huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed HtmlTextSyntax to HtmlTextLiteralSyntax for consistency (#2560) 

* Renamed HtmlTextSyntax to HtmlTextLiteralSyntax for consistency

* Generated baselines
This commit is contained in:
Ajay Bhargav Baaskaran 2018-08-28 14:00:32 -07:00 committed by GitHub
parent 02bc4604a5
commit 9e4c4079f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
576 changed files with 2383 additions and 2383 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlLanguageCharacteristics.cs
View File

@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
{
switch (type)
{
case SyntaxKind.HtmlTextLiteral:
case SyntaxKind.Text:
return Resources.HtmlToken_Text;
case SyntaxKind.Whitespace:
return Resources.HtmlToken_WhiteSpace;
@ -106,9 +106,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
case KnownTokenType.CommentBody:
return SyntaxKind.RazorCommentLiteral;
case KnownTokenType.Identifier:
return SyntaxKind.HtmlTextLiteral;
return SyntaxKind.Text;
case KnownTokenType.Keyword:
return SyntaxKind.HtmlTextLiteral;
return SyntaxKind.Text;
case KnownTokenType.NewLine:
return SyntaxKind.NewLine;
case KnownTokenType.Transition:

48
src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlMarkupParser.cs
View File

@ -15,13 +15,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
private static readonly SyntaxToken[] nonAllowedHtmlCommentEnding = new[]
{
SyntaxFactory.Token(SyntaxKind.HtmlTextLiteral, "-"),
SyntaxFactory.Token(SyntaxKind.Text, "-"),
SyntaxFactory.Token(SyntaxKind.Bang, "!"),
SyntaxFactory.Token(SyntaxKind.OpenAngle, "<"),
};
private static readonly SyntaxToken[] singleHyphenArray = new[]
{
SyntaxFactory.Token(SyntaxKind.HtmlTextLiteral, "-")
SyntaxFactory.Token(SyntaxKind.Text, "-")
};
private static readonly char[] ValidAfterTypeAttributeNameCharacters = { ' ', '\t', '\r', '\n', '\f', '=' };
@ -252,7 +252,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
var afterBang = Lookahead(lookahead + 1);
return afterBang != null &&
afterBang.Kind == SyntaxKind.HtmlTextLiteral &&
afterBang.Kind == SyntaxKind.Text &&
!string.Equals(afterBang.Content, "DOCTYPE", StringComparison.OrdinalIgnoreCase);
}
@ -339,7 +339,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
private void AfterTransition()
{
// "@:" => Explicit Single Line Block
if (CurrentToken.Kind == SyntaxKind.HtmlTextLiteral && CurrentToken.Content.Length > 0 && CurrentToken.Content[0] == ':')
if (CurrentToken.Kind == SyntaxKind.Text && CurrentToken.Content.Length > 0 && CurrentToken.Content[0] == ':')
{
// Split the token
var split = Language.SplitToken(CurrentToken, 1, SyntaxKind.Colon);
@ -569,7 +569,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
NextToken();
if (At(SyntaxKind.HtmlTextLiteral) && IsHyphen(CurrentToken))
if (At(SyntaxKind.Text) && IsHyphen(CurrentToken))
{
// Doing this here to maintain the order of tokens
if (!NextIs(SyntaxKind.CloseAngle))
@ -586,7 +586,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
internal static bool IsHyphen(SyntaxToken token)
{
return token.Kind == SyntaxKind.HtmlTextLiteral && token.Content == "-";
return token.Kind == SyntaxKind.Text && token.Content == "-";
}
protected bool IsHtmlCommentAhead()
@ -684,7 +684,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
private bool CData()
{
if (CurrentToken.Kind == SyntaxKind.HtmlTextLiteral && string.Equals(CurrentToken.Content, "cdata", StringComparison.OrdinalIgnoreCase))
if (CurrentToken.Kind == SyntaxKind.Text && string.Equals(CurrentToken.Content, "cdata", StringComparison.OrdinalIgnoreCase))
{
if (AcceptAndMoveNext())
{
@ -722,12 +722,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
var nextToken = Lookahead(count: 1);
if (nextToken != null && nextToken.Kind == SyntaxKind.HtmlTextLiteral)
if (nextToken != null && nextToken.Kind == SyntaxKind.Text)
{
tagName = "!" + nextToken.Content;
}
}
else if (At(SyntaxKind.HtmlTextLiteral))
else if (At(SyntaxKind.Text))
{
tagName = CurrentToken.Content;
}
@ -769,7 +769,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
Accept(solidus);
var textLocation = CurrentStart;
Assert(SyntaxKind.HtmlTextLiteral);
Assert(SyntaxKind.Text);
AcceptAndMoveNext();
var seenCloseAngle = Optional(SyntaxKind.CloseAngle);
@ -1187,13 +1187,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
SyntaxToken tagName;
if (potentialTagNameToken == null || potentialTagNameToken.Kind != SyntaxKind.HtmlTextLiteral)
if (potentialTagNameToken == null || potentialTagNameToken.Kind != SyntaxKind.Text)
{
tagName = SyntaxFactory.Token(SyntaxKind.Unknown, string.Empty);
}
else if (bangToken != null)
{
tagName = SyntaxFactory.Token(SyntaxKind.HtmlTextLiteral, "!" + potentialTagNameToken.Content);
tagName = SyntaxFactory.Token(SyntaxKind.Text, "!" + potentialTagNameToken.Content);
}
else
{
@ -1212,7 +1212,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
Accept(_bufferedOpenAngle);
var textLocation = CurrentStart;
Assert(SyntaxKind.HtmlTextLiteral);
Assert(SyntaxKind.Text);
AcceptAndMoveNext();
@ -1256,7 +1256,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
Accept(_bufferedOpenAngle);
OptionalBangEscape();
Optional(SyntaxKind.HtmlTextLiteral);
Optional(SyntaxKind.Text);
return RestOfTag(tag, tags, tagBlockWrapper);
}
@ -1317,7 +1317,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
Assert(SyntaxKind.ForwardSlash);
var solidus = CurrentToken;
NextToken();
if (At(SyntaxKind.HtmlTextLiteral) && string.Equals(CurrentToken.Content, tagName, StringComparison.OrdinalIgnoreCase))
if (At(SyntaxKind.Text) && string.Equals(CurrentToken.Content, tagName, StringComparison.OrdinalIgnoreCase))
{
// Accept up to here
Accept(whiteSpace);
@ -1392,7 +1392,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
var solidus = CurrentToken;
NextToken(); // Skip over '/', current should be text
if (At(SyntaxKind.HtmlTextLiteral) &&
if (At(SyntaxKind.Text) &&
string.Equals(CurrentToken.Content, ScriptTagName, StringComparison.OrdinalIgnoreCase))
{
seenEndScript = true;
@ -1645,7 +1645,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
if (ParserState == ParserState.Content)
{
Output(SpanKindInternal.Markup, SyntaxKind.HtmlText);
Output(SpanKindInternal.Markup, SyntaxKind.HtmlTextLiteral);
}
else
{
@ -1663,9 +1663,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
OptionalBangEscape();
// Parsing a start tag
var scriptTag = At(SyntaxKind.HtmlTextLiteral) &&
var scriptTag = At(SyntaxKind.Text) &&
string.Equals(CurrentToken.Content, "script", StringComparison.OrdinalIgnoreCase);
Optional(SyntaxKind.HtmlTextLiteral);
Optional(SyntaxKind.Text);
TagContent(); // Parse the tag, don't care about the content
Optional(SyntaxKind.ForwardSlash);
Optional(SyntaxKind.CloseAngle);
@ -1692,7 +1692,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
// Whitespace here is invalid (according to the spec)
OptionalBangEscape();
Optional(SyntaxKind.HtmlTextLiteral);
Optional(SyntaxKind.Text);
Optional(SyntaxKind.Whitespace);
Optional(SyntaxKind.CloseAngle);
ParserState = ParserState.Content;
@ -1804,9 +1804,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
while (nesting > 0 && !EndOfFile)
{
SkipToAndParseCode(token =>
token.Kind == SyntaxKind.HtmlTextLiteral ||
token.Kind == SyntaxKind.Text ||
token.Kind == SyntaxKind.OpenAngle);
if (At(SyntaxKind.HtmlTextLiteral))
if (At(SyntaxKind.Text))
{
nesting += ProcessTextToken(nestingSequences, nesting);
if (CurrentToken != null)
@ -1889,10 +1889,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
PutCurrentBack();
// Carve up the token
var pair = Language.SplitToken(token, position, SyntaxKind.HtmlTextLiteral);
var pair = Language.SplitToken(token, position, SyntaxKind.Text);
var preSequence = pair.Item1;
Debug.Assert(pair.Item2 != null);
pair = Language.SplitToken(pair.Item2, sequence.Length, SyntaxKind.HtmlTextLiteral);
pair = Language.SplitToken(pair.Item2, sequence.Length, SyntaxKind.Text);
var sequenceToken = pair.Item1;
var postSequence = pair.Item2;
var postSequenceBookmark = bookmark.AbsoluteIndex + preSequence.Content.Length + pair.Item1.Content.Length;

2
src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlTokenizer.cs
View File

@ -191,7 +191,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
}
// Output the Text token and return to the Data state to tokenize the next character (if there is one)
return Transition(HtmlTokenizerState.Data, EndToken(SyntaxKind.HtmlTextLiteral));
return Transition(HtmlTokenizerState.Data, EndToken(SyntaxKind.Text));
}
private SyntaxToken Token()

4
src/Microsoft.AspNetCore.Razor.Language/Legacy/SpanBuilder.cs
View File

@ -112,7 +112,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
private Syntax.GreenNode GetSyntaxNode(SyntaxKind syntaxKind)
{
if (syntaxKind == SyntaxKind.HtmlText)
if (syntaxKind == SyntaxKind.HtmlTextLiteral)
{
var textTokens = new SyntaxListBuilder<SyntaxToken>(SyntaxListBuilder.Create());
foreach (var token in Tokens)
@ -126,7 +126,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
textTokens.Add(token);
}
var textResult = textTokens.ToList();
return SyntaxFactory.HtmlText(new SyntaxList<SyntaxToken>(textResult.Node));
return SyntaxFactory.HtmlTextLiteral(new SyntaxList<SyntaxToken>(textResult.Node));
}
return null;

2
src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperParseTreeRewriter.cs
View File

@ -800,7 +800,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
var token = childSpan.Tokens[i];
if (token != null &&
(token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.HtmlTextLiteral))
(token.Kind == SyntaxKind.Whitespace || token.Kind == SyntaxKind.Text))
{
textToken = token;
break;

30
src/Microsoft.AspNetCore.Razor.Language/Syntax/Generated/Syntax.xml.Internal.Generated.cs
View File

@ -141,11 +141,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
}
}
internal sealed partial class HtmlTextSyntax : HtmlSyntaxNode
internal sealed partial class HtmlTextLiteralSyntax : HtmlSyntaxNode
{
private readonly GreenNode _textTokens;
internal HtmlTextSyntax(SyntaxKind kind, GreenNode textTokens, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
internal HtmlTextLiteralSyntax(SyntaxKind kind, GreenNode textTokens, RazorDiagnostic[] diagnostics, SyntaxAnnotation[] annotations)
: base(kind, diagnostics, annotations)
{
SlotCount = 1;
@ -157,7 +157,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
}
internal HtmlTextSyntax(SyntaxKind kind, GreenNode textTokens)
internal HtmlTextLiteralSyntax(SyntaxKind kind, GreenNode textTokens)
: base(kind)
{
SlotCount = 1;
@ -181,24 +181,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
internal override SyntaxNode CreateRed(SyntaxNode parent, int position)
{
return new Syntax.HtmlTextSyntax(this, parent, position);
return new Syntax.HtmlTextLiteralSyntax(this, parent, position);
}
public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
{
return visitor.VisitHtmlText(this);
return visitor.VisitHtmlTextLiteral(this);
}
public override void Accept(SyntaxVisitor visitor)
{
visitor.VisitHtmlText(this);
visitor.VisitHtmlTextLiteral(this);
}
public HtmlTextSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> textTokens)
public HtmlTextLiteralSyntax Update(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> textTokens)
{
if (textTokens != TextTokens)
{
var newNode = SyntaxFactory.HtmlText(textTokens);
var newNode = SyntaxFactory.HtmlTextLiteral(textTokens);
var diags = GetDiagnostics();
if (diags != null && diags.Length > 0)
newNode = newNode.WithDiagnosticsGreen(diags);
@ -213,12 +213,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
internal override GreenNode SetDiagnostics(RazorDiagnostic[] diagnostics)
{
return new HtmlTextSyntax(Kind, _textTokens, diagnostics, GetAnnotations());
return new HtmlTextLiteralSyntax(Kind, _textTokens, diagnostics, GetAnnotations());
}
internal override GreenNode SetAnnotations(SyntaxAnnotation[] annotations)
{
return new HtmlTextSyntax(Kind, _textTokens, GetDiagnostics(), annotations);
return new HtmlTextLiteralSyntax(Kind, _textTokens, GetDiagnostics(), annotations);
}
}
@ -1093,7 +1093,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
return DefaultVisit(node);
}
public virtual TResult VisitHtmlText(HtmlTextSyntax node)
public virtual TResult VisitHtmlTextLiteral(HtmlTextLiteralSyntax node)
{
return DefaultVisit(node);
}
@ -1157,7 +1157,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
DefaultVisit(node);
}
public virtual void VisitHtmlText(HtmlTextSyntax node)
public virtual void VisitHtmlTextLiteral(HtmlTextLiteralSyntax node)
{
DefaultVisit(node);
}
@ -1268,9 +1268,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
return new RazorCommentBlockSyntax(SyntaxKind.RazorComment, startCommentTransition, startCommentStar, comment, endCommentStar, endCommentTransition);
}
public static HtmlTextSyntax HtmlText(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> textTokens)
public static HtmlTextLiteralSyntax HtmlTextLiteral(Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax.SyntaxList<SyntaxToken> textTokens)
{
var result = new HtmlTextSyntax(SyntaxKind.HtmlText, textTokens.Node);
var result = new HtmlTextLiteralSyntax(SyntaxKind.HtmlTextLiteral, textTokens.Node);
return result;
}
@ -1389,7 +1389,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax.InternalSyntax
{
return new Type[] {
typeof(RazorCommentBlockSyntax),
typeof(HtmlTextSyntax),
typeof(HtmlTextLiteralSyntax),
typeof(CSharpTransitionSyntax),
typeof(CSharpMetaCodeSyntax),
typeof(CSharpCodeLiteralSyntax),

20
src/Microsoft.AspNetCore.Razor.Language/Syntax/Generated/Syntax.xml.Main.Generated.cs
View File

@ -17,8 +17,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
return DefaultVisit(node);
}
/// <summary>Called when the visitor visits a HtmlTextSyntax node.</summary>
public virtual TResult VisitHtmlText(HtmlTextSyntax node)
/// <summary>Called when the visitor visits a HtmlTextLiteralSyntax node.</summary>
public virtual TResult VisitHtmlTextLiteral(HtmlTextLiteralSyntax node)
{
return DefaultVisit(node);
}
@ -92,8 +92,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
DefaultVisit(node);
}
/// <summary>Called when the visitor visits a HtmlTextSyntax node.</summary>
public virtual void VisitHtmlText(HtmlTextSyntax node)
/// <summary>Called when the visitor visits a HtmlTextLiteralSyntax node.</summary>
public virtual void VisitHtmlTextLiteral(HtmlTextLiteralSyntax node)
{
DefaultVisit(node);
}
@ -209,16 +209,16 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
return SyntaxFactory.RazorCommentBlock(SyntaxFactory.Token(SyntaxKind.RazorCommentTransition), SyntaxFactory.Token(SyntaxKind.RazorCommentStar), default(SyntaxToken), SyntaxFactory.Token(SyntaxKind.RazorCommentStar), SyntaxFactory.Token(SyntaxKind.RazorCommentTransition));
}
/// <summary>Creates a new HtmlTextSyntax instance.</summary>
public static HtmlTextSyntax HtmlText(SyntaxList<SyntaxToken> textTokens)
/// <summary>Creates a new HtmlTextLiteralSyntax instance.</summary>
public static HtmlTextLiteralSyntax HtmlTextLiteral(SyntaxList<SyntaxToken> textTokens)
{
return (HtmlTextSyntax)InternalSyntax.SyntaxFactory.HtmlText(textTokens.Node.ToGreenList<InternalSyntax.SyntaxToken>()).CreateRed();
return (HtmlTextLiteralSyntax)InternalSyntax.SyntaxFactory.HtmlTextLiteral(textTokens.Node.ToGreenList<InternalSyntax.SyntaxToken>()).CreateRed();
}
/// <summary>Creates a new HtmlTextSyntax instance.</summary>
public static HtmlTextSyntax HtmlText()
/// <summary>Creates a new HtmlTextLiteralSyntax instance.</summary>
public static HtmlTextLiteralSyntax HtmlTextLiteral()
{
return SyntaxFactory.HtmlText(default(SyntaxList<SyntaxToken>));
return SyntaxFactory.HtmlTextLiteral(default(SyntaxList<SyntaxToken>));
}
/// <summary>Creates a new CSharpTransitionSyntax instance.</summary>

16
src/Microsoft.AspNetCore.Razor.Language/Syntax/Generated/Syntax.xml.Syntax.Generated.cs
View File

@ -153,11 +153,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
}
}
internal sealed partial class HtmlTextSyntax : HtmlSyntaxNode
internal sealed partial class HtmlTextLiteralSyntax : HtmlSyntaxNode
{
private SyntaxNode _textTokens;
internal HtmlTextSyntax(GreenNode green, SyntaxNode parent, int position)
internal HtmlTextLiteralSyntax(GreenNode green, SyntaxNode parent, int position)
: base(green, parent, position)
{
}
@ -189,19 +189,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
public override TResult Accept<TResult>(SyntaxVisitor<TResult> visitor)
{
return visitor.VisitHtmlText(this);
return visitor.VisitHtmlTextLiteral(this);
}
public override void Accept(SyntaxVisitor visitor)
{
visitor.VisitHtmlText(this);
visitor.VisitHtmlTextLiteral(this);
}
public HtmlTextSyntax Update(SyntaxList<SyntaxToken> textTokens)
public HtmlTextLiteralSyntax Update(SyntaxList<SyntaxToken> textTokens)
{
if (textTokens != TextTokens)
{
var newNode = SyntaxFactory.HtmlText(textTokens);
var newNode = SyntaxFactory.HtmlTextLiteral(textTokens);
var annotations = GetAnnotations();
if (annotations != null && annotations.Length > 0)
return newNode.WithAnnotations(annotations);
@ -211,12 +211,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Syntax
return this;
}
public HtmlTextSyntax WithTextTokens(SyntaxList<SyntaxToken> textTokens)
public HtmlTextLiteralSyntax WithTextTokens(SyntaxList<SyntaxToken> textTokens)
{
return Update(textTokens);
}
public HtmlTextSyntax AddTextTokens(params SyntaxToken[] items)
public HtmlTextLiteralSyntax AddTextTokens(params SyntaxToken[] items)
{
return WithTextTokens(this.TextTokens.AddRange(items));
}

4
src/Microsoft.AspNetCore.Razor.Language/Syntax/Syntax.xml
View File

@ -26,8 +26,8 @@
<!-- HTML -->
<AbstractNode Name="HtmlSyntaxNode" Base="RazorSyntaxNode" />
<Node Name="HtmlTextSyntax" Base="HtmlSyntaxNode">
<Kind Name="HtmlText" />
<Node Name="HtmlTextLiteralSyntax" Base="HtmlSyntaxNode">
<Kind Name="HtmlTextLiteral" />
<Field Name="TextTokens" Type="SyntaxList&lt;SyntaxToken&gt;" />
</Node>

4
src/Microsoft.AspNetCore.Razor.Language/Syntax/SyntaxKind.cs
View File

@ -7,7 +7,7 @@ namespace Microsoft.AspNetCore.Razor.Language
{
#region Nodes
// HTML
HtmlText,
HtmlTextLiteral,
HtmlDocument,
HtmlDeclaration,
@ -42,7 +42,7 @@ namespace Microsoft.AspNetCore.Razor.Language
Transition,
// HTML
HtmlTextLiteral,
Text,
OpenAngle,
Bang,
ForwardSlash,

4
test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/BlockTest.cs
View File

@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
{
// Arrange
var spanBuilder = new SpanBuilder(SourceLocation.Zero);
spanBuilder.Accept(SyntaxFactory.Token(SyntaxKind.HtmlTextLiteral, "hello"));
spanBuilder.Accept(SyntaxFactory.Token(SyntaxKind.Text, "hello"));
var span = spanBuilder.Build();
var blockBuilder = new BlockBuilder()
{
@ -30,7 +30,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
var parentBlock = blockBuilder.Build();
var originalBlockLength = parentBlock.Length;
spanBuilder = new SpanBuilder(SourceLocation.Zero);
spanBuilder.Accept(SyntaxFactory.Token(SyntaxKind.HtmlTextLiteral, "hi"));
spanBuilder.Accept(SyntaxFactory.Token(SyntaxKind.Text, "hi"));
span.ReplaceWith(spanBuilder);
// Wire up parents now so we can re-trigger ChildChanged to cause cache refresh.

14
test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlMarkupParserTests.cs
View File

@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy
get
{
yield return new[] { SyntaxFactory.Token(SyntaxKind.DoubleHyphen, "--") };
yield return new[] { SyntaxFactory.Token(SyntaxKind.HtmlTextLiteral, "asdf") };
yield return new[] { SyntaxFactory.Token(SyntaxKind.Text, "asdf") };
yield return new[] { SyntaxFactory.Token(SyntaxKind.CloseAngle, ">") };
yield return new[] { SyntaxFactory.Token(SyntaxKind.OpenAngle, "<") };
yield return new[] { SyntaxFactory.Token(SyntaxKind.Bang, "!") };
@ -38,7 +38,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy
public void IsHyphen_ReturnsTrueForADashToken()
{
// Arrange
var dashToken = SyntaxFactory.Token(SyntaxKind.HtmlTextLiteral, "-");
var dashToken = SyntaxFactory.Token(SyntaxKind.Text, "-");
// Act & Assert
Assert.True(HtmlMarkupParser.IsHyphen(dashToken));
@ -158,8 +158,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy
public void IsCommentContentEndingInvalid_ReturnsFalseForAllowedContent()
{
// Arrange
var expectedToken1 = SyntaxFactory.Token(SyntaxKind.HtmlTextLiteral, "a");
var sequence = Enumerable.Range((int)'a', 26).Select(item => SyntaxFactory.Token(SyntaxKind.HtmlTextLiteral, ((char)item).ToString()));
var expectedToken1 = SyntaxFactory.Token(SyntaxKind.Text, "a");
var sequence = Enumerable.Range((int)'a', 26).Select(item => SyntaxFactory.Token(SyntaxKind.Text, ((char)item).ToString()));
// Act & Assert
Assert.False(HtmlMarkupParser.IsCommentContentEndingInvalid(sequence));
@ -169,12 +169,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy
public void IsCommentContentEndingInvalid_ReturnsTrueForDisallowedContent()
{
// Arrange
var expectedToken1 = SyntaxFactory.Token(SyntaxKind.HtmlTextLiteral, "a");
var expectedToken1 = SyntaxFactory.Token(SyntaxKind.Text, "a");
var sequence = new[]
{
SyntaxFactory.Token(SyntaxKind.OpenAngle, "<"),
SyntaxFactory.Token(SyntaxKind.Bang, "!"),
SyntaxFactory.Token(SyntaxKind.HtmlTextLiteral, "-")
SyntaxFactory.Token(SyntaxKind.Text, "-")
};
// Act & Assert
@ -185,7 +185,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Test.Legacy
public void IsCommentContentEndingInvalid_ReturnsFalseForEmptyContent()
{
// Arrange
var expectedToken1 = SyntaxFactory.Token(SyntaxKind.HtmlTextLiteral, "a");
var expectedToken1 = SyntaxFactory.Token(SyntaxKind.Text, "a");
var sequence = Array.Empty<SyntaxToken>();
// Act & Assert

8
test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/HtmlTokenizerTest.cs
View File

@ -18,7 +18,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
public void Text_Is_Recognized()
{
TestTokenizer("foo-9309&smlkmb;::-3029022,.sdkq92384",
SyntaxFactory.Token(SyntaxKind.HtmlTextLiteral, "foo-9309&smlkmb;::-3029022,.sdkq92384"));
SyntaxFactory.Token(SyntaxKind.Text, "foo-9309&smlkmb;::-3029022,.sdkq92384"));
}
[Fact]
@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
[Fact]
public void Transition_Is_Not_Recognized_Mid_Text_If_Surrounded_By_Alphanumeric_Characters()
{
TestSingleToken("foo@bar", SyntaxKind.HtmlTextLiteral);
TestSingleToken("foo@bar", SyntaxKind.Text);
}
[Fact]
@ -118,13 +118,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
[Fact]
public void SingleHyphen_Is_Not_Recognized()
{
TestSingleToken("-", SyntaxKind.HtmlTextLiteral);
TestSingleToken("-", SyntaxKind.Text);
}
[Fact]
public void SingleHyphen_Mid_Text_Is_Not_Recognized_As_Separate_Token()
{
TestSingleToken("foo-bar", SyntaxKind.HtmlTextLiteral);
TestSingleToken("foo-bar", SyntaxKind.Text);
}
[Fact]

8
test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/SpanTest.cs
View File

@ -13,10 +13,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
{
// Arrange
var builder = new SpanBuilder(SourceLocation.Zero);
builder.Accept(SyntaxFactory.Token(SyntaxKind.HtmlTextLiteral, "hello"));
builder.Accept(SyntaxFactory.Token(SyntaxKind.Text, "hello"));
var span = builder.Build();
var newBuilder = new SpanBuilder(SourceLocation.Zero);
newBuilder.Accept(SyntaxFactory.Token(SyntaxKind.HtmlTextLiteral, "hi"));
newBuilder.Accept(SyntaxFactory.Token(SyntaxKind.Text, "hi"));
var originalLength = span.Length;
// Act
@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
{
// Arrange
var spanBuilder = new SpanBuilder(SourceLocation.Zero);
spanBuilder.Accept(SyntaxFactory.Token(SyntaxKind.HtmlTextLiteral, "hello"));
spanBuilder.Accept(SyntaxFactory.Token(SyntaxKind.Text, "hello"));
var span = spanBuilder.Build();
var blockBuilder = new BlockBuilder()
{
@ -45,7 +45,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
span.Parent = block;
var originalBlockLength = block.Length;
var newSpanBuilder = new SpanBuilder(SourceLocation.Zero);
newSpanBuilder.Accept(SyntaxFactory.Token(SyntaxKind.HtmlTextLiteral, "hi"));
newSpanBuilder.Accept(SyntaxFactory.Token(SyntaxKind.Text, "hi"));
// Act
span.ReplaceWith(newSpanBuilder);

10
test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TokenizerLookaheadTest.cs
View File

@ -78,9 +78,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
// For the very first element, there will be no previous items, so null is expected
var orderIndex = 0;
Assert.Null(previousTokens.ElementAt(orderIndex++));
AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.HtmlTextLiteral, "asdf"), previousTokens.ElementAt(orderIndex++));
AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.Text, "asdf"), previousTokens.ElementAt(orderIndex++));
AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.DoubleHyphen, "--"), previousTokens.ElementAt(orderIndex++));
AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.HtmlTextLiteral, "fvd"), previousTokens.ElementAt(orderIndex++));
AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.Text, "fvd"), previousTokens.ElementAt(orderIndex++));
}
[Fact]
@ -100,9 +100,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
// Assert
Assert.False(tokenFound);
Assert.Equal(3, tokens.Count);
AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.HtmlTextLiteral, "fvd"), tokens.Pop());
AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.Text, "fvd"), tokens.Pop());
AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.DoubleHyphen, "--"), tokens.Pop());
AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.HtmlTextLiteral, "asdf"), tokens.Pop());
AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.Text, "asdf"), tokens.Pop());
}
[Fact]
@ -123,7 +123,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
Assert.True(tokenFound);
Assert.Equal(2, tokens.Count);
AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.DoubleHyphen, "--"), tokens.Pop());
AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.HtmlTextLiteral, "asdf"), tokens.Pop());
AssertTokenEqual(SyntaxFactory.Token(SyntaxKind.Text, "asdf"), tokens.Pop());
}
private static TestTokenizerBackedParser CreateContentTokenizer(string content)

8
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/SectionDirectiveAutoCompleteAtStartOfFile.stree.txt
View File

@ -17,13 +17,13 @@ Directive block - Gen<Directive:{section;RazorBlock;Unrestricted} [RZ1006(16:0,1
Tag block - Gen<None> - 3 - (19:1,0)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (19:1,0) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
SyntaxKind.HtmlText - [Foo] - [22..25) - FullWidth: 3 - Slots: 1
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.HtmlTextLiteral - [Foo] - [22..25) - FullWidth: 3 - Slots: 1
SyntaxKind.Text;[Foo];
Tag block - Gen<None> - 4 - (25:1,6)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (25:1,6) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];

4
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpAutoCompleteTest/VerbatimBlockAutoCompleteAtStartOfFile.stree.txt
View File

@ -9,13 +9,13 @@ Statement block - Gen<None> - 11 - (0:0,0)
Tag block - Gen<None> - 3 - (4:1,0)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (4:1,0) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Tag block - Gen<None> - 4 - (7:1,3)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (7:1,3) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (11:1,7) - Tokens:1
SyntaxKind.Unknown;[];

6
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/CorrectlyParsesMarkupInDoWhileBlock.stree.txt
View File

@ -20,15 +20,15 @@ Statement block - Gen<None> - 58 - (0:0,0)
Tag block - Gen<None> - 3 - (21:0,21)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
Tag block - Gen<None> - 4 - (27:0,27)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:1
SyntaxKind.Whitespace;[ ];

6
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/NestedCodeBlockWithMarkupSetsDotAsMarkup.stree.txt
View File

@ -24,7 +24,7 @@ Statement block - Gen<None> - 51 - (0:0,0)
Tag block - Gen<None> - 5 - (25:0,25)
Markup span - Gen<Markup> - [<div>] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[div];
SyntaxKind.Text;[div];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:1
SyntaxKind.Unknown;[];
@ -34,12 +34,12 @@ Statement block - Gen<None> - 51 - (0:0,0)
Code span - Gen<Expr> - [something] - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 - (31:0,31) - Tokens:1
SyntaxKind.Identifier;[something];
Markup span - Gen<Markup> - [.] - SpanEditHandler;Accepts:Any - (40:0,40) - Tokens:1
SyntaxKind.HtmlTextLiteral;[.];
SyntaxKind.Text;[.];
Tag block - Gen<None> - 6 - (41:0,41)
Markup span - Gen<Markup> - [</div>] - SpanEditHandler;Accepts:None - (41:0,41) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[div];
SyntaxKind.Text;[div];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (47:0,47) - Tokens:1
SyntaxKind.Whitespace;[ ];

22
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/ParsersCanNestRecursively.stree.txt
View File

@ -21,7 +21,7 @@ Statement block - Gen<None> - 351 - (0:0,0)
Tag block - Gen<None> - 5 - (47:1,12)
Markup span - Gen<Markup> - [<div>] - SpanEditHandler;Accepts:None - (47:1,12) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[div];
SyntaxKind.Text;[div];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [LF ] - SpanEditHandler;Accepts:Any - (52:1,17) - Tokens:2
SyntaxKind.NewLine;[LF];
@ -29,7 +29,7 @@ Statement block - Gen<None> - 351 - (0:0,0)
Tag block - Gen<None> - 4 - (70:2,16)
Markup span - Gen<Markup> - [<h1>] - SpanEditHandler;Accepts:None - (70:2,16) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[h1];
SyntaxKind.Text;[h1];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (74:2,20) - Tokens:1
SyntaxKind.Unknown;[];
@ -44,7 +44,7 @@ Statement block - Gen<None> - 351 - (0:0,0)
Markup span - Gen<Markup> - [</h1>] - SpanEditHandler;Accepts:None - (81:2,27) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[h1];
SyntaxKind.Text;[h1];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [LF ] - SpanEditHandler;Accepts:Any - (86:2,32) - Tokens:2
SyntaxKind.NewLine;[LF];
@ -52,7 +52,7 @@ Statement block - Gen<None> - 351 - (0:0,0)
Tag block - Gen<None> - 4 - (104:3,16)
Markup span - Gen<Markup> - [<ul>] - SpanEditHandler;Accepts:None - (104:3,16) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[ul];
SyntaxKind.Text;[ul];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (108:3,20) - Tokens:1
SyntaxKind.NewLine;[LF];
@ -83,16 +83,16 @@ Statement block - Gen<None> - 351 - (0:0,0)
Tag block - Gen<None> - 4 - (187:5,24)
Markup span - Gen<Markup> - [<li>] - SpanEditHandler;Accepts:None - (187:5,24) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[li];
SyntaxKind.Text;[li];
SyntaxKind.CloseAngle;[>];
Tag block - Gen<None> - 67 - (191:5,28)
Markup span - Gen<Markup> - [<a] - SpanEditHandler;Accepts:Any - (191:5,28) - Tokens:2
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[a];
SyntaxKind.Text;[a];
Markup block - Gen<Attr:href, href="@(193:5,30),"@(256:5,93)> - 64 - (193:5,30)
Markup span - Gen<None> - [ href="] - SpanEditHandler;Accepts:Any - (193:5,30) - Tokens:4
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[href];
SyntaxKind.Text;[href];
SyntaxKind.Equals;[=];
SyntaxKind.DoubleQuote;["];
Markup block - Gen<DynAttr:@(200:5,37)> - 56 - (200:5,37)
@ -141,13 +141,13 @@ Statement block - Gen<None> - 351 - (0:0,0)
Markup span - Gen<Markup> - [</a>] - SpanEditHandler;Accepts:None - (265:5,102) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[a];
SyntaxKind.Text;[a];
SyntaxKind.CloseAngle;[>];
Tag block - Gen<None> - 5 - (269:5,106)
Markup span - Gen<Markup> - [</li>] - SpanEditHandler;Accepts:None - (269:5,106) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[li];
SyntaxKind.Text;[li];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (274:5,111) - Tokens:1
SyntaxKind.NewLine;[LF];
@ -161,7 +161,7 @@ Statement block - Gen<None> - 351 - (0:0,0)
Markup span - Gen<Markup> - [</ul>] - SpanEditHandler;Accepts:None - (315:7,16) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[ul];
SyntaxKind.Text;[ul];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [LF ] - SpanEditHandler;Accepts:Any - (320:7,21) - Tokens:2
SyntaxKind.NewLine;[LF];
@ -170,7 +170,7 @@ Statement block - Gen<None> - 351 - (0:0,0)
Markup span - Gen<Markup> - [</div>] - SpanEditHandler;Accepts:None - (334:8,12) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[div];
SyntaxKind.Text;[div];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (340:8,18) - Tokens:1
SyntaxKind.NewLine;[LF];

6
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinAdditionalCatchClauses.stree.txt
View File

@ -84,15 +84,15 @@ Statement block - Gen<None> - 141 - (0:0,0)
Tag block - Gen<None> - 3 - (129:0,129)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (129:0,129) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (132:0,132) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
Tag block - Gen<None> - 4 - (135:0,135)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (135:0,135) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (139:0,139) - Tokens:1
SyntaxKind.Whitespace;[ ];

6
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinCatchClause.stree.txt
View File

@ -34,15 +34,15 @@ Statement block - Gen<None> - 59 - (0:0,0)
Tag block - Gen<None> - 3 - (47:0,47)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (47:0,47) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (50:0,50) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
Tag block - Gen<None> - 4 - (53:0,53)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (53:0,53) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (57:0,57) - Tokens:1
SyntaxKind.Whitespace;[ ];

6
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinFinallyClause.stree.txt
View File

@ -27,15 +27,15 @@ Statement block - Gen<None> - 48 - (0:0,0)
Tag block - Gen<None> - 3 - (36:0,36)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (39:0,39) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
Tag block - Gen<None> - 4 - (42:0,42)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (42:0,42) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (46:0,46) - Tokens:1
SyntaxKind.Whitespace;[ ];

6
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/SupportsMarkupWithinTryClause.stree.txt
View File

@ -9,15 +9,15 @@ Statement block - Gen<None> - 18 - (0:0,0)
Tag block - Gen<None> - 3 - (6:0,6)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
Tag block - Gen<None> - 4 - (12:0,12)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:1
SyntaxKind.Whitespace;[ ];

6
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtBeginningOfAttributeValue_DoesNotThrow.stree.txt
View File

@ -5,11 +5,11 @@ Statement block - Gen<None> - 22 - (0:0,0)
Tag block - Gen<None> - 20 - (1:0,1)
Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[span];
SyntaxKind.Text;[span];
Markup block - Gen<Attr:foo, foo='@(6:0,6),'@(17:0,17)> - 12 - (6:0,6)
Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[foo];
SyntaxKind.Text;[foo];
SyntaxKind.Equals;[=];
SyntaxKind.SingleQuote;['];
Markup block - Gen<None> - 2 - (12:0,12)
@ -18,7 +18,7 @@ Statement block - Gen<None> - 22 - (0:0,0)
Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1
SyntaxKind.Transition;[@];
Markup span - Gen<LitAttr:@(14:0,14)> - [def] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
SyntaxKind.HtmlTextLiteral;[def];
SyntaxKind.Text;[def];
Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:1
SyntaxKind.SingleQuote;['];
Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:3

6
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionAtEndOfAttributeValue_DoesNotThrow.stree.txt
View File

@ -5,15 +5,15 @@ Statement block - Gen<None> - 22 - (0:0,0)
Tag block - Gen<None> - 20 - (1:0,1)
Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[span];
SyntaxKind.Text;[span];
Markup block - Gen<Attr:foo, foo='@(6:0,6),'@(17:0,17)> - 12 - (6:0,6)
Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[foo];
SyntaxKind.Text;[foo];
SyntaxKind.Equals;[=];
SyntaxKind.SingleQuote;['];
Markup span - Gen<LitAttr:@(12:0,12)> - [abc] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
SyntaxKind.HtmlTextLiteral;[abc];
SyntaxKind.Text;[abc];
Markup block - Gen<None> - 2 - (15:0,15)
Markup span - Gen<LitAttr:@(15:0,15)> - [@] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:1
SyntaxKind.Transition;[@];

8
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionBetweenAttributeValue_DoesNotThrow.stree.txt
View File

@ -5,15 +5,15 @@ Statement block - Gen<None> - 27 - (0:0,0)
Tag block - Gen<None> - 25 - (1:0,1)
Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[span];
SyntaxKind.Text;[span];
Markup block - Gen<Attr:foo, foo='@(6:0,6),'@(22:0,22)> - 17 - (6:0,6)
Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[foo];
SyntaxKind.Text;[foo];
SyntaxKind.Equals;[=];
SyntaxKind.SingleQuote;['];
Markup span - Gen<LitAttr:@(12:0,12)> - [abc] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
SyntaxKind.HtmlTextLiteral;[abc];
SyntaxKind.Text;[abc];
Markup block - Gen<None> - 3 - (15:0,15)
Markup span - Gen<LitAttr: @(15:0,15)> - [ @] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:2
SyntaxKind.Whitespace;[ ];
@ -22,7 +22,7 @@ Statement block - Gen<None> - 27 - (0:0,0)
SyntaxKind.Transition;[@];
Markup span - Gen<LitAttr: @(18:0,18)> - [ def] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:2
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[def];
SyntaxKind.Text;[def];
Markup span - Gen<None> - ['] - SpanEditHandler;Accepts:Any - (22:0,22) - Tokens:1
SyntaxKind.SingleQuote;['];
Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:3

4
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInAttributeValue_DoesNotThrow.stree.txt
View File

@ -5,11 +5,11 @@ Statement block - Gen<None> - 19 - (0:0,0)
Tag block - Gen<None> - 17 - (1:0,1)
Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[span];
SyntaxKind.Text;[span];
Markup block - Gen<Attr:foo, foo='@(6:0,6),'@(14:0,14)> - 9 - (6:0,6)
Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[foo];
SyntaxKind.Text;[foo];
SyntaxKind.Equals;[=];
SyntaxKind.SingleQuote;['];
Markup block - Gen<None> - 2 - (12:0,12)

10
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInEmail_DoesNotThrow.stree.txt
View File

@ -5,25 +5,25 @@ Statement block - Gen<None> - 44 - (0:0,0)
Tag block - Gen<None> - 42 - (1:0,1)
Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[span];
SyntaxKind.Text;[span];
Markup block - Gen<Attr:foo, foo='@(6:0,6),'@(39:0,39)> - 34 - (6:0,6)
Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[foo];
SyntaxKind.Text;[foo];
SyntaxKind.Equals;[=];
SyntaxKind.SingleQuote;['];
Markup span - Gen<LitAttr:@(12:0,12)> - [abc@def.com] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
SyntaxKind.HtmlTextLiteral;[abc@def.com];
SyntaxKind.Text;[abc@def.com];
Markup span - Gen<LitAttr: @(23:0,23)> - [ abc] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:2
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[abc];
SyntaxKind.Text;[abc];
Markup block - Gen<None> - 2 - (27:0,27)
Markup span - Gen<LitAttr:@(27:0,27)> - [@] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:1
SyntaxKind.Transition;[@];
Markup span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (28:0,28) - Tokens:1
SyntaxKind.Transition;[@];
Markup span - Gen<LitAttr:@(29:0,29)> - [def.com] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:1
SyntaxKind.HtmlTextLiteral;[def.com];
SyntaxKind.Text;[def.com];
Markup block - Gen<None> - 3 - (36:0,36)
Markup span - Gen<LitAttr: @(36:0,36)> - [ @] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:2
SyntaxKind.Whitespace;[ ];

46
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionInRegex_DoesNotThrow.stree.txt
View File

@ -5,28 +5,28 @@ Statement block - Gen<None> - 117 - (0:0,0)
Tag block - Gen<None> - 115 - (1:0,1)
Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[span];
SyntaxKind.Text;[span];
Markup block - Gen<Attr:foo, foo="@(6:0,6),"@(112:0,112)> - 107 - (6:0,6)
Markup span - Gen<None> - [ foo="] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[foo];
SyntaxKind.Text;[foo];
SyntaxKind.Equals;[=];
SyntaxKind.DoubleQuote;["];
Markup span - Gen<LitAttr:@(12:0,12)> - [/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:14
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[^];
SyntaxKind.Text;[^];
SyntaxKind.LeftBracket;[[];
SyntaxKind.HtmlTextLiteral;[a-z0-9];
SyntaxKind.Text;[a-z0-9];
SyntaxKind.Bang;[!];
SyntaxKind.HtmlTextLiteral;[#$%&];
SyntaxKind.Text;[#$%&];
SyntaxKind.SingleQuote;['];
SyntaxKind.HtmlTextLiteral;[*+\];
SyntaxKind.Text;[*+\];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.Equals;[=];
SyntaxKind.QuestionMark;[?];
SyntaxKind.HtmlTextLiteral;[^_`{|}~.-];
SyntaxKind.Text;[^_`{|}~.-];
SyntaxKind.RightBracket;[]];
SyntaxKind.HtmlTextLiteral;[+];
SyntaxKind.Text;[+];
Markup block - Gen<None> - 2 - (44:0,44)
Markup span - Gen<LitAttr:@(44:0,44)> - [@] - SpanEditHandler;Accepts:None - (44:0,44) - Tokens:1
SyntaxKind.Transition;[@];
@ -34,35 +34,35 @@ Statement block - Gen<None> - 117 - (0:0,0)
SyntaxKind.Transition;[@];
Markup span - Gen<LitAttr:@(46:0,46)> - [[a-z0-9]([a-z0-9-]*[a-z0-9])?\.([a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i] - SpanEditHandler;Accepts:Any - (46:0,46) - Tokens:30
SyntaxKind.LeftBracket;[[];
SyntaxKind.HtmlTextLiteral;[a-z0-9];
SyntaxKind.Text;[a-z0-9];
SyntaxKind.RightBracket;[]];
SyntaxKind.HtmlTextLiteral;[(];
SyntaxKind.Text;[(];
SyntaxKind.LeftBracket;[[];
SyntaxKind.HtmlTextLiteral;[a-z0-9-];
SyntaxKind.Text;[a-z0-9-];
SyntaxKind.RightBracket;[]];
SyntaxKind.HtmlTextLiteral;[*];
SyntaxKind.Text;[*];
SyntaxKind.LeftBracket;[[];
SyntaxKind.HtmlTextLiteral;[a-z0-9];
SyntaxKind.Text;[a-z0-9];
SyntaxKind.RightBracket;[]];
SyntaxKind.HtmlTextLiteral;[)];
SyntaxKind.Text;[)];
SyntaxKind.QuestionMark;[?];
SyntaxKind.HtmlTextLiteral;[\.(];
SyntaxKind.Text;[\.(];
SyntaxKind.LeftBracket;[[];
SyntaxKind.HtmlTextLiteral;[a-z0-9];
SyntaxKind.Text;[a-z0-9];
SyntaxKind.RightBracket;[]];
SyntaxKind.HtmlTextLiteral;[(];
SyntaxKind.Text;[(];
SyntaxKind.LeftBracket;[[];
SyntaxKind.HtmlTextLiteral;[a-z0-9-];
SyntaxKind.Text;[a-z0-9-];
SyntaxKind.RightBracket;[]];
SyntaxKind.HtmlTextLiteral;[*];
SyntaxKind.Text;[*];
SyntaxKind.LeftBracket;[[];
SyntaxKind.HtmlTextLiteral;[a-z0-9];
SyntaxKind.Text;[a-z0-9];
SyntaxKind.RightBracket;[]];
SyntaxKind.HtmlTextLiteral;[)];
SyntaxKind.Text;[)];
SyntaxKind.QuestionMark;[?];
SyntaxKind.HtmlTextLiteral;[)*$];
SyntaxKind.Text;[)*$];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[i];
SyntaxKind.Text;[i];
Markup span - Gen<None> - ["] - SpanEditHandler;Accepts:Any - (112:0,112) - Tokens:1
SyntaxKind.DoubleQuote;["];
Markup span - Gen<Markup> - [ />] - SpanEditHandler;Accepts:None - (113:0,113) - Tokens:3

12
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransitionWithExpressionBlock_DoesNotThrow.stree.txt
View File

@ -5,11 +5,11 @@ Statement block - Gen<None> - 120 - (0:0,0)
Tag block - Gen<None> - 118 - (1:0,1)
Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[span];
SyntaxKind.Text;[span];
Markup block - Gen<Attr:foo, foo='@(6:0,6),'@(20:0,20)> - 15 - (6:0,6)
Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[foo];
SyntaxKind.Text;[foo];
SyntaxKind.Equals;[=];
SyntaxKind.SingleQuote;['];
Markup block - Gen<None> - 2 - (12:0,12)
@ -36,7 +36,7 @@ Statement block - Gen<None> - 120 - (0:0,0)
Markup block - Gen<Attr:bar, bar='@(21:0,21),'@(48:0,48)> - 28 - (21:0,21)
Markup span - Gen<None> - [ bar='] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:4
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[bar];
SyntaxKind.Text;[bar];
SyntaxKind.Equals;[=];
SyntaxKind.SingleQuote;['];
Markup block - Gen<DynAttr:@(27:0,27)> - 6 - (27:0,27)
@ -71,7 +71,7 @@ Statement block - Gen<None> - 120 - (0:0,0)
Markup block - Gen<Attr:baz, baz='@(49:0,49),'@(70:0,70)> - 22 - (49:0,49)
Markup span - Gen<None> - [ baz='] - SpanEditHandler;Accepts:Any - (49:0,49) - Tokens:4
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[baz];
SyntaxKind.Text;[baz];
SyntaxKind.Equals;[=];
SyntaxKind.SingleQuote;['];
Markup block - Gen<DynAttr:@(55:0,55)> - 13 - (55:0,55)
@ -92,7 +92,7 @@ Statement block - Gen<None> - 120 - (0:0,0)
Markup block - Gen<Attr:bat, bat='@(71:0,71),'@(93:0,93)> - 23 - (71:0,71)
Markup span - Gen<None> - [ bat='] - SpanEditHandler;Accepts:Any - (71:0,71) - Tokens:4
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[bat];
SyntaxKind.Text;[bat];
SyntaxKind.Equals;[=];
SyntaxKind.SingleQuote;['];
Markup block - Gen<DynAttr:@(77:0,77)> - 13 - (77:0,77)
@ -114,7 +114,7 @@ Statement block - Gen<None> - 120 - (0:0,0)
Markup block - Gen<Attr:zoo, zoo='@(94:0,94),'@(115:0,115)> - 22 - (94:0,94)
Markup span - Gen<None> - [ zoo='] - SpanEditHandler;Accepts:Any - (94:0,94) - Tokens:4
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[zoo];
SyntaxKind.Text;[zoo];
SyntaxKind.Equals;[=];
SyntaxKind.SingleQuote;['];
Markup block - Gen<None> - 2 - (100:0,100)

4
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithDoubleTransition_EndOfFile_Throws.stree.txt
View File

@ -5,11 +5,11 @@ Statement block - Gen<None> - 14 - (0:0,0)
Tag block - Gen<None> - 13 - (1:0,1)
Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[span];
SyntaxKind.Text;[span];
Markup block - Gen<Attr:foo, foo='@(6:0,6),@(14:0,14)> - 8 - (6:0,6)
Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[foo];
SyntaxKind.Text;[foo];
SyntaxKind.Equals;[=];
SyntaxKind.SingleQuote;['];
Markup block - Gen<None> - 2 - (12:0,12)

4
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpBlockTest/WithUnexpectedTransitionsInAttributeValue_Throws.stree.txt
View File

@ -5,11 +5,11 @@ Statement block - Gen<None> - 20 - (0:0,0)
Tag block - Gen<None> - 18 - (1:0,1)
Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (1:0,1) - Tokens:2
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[span];
SyntaxKind.Text;[span];
Markup block - Gen<Attr:foo, foo='@(6:0,6),'@(15:0,15)> - 10 - (6:0,6)
Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[foo];
SyntaxKind.Text;[foo];
SyntaxKind.Equals;[=];
SyntaxKind.SingleQuote;['];
Markup block - Gen<DynAttr:@(12:0,12)> - 1 - (12:0,12)

12
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_FileScoped_CanBeBeneathOtherWhiteSpaceCommentsAndDirectives.stree.txt
View File

@ -49,18 +49,18 @@ Markup block - Gen<None> - 130 - (0:0,0)
Tag block - Gen<None> - 3 - (110:5,0)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (110:5,0) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
SyntaxKind.HtmlText - [This is extra] - [113..126) - FullWidth: 13 - Slots: 1
SyntaxKind.HtmlTextLiteral - [This is extra] - [113..126) - FullWidth: 13 - Slots: 1
SyntaxKind.List - [This is extra] - [113..126) - FullWidth: 13 - Slots: 5
SyntaxKind.HtmlTextLiteral;[This];
SyntaxKind.Text;[This];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[is];
SyntaxKind.Text;[is];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[extra];
SyntaxKind.Text;[extra];
Tag block - Gen<None> - 4 - (126:5,16)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (126:5,16) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];

16
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/DirectiveDescriptor_UnderstandsRazorBlocks.stree.txt
View File

@ -17,20 +17,20 @@ Directive block - Gen<Directive:{custom;RazorBlock;Unrestricted}> - 33 - (0:0,0)
Tag block - Gen<None> - 3 - (19:0,19)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
SyntaxKind.HtmlText - [F{o}o] - [22..27) - FullWidth: 5 - Slots: 1
SyntaxKind.HtmlTextLiteral - [F{o}o] - [22..27) - FullWidth: 5 - Slots: 1
SyntaxKind.List - [F{o}o] - [22..27) - FullWidth: 5 - Slots: 5
SyntaxKind.HtmlTextLiteral;[F];
SyntaxKind.HtmlTextLiteral;[{];
SyntaxKind.HtmlTextLiteral;[o];
SyntaxKind.HtmlTextLiteral;[}];
SyntaxKind.HtmlTextLiteral;[o];
SyntaxKind.Text;[F];
SyntaxKind.Text;[{];
SyntaxKind.Text;[o];
SyntaxKind.Text;[}];
SyntaxKind.Text;[o];
Tag block - Gen<None> - 4 - (27:0,27)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (31:0,31) - Tokens:1
SyntaxKind.Whitespace;[ ];

16
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpDirectivesTest/Parse_SectionDirective.stree.txt
View File

@ -17,20 +17,20 @@ Directive block - Gen<Directive:{section;RazorBlock;Unrestricted}> - 32 - (0:0,0
Tag block - Gen<None> - 3 - (18:0,18)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
SyntaxKind.HtmlText - [F{o}o] - [21..26) - FullWidth: 5 - Slots: 1
SyntaxKind.HtmlTextLiteral - [F{o}o] - [21..26) - FullWidth: 5 - Slots: 1
SyntaxKind.List - [F{o}o] - [21..26) - FullWidth: 5 - Slots: 5
SyntaxKind.HtmlTextLiteral;[F];
SyntaxKind.HtmlTextLiteral;[{];
SyntaxKind.HtmlTextLiteral;[o];
SyntaxKind.HtmlTextLiteral;[}];
SyntaxKind.HtmlTextLiteral;[o];
SyntaxKind.Text;[F];
SyntaxKind.Text;[{];
SyntaxKind.Text;[o];
SyntaxKind.Text;[}];
SyntaxKind.Text;[o];
Tag block - Gen<None> - 4 - (26:0,26)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:1
SyntaxKind.Whitespace;[ ];

8
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyParsesMarkupIncorrectyAssumedToBeWithinAStatement.stree.txt
View File

@ -21,12 +21,12 @@ Statement block - Gen<None> - 64 - (0:0,0)
Tag block - Gen<None> - 3 - (43:2,4)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (43:2,4) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo is ] - SpanEditHandler;Accepts:Any - (46:2,7) - Tokens:4
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[is];
SyntaxKind.Text;[is];
SyntaxKind.Whitespace;[ ];
Expression block - Gen<Expr> - 4 - (53:2,14)
Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (53:2,14) - Tokens:1
@ -37,7 +37,7 @@ Statement block - Gen<None> - 64 - (0:0,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (57:2,18) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (61:2,22) - Tokens:1
SyntaxKind.NewLine;[LF];

4
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/CorrectlyRecoversFromMissingCloseParenInExpressionWithinCode.stree.txt
View File

@ -10,13 +10,13 @@ Statement block - Gen<None> - 29 - (0:0,0)
Tag block - Gen<None> - 6 - (15:0,15)
Markup span - Gen<Markup> - [<html>] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[html];
SyntaxKind.Text;[html];
SyntaxKind.CloseAngle;[>];
Tag block - Gen<None> - 7 - (21:0,21)
Markup span - Gen<Markup> - [</html>] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[html];
SyntaxKind.Text;[html];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (28:0,28) - Tokens:1
SyntaxKind.Unknown;[];

6
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/OutputsErrorIfAtSignFollowedByLessThanSignAtStatementStart.stree.txt
View File

@ -14,15 +14,15 @@ Statement block - Gen<None> - 23 - (0:0,0)
Tag block - Gen<None> - 3 - (11:0,11)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (11:0,11) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Bar] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Bar];
SyntaxKind.Text;[Bar];
Tag block - Gen<None> - 4 - (17:0,17)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1
SyntaxKind.Whitespace;[ ];

18
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/RequiresControlFlowStatementsToHaveBraces.stree.txt
View File

@ -9,15 +9,15 @@ Statement block - Gen<None> - 58 - (0:0,0)
Tag block - Gen<None> - 3 - (8:0,8)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (8:0,8) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Bar] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Bar];
SyntaxKind.Text;[Bar];
Tag block - Gen<None> - 4 - (14:0,14)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:1
SyntaxKind.Whitespace;[ ];
@ -33,15 +33,15 @@ Statement block - Gen<None> - 58 - (0:0,0)
Tag block - Gen<None> - 3 - (32:0,32)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Baz] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Baz];
SyntaxKind.Text;[Baz];
Tag block - Gen<None> - 4 - (38:0,38)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (42:0,42) - Tokens:1
SyntaxKind.Whitespace;[ ];
@ -52,15 +52,15 @@ Statement block - Gen<None> - 58 - (0:0,0)
Tag block - Gen<None> - 3 - (48:0,48)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (48:0,48) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Boz] - SpanEditHandler;Accepts:Any - (51:0,51) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Boz];
SyntaxKind.Text;[Boz];
Tag block - Gen<None> - 4 - (54:0,54)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (54:0,54) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (58:0,58) - Tokens:1
SyntaxKind.Unknown;[];

6
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpErrorTest/ResumesIfStatementAfterOpenParen.stree.txt
View File

@ -12,15 +12,15 @@ Statement block - Gen<None> - 24 - (0:0,0)
Tag block - Gen<None> - 3 - (12:1,7)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (12:1,7) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (15:1,10) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
Tag block - Gen<None> - 4 - (18:1,13)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (18:1,13) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (22:1,17) - Tokens:1
SyntaxKind.Whitespace;[ ];

6
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpNestedStatementsTest/NestedMarkupBlock.stree.txt
View File

@ -14,15 +14,15 @@ Statement block - Gen<None> - 29 - (0:0,0)
Tag block - Gen<None> - 3 - (15:0,15)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Hello] - SpanEditHandler;Accepts:Any - (18:0,18) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Hello];
SyntaxKind.Text;[Hello];
Tag block - Gen<None> - 4 - (23:0,23)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (27:0,27) - Tokens:1
SyntaxKind.Whitespace;[ ];

4
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentInMarkup.stree.txt
View File

@ -2,7 +2,7 @@ Markup block - Gen<None> - 25 - (0:0,0)
Tag block - Gen<None> - 3 - (0:0,0)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1
SyntaxKind.NewLine;[LF];
@ -39,5 +39,5 @@ Markup block - Gen<None> - 25 - (0:0,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (21:3,0) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];

4
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentsInSameLineInMarkup.stree.txt
View File

@ -2,7 +2,7 @@ Markup block - Gen<None> - 21 - (0:0,0)
Tag block - Gen<None> - 3 - (0:0,0)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1
SyntaxKind.NewLine;[LF];
@ -38,5 +38,5 @@ Markup block - Gen<None> - 21 - (0:0,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (17:2,0) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];

4
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInClosingTagBlock.stree.txt
View File

@ -2,13 +2,13 @@ Markup block - Gen<None> - 33 - (0:0,0)
Tag block - Gen<None> - 6 - (0:0,0)
Markup span - Gen<Markup> - [<text>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[text];
SyntaxKind.Text;[text];
SyntaxKind.CloseAngle;[>];
Tag block - Gen<None> - 7 - (6:0,6)
Markup span - Gen<Markup> - [</text ] - SpanEditHandler;Accepts:Any - (6:0,6) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[text];
SyntaxKind.Text;[text];
SyntaxKind.Whitespace;[ ];
Comment block - Gen<RazorComment> - 19 - (13:0,13)
Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:1

4
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInMarkup.stree.txt
View File

@ -2,7 +2,7 @@ Markup block - Gen<None> - 15 - (0:0,0)
Tag block - Gen<None> - 3 - (0:0,0)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1
SyntaxKind.NewLine;[LF];
@ -23,5 +23,5 @@ Markup block - Gen<None> - 15 - (0:0,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (11:2,0) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];

4
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInOpeningTagBlock.stree.txt
View File

@ -2,7 +2,7 @@ Markup block - Gen<None> - 33 - (0:0,0)
Tag block - Gen<None> - 26 - (0:0,0)
Markup span - Gen<Markup> - [<text ] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[text];
SyntaxKind.Text;[text];
SyntaxKind.Whitespace;[ ];
Comment block - Gen<RazorComment> - 19 - (6:0,6)
Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (6:0,6) - Tokens:1
@ -21,5 +21,5 @@ Markup block - Gen<None> - 33 - (0:0,0)
Markup span - Gen<Markup> - [</text>] - SpanEditHandler;Accepts:Any - (26:0,26) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[text];
SyntaxKind.Text;[text];
SyntaxKind.CloseAngle;[>];

4
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.stree.txt
View File

@ -13,7 +13,7 @@ Markup block - Gen<None> - 26 - (0:0,0)
Tag block - Gen<None> - 5 - (8:1,4)
Transition span - Gen<None> - [<text] - SpanEditHandler;Accepts:Any - (8:1,4) - Tokens:2
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[text];
SyntaxKind.Text;[text];
Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (13:1,9) - Tokens:1
SyntaxKind.NewLine;[LF];
Markup span - Gen<None> - [ ] - SpanEditHandler;Accepts:Any - (15:2,0) - Tokens:1
@ -32,4 +32,4 @@ Markup block - Gen<None> - 26 - (0:0,0)
Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (23:2,8) - Tokens:1
SyntaxKind.NewLine;[LF];
Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (25:3,0) - Tokens:1
SyntaxKind.HtmlTextLiteral;[}];
SyntaxKind.Text;[}];

6
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentWithExtraNewLineInMarkup.stree.txt
View File

@ -2,7 +2,7 @@ Markup block - Gen<None> - 45 - (0:0,0)
Tag block - Gen<None> - 3 - (0:0,0)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [LFLF] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:2
SyntaxKind.NewLine;[LF];
@ -33,11 +33,11 @@ Markup block - Gen<None> - 45 - (0:0,0)
SyntaxKind.RazorCommentTransition;[@];
Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (37:5,2) - Tokens:1
SyntaxKind.NewLine;[LF];
SyntaxKind.HtmlText - [LF] - [39..41) - FullWidth: 2 - Slots: 1
SyntaxKind.HtmlTextLiteral - [LF] - [39..41) - FullWidth: 2 - Slots: 1
SyntaxKind.NewLine;[LF];
Tag block - Gen<None> - 4 - (41:7,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (41:7,0) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];

8
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentsSurroundingMarkup.stree.txt
View File

@ -2,7 +2,7 @@ Markup block - Gen<None> - 42 - (0:0,0)
Tag block - Gen<None> - 3 - (0:0,0)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (0:0,0) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (3:0,3) - Tokens:1
SyntaxKind.NewLine;[LF];
@ -19,7 +19,7 @@ Markup block - Gen<None> - 42 - (0:0,0)
SyntaxKind.RazorCommentTransition;[@];
Markup span - Gen<Markup> - [ content ] - SpanEditHandler;Accepts:Any - (16:1,11) - Tokens:3
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[content];
SyntaxKind.Text;[content];
SyntaxKind.Whitespace;[ ];
Comment block - Gen<RazorComment> - 11 - (25:1,20)
Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (25:1,20) - Tokens:1
@ -32,11 +32,11 @@ Markup block - Gen<None> - 42 - (0:0,0)
SyntaxKind.RazorCommentStar;[*];
Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (35:1,30) - Tokens:1
SyntaxKind.RazorCommentTransition;[@];
SyntaxKind.HtmlText - [LF] - [36..38) - FullWidth: 2 - Slots: 1
SyntaxKind.HtmlTextLiteral - [LF] - [36..38) - FullWidth: 2 - Slots: 1
SyntaxKind.NewLine;[LF];
Tag block - Gen<None> - 4 - (38:2,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (38:2,0) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];

8
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/AcceptsOpenBraceMultipleLinesBelowSectionName.stree.txt
View File

@ -26,15 +26,15 @@ Markup block - Gen<None> - 46 - (0:0,0)
Tag block - Gen<None> - 3 - (33:7,0)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (33:7,0) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
SyntaxKind.HtmlText - [Foo] - [36..39) - FullWidth: 3 - Slots: 1
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.HtmlTextLiteral - [Foo] - [36..39) - FullWidth: 3 - Slots: 1
SyntaxKind.Text;[Foo];
Tag block - Gen<None> - 4 - (39:7,6)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (39:7,6) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (43:7,10) - Tokens:1
SyntaxKind.NewLine;[LF];

24
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/AllowsBracesInCSharpExpression.stree.txt
View File

@ -17,29 +17,29 @@ Markup block - Gen<None> - 76 - (0:0,0)
Markup block - Gen<None> - 61 - (14:0,14)
Markup span - Gen<Markup> - [ I really want to render a close brace, so here I go: ] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:25
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[I];
SyntaxKind.Text;[I];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[really];
SyntaxKind.Text;[really];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[want];
SyntaxKind.Text;[want];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[to];
SyntaxKind.Text;[to];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[render];
SyntaxKind.Text;[render];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[a];
SyntaxKind.Text;[a];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[close];
SyntaxKind.Text;[close];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[brace,];
SyntaxKind.Text;[brace,];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[so];
SyntaxKind.Text;[so];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[here];
SyntaxKind.Text;[here];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[I];
SyntaxKind.Text;[I];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[go:];
SyntaxKind.Text;[go:];
SyntaxKind.Whitespace;[ ];
Expression block - Gen<Expr> - 6 - (68:0,68)
Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (68:0,68) - Tokens:1

16
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/BalancesBraces.stree.txt
View File

@ -20,25 +20,25 @@ Markup block - Gen<None> - 67 - (0:0,0)
Tag block - Gen<None> - 8 - (15:0,15)
Markup span - Gen<Markup> - [<script>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[script];
SyntaxKind.Text;[script];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [(function foo() { return 1; })();] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:11
SyntaxKind.HtmlTextLiteral;[(function];
SyntaxKind.Text;[(function];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[foo()];
SyntaxKind.Text;[foo()];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[{];
SyntaxKind.Text;[{];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[return];
SyntaxKind.Text;[return];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[1;];
SyntaxKind.Text;[1;];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[})();];
SyntaxKind.Text;[})();];
Tag block - Gen<None> - 9 - (56:0,56)
Markup span - Gen<Markup> - [</script>] - SpanEditHandler;Accepts:Any - (56:0,56) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[script];
SyntaxKind.Text;[script];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (65:0,65) - Tokens:1
SyntaxKind.Whitespace;[ ];

2
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CommentRecoversFromUnclosedTag.stree.txt
View File

@ -20,7 +20,7 @@ Markup block - Gen<None> - 33 - (0:0,0)
Tag block - Gen<None> - 4 - (14:1,0)
Markup span - Gen<Markup> - [<aLF] - SpanEditHandler;Accepts:Any - (14:1,0) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[a];
SyntaxKind.Text;[a];
SyntaxKind.NewLine;[LF];
HtmlComment block - Gen<None> - 14 - (18:2,0)
Markup span - Gen<Markup> - [<!--] - SpanEditHandler;Accepts:None - (18:2,0) - Tokens:3

2
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/CorrectlyTerminatesWhenCloseBraceImmediatelyFollowsMarkup.stree.txt
View File

@ -16,7 +16,7 @@ Markup block - Gen<None> - 24 - (0:0,0)
SyntaxKind.LeftBrace;[{];
Markup block - Gen<None> - 9 - (14:0,14)
Markup span - Gen<Markup> - [something] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
SyntaxKind.HtmlTextLiteral;[something];
SyntaxKind.Text;[something];
MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (23:0,23) - Tokens:1
SyntaxKind.RightBrace;[}];
Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1

8
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/DoesNotRequireSpaceBetweenSectionNameAndOpenBrace.stree.txt
View File

@ -18,15 +18,15 @@ Markup block - Gen<None> - 26 - (0:0,0)
Tag block - Gen<None> - 3 - (14:0,14)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
SyntaxKind.HtmlText - [Foo] - [17..20) - FullWidth: 3 - Slots: 1
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.HtmlTextLiteral - [Foo] - [17..20) - FullWidth: 3 - Slots: 1
SyntaxKind.Text;[Foo];
Tag block - Gen<None> - 4 - (20:0,20)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (24:0,24) - Tokens:1
SyntaxKind.Whitespace;[ ];

2
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent3.stree.txt
View File

@ -16,4 +16,4 @@ Markup block - Gen<None> - 17 - (0:0,0)
SyntaxKind.LeftBrace;[{];
Markup block - Gen<None> - 3 - (14:0,14)
Markup span - Gen<Markup> - [abc] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:1
SyntaxKind.HtmlTextLiteral;[abc];
SyntaxKind.Text;[abc];

2
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesEOFAfterOpenContent4.stree.txt
View File

@ -18,4 +18,4 @@ Markup block - Gen<None> - 20 - (0:0,0)
Markup span - Gen<Markup> - [LF abc] - SpanEditHandler;Accepts:Any - (14:0,14) - Tokens:3
SyntaxKind.NewLine;[LF];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[abc];
SyntaxKind.Text;[abc];

12
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSection.stree.txt
View File

@ -20,16 +20,16 @@ Markup block - Gen<None> - 27 - (0:0,0)
Tag block - Gen<None> - 3 - (15:0,15)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
SyntaxKind.HtmlText - [Foo{}] - [18..23) - FullWidth: 5 - Slots: 1
SyntaxKind.HtmlTextLiteral - [Foo{}] - [18..23) - FullWidth: 5 - Slots: 1
SyntaxKind.List - [Foo{}] - [18..23) - FullWidth: 5 - Slots: 3
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.HtmlTextLiteral;[{];
SyntaxKind.HtmlTextLiteral;[}];
SyntaxKind.Text;[Foo];
SyntaxKind.Text;[{];
SyntaxKind.Text;[}];
Tag block - Gen<None> - 4 - (23:0,23)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];

8
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/HandlesUnterminatedSectionWithNestedIf.stree.txt
View File

@ -37,17 +37,17 @@ Markup block - Gen<None> - 73 - (0:0,0)
Tag block - Gen<None> - 3 - (48:4,8)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (48:4,8) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Hello World] - SpanEditHandler;Accepts:Any - (51:4,11) - Tokens:3
SyntaxKind.HtmlTextLiteral;[Hello];
SyntaxKind.Text;[Hello];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[World];
SyntaxKind.Text;[World];
Tag block - Gen<None> - 4 - (62:4,22)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (62:4,22) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (66:4,26) - Tokens:1
SyntaxKind.NewLine;[LF];

2
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/IgnoresSectionUnlessAllLowerCase.stree.txt
View File

@ -8,4 +8,4 @@ Markup block - Gen<None> - 12 - (0:0,0)
SyntaxKind.Identifier;[Section];
Markup span - Gen<Markup> - [ foo] - SpanEditHandler;Accepts:Any - (8:0,8) - Tokens:2
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[foo];
SyntaxKind.Text;[foo];

8
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParserOutputsErrorOnNestedSections.stree.txt
View File

@ -36,15 +36,15 @@ Markup block - Gen<None> - 44 - (0:0,0)
Tag block - Gen<None> - 3 - (30:0,30)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (30:0,30) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
SyntaxKind.HtmlText - [Foo] - [33..36) - FullWidth: 3 - Slots: 1
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.HtmlTextLiteral - [Foo] - [33..36) - FullWidth: 3 - Slots: 1
SyntaxKind.Text;[Foo];
Tag block - Gen<None> - 4 - (36:0,36)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (36:0,36) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (40:0,40) - Tokens:1
SyntaxKind.Whitespace;[ ];

8
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesNamedSectionCorrectly.stree.txt
View File

@ -20,15 +20,15 @@ Markup block - Gen<None> - 27 - (0:0,0)
Tag block - Gen<None> - 3 - (15:0,15)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
SyntaxKind.HtmlText - [Foo] - [18..21) - FullWidth: 3 - Slots: 1
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.HtmlTextLiteral - [Foo] - [18..21) - FullWidth: 3 - Slots: 1
SyntaxKind.Text;[Foo];
Tag block - Gen<None> - 4 - (21:0,21)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:1
SyntaxKind.Whitespace;[ ];

4
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ParsesXmlProcessingInstruction.stree.txt
View File

@ -20,9 +20,9 @@ Markup block - Gen<None> - 28 - (0:0,0)
SyntaxKind.OpenAngle;[<];
SyntaxKind.QuestionMark;[?];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[xml];
SyntaxKind.Text;[xml];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[bleh];
SyntaxKind.Text;[bleh];
SyntaxKind.Whitespace;[ ];
SyntaxKind.QuestionMark;[?];
SyntaxKind.CloseAngle;[>];

14
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfKeywordNotFollowedByIdentifierStartChar.stree.txt
View File

@ -9,23 +9,23 @@ Markup block - Gen<None> - 25 - (0:0,0)
Code span - Gen<None> - [ ] - SpanEditHandler;Accepts:Whitespace - (8:0,8) - Tokens:1
SyntaxKind.Whitespace;[ ];
Markup span - Gen<Markup> - [9 { ] - SpanEditHandler;Accepts:Any - (9:0,9) - Tokens:4
SyntaxKind.HtmlTextLiteral;[9];
SyntaxKind.Text;[9];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[{];
SyntaxKind.Text;[{];
SyntaxKind.Whitespace;[ ];
Tag block - Gen<None> - 3 - (13:0,13)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
SyntaxKind.HtmlText - [Foo] - [16..19) - FullWidth: 3 - Slots: 1
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.HtmlTextLiteral - [Foo] - [16..19) - FullWidth: 3 - Slots: 1
SyntaxKind.Text;[Foo];
Tag block - Gen<None> - 4 - (19:0,19)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ }] - SpanEditHandler;Accepts:Any - (23:0,23) - Tokens:2
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[}];
SyntaxKind.Text;[}];

14
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/ReportsErrorAndTerminatesSectionBlockIfNameNotFollowedByOpenBrace.stree.txt
View File

@ -11,23 +11,23 @@ Markup block - Gen<None> - 31 - (0:0,0)
Code span - Gen<DirectiveToken {SectionName;Member;Opt:False}> - [foo] - DirectiveTokenEditHandler;Accepts:NonWhitespace - (9:0,9) - Tokens:1
SyntaxKind.Identifier;[foo];
Markup span - Gen<Markup> - [-bar { ] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:4
SyntaxKind.HtmlTextLiteral;[-bar];
SyntaxKind.Text;[-bar];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[{];
SyntaxKind.Text;[{];
SyntaxKind.Whitespace;[ ];
Tag block - Gen<None> - 3 - (19:0,19)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:Any - (19:0,19) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
SyntaxKind.HtmlText - [Foo] - [22..25) - FullWidth: 3 - Slots: 1
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.HtmlTextLiteral - [Foo] - [22..25) - FullWidth: 3 - Slots: 1
SyntaxKind.Text;[Foo];
Tag block - Gen<None> - 4 - (25:0,25)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (25:0,25) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ }] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:2
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[}];
SyntaxKind.Text;[}];

4
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition1.stree.txt
View File

@ -18,11 +18,11 @@ Markup block - Gen<None> - 30 - (0:0,0)
Tag block - Gen<None> - 17 - (12:0,12)
Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:2
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[span];
SyntaxKind.Text;[span];
Markup block - Gen<Attr:foo, foo='@(17:0,17),'@(25:0,25)> - 9 - (17:0,17)
Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:4
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[foo];
SyntaxKind.Text;[foo];
SyntaxKind.Equals;[=];
SyntaxKind.SingleQuote;['];
Markup block - Gen<None> - 2 - (23:0,23)

4
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSectionTest/_WithDoubleTransition2.stree.txt
View File

@ -18,11 +18,11 @@ Markup block - Gen<None> - 44 - (0:0,0)
Tag block - Gen<None> - 31 - (12:0,12)
Markup span - Gen<Markup> - [<span] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:2
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[span];
SyntaxKind.Text;[span];
Markup block - Gen<Attr:foo, foo='@(17:0,17),'@(39:0,39)> - 23 - (17:0,17)
Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (17:0,17) - Tokens:4
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[foo];
SyntaxKind.Text;[foo];
SyntaxKind.Equals;[=];
SyntaxKind.SingleQuote;['];
Markup block - Gen<DynAttr:@(23:0,23)> - 13 - (23:0,23)

10
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpSpecialBlockTest/ParseBlockTerminatesSingleLineCommentAtEndOfLine.stree.txt
View File

@ -17,20 +17,20 @@ Statement block - Gen<None> - 48 - (0:0,0)
Tag block - Gen<None> - 3 - (27:2,1)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (27:2,1) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [A real tag!] - SpanEditHandler;Accepts:Any - (30:2,4) - Tokens:6
SyntaxKind.HtmlTextLiteral;[A];
SyntaxKind.Text;[A];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[real];
SyntaxKind.Text;[real];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[tag];
SyntaxKind.Text;[tag];
SyntaxKind.Bang;[!];
Tag block - Gen<None> - 4 - (41:2,15)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (41:2,15) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (45:2,19) - Tokens:1
SyntaxKind.NewLine;[LF];

8
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInExplicitExpressionParens.stree.txt
View File

@ -16,12 +16,12 @@ Expression block - Gen<Expr> - 37 - (0:0,0)
Tag block - Gen<None> - 3 - (18:0,18)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (21:0,21) - Tokens:3
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[#];
SyntaxKind.Text;[#];
Expression block - Gen<Expr> - 5 - (26:0,26)
Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (26:0,26) - Tokens:1
SyntaxKind.Transition;[@];
@ -31,7 +31,7 @@ Expression block - Gen<Expr> - 37 - (0:0,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (31:0,31) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Expr> - [)] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:1
SyntaxKind.RightParenthesis;[)];

8
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInImplicitExpressionParens.stree.txt
View File

@ -14,12 +14,12 @@ Expression block - Gen<Expr> - 35 - (0:0,0)
Tag block - Gen<None> - 3 - (17:0,17)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:3
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[#];
SyntaxKind.Text;[#];
Expression block - Gen<Expr> - 5 - (25:0,25)
Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:1
SyntaxKind.Transition;[@];
@ -29,7 +29,7 @@ Expression block - Gen<Expr> - 35 - (0:0,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (30:0,30) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Expr> - [)] - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 - (34:0,34) - Tokens:1
SyntaxKind.RightParenthesis;[)];

8
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinCodeBlock.stree.txt
View File

@ -25,12 +25,12 @@ Statement block - Gen<None> - 70 - (0:0,0)
Tag block - Gen<None> - 3 - (49:0,49)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (49:0,49) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (52:0,52) - Tokens:3
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[#];
SyntaxKind.Text;[#];
Expression block - Gen<Expr> - 5 - (57:0,57)
Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (57:0,57) - Tokens:1
SyntaxKind.Transition;[@];
@ -40,7 +40,7 @@ Statement block - Gen<None> - 70 - (0:0,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (62:0,62) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Stmt> - [); }] - SpanEditHandler;Accepts:None - (66:0,66) - Tokens:4
SyntaxKind.RightParenthesis;[)];

8
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSimpleTemplateInStatementWithinStatementBlock.stree.txt
View File

@ -26,12 +26,12 @@ Statement block - Gen<None> - 65 - (0:0,0)
Tag block - Gen<None> - 3 - (44:0,44)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (44:0,44) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (47:0,47) - Tokens:3
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[#];
SyntaxKind.Text;[#];
Expression block - Gen<Expr> - 5 - (52:0,52)
Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (52:0,52) - Tokens:1
SyntaxKind.Transition;[@];
@ -41,7 +41,7 @@ Statement block - Gen<None> - 65 - (0:0,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (57:0,57) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Stmt> - [); ] - SpanEditHandler;Accepts:Any - (61:0,61) - Tokens:3
SyntaxKind.RightParenthesis;[)];

2
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineImmediatelyFollowingStatementChar.stree.txt
View File

@ -11,7 +11,7 @@ Statement block - Gen<None> - 11 - (0:0,0)
SyntaxKind.Colon;[:];
Markup span - Gen<Markup> - [ barLF] - SpanEditHandler;Accepts:None - (4:0,4) - Tokens:3
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[bar];
SyntaxKind.Text;[bar];
SyntaxKind.NewLine;[LF];
Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (10:1,0) - Tokens:1
SyntaxKind.Unknown;[];

2
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesSingleLineTemplate.stree.txt
View File

@ -17,7 +17,7 @@ Statement block - Gen<None> - 23 - (0:0,0)
SyntaxKind.Colon;[:];
Markup span - Gen<Markup> - [ barLF] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:3
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[bar];
SyntaxKind.Text;[bar];
SyntaxKind.NewLine;[LF];
Code span - Gen<Stmt> - [; ] - SpanEditHandler;Accepts:Any - (20:1,0) - Tokens:2
SyntaxKind.Semicolon;[;];

16
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInImplicitExpressionParens.stree.txt
View File

@ -14,12 +14,12 @@ Expression block - Gen<Expr> - 55 - (0:0,0)
Tag block - Gen<None> - 3 - (17:0,17)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:3
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[#];
SyntaxKind.Text;[#];
Expression block - Gen<Expr> - 5 - (25:0,25)
Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:1
SyntaxKind.Transition;[@];
@ -29,7 +29,7 @@ Expression block - Gen<Expr> - 55 - (0:0,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (30:0,30) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Expr> - [, ] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (34:0,34) - Tokens:2
SyntaxKind.Comma;[,];
@ -41,12 +41,12 @@ Expression block - Gen<Expr> - 55 - (0:0,0)
Tag block - Gen<None> - 3 - (37:0,37)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (37:0,37) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (40:0,40) - Tokens:3
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[#];
SyntaxKind.Text;[#];
Expression block - Gen<Expr> - 5 - (45:0,45)
Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (45:0,45) - Tokens:1
SyntaxKind.Transition;[@];
@ -56,7 +56,7 @@ Expression block - Gen<Expr> - 55 - (0:0,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (50:0,50) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Expr> - [)] - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 - (54:0,54) - Tokens:1
SyntaxKind.RightParenthesis;[)];

16
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlesTwoTemplatesInStatementWithinCodeBlock.stree.txt
View File

@ -25,12 +25,12 @@ Statement block - Gen<None> - 90 - (0:0,0)
Tag block - Gen<None> - 3 - (49:0,49)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (49:0,49) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (52:0,52) - Tokens:3
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[#];
SyntaxKind.Text;[#];
Expression block - Gen<Expr> - 5 - (57:0,57)
Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (57:0,57) - Tokens:1
SyntaxKind.Transition;[@];
@ -40,7 +40,7 @@ Statement block - Gen<None> - 90 - (0:0,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (62:0,62) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Stmt> - [, ] - SpanEditHandler;Accepts:Any - (66:0,66) - Tokens:2
SyntaxKind.Comma;[,];
@ -52,12 +52,12 @@ Statement block - Gen<None> - 90 - (0:0,0)
Tag block - Gen<None> - 3 - (69:0,69)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (69:0,69) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (72:0,72) - Tokens:3
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[#];
SyntaxKind.Text;[#];
Expression block - Gen<Expr> - 5 - (77:0,77)
Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (77:0,77) - Tokens:1
SyntaxKind.Transition;[@];
@ -67,7 +67,7 @@ Statement block - Gen<None> - 90 - (0:0,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (82:0,82) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Stmt> - [); }] - SpanEditHandler;Accepts:None - (86:0,86) - Tokens:4
SyntaxKind.RightParenthesis;[)];

16
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/HandlessTwoTemplatesInStatementWithinStatementBlock.stree.txt
View File

@ -26,12 +26,12 @@ Statement block - Gen<None> - 85 - (0:0,0)
Tag block - Gen<None> - 3 - (44:0,44)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (44:0,44) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (47:0,47) - Tokens:3
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[#];
SyntaxKind.Text;[#];
Expression block - Gen<Expr> - 5 - (52:0,52)
Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (52:0,52) - Tokens:1
SyntaxKind.Transition;[@];
@ -41,7 +41,7 @@ Statement block - Gen<None> - 85 - (0:0,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (57:0,57) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Stmt> - [, ] - SpanEditHandler;Accepts:Any - (61:0,61) - Tokens:2
SyntaxKind.Comma;[,];
@ -53,12 +53,12 @@ Statement block - Gen<None> - 85 - (0:0,0)
Tag block - Gen<None> - 3 - (64:0,64)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (64:0,64) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (67:0,67) - Tokens:3
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[#];
SyntaxKind.Text;[#];
Expression block - Gen<Expr> - 5 - (72:0,72)
Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (72:0,72) - Tokens:1
SyntaxKind.Transition;[@];
@ -68,7 +68,7 @@ Statement block - Gen<None> - 85 - (0:0,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (77:0,77) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Stmt> - [); ] - SpanEditHandler;Accepts:Any - (81:0,81) - Tokens:3
SyntaxKind.RightParenthesis;[)];

12
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInImplicitExprParens.stree.txt
View File

@ -14,12 +14,12 @@ Expression block - Gen<Expr> - 61 - (0:0,0)
Tag block - Gen<None> - 3 - (17:0,17)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (17:0,17) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (20:0,20) - Tokens:3
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[#];
SyntaxKind.Text;[#];
Expression block - Gen<Expr> - 31 - (25:0,25)
Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (25:0,25) - Tokens:1
SyntaxKind.Transition;[@];
@ -38,7 +38,7 @@ Expression block - Gen<Expr> - 61 - (0:0,0)
Tag block - Gen<None> - 3 - (43:0,43)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (43:0,43) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (46:0,46) - Tokens:1
SyntaxKind.Unknown;[];
@ -51,7 +51,7 @@ Expression block - Gen<Expr> - 61 - (0:0,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (51:0,51) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Expr> - [)] - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 - (55:0,55) - Tokens:1
SyntaxKind.RightParenthesis;[)];
@ -59,7 +59,7 @@ Expression block - Gen<Expr> - 61 - (0:0,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (56:0,56) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Expr> - [)] - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 - (60:0,60) - Tokens:1
SyntaxKind.RightParenthesis;[)];

12
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinCodeBlock.stree.txt
View File

@ -25,12 +25,12 @@ Statement block - Gen<None> - 96 - (0:0,0)
Tag block - Gen<None> - 3 - (49:0,49)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (49:0,49) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (52:0,52) - Tokens:3
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[#];
SyntaxKind.Text;[#];
Expression block - Gen<Expr> - 31 - (57:0,57)
Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (57:0,57) - Tokens:1
SyntaxKind.Transition;[@];
@ -49,7 +49,7 @@ Statement block - Gen<None> - 96 - (0:0,0)
Tag block - Gen<None> - 3 - (75:0,75)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (75:0,75) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (78:0,78) - Tokens:1
SyntaxKind.Unknown;[];
@ -62,7 +62,7 @@ Statement block - Gen<None> - 96 - (0:0,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (83:0,83) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Expr> - [)] - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 - (87:0,87) - Tokens:1
SyntaxKind.RightParenthesis;[)];
@ -70,7 +70,7 @@ Statement block - Gen<None> - 96 - (0:0,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (88:0,88) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Stmt> - [); }] - SpanEditHandler;Accepts:None - (92:0,92) - Tokens:4
SyntaxKind.RightParenthesis;[)];

12
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/ProducesErrorButCorrectlyParsesNestedTemplateInStmtWithinStmtBlock.stree.txt
View File

@ -26,12 +26,12 @@ Statement block - Gen<None> - 91 - (0:0,0)
Tag block - Gen<None> - 3 - (44:0,44)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (44:0,44) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (47:0,47) - Tokens:3
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[#];
SyntaxKind.Text;[#];
Expression block - Gen<Expr> - 31 - (52:0,52)
Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (52:0,52) - Tokens:1
SyntaxKind.Transition;[@];
@ -50,7 +50,7 @@ Statement block - Gen<None> - 91 - (0:0,0)
Tag block - Gen<None> - 3 - (70:0,70)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (70:0,70) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (73:0,73) - Tokens:1
SyntaxKind.Unknown;[];
@ -63,7 +63,7 @@ Statement block - Gen<None> - 91 - (0:0,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (78:0,78) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Expr> - [)] - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 - (82:0,82) - Tokens:1
SyntaxKind.RightParenthesis;[)];
@ -71,7 +71,7 @@ Statement block - Gen<None> - 91 - (0:0,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (83:0,83) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Stmt> - [); ] - SpanEditHandler;Accepts:Any - (87:0,87) - Tokens:3
SyntaxKind.RightParenthesis;[)];

10
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpTemplateTest/_WithDoubleTransition_DoesNotThrow.stree.txt
View File

@ -26,11 +26,11 @@ Statement block - Gen<None> - 74 - (0:0,0)
Tag block - Gen<None> - 12 - (44:0,44)
Markup span - Gen<Markup> - [<p] - SpanEditHandler;Accepts:Any - (44:0,44) - Tokens:2
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
Markup block - Gen<Attr:foo, foo='@(46:0,46),'@(54:0,54)> - 9 - (46:0,46)
Markup span - Gen<None> - [ foo='] - SpanEditHandler;Accepts:Any - (46:0,46) - Tokens:4
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[foo];
SyntaxKind.Text;[foo];
SyntaxKind.Equals;[=];
SyntaxKind.SingleQuote;['];
Markup block - Gen<None> - 2 - (52:0,52)
@ -43,9 +43,9 @@ Statement block - Gen<None> - 74 - (0:0,0)
Markup span - Gen<Markup> - [>] - SpanEditHandler;Accepts:None - (55:0,55) - Tokens:1
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo #] - SpanEditHandler;Accepts:Any - (56:0,56) - Tokens:3
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[#];
SyntaxKind.Text;[#];
Expression block - Gen<Expr> - 5 - (61:0,61)
Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (61:0,61) - Tokens:1
SyntaxKind.Transition;[@];
@ -55,7 +55,7 @@ Statement block - Gen<None> - 74 - (0:0,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (66:0,66) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Stmt> - [); ] - SpanEditHandler;Accepts:Any - (70:0,70) - Tokens:3
SyntaxKind.RightParenthesis;[)];

18
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBraces.stree.txt
View File

@ -12,15 +12,15 @@ Statement block - Gen<None> - 70 - (0:0,0)
Tag block - Gen<None> - 3 - (10:0,10)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (10:0,10) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Bar] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Bar];
SyntaxKind.Text;[Bar];
Tag block - Gen<None> - 4 - (16:0,16)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (16:0,16) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:1
SyntaxKind.Whitespace;[ ];
@ -41,15 +41,15 @@ Statement block - Gen<None> - 70 - (0:0,0)
Tag block - Gen<None> - 3 - (38:0,38)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Baz] - SpanEditHandler;Accepts:Any - (41:0,41) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Baz];
SyntaxKind.Text;[Baz];
Tag block - Gen<None> - 4 - (44:0,44)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (44:0,44) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (48:0,48) - Tokens:1
SyntaxKind.Whitespace;[ ];
@ -65,15 +65,15 @@ Statement block - Gen<None> - 70 - (0:0,0)
Tag block - Gen<None> - 3 - (58:0,58)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (58:0,58) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Boz] - SpanEditHandler;Accepts:Any - (61:0,61) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Boz];
SyntaxKind.Text;[Boz];
Tag block - Gen<None> - 4 - (64:0,64)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (64:0,64) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (68:0,68) - Tokens:1
SyntaxKind.Whitespace;[ ];

18
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/AllowsMarkupInIfBodyWithBracesWithinCodeBlock.stree.txt
View File

@ -15,15 +15,15 @@ Statement block - Gen<None> - 74 - (0:0,0)
Tag block - Gen<None> - 3 - (12:0,12)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Bar] - SpanEditHandler;Accepts:Any - (15:0,15) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Bar];
SyntaxKind.Text;[Bar];
Tag block - Gen<None> - 4 - (18:0,18)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (18:0,18) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:1
SyntaxKind.Whitespace;[ ];
@ -44,15 +44,15 @@ Statement block - Gen<None> - 74 - (0:0,0)
Tag block - Gen<None> - 3 - (40:0,40)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (40:0,40) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Baz] - SpanEditHandler;Accepts:Any - (43:0,43) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Baz];
SyntaxKind.Text;[Baz];
Tag block - Gen<None> - 4 - (46:0,46)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (46:0,46) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (50:0,50) - Tokens:1
SyntaxKind.Whitespace;[ ];
@ -68,15 +68,15 @@ Statement block - Gen<None> - 74 - (0:0,0)
Tag block - Gen<None> - 3 - (60:0,60)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (60:0,60) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Boz] - SpanEditHandler;Accepts:Any - (63:0,63) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Boz];
SyntaxKind.Text;[Boz];
Tag block - Gen<None> - 4 - (66:0,66)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (66:0,66) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (70:0,70) - Tokens:1
SyntaxKind.Whitespace;[ ];

6
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTag.stree.txt
View File

@ -16,15 +16,15 @@ Statement block - Gen<None> - 29 - (0:0,0)
Tag block - Gen<None> - 6 - (13:0,13)
Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (13:0,13) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[text];
SyntaxKind.Text;[text];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [;] - SpanEditHandler;Accepts:None - (19:0,19) - Tokens:1
SyntaxKind.HtmlTextLiteral;[;];
SyntaxKind.Text;[;];
Tag block - Gen<None> - 7 - (20:0,20)
Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (20:0,20) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[text];
SyntaxKind.Text;[text];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Stmt> - [ }] - SpanEditHandler;Accepts:Any - (27:0,27) - Tokens:2
SyntaxKind.Whitespace;[ ];

6
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/CorrectlyReturnsFromMarkupBlockWithPseudoTagInCodeBlock.stree.txt
View File

@ -19,15 +19,15 @@ Statement block - Gen<None> - 33 - (0:0,0)
Tag block - Gen<None> - 6 - (15:0,15)
Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[text];
SyntaxKind.Text;[text];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [;] - SpanEditHandler;Accepts:None - (21:0,21) - Tokens:1
SyntaxKind.HtmlTextLiteral;[;];
SyntaxKind.Text;[;];
Tag block - Gen<None> - 7 - (22:0,22)
Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (22:0,22) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[text];
SyntaxKind.Text;[text];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Stmt> - [ } ] - SpanEditHandler;Accepts:Any - (29:0,29) - Tokens:3
SyntaxKind.Whitespace;[ ];

8
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesAllWhitespaceOnSameLineWithTrailingNewLineToMarkupExclPreceedingNewline.stree.txt
View File

@ -24,12 +24,12 @@ Statement block - Gen<None> - 161 - (0:0,0)
Tag block - Gen<None> - 3 - (84:2,4)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (84:2,4) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [LF FooLF] - SpanEditHandler;Accepts:Any - (87:2,7) - Tokens:4
SyntaxKind.NewLine;[LF];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
SyntaxKind.NewLine;[LF];
Expression block - Gen<Expr> - 12 - (102:4,0)
Code span - Gen<Stmt> - [ ] - SpanEditHandler;Accepts:Any - (102:4,0) - Tokens:1
@ -45,7 +45,7 @@ Statement block - Gen<None> - 161 - (0:0,0)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (120:5,4) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (124:5,8) - Tokens:1
SyntaxKind.NewLine;[LF];
@ -57,7 +57,7 @@ Statement block - Gen<None> - 161 - (0:0,0)
MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (131:6,5) - Tokens:1
SyntaxKind.Colon;[:];
Markup span - Gen<Markup> - [Hello!LF] - SpanEditHandler;Accepts:None - (132:6,6) - Tokens:3
SyntaxKind.HtmlTextLiteral;[Hello];
SyntaxKind.Text;[Hello];
SyntaxKind.Bang;[!];
SyntaxKind.NewLine;[LF];
Code span - Gen<Stmt> - [ var biz = boz;LF}] - SpanEditHandler;Accepts:Any - (140:7,0) - Tokens:11

6
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode.stree.txt
View File

@ -12,12 +12,12 @@ Expression block - Gen<Expr> - 29 - (0:0,0)
SyntaxKind.Colon;[:];
Markup span - Gen<Markup> - [<p>Foo</p> LF] - SpanEditHandler;Accepts:None - (12:1,2) - Tokens:10
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
SyntaxKind.Whitespace;[ ];
SyntaxKind.NewLine;[LF];

6
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtColonTransitionInDesignTimeMode.stree.txt
View File

@ -11,12 +11,12 @@ Statement block - Gen<None> - 26 - (0:0,0)
SyntaxKind.Colon;[:];
Markup span - Gen<Markup> - [<p>Foo</p> LF] - SpanEditHandler;Accepts:None - (9:1,6) - Tokens:10
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
SyntaxKind.Whitespace;[ ];
SyntaxKind.NewLine;[LF];

6
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode.stree.txt
View File

@ -10,15 +10,15 @@ Expression block - Gen<Expr> - 24 - (0:0,0)
Tag block - Gen<None> - 3 - (9:0,9)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (9:0,9) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (12:0,12) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
Tag block - Gen<None> - 4 - (15:0,15)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (15:0,15) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Expr> - [ )] - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14 - (19:0,19) - Tokens:2
SyntaxKind.Whitespace;[ ];

6
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.stree.txt
View File

@ -10,15 +10,15 @@ Statement block - Gen<None> - 25 - (0:0,0)
Tag block - Gen<None> - 3 - (8:1,5)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (8:1,5) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (11:1,8) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
Tag block - Gen<None> - 4 - (14:1,11)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (14:1,11) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Stmt> - [ LF] - SpanEditHandler;Accepts:Any - (18:1,15) - Tokens:2
SyntaxKind.Whitespace;[ ];

6
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/GivesSpacesToCodeOnTagTransitionInDesignTimeMode.stree.txt
View File

@ -8,15 +8,15 @@ Statement block - Gen<None> - 24 - (0:0,0)
Tag block - Gen<None> - 3 - (7:1,4)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (7:1,4) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (10:1,7) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
Tag block - Gen<None> - 4 - (13:1,10)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (13:1,10) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Stmt> - [ LF] - SpanEditHandler;Accepts:Any - (17:1,14) - Tokens:2
SyntaxKind.Whitespace;[ ];

6
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracket.stree.txt
View File

@ -29,15 +29,15 @@ Statement block - Gen<None> - 42 - (0:0,0)
Tag block - Gen<None> - 3 - (30:0,30)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (30:0,30) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (33:0,33) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
Tag block - Gen<None> - 4 - (36:0,36)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (36:0,36) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (40:0,40) - Tokens:1
SyntaxKind.Whitespace;[ ];

6
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnOpenAngleBracketInCodeBlock.stree.txt
View File

@ -32,15 +32,15 @@ Statement block - Gen<None> - 46 - (0:0,0)
Tag block - Gen<None> - 3 - (32:0,32)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (32:0,32) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (35:0,35) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
Tag block - Gen<None> - 4 - (38:0,38)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (38:0,38) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (42:0,42) - Tokens:1
SyntaxKind.Whitespace;[ ];

2
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColon.stree.txt
View File

@ -14,7 +14,7 @@ Statement block - Gen<None> - 18 - (0:0,0)
MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
SyntaxKind.Colon;[:];
Markup span - Gen<Markup> - [BarLF] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:2
SyntaxKind.HtmlTextLiteral;[Bar];
SyntaxKind.Text;[Bar];
SyntaxKind.NewLine;[LF];
Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:Any - (17:1,0) - Tokens:1
SyntaxKind.RightBrace;[}];

2
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByColonInCodeBlock.stree.txt
View File

@ -17,7 +17,7 @@ Statement block - Gen<None> - 22 - (0:0,0)
MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (13:0,13) - Tokens:1
SyntaxKind.Colon;[:];
Markup span - Gen<Markup> - [BarLF] - SpanEditHandler;Accepts:None - (14:0,14) - Tokens:2
SyntaxKind.HtmlTextLiteral;[Bar];
SyntaxKind.Text;[Bar];
SyntaxKind.NewLine;[LF];
Code span - Gen<Stmt> - [} ] - SpanEditHandler;Accepts:Any - (19:1,0) - Tokens:2
SyntaxKind.RightBrace;[}];

2
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByDoubleColon.stree.txt
View File

@ -14,7 +14,7 @@ Statement block - Gen<None> - 24 - (0:0,0)
MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
SyntaxKind.Colon;[:];
Markup span - Gen<Markup> - [:SometextLF] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:2
SyntaxKind.HtmlTextLiteral;[:Sometext];
SyntaxKind.Text;[:Sometext];
SyntaxKind.NewLine;[LF];
Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:Any - (23:1,0) - Tokens:1
SyntaxKind.RightBrace;[}];

2
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParsesMarkupStatementOnSwitchCharacterFollowedByTripleColon.stree.txt
View File

@ -14,7 +14,7 @@ Statement block - Gen<None> - 25 - (0:0,0)
MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (11:0,11) - Tokens:1
SyntaxKind.Colon;[:];
Markup span - Gen<Markup> - [::SometextLF] - SpanEditHandler;Accepts:None - (12:0,12) - Tokens:2
SyntaxKind.HtmlTextLiteral;[::Sometext];
SyntaxKind.Text;[::Sometext];
SyntaxKind.NewLine;[LF];
Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:Any - (24:1,0) - Tokens:1
SyntaxKind.RightBrace;[}];

12
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ShouldSupportMarkupWithoutPreceedingWhitespace.stree.txt
View File

@ -20,13 +20,13 @@ Statement block - Gen<None> - 67 - (0:0,0)
MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (34:3,1) - Tokens:1
SyntaxKind.Colon;[:];
Markup span - Gen<Markup> - [BazLF] - SpanEditHandler;Accepts:None - (35:3,2) - Tokens:2
SyntaxKind.HtmlTextLiteral;[Baz];
SyntaxKind.Text;[Baz];
SyntaxKind.NewLine;[LF];
Markup block - Gen<None> - 7 - (40:4,0)
Tag block - Gen<None> - 5 - (40:4,0)
Markup span - Gen<Markup> - [<br/>] - SpanEditHandler;Accepts:None - (40:4,0) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[br];
SyntaxKind.Text;[br];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (45:4,5) - Tokens:1
@ -35,15 +35,15 @@ Statement block - Gen<None> - 67 - (0:0,0)
Tag block - Gen<None> - 3 - (47:5,0)
Markup span - Gen<Markup> - [<a>] - SpanEditHandler;Accepts:None - (47:5,0) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[a];
SyntaxKind.Text;[a];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (50:5,3) - Tokens:1
SyntaxKind.HtmlTextLiteral;[Foo];
SyntaxKind.Text;[Foo];
Tag block - Gen<None> - 4 - (53:5,6)
Markup span - Gen<Markup> - [</a>] - SpanEditHandler;Accepts:None - (53:5,6) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[a];
SyntaxKind.Text;[a];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (57:5,10) - Tokens:1
SyntaxKind.NewLine;[LF];
@ -53,7 +53,7 @@ Statement block - Gen<None> - 67 - (0:0,0)
MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (60:6,1) - Tokens:1
SyntaxKind.Colon;[:];
Markup span - Gen<Markup> - [BarLF] - SpanEditHandler;Accepts:None - (61:6,2) - Tokens:2
SyntaxKind.HtmlTextLiteral;[Bar];
SyntaxKind.Text;[Bar];
SyntaxKind.NewLine;[LF];
Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:None - (66:7,0) - Tokens:1
SyntaxKind.RightBrace;[}];

26
test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SupportsAllKindsOfImplicitMarkupInCodeBlock.stree.txt
View File

@ -19,11 +19,11 @@ Statement block - Gen<None> - 206 - (0:0,0)
MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (28:2,9) - Tokens:1
SyntaxKind.Colon;[:];
Markup span - Gen<Markup> - [Single Line MarkupLF] - SpanEditHandler;Accepts:None - (29:2,10) - Tokens:6
SyntaxKind.HtmlTextLiteral;[Single];
SyntaxKind.Text;[Single];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[Line];
SyntaxKind.Text;[Line];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[Markup];
SyntaxKind.Text;[Markup];
SyntaxKind.NewLine;[LF];
Code span - Gen<Stmt> - [ }LF foreach (var p in Enumerable.Range(1, 10)) {LF ] - SpanEditHandler;Accepts:Any - (49:3,0) - Tokens:27
SyntaxKind.Whitespace;[ ];
@ -57,14 +57,14 @@ Statement block - Gen<None> - 206 - (0:0,0)
Tag block - Gen<None> - 6 - (114:5,8)
Transition span - Gen<None> - [<text>] - SpanEditHandler;Accepts:None - (114:5,8) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[text];
SyntaxKind.Text;[text];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [The number is ] - SpanEditHandler;Accepts:None - (120:5,14) - Tokens:6
SyntaxKind.HtmlTextLiteral;[The];
SyntaxKind.Text;[The];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[number];
SyntaxKind.Text;[number];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[is];
SyntaxKind.Text;[is];
SyntaxKind.Whitespace;[ ];
Expression block - Gen<Expr> - 2 - (134:5,28)
Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (134:5,28) - Tokens:1
@ -75,7 +75,7 @@ Statement block - Gen<None> - 206 - (0:0,0)
Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (136:5,30) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[text];
SyntaxKind.Text;[text];
SyntaxKind.CloseAngle;[>];
Code span - Gen<Stmt> - [LF }LF if(!false) {LF] - SpanEditHandler;Accepts:Any - (143:5,37) - Tokens:13
SyntaxKind.NewLine;[LF];
@ -97,20 +97,20 @@ Statement block - Gen<None> - 206 - (0:0,0)
Tag block - Gen<None> - 3 - (178:8,8)
Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (178:8,8) - Tokens:3
SyntaxKind.OpenAngle;[<];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [A real tag!] - SpanEditHandler;Accepts:Any - (181:8,11) - Tokens:6
SyntaxKind.HtmlTextLiteral;[A];
SyntaxKind.Text;[A];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[real];
SyntaxKind.Text;[real];
SyntaxKind.Whitespace;[ ];
SyntaxKind.HtmlTextLiteral;[tag];
SyntaxKind.Text;[tag];
SyntaxKind.Bang;[!];
Tag block - Gen<None> - 4 - (192:8,22)
Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (192:8,22) - Tokens:4
SyntaxKind.OpenAngle;[<];
SyntaxKind.ForwardSlash;[/];
SyntaxKind.HtmlTextLiteral;[p];
SyntaxKind.Text;[p];
SyntaxKind.CloseAngle;[>];
Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (196:8,26) - Tokens:1
SyntaxKind.NewLine;[LF];

Some files were not shown because too many files have changed in this diff Show More