提交 234ae5c8 编写于 作者: B Brett V. Forsgren

rename `ShebangCommentTrivia` to `ShebangTrivia`

上级 0a5af9d4
......@@ -13,7 +13,7 @@ Microsoft.CodeAnalysis.CSharp.Syntax.LoadDirectiveTriviaSyntax.WithIsActive(bool
Microsoft.CodeAnalysis.CSharp.Syntax.LoadDirectiveTriviaSyntax.WithLoadKeyword(Microsoft.CodeAnalysis.SyntaxToken loadKeyword) -> Microsoft.CodeAnalysis.CSharp.Syntax.LoadDirectiveTriviaSyntax
Microsoft.CodeAnalysis.CSharp.SyntaxKind.LoadDirectiveTrivia = 8923 -> Microsoft.CodeAnalysis.CSharp.SyntaxKind
Microsoft.CodeAnalysis.CSharp.SyntaxKind.LoadKeyword = 8485 -> Microsoft.CodeAnalysis.CSharp.SyntaxKind
Microsoft.CodeAnalysis.CSharp.SyntaxKind.ShebangCommentTrivia = 8922 -> Microsoft.CodeAnalysis.CSharp.SyntaxKind
Microsoft.CodeAnalysis.CSharp.SyntaxKind.ShebangTrivia = 8922 -> Microsoft.CodeAnalysis.CSharp.SyntaxKind
override Microsoft.CodeAnalysis.CSharp.CSharpParseOptions.CommonWithKind(Microsoft.CodeAnalysis.SourceCodeKind kind) -> Microsoft.CodeAnalysis.ParseOptions
override Microsoft.CodeAnalysis.CSharp.CSharpSyntaxRewriter.VisitLoadDirectiveTrivia(Microsoft.CodeAnalysis.CSharp.Syntax.LoadDirectiveTriviaSyntax node) -> Microsoft.CodeAnalysis.SyntaxNode
override Microsoft.CodeAnalysis.CSharp.Syntax.LoadDirectiveTriviaSyntax.Accept(Microsoft.CodeAnalysis.CSharp.CSharpSyntaxVisitor visitor) -> void
......@@ -30,4 +30,4 @@ static Microsoft.CodeAnalysis.CSharp.SyntaxExtensions.NormalizeWhitespace(this M
static Microsoft.CodeAnalysis.CSharp.SyntaxFactory.LoadDirectiveTrivia(Microsoft.CodeAnalysis.SyntaxToken file, bool isActive) -> Microsoft.CodeAnalysis.CSharp.Syntax.LoadDirectiveTriviaSyntax
static Microsoft.CodeAnalysis.CSharp.SyntaxFactory.LoadDirectiveTrivia(Microsoft.CodeAnalysis.SyntaxToken hashToken, Microsoft.CodeAnalysis.SyntaxToken loadKeyword, Microsoft.CodeAnalysis.SyntaxToken file, Microsoft.CodeAnalysis.SyntaxToken endOfDirectiveToken, bool isActive) -> Microsoft.CodeAnalysis.CSharp.Syntax.LoadDirectiveTriviaSyntax
virtual Microsoft.CodeAnalysis.CSharp.CSharpSyntaxVisitor.VisitLoadDirectiveTrivia(Microsoft.CodeAnalysis.CSharp.Syntax.LoadDirectiveTriviaSyntax node) -> void
virtual Microsoft.CodeAnalysis.CSharp.CSharpSyntaxVisitor<TResult>.VisitLoadDirectiveTrivia(Microsoft.CodeAnalysis.CSharp.Syntax.LoadDirectiveTriviaSyntax node) -> TResult
\ No newline at end of file
virtual Microsoft.CodeAnalysis.CSharp.CSharpSyntaxVisitor<TResult>.VisitLoadDirectiveTrivia(Microsoft.CodeAnalysis.CSharp.Syntax.LoadDirectiveTriviaSyntax node) -> TResult
......@@ -94,7 +94,7 @@ internal static SyntaxTrivia Comment(string text)
}
else if (text.StartsWith("#", StringComparison.Ordinal))
{
return SyntaxTrivia.Create(SyntaxKind.ShebangCommentTrivia, text);
return SyntaxTrivia.Create(SyntaxKind.ShebangTrivia, text);
}
else
{
......
......@@ -346,7 +346,7 @@ public override bool IsTriviaWithEndOfLine()
{
return this.Kind == SyntaxKind.EndOfLineTrivia
|| this.Kind == SyntaxKind.SingleLineCommentTrivia
|| this.Kind == SyntaxKind.ShebangCommentTrivia;
|| this.Kind == SyntaxKind.ShebangTrivia;
}
// Use conditional weak table so we always return same identity for structured trivia
......
......@@ -176,7 +176,7 @@ public static SyntaxTrivia PreprocessingMessage(string text)
/// <see cref="SyntaxKind.WhitespaceTrivia"/>, <see cref="SyntaxKind.EndOfLineTrivia"/>,
/// <see cref="SyntaxKind.SingleLineCommentTrivia"/>, <see cref="SyntaxKind.MultiLineCommentTrivia"/>,
/// <see cref="SyntaxKind.DocumentationCommentExteriorTrivia"/>, <see cref="SyntaxKind.DisabledTextTrivia"/>,
/// <see cref="SyntaxKind.ShebangCommentTrivia"/>
/// <see cref="SyntaxKind.ShebangTrivia"/>
/// </param>
/// <param name="text">
/// The actual text of this token.
......@@ -195,7 +195,7 @@ public static SyntaxTrivia SyntaxTrivia(SyntaxKind kind, string text)
case SyntaxKind.EndOfLineTrivia:
case SyntaxKind.MultiLineCommentTrivia:
case SyntaxKind.SingleLineCommentTrivia:
case SyntaxKind.ShebangCommentTrivia:
case SyntaxKind.ShebangTrivia:
case SyntaxKind.WhitespaceTrivia:
return new SyntaxTrivia(default(SyntaxToken), new Syntax.InternalSyntax.SyntaxTrivia(kind, text, null, null), 0, 0);
......
......@@ -530,7 +530,7 @@ public enum SyntaxKind : ushort
InterpolationAlignmentClause = 8920,
InterpolationFormatClause = 8921,
ShebangCommentTrivia = 8922,
ShebangTrivia = 8922,
LoadDirectiveTrivia = 8923,
}
}
......@@ -209,7 +209,7 @@ public static bool IsTrivia(SyntaxKind kind)
case SyntaxKind.WhitespaceTrivia:
case SyntaxKind.SingleLineCommentTrivia:
case SyntaxKind.MultiLineCommentTrivia:
case SyntaxKind.ShebangCommentTrivia:
case SyntaxKind.ShebangTrivia:
case SyntaxKind.SingleLineDocumentationCommentTrivia:
case SyntaxKind.MultiLineDocumentationCommentTrivia:
case SyntaxKind.DisabledTextTrivia:
......
......@@ -113,13 +113,13 @@ private void AddEndOfLine()
/// <summary>
/// Returns whether the specified <see cref="SyntaxTrivia"/> token is also the end of the line. This will
/// be true for <see cref="SyntaxKind.EndOfLineTrivia"/>, <see cref="SyntaxKind.SingleLineCommentTrivia"/>,
/// <see cref="SyntaxKind.ShebangCommentTrivia"/>, and all preprocessor directives.
/// <see cref="SyntaxKind.ShebangTrivia"/>, and all preprocessor directives.
/// </summary>
private static bool IsEndOfLine(SyntaxTrivia trivia)
{
return trivia.Kind() == SyntaxKind.EndOfLineTrivia
|| trivia.Kind() == SyntaxKind.SingleLineCommentTrivia
|| trivia.Kind() == SyntaxKind.ShebangCommentTrivia
|| trivia.Kind() == SyntaxKind.ShebangTrivia
|| trivia.IsDirective;
}
......
......@@ -666,7 +666,7 @@ private static bool NeedsLineBreakAfter(SyntaxTrivia trivia, bool isTrailingTriv
switch (kind)
{
case SyntaxKind.SingleLineCommentTrivia:
case SyntaxKind.ShebangCommentTrivia:
case SyntaxKind.ShebangTrivia:
return true;
case SyntaxKind.MultiLineCommentTrivia:
return !isTrailingTrivia;
......
......@@ -8446,7 +8446,7 @@ public void Shebang()
Assert.Empty(root.ChildNodes());
var eof = root.EndOfFileToken;
Assert.Equal(SyntaxKind.EndOfFileToken, eof.Kind());
Assert.Equal(SyntaxKind.ShebangCommentTrivia, eof.GetLeadingTrivia().Single().Kind());
Assert.Equal(SyntaxKind.ShebangTrivia, eof.GetLeadingTrivia().Single().Kind());
tree = ParseAndValidate("#! /usr/bin/env scriptcs\r\n ", TestOptions.Script);
root = tree.GetCompilationUnitRoot();
......@@ -8456,7 +8456,7 @@ public void Shebang()
Assert.Equal(SyntaxKind.EndOfFileToken, eof.Kind());
var leading = eof.GetLeadingTrivia().ToArray();
Assert.Equal(3, leading.Length);
Assert.Equal(SyntaxKind.ShebangCommentTrivia, leading[0].Kind());
Assert.Equal(SyntaxKind.ShebangTrivia, leading[0].Kind());
Assert.Equal(SyntaxKind.EndOfLineTrivia, leading[1].Kind());
Assert.Equal(SyntaxKind.WhitespaceTrivia, leading[2].Kind());
......@@ -8469,7 +8469,7 @@ public void Shebang()
Assert.Equal(SyntaxKind.GlobalStatement, statement.Kind());
leading = statement.GetLeadingTrivia().ToArray();
Assert.Equal(2, leading.Length);
Assert.Equal(SyntaxKind.ShebangCommentTrivia, leading[0].Kind());
Assert.Equal(SyntaxKind.ShebangTrivia, leading[0].Kind());
Assert.Equal(SyntaxKind.EndOfLineTrivia, leading[1].Kind());
}
......
......@@ -175,7 +175,7 @@ static SyntaxNodeExtensions()
var endOfLine = Match(SyntaxKind.EndOfLineTrivia, "\\n");
var singleBlankLine = Matcher.Sequence(whitespace, endOfLine);
var shebangComment = Match(SyntaxKind.ShebangCommentTrivia, "#!");
var shebangComment = Match(SyntaxKind.ShebangTrivia, "#!");
var singleLineComment = Match(SyntaxKind.SingleLineCommentTrivia, "//");
var multiLineComment = Match(SyntaxKind.MultiLineCommentTrivia, "/**/");
var anyCommentMatcher = Matcher.Choice(shebangComment, singleLineComment, multiLineComment);
......
......@@ -348,7 +348,7 @@ public static bool IsEntirelyWithinCrefSyntax(this SyntaxTree syntaxTree, int po
trivia = trivia.GetPreviousTrivia(syntaxTree, cancellationToken);
}
if (trivia.IsSingleLineComment() || trivia.IsShebangComment())
if (trivia.IsSingleLineComment() || trivia.IsShebang())
{
var span = trivia.FullSpan;
......
......@@ -32,7 +32,7 @@ public static bool MatchesKind(this SyntaxTrivia trivia, params SyntaxKind[] kin
public static bool IsRegularComment(this SyntaxTrivia trivia)
{
return trivia.IsSingleLineComment() || trivia.IsMultiLineComment() || trivia.IsShebangComment();
return trivia.IsSingleLineComment() || trivia.IsMultiLineComment() || trivia.IsShebang();
}
public static bool IsRegularOrDocComment(this SyntaxTrivia trivia)
......@@ -50,9 +50,9 @@ public static bool IsMultiLineComment(this SyntaxTrivia trivia)
return trivia.Kind() == SyntaxKind.MultiLineCommentTrivia;
}
public static bool IsShebangComment(this SyntaxTrivia trivia)
public static bool IsShebang(this SyntaxTrivia trivia)
{
return trivia.Kind() == SyntaxKind.ShebangCommentTrivia;
return trivia.Kind() == SyntaxKind.ShebangTrivia;
}
public static bool IsCompleteMultiLineComment(this SyntaxTrivia trivia)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册