From 419d47ebc9fcddbe3d537bc615baa8ca5d5de3ea Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Wed, 12 Sep 2018 16:28:01 -0700 Subject: [PATCH 1/4] Generate baselines for HtmlDocumentTest --- .../Legacy/HtmlDocumentTest.cs | 6 +- ...eptsEndTagWithNoMatchingStartTag.stree.txt | 27 +- ...FileAndOutputsZeroLengthCodeSpan.stree.txt | 22 +- ...lyHandlesOddlySpacedHTMLElements.stree.txt | 81 ++--- ...ineOfMarkupWithEmbeddedStatement.stree.txt | 54 +-- ...noreNewLineAtTheEndOfMarkupBlock.stree.txt | 44 +-- ...fVerbatimBlockIfNoNewlinePresent.stree.txt | 44 +-- ...raNewLineAtTheEndOfVerbatimBlock.stree.txt | 40 ++- ...ndNewLineAtTheEndOfVerbatimBlock.stree.txt | 42 +-- ...nVerbatimBlockIfFollowedByCSharp.stree.txt | 68 ++-- ...esNotReturnErrorOnMismatchedTags.stree.txt | 59 ++-- ...hToCodeOnEmailAddressInAttribute.stree.txt | 52 +-- ...EmitsAtSignAsMarkupIfAtEndOfFile.stree.txt | 24 +- ...kIfFirstCharacterIsSwapCharacter.stree.txt | 24 +- ...NewLineBeforeMarkupInNestedBlock.stree.txt | 86 ++--- ...lesNewLineAndMarkupInNestedBlock.stree.txt | 76 +++-- .../HandlesNewLineInNestedBlock.stree.txt | 68 ++-- ...nAtSignEncounteredAndEmitsOutput.stree.txt | 28 +- ...IgnoresTagsInContentsOfScriptTag.stree.txt | 56 ++-- ...deBlockWithMarkupSetsDotAsMarkup.stree.txt | 98 +++--- ...pportsDollarOpenBraceCombination.stree.txt | 29 +- ...MarkupSpanIfContentIsEmptyString.stree.txt | 7 +- ...tentAsSingleWhitespaceMarkupSpan.stree.txt | 7 +- ...SwitchToCodeOnEmailAddressInText.stree.txt | 7 +- ...IgnoresTagsInContentsOfScriptTag.stree.txt | 109 +++--- ...SpanIfNoSwapCharacterEncountered.stree.txt | 11 +- ...gInVerbatimBlockIfFollowedByHtml.stree.txt | 86 ++--- ...lockIfFollowedByMarkupTransition.stree.txt | 86 ++--- .../RendersTextPseudoTagAsMarkup.stree.txt | 35 +- ...SegmentIfNoCodeBlocksEncountered.stree.txt | 43 +-- ...ingOfAttributeValue_DoesNotThrow.stree.txt | 59 ++-- ...EndOfAttributeValue_DoesNotThrow.stree.txt | 59 ++-- ...tweenAttributeValue_DoesNotThrow.stree.txt | 67 ++-- ...ionInAttributeValue_DoesNotThrow.stree.txt | 54 +-- ...leTransitionInEmail_DoesNotThrow.stree.txt | 82 ++--- ...leTransitionInRegex_DoesNotThrow.stree.txt | 146 +++++---- ...WithExpressionBlock_DoesNotThrow.stree.txt | 310 ++++++++++-------- ...ansitionsInAttributeValue_Throws.stree.txt | 72 ++-- ...onDoesNotCreateDocumentLevelSpan.stree.txt | 78 ++--- 39 files changed, 1265 insertions(+), 1081 deletions(-) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlDocumentTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlDocumentTest.cs index f77ee48b6..061297cc0 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlDocumentTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlDocumentTest.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Linq; using Microsoft.AspNetCore.Razor.Language.Extensions; using Xunit; @@ -12,6 +11,11 @@ public class HtmlDocumentTest : CsHtmlMarkupParserTestBase { private static readonly TestFile Nested1000 = TestFile.Create("TestFiles/nested-1000.html", typeof(HtmlDocumentTest)); + public HtmlDocumentTest() + { + UseNewSyntaxTree = true; + } + [Fact] public void NestedCodeBlockWithMarkupSetsDotAsMarkup() { diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsEndTagWithNoMatchingStartTag.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsEndTagWithNoMatchingStartTag.stree.txt index 0279f883d..9d802831a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsEndTagWithNoMatchingStartTag.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsEndTagWithNoMatchingStartTag.stree.txt @@ -1,13 +1,14 @@ -Markup block - Gen - 14 - (0:0,0) - Markup span - Gen - [Foo ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2 - SyntaxKind.Text;[Foo]; - SyntaxKind.Whitespace;[ ]; - Tag block - Gen - 6 - (4:0,4) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:4 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[div]; - SyntaxKind.CloseAngle;[>]; - Markup span - Gen - [ Bar] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:2 - SyntaxKind.Whitespace;[ ]; - SyntaxKind.Text;[Bar]; +SyntaxKind.HtmlDocument - [0..14) - FullWidth: 14 - Slots: 1 - [Foo Bar] + SyntaxKind.HtmlMarkupBlock - [0..14) - FullWidth: 14 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..4) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Text;[Foo]; + SyntaxKind.Whitespace;[ ]; + SyntaxKind.HtmlTagBlock - [4..10) - FullWidth: 6 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [4..10) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.ForwardSlash;[/]; + SyntaxKind.Text;[div]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTextLiteral - [10..14) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Whitespace;[ ]; + SyntaxKind.Text;[Bar]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.stree.txt index 111e681d8..142e60be6 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.stree.txt @@ -1,10 +1,14 @@ -Markup block - Gen - 1 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 - SyntaxKind.Unknown;[]; - Expression block - Gen - 1 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 - SyntaxKind.Transition;[@]; - Code span - Gen - [] - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 +SyntaxKind.HtmlDocument - [0..1) - FullWidth: 1 - Slots: 1 - [@] + SyntaxKind.HtmlMarkupBlock - [0..1) - FullWidth: 1 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Unknown;[]; + SyntaxKind.CSharpCodeBlock - [0..1) - FullWidth: 1 - Slots: 1 + SyntaxKind.CSharpImplicitExpression - [0..1) - FullWidth: 1 - Slots: 2 + SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.CSharpImplicitExpressionBody - [1..1) - FullWidth: 0 - Slots: 1 + SyntaxKind.CSharpCodeBlock - [1..1) - FullWidth: 0 - Slots: 1 + SyntaxKind.CSharpExpressionLiteral - [1..1) - FullWidth: 0 - Slots: 1 - Gen - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 + SyntaxKind.Unknown;[]; + SyntaxKind.HtmlTextLiteral - [1..1) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any SyntaxKind.Unknown;[]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:1 - SyntaxKind.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.stree.txt index 9e676d2db..c60d725f8 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.stree.txt @@ -1,43 +1,48 @@ -Markup block - Gen - 39 - (0:0,0) - Tag block - Gen - 6 - (0:0,0) - Markup span - Gen - [
] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:4 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[div]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.CloseAngle;[>]; - Tag block - Gen - 17 - (6:0,6) - Markup span - Gen - [ - 14 - (8:0,8) - Markup span - Gen - [ class = '] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:6 - SyntaxKind.Whitespace;[ ]; - SyntaxKind.Text;[class]; +SyntaxKind.HtmlDocument - [0..39) - FullWidth: 39 - Slots: 1 - [

Foo

] + SyntaxKind.HtmlMarkupBlock - [0..39) - FullWidth: 39 - Slots: 1 + SyntaxKind.HtmlTagBlock - [0..6) - FullWidth: 6 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..6) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[div]; SyntaxKind.Whitespace;[ ]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTagBlock - [6..23) - FullWidth: 17 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [6..8) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[p]; + SyntaxKind.HtmlAttributeBlock - [8..22) - FullWidth: 14 - Slots: 7 + SyntaxKind.HtmlTextLiteral - [8..9) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Whitespace;[ ]; + SyntaxKind.HtmlTextLiteral - [9..14) - FullWidth: 5 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Text;[class]; + SyntaxKind.HtmlTextLiteral - [14..15) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Whitespace;[ ]; SyntaxKind.Equals;[=]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.SingleQuote;[']; - Markup span - Gen - [bar] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1 - SyntaxKind.Text;[bar]; - Markup span - Gen - ['] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:1 - SyntaxKind.SingleQuote;[']; - Markup span - Gen - [>] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1 - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [ Foo ] - [23..28) - FullWidth: 5 - Slots: 1 - SyntaxKind.List - [ Foo ] - [23..28) - FullWidth: 5 - Slots: 3 + SyntaxKind.HtmlTextLiteral - [16..18) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Whitespace;[ ]; + SyntaxKind.SingleQuote;[']; + SyntaxKind.HtmlBlock - [18..21) - FullWidth: 3 - Slots: 1 + SyntaxKind.HtmlLiteralAttributeValue - [18..21) - FullWidth: 3 - Slots: 2 + SyntaxKind.HtmlTextLiteral - [18..21) - FullWidth: 3 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Text;[bar]; + SyntaxKind.HtmlTextLiteral - [21..22) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.SingleQuote;[']; + SyntaxKind.HtmlTextLiteral - [22..23) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTextLiteral - [23..28) - FullWidth: 5 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any SyntaxKind.Whitespace;[ ]; SyntaxKind.Text;[Foo]; SyntaxKind.Whitespace;[ ]; - Tag block - Gen - 4 - (28:0,28) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:4 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[p]; - SyntaxKind.CloseAngle;[>]; - Tag block - Gen - 7 - (32:0,32) - Markup span - Gen - [
] - SpanEditHandler;Accepts:Any - (32:0,32) - Tokens:5 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[div]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTagBlock - [28..32) - FullWidth: 4 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [28..32) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.ForwardSlash;[/]; + SyntaxKind.Text;[p]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTagBlock - [32..39) - FullWidth: 7 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [32..39) - FullWidth: 7 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.ForwardSlash;[/]; + SyntaxKind.Text;[div]; + SyntaxKind.Whitespace;[ ]; + SyntaxKind.CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt index b57b9fee5..061c9304d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt @@ -1,30 +1,30 @@ -Markup block - Gen - 31 - (0:0,0) - Tag block - Gen - 5 - (0:0,0) - Markup span - Gen - [
] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[div]; - SyntaxKind.CloseAngle;[>]; - Markup span - Gen - [Foo ] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:2 - SyntaxKind.Text;[Foo]; - SyntaxKind.Whitespace;[ ]; - Statement block - Gen - 12 - (9:0,9) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:1 - SyntaxKind.Transition;[@]; - Code span - Gen - [if(true) {}] - SpanEditHandler;Accepts:Any - (10:0,10) - Tokens:7 - SyntaxKind.Keyword;[if]; - SyntaxKind.LeftParenthesis;[(]; - SyntaxKind.Keyword;[true]; - SyntaxKind.RightParenthesis;[)]; +SyntaxKind.HtmlDocument - [0..31) - FullWidth: 31 - Slots: 1 - [
Foo @if(true) {} Bar
] + SyntaxKind.HtmlMarkupBlock - [0..31) - FullWidth: 31 - Slots: 1 + SyntaxKind.HtmlTagBlock - [0..5) - FullWidth: 5 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..5) - FullWidth: 5 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[div]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTextLiteral - [5..9) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Text;[Foo]; SyntaxKind.Whitespace;[ ]; - SyntaxKind.LeftBrace;[{]; - SyntaxKind.RightBrace;[}]; - SyntaxKind.HtmlTextLiteral - [ Bar] - [21..25) - FullWidth: 4 - Slots: 1 - SyntaxKind.List - [ Bar] - [21..25) - FullWidth: 4 - Slots: 2 + SyntaxKind.CSharpCodeBlock - [9..21) - FullWidth: 12 - Slots: 1 + SyntaxKind.CSharpTransition - [9..10) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.CSharpStatementLiteral - [10..21) - FullWidth: 11 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Keyword;[if]; + SyntaxKind.LeftParenthesis;[(]; + SyntaxKind.Keyword;[true]; + SyntaxKind.RightParenthesis;[)]; + SyntaxKind.Whitespace;[ ]; + SyntaxKind.LeftBrace;[{]; + SyntaxKind.RightBrace;[}]; + SyntaxKind.HtmlTextLiteral - [21..25) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any SyntaxKind.Whitespace;[ ]; SyntaxKind.Text;[Bar]; - Tag block - Gen - 6 - (25:0,25) - Markup span - Gen - [
] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:4 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[div]; - SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTagBlock - [25..31) - FullWidth: 6 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [25..31) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.ForwardSlash;[/]; + SyntaxKind.Text;[div]; + SyntaxKind.CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreNewLineAtTheEndOfMarkupBlock.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreNewLineAtTheEndOfMarkupBlock.stree.txt index 39886635d..178088846 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreNewLineAtTheEndOfMarkupBlock.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreNewLineAtTheEndOfMarkupBlock.stree.txt @@ -1,21 +1,25 @@ -Markup block - Gen - 15 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 - SyntaxKind.Unknown;[]; - Statement block - Gen - 5 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 - SyntaxKind.Transition;[@]; - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 - SyntaxKind.LeftBrace;[{]; - Code span - Gen - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (2:0,2) - Tokens:1 +SyntaxKind.HtmlDocument - [0..15) - FullWidth: 15 - Slots: 1 - [@{LF}LFLF] + SyntaxKind.HtmlMarkupBlock - [0..15) - FullWidth: 15 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Unknown;[]; + SyntaxKind.CSharpCodeBlock - [0..5) - FullWidth: 5 - Slots: 1 + SyntaxKind.CSharpStatement - [0..5) - FullWidth: 5 - Slots: 2 + SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.CSharpStatementBody - [1..5) - FullWidth: 4 - Slots: 3 + SyntaxKind.RazorMetaCode - [1..2) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.LeftBrace;[{]; + SyntaxKind.CSharpCodeBlock - [2..4) - FullWidth: 2 - Slots: 1 + SyntaxKind.CSharpStatementLiteral - [2..4) - FullWidth: 2 - Slots: 1 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL + SyntaxKind.NewLine;[LF]; + SyntaxKind.RazorMetaCode - [4..5) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.RightBrace;[}]; + SyntaxKind.HtmlTextLiteral - [5..7) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.NewLine;[LF]; + SyntaxKind.HtmlTagBlock - [7..13) - FullWidth: 6 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [7..13) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[html]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTextLiteral - [13..15) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any SyntaxKind.NewLine;[LF]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (4:1,0) - Tokens:1 - SyntaxKind.RightBrace;[}]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (5:1,1) - Tokens:1 - SyntaxKind.NewLine;[LF]; - Tag block - Gen - 6 - (7:2,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (7:2,0) - Tokens:3 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[html]; - SyntaxKind.CloseAngle;[>]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (13:2,6) - Tokens:1 - SyntaxKind.NewLine;[LF]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent.stree.txt index e6d7acb56..6251e5e70 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent.stree.txt @@ -1,21 +1,25 @@ -Markup block - Gen - 17 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 - SyntaxKind.Unknown;[]; - Statement block - Gen - 5 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 - SyntaxKind.Transition;[@]; - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 - SyntaxKind.LeftBrace;[{]; - Code span - Gen - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (2:0,2) - Tokens:1 +SyntaxKind.HtmlDocument - [0..17) - FullWidth: 17 - Slots: 1 - [@{LF} LF] + SyntaxKind.HtmlMarkupBlock - [0..17) - FullWidth: 17 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Unknown;[]; + SyntaxKind.CSharpCodeBlock - [0..5) - FullWidth: 5 - Slots: 1 + SyntaxKind.CSharpStatement - [0..5) - FullWidth: 5 - Slots: 2 + SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.CSharpStatementBody - [1..5) - FullWidth: 4 - Slots: 3 + SyntaxKind.RazorMetaCode - [1..2) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.LeftBrace;[{]; + SyntaxKind.CSharpCodeBlock - [2..4) - FullWidth: 2 - Slots: 1 + SyntaxKind.CSharpStatementLiteral - [2..4) - FullWidth: 2 - Slots: 1 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL + SyntaxKind.NewLine;[LF]; + SyntaxKind.RazorMetaCode - [4..5) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.RightBrace;[}]; + SyntaxKind.HtmlTextLiteral - [5..9) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Whitespace;[ ]; + SyntaxKind.HtmlTagBlock - [9..15) - FullWidth: 6 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [9..15) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[html]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTextLiteral - [15..17) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any SyntaxKind.NewLine;[LF]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (4:1,0) - Tokens:1 - SyntaxKind.RightBrace;[}]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (5:1,1) - Tokens:1 - SyntaxKind.Whitespace;[ ]; - Tag block - Gen - 6 - (9:1,5) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (9:1,5) - Tokens:3 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[html]; - SyntaxKind.CloseAngle;[>]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (15:1,11) - Tokens:1 - SyntaxKind.NewLine;[LF]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock.stree.txt index 9a418f929..82dee78aa 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock.stree.txt @@ -1,19 +1,23 @@ -Markup block - Gen - 13 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 - SyntaxKind.Unknown;[]; - Statement block - Gen - 5 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 - SyntaxKind.Transition;[@]; - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 - SyntaxKind.LeftBrace;[{]; - Code span - Gen - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (2:0,2) - Tokens:1 +SyntaxKind.HtmlDocument - [0..13) - FullWidth: 13 - Slots: 1 - [@{LF}LF] + SyntaxKind.HtmlMarkupBlock - [0..13) - FullWidth: 13 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Unknown;[]; + SyntaxKind.CSharpCodeBlock - [0..5) - FullWidth: 5 - Slots: 1 + SyntaxKind.CSharpStatement - [0..5) - FullWidth: 5 - Slots: 2 + SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.CSharpStatementBody - [1..5) - FullWidth: 4 - Slots: 3 + SyntaxKind.RazorMetaCode - [1..2) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.LeftBrace;[{]; + SyntaxKind.CSharpCodeBlock - [2..4) - FullWidth: 2 - Slots: 1 + SyntaxKind.CSharpStatementLiteral - [2..4) - FullWidth: 2 - Slots: 1 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL + SyntaxKind.NewLine;[LF]; + SyntaxKind.RazorMetaCode - [4..5) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.RightBrace;[}]; + SyntaxKind.HtmlTextLiteral - [5..7) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any SyntaxKind.NewLine;[LF]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (4:1,0) - Tokens:1 - SyntaxKind.RightBrace;[}]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (5:1,1) - Tokens:1 - SyntaxKind.NewLine;[LF]; - Tag block - Gen - 6 - (7:2,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (7:2,0) - Tokens:3 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[html]; - SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTagBlock - [7..13) - FullWidth: 6 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [7..13) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[html]; + SyntaxKind.CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock.stree.txt index ef473190e..e93990c80 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock.stree.txt @@ -1,20 +1,24 @@ -Markup block - Gen - 15 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 - SyntaxKind.Unknown;[]; - Statement block - Gen - 5 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 - SyntaxKind.Transition;[@]; - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 - SyntaxKind.LeftBrace;[{]; - Code span - Gen - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (2:0,2) - Tokens:1 +SyntaxKind.HtmlDocument - [0..15) - FullWidth: 15 - Slots: 1 - [@{LF} LF] + SyntaxKind.HtmlMarkupBlock - [0..15) - FullWidth: 15 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Unknown;[]; + SyntaxKind.CSharpCodeBlock - [0..5) - FullWidth: 5 - Slots: 1 + SyntaxKind.CSharpStatement - [0..5) - FullWidth: 5 - Slots: 2 + SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.CSharpStatementBody - [1..5) - FullWidth: 4 - Slots: 3 + SyntaxKind.RazorMetaCode - [1..2) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.LeftBrace;[{]; + SyntaxKind.CSharpCodeBlock - [2..4) - FullWidth: 2 - Slots: 1 + SyntaxKind.CSharpStatementLiteral - [2..4) - FullWidth: 2 - Slots: 1 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL + SyntaxKind.NewLine;[LF]; + SyntaxKind.RazorMetaCode - [4..5) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.RightBrace;[}]; + SyntaxKind.HtmlTextLiteral - [5..9) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Whitespace;[ ]; SyntaxKind.NewLine;[LF]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (4:1,0) - Tokens:1 - SyntaxKind.RightBrace;[}]; - Markup span - Gen - [ LF] - SpanEditHandler;Accepts:Any - (5:1,1) - Tokens:2 - SyntaxKind.Whitespace;[ ]; - SyntaxKind.NewLine;[LF]; - Tag block - Gen - 6 - (9:2,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (9:2,0) - Tokens:3 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[html]; - SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTagBlock - [9..15) - FullWidth: 6 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [9..15) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[html]; + SyntaxKind.CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderNewlineAfterTextTagInVerbatimBlockIfFollowedByCSharp.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderNewlineAfterTextTagInVerbatimBlockIfFollowedByCSharp.stree.txt index a0171c8cd..e6a60231c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderNewlineAfterTextTagInVerbatimBlockIfFollowedByCSharp.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderNewlineAfterTextTagInVerbatimBlockIfFollowedByCSharp.stree.txt @@ -1,32 +1,36 @@ -Markup block - Gen - 30 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 - SyntaxKind.Unknown;[]; - Statement block - Gen - 24 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 - SyntaxKind.Transition;[@]; - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 - SyntaxKind.LeftBrace;[{]; - Markup block - Gen - 17 - (2:0,2) - Tag block - Gen - 6 - (2:0,2) - Transition span - Gen - [] - SpanEditHandler;Accepts:None - (2:0,2) - Tokens:3 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[text]; - SyntaxKind.CloseAngle;[>]; - Markup span - Gen - [Blah] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:1 - SyntaxKind.Text;[Blah]; - Tag block - Gen - 7 - (12:0,12) - Transition span - Gen - [] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:4 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[text]; - SyntaxKind.CloseAngle;[>]; - Code span - Gen - [LFLF] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:2 - SyntaxKind.NewLine;[LF]; - SyntaxKind.NewLine;[LF]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (23:2,0) - Tokens:1 - SyntaxKind.RightBrace;[}]; - Tag block - Gen - 6 - (24:2,1) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (24:2,1) - Tokens:3 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[html]; - SyntaxKind.CloseAngle;[>]; +SyntaxKind.HtmlDocument - [0..30) - FullWidth: 30 - Slots: 1 - [@{BlahLFLF}] + SyntaxKind.HtmlMarkupBlock - [0..30) - FullWidth: 30 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Unknown;[]; + SyntaxKind.CSharpCodeBlock - [0..24) - FullWidth: 24 - Slots: 1 + SyntaxKind.CSharpStatement - [0..24) - FullWidth: 24 - Slots: 2 + SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.CSharpStatementBody - [1..24) - FullWidth: 23 - Slots: 3 + SyntaxKind.RazorMetaCode - [1..2) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.LeftBrace;[{]; + SyntaxKind.CSharpCodeBlock - [2..23) - FullWidth: 21 - Slots: 1 + SyntaxKind.HtmlMarkupBlock - [2..19) - FullWidth: 17 - Slots: 1 + SyntaxKind.HtmlTagBlock - [2..8) - FullWidth: 6 - Slots: 1 + SyntaxKind.HtmlTransition - [2..8) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[text]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTextLiteral - [8..12) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Text;[Blah]; + SyntaxKind.HtmlTagBlock - [12..19) - FullWidth: 7 - Slots: 1 + SyntaxKind.HtmlTransition - [12..19) - FullWidth: 7 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.OpenAngle;[<]; + SyntaxKind.ForwardSlash;[/]; + SyntaxKind.Text;[text]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.CSharpStatementLiteral - [19..23) - FullWidth: 4 - Slots: 1 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL + SyntaxKind.NewLine;[LF]; + SyntaxKind.NewLine;[LF]; + SyntaxKind.RazorMetaCode - [23..24) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.RightBrace;[}]; + SyntaxKind.HtmlTagBlock - [24..30) - FullWidth: 6 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [24..30) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[html]; + SyntaxKind.CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotReturnErrorOnMismatchedTags.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotReturnErrorOnMismatchedTags.stree.txt index dad631ec5..82acc0b4a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotReturnErrorOnMismatchedTags.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotReturnErrorOnMismatchedTags.stree.txt @@ -1,29 +1,30 @@ -Markup block - Gen - 24 - (0:0,0) - Markup span - Gen - [Foo ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2 - SyntaxKind.Text;[Foo]; - SyntaxKind.Whitespace;[ ]; - Tag block - Gen - 5 - (4:0,4) - Markup span - Gen - [
] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:3 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[div]; - SyntaxKind.CloseAngle;[>]; - Tag block - Gen - 3 - (9:0,9) - Markup span - Gen - [

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

] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:4 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[p]; - SyntaxKind.CloseAngle;[>]; - Tag block - Gen - 4 - (16:0,16) - Markup span - Gen - [

] - SpanEditHandler;Accepts:Any - (16:0,16) - Tokens:4 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[p]; - SyntaxKind.CloseAngle;[>]; - Markup span - Gen - [ Baz] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:2 - SyntaxKind.Whitespace;[ ]; - SyntaxKind.Text;[Baz]; +SyntaxKind.HtmlDocument - [0..24) - FullWidth: 24 - Slots: 1 - [Foo

Baz] + SyntaxKind.HtmlMarkupBlock - [0..24) - FullWidth: 24 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..4) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Text;[Foo]; + SyntaxKind.Whitespace;[ ]; + SyntaxKind.HtmlTagBlock - [4..9) - FullWidth: 5 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [4..9) - FullWidth: 5 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[div]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTagBlock - [9..12) - FullWidth: 3 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [9..12) - FullWidth: 3 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[p]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTagBlock - [12..16) - FullWidth: 4 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [12..16) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.ForwardSlash;[/]; + SyntaxKind.Text;[p]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTagBlock - [16..20) - FullWidth: 4 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [16..20) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.ForwardSlash;[/]; + SyntaxKind.Text;[p]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTextLiteral - [20..24) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Whitespace;[ ]; + SyntaxKind.Text;[Baz]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt index d0b467e5d..a203be87d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt @@ -1,28 +1,32 @@ -Markup block - Gen - 51 - (0:0,0) - Tag block - Gen - 39 - (0:0,0) - Markup span - Gen - [ - 36 - (2:0,2) - Markup span - Gen - [ href="] - SpanEditHandler;Accepts:Any - (2:0,2) - Tokens:4 - SyntaxKind.Whitespace;[ ]; - SyntaxKind.Text;[href]; +SyntaxKind.HtmlDocument - [0..51) - FullWidth: 51 - Slots: 1 - [Email me] + SyntaxKind.HtmlMarkupBlock - [0..51) - FullWidth: 51 - Slots: 1 + SyntaxKind.HtmlTagBlock - [0..39) - FullWidth: 39 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..2) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[a]; + SyntaxKind.HtmlAttributeBlock - [2..38) - FullWidth: 36 - Slots: 7 + SyntaxKind.HtmlTextLiteral - [2..3) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Whitespace;[ ]; + SyntaxKind.HtmlTextLiteral - [3..7) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Text;[href]; SyntaxKind.Equals;[=]; - SyntaxKind.DoubleQuote;["]; - Markup span - Gen - [mailto:example@microsoft.com] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1 - SyntaxKind.Text;[mailto:example@microsoft.com]; - Markup span - Gen - ["] - SpanEditHandler;Accepts:Any - (37:0,37) - Tokens:1 - SyntaxKind.DoubleQuote;["]; - Markup span - Gen - [>] - SpanEditHandler;Accepts:Any - (38:0,38) - Tokens:1 - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [Email me] - [39..47) - FullWidth: 8 - Slots: 1 - SyntaxKind.List - [Email me] - [39..47) - FullWidth: 8 - Slots: 3 + SyntaxKind.HtmlTextLiteral - [8..9) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.DoubleQuote;["]; + SyntaxKind.HtmlBlock - [9..37) - FullWidth: 28 - Slots: 1 + SyntaxKind.HtmlLiteralAttributeValue - [9..37) - FullWidth: 28 - Slots: 2 + SyntaxKind.HtmlTextLiteral - [9..37) - FullWidth: 28 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Text;[mailto:example@microsoft.com]; + SyntaxKind.HtmlTextLiteral - [37..38) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.DoubleQuote;["]; + SyntaxKind.HtmlTextLiteral - [38..39) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTextLiteral - [39..47) - FullWidth: 8 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any SyntaxKind.Text;[Email]; SyntaxKind.Whitespace;[ ]; SyntaxKind.Text;[me]; - Tag block - Gen - 4 - (47:0,47) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (47:0,47) - Tokens:4 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[a]; - SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTagBlock - [47..51) - FullWidth: 4 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [47..51) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.ForwardSlash;[/]; + SyntaxKind.Text;[a]; + SyntaxKind.CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.stree.txt index 96e511bc7..d11bff64d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.stree.txt @@ -1,11 +1,15 @@ -Markup block - Gen - 5 - (0:0,0) - Markup span - Gen - [foo ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2 - SyntaxKind.Text;[foo]; - SyntaxKind.Whitespace;[ ]; - Expression block - Gen - 1 - (4:0,4) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:1 - SyntaxKind.Transition;[@]; - Code span - Gen - [] - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 - (5:0,5) - Tokens:1 +SyntaxKind.HtmlDocument - [0..5) - FullWidth: 5 - Slots: 1 - [foo @] + SyntaxKind.HtmlMarkupBlock - [0..5) - FullWidth: 5 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..4) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Text;[foo]; + SyntaxKind.Whitespace;[ ]; + SyntaxKind.CSharpCodeBlock - [4..5) - FullWidth: 1 - Slots: 1 + SyntaxKind.CSharpImplicitExpression - [4..5) - FullWidth: 1 - Slots: 2 + SyntaxKind.CSharpTransition - [4..5) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.CSharpImplicitExpressionBody - [5..5) - FullWidth: 0 - Slots: 1 + SyntaxKind.CSharpCodeBlock - [5..5) - FullWidth: 0 - Slots: 1 + SyntaxKind.CSharpExpressionLiteral - [5..5) - FullWidth: 0 - Slots: 1 - Gen - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 + SyntaxKind.Unknown;[]; + SyntaxKind.HtmlTextLiteral - [5..5) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any SyntaxKind.Unknown;[]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (5:0,5) - Tokens:1 - SyntaxKind.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.stree.txt index bb5a42cd0..3a203efac 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.stree.txt @@ -1,10 +1,14 @@ -Markup block - Gen - 4 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 - SyntaxKind.Unknown;[]; - Expression block - Gen - 4 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 - SyntaxKind.Transition;[@]; - Code span - Gen - [bar] - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 - (1:0,1) - Tokens:1 - SyntaxKind.Identifier;[bar]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:1 - SyntaxKind.Unknown;[]; +SyntaxKind.HtmlDocument - [0..4) - FullWidth: 4 - Slots: 1 - [@bar] + SyntaxKind.HtmlMarkupBlock - [0..4) - FullWidth: 4 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Unknown;[]; + SyntaxKind.CSharpCodeBlock - [0..4) - FullWidth: 4 - Slots: 1 + SyntaxKind.CSharpImplicitExpression - [0..4) - FullWidth: 4 - Slots: 2 + SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.CSharpImplicitExpressionBody - [1..4) - FullWidth: 3 - Slots: 1 + SyntaxKind.CSharpCodeBlock - [1..4) - FullWidth: 3 - Slots: 1 + SyntaxKind.CSharpExpressionLiteral - [1..4) - FullWidth: 3 - Slots: 1 - Gen - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 + SyntaxKind.Identifier;[bar]; + SyntaxKind.HtmlTextLiteral - [4..4) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesExtraNewLineBeforeMarkupInNestedBlock.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesExtraNewLineBeforeMarkupInNestedBlock.stree.txt index 233594530..607bd2267 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesExtraNewLineBeforeMarkupInNestedBlock.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesExtraNewLineBeforeMarkupInNestedBlock.stree.txt @@ -1,42 +1,46 @@ -Markup block - Gen - 37 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 - SyntaxKind.Unknown;[]; - Statement block - Gen - 31 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 - SyntaxKind.Transition;[@]; - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 - SyntaxKind.LeftBrace;[{]; - Code span - Gen - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (2:0,2) - Tokens:1 - SyntaxKind.NewLine;[LF]; - Statement block - Gen - 13 - (4:1,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (4:1,0) - Tokens:1 - SyntaxKind.Transition;[@]; - Code span - Gen - [if(true){LF}] - SpanEditHandler;Accepts:Any - (5:1,1) - Tokens:7 - SyntaxKind.Keyword;[if]; - SyntaxKind.LeftParenthesis;[(]; - SyntaxKind.Keyword;[true]; - SyntaxKind.RightParenthesis;[)]; - SyntaxKind.LeftBrace;[{]; - SyntaxKind.NewLine;[LF]; - SyntaxKind.RightBrace;[}]; - Code span - Gen - [ LF] - SpanEditHandler;Accepts:Any - (17:2,1) - Tokens:2 - SyntaxKind.Whitespace;[ ]; - SyntaxKind.NewLine;[LF]; - Markup block - Gen - 10 - (20:3,0) - Tag block - Gen - 7 - (20:3,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:None - (20:3,0) - Tokens:3 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[input]; - SyntaxKind.CloseAngle;[>]; - Markup span - Gen - [ LF] - SpanEditHandler;Accepts:None - (27:3,7) - Tokens:2 - SyntaxKind.Whitespace;[ ]; - SyntaxKind.NewLine;[LF]; - Code span - Gen - [] - SpanEditHandler;Accepts:Any - (30:4,0) - Tokens:1 +SyntaxKind.HtmlDocument - [0..37) - FullWidth: 37 - Slots: 1 - [@{LF@if(true){LF} LF LF}] + SyntaxKind.HtmlMarkupBlock - [0..37) - FullWidth: 37 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any SyntaxKind.Unknown;[]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (30:4,0) - Tokens:1 - SyntaxKind.RightBrace;[}]; - Tag block - Gen - 6 - (31:4,1) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (31:4,1) - Tokens:3 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[html]; - SyntaxKind.CloseAngle;[>]; + SyntaxKind.CSharpCodeBlock - [0..31) - FullWidth: 31 - Slots: 1 + SyntaxKind.CSharpStatement - [0..31) - FullWidth: 31 - Slots: 2 + SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.CSharpStatementBody - [1..31) - FullWidth: 30 - Slots: 3 + SyntaxKind.RazorMetaCode - [1..2) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.LeftBrace;[{]; + SyntaxKind.CSharpCodeBlock - [2..30) - FullWidth: 28 - Slots: 1 + SyntaxKind.CSharpStatementLiteral - [2..4) - FullWidth: 2 - Slots: 1 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL + SyntaxKind.NewLine;[LF]; + SyntaxKind.CSharpCodeBlock - [4..17) - FullWidth: 13 - Slots: 1 + SyntaxKind.CSharpTransition - [4..5) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.CSharpStatementLiteral - [5..17) - FullWidth: 12 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Keyword;[if]; + SyntaxKind.LeftParenthesis;[(]; + SyntaxKind.Keyword;[true]; + SyntaxKind.RightParenthesis;[)]; + SyntaxKind.LeftBrace;[{]; + SyntaxKind.NewLine;[LF]; + SyntaxKind.RightBrace;[}]; + SyntaxKind.CSharpStatementLiteral - [17..20) - FullWidth: 3 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Whitespace;[ ]; + SyntaxKind.NewLine;[LF]; + SyntaxKind.HtmlMarkupBlock - [20..30) - FullWidth: 10 - Slots: 1 + SyntaxKind.HtmlTagBlock - [20..27) - FullWidth: 7 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [20..27) - FullWidth: 7 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[input]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTextLiteral - [27..30) - FullWidth: 3 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Whitespace;[ ]; + SyntaxKind.NewLine;[LF]; + SyntaxKind.CSharpStatementLiteral - [30..30) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Unknown;[]; + SyntaxKind.RazorMetaCode - [30..31) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.RightBrace;[}]; + SyntaxKind.HtmlTagBlock - [31..37) - FullWidth: 6 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [31..37) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[html]; + SyntaxKind.CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineAndMarkupInNestedBlock.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineAndMarkupInNestedBlock.stree.txt index f29745765..0127c88e6 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineAndMarkupInNestedBlock.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineAndMarkupInNestedBlock.stree.txt @@ -1,37 +1,41 @@ -Markup block - Gen - 27 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 - SyntaxKind.Unknown;[]; - Statement block - Gen - 27 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 - SyntaxKind.Transition;[@]; - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 - SyntaxKind.LeftBrace;[{]; - Code span - Gen - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (2:0,2) - Tokens:1 - SyntaxKind.NewLine;[LF]; - Statement block - Gen - 13 - (4:1,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (4:1,0) - Tokens:1 - SyntaxKind.Transition;[@]; - Code span - Gen - [if(true){LF}] - SpanEditHandler;Accepts:Any - (5:1,1) - Tokens:7 - SyntaxKind.Keyword;[if]; - SyntaxKind.LeftParenthesis;[(]; - SyntaxKind.Keyword;[true]; - SyntaxKind.RightParenthesis;[)]; - SyntaxKind.LeftBrace;[{]; - SyntaxKind.NewLine;[LF]; - SyntaxKind.RightBrace;[}]; - Markup block - Gen - 9 - (17:2,1) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (17:2,1) - Tokens:1 - SyntaxKind.Whitespace;[ ]; - Tag block - Gen - 7 - (18:2,2) - Markup span - Gen - [] - SpanEditHandler;Accepts:None - (18:2,2) - Tokens:3 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[input]; - SyntaxKind.CloseAngle;[>]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (25:2,9) - Tokens:1 - SyntaxKind.Whitespace;[ ]; - Code span - Gen - [] - SpanEditHandler;Accepts:Any - (26:2,10) - Tokens:1 +SyntaxKind.HtmlDocument - [0..27) - FullWidth: 27 - Slots: 1 - [@{LF@if(true){LF} }] + SyntaxKind.HtmlMarkupBlock - [0..27) - FullWidth: 27 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Unknown;[]; + SyntaxKind.CSharpCodeBlock - [0..27) - FullWidth: 27 - Slots: 1 + SyntaxKind.CSharpStatement - [0..27) - FullWidth: 27 - Slots: 2 + SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.CSharpStatementBody - [1..27) - FullWidth: 26 - Slots: 3 + SyntaxKind.RazorMetaCode - [1..2) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.LeftBrace;[{]; + SyntaxKind.CSharpCodeBlock - [2..26) - FullWidth: 24 - Slots: 1 + SyntaxKind.CSharpStatementLiteral - [2..4) - FullWidth: 2 - Slots: 1 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL + SyntaxKind.NewLine;[LF]; + SyntaxKind.CSharpCodeBlock - [4..17) - FullWidth: 13 - Slots: 1 + SyntaxKind.CSharpTransition - [4..5) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.CSharpStatementLiteral - [5..17) - FullWidth: 12 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Keyword;[if]; + SyntaxKind.LeftParenthesis;[(]; + SyntaxKind.Keyword;[true]; + SyntaxKind.RightParenthesis;[)]; + SyntaxKind.LeftBrace;[{]; + SyntaxKind.NewLine;[LF]; + SyntaxKind.RightBrace;[}]; + SyntaxKind.HtmlMarkupBlock - [17..26) - FullWidth: 9 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [17..18) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Whitespace;[ ]; + SyntaxKind.HtmlTagBlock - [18..25) - FullWidth: 7 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [18..25) - FullWidth: 7 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[input]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTextLiteral - [25..26) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Whitespace;[ ]; + SyntaxKind.CSharpStatementLiteral - [26..26) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Unknown;[]; + SyntaxKind.RazorMetaCode - [26..27) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.RightBrace;[}]; + SyntaxKind.HtmlTextLiteral - [27..27) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any SyntaxKind.Unknown;[]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (26:2,10) - Tokens:1 - SyntaxKind.RightBrace;[}]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (27:2,11) - Tokens:1 - SyntaxKind.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineInNestedBlock.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineInNestedBlock.stree.txt index 35287578b..5e1ace40c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineInNestedBlock.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineInNestedBlock.stree.txt @@ -1,33 +1,37 @@ -Markup block - Gen - 29 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 - SyntaxKind.Unknown;[]; - Statement block - Gen - 21 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 - SyntaxKind.Transition;[@]; - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 - SyntaxKind.LeftBrace;[{]; - Code span - Gen - [LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - (2:0,2) - Tokens:1 +SyntaxKind.HtmlDocument - [0..29) - FullWidth: 29 - Slots: 1 - [@{LF@if(true){LF} LF}LF] + SyntaxKind.HtmlMarkupBlock - [0..29) - FullWidth: 29 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Unknown;[]; + SyntaxKind.CSharpCodeBlock - [0..21) - FullWidth: 21 - Slots: 1 + SyntaxKind.CSharpStatement - [0..21) - FullWidth: 21 - Slots: 2 + SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.CSharpStatementBody - [1..21) - FullWidth: 20 - Slots: 3 + SyntaxKind.RazorMetaCode - [1..2) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.LeftBrace;[{]; + SyntaxKind.CSharpCodeBlock - [2..20) - FullWidth: 18 - Slots: 1 + SyntaxKind.CSharpStatementLiteral - [2..4) - FullWidth: 2 - Slots: 1 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL + SyntaxKind.NewLine;[LF]; + SyntaxKind.CSharpCodeBlock - [4..17) - FullWidth: 13 - Slots: 1 + SyntaxKind.CSharpTransition - [4..5) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.CSharpStatementLiteral - [5..17) - FullWidth: 12 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Keyword;[if]; + SyntaxKind.LeftParenthesis;[(]; + SyntaxKind.Keyword;[true]; + SyntaxKind.RightParenthesis;[)]; + SyntaxKind.LeftBrace;[{]; + SyntaxKind.NewLine;[LF]; + SyntaxKind.RightBrace;[}]; + SyntaxKind.CSharpStatementLiteral - [17..20) - FullWidth: 3 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Whitespace;[ ]; + SyntaxKind.NewLine;[LF]; + SyntaxKind.RazorMetaCode - [20..21) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.RightBrace;[}]; + SyntaxKind.HtmlTextLiteral - [21..23) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any SyntaxKind.NewLine;[LF]; - Statement block - Gen - 13 - (4:1,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (4:1,0) - Tokens:1 - SyntaxKind.Transition;[@]; - Code span - Gen - [if(true){LF}] - SpanEditHandler;Accepts:Any - (5:1,1) - Tokens:7 - SyntaxKind.Keyword;[if]; - SyntaxKind.LeftParenthesis;[(]; - SyntaxKind.Keyword;[true]; - SyntaxKind.RightParenthesis;[)]; - SyntaxKind.LeftBrace;[{]; - SyntaxKind.NewLine;[LF]; - SyntaxKind.RightBrace;[}]; - Code span - Gen - [ LF] - SpanEditHandler;Accepts:Any - (17:2,1) - Tokens:2 - SyntaxKind.Whitespace;[ ]; - SyntaxKind.NewLine;[LF]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (20:3,0) - Tokens:1 - SyntaxKind.RightBrace;[}]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:Any - (21:3,1) - Tokens:1 - SyntaxKind.NewLine;[LF]; - Tag block - Gen - 6 - (23:4,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (23:4,0) - Tokens:3 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[html]; - SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTagBlock - [23..29) - FullWidth: 6 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [23..29) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[html]; + SyntaxKind.CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.stree.txt index 854d621f2..e7ec7d741 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.stree.txt @@ -1,12 +1,16 @@ -Markup block - Gen - 12 - (0:0,0) - Markup span - Gen - [foo ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2 - SyntaxKind.Text;[foo]; - SyntaxKind.Whitespace;[ ]; - Expression block - Gen - 4 - (4:0,4) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:1 - SyntaxKind.Transition;[@]; - Code span - Gen - [bar] - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 - (5:0,5) - Tokens:1 - SyntaxKind.Identifier;[bar]; - Markup span - Gen - [ baz] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:2 - SyntaxKind.Whitespace;[ ]; - SyntaxKind.Text;[baz]; +SyntaxKind.HtmlDocument - [0..12) - FullWidth: 12 - Slots: 1 - [foo @bar baz] + SyntaxKind.HtmlMarkupBlock - [0..12) - FullWidth: 12 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..4) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Text;[foo]; + SyntaxKind.Whitespace;[ ]; + SyntaxKind.CSharpCodeBlock - [4..8) - FullWidth: 4 - Slots: 1 + SyntaxKind.CSharpImplicitExpression - [4..8) - FullWidth: 4 - Slots: 2 + SyntaxKind.CSharpTransition - [4..5) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.CSharpImplicitExpressionBody - [5..8) - FullWidth: 3 - Slots: 1 + SyntaxKind.CSharpCodeBlock - [5..8) - FullWidth: 3 - Slots: 1 + SyntaxKind.CSharpExpressionLiteral - [5..8) - FullWidth: 3 - Slots: 1 - Gen - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 + SyntaxKind.Identifier;[bar]; + SyntaxKind.HtmlTextLiteral - [8..12) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Whitespace;[ ]; + SyntaxKind.Text;[baz]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.stree.txt index 9898890f2..a38e97615 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.stree.txt @@ -1,28 +1,32 @@ -Markup block - Gen - 36 - (0:0,0) - Tag block - Gen - 8 - (0:0,0) - Markup span - Gen - [] + SyntaxKind.HtmlMarkupBlock - [0..36) - FullWidth: 36 - Slots: 1 + SyntaxKind.HtmlTagBlock - [0..8) - FullWidth: 8 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..8) - FullWidth: 8 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[script]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTextLiteral - [8..21) - FullWidth: 13 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Text;[foo]; SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[script]; - SyntaxKind.CloseAngle;[>]; - Markup span - Gen - [foo - 4 - (21:0,21) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1 - SyntaxKind.Transition;[@]; - Code span - Gen - [boz] - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 - (22:0,22) - Tokens:1 - SyntaxKind.Identifier;[boz]; - Markup span - Gen - ['>] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:2 - SyntaxKind.SingleQuote;[']; - SyntaxKind.CloseAngle;[>]; - Tag block - Gen - 9 - (27:0,27) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:4 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[script]; + SyntaxKind.Text;[bar]; + SyntaxKind.Whitespace;[ ]; + SyntaxKind.Text;[baz]; + SyntaxKind.Equals;[=]; + SyntaxKind.SingleQuote;[']; + SyntaxKind.CSharpCodeBlock - [21..25) - FullWidth: 4 - Slots: 1 + SyntaxKind.CSharpImplicitExpression - [21..25) - FullWidth: 4 - Slots: 2 + SyntaxKind.CSharpTransition - [21..22) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.CSharpImplicitExpressionBody - [22..25) - FullWidth: 3 - Slots: 1 + SyntaxKind.CSharpCodeBlock - [22..25) - FullWidth: 3 - Slots: 1 + SyntaxKind.CSharpExpressionLiteral - [22..25) - FullWidth: 3 - Slots: 1 - Gen - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 + SyntaxKind.Identifier;[boz]; + SyntaxKind.HtmlTextLiteral - [25..27) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.SingleQuote;[']; SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTagBlock - [27..36) - FullWidth: 9 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [27..36) - FullWidth: 9 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.ForwardSlash;[/]; + SyntaxKind.Text;[script]; + SyntaxKind.CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt index 4de831cbb..58930ed05 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt @@ -1,55 +1,59 @@ -Markup block - Gen - 52 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 - SyntaxKind.Unknown;[]; - Statement block - Gen - 52 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 - SyntaxKind.Transition;[@]; - Code span - Gen - [if (true) { ] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:8 - SyntaxKind.Keyword;[if]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.LeftParenthesis;[(]; - SyntaxKind.Keyword;[true]; - SyntaxKind.RightParenthesis;[)]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.LeftBrace;[{]; - SyntaxKind.Whitespace;[ ]; - Statement block - Gen - 37 - (13:0,13) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1 +SyntaxKind.HtmlDocument - [0..52) - FullWidth: 52 - Slots: 1 - [@if (true) { @if(false) {
@something.
} }] + SyntaxKind.HtmlMarkupBlock - [0..52) - FullWidth: 52 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Unknown;[]; + SyntaxKind.CSharpCodeBlock - [0..52) - FullWidth: 52 - Slots: 1 + SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None SyntaxKind.Transition;[@]; - Code span - Gen - [if(false) {] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:6 + SyntaxKind.CSharpStatementLiteral - [1..13) - FullWidth: 12 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any SyntaxKind.Keyword;[if]; + SyntaxKind.Whitespace;[ ]; SyntaxKind.LeftParenthesis;[(]; - SyntaxKind.Keyword;[false]; + SyntaxKind.Keyword;[true]; SyntaxKind.RightParenthesis;[)]; SyntaxKind.Whitespace;[ ]; SyntaxKind.LeftBrace;[{]; - Markup block - Gen - 24 - (25:0,25) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1 - SyntaxKind.Whitespace;[ ]; - Tag block - Gen - 5 - (26:0,26) - Markup span - Gen - [
] - SpanEditHandler;Accepts:None - (26:0,26) - Tokens:3 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[div]; - SyntaxKind.CloseAngle;[>]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1 - SyntaxKind.Unknown;[]; - Expression block - Gen - 10 - (31:0,31) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:1 - SyntaxKind.Transition;[@]; - Code span - Gen - [something] - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 - (32:0,32) - Tokens:1 - SyntaxKind.Identifier;[something]; - Markup span - Gen - [.] - SpanEditHandler;Accepts:Any - (41:0,41) - Tokens:1 - SyntaxKind.Text;[.]; - Tag block - Gen - 6 - (42:0,42) - Markup span - Gen - [
] - SpanEditHandler;Accepts:None - (42:0,42) - Tokens:4 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[div]; - SyntaxKind.CloseAngle;[>]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:None - (48:0,48) - Tokens:1 + SyntaxKind.Whitespace;[ ]; + SyntaxKind.CSharpCodeBlock - [13..50) - FullWidth: 37 - Slots: 1 + SyntaxKind.CSharpTransition - [13..14) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.CSharpStatementLiteral - [14..25) - FullWidth: 11 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Keyword;[if]; + SyntaxKind.LeftParenthesis;[(]; + SyntaxKind.Keyword;[false]; + SyntaxKind.RightParenthesis;[)]; SyntaxKind.Whitespace;[ ]; - Code span - Gen - [}] - SpanEditHandler;Accepts:Any - (49:0,49) - Tokens:1 + SyntaxKind.LeftBrace;[{]; + SyntaxKind.HtmlMarkupBlock - [25..49) - FullWidth: 24 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [25..26) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Whitespace;[ ]; + SyntaxKind.HtmlTagBlock - [26..31) - FullWidth: 5 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [26..31) - FullWidth: 5 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[div]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTextLiteral - [31..31) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Unknown;[]; + SyntaxKind.CSharpCodeBlock - [31..41) - FullWidth: 10 - Slots: 1 + SyntaxKind.CSharpImplicitExpression - [31..41) - FullWidth: 10 - Slots: 2 + SyntaxKind.CSharpTransition - [31..32) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.CSharpImplicitExpressionBody - [32..41) - FullWidth: 9 - Slots: 1 + SyntaxKind.CSharpCodeBlock - [32..41) - FullWidth: 9 - Slots: 1 + SyntaxKind.CSharpExpressionLiteral - [32..41) - FullWidth: 9 - Slots: 1 - Gen - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 + SyntaxKind.Identifier;[something]; + SyntaxKind.HtmlTextLiteral - [41..42) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Text;[.]; + SyntaxKind.HtmlTagBlock - [42..48) - FullWidth: 6 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [42..48) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.OpenAngle;[<]; + SyntaxKind.ForwardSlash;[/]; + SyntaxKind.Text;[div]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTextLiteral - [48..49) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Whitespace;[ ]; + SyntaxKind.CSharpStatementLiteral - [49..50) - FullWidth: 1 - Slots: 1 - Gen - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 + SyntaxKind.RightBrace;[}]; + SyntaxKind.CSharpStatementLiteral - [50..52) - FullWidth: 2 - Slots: 1 - Gen - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[ATD];K14 + SyntaxKind.Whitespace;[ ]; SyntaxKind.RightBrace;[}]; - Code span - Gen - [ }] - SpanEditHandler;Accepts:Any - (50:0,50) - Tokens:2 - SyntaxKind.Whitespace;[ ]; - SyntaxKind.RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NoLongerSupportsDollarOpenBraceCombination.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NoLongerSupportsDollarOpenBraceCombination.stree.txt index f2a68845e..42eb63f7a 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NoLongerSupportsDollarOpenBraceCombination.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NoLongerSupportsDollarOpenBraceCombination.stree.txt @@ -1,14 +1,15 @@ -Markup block - Gen - 17 - (0:0,0) - Tag block - Gen - 5 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[foo]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [${bar}] - [5..11) - FullWidth: 6 - Slots: 1 - SyntaxKind.Text;[${bar}]; - Tag block - Gen - 6 - (11:0,11) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:4 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[foo]; - SyntaxKind.CloseAngle;[>]; +SyntaxKind.HtmlDocument - [0..17) - FullWidth: 17 - Slots: 1 - [${bar}] + SyntaxKind.HtmlMarkupBlock - [0..17) - FullWidth: 17 - Slots: 1 + SyntaxKind.HtmlTagBlock - [0..5) - FullWidth: 5 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..5) - FullWidth: 5 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[foo]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTextLiteral - [5..11) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Text;[${bar}]; + SyntaxKind.HtmlTagBlock - [11..17) - FullWidth: 6 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [11..17) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.ForwardSlash;[/]; + SyntaxKind.Text;[foo]; + SyntaxKind.CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString.stree.txt index df48ed419..27a756b53 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString.stree.txt @@ -1,3 +1,4 @@ -Markup block - Gen - 0 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 - SyntaxKind.Unknown;[]; +SyntaxKind.HtmlDocument - [0..0) - FullWidth: 0 - Slots: 1 - [] + SyntaxKind.HtmlMarkupBlock - [0..0) - FullWidth: 0 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan.stree.txt index e22974936..56297bdee 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan.stree.txt @@ -1,3 +1,4 @@ -Markup block - Gen - 10 - (0:0,0) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 - SyntaxKind.Whitespace;[ ]; +SyntaxKind.HtmlDocument - [0..10) - FullWidth: 10 - Slots: 1 - [ ] + SyntaxKind.HtmlMarkupBlock - [0..10) - FullWidth: 10 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..10) - FullWidth: 10 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Whitespace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseDocumentDoesNotSwitchToCodeOnEmailAddressInText.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseDocumentDoesNotSwitchToCodeOnEmailAddressInText.stree.txt index 6c9f0060a..3936ec291 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseDocumentDoesNotSwitchToCodeOnEmailAddressInText.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseDocumentDoesNotSwitchToCodeOnEmailAddressInText.stree.txt @@ -1,3 +1,4 @@ -Markup block - Gen - 21 - (0:0,0) - Markup span - Gen - [example@microsoft.com] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 - SyntaxKind.Text;[example@microsoft.com]; +SyntaxKind.HtmlDocument - [0..21) - FullWidth: 21 - Slots: 1 - [example@microsoft.com] + SyntaxKind.HtmlMarkupBlock - [0..21) - FullWidth: 21 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..21) - FullWidth: 21 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Text;[example@microsoft.com]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.stree.txt index 9b49f113c..920cd91e1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.stree.txt @@ -1,52 +1,59 @@ -Markup block - Gen - 53 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 - SyntaxKind.Unknown;[]; - Directive block - Gen - 53 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 - SyntaxKind.Transition;[@]; - MetaCode span - Gen - [section] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 - SyntaxKind.Identifier;[section]; - Code span - Gen - [ ] - SpanEditHandler;Accepts:Whitespace - (8:0,8) - Tokens:1 - SyntaxKind.Whitespace;[ ]; - Code span - Gen - [Foo] - DirectiveTokenEditHandler;Accepts:NonWhitespace - (9:0,9) - Tokens:1 - SyntaxKind.Identifier;[Foo]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:AllWhitespace - (12:0,12) - Tokens:1 - SyntaxKind.Whitespace;[ ]; - MetaCode span - Gen - [{] - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - (13:0,13) - Tokens:1 - SyntaxKind.LeftBrace;[{]; - Markup block - Gen - 38 - (14:0,14) - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1 - SyntaxKind.Whitespace;[ ]; - Tag block - Gen - 8 - (15:0,15) - Markup span - Gen - [ }] + SyntaxKind.HtmlMarkupBlock - [0..53) - FullWidth: 53 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Unknown;[]; + SyntaxKind.CSharpCodeBlock - [0..53) - FullWidth: 53 - Slots: 1 + SyntaxKind.CSharpDirective - [0..53) - FullWidth: 53 - Slots: 2 + SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None SyntaxKind.Transition;[@]; - Code span - Gen - [boz] - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K15 - (37:0,37) - Tokens:1 - SyntaxKind.Identifier;[boz]; - Markup span - Gen - ['>] - SpanEditHandler;Accepts:Any - (40:0,40) - Tokens:2 - SyntaxKind.SingleQuote;[']; - SyntaxKind.CloseAngle;[>]; - Tag block - Gen - 9 - (42:0,42) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (42:0,42) - Tokens:4 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[script]; - SyntaxKind.CloseAngle;[>]; - Markup span - Gen - [ ] - SpanEditHandler;Accepts:Any - (51:0,51) - Tokens:1 - SyntaxKind.Whitespace;[ ]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (52:0,52) - Tokens:1 - SyntaxKind.RightBrace;[}]; - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (53:0,53) - Tokens:1 - SyntaxKind.Unknown;[]; + SyntaxKind.CSharpDirectiveBody - [1..53) - FullWidth: 52 - Slots: 2 + SyntaxKind.RazorMetaCode - [1..8) - FullWidth: 7 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Identifier;[section]; + SyntaxKind.CSharpCodeBlock - [8..53) - FullWidth: 45 - Slots: 1 + SyntaxKind.CSharpStatementLiteral - [8..9) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Whitespace + SyntaxKind.Whitespace;[ ]; + SyntaxKind.CSharpStatementLiteral - [9..12) - FullWidth: 3 - Slots: 1 - Gen - DirectiveTokenEditHandler;Accepts:NonWhitespace + SyntaxKind.Identifier;[Foo]; + SyntaxKind.HtmlTextLiteral - [12..13) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:AllWhitespace + SyntaxKind.Whitespace;[ ]; + SyntaxKind.RazorMetaCode - [13..14) - FullWidth: 1 - Slots: 1 - Gen - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd + SyntaxKind.LeftBrace;[{]; + SyntaxKind.HtmlMarkupBlock - [14..52) - FullWidth: 38 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [14..15) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Whitespace;[ ]; + SyntaxKind.HtmlTagBlock - [15..23) - FullWidth: 8 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [15..23) - FullWidth: 8 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[script]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTextLiteral - [23..36) - FullWidth: 13 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Text;[foo]; + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[bar]; + SyntaxKind.Whitespace;[ ]; + SyntaxKind.Text;[baz]; + SyntaxKind.Equals;[=]; + SyntaxKind.SingleQuote;[']; + SyntaxKind.CSharpCodeBlock - [36..40) - FullWidth: 4 - Slots: 1 + SyntaxKind.CSharpImplicitExpression - [36..40) - FullWidth: 4 - Slots: 2 + SyntaxKind.CSharpTransition - [36..37) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.CSharpImplicitExpressionBody - [37..40) - FullWidth: 3 - Slots: 1 + SyntaxKind.CSharpCodeBlock - [37..40) - FullWidth: 3 - Slots: 1 + SyntaxKind.CSharpExpressionLiteral - [37..40) - FullWidth: 3 - Slots: 1 - Gen - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K15 + SyntaxKind.Identifier;[boz]; + SyntaxKind.HtmlTextLiteral - [40..42) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.SingleQuote;[']; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTagBlock - [42..51) - FullWidth: 9 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [42..51) - FullWidth: 9 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.ForwardSlash;[/]; + SyntaxKind.Text;[script]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTextLiteral - [51..52) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Whitespace;[ ]; + SyntaxKind.RazorMetaCode - [52..53) - FullWidth: 1 - Slots: 1 - Gen - ImplicitExpressionEditHandler;Accepts:None;ImplicitExpression[RTD];K15 + SyntaxKind.RightBrace;[}]; + SyntaxKind.HtmlTextLiteral - [53..53) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Unknown;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered.stree.txt index 5cf09d83c..a25d70dff 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered.stree.txt @@ -1,5 +1,6 @@ -Markup block - Gen - 7 - (0:0,0) - Markup span - Gen - [foo baz] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3 - SyntaxKind.Text;[foo]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.Text;[baz]; +SyntaxKind.HtmlDocument - [0..7) - FullWidth: 7 - Slots: 1 - [foo baz] + SyntaxKind.HtmlMarkupBlock - [0..7) - FullWidth: 7 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..7) - FullWidth: 7 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Text;[foo]; + SyntaxKind.Whitespace;[ ]; + SyntaxKind.Text;[baz]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml.stree.txt index 16d62d841..92430bb30 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml.stree.txt @@ -1,42 +1,46 @@ -Markup block - Gen - 38 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 - SyntaxKind.Unknown;[]; - Statement block - Gen - 32 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 - SyntaxKind.Transition;[@]; - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 - SyntaxKind.LeftBrace;[{]; - Markup block - Gen - 19 - (2:0,2) - Tag block - Gen - 6 - (2:0,2) - Transition span - Gen - [] - SpanEditHandler;Accepts:None - (2:0,2) - Tokens:3 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[text]; - SyntaxKind.CloseAngle;[>]; - Markup span - Gen - [Blah] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:1 - SyntaxKind.Text;[Blah]; - Tag block - Gen - 7 - (12:0,12) - Transition span - Gen - [] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:4 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[text]; - SyntaxKind.CloseAngle;[>]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:1 - SyntaxKind.NewLine;[LF]; - Markup block - Gen - 10 - (21:1,0) - Tag block - Gen - 8 - (21:1,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:None - (21:1,0) - Tokens:4 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[input]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.CloseAngle;[>]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:None - (29:1,8) - Tokens:1 - SyntaxKind.NewLine;[LF]; - Code span - Gen - [] - SpanEditHandler;Accepts:Any - (31:2,0) - Tokens:1 +SyntaxKind.HtmlDocument - [0..38) - FullWidth: 38 - Slots: 1 - [@{BlahLFLF}] + SyntaxKind.HtmlMarkupBlock - [0..38) - FullWidth: 38 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any SyntaxKind.Unknown;[]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (31:2,0) - Tokens:1 - SyntaxKind.RightBrace;[}]; - Tag block - Gen - 6 - (32:2,1) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (32:2,1) - Tokens:3 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[html]; - SyntaxKind.CloseAngle;[>]; + SyntaxKind.CSharpCodeBlock - [0..32) - FullWidth: 32 - Slots: 1 + SyntaxKind.CSharpStatement - [0..32) - FullWidth: 32 - Slots: 2 + SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.CSharpStatementBody - [1..32) - FullWidth: 31 - Slots: 3 + SyntaxKind.RazorMetaCode - [1..2) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.LeftBrace;[{]; + SyntaxKind.CSharpCodeBlock - [2..31) - FullWidth: 29 - Slots: 1 + SyntaxKind.HtmlMarkupBlock - [2..21) - FullWidth: 19 - Slots: 1 + SyntaxKind.HtmlTagBlock - [2..8) - FullWidth: 6 - Slots: 1 + SyntaxKind.HtmlTransition - [2..8) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[text]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTextLiteral - [8..12) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Text;[Blah]; + SyntaxKind.HtmlTagBlock - [12..19) - FullWidth: 7 - Slots: 1 + SyntaxKind.HtmlTransition - [12..19) - FullWidth: 7 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.OpenAngle;[<]; + SyntaxKind.ForwardSlash;[/]; + SyntaxKind.Text;[text]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTextLiteral - [19..21) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.NewLine;[LF]; + SyntaxKind.HtmlMarkupBlock - [21..31) - FullWidth: 10 - Slots: 1 + SyntaxKind.HtmlTagBlock - [21..29) - FullWidth: 8 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [21..29) - FullWidth: 8 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[input]; + SyntaxKind.ForwardSlash;[/]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTextLiteral - [29..31) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.NewLine;[LF]; + SyntaxKind.CSharpStatementLiteral - [31..31) - FullWidth: 0 - Slots: 1 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL + SyntaxKind.Unknown;[]; + SyntaxKind.RazorMetaCode - [31..32) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.RightBrace;[}]; + SyntaxKind.HtmlTagBlock - [32..38) - FullWidth: 6 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [32..38) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[html]; + SyntaxKind.CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersNewlineAfterTextTagInVerbatimBlockIfFollowedByMarkupTransition.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersNewlineAfterTextTagInVerbatimBlockIfFollowedByMarkupTransition.stree.txt index e0d845243..1b63b276e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersNewlineAfterTextTagInVerbatimBlockIfFollowedByMarkupTransition.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersNewlineAfterTextTagInVerbatimBlockIfFollowedByMarkupTransition.stree.txt @@ -1,42 +1,46 @@ -Markup block - Gen - 37 - (0:0,0) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:1 - SyntaxKind.Unknown;[]; - Statement block - Gen - 31 - (0:0,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Tokens:1 - SyntaxKind.Transition;[@]; - MetaCode span - Gen - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Tokens:1 - SyntaxKind.LeftBrace;[{]; - Markup block - Gen - 19 - (2:0,2) - Tag block - Gen - 6 - (2:0,2) - Transition span - Gen - [] - SpanEditHandler;Accepts:None - (2:0,2) - Tokens:3 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[text]; - SyntaxKind.CloseAngle;[>]; - Markup span - Gen - [Blah] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:1 - SyntaxKind.Text;[Blah]; - Tag block - Gen - 7 - (12:0,12) - Transition span - Gen - [] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:4 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[text]; - SyntaxKind.CloseAngle;[>]; - Markup span - Gen - [LF] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:1 - SyntaxKind.NewLine;[LF]; - Markup block - Gen - 9 - (21:1,0) - Transition span - Gen - [@] - SpanEditHandler;Accepts:None - (21:1,0) - Tokens:1 - SyntaxKind.Transition;[@]; - MetaCode span - Gen - [:] - SpanEditHandler;Accepts:Any - (22:1,1) - Tokens:1 - SyntaxKind.Colon;[:]; - Markup span - Gen - [ BlehLF] - SpanEditHandler;Accepts:None - (23:1,2) - Tokens:3 - SyntaxKind.Whitespace;[ ]; - SyntaxKind.Text;[Bleh]; - SyntaxKind.NewLine;[LF]; - Code span - Gen - [] - SpanEditHandler;Accepts:Any - (30:2,0) - Tokens:1 +SyntaxKind.HtmlDocument - [0..37) - FullWidth: 37 - Slots: 1 - [@{BlahLF@: BlehLF}] + SyntaxKind.HtmlMarkupBlock - [0..37) - FullWidth: 37 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any SyntaxKind.Unknown;[]; - MetaCode span - Gen - [}] - SpanEditHandler;Accepts:None - (30:2,0) - Tokens:1 - SyntaxKind.RightBrace;[}]; - Tag block - Gen - 6 - (31:2,1) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (31:2,1) - Tokens:3 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[html]; - SyntaxKind.CloseAngle;[>]; + SyntaxKind.CSharpCodeBlock - [0..31) - FullWidth: 31 - Slots: 1 + SyntaxKind.CSharpStatement - [0..31) - FullWidth: 31 - Slots: 2 + SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.CSharpStatementBody - [1..31) - FullWidth: 30 - Slots: 3 + SyntaxKind.RazorMetaCode - [1..2) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.LeftBrace;[{]; + SyntaxKind.CSharpCodeBlock - [2..30) - FullWidth: 28 - Slots: 1 + SyntaxKind.HtmlMarkupBlock - [2..21) - FullWidth: 19 - Slots: 1 + SyntaxKind.HtmlTagBlock - [2..8) - FullWidth: 6 - Slots: 1 + SyntaxKind.HtmlTransition - [2..8) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[text]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTextLiteral - [8..12) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Text;[Blah]; + SyntaxKind.HtmlTagBlock - [12..19) - FullWidth: 7 - Slots: 1 + SyntaxKind.HtmlTransition - [12..19) - FullWidth: 7 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.OpenAngle;[<]; + SyntaxKind.ForwardSlash;[/]; + SyntaxKind.Text;[text]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTextLiteral - [19..21) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.NewLine;[LF]; + SyntaxKind.HtmlMarkupBlock - [21..30) - FullWidth: 9 - Slots: 1 + SyntaxKind.HtmlTransition - [21..22) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Transition;[@]; + SyntaxKind.RazorMetaCode - [22..23) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Colon;[:]; + SyntaxKind.HtmlTextLiteral - [23..30) - FullWidth: 7 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.Whitespace;[ ]; + SyntaxKind.Text;[Bleh]; + SyntaxKind.NewLine;[LF]; + SyntaxKind.CSharpStatementLiteral - [30..30) - FullWidth: 0 - Slots: 1 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL + SyntaxKind.Unknown;[]; + SyntaxKind.RazorMetaCode - [30..31) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None + SyntaxKind.RightBrace;[}]; + SyntaxKind.HtmlTagBlock - [31..37) - FullWidth: 6 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [31..37) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[html]; + SyntaxKind.CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersTextPseudoTagAsMarkup.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersTextPseudoTagAsMarkup.stree.txt index 3e301a21b..d7b7e0f6c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersTextPseudoTagAsMarkup.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersTextPseudoTagAsMarkup.stree.txt @@ -1,17 +1,18 @@ -Markup block - Gen - 20 - (0:0,0) - Markup span - Gen - [Foo ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:2 - SyntaxKind.Text;[Foo]; - SyntaxKind.Whitespace;[ ]; - Tag block - Gen - 6 - (4:0,4) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (4:0,4) - Tokens:3 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[text]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [Foo] - [10..13) - FullWidth: 3 - Slots: 1 - SyntaxKind.Text;[Foo]; - Tag block - Gen - 7 - (13:0,13) - Markup span - Gen - [] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:4 - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[text]; - SyntaxKind.CloseAngle;[>]; +SyntaxKind.HtmlDocument - [0..20) - FullWidth: 20 - Slots: 1 - [Foo Foo] + SyntaxKind.HtmlMarkupBlock - [0..20) - FullWidth: 20 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [0..4) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Text;[Foo]; + SyntaxKind.Whitespace;[ ]; + SyntaxKind.HtmlTagBlock - [4..10) - FullWidth: 6 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [4..10) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.Text;[text]; + SyntaxKind.CloseAngle;[>]; + SyntaxKind.HtmlTextLiteral - [10..13) - FullWidth: 3 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.Text;[Foo]; + SyntaxKind.HtmlTagBlock - [13..20) - FullWidth: 7 - Slots: 1 + SyntaxKind.HtmlTextLiteral - [13..20) - FullWidth: 7 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any + SyntaxKind.OpenAngle;[<]; + SyntaxKind.ForwardSlash;[/]; + SyntaxKind.Text;[text]; + SyntaxKind.CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.stree.txt index 20d868ac4..2bd00ed8e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.stree.txt @@ -1,25 +1,26 @@ -Markup block - Gen - 30 - (0:0,0) - Markup span - Gen - [Foo Baz] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3 - SyntaxKind.Text;[Foo]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.Text;[Baz]; - HtmlComment block - Gen - 10 - (7:0,7) - Markup span - Gen - [Bar] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:2 - SyntaxKind.DoubleHyphen;[--]; + SyntaxKind.Text;[F]; SyntaxKind.CloseAngle;[>]; - Markup span - Gen - [Bar] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1 - SyntaxKind.Text;[Bar]; - Markup span - Gen - [ + + + + + + + @@ -27,67 +34,75 @@ - - - - - - + + + - - - + + + - - - + + + + + + + + + + - - - + + + - - - + + + - + - + - - - + + + - + - - + + - + - - - + + + - - - + + + - + - - + + - + - - + + + + + + @@ -96,33 +111,25 @@ - + - - - - - + - - - + + + - - - - - + - + - + - + @@ -137,7 +144,7 @@ - + @@ -152,7 +159,7 @@ - + @@ -165,17 +172,17 @@ - - + + - + - - + + diff --git a/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxKind.cs b/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxKind.cs index 9257bd1ee..c16ddc147 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxKind.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxKind.cs @@ -6,18 +6,26 @@ namespace Microsoft.AspNetCore.Razor.Language internal enum SyntaxKind : byte { #region Nodes - // HTML - HtmlTextLiteral, - HtmlDocument, - HtmlBlock, - HtmlMarkupBlock, - HtmlTagBlock, - HtmlAttributeBlock, + // Common + RazorDocument, + GenericBlock, + RazorComment, + RazorMetaCode, + RazorDirective, + RazorDirectiveBody, + UnclassifiedTextLiteral, + + // Markup + MarkupBlock, + MarkupTransition, + MarkupTagBlock, + MarkupTextLiteral, + MarkupEscapedTextLiteral, HtmlCommentBlock, + HtmlAttributeBlock, HtmlMinimizedAttributeBlock, HtmlLiteralAttributeValue, HtmlDynamicAttributeValue, - HtmlTransition, // CSharp CSharpStatement, @@ -26,24 +34,18 @@ internal enum SyntaxKind : byte CSharpExpressionBody, CSharpImplicitExpression, CSharpImplicitExpressionBody, - CSharpDirective, - CSharpDirectiveBody, CSharpCodeBlock, CSharpTemplateBlock, CSharpStatementLiteral, CSharpExpressionLiteral, - CSharpHiddenLiteral, - CSharpNoneLiteral, + CSharpEscapedTextLiteral, CSharpTransition, - - // Common - RazorComment, - RazorMetaCode, #endregion #region Tokens // Common - Unknown, + None, + Marker, List, Whitespace, NewLine, diff --git a/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorCompletionFactsService.cs b/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorCompletionFactsService.cs index 2f9146eab..3a88daed8 100644 --- a/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorCompletionFactsService.cs +++ b/src/Microsoft.VisualStudio.Editor.Razor/DefaultRazorCompletionFactsService.cs @@ -88,7 +88,7 @@ internal static bool IsDirectiveCompletableToken(SyntaxToken token) { return token.Kind == SyntaxKind.Identifier || // Marker symbol - token.Kind == SyntaxKind.Unknown; + token.Kind == SyntaxKind.Marker; } } } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTestBase.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTestBase.cs index 60652e402..83b2adc68 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTestBase.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpTokenizerTestBase.cs @@ -7,7 +7,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { public abstract class CSharpTokenizerTestBase : TokenizerTestBase { - private static SyntaxToken _ignoreRemaining = SyntaxFactory.Token(SyntaxKind.Unknown, string.Empty); + private static SyntaxToken _ignoreRemaining = SyntaxFactory.Token(SyntaxKind.Marker, string.Empty); internal override object IgnoreRemaining { diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTestBase.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTestBase.cs index 76762e5be..0b6250d6d 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTestBase.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTestBase.cs @@ -7,7 +7,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { public abstract class HtmlTokenizerTestBase : TokenizerTestBase { - private static SyntaxToken _ignoreRemaining = SyntaxFactory.Token(SyntaxKind.Unknown, string.Empty); + private static SyntaxToken _ignoreRemaining = SyntaxFactory.Token(SyntaxKind.Marker, string.Empty); internal override object IgnoreRemaining { diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/SourceChangeTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/SourceChangeTest.cs index d569974b6..1ea4aeb76 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/SourceChangeTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/SourceChangeTest.cs @@ -105,8 +105,8 @@ public void GetEditedContent_Span_ReturnsNewContent() { // Arrange var builder = new SpanBuilder(new SourceLocation(0, 0, 0)); - builder.Accept(SyntaxFactory.Token(SyntaxKind.Unknown, "Hello, ")); - builder.Accept(SyntaxFactory.Token(SyntaxKind.Unknown, "World")); + builder.Accept(SyntaxFactory.Token(SyntaxKind.Marker, "Hello, ")); + builder.Accept(SyntaxFactory.Token(SyntaxKind.Marker, "World")); var span = new Span(builder); @@ -124,8 +124,8 @@ public void GetOffSet_SpanIsOwner_ReturnsOffset() { // Arrange var builder = new SpanBuilder(new SourceLocation(13, 0, 0)); - builder.Accept(SyntaxFactory.Token(SyntaxKind.Unknown, "Hello, ")); - builder.Accept(SyntaxFactory.Token(SyntaxKind.Unknown, "World")); + builder.Accept(SyntaxFactory.Token(SyntaxKind.Marker, "Hello, ")); + builder.Accept(SyntaxFactory.Token(SyntaxKind.Marker, "World")); var span = new Span(builder); @@ -143,8 +143,8 @@ public void GetOffSet_SpanIsNotOwnerOfChange_ThrowsException() { // Arrange var builder = new SpanBuilder(new SourceLocation(13, 0, 0)); - builder.Accept(SyntaxFactory.Token(SyntaxKind.Unknown, "Hello, ")); - builder.Accept(SyntaxFactory.Token(SyntaxKind.Unknown, "World")); + builder.Accept(SyntaxFactory.Token(SyntaxKind.Marker, "Hello, ")); + builder.Accept(SyntaxFactory.Token(SyntaxKind.Marker, "World")); var span = new Span(builder); @@ -162,8 +162,8 @@ public void GetOrigninalText_SpanIsOwner_ReturnsContent() { // Arrange var builder = new SpanBuilder(new SourceLocation(13, 0, 0)); - builder.Accept(SyntaxFactory.Token(SyntaxKind.Unknown, "Hello, ")); - builder.Accept(SyntaxFactory.Token(SyntaxKind.Unknown, "World")); + builder.Accept(SyntaxFactory.Token(SyntaxKind.Marker, "Hello, ")); + builder.Accept(SyntaxFactory.Token(SyntaxKind.Marker, "World")); var span = new Span(builder); @@ -181,8 +181,8 @@ public void GetOrigninalText_SpanIsOwner_ReturnsContent_ZeroLengthSpan() { // Arrange var builder = new SpanBuilder(new SourceLocation(13, 0, 0)); - builder.Accept(SyntaxFactory.Token(SyntaxKind.Unknown, "Hello, ")); - builder.Accept(SyntaxFactory.Token(SyntaxKind.Unknown, "World")); + builder.Accept(SyntaxFactory.Token(SyntaxKind.Marker, "Hello, ")); + builder.Accept(SyntaxFactory.Token(SyntaxKind.Marker, "World")); var span = new Span(builder); diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsEndTagWithNoMatchingStartTag.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsEndTagWithNoMatchingStartTag.stree.txt index 9d802831a..8bbf95d77 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsEndTagWithNoMatchingStartTag.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsEndTagWithNoMatchingStartTag.stree.txt @@ -1,14 +1,14 @@ -SyntaxKind.HtmlDocument - [0..14) - FullWidth: 14 - Slots: 1 - [Foo
Bar] - SyntaxKind.HtmlMarkupBlock - [0..14) - FullWidth: 14 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..4) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Text;[Foo]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.HtmlTagBlock - [4..10) - FullWidth: 6 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [4..10) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[div]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [10..14) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Whitespace;[ ]; - SyntaxKind.Text;[Bar]; +RazorDocument - [0..14) - FullWidth: 14 - [Foo
Bar] + MarkupBlock - [0..14) - FullWidth: 14 + MarkupTextLiteral - [0..4) - FullWidth: 4 - Gen - SpanEditHandler;Accepts:Any + Text;[Foo]; + Whitespace;[ ]; + MarkupTagBlock - [4..10) - FullWidth: 6 + MarkupTextLiteral - [4..10) - FullWidth: 6 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + ForwardSlash;[/]; + Text;[div]; + CloseAngle;[>]; + MarkupTextLiteral - [10..14) - FullWidth: 4 - Gen - SpanEditHandler;Accepts:Any + Whitespace;[ ]; + Text;[Bar]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.stree.txt index 142e60be6..20b4ad01f 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/AcceptsSwapTokenAtEndOfFileAndOutputsZeroLengthCodeSpan.stree.txt @@ -1,14 +1,14 @@ -SyntaxKind.HtmlDocument - [0..1) - FullWidth: 1 - Slots: 1 - [@] - SyntaxKind.HtmlMarkupBlock - [0..1) - FullWidth: 1 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; - SyntaxKind.CSharpCodeBlock - [0..1) - FullWidth: 1 - Slots: 1 - SyntaxKind.CSharpImplicitExpression - [0..1) - FullWidth: 1 - Slots: 2 - SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpImplicitExpressionBody - [1..1) - FullWidth: 0 - Slots: 1 - SyntaxKind.CSharpCodeBlock - [1..1) - FullWidth: 0 - Slots: 1 - SyntaxKind.CSharpExpressionLiteral - [1..1) - FullWidth: 0 - Slots: 1 - Gen - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 - SyntaxKind.Unknown;[]; - SyntaxKind.HtmlTextLiteral - [1..1) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; +RazorDocument - [0..1) - FullWidth: 1 - [@] + MarkupBlock - [0..1) - FullWidth: 1 + MarkupTextLiteral - [0..0) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; + CSharpCodeBlock - [0..1) - FullWidth: 1 + CSharpImplicitExpression - [0..1) - FullWidth: 1 + CSharpTransition - [0..1) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpImplicitExpressionBody - [1..1) - FullWidth: 0 + CSharpCodeBlock - [1..1) - FullWidth: 0 + CSharpExpressionLiteral - [1..1) - FullWidth: 0 - Gen - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 + Marker;[]; + MarkupTextLiteral - [1..1) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.stree.txt index c60d725f8..7debfa0ad 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesOddlySpacedHTMLElements.stree.txt @@ -1,48 +1,48 @@ -SyntaxKind.HtmlDocument - [0..39) - FullWidth: 39 - Slots: 1 - [

Foo

] - SyntaxKind.HtmlMarkupBlock - [0..39) - FullWidth: 39 - Slots: 1 - SyntaxKind.HtmlTagBlock - [0..6) - FullWidth: 6 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..6) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[div]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTagBlock - [6..23) - FullWidth: 17 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [6..8) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[p]; - SyntaxKind.HtmlAttributeBlock - [8..22) - FullWidth: 14 - Slots: 7 - SyntaxKind.HtmlTextLiteral - [8..9) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Whitespace;[ ]; - SyntaxKind.HtmlTextLiteral - [9..14) - FullWidth: 5 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Text;[class]; - SyntaxKind.HtmlTextLiteral - [14..15) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Whitespace;[ ]; - SyntaxKind.Equals;[=]; - SyntaxKind.HtmlTextLiteral - [16..18) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Whitespace;[ ]; - SyntaxKind.SingleQuote;[']; - SyntaxKind.HtmlBlock - [18..21) - FullWidth: 3 - Slots: 1 - SyntaxKind.HtmlLiteralAttributeValue - [18..21) - FullWidth: 3 - Slots: 2 - SyntaxKind.HtmlTextLiteral - [18..21) - FullWidth: 3 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Text;[bar]; - SyntaxKind.HtmlTextLiteral - [21..22) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.SingleQuote;[']; - SyntaxKind.HtmlTextLiteral - [22..23) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [23..28) - FullWidth: 5 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Whitespace;[ ]; - SyntaxKind.Text;[Foo]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.HtmlTagBlock - [28..32) - FullWidth: 4 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [28..32) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[p]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTagBlock - [32..39) - FullWidth: 7 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [32..39) - FullWidth: 7 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[div]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.CloseAngle;[>]; +RazorDocument - [0..39) - FullWidth: 39 - [

Foo

] + MarkupBlock - [0..39) - FullWidth: 39 + MarkupTagBlock - [0..6) - FullWidth: 6 + MarkupTextLiteral - [0..6) - FullWidth: 6 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + Text;[div]; + Whitespace;[ ]; + CloseAngle;[>]; + MarkupTagBlock - [6..23) - FullWidth: 17 + MarkupTextLiteral - [6..8) - FullWidth: 2 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + Text;[p]; + HtmlAttributeBlock - [8..22) - FullWidth: 14 + MarkupTextLiteral - [8..9) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:Any + Whitespace;[ ]; + MarkupTextLiteral - [9..14) - FullWidth: 5 - Gen - SpanEditHandler;Accepts:Any + Text;[class]; + MarkupTextLiteral - [14..15) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:Any + Whitespace;[ ]; + Equals;[=]; + MarkupTextLiteral - [16..18) - FullWidth: 2 - Gen - SpanEditHandler;Accepts:Any + Whitespace;[ ]; + SingleQuote;[']; + GenericBlock - [18..21) - FullWidth: 3 + HtmlLiteralAttributeValue - [18..21) - FullWidth: 3 + MarkupTextLiteral - [18..21) - FullWidth: 3 - Gen - SpanEditHandler;Accepts:Any + Text;[bar]; + MarkupTextLiteral - [21..22) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:Any + SingleQuote;[']; + MarkupTextLiteral - [22..23) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:Any + CloseAngle;[>]; + MarkupTextLiteral - [23..28) - FullWidth: 5 - Gen - SpanEditHandler;Accepts:Any + Whitespace;[ ]; + Text;[Foo]; + Whitespace;[ ]; + MarkupTagBlock - [28..32) - FullWidth: 4 + MarkupTextLiteral - [28..32) - FullWidth: 4 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + ForwardSlash;[/]; + Text;[p]; + CloseAngle;[>]; + MarkupTagBlock - [32..39) - FullWidth: 7 + MarkupTextLiteral - [32..39) - FullWidth: 7 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + ForwardSlash;[/]; + Text;[div]; + Whitespace;[ ]; + CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt index 061c9304d..9dc0a4cc4 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/CorrectlyHandlesSingleLineOfMarkupWithEmbeddedStatement.stree.txt @@ -1,30 +1,30 @@ -SyntaxKind.HtmlDocument - [0..31) - FullWidth: 31 - Slots: 1 - [
Foo @if(true) {} Bar
] - SyntaxKind.HtmlMarkupBlock - [0..31) - FullWidth: 31 - Slots: 1 - SyntaxKind.HtmlTagBlock - [0..5) - FullWidth: 5 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..5) - FullWidth: 5 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[div]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [5..9) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Text;[Foo]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.CSharpCodeBlock - [9..21) - FullWidth: 12 - Slots: 1 - SyntaxKind.CSharpTransition - [9..10) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpStatementLiteral - [10..21) - FullWidth: 11 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Keyword;[if]; - SyntaxKind.LeftParenthesis;[(]; - SyntaxKind.Keyword;[true]; - SyntaxKind.RightParenthesis;[)]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.LeftBrace;[{]; - SyntaxKind.RightBrace;[}]; - SyntaxKind.HtmlTextLiteral - [21..25) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Whitespace;[ ]; - SyntaxKind.Text;[Bar]; - SyntaxKind.HtmlTagBlock - [25..31) - FullWidth: 6 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [25..31) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[div]; - SyntaxKind.CloseAngle;[>]; +RazorDocument - [0..31) - FullWidth: 31 - [
Foo @if(true) {} Bar
] + MarkupBlock - [0..31) - FullWidth: 31 + MarkupTagBlock - [0..5) - FullWidth: 5 + MarkupTextLiteral - [0..5) - FullWidth: 5 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + Text;[div]; + CloseAngle;[>]; + MarkupTextLiteral - [5..9) - FullWidth: 4 - Gen - SpanEditHandler;Accepts:Any + Text;[Foo]; + Whitespace;[ ]; + CSharpCodeBlock - [9..21) - FullWidth: 12 + CSharpTransition - [9..10) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpStatementLiteral - [10..21) - FullWidth: 11 - Gen - SpanEditHandler;Accepts:Any + Keyword;[if]; + LeftParenthesis;[(]; + Keyword;[true]; + RightParenthesis;[)]; + Whitespace;[ ]; + LeftBrace;[{]; + RightBrace;[}]; + MarkupTextLiteral - [21..25) - FullWidth: 4 - Gen - SpanEditHandler;Accepts:Any + Whitespace;[ ]; + Text;[Bar]; + MarkupTagBlock - [25..31) - FullWidth: 6 + MarkupTextLiteral - [25..31) - FullWidth: 6 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + ForwardSlash;[/]; + Text;[div]; + CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreNewLineAtTheEndOfMarkupBlock.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreNewLineAtTheEndOfMarkupBlock.stree.txt index 178088846..f9b87bf25 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreNewLineAtTheEndOfMarkupBlock.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreNewLineAtTheEndOfMarkupBlock.stree.txt @@ -1,25 +1,25 @@ -SyntaxKind.HtmlDocument - [0..15) - FullWidth: 15 - Slots: 1 - [@{LF}LFLF] - SyntaxKind.HtmlMarkupBlock - [0..15) - FullWidth: 15 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; - SyntaxKind.CSharpCodeBlock - [0..5) - FullWidth: 5 - Slots: 1 - SyntaxKind.CSharpStatement - [0..5) - FullWidth: 5 - Slots: 2 - SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpStatementBody - [1..5) - FullWidth: 4 - Slots: 3 - SyntaxKind.RazorMetaCode - [1..2) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.LeftBrace;[{]; - SyntaxKind.CSharpCodeBlock - [2..4) - FullWidth: 2 - Slots: 1 - SyntaxKind.CSharpStatementLiteral - [2..4) - FullWidth: 2 - Slots: 1 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - SyntaxKind.NewLine;[LF]; - SyntaxKind.RazorMetaCode - [4..5) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.RightBrace;[}]; - SyntaxKind.HtmlTextLiteral - [5..7) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.NewLine;[LF]; - SyntaxKind.HtmlTagBlock - [7..13) - FullWidth: 6 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [7..13) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[html]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [13..15) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.NewLine;[LF]; +RazorDocument - [0..15) - FullWidth: 15 - [@{LF}LFLF] + MarkupBlock - [0..15) - FullWidth: 15 + MarkupTextLiteral - [0..0) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; + CSharpCodeBlock - [0..5) - FullWidth: 5 + CSharpStatement - [0..5) - FullWidth: 5 + CSharpTransition - [0..1) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpStatementBody - [1..5) - FullWidth: 4 + RazorMetaCode - [1..2) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + LeftBrace;[{]; + CSharpCodeBlock - [2..4) - FullWidth: 2 + CSharpStatementLiteral - [2..4) - FullWidth: 2 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL + NewLine;[LF]; + RazorMetaCode - [4..5) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + RightBrace;[}]; + MarkupTextLiteral - [5..7) - FullWidth: 2 - Gen - SpanEditHandler;Accepts:Any + NewLine;[LF]; + MarkupTagBlock - [7..13) - FullWidth: 6 + MarkupTextLiteral - [7..13) - FullWidth: 6 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + Text;[html]; + CloseAngle;[>]; + MarkupTextLiteral - [13..15) - FullWidth: 2 - Gen - SpanEditHandler;Accepts:Any + NewLine;[LF]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent.stree.txt index 6251e5e70..d92996d54 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent.stree.txt @@ -1,25 +1,25 @@ -SyntaxKind.HtmlDocument - [0..17) - FullWidth: 17 - Slots: 1 - [@{LF} LF] - SyntaxKind.HtmlMarkupBlock - [0..17) - FullWidth: 17 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; - SyntaxKind.CSharpCodeBlock - [0..5) - FullWidth: 5 - Slots: 1 - SyntaxKind.CSharpStatement - [0..5) - FullWidth: 5 - Slots: 2 - SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpStatementBody - [1..5) - FullWidth: 4 - Slots: 3 - SyntaxKind.RazorMetaCode - [1..2) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.LeftBrace;[{]; - SyntaxKind.CSharpCodeBlock - [2..4) - FullWidth: 2 - Slots: 1 - SyntaxKind.CSharpStatementLiteral - [2..4) - FullWidth: 2 - Slots: 1 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - SyntaxKind.NewLine;[LF]; - SyntaxKind.RazorMetaCode - [4..5) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.RightBrace;[}]; - SyntaxKind.HtmlTextLiteral - [5..9) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Whitespace;[ ]; - SyntaxKind.HtmlTagBlock - [9..15) - FullWidth: 6 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [9..15) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[html]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [15..17) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.NewLine;[LF]; +RazorDocument - [0..17) - FullWidth: 17 - [@{LF} LF] + MarkupBlock - [0..17) - FullWidth: 17 + MarkupTextLiteral - [0..0) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; + CSharpCodeBlock - [0..5) - FullWidth: 5 + CSharpStatement - [0..5) - FullWidth: 5 + CSharpTransition - [0..1) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpStatementBody - [1..5) - FullWidth: 4 + RazorMetaCode - [1..2) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + LeftBrace;[{]; + CSharpCodeBlock - [2..4) - FullWidth: 2 + CSharpStatementLiteral - [2..4) - FullWidth: 2 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL + NewLine;[LF]; + RazorMetaCode - [4..5) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + RightBrace;[}]; + MarkupTextLiteral - [5..9) - FullWidth: 4 - Gen - SpanEditHandler;Accepts:Any + Whitespace;[ ]; + MarkupTagBlock - [9..15) - FullWidth: 6 + MarkupTextLiteral - [9..15) - FullWidth: 6 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + Text;[html]; + CloseAngle;[>]; + MarkupTextLiteral - [15..17) - FullWidth: 2 - Gen - SpanEditHandler;Accepts:Any + NewLine;[LF]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock.stree.txt index 82dee78aa..ae916cc46 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock.stree.txt @@ -1,23 +1,23 @@ -SyntaxKind.HtmlDocument - [0..13) - FullWidth: 13 - Slots: 1 - [@{LF}LF] - SyntaxKind.HtmlMarkupBlock - [0..13) - FullWidth: 13 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; - SyntaxKind.CSharpCodeBlock - [0..5) - FullWidth: 5 - Slots: 1 - SyntaxKind.CSharpStatement - [0..5) - FullWidth: 5 - Slots: 2 - SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpStatementBody - [1..5) - FullWidth: 4 - Slots: 3 - SyntaxKind.RazorMetaCode - [1..2) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.LeftBrace;[{]; - SyntaxKind.CSharpCodeBlock - [2..4) - FullWidth: 2 - Slots: 1 - SyntaxKind.CSharpStatementLiteral - [2..4) - FullWidth: 2 - Slots: 1 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - SyntaxKind.NewLine;[LF]; - SyntaxKind.RazorMetaCode - [4..5) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.RightBrace;[}]; - SyntaxKind.HtmlTextLiteral - [5..7) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.NewLine;[LF]; - SyntaxKind.HtmlTagBlock - [7..13) - FullWidth: 6 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [7..13) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[html]; - SyntaxKind.CloseAngle;[>]; +RazorDocument - [0..13) - FullWidth: 13 - [@{LF}LF] + MarkupBlock - [0..13) - FullWidth: 13 + MarkupTextLiteral - [0..0) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; + CSharpCodeBlock - [0..5) - FullWidth: 5 + CSharpStatement - [0..5) - FullWidth: 5 + CSharpTransition - [0..1) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpStatementBody - [1..5) - FullWidth: 4 + RazorMetaCode - [1..2) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + LeftBrace;[{]; + CSharpCodeBlock - [2..4) - FullWidth: 2 + CSharpStatementLiteral - [2..4) - FullWidth: 2 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL + NewLine;[LF]; + RazorMetaCode - [4..5) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + RightBrace;[}]; + MarkupTextLiteral - [5..7) - FullWidth: 2 - Gen - SpanEditHandler;Accepts:Any + NewLine;[LF]; + MarkupTagBlock - [7..13) - FullWidth: 6 + MarkupTextLiteral - [7..13) - FullWidth: 6 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + Text;[html]; + CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock.stree.txt index e93990c80..6b0a7affa 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock.stree.txt @@ -1,24 +1,24 @@ -SyntaxKind.HtmlDocument - [0..15) - FullWidth: 15 - Slots: 1 - [@{LF} LF] - SyntaxKind.HtmlMarkupBlock - [0..15) - FullWidth: 15 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; - SyntaxKind.CSharpCodeBlock - [0..5) - FullWidth: 5 - Slots: 1 - SyntaxKind.CSharpStatement - [0..5) - FullWidth: 5 - Slots: 2 - SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpStatementBody - [1..5) - FullWidth: 4 - Slots: 3 - SyntaxKind.RazorMetaCode - [1..2) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.LeftBrace;[{]; - SyntaxKind.CSharpCodeBlock - [2..4) - FullWidth: 2 - Slots: 1 - SyntaxKind.CSharpStatementLiteral - [2..4) - FullWidth: 2 - Slots: 1 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - SyntaxKind.NewLine;[LF]; - SyntaxKind.RazorMetaCode - [4..5) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.RightBrace;[}]; - SyntaxKind.HtmlTextLiteral - [5..9) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Whitespace;[ ]; - SyntaxKind.NewLine;[LF]; - SyntaxKind.HtmlTagBlock - [9..15) - FullWidth: 6 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [9..15) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[html]; - SyntaxKind.CloseAngle;[>]; +RazorDocument - [0..15) - FullWidth: 15 - [@{LF} LF] + MarkupBlock - [0..15) - FullWidth: 15 + MarkupTextLiteral - [0..0) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; + CSharpCodeBlock - [0..5) - FullWidth: 5 + CSharpStatement - [0..5) - FullWidth: 5 + CSharpTransition - [0..1) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpStatementBody - [1..5) - FullWidth: 4 + RazorMetaCode - [1..2) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + LeftBrace;[{]; + CSharpCodeBlock - [2..4) - FullWidth: 2 + CSharpStatementLiteral - [2..4) - FullWidth: 2 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL + NewLine;[LF]; + RazorMetaCode - [4..5) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + RightBrace;[}]; + MarkupTextLiteral - [5..9) - FullWidth: 4 - Gen - SpanEditHandler;Accepts:Any + Whitespace;[ ]; + NewLine;[LF]; + MarkupTagBlock - [9..15) - FullWidth: 6 + MarkupTextLiteral - [9..15) - FullWidth: 6 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + Text;[html]; + CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderNewlineAfterTextTagInVerbatimBlockIfFollowedByCSharp.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderNewlineAfterTextTagInVerbatimBlockIfFollowedByCSharp.stree.txt index e6a60231c..e7a664c8e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderNewlineAfterTextTagInVerbatimBlockIfFollowedByCSharp.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotRenderNewlineAfterTextTagInVerbatimBlockIfFollowedByCSharp.stree.txt @@ -1,36 +1,36 @@ -SyntaxKind.HtmlDocument - [0..30) - FullWidth: 30 - Slots: 1 - [@{BlahLFLF}] - SyntaxKind.HtmlMarkupBlock - [0..30) - FullWidth: 30 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; - SyntaxKind.CSharpCodeBlock - [0..24) - FullWidth: 24 - Slots: 1 - SyntaxKind.CSharpStatement - [0..24) - FullWidth: 24 - Slots: 2 - SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpStatementBody - [1..24) - FullWidth: 23 - Slots: 3 - SyntaxKind.RazorMetaCode - [1..2) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.LeftBrace;[{]; - SyntaxKind.CSharpCodeBlock - [2..23) - FullWidth: 21 - Slots: 1 - SyntaxKind.HtmlMarkupBlock - [2..19) - FullWidth: 17 - Slots: 1 - SyntaxKind.HtmlTagBlock - [2..8) - FullWidth: 6 - Slots: 1 - SyntaxKind.HtmlTransition - [2..8) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[text]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [8..12) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Text;[Blah]; - SyntaxKind.HtmlTagBlock - [12..19) - FullWidth: 7 - Slots: 1 - SyntaxKind.HtmlTransition - [12..19) - FullWidth: 7 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[text]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.CSharpStatementLiteral - [19..23) - FullWidth: 4 - Slots: 1 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - SyntaxKind.NewLine;[LF]; - SyntaxKind.NewLine;[LF]; - SyntaxKind.RazorMetaCode - [23..24) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.RightBrace;[}]; - SyntaxKind.HtmlTagBlock - [24..30) - FullWidth: 6 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [24..30) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[html]; - SyntaxKind.CloseAngle;[>]; +RazorDocument - [0..30) - FullWidth: 30 - [@{BlahLFLF}] + MarkupBlock - [0..30) - FullWidth: 30 + MarkupTextLiteral - [0..0) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; + CSharpCodeBlock - [0..24) - FullWidth: 24 + CSharpStatement - [0..24) - FullWidth: 24 + CSharpTransition - [0..1) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpStatementBody - [1..24) - FullWidth: 23 + RazorMetaCode - [1..2) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + LeftBrace;[{]; + CSharpCodeBlock - [2..23) - FullWidth: 21 + MarkupBlock - [2..19) - FullWidth: 17 + MarkupTagBlock - [2..8) - FullWidth: 6 + MarkupTransition - [2..8) - FullWidth: 6 - Gen - SpanEditHandler;Accepts:None + OpenAngle;[<]; + Text;[text]; + CloseAngle;[>]; + MarkupTextLiteral - [8..12) - FullWidth: 4 - Gen - SpanEditHandler;Accepts:None + Text;[Blah]; + MarkupTagBlock - [12..19) - FullWidth: 7 + MarkupTransition - [12..19) - FullWidth: 7 - Gen - SpanEditHandler;Accepts:None + OpenAngle;[<]; + ForwardSlash;[/]; + Text;[text]; + CloseAngle;[>]; + CSharpStatementLiteral - [19..23) - FullWidth: 4 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL + NewLine;[LF]; + NewLine;[LF]; + RazorMetaCode - [23..24) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + RightBrace;[}]; + MarkupTagBlock - [24..30) - FullWidth: 6 + MarkupTextLiteral - [24..30) - FullWidth: 6 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + Text;[html]; + CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotReturnErrorOnMismatchedTags.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotReturnErrorOnMismatchedTags.stree.txt index 82acc0b4a..22116b18e 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotReturnErrorOnMismatchedTags.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotReturnErrorOnMismatchedTags.stree.txt @@ -1,30 +1,30 @@ -SyntaxKind.HtmlDocument - [0..24) - FullWidth: 24 - Slots: 1 - [Foo

Baz] - SyntaxKind.HtmlMarkupBlock - [0..24) - FullWidth: 24 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..4) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Text;[Foo]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.HtmlTagBlock - [4..9) - FullWidth: 5 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [4..9) - FullWidth: 5 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[div]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTagBlock - [9..12) - FullWidth: 3 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [9..12) - FullWidth: 3 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[p]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTagBlock - [12..16) - FullWidth: 4 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [12..16) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[p]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTagBlock - [16..20) - FullWidth: 4 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [16..20) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[p]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [20..24) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Whitespace;[ ]; - SyntaxKind.Text;[Baz]; +RazorDocument - [0..24) - FullWidth: 24 - [Foo

Baz] + MarkupBlock - [0..24) - FullWidth: 24 + MarkupTextLiteral - [0..4) - FullWidth: 4 - Gen - SpanEditHandler;Accepts:Any + Text;[Foo]; + Whitespace;[ ]; + MarkupTagBlock - [4..9) - FullWidth: 5 + MarkupTextLiteral - [4..9) - FullWidth: 5 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + Text;[div]; + CloseAngle;[>]; + MarkupTagBlock - [9..12) - FullWidth: 3 + MarkupTextLiteral - [9..12) - FullWidth: 3 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + Text;[p]; + CloseAngle;[>]; + MarkupTagBlock - [12..16) - FullWidth: 4 + MarkupTextLiteral - [12..16) - FullWidth: 4 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + ForwardSlash;[/]; + Text;[p]; + CloseAngle;[>]; + MarkupTagBlock - [16..20) - FullWidth: 4 + MarkupTextLiteral - [16..20) - FullWidth: 4 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + ForwardSlash;[/]; + Text;[p]; + CloseAngle;[>]; + MarkupTextLiteral - [20..24) - FullWidth: 4 - Gen - SpanEditHandler;Accepts:Any + Whitespace;[ ]; + Text;[Baz]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt index a203be87d..ee0b1aa05 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/DoesNotSwitchToCodeOnEmailAddressInAttribute.stree.txt @@ -1,32 +1,32 @@ -SyntaxKind.HtmlDocument - [0..51) - FullWidth: 51 - Slots: 1 - [Email me] - SyntaxKind.HtmlMarkupBlock - [0..51) - FullWidth: 51 - Slots: 1 - SyntaxKind.HtmlTagBlock - [0..39) - FullWidth: 39 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..2) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[a]; - SyntaxKind.HtmlAttributeBlock - [2..38) - FullWidth: 36 - Slots: 7 - SyntaxKind.HtmlTextLiteral - [2..3) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Whitespace;[ ]; - SyntaxKind.HtmlTextLiteral - [3..7) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Text;[href]; - SyntaxKind.Equals;[=]; - SyntaxKind.HtmlTextLiteral - [8..9) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.DoubleQuote;["]; - SyntaxKind.HtmlBlock - [9..37) - FullWidth: 28 - Slots: 1 - SyntaxKind.HtmlLiteralAttributeValue - [9..37) - FullWidth: 28 - Slots: 2 - SyntaxKind.HtmlTextLiteral - [9..37) - FullWidth: 28 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Text;[mailto:example@microsoft.com]; - SyntaxKind.HtmlTextLiteral - [37..38) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.DoubleQuote;["]; - SyntaxKind.HtmlTextLiteral - [38..39) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [39..47) - FullWidth: 8 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Text;[Email]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.Text;[me]; - SyntaxKind.HtmlTagBlock - [47..51) - FullWidth: 4 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [47..51) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[a]; - SyntaxKind.CloseAngle;[>]; +RazorDocument - [0..51) - FullWidth: 51 - [Email me] + MarkupBlock - [0..51) - FullWidth: 51 + MarkupTagBlock - [0..39) - FullWidth: 39 + MarkupTextLiteral - [0..2) - FullWidth: 2 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + Text;[a]; + HtmlAttributeBlock - [2..38) - FullWidth: 36 + MarkupTextLiteral - [2..3) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:Any + Whitespace;[ ]; + MarkupTextLiteral - [3..7) - FullWidth: 4 - Gen - SpanEditHandler;Accepts:Any + Text;[href]; + Equals;[=]; + MarkupTextLiteral - [8..9) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:Any + DoubleQuote;["]; + GenericBlock - [9..37) - FullWidth: 28 + HtmlLiteralAttributeValue - [9..37) - FullWidth: 28 + MarkupTextLiteral - [9..37) - FullWidth: 28 - Gen - SpanEditHandler;Accepts:Any + Text;[mailto:example@microsoft.com]; + MarkupTextLiteral - [37..38) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:Any + DoubleQuote;["]; + MarkupTextLiteral - [38..39) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:Any + CloseAngle;[>]; + MarkupTextLiteral - [39..47) - FullWidth: 8 - Gen - SpanEditHandler;Accepts:Any + Text;[Email]; + Whitespace;[ ]; + Text;[me]; + MarkupTagBlock - [47..51) - FullWidth: 4 + MarkupTextLiteral - [47..51) - FullWidth: 4 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + ForwardSlash;[/]; + Text;[a]; + CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.stree.txt index d11bff64d..4ed0a4357 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsAtSignAsMarkupIfAtEndOfFile.stree.txt @@ -1,15 +1,15 @@ -SyntaxKind.HtmlDocument - [0..5) - FullWidth: 5 - Slots: 1 - [foo @] - SyntaxKind.HtmlMarkupBlock - [0..5) - FullWidth: 5 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..4) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Text;[foo]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.CSharpCodeBlock - [4..5) - FullWidth: 1 - Slots: 1 - SyntaxKind.CSharpImplicitExpression - [4..5) - FullWidth: 1 - Slots: 2 - SyntaxKind.CSharpTransition - [4..5) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpImplicitExpressionBody - [5..5) - FullWidth: 0 - Slots: 1 - SyntaxKind.CSharpCodeBlock - [5..5) - FullWidth: 0 - Slots: 1 - SyntaxKind.CSharpExpressionLiteral - [5..5) - FullWidth: 0 - Slots: 1 - Gen - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 - SyntaxKind.Unknown;[]; - SyntaxKind.HtmlTextLiteral - [5..5) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; +RazorDocument - [0..5) - FullWidth: 5 - [foo @] + MarkupBlock - [0..5) - FullWidth: 5 + MarkupTextLiteral - [0..4) - FullWidth: 4 - Gen - SpanEditHandler;Accepts:Any + Text;[foo]; + Whitespace;[ ]; + CSharpCodeBlock - [4..5) - FullWidth: 1 + CSharpImplicitExpression - [4..5) - FullWidth: 1 + CSharpTransition - [4..5) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpImplicitExpressionBody - [5..5) - FullWidth: 0 + CSharpCodeBlock - [5..5) - FullWidth: 0 + CSharpExpressionLiteral - [5..5) - FullWidth: 0 - Gen - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 + Marker;[]; + MarkupTextLiteral - [5..5) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.stree.txt index 3a203efac..1a167eded 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/EmitsCodeBlockIfFirstCharacterIsSwapCharacter.stree.txt @@ -1,14 +1,14 @@ -SyntaxKind.HtmlDocument - [0..4) - FullWidth: 4 - Slots: 1 - [@bar] - SyntaxKind.HtmlMarkupBlock - [0..4) - FullWidth: 4 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; - SyntaxKind.CSharpCodeBlock - [0..4) - FullWidth: 4 - Slots: 1 - SyntaxKind.CSharpImplicitExpression - [0..4) - FullWidth: 4 - Slots: 2 - SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpImplicitExpressionBody - [1..4) - FullWidth: 3 - Slots: 1 - SyntaxKind.CSharpCodeBlock - [1..4) - FullWidth: 3 - Slots: 1 - SyntaxKind.CSharpExpressionLiteral - [1..4) - FullWidth: 3 - Slots: 1 - Gen - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 - SyntaxKind.Identifier;[bar]; - SyntaxKind.HtmlTextLiteral - [4..4) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; +RazorDocument - [0..4) - FullWidth: 4 - [@bar] + MarkupBlock - [0..4) - FullWidth: 4 + MarkupTextLiteral - [0..0) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; + CSharpCodeBlock - [0..4) - FullWidth: 4 + CSharpImplicitExpression - [0..4) - FullWidth: 4 + CSharpTransition - [0..1) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpImplicitExpressionBody - [1..4) - FullWidth: 3 + CSharpCodeBlock - [1..4) - FullWidth: 3 + CSharpExpressionLiteral - [1..4) - FullWidth: 3 - Gen - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 + Identifier;[bar]; + MarkupTextLiteral - [4..4) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesExtraNewLineBeforeMarkupInNestedBlock.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesExtraNewLineBeforeMarkupInNestedBlock.stree.txt index 607bd2267..a9ee36507 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesExtraNewLineBeforeMarkupInNestedBlock.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesExtraNewLineBeforeMarkupInNestedBlock.stree.txt @@ -1,46 +1,46 @@ -SyntaxKind.HtmlDocument - [0..37) - FullWidth: 37 - Slots: 1 - [@{LF@if(true){LF} LF LF}] - SyntaxKind.HtmlMarkupBlock - [0..37) - FullWidth: 37 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; - SyntaxKind.CSharpCodeBlock - [0..31) - FullWidth: 31 - Slots: 1 - SyntaxKind.CSharpStatement - [0..31) - FullWidth: 31 - Slots: 2 - SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpStatementBody - [1..31) - FullWidth: 30 - Slots: 3 - SyntaxKind.RazorMetaCode - [1..2) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.LeftBrace;[{]; - SyntaxKind.CSharpCodeBlock - [2..30) - FullWidth: 28 - Slots: 1 - SyntaxKind.CSharpStatementLiteral - [2..4) - FullWidth: 2 - Slots: 1 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - SyntaxKind.NewLine;[LF]; - SyntaxKind.CSharpCodeBlock - [4..17) - FullWidth: 13 - Slots: 1 - SyntaxKind.CSharpTransition - [4..5) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpStatementLiteral - [5..17) - FullWidth: 12 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Keyword;[if]; - SyntaxKind.LeftParenthesis;[(]; - SyntaxKind.Keyword;[true]; - SyntaxKind.RightParenthesis;[)]; - SyntaxKind.LeftBrace;[{]; - SyntaxKind.NewLine;[LF]; - SyntaxKind.RightBrace;[}]; - SyntaxKind.CSharpStatementLiteral - [17..20) - FullWidth: 3 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Whitespace;[ ]; - SyntaxKind.NewLine;[LF]; - SyntaxKind.HtmlMarkupBlock - [20..30) - FullWidth: 10 - Slots: 1 - SyntaxKind.HtmlTagBlock - [20..27) - FullWidth: 7 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [20..27) - FullWidth: 7 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[input]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [27..30) - FullWidth: 3 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Whitespace;[ ]; - SyntaxKind.NewLine;[LF]; - SyntaxKind.CSharpStatementLiteral - [30..30) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; - SyntaxKind.RazorMetaCode - [30..31) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.RightBrace;[}]; - SyntaxKind.HtmlTagBlock - [31..37) - FullWidth: 6 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [31..37) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[html]; - SyntaxKind.CloseAngle;[>]; +RazorDocument - [0..37) - FullWidth: 37 - [@{LF@if(true){LF} LF LF}] + MarkupBlock - [0..37) - FullWidth: 37 + MarkupTextLiteral - [0..0) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; + CSharpCodeBlock - [0..31) - FullWidth: 31 + CSharpStatement - [0..31) - FullWidth: 31 + CSharpTransition - [0..1) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpStatementBody - [1..31) - FullWidth: 30 + RazorMetaCode - [1..2) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + LeftBrace;[{]; + CSharpCodeBlock - [2..30) - FullWidth: 28 + CSharpStatementLiteral - [2..4) - FullWidth: 2 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL + NewLine;[LF]; + CSharpCodeBlock - [4..17) - FullWidth: 13 + CSharpTransition - [4..5) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpStatementLiteral - [5..17) - FullWidth: 12 - Gen - SpanEditHandler;Accepts:Any + Keyword;[if]; + LeftParenthesis;[(]; + Keyword;[true]; + RightParenthesis;[)]; + LeftBrace;[{]; + NewLine;[LF]; + RightBrace;[}]; + CSharpStatementLiteral - [17..20) - FullWidth: 3 - Gen - SpanEditHandler;Accepts:Any + Whitespace;[ ]; + NewLine;[LF]; + MarkupBlock - [20..30) - FullWidth: 10 + MarkupTagBlock - [20..27) - FullWidth: 7 + MarkupTextLiteral - [20..27) - FullWidth: 7 - Gen - SpanEditHandler;Accepts:None + OpenAngle;[<]; + Text;[input]; + CloseAngle;[>]; + MarkupTextLiteral - [27..30) - FullWidth: 3 - Gen - SpanEditHandler;Accepts:None + Whitespace;[ ]; + NewLine;[LF]; + CSharpStatementLiteral - [30..30) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; + RazorMetaCode - [30..31) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + RightBrace;[}]; + MarkupTagBlock - [31..37) - FullWidth: 6 + MarkupTextLiteral - [31..37) - FullWidth: 6 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + Text;[html]; + CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineAndMarkupInNestedBlock.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineAndMarkupInNestedBlock.stree.txt index 0127c88e6..68310ce10 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineAndMarkupInNestedBlock.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineAndMarkupInNestedBlock.stree.txt @@ -1,41 +1,41 @@ -SyntaxKind.HtmlDocument - [0..27) - FullWidth: 27 - Slots: 1 - [@{LF@if(true){LF} }] - SyntaxKind.HtmlMarkupBlock - [0..27) - FullWidth: 27 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; - SyntaxKind.CSharpCodeBlock - [0..27) - FullWidth: 27 - Slots: 1 - SyntaxKind.CSharpStatement - [0..27) - FullWidth: 27 - Slots: 2 - SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpStatementBody - [1..27) - FullWidth: 26 - Slots: 3 - SyntaxKind.RazorMetaCode - [1..2) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.LeftBrace;[{]; - SyntaxKind.CSharpCodeBlock - [2..26) - FullWidth: 24 - Slots: 1 - SyntaxKind.CSharpStatementLiteral - [2..4) - FullWidth: 2 - Slots: 1 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - SyntaxKind.NewLine;[LF]; - SyntaxKind.CSharpCodeBlock - [4..17) - FullWidth: 13 - Slots: 1 - SyntaxKind.CSharpTransition - [4..5) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpStatementLiteral - [5..17) - FullWidth: 12 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Keyword;[if]; - SyntaxKind.LeftParenthesis;[(]; - SyntaxKind.Keyword;[true]; - SyntaxKind.RightParenthesis;[)]; - SyntaxKind.LeftBrace;[{]; - SyntaxKind.NewLine;[LF]; - SyntaxKind.RightBrace;[}]; - SyntaxKind.HtmlMarkupBlock - [17..26) - FullWidth: 9 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [17..18) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Whitespace;[ ]; - SyntaxKind.HtmlTagBlock - [18..25) - FullWidth: 7 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [18..25) - FullWidth: 7 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[input]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [25..26) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Whitespace;[ ]; - SyntaxKind.CSharpStatementLiteral - [26..26) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; - SyntaxKind.RazorMetaCode - [26..27) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.RightBrace;[}]; - SyntaxKind.HtmlTextLiteral - [27..27) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; +RazorDocument - [0..27) - FullWidth: 27 - [@{LF@if(true){LF} }] + MarkupBlock - [0..27) - FullWidth: 27 + MarkupTextLiteral - [0..0) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; + CSharpCodeBlock - [0..27) - FullWidth: 27 + CSharpStatement - [0..27) - FullWidth: 27 + CSharpTransition - [0..1) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpStatementBody - [1..27) - FullWidth: 26 + RazorMetaCode - [1..2) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + LeftBrace;[{]; + CSharpCodeBlock - [2..26) - FullWidth: 24 + CSharpStatementLiteral - [2..4) - FullWidth: 2 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL + NewLine;[LF]; + CSharpCodeBlock - [4..17) - FullWidth: 13 + CSharpTransition - [4..5) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpStatementLiteral - [5..17) - FullWidth: 12 - Gen - SpanEditHandler;Accepts:Any + Keyword;[if]; + LeftParenthesis;[(]; + Keyword;[true]; + RightParenthesis;[)]; + LeftBrace;[{]; + NewLine;[LF]; + RightBrace;[}]; + MarkupBlock - [17..26) - FullWidth: 9 + MarkupTextLiteral - [17..18) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:Any + Whitespace;[ ]; + MarkupTagBlock - [18..25) - FullWidth: 7 + MarkupTextLiteral - [18..25) - FullWidth: 7 - Gen - SpanEditHandler;Accepts:None + OpenAngle;[<]; + Text;[input]; + CloseAngle;[>]; + MarkupTextLiteral - [25..26) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Whitespace;[ ]; + CSharpStatementLiteral - [26..26) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; + RazorMetaCode - [26..27) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + RightBrace;[}]; + MarkupTextLiteral - [27..27) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineInNestedBlock.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineInNestedBlock.stree.txt index 5e1ace40c..10e7c0eec 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineInNestedBlock.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandlesNewLineInNestedBlock.stree.txt @@ -1,37 +1,37 @@ -SyntaxKind.HtmlDocument - [0..29) - FullWidth: 29 - Slots: 1 - [@{LF@if(true){LF} LF}LF] - SyntaxKind.HtmlMarkupBlock - [0..29) - FullWidth: 29 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; - SyntaxKind.CSharpCodeBlock - [0..21) - FullWidth: 21 - Slots: 1 - SyntaxKind.CSharpStatement - [0..21) - FullWidth: 21 - Slots: 2 - SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpStatementBody - [1..21) - FullWidth: 20 - Slots: 3 - SyntaxKind.RazorMetaCode - [1..2) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.LeftBrace;[{]; - SyntaxKind.CSharpCodeBlock - [2..20) - FullWidth: 18 - Slots: 1 - SyntaxKind.CSharpStatementLiteral - [2..4) - FullWidth: 2 - Slots: 1 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - SyntaxKind.NewLine;[LF]; - SyntaxKind.CSharpCodeBlock - [4..17) - FullWidth: 13 - Slots: 1 - SyntaxKind.CSharpTransition - [4..5) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpStatementLiteral - [5..17) - FullWidth: 12 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Keyword;[if]; - SyntaxKind.LeftParenthesis;[(]; - SyntaxKind.Keyword;[true]; - SyntaxKind.RightParenthesis;[)]; - SyntaxKind.LeftBrace;[{]; - SyntaxKind.NewLine;[LF]; - SyntaxKind.RightBrace;[}]; - SyntaxKind.CSharpStatementLiteral - [17..20) - FullWidth: 3 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Whitespace;[ ]; - SyntaxKind.NewLine;[LF]; - SyntaxKind.RazorMetaCode - [20..21) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.RightBrace;[}]; - SyntaxKind.HtmlTextLiteral - [21..23) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.NewLine;[LF]; - SyntaxKind.HtmlTagBlock - [23..29) - FullWidth: 6 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [23..29) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[html]; - SyntaxKind.CloseAngle;[>]; +RazorDocument - [0..29) - FullWidth: 29 - [@{LF@if(true){LF} LF}LF] + MarkupBlock - [0..29) - FullWidth: 29 + MarkupTextLiteral - [0..0) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; + CSharpCodeBlock - [0..21) - FullWidth: 21 + CSharpStatement - [0..21) - FullWidth: 21 + CSharpTransition - [0..1) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpStatementBody - [1..21) - FullWidth: 20 + RazorMetaCode - [1..2) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + LeftBrace;[{]; + CSharpCodeBlock - [2..20) - FullWidth: 18 + CSharpStatementLiteral - [2..4) - FullWidth: 2 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL + NewLine;[LF]; + CSharpCodeBlock - [4..17) - FullWidth: 13 + CSharpTransition - [4..5) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpStatementLiteral - [5..17) - FullWidth: 12 - Gen - SpanEditHandler;Accepts:Any + Keyword;[if]; + LeftParenthesis;[(]; + Keyword;[true]; + RightParenthesis;[)]; + LeftBrace;[{]; + NewLine;[LF]; + RightBrace;[}]; + CSharpStatementLiteral - [17..20) - FullWidth: 3 - Gen - SpanEditHandler;Accepts:Any + Whitespace;[ ]; + NewLine;[LF]; + RazorMetaCode - [20..21) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + RightBrace;[}]; + MarkupTextLiteral - [21..23) - FullWidth: 2 - Gen - SpanEditHandler;Accepts:Any + NewLine;[LF]; + MarkupTagBlock - [23..29) - FullWidth: 6 + MarkupTextLiteral - [23..29) - FullWidth: 6 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + Text;[html]; + CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.stree.txt index e7ec7d741..df3820603 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/HandsParsingOverToCodeParserWhenAtSignEncounteredAndEmitsOutput.stree.txt @@ -1,16 +1,16 @@ -SyntaxKind.HtmlDocument - [0..12) - FullWidth: 12 - Slots: 1 - [foo @bar baz] - SyntaxKind.HtmlMarkupBlock - [0..12) - FullWidth: 12 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..4) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Text;[foo]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.CSharpCodeBlock - [4..8) - FullWidth: 4 - Slots: 1 - SyntaxKind.CSharpImplicitExpression - [4..8) - FullWidth: 4 - Slots: 2 - SyntaxKind.CSharpTransition - [4..5) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpImplicitExpressionBody - [5..8) - FullWidth: 3 - Slots: 1 - SyntaxKind.CSharpCodeBlock - [5..8) - FullWidth: 3 - Slots: 1 - SyntaxKind.CSharpExpressionLiteral - [5..8) - FullWidth: 3 - Slots: 1 - Gen - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 - SyntaxKind.Identifier;[bar]; - SyntaxKind.HtmlTextLiteral - [8..12) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Whitespace;[ ]; - SyntaxKind.Text;[baz]; +RazorDocument - [0..12) - FullWidth: 12 - [foo @bar baz] + MarkupBlock - [0..12) - FullWidth: 12 + MarkupTextLiteral - [0..4) - FullWidth: 4 - Gen - SpanEditHandler;Accepts:Any + Text;[foo]; + Whitespace;[ ]; + CSharpCodeBlock - [4..8) - FullWidth: 4 + CSharpImplicitExpression - [4..8) - FullWidth: 4 + CSharpTransition - [4..5) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpImplicitExpressionBody - [5..8) - FullWidth: 3 + CSharpCodeBlock - [5..8) - FullWidth: 3 + CSharpExpressionLiteral - [5..8) - FullWidth: 3 - Gen - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 + Identifier;[bar]; + MarkupTextLiteral - [8..12) - FullWidth: 4 - Gen - SpanEditHandler;Accepts:Any + Whitespace;[ ]; + Text;[baz]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.stree.txt index a38e97615..ad213bb56 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/IgnoresTagsInContentsOfScriptTag.stree.txt @@ -1,32 +1,32 @@ -SyntaxKind.HtmlDocument - [0..36) - FullWidth: 36 - Slots: 1 - [] - SyntaxKind.HtmlMarkupBlock - [0..36) - FullWidth: 36 - Slots: 1 - SyntaxKind.HtmlTagBlock - [0..8) - FullWidth: 8 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..8) - FullWidth: 8 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[script]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [8..21) - FullWidth: 13 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Text;[foo]; - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[bar]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.Text;[baz]; - SyntaxKind.Equals;[=]; - SyntaxKind.SingleQuote;[']; - SyntaxKind.CSharpCodeBlock - [21..25) - FullWidth: 4 - Slots: 1 - SyntaxKind.CSharpImplicitExpression - [21..25) - FullWidth: 4 - Slots: 2 - SyntaxKind.CSharpTransition - [21..22) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpImplicitExpressionBody - [22..25) - FullWidth: 3 - Slots: 1 - SyntaxKind.CSharpCodeBlock - [22..25) - FullWidth: 3 - Slots: 1 - SyntaxKind.CSharpExpressionLiteral - [22..25) - FullWidth: 3 - Slots: 1 - Gen - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 - SyntaxKind.Identifier;[boz]; - SyntaxKind.HtmlTextLiteral - [25..27) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.SingleQuote;[']; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTagBlock - [27..36) - FullWidth: 9 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [27..36) - FullWidth: 9 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[script]; - SyntaxKind.CloseAngle;[>]; +RazorDocument - [0..36) - FullWidth: 36 - [] + MarkupBlock - [0..36) - FullWidth: 36 + MarkupTagBlock - [0..8) - FullWidth: 8 + MarkupTextLiteral - [0..8) - FullWidth: 8 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + Text;[script]; + CloseAngle;[>]; + MarkupTextLiteral - [8..21) - FullWidth: 13 - Gen - SpanEditHandler;Accepts:Any + Text;[foo]; + OpenAngle;[<]; + Text;[bar]; + Whitespace;[ ]; + Text;[baz]; + Equals;[=]; + SingleQuote;[']; + CSharpCodeBlock - [21..25) - FullWidth: 4 + CSharpImplicitExpression - [21..25) - FullWidth: 4 + CSharpTransition - [21..22) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpImplicitExpressionBody - [22..25) - FullWidth: 3 + CSharpCodeBlock - [22..25) - FullWidth: 3 + CSharpExpressionLiteral - [22..25) - FullWidth: 3 - Gen - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 + Identifier;[boz]; + MarkupTextLiteral - [25..27) - FullWidth: 2 - Gen - SpanEditHandler;Accepts:Any + SingleQuote;[']; + CloseAngle;[>]; + MarkupTagBlock - [27..36) - FullWidth: 9 + MarkupTextLiteral - [27..36) - FullWidth: 9 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + ForwardSlash;[/]; + Text;[script]; + CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt index 58930ed05..6450d7ca8 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt @@ -1,59 +1,59 @@ -SyntaxKind.HtmlDocument - [0..52) - FullWidth: 52 - Slots: 1 - [@if (true) { @if(false) {
@something.
} }] - SyntaxKind.HtmlMarkupBlock - [0..52) - FullWidth: 52 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; - SyntaxKind.CSharpCodeBlock - [0..52) - FullWidth: 52 - Slots: 1 - SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpStatementLiteral - [1..13) - FullWidth: 12 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Keyword;[if]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.LeftParenthesis;[(]; - SyntaxKind.Keyword;[true]; - SyntaxKind.RightParenthesis;[)]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.LeftBrace;[{]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.CSharpCodeBlock - [13..50) - FullWidth: 37 - Slots: 1 - SyntaxKind.CSharpTransition - [13..14) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpStatementLiteral - [14..25) - FullWidth: 11 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Keyword;[if]; - SyntaxKind.LeftParenthesis;[(]; - SyntaxKind.Keyword;[false]; - SyntaxKind.RightParenthesis;[)]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.LeftBrace;[{]; - SyntaxKind.HtmlMarkupBlock - [25..49) - FullWidth: 24 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [25..26) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Whitespace;[ ]; - SyntaxKind.HtmlTagBlock - [26..31) - FullWidth: 5 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [26..31) - FullWidth: 5 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[div]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [31..31) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; - SyntaxKind.CSharpCodeBlock - [31..41) - FullWidth: 10 - Slots: 1 - SyntaxKind.CSharpImplicitExpression - [31..41) - FullWidth: 10 - Slots: 2 - SyntaxKind.CSharpTransition - [31..32) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpImplicitExpressionBody - [32..41) - FullWidth: 9 - Slots: 1 - SyntaxKind.CSharpCodeBlock - [32..41) - FullWidth: 9 - Slots: 1 - SyntaxKind.CSharpExpressionLiteral - [32..41) - FullWidth: 9 - Slots: 1 - Gen - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 - SyntaxKind.Identifier;[something]; - SyntaxKind.HtmlTextLiteral - [41..42) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Text;[.]; - SyntaxKind.HtmlTagBlock - [42..48) - FullWidth: 6 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [42..48) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[div]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [48..49) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Whitespace;[ ]; - SyntaxKind.CSharpStatementLiteral - [49..50) - FullWidth: 1 - Slots: 1 - Gen - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - SyntaxKind.RightBrace;[}]; - SyntaxKind.CSharpStatementLiteral - [50..52) - FullWidth: 2 - Slots: 1 - Gen - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[ATD];K14 - SyntaxKind.Whitespace;[ ]; - SyntaxKind.RightBrace;[}]; +RazorDocument - [0..52) - FullWidth: 52 - [@if (true) { @if(false) {
@something.
} }] + MarkupBlock - [0..52) - FullWidth: 52 + MarkupTextLiteral - [0..0) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; + CSharpCodeBlock - [0..52) - FullWidth: 52 + CSharpTransition - [0..1) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpStatementLiteral - [1..13) - FullWidth: 12 - Gen - SpanEditHandler;Accepts:Any + Keyword;[if]; + Whitespace;[ ]; + LeftParenthesis;[(]; + Keyword;[true]; + RightParenthesis;[)]; + Whitespace;[ ]; + LeftBrace;[{]; + Whitespace;[ ]; + CSharpCodeBlock - [13..50) - FullWidth: 37 + CSharpTransition - [13..14) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpStatementLiteral - [14..25) - FullWidth: 11 - Gen - SpanEditHandler;Accepts:Any + Keyword;[if]; + LeftParenthesis;[(]; + Keyword;[false]; + RightParenthesis;[)]; + Whitespace;[ ]; + LeftBrace;[{]; + MarkupBlock - [25..49) - FullWidth: 24 + MarkupTextLiteral - [25..26) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:Any + Whitespace;[ ]; + MarkupTagBlock - [26..31) - FullWidth: 5 + MarkupTextLiteral - [26..31) - FullWidth: 5 - Gen - SpanEditHandler;Accepts:None + OpenAngle;[<]; + Text;[div]; + CloseAngle;[>]; + MarkupTextLiteral - [31..31) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; + CSharpCodeBlock - [31..41) - FullWidth: 10 + CSharpImplicitExpression - [31..41) - FullWidth: 10 + CSharpTransition - [31..32) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpImplicitExpressionBody - [32..41) - FullWidth: 9 + CSharpCodeBlock - [32..41) - FullWidth: 9 + CSharpExpressionLiteral - [32..41) - FullWidth: 9 - Gen - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 + Identifier;[something]; + MarkupTextLiteral - [41..42) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:Any + Text;[.]; + MarkupTagBlock - [42..48) - FullWidth: 6 + MarkupTextLiteral - [42..48) - FullWidth: 6 - Gen - SpanEditHandler;Accepts:None + OpenAngle;[<]; + ForwardSlash;[/]; + Text;[div]; + CloseAngle;[>]; + MarkupTextLiteral - [48..49) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Whitespace;[ ]; + CSharpStatementLiteral - [49..50) - FullWidth: 1 - Gen - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 + RightBrace;[}]; + CSharpStatementLiteral - [50..52) - FullWidth: 2 - Gen - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[ATD];K14 + Whitespace;[ ]; + RightBrace;[}]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NoLongerSupportsDollarOpenBraceCombination.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NoLongerSupportsDollarOpenBraceCombination.stree.txt index 42eb63f7a..2923e610c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NoLongerSupportsDollarOpenBraceCombination.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/NoLongerSupportsDollarOpenBraceCombination.stree.txt @@ -1,15 +1,15 @@ -SyntaxKind.HtmlDocument - [0..17) - FullWidth: 17 - Slots: 1 - [${bar}] - SyntaxKind.HtmlMarkupBlock - [0..17) - FullWidth: 17 - Slots: 1 - SyntaxKind.HtmlTagBlock - [0..5) - FullWidth: 5 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..5) - FullWidth: 5 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[foo]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [5..11) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Text;[${bar}]; - SyntaxKind.HtmlTagBlock - [11..17) - FullWidth: 6 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [11..17) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[foo]; - SyntaxKind.CloseAngle;[>]; +RazorDocument - [0..17) - FullWidth: 17 - [${bar}] + MarkupBlock - [0..17) - FullWidth: 17 + MarkupTagBlock - [0..5) - FullWidth: 5 + MarkupTextLiteral - [0..5) - FullWidth: 5 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + Text;[foo]; + CloseAngle;[>]; + MarkupTextLiteral - [5..11) - FullWidth: 6 - Gen - SpanEditHandler;Accepts:Any + Text;[${bar}]; + MarkupTagBlock - [11..17) - FullWidth: 6 + MarkupTextLiteral - [11..17) - FullWidth: 6 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + ForwardSlash;[/]; + Text;[foo]; + CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString.stree.txt index 27a756b53..4e3000082 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsEmptyBlockWithEmptyMarkupSpanIfContentIsEmptyString.stree.txt @@ -1,4 +1,4 @@ -SyntaxKind.HtmlDocument - [0..0) - FullWidth: 0 - Slots: 1 - [] - SyntaxKind.HtmlMarkupBlock - [0..0) - FullWidth: 0 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; +RazorDocument - [0..0) - FullWidth: 0 - [] + MarkupBlock - [0..0) - FullWidth: 0 + MarkupTextLiteral - [0..0) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan.stree.txt index 56297bdee..f51e794b2 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/OutputsWhitespaceOnlyContentAsSingleWhitespaceMarkupSpan.stree.txt @@ -1,4 +1,4 @@ -SyntaxKind.HtmlDocument - [0..10) - FullWidth: 10 - Slots: 1 - [ ] - SyntaxKind.HtmlMarkupBlock - [0..10) - FullWidth: 10 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..10) - FullWidth: 10 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Whitespace;[ ]; +RazorDocument - [0..10) - FullWidth: 10 - [ ] + MarkupBlock - [0..10) - FullWidth: 10 + MarkupTextLiteral - [0..10) - FullWidth: 10 - Gen - SpanEditHandler;Accepts:Any + Whitespace;[ ]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseDocumentDoesNotSwitchToCodeOnEmailAddressInText.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseDocumentDoesNotSwitchToCodeOnEmailAddressInText.stree.txt index 3936ec291..b40a8668c 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseDocumentDoesNotSwitchToCodeOnEmailAddressInText.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseDocumentDoesNotSwitchToCodeOnEmailAddressInText.stree.txt @@ -1,4 +1,4 @@ -SyntaxKind.HtmlDocument - [0..21) - FullWidth: 21 - Slots: 1 - [example@microsoft.com] - SyntaxKind.HtmlMarkupBlock - [0..21) - FullWidth: 21 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..21) - FullWidth: 21 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Text;[example@microsoft.com]; +RazorDocument - [0..21) - FullWidth: 21 - [example@microsoft.com] + MarkupBlock - [0..21) - FullWidth: 21 + MarkupTextLiteral - [0..21) - FullWidth: 21 - Gen - SpanEditHandler;Accepts:Any + Text;[example@microsoft.com]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.stree.txt index 920cd91e1..255197a72 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParseSectionIgnoresTagsInContentsOfScriptTag.stree.txt @@ -1,59 +1,59 @@ -SyntaxKind.HtmlDocument - [0..53) - FullWidth: 53 - Slots: 1 - [@section Foo { }] - SyntaxKind.HtmlMarkupBlock - [0..53) - FullWidth: 53 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; - SyntaxKind.CSharpCodeBlock - [0..53) - FullWidth: 53 - Slots: 1 - SyntaxKind.CSharpDirective - [0..53) - FullWidth: 53 - Slots: 2 - SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpDirectiveBody - [1..53) - FullWidth: 52 - Slots: 2 - SyntaxKind.RazorMetaCode - [1..8) - FullWidth: 7 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Identifier;[section]; - SyntaxKind.CSharpCodeBlock - [8..53) - FullWidth: 45 - Slots: 1 - SyntaxKind.CSharpStatementLiteral - [8..9) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Whitespace - SyntaxKind.Whitespace;[ ]; - SyntaxKind.CSharpStatementLiteral - [9..12) - FullWidth: 3 - Slots: 1 - Gen - DirectiveTokenEditHandler;Accepts:NonWhitespace - SyntaxKind.Identifier;[Foo]; - SyntaxKind.HtmlTextLiteral - [12..13) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:AllWhitespace - SyntaxKind.Whitespace;[ ]; - SyntaxKind.RazorMetaCode - [13..14) - FullWidth: 1 - Slots: 1 - Gen - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd - SyntaxKind.LeftBrace;[{]; - SyntaxKind.HtmlMarkupBlock - [14..52) - FullWidth: 38 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [14..15) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Whitespace;[ ]; - SyntaxKind.HtmlTagBlock - [15..23) - FullWidth: 8 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [15..23) - FullWidth: 8 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[script]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [23..36) - FullWidth: 13 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Text;[foo]; - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[bar]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.Text;[baz]; - SyntaxKind.Equals;[=]; - SyntaxKind.SingleQuote;[']; - SyntaxKind.CSharpCodeBlock - [36..40) - FullWidth: 4 - Slots: 1 - SyntaxKind.CSharpImplicitExpression - [36..40) - FullWidth: 4 - Slots: 2 - SyntaxKind.CSharpTransition - [36..37) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpImplicitExpressionBody - [37..40) - FullWidth: 3 - Slots: 1 - SyntaxKind.CSharpCodeBlock - [37..40) - FullWidth: 3 - Slots: 1 - SyntaxKind.CSharpExpressionLiteral - [37..40) - FullWidth: 3 - Slots: 1 - Gen - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K15 - SyntaxKind.Identifier;[boz]; - SyntaxKind.HtmlTextLiteral - [40..42) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.SingleQuote;[']; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTagBlock - [42..51) - FullWidth: 9 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [42..51) - FullWidth: 9 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[script]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [51..52) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Whitespace;[ ]; - SyntaxKind.RazorMetaCode - [52..53) - FullWidth: 1 - Slots: 1 - Gen - ImplicitExpressionEditHandler;Accepts:None;ImplicitExpression[RTD];K15 - SyntaxKind.RightBrace;[}]; - SyntaxKind.HtmlTextLiteral - [53..53) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; +RazorDocument - [0..53) - FullWidth: 53 - [@section Foo { }] + MarkupBlock - [0..53) - FullWidth: 53 + MarkupTextLiteral - [0..0) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; + CSharpCodeBlock - [0..53) - FullWidth: 53 + RazorDirective - [0..53) - FullWidth: 53 + CSharpTransition - [0..1) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + RazorDirectiveBody - [1..53) - FullWidth: 52 + RazorMetaCode - [1..8) - FullWidth: 7 - Gen - SpanEditHandler;Accepts:None + Identifier;[section]; + CSharpCodeBlock - [8..53) - FullWidth: 45 + CSharpStatementLiteral - [8..9) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:Whitespace + Whitespace;[ ]; + CSharpStatementLiteral - [9..12) - FullWidth: 3 - Gen - DirectiveTokenEditHandler;Accepts:NonWhitespace + Identifier;[Foo]; + MarkupTextLiteral - [12..13) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:AllWhitespace + Whitespace;[ ]; + RazorMetaCode - [13..14) - FullWidth: 1 - Gen - AutoCompleteEditHandler;Accepts:None,AutoComplete:[];AtEnd + LeftBrace;[{]; + MarkupBlock - [14..52) - FullWidth: 38 + MarkupTextLiteral - [14..15) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:Any + Whitespace;[ ]; + MarkupTagBlock - [15..23) - FullWidth: 8 + MarkupTextLiteral - [15..23) - FullWidth: 8 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + Text;[script]; + CloseAngle;[>]; + MarkupTextLiteral - [23..36) - FullWidth: 13 - Gen - SpanEditHandler;Accepts:Any + Text;[foo]; + OpenAngle;[<]; + Text;[bar]; + Whitespace;[ ]; + Text;[baz]; + Equals;[=]; + SingleQuote;[']; + CSharpCodeBlock - [36..40) - FullWidth: 4 + CSharpImplicitExpression - [36..40) - FullWidth: 4 + CSharpTransition - [36..37) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpImplicitExpressionBody - [37..40) - FullWidth: 3 + CSharpCodeBlock - [37..40) - FullWidth: 3 + CSharpExpressionLiteral - [37..40) - FullWidth: 3 - Gen - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K15 + Identifier;[boz]; + MarkupTextLiteral - [40..42) - FullWidth: 2 - Gen - SpanEditHandler;Accepts:Any + SingleQuote;[']; + CloseAngle;[>]; + MarkupTagBlock - [42..51) - FullWidth: 9 + MarkupTextLiteral - [42..51) - FullWidth: 9 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + ForwardSlash;[/]; + Text;[script]; + CloseAngle;[>]; + MarkupTextLiteral - [51..52) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:Any + Whitespace;[ ]; + RazorMetaCode - [52..53) - FullWidth: 1 - Gen - ImplicitExpressionEditHandler;Accepts:None;ImplicitExpression[RTD];K15 + RightBrace;[}]; + MarkupTextLiteral - [53..53) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered.stree.txt index a25d70dff..b8fbb1060 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ParsesWholeContentAsOneSpanIfNoSwapCharacterEncountered.stree.txt @@ -1,6 +1,6 @@ -SyntaxKind.HtmlDocument - [0..7) - FullWidth: 7 - Slots: 1 - [foo baz] - SyntaxKind.HtmlMarkupBlock - [0..7) - FullWidth: 7 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..7) - FullWidth: 7 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Text;[foo]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.Text;[baz]; +RazorDocument - [0..7) - FullWidth: 7 - [foo baz] + MarkupBlock - [0..7) - FullWidth: 7 + MarkupTextLiteral - [0..7) - FullWidth: 7 - Gen - SpanEditHandler;Accepts:Any + Text;[foo]; + Whitespace;[ ]; + Text;[baz]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml.stree.txt index 92430bb30..3f6aa2076 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersExtraNewlineAtTheEndTextTagInVerbatimBlockIfFollowedByHtml.stree.txt @@ -1,46 +1,46 @@ -SyntaxKind.HtmlDocument - [0..38) - FullWidth: 38 - Slots: 1 - [@{BlahLFLF}] - SyntaxKind.HtmlMarkupBlock - [0..38) - FullWidth: 38 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; - SyntaxKind.CSharpCodeBlock - [0..32) - FullWidth: 32 - Slots: 1 - SyntaxKind.CSharpStatement - [0..32) - FullWidth: 32 - Slots: 2 - SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpStatementBody - [1..32) - FullWidth: 31 - Slots: 3 - SyntaxKind.RazorMetaCode - [1..2) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.LeftBrace;[{]; - SyntaxKind.CSharpCodeBlock - [2..31) - FullWidth: 29 - Slots: 1 - SyntaxKind.HtmlMarkupBlock - [2..21) - FullWidth: 19 - Slots: 1 - SyntaxKind.HtmlTagBlock - [2..8) - FullWidth: 6 - Slots: 1 - SyntaxKind.HtmlTransition - [2..8) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[text]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [8..12) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Text;[Blah]; - SyntaxKind.HtmlTagBlock - [12..19) - FullWidth: 7 - Slots: 1 - SyntaxKind.HtmlTransition - [12..19) - FullWidth: 7 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[text]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [19..21) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.NewLine;[LF]; - SyntaxKind.HtmlMarkupBlock - [21..31) - FullWidth: 10 - Slots: 1 - SyntaxKind.HtmlTagBlock - [21..29) - FullWidth: 8 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [21..29) - FullWidth: 8 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[input]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [29..31) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.NewLine;[LF]; - SyntaxKind.CSharpStatementLiteral - [31..31) - FullWidth: 0 - Slots: 1 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - SyntaxKind.Unknown;[]; - SyntaxKind.RazorMetaCode - [31..32) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.RightBrace;[}]; - SyntaxKind.HtmlTagBlock - [32..38) - FullWidth: 6 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [32..38) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[html]; - SyntaxKind.CloseAngle;[>]; +RazorDocument - [0..38) - FullWidth: 38 - [@{BlahLFLF}] + MarkupBlock - [0..38) - FullWidth: 38 + MarkupTextLiteral - [0..0) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; + CSharpCodeBlock - [0..32) - FullWidth: 32 + CSharpStatement - [0..32) - FullWidth: 32 + CSharpTransition - [0..1) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpStatementBody - [1..32) - FullWidth: 31 + RazorMetaCode - [1..2) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + LeftBrace;[{]; + CSharpCodeBlock - [2..31) - FullWidth: 29 + MarkupBlock - [2..21) - FullWidth: 19 + MarkupTagBlock - [2..8) - FullWidth: 6 + MarkupTransition - [2..8) - FullWidth: 6 - Gen - SpanEditHandler;Accepts:None + OpenAngle;[<]; + Text;[text]; + CloseAngle;[>]; + MarkupTextLiteral - [8..12) - FullWidth: 4 - Gen - SpanEditHandler;Accepts:None + Text;[Blah]; + MarkupTagBlock - [12..19) - FullWidth: 7 + MarkupTransition - [12..19) - FullWidth: 7 - Gen - SpanEditHandler;Accepts:None + OpenAngle;[<]; + ForwardSlash;[/]; + Text;[text]; + CloseAngle;[>]; + MarkupTextLiteral - [19..21) - FullWidth: 2 - Gen - SpanEditHandler;Accepts:None + NewLine;[LF]; + MarkupBlock - [21..31) - FullWidth: 10 + MarkupTagBlock - [21..29) - FullWidth: 8 + MarkupTextLiteral - [21..29) - FullWidth: 8 - Gen - SpanEditHandler;Accepts:None + OpenAngle;[<]; + Text;[input]; + ForwardSlash;[/]; + CloseAngle;[>]; + MarkupTextLiteral - [29..31) - FullWidth: 2 - Gen - SpanEditHandler;Accepts:None + NewLine;[LF]; + CSharpStatementLiteral - [31..31) - FullWidth: 0 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL + Marker;[]; + RazorMetaCode - [31..32) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + RightBrace;[}]; + MarkupTagBlock - [32..38) - FullWidth: 6 + MarkupTextLiteral - [32..38) - FullWidth: 6 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + Text;[html]; + CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersNewlineAfterTextTagInVerbatimBlockIfFollowedByMarkupTransition.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersNewlineAfterTextTagInVerbatimBlockIfFollowedByMarkupTransition.stree.txt index 1b63b276e..eb8bd65f2 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersNewlineAfterTextTagInVerbatimBlockIfFollowedByMarkupTransition.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersNewlineAfterTextTagInVerbatimBlockIfFollowedByMarkupTransition.stree.txt @@ -1,46 +1,46 @@ -SyntaxKind.HtmlDocument - [0..37) - FullWidth: 37 - Slots: 1 - [@{BlahLF@: BlehLF}] - SyntaxKind.HtmlMarkupBlock - [0..37) - FullWidth: 37 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..0) - FullWidth: 0 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Unknown;[]; - SyntaxKind.CSharpCodeBlock - [0..31) - FullWidth: 31 - Slots: 1 - SyntaxKind.CSharpStatement - [0..31) - FullWidth: 31 - Slots: 2 - SyntaxKind.CSharpTransition - [0..1) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.CSharpStatementBody - [1..31) - FullWidth: 30 - Slots: 3 - SyntaxKind.RazorMetaCode - [1..2) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.LeftBrace;[{]; - SyntaxKind.CSharpCodeBlock - [2..30) - FullWidth: 28 - Slots: 1 - SyntaxKind.HtmlMarkupBlock - [2..21) - FullWidth: 19 - Slots: 1 - SyntaxKind.HtmlTagBlock - [2..8) - FullWidth: 6 - Slots: 1 - SyntaxKind.HtmlTransition - [2..8) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[text]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [8..12) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Text;[Blah]; - SyntaxKind.HtmlTagBlock - [12..19) - FullWidth: 7 - Slots: 1 - SyntaxKind.HtmlTransition - [12..19) - FullWidth: 7 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[text]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [19..21) - FullWidth: 2 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.NewLine;[LF]; - SyntaxKind.HtmlMarkupBlock - [21..30) - FullWidth: 9 - Slots: 1 - SyntaxKind.HtmlTransition - [21..22) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Transition;[@]; - SyntaxKind.RazorMetaCode - [22..23) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Colon;[:]; - SyntaxKind.HtmlTextLiteral - [23..30) - FullWidth: 7 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.Whitespace;[ ]; - SyntaxKind.Text;[Bleh]; - SyntaxKind.NewLine;[LF]; - SyntaxKind.CSharpStatementLiteral - [30..30) - FullWidth: 0 - Slots: 1 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL - SyntaxKind.Unknown;[]; - SyntaxKind.RazorMetaCode - [30..31) - FullWidth: 1 - Slots: 1 - Gen - SpanEditHandler;Accepts:None - SyntaxKind.RightBrace;[}]; - SyntaxKind.HtmlTagBlock - [31..37) - FullWidth: 6 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [31..37) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[html]; - SyntaxKind.CloseAngle;[>]; +RazorDocument - [0..37) - FullWidth: 37 - [@{BlahLF@: BlehLF}] + MarkupBlock - [0..37) - FullWidth: 37 + MarkupTextLiteral - [0..0) - FullWidth: 0 - Gen - SpanEditHandler;Accepts:Any + Marker;[]; + CSharpCodeBlock - [0..31) - FullWidth: 31 + CSharpStatement - [0..31) - FullWidth: 31 + CSharpTransition - [0..1) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + CSharpStatementBody - [1..31) - FullWidth: 30 + RazorMetaCode - [1..2) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + LeftBrace;[{]; + CSharpCodeBlock - [2..30) - FullWidth: 28 + MarkupBlock - [2..21) - FullWidth: 19 + MarkupTagBlock - [2..8) - FullWidth: 6 + MarkupTransition - [2..8) - FullWidth: 6 - Gen - SpanEditHandler;Accepts:None + OpenAngle;[<]; + Text;[text]; + CloseAngle;[>]; + MarkupTextLiteral - [8..12) - FullWidth: 4 - Gen - SpanEditHandler;Accepts:None + Text;[Blah]; + MarkupTagBlock - [12..19) - FullWidth: 7 + MarkupTransition - [12..19) - FullWidth: 7 - Gen - SpanEditHandler;Accepts:None + OpenAngle;[<]; + ForwardSlash;[/]; + Text;[text]; + CloseAngle;[>]; + MarkupTextLiteral - [19..21) - FullWidth: 2 - Gen - SpanEditHandler;Accepts:None + NewLine;[LF]; + MarkupBlock - [21..30) - FullWidth: 9 + MarkupTransition - [21..22) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + Transition;[@]; + RazorMetaCode - [22..23) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:Any + Colon;[:]; + MarkupTextLiteral - [23..30) - FullWidth: 7 - Gen - SpanEditHandler;Accepts:None + Whitespace;[ ]; + Text;[Bleh]; + NewLine;[LF]; + CSharpStatementLiteral - [30..30) - FullWidth: 0 - Gen - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[];AtEOL + Marker;[]; + RazorMetaCode - [30..31) - FullWidth: 1 - Gen - SpanEditHandler;Accepts:None + RightBrace;[}]; + MarkupTagBlock - [31..37) - FullWidth: 6 + MarkupTextLiteral - [31..37) - FullWidth: 6 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + Text;[html]; + CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersTextPseudoTagAsMarkup.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersTextPseudoTagAsMarkup.stree.txt index d7b7e0f6c..77e5a0492 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersTextPseudoTagAsMarkup.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/RendersTextPseudoTagAsMarkup.stree.txt @@ -1,18 +1,18 @@ -SyntaxKind.HtmlDocument - [0..20) - FullWidth: 20 - Slots: 1 - [Foo Foo] - SyntaxKind.HtmlMarkupBlock - [0..20) - FullWidth: 20 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [0..4) - FullWidth: 4 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Text;[Foo]; - SyntaxKind.Whitespace;[ ]; - SyntaxKind.HtmlTagBlock - [4..10) - FullWidth: 6 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [4..10) - FullWidth: 6 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.Text;[text]; - SyntaxKind.CloseAngle;[>]; - SyntaxKind.HtmlTextLiteral - [10..13) - FullWidth: 3 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.Text;[Foo]; - SyntaxKind.HtmlTagBlock - [13..20) - FullWidth: 7 - Slots: 1 - SyntaxKind.HtmlTextLiteral - [13..20) - FullWidth: 7 - Slots: 1 - Gen - SpanEditHandler;Accepts:Any - SyntaxKind.OpenAngle;[<]; - SyntaxKind.ForwardSlash;[/]; - SyntaxKind.Text;[text]; - SyntaxKind.CloseAngle;[>]; +RazorDocument - [0..20) - FullWidth: 20 - [Foo Foo] + MarkupBlock - [0..20) - FullWidth: 20 + MarkupTextLiteral - [0..4) - FullWidth: 4 - Gen - SpanEditHandler;Accepts:Any + Text;[Foo]; + Whitespace;[ ]; + MarkupTagBlock - [4..10) - FullWidth: 6 + MarkupTextLiteral - [4..10) - FullWidth: 6 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + Text;[text]; + CloseAngle;[>]; + MarkupTextLiteral - [10..13) - FullWidth: 3 - Gen - SpanEditHandler;Accepts:Any + Text;[Foo]; + MarkupTagBlock - [13..20) - FullWidth: 7 + MarkupTextLiteral - [13..20) - FullWidth: 7 - Gen - SpanEditHandler;Accepts:Any + OpenAngle;[<]; + ForwardSlash;[/]; + Text;[text]; + CloseAngle;[>]; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.stree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.stree.txt index 2bd00ed8e..04442e1a1 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.stree.txt +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/HtmlDocumentTest/ReturnsOneMarkupSegmentIfNoCodeBlocksEncountered.stree.txt @@ -1,26 +1,26 @@ -SyntaxKind.HtmlDocument - [0..30) - FullWidth: 30 - Slots: 1 - [Foo BazBarBarBar