diff --git a/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs index dae31efbd2..a711567547 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs @@ -593,14 +593,14 @@ namespace Microsoft.AspNetCore.Razor.Language public override void VisitMarkupSpan(MarkupChunkGenerator chunkGenerator, Span span) { - if (span.Symbols.Count == 1) + if (span.Tokens.Count == 1) { - var symbol = span.Symbols[0] as HtmlSymbol; - if (symbol != null && - symbol.Type == HtmlSymbolType.Unknown && - symbol.Content.Length == 0) + var token = span.Tokens[0] as HtmlToken; + if (token != null && + token.Type == HtmlTokenType.Unknown && + token.Content.Length == 0) { - // We don't want to create IR nodes for marker symbols. + // We don't want to create IR nodes for marker tokens. return; } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/DirectiveTokenEditHandler.cs b/src/Microsoft.AspNetCore.Razor.Language/DirectiveTokenEditHandler.cs index 6abaa03f5c..308c274518 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/DirectiveTokenEditHandler.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/DirectiveTokenEditHandler.cs @@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Razor.Language { internal class DirectiveTokenEditHandler : SpanEditHandler { - public DirectiveTokenEditHandler(Func> tokenizer) : base(tokenizer) + public DirectiveTokenEditHandler(Func> tokenizer) : base(tokenizer) { } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Extensions/DesignTimeDirectiveTargetExtension.cs b/src/Microsoft.AspNetCore.Razor.Language/Extensions/DesignTimeDirectiveTargetExtension.cs index bc73343044..316c255bfe 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Extensions/DesignTimeDirectiveTargetExtension.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Extensions/DesignTimeDirectiveTargetExtension.cs @@ -59,8 +59,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions if (string.IsNullOrEmpty(node.Content)) { - // This is most likely a marker symbol. - WriteMarkerSymbol(context, node); + // This is most likely a marker token. + WriteMarkerToken(context, node); break; } @@ -80,8 +80,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions if (string.IsNullOrEmpty(node.Content)) { - // This is most likely a marker symbol. - WriteMarkerSymbol(context, node); + // This is most likely a marker token. + WriteMarkerToken(context, node); break; } @@ -102,8 +102,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions if (string.IsNullOrEmpty(node.Content)) { - // This is most likely a marker symbol. - WriteMarkerSymbol(context, node); + // This is most likely a marker token. + WriteMarkerToken(context, node); break; } @@ -155,9 +155,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Extensions context.CodeWriter.WriteLine("))();"); } - private void WriteMarkerSymbol(CodeRenderingContext context, DirectiveTokenIntermediateNode node) + private void WriteMarkerToken(CodeRenderingContext context, DirectiveTokenIntermediateNode node) { - // We want to map marker symbols to a location in the generated document + // We want to map marker tokens to a location in the generated document // that will provide CSharp intellisense. context.AddSourceMappingFor(node); context.CodeWriter.Write(" "); diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/AutoCompleteEditHandler.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/AutoCompleteEditHandler.cs index bd73bbc1b2..3aecb29a52 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/AutoCompleteEditHandler.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/AutoCompleteEditHandler.cs @@ -11,18 +11,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { private static readonly int TypeHashCode = typeof(AutoCompleteEditHandler).GetHashCode(); - public AutoCompleteEditHandler(Func> tokenizer) + public AutoCompleteEditHandler(Func> tokenizer) : base(tokenizer) { } - public AutoCompleteEditHandler(Func> tokenizer, bool autoCompleteAtEndOfSpan) + public AutoCompleteEditHandler(Func> tokenizer, bool autoCompleteAtEndOfSpan) : this(tokenizer) { AutoCompleteAtEndOfSpan = autoCompleteAtEndOfSpan; } - public AutoCompleteEditHandler(Func> tokenizer, AcceptedCharactersInternal accepted) + public AutoCompleteEditHandler(Func> tokenizer, AcceptedCharactersInternal accepted) : base(tokenizer, accepted) { } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpCodeParser.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpCodeParser.cs index b95916b622..a75c983fec 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpCodeParser.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpCodeParser.cs @@ -8,14 +8,14 @@ using System.Linq; namespace Microsoft.AspNetCore.Razor.Language.Legacy { - internal class CSharpCodeParser : TokenizerBackedParser + internal class CSharpCodeParser : TokenizerBackedParser { private static HashSet InvalidNonWhitespaceNameCharacters = new HashSet(new[] { '@', '!', '<', '/', '?', '[', '>', ']', '=', '"', '\'', '*' }); - private static readonly Func IsValidStatementSpacingSymbol = + private static readonly Func IsValidStatementSpacingToken = IsSpacingToken(includeNewLines: true, includeComments: true); internal static readonly DirectiveDescriptor AddTagHelperDirectiveDescriptor = DirectiveDescriptor.CreateDirective( @@ -102,7 +102,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public bool IsNested { get; set; } - protected override bool SymbolTypeEquals(CSharpSymbolType x, CSharpSymbolType y) => x == y; + protected override bool TokenTypeEquals(CSharpTokenType x, CSharpTokenType y) => x == y; protected void MapDirectives(Action handler, params string[] directives) { @@ -161,16 +161,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy [Conditional("DEBUG")] internal void Assert(CSharpKeyword expectedKeyword) { - Debug.Assert(CurrentSymbol.Type == CSharpSymbolType.Keyword && - CurrentSymbol.Keyword.HasValue && - CurrentSymbol.Keyword.Value == expectedKeyword); + Debug.Assert(CurrentToken.Type == CSharpTokenType.Keyword && + CurrentToken.Keyword.HasValue && + CurrentToken.Keyword.Value == expectedKeyword); } protected internal bool At(CSharpKeyword keyword) { - return At(CSharpSymbolType.Keyword) && - CurrentSymbol.Keyword.HasValue && - CurrentSymbol.Keyword.Value == keyword; + return At(CSharpTokenType.Keyword) && + CurrentToken.Keyword.HasValue && + CurrentToken.Keyword.Value == keyword; } protected internal bool AcceptIf(CSharpKeyword keyword) @@ -183,11 +183,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return false; } - protected static Func IsSpacingToken(bool includeNewLines, bool includeComments) + protected static Func IsSpacingToken(bool includeNewLines, bool includeComments) { - return sym => sym.Type == CSharpSymbolType.WhiteSpace || - (includeNewLines && sym.Type == CSharpSymbolType.NewLine) || - (includeComments && sym.Type == CSharpSymbolType.Comment); + return token => token.Type == CSharpTokenType.WhiteSpace || + (includeNewLines && token.Type == CSharpTokenType.NewLine) || + (includeComments && token.Type == CSharpTokenType.Comment); } public override void ParseBlock() @@ -208,27 +208,27 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true)); - var current = CurrentSymbol; - if (At(CSharpSymbolType.StringLiteral) && - CurrentSymbol.Content.Length > 0 && - CurrentSymbol.Content[0] == SyntaxConstants.TransitionCharacter) + var current = CurrentToken; + if (At(CSharpTokenType.StringLiteral) && + CurrentToken.Content.Length > 0 && + CurrentToken.Content[0] == SyntaxConstants.TransitionCharacter) { - var split = Language.SplitSymbol(CurrentSymbol, 1, CSharpSymbolType.Transition); + var split = Language.SplitToken(CurrentToken, 1, CSharpTokenType.Transition); current = split.Item1; // Back up to the end of the transition Context.Source.Position -= split.Item2.Content.Length; NextToken(); } - else if (At(CSharpSymbolType.Transition)) + else if (At(CSharpTokenType.Transition)) { NextToken(); } // Accept "@" if we see it, but if we don't, that's OK. We assume we were started for a good reason - if (current.Type == CSharpSymbolType.Transition) + if (current.Type == CSharpTokenType.Transition) { - if (Span.Symbols.Count > 0) + if (Span.Tokens.Count > 0) { Output(SpanKindInternal.Code); } @@ -251,9 +251,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy span.ChunkGenerator = new StatementChunkGenerator(); } - private void AtTransition(CSharpSymbol current) + private void AtTransition(CSharpToken current) { - Debug.Assert(current.Type == CSharpSymbolType.Transition); + Debug.Assert(current.Type == CSharpTokenType.Transition); Accept(current); Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None; Span.ChunkGenerator = SpanChunkGenerator.Null; @@ -273,16 +273,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // What type of block is this? if (!EndOfFile) { - if (CurrentSymbol.Type == CSharpSymbolType.LeftParenthesis) + if (CurrentToken.Type == CSharpTokenType.LeftParenthesis) { Context.Builder.CurrentBlock.Type = BlockKindInternal.Expression; Context.Builder.CurrentBlock.ChunkGenerator = new ExpressionChunkGenerator(); ExplicitExpression(); return; } - else if (CurrentSymbol.Type == CSharpSymbolType.Identifier) + else if (CurrentToken.Type == CSharpTokenType.Identifier) { - if (TryGetDirectiveHandler(CurrentSymbol.Content, out var handler)) + if (TryGetDirectiveHandler(CurrentToken.Content, out var handler)) { Span.ChunkGenerator = SpanChunkGenerator.Null; handler(); @@ -291,13 +291,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy else { if (string.Equals( - CurrentSymbol.Content, + CurrentToken.Content, SyntaxConstants.CSharp.HelperKeyword, StringComparison.Ordinal)) { Context.ErrorSink.OnError( RazorDiagnosticFactory.CreateParsing_HelperDirectiveNotAvailable( - new SourceSpan(CurrentStart, CurrentSymbol.Content.Length))); + new SourceSpan(CurrentStart, CurrentToken.Content.Length))); } Context.Builder.CurrentBlock.Type = BlockKindInternal.Expression; @@ -306,9 +306,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return; } } - else if (CurrentSymbol.Type == CSharpSymbolType.Keyword) + else if (CurrentToken.Type == CSharpTokenType.Keyword) { - if (TryGetDirectiveHandler(CurrentSymbol.Content, out var handler)) + if (TryGetDirectiveHandler(CurrentToken.Content, out var handler)) { Span.ChunkGenerator = SpanChunkGenerator.Null; handler(); @@ -320,7 +320,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return; } } - else if (CurrentSymbol.Type == CSharpSymbolType.LeftBrace) + else if (CurrentToken.Type == CSharpTokenType.LeftBrace) { VerbatimBlock(); return; @@ -330,7 +330,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Invalid character Context.Builder.CurrentBlock.Type = BlockKindInternal.Expression; Context.Builder.CurrentBlock.ChunkGenerator = new ExpressionChunkGenerator(); - AddMarkerSymbolIfNecessary(); + AddMarkerTokenIfNecessary(); Span.ChunkGenerator = new ExpressionChunkGenerator(); Span.EditHandler = new ImplicitExpressionEditHandler( Language.TokenizeString, @@ -339,11 +339,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { AcceptedCharacters = AcceptedCharactersInternal.NonWhiteSpace }; - if (At(CSharpSymbolType.WhiteSpace) || At(CSharpSymbolType.NewLine)) + if (At(CSharpTokenType.WhiteSpace) || At(CSharpTokenType.NewLine)) { Context.ErrorSink.OnError( RazorDiagnosticFactory.CreateParsing_UnexpectedWhiteSpaceAtStartOfCodeBlock( - new SourceSpan(CurrentStart, CurrentSymbol.Content.Length))); + new SourceSpan(CurrentStart, CurrentToken.Content.Length))); } else if (EndOfFile) { @@ -355,8 +355,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { Context.ErrorSink.OnError( RazorDiagnosticFactory.CreateParsing_UnexpectedCharacterAtStartOfCodeBlock( - new SourceSpan(CurrentStart, CurrentSymbol.Content.Length), - CurrentSymbol.Content)); + new SourceSpan(CurrentStart, CurrentToken.Content.Length), + CurrentToken.Content)); } } finally @@ -369,7 +369,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private void VerbatimBlock() { - Assert(CSharpSymbolType.LeftBrace); + Assert(CSharpTokenType.LeftBrace); var block = new Block(Resources.BlockName_Code, CurrentStart); AcceptAndMoveNext(); @@ -384,14 +384,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy CodeBlock(false, block); Span.ChunkGenerator = new StatementChunkGenerator(); - AddMarkerSymbolIfNecessary(); - if (!At(CSharpSymbolType.RightBrace)) + AddMarkerTokenIfNecessary(); + if (!At(CSharpTokenType.RightBrace)) { editHandler.AutoCompleteString = "}"; } Output(SpanKindInternal.Code); - if (Optional(CSharpSymbolType.RightBrace)) + if (Optional(CSharpTokenType.RightBrace)) { // Set up the "}" span Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None; @@ -401,8 +401,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy if (!IsNested) { EnsureCurrent(); - if (At(CSharpSymbolType.NewLine) || - (At(CSharpSymbolType.WhiteSpace) && NextIs(CSharpSymbolType.NewLine))) + if (At(CSharpTokenType.NewLine) || + (At(CSharpTokenType.WhiteSpace) && NextIs(CSharpTokenType.NewLine))) { Context.NullGenerateWhitespaceAndNewLine = true; } @@ -456,13 +456,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { if (!EndOfFile) { - if (CurrentSymbol.Type == CSharpSymbolType.LeftParenthesis || - CurrentSymbol.Type == CSharpSymbolType.LeftBracket) + if (CurrentToken.Type == CSharpTokenType.LeftParenthesis || + CurrentToken.Type == CSharpTokenType.LeftBracket) { // If we end within "(", whitespace is fine Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any; - CSharpSymbolType right; + CSharpTokenType right; bool success; using (PushSpanConfig((span, prev) => @@ -471,13 +471,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any; })) { - right = Language.FlipBracket(CurrentSymbol.Type); + right = Language.FlipBracket(CurrentToken.Type); success = Balance(BalancingModes.BacktrackOnFailure | BalancingModes.AllowCommentsAndTemplates); } if (!success) { - AcceptUntil(CSharpSymbolType.LessThan); + AcceptUntil(CSharpTokenType.LessThan); } if (At(right)) { @@ -488,22 +488,22 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } return MethodCallOrArrayIndex(acceptedCharacters); } - if (At(CSharpSymbolType.QuestionMark)) + if (At(CSharpTokenType.QuestionMark)) { var next = Lookahead(count: 1); if (next != null) { - if (next.Type == CSharpSymbolType.Dot) + if (next.Type == CSharpTokenType.Dot) { // Accept null conditional dot operator (?.). AcceptAndMoveNext(); AcceptAndMoveNext(); // If the next piece after the ?. is a keyword or identifier then we want to continue. - return At(CSharpSymbolType.Identifier) || At(CSharpSymbolType.Keyword); + return At(CSharpTokenType.Identifier) || At(CSharpTokenType.Keyword); } - else if (next.Type == CSharpSymbolType.LeftBracket) + else if (next.Type == CSharpTokenType.LeftBracket) { // We're at the ? for a null conditional bracket operator (?[). AcceptAndMoveNext(); @@ -513,12 +513,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } } } - else if (At(CSharpSymbolType.Dot)) + else if (At(CSharpTokenType.Dot)) { - var dot = CurrentSymbol; + var dot = CurrentToken; if (NextToken()) { - if (At(CSharpSymbolType.Identifier) || At(CSharpSymbolType.Keyword)) + if (At(CSharpTokenType.Identifier) || At(CSharpTokenType.Keyword)) { // Accept the dot and return to the start Accept(dot); @@ -526,7 +526,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } else { - // Put the symbol back + // Put the token back PutCurrentBack(); } } @@ -540,7 +540,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Accept(dot); } } - else if (!At(CSharpSymbolType.WhiteSpace) && !At(CSharpSymbolType.NewLine)) + else if (!At(CSharpTokenType.WhiteSpace) && !At(CSharpTokenType.NewLine)) { PutCurrentBack(); } @@ -564,7 +564,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { if (insertMarkerIfNecessary && Context.Builder.LastAcceptedCharacters != AcceptedCharactersInternal.Any) { - AddMarkerSymbolIfNecessary(); + AddMarkerTokenIfNecessary(); } EnsureCurrent(); @@ -587,8 +587,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private void CaptureWhitespaceAtEndOfCodeOnlyLine() { - var whitespace = ReadWhile(sym => sym.Type == CSharpSymbolType.WhiteSpace); - if (At(CSharpSymbolType.NewLine)) + var whitespace = ReadWhile(token => token.Type == CSharpTokenType.WhiteSpace); + if (At(CSharpTokenType.NewLine)) { Accept(whitespace); AcceptAndMoveNext(); @@ -610,7 +610,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private void ExplicitExpression() { var block = new Block(Resources.BlockName_ExplicitExpression, CurrentStart); - Assert(CSharpSymbolType.LeftParenthesis); + Assert(CSharpTokenType.LeftParenthesis); AcceptAndMoveNext(); Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None; Span.ChunkGenerator = SpanChunkGenerator.Null; @@ -621,28 +621,28 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy BalancingModes.BacktrackOnFailure | BalancingModes.NoErrorOnFailure | BalancingModes.AllowCommentsAndTemplates, - CSharpSymbolType.LeftParenthesis, - CSharpSymbolType.RightParenthesis, + CSharpTokenType.LeftParenthesis, + CSharpTokenType.RightParenthesis, block.Start); if (!success) { - AcceptUntil(CSharpSymbolType.LessThan); + AcceptUntil(CSharpTokenType.LessThan); Context.ErrorSink.OnError( RazorDiagnosticFactory.CreateParsing_ExpectedEndOfBlockBeforeEOF( new SourceSpan(block.Start, contentLength: 1 /* ( */), block.Name, ")", "(")); } - // If necessary, put an empty-content marker symbol here - if (Span.Symbols.Count == 0) + // If necessary, put an empty-content marker token here + if (Span.Tokens.Count == 0) { - Accept(new CSharpSymbol(string.Empty, CSharpSymbolType.Unknown)); + Accept(new CSharpToken(string.Empty, CSharpTokenType.Unknown)); } // Output the content span and then capture the ")" Output(SpanKindInternal.Code); } - Optional(CSharpSymbolType.RightParenthesis); + Optional(CSharpTokenType.RightParenthesis); if (!EndOfFile) { PutCurrentBack(); @@ -701,19 +701,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { // No embedded transitions in C#, so ignore that param return allowTemplatesAndComments - && ((Language.IsTransition(CurrentSymbol) - && NextIs(CSharpSymbolType.LessThan, CSharpSymbolType.Colon, CSharpSymbolType.DoubleColon)) - || Language.IsCommentStart(CurrentSymbol)); + && ((Language.IsTransition(CurrentToken) + && NextIs(CSharpTokenType.LessThan, CSharpTokenType.Colon, CSharpTokenType.DoubleColon)) + || Language.IsCommentStart(CurrentToken)); } protected override void HandleEmbeddedTransition() { - if (Language.IsTransition(CurrentSymbol)) + if (Language.IsTransition(CurrentToken)) { PutCurrentBack(); Template(); } - else if (Language.IsCommentStart(CurrentSymbol)) + else if (Language.IsCommentStart(CurrentToken)) { RazorComment(); } @@ -761,7 +761,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { Context.ErrorSink.OnError( RazorDiagnosticFactory.CreateParsing_ReservedWord( - new SourceSpan(CurrentStart, CurrentSymbol.Content.Length), CurrentSymbol.Content)); + new SourceSpan(CurrentStart, CurrentToken.Content.Length), CurrentToken.Content)); AcceptAndMoveNext(); Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None; @@ -783,12 +783,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private void CaseStatement(bool topLevel) { - Assert(CSharpSymbolType.Keyword); - Debug.Assert(CurrentSymbol.Keyword != null && - (CurrentSymbol.Keyword.Value == CSharpKeyword.Case || - CurrentSymbol.Keyword.Value == CSharpKeyword.Default)); - AcceptUntil(CSharpSymbolType.Colon); - Optional(CSharpSymbolType.Colon); + Assert(CSharpTokenType.Keyword); + Debug.Assert(CurrentToken.Keyword != null && + (CurrentToken.Keyword.Value == CSharpKeyword.Case || + CurrentToken.Keyword.Value == CSharpKeyword.Default)); + AcceptUntil(CSharpTokenType.Colon); + Optional(CSharpTokenType.Colon); } private void DoStatement(bool topLevel) @@ -813,7 +813,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Assert(CSharpKeyword.While); AcceptAndMoveNext(); AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true)); - if (AcceptCondition() && Optional(CSharpSymbolType.Semicolon)) + if (AcceptCondition() && Optional(CSharpTokenType.Semicolon)) { Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None; } @@ -828,16 +828,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private void UsingKeyword(bool topLevel) { Assert(CSharpKeyword.Using); - var block = new Block(CurrentSymbol, CurrentStart); + var block = new Block(CurrentToken, CurrentStart); AcceptAndMoveNext(); AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true)); - if (At(CSharpSymbolType.LeftParenthesis)) + if (At(CSharpTokenType.LeftParenthesis)) { // using ( ==> Using Statement UsingStatement(block); } - else if (At(CSharpSymbolType.Identifier) || At(CSharpKeyword.Static)) + else if (At(CSharpTokenType.Identifier) || At(CSharpKeyword.Static)) { // using Identifier ==> Using Declaration if (!topLevel) @@ -865,16 +865,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Context.Builder.CurrentBlock.Type = BlockKindInternal.Directive; var start = CurrentStart; - if (At(CSharpSymbolType.Identifier)) + if (At(CSharpTokenType.Identifier)) { // non-static using NamespaceOrTypeName(); var whitespace = ReadWhile(IsSpacingToken(includeNewLines: true, includeComments: true)); - if (At(CSharpSymbolType.Assign)) + if (At(CSharpTokenType.Assign)) { // Alias Accept(whitespace); - Assert(CSharpSymbolType.Assign); + Assert(CSharpTokenType.Assign); AcceptAndMoveNext(); AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true)); @@ -898,13 +898,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.AnyExceptNewline; Span.ChunkGenerator = new AddImportChunkGenerator(new LocationTagged( - string.Concat(Span.Symbols.Skip(1).Select(s => s.Content)), + string.Concat(Span.Tokens.Skip(1).Select(s => s.Content)), start)); // Optional ";" if (EnsureCurrent()) { - Optional(CSharpSymbolType.Semicolon); + Optional(CSharpTokenType.Semicolon); } } @@ -920,15 +920,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var tokens = ReadWhile(token => { var type = token.Type; - if ((expectingDot && type == CSharpSymbolType.Dot) || - (!expectingDot && type == CSharpSymbolType.Identifier)) + if ((expectingDot && type == CSharpTokenType.Dot) || + (!expectingDot && type == CSharpTokenType.Identifier)) { expectingDot = !expectingDot; return true; } - if (type != CSharpSymbolType.WhiteSpace && - type != CSharpSymbolType.NewLine) + if (type != CSharpTokenType.WhiteSpace && + type != CSharpTokenType.NewLine) { expectingDot = false; currentIdentifierLength += token.Content.Length; @@ -966,69 +966,69 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy protected bool NamespaceOrTypeName() { - if (Optional(CSharpSymbolType.LeftParenthesis)) + if (Optional(CSharpTokenType.LeftParenthesis)) { - while (!Optional(CSharpSymbolType.RightParenthesis) && !EndOfFile) + while (!Optional(CSharpTokenType.RightParenthesis) && !EndOfFile) { - Optional(CSharpSymbolType.WhiteSpace); + Optional(CSharpTokenType.WhiteSpace); if (!NamespaceOrTypeName()) { return false; } - Optional(CSharpSymbolType.WhiteSpace); - Optional(CSharpSymbolType.Identifier); - Optional(CSharpSymbolType.WhiteSpace); - Optional(CSharpSymbolType.Comma); + Optional(CSharpTokenType.WhiteSpace); + Optional(CSharpTokenType.Identifier); + Optional(CSharpTokenType.WhiteSpace); + Optional(CSharpTokenType.Comma); } - if (At(CSharpSymbolType.WhiteSpace) && NextIs(CSharpSymbolType.QuestionMark)) + if (At(CSharpTokenType.WhiteSpace) && NextIs(CSharpTokenType.QuestionMark)) { // Only accept the whitespace if we are going to consume the next token. AcceptAndMoveNext(); } - Optional(CSharpSymbolType.QuestionMark); // Nullable + Optional(CSharpTokenType.QuestionMark); // Nullable return true; } - else if (Optional(CSharpSymbolType.Identifier) || Optional(CSharpSymbolType.Keyword)) + else if (Optional(CSharpTokenType.Identifier) || Optional(CSharpTokenType.Keyword)) { - if (Optional(CSharpSymbolType.DoubleColon)) + if (Optional(CSharpTokenType.DoubleColon)) { - if (!Optional(CSharpSymbolType.Identifier)) + if (!Optional(CSharpTokenType.Identifier)) { - Optional(CSharpSymbolType.Keyword); + Optional(CSharpTokenType.Keyword); } } - if (At(CSharpSymbolType.LessThan)) + if (At(CSharpTokenType.LessThan)) { TypeArgumentList(); } - if (Optional(CSharpSymbolType.Dot)) + if (Optional(CSharpTokenType.Dot)) { NamespaceOrTypeName(); } - if (At(CSharpSymbolType.WhiteSpace) && NextIs(CSharpSymbolType.QuestionMark)) + if (At(CSharpTokenType.WhiteSpace) && NextIs(CSharpTokenType.QuestionMark)) { // Only accept the whitespace if we are going to consume the next token. AcceptAndMoveNext(); } - Optional(CSharpSymbolType.QuestionMark); // Nullable + Optional(CSharpTokenType.QuestionMark); // Nullable - if (At(CSharpSymbolType.WhiteSpace) && NextIs(CSharpSymbolType.LeftBracket)) + if (At(CSharpTokenType.WhiteSpace) && NextIs(CSharpTokenType.LeftBracket)) { // Only accept the whitespace if we are going to consume the next token. AcceptAndMoveNext(); } - while (At(CSharpSymbolType.LeftBracket)) + while (At(CSharpTokenType.LeftBracket)) { Balance(BalancingModes.None); - Optional(CSharpSymbolType.RightBracket); + Optional(CSharpTokenType.RightBracket); } return true; } @@ -1040,14 +1040,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private void TypeArgumentList() { - Assert(CSharpSymbolType.LessThan); + Assert(CSharpTokenType.LessThan); Balance(BalancingModes.None); - Optional(CSharpSymbolType.GreaterThan); + Optional(CSharpTokenType.GreaterThan); } private void UsingStatement(Block block) { - Assert(CSharpSymbolType.LeftParenthesis); + Assert(CSharpTokenType.LeftParenthesis); // Parse condition if (AcceptCondition()) @@ -1136,7 +1136,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { return; } - var block = new Block(CurrentSymbol, CurrentStart); + var block = new Block(CurrentToken, CurrentStart); AcceptAndMoveNext(); AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true)); @@ -1159,13 +1159,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy if (!EndOfFile) { // Check for "{" to make sure we're at a block - if (!At(CSharpSymbolType.LeftBrace)) + if (!At(CSharpTokenType.LeftBrace)) { Context.ErrorSink.OnError( RazorDiagnosticFactory.CreateParsing_SingleLineControlFlowStatementsNotAllowed( - new SourceSpan(CurrentStart, CurrentSymbol.Content.Length), - Language.GetSample(CSharpSymbolType.LeftBrace), - CurrentSymbol.Content)); + new SourceSpan(CurrentStart, CurrentToken.Content.Length), + Language.GetSample(CSharpTokenType.LeftBrace), + CurrentToken.Content)); } // Parse the statement and then we're done @@ -1175,8 +1175,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private void UnconditionalBlock() { - Assert(CSharpSymbolType.Keyword); - var block = new Block(CurrentSymbol, CurrentStart); + Assert(CSharpTokenType.Keyword); + var block = new Block(CurrentToken, CurrentStart); AcceptAndMoveNext(); AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true)); ExpectCodeBlock(block); @@ -1186,22 +1186,22 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { Assert(CSharpKeyword.Catch); - var block = new Block(CurrentSymbol, CurrentStart); + var block = new Block(CurrentToken, CurrentStart); // Accept "catch" AcceptAndMoveNext(); - AcceptWhile(IsValidStatementSpacingSymbol); + AcceptWhile(IsValidStatementSpacingToken); // Parse the catch condition if present. If not present, let the C# compiler complain. if (AcceptCondition()) { - AcceptWhile(IsValidStatementSpacingSymbol); + AcceptWhile(IsValidStatementSpacingToken); if (At(CSharpKeyword.When)) { // Accept "when". AcceptAndMoveNext(); - AcceptWhile(IsValidStatementSpacingSymbol); + AcceptWhile(IsValidStatementSpacingToken); // Parse the filter condition if present. If not present, let the C# compiler complain. if (!AcceptCondition()) @@ -1210,7 +1210,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return; } - AcceptWhile(IsValidStatementSpacingSymbol); + AcceptWhile(IsValidStatementSpacingToken); } ExpectCodeBlock(block); @@ -1219,8 +1219,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private void ConditionalBlock(bool topLevel) { - Assert(CSharpSymbolType.Keyword); - var block = new Block(CurrentSymbol, CurrentStart); + Assert(CSharpTokenType.Keyword); + var block = new Block(CurrentToken, CurrentStart); ConditionalBlock(block); if (topLevel) { @@ -1243,16 +1243,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private bool AcceptCondition() { - if (At(CSharpSymbolType.LeftParenthesis)) + if (At(CSharpTokenType.LeftParenthesis)) { var complete = Balance(BalancingModes.BacktrackOnFailure | BalancingModes.AllowCommentsAndTemplates); if (!complete) { - AcceptUntil(CSharpSymbolType.NewLine); + AcceptUntil(CSharpTokenType.NewLine); } else { - Optional(CSharpSymbolType.RightParenthesis); + Optional(CSharpTokenType.RightParenthesis); } return complete; } @@ -1280,16 +1280,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return; } - var type = CurrentSymbol.Type; + var type = CurrentToken.Type; var loc = CurrentStart; // Both cases @: and @:: are triggered as markup, second colon in second case will be triggered as a plain text - var isSingleLineMarkup = type == CSharpSymbolType.Transition && - (NextIs(CSharpSymbolType.Colon, CSharpSymbolType.DoubleColon)); + var isSingleLineMarkup = type == CSharpTokenType.Transition && + (NextIs(CSharpTokenType.Colon, CSharpTokenType.DoubleColon)); var isMarkup = isSingleLineMarkup || - type == CSharpSymbolType.LessThan || - (type == CSharpSymbolType.Transition && NextIs(CSharpSymbolType.LessThan)); + type == CSharpTokenType.LessThan || + (type == CSharpTokenType.Transition && NextIs(CSharpTokenType.LessThan)); if (Context.DesignTimeMode || !isMarkup) { @@ -1301,14 +1301,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } else { - var nextSymbol = Lookahead(1); + var nextToken = Lookahead(1); // MARKUP owns whitespace EXCEPT in DesignTimeMode. PutCurrentBack(); // Put back the whitespace unless it precedes a '' tag. - if (nextSymbol != null && - !string.Equals(nextSymbol.Content, SyntaxConstants.TextTagName, StringComparison.Ordinal)) + if (nextToken != null && + !string.Equals(nextToken.Content, SyntaxConstants.TextTagName, StringComparison.Ordinal)) { PutBack(lastWhitespace); } @@ -1321,7 +1321,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy if (isMarkup) { - if (type == CSharpSymbolType.Transition && !isSingleLineMarkup) + if (type == CSharpTokenType.Transition && !isSingleLineMarkup) { Context.ErrorSink.OnError( RazorDiagnosticFactory.CreateParsing_AtInCodeMustBeFollowedByColonParenOrIdentifierStart( @@ -1330,8 +1330,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Markup block Output(SpanKindInternal.Code); - if (Context.DesignTimeMode && CurrentSymbol != null && - (CurrentSymbol.Type == CSharpSymbolType.LessThan || CurrentSymbol.Type == CSharpSymbolType.Transition)) + if (Context.DesignTimeMode && CurrentToken != null && + (CurrentToken.Type == CSharpTokenType.LessThan || CurrentToken.Type == CSharpTokenType.Transition)) { PutCurrentBack(); } @@ -1344,33 +1344,33 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } } - private void HandleStatement(Block block, CSharpSymbolType type) + private void HandleStatement(Block block, CSharpTokenType type) { switch (type) { - case CSharpSymbolType.RazorCommentTransition: + case CSharpTokenType.RazorCommentTransition: Output(SpanKindInternal.Code); RazorComment(); Statement(block); break; - case CSharpSymbolType.LeftBrace: + case CSharpTokenType.LeftBrace: // Verbatim Block block = block ?? new Block(Resources.BlockName_Code, CurrentStart); AcceptAndMoveNext(); CodeBlock(block); break; - case CSharpSymbolType.Keyword: + case CSharpTokenType.Keyword: // Keyword block HandleKeyword(false, StandardStatement); break; - case CSharpSymbolType.Transition: + case CSharpTokenType.Transition: // Embedded Expression block EmbeddedExpression(); break; - case CSharpSymbolType.RightBrace: + case CSharpTokenType.RightBrace: // Possible end of Code Block, just run the continuation break; - case CSharpSymbolType.Comment: + case CSharpTokenType.Comment: AcceptAndMoveNext(); break; default: @@ -1383,11 +1383,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private void EmbeddedExpression() { // First, verify the type of the block - Assert(CSharpSymbolType.Transition); - var transition = CurrentSymbol; + Assert(CSharpTokenType.Transition); + var transition = CurrentToken; NextToken(); - if (At(CSharpSymbolType.Transition)) + if (At(CSharpTokenType.Transition)) { // Escaped "@" Output(SpanKindInternal.Code); @@ -1397,14 +1397,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Span.ChunkGenerator = SpanChunkGenerator.Null; Output(SpanKindInternal.Code); - Assert(CSharpSymbolType.Transition); + Assert(CSharpTokenType.Transition); AcceptAndMoveNext(); StandardStatement(); } else { // Throw errors as necessary, but continue parsing - if (At(CSharpSymbolType.LeftBrace)) + if (At(CSharpTokenType.LeftBrace)) { Context.ErrorSink.OnError( RazorDiagnosticFactory.CreateParsing_UnexpectedNestedCodeBlock( @@ -1416,7 +1416,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy PutBack(transition); // Before exiting, add a marker span if necessary - AddMarkerSymbolIfNecessary(); + AddMarkerTokenIfNecessary(); NestedBlock(); } @@ -1427,49 +1427,49 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy while (!EndOfFile) { var bookmark = CurrentStart.AbsoluteIndex; - var read = ReadWhile(sym => - sym.Type != CSharpSymbolType.Semicolon && - sym.Type != CSharpSymbolType.RazorCommentTransition && - sym.Type != CSharpSymbolType.Transition && - sym.Type != CSharpSymbolType.LeftBrace && - sym.Type != CSharpSymbolType.LeftParenthesis && - sym.Type != CSharpSymbolType.LeftBracket && - sym.Type != CSharpSymbolType.RightBrace); + var read = ReadWhile(token => + token.Type != CSharpTokenType.Semicolon && + token.Type != CSharpTokenType.RazorCommentTransition && + token.Type != CSharpTokenType.Transition && + token.Type != CSharpTokenType.LeftBrace && + token.Type != CSharpTokenType.LeftParenthesis && + token.Type != CSharpTokenType.LeftBracket && + token.Type != CSharpTokenType.RightBrace); - if (At(CSharpSymbolType.LeftBrace) || - At(CSharpSymbolType.LeftParenthesis) || - At(CSharpSymbolType.LeftBracket)) + if (At(CSharpTokenType.LeftBrace) || + At(CSharpTokenType.LeftParenthesis) || + At(CSharpTokenType.LeftBracket)) { Accept(read); if (Balance(BalancingModes.AllowCommentsAndTemplates | BalancingModes.BacktrackOnFailure)) { - Optional(CSharpSymbolType.RightBrace); + Optional(CSharpTokenType.RightBrace); } else { // Recovery - AcceptUntil(CSharpSymbolType.LessThan, CSharpSymbolType.RightBrace); + AcceptUntil(CSharpTokenType.LessThan, CSharpTokenType.RightBrace); return; } } - else if (At(CSharpSymbolType.Transition) && (NextIs(CSharpSymbolType.LessThan, CSharpSymbolType.Colon))) + else if (At(CSharpTokenType.Transition) && (NextIs(CSharpTokenType.LessThan, CSharpTokenType.Colon))) { Accept(read); Output(SpanKindInternal.Code); Template(); } - else if (At(CSharpSymbolType.RazorCommentTransition)) + else if (At(CSharpTokenType.RazorCommentTransition)) { Accept(read); RazorComment(); } - else if (At(CSharpSymbolType.Semicolon)) + else if (At(CSharpTokenType.Semicolon)) { Accept(read); AcceptAndMoveNext(); return; } - else if (At(CSharpSymbolType.RightBrace)) + else if (At(CSharpTokenType.RightBrace)) { Accept(read); return; @@ -1478,7 +1478,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { Context.Source.Position = bookmark; NextToken(); - AcceptUntil(CSharpSymbolType.LessThan, CSharpSymbolType.LeftBrace, CSharpSymbolType.RightBrace); + AcceptUntil(CSharpTokenType.LessThan, CSharpTokenType.LeftBrace, CSharpTokenType.RightBrace); return; } } @@ -1492,7 +1492,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private void CodeBlock(bool acceptTerminatingBrace, Block block) { EnsureCurrent(); - while (!EndOfFile && !At(CSharpSymbolType.RightBrace)) + while (!EndOfFile && !At(CSharpTokenType.RightBrace)) { // Parse a statement, then return here Statement(); @@ -1507,7 +1507,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } else if (acceptTerminatingBrace) { - Assert(CSharpSymbolType.RightBrace); + Assert(CSharpTokenType.RightBrace); Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None; AcceptAndMoveNext(); } @@ -1515,8 +1515,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private void HandleKeyword(bool topLevel, Action fallback) { - Debug.Assert(CurrentSymbol.Type == CSharpSymbolType.Keyword && CurrentSymbol.Keyword != null); - if (_keywordParsers.TryGetValue(CurrentSymbol.Keyword.Value, out var handler)) + Debug.Assert(CurrentToken.Type == CSharpTokenType.Keyword && CurrentToken.Keyword != null); + if (_keywordParsers.TryGetValue(CurrentToken.Keyword.Value, out var handler)) { handler(topLevel); } @@ -1526,12 +1526,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } } - private IEnumerable SkipToNextImportantToken() + private IEnumerable SkipToNextImportantToken() { while (!EndOfFile) { var whitespace = ReadWhile(IsSpacingToken(includeNewLines: true, includeComments: true)); - if (At(CSharpSymbolType.RazorCommentTransition)) + if (At(CSharpTokenType.RazorCommentTransition)) { Accept(whitespace); Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Any; @@ -1542,13 +1542,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return whitespace; } } - return Enumerable.Empty(); + return Enumerable.Empty(); } // Common code for Parsers, but FxCop REALLY doesn't like it in the base class.. moving it here for now. protected override void OutputSpanBeforeRazorComment() { - AddMarkerSymbolIfNecessary(); + AddMarkerTokenIfNecessary(); Output(SpanKindInternal.Code); } @@ -1610,7 +1610,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy if (!char.IsWhiteSpace(@char)) { - var currentDirective = CurrentSymbol.Content; + var currentDirective = CurrentToken.Content; Context.ErrorSink.OnError( RazorDiagnosticFactory.CreateParsing_DirectiveMustAppearAtStartOfLine( new SourceSpan(CurrentStart, currentDirective.Length), currentDirective)); @@ -1644,13 +1644,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy for (var i = 0; i < descriptor.Tokens.Count; i++) { - if (!At(CSharpSymbolType.WhiteSpace) && - !At(CSharpSymbolType.NewLine) && + if (!At(CSharpTokenType.WhiteSpace) && + !At(CSharpTokenType.NewLine) && !EndOfFile) { Context.ErrorSink.OnError( RazorDiagnosticFactory.CreateParsing_DirectiveTokensMustBeSeparatedByWhitespace( - new SourceSpan(CurrentStart, CurrentSymbol.Content.Length), descriptor.Directive)); + new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive)); return; } @@ -1664,10 +1664,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Span.ChunkGenerator = SpanChunkGenerator.Null; Output(SpanKindInternal.Code, AcceptedCharactersInternal.WhiteSpace); - if (EndOfFile || At(CSharpSymbolType.NewLine)) + if (EndOfFile || At(CSharpTokenType.NewLine)) { - // Add a marker symbol to provide CSharp intellisense when we start typing the directive token. - AddMarkerSymbolIfNecessary(); + // Add a marker token to provide CSharp intellisense when we start typing the directive token. + AddMarkerTokenIfNecessary(); Span.ChunkGenerator = new DirectiveTokenChunkGenerator(tokenDescriptor); Span.EditHandler = new DirectiveTokenEditHandler(Language.TokenizeString); Output(SpanKindInternal.Code, AcceptedCharactersInternal.NonWhiteSpace); @@ -1679,7 +1679,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Output(SpanKindInternal.Markup, AcceptedCharactersInternal.WhiteSpace); } - if (tokenDescriptor.Optional && (EndOfFile || At(CSharpSymbolType.NewLine))) + if (tokenDescriptor.Optional && (EndOfFile || At(CSharpTokenType.NewLine))) { break; } @@ -1700,7 +1700,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { Context.ErrorSink.OnError( RazorDiagnosticFactory.CreateParsing_DirectiveExpectsTypeName( - new SourceSpan(CurrentStart, CurrentSymbol.Content.Length), descriptor.Directive)); + new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive)); return; } @@ -1718,7 +1718,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy break; case DirectiveTokenKind.Member: - if (At(CSharpSymbolType.Identifier)) + if (At(CSharpTokenType.Identifier)) { AcceptAndMoveNext(); } @@ -1726,13 +1726,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { Context.ErrorSink.OnError( RazorDiagnosticFactory.CreateParsing_DirectiveExpectsIdentifier( - new SourceSpan(CurrentStart, CurrentSymbol.Content.Length), descriptor.Directive)); + new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive)); return; } break; case DirectiveTokenKind.String: - if (At(CSharpSymbolType.StringLiteral) && CurrentSymbol.Errors.Count == 0) + if (At(CSharpTokenType.StringLiteral) && CurrentToken.Errors.Count == 0) { AcceptAndMoveNext(); } @@ -1740,7 +1740,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { Context.ErrorSink.OnError( RazorDiagnosticFactory.CreateParsing_DirectiveExpectsQuotedStringLiteral( - new SourceSpan(CurrentStart, CurrentSymbol.Content.Length), descriptor.Directive)); + new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive)); return; } break; @@ -1759,13 +1759,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy case DirectiveKind.SingleLine: Output(SpanKindInternal.None, AcceptedCharactersInternal.WhiteSpace); - Optional(CSharpSymbolType.Semicolon); + Optional(CSharpTokenType.Semicolon); Span.ChunkGenerator = SpanChunkGenerator.Null; Output(SpanKindInternal.MetaCode, AcceptedCharactersInternal.WhiteSpace); AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true)); - if (At(CSharpSymbolType.NewLine)) + if (At(CSharpTokenType.NewLine)) { AcceptAndMoveNext(); } @@ -1773,7 +1773,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { Context.ErrorSink.OnError( RazorDiagnosticFactory.CreateParsing_UnexpectedDirectiveLiteral( - new SourceSpan(CurrentStart, CurrentSymbol.Content.Length), + new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive, Resources.ErrorComponent_Newline)); } @@ -1816,12 +1816,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy ParseDirectiveBlock(descriptor, parseChildren: (startingBraceLocation) => { NextToken(); - Balance(BalancingModes.NoErrorOnFailure, CSharpSymbolType.LeftBrace, CSharpSymbolType.RightBrace, startingBraceLocation); + Balance(BalancingModes.NoErrorOnFailure, CSharpTokenType.LeftBrace, CSharpTokenType.RightBrace, startingBraceLocation); Span.ChunkGenerator = new StatementChunkGenerator(); var existingEditHandler = Span.EditHandler; Span.EditHandler = new CodeBlockEditHandler(Language.TokenizeString); - AddMarkerSymbolIfNecessary(); + AddMarkerTokenIfNecessary(); Output(SpanKindInternal.Code); @@ -1868,25 +1868,25 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy RazorDiagnosticFactory.CreateParsing_UnexpectedEOFAfterDirective( new SourceSpan(CurrentStart, contentLength: 1 /* { */), descriptor.Directive, "{")); } - else if (!At(CSharpSymbolType.LeftBrace)) + else if (!At(CSharpTokenType.LeftBrace)) { Context.ErrorSink.OnError( RazorDiagnosticFactory.CreateParsing_UnexpectedDirectiveLiteral( - new SourceSpan(CurrentStart, CurrentSymbol.Content.Length), descriptor.Directive, "{")); + new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive, "{")); } else { var editHandler = new AutoCompleteEditHandler(Language.TokenizeString, autoCompleteAtEndOfSpan: true); Span.EditHandler = editHandler; var startingBraceLocation = CurrentStart; - Accept(CurrentSymbol); + Accept(CurrentToken); Span.ChunkGenerator = SpanChunkGenerator.Null; Output(SpanKindInternal.MetaCode, AcceptedCharactersInternal.None); parseChildren(startingBraceLocation); Span.ChunkGenerator = SpanChunkGenerator.Null; - if (!Optional(CSharpSymbolType.RightBrace)) + if (!Optional(CSharpTokenType.RightBrace)) { editHandler.AutoCompleteString = "}"; Context.ErrorSink.OnError( @@ -1982,9 +1982,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Ex: @addTagHelper "*, Microsoft.AspNetCore.CoolLibrary" // ^ ^ // Start End - if (Span.Symbols.Count == 1 && (Span.Symbols[0] as CSharpSymbol)?.Type == CSharpSymbolType.StringLiteral) + if (Span.Tokens.Count == 1 && (Span.Tokens[0] as CSharpToken)?.Type == CSharpTokenType.StringLiteral) { - offset += Span.Symbols[0].Content.IndexOf(directiveText, StringComparison.Ordinal); + offset += Span.Tokens[0].Content.IndexOf(directiveText, StringComparison.Ordinal); // This is safe because inside one of these directives all of the text needs to be on the // same line. @@ -2081,8 +2081,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy [Conditional("DEBUG")] protected void AssertDirective(string directive) { - Debug.Assert(CurrentSymbol.Type == CSharpSymbolType.Identifier || CurrentSymbol.Type == CSharpSymbolType.Keyword); - Debug.Assert(string.Equals(CurrentSymbol.Content, directive, StringComparison.Ordinal)); + Debug.Assert(CurrentToken.Type == CSharpTokenType.Identifier || CurrentToken.Type == CSharpTokenType.Keyword); + Debug.Assert(string.Equals(CurrentToken.Content, directive, StringComparison.Ordinal)); } private void TagHelperDirective(string keyword, Func, ISpanChunkGenerator> chunkGeneratorFactory) @@ -2108,18 +2108,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var keywordLength = Span.End.AbsoluteIndex - Span.Start.AbsoluteIndex; - var foundWhitespace = At(CSharpSymbolType.WhiteSpace); + var foundWhitespace = At(CSharpTokenType.WhiteSpace); // If we found whitespace then any content placed within the whitespace MAY cause a destructive change // to the document. We can't accept it. var acceptedCharacters = foundWhitespace ? AcceptedCharactersInternal.None : AcceptedCharactersInternal.AnyExceptNewline; Output(SpanKindInternal.MetaCode, acceptedCharacters); - AcceptWhile(CSharpSymbolType.WhiteSpace); + AcceptWhile(CSharpTokenType.WhiteSpace); Span.ChunkGenerator = SpanChunkGenerator.Null; Output(SpanKindInternal.Markup, acceptedCharacters); - if (EndOfFile || At(CSharpSymbolType.NewLine)) + if (EndOfFile || At(CSharpTokenType.NewLine)) { Context.ErrorSink.OnError( RazorDiagnosticFactory.CreateParsing_DirectiveMustHaveValue( @@ -2134,10 +2134,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Parse to the end of the line. Essentially accepts anything until end of line, comments, invalid code // etc. - AcceptUntil(CSharpSymbolType.NewLine); + AcceptUntil(CSharpTokenType.NewLine); // Pull out the value and remove whitespaces and optional quotes - var rawValue = string.Concat(Span.Symbols.Select(s => s.Content)).Trim(); + var rawValue = string.Concat(Span.Tokens.Select(s => s.Content)).Trim(); var startsWithQuote = rawValue.StartsWith("\"", StringComparison.Ordinal); var endsWithQuote = rawValue.EndsWith("\"", StringComparison.Ordinal); @@ -2170,21 +2170,21 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Start = start; } - public Block(CSharpSymbol symbol, SourceLocation start) - : this(GetName(symbol), start) + public Block(CSharpToken token, SourceLocation start) + : this(GetName(token), start) { } public string Name { get; set; } public SourceLocation Start { get; set; } - private static string GetName(CSharpSymbol sym) + private static string GetName(CSharpToken token) { - if (sym.Type == CSharpSymbolType.Keyword) + if (token.Type == CSharpTokenType.Keyword) { - return CSharpLanguageCharacteristics.GetKeyword(sym.Keyword.Value); + return CSharpLanguageCharacteristics.GetKeyword(token.Keyword.Value); } - return sym.Content; + return token.Content; } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpLanguageCharacteristics.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpLanguageCharacteristics.cs index 44ce3a89ce..70d4bfeda1 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpLanguageCharacteristics.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpLanguageCharacteristics.cs @@ -6,61 +6,61 @@ using System.Diagnostics; namespace Microsoft.AspNetCore.Razor.Language.Legacy { - internal class CSharpLanguageCharacteristics : LanguageCharacteristics + internal class CSharpLanguageCharacteristics : LanguageCharacteristics { private static readonly CSharpLanguageCharacteristics _instance = new CSharpLanguageCharacteristics(); - private static Dictionary _symbolSamples = new Dictionary() + private static Dictionary _tokenSamples = new Dictionary() { - { CSharpSymbolType.Arrow, "->" }, - { CSharpSymbolType.Minus, "-" }, - { CSharpSymbolType.Decrement, "--" }, - { CSharpSymbolType.MinusAssign, "-=" }, - { CSharpSymbolType.NotEqual, "!=" }, - { CSharpSymbolType.Not, "!" }, - { CSharpSymbolType.Modulo, "%" }, - { CSharpSymbolType.ModuloAssign, "%=" }, - { CSharpSymbolType.AndAssign, "&=" }, - { CSharpSymbolType.And, "&" }, - { CSharpSymbolType.DoubleAnd, "&&" }, - { CSharpSymbolType.LeftParenthesis, "(" }, - { CSharpSymbolType.RightParenthesis, ")" }, - { CSharpSymbolType.Star, "*" }, - { CSharpSymbolType.MultiplyAssign, "*=" }, - { CSharpSymbolType.Comma, "," }, - { CSharpSymbolType.Dot, "." }, - { CSharpSymbolType.Slash, "/" }, - { CSharpSymbolType.DivideAssign, "/=" }, - { CSharpSymbolType.DoubleColon, "::" }, - { CSharpSymbolType.Colon, ":" }, - { CSharpSymbolType.Semicolon, ";" }, - { CSharpSymbolType.QuestionMark, "?" }, - { CSharpSymbolType.NullCoalesce, "??" }, - { CSharpSymbolType.RightBracket, "]" }, - { CSharpSymbolType.LeftBracket, "[" }, - { CSharpSymbolType.XorAssign, "^=" }, - { CSharpSymbolType.Xor, "^" }, - { CSharpSymbolType.LeftBrace, "{" }, - { CSharpSymbolType.OrAssign, "|=" }, - { CSharpSymbolType.DoubleOr, "||" }, - { CSharpSymbolType.Or, "|" }, - { CSharpSymbolType.RightBrace, "}" }, - { CSharpSymbolType.Tilde, "~" }, - { CSharpSymbolType.Plus, "+" }, - { CSharpSymbolType.PlusAssign, "+=" }, - { CSharpSymbolType.Increment, "++" }, - { CSharpSymbolType.LessThan, "<" }, - { CSharpSymbolType.LessThanEqual, "<=" }, - { CSharpSymbolType.LeftShift, "<<" }, - { CSharpSymbolType.LeftShiftAssign, "<<=" }, - { CSharpSymbolType.Assign, "=" }, - { CSharpSymbolType.Equals, "==" }, - { CSharpSymbolType.GreaterThan, ">" }, - { CSharpSymbolType.GreaterThanEqual, ">=" }, - { CSharpSymbolType.RightShift, ">>" }, - { CSharpSymbolType.RightShiftAssign, ">>=" }, - { CSharpSymbolType.Hash, "#" }, - { CSharpSymbolType.Transition, "@" }, + { CSharpTokenType.Arrow, "->" }, + { CSharpTokenType.Minus, "-" }, + { CSharpTokenType.Decrement, "--" }, + { CSharpTokenType.MinusAssign, "-=" }, + { CSharpTokenType.NotEqual, "!=" }, + { CSharpTokenType.Not, "!" }, + { CSharpTokenType.Modulo, "%" }, + { CSharpTokenType.ModuloAssign, "%=" }, + { CSharpTokenType.AndAssign, "&=" }, + { CSharpTokenType.And, "&" }, + { CSharpTokenType.DoubleAnd, "&&" }, + { CSharpTokenType.LeftParenthesis, "(" }, + { CSharpTokenType.RightParenthesis, ")" }, + { CSharpTokenType.Star, "*" }, + { CSharpTokenType.MultiplyAssign, "*=" }, + { CSharpTokenType.Comma, "," }, + { CSharpTokenType.Dot, "." }, + { CSharpTokenType.Slash, "/" }, + { CSharpTokenType.DivideAssign, "/=" }, + { CSharpTokenType.DoubleColon, "::" }, + { CSharpTokenType.Colon, ":" }, + { CSharpTokenType.Semicolon, ";" }, + { CSharpTokenType.QuestionMark, "?" }, + { CSharpTokenType.NullCoalesce, "??" }, + { CSharpTokenType.RightBracket, "]" }, + { CSharpTokenType.LeftBracket, "[" }, + { CSharpTokenType.XorAssign, "^=" }, + { CSharpTokenType.Xor, "^" }, + { CSharpTokenType.LeftBrace, "{" }, + { CSharpTokenType.OrAssign, "|=" }, + { CSharpTokenType.DoubleOr, "||" }, + { CSharpTokenType.Or, "|" }, + { CSharpTokenType.RightBrace, "}" }, + { CSharpTokenType.Tilde, "~" }, + { CSharpTokenType.Plus, "+" }, + { CSharpTokenType.PlusAssign, "+=" }, + { CSharpTokenType.Increment, "++" }, + { CSharpTokenType.LessThan, "<" }, + { CSharpTokenType.LessThanEqual, "<=" }, + { CSharpTokenType.LeftShift, "<<" }, + { CSharpTokenType.LeftShiftAssign, "<<=" }, + { CSharpTokenType.Assign, "=" }, + { CSharpTokenType.Equals, "==" }, + { CSharpTokenType.GreaterThan, ">" }, + { CSharpTokenType.GreaterThanEqual, ">=" }, + { CSharpTokenType.RightShift, ">>" }, + { CSharpTokenType.RightShiftAssign, ">>=" }, + { CSharpTokenType.Hash, "#" }, + { CSharpTokenType.Transition, "@" }, }; protected CSharpLanguageCharacteristics() @@ -74,96 +74,96 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return new CSharpTokenizer(source); } - protected override CSharpSymbol CreateSymbol(string content, CSharpSymbolType type, IReadOnlyList errors) + protected override CSharpToken CreateToken(string content, CSharpTokenType type, IReadOnlyList errors) { - return new CSharpSymbol(content, type, errors); + return new CSharpToken(content, type, errors); } - public override string GetSample(CSharpSymbolType type) + public override string GetSample(CSharpTokenType type) { string sample; - if (!_symbolSamples.TryGetValue(type, out sample)) + if (!_tokenSamples.TryGetValue(type, out sample)) { switch (type) { - case CSharpSymbolType.Identifier: - return Resources.CSharpSymbol_Identifier; - case CSharpSymbolType.Keyword: - return Resources.CSharpSymbol_Keyword; - case CSharpSymbolType.IntegerLiteral: - return Resources.CSharpSymbol_IntegerLiteral; - case CSharpSymbolType.NewLine: - return Resources.CSharpSymbol_Newline; - case CSharpSymbolType.WhiteSpace: - return Resources.CSharpSymbol_Whitespace; - case CSharpSymbolType.Comment: - return Resources.CSharpSymbol_Comment; - case CSharpSymbolType.RealLiteral: - return Resources.CSharpSymbol_RealLiteral; - case CSharpSymbolType.CharacterLiteral: - return Resources.CSharpSymbol_CharacterLiteral; - case CSharpSymbolType.StringLiteral: - return Resources.CSharpSymbol_StringLiteral; + case CSharpTokenType.Identifier: + return Resources.CSharpToken_Identifier; + case CSharpTokenType.Keyword: + return Resources.CSharpToken_Keyword; + case CSharpTokenType.IntegerLiteral: + return Resources.CSharpToken_IntegerLiteral; + case CSharpTokenType.NewLine: + return Resources.CSharpToken_Newline; + case CSharpTokenType.WhiteSpace: + return Resources.CSharpToken_Whitespace; + case CSharpTokenType.Comment: + return Resources.CSharpToken_Comment; + case CSharpTokenType.RealLiteral: + return Resources.CSharpToken_RealLiteral; + case CSharpTokenType.CharacterLiteral: + return Resources.CSharpToken_CharacterLiteral; + case CSharpTokenType.StringLiteral: + return Resources.CSharpToken_StringLiteral; default: - return Resources.Symbol_Unknown; + return Resources.Token_Unknown; } } return sample; } - public override CSharpSymbol CreateMarkerSymbol() + public override CSharpToken CreateMarkerToken() { - return new CSharpSymbol(string.Empty, CSharpSymbolType.Unknown); + return new CSharpToken(string.Empty, CSharpTokenType.Unknown); } - public override CSharpSymbolType GetKnownSymbolType(KnownSymbolType type) + public override CSharpTokenType GetKnownTokenType(KnownTokenType type) { switch (type) { - case KnownSymbolType.Identifier: - return CSharpSymbolType.Identifier; - case KnownSymbolType.Keyword: - return CSharpSymbolType.Keyword; - case KnownSymbolType.NewLine: - return CSharpSymbolType.NewLine; - case KnownSymbolType.WhiteSpace: - return CSharpSymbolType.WhiteSpace; - case KnownSymbolType.Transition: - return CSharpSymbolType.Transition; - case KnownSymbolType.CommentStart: - return CSharpSymbolType.RazorCommentTransition; - case KnownSymbolType.CommentStar: - return CSharpSymbolType.RazorCommentStar; - case KnownSymbolType.CommentBody: - return CSharpSymbolType.RazorComment; + case KnownTokenType.Identifier: + return CSharpTokenType.Identifier; + case KnownTokenType.Keyword: + return CSharpTokenType.Keyword; + case KnownTokenType.NewLine: + return CSharpTokenType.NewLine; + case KnownTokenType.WhiteSpace: + return CSharpTokenType.WhiteSpace; + case KnownTokenType.Transition: + return CSharpTokenType.Transition; + case KnownTokenType.CommentStart: + return CSharpTokenType.RazorCommentTransition; + case KnownTokenType.CommentStar: + return CSharpTokenType.RazorCommentStar; + case KnownTokenType.CommentBody: + return CSharpTokenType.RazorComment; default: - return CSharpSymbolType.Unknown; + return CSharpTokenType.Unknown; } } - public override CSharpSymbolType FlipBracket(CSharpSymbolType bracket) + public override CSharpTokenType FlipBracket(CSharpTokenType bracket) { switch (bracket) { - case CSharpSymbolType.LeftBrace: - return CSharpSymbolType.RightBrace; - case CSharpSymbolType.LeftBracket: - return CSharpSymbolType.RightBracket; - case CSharpSymbolType.LeftParenthesis: - return CSharpSymbolType.RightParenthesis; - case CSharpSymbolType.LessThan: - return CSharpSymbolType.GreaterThan; - case CSharpSymbolType.RightBrace: - return CSharpSymbolType.LeftBrace; - case CSharpSymbolType.RightBracket: - return CSharpSymbolType.LeftBracket; - case CSharpSymbolType.RightParenthesis: - return CSharpSymbolType.LeftParenthesis; - case CSharpSymbolType.GreaterThan: - return CSharpSymbolType.LessThan; + case CSharpTokenType.LeftBrace: + return CSharpTokenType.RightBrace; + case CSharpTokenType.LeftBracket: + return CSharpTokenType.RightBracket; + case CSharpTokenType.LeftParenthesis: + return CSharpTokenType.RightParenthesis; + case CSharpTokenType.LessThan: + return CSharpTokenType.GreaterThan; + case CSharpTokenType.RightBrace: + return CSharpTokenType.LeftBrace; + case CSharpTokenType.RightBracket: + return CSharpTokenType.LeftBracket; + case CSharpTokenType.RightParenthesis: + return CSharpTokenType.LeftParenthesis; + case CSharpTokenType.GreaterThan: + return CSharpTokenType.LessThan; default: Debug.Fail("FlipBracket must be called with a bracket character"); - return CSharpSymbolType.Unknown; + return CSharpTokenType.Unknown; } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpSymbol.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpToken.cs similarity index 83% rename from src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpSymbol.cs rename to src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpToken.cs index 21cd94915d..c928f0880e 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpSymbol.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpToken.cs @@ -6,11 +6,11 @@ using System.Collections.Generic; namespace Microsoft.AspNetCore.Razor.Language.Legacy { - internal class CSharpSymbol : SymbolBase + internal class CSharpToken : TokenBase { - public CSharpSymbol( + public CSharpToken( string content, - CSharpSymbolType type) + CSharpTokenType type) : base(content, type, RazorDiagnostic.EmptyArray) { if (content == null) @@ -19,9 +19,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } } - public CSharpSymbol( + public CSharpToken( string content, - CSharpSymbolType type, + CSharpTokenType type, IReadOnlyList errors) : base(content, type, errors) { @@ -35,7 +35,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public override bool Equals(object obj) { - var other = obj as CSharpSymbol; + var other = obj as CSharpToken; return base.Equals(other) && other.Keyword == Keyword; } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpSymbolType.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpTokenType.cs similarity index 97% rename from src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpSymbolType.cs rename to src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpTokenType.cs index 059d7c48a6..10f3478d6d 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpSymbolType.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpTokenType.cs @@ -3,7 +3,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { - internal enum CSharpSymbolType + internal enum CSharpTokenType { Unknown, Identifier, diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpTokenizer.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpTokenizer.cs index a1943070f3..f819e98a3a 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpTokenizer.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpTokenizer.cs @@ -8,9 +8,9 @@ using System.Globalization; namespace Microsoft.AspNetCore.Razor.Language.Legacy { - internal class CSharpTokenizer : Tokenizer + internal class CSharpTokenizer : Tokenizer { - private Dictionary> _operatorHandlers; + private Dictionary> _operatorHandlers; private static readonly Dictionary _keywords = new Dictionary(StringComparer.Ordinal) { @@ -100,31 +100,31 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { base.CurrentState = StartState; - _operatorHandlers = new Dictionary>() + _operatorHandlers = new Dictionary>() { { '-', MinusOperator }, { '<', LessThanOperator }, { '>', GreaterThanOperator }, - { '&', CreateTwoCharOperatorHandler(CSharpSymbolType.And, '=', CSharpSymbolType.AndAssign, '&', CSharpSymbolType.DoubleAnd) }, - { '|', CreateTwoCharOperatorHandler(CSharpSymbolType.Or, '=', CSharpSymbolType.OrAssign, '|', CSharpSymbolType.DoubleOr) }, - { '+', CreateTwoCharOperatorHandler(CSharpSymbolType.Plus, '=', CSharpSymbolType.PlusAssign, '+', CSharpSymbolType.Increment) }, - { '=', CreateTwoCharOperatorHandler(CSharpSymbolType.Assign, '=', CSharpSymbolType.Equals, '>', CSharpSymbolType.GreaterThanEqual) }, - { '!', CreateTwoCharOperatorHandler(CSharpSymbolType.Not, '=', CSharpSymbolType.NotEqual) }, - { '%', CreateTwoCharOperatorHandler(CSharpSymbolType.Modulo, '=', CSharpSymbolType.ModuloAssign) }, - { '*', CreateTwoCharOperatorHandler(CSharpSymbolType.Star, '=', CSharpSymbolType.MultiplyAssign) }, - { ':', CreateTwoCharOperatorHandler(CSharpSymbolType.Colon, ':', CSharpSymbolType.DoubleColon) }, - { '?', CreateTwoCharOperatorHandler(CSharpSymbolType.QuestionMark, '?', CSharpSymbolType.NullCoalesce) }, - { '^', CreateTwoCharOperatorHandler(CSharpSymbolType.Xor, '=', CSharpSymbolType.XorAssign) }, - { '(', () => CSharpSymbolType.LeftParenthesis }, - { ')', () => CSharpSymbolType.RightParenthesis }, - { '{', () => CSharpSymbolType.LeftBrace }, - { '}', () => CSharpSymbolType.RightBrace }, - { '[', () => CSharpSymbolType.LeftBracket }, - { ']', () => CSharpSymbolType.RightBracket }, - { ',', () => CSharpSymbolType.Comma }, - { ';', () => CSharpSymbolType.Semicolon }, - { '~', () => CSharpSymbolType.Tilde }, - { '#', () => CSharpSymbolType.Hash } + { '&', CreateTwoCharOperatorHandler(CSharpTokenType.And, '=', CSharpTokenType.AndAssign, '&', CSharpTokenType.DoubleAnd) }, + { '|', CreateTwoCharOperatorHandler(CSharpTokenType.Or, '=', CSharpTokenType.OrAssign, '|', CSharpTokenType.DoubleOr) }, + { '+', CreateTwoCharOperatorHandler(CSharpTokenType.Plus, '=', CSharpTokenType.PlusAssign, '+', CSharpTokenType.Increment) }, + { '=', CreateTwoCharOperatorHandler(CSharpTokenType.Assign, '=', CSharpTokenType.Equals, '>', CSharpTokenType.GreaterThanEqual) }, + { '!', CreateTwoCharOperatorHandler(CSharpTokenType.Not, '=', CSharpTokenType.NotEqual) }, + { '%', CreateTwoCharOperatorHandler(CSharpTokenType.Modulo, '=', CSharpTokenType.ModuloAssign) }, + { '*', CreateTwoCharOperatorHandler(CSharpTokenType.Star, '=', CSharpTokenType.MultiplyAssign) }, + { ':', CreateTwoCharOperatorHandler(CSharpTokenType.Colon, ':', CSharpTokenType.DoubleColon) }, + { '?', CreateTwoCharOperatorHandler(CSharpTokenType.QuestionMark, '?', CSharpTokenType.NullCoalesce) }, + { '^', CreateTwoCharOperatorHandler(CSharpTokenType.Xor, '=', CSharpTokenType.XorAssign) }, + { '(', () => CSharpTokenType.LeftParenthesis }, + { ')', () => CSharpTokenType.RightParenthesis }, + { '{', () => CSharpTokenType.LeftBrace }, + { '}', () => CSharpTokenType.RightBrace }, + { '[', () => CSharpTokenType.LeftBracket }, + { ']', () => CSharpTokenType.RightBracket }, + { ',', () => CSharpTokenType.Comma }, + { ';', () => CSharpTokenType.Semicolon }, + { '~', () => CSharpTokenType.Tilde }, + { '#', () => CSharpTokenType.Hash } }; } @@ -132,11 +132,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private new CSharpTokenizerState? CurrentState => (CSharpTokenizerState?)base.CurrentState; - public override CSharpSymbolType RazorCommentType => CSharpSymbolType.RazorComment; + public override CSharpTokenType RazorCommentType => CSharpTokenType.RazorComment; - public override CSharpSymbolType RazorCommentTransitionType => CSharpSymbolType.RazorCommentTransition; + public override CSharpTokenType RazorCommentTransitionType => CSharpTokenType.RazorCommentTransition; - public override CSharpSymbolType RazorCommentStarType => CSharpSymbolType.RazorCommentStar; + public override CSharpTokenType RazorCommentStarType => CSharpTokenType.RazorCommentStar; protected override StateResult Dispatch() { @@ -160,8 +160,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return RazorCommentBody(); case CSharpTokenizerState.StarAfterRazorCommentBody: return StarAfterRazorCommentBody(); - case CSharpTokenizerState.AtSymbolAfterRazorCommentBody: - return AtSymbolAfterRazorCommentBody(); + case CSharpTokenizerState.AtTokenAfterRazorCommentBody: + return AtTokenAfterRazorCommentBody(); default: Debug.Fail("Invalid TokenizerState"); return default(StateResult); @@ -169,15 +169,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } // Optimize memory allocation by returning constants for the most frequent cases - protected override string GetSymbolContent(CSharpSymbolType type) + protected override string GetTokenContent(CSharpTokenType type) { - var symbolLength = Buffer.Length; + var tokenLength = Buffer.Length; - if (symbolLength == 1) + if (tokenLength == 1) { switch (type) { - case CSharpSymbolType.IntegerLiteral: + case CSharpTokenType.IntegerLiteral: switch (Buffer[0]) { case '0': @@ -202,13 +202,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return "9"; } break; - case CSharpSymbolType.NewLine: + case CSharpTokenType.NewLine: if (Buffer[0] == '\n') { return "\n"; } break; - case CSharpSymbolType.WhiteSpace: + case CSharpTokenType.WhiteSpace: if (Buffer[0] == ' ') { return " "; @@ -218,134 +218,134 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return "\t"; } break; - case CSharpSymbolType.Minus: + case CSharpTokenType.Minus: return "-"; - case CSharpSymbolType.Not: + case CSharpTokenType.Not: return "!"; - case CSharpSymbolType.Modulo: + case CSharpTokenType.Modulo: return "%"; - case CSharpSymbolType.And: + case CSharpTokenType.And: return "&"; - case CSharpSymbolType.LeftParenthesis: + case CSharpTokenType.LeftParenthesis: return "("; - case CSharpSymbolType.RightParenthesis: + case CSharpTokenType.RightParenthesis: return ")"; - case CSharpSymbolType.Star: + case CSharpTokenType.Star: return "*"; - case CSharpSymbolType.Comma: + case CSharpTokenType.Comma: return ","; - case CSharpSymbolType.Dot: + case CSharpTokenType.Dot: return "."; - case CSharpSymbolType.Slash: + case CSharpTokenType.Slash: return "/"; - case CSharpSymbolType.Colon: + case CSharpTokenType.Colon: return ":"; - case CSharpSymbolType.Semicolon: + case CSharpTokenType.Semicolon: return ";"; - case CSharpSymbolType.QuestionMark: + case CSharpTokenType.QuestionMark: return "?"; - case CSharpSymbolType.RightBracket: + case CSharpTokenType.RightBracket: return "]"; - case CSharpSymbolType.LeftBracket: + case CSharpTokenType.LeftBracket: return "["; - case CSharpSymbolType.Xor: + case CSharpTokenType.Xor: return "^"; - case CSharpSymbolType.LeftBrace: + case CSharpTokenType.LeftBrace: return "{"; - case CSharpSymbolType.Or: + case CSharpTokenType.Or: return "|"; - case CSharpSymbolType.RightBrace: + case CSharpTokenType.RightBrace: return "}"; - case CSharpSymbolType.Tilde: + case CSharpTokenType.Tilde: return "~"; - case CSharpSymbolType.Plus: + case CSharpTokenType.Plus: return "+"; - case CSharpSymbolType.LessThan: + case CSharpTokenType.LessThan: return "<"; - case CSharpSymbolType.Assign: + case CSharpTokenType.Assign: return "="; - case CSharpSymbolType.GreaterThan: + case CSharpTokenType.GreaterThan: return ">"; - case CSharpSymbolType.Hash: + case CSharpTokenType.Hash: return "#"; - case CSharpSymbolType.Transition: + case CSharpTokenType.Transition: return "@"; } } - else if (symbolLength == 2) + else if (tokenLength == 2) { switch (type) { - case CSharpSymbolType.NewLine: + case CSharpTokenType.NewLine: return "\r\n"; - case CSharpSymbolType.Arrow: + case CSharpTokenType.Arrow: return "->"; - case CSharpSymbolType.Decrement: + case CSharpTokenType.Decrement: return "--"; - case CSharpSymbolType.MinusAssign: + case CSharpTokenType.MinusAssign: return "-="; - case CSharpSymbolType.NotEqual: + case CSharpTokenType.NotEqual: return "!="; - case CSharpSymbolType.ModuloAssign: + case CSharpTokenType.ModuloAssign: return "%="; - case CSharpSymbolType.AndAssign: + case CSharpTokenType.AndAssign: return "&="; - case CSharpSymbolType.DoubleAnd: + case CSharpTokenType.DoubleAnd: return "&&"; - case CSharpSymbolType.MultiplyAssign: + case CSharpTokenType.MultiplyAssign: return "*="; - case CSharpSymbolType.DivideAssign: + case CSharpTokenType.DivideAssign: return "/="; - case CSharpSymbolType.DoubleColon: + case CSharpTokenType.DoubleColon: return "::"; - case CSharpSymbolType.NullCoalesce: + case CSharpTokenType.NullCoalesce: return "??"; - case CSharpSymbolType.XorAssign: + case CSharpTokenType.XorAssign: return "^="; - case CSharpSymbolType.OrAssign: + case CSharpTokenType.OrAssign: return "|="; - case CSharpSymbolType.DoubleOr: + case CSharpTokenType.DoubleOr: return "||"; - case CSharpSymbolType.PlusAssign: + case CSharpTokenType.PlusAssign: return "+="; - case CSharpSymbolType.Increment: + case CSharpTokenType.Increment: return "++"; - case CSharpSymbolType.LessThanEqual: + case CSharpTokenType.LessThanEqual: return "<="; - case CSharpSymbolType.LeftShift: + case CSharpTokenType.LeftShift: return "<<"; - case CSharpSymbolType.Equals: + case CSharpTokenType.Equals: return "=="; - case CSharpSymbolType.GreaterThanEqual: + case CSharpTokenType.GreaterThanEqual: if (Buffer[0] == '=') { return "=>"; } return ">="; - case CSharpSymbolType.RightShift: + case CSharpTokenType.RightShift: return ">>"; } } - else if (symbolLength == 3) + else if (tokenLength == 3) { switch (type) { - case CSharpSymbolType.LeftShiftAssign: + case CSharpTokenType.LeftShiftAssign: return "<<="; - case CSharpSymbolType.RightShiftAssign: + case CSharpTokenType.RightShiftAssign: return ">>="; } } - return base.GetSymbolContent(type); + return base.GetTokenContent(type); } - protected override CSharpSymbol CreateSymbol(string content, CSharpSymbolType type, IReadOnlyList errors) + protected override CSharpToken CreateToken(string content, CSharpTokenType type, IReadOnlyList errors) { - return new CSharpSymbol(content, type, errors); + return new CSharpToken(content, type, errors); } private StateResult Data() @@ -359,13 +359,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { TakeCurrent(); } - return Stay(EndSymbol(CSharpSymbolType.NewLine)); + return Stay(EndToken(CSharpTokenType.NewLine)); } else if (ParserHelpers.IsWhitespace(CurrentCharacter)) { // CSharp Spec §2.3.3 TakeUntil(c => !ParserHelpers.IsWhitespace(c)); - return Stay(EndSymbol(CSharpSymbolType.WhiteSpace)); + return Stay(EndToken(CSharpTokenType.WhiteSpace)); } else if (IsIdentifierStart(CurrentCharacter)) { @@ -378,7 +378,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy switch (CurrentCharacter) { case '@': - return AtSymbol(); + return AtToken(); case '\'': TakeCurrent(); return Transition(CSharpTokenizerState.QuotedCharacterLiteral); @@ -390,7 +390,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { return RealLiteral(); } - return Stay(Single(CSharpSymbolType.Dot)); + return Stay(Single(CSharpTokenType.Dot)); case '/': TakeCurrent(); if (CurrentCharacter == '/') @@ -406,18 +406,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy else if (CurrentCharacter == '=') { TakeCurrent(); - return Stay(EndSymbol(CSharpSymbolType.DivideAssign)); + return Stay(EndToken(CSharpTokenType.DivideAssign)); } else { - return Stay(EndSymbol(CSharpSymbolType.Slash)); + return Stay(EndToken(CSharpTokenType.Slash)); } default: - return Stay(EndSymbol(Operator())); + return Stay(EndToken(Operator())); } } - private StateResult AtSymbol() + private StateResult AtToken() { TakeCurrent(); if (CurrentCharacter == '"') @@ -429,78 +429,78 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { return Transition( CSharpTokenizerState.AfterRazorCommentTransition, - EndSymbol(CSharpSymbolType.RazorCommentTransition)); + EndToken(CSharpTokenType.RazorCommentTransition)); } else if (CurrentCharacter == '@') { // Could be escaped comment transition return Transition( CSharpTokenizerState.EscapedRazorCommentTransition, - EndSymbol(CSharpSymbolType.Transition)); + EndToken(CSharpTokenType.Transition)); } - return Stay(EndSymbol(CSharpSymbolType.Transition)); + return Stay(EndToken(CSharpTokenType.Transition)); } private StateResult EscapedRazorCommentTransition() { TakeCurrent(); - return Transition(CSharpTokenizerState.Data, EndSymbol(CSharpSymbolType.Transition)); + return Transition(CSharpTokenizerState.Data, EndToken(CSharpTokenType.Transition)); } - private CSharpSymbolType Operator() + private CSharpTokenType Operator() { var first = CurrentCharacter; TakeCurrent(); - Func handler; + Func handler; if (_operatorHandlers.TryGetValue(first, out handler)) { return handler(); } - return CSharpSymbolType.Unknown; + return CSharpTokenType.Unknown; } - private CSharpSymbolType LessThanOperator() + private CSharpTokenType LessThanOperator() { if (CurrentCharacter == '=') { TakeCurrent(); - return CSharpSymbolType.LessThanEqual; + return CSharpTokenType.LessThanEqual; } - return CSharpSymbolType.LessThan; + return CSharpTokenType.LessThan; } - private CSharpSymbolType GreaterThanOperator() + private CSharpTokenType GreaterThanOperator() { if (CurrentCharacter == '=') { TakeCurrent(); - return CSharpSymbolType.GreaterThanEqual; + return CSharpTokenType.GreaterThanEqual; } - return CSharpSymbolType.GreaterThan; + return CSharpTokenType.GreaterThan; } - private CSharpSymbolType MinusOperator() + private CSharpTokenType MinusOperator() { if (CurrentCharacter == '>') { TakeCurrent(); - return CSharpSymbolType.Arrow; + return CSharpTokenType.Arrow; } else if (CurrentCharacter == '-') { TakeCurrent(); - return CSharpSymbolType.Decrement; + return CSharpTokenType.Decrement; } else if (CurrentCharacter == '=') { TakeCurrent(); - return CSharpSymbolType.MinusAssign; + return CSharpTokenType.MinusAssign; } - return CSharpSymbolType.Minus; + return CSharpTokenType.Minus; } - private Func CreateTwoCharOperatorHandler(CSharpSymbolType typeIfOnlyFirst, char second, CSharpSymbolType typeIfBoth) + private Func CreateTwoCharOperatorHandler(CSharpTokenType typeIfOnlyFirst, char second, CSharpTokenType typeIfBoth) { return () => { @@ -513,7 +513,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy }; } - private Func CreateTwoCharOperatorHandler(CSharpSymbolType typeIfOnlyFirst, char option1, CSharpSymbolType typeIfOption1, char option2, CSharpSymbolType typeIfOption2) + private Func CreateTwoCharOperatorHandler(CSharpTokenType typeIfOnlyFirst, char option1, CSharpTokenType typeIfOption1, char option2, CSharpTokenType typeIfOption2) { return () => { @@ -550,14 +550,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy RazorDiagnosticFactory.CreateParsing_UnterminatedStringLiteral( new SourceSpan(CurrentStart, contentLength: 1 /* end of file */))); } - return Transition(CSharpTokenizerState.Data, EndSymbol(CSharpSymbolType.StringLiteral)); + return Transition(CSharpTokenizerState.Data, EndToken(CSharpTokenType.StringLiteral)); } - private StateResult QuotedCharacterLiteral() => QuotedLiteral('\'', CSharpSymbolType.CharacterLiteral); + private StateResult QuotedCharacterLiteral() => QuotedLiteral('\'', CSharpTokenType.CharacterLiteral); - private StateResult QuotedStringLiteral() => QuotedLiteral('\"', CSharpSymbolType.StringLiteral); + private StateResult QuotedStringLiteral() => QuotedLiteral('\"', CSharpTokenType.StringLiteral); - private StateResult QuotedLiteral(char quote, CSharpSymbolType literalType) + private StateResult QuotedLiteral(char quote, CSharpTokenType literalType) { TakeUntil(c => c == '\\' || c == quote || ParserHelpers.IsNewLine(c)); if (CurrentCharacter == '\\') @@ -581,7 +581,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { TakeCurrent(); // No-op if at EOF } - return Transition(CSharpTokenizerState.Data, EndSymbol(literalType)); + return Transition(CSharpTokenizerState.Data, EndToken(literalType)); } // CSharp Spec §2.3.2 @@ -594,7 +594,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy RazorDiagnosticFactory.CreateParsing_BlockCommentNotTerminated( new SourceSpan(CurrentStart, contentLength: 1 /* end of file */))); - return Transition(CSharpTokenizerState.Data, EndSymbol(CSharpSymbolType.Comment)); + return Transition(CSharpTokenizerState.Data, EndToken(CSharpTokenType.Comment)); } if (CurrentCharacter == '*') { @@ -602,7 +602,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy if (CurrentCharacter == '/') { TakeCurrent(); - return Transition(CSharpTokenizerState.Data, EndSymbol(CSharpSymbolType.Comment)); + return Transition(CSharpTokenizerState.Data, EndToken(CSharpTokenType.Comment)); } } return Stay(); @@ -612,7 +612,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private StateResult SingleLineComment() { TakeUntil(c => ParserHelpers.IsNewLine(c)); - return Stay(EndSymbol(CSharpSymbolType.Comment)); + return Stay(EndToken(CSharpTokenType.Comment)); } // CSharp Spec §2.4.4 @@ -632,7 +632,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { TakeUntil(c => !IsHexDigit(c)); TakeIntegerSuffix(); - return Stay(EndSymbol(CSharpSymbolType.IntegerLiteral)); + return Stay(EndToken(CSharpTokenType.IntegerLiteral)); } private StateResult DecimalLiteral() @@ -650,7 +650,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy else { TakeIntegerSuffix(); - return Stay(EndSymbol(CSharpSymbolType.IntegerLiteral)); + return Stay(EndToken(CSharpTokenType.IntegerLiteral)); } } @@ -669,7 +669,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { TakeCurrent(); } - return Stay(EndSymbol(CSharpSymbolType.RealLiteral)); + return Stay(EndToken(CSharpTokenType.RealLiteral)); } // CSharp Spec §2.4.4.3 @@ -708,27 +708,27 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Debug.Assert(IsIdentifierStart(CurrentCharacter)); TakeCurrent(); TakeUntil(c => !IsIdentifierPart(c)); - CSharpSymbol symbol = null; + CSharpToken token = null; if (HaveContent) { CSharpKeyword keyword; - var type = CSharpSymbolType.Identifier; - var symbolContent = Buffer.ToString(); - if (_keywords.TryGetValue(symbolContent, out keyword)) + var type = CSharpTokenType.Identifier; + var tokenContent = Buffer.ToString(); + if (_keywords.TryGetValue(tokenContent, out keyword)) { - type = CSharpSymbolType.Keyword; + type = CSharpTokenType.Keyword; } - symbol = new CSharpSymbol(symbolContent, type) + token = new CSharpToken(tokenContent, type) { - Keyword = type == CSharpSymbolType.Keyword ? (CSharpKeyword?)keyword : null, + Keyword = type == CSharpTokenType.Keyword ? (CSharpKeyword?)keyword : null, }; Buffer.Clear(); CurrentErrors.Clear(); } - return Stay(symbol); + return Stay(token); } private StateResult Transition(CSharpTokenizerState state) @@ -736,7 +736,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return Transition((int)state, result: null); } - private StateResult Transition(CSharpTokenizerState state, CSharpSymbol result) + private StateResult Transition(CSharpTokenizerState state, CSharpToken result) { return Transition((int)state, result); } @@ -793,7 +793,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy EscapedRazorCommentTransition = RazorCommentTokenizerState.EscapedRazorCommentTransition, RazorCommentBody = RazorCommentTokenizerState.RazorCommentBody, StarAfterRazorCommentBody = RazorCommentTokenizerState.StarAfterRazorCommentBody, - AtSymbolAfterRazorCommentBody = RazorCommentTokenizerState.AtSymbolAfterRazorCommentBody, + AtTokenAfterRazorCommentBody = RazorCommentTokenizerState.AtTokenAfterRazorCommentBody, } } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/CodeBlockEditHandler.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/CodeBlockEditHandler.cs index 0430388d81..d5ce71c43e 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/CodeBlockEditHandler.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/CodeBlockEditHandler.cs @@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { internal class CodeBlockEditHandler : SpanEditHandler { - public CodeBlockEditHandler(Func> tokenizer) : base(tokenizer) + public CodeBlockEditHandler(Func> tokenizer) : base(tokenizer) { } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveCSharpTokenizer.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveCSharpTokenizer.cs index d9507e8522..a9befaa302 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveCSharpTokenizer.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveCSharpTokenizer.cs @@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { _visitedFirstTokenStart = true; } - else if (result.Result != null && _visitedFirstTokenStart && result.Result.Type == CSharpSymbolType.NewLine) + else if (result.Result != null && _visitedFirstTokenStart && result.Result.Type == CSharpTokenType.NewLine) { _visitedFirstTokenLineEnd = true; } @@ -29,34 +29,34 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return result; } - public override CSharpSymbol NextSymbol() + public override CSharpToken NextToken() { // Post-Condition: Buffer should be empty at the start of Next() Debug.Assert(Buffer.Length == 0); - StartSymbol(); + StartToken(); if (EndOfFile || (_visitedFirstTokenStart && _visitedFirstTokenLineEnd)) { return null; } - var symbol = Turn(); + var token = Turn(); // Post-Condition: Buffer should be empty at the end of Next() Debug.Assert(Buffer.Length == 0); - return symbol; + return token; } - private bool IsValidTokenType(CSharpSymbolType type) + private bool IsValidTokenType(CSharpTokenType type) { - return type != CSharpSymbolType.WhiteSpace && - type != CSharpSymbolType.NewLine && - type != CSharpSymbolType.Comment && - type != CSharpSymbolType.RazorComment && - type != CSharpSymbolType.RazorCommentStar && - type != CSharpSymbolType.RazorCommentTransition && - type != CSharpSymbolType.Transition; + return type != CSharpTokenType.WhiteSpace && + type != CSharpTokenType.NewLine && + type != CSharpTokenType.Comment && + type != CSharpTokenType.RazorComment && + type != CSharpTokenType.RazorCommentStar && + type != CSharpTokenType.RazorCommentTransition && + type != CSharpTokenType.Transition; } } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveHtmlTokenizer.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveHtmlTokenizer.cs index 5e52dd6ade..034977c758 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveHtmlTokenizer.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/DirectiveHtmlTokenizer.cs @@ -24,33 +24,33 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return result; } - public override HtmlSymbol NextSymbol() + public override HtmlToken NextToken() { // Post-Condition: Buffer should be empty at the start of Next() Debug.Assert(Buffer.Length == 0); - StartSymbol(); + StartToken(); if (EndOfFile || _visitedFirstTokenStart) { return null; } - var symbol = Turn(); + var token = Turn(); // Post-Condition: Buffer should be empty at the end of Next() Debug.Assert(Buffer.Length == 0); - return symbol; + return token; } - private bool IsValidTokenType(HtmlSymbolType type) + private bool IsValidTokenType(HtmlTokenType type) { - return type != HtmlSymbolType.WhiteSpace && - type != HtmlSymbolType.NewLine && - type != HtmlSymbolType.RazorComment && - type != HtmlSymbolType.RazorCommentStar && - type != HtmlSymbolType.RazorCommentTransition && - type != HtmlSymbolType.Transition; + return type != HtmlTokenType.WhiteSpace && + type != HtmlTokenType.NewLine && + type != HtmlTokenType.RazorComment && + type != HtmlTokenType.RazorCommentStar && + type != HtmlTokenType.RazorCommentTransition && + type != HtmlTokenType.Transition; } } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlLanguageCharacteristics.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlLanguageCharacteristics.cs index cc44a34368..096ae84dc0 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlLanguageCharacteristics.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlLanguageCharacteristics.cs @@ -6,7 +6,7 @@ using System.Diagnostics; namespace Microsoft.AspNetCore.Razor.Language.Legacy { - internal class HtmlLanguageCharacteristics : LanguageCharacteristics + internal class HtmlLanguageCharacteristics : LanguageCharacteristics { private static readonly HtmlLanguageCharacteristics _instance = new HtmlLanguageCharacteristics(); @@ -19,50 +19,50 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy get { return _instance; } } - public override string GetSample(HtmlSymbolType type) + public override string GetSample(HtmlTokenType type) { switch (type) { - case HtmlSymbolType.Text: - return Resources.HtmlSymbol_Text; - case HtmlSymbolType.WhiteSpace: - return Resources.HtmlSymbol_WhiteSpace; - case HtmlSymbolType.NewLine: - return Resources.HtmlSymbol_NewLine; - case HtmlSymbolType.OpenAngle: + case HtmlTokenType.Text: + return Resources.HtmlToken_Text; + case HtmlTokenType.WhiteSpace: + return Resources.HtmlToken_WhiteSpace; + case HtmlTokenType.NewLine: + return Resources.HtmlToken_NewLine; + case HtmlTokenType.OpenAngle: return "<"; - case HtmlSymbolType.Bang: + case HtmlTokenType.Bang: return "!"; - case HtmlSymbolType.ForwardSlash: + case HtmlTokenType.ForwardSlash: return "/"; - case HtmlSymbolType.QuestionMark: + case HtmlTokenType.QuestionMark: return "?"; - case HtmlSymbolType.DoubleHyphen: + case HtmlTokenType.DoubleHyphen: return "--"; - case HtmlSymbolType.LeftBracket: + case HtmlTokenType.LeftBracket: return "["; - case HtmlSymbolType.CloseAngle: + case HtmlTokenType.CloseAngle: return ">"; - case HtmlSymbolType.RightBracket: + case HtmlTokenType.RightBracket: return "]"; - case HtmlSymbolType.Equals: + case HtmlTokenType.Equals: return "="; - case HtmlSymbolType.DoubleQuote: + case HtmlTokenType.DoubleQuote: return "\""; - case HtmlSymbolType.SingleQuote: + case HtmlTokenType.SingleQuote: return "'"; - case HtmlSymbolType.Transition: + case HtmlTokenType.Transition: return "@"; - case HtmlSymbolType.Colon: + case HtmlTokenType.Colon: return ":"; - case HtmlSymbolType.RazorComment: - return Resources.HtmlSymbol_RazorComment; - case HtmlSymbolType.RazorCommentStar: + case HtmlTokenType.RazorComment: + return Resources.HtmlToken_RazorComment; + case HtmlTokenType.RazorCommentStar: return "*"; - case HtmlSymbolType.RazorCommentTransition: + case HtmlTokenType.RazorCommentTransition: return "@"; default: - return Resources.Symbol_Unknown; + return Resources.Token_Unknown; } } @@ -71,57 +71,57 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return new HtmlTokenizer(source); } - public override HtmlSymbolType FlipBracket(HtmlSymbolType bracket) + public override HtmlTokenType FlipBracket(HtmlTokenType bracket) { switch (bracket) { - case HtmlSymbolType.LeftBracket: - return HtmlSymbolType.RightBracket; - case HtmlSymbolType.OpenAngle: - return HtmlSymbolType.CloseAngle; - case HtmlSymbolType.RightBracket: - return HtmlSymbolType.LeftBracket; - case HtmlSymbolType.CloseAngle: - return HtmlSymbolType.OpenAngle; + case HtmlTokenType.LeftBracket: + return HtmlTokenType.RightBracket; + case HtmlTokenType.OpenAngle: + return HtmlTokenType.CloseAngle; + case HtmlTokenType.RightBracket: + return HtmlTokenType.LeftBracket; + case HtmlTokenType.CloseAngle: + return HtmlTokenType.OpenAngle; default: Debug.Fail("FlipBracket must be called with a bracket character"); - return HtmlSymbolType.Unknown; + return HtmlTokenType.Unknown; } } - public override HtmlSymbol CreateMarkerSymbol() + public override HtmlToken CreateMarkerToken() { - return new HtmlSymbol(string.Empty, HtmlSymbolType.Unknown); + return new HtmlToken(string.Empty, HtmlTokenType.Unknown); } - public override HtmlSymbolType GetKnownSymbolType(KnownSymbolType type) + public override HtmlTokenType GetKnownTokenType(KnownTokenType type) { switch (type) { - case KnownSymbolType.CommentStart: - return HtmlSymbolType.RazorCommentTransition; - case KnownSymbolType.CommentStar: - return HtmlSymbolType.RazorCommentStar; - case KnownSymbolType.CommentBody: - return HtmlSymbolType.RazorComment; - case KnownSymbolType.Identifier: - return HtmlSymbolType.Text; - case KnownSymbolType.Keyword: - return HtmlSymbolType.Text; - case KnownSymbolType.NewLine: - return HtmlSymbolType.NewLine; - case KnownSymbolType.Transition: - return HtmlSymbolType.Transition; - case KnownSymbolType.WhiteSpace: - return HtmlSymbolType.WhiteSpace; + case KnownTokenType.CommentStart: + return HtmlTokenType.RazorCommentTransition; + case KnownTokenType.CommentStar: + return HtmlTokenType.RazorCommentStar; + case KnownTokenType.CommentBody: + return HtmlTokenType.RazorComment; + case KnownTokenType.Identifier: + return HtmlTokenType.Text; + case KnownTokenType.Keyword: + return HtmlTokenType.Text; + case KnownTokenType.NewLine: + return HtmlTokenType.NewLine; + case KnownTokenType.Transition: + return HtmlTokenType.Transition; + case KnownTokenType.WhiteSpace: + return HtmlTokenType.WhiteSpace; default: - return HtmlSymbolType.Unknown; + return HtmlTokenType.Unknown; } } - protected override HtmlSymbol CreateSymbol(string content, HtmlSymbolType type, IReadOnlyList errors) + protected override HtmlToken CreateToken(string content, HtmlTokenType type, IReadOnlyList errors) { - return new HtmlSymbol(content, type, errors); + return new HtmlToken(content, type, errors); } } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlMarkupParser.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlMarkupParser.cs index d038f58cc5..cbf0c1021a 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlMarkupParser.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlMarkupParser.cs @@ -8,16 +8,16 @@ using System.Linq; namespace Microsoft.AspNetCore.Razor.Language.Legacy { - internal class HtmlMarkupParser : TokenizerBackedParser + internal class HtmlMarkupParser : TokenizerBackedParser { private const string ScriptTagName = "script"; - private static readonly HtmlSymbol[] nonAllowedHtmlCommentEnding = new[] { HtmlSymbol.Hyphen, new HtmlSymbol("!", HtmlSymbolType.Bang), new HtmlSymbol("<", HtmlSymbolType.OpenAngle) }; - private static readonly HtmlSymbol[] singleHyphenArray = new[] { HtmlSymbol.Hyphen }; + private static readonly HtmlToken[] nonAllowedHtmlCommentEnding = new[] { HtmlToken.Hyphen, new HtmlToken("!", HtmlTokenType.Bang), new HtmlToken("<", HtmlTokenType.OpenAngle) }; + private static readonly HtmlToken[] singleHyphenArray = new[] { HtmlToken.Hyphen }; private static readonly char[] ValidAfterTypeAttributeNameCharacters = { ' ', '\t', '\r', '\n', '\f', '=' }; private SourceLocation _lastTagStart = SourceLocation.Zero; - private HtmlSymbol _bufferedOpenAngle; + private HtmlToken _bufferedOpenAngle; //From http://dev.w3.org/html5/spec/Overview.html#elements-0 private ISet _voidElements = new HashSet(StringComparer.OrdinalIgnoreCase) @@ -59,7 +59,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy get { return CaseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase; } } - protected override bool SymbolTypeEquals(HtmlSymbolType x, HtmlSymbolType y) => x == y; + protected override bool TokenTypeEquals(HtmlTokenType x, HtmlTokenType y) => x == y; public override void BuildSpan(SpanBuilder span, SourceLocation start, string content) { @@ -73,30 +73,30 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Output(SpanKindInternal.Markup); } - protected void SkipToAndParseCode(HtmlSymbolType type) + protected void SkipToAndParseCode(HtmlTokenType type) { - SkipToAndParseCode(sym => sym.Type == type); + SkipToAndParseCode(token => token.Type == type); } - protected void SkipToAndParseCode(Func condition) + protected void SkipToAndParseCode(Func condition) { - HtmlSymbol last = null; + HtmlToken last = null; var startOfLine = false; - while (!EndOfFile && !condition(CurrentSymbol)) + while (!EndOfFile && !condition(CurrentToken)) { if (Context.NullGenerateWhitespaceAndNewLine) { Context.NullGenerateWhitespaceAndNewLine = false; Span.ChunkGenerator = SpanChunkGenerator.Null; - AcceptWhile(symbol => symbol.Type == HtmlSymbolType.WhiteSpace); - if (At(HtmlSymbolType.NewLine)) + AcceptWhile(token => token.Type == HtmlTokenType.WhiteSpace); + if (At(HtmlTokenType.NewLine)) { AcceptAndMoveNext(); } Output(SpanKindInternal.Markup); } - else if (At(HtmlSymbolType.NewLine)) + else if (At(HtmlTokenType.NewLine)) { if (last != null) { @@ -108,11 +108,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy last = null; AcceptAndMoveNext(); } - else if (At(HtmlSymbolType.Transition)) + else if (At(HtmlTokenType.Transition)) { - var transition = CurrentSymbol; + var transition = CurrentToken; NextToken(); - if (At(HtmlSymbolType.Transition)) + if (At(HtmlTokenType.Transition)) { if (last != null) { @@ -138,7 +138,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Handle whitespace rewriting if (last != null) { - if (!Context.DesignTimeMode && last.Type == HtmlSymbolType.WhiteSpace && startOfLine) + if (!Context.DesignTimeMode && last.Type == HtmlTokenType.WhiteSpace && startOfLine) { // Put the whitespace back too startOfLine = false; @@ -155,15 +155,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy OtherParserBlock(); } - else if (At(HtmlSymbolType.RazorCommentTransition)) + else if (At(HtmlTokenType.RazorCommentTransition)) { if (last != null) { // Don't render the whitespace between the start of the line and the razor comment. - if (startOfLine && last.Type == HtmlSymbolType.WhiteSpace) + if (startOfLine && last.Type == HtmlTokenType.WhiteSpace) { - AddMarkerSymbolIfNecessary(); - // Output the symbols that may have been accepted prior to the whitespace. + AddMarkerTokenIfNecessary(); + // Output the tokens that may have been accepted prior to the whitespace. Output(SpanKindInternal.Markup); Span.ChunkGenerator = SpanChunkGenerator.Null; @@ -173,15 +173,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy last = null; } - AddMarkerSymbolIfNecessary(); + AddMarkerTokenIfNecessary(); Output(SpanKindInternal.Markup); RazorComment(); // Handle the whitespace and newline at the end of a razor comment. if (startOfLine && - (At(HtmlSymbolType.NewLine) || - (At(HtmlSymbolType.WhiteSpace) && NextIs(HtmlSymbolType.NewLine)))) + (At(HtmlTokenType.NewLine) || + (At(HtmlTokenType.WhiteSpace) && NextIs(HtmlTokenType.NewLine)))) { AcceptWhile(IsSpacingToken(includeNewLines: false)); AcceptAndMoveNext(); @@ -192,7 +192,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy else { // As long as we see whitespace, we're still at the "start" of the line - startOfLine &= At(HtmlSymbolType.WhiteSpace); + startOfLine &= At(HtmlTokenType.WhiteSpace); // If there's a last token, accept it if (last != null) @@ -202,7 +202,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } // Advance - last = CurrentSymbol; + last = CurrentToken; NextToken(); } } @@ -213,14 +213,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } } - protected static Func IsSpacingToken(bool includeNewLines) + protected static Func IsSpacingToken(bool includeNewLines) { - return sym => sym.Type == HtmlSymbolType.WhiteSpace || (includeNewLines && sym.Type == HtmlSymbolType.NewLine); + return token => token.Type == HtmlTokenType.WhiteSpace || (includeNewLines && token.Type == HtmlTokenType.NewLine); } private void OtherParserBlock() { - AddMarkerSymbolIfNecessary(); + AddMarkerTokenIfNecessary(); Output(SpanKindInternal.Markup); using (PushSpanConfig()) @@ -238,12 +238,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var potentialBang = Lookahead(lookahead); if (potentialBang != null && - potentialBang.Type == HtmlSymbolType.Bang) + potentialBang.Type == HtmlTokenType.Bang) { var afterBang = Lookahead(lookahead + 1); return afterBang != null && - afterBang.Type == HtmlSymbolType.Text && + afterBang.Type == HtmlTokenType.Text && !string.Equals(afterBang.Content, "DOCTYPE", StringComparison.OrdinalIgnoreCase); } @@ -257,7 +257,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Output(SpanKindInternal.Markup); // Accept the parser escape character '!'. - Assert(HtmlSymbolType.Bang); + Assert(HtmlTokenType.Bang); AcceptAndMoveNext(); // Setup the metacode span that we will be outputing. @@ -286,23 +286,23 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy AcceptWhile(IsSpacingToken(includeNewLines: true)); - if (CurrentSymbol.Type == HtmlSymbolType.OpenAngle) + if (CurrentToken.Type == HtmlTokenType.OpenAngle) { // "<" => Implicit Tag Block - TagBlock(new Stack>()); + TagBlock(new Stack>()); } - else if (CurrentSymbol.Type == HtmlSymbolType.Transition) + else if (CurrentToken.Type == HtmlTokenType.Transition) { // "@" => Explicit Tag/Single Line Block OR Template Output(SpanKindInternal.Markup); // Definitely have a transition span - Assert(HtmlSymbolType.Transition); + Assert(HtmlTokenType.Transition); AcceptAndMoveNext(); Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None; Span.ChunkGenerator = SpanChunkGenerator.Null; Output(SpanKindInternal.Transition); - if (At(HtmlSymbolType.Transition)) + if (At(HtmlTokenType.Transition)) { Span.ChunkGenerator = SpanChunkGenerator.Null; AcceptAndMoveNext(); @@ -314,7 +314,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { Context.ErrorSink.OnError( RazorDiagnosticFactory.CreateParsing_MarkupBlockMustStartWithTag( - new SourceSpan(CurrentStart, CurrentSymbol.Content.Length))); + new SourceSpan(CurrentStart, CurrentToken.Content.Length))); } Output(SpanKindInternal.Markup); } @@ -330,10 +330,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private void AfterTransition() { // "@:" => Explicit Single Line Block - if (CurrentSymbol.Type == HtmlSymbolType.Text && CurrentSymbol.Content.Length > 0 && CurrentSymbol.Content[0] == ':') + if (CurrentToken.Type == HtmlTokenType.Text && CurrentToken.Content.Length > 0 && CurrentToken.Content[0] == ':') { // Split the token - Tuple split = Language.SplitSymbol(CurrentSymbol, 1, HtmlSymbolType.Colon); + Tuple split = Language.SplitToken(CurrentToken, 1, HtmlTokenType.Colon); // The first part (left) is added to this span and we return a MetaCode span Accept(split.Item1); @@ -346,9 +346,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy NextToken(); SingleLineMarkup(); } - else if (CurrentSymbol.Type == HtmlSymbolType.OpenAngle) + else if (CurrentToken.Type == HtmlTokenType.OpenAngle) { - TagBlock(new Stack>()); + TagBlock(new Stack>()); } } @@ -359,8 +359,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var old = Context.WhiteSpaceIsSignificantToAncestorBlock; Context.WhiteSpaceIsSignificantToAncestorBlock = true; Span.EditHandler = new SpanEditHandler(Language.TokenizeString); - SkipToAndParseCode(HtmlSymbolType.NewLine); - if (!EndOfFile && CurrentSymbol.Type == HtmlSymbolType.NewLine) + SkipToAndParseCode(HtmlTokenType.NewLine); + if (!EndOfFile && CurrentToken.Type == HtmlTokenType.NewLine) { AcceptAndMoveNext(); Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None; @@ -370,13 +370,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Output(SpanKindInternal.Markup); } - private void TagBlock(Stack> tags) + private void TagBlock(Stack> tags) { // Skip Whitespace and Text var complete = false; do { - SkipToAndParseCode(HtmlSymbolType.OpenAngle); + SkipToAndParseCode(HtmlTokenType.OpenAngle); // Output everything prior to the OpenAngle into a markup span Output(SpanKindInternal.Markup); @@ -401,8 +401,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { _bufferedOpenAngle = null; _lastTagStart = CurrentStart; - Assert(HtmlSymbolType.OpenAngle); - _bufferedOpenAngle = CurrentSymbol; + Assert(HtmlTokenType.OpenAngle); + _bufferedOpenAngle = CurrentToken; var tagStart = CurrentStart; if (!NextToken()) { @@ -440,18 +440,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } private bool AfterTagStart(SourceLocation tagStart, - Stack> tags, + Stack> tags, bool atSpecialTag, IDisposable tagBlockWrapper) { if (!EndOfFile) { - switch (CurrentSymbol.Type) + switch (CurrentToken.Type) { - case HtmlSymbolType.ForwardSlash: + case HtmlTokenType.ForwardSlash: // End Tag return EndTag(tagStart, tags, tagBlockWrapper); - case HtmlSymbolType.Bang: + case HtmlTokenType.Bang: // Comment, CDATA, DOCTYPE, or a parser-escaped HTML tag. if (atSpecialTag) { @@ -462,7 +462,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { goto default; } - case HtmlSymbolType.QuestionMark: + case HtmlTokenType.QuestionMark: // XML PI Accept(_bufferedOpenAngle); return XmlPI(); @@ -483,15 +483,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private bool XmlPI() { // Accept "?" - Assert(HtmlSymbolType.QuestionMark); + Assert(HtmlTokenType.QuestionMark); AcceptAndMoveNext(); - return AcceptUntilAll(HtmlSymbolType.QuestionMark, HtmlSymbolType.CloseAngle); + return AcceptUntilAll(HtmlTokenType.QuestionMark, HtmlTokenType.CloseAngle); } private bool BangTag() { // Accept "!" - Assert(HtmlSymbolType.Bang); + Assert(HtmlTokenType.Bang); if (AcceptAndMoveNext()) { @@ -499,17 +499,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { using (Context.Builder.StartBlock(BlockKindInternal.HtmlComment)) { - // Accept the double-hyphen symbol at the beginning of the comment block. + // Accept the double-hyphen token at the beginning of the comment block. AcceptAndMoveNext(); Output(SpanKindInternal.Markup, AcceptedCharactersInternal.None); Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.WhiteSpace; while (!EndOfFile) { - SkipToAndParseCode(HtmlSymbolType.DoubleHyphen); + SkipToAndParseCode(HtmlTokenType.DoubleHyphen); var lastDoubleHyphen = AcceptAllButLastDoubleHyphens(); - if (At(HtmlSymbolType.CloseAngle)) + if (At(HtmlTokenType.CloseAngle)) { // Output the content in the comment block as a separate markup Output(SpanKindInternal.Markup, AcceptedCharactersInternal.WhiteSpace); @@ -527,7 +527,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } } } - else if (CurrentSymbol.Type == HtmlSymbolType.LeftBracket) + else if (CurrentToken.Type == HtmlTokenType.LeftBracket) { if (AcceptAndMoveNext()) { @@ -537,19 +537,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy else { AcceptAndMoveNext(); - return AcceptUntilAll(HtmlSymbolType.CloseAngle); + return AcceptUntilAll(HtmlTokenType.CloseAngle); } } return false; } - protected HtmlSymbol AcceptAllButLastDoubleHyphens() + protected HtmlToken AcceptAllButLastDoubleHyphens() { - var lastDoubleHyphen = CurrentSymbol; + var lastDoubleHyphen = CurrentToken; AcceptWhile(s => { - if (NextIs(HtmlSymbolType.DoubleHyphen)) + if (NextIs(HtmlTokenType.DoubleHyphen)) { lastDoubleHyphen = s; return true; @@ -560,10 +560,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy NextToken(); - if (At(HtmlSymbolType.Text) && IsHyphen(CurrentSymbol)) + if (At(HtmlTokenType.Text) && IsHyphen(CurrentToken)) { - // Doing this here to maintain the order of symbols - if (!NextIs(HtmlSymbolType.CloseAngle)) + // Doing this here to maintain the order of tokens + if (!NextIs(HtmlTokenType.CloseAngle)) { Accept(lastDoubleHyphen); lastDoubleHyphen = null; @@ -575,9 +575,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return lastDoubleHyphen; } - internal static bool IsHyphen(HtmlSymbol symbol) + internal static bool IsHyphen(HtmlToken token) { - return symbol.Equals(HtmlSymbol.Hyphen); + return token.Equals(HtmlToken.Hyphen); } protected bool IsHtmlCommentAhead() @@ -598,30 +598,30 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy * * */ - if (CurrentSymbol.Type != HtmlSymbolType.DoubleHyphen) + if (CurrentToken.Type != HtmlTokenType.DoubleHyphen) { return false; } // Check condition 2.1 - if (NextIs(HtmlSymbolType.CloseAngle) || NextIs(next => IsHyphen(next) && NextIs(HtmlSymbolType.CloseAngle))) + if (NextIs(HtmlTokenType.CloseAngle) || NextIs(next => IsHyphen(next) && NextIs(HtmlTokenType.CloseAngle))) { return false; } // Check condition 2.2 var isValidComment = false; - LookaheadUntil((symbol, prevSymbols) => + LookaheadUntil((token, prevTokens) => { - if (symbol.Type == HtmlSymbolType.DoubleHyphen) + if (token.Type == HtmlTokenType.DoubleHyphen) { - if (NextIs(HtmlSymbolType.CloseAngle)) + if (NextIs(HtmlTokenType.CloseAngle)) { // Check condition 2.3: We're at the end of a comment. Check to make sure the text ending is allowed. - isValidComment = !IsCommentContentEndingInvalid(prevSymbols); + isValidComment = !IsCommentContentEndingInvalid(prevTokens); return true; } - else if (NextIs(ns => IsHyphen(ns) && NextIs(HtmlSymbolType.CloseAngle))) + else if (NextIs(ns => IsHyphen(ns) && NextIs(HtmlTokenType.CloseAngle))) { // Check condition 2.3: we're at the end of a comment, which has an extra dash. // Need to treat the dash as part of the content and check the ending. @@ -630,17 +630,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy isValidComment = true; return true; } - else if (NextIs(ns => ns.Type == HtmlSymbolType.Bang && NextIs(HtmlSymbolType.CloseAngle))) + else if (NextIs(ns => ns.Type == HtmlTokenType.Bang && NextIs(HtmlTokenType.CloseAngle))) { // This is condition 2.2.3 isValidComment = false; return true; } } - else if (symbol.Type == HtmlSymbolType.OpenAngle) + else if (token.Type == HtmlTokenType.OpenAngle) { // Checking condition 2.2.1 - if (NextIs(ns => ns.Type == HtmlSymbolType.Bang && NextIs(HtmlSymbolType.DoubleHyphen))) + if (NextIs(ns => ns.Type == HtmlTokenType.Bang && NextIs(HtmlTokenType.DoubleHyphen))) { isValidComment = false; return true; @@ -654,9 +654,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } /// - /// Verifies, that the sequence doesn't end with the "<!-" HtmlSymbols. Note, the first symbol is an opening bracket symbol + /// Verifies, that the sequence doesn't end with the "<!-" HtmlTokens. Note, the first token is an opening bracket token /// - internal static bool IsCommentContentEndingInvalid(IEnumerable sequence) + internal static bool IsCommentContentEndingInvalid(IEnumerable sequence) { var reversedSequence = sequence.Reverse(); var index = 0; @@ -678,13 +678,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private bool CData() { - if (CurrentSymbol.Type == HtmlSymbolType.Text && string.Equals(CurrentSymbol.Content, "cdata", StringComparison.OrdinalIgnoreCase)) + if (CurrentToken.Type == HtmlTokenType.Text && string.Equals(CurrentToken.Content, "cdata", StringComparison.OrdinalIgnoreCase)) { if (AcceptAndMoveNext()) { - if (CurrentSymbol.Type == HtmlSymbolType.LeftBracket) + if (CurrentToken.Type == HtmlTokenType.LeftBracket) { - return AcceptUntilAll(HtmlSymbolType.RightBracket, HtmlSymbolType.RightBracket, HtmlSymbolType.CloseAngle); + return AcceptUntilAll(HtmlTokenType.RightBracket, HtmlTokenType.RightBracket, HtmlTokenType.CloseAngle); } } } @@ -693,12 +693,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } private bool EndTag(SourceLocation tagStart, - Stack> tags, + Stack> tags, IDisposable tagBlockWrapper) { // Accept "/" and move next - Assert(HtmlSymbolType.ForwardSlash); - var forwardSlash = CurrentSymbol; + Assert(HtmlTokenType.ForwardSlash); + var forwardSlash = CurrentToken; if (!NextToken()) { Accept(_bufferedOpenAngle); @@ -708,22 +708,22 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy else { var tagName = string.Empty; - HtmlSymbol bangSymbol = null; + HtmlToken bangToken = null; - if (At(HtmlSymbolType.Bang)) + if (At(HtmlTokenType.Bang)) { - bangSymbol = CurrentSymbol; + bangToken = CurrentToken; - var nextSymbol = Lookahead(count: 1); + var nextToken = Lookahead(count: 1); - if (nextSymbol != null && nextSymbol.Type == HtmlSymbolType.Text) + if (nextToken != null && nextToken.Type == HtmlTokenType.Text) { - tagName = "!" + nextSymbol.Content; + tagName = "!" + nextToken.Content; } } - else if (At(HtmlSymbolType.Text)) + else if (At(HtmlTokenType.Text)) { - tagName = CurrentSymbol.Content; + tagName = CurrentToken.Content; } var matched = RemoveTag(tags, tagName, tagStart); @@ -741,32 +741,32 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy OptionalBangEscape(); - AcceptUntil(HtmlSymbolType.CloseAngle); + AcceptUntil(HtmlTokenType.CloseAngle); // Accept the ">" - return Optional(HtmlSymbolType.CloseAngle); + return Optional(HtmlTokenType.CloseAngle); } } private void RecoverTextTag() { // We don't want to skip-to and parse because there shouldn't be anything in the body of text tags. - AcceptUntil(HtmlSymbolType.CloseAngle, HtmlSymbolType.NewLine); + AcceptUntil(HtmlTokenType.CloseAngle, HtmlTokenType.NewLine); // Include the close angle in the text tag block if it's there, otherwise just move on - Optional(HtmlSymbolType.CloseAngle); + Optional(HtmlTokenType.CloseAngle); } - private bool EndTextTag(HtmlSymbol solidus, IDisposable tagBlockWrapper) + private bool EndTextTag(HtmlToken solidus, IDisposable tagBlockWrapper) { Accept(_bufferedOpenAngle); Accept(solidus); var textLocation = CurrentStart; - Assert(HtmlSymbolType.Text); + Assert(HtmlTokenType.Text); AcceptAndMoveNext(); - var seenCloseAngle = Optional(HtmlSymbolType.CloseAngle); + var seenCloseAngle = Optional(HtmlTokenType.CloseAngle); if (!seenCloseAngle) { @@ -794,32 +794,32 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { get { - if (At(HtmlSymbolType.OpenAngle)) + if (At(HtmlTokenType.OpenAngle)) { - if (NextIs(HtmlSymbolType.Bang)) + if (NextIs(HtmlTokenType.Bang)) { return !IsBangEscape(lookahead: 1); } - return NextIs(HtmlSymbolType.QuestionMark); + return NextIs(HtmlTokenType.QuestionMark); } return false; } } - private bool IsTagRecoveryStopPoint(HtmlSymbol sym) + private bool IsTagRecoveryStopPoint(HtmlToken token) { - return sym.Type == HtmlSymbolType.CloseAngle || - sym.Type == HtmlSymbolType.ForwardSlash || - sym.Type == HtmlSymbolType.OpenAngle || - sym.Type == HtmlSymbolType.SingleQuote || - sym.Type == HtmlSymbolType.DoubleQuote; + return token.Type == HtmlTokenType.CloseAngle || + token.Type == HtmlTokenType.ForwardSlash || + token.Type == HtmlTokenType.OpenAngle || + token.Type == HtmlTokenType.SingleQuote || + token.Type == HtmlTokenType.DoubleQuote; } private void TagContent() { - if (!At(HtmlSymbolType.WhiteSpace) && !At(HtmlSymbolType.NewLine)) + if (!At(HtmlTokenType.WhiteSpace) && !At(HtmlTokenType.NewLine)) { // We should be right after the tag name, so if there's no whitespace or new line, something is wrong RecoverToEndOfTag(); @@ -836,9 +836,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private bool IsEndOfTag() { - if (At(HtmlSymbolType.ForwardSlash)) + if (At(HtmlTokenType.ForwardSlash)) { - if (NextIs(HtmlSymbolType.CloseAngle)) + if (NextIs(HtmlTokenType.CloseAngle)) { return true; } @@ -847,16 +847,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy AcceptAndMoveNext(); } } - return At(HtmlSymbolType.CloseAngle) || At(HtmlSymbolType.OpenAngle); + return At(HtmlTokenType.CloseAngle) || At(HtmlTokenType.OpenAngle); } private void BeforeAttribute() { // http://dev.w3.org/html5/spec/tokenization.html#before-attribute-name-state // Capture whitespace - var whitespace = ReadWhile(sym => sym.Type == HtmlSymbolType.WhiteSpace || sym.Type == HtmlSymbolType.NewLine); + var whitespace = ReadWhile(token => token.Type == HtmlTokenType.WhiteSpace || token.Type == HtmlTokenType.NewLine); - if (At(HtmlSymbolType.Transition)) + if (At(HtmlTokenType.Transition)) { // Transition outside of attribute value => Switch to recovery mode Accept(whitespace); @@ -866,21 +866,21 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // http://dev.w3.org/html5/spec/tokenization.html#attribute-name-state // Read the 'name' (i.e. read until the '=' or whitespace/newline) - var name = Enumerable.Empty(); - var whitespaceAfterAttributeName = Enumerable.Empty(); - if (IsValidAttributeNameSymbol(CurrentSymbol)) + var name = Enumerable.Empty(); + var whitespaceAfterAttributeName = Enumerable.Empty(); + if (IsValidAttributeNameToken(CurrentToken)) { - name = ReadWhile(sym => - sym.Type != HtmlSymbolType.WhiteSpace && - sym.Type != HtmlSymbolType.NewLine && - sym.Type != HtmlSymbolType.Equals && - sym.Type != HtmlSymbolType.CloseAngle && - sym.Type != HtmlSymbolType.OpenAngle && - (sym.Type != HtmlSymbolType.ForwardSlash || !NextIs(HtmlSymbolType.CloseAngle))); + name = ReadWhile(token => + token.Type != HtmlTokenType.WhiteSpace && + token.Type != HtmlTokenType.NewLine && + token.Type != HtmlTokenType.Equals && + token.Type != HtmlTokenType.CloseAngle && + token.Type != HtmlTokenType.OpenAngle && + (token.Type != HtmlTokenType.ForwardSlash || !NextIs(HtmlTokenType.CloseAngle))); // capture whitespace after attribute name (if any) whitespaceAfterAttributeName = ReadWhile( - sym => sym.Type == HtmlSymbolType.WhiteSpace || sym.Type == HtmlSymbolType.NewLine); + token => token.Type == HtmlTokenType.WhiteSpace || token.Type == HtmlTokenType.NewLine); } else { @@ -890,7 +890,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return; } - if (!At(HtmlSymbolType.Equals)) + if (!At(HtmlTokenType.Equals)) { // Minimized attribute @@ -925,32 +925,32 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } private void AttributePrefix( - IEnumerable whitespace, - IEnumerable nameSymbols, - IEnumerable whitespaceAfterAttributeName) + IEnumerable whitespace, + IEnumerable nameTokens, + IEnumerable whitespaceAfterAttributeName) { // First, determine if this is a 'data-' attribute (since those can't use conditional attributes) - var name = string.Concat(nameSymbols.Select(s => s.Content)); + var name = string.Concat(nameTokens.Select(s => s.Content)); var attributeCanBeConditional = Context.FeatureFlags.EXPERIMENTAL_AllowConditionalDataDashAttributes || !name.StartsWith("data-", StringComparison.OrdinalIgnoreCase); // Accept the whitespace and name Accept(whitespace); - Accept(nameSymbols); + Accept(nameTokens); // Since this is not a minimized attribute, the whitespace after attribute name belongs to this attribute. Accept(whitespaceAfterAttributeName); - Assert(HtmlSymbolType.Equals); // We should be at "=" + Assert(HtmlTokenType.Equals); // We should be at "=" AcceptAndMoveNext(); - var whitespaceAfterEquals = ReadWhile(sym => sym.Type == HtmlSymbolType.WhiteSpace || sym.Type == HtmlSymbolType.NewLine); - var quote = HtmlSymbolType.Unknown; - if (At(HtmlSymbolType.SingleQuote) || At(HtmlSymbolType.DoubleQuote)) + var whitespaceAfterEquals = ReadWhile(token => token.Type == HtmlTokenType.WhiteSpace || token.Type == HtmlTokenType.NewLine); + var quote = HtmlTokenType.Unknown; + if (At(HtmlTokenType.SingleQuote) || At(HtmlTokenType.DoubleQuote)) { // Found a quote, the whitespace belongs to this attribute. Accept(whitespaceAfterEquals); - quote = CurrentSymbol.Type; + quote = CurrentToken.Type; AcceptAndMoveNext(); } else if (whitespaceAfterEquals.Any()) @@ -961,7 +961,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } // We now have the prefix: (i.e. ' foo="') - var prefix = new LocationTagged(string.Concat(Span.Symbols.Select(s => s.Content)), Span.Start); + var prefix = new LocationTagged(string.Concat(Span.Tokens.Select(s => s.Content)), Span.Start); if (attributeCanBeConditional) { @@ -970,10 +970,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Read the attribute value only if the value is quoted // or if there is no whitespace between '=' and the unquoted value. - if (quote != HtmlSymbolType.Unknown || !whitespaceAfterEquals.Any()) + if (quote != HtmlTokenType.Unknown || !whitespaceAfterEquals.Any()) { // Read the attribute value. - while (!EndOfFile && !IsEndOfAttributeValue(quote, CurrentSymbol)) + while (!EndOfFile && !IsEndOfAttributeValue(quote, CurrentToken)) { AttributeValue(quote); } @@ -981,13 +981,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Capture the suffix var suffix = new LocationTagged(string.Empty, CurrentStart); - if (quote != HtmlSymbolType.Unknown && At(quote)) + if (quote != HtmlTokenType.Unknown && At(quote)) { - suffix = new LocationTagged(CurrentSymbol.Content, CurrentStart); + suffix = new LocationTagged(CurrentToken.Content, CurrentStart); AcceptAndMoveNext(); } - if (Span.Symbols.Count > 0) + if (Span.Tokens.Count > 0) { // Again, block chunk generator will render the suffix Span.ChunkGenerator = SpanChunkGenerator.Null; @@ -1003,18 +1003,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Output the attribute name, the equals and optional quote. Ex: foo=" Output(SpanKindInternal.Markup); - if (quote == HtmlSymbolType.Unknown && whitespaceAfterEquals.Any()) + if (quote == HtmlTokenType.Unknown && whitespaceAfterEquals.Any()) { return; } // Not a "conditional" attribute, so just read the value - SkipToAndParseCode(sym => IsEndOfAttributeValue(quote, sym)); + SkipToAndParseCode(token => IsEndOfAttributeValue(quote, token)); // Output the attribute value (will include everything in-between the attribute's quotes). Output(SpanKindInternal.Markup); - if (quote != HtmlSymbolType.Unknown) + if (quote != HtmlTokenType.Unknown) { Optional(quote); } @@ -1022,14 +1022,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } } - private void AttributeValue(HtmlSymbolType quote) + private void AttributeValue(HtmlTokenType quote) { var prefixStart = CurrentStart; - var prefix = ReadWhile(sym => sym.Type == HtmlSymbolType.WhiteSpace || sym.Type == HtmlSymbolType.NewLine); + var prefix = ReadWhile(token => token.Type == HtmlTokenType.WhiteSpace || token.Type == HtmlTokenType.NewLine); - if (At(HtmlSymbolType.Transition)) + if (At(HtmlTokenType.Transition)) { - if (NextIs(HtmlSymbolType.Transition)) + if (NextIs(HtmlTokenType.Transition)) { // Wrapping this in a block so that the ConditionalAttributeCollapser doesn't rewrite it. using (Context.Builder.StartBlock(BlockKindInternal.Markup)) @@ -1039,7 +1039,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Render a single "@" in place of "@@". Span.ChunkGenerator = new LiteralAttributeChunkGenerator( new LocationTagged(string.Concat(prefix.Select(s => s.Content)), prefixStart), - new LocationTagged(CurrentSymbol.Content, CurrentStart)); + new LocationTagged(CurrentToken.Content, CurrentStart)); AcceptAndMoveNext(); Output(SpanKindInternal.Markup, AcceptedCharactersInternal.None); @@ -1074,17 +1074,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Accept(prefix); // Literal value - // 'quote' should be "Unknown" if not quoted and symbols coming from the tokenizer should never have + // 'quote' should be "Unknown" if not quoted and tokens coming from the tokenizer should never have // "Unknown" type. var valueStart = CurrentStart; - var value = ReadWhile(sym => + var value = ReadWhile(token => // These three conditions find separators which break the attribute value into portions - sym.Type != HtmlSymbolType.WhiteSpace && - sym.Type != HtmlSymbolType.NewLine && - sym.Type != HtmlSymbolType.Transition && + token.Type != HtmlTokenType.WhiteSpace && + token.Type != HtmlTokenType.NewLine && + token.Type != HtmlTokenType.Transition && // This condition checks for the end of the attribute value (it repeats some of the checks above // but for now that's ok) - !IsEndOfAttributeValue(quote, sym)); + !IsEndOfAttributeValue(quote, token)); Accept(value); Span.ChunkGenerator = new LiteralAttributeChunkGenerator( new LocationTagged(string.Concat(prefix.Select(s => s.Content)), prefixStart), @@ -1093,27 +1093,27 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Output(SpanKindInternal.Markup); } - private bool IsEndOfAttributeValue(HtmlSymbolType quote, HtmlSymbol sym) + private bool IsEndOfAttributeValue(HtmlTokenType quote, HtmlToken token) { - return EndOfFile || sym == null || - (quote != HtmlSymbolType.Unknown - ? sym.Type == quote // If quoted, just wait for the quote - : IsUnquotedEndOfAttributeValue(sym)); + return EndOfFile || token == null || + (quote != HtmlTokenType.Unknown + ? token.Type == quote // If quoted, just wait for the quote + : IsUnquotedEndOfAttributeValue(token)); } - private bool IsUnquotedEndOfAttributeValue(HtmlSymbol sym) + private bool IsUnquotedEndOfAttributeValue(HtmlToken token) { // If unquoted, we have a larger set of terminating characters: // http://dev.w3.org/html5/spec/tokenization.html#attribute-value-unquoted-state // Also we need to detect "/" and ">" - return sym.Type == HtmlSymbolType.DoubleQuote || - sym.Type == HtmlSymbolType.SingleQuote || - sym.Type == HtmlSymbolType.OpenAngle || - sym.Type == HtmlSymbolType.Equals || - (sym.Type == HtmlSymbolType.ForwardSlash && NextIs(HtmlSymbolType.CloseAngle)) || - sym.Type == HtmlSymbolType.CloseAngle || - sym.Type == HtmlSymbolType.WhiteSpace || - sym.Type == HtmlSymbolType.NewLine; + return token.Type == HtmlTokenType.DoubleQuote || + token.Type == HtmlTokenType.SingleQuote || + token.Type == HtmlTokenType.OpenAngle || + token.Type == HtmlTokenType.Equals || + (token.Type == HtmlTokenType.ForwardSlash && NextIs(HtmlTokenType.CloseAngle)) || + token.Type == HtmlTokenType.CloseAngle || + token.Type == HtmlTokenType.WhiteSpace || + token.Type == HtmlTokenType.NewLine; } private void RecoverToEndOfTag() @@ -1125,17 +1125,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy if (!EndOfFile) { EnsureCurrent(); - switch (CurrentSymbol.Type) + switch (CurrentToken.Type) { - case HtmlSymbolType.SingleQuote: - case HtmlSymbolType.DoubleQuote: + case HtmlTokenType.SingleQuote: + case HtmlTokenType.DoubleQuote: ParseQuoted(); break; - case HtmlSymbolType.OpenAngle: + case HtmlTokenType.OpenAngle: // Another "<" means this tag is invalid. - case HtmlSymbolType.ForwardSlash: + case HtmlTokenType.ForwardSlash: // Empty tag - case HtmlSymbolType.CloseAngle: + case HtmlTokenType.CloseAngle: // End of tag return; default: @@ -1148,12 +1148,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private void ParseQuoted() { - var type = CurrentSymbol.Type; + var type = CurrentToken.Type; AcceptAndMoveNext(); ParseQuoted(type); } - private void ParseQuoted(HtmlSymbolType type) + private void ParseQuoted(HtmlTokenType type) { SkipToAndParseCode(type); if (!EndOfFile) @@ -1163,38 +1163,38 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } } - private bool StartTag(Stack> tags, IDisposable tagBlockWrapper) + private bool StartTag(Stack> tags, IDisposable tagBlockWrapper) { - HtmlSymbol bangSymbol = null; - HtmlSymbol potentialTagNameSymbol; + HtmlToken bangToken = null; + HtmlToken potentialTagNameToken; - if (At(HtmlSymbolType.Bang)) + if (At(HtmlTokenType.Bang)) { - bangSymbol = CurrentSymbol; + bangToken = CurrentToken; - potentialTagNameSymbol = Lookahead(count: 1); + potentialTagNameToken = Lookahead(count: 1); } else { - potentialTagNameSymbol = CurrentSymbol; + potentialTagNameToken = CurrentToken; } - HtmlSymbol tagName; + HtmlToken tagName; - if (potentialTagNameSymbol == null || potentialTagNameSymbol.Type != HtmlSymbolType.Text) + if (potentialTagNameToken == null || potentialTagNameToken.Type != HtmlTokenType.Text) { - tagName = new HtmlSymbol(string.Empty, HtmlSymbolType.Unknown); + tagName = new HtmlToken(string.Empty, HtmlTokenType.Unknown); } - else if (bangSymbol != null) + else if (bangToken != null) { - tagName = new HtmlSymbol("!" + potentialTagNameSymbol.Content, HtmlSymbolType.Text); + tagName = new HtmlToken("!" + potentialTagNameToken.Content, HtmlTokenType.Text); } else { - tagName = potentialTagNameSymbol; + tagName = potentialTagNameToken; } - Tuple tag = Tuple.Create(tagName, _lastTagStart); + Tuple tag = Tuple.Create(tagName, _lastTagStart); if (tags.Count == 0 && // Note tagName may contain a '!' escape character. This ensures doesn't match here. @@ -1206,23 +1206,23 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Accept(_bufferedOpenAngle); var textLocation = CurrentStart; - Assert(HtmlSymbolType.Text); + Assert(HtmlTokenType.Text); AcceptAndMoveNext(); var bookmark = CurrentStart.AbsoluteIndex; - IEnumerable tokens = ReadWhile(IsSpacingToken(includeNewLines: true)); - var empty = At(HtmlSymbolType.ForwardSlash); + IEnumerable tokens = ReadWhile(IsSpacingToken(includeNewLines: true)); + var empty = At(HtmlTokenType.ForwardSlash); if (empty) { Accept(tokens); - Assert(HtmlSymbolType.ForwardSlash); + Assert(HtmlTokenType.ForwardSlash); AcceptAndMoveNext(); bookmark = CurrentStart.AbsoluteIndex; tokens = ReadWhile(IsSpacingToken(includeNewLines: true)); } - if (!Optional(HtmlSymbolType.CloseAngle)) + if (!Optional(HtmlTokenType.CloseAngle)) { Context.Source.Position = bookmark; NextToken(); @@ -1250,24 +1250,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Accept(_bufferedOpenAngle); OptionalBangEscape(); - Optional(HtmlSymbolType.Text); + Optional(HtmlTokenType.Text); return RestOfTag(tag, tags, tagBlockWrapper); } - private bool RestOfTag(Tuple tag, - Stack> tags, + private bool RestOfTag(Tuple tag, + Stack> tags, IDisposable tagBlockWrapper) { TagContent(); // We are now at a possible end of the tag // Found '<', so we just abort this tag. - if (At(HtmlSymbolType.OpenAngle)) + if (At(HtmlTokenType.OpenAngle)) { return false; } - var isEmpty = At(HtmlSymbolType.ForwardSlash); + var isEmpty = At(HtmlTokenType.ForwardSlash); // Found a solidus, so don't accept it but DON'T push the tag to the stack if (isEmpty) { @@ -1275,7 +1275,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } // Check for the '>' to determine if the tag is finished - var seenClose = Optional(HtmlSymbolType.CloseAngle); + var seenClose = Optional(HtmlTokenType.CloseAngle); if (!seenClose) { Context.ErrorSink.OnError( @@ -1301,17 +1301,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var bookmark = CurrentStart.AbsoluteIndex; // Skip whitespace - IEnumerable whiteSpace = ReadWhile(IsSpacingToken(includeNewLines: true)); + IEnumerable whiteSpace = ReadWhile(IsSpacingToken(includeNewLines: true)); // Open Angle - if (At(HtmlSymbolType.OpenAngle) && NextIs(HtmlSymbolType.ForwardSlash)) + if (At(HtmlTokenType.OpenAngle) && NextIs(HtmlTokenType.ForwardSlash)) { - var openAngle = CurrentSymbol; + var openAngle = CurrentToken; NextToken(); - Assert(HtmlSymbolType.ForwardSlash); - var solidus = CurrentSymbol; + Assert(HtmlTokenType.ForwardSlash); + var solidus = CurrentToken; NextToken(); - if (At(HtmlSymbolType.Text) && string.Equals(CurrentSymbol.Content, tagName, StringComparison.OrdinalIgnoreCase)) + if (At(HtmlTokenType.Text) && string.Equals(CurrentToken.Content, tagName, StringComparison.OrdinalIgnoreCase)) { // Accept up to here Accept(whiteSpace); @@ -1324,9 +1324,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy AcceptAndMoveNext(); // Accept to '>', '<' or EOF - AcceptUntil(HtmlSymbolType.CloseAngle, HtmlSymbolType.OpenAngle); + AcceptUntil(HtmlTokenType.CloseAngle, HtmlTokenType.OpenAngle); // Accept the '>' if we saw it. And if we do see it, we're complete - var complete = Optional(HtmlSymbolType.CloseAngle); + var complete = Optional(HtmlTokenType.CloseAngle); if (complete) { @@ -1376,18 +1376,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy while (!seenEndScript && !EndOfFile) { - SkipToAndParseCode(HtmlSymbolType.OpenAngle); + SkipToAndParseCode(HtmlTokenType.OpenAngle); var tagStart = CurrentStart; - if (NextIs(HtmlSymbolType.ForwardSlash)) + if (NextIs(HtmlTokenType.ForwardSlash)) { - var openAngle = CurrentSymbol; + var openAngle = CurrentToken; NextToken(); // Skip over '<', current is '/' - var solidus = CurrentSymbol; + var solidus = CurrentToken; NextToken(); // Skip over '/', current should be text - if (At(HtmlSymbolType.Text) && - string.Equals(CurrentSymbol.Content, ScriptTagName, StringComparison.OrdinalIgnoreCase)) + if (At(HtmlTokenType.Text) && + string.Equals(CurrentToken.Content, ScriptTagName, StringComparison.OrdinalIgnoreCase)) { seenEndScript = true; } @@ -1398,7 +1398,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy PutBack(solidus); // Put back '/' PutBack(openAngle); // Put back '<' - // We just looked ahead, this NextToken will set CurrentSymbol to an open angle bracket. + // We just looked ahead, this NextToken will set CurrentToken to an open angle bracket. NextToken(); } @@ -1412,8 +1412,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy AcceptAndMoveNext(); // '<' AcceptAndMoveNext(); // '/' - SkipToAndParseCode(HtmlSymbolType.CloseAngle); - if (!Optional(HtmlSymbolType.CloseAngle)) + SkipToAndParseCode(HtmlTokenType.CloseAngle); + if (!Optional(HtmlTokenType.CloseAngle)) { Context.ErrorSink.OnError( RazorDiagnosticFactory.CreateParsing_UnfinishedTag( @@ -1444,7 +1444,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy tagBlockWrapper.Dispose(); } - private bool AcceptUntilAll(params HtmlSymbolType[] endSequence) + private bool AcceptUntilAll(params HtmlTokenType[] endSequence) { while (!EndOfFile) { @@ -1459,9 +1459,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return false; } - private bool RemoveTag(Stack> tags, string tagName, SourceLocation tagStart) + private bool RemoveTag(Stack> tags, string tagName, SourceLocation tagStart) { - Tuple currentTag = null; + Tuple currentTag = null; while (tags.Count > 0) { currentTag = tags.Pop(); @@ -1489,7 +1489,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return false; } - private void EndTagBlock(Stack> tags, bool complete) + private void EndTagBlock(Stack> tags, bool complete) { if (tags.Count > 0) { @@ -1517,46 +1517,46 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy if (Context.Builder.LastSpan.Kind == SpanKindInternal.Transition) { - var symbols = ReadWhile( - f => (f.Type == HtmlSymbolType.WhiteSpace) || (f.Type == HtmlSymbolType.NewLine)); + var tokens = ReadWhile( + f => (f.Type == HtmlTokenType.WhiteSpace) || (f.Type == HtmlTokenType.NewLine)); - // Make sure the current symbol is not markup, which can be html start tag or @: - if (!(At(HtmlSymbolType.OpenAngle) || - (At(HtmlSymbolType.Transition) && Lookahead(count: 1).Content.StartsWith(":")))) + // Make sure the current token is not markup, which can be html start tag or @: + if (!(At(HtmlTokenType.OpenAngle) || + (At(HtmlTokenType.Transition) && Lookahead(count: 1).Content.StartsWith(":")))) { // Don't accept whitespace as markup if the end text tag is followed by csharp. shouldAcceptWhitespaceAndNewLine = false; } PutCurrentBack(); - PutBack(symbols); + PutBack(tokens); EnsureCurrent(); } if (shouldAcceptWhitespaceAndNewLine) { // Accept whitespace and a single newline if present - AcceptWhile(HtmlSymbolType.WhiteSpace); - Optional(HtmlSymbolType.NewLine); + AcceptWhile(HtmlTokenType.WhiteSpace); + Optional(HtmlTokenType.NewLine); } } else if (Span.EditHandler.AcceptedCharacters == AcceptedCharactersInternal.Any) { - AcceptWhile(HtmlSymbolType.WhiteSpace); - Optional(HtmlSymbolType.NewLine); + AcceptWhile(HtmlTokenType.WhiteSpace); + Optional(HtmlTokenType.NewLine); } PutCurrentBack(); if (!complete) { - AddMarkerSymbolIfNecessary(); + AddMarkerTokenIfNecessary(); } Output(SpanKindInternal.Markup); } - internal static bool IsValidAttributeNameSymbol(HtmlSymbol symbol) + internal static bool IsValidAttributeNameToken(HtmlToken token) { - if (symbol == null) + if (token == null) { return false; } @@ -1565,16 +1565,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // However, it's not all of it. For instance we don't special case control characters or allow OpenAngle. // It also doesn't try to exclude Razor specific features such as the @ transition. This is based on the // expectation that the parser handles such scenarios prior to falling through to name resolution. - var symbolType = symbol.Type; - return symbolType != HtmlSymbolType.WhiteSpace && - symbolType != HtmlSymbolType.NewLine && - symbolType != HtmlSymbolType.CloseAngle && - symbolType != HtmlSymbolType.OpenAngle && - symbolType != HtmlSymbolType.ForwardSlash && - symbolType != HtmlSymbolType.DoubleQuote && - symbolType != HtmlSymbolType.SingleQuote && - symbolType != HtmlSymbolType.Equals && - symbolType != HtmlSymbolType.Unknown; + var tokenType = token.Type; + return tokenType != HtmlTokenType.WhiteSpace && + tokenType != HtmlTokenType.NewLine && + tokenType != HtmlTokenType.CloseAngle && + tokenType != HtmlTokenType.OpenAngle && + tokenType != HtmlTokenType.ForwardSlash && + tokenType != HtmlTokenType.DoubleQuote && + tokenType != HtmlTokenType.SingleQuote && + tokenType != HtmlTokenType.Equals && + tokenType != HtmlTokenType.Unknown; } public void ParseDocument() @@ -1593,10 +1593,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy NextToken(); while (!EndOfFile) { - SkipToAndParseCode(HtmlSymbolType.OpenAngle); + SkipToAndParseCode(HtmlTokenType.OpenAngle); ScanTagInDocumentContext(); } - AddMarkerSymbolIfNecessary(); + AddMarkerTokenIfNecessary(); Output(SpanKindInternal.Markup); } } @@ -1608,14 +1608,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy /// private void ScanTagInDocumentContext() { - if (At(HtmlSymbolType.OpenAngle)) + if (At(HtmlTokenType.OpenAngle)) { - if (NextIs(HtmlSymbolType.Bang)) + if (NextIs(HtmlTokenType.Bang)) { // Checking to see if we meet the conditions of a special '!' tag: ';" as an HTML tag. @@ -1670,13 +1670,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { // Parsing an end tag // This section can accept things like: '

' or '

' etc. - Optional(HtmlSymbolType.ForwardSlash); + Optional(HtmlTokenType.ForwardSlash); // Whitespace here is invalid (according to the spec) OptionalBangEscape(); - Optional(HtmlSymbolType.Text); - Optional(HtmlSymbolType.WhiteSpace); - Optional(HtmlSymbolType.CloseAngle); + Optional(HtmlTokenType.Text); + Optional(HtmlTokenType.WhiteSpace); + Optional(HtmlTokenType.CloseAngle); } Output(SpanKindInternal.Markup); @@ -1758,7 +1758,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { NestingSection(nestingSequences); } - AddMarkerSymbolIfNecessary(); + AddMarkerTokenIfNecessary(); Output(SpanKindInternal.Markup); } } @@ -1768,7 +1768,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { do { - SkipToAndParseCode(sym => sym.Type == HtmlSymbolType.OpenAngle || AtEnd(nestingSequenceComponents)); + SkipToAndParseCode(token => token.Type == HtmlTokenType.OpenAngle || AtEnd(nestingSequenceComponents)); ScanTagInDocumentContext(); if (!EndOfFile && AtEnd(nestingSequenceComponents)) { @@ -1785,13 +1785,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var nesting = 1; while (nesting > 0 && !EndOfFile) { - SkipToAndParseCode(sym => - sym.Type == HtmlSymbolType.Text || - sym.Type == HtmlSymbolType.OpenAngle); - if (At(HtmlSymbolType.Text)) + SkipToAndParseCode(token => + token.Type == HtmlTokenType.Text || + token.Type == HtmlTokenType.OpenAngle); + if (At(HtmlTokenType.Text)) { nesting += ProcessTextToken(nestingSequences, nesting); - if (CurrentSymbol != null) + if (CurrentToken != null) { AcceptAndMoveNext(); } @@ -1810,19 +1810,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private bool AtEnd(string[] nestingSequenceComponents) { EnsureCurrent(); - if (string.Equals(CurrentSymbol.Content, nestingSequenceComponents[0], Comparison)) + if (string.Equals(CurrentToken.Content, nestingSequenceComponents[0], Comparison)) { - var bookmark = Context.Source.Position - CurrentSymbol.Content.Length; + var bookmark = Context.Source.Position - CurrentToken.Content.Length; try { foreach (string component in nestingSequenceComponents) { - if (!EndOfFile && !string.Equals(CurrentSymbol.Content, component, Comparison)) + if (!EndOfFile && !string.Equals(CurrentToken.Content, component, Comparison)) { return false; } NextToken(); - while (!EndOfFile && IsSpacingToken(includeNewLines: true)(CurrentSymbol)) + while (!EndOfFile && IsSpacingToken(includeNewLines: true)(CurrentToken)) { NextToken(); } @@ -1840,7 +1840,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private int ProcessTextToken(Tuple nestingSequences, int currentNesting) { - for (int i = 0; i < CurrentSymbol.Content.Length; i++) + for (int i = 0; i < CurrentToken.Content.Length; i++) { var nestingDelta = HandleNestingSequence(nestingSequences.Item1, i, currentNesting, 1); if (nestingDelta == 0) @@ -1859,22 +1859,22 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private int HandleNestingSequence(string sequence, int position, int currentNesting, int retIfMatched) { if (sequence != null && - CurrentSymbol.Content[position] == sequence[0] && - position + sequence.Length <= CurrentSymbol.Content.Length) + CurrentToken.Content[position] == sequence[0] && + position + sequence.Length <= CurrentToken.Content.Length) { - var possibleStart = CurrentSymbol.Content.Substring(position, sequence.Length); + var possibleStart = CurrentToken.Content.Substring(position, sequence.Length); if (string.Equals(possibleStart, sequence, Comparison)) { - // Capture the current symbol and "put it back" (really we just want to clear CurrentSymbol) + // Capture the current token and "put it back" (really we just want to clear CurrentToken) var bookmark = CurrentStart; - var sym = CurrentSymbol; + var token = CurrentToken; PutCurrentBack(); - // Carve up the symbol - Tuple pair = Language.SplitSymbol(sym, position, HtmlSymbolType.Text); + // Carve up the token + Tuple pair = Language.SplitToken(token, position, HtmlTokenType.Text); var preSequence = pair.Item1; Debug.Assert(pair.Item2 != null); - pair = Language.SplitSymbol(pair.Item2, sequence.Length, HtmlSymbolType.Text); + pair = Language.SplitToken(pair.Item2, sequence.Length, HtmlTokenType.Text); var sequenceToken = pair.Item1; var postSequence = pair.Item2; var postSequenceBookmark = bookmark.AbsoluteIndex + preSequence.Content.Length + pair.Item1.Content.Length; @@ -1897,7 +1897,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // This isn't the end of the last nesting sequence, accept the token and keep going Accept(sequenceToken); - // Position at the start of the postSequence symbol, which might be null. + // Position at the start of the postSequence token, which might be null. Context.Source.Position = postSequenceBookmark; } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlSymbol.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlToken.cs similarity index 73% rename from src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlSymbol.cs rename to src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlToken.cs index 217e293704..2d52ed14e2 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlSymbol.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlToken.cs @@ -6,11 +6,11 @@ using System.Collections.Generic; namespace Microsoft.AspNetCore.Razor.Language.Legacy { - internal class HtmlSymbol : SymbolBase + internal class HtmlToken : TokenBase { - internal static readonly HtmlSymbol Hyphen = new HtmlSymbol("-", HtmlSymbolType.Text); + internal static readonly HtmlToken Hyphen = new HtmlToken("-", HtmlTokenType.Text); - public HtmlSymbol(string content, HtmlSymbolType type) + public HtmlToken(string content, HtmlTokenType type) : base(content, type, RazorDiagnostic.EmptyArray) { if (content == null) @@ -19,9 +19,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } } - public HtmlSymbol( + public HtmlToken( string content, - HtmlSymbolType type, + HtmlTokenType type, IReadOnlyList errors) : base(content, type, errors) { diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlSymbolType.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlTokenType.cs similarity index 96% rename from src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlSymbolType.cs rename to src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlTokenType.cs index bc90b98022..82d96d7ebc 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlSymbolType.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlTokenType.cs @@ -6,7 +6,7 @@ using System; namespace Microsoft.AspNetCore.Razor.Language.Legacy { [Flags] - internal enum HtmlSymbolType + internal enum HtmlTokenType { Unknown, Text, // Text which isn't one of the below diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlTokenizer.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlTokenizer.cs index df9671d1b7..99a7152447 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlTokenizer.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlTokenizer.cs @@ -7,7 +7,7 @@ using System.Diagnostics; namespace Microsoft.AspNetCore.Razor.Language.Legacy { // Tokenizer _loosely_ based on http://dev.w3.org/html5/spec/Overview.html#tokenization - internal class HtmlTokenizer : Tokenizer + internal class HtmlTokenizer : Tokenizer { private const char TransitionChar = '@'; @@ -21,24 +21,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private new HtmlTokenizerState? CurrentState => (HtmlTokenizerState?)base.CurrentState; - public override HtmlSymbolType RazorCommentType + public override HtmlTokenType RazorCommentType { - get { return HtmlSymbolType.RazorComment; } + get { return HtmlTokenType.RazorComment; } } - public override HtmlSymbolType RazorCommentTransitionType + public override HtmlTokenType RazorCommentTransitionType { - get { return HtmlSymbolType.RazorCommentTransition; } + get { return HtmlTokenType.RazorCommentTransition; } } - public override HtmlSymbolType RazorCommentStarType + public override HtmlTokenType RazorCommentStarType { - get { return HtmlSymbolType.RazorCommentStar; } + get { return HtmlTokenType.RazorCommentStar; } } - protected override HtmlSymbol CreateSymbol(string content, HtmlSymbolType type, IReadOnlyList errors) + protected override HtmlToken CreateToken(string content, HtmlTokenType type, IReadOnlyList errors) { - return new HtmlSymbol(content, type, errors); + return new HtmlToken(content, type, errors); } protected override StateResult Dispatch() @@ -57,8 +57,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return RazorCommentBody(); case HtmlTokenizerState.StarAfterRazorCommentBody: return StarAfterRazorCommentBody(); - case HtmlTokenizerState.AtSymbolAfterRazorCommentBody: - return AtSymbolAfterRazorCommentBody(); + case HtmlTokenizerState.AtTokenAfterRazorCommentBody: + return AtTokenAfterRazorCommentBody(); default: Debug.Fail("Invalid TokenizerState"); return default(StateResult); @@ -66,35 +66,35 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } // Optimize memory allocation by returning constants for the most frequent cases - protected override string GetSymbolContent(HtmlSymbolType type) + protected override string GetTokenContent(HtmlTokenType type) { - var symbolLength = Buffer.Length; + var tokenLength = Buffer.Length; - if (symbolLength == 1) + if (tokenLength == 1) { switch (type) { - case HtmlSymbolType.OpenAngle: + case HtmlTokenType.OpenAngle: return "<"; - case HtmlSymbolType.Bang: + case HtmlTokenType.Bang: return "!"; - case HtmlSymbolType.ForwardSlash: + case HtmlTokenType.ForwardSlash: return "/"; - case HtmlSymbolType.QuestionMark: + case HtmlTokenType.QuestionMark: return "?"; - case HtmlSymbolType.LeftBracket: + case HtmlTokenType.LeftBracket: return "["; - case HtmlSymbolType.CloseAngle: + case HtmlTokenType.CloseAngle: return ">"; - case HtmlSymbolType.RightBracket: + case HtmlTokenType.RightBracket: return "]"; - case HtmlSymbolType.Equals: + case HtmlTokenType.Equals: return "="; - case HtmlSymbolType.DoubleQuote: + case HtmlTokenType.DoubleQuote: return "\""; - case HtmlSymbolType.SingleQuote: + case HtmlTokenType.SingleQuote: return "'"; - case HtmlSymbolType.WhiteSpace: + case HtmlTokenType.WhiteSpace: if (Buffer[0] == ' ') { return " "; @@ -104,7 +104,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return "\t"; } break; - case HtmlSymbolType.NewLine: + case HtmlTokenType.NewLine: if (Buffer[0] == '\n') { return "\n"; @@ -113,12 +113,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } } - if (symbolLength == 2 && type == HtmlSymbolType.NewLine) + if (tokenLength == 2 && type == HtmlTokenType.NewLine) { return "\r\n"; } - return base.GetSymbolContent(type); + return base.GetTokenContent(type); } // http://dev.w3.org/html5/spec/Overview.html#data-state @@ -139,21 +139,21 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { return Transition( HtmlTokenizerState.AfterRazorCommentTransition, - EndSymbol(HtmlSymbolType.RazorCommentTransition)); + EndToken(HtmlTokenType.RazorCommentTransition)); } else if (CurrentCharacter == '@') { // Could be escaped comment transition return Transition( HtmlTokenizerState.EscapedRazorCommentTransition, - EndSymbol(HtmlSymbolType.Transition)); + EndToken(HtmlTokenType.Transition)); } - return Stay(EndSymbol(HtmlSymbolType.Transition)); + return Stay(EndToken(HtmlTokenType.Transition)); } - else if (AtSymbol()) + else if (AtToken()) { - return Stay(Symbol()); + return Stay(Token()); } else { @@ -164,7 +164,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private StateResult EscapedRazorCommentTransition() { TakeCurrent(); - return Transition(HtmlTokenizerState.Data, EndSymbol(HtmlSymbolType.Transition)); + return Transition(HtmlTokenizerState.Data, EndToken(HtmlTokenType.Transition)); } private StateResult Text() @@ -172,7 +172,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var prev = '\0'; while (!EndOfFile && !(ParserHelpers.IsWhitespace(CurrentCharacter) || ParserHelpers.IsNewLine(CurrentCharacter)) && - !AtSymbol()) + !AtToken()) { prev = CurrentCharacter; TakeCurrent(); @@ -190,56 +190,56 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } // Output the Text token and return to the Data state to tokenize the next character (if there is one) - return Transition(HtmlTokenizerState.Data, EndSymbol(HtmlSymbolType.Text)); + return Transition(HtmlTokenizerState.Data, EndToken(HtmlTokenType.Text)); } - private HtmlSymbol Symbol() + private HtmlToken Token() { - Debug.Assert(AtSymbol()); + Debug.Assert(AtToken()); var sym = CurrentCharacter; TakeCurrent(); switch (sym) { case '<': - return EndSymbol(HtmlSymbolType.OpenAngle); + return EndToken(HtmlTokenType.OpenAngle); case '!': - return EndSymbol(HtmlSymbolType.Bang); + return EndToken(HtmlTokenType.Bang); case '/': - return EndSymbol(HtmlSymbolType.ForwardSlash); + return EndToken(HtmlTokenType.ForwardSlash); case '?': - return EndSymbol(HtmlSymbolType.QuestionMark); + return EndToken(HtmlTokenType.QuestionMark); case '[': - return EndSymbol(HtmlSymbolType.LeftBracket); + return EndToken(HtmlTokenType.LeftBracket); case '>': - return EndSymbol(HtmlSymbolType.CloseAngle); + return EndToken(HtmlTokenType.CloseAngle); case ']': - return EndSymbol(HtmlSymbolType.RightBracket); + return EndToken(HtmlTokenType.RightBracket); case '=': - return EndSymbol(HtmlSymbolType.Equals); + return EndToken(HtmlTokenType.Equals); case '"': - return EndSymbol(HtmlSymbolType.DoubleQuote); + return EndToken(HtmlTokenType.DoubleQuote); case '\'': - return EndSymbol(HtmlSymbolType.SingleQuote); + return EndToken(HtmlTokenType.SingleQuote); case '-': Debug.Assert(CurrentCharacter == '-'); TakeCurrent(); - return EndSymbol(HtmlSymbolType.DoubleHyphen); + return EndToken(HtmlTokenType.DoubleHyphen); default: - Debug.Fail("Unexpected symbol!"); - return EndSymbol(HtmlSymbolType.Unknown); + Debug.Fail("Unexpected token!"); + return EndToken(HtmlTokenType.Unknown); } } - private HtmlSymbol Whitespace() + private HtmlToken Whitespace() { while (ParserHelpers.IsWhitespace(CurrentCharacter)) { TakeCurrent(); } - return EndSymbol(HtmlSymbolType.WhiteSpace); + return EndToken(HtmlTokenType.WhiteSpace); } - private HtmlSymbol Newline() + private HtmlToken Newline() { Debug.Assert(ParserHelpers.IsNewLine(CurrentCharacter)); // CSharp Spec §2.3.1 @@ -249,10 +249,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { TakeCurrent(); } - return EndSymbol(HtmlSymbolType.NewLine); + return EndToken(HtmlTokenType.NewLine); } - private bool AtSymbol() + private bool AtToken() { return CurrentCharacter == '<' || CurrentCharacter == '<' || @@ -274,7 +274,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return Transition((int)state, result: null); } - private StateResult Transition(HtmlTokenizerState state, HtmlSymbol result) + private StateResult Transition(HtmlTokenizerState state, HtmlToken result) { return Transition((int)state, result); } @@ -289,7 +289,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy EscapedRazorCommentTransition = RazorCommentTokenizerState.EscapedRazorCommentTransition, RazorCommentBody = RazorCommentTokenizerState.RazorCommentBody, StarAfterRazorCommentBody = RazorCommentTokenizerState.StarAfterRazorCommentBody, - AtSymbolAfterRazorCommentBody = RazorCommentTokenizerState.AtSymbolAfterRazorCommentBody, + AtTokenAfterRazorCommentBody = RazorCommentTokenizerState.AtTokenAfterRazorCommentBody, } } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/ISymbol.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/IToken.cs similarity index 91% rename from src/Microsoft.AspNetCore.Razor.Language/Legacy/ISymbol.cs rename to src/Microsoft.AspNetCore.Razor.Language/Legacy/IToken.cs index 346a390375..2f8eb1214d 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/ISymbol.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/IToken.cs @@ -3,7 +3,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { - internal interface ISymbol + internal interface IToken { Span Parent { get; set; } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/ITokenizer.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/ITokenizer.cs index 30e5186afb..530df75dbc 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/ITokenizer.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/ITokenizer.cs @@ -5,6 +5,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { internal interface ITokenizer { - ISymbol NextSymbol(); + IToken NextToken(); } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/ImplicitExpressionEditHandler.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/ImplicitExpressionEditHandler.cs index a55c2a8949..b3869f00d0 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/ImplicitExpressionEditHandler.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/ImplicitExpressionEditHandler.cs @@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private readonly ISet _keywords; private readonly IReadOnlyCollection _readOnlyKeywords; - public ImplicitExpressionEditHandler(Func> tokenizer, ISet keywords, bool acceptTrailingDot) + public ImplicitExpressionEditHandler(Func> tokenizer, ISet keywords, bool acceptTrailingDot) : base(tokenizer) { _keywords = keywords ?? new HashSet(); @@ -170,44 +170,44 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return false; } - for (var i = 0; i < target.Symbols.Count; i++) + for (var i = 0; i < target.Tokens.Count; i++) { - var symbol = target.Symbols[i] as CSharpSymbol; + var token = target.Tokens[i] as CSharpToken; - if (symbol == null) + if (token == null) { break; } - var symbolStartIndex = symbol.Start.AbsoluteIndex; - var symbolEndIndex = symbolStartIndex + symbol.Content.Length; + var tokenStartIndex = token.Start.AbsoluteIndex; + var tokenEndIndex = tokenStartIndex + token.Content.Length; - // We're looking for the first symbol that contains the SourceChange. - if (symbolEndIndex > change.Span.AbsoluteIndex) + // We're looking for the first token that contains the SourceChange. + if (tokenEndIndex > change.Span.AbsoluteIndex) { - if (symbolEndIndex >= change.Span.AbsoluteIndex + change.Span.Length && symbol.Type == CSharpSymbolType.Identifier) + if (tokenEndIndex >= change.Span.AbsoluteIndex + change.Span.Length && token.Type == CSharpTokenType.Identifier) { - // The symbol we're changing happens to be an identifier. Need to check if its transformed state is also one. + // The token we're changing happens to be an identifier. Need to check if its transformed state is also one. // We do this transformation logic to capture the case that the new text change happens to not be an identifier; // i.e. "5". Alone, it's numeric, within an identifier it's classified as identifier. - var transformedContent = change.GetEditedContent(symbol.Content, change.Span.AbsoluteIndex - symbolStartIndex); - var newSymbols = Tokenizer(transformedContent); + var transformedContent = change.GetEditedContent(token.Content, change.Span.AbsoluteIndex - tokenStartIndex); + var newTokens = Tokenizer(transformedContent); - if (newSymbols.Count() != 1) + if (newTokens.Count() != 1) { - // The transformed content resulted in more than one symbol; we can only replace a single identifier with + // The transformed content resulted in more than one token; we can only replace a single identifier with // another single identifier. break; } - var newSymbol = (CSharpSymbol)newSymbols.First(); - if (newSymbol.Type == CSharpSymbolType.Identifier) + var newToken = (CSharpToken)newTokens.First(); + if (newToken.Type == CSharpTokenType.Identifier) { return true; } } - // Change is touching a non-identifier symbol or spans multiple symbols. + // Change is touching a non-identifier token or spans multiple tokens. break; } @@ -241,7 +241,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var changeStart = change.Span.AbsoluteIndex; var changeLength = change.Span.Length; var changeEnd = changeStart + changeLength; - var tokens = target.Symbols.Cast().ToArray(); + var tokens = target.Tokens.Cast().ToArray(); if (!IsInsideParenthesis(changeStart, tokens) || !IsInsideParenthesis(changeEnd, tokens)) { // Either the start or end of the delete does not fall inside of parenthesis, unacceptable inner deletion. @@ -274,7 +274,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return false; } - var tokens = target.Symbols.Cast().ToArray(); + var tokens = target.Tokens.Cast().ToArray(); if (IsInsideParenthesis(change.Span.AbsoluteIndex, tokens)) { return true; @@ -284,7 +284,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } // Internal for testing - internal static bool IsInsideParenthesis(int position, IReadOnlyList tokens) + internal static bool IsInsideParenthesis(int position, IReadOnlyList tokens) { var balanceCount = 0; var foundInsertionPoint = false; @@ -322,7 +322,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } // Internal for testing - internal static bool ContainsPosition(int position, CSharpSymbol currentToken) + internal static bool ContainsPosition(int position, CSharpToken currentToken) { var tokenStart = currentToken.Start.AbsoluteIndex; if (tokenStart == position) @@ -342,14 +342,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } // Internal for testing - internal static bool TryUpdateBalanceCount(CSharpSymbol token, ref int count) + internal static bool TryUpdateBalanceCount(CSharpToken token, ref int count) { var updatedCount = count; - if (token.Type == CSharpSymbolType.LeftParenthesis) + if (token.Type == CSharpTokenType.LeftParenthesis) { updatedCount++; } - else if (token.Type == CSharpSymbolType.RightParenthesis) + else if (token.Type == CSharpTokenType.RightParenthesis) { if (updatedCount == 0) { @@ -358,7 +358,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy updatedCount--; } - else if (token.Type == CSharpSymbolType.StringLiteral) + else if (token.Type == CSharpTokenType.StringLiteral) { var content = token.Content; if (content.Length > 0 && content[content.Length - 1] != '"') @@ -370,7 +370,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } } } - else if (token.Type == CSharpSymbolType.CharacterLiteral) + else if (token.Type == CSharpTokenType.CharacterLiteral) { var content = token.Content; if (content.Length > 0 && content[content.Length - 1] != '\'') diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/KnownSymbolType.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/KnownTokenType.cs similarity index 92% rename from src/Microsoft.AspNetCore.Razor.Language/Legacy/KnownSymbolType.cs rename to src/Microsoft.AspNetCore.Razor.Language/Legacy/KnownTokenType.cs index a1ed444ac9..ca5fad7254 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/KnownSymbolType.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/KnownTokenType.cs @@ -3,7 +3,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { - internal enum KnownSymbolType + internal enum KnownTokenType { WhiteSpace, NewLine, diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/LanguageCharacteristics.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/LanguageCharacteristics.cs index 23d5f037d0..b12bf612b9 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/LanguageCharacteristics.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/LanguageCharacteristics.cs @@ -6,104 +6,104 @@ using System.Collections.Generic; namespace Microsoft.AspNetCore.Razor.Language.Legacy { - internal abstract class LanguageCharacteristics - where TSymbolType : struct - where TTokenizer : Tokenizer - where TSymbol : SymbolBase + internal abstract class LanguageCharacteristics + where TTokenType : struct + where TTokenizer : Tokenizer + where TToken : TokenBase { - public abstract string GetSample(TSymbolType type); + public abstract string GetSample(TTokenType type); public abstract TTokenizer CreateTokenizer(ITextDocument source); - public abstract TSymbolType FlipBracket(TSymbolType bracket); - public abstract TSymbol CreateMarkerSymbol(); + public abstract TTokenType FlipBracket(TTokenType bracket); + public abstract TToken CreateMarkerToken(); - public virtual IEnumerable TokenizeString(string content) + public virtual IEnumerable TokenizeString(string content) { return TokenizeString(SourceLocation.Zero, content); } - public virtual IEnumerable TokenizeString(SourceLocation start, string input) + public virtual IEnumerable TokenizeString(SourceLocation start, string input) { using (var reader = new SeekableTextReader(input, start.FilePath)) { var tok = CreateTokenizer(reader); - TSymbol sym; - while ((sym = tok.NextSymbol()) != null) + TToken token; + while ((token = tok.NextToken()) != null) { - yield return sym; + yield return token; } } } - public virtual bool IsWhiteSpace(TSymbol symbol) + public virtual bool IsWhiteSpace(TToken token) { - return IsKnownSymbolType(symbol, KnownSymbolType.WhiteSpace); + return IsKnownTokenType(token, KnownTokenType.WhiteSpace); } - public virtual bool IsNewLine(TSymbol symbol) + public virtual bool IsNewLine(TToken token) { - return IsKnownSymbolType(symbol, KnownSymbolType.NewLine); + return IsKnownTokenType(token, KnownTokenType.NewLine); } - public virtual bool IsIdentifier(TSymbol symbol) + public virtual bool IsIdentifier(TToken token) { - return IsKnownSymbolType(symbol, KnownSymbolType.Identifier); + return IsKnownTokenType(token, KnownTokenType.Identifier); } - public virtual bool IsKeyword(TSymbol symbol) + public virtual bool IsKeyword(TToken token) { - return IsKnownSymbolType(symbol, KnownSymbolType.Keyword); + return IsKnownTokenType(token, KnownTokenType.Keyword); } - public virtual bool IsTransition(TSymbol symbol) + public virtual bool IsTransition(TToken token) { - return IsKnownSymbolType(symbol, KnownSymbolType.Transition); + return IsKnownTokenType(token, KnownTokenType.Transition); } - public virtual bool IsCommentStart(TSymbol symbol) + public virtual bool IsCommentStart(TToken token) { - return IsKnownSymbolType(symbol, KnownSymbolType.CommentStart); + return IsKnownTokenType(token, KnownTokenType.CommentStart); } - public virtual bool IsCommentStar(TSymbol symbol) + public virtual bool IsCommentStar(TToken token) { - return IsKnownSymbolType(symbol, KnownSymbolType.CommentStar); + return IsKnownTokenType(token, KnownTokenType.CommentStar); } - public virtual bool IsCommentBody(TSymbol symbol) + public virtual bool IsCommentBody(TToken token) { - return IsKnownSymbolType(symbol, KnownSymbolType.CommentBody); + return IsKnownTokenType(token, KnownTokenType.CommentBody); } - public virtual bool IsUnknown(TSymbol symbol) + public virtual bool IsUnknown(TToken token) { - return IsKnownSymbolType(symbol, KnownSymbolType.Unknown); + return IsKnownTokenType(token, KnownTokenType.Unknown); } - public virtual bool IsKnownSymbolType(TSymbol symbol, KnownSymbolType type) + public virtual bool IsKnownTokenType(TToken token, KnownTokenType type) { - return symbol != null && Equals(symbol.Type, GetKnownSymbolType(type)); + return token != null && Equals(token.Type, GetKnownTokenType(type)); } - public virtual Tuple SplitSymbol(TSymbol symbol, int splitAt, TSymbolType leftType) + public virtual Tuple SplitToken(TToken token, int splitAt, TTokenType leftType) { - var left = CreateSymbol(symbol.Content.Substring(0, splitAt), leftType, RazorDiagnostic.EmptyArray); + var left = CreateToken(token.Content.Substring(0, splitAt), leftType, RazorDiagnostic.EmptyArray); - TSymbol right = null; - if (splitAt < symbol.Content.Length) + TToken right = null; + if (splitAt < token.Content.Length) { - right = CreateSymbol(symbol.Content.Substring(splitAt), symbol.Type, symbol.Errors); + right = CreateToken(token.Content.Substring(splitAt), token.Type, token.Errors); } return Tuple.Create(left, right); } - public abstract TSymbolType GetKnownSymbolType(KnownSymbolType type); + public abstract TTokenType GetKnownTokenType(KnownTokenType type); - public virtual bool KnowsSymbolType(KnownSymbolType type) + public virtual bool KnowsTokenType(KnownTokenType type) { - return type == KnownSymbolType.Unknown || !Equals(GetKnownSymbolType(type), GetKnownSymbolType(KnownSymbolType.Unknown)); + return type == KnownTokenType.Unknown || !Equals(GetKnownTokenType(type), GetKnownTokenType(KnownTokenType.Unknown)); } - protected abstract TSymbol CreateSymbol(string content, TSymbolType type, IReadOnlyList errors); + protected abstract TToken CreateToken(string content, TTokenType type, IReadOnlyList errors); } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/MarkupRewriter.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/MarkupRewriter.cs index 6ce51f273f..42074050ff 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/MarkupRewriter.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/MarkupRewriter.cs @@ -67,7 +67,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy builder.Kind = SpanKindInternal.Markup; builder.ChunkGenerator = new MarkupChunkGenerator(); - foreach (ISymbol sym in HtmlLanguageCharacteristics.Instance.TokenizeString(start, content)) + foreach (IToken sym in HtmlLanguageCharacteristics.Instance.TokenizeString(start, content)) { builder.Accept(sym); } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/Span.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/Span.cs index 9b7366fc5e..fbf9f9f2c2 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/Span.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/Span.cs @@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public ISpanChunkGenerator ChunkGenerator { get; private set; } public SpanKindInternal Kind { get; private set; } - public IReadOnlyList Symbols { get; private set; } + public IReadOnlyList Tokens { get; private set; } // Allow test code to re-link spans public Span Previous { get; internal set; } @@ -42,9 +42,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var length = 0; if (_content == null) { - for (var i = 0; i < Symbols.Count; i++) + for (var i = 0; i < Tokens.Count; i++) { - length += Symbols[i].Content.Length; + length += Tokens[i].Content.Length; } } else @@ -67,19 +67,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { if (_content == null) { - var symbolCount = Symbols.Count; - if (symbolCount == 1) + var tokenCount = Tokens.Count; + if (tokenCount == 1) { // Perf: no StringBuilder allocation if not necessary - _content = Symbols[0].Content; + _content = Tokens[0].Content; } else { var builder = new StringBuilder(); - for (var i = 0; i < symbolCount; i++) + for (var i = 0; i < tokenCount; i++) { - var symbol = Symbols[i]; - builder.Append(symbol.Content); + var token = Tokens[i]; + builder.Append(token.Content); } _content = builder.ToString(); @@ -93,11 +93,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public void ReplaceWith(SpanBuilder builder) { Kind = builder.Kind; - Symbols = builder.Symbols; + Tokens = builder.Tokens; - for (var i = 0; i Gen: <"); builder.Append(ChunkGenerator.ToString()); builder.Append("> {"); - builder.Append(string.Join(";", Symbols.GroupBy(sym => sym.GetType()).Select(grp => string.Concat(grp.Key.Name, ":", grp.Count())))); + builder.Append(string.Join(";", Tokens.GroupBy(sym => sym.GetType()).Select(grp => string.Concat(grp.Key.Name, ":", grp.Count())))); builder.Append("}"); return builder.ToString(); } @@ -166,7 +166,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Kind.Equals(other.Kind) && EditHandler.Equals(other.EditHandler) && ChunkGenerator.Equals(other.ChunkGenerator) && - Symbols.SequenceEqual(other.Symbols); + Tokens.SequenceEqual(other.Tokens); } public override int GetHashCode() diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanBuilder.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanBuilder.cs index b9b9e2df54..6d2e647b91 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanBuilder.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanBuilder.cs @@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy internal class SpanBuilder { private SourceLocation _start; - private List _symbols; + private List _tokens; private SourceLocationTracker _tracker; public SpanBuilder(Span original) @@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy _start = original.Start; ChunkGenerator = original.ChunkGenerator; - _symbols = new List(original.Symbols); + _tokens = new List(original.Tokens); _tracker = new SourceLocationTracker(original.Start); } @@ -49,16 +49,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public SpanKindInternal Kind { get; set; } - public IReadOnlyList Symbols + public IReadOnlyList Tokens { get { - if (_symbols == null) + if (_tokens == null) { - _symbols = new List(); + _tokens = new List(); } - return _symbols; + return _tokens; } } @@ -68,10 +68,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { // Need to potentially allocate a new list because Span.ReplaceWith takes ownership // of the original list. - _symbols = null; - _symbols = new List(); + _tokens = null; + _tokens = new List(); - EditHandler = SpanEditHandler.CreateDefault((content) => Enumerable.Empty()); + EditHandler = SpanEditHandler.CreateDefault((content) => Enumerable.Empty()); ChunkGenerator = SpanChunkGenerator.Null; Start = SourceLocation.Undefined; } @@ -80,23 +80,23 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { var span = new Span(this); - for (var i = 0; i < span.Symbols.Count; i++) + for (var i = 0; i < span.Tokens.Count; i++) { - var symbol = span.Symbols[i]; - symbol.Parent = span; + var token = span.Tokens[i]; + token.Parent = span; } return span; } - public void ClearSymbols() + public void ClearTokens() { - _symbols?.Clear(); + _tokens?.Clear(); } - public void Accept(ISymbol symbol) + public void Accept(IToken token) { - if (symbol == null) + if (token == null) { return; } @@ -106,8 +106,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy throw new InvalidOperationException("SpanBuilder must have a valid location"); } - _symbols.Add(symbol); - _tracker.UpdateLocation(symbol.Content); + _tokens.Add(token); + _tracker.UpdateLocation(token.Content); } } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanEditHandler.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanEditHandler.cs index dd9511ce70..d5407f34dd 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanEditHandler.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanEditHandler.cs @@ -11,12 +11,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { private static readonly int TypeHashCode = typeof(SpanEditHandler).GetHashCode(); - public SpanEditHandler(Func> tokenizer) + public SpanEditHandler(Func> tokenizer) : this(tokenizer, AcceptedCharactersInternal.Any) { } - public SpanEditHandler(Func> tokenizer, AcceptedCharactersInternal accepted) + public SpanEditHandler(Func> tokenizer, AcceptedCharactersInternal accepted) { AcceptedCharacters = accepted; Tokenizer = tokenizer; @@ -24,9 +24,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public AcceptedCharactersInternal AcceptedCharacters { get; set; } - public Func> Tokenizer { get; set; } + public Func> Tokenizer { get; set; } - public static SpanEditHandler CreateDefault(Func> tokenizer) + public static SpanEditHandler CreateDefault(Func> tokenizer) { return new SpanEditHandler(tokenizer); } @@ -69,7 +69,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { var newContent = change.GetEditedContent(target); var newSpan = new SpanBuilder(target); - newSpan.ClearSymbols(); + newSpan.ClearTokens(); foreach (var token in Tokenizer(newContent)) { newSpan.Accept(token); diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/SyntaxTreeNode.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/SyntaxTreeNode.cs index a20c7c318b..1b7b192db9 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/SyntaxTreeNode.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/SyntaxTreeNode.cs @@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy /// The node to compare this node with /// /// true if the provided node has all the same content and metadata, though the specific quantity and type of - /// symbols may be different. + /// tokens may be different. /// public abstract bool EquivalentTo(SyntaxTreeNode node); diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlockRewriter.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlockRewriter.cs index d3a58ac598..f08d0579e5 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlockRewriter.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperBlockRewriter.cs @@ -42,8 +42,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // We skip the first child "" or "/>". // The -2 accounts for both the start and end tags. If the tag does not have a valid structure then there's // no end tag to ignore. - var symbolOffset = validStructure ? 2 : 1; - var attributeChildren = tagBlock.Children.Skip(1).Take(tagBlock.Children.Count() - symbolOffset); + var tokenOffset = validStructure ? 2 : 1; + var attributeChildren = tagBlock.Children.Skip(1).Take(tagBlock.Children.Count() - tokenOffset); var processedBoundAttributeNames = new HashSet(StringComparer.OrdinalIgnoreCase); foreach (var child in attributeChildren) @@ -149,8 +149,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Kind = span.Kind }; - // Will contain symbols that represent a single attribute value: - var htmlSymbols = span.Symbols.OfType().ToArray(); + // Will contain tokens that represent a single attribute value: + var htmlTokens = span.Tokens.OfType().ToArray(); var capturedAttributeValueStart = false; var attributeValueStartLocation = span.Start; @@ -158,53 +158,53 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // TryParseBlock() variation of attribute parsing. var attributeValueStyle = AttributeStructure.DoubleQuotes; - // The symbolOffset is initialized to 0 to expect worst case: "class=". If a quote is found later on for - // the attribute value the symbolOffset is adjusted accordingly. - var symbolOffset = 0; + // The tokenOffset is initialized to 0 to expect worst case: "class=". If a quote is found later on for + // the attribute value the tokenOffset is adjusted accordingly. + var tokenOffset = 0; string name = null; - // Iterate down through the symbols to find the name and the start of the value. - // We subtract the symbolOffset so we don't accept an ending quote of a span. - for (var i = 0; i < htmlSymbols.Length - symbolOffset; i++) + // Iterate down through the tokens to find the name and the start of the value. + // We subtract the tokenOffset so we don't accept an ending quote of a span. + for (var i = 0; i < htmlTokens.Length - tokenOffset; i++) { - var symbol = htmlSymbols[i]; + var token = htmlTokens[i]; if (afterEquals) { // We've captured all leading whitespace, the attribute name, and an equals with an optional // quote/double quote. We're now at: " asp-for='|...'" or " asp-for=|..." - // The goal here is to capture all symbols until the end of the attribute. Note this will not - // consume an ending quote due to the symbolOffset. + // The goal here is to capture all tokens until the end of the attribute. Note this will not + // consume an ending quote due to the tokenOffset. - // When symbols are accepted into SpanBuilders, their locations get altered to be offset by the - // parent which is why we need to mark our start location prior to adding the symbol. + // When tokens are accepted into SpanBuilders, their locations get altered to be offset by the + // parent which is why we need to mark our start location prior to adding the token. // This is needed to know the location of the attribute value start within the document. if (!capturedAttributeValueStart) { capturedAttributeValueStart = true; - attributeValueStartLocation = symbol.Start; + attributeValueStartLocation = token.Start; } - builder.Accept(symbol); + builder.Accept(token); } - else if (name == null && HtmlMarkupParser.IsValidAttributeNameSymbol(symbol)) + else if (name == null && HtmlMarkupParser.IsValidAttributeNameToken(token)) { // We've captured all leading whitespace prior to the attribute name. // We're now at: " |asp-for='...'" or " |asp-for=..." // The goal here is to capture the attribute name. var nameBuilder = new StringBuilder(); - // Move the indexer past the attribute name symbols. - for (var j = i; j < htmlSymbols.Length; j++) + // Move the indexer past the attribute name tokens. + for (var j = i; j < htmlTokens.Length; j++) { - var nameSymbol = htmlSymbols[j]; - if (!HtmlMarkupParser.IsValidAttributeNameSymbol(nameSymbol)) + var nameToken = htmlTokens[j]; + if (!HtmlMarkupParser.IsValidAttributeNameToken(nameToken)) { break; } - nameBuilder.Append(nameSymbol.Content); + nameBuilder.Append(nameToken.Content); i++; } @@ -213,67 +213,67 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy name = nameBuilder.ToString(); attributeValueStartLocation = SourceLocationTracker.Advance(attributeValueStartLocation, name); } - else if (symbol.Type == HtmlSymbolType.Equals) + else if (token.Type == HtmlTokenType.Equals) { // We've captured all leading whitespace and the attribute name. // We're now at: " asp-for|='...'" or " asp-for|=..." // The goal here is to consume the equal sign and the optional single/double-quote. - // The coming symbols will either be a quote or value (in the case that the value is unquoted). + // The coming tokens will either be a quote or value (in the case that the value is unquoted). - SourceLocation symbolStartLocation; + SourceLocation tokenStartLocation; // Skip the whitespace preceding the start of the attribute value. do { - i++; // Start from the symbol after '='. - } while (i < htmlSymbols.Length && - (htmlSymbols[i].Type == HtmlSymbolType.WhiteSpace || - htmlSymbols[i].Type == HtmlSymbolType.NewLine)); + i++; // Start from the token after '='. + } while (i < htmlTokens.Length && + (htmlTokens[i].Type == HtmlTokenType.WhiteSpace || + htmlTokens[i].Type == HtmlTokenType.NewLine)); // Check for attribute start values, aka single or double quote - if (i < htmlSymbols.Length && IsQuote(htmlSymbols[i])) + if (i < htmlTokens.Length && IsQuote(htmlTokens[i])) { - if (htmlSymbols[i].Type == HtmlSymbolType.SingleQuote) + if (htmlTokens[i].Type == HtmlTokenType.SingleQuote) { attributeValueStyle = AttributeStructure.SingleQuotes; } - symbolStartLocation = htmlSymbols[i].Start; + tokenStartLocation = htmlTokens[i].Start; // If there's a start quote then there must be an end quote to be valid, skip it. - symbolOffset = 1; + tokenOffset = 1; } else { - // We are at the symbol after equals. Go back to equals to ensure we don't skip past that symbol. + // We are at the token after equals. Go back to equals to ensure we don't skip past that token. i--; - symbolStartLocation = symbol.Start; + tokenStartLocation = token.Start; } attributeValueStartLocation = new SourceLocation( - symbolStartLocation.FilePath, - symbolStartLocation.AbsoluteIndex + 1, - symbolStartLocation.LineIndex, - symbolStartLocation.CharacterIndex + 1); + tokenStartLocation.FilePath, + tokenStartLocation.AbsoluteIndex + 1, + tokenStartLocation.LineIndex, + tokenStartLocation.CharacterIndex + 1); afterEquals = true; } - else if (symbol.Type == HtmlSymbolType.WhiteSpace) + else if (token.Type == HtmlTokenType.WhiteSpace) { // We're at the start of the attribute, this branch may be hit on the first iterations of - // the loop since the parser separates attributes with their spaces included as symbols. + // the loop since the parser separates attributes with their spaces included as tokens. // We're at: "| asp-for='...'" or "| asp-for=..." // Note: This will not be hit even for situations like asp-for ="..." because the core Razor // parser currently does not know how to handle attributes in that format. This will be addressed // by https://github.com/aspnet/Razor/issues/123. - attributeValueStartLocation = SourceLocationTracker.Advance(attributeValueStartLocation, symbol.Content); + attributeValueStartLocation = SourceLocationTracker.Advance(attributeValueStartLocation, token.Content); } } - // After all symbols have been added we need to set the builders start position so we do not indirectly + // After all tokens have been added we need to set the builders start position so we do not indirectly // modify the span's start location. builder.Start = attributeValueStartLocation; @@ -341,14 +341,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return TryParseSpan(childSpan, descriptors, errorSink, processedBoundAttributeNames); } - var nameSymbols = childSpan - .Symbols - .OfType() - .SkipWhile(symbol => !HtmlMarkupParser.IsValidAttributeNameSymbol(symbol)) // Skip prefix - .TakeWhile(nameSymbol => HtmlMarkupParser.IsValidAttributeNameSymbol(nameSymbol)) - .Select(nameSymbol => nameSymbol.Content); + var nameTokens = childSpan + .Tokens + .OfType() + .SkipWhile(token => !HtmlMarkupParser.IsValidAttributeNameToken(token)) // Skip prefix + .TakeWhile(nameToken => HtmlMarkupParser.IsValidAttributeNameToken(nameToken)) + .Select(nameToken => nameToken.Content); - var name = string.Concat(nameSymbols); + var name = string.Concat(nameTokens); if (string.IsNullOrEmpty(name)) { var location = new SourceSpan(childSpan.Start, childSpan.Length); @@ -362,12 +362,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var result = CreateTryParseResult(name, descriptors, processedBoundAttributeNames); var firstChild = builder.Children[0] as Span; - if (firstChild != null && firstChild.Symbols[0] is HtmlSymbol) + if (firstChild != null && firstChild.Tokens[0] is HtmlToken) { - var htmlSymbol = firstChild.Symbols[firstChild.Symbols.Count - 1] as HtmlSymbol; - switch (htmlSymbol.Type) + var htmlToken = firstChild.Tokens[firstChild.Tokens.Count - 1] as HtmlToken; + switch (htmlToken.Type) { - case HtmlSymbolType.Equals: + case HtmlTokenType.Equals: if (builder.Children.Count == 2 && builder.Children[1] is Span value && value.Kind == SpanKindInternal.Markup) @@ -385,10 +385,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy result.AttributeStructure = AttributeStructure.DoubleQuotes; } break; - case HtmlSymbolType.DoubleQuote: + case HtmlTokenType.DoubleQuote: result.AttributeStructure = AttributeStructure.DoubleQuotes; break; - case HtmlSymbolType.SingleQuote: + case HtmlTokenType.SingleQuote: result.AttributeStructure = AttributeStructure.SingleQuotes; break; default: @@ -407,12 +407,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var endSpan = (Span)endNode; // In some malformed cases e.g.

0) + if (childSpan.Tokens.Count > 0) { - var potentialQuote = childSpan.Symbols[childSpan.Symbols.Count - 1] as HtmlSymbol; + var potentialQuote = childSpan.Tokens[childSpan.Tokens.Count - 1] as HtmlToken; if (potentialQuote != null && - (potentialQuote.Type == HtmlSymbolType.DoubleQuote || - potentialQuote.Type == HtmlSymbolType.SingleQuote)) + (potentialQuote.Type == HtmlTokenType.DoubleQuote || + potentialQuote.Type == HtmlTokenType.SingleQuote)) { childOffset = 1; } @@ -391,9 +391,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy else { var valueChildSpan = (Span)valueChild; - for (var k = 0; k < valueChildSpan.Symbols.Count; k++) + for (var k = 0; k < valueChildSpan.Tokens.Count; k++) { - _attributeValueBuilder.Append(valueChildSpan.Symbols[k].Content); + _attributeValueBuilder.Append(valueChildSpan.Tokens[k].Content); } } } @@ -404,43 +404,43 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var afterEquals = false; var atValue = false; - var endValueMarker = childSpan.Symbols.Count; + var endValueMarker = childSpan.Tokens.Count; // Entire attribute is a string for (var j = 0; j < endValueMarker; j++) { - var htmlSymbol = (HtmlSymbol)childSpan.Symbols[j]; + var htmlToken = (HtmlToken)childSpan.Tokens[j]; if (!afterEquals) { - afterEquals = htmlSymbol.Type == HtmlSymbolType.Equals; + afterEquals = htmlToken.Type == HtmlTokenType.Equals; continue; } if (!atValue) { - atValue = htmlSymbol.Type != HtmlSymbolType.WhiteSpace && - htmlSymbol.Type != HtmlSymbolType.NewLine; + atValue = htmlToken.Type != HtmlTokenType.WhiteSpace && + htmlToken.Type != HtmlTokenType.NewLine; if (atValue) { - if (htmlSymbol.Type == HtmlSymbolType.DoubleQuote || - htmlSymbol.Type == HtmlSymbolType.SingleQuote) + if (htmlToken.Type == HtmlTokenType.DoubleQuote || + htmlToken.Type == HtmlTokenType.SingleQuote) { endValueMarker--; } else { - // Current symbol is considered the value (unquoted). Add its content to the + // Current token is considered the value (unquoted). Add its content to the // attribute value builder before we move past it. - _attributeValueBuilder.Append(htmlSymbol.Content); + _attributeValueBuilder.Append(htmlToken.Content); } } continue; } - _attributeValueBuilder.Append(htmlSymbol.Content); + _attributeValueBuilder.Append(htmlToken.Content); } } @@ -642,11 +642,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // If our tag end is not a markup span it means it's some sort of code SyntaxTreeNode (not a valid format) if (tagEnd != null && tagEnd.Kind == SpanKindInternal.Markup) { - var endSymbol = tagEnd.Symbols.Count > 0 ? - tagEnd.Symbols[tagEnd.Symbols.Count - 1] as HtmlSymbol : + var endToken = tagEnd.Tokens.Count > 0 ? + tagEnd.Tokens[tagEnd.Tokens.Count - 1] as HtmlToken : null; - if (endSymbol != null && endSymbol.Type == HtmlSymbolType.CloseAngle) + if (endToken != null && endToken.Type == HtmlTokenType.CloseAngle) { return false; } @@ -793,25 +793,25 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } var childSpan = (Span)child; - HtmlSymbol textSymbol = null; - for (var i = 0; i < childSpan.Symbols.Count; i++) + HtmlToken textToken = null; + for (var i = 0; i < childSpan.Tokens.Count; i++) { - var symbol = childSpan.Symbols[i] as HtmlSymbol; + var token = childSpan.Tokens[i] as HtmlToken; - if (symbol != null && - (symbol.Type & (HtmlSymbolType.WhiteSpace | HtmlSymbolType.Text)) == symbol.Type) + if (token != null && + (token.Type & (HtmlTokenType.WhiteSpace | HtmlTokenType.Text)) == token.Type) { - textSymbol = symbol; + textToken = token; break; } } - if (textSymbol == null) + if (textToken == null) { return null; } - return textSymbol.Type == HtmlSymbolType.WhiteSpace ? null : textSymbol.Content; + return textToken.Type == HtmlTokenType.WhiteSpace ? null : textToken.Content; } private static bool IsEndTag(Block tagBlock) @@ -820,10 +820,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var childSpan = (Span)tagBlock.Children.First(); - // We grab the symbol that could be forward slash - var relevantSymbol = (HtmlSymbol)childSpan.Symbols[childSpan.Symbols.Count == 1 ? 0 : 1]; + // We grab the token that could be forward slash + var relevantToken = (HtmlToken)childSpan.Tokens[childSpan.Tokens.Count == 1 ? 0 : 1]; - return relevantSymbol.Type == HtmlSymbolType.ForwardSlash; + return relevantToken.Type == HtmlTokenType.ForwardSlash; } internal static bool IsComment(Span span) diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/SymbolBase.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenBase.cs similarity index 83% rename from src/Microsoft.AspNetCore.Razor.Language/Legacy/SymbolBase.cs rename to src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenBase.cs index c1caebb988..562a41f5bc 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/SymbolBase.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenBase.cs @@ -8,9 +8,9 @@ using Microsoft.Extensions.Internal; namespace Microsoft.AspNetCore.Razor.Language.Legacy { - internal abstract class SymbolBase : ISymbol where TType : struct + internal abstract class TokenBase : IToken where TType : struct { - protected SymbolBase( + protected TokenBase( string content, TType type, IReadOnlyList errors) @@ -43,15 +43,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } var tracker = new SourceLocationTracker(Parent.Start); - for (var i = 0; i < Parent.Symbols.Count; i++) + for (var i = 0; i < Parent.Tokens.Count; i++) { - var symbol = Parent.Symbols[i]; - if (object.ReferenceEquals(this, symbol)) + var token = Parent.Tokens[i]; + if (object.ReferenceEquals(this, token)) { break; } - tracker.UpdateLocation(symbol.Content); + tracker.UpdateLocation(token.Content); } return tracker.CurrentLocation; @@ -60,7 +60,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public override bool Equals(object obj) { - var other = obj as SymbolBase; + var other = obj as TokenBase; return other != null && string.Equals(Content, other.Content, StringComparison.Ordinal) && Type.Equals(other.Type); diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/Tokenizer.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/Tokenizer.cs index 465754f6d5..af77d2ddc6 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/Tokenizer.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/Tokenizer.cs @@ -8,9 +8,9 @@ using System.Text; namespace Microsoft.AspNetCore.Razor.Language.Legacy { - internal abstract partial class Tokenizer : ITokenizer - where TSymbolType : struct - where TSymbol : SymbolBase + internal abstract partial class Tokenizer : ITokenizer + where TTokenType : struct + where TToken : TokenBase { protected Tokenizer(ITextDocument source) { @@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Source = source; Buffer = new StringBuilder(); CurrentErrors = new List(); - StartSymbol(); + StartToken(); } protected List CurrentErrors { get; } @@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy protected int? CurrentState { get; set; } - protected TSymbol CurrentSymbol { get; private set; } + protected TToken CurrentToken { get; private set; } public ITextDocument Source { get; private set; } @@ -42,9 +42,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy get { return Source.Peek() == -1; } } - public abstract TSymbolType RazorCommentStarType { get; } - public abstract TSymbolType RazorCommentType { get; } - public abstract TSymbolType RazorCommentTransitionType { get; } + public abstract TTokenType RazorCommentStarType { get; } + public abstract TTokenType RazorCommentType { get; } + public abstract TTokenType RazorCommentTransitionType { get; } protected bool HaveContent { @@ -64,27 +64,27 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public SourceLocation CurrentStart { get; private set; } - protected abstract TSymbol CreateSymbol(string content, TSymbolType type, IReadOnlyList errors); + protected abstract TToken CreateToken(string content, TTokenType type, IReadOnlyList errors); protected abstract StateResult Dispatch(); - ISymbol ITokenizer.NextSymbol() + IToken ITokenizer.NextToken() { - return NextSymbol(); + return NextToken(); } - public virtual TSymbol NextSymbol() + public virtual TToken NextToken() { // Post-Condition: Buffer should be empty at the start of Next() Debug.Assert(Buffer.Length == 0); - StartSymbol(); + StartToken(); if (EndOfFile) { return null; } - var symbol = Turn(); + var token = Turn(); // Post-Condition: Buffer should be empty at the end of Next() Debug.Assert(Buffer.Length == 0); @@ -92,10 +92,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Post-Condition: Token should be non-zero length unless we're at EOF. Debug.Assert(EndOfFile || !CurrentStart.Equals(CurrentLocation)); - return symbol; + return token; } - protected virtual TSymbol Turn() + protected virtual TToken Turn() { if (CurrentState != null) { @@ -105,19 +105,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var next = Dispatch(); CurrentState = next.State; - CurrentSymbol = next.Result; + CurrentToken = next.Result; } - while (CurrentState != null && CurrentSymbol == null); + while (CurrentState != null && CurrentToken == null); if (CurrentState == null) { - return default(TSymbol); // Terminated + return default(TToken); // Terminated } - return CurrentSymbol; + return CurrentToken; } - return default(TSymbol); + return default(TToken); } public void Reset() @@ -149,7 +149,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy /// Returns a result containing the specified output and indicating that the next call to /// should invoke the provided state. /// - protected StateResult Transition(int state, TSymbol result) + protected StateResult Transition(int state, TToken result) { return new StateResult(state, result); } @@ -159,7 +159,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return new StateResult((int)state, result: null); } - protected StateResult Transition(RazorCommentTokenizerState state, TSymbol result) + protected StateResult Transition(RazorCommentTokenizerState state, TToken result) { return new StateResult((int)state, result); } @@ -180,18 +180,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy /// Returns a result containing the specified output and indicating that the next call to /// should re-invoke the current state. /// - protected StateResult Stay(TSymbol result) + protected StateResult Stay(TToken result) { return new StateResult(CurrentState, result); } - protected TSymbol Single(TSymbolType type) + protected TToken Single(TTokenType type) { TakeCurrent(); - return EndSymbol(type); + return EndToken(type); } - protected void StartSymbol() + protected void StartToken() { Debug.Assert(Buffer.Length == 0); Debug.Assert(CurrentErrors.Count == 0); @@ -199,9 +199,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy CurrentStart = CurrentLocation; } - protected TSymbol EndSymbol(TSymbolType type) + protected TToken EndToken(TTokenType type) { - TSymbol symbol = null; + TToken token = null; if (HaveContent) { // Perf: Don't allocate a new errors array unless necessary. @@ -211,18 +211,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy errors[i] = CurrentErrors[i]; } - var symbolContent = GetSymbolContent(type); - Debug.Assert(string.Equals(symbolContent, Buffer.ToString(), StringComparison.Ordinal)); - symbol = CreateSymbol(symbolContent, type, errors); + var tokenContent = GetTokenContent(type); + Debug.Assert(string.Equals(tokenContent, Buffer.ToString(), StringComparison.Ordinal)); + token = CreateToken(tokenContent, type, errors); Buffer.Clear(); CurrentErrors.Clear(); } - return symbol; + return token; } - protected virtual string GetSymbolContent(TSymbolType type) + protected virtual string GetTokenContent(TTokenType type) { return Buffer.ToString(); } @@ -272,13 +272,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { if (CurrentCharacter != '*') { - // We've been moved since last time we were asked for a symbol... reset the state + // We've been moved since last time we were asked for a token... reset the state return Transition(StartState); } AssertCurrent('*'); TakeCurrent(); - return Transition(1002, EndSymbol(RazorCommentStarType)); + return Transition(1002, EndToken(RazorCommentStarType)); } protected StateResult RazorCommentBody() @@ -292,7 +292,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { return Transition( RazorCommentTokenizerState.StarAfterRazorCommentBody, - EndSymbol(RazorCommentType)); + EndToken(RazorCommentType)); } else { @@ -306,7 +306,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } } - return Transition(StartState, EndSymbol(RazorCommentType)); + return Transition(StartState, EndToken(RazorCommentType)); } protected StateResult StarAfterRazorCommentBody() @@ -314,15 +314,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy AssertCurrent('*'); TakeCurrent(); return Transition( - RazorCommentTokenizerState.AtSymbolAfterRazorCommentBody, - EndSymbol(RazorCommentStarType)); + RazorCommentTokenizerState.AtTokenAfterRazorCommentBody, + EndToken(RazorCommentStarType)); } - protected StateResult AtSymbolAfterRazorCommentBody() + protected StateResult AtTokenAfterRazorCommentBody() { AssertCurrent('@'); TakeCurrent(); - return Transition(StartState, EndSymbol(RazorCommentTransitionType)); + return Transition(StartState, EndToken(RazorCommentTransitionType)); } ///

@@ -392,12 +392,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy EscapedRazorCommentTransition, RazorCommentBody, StarAfterRazorCommentBody, - AtSymbolAfterRazorCommentBody, + AtTokenAfterRazorCommentBody, } protected struct StateResult { - public StateResult(int? state, TSymbol result) + public StateResult(int? state, TToken result) { State = state; Result = result; @@ -405,7 +405,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public int? State { get; } - public TSymbol Result { get; } + public TToken Result { get; } } private static LookaheadToken BeginLookahead(ITextBuffer buffer) diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenizerBackedParser.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenizerBackedParser.cs index 01fa0b11e1..af5a08831f 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenizerBackedParser.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenizerBackedParser.cs @@ -8,20 +8,20 @@ using System.Linq; namespace Microsoft.AspNetCore.Razor.Language.Legacy { - internal abstract partial class TokenizerBackedParser : ParserBase - where TSymbolType : struct - where TTokenizer : Tokenizer - where TSymbol : SymbolBase + internal abstract partial class TokenizerBackedParser : ParserBase + where TTokenType : struct + where TTokenizer : Tokenizer + where TToken : TokenBase { - private readonly TokenizerView _tokenizer; + private readonly TokenizerView _tokenizer; - protected TokenizerBackedParser(LanguageCharacteristics language, ParserContext context) + protected TokenizerBackedParser(LanguageCharacteristics language, ParserContext context) : base(context) { Language = language; var languageTokenizer = Language.CreateTokenizer(Context.Source); - _tokenizer = new TokenizerView(languageTokenizer); + _tokenizer = new TokenizerView(languageTokenizer); Span = new SpanBuilder(CurrentLocation); } @@ -29,12 +29,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy protected Action SpanConfig { get; set; } - protected TSymbol CurrentSymbol + protected TToken CurrentToken { get { return _tokenizer.Current; } } - protected TSymbol PreviousSymbol { get; private set; } + protected TToken PreviousToken { get; private set; } protected SourceLocation CurrentLocation => _tokenizer.Tokenizer.CurrentLocation; @@ -45,7 +45,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy get { return _tokenizer.EndOfFile; } } - protected LanguageCharacteristics Language { get; } + protected LanguageCharacteristics Language { get; } protected virtual void HandleEmbeddedTransition() { @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public override void BuildSpan(SpanBuilder span, SourceLocation start, string content) { - foreach (ISymbol sym in Language.TokenizeString(start, content)) + foreach (IToken sym in Language.TokenizeString(start, content)) { span.Accept(sym); } @@ -72,7 +72,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } } - protected TSymbol Lookahead(int count) + protected TToken Lookahead(int count) { if (count < 0) { @@ -80,42 +80,42 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } else if (count == 0) { - return CurrentSymbol; + return CurrentToken; } - // We add 1 in order to store the current symbol. - var symbols = new TSymbol[count + 1]; - var currentSymbol = CurrentSymbol; + // We add 1 in order to store the current token. + var tokens = new TToken[count + 1]; + var currentToken = CurrentToken; - symbols[0] = currentSymbol; + tokens[0] = currentToken; // We need to look forward "count" many times. for (var i = 1; i <= count; i++) { NextToken(); - symbols[i] = CurrentSymbol; + tokens[i] = CurrentToken; } // Restore Tokenizer's location to where it was pointing before the look-ahead. for (var i = count; i >= 0; i--) { - PutBack(symbols[i]); + PutBack(tokens[i]); } - // The PutBacks above will set CurrentSymbol to null. EnsureCurrent will set our CurrentSymbol to the - // next symbol. + // The PutBacks above will set CurrentToken to null. EnsureCurrent will set our CurrentToken to the + // next token. EnsureCurrent(); - return symbols[count]; + return tokens[count]; } /// /// Looks forward until the specified condition is met. /// - /// A predicate accepting the symbol being evaluated and the list of symbols which have been looped through. - /// true, if the condition was met. false - if the condition wasn't met and the last symbol has already been processed. - /// The list of previous symbols is passed in the reverse order. So the last processed element will be the first one in the list. - protected bool LookaheadUntil(Func, bool> condition) + /// A predicate accepting the token being evaluated and the list of tokens which have been looped through. + /// true, if the condition was met. false - if the condition wasn't met and the last token has already been processed. + /// The list of previous tokens is passed in the reverse order. So the last processed element will be the first one in the list. + protected bool LookaheadUntil(Func, bool> condition) { if (condition == null) { @@ -124,8 +124,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var matchFound = false; - var symbols = new List(); - symbols.Add(CurrentSymbol); + var tokens = new List(); + tokens.Add(CurrentToken); while (true) { @@ -134,8 +134,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy break; } - symbols.Add(CurrentSymbol); - if (condition(CurrentSymbol, symbols)) + tokens.Add(CurrentToken); + if (condition(CurrentToken, tokens)) { matchFound = true; break; @@ -143,13 +143,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } // Restore Tokenizer's location to where it was pointing before the look-ahead. - for (var i = symbols.Count - 1; i >= 0; i--) + for (var i = tokens.Count - 1; i >= 0; i--) { - PutBack(symbols[i]); + PutBack(tokens[i]); } - // The PutBacks above will set CurrentSymbol to null. EnsureCurrent will set our CurrentSymbol to the - // next symbol. + // The PutBacks above will set CurrentToken to null. EnsureCurrent will set our CurrentToken to the + // next token. EnsureCurrent(); return matchFound; @@ -157,57 +157,57 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy protected internal bool NextToken() { - PreviousSymbol = CurrentSymbol; + PreviousToken = CurrentToken; return _tokenizer.Next(); } // Helpers [Conditional("DEBUG")] - internal void Assert(TSymbolType expectedType) + internal void Assert(TTokenType expectedType) { - Debug.Assert(!EndOfFile && SymbolTypeEquals(CurrentSymbol.Type, expectedType)); + Debug.Assert(!EndOfFile && TokenTypeEquals(CurrentToken.Type, expectedType)); } - abstract protected bool SymbolTypeEquals(TSymbolType x, TSymbolType y); + abstract protected bool TokenTypeEquals(TTokenType x, TTokenType y); - protected internal void PutBack(TSymbol symbol) + protected internal void PutBack(TToken token) { - if (symbol != null) + if (token != null) { - _tokenizer.PutBack(symbol); + _tokenizer.PutBack(token); } } /// - /// Put the specified symbols back in the input stream. The provided list MUST be in the ORDER THE SYMBOLS WERE READ. The - /// list WILL be reversed and the Putback(TSymbol) will be called on each item. + /// Put the specified tokens back in the input stream. The provided list MUST be in the ORDER THE TOKENS WERE READ. The + /// list WILL be reversed and the Putback(TToken) will be called on each item. /// /// - /// If a document contains symbols: a, b, c, d, e, f + /// If a document contains tokens: a, b, c, d, e, f /// and AcceptWhile or AcceptUntil is used to collect until d /// the list returned by AcceptWhile/Until will contain: a, b, c IN THAT ORDER /// that is the correct format for providing to this method. The caller of this method would, /// in that case, want to put c, b and a back into the stream, so "a, b, c" is the CORRECT order /// - protected internal void PutBack(IEnumerable symbols) + protected internal void PutBack(IEnumerable tokens) { - foreach (TSymbol symbol in symbols.Reverse()) + foreach (TToken token in tokens.Reverse()) { - PutBack(symbol); + PutBack(token); } } protected internal void PutCurrentBack() { - if (!EndOfFile && CurrentSymbol != null) + if (!EndOfFile && CurrentToken != null) { - PutBack(CurrentSymbol); + PutBack(CurrentToken); } } protected internal bool Balance(BalancingModes mode) { - var left = CurrentSymbol.Type; + var left = CurrentToken.Type; var right = Language.FlipBracket(left); var start = CurrentStart; AcceptAndMoveNext(); @@ -223,13 +223,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return Balance(mode, left, right, start); } - protected internal bool Balance(BalancingModes mode, TSymbolType left, TSymbolType right, SourceLocation start) + protected internal bool Balance(BalancingModes mode, TTokenType left, TTokenType right, SourceLocation start) { var startPosition = CurrentStart.AbsoluteIndex; var nesting = 1; if (!EndOfFile) { - var syms = new List(); + var syms = new List(); do { if (IsAtEmbeddedTransition( @@ -253,7 +253,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } if (nesting > 0) { - syms.Add(CurrentSymbol); + syms.Add(CurrentToken); } } while (nesting > 0 && NextToken()); @@ -280,29 +280,29 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } else { - // Accept all the symbols we saw + // Accept all the tokens we saw Accept(syms); } } return nesting == 0; } - protected internal bool NextIs(TSymbolType type) + protected internal bool NextIs(TTokenType type) { - return NextIs(sym => sym != null && SymbolTypeEquals(type, sym.Type)); + return NextIs(sym => sym != null && TokenTypeEquals(type, sym.Type)); } - protected internal bool NextIs(params TSymbolType[] types) + protected internal bool NextIs(params TTokenType[] types) { - return NextIs(sym => sym != null && types.Any(t => SymbolTypeEquals(t, sym.Type))); + return NextIs(sym => sym != null && types.Any(t => TokenTypeEquals(t, sym.Type))); } - protected internal bool NextIs(Func condition) + protected internal bool NextIs(Func condition) { - var cur = CurrentSymbol; + var cur = CurrentToken; if (NextToken()) { - var result = condition(CurrentSymbol); + var result = condition(CurrentToken); PutCurrentBack(); PutBack(cur); EnsureCurrent(); @@ -317,27 +317,27 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return false; } - protected internal bool Was(TSymbolType type) + protected internal bool Was(TTokenType type) { - return PreviousSymbol != null && SymbolTypeEquals(PreviousSymbol.Type, type); + return PreviousToken != null && TokenTypeEquals(PreviousToken.Type, type); } - protected internal bool At(TSymbolType type) + protected internal bool At(TTokenType type) { - return !EndOfFile && CurrentSymbol != null && SymbolTypeEquals(CurrentSymbol.Type, type); + return !EndOfFile && CurrentToken != null && TokenTypeEquals(CurrentToken.Type, type); } protected internal bool AcceptAndMoveNext() { - Accept(CurrentSymbol); + Accept(CurrentToken); return NextToken(); } - protected TSymbol AcceptSingleWhiteSpaceCharacter() + protected TToken AcceptSingleWhiteSpaceCharacter() { - if (Language.IsWhiteSpace(CurrentSymbol)) + if (Language.IsWhiteSpace(CurrentToken)) { - Tuple pair = Language.SplitSymbol(CurrentSymbol, 1, Language.GetKnownSymbolType(KnownSymbolType.WhiteSpace)); + Tuple pair = Language.SplitToken(CurrentToken, 1, Language.GetKnownTokenType(KnownTokenType.WhiteSpace)); Accept(pair.Item1); Span.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None; NextToken(); @@ -346,32 +346,32 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return null; } - protected internal void Accept(IEnumerable symbols) + protected internal void Accept(IEnumerable tokens) { - foreach (TSymbol symbol in symbols) + foreach (TToken token in tokens) { - Accept(symbol); + Accept(token); } } - protected internal void Accept(TSymbol symbol) + protected internal void Accept(TToken token) { - if (symbol != null) + if (token != null) { - foreach (var error in symbol.Errors) + foreach (var error in token.Errors) { Context.ErrorSink.OnError(error); } - Span.Accept(symbol); + Span.Accept(token); } } - protected internal bool AcceptAll(params TSymbolType[] types) + protected internal bool AcceptAll(params TTokenType[] types) { - foreach (TSymbolType type in types) + foreach (TTokenType type in types) { - if (CurrentSymbol == null || !SymbolTypeEquals(CurrentSymbol.Type, type)) + if (CurrentToken == null || !TokenTypeEquals(CurrentToken.Type, type)) { return false; } @@ -380,11 +380,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return true; } - protected internal void AddMarkerSymbolIfNecessary() + protected internal void AddMarkerTokenIfNecessary() { - if (Span.Symbols.Count == 0 && Context.Builder.LastAcceptedCharacters != AcceptedCharactersInternal.Any) + if (Span.Tokens.Count == 0 && Context.Builder.LastAcceptedCharacters != AcceptedCharactersInternal.Any) { - Accept(Language.CreateMarkerSymbol()); + Accept(Language.CreateMarkerToken()); } } @@ -408,7 +408,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private void Output() { - if (Span.Symbols.Count > 0) + if (Span.Tokens.Count > 0) { var nextStart = Span.End; @@ -462,23 +462,23 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Initialize(Span); } - protected internal void Expected(KnownSymbolType type) + protected internal void Expected(KnownTokenType type) { - Expected(Language.GetKnownSymbolType(type)); + Expected(Language.GetKnownTokenType(type)); } - protected internal void Expected(params TSymbolType[] types) + protected internal void Expected(params TTokenType[] types) { - Debug.Assert(!EndOfFile && CurrentSymbol != null && types.Contains(CurrentSymbol.Type)); + Debug.Assert(!EndOfFile && CurrentToken != null && types.Contains(CurrentToken.Type)); AcceptAndMoveNext(); } - protected internal bool Optional(KnownSymbolType type) + protected internal bool Optional(KnownTokenType type) { - return Optional(Language.GetKnownSymbolType(type)); + return Optional(Language.GetKnownTokenType(type)); } - protected internal bool Optional(TSymbolType type) + protected internal bool Optional(TTokenType type) { if (At(type)) { @@ -490,7 +490,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy protected bool EnsureCurrent() { - if (CurrentSymbol == null) + if (CurrentToken == null) { return NextToken(); } @@ -498,62 +498,62 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return true; } - protected internal void AcceptWhile(TSymbolType type) + protected internal void AcceptWhile(TTokenType type) { - AcceptWhile(sym => SymbolTypeEquals(type, sym.Type)); + AcceptWhile(sym => TokenTypeEquals(type, sym.Type)); } // We want to avoid array allocations and enumeration where possible, so we use the same technique as string.Format - protected internal void AcceptWhile(TSymbolType type1, TSymbolType type2) + protected internal void AcceptWhile(TTokenType type1, TTokenType type2) { - AcceptWhile(sym => SymbolTypeEquals(type1, sym.Type) || SymbolTypeEquals(type2, sym.Type)); + AcceptWhile(sym => TokenTypeEquals(type1, sym.Type) || TokenTypeEquals(type2, sym.Type)); } - protected internal void AcceptWhile(TSymbolType type1, TSymbolType type2, TSymbolType type3) + protected internal void AcceptWhile(TTokenType type1, TTokenType type2, TTokenType type3) { - AcceptWhile(sym => SymbolTypeEquals(type1, sym.Type) || SymbolTypeEquals(type2, sym.Type) || SymbolTypeEquals(type3, sym.Type)); + AcceptWhile(sym => TokenTypeEquals(type1, sym.Type) || TokenTypeEquals(type2, sym.Type) || TokenTypeEquals(type3, sym.Type)); } - protected internal void AcceptWhile(params TSymbolType[] types) + protected internal void AcceptWhile(params TTokenType[] types) { - AcceptWhile(sym => types.Any(expected => SymbolTypeEquals(expected, sym.Type))); + AcceptWhile(sym => types.Any(expected => TokenTypeEquals(expected, sym.Type))); } - protected internal void AcceptUntil(TSymbolType type) + protected internal void AcceptUntil(TTokenType type) { - AcceptWhile(sym => !SymbolTypeEquals(type, sym.Type)); + AcceptWhile(sym => !TokenTypeEquals(type, sym.Type)); } // We want to avoid array allocations and enumeration where possible, so we use the same technique as string.Format - protected internal void AcceptUntil(TSymbolType type1, TSymbolType type2) + protected internal void AcceptUntil(TTokenType type1, TTokenType type2) { - AcceptWhile(sym => !SymbolTypeEquals(type1, sym.Type) && !SymbolTypeEquals(type2, sym.Type)); + AcceptWhile(sym => !TokenTypeEquals(type1, sym.Type) && !TokenTypeEquals(type2, sym.Type)); } - protected internal void AcceptUntil(TSymbolType type1, TSymbolType type2, TSymbolType type3) + protected internal void AcceptUntil(TTokenType type1, TTokenType type2, TTokenType type3) { - AcceptWhile(sym => !SymbolTypeEquals(type1, sym.Type) && !SymbolTypeEquals(type2, sym.Type) && !SymbolTypeEquals(type3, sym.Type)); + AcceptWhile(sym => !TokenTypeEquals(type1, sym.Type) && !TokenTypeEquals(type2, sym.Type) && !TokenTypeEquals(type3, sym.Type)); } - protected internal void AcceptUntil(params TSymbolType[] types) + protected internal void AcceptUntil(params TTokenType[] types) { - AcceptWhile(sym => types.All(expected => !SymbolTypeEquals(expected, sym.Type))); + AcceptWhile(sym => types.All(expected => !TokenTypeEquals(expected, sym.Type))); } - protected internal void AcceptWhile(Func condition) + protected internal void AcceptWhile(Func condition) { Accept(ReadWhileLazy(condition)); } - protected internal IEnumerable ReadWhile(Func condition) + protected internal IEnumerable ReadWhile(Func condition) { return ReadWhileLazy(condition).ToList(); } - protected TSymbol AcceptWhiteSpaceInLines() + protected TToken AcceptWhiteSpaceInLines() { - TSymbol lastWs = null; - while (Language.IsWhiteSpace(CurrentSymbol) || Language.IsNewLine(CurrentSymbol)) + TToken lastWs = null; + while (Language.IsWhiteSpace(CurrentToken) || Language.IsNewLine(CurrentToken)) { // Capture the previous whitespace node if (lastWs != null) @@ -561,14 +561,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Accept(lastWs); } - if (Language.IsWhiteSpace(CurrentSymbol)) + if (Language.IsWhiteSpace(CurrentToken)) { - lastWs = CurrentSymbol; + lastWs = CurrentToken; } - else if (Language.IsNewLine(CurrentSymbol)) + else if (Language.IsNewLine(CurrentToken)) { // Accept newline and reset last whitespace tracker - Accept(CurrentSymbol); + Accept(CurrentToken); lastWs = null; } @@ -579,18 +579,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy protected bool AtIdentifier(bool allowKeywords) { - return CurrentSymbol != null && - (Language.IsIdentifier(CurrentSymbol) || - (allowKeywords && Language.IsKeyword(CurrentSymbol))); + return CurrentToken != null && + (Language.IsIdentifier(CurrentToken) || + (allowKeywords && Language.IsKeyword(CurrentToken))); } // Don't open this to sub classes because it's lazy but it looks eager. // You have to advance the Enumerable to read the next characters. - internal IEnumerable ReadWhileLazy(Func condition) + internal IEnumerable ReadWhileLazy(Func condition) { - while (EnsureCurrent() && condition(CurrentSymbol)) + while (EnsureCurrent() && condition(CurrentToken)) { - yield return CurrentSymbol; + yield return CurrentToken; NextToken(); } } @@ -620,9 +620,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy protected void RazorComment() { - if (!Language.KnowsSymbolType(KnownSymbolType.CommentStart) || - !Language.KnowsSymbolType(KnownSymbolType.CommentStar) || - !Language.KnowsSymbolType(KnownSymbolType.CommentBody)) + if (!Language.KnowsTokenType(KnownTokenType.CommentStart) || + !Language.KnowsTokenType(KnownTokenType.CommentStar) || + !Language.KnowsTokenType(KnownTokenType.CommentBody)) { throw new InvalidOperationException(Resources.Language_Does_Not_Support_RazorComment); } @@ -634,18 +634,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Context.Builder.CurrentBlock.ChunkGenerator = new RazorCommentChunkGenerator(); var start = CurrentStart; - Expected(KnownSymbolType.CommentStart); + Expected(KnownTokenType.CommentStart); Output(SpanKindInternal.Transition, AcceptedCharactersInternal.None); - Expected(KnownSymbolType.CommentStar); + Expected(KnownTokenType.CommentStar); Output(SpanKindInternal.MetaCode, AcceptedCharactersInternal.None); - Optional(KnownSymbolType.CommentBody); - AddMarkerSymbolIfNecessary(); + Optional(KnownTokenType.CommentBody); + AddMarkerTokenIfNecessary(); Output(SpanKindInternal.Comment); var errorReported = false; - if (!Optional(KnownSymbolType.CommentStar)) + if (!Optional(KnownTokenType.CommentStar)) { errorReported = true; Context.ErrorSink.OnError( @@ -657,7 +657,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Output(SpanKindInternal.MetaCode, AcceptedCharactersInternal.None); } - if (!Optional(KnownSymbolType.CommentStart)) + if (!Optional(KnownTokenType.CommentStart)) { if (!errorReported) { diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenizerView.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenizerView.cs index b85f0cd10b..2b290bda5c 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenizerView.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenizerView.cs @@ -3,10 +3,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { - internal class TokenizerView - where TSymbolType : struct - where TTokenizer : Tokenizer - where TSymbol : SymbolBase + internal class TokenizerView + where TTokenType : struct + where TTokenizer : Tokenizer + where TToken : TokenBase { public TokenizerView(TTokenizer tokenizer) { @@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public TTokenizer Tokenizer { get; private set; } public bool EndOfFile { get; private set; } - public TSymbol Current { get; private set; } + public TToken Current { get; private set; } public ITextDocument Source { @@ -24,14 +24,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public bool Next() { - Current = Tokenizer.NextSymbol(); + Current = Tokenizer.NextToken(); EndOfFile = (Current == null); return !EndOfFile; } - public void PutBack(TSymbol symbol) + public void PutBack(TToken token) { - Source.Position -= symbol.Content.Length; + Source.Position -= token.Content.Length; Current = null; EndOfFile = Source.Position >= Source.Length; Tokenizer.Reset(); diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/WhiteSpaceRewriter.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/WhiteSpaceRewriter.cs index 766f57d4bf..cf71b0a024 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/WhiteSpaceRewriter.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/WhiteSpaceRewriter.cs @@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { // Add this node to the parent var builder = new SpanBuilder(ws); - builder.ClearSymbols(); + builder.ClearTokens(); FillSpan(builder, ws.Start, ws.Content); parent.Children.Add(builder.Build()); diff --git a/src/Microsoft.AspNetCore.Razor.Language/Properties/Resources.Designer.cs b/src/Microsoft.AspNetCore.Razor.Language/Properties/Resources.Designer.cs index a785a39bca..773fb6de9c 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Properties/Resources.Designer.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Properties/Resources.Designer.cs @@ -139,128 +139,128 @@ namespace Microsoft.AspNetCore.Razor.Language /// /// <<character literal>> /// - internal static string CSharpSymbol_CharacterLiteral + internal static string CSharpToken_CharacterLiteral { - get => GetString("CSharpSymbol_CharacterLiteral"); + get => GetString("CSharpToken_CharacterLiteral"); } /// /// <<character literal>> /// - internal static string FormatCSharpSymbol_CharacterLiteral() - => GetString("CSharpSymbol_CharacterLiteral"); + internal static string FormatCSharpToken_CharacterLiteral() + => GetString("CSharpToken_CharacterLiteral"); /// /// <<comment>> /// - internal static string CSharpSymbol_Comment + internal static string CSharpToken_Comment { - get => GetString("CSharpSymbol_Comment"); + get => GetString("CSharpToken_Comment"); } /// /// <<comment>> /// - internal static string FormatCSharpSymbol_Comment() - => GetString("CSharpSymbol_Comment"); + internal static string FormatCSharpToken_Comment() + => GetString("CSharpToken_Comment"); /// /// <<identifier>> /// - internal static string CSharpSymbol_Identifier + internal static string CSharpToken_Identifier { - get => GetString("CSharpSymbol_Identifier"); + get => GetString("CSharpToken_Identifier"); } /// /// <<identifier>> /// - internal static string FormatCSharpSymbol_Identifier() - => GetString("CSharpSymbol_Identifier"); + internal static string FormatCSharpToken_Identifier() + => GetString("CSharpToken_Identifier"); /// /// <<integer literal>> /// - internal static string CSharpSymbol_IntegerLiteral + internal static string CSharpToken_IntegerLiteral { - get => GetString("CSharpSymbol_IntegerLiteral"); + get => GetString("CSharpToken_IntegerLiteral"); } /// /// <<integer literal>> /// - internal static string FormatCSharpSymbol_IntegerLiteral() - => GetString("CSharpSymbol_IntegerLiteral"); + internal static string FormatCSharpToken_IntegerLiteral() + => GetString("CSharpToken_IntegerLiteral"); /// /// <<keyword>> /// - internal static string CSharpSymbol_Keyword + internal static string CSharpToken_Keyword { - get => GetString("CSharpSymbol_Keyword"); + get => GetString("CSharpToken_Keyword"); } /// /// <<keyword>> /// - internal static string FormatCSharpSymbol_Keyword() - => GetString("CSharpSymbol_Keyword"); + internal static string FormatCSharpToken_Keyword() + => GetString("CSharpToken_Keyword"); /// /// <<newline sequence>> /// - internal static string CSharpSymbol_Newline + internal static string CSharpToken_Newline { - get => GetString("CSharpSymbol_Newline"); + get => GetString("CSharpToken_Newline"); } /// /// <<newline sequence>> /// - internal static string FormatCSharpSymbol_Newline() - => GetString("CSharpSymbol_Newline"); + internal static string FormatCSharpToken_Newline() + => GetString("CSharpToken_Newline"); /// /// <<real literal>> /// - internal static string CSharpSymbol_RealLiteral + internal static string CSharpToken_RealLiteral { - get => GetString("CSharpSymbol_RealLiteral"); + get => GetString("CSharpToken_RealLiteral"); } /// /// <<real literal>> /// - internal static string FormatCSharpSymbol_RealLiteral() - => GetString("CSharpSymbol_RealLiteral"); + internal static string FormatCSharpToken_RealLiteral() + => GetString("CSharpToken_RealLiteral"); /// /// <<string literal>> /// - internal static string CSharpSymbol_StringLiteral + internal static string CSharpToken_StringLiteral { - get => GetString("CSharpSymbol_StringLiteral"); + get => GetString("CSharpToken_StringLiteral"); } /// /// <<string literal>> /// - internal static string FormatCSharpSymbol_StringLiteral() - => GetString("CSharpSymbol_StringLiteral"); + internal static string FormatCSharpToken_StringLiteral() + => GetString("CSharpToken_StringLiteral"); /// /// <<white space>> /// - internal static string CSharpSymbol_Whitespace + internal static string CSharpToken_Whitespace { - get => GetString("CSharpSymbol_Whitespace"); + get => GetString("CSharpToken_Whitespace"); } /// /// <<white space>> /// - internal static string FormatCSharpSymbol_Whitespace() - => GetString("CSharpSymbol_Whitespace"); + internal static string FormatCSharpToken_Whitespace() + => GetString("CSharpToken_Whitespace"); /// /// The document type '{0}' does not support the extension '{1}'. @@ -489,58 +489,58 @@ namespace Microsoft.AspNetCore.Razor.Language /// /// <<newline sequence>> /// - internal static string HtmlSymbol_NewLine + internal static string HtmlToken_NewLine { - get => GetString("HtmlSymbol_NewLine"); + get => GetString("HtmlToken_NewLine"); } /// /// <<newline sequence>> /// - internal static string FormatHtmlSymbol_NewLine() - => GetString("HtmlSymbol_NewLine"); + internal static string FormatHtmlToken_NewLine() + => GetString("HtmlToken_NewLine"); /// /// <<razor comment>> /// - internal static string HtmlSymbol_RazorComment + internal static string HtmlToken_RazorComment { - get => GetString("HtmlSymbol_RazorComment"); + get => GetString("HtmlToken_RazorComment"); } /// /// <<razor comment>> /// - internal static string FormatHtmlSymbol_RazorComment() - => GetString("HtmlSymbol_RazorComment"); + internal static string FormatHtmlToken_RazorComment() + => GetString("HtmlToken_RazorComment"); /// /// <<text>> /// - internal static string HtmlSymbol_Text + internal static string HtmlToken_Text { - get => GetString("HtmlSymbol_Text"); + get => GetString("HtmlToken_Text"); } /// /// <<text>> /// - internal static string FormatHtmlSymbol_Text() - => GetString("HtmlSymbol_Text"); + internal static string FormatHtmlToken_Text() + => GetString("HtmlToken_Text"); /// /// <<white space>> /// - internal static string HtmlSymbol_WhiteSpace + internal static string HtmlToken_WhiteSpace { - get => GetString("HtmlSymbol_WhiteSpace"); + get => GetString("HtmlToken_WhiteSpace"); } /// /// <<white space>> /// - internal static string FormatHtmlSymbol_WhiteSpace() - => GetString("HtmlSymbol_WhiteSpace"); + internal static string FormatHtmlToken_WhiteSpace() + => GetString("HtmlToken_WhiteSpace"); /// /// Specify the base class for the current document. @@ -711,7 +711,7 @@ namespace Microsoft.AspNetCore.Razor.Language => GetString("KeyMustNotBeNull"); /// - /// Cannot use built-in RazorComment handler, language characteristics does not define the CommentStart, CommentStar and CommentBody known symbol types or parser does not override TokenizerBackedParser.OutputSpanBeforeRazorComment + /// Cannot use built-in RazorComment handler, language characteristics does not define the CommentStart, CommentStar and CommentBody known token types or parser does not override TokenizerBackedParser.OutputSpanBeforeRazorComment /// internal static string Language_Does_Not_Support_RazorComment { @@ -719,7 +719,7 @@ namespace Microsoft.AspNetCore.Razor.Language } /// - /// Cannot use built-in RazorComment handler, language characteristics does not define the CommentStart, CommentStar and CommentBody known symbol types or parser does not override TokenizerBackedParser.OutputSpanBeforeRazorComment + /// Cannot use built-in RazorComment handler, language characteristics does not define the CommentStart, CommentStar and CommentBody known token types or parser does not override TokenizerBackedParser.OutputSpanBeforeRazorComment /// internal static string FormatLanguage_Does_Not_Support_RazorComment() => GetString("Language_Does_Not_Support_RazorComment"); @@ -1351,16 +1351,16 @@ namespace Microsoft.AspNetCore.Razor.Language /// /// <<unknown>> /// - internal static string Symbol_Unknown + internal static string Token_Unknown { - get => GetString("Symbol_Unknown"); + get => GetString("Token_Unknown"); } /// /// <<unknown>> /// - internal static string FormatSymbol_Unknown() - => GetString("Symbol_Unknown"); + internal static string FormatToken_Unknown() + => GetString("Token_Unknown"); /// /// Invalid tag helper bound property '{1}' on tag helper '{0}'. Tag helpers cannot bind to HTML attributes with name '{2}' because the name contains a '{3}' character. diff --git a/src/Microsoft.AspNetCore.Razor.Language/Resources.resx b/src/Microsoft.AspNetCore.Razor.Language/Resources.resx index 195a9d791b..e23e66c297 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Resources.resx +++ b/src/Microsoft.AspNetCore.Razor.Language/Resources.resx @@ -146,31 +146,31 @@ Invalid newline sequence '{0}'. Support newline sequences are '\r\n' and '\n'. - + <<character literal>> - + <<comment>> - + <<identifier>> - + <<integer literal>> - + <<keyword>> - + <<newline sequence>> - + <<real literal>> - + <<string literal>> - + <<white space>> @@ -221,16 +221,16 @@ Specify a C# code block. - + <<newline sequence>> - + <<razor comment>> - + <<text>> - + <<white space>> @@ -270,7 +270,7 @@ The key must not be null. - Cannot use built-in RazorComment handler, language characteristics does not define the CommentStart, CommentStar and CommentBody known symbol types or parser does not override TokenizerBackedParser.OutputSpanBeforeRazorComment + Cannot use built-in RazorComment handler, language characteristics does not define the CommentStart, CommentStar and CommentBody known token types or parser does not override TokenizerBackedParser.OutputSpanBeforeRazorComment The specified encoding '{0}' does not match the content's encoding '{1}'. @@ -423,7 +423,7 @@ Instead, wrap the contents of the block in "{{}}": @section Header { ... } In CSHTML, the @section keyword is case-sensitive and lowercase (as with all C# keywords) - + <<unknown>> diff --git a/src/Microsoft.AspNetCore.Razor.Language/breakingchanges.netcore.json b/src/Microsoft.AspNetCore.Razor.Language/breakingchanges.netcore.json new file mode 100644 index 0000000000..a753f1bfc8 --- /dev/null +++ b/src/Microsoft.AspNetCore.Razor.Language/breakingchanges.netcore.json @@ -0,0 +1,15 @@ +[ + { + "TypeId": "protected enum Microsoft.AspNetCore.Razor.Language.Legacy.Tokenizer+RazorCommentTokenizerState where T0 : Microsoft.AspNetCore.Razor.Language.Legacy.SymbolBase where T1 : struct", + "Kind": "Removal" + }, + { + "TypeId": "protected struct Microsoft.AspNetCore.Razor.Language.Legacy.Tokenizer+StateResult where T0 : Microsoft.AspNetCore.Razor.Language.Legacy.SymbolBase where T1 : struct", + "Kind": "Removal" + }, + { + "TypeId": "protected class Microsoft.AspNetCore.Razor.Language.Legacy.CSharpCodeParser+Block", + "MemberId": "public .ctor(Microsoft.AspNetCore.Razor.Language.Legacy.CSharpSymbol symbol, Microsoft.AspNetCore.Razor.Language.SourceLocation start)", + "Kind": "Removal" + } +] \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Razor.Language/breakingchanges.netframework.json b/src/Microsoft.AspNetCore.Razor.Language/breakingchanges.netframework.json new file mode 100644 index 0000000000..a753f1bfc8 --- /dev/null +++ b/src/Microsoft.AspNetCore.Razor.Language/breakingchanges.netframework.json @@ -0,0 +1,15 @@ +[ + { + "TypeId": "protected enum Microsoft.AspNetCore.Razor.Language.Legacy.Tokenizer+RazorCommentTokenizerState where T0 : Microsoft.AspNetCore.Razor.Language.Legacy.SymbolBase where T1 : struct", + "Kind": "Removal" + }, + { + "TypeId": "protected struct Microsoft.AspNetCore.Razor.Language.Legacy.Tokenizer+StateResult where T0 : Microsoft.AspNetCore.Razor.Language.Legacy.SymbolBase where T1 : struct", + "Kind": "Removal" + }, + { + "TypeId": "protected class Microsoft.AspNetCore.Razor.Language.Legacy.CSharpCodeParser+Block", + "MemberId": "public .ctor(Microsoft.AspNetCore.Razor.Language.Legacy.CSharpSymbol symbol, Microsoft.AspNetCore.Razor.Language.SourceLocation start)", + "Kind": "Removal" + } +] \ No newline at end of file diff --git a/src/Microsoft.VisualStudio.Editor.Razor/BraceSmartIndenter.cs b/src/Microsoft.VisualStudio.Editor.Razor/BraceSmartIndenter.cs index 2963fc9b0f..4de857b966 100644 --- a/src/Microsoft.VisualStudio.Editor.Razor/BraceSmartIndenter.cs +++ b/src/Microsoft.VisualStudio.Editor.Razor/BraceSmartIndenter.cs @@ -278,9 +278,9 @@ namespace Microsoft.VisualStudio.Editor.Razor { // We only support whitespace based content. Any non-whitespace content is an unkonwn to us // in regards to indentation. - for (var i = 0; i < owner.Symbols.Count; i++) + for (var i = 0; i < owner.Tokens.Count; i++) { - if (!string.IsNullOrWhiteSpace(owner.Symbols[i].Content)) + if (!string.IsNullOrWhiteSpace(owner.Tokens[i].Content)) { return true; } diff --git a/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorIndentationFactsService.cs b/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorIndentationFactsService.cs index c0ed95ad11..109ba1311b 100644 --- a/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorIndentationFactsService.cs +++ b/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorIndentationFactsService.cs @@ -142,9 +142,9 @@ namespace Microsoft.VisualStudio.Editor.Razor internal static bool IsCSharpOpenCurlyBrace(SyntaxTreeNode currentChild) { return currentChild is Span currentSpan && - currentSpan.Symbols.Count == 1 && - currentSpan.Symbols[0] is CSharpSymbol symbol && - symbol.Type == CSharpSymbolType.LeftBrace; + currentSpan.Tokens.Count == 1 && + currentSpan.Tokens[0] is CSharpToken symbol && + symbol.Type == CSharpTokenType.LeftBrace; } } } diff --git a/src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionProvider.cs b/src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionProvider.cs index 56768829d1..6a2d017716 100644 --- a/src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionProvider.cs +++ b/src/Microsoft.VisualStudio.Editor.Razor/RazorDirectiveCompletionProvider.cs @@ -162,7 +162,7 @@ namespace Microsoft.VisualStudio.Editor.Razor } if (owner.ChunkGenerator is ExpressionChunkGenerator && - owner.Symbols.All(IsDirectiveCompletableSymbol) && + owner.Tokens.All(IsDirectiveCompletableSymbol) && // Do not provide IntelliSense for explicit expressions. Explicit expressions will usually look like: // [@] [(] [DateTime.Now] [)] owner.Parent?.Children.Count > 1 && @@ -204,16 +204,16 @@ namespace Microsoft.VisualStudio.Editor.Razor return false; } - private static bool IsDirectiveCompletableSymbol(AspNetCore.Razor.Language.Legacy.ISymbol symbol) + private static bool IsDirectiveCompletableSymbol(AspNetCore.Razor.Language.Legacy.IToken symbol) { - if (!(symbol is CSharpSymbol csharpSymbol)) + if (!(symbol is CSharpToken csharpSymbol)) { return false; } - return csharpSymbol.Type == CSharpSymbolType.Identifier || + return csharpSymbol.Type == CSharpTokenType.Identifier || // Marker symbol - csharpSymbol.Type == CSharpSymbolType.Unknown; + csharpSymbol.Type == CSharpTokenType.Unknown; } } } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/BlockTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/BlockTest.cs index 4b4f984ce6..d54ef401df 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/BlockTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/BlockTest.cs @@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { // Arrange var spanBuilder = new SpanBuilder(SourceLocation.Zero); - spanBuilder.Accept(new HtmlSymbol("hello", HtmlSymbolType.Text)); + spanBuilder.Accept(new HtmlToken("hello", HtmlTokenType.Text)); var span = spanBuilder.Build(); var blockBuilder = new BlockBuilder() { @@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var parentBlock = blockBuilder.Build(); var originalBlockLength = parentBlock.Length; spanBuilder = new SpanBuilder(SourceLocation.Zero); - spanBuilder.Accept(new HtmlSymbol("hi", HtmlSymbolType.Text)); + spanBuilder.Accept(new HtmlToken("hi", HtmlTokenType.Text)); span.ReplaceWith(spanBuilder); // Wire up parents now so we can re-trigger ChildChanged to cause cache refresh. diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpLanguageCharacteristicsTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpLanguageCharacteristicsTest.cs index 1ab365c98a..e8eeb8c586 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpLanguageCharacteristicsTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpLanguageCharacteristicsTest.cs @@ -8,13 +8,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public class CSharpLanguageCharacteristicsTest { [Fact] - public void GetSample_RightShiftAssign_ReturnsCorrectSymbol() + public void GetSample_RightShiftAssign_ReturnsCorrectToken() { // Arrange & Act - var symbol = CSharpLanguageCharacteristics.Instance.GetSample(CSharpSymbolType.RightShiftAssign); + var token = CSharpLanguageCharacteristics.Instance.GetSample(CSharpTokenType.RightShiftAssign); // Assert - Assert.Equal(">>=", symbol); + Assert.Equal(">>=", token); } } } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerCommentTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerCommentTest.cs index 2ff59a679b..64dafafa16 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerCommentTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerCommentTest.cs @@ -7,16 +7,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { public class CSharpTokenizerCommentTest : CSharpTokenizerTestBase { - private new CSharpSymbol IgnoreRemaining => (CSharpSymbol)base.IgnoreRemaining; + private new CSharpToken IgnoreRemaining => (CSharpToken)base.IgnoreRemaining; [Fact] public void Next_Ignores_Star_At_EOF_In_RazorComment() { TestTokenizer( "@* Foo * Bar * Baz *", - new CSharpSymbol("@", CSharpSymbolType.RazorCommentTransition), - new CSharpSymbol("*", CSharpSymbolType.RazorCommentStar), - new CSharpSymbol(" Foo * Bar * Baz *", CSharpSymbolType.RazorComment)); + new CSharpToken("@", CSharpTokenType.RazorCommentTransition), + new CSharpToken("*", CSharpTokenType.RazorCommentStar), + new CSharpToken(" Foo * Bar * Baz *", CSharpTokenType.RazorComment)); } [Fact] @@ -24,11 +24,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { TestTokenizer( "@* Foo * Bar * Baz *@", - new CSharpSymbol("@", CSharpSymbolType.RazorCommentTransition), - new CSharpSymbol("*", CSharpSymbolType.RazorCommentStar), - new CSharpSymbol(" Foo * Bar * Baz ", CSharpSymbolType.RazorComment), - new CSharpSymbol("*", CSharpSymbolType.RazorCommentStar), - new CSharpSymbol("@", CSharpSymbolType.RazorCommentTransition)); + new CSharpToken("@", CSharpTokenType.RazorCommentTransition), + new CSharpToken("*", CSharpTokenType.RazorCommentStar), + new CSharpToken(" Foo * Bar * Baz ", CSharpTokenType.RazorComment), + new CSharpToken("*", CSharpTokenType.RazorCommentStar), + new CSharpToken("@", CSharpTokenType.RazorCommentTransition)); } [Fact] @@ -36,59 +36,59 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { TestTokenizer( "@* Foo Bar Baz *@", - new CSharpSymbol("@", CSharpSymbolType.RazorCommentTransition), - new CSharpSymbol("*", CSharpSymbolType.RazorCommentStar), - new CSharpSymbol(" Foo Bar Baz ", CSharpSymbolType.RazorComment), - new CSharpSymbol("*", CSharpSymbolType.RazorCommentStar), - new CSharpSymbol("@", CSharpSymbolType.RazorCommentTransition)); + new CSharpToken("@", CSharpTokenType.RazorCommentTransition), + new CSharpToken("*", CSharpTokenType.RazorCommentStar), + new CSharpToken(" Foo Bar Baz ", CSharpTokenType.RazorComment), + new CSharpToken("*", CSharpTokenType.RazorCommentStar), + new CSharpToken("@", CSharpTokenType.RazorCommentTransition)); } [Fact] public void Next_Returns_Comment_Token_For_Entire_Single_Line_Comment() { - TestTokenizer("// Foo Bar Baz", new CSharpSymbol("// Foo Bar Baz", CSharpSymbolType.Comment)); + TestTokenizer("// Foo Bar Baz", new CSharpToken("// Foo Bar Baz", CSharpTokenType.Comment)); } [Fact] public void Single_Line_Comment_Is_Terminated_By_Newline() { - TestTokenizer("// Foo Bar Baz\na", new CSharpSymbol("// Foo Bar Baz", CSharpSymbolType.Comment), IgnoreRemaining); + TestTokenizer("// Foo Bar Baz\na", new CSharpToken("// Foo Bar Baz", CSharpTokenType.Comment), IgnoreRemaining); } [Fact] public void Multi_Line_Comment_In_Single_Line_Comment_Has_No_Effect() { - TestTokenizer("// Foo/*Bar*/ Baz\na", new CSharpSymbol("// Foo/*Bar*/ Baz", CSharpSymbolType.Comment), IgnoreRemaining); + TestTokenizer("// Foo/*Bar*/ Baz\na", new CSharpToken("// Foo/*Bar*/ Baz", CSharpTokenType.Comment), IgnoreRemaining); } [Fact] public void Next_Returns_Comment_Token_For_Entire_Multi_Line_Comment() { - TestTokenizer("/* Foo\nBar\nBaz */", new CSharpSymbol("/* Foo\nBar\nBaz */", CSharpSymbolType.Comment)); + TestTokenizer("/* Foo\nBar\nBaz */", new CSharpToken("/* Foo\nBar\nBaz */", CSharpTokenType.Comment)); } [Fact] public void Multi_Line_Comment_Is_Terminated_By_End_Sequence() { - TestTokenizer("/* Foo\nBar\nBaz */a", new CSharpSymbol("/* Foo\nBar\nBaz */", CSharpSymbolType.Comment), IgnoreRemaining); + TestTokenizer("/* Foo\nBar\nBaz */a", new CSharpToken("/* Foo\nBar\nBaz */", CSharpTokenType.Comment), IgnoreRemaining); } [Fact] public void Unterminated_Multi_Line_Comment_Captures_To_EOF() { - TestTokenizer("/* Foo\nBar\nBaz", new CSharpSymbol("/* Foo\nBar\nBaz", CSharpSymbolType.Comment), IgnoreRemaining); + TestTokenizer("/* Foo\nBar\nBaz", new CSharpToken("/* Foo\nBar\nBaz", CSharpTokenType.Comment), IgnoreRemaining); } [Fact] public void Nested_Multi_Line_Comments_Terminated_At_First_End_Sequence() { - TestTokenizer("/* Foo/*\nBar\nBaz*/ */", new CSharpSymbol("/* Foo/*\nBar\nBaz*/", CSharpSymbolType.Comment), IgnoreRemaining); + TestTokenizer("/* Foo/*\nBar\nBaz*/ */", new CSharpToken("/* Foo/*\nBar\nBaz*/", CSharpTokenType.Comment), IgnoreRemaining); } [Fact] public void Nested_Multi_Line_Comments_Terminated_At_Full_End_Sequence() { - TestTokenizer("/* Foo\nBar\nBaz* */", new CSharpSymbol("/* Foo\nBar\nBaz* */", CSharpSymbolType.Comment), IgnoreRemaining); + TestTokenizer("/* Foo\nBar\nBaz* */", new CSharpToken("/* Foo\nBar\nBaz* */", CSharpTokenType.Comment), IgnoreRemaining); } } } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerIdentifierTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerIdentifierTest.cs index fe17606261..b24c976dc9 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerIdentifierTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerIdentifierTest.cs @@ -10,73 +10,73 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy [Fact] public void Simple_Identifier_Is_Recognized() { - TestTokenizer("foo", new CSharpSymbol("foo", CSharpSymbolType.Identifier)); + TestTokenizer("foo", new CSharpToken("foo", CSharpTokenType.Identifier)); } [Fact] public void Identifier_Starting_With_Underscore_Is_Recognized() { - TestTokenizer("_foo", new CSharpSymbol("_foo", CSharpSymbolType.Identifier)); + TestTokenizer("_foo", new CSharpToken("_foo", CSharpTokenType.Identifier)); } [Fact] public void Identifier_Can_Contain_Digits() { - TestTokenizer("foo4", new CSharpSymbol("foo4", CSharpSymbolType.Identifier)); + TestTokenizer("foo4", new CSharpToken("foo4", CSharpTokenType.Identifier)); } [Fact] public void Identifier_Can_Start_With_Titlecase_Letter() { - TestTokenizer("ῼfoo", new CSharpSymbol("ῼfoo", CSharpSymbolType.Identifier)); + TestTokenizer("ῼfoo", new CSharpToken("ῼfoo", CSharpTokenType.Identifier)); } [Fact] public void Identifier_Can_Start_With_Letter_Modifier() { - TestTokenizer("ᵊfoo", new CSharpSymbol("ᵊfoo", CSharpSymbolType.Identifier)); + TestTokenizer("ᵊfoo", new CSharpToken("ᵊfoo", CSharpTokenType.Identifier)); } [Fact] public void Identifier_Can_Start_With_Other_Letter() { - TestTokenizer("ƻfoo", new CSharpSymbol("ƻfoo", CSharpSymbolType.Identifier)); + TestTokenizer("ƻfoo", new CSharpToken("ƻfoo", CSharpTokenType.Identifier)); } [Fact] public void Identifier_Can_Start_With_Number_Letter() { - TestTokenizer("Ⅽool", new CSharpSymbol("Ⅽool", CSharpSymbolType.Identifier)); + TestTokenizer("Ⅽool", new CSharpToken("Ⅽool", CSharpTokenType.Identifier)); } [Fact] public void Identifier_Can_Contain_Non_Spacing_Mark() { - TestTokenizer("foo\u0300", new CSharpSymbol("foo\u0300", CSharpSymbolType.Identifier)); + TestTokenizer("foo\u0300", new CSharpToken("foo\u0300", CSharpTokenType.Identifier)); } [Fact] public void Identifier_Can_Contain_Spacing_Combining_Mark() { - TestTokenizer("fooः", new CSharpSymbol("fooः", CSharpSymbolType.Identifier)); + TestTokenizer("fooः", new CSharpToken("fooः", CSharpTokenType.Identifier)); } [Fact] public void Identifier_Can_Contain_Non_English_Digit() { - TestTokenizer("foo١", new CSharpSymbol("foo١", CSharpSymbolType.Identifier)); + TestTokenizer("foo١", new CSharpToken("foo١", CSharpTokenType.Identifier)); } [Fact] public void Identifier_Can_Contain_Connector_Punctuation() { - TestTokenizer("foo‿bar", new CSharpSymbol("foo‿bar", CSharpSymbolType.Identifier)); + TestTokenizer("foo‿bar", new CSharpToken("foo‿bar", CSharpTokenType.Identifier)); } [Fact] public void Identifier_Can_Contain_Format_Character() { - TestTokenizer("foo؃bar", new CSharpSymbol("foo؃bar", CSharpSymbolType.Identifier)); + TestTokenizer("foo؃bar", new CSharpToken("foo؃bar", CSharpTokenType.Identifier)); } [Fact] @@ -164,7 +164,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy private void TestKeyword(string keyword, CSharpKeyword keywordType) { - TestTokenizer(keyword, new CSharpSymbol(keyword, CSharpSymbolType.Keyword) { Keyword = keywordType }); + TestTokenizer(keyword, new CSharpToken(keyword, CSharpTokenType.Keyword) { Keyword = keywordType }); } } } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerLiteralTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerLiteralTest.cs index 0d614bf84a..a10aea8ba9 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerLiteralTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerLiteralTest.cs @@ -8,280 +8,280 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { public class CSharpTokenizerLiteralTest : CSharpTokenizerTestBase { - private new CSharpSymbol IgnoreRemaining => (CSharpSymbol)base.IgnoreRemaining; + private new CSharpToken IgnoreRemaining => (CSharpToken)base.IgnoreRemaining; [Fact] public void Simple_Integer_Literal_Is_Recognized() { - TestSingleToken("01189998819991197253", CSharpSymbolType.IntegerLiteral); + TestSingleToken("01189998819991197253", CSharpTokenType.IntegerLiteral); } [Fact] public void Integer_Type_Suffix_Is_Recognized() { - TestSingleToken("42U", CSharpSymbolType.IntegerLiteral); - TestSingleToken("42u", CSharpSymbolType.IntegerLiteral); + TestSingleToken("42U", CSharpTokenType.IntegerLiteral); + TestSingleToken("42u", CSharpTokenType.IntegerLiteral); - TestSingleToken("42L", CSharpSymbolType.IntegerLiteral); - TestSingleToken("42l", CSharpSymbolType.IntegerLiteral); + TestSingleToken("42L", CSharpTokenType.IntegerLiteral); + TestSingleToken("42l", CSharpTokenType.IntegerLiteral); - TestSingleToken("42UL", CSharpSymbolType.IntegerLiteral); - TestSingleToken("42Ul", CSharpSymbolType.IntegerLiteral); + TestSingleToken("42UL", CSharpTokenType.IntegerLiteral); + TestSingleToken("42Ul", CSharpTokenType.IntegerLiteral); - TestSingleToken("42uL", CSharpSymbolType.IntegerLiteral); - TestSingleToken("42ul", CSharpSymbolType.IntegerLiteral); + TestSingleToken("42uL", CSharpTokenType.IntegerLiteral); + TestSingleToken("42ul", CSharpTokenType.IntegerLiteral); - TestSingleToken("42LU", CSharpSymbolType.IntegerLiteral); - TestSingleToken("42Lu", CSharpSymbolType.IntegerLiteral); + TestSingleToken("42LU", CSharpTokenType.IntegerLiteral); + TestSingleToken("42Lu", CSharpTokenType.IntegerLiteral); - TestSingleToken("42lU", CSharpSymbolType.IntegerLiteral); - TestSingleToken("42lu", CSharpSymbolType.IntegerLiteral); + TestSingleToken("42lU", CSharpTokenType.IntegerLiteral); + TestSingleToken("42lu", CSharpTokenType.IntegerLiteral); } [Fact] public void Trailing_Letter_Is_Not_Part_Of_Integer_Literal_If_Not_Type_Sufix() { - TestTokenizer("42a", new CSharpSymbol("42", CSharpSymbolType.IntegerLiteral), IgnoreRemaining); + TestTokenizer("42a", new CSharpToken("42", CSharpTokenType.IntegerLiteral), IgnoreRemaining); } [Fact] public void Simple_Hex_Literal_Is_Recognized() { - TestSingleToken("0x0123456789ABCDEF", CSharpSymbolType.IntegerLiteral); + TestSingleToken("0x0123456789ABCDEF", CSharpTokenType.IntegerLiteral); } [Fact] public void Integer_Type_Suffix_Is_Recognized_In_Hex_Literal() { - TestSingleToken("0xDEADBEEFU", CSharpSymbolType.IntegerLiteral); - TestSingleToken("0xDEADBEEFu", CSharpSymbolType.IntegerLiteral); + TestSingleToken("0xDEADBEEFU", CSharpTokenType.IntegerLiteral); + TestSingleToken("0xDEADBEEFu", CSharpTokenType.IntegerLiteral); - TestSingleToken("0xDEADBEEFL", CSharpSymbolType.IntegerLiteral); - TestSingleToken("0xDEADBEEFl", CSharpSymbolType.IntegerLiteral); + TestSingleToken("0xDEADBEEFL", CSharpTokenType.IntegerLiteral); + TestSingleToken("0xDEADBEEFl", CSharpTokenType.IntegerLiteral); - TestSingleToken("0xDEADBEEFUL", CSharpSymbolType.IntegerLiteral); - TestSingleToken("0xDEADBEEFUl", CSharpSymbolType.IntegerLiteral); + TestSingleToken("0xDEADBEEFUL", CSharpTokenType.IntegerLiteral); + TestSingleToken("0xDEADBEEFUl", CSharpTokenType.IntegerLiteral); - TestSingleToken("0xDEADBEEFuL", CSharpSymbolType.IntegerLiteral); - TestSingleToken("0xDEADBEEFul", CSharpSymbolType.IntegerLiteral); + TestSingleToken("0xDEADBEEFuL", CSharpTokenType.IntegerLiteral); + TestSingleToken("0xDEADBEEFul", CSharpTokenType.IntegerLiteral); - TestSingleToken("0xDEADBEEFLU", CSharpSymbolType.IntegerLiteral); - TestSingleToken("0xDEADBEEFLu", CSharpSymbolType.IntegerLiteral); + TestSingleToken("0xDEADBEEFLU", CSharpTokenType.IntegerLiteral); + TestSingleToken("0xDEADBEEFLu", CSharpTokenType.IntegerLiteral); - TestSingleToken("0xDEADBEEFlU", CSharpSymbolType.IntegerLiteral); - TestSingleToken("0xDEADBEEFlu", CSharpSymbolType.IntegerLiteral); + TestSingleToken("0xDEADBEEFlU", CSharpTokenType.IntegerLiteral); + TestSingleToken("0xDEADBEEFlu", CSharpTokenType.IntegerLiteral); } [Fact] public void Trailing_Letter_Is_Not_Part_Of_Hex_Literal_If_Not_Type_Sufix() { - TestTokenizer("0xDEADBEEFz", new CSharpSymbol("0xDEADBEEF", CSharpSymbolType.IntegerLiteral), IgnoreRemaining); + TestTokenizer("0xDEADBEEFz", new CSharpToken("0xDEADBEEF", CSharpTokenType.IntegerLiteral), IgnoreRemaining); } [Fact] public void Dot_Followed_By_Non_Digit_Is_Not_Part_Of_Real_Literal() { - TestTokenizer("3.a", new CSharpSymbol("3", CSharpSymbolType.IntegerLiteral), IgnoreRemaining); + TestTokenizer("3.a", new CSharpToken("3", CSharpTokenType.IntegerLiteral), IgnoreRemaining); } [Fact] public void Simple_Real_Literal_Is_Recognized() { - TestTokenizer("3.14159", new CSharpSymbol("3.14159", CSharpSymbolType.RealLiteral)); + TestTokenizer("3.14159", new CSharpToken("3.14159", CSharpTokenType.RealLiteral)); } [Fact] public void Real_Literal_Between_Zero_And_One_Is_Recognized() { - TestTokenizer(".14159", new CSharpSymbol(".14159", CSharpSymbolType.RealLiteral)); + TestTokenizer(".14159", new CSharpToken(".14159", CSharpTokenType.RealLiteral)); } [Fact] public void Integer_With_Real_Type_Suffix_Is_Recognized() { - TestSingleToken("42F", CSharpSymbolType.RealLiteral); - TestSingleToken("42f", CSharpSymbolType.RealLiteral); - TestSingleToken("42D", CSharpSymbolType.RealLiteral); - TestSingleToken("42d", CSharpSymbolType.RealLiteral); - TestSingleToken("42M", CSharpSymbolType.RealLiteral); - TestSingleToken("42m", CSharpSymbolType.RealLiteral); + TestSingleToken("42F", CSharpTokenType.RealLiteral); + TestSingleToken("42f", CSharpTokenType.RealLiteral); + TestSingleToken("42D", CSharpTokenType.RealLiteral); + TestSingleToken("42d", CSharpTokenType.RealLiteral); + TestSingleToken("42M", CSharpTokenType.RealLiteral); + TestSingleToken("42m", CSharpTokenType.RealLiteral); } [Fact] public void Integer_With_Exponent_Is_Recognized() { - TestSingleToken("1e10", CSharpSymbolType.RealLiteral); - TestSingleToken("1E10", CSharpSymbolType.RealLiteral); - TestSingleToken("1e+10", CSharpSymbolType.RealLiteral); - TestSingleToken("1E+10", CSharpSymbolType.RealLiteral); - TestSingleToken("1e-10", CSharpSymbolType.RealLiteral); - TestSingleToken("1E-10", CSharpSymbolType.RealLiteral); + TestSingleToken("1e10", CSharpTokenType.RealLiteral); + TestSingleToken("1E10", CSharpTokenType.RealLiteral); + TestSingleToken("1e+10", CSharpTokenType.RealLiteral); + TestSingleToken("1E+10", CSharpTokenType.RealLiteral); + TestSingleToken("1e-10", CSharpTokenType.RealLiteral); + TestSingleToken("1E-10", CSharpTokenType.RealLiteral); } [Fact] public void Real_Number_With_Type_Suffix_Is_Recognized() { - TestSingleToken("3.14F", CSharpSymbolType.RealLiteral); - TestSingleToken("3.14f", CSharpSymbolType.RealLiteral); - TestSingleToken("3.14D", CSharpSymbolType.RealLiteral); - TestSingleToken("3.14d", CSharpSymbolType.RealLiteral); - TestSingleToken("3.14M", CSharpSymbolType.RealLiteral); - TestSingleToken("3.14m", CSharpSymbolType.RealLiteral); + TestSingleToken("3.14F", CSharpTokenType.RealLiteral); + TestSingleToken("3.14f", CSharpTokenType.RealLiteral); + TestSingleToken("3.14D", CSharpTokenType.RealLiteral); + TestSingleToken("3.14d", CSharpTokenType.RealLiteral); + TestSingleToken("3.14M", CSharpTokenType.RealLiteral); + TestSingleToken("3.14m", CSharpTokenType.RealLiteral); } [Fact] public void Real_Number_With_Exponent_Is_Recognized() { - TestSingleToken("3.14E10", CSharpSymbolType.RealLiteral); - TestSingleToken("3.14e10", CSharpSymbolType.RealLiteral); - TestSingleToken("3.14E+10", CSharpSymbolType.RealLiteral); - TestSingleToken("3.14e+10", CSharpSymbolType.RealLiteral); - TestSingleToken("3.14E-10", CSharpSymbolType.RealLiteral); - TestSingleToken("3.14e-10", CSharpSymbolType.RealLiteral); + TestSingleToken("3.14E10", CSharpTokenType.RealLiteral); + TestSingleToken("3.14e10", CSharpTokenType.RealLiteral); + TestSingleToken("3.14E+10", CSharpTokenType.RealLiteral); + TestSingleToken("3.14e+10", CSharpTokenType.RealLiteral); + TestSingleToken("3.14E-10", CSharpTokenType.RealLiteral); + TestSingleToken("3.14e-10", CSharpTokenType.RealLiteral); } [Fact] public void Real_Number_With_Exponent_And_Type_Suffix_Is_Recognized() { - TestSingleToken("3.14E+10F", CSharpSymbolType.RealLiteral); + TestSingleToken("3.14E+10F", CSharpTokenType.RealLiteral); } [Fact] public void Single_Character_Literal_Is_Recognized() { - TestSingleToken("'f'", CSharpSymbolType.CharacterLiteral); + TestSingleToken("'f'", CSharpTokenType.CharacterLiteral); } [Fact] public void Multi_Character_Literal_Is_Recognized() { - TestSingleToken("'foo'", CSharpSymbolType.CharacterLiteral); + TestSingleToken("'foo'", CSharpTokenType.CharacterLiteral); } [Fact] public void Character_Literal_Is_Terminated_By_EOF_If_Unterminated() { - TestSingleToken("'foo bar", CSharpSymbolType.CharacterLiteral); + TestSingleToken("'foo bar", CSharpTokenType.CharacterLiteral); } [Fact] public void Character_Literal_Not_Terminated_By_Escaped_Quote() { - TestSingleToken("'foo\\'bar'", CSharpSymbolType.CharacterLiteral); + TestSingleToken("'foo\\'bar'", CSharpTokenType.CharacterLiteral); } [Fact] public void Character_Literal_Is_Terminated_By_EOL_If_Unterminated() { - TestTokenizer("'foo\n", new CSharpSymbol("'foo", CSharpSymbolType.CharacterLiteral), IgnoreRemaining); + TestTokenizer("'foo\n", new CSharpToken("'foo", CSharpTokenType.CharacterLiteral), IgnoreRemaining); } [Fact] public void Character_Literal_Terminated_By_EOL_Even_When_Last_Char_Is_Slash() { - TestTokenizer("'foo\\\n", new CSharpSymbol("'foo\\", CSharpSymbolType.CharacterLiteral), IgnoreRemaining); + TestTokenizer("'foo\\\n", new CSharpToken("'foo\\", CSharpTokenType.CharacterLiteral), IgnoreRemaining); } [Fact] public void Character_Literal_Terminated_By_EOL_Even_When_Last_Char_Is_Slash_And_Followed_By_Stuff() { - TestTokenizer("'foo\\\nflarg", new CSharpSymbol("'foo\\", CSharpSymbolType.CharacterLiteral), IgnoreRemaining); + TestTokenizer("'foo\\\nflarg", new CSharpToken("'foo\\", CSharpTokenType.CharacterLiteral), IgnoreRemaining); } [Fact] public void Character_Literal_Terminated_By_CRLF_Even_When_Last_Char_Is_Slash() { - TestTokenizer("'foo\\" + Environment.NewLine, new CSharpSymbol("'foo\\", CSharpSymbolType.CharacterLiteral), IgnoreRemaining); + TestTokenizer("'foo\\" + Environment.NewLine, new CSharpToken("'foo\\", CSharpTokenType.CharacterLiteral), IgnoreRemaining); } [Fact] public void Character_Literal_Terminated_By_CRLF_Even_When_Last_Char_Is_Slash_And_Followed_By_Stuff() { - TestTokenizer($"'foo\\{Environment.NewLine}flarg", new CSharpSymbol("'foo\\", CSharpSymbolType.CharacterLiteral), IgnoreRemaining); + TestTokenizer($"'foo\\{Environment.NewLine}flarg", new CSharpToken("'foo\\", CSharpTokenType.CharacterLiteral), IgnoreRemaining); } [Fact] public void Character_Literal_Allows_Escaped_Escape() { - TestTokenizer("'foo\\\\'blah", new CSharpSymbol("'foo\\\\'", CSharpSymbolType.CharacterLiteral), IgnoreRemaining); + TestTokenizer("'foo\\\\'blah", new CSharpToken("'foo\\\\'", CSharpTokenType.CharacterLiteral), IgnoreRemaining); } [Fact] public void String_Literal_Is_Recognized() { - TestSingleToken("\"foo\"", CSharpSymbolType.StringLiteral); + TestSingleToken("\"foo\"", CSharpTokenType.StringLiteral); } [Fact] public void String_Literal_Is_Terminated_By_EOF_If_Unterminated() { - TestSingleToken("\"foo bar", CSharpSymbolType.StringLiteral); + TestSingleToken("\"foo bar", CSharpTokenType.StringLiteral); } [Fact] public void String_Literal_Not_Terminated_By_Escaped_Quote() { - TestSingleToken("\"foo\\\"bar\"", CSharpSymbolType.StringLiteral); + TestSingleToken("\"foo\\\"bar\"", CSharpTokenType.StringLiteral); } [Fact] public void String_Literal_Is_Terminated_By_EOL_If_Unterminated() { - TestTokenizer("\"foo\n", new CSharpSymbol("\"foo", CSharpSymbolType.StringLiteral), IgnoreRemaining); + TestTokenizer("\"foo\n", new CSharpToken("\"foo", CSharpTokenType.StringLiteral), IgnoreRemaining); } [Fact] public void String_Literal_Terminated_By_EOL_Even_When_Last_Char_Is_Slash() { - TestTokenizer("\"foo\\\n", new CSharpSymbol("\"foo\\", CSharpSymbolType.StringLiteral), IgnoreRemaining); + TestTokenizer("\"foo\\\n", new CSharpToken("\"foo\\", CSharpTokenType.StringLiteral), IgnoreRemaining); } [Fact] public void String_Literal_Terminated_By_EOL_Even_When_Last_Char_Is_Slash_And_Followed_By_Stuff() { - TestTokenizer("\"foo\\\nflarg", new CSharpSymbol("\"foo\\", CSharpSymbolType.StringLiteral), IgnoreRemaining); + TestTokenizer("\"foo\\\nflarg", new CSharpToken("\"foo\\", CSharpTokenType.StringLiteral), IgnoreRemaining); } [Fact] public void String_Literal_Terminated_By_CRLF_Even_When_Last_Char_Is_Slash() { - TestTokenizer("\"foo\\" + Environment.NewLine, new CSharpSymbol("\"foo\\", CSharpSymbolType.StringLiteral), IgnoreRemaining); + TestTokenizer("\"foo\\" + Environment.NewLine, new CSharpToken("\"foo\\", CSharpTokenType.StringLiteral), IgnoreRemaining); } [Fact] public void String_Literal_Terminated_By_CRLF_Even_When_Last_Char_Is_Slash_And_Followed_By_Stuff() { - TestTokenizer($"\"foo\\{Environment.NewLine}flarg", new CSharpSymbol("\"foo\\", CSharpSymbolType.StringLiteral), IgnoreRemaining); + TestTokenizer($"\"foo\\{Environment.NewLine}flarg", new CSharpToken("\"foo\\", CSharpTokenType.StringLiteral), IgnoreRemaining); } [Fact] public void String_Literal_Allows_Escaped_Escape() { - TestTokenizer("\"foo\\\\\"blah", new CSharpSymbol("\"foo\\\\\"", CSharpSymbolType.StringLiteral), IgnoreRemaining); + TestTokenizer("\"foo\\\\\"blah", new CSharpToken("\"foo\\\\\"", CSharpTokenType.StringLiteral), IgnoreRemaining); } [Fact] public void Verbatim_String_Literal_Can_Contain_Newlines() { - TestSingleToken("@\"foo\nbar\nbaz\"", CSharpSymbolType.StringLiteral); + TestSingleToken("@\"foo\nbar\nbaz\"", CSharpTokenType.StringLiteral); } [Fact] public void Verbatim_String_Literal_Not_Terminated_By_Escaped_Double_Quote() { - TestSingleToken("@\"foo\"\"bar\"", CSharpSymbolType.StringLiteral); + TestSingleToken("@\"foo\"\"bar\"", CSharpTokenType.StringLiteral); } [Fact] public void Verbatim_String_Literal_Is_Terminated_By_Slash_Double_Quote() { - TestTokenizer("@\"foo\\\"bar\"", new CSharpSymbol("@\"foo\\\"", CSharpSymbolType.StringLiteral), IgnoreRemaining); + TestTokenizer("@\"foo\\\"bar\"", new CSharpToken("@\"foo\\\"", CSharpTokenType.StringLiteral), IgnoreRemaining); } [Fact] public void Verbatim_String_Literal_Is_Terminated_By_EOF() { - TestSingleToken("@\"foo", CSharpSymbolType.StringLiteral); + TestSingleToken("@\"foo", CSharpTokenType.StringLiteral); } } } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerOperatorsTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerOperatorsTest.cs index 67000e950b..0b600ea9bc 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerOperatorsTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerOperatorsTest.cs @@ -10,287 +10,287 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy [Fact] public void LeftBrace_Is_Recognized() { - TestSingleToken("{", CSharpSymbolType.LeftBrace); + TestSingleToken("{", CSharpTokenType.LeftBrace); } [Fact] public void Plus_Is_Recognized() { - TestSingleToken("+", CSharpSymbolType.Plus); + TestSingleToken("+", CSharpTokenType.Plus); } [Fact] public void Assign_Is_Recognized() { - TestSingleToken("=", CSharpSymbolType.Assign); + TestSingleToken("=", CSharpTokenType.Assign); } [Fact] public void Arrow_Is_Recognized() { - TestSingleToken("->", CSharpSymbolType.Arrow); + TestSingleToken("->", CSharpTokenType.Arrow); } [Fact] public void AndAssign_Is_Recognized() { - TestSingleToken("&=", CSharpSymbolType.AndAssign); + TestSingleToken("&=", CSharpTokenType.AndAssign); } [Fact] public void RightBrace_Is_Recognized() { - TestSingleToken("}", CSharpSymbolType.RightBrace); + TestSingleToken("}", CSharpTokenType.RightBrace); } [Fact] public void Minus_Is_Recognized() { - TestSingleToken("-", CSharpSymbolType.Minus); + TestSingleToken("-", CSharpTokenType.Minus); } [Fact] public void LessThan_Is_Recognized() { - TestSingleToken("<", CSharpSymbolType.LessThan); + TestSingleToken("<", CSharpTokenType.LessThan); } [Fact] public void Equals_Is_Recognized() { - TestSingleToken("==", CSharpSymbolType.Equals); + TestSingleToken("==", CSharpTokenType.Equals); } [Fact] public void OrAssign_Is_Recognized() { - TestSingleToken("|=", CSharpSymbolType.OrAssign); + TestSingleToken("|=", CSharpTokenType.OrAssign); } [Fact] public void LeftBracket_Is_Recognized() { - TestSingleToken("[", CSharpSymbolType.LeftBracket); + TestSingleToken("[", CSharpTokenType.LeftBracket); } [Fact] public void Star_Is_Recognized() { - TestSingleToken("*", CSharpSymbolType.Star); + TestSingleToken("*", CSharpTokenType.Star); } [Fact] public void GreaterThan_Is_Recognized() { - TestSingleToken(">", CSharpSymbolType.GreaterThan); + TestSingleToken(">", CSharpTokenType.GreaterThan); } [Fact] public void NotEqual_Is_Recognized() { - TestSingleToken("!=", CSharpSymbolType.NotEqual); + TestSingleToken("!=", CSharpTokenType.NotEqual); } [Fact] public void XorAssign_Is_Recognized() { - TestSingleToken("^=", CSharpSymbolType.XorAssign); + TestSingleToken("^=", CSharpTokenType.XorAssign); } [Fact] public void RightBracket_Is_Recognized() { - TestSingleToken("]", CSharpSymbolType.RightBracket); + TestSingleToken("]", CSharpTokenType.RightBracket); } [Fact] public void Slash_Is_Recognized() { - TestSingleToken("/", CSharpSymbolType.Slash); + TestSingleToken("/", CSharpTokenType.Slash); } [Fact] public void QuestionMark_Is_Recognized() { - TestSingleToken("?", CSharpSymbolType.QuestionMark); + TestSingleToken("?", CSharpTokenType.QuestionMark); } [Fact] public void LessThanEqual_Is_Recognized() { - TestSingleToken("<=", CSharpSymbolType.LessThanEqual); + TestSingleToken("<=", CSharpTokenType.LessThanEqual); } [Fact] public void LeftShift_Is_Not_Specially_Recognized() { TestTokenizer("<<", - new CSharpSymbol("<", CSharpSymbolType.LessThan), - new CSharpSymbol("<", CSharpSymbolType.LessThan)); + new CSharpToken("<", CSharpTokenType.LessThan), + new CSharpToken("<", CSharpTokenType.LessThan)); } [Fact] public void LeftParen_Is_Recognized() { - TestSingleToken("(", CSharpSymbolType.LeftParenthesis); + TestSingleToken("(", CSharpTokenType.LeftParenthesis); } [Fact] public void Modulo_Is_Recognized() { - TestSingleToken("%", CSharpSymbolType.Modulo); + TestSingleToken("%", CSharpTokenType.Modulo); } [Fact] public void NullCoalesce_Is_Recognized() { - TestSingleToken("??", CSharpSymbolType.NullCoalesce); + TestSingleToken("??", CSharpTokenType.NullCoalesce); } [Fact] public void GreaterThanEqual_Is_Recognized() { - TestSingleToken(">=", CSharpSymbolType.GreaterThanEqual); + TestSingleToken(">=", CSharpTokenType.GreaterThanEqual); } [Fact] public void EqualGreaterThan_Is_Recognized() { - TestSingleToken("=>", CSharpSymbolType.GreaterThanEqual); + TestSingleToken("=>", CSharpTokenType.GreaterThanEqual); } [Fact] public void RightParen_Is_Recognized() { - TestSingleToken(")", CSharpSymbolType.RightParenthesis); + TestSingleToken(")", CSharpTokenType.RightParenthesis); } [Fact] public void And_Is_Recognized() { - TestSingleToken("&", CSharpSymbolType.And); + TestSingleToken("&", CSharpTokenType.And); } [Fact] public void DoubleColon_Is_Recognized() { - TestSingleToken("::", CSharpSymbolType.DoubleColon); + TestSingleToken("::", CSharpTokenType.DoubleColon); } [Fact] public void PlusAssign_Is_Recognized() { - TestSingleToken("+=", CSharpSymbolType.PlusAssign); + TestSingleToken("+=", CSharpTokenType.PlusAssign); } [Fact] public void Semicolon_Is_Recognized() { - TestSingleToken(";", CSharpSymbolType.Semicolon); + TestSingleToken(";", CSharpTokenType.Semicolon); } [Fact] public void Tilde_Is_Recognized() { - TestSingleToken("~", CSharpSymbolType.Tilde); + TestSingleToken("~", CSharpTokenType.Tilde); } [Fact] public void DoubleOr_Is_Recognized() { - TestSingleToken("||", CSharpSymbolType.DoubleOr); + TestSingleToken("||", CSharpTokenType.DoubleOr); } [Fact] public void ModuloAssign_Is_Recognized() { - TestSingleToken("%=", CSharpSymbolType.ModuloAssign); + TestSingleToken("%=", CSharpTokenType.ModuloAssign); } [Fact] public void Colon_Is_Recognized() { - TestSingleToken(":", CSharpSymbolType.Colon); + TestSingleToken(":", CSharpTokenType.Colon); } [Fact] public void Not_Is_Recognized() { - TestSingleToken("!", CSharpSymbolType.Not); + TestSingleToken("!", CSharpTokenType.Not); } [Fact] public void DoubleAnd_Is_Recognized() { - TestSingleToken("&&", CSharpSymbolType.DoubleAnd); + TestSingleToken("&&", CSharpTokenType.DoubleAnd); } [Fact] public void DivideAssign_Is_Recognized() { - TestSingleToken("/=", CSharpSymbolType.DivideAssign); + TestSingleToken("/=", CSharpTokenType.DivideAssign); } [Fact] public void Comma_Is_Recognized() { - TestSingleToken(",", CSharpSymbolType.Comma); + TestSingleToken(",", CSharpTokenType.Comma); } [Fact] public void Xor_Is_Recognized() { - TestSingleToken("^", CSharpSymbolType.Xor); + TestSingleToken("^", CSharpTokenType.Xor); } [Fact] public void Decrement_Is_Recognized() { - TestSingleToken("--", CSharpSymbolType.Decrement); + TestSingleToken("--", CSharpTokenType.Decrement); } [Fact] public void MultiplyAssign_Is_Recognized() { - TestSingleToken("*=", CSharpSymbolType.MultiplyAssign); + TestSingleToken("*=", CSharpTokenType.MultiplyAssign); } [Fact] public void Dot_Is_Recognized() { - TestSingleToken(".", CSharpSymbolType.Dot); + TestSingleToken(".", CSharpTokenType.Dot); } [Fact] public void Or_Is_Recognized() { - TestSingleToken("|", CSharpSymbolType.Or); + TestSingleToken("|", CSharpTokenType.Or); } [Fact] public void Increment_Is_Recognized() { - TestSingleToken("++", CSharpSymbolType.Increment); + TestSingleToken("++", CSharpTokenType.Increment); } [Fact] public void MinusAssign_Is_Recognized() { - TestSingleToken("-=", CSharpSymbolType.MinusAssign); + TestSingleToken("-=", CSharpTokenType.MinusAssign); } [Fact] public void RightShift_Is_Not_Specially_Recognized() { TestTokenizer(">>", - new CSharpSymbol(">", CSharpSymbolType.GreaterThan), - new CSharpSymbol(">", CSharpSymbolType.GreaterThan)); + new CSharpToken(">", CSharpTokenType.GreaterThan), + new CSharpToken(">", CSharpTokenType.GreaterThan)); } [Fact] public void Hash_Is_Recognized() { - TestSingleToken("#", CSharpSymbolType.Hash); + TestSingleToken("#", CSharpTokenType.Hash); } } } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTest.cs index c4dabc0399..cf98382ef4 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTest.cs @@ -7,7 +7,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { public class CSharpTokenizerTest : CSharpTokenizerTestBase { - private new CSharpSymbol IgnoreRemaining => (CSharpSymbol)base.IgnoreRemaining; + private new CSharpToken IgnoreRemaining => (CSharpToken)base.IgnoreRemaining; [Fact] public void Next_Returns_Null_When_EOF_Reached() @@ -20,8 +20,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { TestTokenizer( "\r\ra", - new CSharpSymbol("\r", CSharpSymbolType.NewLine), - new CSharpSymbol("\r", CSharpSymbolType.NewLine), + new CSharpToken("\r", CSharpTokenType.NewLine), + new CSharpToken("\r", CSharpTokenType.NewLine), IgnoreRemaining); } @@ -30,8 +30,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { TestTokenizer( "\n\na", - new CSharpSymbol("\n", CSharpSymbolType.NewLine), - new CSharpSymbol("\n", CSharpSymbolType.NewLine), + new CSharpToken("\n", CSharpTokenType.NewLine), + new CSharpToken("\n", CSharpTokenType.NewLine), IgnoreRemaining); } @@ -41,8 +41,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // NEL: Unicode "Next Line" U+0085 TestTokenizer( "\u0085\u0085a", - new CSharpSymbol("\u0085", CSharpSymbolType.NewLine), - new CSharpSymbol("\u0085", CSharpSymbolType.NewLine), + new CSharpToken("\u0085", CSharpTokenType.NewLine), + new CSharpToken("\u0085", CSharpTokenType.NewLine), IgnoreRemaining); } @@ -52,8 +52,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Unicode "Line Separator" U+2028 TestTokenizer( "\u2028\u2028a", - new CSharpSymbol("\u2028", CSharpSymbolType.NewLine), - new CSharpSymbol("\u2028", CSharpSymbolType.NewLine), + new CSharpToken("\u2028", CSharpTokenType.NewLine), + new CSharpToken("\u2028", CSharpTokenType.NewLine), IgnoreRemaining); } @@ -63,8 +63,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Unicode "Paragraph Separator" U+2029 TestTokenizer( "\u2029\u2029a", - new CSharpSymbol("\u2029", CSharpSymbolType.NewLine), - new CSharpSymbol("\u2029", CSharpSymbolType.NewLine), + new CSharpToken("\u2029", CSharpTokenType.NewLine), + new CSharpToken("\u2029", CSharpTokenType.NewLine), IgnoreRemaining); } @@ -73,8 +73,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { TestTokenizer( "\r\n\r\na", - new CSharpSymbol("\r\n", CSharpSymbolType.NewLine), - new CSharpSymbol("\r\n", CSharpSymbolType.NewLine), + new CSharpToken("\r\n", CSharpTokenType.NewLine), + new CSharpToken("\r\n", CSharpTokenType.NewLine), IgnoreRemaining); } @@ -83,15 +83,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { TestTokenizer( " \f\t\u000B \n ", - new CSharpSymbol(" \f\t\u000B ", CSharpSymbolType.WhiteSpace), - new CSharpSymbol("\n", CSharpSymbolType.NewLine), - new CSharpSymbol(" ", CSharpSymbolType.WhiteSpace)); + new CSharpToken(" \f\t\u000B ", CSharpTokenType.WhiteSpace), + new CSharpToken("\n", CSharpTokenType.NewLine), + new CSharpToken(" ", CSharpTokenType.WhiteSpace)); } [Fact] public void Transition_Is_Recognized() { - TestSingleToken("@", CSharpSymbolType.Transition); + TestSingleToken("@", CSharpTokenType.Transition); } [Fact] @@ -99,8 +99,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { TestTokenizer( "@(", - new CSharpSymbol("@", CSharpSymbolType.Transition), - new CSharpSymbol("(", CSharpSymbolType.LeftParenthesis)); + new CSharpToken("@", CSharpTokenType.Transition), + new CSharpToken("(", CSharpTokenType.LeftParenthesis)); } } } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTestBase.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTestBase.cs index a22d0d5ef1..6869138c1e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTestBase.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTestBase.cs @@ -5,7 +5,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { public abstract class CSharpTokenizerTestBase : TokenizerTestBase { - private static CSharpSymbol _ignoreRemaining = new CSharpSymbol(string.Empty, CSharpSymbolType.Unknown); + private static CSharpToken _ignoreRemaining = new CSharpToken(string.Empty, CSharpTokenType.Unknown); internal override object IgnoreRemaining { @@ -17,14 +17,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return new CSharpTokenizer(source); } - internal void TestSingleToken(string text, CSharpSymbolType expectedSymbolType) + internal void TestSingleToken(string text, CSharpTokenType expectedTokenType) { - TestTokenizer(text, new CSharpSymbol(text, expectedSymbolType)); + TestTokenizer(text, new CSharpToken(text, expectedTokenType)); } - internal void TestTokenizer(string input, params CSharpSymbol[] expectedSymbols) + internal void TestTokenizer(string input, params CSharpToken[] expectedTokens) { - base.TestTokenizer(input, expectedSymbols); + base.TestTokenizer(input, expectedTokens); } } } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/DirectiveCSharpTokenizerTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/DirectiveCSharpTokenizerTest.cs index dcbbd2b1ef..7a1e0c070a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/DirectiveCSharpTokenizerTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/DirectiveCSharpTokenizerTest.cs @@ -12,12 +12,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { TestTokenizer( "\r\n @something \r\n @this is ignored", - new CSharpSymbol("\r\n", CSharpSymbolType.NewLine), - new CSharpSymbol(" ", CSharpSymbolType.WhiteSpace), - new CSharpSymbol("@", CSharpSymbolType.Transition), - new CSharpSymbol("something", CSharpSymbolType.Identifier), - new CSharpSymbol(" ", CSharpSymbolType.WhiteSpace), - new CSharpSymbol("\r\n", CSharpSymbolType.NewLine)); + new CSharpToken("\r\n", CSharpTokenType.NewLine), + new CSharpToken(" ", CSharpTokenType.WhiteSpace), + new CSharpToken("@", CSharpTokenType.Transition), + new CSharpToken("something", CSharpTokenType.Identifier), + new CSharpToken(" ", CSharpTokenType.WhiteSpace), + new CSharpToken("\r\n", CSharpTokenType.NewLine)); } [Fact] @@ -25,18 +25,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { TestTokenizer( "@*included*@\r\n @something \"value\"\r\n @this is ignored", - new CSharpSymbol("@", CSharpSymbolType.RazorCommentTransition), - new CSharpSymbol("*", CSharpSymbolType.RazorCommentStar), - new CSharpSymbol("included", CSharpSymbolType.RazorComment), - new CSharpSymbol("*", CSharpSymbolType.RazorCommentStar), - new CSharpSymbol("@", CSharpSymbolType.RazorCommentTransition), - new CSharpSymbol("\r\n", CSharpSymbolType.NewLine), - new CSharpSymbol(" ", CSharpSymbolType.WhiteSpace), - new CSharpSymbol("@", CSharpSymbolType.Transition), - new CSharpSymbol("something", CSharpSymbolType.Identifier), - new CSharpSymbol(" ", CSharpSymbolType.WhiteSpace), - new CSharpSymbol("\"value\"", CSharpSymbolType.StringLiteral), - new CSharpSymbol("\r\n", CSharpSymbolType.NewLine)); + new CSharpToken("@", CSharpTokenType.RazorCommentTransition), + new CSharpToken("*", CSharpTokenType.RazorCommentStar), + new CSharpToken("included", CSharpTokenType.RazorComment), + new CSharpToken("*", CSharpTokenType.RazorCommentStar), + new CSharpToken("@", CSharpTokenType.RazorCommentTransition), + new CSharpToken("\r\n", CSharpTokenType.NewLine), + new CSharpToken(" ", CSharpTokenType.WhiteSpace), + new CSharpToken("@", CSharpTokenType.Transition), + new CSharpToken("something", CSharpTokenType.Identifier), + new CSharpToken(" ", CSharpTokenType.WhiteSpace), + new CSharpToken("\"value\"", CSharpTokenType.StringLiteral), + new CSharpToken("\r\n", CSharpTokenType.NewLine)); } internal override object CreateTokenizer(ITextDocument source) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/DirectiveHtmlTokenizerTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/DirectiveHtmlTokenizerTest.cs index b75874b681..cffd0a0d0d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/DirectiveHtmlTokenizerTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/DirectiveHtmlTokenizerTest.cs @@ -12,9 +12,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { TestTokenizer( "\r\n
Ignored
", - new HtmlSymbol("\r\n", HtmlSymbolType.NewLine), - new HtmlSymbol(" ", HtmlSymbolType.WhiteSpace), - new HtmlSymbol("<", HtmlSymbolType.OpenAngle)); + new HtmlToken("\r\n", HtmlTokenType.NewLine), + new HtmlToken(" ", HtmlTokenType.WhiteSpace), + new HtmlToken("<", HtmlTokenType.OpenAngle)); } [Fact] @@ -22,15 +22,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { TestTokenizer( "\r\n @*included*@
Ignored
", - new HtmlSymbol("\r\n", HtmlSymbolType.NewLine), - new HtmlSymbol(" ", HtmlSymbolType.WhiteSpace), - new HtmlSymbol("@", HtmlSymbolType.RazorCommentTransition), - new HtmlSymbol("*", HtmlSymbolType.RazorCommentStar), - new HtmlSymbol("included", HtmlSymbolType.RazorComment), - new HtmlSymbol("*", HtmlSymbolType.RazorCommentStar), - new HtmlSymbol("@", HtmlSymbolType.RazorCommentTransition), - new HtmlSymbol(" ", HtmlSymbolType.WhiteSpace), - new HtmlSymbol("<", HtmlSymbolType.OpenAngle)); + new HtmlToken("\r\n", HtmlTokenType.NewLine), + new HtmlToken(" ", HtmlTokenType.WhiteSpace), + new HtmlToken("@", HtmlTokenType.RazorCommentTransition), + new HtmlToken("*", HtmlTokenType.RazorCommentStar), + new HtmlToken("included", HtmlTokenType.RazorComment), + new HtmlToken("*", HtmlTokenType.RazorCommentStar), + new HtmlToken("@", HtmlTokenType.RazorCommentTransition), + new HtmlToken(" ", HtmlTokenType.WhiteSpace), + new HtmlToken("<", HtmlTokenType.OpenAngle)); } internal override object CreateTokenizer(ITextDocument source) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlMarkupParserTests.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlMarkupParserTests.cs index cc12a33914..839eb92353 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlMarkupParserTests.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlMarkupParserTests.cs @@ -8,69 +8,69 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy { public class HtmlMarkupParserTests { - private static readonly HtmlSymbol doubleHyphenSymbol = new HtmlSymbol("--", HtmlSymbolType.DoubleHyphen); + private static readonly HtmlToken doubleHyphenToken = new HtmlToken("--", HtmlTokenType.DoubleHyphen); - public static IEnumerable NonDashSymbols + public static IEnumerable NonDashTokens { get { - yield return new[] { new HtmlSymbol("--", HtmlSymbolType.DoubleHyphen) }; - yield return new[] { new HtmlSymbol("asdf", HtmlSymbolType.Text) }; - yield return new[] { new HtmlSymbol(">", HtmlSymbolType.CloseAngle) }; - yield return new[] { new HtmlSymbol("<", HtmlSymbolType.OpenAngle) }; - yield return new[] { new HtmlSymbol("!", HtmlSymbolType.Bang) }; + yield return new[] { new HtmlToken("--", HtmlTokenType.DoubleHyphen) }; + yield return new[] { new HtmlToken("asdf", HtmlTokenType.Text) }; + yield return new[] { new HtmlToken(">", HtmlTokenType.CloseAngle) }; + yield return new[] { new HtmlToken("<", HtmlTokenType.OpenAngle) }; + yield return new[] { new HtmlToken("!", HtmlTokenType.Bang) }; } } [Theory] - [MemberData(nameof(NonDashSymbols))] - public void IsHyphen_ReturnsFalseForNonDashSymbol(object symbol) + [MemberData(nameof(NonDashTokens))] + public void IsHyphen_ReturnsFalseForNonDashToken(object token) { // Arrange - var convertedSymbol = (HtmlSymbol)symbol; + var convertedToken = (HtmlToken)token; // Act & Assert - Assert.False(HtmlMarkupParser.IsHyphen(convertedSymbol)); + Assert.False(HtmlMarkupParser.IsHyphen(convertedToken)); } [Fact] - public void IsHyphen_ReturnsTrueForADashSymbol() + public void IsHyphen_ReturnsTrueForADashToken() { // Arrange - var dashSymbol = new HtmlSymbol("-", HtmlSymbolType.Text); + var dashToken = new HtmlToken("-", HtmlTokenType.Text); // Act & Assert - Assert.True(HtmlMarkupParser.IsHyphen(dashSymbol)); + Assert.True(HtmlMarkupParser.IsHyphen(dashToken)); } [Fact] - public void AcceptAllButLastDoubleHypens_ReturnsTheOnlyDoubleHyphenSymbol() + public void AcceptAllButLastDoubleHypens_ReturnsTheOnlyDoubleHyphenToken() { // Arrange var sut = CreateTestParserForContent("-->"); // Act - var symbol = sut.AcceptAllButLastDoubleHyphens(); + var token = sut.AcceptAllButLastDoubleHyphens(); // Assert - Assert.Equal(doubleHyphenSymbol, symbol); - Assert.True(sut.At(HtmlSymbolType.CloseAngle)); - Assert.Equal(doubleHyphenSymbol, sut.PreviousSymbol); + Assert.Equal(doubleHyphenToken, token); + Assert.True(sut.At(HtmlTokenType.CloseAngle)); + Assert.Equal(doubleHyphenToken, sut.PreviousToken); } [Fact] - public void AcceptAllButLastDoubleHypens_ReturnsTheDoubleHyphenSymbolAfterAcceptingTheDash() + public void AcceptAllButLastDoubleHypens_ReturnsTheDoubleHyphenTokenAfterAcceptingTheDash() { // Arrange var sut = CreateTestParserForContent("--->"); // Act - var symbol = sut.AcceptAllButLastDoubleHyphens(); + var token = sut.AcceptAllButLastDoubleHyphens(); // Assert - Assert.Equal(doubleHyphenSymbol, symbol); - Assert.True(sut.At(HtmlSymbolType.CloseAngle)); - Assert.True(HtmlMarkupParser.IsHyphen(sut.PreviousSymbol)); + Assert.Equal(doubleHyphenToken, token); + Assert.True(sut.At(HtmlTokenType.CloseAngle)); + Assert.True(HtmlMarkupParser.IsHyphen(sut.PreviousToken)); } [Fact] @@ -117,7 +117,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy public void IsHtmlCommentAhead_ReturnsTrueForValidCommentTagWithExtraInfoAfter() { // Arrange - var sut = CreateTestParserForContent("-- comment --> the first part is a valid comment without the Open angle and bang symbols"); + var sut = CreateTestParserForContent("-- comment --> the first part is a valid comment without the Open angle and bang tokens"); // Act & Assert Assert.True(sut.IsHtmlCommentAhead()); @@ -157,8 +157,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy public void IsCommentContentEndingInvalid_ReturnsFalseForAllowedContent() { // Arrange - var expectedSymbol1 = new HtmlSymbol("a", HtmlSymbolType.Text); - var sequence = Enumerable.Range((int)'a', 26).Select(item => new HtmlSymbol(((char)item).ToString(), HtmlSymbolType.Text)); + var expectedToken1 = new HtmlToken("a", HtmlTokenType.Text); + var sequence = Enumerable.Range((int)'a', 26).Select(item => new HtmlToken(((char)item).ToString(), HtmlTokenType.Text)); // Act & Assert Assert.False(HtmlMarkupParser.IsCommentContentEndingInvalid(sequence)); @@ -168,8 +168,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy public void IsCommentContentEndingInvalid_ReturnsTrueForDisallowedContent() { // Arrange - var expectedSymbol1 = new HtmlSymbol("a", HtmlSymbolType.Text); - var sequence = new[] { new HtmlSymbol("<", HtmlSymbolType.OpenAngle), new HtmlSymbol("!", HtmlSymbolType.Bang), new HtmlSymbol("-", HtmlSymbolType.Text) }; + var expectedToken1 = new HtmlToken("a", HtmlTokenType.Text); + var sequence = new[] { new HtmlToken("<", HtmlTokenType.OpenAngle), new HtmlToken("!", HtmlTokenType.Bang), new HtmlToken("-", HtmlTokenType.Text) }; // Act & Assert Assert.True(HtmlMarkupParser.IsCommentContentEndingInvalid(sequence)); @@ -179,8 +179,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy public void IsCommentContentEndingInvalid_ReturnsFalseForEmptyContent() { // Arrange - var expectedSymbol1 = new HtmlSymbol("a", HtmlSymbolType.Text); - var sequence = Array.Empty(); + var expectedToken1 = new HtmlToken("a", HtmlTokenType.Text); + var sequence = Array.Empty(); // Act & Assert Assert.False(HtmlMarkupParser.IsCommentContentEndingInvalid(sequence)); @@ -188,9 +188,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy private class TestHtmlMarkupParser : HtmlMarkupParser { - public new HtmlSymbol PreviousSymbol + public new HtmlToken PreviousToken { - get => base.PreviousSymbol; + get => base.PreviousToken; } public new bool IsHtmlCommentAhead() @@ -203,7 +203,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy this.EnsureCurrent(); } - public new HtmlSymbol AcceptAllButLastDoubleHyphens() + public new HtmlToken AcceptAllButLastDoubleHyphens() { return base.AcceptAllButLastDoubleHyphens(); } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTest.cs index 529c2f9118..9b54d75957 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTest.cs @@ -17,113 +17,113 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public void Text_Is_Recognized() { TestTokenizer("foo-9309&smlkmb;::-3029022,.sdkq92384", - new HtmlSymbol("foo-9309&smlkmb;::-3029022,.sdkq92384", HtmlSymbolType.Text)); + new HtmlToken("foo-9309&smlkmb;::-3029022,.sdkq92384", HtmlTokenType.Text)); } [Fact] public void Whitespace_Is_Recognized() { TestTokenizer(" \t\f ", - new HtmlSymbol(" \t\f ", HtmlSymbolType.WhiteSpace)); + new HtmlToken(" \t\f ", HtmlTokenType.WhiteSpace)); } [Fact] public void Newline_Is_Recognized() { TestTokenizer("\n\r\r\n", - new HtmlSymbol("\n", HtmlSymbolType.NewLine), - new HtmlSymbol("\r", HtmlSymbolType.NewLine), - new HtmlSymbol("\r\n", HtmlSymbolType.NewLine)); + new HtmlToken("\n", HtmlTokenType.NewLine), + new HtmlToken("\r", HtmlTokenType.NewLine), + new HtmlToken("\r\n", HtmlTokenType.NewLine)); } [Fact] public void Transition_Is_Not_Recognized_Mid_Text_If_Surrounded_By_Alphanumeric_Characters() { - TestSingleToken("foo@bar", HtmlSymbolType.Text); + TestSingleToken("foo@bar", HtmlTokenType.Text); } [Fact] public void OpenAngle_Is_Recognized() { - TestSingleToken("<", HtmlSymbolType.OpenAngle); + TestSingleToken("<", HtmlTokenType.OpenAngle); } [Fact] public void Bang_Is_Recognized() { - TestSingleToken("!", HtmlSymbolType.Bang); + TestSingleToken("!", HtmlTokenType.Bang); } [Fact] public void Solidus_Is_Recognized() { - TestSingleToken("/", HtmlSymbolType.ForwardSlash); + TestSingleToken("/", HtmlTokenType.ForwardSlash); } [Fact] public void QuestionMark_Is_Recognized() { - TestSingleToken("?", HtmlSymbolType.QuestionMark); + TestSingleToken("?", HtmlTokenType.QuestionMark); } [Fact] public void LeftBracket_Is_Recognized() { - TestSingleToken("[", HtmlSymbolType.LeftBracket); + TestSingleToken("[", HtmlTokenType.LeftBracket); } [Fact] public void CloseAngle_Is_Recognized() { - TestSingleToken(">", HtmlSymbolType.CloseAngle); + TestSingleToken(">", HtmlTokenType.CloseAngle); } [Fact] public void RightBracket_Is_Recognized() { - TestSingleToken("]", HtmlSymbolType.RightBracket); + TestSingleToken("]", HtmlTokenType.RightBracket); } [Fact] public void Equals_Is_Recognized() { - TestSingleToken("=", HtmlSymbolType.Equals); + TestSingleToken("=", HtmlTokenType.Equals); } [Fact] public void DoubleQuote_Is_Recognized() { - TestSingleToken("\"", HtmlSymbolType.DoubleQuote); + TestSingleToken("\"", HtmlTokenType.DoubleQuote); } [Fact] public void SingleQuote_Is_Recognized() { - TestSingleToken("'", HtmlSymbolType.SingleQuote); + TestSingleToken("'", HtmlTokenType.SingleQuote); } [Fact] public void Transition_Is_Recognized() { - TestSingleToken("@", HtmlSymbolType.Transition); + TestSingleToken("@", HtmlTokenType.Transition); } [Fact] public void DoubleHyphen_Is_Recognized() { - TestSingleToken("--", HtmlSymbolType.DoubleHyphen); + TestSingleToken("--", HtmlTokenType.DoubleHyphen); } [Fact] public void SingleHyphen_Is_Not_Recognized() { - TestSingleToken("-", HtmlSymbolType.Text); + TestSingleToken("-", HtmlTokenType.Text); } [Fact] public void SingleHyphen_Mid_Text_Is_Not_Recognized_As_Separate_Token() { - TestSingleToken("foo-bar", HtmlSymbolType.Text); + TestSingleToken("foo-bar", HtmlTokenType.Text); } [Fact] @@ -131,9 +131,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { TestTokenizer( "@* Foo * Bar * Baz *", - new HtmlSymbol("@", HtmlSymbolType.RazorCommentTransition), - new HtmlSymbol("*", HtmlSymbolType.RazorCommentStar), - new HtmlSymbol(" Foo * Bar * Baz *", HtmlSymbolType.RazorComment)); + new HtmlToken("@", HtmlTokenType.RazorCommentTransition), + new HtmlToken("*", HtmlTokenType.RazorCommentStar), + new HtmlToken(" Foo * Bar * Baz *", HtmlTokenType.RazorComment)); } [Fact] @@ -141,11 +141,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { TestTokenizer( "@* Foo * Bar * Baz *@", - new HtmlSymbol("@", HtmlSymbolType.RazorCommentTransition), - new HtmlSymbol("*", HtmlSymbolType.RazorCommentStar), - new HtmlSymbol(" Foo * Bar * Baz ", HtmlSymbolType.RazorComment), - new HtmlSymbol("*", HtmlSymbolType.RazorCommentStar), - new HtmlSymbol("@", HtmlSymbolType.RazorCommentTransition)); + new HtmlToken("@", HtmlTokenType.RazorCommentTransition), + new HtmlToken("*", HtmlTokenType.RazorCommentStar), + new HtmlToken(" Foo * Bar * Baz ", HtmlTokenType.RazorComment), + new HtmlToken("*", HtmlTokenType.RazorCommentStar), + new HtmlToken("@", HtmlTokenType.RazorCommentTransition)); } [Fact] @@ -153,11 +153,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { TestTokenizer( "@* Foo Bar Baz *@", - new HtmlSymbol("@", HtmlSymbolType.RazorCommentTransition), - new HtmlSymbol("*", HtmlSymbolType.RazorCommentStar), - new HtmlSymbol(" Foo Bar Baz ", HtmlSymbolType.RazorComment), - new HtmlSymbol("*", HtmlSymbolType.RazorCommentStar), - new HtmlSymbol("@", HtmlSymbolType.RazorCommentTransition)); + new HtmlToken("@", HtmlTokenType.RazorCommentTransition), + new HtmlToken("*", HtmlTokenType.RazorCommentStar), + new HtmlToken(" Foo Bar Baz ", HtmlTokenType.RazorComment), + new HtmlToken("*", HtmlTokenType.RazorCommentStar), + new HtmlToken("@", HtmlTokenType.RazorCommentTransition)); } } } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTestBase.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTestBase.cs index 5e9a2d489e..6416496b32 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTestBase.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTestBase.cs @@ -5,7 +5,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { public abstract class HtmlTokenizerTestBase : TokenizerTestBase { - private static HtmlSymbol _ignoreRemaining = new HtmlSymbol(string.Empty, HtmlSymbolType.Unknown); + private static HtmlToken _ignoreRemaining = new HtmlToken(string.Empty, HtmlTokenType.Unknown); internal override object IgnoreRemaining { @@ -17,14 +17,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return new HtmlTokenizer(source); } - internal void TestSingleToken(string text, HtmlSymbolType expectedSymbolType) + internal void TestSingleToken(string text, HtmlTokenType expectedTokenType) { - TestTokenizer(text, new HtmlSymbol(text, expectedSymbolType)); + TestTokenizer(text, new HtmlToken(text, expectedTokenType)); } - internal void TestTokenizer(string input, params HtmlSymbol[] expectedSymbols) + internal void TestTokenizer(string input, params HtmlToken[] expectedTokens) { - base.TestTokenizer(input, expectedSymbols); + base.TestTokenizer(input, expectedTokens); } } } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/ImplicitExpressionEditHandlerTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/ImplicitExpressionEditHandlerTest.cs index 14436d244c..f96e7920af 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/ImplicitExpressionEditHandlerTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/ImplicitExpressionEditHandlerTest.cs @@ -159,7 +159,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public void TryUpdateBalanceCount_SingleLeftParenthesis_CountsCorrectly() { // Arrange - var token = new CSharpSymbol("(", CSharpSymbolType.LeftParenthesis); + var token = new CSharpToken("(", CSharpTokenType.LeftParenthesis); var count = 0; // Act @@ -174,7 +174,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public void TryUpdateBalanceCount_SingleRightParenthesis_CountsCorrectly() { // Arrange - var token = new CSharpSymbol(")", CSharpSymbolType.RightParenthesis); + var token = new CSharpToken(")", CSharpTokenType.RightParenthesis); var count = 2; // Act @@ -189,7 +189,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public void TryUpdateBalanceCount_IncompleteStringLiteral_CountsCorrectly() { // Arrange - var token = new CSharpSymbol("\"((", CSharpSymbolType.StringLiteral); + var token = new CSharpToken("\"((", CSharpTokenType.StringLiteral); var count = 2; // Act @@ -204,7 +204,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public void TryUpdateBalanceCount_IncompleteCharacterLiteral_CountsCorrectly() { // Arrange - var token = new CSharpSymbol("'((", CSharpSymbolType.CharacterLiteral); + var token = new CSharpToken("'((", CSharpTokenType.CharacterLiteral); var count = 2; // Act @@ -219,7 +219,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public void TryUpdateBalanceCount_CompleteStringLiteral_CountsCorrectly() { // Arrange - var token = new CSharpSymbol("\"((\"", CSharpSymbolType.StringLiteral); + var token = new CSharpToken("\"((\"", CSharpTokenType.StringLiteral); var count = 2; // Act @@ -234,7 +234,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public void TryUpdateBalanceCount_CompleteCharacterLiteral_CountsCorrectly() { // Arrange - var token = new CSharpSymbol("'('", CSharpSymbolType.CharacterLiteral); + var token = new CSharpToken("'('", CSharpTokenType.CharacterLiteral); var count = 2; // Act @@ -249,7 +249,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public void TryUpdateBalanceCount_InvalidParenthesis_ReturnsFalse() { // Arrange - var token = new CSharpSymbol(")", CSharpSymbolType.RightParenthesis); + var token = new CSharpToken(")", CSharpTokenType.RightParenthesis); var count = 0; // Act @@ -264,7 +264,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public void TryUpdateBalanceCount_InvalidParenthesisStringLiteral_ReturnsFalse() { // Arrange - var token = new CSharpSymbol("\")", CSharpSymbolType.StringLiteral); + var token = new CSharpToken("\")", CSharpTokenType.StringLiteral); var count = 0; // Act @@ -279,7 +279,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public void TryUpdateBalanceCount_InvalidParenthesisCharacterLiteral_ReturnsFalse() { // Arrange - var token = new CSharpSymbol("')", CSharpSymbolType.CharacterLiteral); + var token = new CSharpToken("')", CSharpTokenType.CharacterLiteral); var count = 0; // Act @@ -453,10 +453,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return span; } - private static IReadOnlyList GetTokens(SourceLocation start, string content) + private static IReadOnlyList GetTokens(SourceLocation start, string content) { var parent = GetSpan(start, content); - var tokens = parent.Symbols.Cast().ToArray(); + var tokens = parent.Tokens.Cast().ToArray(); return tokens; } } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/SpanTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/SpanTest.cs index 5c52dd7967..96c856848c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/SpanTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/SpanTest.cs @@ -12,10 +12,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { // Arrange var builder = new SpanBuilder(SourceLocation.Zero); - builder.Accept(new HtmlSymbol("hello", HtmlSymbolType.Text)); + builder.Accept(new HtmlToken("hello", HtmlTokenType.Text)); var span = builder.Build(); var newBuilder = new SpanBuilder(SourceLocation.Zero); - newBuilder.Accept(new HtmlSymbol("hi", HtmlSymbolType.Text)); + newBuilder.Accept(new HtmlToken("hi", HtmlTokenType.Text)); var originalLength = span.Length; // Act @@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { // Arrange var spanBuilder = new SpanBuilder(SourceLocation.Zero); - spanBuilder.Accept(new HtmlSymbol("hello", HtmlSymbolType.Text)); + spanBuilder.Accept(new HtmlToken("hello", HtmlTokenType.Text)); var span = spanBuilder.Build(); var blockBuilder = new BlockBuilder() { @@ -44,7 +44,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy span.Parent = block; var originalBlockLength = block.Length; var newSpanBuilder = new SpanBuilder(SourceLocation.Zero); - newSpanBuilder.Accept(new HtmlSymbol("hi", HtmlSymbolType.Text)); + newSpanBuilder.Accept(new HtmlToken("hi", HtmlTokenType.Text)); // Act span.ReplaceWith(newSpanBuilder); @@ -64,7 +64,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Kind = SpanKindInternal.Transition, ChunkGenerator = new ExpressionChunkGenerator(), }; - spanBuilder.Accept(new CSharpSymbol("@", CSharpSymbolType.Transition)); + spanBuilder.Accept(new CSharpToken("@", CSharpTokenType.Transition)); var span = spanBuilder.Build(); // Act diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TokenizerLookaheadTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TokenizerLookaheadTest.cs index aa9ea560cc..23a1df23dc 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TokenizerLookaheadTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TokenizerLookaheadTest.cs @@ -57,51 +57,51 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } [Fact] - public void LookaheadUntil_PassesThePreviousSymbolsInTheSameOrder() + public void LookaheadUntil_PassesThePreviousTokensInTheSameOrder() { // Arrange var tokenizer = CreateContentTokenizer("asdf--fvd--<"); // Act var i = 3; - IEnumerable previousSymbols = null; - var symbolFound = tokenizer.LookaheadUntil((s, p) => + IEnumerable previousTokens = null; + var tokenFound = tokenizer.LookaheadUntil((s, p) => { - previousSymbols = p; + previousTokens = p; return --i == 0; }); // Assert - Assert.Equal(4, previousSymbols.Count()); + Assert.Equal(4, previousTokens.Count()); // For the very first element, there will be no previous items, so null is expected var orderIndex = 0; - Assert.Null(previousSymbols.ElementAt(orderIndex++)); - Assert.Equal(new HtmlSymbol("asdf", HtmlSymbolType.Text), previousSymbols.ElementAt(orderIndex++)); - Assert.Equal(new HtmlSymbol("--", HtmlSymbolType.DoubleHyphen), previousSymbols.ElementAt(orderIndex++)); - Assert.Equal(new HtmlSymbol("fvd", HtmlSymbolType.Text), previousSymbols.ElementAt(orderIndex++)); + Assert.Null(previousTokens.ElementAt(orderIndex++)); + Assert.Equal(new HtmlToken("asdf", HtmlTokenType.Text), previousTokens.ElementAt(orderIndex++)); + Assert.Equal(new HtmlToken("--", HtmlTokenType.DoubleHyphen), previousTokens.ElementAt(orderIndex++)); + Assert.Equal(new HtmlToken("fvd", HtmlTokenType.Text), previousTokens.ElementAt(orderIndex++)); } [Fact] - public void LookaheadUntil_ReturnsFalseAfterIteratingOverAllSymbolsIfConditionIsNotMet() + public void LookaheadUntil_ReturnsFalseAfterIteratingOverAllTokensIfConditionIsNotMet() { // Arrange var tokenizer = CreateContentTokenizer("asdf--fvd"); // Act - var symbols = new Stack(); - var symbolFound = tokenizer.LookaheadUntil((s, p) => + var tokens = new Stack(); + var tokenFound = tokenizer.LookaheadUntil((s, p) => { - symbols.Push(s); + tokens.Push(s); return false; }); // Assert - Assert.False(symbolFound); - Assert.Equal(3, symbols.Count); - Assert.Equal(new HtmlSymbol("fvd", HtmlSymbolType.Text), symbols.Pop()); - Assert.Equal(new HtmlSymbol("--", HtmlSymbolType.DoubleHyphen), symbols.Pop()); - Assert.Equal(new HtmlSymbol("asdf", HtmlSymbolType.Text), symbols.Pop()); + Assert.False(tokenFound); + Assert.Equal(3, tokens.Count); + Assert.Equal(new HtmlToken("fvd", HtmlTokenType.Text), tokens.Pop()); + Assert.Equal(new HtmlToken("--", HtmlTokenType.DoubleHyphen), tokens.Pop()); + Assert.Equal(new HtmlToken("asdf", HtmlTokenType.Text), tokens.Pop()); } [Fact] @@ -111,18 +111,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var tokenizer = CreateContentTokenizer("asdf--fvd"); // Act - var symbols = new Stack(); - var symbolFound = tokenizer.LookaheadUntil((s, p) => + var tokens = new Stack(); + var tokenFound = tokenizer.LookaheadUntil((s, p) => { - symbols.Push(s); - return s.Type == HtmlSymbolType.DoubleHyphen; + tokens.Push(s); + return s.Type == HtmlTokenType.DoubleHyphen; }); // Assert - Assert.True(symbolFound); - Assert.Equal(2, symbols.Count); - Assert.Equal(new HtmlSymbol("--", HtmlSymbolType.DoubleHyphen), symbols.Pop()); - Assert.Equal(new HtmlSymbol("asdf", HtmlSymbolType.Text), symbols.Pop()); + Assert.True(tokenFound); + Assert.Equal(2, tokens.Count); + Assert.Equal(new HtmlToken("--", HtmlTokenType.DoubleHyphen), tokens.Pop()); + Assert.Equal(new HtmlToken("asdf", HtmlTokenType.Text), tokens.Pop()); } private static TestTokenizerBackedParser CreateContentTokenizer(string content) @@ -135,7 +135,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy return tokenizer; } - private class ExposedTokenizer : Tokenizer + private class ExposedTokenizer : Tokenizer { public ExposedTokenizer(string input) : base(new SeekableTextReader(input, filePath: null)) @@ -150,7 +150,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } } - public override CSharpSymbolType RazorCommentStarType + public override CSharpTokenType RazorCommentStarType { get { @@ -158,7 +158,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } } - public override CSharpSymbolType RazorCommentTransitionType + public override CSharpTokenType RazorCommentTransitionType { get { @@ -166,7 +166,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } } - public override CSharpSymbolType RazorCommentType + public override CSharpTokenType RazorCommentType { get { @@ -182,9 +182,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } } - protected override CSharpSymbol CreateSymbol( + protected override CSharpToken CreateToken( string content, - CSharpSymbolType type, + CSharpTokenType type, IReadOnlyList errors) { throw new NotImplementedException(); @@ -196,9 +196,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } } - private class TestTokenizerBackedParser : TokenizerBackedParser + private class TestTokenizerBackedParser : TokenizerBackedParser { - internal TestTokenizerBackedParser(LanguageCharacteristics language, ParserContext context) : base(language, context) + internal TestTokenizerBackedParser(LanguageCharacteristics language, ParserContext context) : base(language, context) { } @@ -207,12 +207,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy throw new NotImplementedException(); } - protected override bool SymbolTypeEquals(HtmlSymbolType x, HtmlSymbolType y) + protected override bool TokenTypeEquals(HtmlTokenType x, HtmlTokenType y) { throw new NotImplementedException(); } - internal new bool LookaheadUntil(Func, bool> condition) + internal new bool LookaheadUntil(Func, bool> condition) { return base.LookaheadUntil(condition); } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TokenizerTestBase.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TokenizerTestBase.cs index bcd2eff90b..307ccad3a7 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TokenizerTestBase.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TokenizerTestBase.cs @@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy internal void TestTokenizer(string input, params TSymbol[] expectedSymbols) where TSymbolType : struct - where TSymbol : SymbolBase + where TSymbol : TokenBase { // Arrange var success = true; @@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var tokenizer = (Tokenizer)CreateTokenizer(source); var counter = 0; TSymbol current = null; - while ((current = tokenizer.NextSymbol()) != null) + while ((current = tokenizer.NextToken()) != null) { if (counter >= expectedSymbols.Length) { diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/SourceChangeTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/SourceChangeTest.cs index f3f1b9320e..470b69720a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/SourceChangeTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/SourceChangeTest.cs @@ -104,8 +104,8 @@ namespace Microsoft.AspNetCore.Razor.Language { // Arrange var builder = new SpanBuilder(new SourceLocation(0, 0, 0)); - builder.Accept(new RawTextSymbol(new SourceLocation(0, 0, 0), "Hello, ")); - builder.Accept(new RawTextSymbol(new SourceLocation(7, 0, 7), "World")); + builder.Accept(new RawTextToken(new SourceLocation(0, 0, 0), "Hello, ")); + builder.Accept(new RawTextToken(new SourceLocation(7, 0, 7), "World")); var span = new Span(builder); @@ -123,8 +123,8 @@ namespace Microsoft.AspNetCore.Razor.Language { // Arrange var builder = new SpanBuilder(new SourceLocation(13, 0, 0)); - builder.Accept(new RawTextSymbol(new SourceLocation(13, 0, 13), "Hello, ")); - builder.Accept(new RawTextSymbol(new SourceLocation(20, 0, 20), "World")); + builder.Accept(new RawTextToken(new SourceLocation(13, 0, 13), "Hello, ")); + builder.Accept(new RawTextToken(new SourceLocation(20, 0, 20), "World")); var span = new Span(builder); @@ -142,8 +142,8 @@ namespace Microsoft.AspNetCore.Razor.Language { // Arrange var builder = new SpanBuilder(new SourceLocation(13, 0, 0)); - builder.Accept(new RawTextSymbol(new SourceLocation(13, 0, 13), "Hello, ")); - builder.Accept(new RawTextSymbol(new SourceLocation(20, 0, 20), "World")); + builder.Accept(new RawTextToken(new SourceLocation(13, 0, 13), "Hello, ")); + builder.Accept(new RawTextToken(new SourceLocation(20, 0, 20), "World")); var span = new Span(builder); @@ -161,8 +161,8 @@ namespace Microsoft.AspNetCore.Razor.Language { // Arrange var builder = new SpanBuilder(new SourceLocation(13, 0, 0)); - builder.Accept(new RawTextSymbol(new SourceLocation(13, 0, 13), "Hello, ")); - builder.Accept(new RawTextSymbol(new SourceLocation(20, 0, 20), "World")); + builder.Accept(new RawTextToken(new SourceLocation(13, 0, 13), "Hello, ")); + builder.Accept(new RawTextToken(new SourceLocation(20, 0, 20), "World")); var span = new Span(builder); @@ -180,8 +180,8 @@ namespace Microsoft.AspNetCore.Razor.Language { // Arrange var builder = new SpanBuilder(new SourceLocation(13, 0, 0)); - builder.Accept(new RawTextSymbol(new SourceLocation(13, 0, 13), "Hello, ")); - builder.Accept(new RawTextSymbol(new SourceLocation(20, 0, 20), "World")); + builder.Accept(new RawTextToken(new SourceLocation(13, 0, 13), "Hello, ")); + builder.Accept(new RawTextToken(new SourceLocation(20, 0, 20), "World")); var span = new Span(builder); diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtEOF.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtEOF.syntaxtree.txt index aeb4d8044b..4d7733a74b 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtEOF.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtEOF.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 11 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [functions] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[functions]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (10:0,10) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [] - CodeBlockEditHandler;Accepts:Any;CodeBlock - (11:0,11) - Symbols:1 - CSharpSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [functions] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[functions]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (10:0,10) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [] - CodeBlockEditHandler;Accepts:Any;CodeBlock - (11:0,11) - Tokens:1 + CSharpTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtStartOfFile.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtStartOfFile.syntaxtree.txt index 68498ee910..18a654401d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtStartOfFile.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/FunctionsDirectiveAutoCompleteAtStartOfFile.syntaxtree.txt @@ -1,10 +1,10 @@ Directive block - Gen - 16 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [functions] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[functions]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (10:0,10) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [LFfoo] - CodeBlockEditHandler;Accepts:Any;CodeBlock - (11:0,11) - Symbols:2 - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Identifier;[foo]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [functions] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[functions]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (10:0,10) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [LFfoo] - CodeBlockEditHandler;Accepts:Any;CodeBlock - (11:0,11) - Tokens:2 + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Identifier;[foo]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.syntaxtree.txt index 726919a24f..25e7638666 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtEOF.syntaxtree.txt @@ -1,16 +1,16 @@ Directive block - Gen - 17 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [Header] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[Header]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (15:0,15) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (16:0,16) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [Header] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[Header]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (15:0,15) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (16:0,16) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 0 - (17:0,17) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (17:0,17) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.syntaxtree.txt index a695040cee..cab4006af3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.syntaxtree.txt @@ -1,29 +1,29 @@ Directive block - Gen - 29 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [Header] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[Header]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (15:0,15) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (16:0,16) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [Header] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[Header]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (15:0,15) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (16:0,16) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 12 - (17:0,17) - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (17:0,17) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1 + HtmlTokenType.NewLine;[LF]; Tag block - Gen - 3 - (19:1,0) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (19:1,0) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (22:1,3) - Symbols:1 - HtmlSymbolType.Text;[Foo]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (19:1,0) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (22:1,3) - Tokens:1 + HtmlTokenType.Text;[Foo]; Tag block - Gen - 4 - (25:1,6) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (25:1,6) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (25:1,6) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtEOF.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtEOF.syntaxtree.txt index 7637638d62..5c1bcb1c4a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtEOF.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtEOF.syntaxtree.txt @@ -1,7 +1,7 @@ Statement block - Gen - 2 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (2:0,2) - Symbols:1 - CSharpSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (2:0,2) - Tokens:1 + CSharpTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtStartOfFile.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtStartOfFile.syntaxtree.txt index 8066a192b7..9be89463a8 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtStartOfFile.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtStartOfFile.syntaxtree.txt @@ -1,21 +1,21 @@ Statement block - Gen - 11 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (2:0,2) - Symbols:1 - CSharpSymbolType.NewLine;[LF]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (2:0,2) - Tokens:1 + CSharpTokenType.NewLine;[LF]; Markup block - Gen - 7 - (4:1,0) Tag block - Gen - 3 - (4:1,0) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (4:1,0) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (4:1,0) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; Tag block - Gen - 4 - (7:1,3) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (7:1,3) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Code span - Gen - [] - SpanEditHandler;Accepts:Any - (11:1,7) - Symbols:1 - CSharpSymbolType.Unknown;[]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (7:1,3) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Code span - Gen - [] - SpanEditHandler;Accepts:Any - (11:1,7) - Tokens:1 + CSharpTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideBlockComments.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideBlockComments.syntaxtree.txt index 492147e886..f9d3e2b176 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideBlockComments.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideBlockComments.syntaxtree.txt @@ -1,21 +1,21 @@ Statement block - Gen - 54 - (0:0,0) - Code span - Gen - [if(foo) {LF /* bar } " */ ' baz } 'LF zoop();LF}] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:19 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Comment;[/* bar } " */]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.CharacterLiteral;[' baz } ']; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[zoop]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [if(foo) {LF /* bar } " */ ' baz } 'LF zoop();LF}] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:19 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Comment;[/* bar } " */]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.CharacterLiteral;[' baz } ']; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[zoop]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideSingleLineComments.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideSingleLineComments.syntaxtree.txt index 6092ec784e..e2a2903cf4 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideSingleLineComments.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/BalancingBracketsIgnoresStringLiteralCharactersAndBracketsInsideSingleLineComments.syntaxtree.txt @@ -1,19 +1,19 @@ Statement block - Gen - 47 - (0:0,0) - Code span - Gen - [if(foo) {LF // bar } " baz 'LF zoop();LF}] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:17 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Comment;[// bar } " baz ']; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[zoop]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [if(foo) {LF // bar } " baz 'LF zoop();LF}] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:17 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Comment;[// bar } " baz ']; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[zoop]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithAtDoesntCauseError.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithAtDoesntCauseError.syntaxtree.txt index 7515b640d9..f0d580e422 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithAtDoesntCauseError.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithAtDoesntCauseError.syntaxtree.txt @@ -1,25 +1,25 @@ Statement block - Gen - 28 - (0:0,0) - Code span - Gen - [if (true) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:8 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [if (true) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:8 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; Statement block - Gen - 14 - (12:0,12) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [if(false) { }] - SpanEditHandler;Accepts:Any - (13:0,13) - Symbols:8 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[false]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - Code span - Gen - [ }] - SpanEditHandler;Accepts:Any - (26:0,26) - Symbols:2 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [if(false) { }] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:8 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[false]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + Code span - Gen - [ }] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:2 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockAcceptsElseIfWithNoCondition.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockAcceptsElseIfWithNoCondition.syntaxtree.txt index c52b4341ce..7b74209f11 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockAcceptsElseIfWithNoCondition.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockAcceptsElseIfWithNoCondition.syntaxtree.txt @@ -1,60 +1,60 @@ Statement block - Gen - 106 - (0:0,0) - Code span - Gen - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"foo } bar");LF} else if { foo(); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:58 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[10]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["baz"]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"foo } bar"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"foo } bar");LF} else if { foo(); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:58 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[10]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["baz"]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"foo } bar"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockAcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockAcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode.syntaxtree.txt index 5ba3927092..a32c45341c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockAcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockAcceptsTrailingDotIntoImplicitExpressionWhenEmbeddedInCode.syntaxtree.txt @@ -1,18 +1,18 @@ Statement block - Gen - 17 - (0:0,0) - Code span - Gen - [if(foo) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:7 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [if(foo) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:7 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; Expression block - Gen - 5 - (10:0,10) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo.] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (11:0,11) - Symbols:2 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.Dot;[.]; - Code span - Gen - [ }] - SpanEditHandler;Accepts:Any - (15:0,15) - Symbols:2 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo.] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (11:0,11) - Tokens:2 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.Dot;[.]; + Code span - Gen - [ }] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:2 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockAllowsEmptyBlockStatement.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockAllowsEmptyBlockStatement.syntaxtree.txt index df639fbb77..78000ba7a0 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockAllowsEmptyBlockStatement.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockAllowsEmptyBlockStatement.syntaxtree.txt @@ -1,10 +1,10 @@ Statement block - Gen - 13 - (0:0,0) - Code span - Gen - [if(false) { }] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:8 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[false]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [if(false) { }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:8 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[false]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCapturesNewlineAfterUsing.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCapturesNewlineAfterUsing.syntaxtree.txt index b766d9e667..4f557730af 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCapturesNewlineAfterUsing.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCapturesNewlineAfterUsing.syntaxtree.txt @@ -1,6 +1,6 @@ Directive block - Gen - 11 - (0:0,0) - Code span - Gen - [using FooLF] - SpanEditHandler;Accepts:AnyExceptNewline - (0:0,0) - Symbols:4 - CSharpSymbolType.Keyword;[using]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.NewLine;[LF]; + Code span - Gen - [using FooLF] - SpanEditHandler;Accepts:AnyExceptNewline - (0:0,0) - Tokens:4 + CSharpTokenType.Keyword;[using]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.NewLine;[LF]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesDoWhileBlock.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesDoWhileBlock.syntaxtree.txt index 08f5c5b2d9..b30314d849 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesDoWhileBlock.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesDoWhileBlock.syntaxtree.txt @@ -1,26 +1,26 @@ Statement block - Gen - 40 - (0:0,0) - Code span - Gen - [do { var foo = bar; } while(foo != bar);] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:24 - CSharpSymbolType.Keyword;[do]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[while]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NotEqual;[!=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; + Code span - Gen - [do { var foo = bar; } while(foo != bar);] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:24 + CSharpTokenType.Keyword;[do]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[while]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NotEqual;[!=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesDoWhileBlockMissingSemicolon.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesDoWhileBlockMissingSemicolon.syntaxtree.txt index 2d72a88d86..ca898906ac 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesDoWhileBlockMissingSemicolon.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesDoWhileBlockMissingSemicolon.syntaxtree.txt @@ -1,25 +1,25 @@ Statement block - Gen - 39 - (0:0,0) - Code span - Gen - [do { var foo = bar; } while(foo != bar)] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:23 - CSharpSymbolType.Keyword;[do]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[while]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NotEqual;[!=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.RightParenthesis;[)]; + Code span - Gen - [do { var foo = bar; } while(foo != bar)] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:23 + CSharpTokenType.Keyword;[do]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[while]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NotEqual;[!=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.RightParenthesis;[)]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesDoWhileBlockMissingWhileClauseEntirely.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesDoWhileBlockMissingWhileClauseEntirely.syntaxtree.txt index 6f8df081d8..ba8d12a4e0 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesDoWhileBlockMissingWhileClauseEntirely.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesDoWhileBlockMissingWhileClauseEntirely.syntaxtree.txt @@ -1,16 +1,16 @@ Statement block - Gen - 21 - (0:0,0) - Code span - Gen - [do { var foo = bar; }] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:14 - CSharpSymbolType.Keyword;[do]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [do { var foo = bar; }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:14 + CSharpTokenType.Keyword;[do]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesDoWhileBlockMissingWhileCondition.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesDoWhileBlockMissingWhileCondition.syntaxtree.txt index 8c0d027674..f5ab356933 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesDoWhileBlockMissingWhileCondition.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesDoWhileBlockMissingWhileCondition.syntaxtree.txt @@ -1,18 +1,18 @@ Statement block - Gen - 27 - (0:0,0) - Code span - Gen - [do { var foo = bar; } while] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:16 - CSharpSymbolType.Keyword;[do]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[while]; + Code span - Gen - [do { var foo = bar; } while] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:16 + CSharpTokenType.Keyword;[do]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[while]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesDoWhileBlockMissingWhileConditionWithSemicolon.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesDoWhileBlockMissingWhileConditionWithSemicolon.syntaxtree.txt index a91ee07a03..e93c870c6f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesDoWhileBlockMissingWhileConditionWithSemicolon.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesDoWhileBlockMissingWhileConditionWithSemicolon.syntaxtree.txt @@ -1,19 +1,19 @@ Statement block - Gen - 28 - (0:0,0) - Code span - Gen - [do { var foo = bar; } while;] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:17 - CSharpSymbolType.Keyword;[do]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[while]; - CSharpSymbolType.Semicolon;[;]; + Code span - Gen - [do { var foo = bar; } while;] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:17 + CSharpTokenType.Keyword;[do]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[while]; + CSharpTokenType.Semicolon;[;]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesMarkupInDoWhileBlock.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesMarkupInDoWhileBlock.syntaxtree.txt index 4f4319d5cb..ea36eb7e97 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesMarkupInDoWhileBlock.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockCorrectlyParsesMarkupInDoWhileBlock.syntaxtree.txt @@ -1,50 +1,50 @@ Statement block - Gen - 58 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [do { var foo = bar;] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:12 - CSharpSymbolType.Keyword;[do]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [do { var foo = bar;] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:12 + CSharpTokenType.Keyword;[do]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; Markup block - Gen - 12 - (20:0,20) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (20:0,20) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 3 - (21:0,21) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (21:0,21) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (24:0,24) - Symbols:1 - HtmlSymbolType.Text;[Foo]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1 + HtmlTokenType.Text;[Foo]; Tag block - Gen - 4 - (27:0,27) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (27:0,27) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (31:0,31) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; - Code span - Gen - [foo++; } while (foo);] - SpanEditHandler;Accepts:None - (32:0,32) - Symbols:15 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.Increment;[++]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[while]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.GreaterThan;[>]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; + Code span - Gen - [foo++; } while (foo);] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:15 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.Increment;[++]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[while]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.GreaterThan;[>]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockDoesNotAllowMultipleFinallyBlocks.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockDoesNotAllowMultipleFinallyBlocks.syntaxtree.txt index 493313d0b3..c9a0cb5fa2 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockDoesNotAllowMultipleFinallyBlocks.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockDoesNotAllowMultipleFinallyBlocks.syntaxtree.txt @@ -1,37 +1,37 @@ Statement block - Gen - 55 - (0:0,0) - Code span - Gen - [try { var foo = new { } } finally { var foo = new { } }] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:35 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[finally]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [try { var foo = new { } } finally { var foo = new { } }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:35 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[finally]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockDoesNotParseMarkupStatementOrExpressionOnSwitchCharacterNotFollowedByOpenAngleOrColon.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockDoesNotParseMarkupStatementOrExpressionOnSwitchCharacterNotFollowedByOpenAngleOrColon.syntaxtree.txt index 194df0b599..7eb0dd4ec7 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockDoesNotParseMarkupStatementOrExpressionOnSwitchCharacterNotFollowedByOpenAngleOrColon.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockDoesNotParseMarkupStatementOrExpressionOnSwitchCharacterNotFollowedByOpenAngleOrColon.syntaxtree.txt @@ -1,17 +1,17 @@ Statement block - Gen - 30 - (0:0,0) - Code span - Gen - [if(foo) { @"Foo".ToString(); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:15 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;[@"Foo"]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[ToString]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [if(foo) { @"Foo".ToString(); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:15 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;[@"Foo"]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[ToString]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockDoesntCaptureWhitespaceAfterUsing.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockDoesntCaptureWhitespaceAfterUsing.syntaxtree.txt index 85b88e63eb..5c5013b233 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockDoesntCaptureWhitespaceAfterUsing.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockDoesntCaptureWhitespaceAfterUsing.syntaxtree.txt @@ -1,5 +1,5 @@ Directive block - Gen - 9 - (0:0,0) - Code span - Gen - [using Foo] - SpanEditHandler;Accepts:AnyExceptNewline - (0:0,0) - Symbols:3 - CSharpSymbolType.Keyword;[using]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; + Code span - Gen - [using Foo] - SpanEditHandler;Accepts:AnyExceptNewline - (0:0,0) - Tokens:3 + CSharpTokenType.Keyword;[using]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockHasErrorsIfNamespaceAliasMissingSemicolon.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockHasErrorsIfNamespaceAliasMissingSemicolon.syntaxtree.txt index 5b1371ae8d..ceb649cba3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockHasErrorsIfNamespaceAliasMissingSemicolon.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockHasErrorsIfNamespaceAliasMissingSemicolon.syntaxtree.txt @@ -1,13 +1,13 @@ Directive block - Gen - 29 - (0:0,0) - Code span - Gen - [using Foo.Bar.Baz = FooBarBaz] - SpanEditHandler;Accepts:AnyExceptNewline - (0:0,0) - Symbols:11 - CSharpSymbolType.Keyword;[using]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Baz]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[FooBarBaz]; + Code span - Gen - [using Foo.Bar.Baz = FooBarBaz] - SpanEditHandler;Accepts:AnyExceptNewline - (0:0,0) - Tokens:11 + CSharpTokenType.Keyword;[using]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Baz]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[FooBarBaz]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockHasErrorsIfNamespaceImportMissingSemicolon.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockHasErrorsIfNamespaceImportMissingSemicolon.syntaxtree.txt index a7bb8199b2..0e214796db 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockHasErrorsIfNamespaceImportMissingSemicolon.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockHasErrorsIfNamespaceImportMissingSemicolon.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 17 - (0:0,0) - Code span - Gen - [using Foo.Bar.Baz] - SpanEditHandler;Accepts:AnyExceptNewline - (0:0,0) - Symbols:7 - CSharpSymbolType.Keyword;[using]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Baz]; + Code span - Gen - [using Foo.Bar.Baz] - SpanEditHandler;Accepts:AnyExceptNewline - (0:0,0) - Tokens:7 + CSharpTokenType.Keyword;[using]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Baz]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesElseIfBranchesOfIfStatement.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesElseIfBranchesOfIfStatement.syntaxtree.txt index 8d7dc26146..5563401047 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesElseIfBranchesOfIfStatement.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesElseIfBranchesOfIfStatement.syntaxtree.txt @@ -1,95 +1,95 @@ Statement block - Gen - 180 - (0:0,0) - Code span - Gen - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"bar } baz");LF}] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:93 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[10]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["baz"]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"foo } bar"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[10]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["baz"]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"bar } baz"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"bar } baz");LF}] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:93 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[10]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["baz"]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"foo } bar"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[10]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["baz"]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"bar } baz"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesExpressionOnSwitchCharacterFollowedByIdentifierStart.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesExpressionOnSwitchCharacterFollowedByIdentifierStart.syntaxtree.txt index 2e3daab58a..45b2fc09d2 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesExpressionOnSwitchCharacterFollowedByIdentifierStart.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesExpressionOnSwitchCharacterFollowedByIdentifierStart.syntaxtree.txt @@ -1,24 +1,24 @@ Statement block - Gen - 25 - (0:0,0) - Code span - Gen - [if(foo) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:7 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [if(foo) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:7 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; Expression block - Gen - 13 - (10:0,10) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo[4].bar()] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (11:0,11) - Symbols:8 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.IntegerLiteral;[4]; - CSharpSymbolType.RightBracket;[]]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - Code span - Gen - [ }] - SpanEditHandler;Accepts:Any - (23:0,23) - Symbols:2 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo[4].bar()] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (11:0,11) - Tokens:8 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.IntegerLiteral;[4]; + CSharpTokenType.RightBracket;[]]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + Code span - Gen - [ }] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:2 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesExpressionOnSwitchCharacterFollowedByOpenParen.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesExpressionOnSwitchCharacterFollowedByOpenParen.syntaxtree.txt index 333a092687..09618cf66e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesExpressionOnSwitchCharacterFollowedByOpenParen.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesExpressionOnSwitchCharacterFollowedByOpenParen.syntaxtree.txt @@ -1,25 +1,25 @@ Statement block - Gen - 24 - (0:0,0) - Code span - Gen - [if(foo) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:7 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [if(foo) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:7 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; Expression block - Gen - 12 - (10:0,10) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (11:0,11) - Symbols:1 - CSharpSymbolType.LeftParenthesis;[(]; - Code span - Gen - [foo + bar] - SpanEditHandler;Accepts:Any - (12:0,12) - Symbols:5 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Plus;[+]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (21:0,21) - Symbols:1 - CSharpSymbolType.RightParenthesis;[)]; - Code span - Gen - [ }] - SpanEditHandler;Accepts:Any - (22:0,22) - Symbols:2 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (11:0,11) - Tokens:1 + CSharpTokenType.LeftParenthesis;[(]; + Code span - Gen - [foo + bar] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:5 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Plus;[+]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1 + CSharpTokenType.RightParenthesis;[)]; + Code span - Gen - [ }] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:2 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesMultipleElseIfBranchesOfIfStatement.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesMultipleElseIfBranchesOfIfStatement.syntaxtree.txt index ab769c186e..05d2542f80 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesMultipleElseIfBranchesOfIfStatement.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesMultipleElseIfBranchesOfIfStatement.syntaxtree.txt @@ -1,239 +1,239 @@ Statement block - Gen - 459 - (0:0,0) - Code span - Gen - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"bar } baz");LF}] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:237 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[10]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["baz"]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"foo } bar"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[10]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["baz"]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"bar } baz"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[10]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["baz"]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"bar } baz"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[10]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["baz"]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"bar } baz"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[10]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["baz"]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"bar } baz"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"bar } baz");LF}] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:237 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[10]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["baz"]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"foo } bar"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[10]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["baz"]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"bar } baz"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[10]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["baz"]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"bar } baz"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[10]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["baz"]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"bar } baz"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[10]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["baz"]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"bar } baz"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesMultipleElseIfBranchesOfIfStatementFollowedByOneElseBranch.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesMultipleElseIfBranchesOfIfStatementFollowedByOneElseBranch.syntaxtree.txt index 817f2e20cc..766f7e4ddd 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesMultipleElseIfBranchesOfIfStatementFollowedByOneElseBranch.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesMultipleElseIfBranchesOfIfStatementFollowedByOneElseBranch.syntaxtree.txt @@ -1,157 +1,157 @@ Statement block - Gen - 313 - (0:0,0) - Code span - Gen - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"bar } baz");LF} else { Debug.WriteLine(@"bar } baz"); }] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:155 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[10]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["baz"]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"foo } bar"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[10]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["baz"]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"bar } baz"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[10]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["baz"]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"bar } baz"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"bar } baz"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"bar } baz");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"bar } baz");LF} else { Debug.WriteLine(@"bar } baz"); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:155 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[10]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["baz"]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"foo } bar"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[10]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["baz"]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"bar } baz"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[10]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["baz"]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"bar } baz"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"bar } baz"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesNamespaceAliasWithSemicolonForUsingKeywordIfIsInValidFormat.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesNamespaceAliasWithSemicolonForUsingKeywordIfIsInValidFormat.syntaxtree.txt index 775666b7e4..9b0810ec74 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesNamespaceAliasWithSemicolonForUsingKeywordIfIsInValidFormat.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesNamespaceAliasWithSemicolonForUsingKeywordIfIsInValidFormat.syntaxtree.txt @@ -1,10 +1,10 @@ Directive block - Gen - 28 - (0:0,0) - Code span - Gen - [using FooBarBaz = FooBarBaz;] - SpanEditHandler;Accepts:AnyExceptNewline - (0:0,0) - Symbols:8 - CSharpSymbolType.Keyword;[using]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[FooBarBaz]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[FooBarBaz]; - CSharpSymbolType.Semicolon;[;]; + Code span - Gen - [using FooBarBaz = FooBarBaz;] - SpanEditHandler;Accepts:AnyExceptNewline - (0:0,0) - Tokens:8 + CSharpTokenType.Keyword;[using]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[FooBarBaz]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[FooBarBaz]; + CSharpTokenType.Semicolon;[;]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesNamespaceImportWithSemicolonForUsingKeywordIfIsInValidFormat.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesNamespaceImportWithSemicolonForUsingKeywordIfIsInValidFormat.syntaxtree.txt index 80e34b4242..d9f8d37923 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesNamespaceImportWithSemicolonForUsingKeywordIfIsInValidFormat.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockParsesNamespaceImportWithSemicolonForUsingKeywordIfIsInValidFormat.syntaxtree.txt @@ -1,10 +1,10 @@ Directive block - Gen - 18 - (0:0,0) - Code span - Gen - [using Foo.Bar.Baz;] - SpanEditHandler;Accepts:AnyExceptNewline - (0:0,0) - Symbols:8 - CSharpSymbolType.Keyword;[using]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Baz]; - CSharpSymbolType.Semicolon;[;]; + Code span - Gen - [using Foo.Bar.Baz;] - SpanEditHandler;Accepts:AnyExceptNewline - (0:0,0) - Tokens:8 + CSharpTokenType.Keyword;[using]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Baz]; + CSharpTokenType.Semicolon;[;]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsForKeyword.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsForKeyword.syntaxtree.txt index 91928ed5f2..c19dcce9b3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsForKeyword.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsForKeyword.syntaxtree.txt @@ -1,46 +1,46 @@ Statement block - Gen - 82 - (0:0,0) - Code span - Gen - [for(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:44 - CSharpSymbolType.Keyword;[for]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[10]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["baz"]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"foo } bar"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [for(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:44 + CSharpTokenType.Keyword;[for]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[10]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["baz"]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"foo } bar"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsForeachKeyword.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsForeachKeyword.syntaxtree.txt index 6ded04854f..8e095ff484 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsForeachKeyword.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsForeachKeyword.syntaxtree.txt @@ -1,46 +1,46 @@ Statement block - Gen - 86 - (0:0,0) - Code span - Gen - [foreach(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:44 - CSharpSymbolType.Keyword;[foreach]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[10]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["baz"]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"foo } bar"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [foreach(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:44 + CSharpTokenType.Keyword;[foreach]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[10]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["baz"]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"foo } bar"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsIfKeywordWithNoElseBranches.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsIfKeywordWithNoElseBranches.syntaxtree.txt index c3cd91c222..bb4eee2f14 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsIfKeywordWithNoElseBranches.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsIfKeywordWithNoElseBranches.syntaxtree.txt @@ -1,46 +1,46 @@ Statement block - Gen - 81 - (0:0,0) - Code span - Gen - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:44 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[10]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["baz"]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"foo } bar"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:44 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[10]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["baz"]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"foo } bar"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsLockKeyword.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsLockKeyword.syntaxtree.txt index 72b6a2a065..d1aea3ef3c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsLockKeyword.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsLockKeyword.syntaxtree.txt @@ -1,18 +1,18 @@ Statement block - Gen - 44 - (0:0,0) - Code span - Gen - [lock(foo) { Debug.WriteLine(@"foo } bar"); }] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:16 - CSharpSymbolType.Keyword;[lock]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"foo } bar"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [lock(foo) { Debug.WriteLine(@"foo } bar"); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:16 + CSharpTokenType.Keyword;[lock]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"foo } bar"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsSwitchKeyword.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsSwitchKeyword.syntaxtree.txt index 45e7542193..f0e5015b28 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsSwitchKeyword.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsSwitchKeyword.syntaxtree.txt @@ -1,54 +1,54 @@ Statement block - Gen - 161 - (0:0,0) - Code span - Gen - [switch(foo) {LF case 0:LF break;LF case 1:LF {LF break;LF }LF case 2:LF return;LF default:LF return;LF}] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:52 - CSharpSymbolType.Keyword;[switch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[case]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Colon;[:]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[break]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[case]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[1]; - CSharpSymbolType.Colon;[:]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[break]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[case]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[2]; - CSharpSymbolType.Colon;[:]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[return]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[default]; - CSharpSymbolType.Colon;[:]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[return]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [switch(foo) {LF case 0:LF break;LF case 1:LF {LF break;LF }LF case 2:LF return;LF default:LF return;LF}] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:52 + CSharpTokenType.Keyword;[switch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[case]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Colon;[:]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[break]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[case]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[1]; + CSharpTokenType.Colon;[:]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[break]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[case]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[2]; + CSharpTokenType.Colon;[:]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[return]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[default]; + CSharpTokenType.Colon;[:]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[return]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsUsingKeywordFollowedByParen.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsUsingKeywordFollowedByParen.syntaxtree.txt index d96f852117..aaabf8bbd5 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsUsingKeywordFollowedByParen.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsUsingKeywordFollowedByParen.syntaxtree.txt @@ -1,46 +1,46 @@ Statement block - Gen - 84 - (0:0,0) - Code span - Gen - [using(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:44 - CSharpSymbolType.Keyword;[using]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[10]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["baz"]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"foo } bar"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [using(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:44 + CSharpTokenType.Keyword;[using]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[10]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["baz"]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"foo } bar"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsWhileKeyword.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsWhileKeyword.syntaxtree.txt index 40767f609b..261becea48 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsWhileKeyword.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSkipsParenthesisedExpressionAndThenBalancesBracesIfFirstIdentifierIsWhileKeyword.syntaxtree.txt @@ -1,46 +1,46 @@ Statement block - Gen - 84 - (0:0,0) - Code span - Gen - [while(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:44 - CSharpSymbolType.Keyword;[while]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[10]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["baz"]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"foo } bar"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [while(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:44 + CSharpTokenType.Keyword;[while]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[10]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["baz"]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"foo } bar"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockStopsParsingCatchClausesAfterFinallyBlock.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockStopsParsingCatchClausesAfterFinallyBlock.syntaxtree.txt index 493313d0b3..c9a0cb5fa2 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockStopsParsingCatchClausesAfterFinallyBlock.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockStopsParsingCatchClausesAfterFinallyBlock.syntaxtree.txt @@ -1,37 +1,37 @@ Statement block - Gen - 55 - (0:0,0) - Code span - Gen - [try { var foo = new { } } finally { var foo = new { } }] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:35 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[finally]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [try { var foo = new { } } finally { var foo = new { } }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:35 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[finally]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockStopsParsingCodeAfterElseBranch.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockStopsParsingCodeAfterElseBranch.syntaxtree.txt index 1d53581e15..8aea7b10e3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockStopsParsingCodeAfterElseBranch.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockStopsParsingCodeAfterElseBranch.syntaxtree.txt @@ -1,109 +1,109 @@ Statement block - Gen - 220 - (0:0,0) - Code span - Gen - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"bar } baz");LF} else { Debug.WriteLine(@"bar } baz"); }] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:107 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[10]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["baz"]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"foo } bar"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[10]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["baz"]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"bar } baz"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"bar } baz"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"foo } bar");LF} else if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"bar } baz");LF} else { Debug.WriteLine(@"bar } baz"); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:107 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[10]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["baz"]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"foo } bar"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[10]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["baz"]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"bar } baz"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"bar } baz"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockStopsParsingIfIfStatementNotFollowedByElse.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockStopsParsingIfIfStatementNotFollowedByElse.syntaxtree.txt index f3ca23e917..a6fde6d036 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockStopsParsingIfIfStatementNotFollowedByElse.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockStopsParsingIfIfStatementNotFollowedByElse.syntaxtree.txt @@ -1,47 +1,47 @@ Statement block - Gen - 87 - (0:0,0) - Code span - Gen - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"foo } bar");LF}] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:45 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[10]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["baz"]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"foo } bar"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [if(int i = 0; i < 10; new Foo { Bar = "baz" }) {LF Debug.WriteLine(@"foo } bar");LF}] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:45 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[10]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["baz"]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"foo } bar"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenCatchAndFinallyClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenCatchAndFinallyClause.syntaxtree.txt index 372641ccc4..4dd24cad32 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenCatchAndFinallyClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenCatchAndFinallyClause.syntaxtree.txt @@ -1,41 +1,41 @@ Statement block - Gen - 75 - (0:0,0) - Code span - Gen - [try { bar(); } catch(bar) { baz(); } /* Foo */ /* Bar */ finally { biz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:39 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Comment;[/* Foo */]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Comment;[/* Bar */]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[finally]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[biz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [try { bar(); } catch(bar) { baz(); } /* Foo */ /* Bar */ finally { biz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:39 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Comment;[/* Foo */]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Comment;[/* Bar */]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[finally]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[biz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenDoAndWhileClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenDoAndWhileClause.syntaxtree.txt index 6c2b490097..89aeaa49b0 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenDoAndWhileClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenDoAndWhileClause.syntaxtree.txt @@ -1,26 +1,26 @@ Statement block - Gen - 54 - (0:0,0) - Code span - Gen - [do { var foo = bar; } /* Foo */ /* Bar */ while(true);] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:24 - CSharpSymbolType.Keyword;[do]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Comment;[/* Foo */]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Comment;[/* Bar */]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[while]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; + Code span - Gen - [do { var foo = bar; } /* Foo */ /* Bar */ while(true);] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:24 + CSharpTokenType.Keyword;[do]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Comment;[/* Foo */]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Comment;[/* Bar */]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[while]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenElseIfAndElseClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenElseIfAndElseClause.syntaxtree.txt index b7dbaff01b..8beb9c4062 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenElseIfAndElseClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenElseIfAndElseClause.syntaxtree.txt @@ -1,46 +1,46 @@ Statement block - Gen - 78 - (0:0,0) - Code span - Gen - [if(foo) { bar(); } else if(bar) { baz(); } /* Foo */ /* Bar */ else { biz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:44 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Comment;[/* Foo */]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Comment;[/* Bar */]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[biz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [if(foo) { bar(); } else if(bar) { baz(); } /* Foo */ /* Bar */ else { biz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:44 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Comment;[/* Foo */]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Comment;[/* Bar */]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[biz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenIfAndElseClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenIfAndElseClause.syntaxtree.txt index b3d9e4803d..c00834cb33 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenIfAndElseClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenIfAndElseClause.syntaxtree.txt @@ -1,30 +1,30 @@ Statement block - Gen - 54 - (0:0,0) - Code span - Gen - [if(foo) { bar(); } /* Foo */ /* Bar */ else { baz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:28 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Comment;[/* Foo */]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Comment;[/* Bar */]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [if(foo) { bar(); } /* Foo */ /* Bar */ else { baz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:28 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Comment;[/* Foo */]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Comment;[/* Bar */]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenIfAndElseIfClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenIfAndElseIfClause.syntaxtree.txt index a3e21f379d..35a7c0c0e2 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenIfAndElseIfClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenIfAndElseIfClause.syntaxtree.txt @@ -1,35 +1,35 @@ Statement block - Gen - 62 - (0:0,0) - Code span - Gen - [if(foo) { bar(); } /* Foo */ /* Bar */ else if(bar) { baz(); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:33 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Comment;[/* Foo */]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Comment;[/* Bar */]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [if(foo) { bar(); } /* Foo */ /* Bar */ else if(bar) { baz(); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:33 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Comment;[/* Foo */]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Comment;[/* Bar */]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenTryAndCatchClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenTryAndCatchClause.syntaxtree.txt index 98ebae7b75..4fb861d57f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenTryAndCatchClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenTryAndCatchClause.syntaxtree.txt @@ -1,30 +1,30 @@ Statement block - Gen - 56 - (0:0,0) - Code span - Gen - [try { bar(); } /* Foo */ /* Bar */ catch(bar) { baz(); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:28 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Comment;[/* Foo */]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Comment;[/* Bar */]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [try { bar(); } /* Foo */ /* Bar */ catch(bar) { baz(); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:28 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Comment;[/* Foo */]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Comment;[/* Bar */]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenTryAndFinallyClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenTryAndFinallyClause.syntaxtree.txt index 76850c7324..659643d83f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenTryAndFinallyClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsBlockCommentBetweenTryAndFinallyClause.syntaxtree.txt @@ -1,27 +1,27 @@ Statement block - Gen - 53 - (0:0,0) - Code span - Gen - [try { bar(); } /* Foo */ /* Bar */ finally { baz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:25 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Comment;[/* Foo */]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Comment;[/* Bar */]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[finally]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [try { bar(); } /* Foo */ /* Bar */ finally { baz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:25 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Comment;[/* Foo */]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Comment;[/* Bar */]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[finally]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsExceptionLessCatchClauses.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsExceptionLessCatchClauses.syntaxtree.txt index 03b82d640b..bb84c5607a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsExceptionLessCatchClauses.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsExceptionLessCatchClauses.syntaxtree.txt @@ -1,37 +1,37 @@ Statement block - Gen - 53 - (0:0,0) - Code span - Gen - [try { var foo = new { } } catch { var foo = new { } }] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:35 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [try { var foo = new { } } catch { var foo = new { } }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:35 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenCatchAndFinallyClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenCatchAndFinallyClause.syntaxtree.txt index acf12c72eb..b09a7b573c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenCatchAndFinallyClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenCatchAndFinallyClause.syntaxtree.txt @@ -1,41 +1,41 @@ Statement block - Gen - 72 - (0:0,0) - Code span - Gen - [try { bar(); } catch(bar) { baz(); }LF// FooLF// BarLFfinally { biz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:39 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Comment;[// Foo]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Comment;[// Bar]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Keyword;[finally]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[biz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [try { bar(); } catch(bar) { baz(); }LF// FooLF// BarLFfinally { biz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:39 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Comment;[// Foo]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Comment;[// Bar]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Keyword;[finally]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[biz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenDoAndWhileClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenDoAndWhileClause.syntaxtree.txt index 40209ac12e..17b8ff17eb 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenDoAndWhileClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenDoAndWhileClause.syntaxtree.txt @@ -1,26 +1,26 @@ Statement block - Gen - 51 - (0:0,0) - Code span - Gen - [do { var foo = bar; }LF// FooLF// BarLFwhile(true);] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:24 - CSharpSymbolType.Keyword;[do]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Comment;[// Foo]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Comment;[// Bar]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Keyword;[while]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; + Code span - Gen - [do { var foo = bar; }LF// FooLF// BarLFwhile(true);] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:24 + CSharpTokenType.Keyword;[do]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Comment;[// Foo]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Comment;[// Bar]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Keyword;[while]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenElseIfAndElseClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenElseIfAndElseClause.syntaxtree.txt index 33a8921e59..eb193d4c42 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenElseIfAndElseClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenElseIfAndElseClause.syntaxtree.txt @@ -1,46 +1,46 @@ Statement block - Gen - 75 - (0:0,0) - Code span - Gen - [if(foo) { bar(); } else if(bar) { baz(); }LF// FooLF// BarLFelse { biz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:44 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Comment;[// Foo]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Comment;[// Bar]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[biz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [if(foo) { bar(); } else if(bar) { baz(); }LF// FooLF// BarLFelse { biz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:44 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Comment;[// Foo]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Comment;[// Bar]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[biz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenIfAndElseClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenIfAndElseClause.syntaxtree.txt index ecff6e6791..5494eeaffe 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenIfAndElseClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenIfAndElseClause.syntaxtree.txt @@ -1,30 +1,30 @@ Statement block - Gen - 51 - (0:0,0) - Code span - Gen - [if(foo) { bar(); }LF// FooLF// BarLFelse { baz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:28 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Comment;[// Foo]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Comment;[// Bar]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [if(foo) { bar(); }LF// FooLF// BarLFelse { baz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:28 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Comment;[// Foo]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Comment;[// Bar]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenIfAndElseIfClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenIfAndElseIfClause.syntaxtree.txt index 7d68e7beaa..9359227eaf 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenIfAndElseIfClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenIfAndElseIfClause.syntaxtree.txt @@ -1,35 +1,35 @@ Statement block - Gen - 59 - (0:0,0) - Code span - Gen - [if(foo) { bar(); }LF// FooLF// BarLFelse if(bar) { baz(); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:33 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Comment;[// Foo]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Comment;[// Bar]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [if(foo) { bar(); }LF// FooLF// BarLFelse if(bar) { baz(); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:33 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Comment;[// Foo]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Comment;[// Bar]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenTryAndCatchClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenTryAndCatchClause.syntaxtree.txt index e0c31462eb..fd741d9327 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenTryAndCatchClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenTryAndCatchClause.syntaxtree.txt @@ -1,30 +1,30 @@ Statement block - Gen - 53 - (0:0,0) - Code span - Gen - [try { bar(); }LF// FooLF// BarLFcatch(bar) { baz(); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:28 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Comment;[// Foo]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Comment;[// Bar]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [try { bar(); }LF// FooLF// BarLFcatch(bar) { baz(); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:28 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Comment;[// Foo]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Comment;[// Bar]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenTryAndFinallyClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenTryAndFinallyClause.syntaxtree.txt index f04cd252d5..4f6a067875 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenTryAndFinallyClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsLineCommentBetweenTryAndFinallyClause.syntaxtree.txt @@ -1,27 +1,27 @@ Statement block - Gen - 50 - (0:0,0) - Code span - Gen - [try { bar(); }LF// FooLF// BarLFfinally { baz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:25 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Comment;[// Foo]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Comment;[// Bar]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Keyword;[finally]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [try { bar(); }LF// FooLF// BarLFfinally { baz(); }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:25 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Comment;[// Foo]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Comment;[// Bar]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Keyword;[finally]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsMarkupWithinAdditionalCatchClauses.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsMarkupWithinAdditionalCatchClauses.syntaxtree.txt index f6bdbfe7eb..12d1fbf839 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsMarkupWithinAdditionalCatchClauses.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsMarkupWithinAdditionalCatchClauses.syntaxtree.txt @@ -1,100 +1,100 @@ Statement block - Gen - 141 - (0:0,0) - Code span - Gen - [try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) {] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:78 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Baz]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Baz]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Baz]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; + Code span - Gen - [try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) {] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:78 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Baz]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Baz]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Baz]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 12 - (128:0,128) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (128:0,128) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (128:0,128) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 3 - (129:0,129) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (129:0,129) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (132:0,132) - Symbols:1 - HtmlSymbolType.Text;[Foo]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (129:0,129) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (132:0,132) - Tokens:1 + HtmlTokenType.Text;[Foo]; Tag block - Gen - 4 - (135:0,135) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (135:0,135) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (139:0,139) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; - Code span - Gen - [}] - SpanEditHandler;Accepts:Any - (140:0,140) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (135:0,135) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (139:0,139) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; + Code span - Gen - [}] - SpanEditHandler;Accepts:Any - (140:0,140) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsMarkupWithinCatchClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsMarkupWithinCatchClause.syntaxtree.txt index 8024183cd0..eb1512a038 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsMarkupWithinCatchClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsMarkupWithinCatchClause.syntaxtree.txt @@ -1,50 +1,50 @@ Statement block - Gen - 59 - (0:0,0) - Code span - Gen - [try { var foo = new { } } catch(Foo Bar Baz) {] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:28 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Baz]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; + Code span - Gen - [try { var foo = new { } } catch(Foo Bar Baz) {] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:28 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Baz]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 12 - (46:0,46) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (46:0,46) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (46:0,46) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 3 - (47:0,47) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (47:0,47) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (50:0,50) - Symbols:1 - HtmlSymbolType.Text;[Foo]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (47:0,47) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (50:0,50) - Tokens:1 + HtmlTokenType.Text;[Foo]; Tag block - Gen - 4 - (53:0,53) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (53:0,53) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (57:0,57) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; - Code span - Gen - [}] - SpanEditHandler;Accepts:Any - (58:0,58) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (53:0,53) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (57:0,57) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; + Code span - Gen - [}] - SpanEditHandler;Accepts:Any - (58:0,58) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsMarkupWithinFinallyClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsMarkupWithinFinallyClause.syntaxtree.txt index f3e53bc0e1..4af8d90e1a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsMarkupWithinFinallyClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsMarkupWithinFinallyClause.syntaxtree.txt @@ -1,43 +1,43 @@ Statement block - Gen - 48 - (0:0,0) - Code span - Gen - [try { var foo = new { } } finally {] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:21 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[finally]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; + Code span - Gen - [try { var foo = new { } } finally {] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:21 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[finally]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 12 - (35:0,35) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (35:0,35) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 3 - (36:0,36) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (36:0,36) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (39:0,39) - Symbols:1 - HtmlSymbolType.Text;[Foo]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (39:0,39) - Tokens:1 + HtmlTokenType.Text;[Foo]; Tag block - Gen - 4 - (42:0,42) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (42:0,42) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (46:0,46) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; - Code span - Gen - [}] - SpanEditHandler;Accepts:None - (47:0,47) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (42:0,42) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (46:0,46) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; + Code span - Gen - [}] - SpanEditHandler;Accepts:None - (47:0,47) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsMarkupWithinTryClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsMarkupWithinTryClause.syntaxtree.txt index c3bb2e8568..f7fc9e38f9 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsMarkupWithinTryClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsMarkupWithinTryClause.syntaxtree.txt @@ -1,25 +1,25 @@ Statement block - Gen - 18 - (0:0,0) - Code span - Gen - [try {] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:3 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; + Code span - Gen - [try {] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 12 - (5:0,5) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (5:0,5) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 3 - (6:0,6) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (6:0,6) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (9:0,9) - Symbols:1 - HtmlSymbolType.Text;[Foo]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1 + HtmlTokenType.Text;[Foo]; Tag block - Gen - 4 - (12:0,12) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (12:0,12) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; - Code span - Gen - [}] - SpanEditHandler;Accepts:Any - (17:0,17) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; + Code span - Gen - [}] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenCatchAndFinallyClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenCatchAndFinallyClause.syntaxtree.txt index 166e268a6f..7ebe9d2b86 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenCatchAndFinallyClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenCatchAndFinallyClause.syntaxtree.txt @@ -1,63 +1,63 @@ Statement block - Gen - 75 - (0:0,0) - Code span - Gen - [try { bar(); } catch(bar) { baz(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:25 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [try { bar(); } catch(bar) { baz(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:25 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; Comment block - Gen - 9 - (37:0,37) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (37:0,37) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (38:0,38) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [ Foo ] - SpanEditHandler;Accepts:Any - (39:0,39) - Symbols:1 - CSharpSymbolType.RazorComment;[ Foo ]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (44:0,44) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (45:0,45) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:Any - (46:0,46) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (37:0,37) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Comment span - Gen - [ Foo ] - SpanEditHandler;Accepts:Any - (39:0,39) - Tokens:1 + CSharpTokenType.RazorComment;[ Foo ]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (44:0,44) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (45:0,45) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:Any - (46:0,46) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; Comment block - Gen - 9 - (47:0,47) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (47:0,47) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (48:0,48) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [ Bar ] - SpanEditHandler;Accepts:Any - (49:0,49) - Symbols:1 - CSharpSymbolType.RazorComment;[ Bar ]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (54:0,54) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (55:0,55) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - Code span - Gen - [ finally { biz(); }] - SpanEditHandler;Accepts:None - (56:0,56) - Symbols:11 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[finally]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[biz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (47:0,47) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (48:0,48) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Comment span - Gen - [ Bar ] - SpanEditHandler;Accepts:Any - (49:0,49) - Tokens:1 + CSharpTokenType.RazorComment;[ Bar ]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (54:0,54) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (55:0,55) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + Code span - Gen - [ finally { biz(); }] - SpanEditHandler;Accepts:None - (56:0,56) - Tokens:11 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[finally]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[biz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenDoAndWhileClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenDoAndWhileClause.syntaxtree.txt index 5d37bf7216..e31ec364b4 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenDoAndWhileClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenDoAndWhileClause.syntaxtree.txt @@ -1,48 +1,48 @@ Statement block - Gen - 54 - (0:0,0) - Code span - Gen - [do { var foo = bar; } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:15 - CSharpSymbolType.Keyword;[do]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [do { var foo = bar; } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:15 + CSharpTokenType.Keyword;[do]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; Comment block - Gen - 9 - (22:0,22) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (22:0,22) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (23:0,23) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [ Foo ] - SpanEditHandler;Accepts:Any - (24:0,24) - Symbols:1 - CSharpSymbolType.RazorComment;[ Foo ]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (29:0,29) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (30:0,30) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:Any - (31:0,31) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Comment span - Gen - [ Foo ] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1 + CSharpTokenType.RazorComment;[ Foo ]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (29:0,29) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (30:0,30) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; Comment block - Gen - 9 - (32:0,32) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (32:0,32) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (33:0,33) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [ Bar ] - SpanEditHandler;Accepts:Any - (34:0,34) - Symbols:1 - CSharpSymbolType.RazorComment;[ Bar ]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (39:0,39) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (40:0,40) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - Code span - Gen - [ while(true);] - SpanEditHandler;Accepts:None - (41:0,41) - Symbols:6 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[while]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (33:0,33) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Comment span - Gen - [ Bar ] - SpanEditHandler;Accepts:Any - (34:0,34) - Tokens:1 + CSharpTokenType.RazorComment;[ Bar ]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (39:0,39) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (40:0,40) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + Code span - Gen - [ while(true);] - SpanEditHandler;Accepts:None - (41:0,41) - Tokens:6 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[while]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenElseIfAndElseClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenElseIfAndElseClause.syntaxtree.txt index f968c56872..36f17bd744 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenElseIfAndElseClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenElseIfAndElseClause.syntaxtree.txt @@ -1,68 +1,68 @@ Statement block - Gen - 78 - (0:0,0) - Code span - Gen - [if(foo) { bar(); } else if(bar) { baz(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:30 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [if(foo) { bar(); } else if(bar) { baz(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:30 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; Comment block - Gen - 9 - (43:0,43) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (43:0,43) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (44:0,44) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [ Foo ] - SpanEditHandler;Accepts:Any - (45:0,45) - Symbols:1 - CSharpSymbolType.RazorComment;[ Foo ]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (50:0,50) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (51:0,51) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:Any - (52:0,52) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (43:0,43) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (44:0,44) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Comment span - Gen - [ Foo ] - SpanEditHandler;Accepts:Any - (45:0,45) - Tokens:1 + CSharpTokenType.RazorComment;[ Foo ]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (50:0,50) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (51:0,51) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:Any - (52:0,52) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; Comment block - Gen - 9 - (53:0,53) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (53:0,53) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (54:0,54) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [ Bar ] - SpanEditHandler;Accepts:Any - (55:0,55) - Symbols:1 - CSharpSymbolType.RazorComment;[ Bar ]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (60:0,60) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (61:0,61) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - Code span - Gen - [ else { baz(); }] - SpanEditHandler;Accepts:None - (62:0,62) - Symbols:11 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (53:0,53) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (54:0,54) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Comment span - Gen - [ Bar ] - SpanEditHandler;Accepts:Any - (55:0,55) - Tokens:1 + CSharpTokenType.RazorComment;[ Bar ]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (60:0,60) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (61:0,61) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + Code span - Gen - [ else { baz(); }] - SpanEditHandler;Accepts:None - (62:0,62) - Tokens:11 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenIfAndElseClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenIfAndElseClause.syntaxtree.txt index 5dddcf991b..6a9926895b 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenIfAndElseClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenIfAndElseClause.syntaxtree.txt @@ -1,52 +1,52 @@ Statement block - Gen - 54 - (0:0,0) - Code span - Gen - [if(foo) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:14 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [if(foo) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:14 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; Comment block - Gen - 9 - (19:0,19) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (19:0,19) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (20:0,20) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [ Foo ] - SpanEditHandler;Accepts:Any - (21:0,21) - Symbols:1 - CSharpSymbolType.RazorComment;[ Foo ]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (26:0,26) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (27:0,27) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:Any - (28:0,28) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Comment span - Gen - [ Foo ] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1 + CSharpTokenType.RazorComment;[ Foo ]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (26:0,26) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; Comment block - Gen - 9 - (29:0,29) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (29:0,29) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (30:0,30) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [ Bar ] - SpanEditHandler;Accepts:Any - (31:0,31) - Symbols:1 - CSharpSymbolType.RazorComment;[ Bar ]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (36:0,36) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (37:0,37) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - Code span - Gen - [ else { baz(); }] - SpanEditHandler;Accepts:None - (38:0,38) - Symbols:11 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (29:0,29) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (30:0,30) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Comment span - Gen - [ Bar ] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1 + CSharpTokenType.RazorComment;[ Bar ]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (37:0,37) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + Code span - Gen - [ else { baz(); }] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:11 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenIfAndElseIfClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenIfAndElseIfClause.syntaxtree.txt index 7ad78eea0d..f25afcea4d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenIfAndElseIfClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenIfAndElseIfClause.syntaxtree.txt @@ -1,57 +1,57 @@ Statement block - Gen - 62 - (0:0,0) - Code span - Gen - [if(foo) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:14 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [if(foo) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:14 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; Comment block - Gen - 9 - (19:0,19) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (19:0,19) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (20:0,20) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [ Foo ] - SpanEditHandler;Accepts:Any - (21:0,21) - Symbols:1 - CSharpSymbolType.RazorComment;[ Foo ]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (26:0,26) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (27:0,27) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:Any - (28:0,28) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Comment span - Gen - [ Foo ] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1 + CSharpTokenType.RazorComment;[ Foo ]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (26:0,26) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; Comment block - Gen - 9 - (29:0,29) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (29:0,29) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (30:0,30) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [ Bar ] - SpanEditHandler;Accepts:Any - (31:0,31) - Symbols:1 - CSharpSymbolType.RazorComment;[ Bar ]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (36:0,36) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (37:0,37) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - Code span - Gen - [ else if(bar) { baz(); }] - SpanEditHandler;Accepts:Any - (38:0,38) - Symbols:16 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (29:0,29) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (30:0,30) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Comment span - Gen - [ Bar ] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1 + CSharpTokenType.RazorComment;[ Bar ]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (37:0,37) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + Code span - Gen - [ else if(bar) { baz(); }] - SpanEditHandler;Accepts:Any - (38:0,38) - Tokens:16 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenTryAndCatchClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenTryAndCatchClause.syntaxtree.txt index aa16fc8b57..7ca64561f4 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenTryAndCatchClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenTryAndCatchClause.syntaxtree.txt @@ -1,51 +1,51 @@ Statement block - Gen - 55 - (0:0,0) - Code span - Gen - [try { bar(); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:10 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [try { bar(); }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:10 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; Comment block - Gen - 9 - (14:0,14) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (14:0,14) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (15:0,15) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [ Foo ] - SpanEditHandler;Accepts:Any - (16:0,16) - Symbols:1 - CSharpSymbolType.RazorComment;[ Foo ]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (21:0,21) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (22:0,22) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:Any - (23:0,23) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Comment span - Gen - [ Foo ] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1 + CSharpTokenType.RazorComment;[ Foo ]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; Comment block - Gen - 9 - (24:0,24) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (24:0,24) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (25:0,25) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [ Bar ] - SpanEditHandler;Accepts:Any - (26:0,26) - Symbols:1 - CSharpSymbolType.RazorComment;[ Bar ]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (31:0,31) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (32:0,32) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - Code span - Gen - [ catch(bar) { baz(); }] - SpanEditHandler;Accepts:Any - (33:0,33) - Symbols:14 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Comment span - Gen - [ Bar ] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:1 + CSharpTokenType.RazorComment;[ Bar ]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + Code span - Gen - [ catch(bar) { baz(); }] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:14 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenTryAndFinallyClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenTryAndFinallyClause.syntaxtree.txt index f31b7a4b66..bb040a642a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenTryAndFinallyClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsRazorCommentBetweenTryAndFinallyClause.syntaxtree.txt @@ -1,49 +1,49 @@ Statement block - Gen - 53 - (0:0,0) - Code span - Gen - [try { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:11 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [try { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:11 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; Comment block - Gen - 9 - (15:0,15) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (16:0,16) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [ Foo ] - SpanEditHandler;Accepts:Any - (17:0,17) - Symbols:1 - CSharpSymbolType.RazorComment;[ Foo ]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (22:0,22) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (23:0,23) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:Any - (24:0,24) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Comment span - Gen - [ Foo ] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1 + CSharpTokenType.RazorComment;[ Foo ]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; Comment block - Gen - 9 - (25:0,25) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (25:0,25) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (26:0,26) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [ Bar ] - SpanEditHandler;Accepts:Any - (27:0,27) - Symbols:1 - CSharpSymbolType.RazorComment;[ Bar ]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (32:0,32) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (33:0,33) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - Code span - Gen - [ finally { biz(); }] - SpanEditHandler;Accepts:None - (34:0,34) - Symbols:11 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[finally]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[biz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (26:0,26) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Comment span - Gen - [ Bar ] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:1 + CSharpTokenType.RazorComment;[ Bar ]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (33:0,33) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + Code span - Gen - [ finally { biz(); }] - SpanEditHandler;Accepts:None - (34:0,34) - Tokens:11 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[finally]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[biz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsTryStatementWithFinallyClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsTryStatementWithFinallyClause.syntaxtree.txt index 493313d0b3..c9a0cb5fa2 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsTryStatementWithFinallyClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsTryStatementWithFinallyClause.syntaxtree.txt @@ -1,37 +1,37 @@ Statement block - Gen - 55 - (0:0,0) - Code span - Gen - [try { var foo = new { } } finally { var foo = new { } }] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:35 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[finally]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [try { var foo = new { } } finally { var foo = new { } }] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:35 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[finally]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsTryStatementWithMultipleCatchClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsTryStatementWithMultipleCatchClause.syntaxtree.txt index 7c2f15939f..b4bab579d7 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsTryStatementWithMultipleCatchClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsTryStatementWithMultipleCatchClause.syntaxtree.txt @@ -1,94 +1,94 @@ Statement block - Gen - 148 - (0:0,0) - Code span - Gen - [try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } }] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:92 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Baz]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Baz]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Baz]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:92 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Baz]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Baz]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Baz]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsTryStatementWithNoAdditionalClauses.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsTryStatementWithNoAdditionalClauses.syntaxtree.txt index 61dabde423..8db73b2757 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsTryStatementWithNoAdditionalClauses.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsTryStatementWithNoAdditionalClauses.syntaxtree.txt @@ -1,19 +1,19 @@ Statement block - Gen - 25 - (0:0,0) - Code span - Gen - [try { var foo = new { } }] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:17 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [try { var foo = new { } }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:17 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsTryStatementWithOneCatchClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsTryStatementWithOneCatchClause.syntaxtree.txt index 2dc17cf9b8..e83ac8d8ba 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsTryStatementWithOneCatchClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsTryStatementWithOneCatchClause.syntaxtree.txt @@ -1,44 +1,44 @@ Statement block - Gen - 66 - (0:0,0) - Code span - Gen - [try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } }] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:42 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Baz]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [try { var foo = new { } } catch(Foo Bar Baz) { var foo = new { } }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:42 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Baz]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsUsingsNestedWithinOtherBlocks.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsUsingsNestedWithinOtherBlocks.syntaxtree.txt index e3f8d60c2d..4618359626 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsUsingsNestedWithinOtherBlocks.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockSupportsUsingsNestedWithinOtherBlocks.syntaxtree.txt @@ -1,55 +1,55 @@ Statement block - Gen - 96 - (0:0,0) - Code span - Gen - [if(foo) { using(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); } }] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:53 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[using]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[10]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["baz"]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Debug]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WriteLine]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"foo } bar"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [if(foo) { using(int i = 0; i < 10; new Foo { Bar = "baz" }) { Debug.WriteLine(@"foo } bar"); } }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:53 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[using]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[10]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["baz"]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Debug]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WriteLine]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"foo } bar"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTerminatesBlockCommentAtEndOfFile.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTerminatesBlockCommentAtEndOfFile.syntaxtree.txt index 79ab1d0164..c1ef9144c7 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTerminatesBlockCommentAtEndOfFile.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTerminatesBlockCommentAtEndOfFile.syntaxtree.txt @@ -1,16 +1,16 @@ Statement block - Gen - 38 - (0:0,0) - Code span - Gen - [foreach(var f in Foo) { /* foo bar baz] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:14 - CSharpSymbolType.Keyword;[foreach]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[f]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[in]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Comment;[/* foo bar baz];RZ1001(24:0,24 [1] ) + Code span - Gen - [foreach(var f in Foo) { /* foo bar baz] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:14 + CSharpTokenType.Keyword;[foreach]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[f]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[in]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Comment;[/* foo bar baz];RZ1001(24:0,24 [1] ) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTerminatesParenBalancingAtEOF.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTerminatesParenBalancingAtEOF.syntaxtree.txt index b7d07763b6..74aaae6293 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTerminatesParenBalancingAtEOF.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTerminatesParenBalancingAtEOF.syntaxtree.txt @@ -1,11 +1,11 @@ Expression block - Gen - 15 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [Html.En(code()] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:7 - CSharpSymbolType.Identifier;[Html]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[En]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[code]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [Html.En(code()] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:7 + CSharpTokenType.Identifier;[Html]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[En]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[code]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTerminatesSingleLineCommentAtEndOfFile.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTerminatesSingleLineCommentAtEndOfFile.syntaxtree.txt index 142f08509f..132a174cc4 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTerminatesSingleLineCommentAtEndOfFile.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTerminatesSingleLineCommentAtEndOfFile.syntaxtree.txt @@ -1,16 +1,16 @@ Statement block - Gen - 38 - (0:0,0) - Code span - Gen - [foreach(var f in Foo) { // foo bar baz] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:14 - CSharpSymbolType.Keyword;[foreach]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[f]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[in]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Comment;[// foo bar baz]; + Code span - Gen - [foreach(var f in Foo) { // foo bar baz] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:14 + CSharpTokenType.Keyword;[foreach]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[f]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[in]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Comment;[// foo bar baz]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTerminatesSingleSlashAtEndOfFile.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTerminatesSingleSlashAtEndOfFile.syntaxtree.txt index b9f5736263..fc3d51a91d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTerminatesSingleSlashAtEndOfFile.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTerminatesSingleSlashAtEndOfFile.syntaxtree.txt @@ -1,22 +1,22 @@ Statement block - Gen - 37 - (0:0,0) - Code span - Gen - [foreach(var f in Foo) { / foo bar baz] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:20 - CSharpSymbolType.Keyword;[foreach]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[f]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[in]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Slash;[/]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; + Code span - Gen - [foreach(var f in Foo) { / foo bar baz] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:20 + CSharpTokenType.Keyword;[foreach]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[f]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[in]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Slash;[/]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTerminatesUsingKeywordAtEOFAndOutputsFileCodeBlock.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTerminatesUsingKeywordAtEOFAndOutputsFileCodeBlock.syntaxtree.txt index 4a8f3b0bb8..96f6f0f501 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTerminatesUsingKeywordAtEOFAndOutputsFileCodeBlock.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTerminatesUsingKeywordAtEOFAndOutputsFileCodeBlock.syntaxtree.txt @@ -1,4 +1,4 @@ Statement block - Gen - 25 - (0:0,0) - Code span - Gen - [using ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:2 - CSharpSymbolType.Keyword;[using]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [using ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2 + CSharpTokenType.Keyword;[using]; + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTreatsAtSignsAfterFirstPairAsPartOfCSharpStatement.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTreatsAtSignsAfterFirstPairAsPartOfCSharpStatement.syntaxtree.txt index fb00f94e10..2adfba5136 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTreatsAtSignsAfterFirstPairAsPartOfCSharpStatement.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTreatsAtSignsAfterFirstPairAsPartOfCSharpStatement.syntaxtree.txt @@ -1,22 +1,22 @@ Statement block - Gen - 27 - (0:0,0) - Code span - Gen - [if(foo) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:7 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [@] - SpanEditHandler;Accepts:Any - (10:0,10) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [@@@class.Foo() }] - SpanEditHandler;Accepts:Any - (11:0,11) - Symbols:10 - CSharpSymbolType.Transition;[@]; - CSharpSymbolType.Transition;[@]; - CSharpSymbolType.Transition;[@]; - CSharpSymbolType.Keyword;[class]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [if(foo) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:7 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [@] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [@@@class.Foo() }] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:10 + CSharpTokenType.Transition;[@]; + CSharpTokenType.Transition;[@]; + CSharpTokenType.Transition;[@]; + CSharpTokenType.Keyword;[class]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTreatsDoubleAtSignAsEscapeSequenceIfAtStatementStart.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTreatsDoubleAtSignAsEscapeSequenceIfAtStatementStart.syntaxtree.txt index f2f576ce8d..2b2e1a980f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTreatsDoubleAtSignAsEscapeSequenceIfAtStatementStart.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlockTreatsDoubleAtSignAsEscapeSequenceIfAtStatementStart.syntaxtree.txt @@ -1,20 +1,20 @@ Statement block - Gen - 25 - (0:0,0) - Code span - Gen - [if(foo) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:7 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [@] - SpanEditHandler;Accepts:Any - (10:0,10) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [@class.Foo() }] - SpanEditHandler;Accepts:Any - (11:0,11) - Symbols:8 - CSharpSymbolType.Transition;[@]; - CSharpSymbolType.Keyword;[class]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [if(foo) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:7 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [@] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [@class.Foo() }] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:8 + CSharpTokenType.Transition;[@]; + CSharpTokenType.Keyword;[class]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_NestedCodeBlockWithCSharpAt.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_NestedCodeBlockWithCSharpAt.syntaxtree.txt index 7858f8d83f..80065e6122 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_NestedCodeBlockWithCSharpAt.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_NestedCodeBlockWithCSharpAt.syntaxtree.txt @@ -1,41 +1,41 @@ Statement block - Gen - 49 - (0:0,0) - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [ if (true) { var val = @x; if (val != 3) { } } ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (1:0,1) - Symbols:35 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[val]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Transition;[@]; - CSharpSymbolType.Identifier;[x]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[val]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NotEqual;[!=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[3]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (48:0,48) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [ if (true) { var val = @x; if (val != 3) { } } ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (1:0,1) - Tokens:35 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[val]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Transition;[@]; + CSharpTokenType.Identifier;[x]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[val]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NotEqual;[!=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[3]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (48:0,48) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_NestedCodeBlockWithMarkupSetsDotAsMarkup.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_NestedCodeBlockWithMarkupSetsDotAsMarkup.syntaxtree.txt index 4d46547f84..28fa9d02af 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_NestedCodeBlockWithMarkupSetsDotAsMarkup.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_NestedCodeBlockWithMarkupSetsDotAsMarkup.syntaxtree.txt @@ -1,50 +1,50 @@ Statement block - Gen - 51 - (0:0,0) - Code span - Gen - [if (true) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:8 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [if (true) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:8 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; Statement block - Gen - 37 - (12:0,12) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [if(false) {] - SpanEditHandler;Accepts:Any - (13:0,13) - Symbols:6 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[false]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [if(false) {] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:6 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[false]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 24 - (24:0,24) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (24:0,24) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 5 - (25:0,25) - Markup span - Gen - [
] - SpanEditHandler;Accepts:None - (25:0,25) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[div]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (30:0,30) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [
] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[div]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:1 + HtmlTokenType.Unknown;[]; Expression block - Gen - 10 - (30:0,30) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (30:0,30) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [something] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (31:0,31) - Symbols:1 - CSharpSymbolType.Identifier;[something]; - Markup span - Gen - [.] - SpanEditHandler;Accepts:Any - (40:0,40) - Symbols:1 - HtmlSymbolType.Text;[.]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (30:0,30) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [something] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (31:0,31) - Tokens:1 + CSharpTokenType.Identifier;[something]; + Markup span - Gen - [.] - SpanEditHandler;Accepts:Any - (40:0,40) - Tokens:1 + HtmlTokenType.Text;[.]; Tag block - Gen - 6 - (41:0,41) - Markup span - Gen - [
] - SpanEditHandler;Accepts:None - (41:0,41) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[div]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (47:0,47) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; - Code span - Gen - [}] - SpanEditHandler;Accepts:Any - (48:0,48) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; - Code span - Gen - [ }] - SpanEditHandler;Accepts:Any - (49:0,49) - Symbols:2 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Markup span - Gen - [
] - SpanEditHandler;Accepts:None - (41:0,41) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[div]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (47:0,47) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; + Code span - Gen - [}] - SpanEditHandler;Accepts:Any - (48:0,48) - Tokens:1 + CSharpTokenType.RightBrace;[}]; + Code span - Gen - [ }] - SpanEditHandler;Accepts:Any - (49:0,49) - Tokens:2 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.syntaxtree.txt index d7cf158060..ac7bda2f5e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.syntaxtree.txt @@ -1,31 +1,31 @@ Statement block - Gen - 22 - (0:0,0) - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 20 - (1:0,1) Tag block - Gen - 20 - (1:0,1) - Markup span - Gen - [ - [ - 12 - (6:0,6) - Markup span - Gen - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Symbols:4 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[foo]; - HtmlSymbolType.Equals;[=]; - HtmlSymbolType.SingleQuote;[']; + Markup span - Gen - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[foo]; + HtmlTokenType.Equals;[=]; + HtmlTokenType.SingleQuote;[']; Markup block - Gen - 2 - (12:0,12) - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - [def] - SpanEditHandler;Accepts:Any - (14:0,14) - Symbols:1 - HtmlSymbolType.Text;[def]; - Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (17:0,17) - Symbols:1 - HtmlSymbolType.SingleQuote;[']; - Markup span - Gen - [ />] - SpanEditHandler;Accepts:None - (18:0,18) - Symbols:3 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.CloseAngle;[>]; - Code span - Gen - [] - SpanEditHandler;Accepts:Any - (21:0,21) - Symbols:1 - CSharpSymbolType.Unknown;[]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (21:0,21) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - [def] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1 + HtmlTokenType.Text;[def]; + Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1 + HtmlTokenType.SingleQuote;[']; + Markup span - Gen - [ />] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:3 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.CloseAngle;[>]; + Code span - Gen - [] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1 + CSharpTokenType.Unknown;[]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.syntaxtree.txt index 2e2a371f2d..d7426b2aac 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.syntaxtree.txt @@ -1,31 +1,31 @@ Statement block - Gen - 22 - (0:0,0) - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 20 - (1:0,1) Tag block - Gen - 20 - (1:0,1) - Markup span - Gen - [ - [ - 12 - (6:0,6) - Markup span - Gen - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Symbols:4 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[foo]; - HtmlSymbolType.Equals;[=]; - HtmlSymbolType.SingleQuote;[']; - Markup span - Gen - [abc] - SpanEditHandler;Accepts:Any - (12:0,12) - Symbols:1 - HtmlSymbolType.Text;[abc]; + Markup span - Gen - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[foo]; + HtmlTokenType.Equals;[=]; + HtmlTokenType.SingleQuote;[']; + Markup span - Gen - [abc] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1 + HtmlTokenType.Text;[abc]; Markup block - Gen - 2 - (15:0,15) - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (16:0,16) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (17:0,17) - Symbols:1 - HtmlSymbolType.SingleQuote;[']; - Markup span - Gen - [ />] - SpanEditHandler;Accepts:None - (18:0,18) - Symbols:3 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.CloseAngle;[>]; - Code span - Gen - [] - SpanEditHandler;Accepts:Any - (21:0,21) - Symbols:1 - CSharpSymbolType.Unknown;[]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (21:0,21) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1 + HtmlTokenType.SingleQuote;[']; + Markup span - Gen - [ />] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:3 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.CloseAngle;[>]; + Code span - Gen - [] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1 + CSharpTokenType.Unknown;[]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.syntaxtree.txt index 4281b0f23e..6ec5d3f78a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.syntaxtree.txt @@ -1,35 +1,35 @@ Statement block - Gen - 27 - (0:0,0) - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 25 - (1:0,1) Tag block - Gen - 25 - (1:0,1) - Markup span - Gen - [ - [ - 17 - (6:0,6) - Markup span - Gen - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Symbols:4 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[foo]; - HtmlSymbolType.Equals;[=]; - HtmlSymbolType.SingleQuote;[']; - Markup span - Gen - [abc] - SpanEditHandler;Accepts:Any - (12:0,12) - Symbols:1 - HtmlSymbolType.Text;[abc]; + Markup span - Gen - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[foo]; + HtmlTokenType.Equals;[=]; + HtmlTokenType.SingleQuote;[']; + Markup span - Gen - [abc] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1 + HtmlTokenType.Text;[abc]; Markup block - Gen - 3 - (15:0,15) - Markup span - Gen - [ @] - SpanEditHandler;Accepts:None - (15:0,15) - Symbols:2 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Transition;[@]; - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (17:0,17) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - [ def] - SpanEditHandler;Accepts:Any - (18:0,18) - Symbols:2 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[def]; - Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (22:0,22) - Symbols:1 - HtmlSymbolType.SingleQuote;[']; - Markup span - Gen - [ />] - SpanEditHandler;Accepts:None - (23:0,23) - Symbols:3 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.CloseAngle;[>]; - Code span - Gen - [] - SpanEditHandler;Accepts:Any - (26:0,26) - Symbols:1 - CSharpSymbolType.Unknown;[]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (26:0,26) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Markup span - Gen - [ @] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:2 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Transition;[@]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - [ def] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:2 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[def]; + Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1 + HtmlTokenType.SingleQuote;[']; + Markup span - Gen - [ />] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:3 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.CloseAngle;[>]; + Code span - Gen - [] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:1 + CSharpTokenType.Unknown;[]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (26:0,26) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionInAttributeValue_DoesNotThrow.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionInAttributeValue_DoesNotThrow.syntaxtree.txt index fe93e1b8a3..89200d1412 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionInAttributeValue_DoesNotThrow.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionInAttributeValue_DoesNotThrow.syntaxtree.txt @@ -1,29 +1,29 @@ Statement block - Gen - 19 - (0:0,0) - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 17 - (1:0,1) Tag block - Gen - 17 - (1:0,1) - Markup span - Gen - [ - [ - 9 - (6:0,6) - Markup span - Gen - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Symbols:4 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[foo]; - HtmlSymbolType.Equals;[=]; - HtmlSymbolType.SingleQuote;[']; + Markup span - Gen - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[foo]; + HtmlTokenType.Equals;[=]; + HtmlTokenType.SingleQuote;[']; Markup block - Gen - 2 - (12:0,12) - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (14:0,14) - Symbols:1 - HtmlSymbolType.SingleQuote;[']; - Markup span - Gen - [ />] - SpanEditHandler;Accepts:None - (15:0,15) - Symbols:3 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.CloseAngle;[>]; - Code span - Gen - [] - SpanEditHandler;Accepts:Any - (18:0,18) - Symbols:1 - CSharpSymbolType.Unknown;[]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (18:0,18) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1 + HtmlTokenType.SingleQuote;[']; + Markup span - Gen - [ />] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:3 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.CloseAngle;[>]; + Code span - Gen - [] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1 + CSharpTokenType.Unknown;[]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionInEmail_DoesNotThrow.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionInEmail_DoesNotThrow.syntaxtree.txt index db745aa5c1..5ff6c98e4d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionInEmail_DoesNotThrow.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionInEmail_DoesNotThrow.syntaxtree.txt @@ -1,42 +1,42 @@ Statement block - Gen - 44 - (0:0,0) - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 42 - (1:0,1) Tag block - Gen - 42 - (1:0,1) - Markup span - Gen - [ - [ - 34 - (6:0,6) - Markup span - Gen - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Symbols:4 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[foo]; - HtmlSymbolType.Equals;[=]; - HtmlSymbolType.SingleQuote;[']; - Markup span - Gen - [abc@def.com] - SpanEditHandler;Accepts:Any - (12:0,12) - Symbols:1 - HtmlSymbolType.Text;[abc@def.com]; - Markup span - Gen - [ abc] - SpanEditHandler;Accepts:Any - (23:0,23) - Symbols:2 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[abc]; + Markup span - Gen - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[foo]; + HtmlTokenType.Equals;[=]; + HtmlTokenType.SingleQuote;[']; + Markup span - Gen - [abc@def.com] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1 + HtmlTokenType.Text;[abc@def.com]; + Markup span - Gen - [ abc] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:2 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[abc]; Markup block - Gen - 2 - (27:0,27) - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (27:0,27) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (28:0,28) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - [def.com] - SpanEditHandler;Accepts:Any - (29:0,29) - Symbols:1 - HtmlSymbolType.Text;[def.com]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (28:0,28) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - [def.com] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:1 + HtmlTokenType.Text;[def.com]; Markup block - Gen - 3 - (36:0,36) - Markup span - Gen - [ @] - SpanEditHandler;Accepts:None - (36:0,36) - Symbols:2 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Transition;[@]; - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (38:0,38) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (39:0,39) - Symbols:1 - HtmlSymbolType.SingleQuote;[']; - Markup span - Gen - [ />] - SpanEditHandler;Accepts:None - (40:0,40) - Symbols:3 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.CloseAngle;[>]; - Code span - Gen - [] - SpanEditHandler;Accepts:Any - (43:0,43) - Symbols:1 - CSharpSymbolType.Unknown;[]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (43:0,43) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Markup span - Gen - [ @] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:2 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Transition;[@]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (39:0,39) - Tokens:1 + HtmlTokenType.SingleQuote;[']; + Markup span - Gen - [ />] - SpanEditHandler;Accepts:None - (40:0,40) - Tokens:3 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.CloseAngle;[>]; + Code span - Gen - [] - SpanEditHandler;Accepts:Any - (43:0,43) - Tokens:1 + CSharpTokenType.Unknown;[]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (43:0,43) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionInRegex_DoesNotThrow.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionInRegex_DoesNotThrow.syntaxtree.txt index 3ac9e76d8a..ae6eb40508 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionInRegex_DoesNotThrow.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionInRegex_DoesNotThrow.syntaxtree.txt @@ -1,75 +1,75 @@ Statement block - Gen - 117 - (0:0,0) - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 115 - (1:0,1) Tag block - Gen - 115 - (1:0,1) - Markup span - Gen - [ - [ - 107 - (6:0,6) - Markup span - Gen - [ foo="] - SpanEditHandler;Accepts:Any - (6:0,6) - Symbols:4 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[foo]; - HtmlSymbolType.Equals;[=]; - HtmlSymbolType.DoubleQuote;["]; - Markup span - Gen - [/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+] - SpanEditHandler;Accepts:Any - (12:0,12) - Symbols:14 - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[^]; - HtmlSymbolType.LeftBracket;[[]; - HtmlSymbolType.Text;[a-z0-9]; - HtmlSymbolType.Bang;[!]; - HtmlSymbolType.Text;[#$%&]; - HtmlSymbolType.SingleQuote;[']; - HtmlSymbolType.Text;[*+\]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Equals;[=]; - HtmlSymbolType.QuestionMark;[?]; - HtmlSymbolType.Text;[^_`{|}~.-]; - HtmlSymbolType.RightBracket;[]]; - HtmlSymbolType.Text;[+]; + Markup span - Gen - [ foo="] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[foo]; + HtmlTokenType.Equals;[=]; + HtmlTokenType.DoubleQuote;["]; + Markup span - Gen - [/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:14 + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[^]; + HtmlTokenType.LeftBracket;[[]; + HtmlTokenType.Text;[a-z0-9]; + HtmlTokenType.Bang;[!]; + HtmlTokenType.Text;[#$%&]; + HtmlTokenType.SingleQuote;[']; + HtmlTokenType.Text;[*+\]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Equals;[=]; + HtmlTokenType.QuestionMark;[?]; + HtmlTokenType.Text;[^_`{|}~.-]; + HtmlTokenType.RightBracket;[]]; + HtmlTokenType.Text;[+]; Markup block - Gen - 2 - (44:0,44) - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (44:0,44) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (45:0,45) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - [[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i] - SpanEditHandler;Accepts:Any - (46:0,46) - Symbols:30 - HtmlSymbolType.LeftBracket;[[]; - HtmlSymbolType.Text;[a-z0-9]; - HtmlSymbolType.RightBracket;[]]; - HtmlSymbolType.Text;[(]; - HtmlSymbolType.LeftBracket;[[]; - HtmlSymbolType.Text;[a-z0-9-]; - HtmlSymbolType.RightBracket;[]]; - HtmlSymbolType.Text;[*]; - HtmlSymbolType.LeftBracket;[[]; - HtmlSymbolType.Text;[a-z0-9]; - HtmlSymbolType.RightBracket;[]]; - HtmlSymbolType.Text;[)]; - HtmlSymbolType.QuestionMark;[?]; - HtmlSymbolType.Text;[\.(]; - HtmlSymbolType.LeftBracket;[[]; - HtmlSymbolType.Text;[a-z0-9]; - HtmlSymbolType.RightBracket;[]]; - HtmlSymbolType.Text;[(]; - HtmlSymbolType.LeftBracket;[[]; - HtmlSymbolType.Text;[a-z0-9-]; - HtmlSymbolType.RightBracket;[]]; - HtmlSymbolType.Text;[*]; - HtmlSymbolType.LeftBracket;[[]; - HtmlSymbolType.Text;[a-z0-9]; - HtmlSymbolType.RightBracket;[]]; - HtmlSymbolType.Text;[)]; - HtmlSymbolType.QuestionMark;[?]; - HtmlSymbolType.Text;[)*$]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[i]; - Markup span - Gen - ["] - SpanEditHandler;Accepts:Any - (112:0,112) - Symbols:1 - HtmlSymbolType.DoubleQuote;["]; - Markup span - Gen - [ />] - SpanEditHandler;Accepts:None - (113:0,113) - Symbols:3 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.CloseAngle;[>]; - Code span - Gen - [] - SpanEditHandler;Accepts:Any - (116:0,116) - Symbols:1 - CSharpSymbolType.Unknown;[]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (116:0,116) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (44:0,44) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (45:0,45) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - [[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i] - SpanEditHandler;Accepts:Any - (46:0,46) - Tokens:30 + HtmlTokenType.LeftBracket;[[]; + HtmlTokenType.Text;[a-z0-9]; + HtmlTokenType.RightBracket;[]]; + HtmlTokenType.Text;[(]; + HtmlTokenType.LeftBracket;[[]; + HtmlTokenType.Text;[a-z0-9-]; + HtmlTokenType.RightBracket;[]]; + HtmlTokenType.Text;[*]; + HtmlTokenType.LeftBracket;[[]; + HtmlTokenType.Text;[a-z0-9]; + HtmlTokenType.RightBracket;[]]; + HtmlTokenType.Text;[)]; + HtmlTokenType.QuestionMark;[?]; + HtmlTokenType.Text;[\.(]; + HtmlTokenType.LeftBracket;[[]; + HtmlTokenType.Text;[a-z0-9]; + HtmlTokenType.RightBracket;[]]; + HtmlTokenType.Text;[(]; + HtmlTokenType.LeftBracket;[[]; + HtmlTokenType.Text;[a-z0-9-]; + HtmlTokenType.RightBracket;[]]; + HtmlTokenType.Text;[*]; + HtmlTokenType.LeftBracket;[[]; + HtmlTokenType.Text;[a-z0-9]; + HtmlTokenType.RightBracket;[]]; + HtmlTokenType.Text;[)]; + HtmlTokenType.QuestionMark;[?]; + HtmlTokenType.Text;[)*$]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[i]; + Markup span - Gen - ["] - SpanEditHandler;Accepts:Any - (112:0,112) - Tokens:1 + HtmlTokenType.DoubleQuote;["]; + Markup span - Gen - [ />] - SpanEditHandler;Accepts:None - (113:0,113) - Tokens:3 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.CloseAngle;[>]; + Code span - Gen - [] - SpanEditHandler;Accepts:Any - (116:0,116) - Tokens:1 + CSharpTokenType.Unknown;[]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (116:0,116) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionWithExpressionBlock_DoesNotThrow.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionWithExpressionBlock_DoesNotThrow.syntaxtree.txt index 52c3f384bb..c50182aa59 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionWithExpressionBlock_DoesNotThrow.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransitionWithExpressionBlock_DoesNotThrow.syntaxtree.txt @@ -1,144 +1,144 @@ Statement block - Gen - 120 - (0:0,0) - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 118 - (1:0,1) Tag block - Gen - 118 - (1:0,1) - Markup span - Gen - [ - [ - 15 - (6:0,6) - Markup span - Gen - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Symbols:4 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[foo]; - HtmlSymbolType.Equals;[=]; - HtmlSymbolType.SingleQuote;[']; + Markup span - Gen - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[foo]; + HtmlTokenType.Equals;[=]; + HtmlTokenType.SingleQuote;[']; Markup block - Gen - 2 - (12:0,12) - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Symbols:1 - HtmlSymbolType.Transition;[@]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1 + HtmlTokenType.Transition;[@]; Markup block - Gen - 6 - (14:0,14) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (14:0,14) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1 + HtmlTokenType.Unknown;[]; Expression block - Gen - 6 - (14:0,14) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (14:0,14) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (15:0,15) - Symbols:1 - CSharpSymbolType.LeftParenthesis;[(]; - Code span - Gen - [2+3] - SpanEditHandler;Accepts:Any - (16:0,16) - Symbols:3 - CSharpSymbolType.IntegerLiteral;[2]; - CSharpSymbolType.Plus;[+]; - CSharpSymbolType.IntegerLiteral;[3]; - MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (19:0,19) - Symbols:1 - CSharpSymbolType.RightParenthesis;[)]; - Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (20:0,20) - Symbols:1 - HtmlSymbolType.SingleQuote;[']; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1 + CSharpTokenType.LeftParenthesis;[(]; + Code span - Gen - [2+3] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:3 + CSharpTokenType.IntegerLiteral;[2]; + CSharpTokenType.Plus;[+]; + CSharpTokenType.IntegerLiteral;[3]; + MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:1 + CSharpTokenType.RightParenthesis;[)]; + Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:1 + HtmlTokenType.SingleQuote;[']; Markup block - Gen - 28 - (21:0,21) - Markup span - Gen - [ bar='] - SpanEditHandler;Accepts:Any - (21:0,21) - Symbols:4 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[bar]; - HtmlSymbolType.Equals;[=]; - HtmlSymbolType.SingleQuote;[']; + Markup span - Gen - [ bar='] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:4 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[bar]; + HtmlTokenType.Equals;[=]; + HtmlTokenType.SingleQuote;[']; Markup block - Gen - 6 - (27:0,27) Expression block - Gen - 6 - (27:0,27) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (27:0,27) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (28:0,28) - Symbols:1 - CSharpSymbolType.LeftParenthesis;[(]; - Code span - Gen - [2+3] - SpanEditHandler;Accepts:Any - (29:0,29) - Symbols:3 - CSharpSymbolType.IntegerLiteral;[2]; - CSharpSymbolType.Plus;[+]; - CSharpSymbolType.IntegerLiteral;[3]; - MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (32:0,32) - Symbols:1 - CSharpSymbolType.RightParenthesis;[)]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (28:0,28) - Tokens:1 + CSharpTokenType.LeftParenthesis;[(]; + Code span - Gen - [2+3] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:3 + CSharpTokenType.IntegerLiteral;[2]; + CSharpTokenType.Plus;[+]; + CSharpTokenType.IntegerLiteral;[3]; + MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:1 + CSharpTokenType.RightParenthesis;[)]; Markup block - Gen - 2 - (33:0,33) - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (33:0,33) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (34:0,34) - Symbols:1 - HtmlSymbolType.Transition;[@]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (33:0,33) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (34:0,34) - Tokens:1 + HtmlTokenType.Transition;[@]; Markup block - Gen - 13 - (35:0,35) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (35:0,35) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:1 + HtmlTokenType.Unknown;[]; Expression block - Gen - 13 - (35:0,35) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (35:0,35) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (36:0,36) - Symbols:3 - CSharpSymbolType.Identifier;[DateTime]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Now]; - Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (48:0,48) - Symbols:1 - HtmlSymbolType.SingleQuote;[']; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (35:0,35) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (36:0,36) - Tokens:3 + CSharpTokenType.Identifier;[DateTime]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Now]; + Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (48:0,48) - Tokens:1 + HtmlTokenType.SingleQuote;[']; Markup block - Gen - 22 - (49:0,49) - Markup span - Gen - [ baz='] - SpanEditHandler;Accepts:Any - (49:0,49) - Symbols:4 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[baz]; - HtmlSymbolType.Equals;[=]; - HtmlSymbolType.SingleQuote;[']; + Markup span - Gen - [ baz='] - SpanEditHandler;Accepts:Any - (49:0,49) - Tokens:4 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[baz]; + HtmlTokenType.Equals;[=]; + HtmlTokenType.SingleQuote;[']; Markup block - Gen - 13 - (55:0,55) Expression block - Gen - 13 - (55:0,55) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (55:0,55) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (56:0,56) - Symbols:3 - CSharpSymbolType.Identifier;[DateTime]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Now]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (55:0,55) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (56:0,56) - Tokens:3 + CSharpTokenType.Identifier;[DateTime]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Now]; Markup block - Gen - 2 - (68:0,68) - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (68:0,68) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (69:0,69) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (70:0,70) - Symbols:1 - HtmlSymbolType.SingleQuote;[']; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (68:0,68) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (69:0,69) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (70:0,70) - Tokens:1 + HtmlTokenType.SingleQuote;[']; Markup block - Gen - 23 - (71:0,71) - Markup span - Gen - [ bat='] - SpanEditHandler;Accepts:Any - (71:0,71) - Symbols:4 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[bat]; - HtmlSymbolType.Equals;[=]; - HtmlSymbolType.SingleQuote;[']; + Markup span - Gen - [ bat='] - SpanEditHandler;Accepts:Any - (71:0,71) - Tokens:4 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[bat]; + HtmlTokenType.Equals;[=]; + HtmlTokenType.SingleQuote;[']; Markup block - Gen - 13 - (77:0,77) Expression block - Gen - 13 - (77:0,77) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (77:0,77) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (78:0,78) - Symbols:3 - CSharpSymbolType.Identifier;[DateTime]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Now]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (77:0,77) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (78:0,78) - Tokens:3 + CSharpTokenType.Identifier;[DateTime]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Now]; Markup block - Gen - 3 - (90:0,90) - Markup span - Gen - [ @] - SpanEditHandler;Accepts:None - (90:0,90) - Symbols:2 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Transition;[@]; - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (92:0,92) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (93:0,93) - Symbols:1 - HtmlSymbolType.SingleQuote;[']; + Markup span - Gen - [ @] - SpanEditHandler;Accepts:None - (90:0,90) - Tokens:2 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Transition;[@]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (92:0,92) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (93:0,93) - Tokens:1 + HtmlTokenType.SingleQuote;[']; Markup block - Gen - 22 - (94:0,94) - Markup span - Gen - [ zoo='] - SpanEditHandler;Accepts:Any - (94:0,94) - Symbols:4 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[zoo]; - HtmlSymbolType.Equals;[=]; - HtmlSymbolType.SingleQuote;[']; + Markup span - Gen - [ zoo='] - SpanEditHandler;Accepts:Any - (94:0,94) - Tokens:4 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[zoo]; + HtmlTokenType.Equals;[=]; + HtmlTokenType.SingleQuote;[']; Markup block - Gen - 2 - (100:0,100) - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (100:0,100) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (101:0,101) - Symbols:1 - HtmlSymbolType.Transition;[@]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (100:0,100) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (101:0,101) - Tokens:1 + HtmlTokenType.Transition;[@]; Markup block - Gen - 13 - (102:0,102) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (102:0,102) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (102:0,102) - Tokens:1 + HtmlTokenType.Unknown;[]; Expression block - Gen - 13 - (102:0,102) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (102:0,102) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (103:0,103) - Symbols:3 - CSharpSymbolType.Identifier;[DateTime]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Now]; - Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (115:0,115) - Symbols:1 - HtmlSymbolType.SingleQuote;[']; - Markup span - Gen - [ />] - SpanEditHandler;Accepts:None - (116:0,116) - Symbols:3 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.CloseAngle;[>]; - Code span - Gen - [] - SpanEditHandler;Accepts:Any - (119:0,119) - Symbols:1 - CSharpSymbolType.Unknown;[]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (119:0,119) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (102:0,102) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (103:0,103) - Tokens:3 + CSharpTokenType.Identifier;[DateTime]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Now]; + Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (115:0,115) - Tokens:1 + HtmlTokenType.SingleQuote;[']; + Markup span - Gen - [ />] - SpanEditHandler;Accepts:None - (116:0,116) - Tokens:3 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.CloseAngle;[>]; + Code span - Gen - [] - SpanEditHandler;Accepts:Any - (119:0,119) - Tokens:1 + CSharpTokenType.Unknown;[]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (119:0,119) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransition_EndOfFile_Throws.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransition_EndOfFile_Throws.syntaxtree.txt index 9fbfa723b7..2f4c6d6bfd 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransition_EndOfFile_Throws.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithDoubleTransition_EndOfFile_Throws.syntaxtree.txt @@ -1,21 +1,21 @@ Statement block - Gen - 14 - (0:0,0) - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 13 - (1:0,1) Tag block - Gen - 13 - (1:0,1) - Markup span - Gen - [ - [ - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[foo]; + HtmlTokenType.Equals;[=]; + HtmlTokenType.SingleQuote;[']; Markup block - Gen - 2 - (12:0,12) - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (14:0,14) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithUnexpectedTransitionsInAttributeValue_Throws.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithUnexpectedTransitionsInAttributeValue_Throws.syntaxtree.txt index 6a84c3a982..cfd73bfa96 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithUnexpectedTransitionsInAttributeValue_Throws.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParseBlock_WithUnexpectedTransitionsInAttributeValue_Throws.syntaxtree.txt @@ -1,38 +1,38 @@ Statement block - Gen - 20 - (0:0,0) - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 18 - (1:0,1) Tag block - Gen - 18 - (1:0,1) - Markup span - Gen - [ - [ - 10 - (6:0,6) - Markup span - Gen - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Symbols:4 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[foo]; - HtmlSymbolType.Equals;[=]; - HtmlSymbolType.SingleQuote;[']; + Markup span - Gen - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[foo]; + HtmlTokenType.Equals;[=]; + HtmlTokenType.SingleQuote;[']; Markup block - Gen - 1 - (12:0,12) Expression block - Gen - 1 - (12:0,12) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (13:0,13) - Symbols:1 - CSharpSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (13:0,13) - Tokens:1 + CSharpTokenType.Unknown;[]; Markup block - Gen - 2 - (13:0,13) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (13:0,13) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Expression block - Gen - 1 - (14:0,14) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (14:0,14) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (15:0,15) - Symbols:1 - CSharpSymbolType.Unknown;[]; - Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (15:0,15) - Symbols:1 - HtmlSymbolType.SingleQuote;[']; - Markup span - Gen - [ />] - SpanEditHandler;Accepts:None - (16:0,16) - Symbols:3 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.CloseAngle;[>]; - Code span - Gen - [] - SpanEditHandler;Accepts:Any - (19:0,19) - Symbols:1 - CSharpSymbolType.Unknown;[]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (19:0,19) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (15:0,15) - Tokens:1 + CSharpTokenType.Unknown;[]; + Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1 + HtmlTokenType.SingleQuote;[']; + Markup span - Gen - [ />] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:3 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.CloseAngle;[>]; + Code span - Gen - [] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:1 + CSharpTokenType.Unknown;[]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.syntaxtree.txt index b04759cfbd..13ca10275e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.syntaxtree.txt @@ -1,179 +1,179 @@ Statement block - Gen - 351 - (0:0,0) - Code span - Gen - [foreach(var c in db.Categories) {LF] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:15 - CSharpSymbolType.Keyword;[foreach]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[c]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[in]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[db]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Categories]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; + Code span - Gen - [foreach(var c in db.Categories) {LF] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:15 + CSharpTokenType.Keyword;[foreach]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[c]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[in]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[db]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Categories]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; Markup block - Gen - 307 - (35:1,0) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (35:1,0) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (35:1,0) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 5 - (47:1,12) - Markup span - Gen - [
] - SpanEditHandler;Accepts:None - (47:1,12) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[div]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [LF ] - SpanEditHandler;Accepts:Any - (52:1,17) - Symbols:2 - HtmlSymbolType.NewLine;[LF]; - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [
] - SpanEditHandler;Accepts:None - (47:1,12) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[div]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [LF ] - SpanEditHandler;Accepts:Any - (52:1,17) - Tokens:2 + HtmlTokenType.NewLine;[LF]; + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 4 - (70:2,16) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (70:2,16) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[h1]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (74:2,20) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (70:2,16) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[h1]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (74:2,20) - Tokens:1 + HtmlTokenType.Unknown;[]; Expression block - Gen - 7 - (74:2,20) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (74:2,20) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [c.Name] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (75:2,21) - Symbols:3 - CSharpSymbolType.Identifier;[c]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Name]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (74:2,20) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [c.Name] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (75:2,21) - Tokens:3 + CSharpTokenType.Identifier;[c]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Name]; Tag block - Gen - 5 - (81:2,27) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (81:2,27) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[h1]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [LF ] - SpanEditHandler;Accepts:Any - (86:2,32) - Symbols:2 - HtmlSymbolType.NewLine;[LF]; - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (81:2,27) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[h1]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [LF ] - SpanEditHandler;Accepts:Any - (86:2,32) - Tokens:2 + HtmlTokenType.NewLine;[LF]; + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 4 - (104:3,16) - Markup span - Gen - [
    ] - SpanEditHandler;Accepts:None - (104:3,16) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[ul]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (108:3,20) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; + Markup span - Gen - [
      ] - SpanEditHandler;Accepts:None - (104:3,16) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[ul]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (108:3,20) - Tokens:1 + HtmlTokenType.NewLine;[LF]; Statement block - Gen - 189 - (110:4,0) - Code span - Gen - [ ] - SpanEditHandler;Accepts:Any - (110:4,0) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (130:4,20) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foreach(var p in c.Products) {LF] - SpanEditHandler;Accepts:Any - (131:4,21) - Symbols:15 - CSharpSymbolType.Keyword;[foreach]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[p]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[in]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[c]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Products]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:Any - (110:4,0) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (130:4,20) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foreach(var p in c.Products) {LF] - SpanEditHandler;Accepts:Any - (131:4,21) - Tokens:15 + CSharpTokenType.Keyword;[foreach]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[p]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[in]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[c]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Products]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; Markup block - Gen - 113 - (163:5,0) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (163:5,0) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (163:5,0) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 4 - (187:5,24) - Markup span - Gen - [
    • ] - SpanEditHandler;Accepts:None - (187:5,24) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[li]; - HtmlSymbolType.CloseAngle;[>]; + Markup span - Gen - [
    • ] - SpanEditHandler;Accepts:None - (187:5,24) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[li]; + HtmlTokenType.CloseAngle;[>]; Tag block - Gen - 67 - (191:5,28) - Markup span - Gen - [ - [ - 64 - (193:5,30) - Markup span - Gen - [ href="] - SpanEditHandler;Accepts:Any - (193:5,30) - Symbols:4 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[href]; - HtmlSymbolType.Equals;[=]; - HtmlSymbolType.DoubleQuote;["]; + Markup span - Gen - [ href="] - SpanEditHandler;Accepts:Any - (193:5,30) - Tokens:4 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[href]; + HtmlTokenType.Equals;[=]; + HtmlTokenType.DoubleQuote;["]; Markup block - Gen - 56 - (200:5,37) Expression block - Gen - 56 - (200:5,37) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (200:5,37) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [Html.ActionUrl("Products", "Detail", new { id = p.Id })] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (201:5,38) - Symbols:24 - CSharpSymbolType.Identifier;[Html]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[ActionUrl]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;["Products"]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["Detail"]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[id]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[p]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Id]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.RightParenthesis;[)]; - Markup span - Gen - ["] - SpanEditHandler;Accepts:Any - (256:5,93) - Symbols:1 - HtmlSymbolType.DoubleQuote;["]; - Markup span - Gen - [>] - SpanEditHandler;Accepts:None - (257:5,94) - Symbols:1 - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (258:5,95) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (200:5,37) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [Html.ActionUrl("Products", "Detail", new { id = p.Id })] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (201:5,38) - Tokens:24 + CSharpTokenType.Identifier;[Html]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[ActionUrl]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;["Products"]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["Detail"]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[id]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[p]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Id]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.RightParenthesis;[)]; + Markup span - Gen - ["] - SpanEditHandler;Accepts:Any - (256:5,93) - Tokens:1 + HtmlTokenType.DoubleQuote;["]; + Markup span - Gen - [>] - SpanEditHandler;Accepts:None - (257:5,94) - Tokens:1 + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (258:5,95) - Tokens:1 + HtmlTokenType.Unknown;[]; Expression block - Gen - 7 - (258:5,95) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (258:5,95) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [p.Name] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (259:5,96) - Symbols:3 - CSharpSymbolType.Identifier;[p]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Name]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (258:5,95) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [p.Name] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (259:5,96) - Tokens:3 + CSharpTokenType.Identifier;[p]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Name]; Tag block - Gen - 4 - (265:5,102) - Markup span - Gen - [] - SpanEditHandler;Accepts:None - (265:5,102) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[a]; - HtmlSymbolType.CloseAngle;[>]; + Markup span - Gen - [] - SpanEditHandler;Accepts:None - (265:5,102) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[a]; + HtmlTokenType.CloseAngle;[>]; Tag block - Gen - 5 - (269:5,106) - Markup span - Gen - [
      • ] - SpanEditHandler;Accepts:None - (269:5,106) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[li]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:None - (274:5,111) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; - Code span - Gen - [ }LF] - SpanEditHandler;Accepts:None - (276:6,0) - Symbols:3 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.NewLine;[LF]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (299:7,0) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [] - SpanEditHandler;Accepts:None - (269:5,106) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[li]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:None - (274:5,111) - Tokens:1 + HtmlTokenType.NewLine;[LF]; + Code span - Gen - [ }LF] - SpanEditHandler;Accepts:None - (276:6,0) - Tokens:3 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.NewLine;[LF]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (299:7,0) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 5 - (315:7,16) - Markup span - Gen - [
    ] - SpanEditHandler;Accepts:None - (315:7,16) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[ul]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [LF ] - SpanEditHandler;Accepts:Any - (320:7,21) - Symbols:2 - HtmlSymbolType.NewLine;[LF]; - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [
] - SpanEditHandler;Accepts:None - (315:7,16) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[ul]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [LF ] - SpanEditHandler;Accepts:Any - (320:7,21) - Tokens:2 + HtmlTokenType.NewLine;[LF]; + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 6 - (334:8,12) - Markup span - Gen - [
] - SpanEditHandler;Accepts:None - (334:8,12) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[div]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:None - (340:8,18) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; - Code span - Gen - [ }] - SpanEditHandler;Accepts:None - (342:9,0) - Symbols:2 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Markup span - Gen - [
] - SpanEditHandler;Accepts:None - (334:8,12) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[div]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:None - (340:8,18) - Tokens:1 + HtmlTokenType.NewLine;[LF]; + Code span - Gen - [ }] - SpanEditHandler;Accepts:None - (342:9,0) - Tokens:2 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt index fc53232ee5..0b3a224f4b 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt @@ -1,10 +1,10 @@ Directive block - Gen - 18 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[addTagHelper]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [Foo"] - SpanEditHandler;Accepts:AnyExceptNewline - (14:0,14) - Symbols:2 - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.StringLiteral;["];RZ1000(17:0,17 [1] ) + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[addTagHelper]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [Foo"] - SpanEditHandler;Accepts:AnyExceptNewline - (14:0,14) - Tokens:2 + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.StringLiteral;["];RZ1000(17:0,17 [1] ) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.syntaxtree.txt index ac63a091e5..138d746a0d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_InvalidLookupText_AddsError.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 17 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[addTagHelper]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [Foo] - SpanEditHandler;Accepts:AnyExceptNewline - (14:0,14) - Symbols:1 - CSharpSymbolType.Identifier;[Foo]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[addTagHelper]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [Foo] - SpanEditHandler;Accepts:AnyExceptNewline - (14:0,14) - Tokens:1 + CSharpTokenType.Identifier;[Foo]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_NoValue_Invalid.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_NoValue_Invalid.syntaxtree.txt index a4e6973dbf..9f107f20c1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_NoValue_Invalid.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_NoValue_Invalid.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 16 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[addTagHelper]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [""] - SpanEditHandler;Accepts:AnyExceptNewline - (14:0,14) - Symbols:1 - CSharpSymbolType.StringLiteral;[""]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[addTagHelper]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [""] - SpanEditHandler;Accepts:AnyExceptNewline - (14:0,14) - Tokens:1 + CSharpTokenType.StringLiteral;[""]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_RequiresValue.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_RequiresValue.syntaxtree.txt index 9b9645b0bc..56dc421136 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_RequiresValue.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_RequiresValue.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 14 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[addTagHelper]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [] - SpanEditHandler;Accepts:AnyExceptNewline - (14:0,14) - Symbols:1 - CSharpSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[addTagHelper]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [] - SpanEditHandler;Accepts:AnyExceptNewline - (14:0,14) - Tokens:1 + CSharpTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.syntaxtree.txt index 024067cf7f..e6d7ba0e8f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_SingleQuotes_AddsError.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 22 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[addTagHelper]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ['*, Foo'] - SpanEditHandler;Accepts:AnyExceptNewline - (14:0,14) - Symbols:1 - CSharpSymbolType.CharacterLiteral;['*, Foo']; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[addTagHelper]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ['*, Foo'] - SpanEditHandler;Accepts:AnyExceptNewline - (14:0,14) - Tokens:1 + CSharpTokenType.CharacterLiteral;['*, Foo']; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt index 7a20f4a3d2..817474e23d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 18 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[addTagHelper]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ["Foo] - SpanEditHandler;Accepts:AnyExceptNewline - (14:0,14) - Symbols:1 - CSharpSymbolType.StringLiteral;["Foo];RZ1000(14:0,14 [1] ) + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[addTagHelper]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ["Foo] - SpanEditHandler;Accepts:AnyExceptNewline - (14:0,14) - Tokens:1 + CSharpTokenType.StringLiteral;["Foo];RZ1000(14:0,14 [1] ) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_SupportsSpaces.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_SupportsSpaces.syntaxtree.txt index 1d35dbf548..7b55abb278 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_SupportsSpaces.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_SupportsSpaces.syntaxtree.txt @@ -1,13 +1,13 @@ Directive block - Gen - 32 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[addTagHelper]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [Foo, Bar ] - SpanEditHandler;Accepts:AnyExceptNewline - (18:0,18) - Symbols:5 - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[addTagHelper]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [Foo, Bar ] - SpanEditHandler;Accepts:AnyExceptNewline - (18:0,18) - Tokens:5 + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.syntaxtree.txt index 05946a28f1..e009495ff2 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/AddTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 19 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[addTagHelper]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ["Foo"] - SpanEditHandler;Accepts:AnyExceptNewline - (14:0,14) - Symbols:1 - CSharpSymbolType.StringLiteral;["Foo"]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [addTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[addTagHelper]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ["Foo"] - SpanEditHandler;Accepts:AnyExceptNewline - (14:0,14) - Tokens:1 + CSharpTokenType.StringLiteral;["Foo"]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.syntaxtree.txt index f815cae43f..642f0611e8 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/BuiltInDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.syntaxtree.txt @@ -1,12 +1,12 @@ Directive block - Gen - 26 - (0:0,0) - Code span - Gen - [LF ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:2 - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (4:1,2) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [addTagHelper] - SpanEditHandler;Accepts:None - (5:1,3) - Symbols:1 - CSharpSymbolType.Identifier;[addTagHelper]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (17:1,15) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ["*, Foo"] - SpanEditHandler;Accepts:AnyExceptNewline - (18:1,16) - Symbols:1 - CSharpSymbolType.StringLiteral;["*, Foo"]; + Code span - Gen - [LF ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2 + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (4:1,2) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [addTagHelper] - SpanEditHandler;Accepts:None - (5:1,3) - Tokens:1 + CSharpTokenType.Identifier;[addTagHelper]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (17:1,15) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ["*, Foo"] - SpanEditHandler;Accepts:AnyExceptNewline - (18:1,16) - Tokens:1 + CSharpTokenType.StringLiteral;["*, Foo"]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.syntaxtree.txt index 643b8672af..2d4ada75c3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/BuiltInDirectiveErrorsIfNotAtStartOfLine.syntaxtree.txt @@ -1,18 +1,18 @@ Statement block - Gen - 28 - (0:0,0) - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [ ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (1:0,1) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [ ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (1:0,1) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; Directive block - Gen - 22 - (3:0,3) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (3:0,3) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [addTagHelper] - SpanEditHandler;Accepts:None - (4:0,4) - Symbols:1 - CSharpSymbolType.Identifier;[addTagHelper]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ["*, Foo"] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Symbols:1 - CSharpSymbolType.StringLiteral;["*, Foo"]; - Code span - Gen - [LF] - SpanEditHandler;Accepts:Any - (25:0,25) - Symbols:1 - CSharpSymbolType.NewLine;[LF]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (27:1,0) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [addTagHelper] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:1 + CSharpTokenType.Identifier;[addTagHelper]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ["*, Foo"] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1 + CSharpTokenType.StringLiteral;["*, Foo"]; + Code span - Gen - [LF] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1 + CSharpTokenType.NewLine;[LF]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (27:1,0) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.syntaxtree.txt index 8f506b7941..9c4daa1e93 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsNullableTypes.syntaxtree.txt @@ -1,71 +1,71 @@ Directive block - Gen - 176 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [string?] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:2 - CSharpSymbolType.Keyword;[string]; - CSharpSymbolType.QuestionMark;[?]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (15:0,15) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [string?[]] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (16:0,16) - Symbols:4 - CSharpSymbolType.Keyword;[string]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.RightBracket;[]]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (25:0,25) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [global::System.Int32?] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (26:0,26) - Symbols:6 - CSharpSymbolType.Identifier;[global]; - CSharpSymbolType.DoubleColon;[::]; - CSharpSymbolType.Identifier;[System]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Int32]; - CSharpSymbolType.QuestionMark;[?]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (47:0,47) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [KeyValuePair?] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (48:0,48) - Symbols:8 - CSharpSymbolType.Identifier;[KeyValuePair]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.Keyword;[string]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[string]; - CSharpSymbolType.GreaterThan;[>]; - CSharpSymbolType.QuestionMark;[?]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (77:0,77) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [KeyValuePair?[]] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (78:0,78) - Symbols:10 - CSharpSymbolType.Identifier;[KeyValuePair]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.Keyword;[string]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[string]; - CSharpSymbolType.GreaterThan;[>]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.RightBracket;[]]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (109:0,109) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [global::System.Collections.Generic.KeyValuePair?[]] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (110:0,110) - Symbols:18 - CSharpSymbolType.Identifier;[global]; - CSharpSymbolType.DoubleColon;[::]; - CSharpSymbolType.Identifier;[System]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Collections]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Generic]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[KeyValuePair]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.Keyword;[string]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[string]; - CSharpSymbolType.GreaterThan;[>]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.RightBracket;[]]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [string?] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:2 + CSharpTokenType.Keyword;[string]; + CSharpTokenType.QuestionMark;[?]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (15:0,15) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [string?[]] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (16:0,16) - Tokens:4 + CSharpTokenType.Keyword;[string]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.RightBracket;[]]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (25:0,25) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [global::System.Int32?] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (26:0,26) - Tokens:6 + CSharpTokenType.Identifier;[global]; + CSharpTokenType.DoubleColon;[::]; + CSharpTokenType.Identifier;[System]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Int32]; + CSharpTokenType.QuestionMark;[?]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (47:0,47) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [KeyValuePair?] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (48:0,48) - Tokens:8 + CSharpTokenType.Identifier;[KeyValuePair]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.Keyword;[string]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[string]; + CSharpTokenType.GreaterThan;[>]; + CSharpTokenType.QuestionMark;[?]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (77:0,77) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [KeyValuePair?[]] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (78:0,78) - Tokens:10 + CSharpTokenType.Identifier;[KeyValuePair]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.Keyword;[string]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[string]; + CSharpTokenType.GreaterThan;[>]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.RightBracket;[]]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (109:0,109) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [global::System.Collections.Generic.KeyValuePair?[]] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (110:0,110) - Tokens:18 + CSharpTokenType.Identifier;[global]; + CSharpTokenType.DoubleColon;[::]; + CSharpTokenType.Identifier;[System]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Collections]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Generic]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[KeyValuePair]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.Keyword;[string]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[string]; + CSharpTokenType.GreaterThan;[>]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.RightBracket;[]]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.syntaxtree.txt index 145e46c8f5..f9e21e7409 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsTupleTypes.syntaxtree.txt @@ -1,155 +1,155 @@ Directive block - Gen - 246 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [(bool, int)] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:6 - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[bool]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.RightParenthesis;[)]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (19:0,19) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [(int aa, string bb)?] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (20:0,20) - Symbols:11 - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[aa]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[string]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bb]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.QuestionMark;[?]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (40:0,40) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [( int? q , bool w )] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (41:0,41) - Symbols:14 - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[q]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[bool]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[w]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightParenthesis;[)]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (70:0,70) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [( int ? q, bool ?w ,(long ? [])) ?] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (71:0,71) - Symbols:26 - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[q]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[bool]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.Identifier;[w]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[long]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.RightBracket;[]]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.QuestionMark;[?]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (108:0,108) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [(List<(int, string)?> aa, string bb)] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (109:0,109) - Symbols:19 - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[List]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[string]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.GreaterThan;[>]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[aa]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[string]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bb]; - CSharpSymbolType.RightParenthesis;[)]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (145:0,145) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [(string ss, (int u, List<(string, int)> k, (Char c, bool b, List l)), global::System.Int32[] a)] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (146:0,146) - Symbols:56 - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[string]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[ss]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[u]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[List]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[string]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.GreaterThan;[>]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[k]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Char]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[c]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[bool]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[b]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[List]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.GreaterThan;[>]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[l]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[global]; - CSharpSymbolType.DoubleColon;[::]; - CSharpSymbolType.Identifier;[System]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Int32]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.RightBracket;[]]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[a]; - CSharpSymbolType.RightParenthesis;[)]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [(bool, int)] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:6 + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[bool]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.RightParenthesis;[)]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (19:0,19) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [(int aa, string bb)?] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (20:0,20) - Tokens:11 + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[aa]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[string]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bb]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.QuestionMark;[?]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (40:0,40) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [( int? q , bool w )] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (41:0,41) - Tokens:14 + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[q]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[bool]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[w]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightParenthesis;[)]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (70:0,70) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [( int ? q, bool ?w ,(long ? [])) ?] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (71:0,71) - Tokens:26 + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[q]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[bool]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.Identifier;[w]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[long]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.RightBracket;[]]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.QuestionMark;[?]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (108:0,108) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [(List<(int, string)?> aa, string bb)] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (109:0,109) - Tokens:19 + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[List]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[string]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.GreaterThan;[>]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[aa]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[string]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bb]; + CSharpTokenType.RightParenthesis;[)]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (145:0,145) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [(string ss, (int u, List<(string, int)> k, (Char c, bool b, List l)), global::System.Int32[] a)] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (146:0,146) - Tokens:56 + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[string]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[ss]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[u]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[List]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[string]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.GreaterThan;[>]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[k]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Char]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[c]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[bool]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[b]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[List]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.GreaterThan;[>]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[l]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[global]; + CSharpTokenType.DoubleColon;[::]; + CSharpTokenType.Identifier;[System]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Int32]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.RightBracket;[]]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[a]; + CSharpTokenType.RightParenthesis;[)]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.syntaxtree.txt index 26e92614c8..6116fb54b7 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsTupleTypes_IgnoresTrailingWhitespace.syntaxtree.txt @@ -1,17 +1,17 @@ Directive block - Gen - 23 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [(bool, int?)] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:7 - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[bool]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.RightParenthesis;[)]; - None span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (20:0,20) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [(bool, int?)] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:7 + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[bool]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.RightParenthesis;[)]; + None span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (20:0,20) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.syntaxtree.txt index 7760373adf..28cca39386 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_AllowsWhiteSpaceAroundTokens.syntaxtree.txt @@ -1,21 +1,21 @@ Directive block - Gen - 67 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (11:0,11) - Symbols:7 - CSharpSymbolType.Identifier;[System]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Text]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Encoding]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[ASCIIEncoding]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (45:0,45) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [Some_Member] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (52:0,52) - Symbols:1 - CSharpSymbolType.Identifier;[Some_Member]; - None span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (63:0,63) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (11:0,11) - Tokens:7 + CSharpTokenType.Identifier;[System]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Text]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Encoding]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[ASCIIEncoding]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (45:0,45) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [Some_Member] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (52:0,52) - Tokens:1 + CSharpTokenType.Identifier;[Some_Member]; + None span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (63:0,63) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.syntaxtree.txt index 7f3f2d08f1..1fee4f1796 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleEOFIncompleteNamespaceTokens.syntaxtree.txt @@ -1,7 +1,7 @@ Directive block - Gen - 8 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.syntaxtree.txt index 7f3f2d08f1..1fee4f1796 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleEOFInvalidNamespaceTokens.syntaxtree.txt @@ -1,7 +1,7 @@ Directive block - Gen - 8 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.syntaxtree.txt index 7f3f2d08f1..1fee4f1796 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleIncompleteNamespaceTokens.syntaxtree.txt @@ -1,7 +1,7 @@ Directive block - Gen - 8 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.syntaxtree.txt index 7f3f2d08f1..1fee4f1796 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_CanHandleInvalidNamespaceTokens.syntaxtree.txt @@ -1,7 +1,7 @@ Directive block - Gen - 8 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.syntaxtree.txt index 39f9d5c8b7..b108f825f7 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsExtraContentAfterDirective.syntaxtree.txt @@ -1,11 +1,11 @@ Directive block - Gen - 16 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ["hello"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.StringLiteral;["hello"]; - None span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (15:0,15) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ["hello"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.StringLiteral;["hello"]; + None span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (15:0,15) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.syntaxtree.txt index 597a610805..66c8f9e22b 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsForInvalidMemberTokens.syntaxtree.txt @@ -1,7 +1,7 @@ Directive block - Gen - 8 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.syntaxtree.txt index a628e80225..785e17335e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenEOFBeforeDirectiveBlockStart.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 15 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ["Hello"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.StringLiteral;["Hello"]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ["Hello"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.StringLiteral;["Hello"]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.syntaxtree.txt index 8ca507c746..d4346b5102 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenExtraContentBeforeBlockStart.syntaxtree.txt @@ -1,11 +1,11 @@ Directive block - Gen - 16 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ["Hello"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.StringLiteral;["Hello"]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (15:0,15) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ["Hello"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.StringLiteral;["Hello"]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (15:0,15) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.syntaxtree.txt index 3e161f55f1..15be232395 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_ErrorsWhenMissingEndBrace.syntaxtree.txt @@ -1,15 +1,15 @@ Directive block - Gen - 17 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ["Hello"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.StringLiteral;["Hello"]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (15:0,15) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (16:0,16) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [] - CodeBlockEditHandler;Accepts:Any;CodeBlock - (17:0,17) - Symbols:1 - CSharpSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ["Hello"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.StringLiteral;["Hello"]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (15:0,15) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (16:0,16) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [] - CodeBlockEditHandler;Accepts:Any;CodeBlock - (17:0,17) - Tokens:1 + CSharpTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.syntaxtree.txt index b281cea5c2..f9f16307e7 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScopedMultipleOccurring_CanHaveDuplicates.syntaxtree.txt @@ -1,39 +1,39 @@ Markup block - Gen - 85 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 44 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:7 - CSharpSymbolType.Identifier;[System]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Text]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Encoding]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[ASCIIEncoding]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:WhiteSpace - (42:0,42) - Symbols:1 - CSharpSymbolType.NewLine;[LF]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (44:1,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:7 + CSharpTokenType.Identifier;[System]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Text]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Encoding]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[ASCIIEncoding]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:WhiteSpace - (42:0,42) - Tokens:1 + CSharpTokenType.NewLine;[LF]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (44:1,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 41 - (44:1,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (44:1,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (45:1,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (51:1,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [System.Text.Encoding.UTF8Encoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (52:1,8) - Symbols:7 - CSharpSymbolType.Identifier;[System]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Text]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Encoding]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[UTF8Encoding]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (85:1,41) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (44:1,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (45:1,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (51:1,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [System.Text.Encoding.UTF8Encoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (52:1,8) - Tokens:7 + CSharpTokenType.Identifier;[System]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Text]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Encoding]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[UTF8Encoding]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (85:1,41) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.syntaxtree.txt index d2ca19ae10..ed97532104 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScopedSinglyOccurring_ErrorsIfDuplicate.syntaxtree.txt @@ -1,39 +1,39 @@ Markup block - Gen - 85 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 44 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:7 - CSharpSymbolType.Identifier;[System]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Text]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Encoding]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[ASCIIEncoding]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:WhiteSpace - (42:0,42) - Symbols:1 - CSharpSymbolType.NewLine;[LF]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (44:1,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:7 + CSharpTokenType.Identifier;[System]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Text]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Encoding]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[ASCIIEncoding]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:WhiteSpace - (42:0,42) - Tokens:1 + CSharpTokenType.NewLine;[LF]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (44:1,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 41 - (44:1,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (44:1,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (45:1,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (51:1,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [System.Text.Encoding.UTF8Encoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (52:1,8) - Symbols:7 - CSharpSymbolType.Identifier;[System]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Text]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Encoding]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[UTF8Encoding]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (85:1,41) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (44:1,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (45:1,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (51:1,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [System.Text.Encoding.UTF8Encoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (52:1,8) - Tokens:7 + CSharpTokenType.Identifier;[System]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Text]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Encoding]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[UTF8Encoding]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (85:1,41) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.syntaxtree.txt index 4a45dee1b5..dabeb41382 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherDirectives.syntaxtree.txt @@ -1,33 +1,33 @@ Markup block - Gen - 59 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 44 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:7 - CSharpSymbolType.Identifier;[System]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Text]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Encoding]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[ASCIIEncoding]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:WhiteSpace - (42:0,42) - Symbols:1 - CSharpSymbolType.NewLine;[LF]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (44:1,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:7 + CSharpTokenType.Identifier;[System]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Text]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Encoding]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[ASCIIEncoding]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:WhiteSpace - (42:0,42) - Tokens:1 + CSharpTokenType.NewLine;[LF]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (44:1,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 15 - (44:1,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (44:1,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [something] - SpanEditHandler;Accepts:None - (45:1,1) - Symbols:1 - CSharpSymbolType.Identifier;[something]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (54:1,10) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [Else] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (55:1,11) - Symbols:1 - CSharpSymbolType.Identifier;[Else]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (59:1,15) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (44:1,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [something] - SpanEditHandler;Accepts:None - (45:1,1) - Tokens:1 + CSharpTokenType.Identifier;[something]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (54:1,10) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [Else] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (55:1,11) - Tokens:1 + CSharpTokenType.Identifier;[Else]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (59:1,15) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.syntaxtree.txt index eb2a5f3250..203fd7aee0 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.syntaxtree.txt @@ -1,65 +1,65 @@ Markup block - Gen - 130 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Comment block - Gen - 43 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [ There are two directives beneath this ] - SpanEditHandler;Accepts:Any - (2:0,2) - Symbols:1 - HtmlSymbolType.RazorComment;[ There are two directives beneath this ]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (41:0,41) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (42:0,42) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (43:0,43) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Comment span - Gen - [ There are two directives beneath this ] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1 + HtmlTokenType.RazorComment;[ There are two directives beneath this ]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (41:0,41) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (42:0,42) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (43:0,43) - Tokens:1 + HtmlTokenType.NewLine;[LF]; Directive block - Gen - 44 - (45:1,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (45:1,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (46:1,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (52:1,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (53:1,8) - Symbols:7 - CSharpSymbolType.Identifier;[System]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Text]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Encoding]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[ASCIIEncoding]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:WhiteSpace - (87:1,42) - Symbols:1 - CSharpSymbolType.NewLine;[LF]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (89:2,0) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (45:1,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (46:1,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (52:1,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (53:1,8) - Tokens:7 + CSharpTokenType.Identifier;[System]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Text]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Encoding]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[ASCIIEncoding]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:WhiteSpace - (87:1,42) - Tokens:1 + CSharpTokenType.NewLine;[LF]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (89:2,0) - Tokens:1 + HtmlTokenType.NewLine;[LF]; Directive block - Gen - 17 - (91:3,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (91:3,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [something] - SpanEditHandler;Accepts:None - (92:3,1) - Symbols:1 - CSharpSymbolType.Identifier;[something]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (101:3,10) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [Else] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (102:3,11) - Symbols:1 - CSharpSymbolType.Identifier;[Else]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:WhiteSpace - (106:3,15) - Symbols:1 - CSharpSymbolType.NewLine;[LF]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (108:4,0) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (91:3,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [something] - SpanEditHandler;Accepts:None - (92:3,1) - Tokens:1 + CSharpTokenType.Identifier;[something]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (101:3,10) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [Else] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (102:3,11) - Tokens:1 + CSharpTokenType.Identifier;[Else]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:WhiteSpace - (106:3,15) - Tokens:1 + CSharpTokenType.NewLine;[LF]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (108:4,0) - Tokens:1 + HtmlTokenType.NewLine;[LF]; Tag block - Gen - 3 - (110:5,0) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (110:5,0) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [This is extra] - SpanEditHandler;Accepts:Any - (113:5,3) - Symbols:5 - HtmlSymbolType.Text;[This]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[is]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[extra]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (110:5,0) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [This is extra] - SpanEditHandler;Accepts:Any - (113:5,3) - Tokens:5 + HtmlTokenType.Text;[This]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[is]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[extra]; Tag block - Gen - 4 - (126:5,16) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (126:5,16) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (126:5,16) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.syntaxtree.txt index 66b6200cbe..6feb3829cd 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_NoErrorsSemicolonAfterDirective.syntaxtree.txt @@ -1,15 +1,15 @@ Directive block - Gen - 19 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ["hello"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.StringLiteral;["hello"]; - None span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (15:0,15) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [;] - SpanEditHandler;Accepts:WhiteSpace - (16:0,16) - Symbols:1 - CSharpSymbolType.Semicolon;[;]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (17:0,17) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ["hello"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.StringLiteral;["hello"]; + None span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (15:0,15) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [;] - SpanEditHandler;Accepts:WhiteSpace - (16:0,16) - Tokens:1 + CSharpTokenType.Semicolon;[;]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (17:0,17) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.syntaxtree.txt index 3db9d2b527..8dfad4bd3c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForNonStringValue.syntaxtree.txt @@ -1,7 +1,7 @@ Directive block - Gen - 8 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.syntaxtree.txt index a80e2e48d4..fd51b1bf91 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForPartialQuotedValue.syntaxtree.txt @@ -1,7 +1,7 @@ Directive block - Gen - 8 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.syntaxtree.txt index 15f59fc001..b65823863d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForSingleQuotedValue.syntaxtree.txt @@ -1,7 +1,7 @@ Directive block - Gen - 8 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.syntaxtree.txt index a80e2e48d4..fd51b1bf91 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_StringToken_ParserErrorForUnquotedValue.syntaxtree.txt @@ -1,7 +1,7 @@ Directive block - Gen - 8 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.syntaxtree.txt index de6d063d24..7c8de4fbc1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_TokensMustBeSeparatedBySpace.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 17 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ["string1"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.StringLiteral;["string1"]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ["string1"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.StringLiteral;["string1"]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.syntaxtree.txt index de2b8358b3..64c88fe4f9 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsCodeBlocks.syntaxtree.txt @@ -1,27 +1,27 @@ Directive block - Gen - 32 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ["Name"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.StringLiteral;["Name"]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (14:0,14) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (15:0,15) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [ foo(); bar(); ] - CodeBlockEditHandler;Accepts:Any;CodeBlock - (16:0,16) - Symbols:11 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (31:0,31) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ["Name"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.StringLiteral;["Name"]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (14:0,14) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (15:0,15) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [ foo(); bar(); ] - CodeBlockEditHandler;Accepts:Any;CodeBlock - (16:0,16) - Tokens:11 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.syntaxtree.txt index f29e34c399..c51aa18acd 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsMemberTokens.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 19 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [Some_Member] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.Identifier;[Some_Member]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [Some_Member] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.Identifier;[Some_Member]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.syntaxtree.txt index 09011f33e8..1cca925839 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsMultipleTokens.syntaxtree.txt @@ -1,23 +1,23 @@ Directive block - Gen - 64 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:7 - CSharpSymbolType.Identifier;[System]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Text]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Encoding]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[ASCIIEncoding]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (42:0,42) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [Some_Member] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (43:0,43) - Symbols:1 - CSharpSymbolType.Identifier;[Some_Member]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (54:0,54) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ["AString"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (55:0,55) - Symbols:1 - CSharpSymbolType.StringLiteral;["AString"]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:7 + CSharpTokenType.Identifier;[System]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Text]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Encoding]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[ASCIIEncoding]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (42:0,42) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [Some_Member] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (43:0,43) - Tokens:1 + CSharpTokenType.Identifier;[Some_Member]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (54:0,54) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ["AString"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (55:0,55) - Tokens:1 + CSharpTokenType.StringLiteral;["AString"]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.syntaxtree.txt index d4d820566f..c5bde0c85c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.syntaxtree.txt @@ -1,37 +1,37 @@ Directive block - Gen - 33 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ["Header"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.StringLiteral;["Header"]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (16:0,16) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (17:0,17) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ["Header"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.StringLiteral;["Header"]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (16:0,16) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (17:0,17) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 14 - (18:0,18) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (18:0,18) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 3 - (19:0,19) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (19:0,19) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [F{o}o] - SpanEditHandler;Accepts:Any - (22:0,22) - Symbols:5 - HtmlSymbolType.Text;[F]; - HtmlSymbolType.Text;[{]; - HtmlSymbolType.Text;[o]; - HtmlSymbolType.Text;[}]; - HtmlSymbolType.Text;[o]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [F{o}o] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:5 + HtmlTokenType.Text;[F]; + HtmlTokenType.Text;[{]; + HtmlTokenType.Text;[o]; + HtmlTokenType.Text;[}]; + HtmlTokenType.Text;[o]; Tag block - Gen - 4 - (27:0,27) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (27:0,27) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (31:0,31) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (32:0,32) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.syntaxtree.txt index 003c77ac67..3413cd7516 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsStringTokens.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 17 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ["AString"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.StringLiteral;["AString"]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ["AString"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.StringLiteral;["AString"]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.syntaxtree.txt index 99865f717d..4032e9314f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsTypeTokens.syntaxtree.txt @@ -1,15 +1,15 @@ Directive block - Gen - 42 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:7 - CSharpSymbolType.Identifier;[System]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Text]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Encoding]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[ASCIIEncoding]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:7 + CSharpTokenType.Identifier;[System]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Text]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Encoding]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[ASCIIEncoding]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Directives_CanUseReservedWord_Class.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Directives_CanUseReservedWord_Class.syntaxtree.txt index 254a58c9ba..32fae95183 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Directives_CanUseReservedWord_Class.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Directives_CanUseReservedWord_Class.syntaxtree.txt @@ -1,5 +1,5 @@ Directive block - Gen - 6 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [class] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Keyword;[class]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [class] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Keyword;[class]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Directives_CanUseReservedWord_Namespace.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Directives_CanUseReservedWord_Namespace.syntaxtree.txt index 7c56185f2c..2beaf1fc4f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Directives_CanUseReservedWord_Namespace.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Directives_CanUseReservedWord_Namespace.syntaxtree.txt @@ -1,5 +1,5 @@ Directive block - Gen - 10 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [namespace] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Keyword;[namespace]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [namespace] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Keyword;[namespace]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/EmptyFunctionsDirective.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/EmptyFunctionsDirective.syntaxtree.txt index 74cd02530c..f4f2d2009c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/EmptyFunctionsDirective.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/EmptyFunctionsDirective.syntaxtree.txt @@ -1,13 +1,13 @@ Directive block - Gen - 14 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [functions] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[functions]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (11:0,11) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [ ] - CodeBlockEditHandler;Accepts:Any;CodeBlock - (12:0,12) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (13:0,13) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [functions] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[functions]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (11:0,11) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [ ] - CodeBlockEditHandler;Accepts:Any;CodeBlock - (12:0,12) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.syntaxtree.txt index 5782c0d274..cb071c8170 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/ExtensibleDirectiveDoesNotErorrIfNotAtStartOfLineBecauseOfWhitespace.syntaxtree.txt @@ -1,18 +1,18 @@ Directive block - Gen - 46 - (0:0,0) - Code span - Gen - [LF ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:2 - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (4:1,2) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (5:1,3) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (11:1,9) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (12:1,10) - Symbols:7 - CSharpSymbolType.Identifier;[System]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Text]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Encoding]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[ASCIIEncoding]; + Code span - Gen - [LF ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2 + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (4:1,2) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (5:1,3) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (11:1,9) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (12:1,10) - Tokens:7 + CSharpTokenType.Identifier;[System]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Text]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Encoding]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[ASCIIEncoding]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.syntaxtree.txt index db87fbabc6..ceac2d5c09 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/ExtensibleDirectiveErrorsIfNotAtStartOfLine.syntaxtree.txt @@ -1,26 +1,26 @@ Statement block - Gen - 48 - (0:0,0) - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [ ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (1:0,1) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [ ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (1:0,1) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; Directive block - Gen - 44 - (3:0,3) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (3:0,3) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (4:0,4) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (10:0,10) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (11:0,11) - Symbols:7 - CSharpSymbolType.Identifier;[System]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Text]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Encoding]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[ASCIIEncoding]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:WhiteSpace - (45:0,45) - Symbols:1 - CSharpSymbolType.NewLine;[LF]; - Code span - Gen - [] - SpanEditHandler;Accepts:Any - (47:1,0) - Symbols:1 - CSharpSymbolType.Unknown;[]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (47:1,0) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (10:0,10) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [System.Text.Encoding.ASCIIEncoding] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (11:0,11) - Tokens:7 + CSharpTokenType.Identifier;[System]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Text]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Encoding]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[ASCIIEncoding]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:WhiteSpace - (45:0,45) - Tokens:1 + CSharpTokenType.NewLine;[LF]; + Code span - Gen - [] - SpanEditHandler;Accepts:Any - (47:1,0) - Tokens:1 + CSharpTokenType.Unknown;[]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (47:1,0) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsArrays.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsArrays.syntaxtree.txt index df4ed89534..4dba3c76e7 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsArrays.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsArrays.syntaxtree.txt @@ -1,20 +1,20 @@ Markup block - Gen - 22 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 22 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [inherits] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[inherits]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [string[[]][]] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (10:0,10) - Symbols:7 - CSharpSymbolType.Keyword;[string]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.RightBracket;[]]; - CSharpSymbolType.RightBracket;[]]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.RightBracket;[]]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (22:0,22) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [inherits] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[inherits]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [string[[]][]] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (10:0,10) - Tokens:7 + CSharpTokenType.Keyword;[string]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.RightBracket;[]]; + CSharpTokenType.RightBracket;[]]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.RightBracket;[]]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsNestedGenerics.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsNestedGenerics.syntaxtree.txt index 70a9fc2701..598a5043f8 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsNestedGenerics.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsNestedGenerics.syntaxtree.txt @@ -1,30 +1,30 @@ Markup block - Gen - 87 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 87 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [inherits] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[inherits]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [System.Web.Mvc.WebViewPage>] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (10:0,10) - Symbols:17 - CSharpSymbolType.Identifier;[System]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Web]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Mvc]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[WebViewPage]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.Identifier;[IEnumerable]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.Identifier;[MvcApplication2]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Models]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[RegisterModel]; - CSharpSymbolType.GreaterThan;[>]; - CSharpSymbolType.GreaterThan;[>]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (87:0,87) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [inherits] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[inherits]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [System.Web.Mvc.WebViewPage>] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (10:0,10) - Tokens:17 + CSharpTokenType.Identifier;[System]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Web]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Mvc]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[WebViewPage]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.Identifier;[IEnumerable]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.Identifier;[MvcApplication2]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Models]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[RegisterModel]; + CSharpTokenType.GreaterThan;[>]; + CSharpTokenType.GreaterThan;[>]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (87:0,87) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsTypeKeywords.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsTypeKeywords.syntaxtree.txt index 61adfcaf46..a65a1bba4c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsTypeKeywords.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/InheritsDirectiveSupportsTypeKeywords.syntaxtree.txt @@ -1,14 +1,14 @@ Markup block - Gen - 16 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 16 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [inherits] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[inherits]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [string] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (10:0,10) - Symbols:1 - CSharpSymbolType.Keyword;[string]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (16:0,16) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [inherits] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[inherits]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [string] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (10:0,10) - Tokens:1 + CSharpTokenType.Keyword;[string]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_AreSkipped.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_AreSkipped.syntaxtree.txt index fe88685d99..5b7ca1b209 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_AreSkipped.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_AreSkipped.syntaxtree.txt @@ -1,7 +1,7 @@ Directive block - Gen - 8 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.syntaxtree.txt index 080b1cf44b..1951c2e8a1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithBraces_AreParsed.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 29 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ["{formaction}?/{id}?"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.StringLiteral;["{formaction}?/{id}?"]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ["{formaction}?/{id}?"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.StringLiteral;["{formaction}?/{id}?"]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.syntaxtree.txt index ed9253fcff..4f534b5d86 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithMultipleOptionalTokens_AreParsed.syntaxtree.txt @@ -1,15 +1,15 @@ Directive block - Gen - 43 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ["{formaction}?/{id}?"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.StringLiteral;["{formaction}?/{id}?"]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (29:0,29) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [System.String] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (30:0,30) - Symbols:3 - CSharpSymbolType.Identifier;[System]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[String]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ["{formaction}?/{id}?"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.StringLiteral;["{formaction}?/{id}?"]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (29:0,29) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [System.String] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (30:0,30) - Tokens:3 + CSharpTokenType.Identifier;[System]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[String]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.syntaxtree.txt index 76422e95ad..1e6bb057fa 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalDirectiveTokens_WithSimpleTokens_AreParsed.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 22 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ["simple-value"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.StringLiteral;["simple-value"]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ["simple-value"] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.StringLiteral;["simple-value"]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.syntaxtree.txt index 82119d319b..114b39032d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalMemberTokens_WithMemberSpecified_IsParsed.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 27 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [TestDirective] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[TestDirective]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (14:0,14) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [PropertyName] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (15:0,15) - Symbols:1 - CSharpSymbolType.Identifier;[PropertyName]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [TestDirective] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[TestDirective]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (14:0,14) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [PropertyName] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (15:0,15) - Tokens:1 + CSharpTokenType.Identifier;[PropertyName]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.syntaxtree.txt index a5881d0daa..ee0063aa4b 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/OptionalMemberTokens_WithMissingMember_IsParsed.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 15 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [TestDirective] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[TestDirective]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (14:0,14) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (15:0,15) - Symbols:1 - CSharpSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [TestDirective] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[TestDirective]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (14:0,14) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (15:0,15) - Tokens:1 + CSharpTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parse_FunctionsDirective.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parse_FunctionsDirective.syntaxtree.txt index 75dd6fbff4..119a7b047b 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parse_FunctionsDirective.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parse_FunctionsDirective.syntaxtree.txt @@ -1,23 +1,23 @@ Directive block - Gen - 28 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [functions] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[functions]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (11:0,11) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [ foo(); bar(); ] - CodeBlockEditHandler;Accepts:Any;CodeBlock - (12:0,12) - Symbols:11 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (27:0,27) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [functions] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[functions]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (11:0,11) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [ foo(); bar(); ] - CodeBlockEditHandler;Accepts:Any;CodeBlock - (12:0,12) - Tokens:11 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parse_SectionDirective.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parse_SectionDirective.syntaxtree.txt index 0a3810f75d..2af805b4b0 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parse_SectionDirective.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parse_SectionDirective.syntaxtree.txt @@ -1,37 +1,37 @@ Directive block - Gen - 32 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [Header] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[Header]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (15:0,15) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (16:0,16) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [Header] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[Header]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (15:0,15) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (16:0,16) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 14 - (17:0,17) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (17:0,17) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 3 - (18:0,18) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (18:0,18) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [F{o}o] - SpanEditHandler;Accepts:Any - (21:0,21) - Symbols:5 - HtmlSymbolType.Text;[F]; - HtmlSymbolType.Text;[{]; - HtmlSymbolType.Text;[o]; - HtmlSymbolType.Text;[}]; - HtmlSymbolType.Text;[o]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [F{o}o] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:5 + HtmlTokenType.Text;[F]; + HtmlTokenType.Text;[{]; + HtmlTokenType.Text;[o]; + HtmlTokenType.Text;[}]; + HtmlTokenType.Text;[o]; Tag block - Gen - 4 - (26:0,26) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (26:0,26) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (30:0,30) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (31:0,31) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.syntaxtree.txt index b14fe5e74d..9776383715 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithMultipleSegments.syntaxtree.txt @@ -1,13 +1,13 @@ Directive block - Gen - 29 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [BaseNamespace.Foo.Bar] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:5 - CSharpSymbolType.Identifier;[BaseNamespace]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Bar]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [BaseNamespace.Foo.Bar] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:5 + CSharpTokenType.Identifier;[BaseNamespace]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Bar]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.syntaxtree.txt index a4e1048ad6..8a637f25e1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parser_ParsesNamespaceDirectiveToken_WithSingleSegment.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 21 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[custom]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [BaseNamespace] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.Identifier;[BaseNamespace]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [custom] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[custom]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (7:0,7) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [BaseNamespace] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.Identifier;[BaseNamespace]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt index 9a172eb914..7d2f6da517 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt @@ -1,10 +1,10 @@ Directive block - Gen - 21 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[removeTagHelper]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [Foo"] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Symbols:2 - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.StringLiteral;["];RZ1000(20:0,20 [1] ) + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[removeTagHelper]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [Foo"] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:2 + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.StringLiteral;["];RZ1000(20:0,20 [1] ) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.syntaxtree.txt index 5f792feb43..860f903187 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_InvalidLookupText_AddsError.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 20 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[removeTagHelper]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [Foo] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Symbols:1 - CSharpSymbolType.Identifier;[Foo]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[removeTagHelper]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [Foo] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1 + CSharpTokenType.Identifier;[Foo]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.syntaxtree.txt index 41f8e7f760..73ba9fd131 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_NoValue_Invalid.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 19 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[removeTagHelper]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [""] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Symbols:1 - CSharpSymbolType.StringLiteral;[""]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[removeTagHelper]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [""] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1 + CSharpTokenType.StringLiteral;[""]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_RequiresValue.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_RequiresValue.syntaxtree.txt index 4b0b72ab8f..2666ac8a58 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_RequiresValue.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_RequiresValue.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 17 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[removeTagHelper]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Symbols:1 - CSharpSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[removeTagHelper]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1 + CSharpTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.syntaxtree.txt index 6ff9997349..acf4682a63 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_SingleQuotes_AddsError.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 25 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[removeTagHelper]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ['*, Foo'] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Symbols:1 - CSharpSymbolType.CharacterLiteral;['*, Foo']; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[removeTagHelper]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ['*, Foo'] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1 + CSharpTokenType.CharacterLiteral;['*, Foo']; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt index c4085cec02..5483dd02f2 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 21 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[removeTagHelper]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ["Foo] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Symbols:1 - CSharpSymbolType.StringLiteral;["Foo];RZ1000(17:0,17 [1] ) + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[removeTagHelper]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ["Foo] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1 + CSharpTokenType.StringLiteral;["Foo];RZ1000(17:0,17 [1] ) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.syntaxtree.txt index cffad8b956..2bcd74c5e6 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_SupportsSpaces.syntaxtree.txt @@ -1,13 +1,13 @@ Directive block - Gen - 35 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[removeTagHelper]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [Foo, Bar ] - SpanEditHandler;Accepts:AnyExceptNewline - (21:0,21) - Symbols:5 - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[removeTagHelper]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [Foo, Bar ] - SpanEditHandler;Accepts:AnyExceptNewline - (21:0,21) - Tokens:5 + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.syntaxtree.txt index aff91dc1f6..2f9b4b42d9 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/RemoveTagHelperDirective_WithQuotes_InvalidLookupText_AddsError.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 22 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[removeTagHelper]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ["Foo"] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Symbols:1 - CSharpSymbolType.StringLiteral;["Foo"]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [removeTagHelper] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[removeTagHelper]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ["Foo"] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1 + CSharpTokenType.StringLiteral;["Foo"]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt index 5254a067c9..6377f48d15 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt @@ -1,11 +1,11 @@ Directive block - Gen - 24 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [tagHelperPrefix] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[tagHelperPrefix]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [Foo "] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Symbols:3 - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["];RZ1000(23:0,23 [1] ) + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [tagHelperPrefix] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[tagHelperPrefix]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [Foo "] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:3 + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["];RZ1000(23:0,23 [1] ) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.syntaxtree.txt index 9a93abd3af..5a5e18da25 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_NoValueSucceeds.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 19 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [tagHelperPrefix] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[tagHelperPrefix]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [""] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Symbols:1 - CSharpSymbolType.StringLiteral;[""]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [tagHelperPrefix] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[tagHelperPrefix]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [""] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1 + CSharpTokenType.StringLiteral;[""]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_RequiresValue.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_RequiresValue.syntaxtree.txt index 8eb05d427c..d63b77168e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_RequiresValue.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_RequiresValue.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 17 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [tagHelperPrefix] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[tagHelperPrefix]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Symbols:1 - CSharpSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [tagHelperPrefix] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[tagHelperPrefix]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1 + CSharpTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt index 5d4223957a..277fbd3a51 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 21 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [tagHelperPrefix] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[tagHelperPrefix]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ["Foo] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Symbols:1 - CSharpSymbolType.StringLiteral;["Foo];RZ1000(17:0,17 [1] ) + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [tagHelperPrefix] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[tagHelperPrefix]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ["Foo] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1 + CSharpTokenType.StringLiteral;["Foo];RZ1000(17:0,17 [1] ) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_Succeeds.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_Succeeds.syntaxtree.txt index ce8884c54b..7e9a17d299 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_Succeeds.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_Succeeds.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 20 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [tagHelperPrefix] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[tagHelperPrefix]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [Foo] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Symbols:1 - CSharpSymbolType.Identifier;[Foo]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [tagHelperPrefix] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[tagHelperPrefix]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [Foo] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1 + CSharpTokenType.Identifier;[Foo]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.syntaxtree.txt index f9c3d601bb..1c5a3a9321 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/TagHelperPrefixDirective_WithQuotes_Succeeds.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 22 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [tagHelperPrefix] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[tagHelperPrefix]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - ["Foo"] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Symbols:1 - CSharpSymbolType.StringLiteral;["Foo"]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [tagHelperPrefix] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[tagHelperPrefix]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - ["Foo"] - SpanEditHandler;Accepts:AnyExceptNewline - (17:0,17) - Tokens:1 + CSharpTokenType.StringLiteral;["Foo"]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockCapturesWhitespaceToEndOfLineInInvalidUsingStatementAndTreatsAsFileCode.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockCapturesWhitespaceToEndOfLineInInvalidUsingStatementAndTreatsAsFileCode.syntaxtree.txt index 10662a6c39..6f18195cab 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockCapturesWhitespaceToEndOfLineInInvalidUsingStatementAndTreatsAsFileCode.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockCapturesWhitespaceToEndOfLineInInvalidUsingStatementAndTreatsAsFileCode.syntaxtree.txt @@ -1,5 +1,5 @@ Statement block - Gen - 17 - (0:0,0) - Code span - Gen - [using LF] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:3 - CSharpSymbolType.Keyword;[using]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NewLine;[LF]; + Code span - Gen - [using LF] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3 + CSharpTokenType.Keyword;[using]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NewLine;[LF]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockCorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockCorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed.syntaxtree.txt index 30ca1ad20c..c0c22405e9 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockCorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockCorrectlyHandlesInCorrectTransitionsIfImplicitExpressionParensUnclosed.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 7 - (0:0,0) - Code span - Gen - [Href(LF] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Symbols:3 - CSharpSymbolType.Identifier;[Href]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.NewLine;[LF]; + Code span - Gen - [Href(LF] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Tokens:3 + CSharpTokenType.Identifier;[Href]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.NewLine;[LF]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockCorrectlyParsesAtSignInDelimitedBlock.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockCorrectlyParsesAtSignInDelimitedBlock.syntaxtree.txt index 59439ca8e0..604a9bb8b6 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockCorrectlyParsesAtSignInDelimitedBlock.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockCorrectlyParsesAtSignInDelimitedBlock.syntaxtree.txt @@ -1,17 +1,17 @@ Expression block - Gen - 46 - (0:0,0) - MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftParenthesis;[(]; - Code span - Gen - [Request["description"] ?? @photo.Description] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:11 - CSharpSymbolType.Identifier;[Request]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.StringLiteral;["description"]; - CSharpSymbolType.RightBracket;[]]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NullCoalesce;[??]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Transition;[@]; - CSharpSymbolType.Identifier;[photo]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Description]; - MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (45:0,45) - Symbols:1 - CSharpSymbolType.RightParenthesis;[)]; + MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftParenthesis;[(]; + Code span - Gen - [Request["description"] ?? @photo.Description] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:11 + CSharpTokenType.Identifier;[Request]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.StringLiteral;["description"]; + CSharpTokenType.RightBracket;[]]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NullCoalesce;[??]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Transition;[@]; + CSharpTokenType.Identifier;[photo]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Description]; + MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (45:0,45) - Tokens:1 + CSharpTokenType.RightParenthesis;[)]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockCorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockCorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.syntaxtree.txt index 57cdc77371..5f1e30a96d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockCorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockCorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.syntaxtree.txt @@ -1,45 +1,45 @@ Statement block - Gen - 64 - (0:0,0) - Code span - Gen - [if(foo) {LF var foo = "foo bar bazLF ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:17 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["foo bar baz];RZ1000(25:1,14 [1] ) - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [if(foo) {LF var foo = "foo bar bazLF ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:17 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["foo bar baz];RZ1000(25:1,14 [1] ) + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; Markup block - Gen - 20 - (43:2,4) Tag block - Gen - 3 - (43:2,4) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (43:2,4) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [Foo is ] - SpanEditHandler;Accepts:Any - (46:2,7) - Symbols:4 - HtmlSymbolType.Text;[Foo]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[is]; - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (43:2,4) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [Foo is ] - SpanEditHandler;Accepts:Any - (46:2,7) - Tokens:4 + HtmlTokenType.Text;[Foo]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[is]; + HtmlTokenType.WhiteSpace;[ ]; Expression block - Gen - 4 - (53:2,14) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (53:2,14) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (54:2,15) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (53:2,14) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (54:2,15) - Tokens:1 + CSharpTokenType.Identifier;[foo]; Tag block - Gen - 4 - (57:2,18) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (57:2,18) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:None - (61:2,22) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; - Code span - Gen - [}] - SpanEditHandler;Accepts:Any - (63:3,0) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (57:2,18) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:None - (61:2,22) - Tokens:1 + HtmlTokenType.NewLine;[LF]; + Code span - Gen - [}] - SpanEditHandler;Accepts:Any - (63:3,0) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockCorrectlyRecoversFromMissingCloseParenInExpressionWithinCode.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockCorrectlyRecoversFromMissingCloseParenInExpressionWithinCode.syntaxtree.txt index 6cf94e97da..7832ba2cb6 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockCorrectlyRecoversFromMissingCloseParenInExpressionWithinCode.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockCorrectlyRecoversFromMissingCloseParenInExpressionWithinCode.syntaxtree.txt @@ -1,24 +1,24 @@ Statement block - Gen - 29 - (0:0,0) - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [string.Format(] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (1:0,1) - Symbols:4 - CSharpSymbolType.Keyword;[string]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Format]; - CSharpSymbolType.LeftParenthesis;[(]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [string.Format(] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (1:0,1) - Tokens:4 + CSharpTokenType.Keyword;[string]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Format]; + CSharpTokenType.LeftParenthesis;[(]; Markup block - Gen - 13 - (15:0,15) Tag block - Gen - 6 - (15:0,15) - Markup span - Gen - [] - SpanEditHandler;Accepts:None - (15:0,15) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[html]; - HtmlSymbolType.CloseAngle;[>]; + Markup span - Gen - [] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[html]; + HtmlTokenType.CloseAngle;[>]; Tag block - Gen - 7 - (21:0,21) - Markup span - Gen - [] - SpanEditHandler;Accepts:None - (21:0,21) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[html]; - HtmlSymbolType.CloseAngle;[>]; - Code span - Gen - [] - SpanEditHandler;Accepts:Any - (28:0,28) - Symbols:1 - CSharpSymbolType.Unknown;[]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (28:0,28) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Markup span - Gen - [] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[html]; + HtmlTokenType.CloseAngle;[>]; + Code span - Gen - [] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:1 + CSharpTokenType.Unknown;[]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (28:0,28) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockHandlesQuotesAfterTransition.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockHandlesQuotesAfterTransition.syntaxtree.txt index 2ce6cbbd8a..8f8de632d0 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockHandlesQuotesAfterTransition.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockHandlesQuotesAfterTransition.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 1 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockIncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockIncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.syntaxtree.txt index 4f38bbc80d..14a29b0b80 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockIncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockIncludesUnexpectedCharacterInSingleStatementControlFlowStatementError.syntaxtree.txt @@ -1,20 +1,20 @@ Statement block - Gen - 27 - (0:0,0) - Code span - Gen - [if(foo)) { var bar = foo; }] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:18 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [if(foo)) { var bar = foo; }] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:18 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace.syntaxtree.txt index 54058d35f2..2a25f6f7de 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodOutputsOpenCurlyAsCodeSpanIfEofFoundAfterOpenCurlyBrace.syntaxtree.txt @@ -1,5 +1,5 @@ Statement block - Gen - 1 - (0:0,0) - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (1:0,1) - Symbols:1 - CSharpSymbolType.Unknown;[]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (1:0,1) - Tokens:1 + CSharpTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodOutputsZeroLengthCodeSpanIfStatementBlockEmpty.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodOutputsZeroLengthCodeSpanIfStatementBlockEmpty.syntaxtree.txt index 82873f5134..898717d0f5 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodOutputsZeroLengthCodeSpanIfStatementBlockEmpty.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodOutputsZeroLengthCodeSpanIfStatementBlockEmpty.syntaxtree.txt @@ -1,7 +1,7 @@ Statement block - Gen - 2 - (0:0,0) - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (1:0,1) - Symbols:1 - CSharpSymbolType.Unknown;[]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (1:0,1) - Tokens:1 + CSharpTokenType.Unknown;[]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.syntaxtree.txt index 2ce6cbbd8a..8f8de632d0 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodParsesNothingIfFirstCharacterIsNotIdentifierStartOrParenOrBrace.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 1 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.syntaxtree.txt index 3df5c02a08..d7a2344f3c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodProducesErrorIfEOFAfterTransitionInEmbeddedExpression.syntaxtree.txt @@ -1,13 +1,13 @@ Statement block - Gen - 8 - (0:0,0) - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [LF ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (1:0,1) - Symbols:2 - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [LF ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (1:0,1) - Tokens:2 + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; Expression block - Gen - 1 - (7:1,4) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (7:1,4) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (8:1,5) - Symbols:1 - CSharpSymbolType.Unknown;[]; - Code span - Gen - [] - SpanEditHandler;Accepts:Any - (8:1,5) - Symbols:1 - CSharpSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (7:1,4) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (8:1,5) - Tokens:1 + CSharpTokenType.Unknown;[]; + Code span - Gen - [] - SpanEditHandler;Accepts:Any - (8:1,5) - Tokens:1 + CSharpTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodProducesErrorIfNewlineFollowsTransition.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodProducesErrorIfNewlineFollowsTransition.syntaxtree.txt index 2ce6cbbd8a..8f8de632d0 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodProducesErrorIfNewlineFollowsTransition.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodProducesErrorIfNewlineFollowsTransition.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 1 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpression.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpression.syntaxtree.txt index cfb3d1f280..cea41801d1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpression.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockMethodProducesErrorIfWhitespaceBetweenTransitionAndBlockStartInEmbeddedExpression.syntaxtree.txt @@ -1,18 +1,18 @@ Statement block - Gen - 16 - (0:0,0) - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [LF ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (1:0,1) - Symbols:2 - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [LF ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (1:0,1) - Tokens:2 + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; Expression block - Gen - 1 - (7:1,4) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (7:1,4) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (8:1,5) - Symbols:1 - CSharpSymbolType.Unknown;[]; - Code span - Gen - [ {}LF] - SpanEditHandler;Accepts:Any - (8:1,5) - Symbols:4 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.NewLine;[LF]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (15:2,0) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (7:1,4) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (8:1,5) - Tokens:1 + CSharpTokenType.Unknown;[]; + Code span - Gen - [ {}LF] - SpanEditHandler;Accepts:Any - (8:1,5) - Tokens:4 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.NewLine;[LF]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (15:2,0) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockOutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockOutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart.syntaxtree.txt index 3fba28dea0..691f6016fb 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockOutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockOutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart.syntaxtree.txt @@ -1,30 +1,30 @@ Statement block - Gen - 23 - (0:0,0) - Code span - Gen - [if(foo) {] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:6 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; + Code span - Gen - [if(foo) {] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:6 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 13 - (9:0,9) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (9:0,9) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Symbols:1 - HtmlSymbolType.Transition;[@]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:1 + HtmlTokenType.Transition;[@]; Tag block - Gen - 3 - (11:0,11) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (11:0,11) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [Bar] - SpanEditHandler;Accepts:Any - (14:0,14) - Symbols:1 - HtmlSymbolType.Text;[Bar]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (11:0,11) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [Bar] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1 + HtmlTokenType.Text;[Bar]; Tag block - Gen - 4 - (17:0,17) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (17:0,17) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (21:0,21) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; - Code span - Gen - [}] - SpanEditHandler;Accepts:Any - (22:0,22) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; + Code span - Gen - [}] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfCatchBlockUnterminatedAtEOF.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfCatchBlockUnterminatedAtEOF.syntaxtree.txt index 2d052b7c72..dce1789d78 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfCatchBlockUnterminatedAtEOF.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfCatchBlockUnterminatedAtEOF.syntaxtree.txt @@ -1,47 +1,47 @@ Statement block - Gen - 70 - (0:0,0) - Code span - Gen - [try { baz(); } catch(Foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:45 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NotEqual;[!=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[null]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [try { baz(); } catch(Foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:45 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NotEqual;[!=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[null]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfClassBlockUnterminatedAtEOF.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfClassBlockUnterminatedAtEOF.syntaxtree.txt index 1775df09db..08147658a8 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfClassBlockUnterminatedAtEOF.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfClassBlockUnterminatedAtEOF.syntaxtree.txt @@ -1,36 +1,36 @@ Directive block - Gen - 54 - (0:0,0) - MetaCode span - Gen - [functions] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Identifier;[functions]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (10:0,10) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [ var foo = bar; if(foo != null) { bar(); } ] - CodeBlockEditHandler;Accepts:Any;CodeBlock - (11:0,11) - Symbols:28 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NotEqual;[!=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[null]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; + MetaCode span - Gen - [functions] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Identifier;[functions]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (10:0,10) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [ var foo = bar; if(foo != null) { bar(); } ] - CodeBlockEditHandler;Accepts:Any;CodeBlock - (11:0,11) - Tokens:28 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NotEqual;[!=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[null]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfDoBlockUnterminatedAtEOF.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfDoBlockUnterminatedAtEOF.syntaxtree.txt index 535f2e7bce..73e25271f0 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfDoBlockUnterminatedAtEOF.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfDoBlockUnterminatedAtEOF.syntaxtree.txt @@ -1,33 +1,33 @@ Statement block - Gen - 47 - (0:0,0) - Code span - Gen - [do { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:31 - CSharpSymbolType.Keyword;[do]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NotEqual;[!=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[null]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [do { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:31 + CSharpTokenType.Keyword;[do]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NotEqual;[!=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[null]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfElseBlockUnterminatedAtEOF.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfElseBlockUnterminatedAtEOF.syntaxtree.txt index b796d0fb50..652f403cec 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfElseBlockUnterminatedAtEOF.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfElseBlockUnterminatedAtEOF.syntaxtree.txt @@ -1,47 +1,47 @@ Statement block - Gen - 68 - (0:0,0) - Code span - Gen - [if(foo) { baz(); } else { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:45 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NotEqual;[!=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[null]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [if(foo) { baz(); } else { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:45 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NotEqual;[!=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[null]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfElseIfBlockUnterminatedAtEOF.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfElseIfBlockUnterminatedAtEOF.syntaxtree.txt index bb4b7b903c..4750dbca0e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfElseIfBlockUnterminatedAtEOF.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfElseIfBlockUnterminatedAtEOF.syntaxtree.txt @@ -1,49 +1,49 @@ Statement block - Gen - 71 - (0:0,0) - Code span - Gen - [if(foo) { baz(); } else if { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:47 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NotEqual;[!=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[null]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [if(foo) { baz(); } else if { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:47 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NotEqual;[!=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[null]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfExplicitCodeBlockUnterminatedAtEOF.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfExplicitCodeBlockUnterminatedAtEOF.syntaxtree.txt index de2649a46f..de02008232 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfExplicitCodeBlockUnterminatedAtEOF.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfExplicitCodeBlockUnterminatedAtEOF.syntaxtree.txt @@ -1,32 +1,32 @@ Statement block - Gen - 44 - (0:0,0) - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [ var foo = bar; if(foo != null) { bar(); } ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (1:0,1) - Symbols:28 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NotEqual;[!=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[null]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [ var foo = bar; if(foo != null) { bar(); } ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (1:0,1) - Tokens:28 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NotEqual;[!=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[null]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfFinallyBlockUnterminatedAtEOF.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfFinallyBlockUnterminatedAtEOF.syntaxtree.txt index b108e413d1..17ec773583 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfFinallyBlockUnterminatedAtEOF.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfFinallyBlockUnterminatedAtEOF.syntaxtree.txt @@ -1,44 +1,44 @@ Statement block - Gen - 67 - (0:0,0) - Code span - Gen - [try { baz(); } finally { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:42 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[finally]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NotEqual;[!=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[null]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [try { baz(); } finally { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:42 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[finally]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NotEqual;[!=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[null]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfForBlockUnterminatedAtEOF.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfForBlockUnterminatedAtEOF.syntaxtree.txt index 8ca6c0ffe6..f896c4413c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfForBlockUnterminatedAtEOF.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfForBlockUnterminatedAtEOF.syntaxtree.txt @@ -1,37 +1,37 @@ Statement block - Gen - 54 - (0:0,0) - Code span - Gen - [for (foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:35 - CSharpSymbolType.Keyword;[for]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NotEqual;[!=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[null]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [for (foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:35 + CSharpTokenType.Keyword;[for]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NotEqual;[!=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[null]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfForeachBlockUnterminatedAtEOF.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfForeachBlockUnterminatedAtEOF.syntaxtree.txt index 38dde74508..f040273553 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfForeachBlockUnterminatedAtEOF.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfForeachBlockUnterminatedAtEOF.syntaxtree.txt @@ -1,37 +1,37 @@ Statement block - Gen - 58 - (0:0,0) - Code span - Gen - [foreach (foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:35 - CSharpSymbolType.Keyword;[foreach]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NotEqual;[!=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[null]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [foreach (foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:35 + CSharpTokenType.Keyword;[foreach]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NotEqual;[!=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[null]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfIfBlockUnterminatedAtEOF.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfIfBlockUnterminatedAtEOF.syntaxtree.txt index 8eea268e01..8940e51eb3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfIfBlockUnterminatedAtEOF.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfIfBlockUnterminatedAtEOF.syntaxtree.txt @@ -1,37 +1,37 @@ Statement block - Gen - 53 - (0:0,0) - Code span - Gen - [if (foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:35 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NotEqual;[!=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[null]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [if (foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:35 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NotEqual;[!=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[null]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfLockBlockUnterminatedAtEOF.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfLockBlockUnterminatedAtEOF.syntaxtree.txt index 113317cdc9..2db346c06b 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfLockBlockUnterminatedAtEOF.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfLockBlockUnterminatedAtEOF.syntaxtree.txt @@ -1,37 +1,37 @@ Statement block - Gen - 55 - (0:0,0) - Code span - Gen - [lock (foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:35 - CSharpSymbolType.Keyword;[lock]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NotEqual;[!=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[null]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [lock (foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:35 + CSharpTokenType.Keyword;[lock]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NotEqual;[!=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[null]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfSwitchBlockUnterminatedAtEOF.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfSwitchBlockUnterminatedAtEOF.syntaxtree.txt index 97331217b1..274707aa24 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfSwitchBlockUnterminatedAtEOF.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfSwitchBlockUnterminatedAtEOF.syntaxtree.txt @@ -1,37 +1,37 @@ Statement block - Gen - 57 - (0:0,0) - Code span - Gen - [switch (foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:35 - CSharpSymbolType.Keyword;[switch]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NotEqual;[!=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[null]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [switch (foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:35 + CSharpTokenType.Keyword;[switch]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NotEqual;[!=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[null]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfTryBlockUnterminatedAtEOF.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfTryBlockUnterminatedAtEOF.syntaxtree.txt index c3b097f187..b8edb26e7e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfTryBlockUnterminatedAtEOF.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfTryBlockUnterminatedAtEOF.syntaxtree.txt @@ -1,33 +1,33 @@ Statement block - Gen - 48 - (0:0,0) - Code span - Gen - [try { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:31 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NotEqual;[!=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[null]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [try { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:31 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NotEqual;[!=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[null]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfUsingBlockUnterminatedAtEOF.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfUsingBlockUnterminatedAtEOF.syntaxtree.txt index db82b450d0..50ee1fda7f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfUsingBlockUnterminatedAtEOF.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfUsingBlockUnterminatedAtEOF.syntaxtree.txt @@ -1,37 +1,37 @@ Statement block - Gen - 56 - (0:0,0) - Code span - Gen - [using (foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:35 - CSharpSymbolType.Keyword;[using]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NotEqual;[!=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[null]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [using (foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:35 + CSharpTokenType.Keyword;[using]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NotEqual;[!=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[null]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfWhileBlockUnterminatedAtEOF.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfWhileBlockUnterminatedAtEOF.syntaxtree.txt index a2bdbbb669..cef398b06c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfWhileBlockUnterminatedAtEOF.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockReportsErrorIfWhileBlockUnterminatedAtEOF.syntaxtree.txt @@ -1,37 +1,37 @@ Statement block - Gen - 56 - (0:0,0) - Code span - Gen - [while (foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:35 - CSharpSymbolType.Keyword;[while]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NotEqual;[!=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[null]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [while (foo) { var foo = bar; if(foo != null) { bar(); } ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:35 + CSharpTokenType.Keyword;[while]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NotEqual;[!=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[null]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockRequiresControlFlowStatementsToHaveBraces.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockRequiresControlFlowStatementsToHaveBraces.syntaxtree.txt index 1f510343e6..b7e771e87f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockRequiresControlFlowStatementsToHaveBraces.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockRequiresControlFlowStatementsToHaveBraces.syntaxtree.txt @@ -1,66 +1,66 @@ Statement block - Gen - 58 - (0:0,0) - Code span - Gen - [if(foo) ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:5 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [if(foo) ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:5 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; Markup block - Gen - 11 - (8:0,8) Tag block - Gen - 3 - (8:0,8) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (8:0,8) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [Bar] - SpanEditHandler;Accepts:Any - (11:0,11) - Symbols:1 - HtmlSymbolType.Text;[Bar]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [Bar] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1 + HtmlTokenType.Text;[Bar]; Tag block - Gen - 4 - (14:0,14) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (14:0,14) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (18:0,18) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; - Code span - Gen - [else if(bar) ] - SpanEditHandler;Accepts:Any - (19:0,19) - Symbols:7 - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; + Code span - Gen - [else if(bar) ] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:7 + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; Markup block - Gen - 11 - (32:0,32) Tag block - Gen - 3 - (32:0,32) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (32:0,32) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [Baz] - SpanEditHandler;Accepts:Any - (35:0,35) - Symbols:1 - HtmlSymbolType.Text;[Baz]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [Baz] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:1 + HtmlTokenType.Text;[Baz]; Tag block - Gen - 4 - (38:0,38) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (38:0,38) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (42:0,42) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; - Code span - Gen - [else ] - SpanEditHandler;Accepts:Any - (43:0,43) - Symbols:2 - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (42:0,42) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; + Code span - Gen - [else ] - SpanEditHandler;Accepts:Any - (43:0,43) - Tokens:2 + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; Markup block - Gen - 10 - (48:0,48) Tag block - Gen - 3 - (48:0,48) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (48:0,48) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [Boz] - SpanEditHandler;Accepts:Any - (51:0,51) - Symbols:1 - HtmlSymbolType.Text;[Boz]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (48:0,48) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [Boz] - SpanEditHandler;Accepts:Any - (51:0,51) - Tokens:1 + HtmlTokenType.Text;[Boz]; Tag block - Gen - 4 - (54:0,54) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (54:0,54) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Code span - Gen - [] - SpanEditHandler;Accepts:Any - (58:0,58) - Symbols:1 - CSharpSymbolType.Unknown;[]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (54:0,54) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Code span - Gen - [] - SpanEditHandler;Accepts:Any - (58:0,58) - Tokens:1 + CSharpTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockResumesIfStatementAfterOpenParen.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockResumesIfStatementAfterOpenParen.syntaxtree.txt index e4f2a03e7c..f1e59db50a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockResumesIfStatementAfterOpenParen.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockResumesIfStatementAfterOpenParen.syntaxtree.txt @@ -1,28 +1,28 @@ Statement block - Gen - 24 - (0:0,0) - Code span - Gen - [if(LFelse {] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:6 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; + Code span - Gen - [if(LFelse {] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:6 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 12 - (11:1,6) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (11:1,6) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (11:1,6) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 3 - (12:1,7) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (12:1,7) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (15:1,10) - Symbols:1 - HtmlSymbolType.Text;[Foo]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (12:1,7) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (15:1,10) - Tokens:1 + HtmlTokenType.Text;[Foo]; Tag block - Gen - 4 - (18:1,13) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (18:1,13) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (22:1,17) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; - Code span - Gen - [}] - SpanEditHandler;Accepts:None - (23:1,18) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (18:1,13) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (22:1,17) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; + Code span - Gen - [}] - SpanEditHandler;Accepts:None - (23:1,18) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed.syntaxtree.txt index 508fa47432..72e23a8a3c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtEOFIfBracketInImplicitExpressionUnclosed.syntaxtree.txt @@ -1,12 +1,12 @@ Expression block - Gen - 22 - (0:0,0) - Code span - Gen - [Foo[Bar[Baz]LFBizLFBoz] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Symbols:10 - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.Identifier;[Baz]; - CSharpSymbolType.RightBracket;[]]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Identifier;[Biz]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Identifier;[Boz]; + Code span - Gen - [Foo[Bar[Baz]LFBizLFBoz] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Tokens:10 + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.Identifier;[Baz]; + CSharpTokenType.RightBracket;[]]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Identifier;[Biz]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Identifier;[Boz]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExpressionUnclosed.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExpressionUnclosed.syntaxtree.txt index 2e966569e5..78cdf0005e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExpressionUnclosed.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtEOFIfIfParenInExplicitExpressionUnclosed.syntaxtree.txt @@ -1,9 +1,9 @@ Expression block - Gen - 13 - (0:0,0) - MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftParenthesis;[(]; - Code span - Gen - [foo barLFbaz] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:5 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Identifier;[baz]; + MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftParenthesis;[(]; + Code span - Gen - [foo barLFbaz] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:5 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Identifier;[baz]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtEOFIfParenInImplicitExpressionUnclosed.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtEOFIfParenInImplicitExpressionUnclosed.syntaxtree.txt index 2507fca3e0..8a2b46772d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtEOFIfParenInImplicitExpressionUnclosed.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtEOFIfParenInImplicitExpressionUnclosed.syntaxtree.txt @@ -1,12 +1,12 @@ Expression block - Gen - 22 - (0:0,0) - Code span - Gen - [Foo(Bar(Baz)LFBizLFBoz] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Symbols:10 - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Baz]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Identifier;[Biz]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Identifier;[Boz]; + Code span - Gen - [Foo(Bar(Baz)LFBizLFBoz] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Tokens:10 + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Baz]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Identifier;[Biz]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Identifier;[Boz]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExpressionUnclosed.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExpressionUnclosed.syntaxtree.txt index 22442daf9a..ec70a45174 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExpressionUnclosed.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtMarkupIfBracketInImplicitExpressionUnclosed.syntaxtree.txt @@ -1,11 +1,11 @@ Expression block - Gen - 19 - (0:0,0) - Code span - Gen - [Foo[Bar[Baz]LFBizLF] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Symbols:9 - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.Identifier;[Baz]; - CSharpSymbolType.RightBracket;[]]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Identifier;[Biz]; - CSharpSymbolType.NewLine;[LF]; + Code span - Gen - [Foo[Bar[Baz]LFBizLF] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Tokens:9 + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.Identifier;[Baz]; + CSharpTokenType.RightBracket;[]]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Identifier;[Biz]; + CSharpTokenType.NewLine;[LF]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExpressionUnclosed.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExpressionUnclosed.syntaxtree.txt index fff7ad0517..c23684a3e4 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExpressionUnclosed.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtMarkupIfIfParenInExplicitExpressionUnclosed.syntaxtree.txt @@ -1,8 +1,8 @@ Expression block - Gen - 10 - (0:0,0) - MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftParenthesis;[(]; - Code span - Gen - [foo barLF] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:4 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.NewLine;[LF]; + MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftParenthesis;[(]; + Code span - Gen - [foo barLF] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:4 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.NewLine;[LF]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed.syntaxtree.txt index aead3fc0d1..e8a7af923b 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockShouldReportErrorAndTerminateAtMarkupIfParenInImplicitExpressionUnclosed.syntaxtree.txt @@ -1,11 +1,11 @@ Expression block - Gen - 19 - (0:0,0) - Code span - Gen - [Foo(Bar(Baz)LFBizLF] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Symbols:9 - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Baz]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Identifier;[Biz]; - CSharpSymbolType.NewLine;[LF]; + Code span - Gen - [Foo(Bar(Baz)LFBizLF] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Tokens:9 + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Baz]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Identifier;[Biz]; + CSharpTokenType.NewLine;[LF]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen.syntaxtree.txt index e6a3bf318e..7bbc78e8ff 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesForeachBlockAtEOLWhenRecoveringFromMissingCloseParen.syntaxtree.txt @@ -1,8 +1,8 @@ Statement block - Gen - 17 - (0:0,0) - Code span - Gen - [foreach(foo barLF] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:6 - CSharpSymbolType.Keyword;[foreach]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.NewLine;[LF]; + Code span - Gen - [foreach(foo barLF] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:6 + CSharpTokenType.Keyword;[foreach]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.NewLine;[LF]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen.syntaxtree.txt index 32445eb7b7..d12e4eeb98 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesIfBlockAtEOLWhenRecoveringFromMissingCloseParen.syntaxtree.txt @@ -1,8 +1,8 @@ Statement block - Gen - 12 - (0:0,0) - Code span - Gen - [if(foo barLF] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:6 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.NewLine;[LF]; + Code span - Gen - [if(foo barLF] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:6 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.NewLine;[LF]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing.syntaxtree.txt index 475e4152b9..83c5c0e7bc 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesNormalCSharpStringsAtEOLIfEndQuoteMissing.syntaxtree.txt @@ -1,21 +1,21 @@ Statement block - Gen - 41 - (0:0,0) - Code span - Gen - [if(foo) {LF var p = "foo bar bazLF;LF}] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:19 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[p]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["foo bar baz];RZ1000(23:1,12 [1] ) - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; + Code span - Gen - [if(foo) {LF var p = "foo bar bazLF;LF}] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:19 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[p]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["foo bar baz];RZ1000(23:1,12 [1] ) + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesNormalStringAtEndOfFile.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesNormalStringAtEndOfFile.syntaxtree.txt index 6648ce44b9..f62bdc8820 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesNormalStringAtEndOfFile.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesNormalStringAtEndOfFile.syntaxtree.txt @@ -1,16 +1,16 @@ Statement block - Gen - 45 - (0:0,0) - Code span - Gen - [if(foo) { var foo = "blah blah blah blah blah] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:14 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;["blah blah blah blah blah];RZ1000(20:0,20 [1] ) + Code span - Gen - [if(foo) { var foo = "blah blah blah blah blah] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:14 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;["blah blah blah blah blah];RZ1000(20:0,20 [1] ) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen.syntaxtree.txt index 4e53aa8634..c0593ccb6f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesUsingBlockAtEOLWhenRecoveringFromMissingCloseParen.syntaxtree.txt @@ -1,8 +1,8 @@ Statement block - Gen - 15 - (0:0,0) - Code span - Gen - [using(foo barLF] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:6 - CSharpSymbolType.Keyword;[using]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.NewLine;[LF]; + Code span - Gen - [using(foo barLF] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:6 + CSharpTokenType.Keyword;[using]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.NewLine;[LF]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesVerbatimStringAtEndOfFile.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesVerbatimStringAtEndOfFile.syntaxtree.txt index 4137bfde8d..b657dfb7d1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesVerbatimStringAtEndOfFile.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesVerbatimStringAtEndOfFile.syntaxtree.txt @@ -1,16 +1,16 @@ Statement block - Gen - 60 - (0:0,0) - Code span - Gen - [if(foo) { var foo = @"blah LFblah; LF

Foo

LFblah LFblah] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:14 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.StringLiteral;[@"blah LFblah; LF

Foo

LFblah LFblah];RZ1000(20:0,20 [1] ) + Code span - Gen - [if(foo) { var foo = @"blah LFblah; LF

Foo

LFblah LFblah] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:14 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.StringLiteral;[@"blah LFblah; LF

Foo

LFblah LFblah];RZ1000(20:0,20 [1] ) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesWhileClauseInDoStatementAtEOLWhenRecoveringFromMissingCloseParen.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesWhileClauseInDoStatementAtEOLWhenRecoveringFromMissingCloseParen.syntaxtree.txt index 44c82a424c..9f5bb09d03 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesWhileClauseInDoStatementAtEOLWhenRecoveringFromMissingCloseParen.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockTerminatesWhileClauseInDoStatementAtEOLWhenRecoveringFromMissingCloseParen.syntaxtree.txt @@ -1,14 +1,14 @@ Statement block - Gen - 22 - (0:0,0) - Code span - Gen - [do { } while(foo barLF] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:12 - CSharpSymbolType.Keyword;[do]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[while]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.NewLine;[LF]; + Code span - Gen - [do { } while(foo barLF] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:12 + CSharpTokenType.Keyword;[do]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[while]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.NewLine;[LF]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockWithHelperDirectiveProducesError.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockWithHelperDirectiveProducesError.syntaxtree.txt index b3da1fc769..1454016ba1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockWithHelperDirectiveProducesError.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockWithHelperDirectiveProducesError.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 7 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [helper] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[helper]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [helper] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[helper]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockWithNestedCodeBlockProducesError.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockWithNestedCodeBlockProducesError.syntaxtree.txt index 9507be3472..bf52f4c935 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockWithNestedCodeBlockProducesError.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ParseBlockWithNestedCodeBlockProducesError.syntaxtree.txt @@ -1,20 +1,20 @@ Statement block - Gen - 11 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [if { ] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:4 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [if { ] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:4 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; Statement block - Gen - 3 - (6:0,6) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (6:0,6) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (7:0,7) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (8:0,8) - Symbols:1 - CSharpSymbolType.Unknown;[]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (8:0,8) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; - Code span - Gen - [ }] - SpanEditHandler;Accepts:Any - (9:0,9) - Symbols:2 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (7:0,7) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (8:0,8) - Tokens:1 + CSharpTokenType.Unknown;[]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:1 + CSharpTokenType.RightBrace;[}]; + Code span - Gen - [ }] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:2 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptConsecutiveEscapedQuotesInNonVerbatimStrings.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptConsecutiveEscapedQuotesInNonVerbatimStrings.syntaxtree.txt index 26d9034003..ab2776cd54 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptConsecutiveEscapedQuotesInNonVerbatimStrings.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptConsecutiveEscapedQuotesInNonVerbatimStrings.syntaxtree.txt @@ -1,9 +1,9 @@ Expression block - Gen - 9 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.LeftParenthesis;[(]; - Code span - Gen - ["\"\""] - SpanEditHandler;Accepts:Any - (2:0,2) - Symbols:1 - CSharpSymbolType.StringLiteral;["\"\""]; - MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (8:0,8) - Symbols:1 - CSharpSymbolType.RightParenthesis;[)]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.LeftParenthesis;[(]; + Code span - Gen - ["\"\""] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1 + CSharpTokenType.StringLiteral;["\"\""]; + MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:1 + CSharpTokenType.RightParenthesis;[)]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptConsecutiveEscapedQuotesInVerbatimStrings.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptConsecutiveEscapedQuotesInVerbatimStrings.syntaxtree.txt index 48f34c6ffb..173672adb1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptConsecutiveEscapedQuotesInVerbatimStrings.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptConsecutiveEscapedQuotesInVerbatimStrings.syntaxtree.txt @@ -1,9 +1,9 @@ Expression block - Gen - 10 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.LeftParenthesis;[(]; - Code span - Gen - [@""""""] - SpanEditHandler;Accepts:Any - (2:0,2) - Symbols:1 - CSharpSymbolType.StringLiteral;[@""""""]; - MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (9:0,9) - Symbols:1 - CSharpSymbolType.RightParenthesis;[)]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.LeftParenthesis;[(]; + Code span - Gen - [@""""""] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1 + CSharpTokenType.StringLiteral;[@""""""]; + MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:1 + CSharpTokenType.RightParenthesis;[)]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptEscapedQuoteInNonVerbatimStrings.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptEscapedQuoteInNonVerbatimStrings.syntaxtree.txt index dbdf46f11a..28ef6bad21 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptEscapedQuoteInNonVerbatimStrings.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptEscapedQuoteInNonVerbatimStrings.syntaxtree.txt @@ -1,9 +1,9 @@ Expression block - Gen - 7 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.LeftParenthesis;[(]; - Code span - Gen - ["\""] - SpanEditHandler;Accepts:Any - (2:0,2) - Symbols:1 - CSharpSymbolType.StringLiteral;["\""]; - MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (6:0,6) - Symbols:1 - CSharpSymbolType.RightParenthesis;[)]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.LeftParenthesis;[(]; + Code span - Gen - ["\""] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1 + CSharpTokenType.StringLiteral;["\""]; + MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:1 + CSharpTokenType.RightParenthesis;[)]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptEscapedQuoteInVerbatimStrings.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptEscapedQuoteInVerbatimStrings.syntaxtree.txt index baa41dc569..e8c4fd0f60 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptEscapedQuoteInVerbatimStrings.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptEscapedQuoteInVerbatimStrings.syntaxtree.txt @@ -1,9 +1,9 @@ Expression block - Gen - 8 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.LeftParenthesis;[(]; - Code span - Gen - [@""""] - SpanEditHandler;Accepts:Any - (2:0,2) - Symbols:1 - CSharpSymbolType.StringLiteral;[@""""]; - MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (7:0,7) - Symbols:1 - CSharpSymbolType.RightParenthesis;[)]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.LeftParenthesis;[(]; + Code span - Gen - [@""""] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1 + CSharpTokenType.StringLiteral;[@""""]; + MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (7:0,7) - Tokens:1 + CSharpTokenType.RightParenthesis;[)]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptMultiLineVerbatimStrings.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptMultiLineVerbatimStrings.syntaxtree.txt index 6047dfb72a..c30fec9476 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptMultiLineVerbatimStrings.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptMultiLineVerbatimStrings.syntaxtree.txt @@ -1,9 +1,9 @@ Expression block - Gen - 23 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.LeftParenthesis;[(]; - Code span - Gen - [@"LFFooLFBarLFBazLF"] - SpanEditHandler;Accepts:Any - (2:0,2) - Symbols:1 - CSharpSymbolType.StringLiteral;[@"LFFooLFBarLFBazLF"]; - MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (22:4,1) - Symbols:1 - CSharpSymbolType.RightParenthesis;[)]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.LeftParenthesis;[(]; + Code span - Gen - [@"LFFooLFBarLFBazLF"] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1 + CSharpTokenType.StringLiteral;[@"LFFooLFBarLFBazLF"]; + MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (22:4,1) - Tokens:1 + CSharpTokenType.RightParenthesis;[)]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptMultipleEscapedQuotesInNonVerbatimStrings.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptMultipleEscapedQuotesInNonVerbatimStrings.syntaxtree.txt index 6bbfd0acad..054fbe06a9 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptMultipleEscapedQuotesInNonVerbatimStrings.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptMultipleEscapedQuotesInNonVerbatimStrings.syntaxtree.txt @@ -1,9 +1,9 @@ Expression block - Gen - 21 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.LeftParenthesis;[(]; - Code span - Gen - ["\"hello, world\""] - SpanEditHandler;Accepts:Any - (2:0,2) - Symbols:1 - CSharpSymbolType.StringLiteral;["\"hello, world\""]; - MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (20:0,20) - Symbols:1 - CSharpSymbolType.RightParenthesis;[)]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.LeftParenthesis;[(]; + Code span - Gen - ["\"hello, world\""] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1 + CSharpTokenType.StringLiteral;["\"hello, world\""]; + MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:1 + CSharpTokenType.RightParenthesis;[)]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptMultipleEscapedQuotesInVerbatimStrings.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptMultipleEscapedQuotesInVerbatimStrings.syntaxtree.txt index 4e54ffe339..a77e2669da 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptMultipleEscapedQuotesInVerbatimStrings.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptMultipleEscapedQuotesInVerbatimStrings.syntaxtree.txt @@ -1,9 +1,9 @@ Expression block - Gen - 22 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.LeftParenthesis;[(]; - Code span - Gen - [@"""hello, world"""] - SpanEditHandler;Accepts:Any - (2:0,2) - Symbols:1 - CSharpSymbolType.StringLiteral;[@"""hello, world"""]; - MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (21:0,21) - Symbols:1 - CSharpSymbolType.RightParenthesis;[)]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.LeftParenthesis;[(]; + Code span - Gen - [@"""hello, world"""] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1 + CSharpTokenType.StringLiteral;[@"""hello, world"""]; + MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1 + CSharpTokenType.RightParenthesis;[)]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptMultipleRepeatedEscapedQuoteInVerbatimStrings.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptMultipleRepeatedEscapedQuoteInVerbatimStrings.syntaxtree.txt index 48f34c6ffb..173672adb1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptMultipleRepeatedEscapedQuoteInVerbatimStrings.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldAcceptMultipleRepeatedEscapedQuoteInVerbatimStrings.syntaxtree.txt @@ -1,9 +1,9 @@ Expression block - Gen - 10 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.LeftParenthesis;[(]; - Code span - Gen - [@""""""] - SpanEditHandler;Accepts:Any - (2:0,2) - Symbols:1 - CSharpSymbolType.StringLiteral;[@""""""]; - MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (9:0,9) - Symbols:1 - CSharpSymbolType.RightParenthesis;[)]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.LeftParenthesis;[(]; + Code span - Gen - [@""""""] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1 + CSharpTokenType.StringLiteral;[@""""""]; + MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:1 + CSharpTokenType.RightParenthesis;[)]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpression.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpression.syntaxtree.txt index c3029b551a..f477a803b1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpression.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldOutputZeroLengthCodeSpanIfEOFOccursAfterStartOfExplicitExpression.syntaxtree.txt @@ -1,7 +1,7 @@ Expression block - Gen - 2 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.LeftParenthesis;[(]; - Code span - Gen - [] - SpanEditHandler;Accepts:Any - (2:0,2) - Symbols:1 - CSharpSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.LeftParenthesis;[(]; + Code span - Gen - [] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1 + CSharpTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldOutputZeroLengthCodeSpanIfExplicitExpressionIsEmpty.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldOutputZeroLengthCodeSpanIfExplicitExpressionIsEmpty.syntaxtree.txt index 7a2a258620..ac2afba6aa 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldOutputZeroLengthCodeSpanIfExplicitExpressionIsEmpty.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpExplicitExpressionTest/ParseBlockShouldOutputZeroLengthCodeSpanIfExplicitExpressionIsEmpty.syntaxtree.txt @@ -1,9 +1,9 @@ Expression block - Gen - 3 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.LeftParenthesis;[(]; - Code span - Gen - [] - SpanEditHandler;Accepts:Any - (2:0,2) - Symbols:1 - CSharpSymbolType.Unknown;[]; - MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (2:0,2) - Symbols:1 - CSharpSymbolType.RightParenthesis;[)]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.LeftParenthesis;[(]; + Code span - Gen - [] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1 + CSharpTokenType.Unknown;[]; + MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (2:0,2) - Tokens:1 + CSharpTokenType.RightParenthesis;[)]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/NestedImplicitExpression.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/NestedImplicitExpression.syntaxtree.txt index 8f3b31118a..ca459f326c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/NestedImplicitExpression.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/NestedImplicitExpression.syntaxtree.txt @@ -1,18 +1,18 @@ Statement block - Gen - 18 - (0:0,0) - Code span - Gen - [if (true) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:8 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; + Code span - Gen - [if (true) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:8 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; Expression block - Gen - 4 - (12:0,12) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (13:0,13) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; - Code span - Gen - [ }] - SpanEditHandler;Accepts:Any - (16:0,16) - Symbols:2 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (13:0,13) - Tokens:1 + CSharpTokenType.Identifier;[foo]; + Code span - Gen - [ }] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:2 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockAcceptsNonEnglishCharactersThatAreValidIdentifiers.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockAcceptsNonEnglishCharactersThatAreValidIdentifiers.syntaxtree.txt index b5629747fd..7d0e4caeab 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockAcceptsNonEnglishCharactersThatAreValidIdentifiers.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockAcceptsNonEnglishCharactersThatAreValidIdentifiers.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 8 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [हळूँजद॔] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[हळूँजद॔]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [हळूँजद॔] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[हळूँजद॔]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodDoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodDoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace.syntaxtree.txt index 368cbec988..8967206fd1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodDoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodDoesNotAcceptSemicolonIfExpressionTerminatedByWhitespace.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 4 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[foo]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodDoesNotIncludeDotAtEOFInImplicitExpression.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodDoesNotIncludeDotAtEOFInImplicitExpression.syntaxtree.txt index 1a5b3d317b..a319543617 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodDoesNotIncludeDotAtEOFInImplicitExpression.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodDoesNotIncludeDotAtEOFInImplicitExpression.syntaxtree.txt @@ -1,7 +1,7 @@ Expression block - Gen - 8 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo.bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:3 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[bar]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo.bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:3 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[bar]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodDoesNotIncludeDotFollowedByInvalidIdentifierCharacterInImplicitExpression1.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodDoesNotIncludeDotFollowedByInvalidIdentifierCharacterInImplicitExpression1.syntaxtree.txt index 1a5b3d317b..a319543617 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodDoesNotIncludeDotFollowedByInvalidIdentifierCharacterInImplicitExpression1.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodDoesNotIncludeDotFollowedByInvalidIdentifierCharacterInImplicitExpression1.syntaxtree.txt @@ -1,7 +1,7 @@ Expression block - Gen - 8 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo.bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:3 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[bar]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo.bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:3 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[bar]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodDoesNotIncludeDotFollowedByInvalidIdentifierCharacterInImplicitExpression2.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodDoesNotIncludeDotFollowedByInvalidIdentifierCharacterInImplicitExpression2.syntaxtree.txt index 1a5b3d317b..a319543617 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodDoesNotIncludeDotFollowedByInvalidIdentifierCharacterInImplicitExpression2.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodDoesNotIncludeDotFollowedByInvalidIdentifierCharacterInImplicitExpression2.syntaxtree.txt @@ -1,7 +1,7 @@ Expression block - Gen - 8 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo.bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:3 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[bar]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo.bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:3 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[bar]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodDoesNotIncludeSemicolonAfterDot.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodDoesNotIncludeSemicolonAfterDot.syntaxtree.txt index 1a5b3d317b..a319543617 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodDoesNotIncludeSemicolonAfterDot.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodDoesNotIncludeSemicolonAfterDot.syntaxtree.txt @@ -1,7 +1,7 @@ Expression block - Gen - 8 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo.bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:3 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[bar]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo.bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:3 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[bar]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodIgnoresSemicolonAtEndOfDottedIdentifiers.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodIgnoresSemicolonAtEndOfDottedIdentifiers.syntaxtree.txt index d523e84810..b130a21495 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodIgnoresSemicolonAtEndOfDottedIdentifiers.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodIgnoresSemicolonAtEndOfDottedIdentifiers.syntaxtree.txt @@ -1,9 +1,9 @@ Expression block - Gen - 12 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo.bar.baz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:5 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[baz]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo.bar.baz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:5 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[baz]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodIgnoresSemicolonAtEndOfSimpleImplicitExpression.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodIgnoresSemicolonAtEndOfSimpleImplicitExpression.syntaxtree.txt index 368cbec988..8967206fd1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodIgnoresSemicolonAtEndOfSimpleImplicitExpression.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodIgnoresSemicolonAtEndOfSimpleImplicitExpression.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 4 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[foo]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesDottedIdentifiersAsImplicitExpression.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesDottedIdentifiersAsImplicitExpression.syntaxtree.txt index d523e84810..b130a21495 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesDottedIdentifiersAsImplicitExpression.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesDottedIdentifiersAsImplicitExpression.syntaxtree.txt @@ -1,9 +1,9 @@ Expression block - Gen - 12 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo.bar.baz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:5 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[baz]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo.bar.baz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:5 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[baz]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket1.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket1.syntaxtree.txt index d123ee18bd..d0922098d3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket1.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket1.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 4 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[val]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[val]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket10.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket10.syntaxtree.txt index 57d0b46d99..a03e6f1514 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket10.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket10.syntaxtree.txt @@ -1,10 +1,10 @@ Expression block - Gen - 9 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val?[-1]] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:6 - CSharpSymbolType.Identifier;[val]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.Minus;[-]; - CSharpSymbolType.IntegerLiteral;[1]; - CSharpSymbolType.RightBracket;[]]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val?[-1]] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:6 + CSharpTokenType.Identifier;[val]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.Minus;[-]; + CSharpTokenType.IntegerLiteral;[1]; + CSharpTokenType.RightBracket;[]]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket11.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket11.syntaxtree.txt index a24dd4c31d..2445b36952 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket11.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket11.syntaxtree.txt @@ -1,12 +1,12 @@ Expression block - Gen - 15 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val?[abc]?[def] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:8 - CSharpSymbolType.Identifier;[val]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.Identifier;[abc]; - CSharpSymbolType.RightBracket;[]]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.Identifier;[def]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val?[abc]?[def] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:8 + CSharpTokenType.Identifier;[val]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.Identifier;[abc]; + CSharpTokenType.RightBracket;[]]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.Identifier;[def]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket12.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket12.syntaxtree.txt index e66d54706b..fcfaadd462 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket12.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket12.syntaxtree.txt @@ -1,13 +1,13 @@ Expression block - Gen - 14 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val?[abc]?[2]] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:9 - CSharpSymbolType.Identifier;[val]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.Identifier;[abc]; - CSharpSymbolType.RightBracket;[]]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.IntegerLiteral;[2]; - CSharpSymbolType.RightBracket;[]]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val?[abc]?[2]] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:9 + CSharpTokenType.Identifier;[val]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.Identifier;[abc]; + CSharpTokenType.RightBracket;[]]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.IntegerLiteral;[2]; + CSharpTokenType.RightBracket;[]]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket13.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket13.syntaxtree.txt index 967b311fc0..3c1fe5005f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket13.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket13.syntaxtree.txt @@ -1,16 +1,16 @@ Expression block - Gen - 22 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val?[abc]?.more?[def]] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:12 - CSharpSymbolType.Identifier;[val]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.Identifier;[abc]; - CSharpSymbolType.RightBracket;[]]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[more]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.Identifier;[def]; - CSharpSymbolType.RightBracket;[]]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val?[abc]?.more?[def]] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:12 + CSharpTokenType.Identifier;[val]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.Identifier;[abc]; + CSharpTokenType.RightBracket;[]]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[more]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.Identifier;[def]; + CSharpTokenType.RightBracket;[]]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket14.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket14.syntaxtree.txt index 2e273fbbca..24b8db6eaf 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket14.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket14.syntaxtree.txt @@ -1,15 +1,15 @@ Expression block - Gen - 21 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val?[abc]?.more?.abc] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:11 - CSharpSymbolType.Identifier;[val]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.Identifier;[abc]; - CSharpSymbolType.RightBracket;[]]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[more]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[abc]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val?[abc]?.more?.abc] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:11 + CSharpTokenType.Identifier;[val]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.Identifier;[abc]; + CSharpTokenType.RightBracket;[]]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[more]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[abc]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket15.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket15.syntaxtree.txt index a6398e5589..d8b3eb81dd 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket15.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket15.syntaxtree.txt @@ -1,13 +1,13 @@ Expression block - Gen - 19 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val?[null ?? true]] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:9 - CSharpSymbolType.Identifier;[val]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.Keyword;[null]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NullCoalesce;[??]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightBracket;[]]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val?[null ?? true]] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:9 + CSharpTokenType.Identifier;[val]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.Keyword;[null]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NullCoalesce;[??]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightBracket;[]]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket16.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket16.syntaxtree.txt index d009d78db8..6cef2a04b9 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket16.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket16.syntaxtree.txt @@ -1,17 +1,17 @@ Expression block - Gen - 20 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val?[abc?.gef?[-1]]] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:13 - CSharpSymbolType.Identifier;[val]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.Identifier;[abc]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[gef]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.Minus;[-]; - CSharpSymbolType.IntegerLiteral;[1]; - CSharpSymbolType.RightBracket;[]]; - CSharpSymbolType.RightBracket;[]]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val?[abc?.gef?[-1]]] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:13 + CSharpTokenType.Identifier;[val]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.Identifier;[abc]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[gef]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.Minus;[-]; + CSharpTokenType.IntegerLiteral;[1]; + CSharpTokenType.RightBracket;[]]; + CSharpTokenType.RightBracket;[]]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket2.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket2.syntaxtree.txt index d123ee18bd..d0922098d3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket2.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket2.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 4 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[val]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[val]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket3.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket3.syntaxtree.txt index b96658c322..6323d68f11 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket3.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket3.syntaxtree.txt @@ -1,7 +1,7 @@ Expression block - Gen - 6 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val?[] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:3 - CSharpSymbolType.Identifier;[val]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.LeftBracket;[[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val?[] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:3 + CSharpTokenType.Identifier;[val]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.LeftBracket;[[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket4.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket4.syntaxtree.txt index d123ee18bd..d0922098d3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket4.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket4.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 4 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[val]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[val]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket5.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket5.syntaxtree.txt index 2e6a035938..a46eeb9133 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket5.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket5.syntaxtree.txt @@ -1,8 +1,8 @@ Expression block - Gen - 10 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val?[more] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:4 - CSharpSymbolType.Identifier;[val]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.Identifier;[more]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val?[more] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:4 + CSharpTokenType.Identifier;[val]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.Identifier;[more]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket6.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket6.syntaxtree.txt index 58bc580be4..b57c6e2517 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket6.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket6.syntaxtree.txt @@ -1,9 +1,9 @@ Expression block - Gen - 8 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val?[0]] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:5 - CSharpSymbolType.Identifier;[val]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.RightBracket;[]]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val?[0]] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:5 + CSharpTokenType.Identifier;[val]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.RightBracket;[]]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket7.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket7.syntaxtree.txt index b96658c322..6323d68f11 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket7.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket7.syntaxtree.txt @@ -1,7 +1,7 @@ Expression block - Gen - 6 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val?[] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:3 - CSharpSymbolType.Identifier;[val]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.LeftBracket;[[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val?[] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:3 + CSharpTokenType.Identifier;[val]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.LeftBracket;[[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket8.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket8.syntaxtree.txt index 0dfa555f8a..61ca8525a6 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket8.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket8.syntaxtree.txt @@ -1,9 +1,9 @@ Expression block - Gen - 11 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val?[more.] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:5 - CSharpSymbolType.Identifier;[val]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.Identifier;[more]; - CSharpSymbolType.Dot;[.]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val?[more.] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:5 + CSharpTokenType.Identifier;[val]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.Identifier;[more]; + CSharpTokenType.Dot;[.]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket9.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket9.syntaxtree.txt index d123ee18bd..d0922098d3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket9.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket9.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 4 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[val]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[val]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot1.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot1.syntaxtree.txt index d123ee18bd..d0922098d3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot1.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot1.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 4 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[val]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[val]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot10.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot10.syntaxtree.txt index 0eaead0945..957c73bbe7 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot10.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot10.syntaxtree.txt @@ -1,8 +1,8 @@ Expression block - Gen - 10 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val?.more] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:4 - CSharpSymbolType.Identifier;[val]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[more]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val?.more] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:4 + CSharpTokenType.Identifier;[val]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[more]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot11.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot11.syntaxtree.txt index d123ee18bd..d0922098d3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot11.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot11.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 4 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[val]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[val]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot12.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot12.syntaxtree.txt index 89110e1265..0a0c3e1a67 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot12.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot12.syntaxtree.txt @@ -1,13 +1,13 @@ Expression block - Gen - 19 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val?.more(false)?.] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:9 - CSharpSymbolType.Identifier;[val]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[more]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[false]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.Dot;[.]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val?.more(false)?.] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:9 + CSharpTokenType.Identifier;[val]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[more]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[false]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.Dot;[.]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot13.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot13.syntaxtree.txt index 0dedbf3852..8f54d19b74 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot13.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot13.syntaxtree.txt @@ -1,14 +1,14 @@ Expression block - Gen - 22 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val?.more(false)?.abc] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:10 - CSharpSymbolType.Identifier;[val]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[more]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[false]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[abc]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val?.more(false)?.abc] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:10 + CSharpTokenType.Identifier;[val]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[more]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[false]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[abc]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot14.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot14.syntaxtree.txt index 5f69aab1bf..bfb8b54625 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot14.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot14.syntaxtree.txt @@ -1,18 +1,18 @@ Expression block - Gen - 29 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val?.more(null ?? true)?.abc] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:14 - CSharpSymbolType.Identifier;[val]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[more]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[null]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NullCoalesce;[??]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[abc]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val?.more(null ?? true)?.abc] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:14 + CSharpTokenType.Identifier;[val]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[more]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[null]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NullCoalesce;[??]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[abc]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot2.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot2.syntaxtree.txt index d123ee18bd..d0922098d3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot2.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot2.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 4 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[val]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[val]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot3.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot3.syntaxtree.txt index d123ee18bd..d0922098d3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot3.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot3.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 4 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[val]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[val]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot4.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot4.syntaxtree.txt index d123ee18bd..d0922098d3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot4.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot4.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 4 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[val]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[val]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot5.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot5.syntaxtree.txt index 141b205dac..3860072ffb 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot5.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot5.syntaxtree.txt @@ -1,7 +1,7 @@ Expression block - Gen - 6 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val?.] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:3 - CSharpSymbolType.Identifier;[val]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.Dot;[.]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val?.] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:3 + CSharpTokenType.Identifier;[val]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.Dot;[.]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot6.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot6.syntaxtree.txt index d123ee18bd..d0922098d3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot6.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot6.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 4 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[val]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[val]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot7.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot7.syntaxtree.txt index 141b205dac..3860072ffb 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot7.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot7.syntaxtree.txt @@ -1,7 +1,7 @@ Expression block - Gen - 6 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val?.] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:3 - CSharpSymbolType.Identifier;[val]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.Dot;[.]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val?.] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:3 + CSharpTokenType.Identifier;[val]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.Dot;[.]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot8.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot8.syntaxtree.txt index 141b205dac..3860072ffb 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot8.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot8.syntaxtree.txt @@ -1,7 +1,7 @@ Expression block - Gen - 6 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val?.] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:3 - CSharpSymbolType.Identifier;[val]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.Dot;[.]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val?.] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:3 + CSharpTokenType.Identifier;[val]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.Dot;[.]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot9.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot9.syntaxtree.txt index 0eaead0945..957c73bbe7 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot9.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Dot9.syntaxtree.txt @@ -1,8 +1,8 @@ Expression block - Gen - 10 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [val?.more] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:4 - CSharpSymbolType.Identifier;[val]; - CSharpSymbolType.QuestionMark;[?]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[more]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [val?.more] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:4 + CSharpTokenType.Identifier;[val]; + CSharpTokenType.QuestionMark;[?]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[more]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesSingleIdentifierAsImplicitExpression.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesSingleIdentifierAsImplicitExpression.syntaxtree.txt index 368cbec988..8967206fd1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesSingleIdentifierAsImplicitExpression.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodParsesSingleIdentifierAsImplicitExpression.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 4 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[foo]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodTerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpression.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodTerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpression.syntaxtree.txt index 1a5b3d317b..a319543617 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodTerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpression.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockMethodTerminatesAfterIdentifierUnlessFollowedByDotOrParenInImplicitExpression.syntaxtree.txt @@ -1,7 +1,7 @@ Expression block - Gen - 8 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo.bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:3 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[bar]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo.bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:3 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[bar]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockOutputExpressionIfModuleTokenNotFollowedByBrace.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockOutputExpressionIfModuleTokenNotFollowedByBrace.syntaxtree.txt index 15553d9fec..e32608be70 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockOutputExpressionIfModuleTokenNotFollowedByBrace.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockOutputExpressionIfModuleTokenNotFollowedByBrace.syntaxtree.txt @@ -1,9 +1,9 @@ Expression block - Gen - 13 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [module.foo()] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:5 - CSharpSymbolType.Identifier;[module]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [module.foo()] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:5 + CSharpTokenType.Identifier;[module]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockOutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockOutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.syntaxtree.txt index 2ce6cbbd8a..8f8de632d0 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockOutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockOutputsZeroLengthCodeSpanIfEOFOccursAfterTransition.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 1 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockOutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockOutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.syntaxtree.txt index 2ce6cbbd8a..8f8de632d0 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockOutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockOutputsZeroLengthCodeSpanIfInvalidCharacterFollowsTransition.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 1 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockProperlyParsesBracketsAndBalancesThemInImplicitExpression.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockProperlyParsesBracketsAndBalancesThemInImplicitExpression.syntaxtree.txt index e128b8b59d..b600515ce2 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockProperlyParsesBracketsAndBalancesThemInImplicitExpression.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockProperlyParsesBracketsAndBalancesThemInImplicitExpression.syntaxtree.txt @@ -1,25 +1,25 @@ Expression block - Gen - 34 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo.bar[4 * (8 + 7)]["fo\"o"].baz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:21 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.IntegerLiteral;[4]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Star;[*]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.IntegerLiteral;[8]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Plus;[+]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[7]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.RightBracket;[]]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.StringLiteral;["fo\"o"]; - CSharpSymbolType.RightBracket;[]]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[baz]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo.bar[4 * (8 + 7)]["fo\"o"].baz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:21 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.IntegerLiteral;[4]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Star;[*]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.IntegerLiteral;[8]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Plus;[+]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[7]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.RightBracket;[]]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.StringLiteral;["fo\"o"]; + CSharpTokenType.RightBracket;[]]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[baz]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockProperlyParsesParenthesesAndBalancesThemInImplicitExpression.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockProperlyParsesParenthesesAndBalancesThemInImplicitExpression.syntaxtree.txt index 5367db8cc1..860b824f83 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockProperlyParsesParenthesesAndBalancesThemInImplicitExpression.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockProperlyParsesParenthesesAndBalancesThemInImplicitExpression.syntaxtree.txt @@ -1,63 +1,63 @@ Expression block - Gen - 115 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo().bar("bi\"z", 4)("chained method; call").baz(@"bo""z", '\'', () => { return 4; }, (4+5+new { foo = bar[4] }))] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:59 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;["bi\"z"]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[4]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;["chained method; call"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;[@"bo""z"]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.CharacterLiteral;['\'']; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.GreaterThanEqual;[=>]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[return]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[4]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.IntegerLiteral;[4]; - CSharpSymbolType.Plus;[+]; - CSharpSymbolType.IntegerLiteral;[5]; - CSharpSymbolType.Plus;[+]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftBracket;[[]; - CSharpSymbolType.IntegerLiteral;[4]; - CSharpSymbolType.RightBracket;[]]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.RightParenthesis;[)]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo().bar("bi\"z", 4)("chained method; call").baz(@"bo""z", '\'', () => { return 4; }, (4+5+new { foo = bar[4] }))] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:59 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;["bi\"z"]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[4]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;["chained method; call"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;[@"bo""z"]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.CharacterLiteral;['\'']; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.GreaterThanEqual;[=>]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[return]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[4]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.IntegerLiteral;[4]; + CSharpTokenType.Plus;[+]; + CSharpTokenType.IntegerLiteral;[5]; + CSharpTokenType.Plus;[+]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftBracket;[[]; + CSharpTokenType.IntegerLiteral;[4]; + CSharpTokenType.RightBracket;[]]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.RightParenthesis;[)]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockStopsBalancingParenthesesAtEOF.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockStopsBalancingParenthesesAtEOF.syntaxtree.txt index 0c5b1d37b3..baef337685 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockStopsBalancingParenthesesAtEOF.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockStopsBalancingParenthesesAtEOF.syntaxtree.txt @@ -1,8 +1,8 @@ Expression block - Gen - 7 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo(()] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:4 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo(()] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:4 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockSupportsSlashesWithinComplexImplicitExpressions.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockSupportsSlashesWithinComplexImplicitExpressions.syntaxtree.txt index 6e2ba2e015..00f9a55723 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockSupportsSlashesWithinComplexImplicitExpressions.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockSupportsSlashesWithinComplexImplicitExpressions.syntaxtree.txt @@ -1,39 +1,39 @@ Expression block - Gen - 103 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [DataGridColumn.Template("Years of Service", e => (int)Math.Round((DateTime.Now - dt).TotalDays / 365))] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:35 - CSharpSymbolType.Identifier;[DataGridColumn]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Template]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;["Years of Service"]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[e]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.GreaterThanEqual;[=>]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Identifier;[Math]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Round]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[DateTime]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Now]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Minus;[-]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[dt]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[TotalDays]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Slash;[/]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[365]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.RightParenthesis;[)]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [DataGridColumn.Template("Years of Service", e => (int)Math.Round((DateTime.Now - dt).TotalDays / 365))] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:35 + CSharpTokenType.Identifier;[DataGridColumn]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Template]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;["Years of Service"]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[e]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.GreaterThanEqual;[=>]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Identifier;[Math]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Round]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[DateTime]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Now]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Minus;[-]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[dt]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[TotalDays]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Slash;[/]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[365]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.RightParenthesis;[)]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionAtHtmlEndTag.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionAtHtmlEndTag.syntaxtree.txt index 1a9757cdf3..505ddd1f05 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionAtHtmlEndTag.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionAtHtmlEndTag.syntaxtree.txt @@ -1,11 +1,11 @@ Expression block - Gen - 14 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo().bar.baz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:7 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[baz]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo().bar.baz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:7 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[baz]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionAtHtmlStartTag.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionAtHtmlStartTag.syntaxtree.txt index 1a9757cdf3..505ddd1f05 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionAtHtmlStartTag.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionAtHtmlStartTag.syntaxtree.txt @@ -1,11 +1,11 @@ Expression block - Gen - 14 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo().bar.baz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:7 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[baz]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo().bar.baz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:7 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[baz]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace.syntaxtree.txt index 368cbec988..8967206fd1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionAtLastValidPointIfDotFollowedByWhitespace.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 4 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[foo]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionBeforeDotIfDotNotFollowedByIdentifierStartCharacter.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionBeforeDotIfDotNotFollowedByIdentifierStartCharacter.syntaxtree.txt index 1a9757cdf3..505ddd1f05 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionBeforeDotIfDotNotFollowedByIdentifierStartCharacter.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionBeforeDotIfDotNotFollowedByIdentifierStartCharacter.syntaxtree.txt @@ -1,11 +1,11 @@ Expression block - Gen - 14 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo().bar.baz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:7 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[baz]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo().bar.baz] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:7 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[baz]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace.syntaxtree.txt index 9e5423ea30..7dc1a3a043 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionIfCloseParenFollowedByAnyWhiteSpace.syntaxtree.txt @@ -1,9 +1,9 @@ Expression block - Gen - 10 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo.bar()] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:5 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo.bar()] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:5 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace.syntaxtree.txt index 368cbec988..8967206fd1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpImplicitExpressionTest/ParseBlockTerminatesImplicitExpressionIfIdentifierFollowedByAnyWhiteSpace.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 4 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[foo]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedCodeBlock.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedCodeBlock.syntaxtree.txt index 550209a3d4..f34e002cbb 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedCodeBlock.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedCodeBlock.syntaxtree.txt @@ -1,29 +1,29 @@ Statement block - Gen - 35 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [while(true) { { { { foo(); } } } }] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:25 - CSharpSymbolType.Keyword;[while]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [while(true) { { { { foo(); } } } }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:25 + CSharpTokenType.Keyword;[while]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedExplicitExpression.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedExplicitExpression.syntaxtree.txt index 969e6055f8..e7571bdb11 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedExplicitExpression.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedExplicitExpression.syntaxtree.txt @@ -1,23 +1,23 @@ Statement block - Gen - 23 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [while(true) { ] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:7 - CSharpSymbolType.Keyword;[while]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [while(true) { ] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:7 + CSharpTokenType.Keyword;[while]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; Expression block - Gen - 6 - (15:0,15) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (16:0,16) - Symbols:1 - CSharpSymbolType.LeftParenthesis;[(]; - Code span - Gen - [foo] - SpanEditHandler;Accepts:Any - (17:0,17) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; - MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (20:0,20) - Symbols:1 - CSharpSymbolType.RightParenthesis;[)]; - Code span - Gen - [ }] - SpanEditHandler;Accepts:None - (21:0,21) - Symbols:2 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1 + CSharpTokenType.LeftParenthesis;[(]; + Code span - Gen - [foo] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1 + CSharpTokenType.Identifier;[foo]; + MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:1 + CSharpTokenType.RightParenthesis;[)]; + Code span - Gen - [ }] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:2 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedImplicitExpression.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedImplicitExpression.syntaxtree.txt index 0cf648e8cb..2f0e49b1ad 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedImplicitExpression.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedImplicitExpression.syntaxtree.txt @@ -1,19 +1,19 @@ Statement block - Gen - 21 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [while(true) { ] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:7 - CSharpSymbolType.Keyword;[while]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [while(true) { ] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:7 + CSharpTokenType.Keyword;[while]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; Expression block - Gen - 4 - (15:0,15) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (16:0,16) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; - Code span - Gen - [ }] - SpanEditHandler;Accepts:None - (19:0,19) - Symbols:2 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[ATD];K14 - (16:0,16) - Tokens:1 + CSharpTokenType.Identifier;[foo]; + Code span - Gen - [ }] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:2 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedKeywordStatement.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedKeywordStatement.syntaxtree.txt index 506479fe91..f7c3782b99 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedKeywordStatement.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedKeywordStatement.syntaxtree.txt @@ -1,43 +1,43 @@ Statement block - Gen - 55 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [while(true) { for(int i = 0; i < 10; i++) { foo(); } }] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:39 - CSharpSymbolType.Keyword;[while]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[for]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[10]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.Increment;[++]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [while(true) { for(int i = 0; i < 10; i++) { foo(); } }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:39 + CSharpTokenType.Keyword;[while]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[for]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[10]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.Increment;[++]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedMarkupBlock.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedMarkupBlock.syntaxtree.txt index b37c94671c..8293783918 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedMarkupBlock.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedMarkupBlock.syntaxtree.txt @@ -1,30 +1,30 @@ Statement block - Gen - 29 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [while(true) {] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:6 - CSharpSymbolType.Keyword;[while]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [while(true) {] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:6 + CSharpTokenType.Keyword;[while]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 14 - (14:0,14) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (14:0,14) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 3 - (15:0,15) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (15:0,15) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [Hello] - SpanEditHandler;Accepts:Any - (18:0,18) - Symbols:1 - HtmlSymbolType.Text;[Hello]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [Hello] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1 + HtmlTokenType.Text;[Hello]; Tag block - Gen - 4 - (23:0,23) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (23:0,23) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (27:0,27) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; - Code span - Gen - [}] - SpanEditHandler;Accepts:None - (28:0,28) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; + Code span - Gen - [}] - SpanEditHandler;Accepts:None - (28:0,28) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedSimpleStatement.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedSimpleStatement.syntaxtree.txt index a7645b93aa..5a2eb3d2e3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedSimpleStatement.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedSimpleStatement.syntaxtree.txt @@ -1,17 +1,17 @@ Statement block - Gen - 23 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [while(true) { foo(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:13 - CSharpSymbolType.Keyword;[while]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [while(true) { foo(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:13 + CSharpTokenType.Keyword;[while]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/EmptyRazorComment.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/EmptyRazorComment.syntaxtree.txt index 87e94e8487..23850e4407 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/EmptyRazorComment.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/EmptyRazorComment.syntaxtree.txt @@ -1,16 +1,16 @@ Markup block - Gen - 4 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Comment block - Gen - 4 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [] - SpanEditHandler;Accepts:Any - (2:0,2) - Symbols:1 - HtmlSymbolType.Unknown;[]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (2:0,2) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (3:0,3) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (4:0,4) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Comment span - Gen - [] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1 + HtmlTokenType.Unknown;[]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (2:0,2) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentInMarkup.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentInMarkup.syntaxtree.txt index fb0fc05609..7c36168330 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentInMarkup.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentInMarkup.syntaxtree.txt @@ -1,43 +1,43 @@ Markup block - Gen - 25 - (0:0,0) Tag block - Gen - 3 - (0:0,0) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (3:0,3) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (5:1,0) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1 + HtmlTokenType.NewLine;[LF]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (5:1,0) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Comment block - Gen - 4 - (7:1,2) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (7:1,2) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (8:1,3) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [] - SpanEditHandler;Accepts:Any - (9:1,4) - Symbols:1 - HtmlSymbolType.Unknown;[]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (9:1,4) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (10:1,5) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - Markup span - Gen - [ LF] - SpanEditHandler;Accepts:Any - (11:1,6) - Symbols:2 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.NewLine;[LF]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (7:1,2) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (8:1,3) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Comment span - Gen - [] - SpanEditHandler;Accepts:Any - (9:1,4) - Tokens:1 + HtmlTokenType.Unknown;[]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (9:1,4) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (10:1,5) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + Markup span - Gen - [ LF] - SpanEditHandler;Accepts:Any - (11:1,6) - Tokens:2 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.NewLine;[LF]; Comment block - Gen - 4 - (15:2,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (15:2,0) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (16:2,1) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [] - SpanEditHandler;Accepts:Any - (17:2,2) - Symbols:1 - HtmlSymbolType.Unknown;[]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (17:2,2) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (18:2,3) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (19:2,4) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (15:2,0) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (16:2,1) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Comment span - Gen - [] - SpanEditHandler;Accepts:Any - (17:2,2) - Tokens:1 + HtmlTokenType.Unknown;[]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (17:2,2) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (18:2,3) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (19:2,4) - Tokens:1 + HtmlTokenType.NewLine;[LF]; Tag block - Gen - 4 - (21:3,0) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (21:3,0) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (21:3,0) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentsInSameLineInMarkup.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentsInSameLineInMarkup.syntaxtree.txt index 8e60c9043c..89fc73cdc8 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentsInSameLineInMarkup.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentsInSameLineInMarkup.syntaxtree.txt @@ -1,42 +1,42 @@ Markup block - Gen - 21 - (0:0,0) Tag block - Gen - 3 - (0:0,0) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (3:0,3) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1 + HtmlTokenType.NewLine;[LF]; Comment block - Gen - 4 - (5:1,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (5:1,0) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (6:1,1) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [] - SpanEditHandler;Accepts:Any - (7:1,2) - Symbols:1 - HtmlSymbolType.Unknown;[]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (7:1,2) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (8:1,3) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (9:1,4) - Symbols:1 - HtmlSymbolType.Unknown;[]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (9:1,4) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (5:1,0) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (6:1,1) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Comment span - Gen - [] - SpanEditHandler;Accepts:Any - (7:1,2) - Tokens:1 + HtmlTokenType.Unknown;[]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (7:1,2) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (8:1,3) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (9:1,4) - Tokens:1 + HtmlTokenType.Unknown;[]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (9:1,4) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Comment block - Gen - 4 - (11:1,6) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (11:1,6) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (12:1,7) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [] - SpanEditHandler;Accepts:Any - (13:1,8) - Symbols:1 - HtmlSymbolType.Unknown;[]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (13:1,8) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (14:1,9) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (15:1,10) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (11:1,6) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (12:1,7) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Comment span - Gen - [] - SpanEditHandler;Accepts:Any - (13:1,8) - Tokens:1 + HtmlTokenType.Unknown;[]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (13:1,8) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (14:1,9) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (15:1,10) - Tokens:1 + HtmlTokenType.NewLine;[LF]; Tag block - Gen - 4 - (17:2,0) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (17:2,0) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (17:2,0) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.syntaxtree.txt index 8e31004d17..a720123ae4 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.syntaxtree.txt @@ -1,23 +1,23 @@ Markup block - Gen - 13 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Expression block - Gen - 13 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo(LF] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:3 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.NewLine;[LF]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo(LF] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:3 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.NewLine;[LF]; Comment block - Gen - 4 - (7:1,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (7:1,0) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (8:1,1) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [] - SpanEditHandler;Accepts:Any - (9:1,2) - Symbols:1 - CSharpSymbolType.Unknown;[]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (9:1,2) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (10:1,3) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - Code span - Gen - [LF] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (11:1,4) - Symbols:1 - CSharpSymbolType.NewLine;[LF]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (7:1,0) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (8:1,1) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Comment span - Gen - [] - SpanEditHandler;Accepts:Any - (9:1,2) - Tokens:1 + CSharpTokenType.Unknown;[]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (9:1,2) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (10:1,3) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + Code span - Gen - [LF] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (11:1,4) - Tokens:1 + CSharpTokenType.NewLine;[LF]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInMarkup.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInMarkup.syntaxtree.txt index 8a702cad41..d220dd0bc1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInMarkup.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInMarkup.syntaxtree.txt @@ -1,27 +1,27 @@ Markup block - Gen - 15 - (0:0,0) Tag block - Gen - 3 - (0:0,0) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (3:0,3) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1 + HtmlTokenType.NewLine;[LF]; Comment block - Gen - 4 - (5:1,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (5:1,0) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (6:1,1) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [] - SpanEditHandler;Accepts:Any - (7:1,2) - Symbols:1 - HtmlSymbolType.Unknown;[]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (7:1,2) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (8:1,3) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (9:1,4) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (5:1,0) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (6:1,1) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Comment span - Gen - [] - SpanEditHandler;Accepts:Any - (7:1,2) - Tokens:1 + HtmlTokenType.Unknown;[]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (7:1,2) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (8:1,3) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (9:1,4) - Tokens:1 + HtmlTokenType.NewLine;[LF]; Tag block - Gen - 4 - (11:2,0) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (11:2,0) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (11:2,0) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.syntaxtree.txt index ca37c88848..c83ed3402f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.syntaxtree.txt @@ -1,35 +1,35 @@ Markup block - Gen - 26 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Statement block - Gen - 26 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [LF ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (2:0,2) - Symbols:2 - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [LF ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (2:0,2) - Tokens:2 + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; Markup block - Gen - 18 - (8:1,4) Tag block - Gen - 5 - (8:1,4) - Transition span - Gen - [ - [LF] - SpanEditHandler;Accepts:None - (13:1,9) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (15:2,0) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [ - [LF] - SpanEditHandler;Accepts:None - (13:1,9) - Tokens:1 + HtmlTokenType.NewLine;[LF]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (15:2,0) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Comment block - Gen - 4 - (19:2,4) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (19:2,4) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (20:2,5) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [] - SpanEditHandler;Accepts:Any - (21:2,6) - Symbols:1 - HtmlSymbolType.Unknown;[]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (21:2,6) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (22:2,7) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (23:2,8) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; - Markup span - Gen - [}] - SpanEditHandler;Accepts:Any - (25:3,0) - Symbols:1 - HtmlSymbolType.Text;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (19:2,4) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (20:2,5) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Comment span - Gen - [] - SpanEditHandler;Accepts:Any - (21:2,6) - Tokens:1 + HtmlTokenType.Unknown;[]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (21:2,6) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (22:2,7) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (23:2,8) - Tokens:1 + HtmlTokenType.NewLine;[LF]; + Markup span - Gen - [}] - SpanEditHandler;Accepts:Any - (25:3,0) - Tokens:1 + HtmlTokenType.Text;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentWithExtraNewLineInMarkup.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentWithExtraNewLineInMarkup.syntaxtree.txt index 68282435f9..f1c4b4d734 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentWithExtraNewLineInMarkup.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentWithExtraNewLineInMarkup.syntaxtree.txt @@ -1,43 +1,43 @@ Markup block - Gen - 45 - (0:0,0) Tag block - Gen - 3 - (0:0,0) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [LFLF] - SpanEditHandler;Accepts:Any - (3:0,3) - Symbols:2 - HtmlSymbolType.NewLine;[LF]; - HtmlSymbolType.NewLine;[LF]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [LFLF] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:2 + HtmlTokenType.NewLine;[LF]; + HtmlTokenType.NewLine;[LF]; Comment block - Gen - 13 - (7:2,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (7:2,0) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (8:2,1) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [ content ] - SpanEditHandler;Accepts:Any - (9:2,2) - Symbols:1 - HtmlSymbolType.RazorComment;[ content ]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (18:2,11) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (19:2,12) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (20:2,13) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (7:2,0) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (8:2,1) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Comment span - Gen - [ content ] - SpanEditHandler;Accepts:Any - (9:2,2) - Tokens:1 + HtmlTokenType.RazorComment;[ content ]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (18:2,11) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (19:2,12) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (20:2,13) - Tokens:1 + HtmlTokenType.NewLine;[LF]; Comment block - Gen - 15 - (22:3,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (22:3,0) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (23:3,1) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [LFcontentLF] - SpanEditHandler;Accepts:Any - (24:3,2) - Symbols:1 - HtmlSymbolType.RazorComment;[LFcontentLF]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (35:5,0) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (36:5,1) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (37:5,2) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (39:6,0) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (22:3,0) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (23:3,1) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Comment span - Gen - [LFcontentLF] - SpanEditHandler;Accepts:Any - (24:3,2) - Tokens:1 + HtmlTokenType.RazorComment;[LFcontentLF]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (35:5,0) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (36:5,1) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (37:5,2) - Tokens:1 + HtmlTokenType.NewLine;[LF]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (39:6,0) - Tokens:1 + HtmlTokenType.NewLine;[LF]; Tag block - Gen - 4 - (41:7,0) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (41:7,0) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (41:7,0) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentsSurroundingMarkup.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentsSurroundingMarkup.syntaxtree.txt index 3dd0ba4972..b4d122ddd1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentsSurroundingMarkup.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentsSurroundingMarkup.syntaxtree.txt @@ -1,42 +1,42 @@ Markup block - Gen - 42 - (0:0,0) Tag block - Gen - 3 - (0:0,0) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (3:0,3) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1 + HtmlTokenType.NewLine;[LF]; Comment block - Gen - 11 - (5:1,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (5:1,0) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (6:1,1) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [ hello ] - SpanEditHandler;Accepts:Any - (7:1,2) - Symbols:1 - HtmlSymbolType.RazorComment;[ hello ]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (14:1,9) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (15:1,10) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - Markup span - Gen - [ content ] - SpanEditHandler;Accepts:Any - (16:1,11) - Symbols:3 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[content]; - HtmlSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (5:1,0) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (6:1,1) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Comment span - Gen - [ hello ] - SpanEditHandler;Accepts:Any - (7:1,2) - Tokens:1 + HtmlTokenType.RazorComment;[ hello ]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (14:1,9) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (15:1,10) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + Markup span - Gen - [ content ] - SpanEditHandler;Accepts:Any - (16:1,11) - Tokens:3 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[content]; + HtmlTokenType.WhiteSpace;[ ]; Comment block - Gen - 11 - (25:1,20) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (25:1,20) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (26:1,21) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [ world ] - SpanEditHandler;Accepts:Any - (27:1,22) - Symbols:1 - HtmlSymbolType.RazorComment;[ world ]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (34:1,29) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (35:1,30) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (36:1,31) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (25:1,20) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (26:1,21) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Comment span - Gen - [ world ] - SpanEditHandler;Accepts:Any - (27:1,22) - Tokens:1 + HtmlTokenType.RazorComment;[ world ]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (34:1,29) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (35:1,30) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (36:1,31) - Tokens:1 + HtmlTokenType.NewLine;[LF]; Tag block - Gen - 4 - (38:2,0) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (38:2,0) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (38:2,0) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.syntaxtree.txt index b2de99c70f..a42813eed7 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.syntaxtree.txt @@ -1,10 +1,10 @@ Markup block - Gen - 2 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Comment block - Gen - 2 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - HtmlSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - HtmlSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [] - SpanEditHandler;Accepts:Any - (2:0,2) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + HtmlTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + HtmlTokenType.RazorCommentStar;[*]; + Comment span - Gen - [] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.syntaxtree.txt index 8a9ca61d07..9e50cab6a4 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.syntaxtree.txt @@ -1,16 +1,16 @@ Markup block - Gen - 7 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Expression block - Gen - 7 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foo(] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:2 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foo(] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:2 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; Comment block - Gen - 2 - (5:0,5) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (5:0,5) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (6:0,6) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [] - SpanEditHandler;Accepts:Any - (7:0,7) - Symbols:1 - CSharpSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (5:0,5) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Comment span - Gen - [] - SpanEditHandler;Accepts:Any - (7:0,7) - Tokens:1 + CSharpTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.syntaxtree.txt index 9acfe929f8..cd383fd925 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.syntaxtree.txt @@ -1,17 +1,17 @@ Markup block - Gen - 4 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Statement block - Gen - 4 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (2:0,2) - Symbols:1 - CSharpSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (2:0,2) - Tokens:1 + CSharpTokenType.Unknown;[]; Comment block - Gen - 2 - (2:0,2) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (2:0,2) - Symbols:1 - CSharpSymbolType.RazorCommentTransition;[@]; - MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (3:0,3) - Symbols:1 - CSharpSymbolType.RazorCommentStar;[*]; - Comment span - Gen - [] - SpanEditHandler;Accepts:Any - (4:0,4) - Symbols:1 - CSharpSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (2:0,2) - Tokens:1 + CSharpTokenType.RazorCommentTransition;[@]; + MetaCode span - Gen - [*] - SpanEditHandler;Accepts:None - (3:0,3) - Tokens:1 + CSharpTokenType.RazorCommentStar;[*]; + Comment span - Gen - [] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1 + CSharpTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.syntaxtree.txt index 700a0bc901..65ed4440a2 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.syntaxtree.txt @@ -1,3 +1,3 @@ Directive block - Gen - 9 - (0:0,0) - MetaCode span - Gen - [namespace] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Keyword;[namespace]; + MetaCode span - Gen - [namespace] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Keyword;[namespace]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.syntaxtree.txt index 5e115a5168..3c97840031 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.syntaxtree.txt @@ -1,3 +1,3 @@ Expression block - Gen - 9 - (0:0,0) - Code span - Gen - [NameSpace] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (0:0,0) - Symbols:1 - CSharpSymbolType.Identifier;[NameSpace]; + Code span - Gen - [NameSpace] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (0:0,0) - Tokens:1 + CSharpTokenType.Identifier;[NameSpace]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockAcceptsOpenBraceMultipleLinesBelowSectionName.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockAcceptsOpenBraceMultipleLinesBelowSectionName.syntaxtree.txt index 0b589fa230..c601f9eed9 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockAcceptsOpenBraceMultipleLinesBelowSectionName.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockAcceptsOpenBraceMultipleLinesBelowSectionName.syntaxtree.txt @@ -1,44 +1,44 @@ Markup block - Gen - 46 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 46 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; - Markup span - Gen - [ LFLFLFLFLFLF] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Symbols:7 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.NewLine;[LF]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (30:6,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[foo]; + Markup span - Gen - [ LFLFLFLFLFLF] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:7 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.NewLine;[LF]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (30:6,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 14 - (31:6,1) - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (31:6,1) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (31:6,1) - Tokens:1 + HtmlTokenType.NewLine;[LF]; Tag block - Gen - 3 - (33:7,0) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (33:7,0) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (36:7,3) - Symbols:1 - HtmlSymbolType.Text;[Foo]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (33:7,0) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (36:7,3) - Tokens:1 + HtmlTokenType.Text;[Foo]; Tag block - Gen - 4 - (39:7,6) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (39:7,6) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (43:7,10) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (45:8,0) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (46:8,1) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (39:7,6) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (43:7,10) - Tokens:1 + HtmlTokenType.NewLine;[LF]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (45:8,0) - Tokens:1 + CSharpTokenType.RightBrace;[}]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (46:8,1) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockAllowsBracesInCSharpExpression.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockAllowsBracesInCSharpExpression.syntaxtree.txt index 7629579f45..f0c43e199a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockAllowsBracesInCSharpExpression.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockAllowsBracesInCSharpExpression.syntaxtree.txt @@ -1,58 +1,58 @@ Markup block - Gen - 76 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 76 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (13:0,13) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[foo]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (13:0,13) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 61 - (14:0,14) - Markup span - Gen - [ I really want to render a close brace, so here I go: ] - SpanEditHandler;Accepts:Any - (14:0,14) - Symbols:25 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[I]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[really]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[want]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[to]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[render]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[a]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[close]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[brace,]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[so]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[here]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[I]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[go:]; - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ I really want to render a close brace, so here I go: ] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:25 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[I]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[really]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[want]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[to]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[render]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[a]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[close]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[brace,]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[so]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[here]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[I]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[go:]; + HtmlTokenType.WhiteSpace;[ ]; Expression block - Gen - 6 - (68:0,68) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (68:0,68) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (69:0,69) - Symbols:1 - CSharpSymbolType.LeftParenthesis;[(]; - Code span - Gen - ["}"] - SpanEditHandler;Accepts:Any - (70:0,70) - Symbols:1 - CSharpSymbolType.StringLiteral;["}"]; - MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (73:0,73) - Symbols:1 - CSharpSymbolType.RightParenthesis;[)]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (74:0,74) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (75:0,75) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (76:0,76) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (68:0,68) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (69:0,69) - Tokens:1 + CSharpTokenType.LeftParenthesis;[(]; + Code span - Gen - ["}"] - SpanEditHandler;Accepts:Any - (70:0,70) - Tokens:1 + CSharpTokenType.StringLiteral;["}"]; + MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (73:0,73) - Tokens:1 + CSharpTokenType.RightParenthesis;[)]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (74:0,74) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (75:0,75) - Tokens:1 + CSharpTokenType.RightBrace;[}]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (76:0,76) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockBalancesBraces.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockBalancesBraces.syntaxtree.txt index b7d3454670..60d6671298 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockBalancesBraces.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockBalancesBraces.syntaxtree.txt @@ -1,48 +1,48 @@ Markup block - Gen - 67 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 67 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (13:0,13) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[foo]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (13:0,13) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 52 - (14:0,14) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (14:0,14) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 8 - (15:0,15) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (56:0,56) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[script]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (65:0,65) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (66:0,66) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (67:0,67) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (56:0,56) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[script]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (65:0,65) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (66:0,66) - Tokens:1 + CSharpTokenType.RightBrace;[}]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (67:0,67) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockCapturesNewlineImmediatelyFollowing.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockCapturesNewlineImmediatelyFollowing.syntaxtree.txt index 546b239714..689b12e4aa 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockCapturesNewlineImmediatelyFollowing.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockCapturesNewlineImmediatelyFollowing.syntaxtree.txt @@ -1,12 +1,12 @@ Markup block - Gen - 10 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 8 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.Unknown;[]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (8:0,8) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.Unknown;[]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:1 + HtmlTokenType.NewLine;[LF]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockCapturesWhitespaceToEndOfLineInSectionStatementMissingName.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockCapturesWhitespaceToEndOfLineInSectionStatementMissingName.syntaxtree.txt index 4590b6fe8b..0fde9614d9 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockCapturesWhitespaceToEndOfLineInSectionStatementMissingName.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockCapturesWhitespaceToEndOfLineInSectionStatementMissingName.syntaxtree.txt @@ -1,15 +1,15 @@ Markup block - Gen - 23 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 17 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (17:0,17) - Symbols:1 - CSharpSymbolType.Unknown;[]; - Markup span - Gen - [LF ] - SpanEditHandler;Accepts:Any - (17:0,17) - Symbols:2 - HtmlSymbolType.NewLine;[LF]; - HtmlSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (17:0,17) - Tokens:1 + CSharpTokenType.Unknown;[]; + Markup span - Gen - [LF ] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:2 + HtmlTokenType.NewLine;[LF]; + HtmlTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockCapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockCapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.syntaxtree.txt index c1f6728eda..3a2c1106da 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockCapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockCapturesWhitespaceToEndOfLineInSectionStatementMissingOpenBrace.syntaxtree.txt @@ -1,18 +1,18 @@ Markup block - Gen - 27 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 27 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [Foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[Foo]; - Markup span - Gen - [ LF ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Symbols:3 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (27:1,4) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [Foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[Foo]; + Markup span - Gen - [ LF ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:3 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (27:1,4) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockCommentRecoversFromUnclosedTag.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockCommentRecoversFromUnclosedTag.syntaxtree.txt index 55310fee65..e764c527f3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockCommentRecoversFromUnclosedTag.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockCommentRecoversFromUnclosedTag.syntaxtree.txt @@ -1,45 +1,45 @@ Markup block - Gen - 33 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 33 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [s] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[s]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (11:0,11) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [s] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[s]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (11:0,11) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 20 - (12:0,12) - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (12:0,12) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1 + HtmlTokenType.NewLine;[LF]; Tag block - Gen - 4 - (14:1,0) - Markup span - Gen - [ - [ - 14 - (18:2,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:None - (29:2,11) - Symbols:2 - HtmlSymbolType.DoubleHyphen;[--]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (32:2,14) - Symbols:1 - HtmlSymbolType.Unknown;[]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (32:2,14) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (33:2,15) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:None - (29:2,11) - Tokens:2 + HtmlTokenType.DoubleHyphen;[--]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (32:2,14) - Tokens:1 + HtmlTokenType.Unknown;[]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (32:2,14) - Tokens:1 + CSharpTokenType.RightBrace;[}]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (33:2,15) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockCorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockCorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup.syntaxtree.txt index 2a3fe9aae1..6bc6ea89b2 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockCorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockCorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup.syntaxtree.txt @@ -1,23 +1,23 @@ Markup block - Gen - 24 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 24 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (13:0,13) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[foo]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (13:0,13) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 9 - (14:0,14) - Markup span - Gen - [something] - SpanEditHandler;Accepts:Any - (14:0,14) - Symbols:1 - HtmlSymbolType.Text;[something]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (23:0,23) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (24:0,24) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [something] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1 + HtmlTokenType.Text;[something]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:1 + CSharpTokenType.RightBrace;[}]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockDoesNotRequireSpaceBetweenSectionNameAndOpenBrace.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockDoesNotRequireSpaceBetweenSectionNameAndOpenBrace.syntaxtree.txt index d09ac5b531..55381a524f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockDoesNotRequireSpaceBetweenSectionNameAndOpenBrace.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockDoesNotRequireSpaceBetweenSectionNameAndOpenBrace.syntaxtree.txt @@ -1,36 +1,36 @@ Markup block - Gen - 26 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 26 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (12:0,12) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[foo]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (12:0,12) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 12 - (13:0,13) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (13:0,13) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 3 - (14:0,14) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (14:0,14) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (17:0,17) - Symbols:1 - HtmlSymbolType.Text;[Foo]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1 + HtmlTokenType.Text;[Foo]; Tag block - Gen - 4 - (20:0,20) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (20:0,20) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (24:0,24) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (25:0,25) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (26:0,26) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:1 + CSharpTokenType.RightBrace;[}]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesEOFAfterOpenBrace.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesEOFAfterOpenBrace.syntaxtree.txt index 18a3b5034b..19018c5dbe 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesEOFAfterOpenBrace.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesEOFAfterOpenBrace.syntaxtree.txt @@ -1,19 +1,19 @@ Markup block - Gen - 14 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 14 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (13:0,13) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[foo]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (13:0,13) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 0 - (14:0,14) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (14:0,14) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesEOFAfterOpenContent1.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesEOFAfterOpenContent1.syntaxtree.txt index 53009cd47d..134177d6a6 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesEOFAfterOpenContent1.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesEOFAfterOpenContent1.syntaxtree.txt @@ -1,19 +1,19 @@ Markup block - Gen - 15 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 15 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (13:0,13) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[foo]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (13:0,13) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 1 - (14:0,14) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (14:0,14) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesEOFAfterOpenContent2.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesEOFAfterOpenContent2.syntaxtree.txt index 1d6f145970..0a934073ea 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesEOFAfterOpenContent2.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesEOFAfterOpenContent2.syntaxtree.txt @@ -1,19 +1,19 @@ Markup block - Gen - 16 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 16 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (13:0,13) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[foo]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (13:0,13) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 2 - (14:0,14) - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (14:0,14) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1 + HtmlTokenType.NewLine;[LF]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesEOFAfterOpenContent3.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesEOFAfterOpenContent3.syntaxtree.txt index a9a1a16f71..d828a581f0 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesEOFAfterOpenContent3.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesEOFAfterOpenContent3.syntaxtree.txt @@ -1,19 +1,19 @@ Markup block - Gen - 17 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 17 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (13:0,13) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[foo]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (13:0,13) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 3 - (14:0,14) - Markup span - Gen - [abc] - SpanEditHandler;Accepts:Any - (14:0,14) - Symbols:1 - HtmlSymbolType.Text;[abc]; + Markup span - Gen - [abc] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1 + HtmlTokenType.Text;[abc]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesEOFAfterOpenContent4.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesEOFAfterOpenContent4.syntaxtree.txt index 025e6f95cc..dfd8d9e423 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesEOFAfterOpenContent4.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesEOFAfterOpenContent4.syntaxtree.txt @@ -1,21 +1,21 @@ Markup block - Gen - 20 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 20 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (13:0,13) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[foo]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (13:0,13) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 6 - (14:0,14) - Markup span - Gen - [LF abc] - SpanEditHandler;Accepts:Any - (14:0,14) - Symbols:3 - HtmlSymbolType.NewLine;[LF]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[abc]; + Markup span - Gen - [LF abc] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:3 + HtmlTokenType.NewLine;[LF]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[abc]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesUnterminatedSection.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesUnterminatedSection.syntaxtree.txt index 10d6830487..bc5eedd22b 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesUnterminatedSection.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesUnterminatedSection.syntaxtree.txt @@ -1,34 +1,34 @@ Markup block - Gen - 27 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 27 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (13:0,13) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[foo]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (13:0,13) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 13 - (14:0,14) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (14:0,14) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 3 - (15:0,15) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (15:0,15) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [Foo{}] - SpanEditHandler;Accepts:Any - (18:0,18) - Symbols:3 - HtmlSymbolType.Text;[Foo]; - HtmlSymbolType.Text;[{]; - HtmlSymbolType.Text;[}]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [Foo{}] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:3 + HtmlTokenType.Text;[Foo]; + HtmlTokenType.Text;[{]; + HtmlTokenType.Text;[}]; Tag block - Gen - 4 - (23:0,23) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (23:0,23) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesUnterminatedSectionWithNestedIf.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesUnterminatedSectionWithNestedIf.syntaxtree.txt index 3b477a43f4..4090ca154c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesUnterminatedSectionWithNestedIf.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockHandlesUnterminatedSectionWithNestedIf.syntaxtree.txt @@ -1,56 +1,56 @@ Markup block - Gen - 73 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 73 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [Test] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[Test]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:AllWhiteSpace - (13:0,13) - Symbols:1 - CSharpSymbolType.NewLine;[LF]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (15:1,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [Test] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[Test]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:AllWhiteSpace - (13:0,13) - Tokens:1 + CSharpTokenType.NewLine;[LF]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[}];AtEnd - (15:1,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 57 - (16:1,1) - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (16:1,1) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (16:1,1) - Tokens:1 + HtmlTokenType.NewLine;[LF]; Statement block - Gen - 55 - (18:2,0) - Code span - Gen - [ ] - SpanEditHandler;Accepts:Any - (18:2,0) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (22:2,4) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [if(true)LF {LF] - SpanEditHandler;Accepts:Any - (23:2,5) - Symbols:8 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:Any - (18:2,0) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (22:2,4) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [if(true)LF {LF] - SpanEditHandler;Accepts:Any - (23:2,5) - Tokens:8 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; Markup block - Gen - 28 - (40:4,0) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (40:4,0) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (40:4,0) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 3 - (48:4,8) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (48:4,8) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [Hello World] - SpanEditHandler;Accepts:Any - (51:4,11) - Symbols:3 - HtmlSymbolType.Text;[Hello]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[World]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (48:4,8) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [Hello World] - SpanEditHandler;Accepts:Any - (51:4,11) - Tokens:3 + HtmlTokenType.Text;[Hello]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[World]; Tag block - Gen - 4 - (62:4,22) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (62:4,22) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:None - (66:4,26) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; - Code span - Gen - [ }] - SpanEditHandler;Accepts:Any - (68:5,0) - Symbols:2 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (62:4,22) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:None - (66:4,26) - Tokens:1 + HtmlTokenType.NewLine;[LF]; + Code span - Gen - [ }] - SpanEditHandler;Accepts:Any - (68:5,0) - Tokens:2 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockIgnoresSectionUnlessAllLowerCase.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockIgnoresSectionUnlessAllLowerCase.syntaxtree.txt index bc8fc8f51b..59d3f3e25a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockIgnoresSectionUnlessAllLowerCase.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockIgnoresSectionUnlessAllLowerCase.syntaxtree.txt @@ -1,11 +1,11 @@ Markup block - Gen - 12 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Expression block - Gen - 8 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [Section] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K15 - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[Section]; - Markup span - Gen - [ foo] - SpanEditHandler;Accepts:Any - (8:0,8) - Symbols:2 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[foo]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [Section] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K15 - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[Section]; + Markup span - Gen - [ foo] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:2 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[foo]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockParsesComment.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockParsesComment.syntaxtree.txt index f4d0548865..4bdbe3877f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockParsesComment.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockParsesComment.syntaxtree.txt @@ -1,33 +1,33 @@ Markup block - Gen - 21 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 21 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [s] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[s]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (11:0,11) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [s] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[s]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (11:0,11) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 8 - (12:0,12) HtmlComment block - Gen - 8 - (12:0,12) - Markup span - Gen - [] - SpanEditHandler;Accepts:None - (17:0,17) - Symbols:2 - HtmlSymbolType.DoubleHyphen;[--]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (20:0,20) - Symbols:1 - HtmlSymbolType.Unknown;[]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (20:0,20) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (21:0,21) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:2 + HtmlTokenType.DoubleHyphen;[--]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:1 + HtmlTokenType.Unknown;[]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:1 + CSharpTokenType.RightBrace;[}]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockParsesCommentWithDelimiters.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockParsesCommentWithDelimiters.syntaxtree.txt index 5bb8b52316..86e6444d85 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockParsesCommentWithDelimiters.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockParsesCommentWithDelimiters.syntaxtree.txt @@ -1,38 +1,38 @@ Markup block - Gen - 26 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 26 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [s] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[s]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (11:0,11) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [s] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[s]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (11:0,11) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 13 - (12:0,12) HtmlComment block - Gen - 13 - (12:0,12) - Markup span - Gen - [] - SpanEditHandler;Accepts:None - (22:0,22) - Symbols:2 - HtmlSymbolType.DoubleHyphen;[--]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (25:0,25) - Symbols:1 - HtmlSymbolType.Unknown;[]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (25:0,25) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (26:0,26) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:2 + HtmlTokenType.DoubleHyphen;[--]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1 + HtmlTokenType.Unknown;[]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:1 + CSharpTokenType.RightBrace;[}]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockParsesNamedSectionCorrectly.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockParsesNamedSectionCorrectly.syntaxtree.txt index 565d92a215..816ec6dd7f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockParsesNamedSectionCorrectly.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockParsesNamedSectionCorrectly.syntaxtree.txt @@ -1,38 +1,38 @@ Markup block - Gen - 27 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 27 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (13:0,13) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[foo]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (13:0,13) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 12 - (14:0,14) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (14:0,14) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 3 - (15:0,15) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (15:0,15) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (18:0,18) - Symbols:1 - HtmlSymbolType.Text;[Foo]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1 + HtmlTokenType.Text;[Foo]; Tag block - Gen - 4 - (21:0,21) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (21:0,21) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (25:0,25) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (26:0,26) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (27:0,27) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (26:0,26) - Tokens:1 + CSharpTokenType.RightBrace;[}]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockParsesXmlProcessingInstruction.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockParsesXmlProcessingInstruction.syntaxtree.txt index e71b39980d..92cd8e4296 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockParsesXmlProcessingInstruction.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockParsesXmlProcessingInstruction.syntaxtree.txt @@ -1,32 +1,32 @@ Markup block - Gen - 28 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 28 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [s] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[s]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (11:0,11) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [s] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[s]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (11:0,11) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 15 - (12:0,12) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (12:0,12) - Symbols:10 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.QuestionMark;[?]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[xml]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[bleh]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.QuestionMark;[?]; - HtmlSymbolType.CloseAngle;[>]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (27:0,27) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (28:0,28) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:10 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.QuestionMark;[?]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[xml]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[bleh]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.QuestionMark;[?]; + HtmlTokenType.CloseAngle;[>]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:1 + CSharpTokenType.RightBrace;[}]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockReportsErrorAndAcceptsWhitespaceToEndOfLineIfSectionNotFollowedByOpenBrace.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockReportsErrorAndAcceptsWhitespaceToEndOfLineIfSectionNotFollowedByOpenBrace.syntaxtree.txt index 2cf9ce76f6..f0c5008e10 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockReportsErrorAndAcceptsWhitespaceToEndOfLineIfSectionNotFollowedByOpenBrace.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockReportsErrorAndAcceptsWhitespaceToEndOfLineIfSectionNotFollowedByOpenBrace.syntaxtree.txt @@ -1,17 +1,17 @@ Markup block - Gen - 20 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 20 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; - Markup span - Gen - [ LF] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Symbols:2 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.NewLine;[LF]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (20:1,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[foo]; + Markup span - Gen - [ LF] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:2 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.NewLine;[LF]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (20:1,0) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartCharacter.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartCharacter.syntaxtree.txt index 6904aeccf6..2505742c14 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartCharacter.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartCharacter.syntaxtree.txt @@ -1,31 +1,31 @@ Markup block - Gen - 25 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 9 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Markup span - Gen - [9 { ] - SpanEditHandler;Accepts:Any - (9:0,9) - Symbols:4 - HtmlSymbolType.Text;[9]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[{]; - HtmlSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Markup span - Gen - [9 { ] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:4 + HtmlTokenType.Text;[9]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[{]; + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 3 - (13:0,13) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (13:0,13) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (16:0,16) - Symbols:1 - HtmlSymbolType.Text;[Foo]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:1 + HtmlTokenType.Text;[Foo]; Tag block - Gen - 4 - (19:0,19) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (19:0,19) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [ }] - SpanEditHandler;Accepts:Any - (23:0,23) - Symbols:2 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[}]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [ }] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:2 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.syntaxtree.txt index a5332ecac8..f9fea55241 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlockReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.syntaxtree.txt @@ -1,33 +1,33 @@ Markup block - Gen - 31 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 12 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; - Markup span - Gen - [-bar { ] - SpanEditHandler;Accepts:Any - (12:0,12) - Symbols:4 - HtmlSymbolType.Text;[-bar]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[{]; - HtmlSymbolType.WhiteSpace;[ ]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[foo]; + Markup span - Gen - [-bar { ] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:4 + HtmlTokenType.Text;[-bar]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[{]; + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 3 - (19:0,19) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (19:0,19) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (22:0,22) - Symbols:1 - HtmlSymbolType.Text;[Foo]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1 + HtmlTokenType.Text;[Foo]; Tag block - Gen - 4 - (25:0,25) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (25:0,25) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [ }] - SpanEditHandler;Accepts:Any - (29:0,29) - Symbols:2 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[}]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [ }] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:2 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlock_WithDoubleTransition1.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlock_WithDoubleTransition1.syntaxtree.txt index c42e429991..5be347d4cf 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlock_WithDoubleTransition1.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlock_WithDoubleTransition1.syntaxtree.txt @@ -1,42 +1,42 @@ Markup block - Gen - 30 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 30 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [s] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[s]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (11:0,11) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [s] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[s]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (11:0,11) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 17 - (12:0,12) Tag block - Gen - 17 - (12:0,12) - Markup span - Gen - [ - [ - 9 - (17:0,17) - Markup span - Gen - [ foo='] - SpanEditHandler;Accepts:Any - (17:0,17) - Symbols:4 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[foo]; - HtmlSymbolType.Equals;[=]; - HtmlSymbolType.SingleQuote;[']; + Markup span - Gen - [ foo='] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:4 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[foo]; + HtmlTokenType.Equals;[=]; + HtmlTokenType.SingleQuote;[']; Markup block - Gen - 2 - (23:0,23) - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (23:0,23) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (24:0,24) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (25:0,25) - Symbols:1 - HtmlSymbolType.SingleQuote;[']; - Markup span - Gen - [ />] - SpanEditHandler;Accepts:Any - (26:0,26) - Symbols:3 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.CloseAngle;[>]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (29:0,29) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (30:0,30) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (24:0,24) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1 + HtmlTokenType.SingleQuote;[']; + Markup span - Gen - [ />] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:3 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.CloseAngle;[>]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (29:0,29) - Tokens:1 + CSharpTokenType.RightBrace;[}]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlock_WithDoubleTransition2.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlock_WithDoubleTransition2.syntaxtree.txt index 7d95d54c6e..062a860adb 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlock_WithDoubleTransition2.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParseSectionBlock_WithDoubleTransition2.syntaxtree.txt @@ -1,51 +1,51 @@ Markup block - Gen - 44 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 44 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [s] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[s]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (11:0,11) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [s] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[s]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (10:0,10) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (11:0,11) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 31 - (12:0,12) Tag block - Gen - 31 - (12:0,12) - Markup span - Gen - [ - [ - 23 - (17:0,17) - Markup span - Gen - [ foo='] - SpanEditHandler;Accepts:Any - (17:0,17) - Symbols:4 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[foo]; - HtmlSymbolType.Equals;[=]; - HtmlSymbolType.SingleQuote;[']; + Markup span - Gen - [ foo='] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:4 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[foo]; + HtmlTokenType.Equals;[=]; + HtmlTokenType.SingleQuote;[']; Markup block - Gen - 13 - (23:0,23) Expression block - Gen - 13 - (23:0,23) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (23:0,23) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K15 - (24:0,24) - Symbols:3 - CSharpSymbolType.Identifier;[DateTime]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Now]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [DateTime.Now] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K15 - (24:0,24) - Tokens:3 + CSharpTokenType.Identifier;[DateTime]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Now]; Markup block - Gen - 3 - (36:0,36) - Markup span - Gen - [ @] - SpanEditHandler;Accepts:None - (36:0,36) - Symbols:2 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Transition;[@]; - Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (38:0,38) - Symbols:1 - HtmlSymbolType.Transition;[@]; - Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (39:0,39) - Symbols:1 - HtmlSymbolType.SingleQuote;[']; - Markup span - Gen - [ />] - SpanEditHandler;Accepts:Any - (40:0,40) - Symbols:3 - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.CloseAngle;[>]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (43:0,43) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (44:0,44) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [ @] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:2 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Transition;[@]; + Markup span - Gen - [@] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:1 + HtmlTokenType.Transition;[@]; + Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (39:0,39) - Tokens:1 + HtmlTokenType.SingleQuote;[']; + Markup span - Gen - [ />] - SpanEditHandler;Accepts:Any - (40:0,40) - Tokens:3 + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.CloseAngle;[>]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (43:0,43) - Tokens:1 + CSharpTokenType.RightBrace;[}]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (44:0,44) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.syntaxtree.txt index 6e28afaa84..b8abb7fa56 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.syntaxtree.txt @@ -1,58 +1,58 @@ Markup block - Gen - 44 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 44 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[foo]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (13:0,13) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[foo]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (13:0,13) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 29 - (14:0,14) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (14:0,14) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Directive block - Gen - 27 - (15:0,15) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (16:0,16) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (23:0,23) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [bar] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (24:0,24) - Symbols:1 - CSharpSymbolType.Identifier;[bar]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (27:0,27) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (28:0,28) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (23:0,23) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [bar] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (24:0,24) - Tokens:1 + CSharpTokenType.Identifier;[bar]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (27:0,27) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (28:0,28) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 12 - (29:0,29) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (29:0,29) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 3 - (30:0,30) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (30:0,30) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (33:0,33) - Symbols:1 - HtmlSymbolType.Text;[Foo]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [Foo] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:1 + HtmlTokenType.Text;[Foo]; Tag block - Gen - 4 - (36:0,36) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (36:0,36) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (40:0,40) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (41:0,41) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (42:0,42) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (43:0,43) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (44:0,44) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (36:0,36) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (40:0,40) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (41:0,41) - Tokens:1 + CSharpTokenType.RightBrace;[}]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (42:0,42) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (43:0,43) - Tokens:1 + CSharpTokenType.RightBrace;[}]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (44:0,44) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlock.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlock.syntaxtree.txt index 1c746af300..5b549fd8de 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlock.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlock.syntaxtree.txt @@ -1,36 +1,36 @@ Markup block - Gen - 33 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 33 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [Foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[Foo]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (13:0,13) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [Foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[Foo]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (13:0,13) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 18 - (14:0,14) - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (14:0,14) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1 + HtmlTokenType.NewLine;[LF]; Statement block - Gen - 16 - (16:1,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (16:1,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [if(true) {LF}LF] - SpanEditHandler;Accepts:Any - (17:1,1) - Symbols:9 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.NewLine;[LF]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (32:3,0) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (33:3,1) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (16:1,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [if(true) {LF}LF] - SpanEditHandler;Accepts:Any - (17:1,1) - Tokens:9 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.NewLine;[LF]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (32:3,0) - Tokens:1 + CSharpTokenType.RightBrace;[}]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (33:3,1) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlockNoWhitespace.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlockNoWhitespace.syntaxtree.txt index 9210cdb53f..1712aafc46 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlockNoWhitespace.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/SectionIsCorrectlyTerminatedWhenCloseBraceImmediatelyFollowsCodeBlockNoWhitespace.syntaxtree.txt @@ -1,35 +1,35 @@ Markup block - Gen - 31 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 + HtmlTokenType.Unknown;[]; Directive block - Gen - 31 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - Code span - Gen - [Foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Symbols:1 - CSharpSymbolType.Identifier;[Foo]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Symbols:1 - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (13:0,13) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.Identifier;[section]; + Code span - Gen - [ ] - SpanEditHandler;Accepts:WhiteSpace - (8:0,8) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + Code span - Gen - [Foo] - DirectiveTokenEditHandler;Accepts:NonWhiteSpace - (9:0,9) - Tokens:1 + CSharpTokenType.Identifier;[Foo]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhiteSpace - (12:0,12) - Tokens:1 + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (13:0,13) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; Markup block - Gen - 16 - (14:0,14) - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (14:0,14) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1 + HtmlTokenType.NewLine;[LF]; Statement block - Gen - 14 - (16:1,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (16:1,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [if(true) {LF}] - SpanEditHandler;Accepts:Any - (17:1,1) - Symbols:8 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (30:2,1) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (31:2,2) - Symbols:1 - HtmlSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (16:1,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [if(true) {LF}] - SpanEditHandler;Accepts:Any - (17:1,1) - Tokens:8 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (30:2,1) - Tokens:1 + CSharpTokenType.RightBrace;[}]; + Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (31:2,2) - Tokens:1 + HtmlTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/NamespaceImportInsideCodeBlockCausesError.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/NamespaceImportInsideCodeBlockCausesError.syntaxtree.txt index 3030df2498..41fd907da2 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/NamespaceImportInsideCodeBlockCausesError.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/NamespaceImportInsideCodeBlockCausesError.syntaxtree.txt @@ -1,25 +1,25 @@ Statement block - Gen - 37 - (0:0,0) - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [ using Foo.Bar.Baz; var foo = bar; ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (1:0,1) - Symbols:19 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[using]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Baz]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (36:0,36) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [ using Foo.Bar.Baz; var foo = bar; ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (1:0,1) - Tokens:19 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[using]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Baz]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/NonKeywordStatementInCodeBlockIsHandledCorrectly.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/NonKeywordStatementInCodeBlockIsHandledCorrectly.syntaxtree.txt index 12c1bd052b..25dbecb0d5 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/NonKeywordStatementInCodeBlockIsHandledCorrectly.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/NonKeywordStatementInCodeBlockIsHandledCorrectly.syntaxtree.txt @@ -1,26 +1,26 @@ Statement block - Gen - 56 - (0:0,0) - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [LF List photos = gallery.Photo.ToList();LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (1:0,1) - Symbols:20 - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[List]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.Identifier;[dynamic]; - CSharpSymbolType.GreaterThan;[>]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[photos]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[gallery]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Photo]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[ToList]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (55:2,0) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [LF List photos = gallery.Photo.ToList();LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (1:0,1) - Tokens:20 + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[List]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.Identifier;[dynamic]; + CSharpTokenType.GreaterThan;[>]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[photos]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[gallery]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Photo]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[ToList]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (55:2,0) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockBalancesBracesOutsideStringsIfFirstCharacterIsBraceAndReturnsSpanOfTypeCode.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockBalancesBracesOutsideStringsIfFirstCharacterIsBraceAndReturnsSpanOfTypeCode.syntaxtree.txt index 6330e602ef..19a360fd8b 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockBalancesBracesOutsideStringsIfFirstCharacterIsBraceAndReturnsSpanOfTypeCode.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockBalancesBracesOutsideStringsIfFirstCharacterIsBraceAndReturnsSpanOfTypeCode.syntaxtree.txt @@ -1,26 +1,26 @@ Statement block - Gen - 52 - (0:0,0) - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [foo"b}ar" if(condition) { string.Format("{0}"); } ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (1:0,1) - Symbols:20 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.StringLiteral;["b}ar"]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[condition]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[string]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Format]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;["{0}"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (51:0,51) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [foo"b}ar" if(condition) { string.Format("{0}"); } ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (1:0,1) - Tokens:20 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.StringLiteral;["b}ar"]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[condition]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[string]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Format]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;["{0}"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (51:0,51) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockBalancesParensOutsideStringsIfFirstCharacterIsParenAndReturnsSpanOfTypeExpression.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockBalancesParensOutsideStringsIfFirstCharacterIsParenAndReturnsSpanOfTypeExpression.syntaxtree.txt index 13350994f6..757004c73b 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockBalancesParensOutsideStringsIfFirstCharacterIsParenAndReturnsSpanOfTypeExpression.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockBalancesParensOutsideStringsIfFirstCharacterIsParenAndReturnsSpanOfTypeExpression.syntaxtree.txt @@ -1,26 +1,26 @@ Expression block - Gen - 52 - (0:0,0) - MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftParenthesis;[(]; - Code span - Gen - [foo"b)ar" if(condition) { string.Format("{0}"); } ] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:20 - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.StringLiteral;["b)ar"]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[condition]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[string]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Format]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.StringLiteral;["{0}"]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (51:0,51) - Symbols:1 - CSharpSymbolType.RightParenthesis;[)]; + MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftParenthesis;[(]; + Code span - Gen - [foo"b)ar" if(condition) { string.Format("{0}"); } ] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:20 + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.StringLiteral;["b)ar"]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[condition]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[string]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Format]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.StringLiteral;["{0}"]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [)] - SpanEditHandler;Accepts:None - (51:0,51) - Tokens:1 + CSharpTokenType.RightParenthesis;[)]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.syntaxtree.txt index 2ce6cbbd8a..8f8de632d0 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockIgnoresSingleSlashAtStart.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 1 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Unknown;[]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockTerminatesSingleLineCommentAtEndOfLine.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockTerminatesSingleLineCommentAtEndOfLine.syntaxtree.txt index e952ba9a9f..60b8f07d27 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockTerminatesSingleLineCommentAtEndOfLine.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockTerminatesSingleLineCommentAtEndOfLine.syntaxtree.txt @@ -1,38 +1,38 @@ Statement block - Gen - 48 - (0:0,0) - Code span - Gen - [if(!false) {LF // FooLF] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:11 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Not;[!]; - CSharpSymbolType.Keyword;[false]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Comment;[// Foo]; - CSharpSymbolType.NewLine;[LF]; + Code span - Gen - [if(!false) {LF // FooLF] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:11 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Not;[!]; + CSharpTokenType.Keyword;[false]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Comment;[// Foo]; + CSharpTokenType.NewLine;[LF]; Markup block - Gen - 21 - (26:2,0) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (26:2,0) - Symbols:1 - HtmlSymbolType.WhiteSpace;[ ]; + Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (26:2,0) - Tokens:1 + HtmlTokenType.WhiteSpace;[ ]; Tag block - Gen - 3 - (27:2,1) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (27:2,1) - Symbols:3 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [A real tag!] - SpanEditHandler;Accepts:Any - (30:2,4) - Symbols:6 - HtmlSymbolType.Text;[A]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[real]; - HtmlSymbolType.WhiteSpace;[ ]; - HtmlSymbolType.Text;[tag]; - HtmlSymbolType.Bang;[!]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (27:2,1) - Tokens:3 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [A real tag!] - SpanEditHandler;Accepts:Any - (30:2,4) - Tokens:6 + HtmlTokenType.Text;[A]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[real]; + HtmlTokenType.WhiteSpace;[ ]; + HtmlTokenType.Text;[tag]; + HtmlTokenType.Bang;[!]; Tag block - Gen - 4 - (41:2,15) - Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (41:2,15) - Symbols:4 - HtmlSymbolType.OpenAngle;[<]; - HtmlSymbolType.ForwardSlash;[/]; - HtmlSymbolType.Text;[p]; - HtmlSymbolType.CloseAngle;[>]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:None - (45:2,19) - Symbols:1 - HtmlSymbolType.NewLine;[LF]; - Code span - Gen - [}] - SpanEditHandler;Accepts:Any - (47:3,0) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Markup span - Gen - [

] - SpanEditHandler;Accepts:None - (41:2,15) - Tokens:4 + HtmlTokenType.OpenAngle;[<]; + HtmlTokenType.ForwardSlash;[/]; + HtmlTokenType.Text;[p]; + HtmlTokenType.CloseAngle;[>]; + Markup span - Gen - [LF] - SpanEditHandler;Accepts:None - (45:2,19) - Tokens:1 + HtmlTokenType.NewLine;[LF]; + Code span - Gen - [}] - SpanEditHandler;Accepts:Any - (47:3,0) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/TypeAliasInsideCodeBlockIsNotHandledSpecially.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/TypeAliasInsideCodeBlockIsNotHandledSpecially.syntaxtree.txt index 39c7ed584a..5576cf671f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/TypeAliasInsideCodeBlockIsNotHandledSpecially.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/TypeAliasInsideCodeBlockIsNotHandledSpecially.syntaxtree.txt @@ -1,27 +1,27 @@ Statement block - Gen - 39 - (0:0,0) - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [ using Foo = Bar.Baz; var foo = bar; ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (1:0,1) - Symbols:21 - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[using]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Baz]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (38:0,38) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [ using Foo = Bar.Baz; var foo = bar; ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (1:0,1) - Tokens:21 + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[using]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Baz]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/CatchClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/CatchClause.syntaxtree.txt index 4bec7050a8..979f01d5ec 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/CatchClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/CatchClause.syntaxtree.txt @@ -1,46 +1,46 @@ Statement block - Gen - 94 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [try { foo(); } catch(IOException ioex) { handleIO(); } catch(Exception ex) { handleOther(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:42 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[IOException]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[ioex]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[handleIO]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Exception]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[ex]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[handleOther]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [try { foo(); } catch(IOException ioex) { handleIO(); } catch(Exception ex) { handleOther(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:42 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[IOException]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[ioex]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[handleIO]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Exception]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[ex]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[handleOther]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/DoStatement.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/DoStatement.syntaxtree.txt index e0800abb71..3d7b1a88af 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/DoStatement.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/DoStatement.syntaxtree.txt @@ -1,20 +1,20 @@ Statement block - Gen - 27 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [do { foo(); } while(true);] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:16 - CSharpSymbolType.Keyword;[do]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[while]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [do { foo(); } while(true);] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:16 + CSharpTokenType.Keyword;[do]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[while]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ElseClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ElseClause.syntaxtree.txt index 97f305d064..6952c9d39e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ElseClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ElseClause.syntaxtree.txt @@ -1,28 +1,28 @@ Statement block - Gen - 36 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [if(true) { foo(); } else { foo(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:24 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [if(true) { foo(); } else { foo(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:24 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ElseIfClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ElseIfClause.syntaxtree.txt index 50c56b7176..3ac82af49f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ElseIfClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ElseIfClause.syntaxtree.txt @@ -1,50 +1,50 @@ Statement block - Gen - 73 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [if(true) { foo(); } else if(false) { foo(); } else if(!false) { foo(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:46 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[false]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[else]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Not;[!]; - CSharpSymbolType.Keyword;[false]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [if(true) { foo(); } else if(false) { foo(); } else if(!false) { foo(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:46 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[false]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[else]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Not;[!]; + CSharpTokenType.Keyword;[false]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteBody.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteBody.syntaxtree.txt index 463f6193d0..a65e11f6c9 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteBody.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteBody.syntaxtree.txt @@ -1,27 +1,27 @@ Statement block - Gen - 53 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [try { someMethod(); } catch(Exception) when (true) {] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:23 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[someMethod]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Exception]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[when]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [try { someMethod(); } catch(Exception) when (true) {] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:23 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[someMethod]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Exception]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[when]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteCondition.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteCondition.syntaxtree.txt index 0688194a9d..ea80c49749 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteCondition.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilterError_TryCatchWhen_InCompleteCondition.syntaxtree.txt @@ -1,23 +1,23 @@ Statement block - Gen - 46 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [try { someMethod(); } catch(Exception) when (] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:19 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[someMethod]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Exception]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[when]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [try { someMethod(); } catch(Exception) when (] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:19 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[someMethod]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Exception]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[when]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchNoBodyWhen.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchNoBodyWhen.syntaxtree.txt index 5f5054f9a6..b974facb6a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchNoBodyWhen.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchNoBodyWhen.syntaxtree.txt @@ -1,30 +1,30 @@ Statement block - Gen - 65 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [try { someMethod(); } catch(Exception) when { anotherMethod(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:26 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[someMethod]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Exception]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[when]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[anotherMethod]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [try { someMethod(); } catch(Exception) when { anotherMethod(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:26 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[someMethod]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Exception]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[when]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[anotherMethod]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhen.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhen.syntaxtree.txt index 3bee1d3226..7672a029cd 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhen.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhen.syntaxtree.txt @@ -1,21 +1,21 @@ Statement block - Gen - 44 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [try { someMethod(); } catch(Exception) when] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:17 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[someMethod]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Exception]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[when]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [try { someMethod(); } catch(Exception) when] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:17 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[someMethod]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Exception]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[when]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhenNoBodies.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhenNoBodies.syntaxtree.txt index b1d5ee704e..1d47290523 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhenNoBodies.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryCatchWhenNoBodies.syntaxtree.txt @@ -1,25 +1,25 @@ Statement block - Gen - 51 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [try { someMethod(); } catch(Exception) when (true)] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:21 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[someMethod]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Exception]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[when]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [try { someMethod(); } catch(Exception) when (true)] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:21 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[someMethod]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Exception]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[when]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryWhen.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryWhen.syntaxtree.txt index 3b40fcd2b1..1d2521b0e0 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryWhen.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_IncompleteTryWhen.syntaxtree.txt @@ -1,14 +1,14 @@ Statement block - Gen - 22 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [try { someMethod(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:10 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[someMethod]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [try { someMethod(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:10 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[someMethod]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_MultiLine.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_MultiLine.syntaxtree.txt index c41473d0fe..f814178b03 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_MultiLine.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_MultiLine.syntaxtree.txt @@ -1,54 +1,54 @@ Statement block - Gen - 103 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [tryLF{LFA();LF}LFcatch(Exception) when (true)LF{LFB();LF}LFcatch(IOException) when (false)LF{LFC();LF}] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:50 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Identifier;[A]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Exception]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[when]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Identifier;[B]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[IOException]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[when]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[false]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.Identifier;[C]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.NewLine;[LF]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [tryLF{LFA();LF}LFcatch(Exception) when (true)LF{LFB();LF}LFcatch(IOException) when (false)LF{LFC();LF}] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:50 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Identifier;[A]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Exception]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[when]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Identifier;[B]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[IOException]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[when]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[false]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.Identifier;[C]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.NewLine;[LF]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_NestedTryCatchWhen.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_NestedTryCatchWhen.syntaxtree.txt index a82c424f29..c7aebf715c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_NestedTryCatchWhen.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_NestedTryCatchWhen.syntaxtree.txt @@ -1,38 +1,38 @@ Statement block - Gen - 69 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1 - CSharpSymbolType.LeftBrace;[{]; - Code span - Gen - [try { someMethod(); } catch(Exception) when (true) { handleIO(); }] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (2:0,2) - Symbols:30 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[someMethod]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Exception]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[when]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[handleIO]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (68:0,68) - Symbols:1 - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 + CSharpTokenType.LeftBrace;[{]; + Code span - Gen - [try { someMethod(); } catch(Exception) when (true) { handleIO(); }] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (2:0,2) - Tokens:30 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[someMethod]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Exception]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[when]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[handleIO]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (68:0,68) - Tokens:1 + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenCatchWhenComplete_SingleLine.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenCatchWhenComplete_SingleLine.syntaxtree.txt index 72415aa411..9b61a41852 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenCatchWhenComplete_SingleLine.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenCatchWhenComplete_SingleLine.syntaxtree.txt @@ -1,54 +1,54 @@ Statement block - Gen - 92 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [try { A(); } catch(Exception) when (true) { B(); } catch(IOException) when (false) { C(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:50 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[A]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Exception]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[when]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[B]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[IOException]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[when]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[false]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[C]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [try { A(); } catch(Exception) when (true) { B(); } catch(IOException) when (false) { C(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:50 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[A]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Exception]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[when]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[B]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[IOException]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[when]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[false]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[C]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenComplete_SingleLine.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenComplete_SingleLine.syntaxtree.txt index 135138e456..d4abea3d20 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenComplete_SingleLine.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenComplete_SingleLine.syntaxtree.txt @@ -1,34 +1,34 @@ Statement block - Gen - 67 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [try { someMethod(); } catch(Exception) when (true) { handleIO(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:30 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[someMethod]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Exception]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[when]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[handleIO]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [try { someMethod(); } catch(Exception) when (true) { handleIO(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:30 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[someMethod]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Exception]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[when]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[handleIO]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenFinallyComplete_SingleLine.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenFinallyComplete_SingleLine.syntaxtree.txt index 5f91bb21ef..d2eb922ac6 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenFinallyComplete_SingleLine.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ExceptionFilter_TryCatchWhenFinallyComplete_SingleLine.syntaxtree.txt @@ -1,45 +1,45 @@ Statement block - Gen - 68 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [try { A(); } catch(Exception) when (true) { B(); } finally { C(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:41 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[A]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[catch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[Exception]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[when]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[B]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[finally]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[C]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [try { A(); } catch(Exception) when (true) { B(); } finally { C(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:41 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[A]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[catch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[Exception]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[when]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[B]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[finally]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[C]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/FinallyClause.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/FinallyClause.syntaxtree.txt index 4a1de98901..0810f3848a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/FinallyClause.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/FinallyClause.syntaxtree.txt @@ -1,25 +1,25 @@ Statement block - Gen - 38 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [try { foo(); } finally { Dispose(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:21 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[finally]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Dispose]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [try { foo(); } finally { Dispose(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:21 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[finally]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Dispose]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ForEachStatement.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ForEachStatement.syntaxtree.txt index a4eccdd716..7d4a7b839e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ForEachStatement.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ForEachStatement.syntaxtree.txt @@ -1,23 +1,23 @@ Statement block - Gen - 35 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [foreach(var foo in bar) { foo(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:19 - CSharpSymbolType.Keyword;[foreach]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[in]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[bar]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [foreach(var foo in bar) { foo(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:19 + CSharpTokenType.Keyword;[foreach]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[in]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[bar]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ForStatement.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ForStatement.syntaxtree.txt index 3e914af96f..073af76a08 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ForStatement.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/ForStatement.syntaxtree.txt @@ -1,34 +1,34 @@ Statement block - Gen - 43 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [for(int i = 0; i++; i < length) { foo(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:30 - CSharpSymbolType.Keyword;[for]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[int]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.IntegerLiteral;[0]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.Increment;[++]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[i]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[length]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [for(int i = 0; i++; i < length) { foo(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:30 + CSharpTokenType.Keyword;[for]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[int]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.IntegerLiteral;[0]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.Increment;[++]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[i]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[length]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/IfStatement.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/IfStatement.syntaxtree.txt index 5edc09a8a5..d01613f66d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/IfStatement.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/IfStatement.syntaxtree.txt @@ -1,17 +1,17 @@ Statement block - Gen - 20 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [if(true) { foo(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:13 - CSharpSymbolType.Keyword;[if]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [if(true) { foo(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:13 + CSharpTokenType.Keyword;[if]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/LockStatement.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/LockStatement.syntaxtree.txt index 4ca2cf8004..7a8dcd7965 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/LockStatement.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/LockStatement.syntaxtree.txt @@ -1,17 +1,17 @@ Statement block - Gen - 21 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [lock(baz) { foo(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:13 - CSharpSymbolType.Keyword;[lock]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[baz]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [lock(baz) { foo(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:13 + CSharpTokenType.Keyword;[lock]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[baz]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/NonBlockKeywordTreatedAsImplicitExpression.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/NonBlockKeywordTreatedAsImplicitExpression.syntaxtree.txt index 14b766e62b..7b1d379e7d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/NonBlockKeywordTreatedAsImplicitExpression.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/NonBlockKeywordTreatedAsImplicitExpression.syntaxtree.txt @@ -1,5 +1,5 @@ Expression block - Gen - 3 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [is] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:1 - CSharpSymbolType.Keyword;[is]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [is] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 + CSharpTokenType.Keyword;[is]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_Complete_Spaced.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_Complete_Spaced.syntaxtree.txt index 57e55d23b0..6e6611d1d6 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_Complete_Spaced.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_Complete_Spaced.syntaxtree.txt @@ -1,13 +1,13 @@ Directive block - Gen - 40 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [using static global::System.Console] - SpanEditHandler;Accepts:AnyExceptNewline - (1:0,1) - Symbols:9 - CSharpSymbolType.Keyword;[using]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[static]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[global]; - CSharpSymbolType.DoubleColon;[::]; - CSharpSymbolType.Identifier;[System]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Console]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [using static global::System.Console] - SpanEditHandler;Accepts:AnyExceptNewline - (1:0,1) - Tokens:9 + CSharpTokenType.Keyword;[using]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[static]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[global]; + CSharpTokenType.DoubleColon;[::]; + CSharpTokenType.Identifier;[System]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Console]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_GlobalPrefix.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_GlobalPrefix.syntaxtree.txt index 2107f8c0a0..7211d38d71 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_GlobalPrefix.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_GlobalPrefix.syntaxtree.txt @@ -1,13 +1,13 @@ Directive block - Gen - 36 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [using static global::System.Console] - SpanEditHandler;Accepts:AnyExceptNewline - (1:0,1) - Symbols:9 - CSharpSymbolType.Keyword;[using]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[static]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[global]; - CSharpSymbolType.DoubleColon;[::]; - CSharpSymbolType.Identifier;[System]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Console]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [using static global::System.Console] - SpanEditHandler;Accepts:AnyExceptNewline - (1:0,1) - Tokens:9 + CSharpTokenType.Keyword;[using]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[static]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[global]; + CSharpTokenType.DoubleColon;[::]; + CSharpTokenType.Identifier;[System]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Console]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_MultipleIdentifiers.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_MultipleIdentifiers.syntaxtree.txt index ad4edfc1c9..54278101f9 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_MultipleIdentifiers.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_MultipleIdentifiers.syntaxtree.txt @@ -1,11 +1,11 @@ Directive block - Gen - 28 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [using static System.Console] - SpanEditHandler;Accepts:AnyExceptNewline - (1:0,1) - Symbols:7 - CSharpSymbolType.Keyword;[using]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[static]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[System]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Console]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [using static System.Console] - SpanEditHandler;Accepts:AnyExceptNewline - (1:0,1) - Tokens:7 + CSharpTokenType.Keyword;[using]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[static]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[System]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Console]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_NoUsing.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_NoUsing.syntaxtree.txt index ad822bd97e..7d6aaac205 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_NoUsing.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_NoUsing.syntaxtree.txt @@ -1,7 +1,7 @@ Directive block - Gen - 13 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [using static] - SpanEditHandler;Accepts:AnyExceptNewline - (1:0,1) - Symbols:3 - CSharpSymbolType.Keyword;[using]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[static]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [using static] - SpanEditHandler;Accepts:AnyExceptNewline - (1:0,1) - Tokens:3 + CSharpTokenType.Keyword;[using]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[static]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_SingleIdentifier.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_SingleIdentifier.syntaxtree.txt index ec4cf9f779..226b90f7bd 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_SingleIdentifier.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/StaticUsing_SingleIdentifier.syntaxtree.txt @@ -1,9 +1,9 @@ Directive block - Gen - 20 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [using static System] - SpanEditHandler;Accepts:AnyExceptNewline - (1:0,1) - Symbols:5 - CSharpSymbolType.Keyword;[using]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[static]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[System]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [using static System] - SpanEditHandler;Accepts:AnyExceptNewline - (1:0,1) - Tokens:5 + CSharpTokenType.Keyword;[using]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[static]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[System]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/SwitchStatement.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/SwitchStatement.syntaxtree.txt index 9ea0dc1d0b..dd5b38a925 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/SwitchStatement.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/SwitchStatement.syntaxtree.txt @@ -1,17 +1,17 @@ Statement block - Gen - 23 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [switch(foo) { foo(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:13 - CSharpSymbolType.Keyword;[switch]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [switch(foo) { foo(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:13 + CSharpTokenType.Keyword;[switch]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/TryStatement.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/TryStatement.syntaxtree.txt index 8005f42530..bd13bb3059 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/TryStatement.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/TryStatement.syntaxtree.txt @@ -1,14 +1,14 @@ Statement block - Gen - 15 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [try { foo(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:10 - CSharpSymbolType.Keyword;[try]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [try { foo(); }] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:10 + CSharpTokenType.Keyword;[try]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingNamespaceImport.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingNamespaceImport.syntaxtree.txt index 7c3c54e3f6..4a9d2be68d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingNamespaceImport.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingNamespaceImport.syntaxtree.txt @@ -1,13 +1,13 @@ Directive block - Gen - 41 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [using System.Text.Encoding.ASCIIEncoding] - SpanEditHandler;Accepts:AnyExceptNewline - (1:0,1) - Symbols:9 - CSharpSymbolType.Keyword;[using]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[System]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Text]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Encoding]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[ASCIIEncoding]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [using System.Text.Encoding.ASCIIEncoding] - SpanEditHandler;Accepts:AnyExceptNewline - (1:0,1) - Tokens:9 + CSharpTokenType.Keyword;[using]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[System]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Text]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Encoding]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[ASCIIEncoding]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingStatement.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingStatement.syntaxtree.txt index 18c227782b..b8a04ea3e1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingStatement.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingStatement.syntaxtree.txt @@ -1,29 +1,29 @@ Statement block - Gen - 42 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [using(var foo = new Foo()) { foo.Bar(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:25 - CSharpSymbolType.Keyword;[using]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Identifier;[var]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[new]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[Foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Bar]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [using(var foo = new Foo()) { foo.Bar(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:25 + CSharpTokenType.Keyword;[using]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Identifier;[var]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[new]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[Foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Bar]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingTypeAlias.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingTypeAlias.syntaxtree.txt index b82af607ca..df25b12077 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingTypeAlias.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/UsingTypeAlias.syntaxtree.txt @@ -1,23 +1,23 @@ Directive block - Gen - 79 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen;> - [using StringDictionary = System.Collections.Generic.Dictionary] - SpanEditHandler;Accepts:AnyExceptNewline - (1:0,1) - Symbols:19 - CSharpSymbolType.Keyword;[using]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[StringDictionary]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Assign;[=]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[System]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Collections]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Generic]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Dictionary]; - CSharpSymbolType.LessThan;[<]; - CSharpSymbolType.Keyword;[string]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Keyword;[string]; - CSharpSymbolType.GreaterThan;[>]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen;> - [using StringDictionary = System.Collections.Generic.Dictionary] - SpanEditHandler;Accepts:AnyExceptNewline - (1:0,1) - Tokens:19 + CSharpTokenType.Keyword;[using]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[StringDictionary]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Assign;[=]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[System]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Collections]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Generic]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Dictionary]; + CSharpTokenType.LessThan;[<]; + CSharpTokenType.Keyword;[string]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Keyword;[string]; + CSharpTokenType.GreaterThan;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/WhileStatement.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/WhileStatement.syntaxtree.txt index a7645b93aa..5a2eb3d2e3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/WhileStatement.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpStatementTest/WhileStatement.syntaxtree.txt @@ -1,17 +1,17 @@ Statement block - Gen - 23 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.Transition;[@]; - Code span - Gen - [while(true) { foo(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:13 - CSharpSymbolType.Keyword;[while]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.Keyword;[true]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.LeftBrace;[{]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.Identifier;[foo]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.RightParenthesis;[)]; - CSharpSymbolType.Semicolon;[;]; - CSharpSymbolType.WhiteSpace;[ ]; - CSharpSymbolType.RightBrace;[}]; + Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.Transition;[@]; + Code span - Gen - [while(true) { foo(); }] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:13 + CSharpTokenType.Keyword;[while]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.Keyword;[true]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.LeftBrace;[{]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.Identifier;[foo]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.RightParenthesis;[)]; + CSharpTokenType.Semicolon;[;]; + CSharpTokenType.WhiteSpace;[ ]; + CSharpTokenType.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ParseBlockHandlesSimpleTemplateInExplicitExpressionParens.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ParseBlockHandlesSimpleTemplateInExplicitExpressionParens.syntaxtree.txt index ec95fa14ec..bdcccbd8c2 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ParseBlockHandlesSimpleTemplateInExplicitExpressionParens.syntaxtree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ParseBlockHandlesSimpleTemplateInExplicitExpressionParens.syntaxtree.txt @@ -1,39 +1,39 @@ Expression block - Gen - 37 - (0:0,0) - MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1 - CSharpSymbolType.LeftParenthesis;[(]; - Code span - Gen - [Html.Repeat(10, ] - SpanEditHandler;Accepts:Any - (1:0,1) - Symbols:7 - CSharpSymbolType.Identifier;[Html]; - CSharpSymbolType.Dot;[.]; - CSharpSymbolType.Identifier;[Repeat]; - CSharpSymbolType.LeftParenthesis;[(]; - CSharpSymbolType.IntegerLiteral;[10]; - CSharpSymbolType.Comma;[,]; - CSharpSymbolType.WhiteSpace;[ ]; + MetaCode span - Gen - [(] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 + CSharpTokenType.LeftParenthesis;[(]; + Code span - Gen - [Html.Repeat(10, ] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:7 + CSharpTokenType.Identifier;[Html]; + CSharpTokenType.Dot;[.]; + CSharpTokenType.Identifier;[Repeat]; + CSharpTokenType.LeftParenthesis;[(]; + CSharpTokenType.IntegerLiteral;[10]; + CSharpTokenType.Comma;[,]; + CSharpTokenType.WhiteSpace;[ ]; Template block - Gen