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

Allow markup in local functions and @functions. 

- Allow markup to exist in all code blocks. Prior to this change whenever we'd see nested curly braces we would do dumb brace matching to skip over any potentially risky code; now we treat every curly brace as an opportunity to intermingle Markup.
- One fix I had to introduce was now that functions blocks are parsed like `@{}` blocks I ran into cases where certain reserved keywords would get improperly parsed. This exposed a bug in our parsing where we’d treat **class** and **namespace** as directives without a transition in a `@{}` block. For instance this:
```
@{
    class
}
```
would barf in the old parser by treating the `class` piece as a directive even though it did not have a transition. To account for this I changed our reserved directives to be parsed as directives instead of keywords (it's how they should have been parsed anyhow). This isn't a breaking change because the directive parsing logic is a subset of how keywords get parsed.

- One quirk this change introduces is a difference in behavior in regards to one error case. Before this change if you were to have `@if (foo)) { var bar = foo; }` the entire statement would be classified as C# and you'd get a C# error on the trailing `)`. With my changes we try to keep group statements together more closely and allow for HTML in unexpected or end of statement scenarios. So, with these new changes the above example would only have `@if (foo))` classified as C# and the rest as markup because the original was invalid.
- Added lots of tests,
- Modified the feature flag to maintain the old behavior when disabled.

aspnet/AspNetCoredotnet/aspnetcore-tooling#5110
\n\nCommit migrated from 5ffd84e56d
This commit is contained in:
N. Taylor Mullen 2019-03-14 15:48:16 -07:00
parent 25e5a4ffab
commit e5064d3c76
3 changed files with 68 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
View File

@ -482,7 +482,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
// Set up auto-complete and parse the code block
var editHandler = new AutoCompleteEditHandler(Language.TokenizeString);
SpanContext.EditHandler = editHandler;
ParseCodeBlock(builder, block, acceptTerminatingBrace: false);
ParseCodeBlock(builder, block);
if (EndOfFile)
{
Context.ErrorSink.OnError(
RazorDiagnosticFactory.CreateParsing_ExpectedEndOfBlockBeforeEOF(
new SourceSpan(block.Start, contentLength: 1 /* { OR } */), block.Name, "}", "{"));
}
EnsureCurrent();
SpanContext.ChunkGenerator = new StatementChunkGenerator();
@ -521,7 +528,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
return SyntaxFactory.CSharpStatementBody(leftBrace, codeBlock, rightBrace);
}
private void ParseCodeBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Block block, bool acceptTerminatingBrace = true)
private void ParseCodeBlock(in SyntaxListBuilder<RazorSyntaxNode> builder, Block block)
{
EnsureCurrent();
while (!EndOfFile && !At(SyntaxKind.RightBrace))
@ -530,19 +537,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
ParseStatement(builder, block: block);
EnsureCurrent();
}
if (EndOfFile)
{
Context.ErrorSink.OnError(
RazorDiagnosticFactory.CreateParsing_ExpectedEndOfBlockBeforeEOF(
new SourceSpan(block.Start, contentLength: 1 /* { OR } */), block.Name, "}", "{"));
}
else if (acceptTerminatingBrace)
{
Assert(SyntaxKind.RightBrace);
SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
AcceptAndMoveNext();
}
}
private void ParseStatement(in SyntaxListBuilder<RazorSyntaxNode> builder, Block block)
@ -634,6 +628,24 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
// Verbatim Block
AcceptAndMoveNext();
ParseCodeBlock(builder, block);
// ParseCodeBlock is responsible for parsing the insides of a code block (non-inclusive of braces).
// Therefore, there's one of two cases after parsing:
// 1. We've hit the End of File (incomplete parse block).
// 2. It's a complete parse block and we're at a right brace.
if (EndOfFile)
{
Context.ErrorSink.OnError(
RazorDiagnosticFactory.CreateParsing_ExpectedEndOfBlockBeforeEOF(
new SourceSpan(block.Start, contentLength: 1 /* { OR } */), block.Name, "}", "{"));
}
else
{
Assert(SyntaxKind.RightBrace);
SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.None;
AcceptAndMoveNext();
}
break;
case SyntaxKind.Keyword:
if (!TryParseKeyword(builder, whitespace: null, transition: null))
@ -736,7 +748,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
token.Kind != SyntaxKind.LeftBracket &&
token.Kind != SyntaxKind.RightBrace);
if (At(SyntaxKind.LeftBrace) ||
if ((!Context.FeatureFlags.AllowRazorInAllCodeBlocks && At(SyntaxKind.LeftBrace)) ||
At(SyntaxKind.LeftParenthesis) ||
At(SyntaxKind.LeftBracket))
{
@ -752,6 +764,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
return;
}
}
else if (Context.FeatureFlags.AllowRazorInAllCodeBlocks && At(SyntaxKind.LeftBrace))
{
Accept(read);
return;
}
else if (At(SyntaxKind.Transition) && (NextIs(SyntaxKind.LessThan, SyntaxKind.Colon)))
{
Accept(read);
@ -847,6 +864,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
MapDirectives(ParseTagHelperPrefixDirective, SyntaxConstants.CSharp.TagHelperPrefixKeyword);
MapDirectives(ParseAddTagHelperDirective, SyntaxConstants.CSharp.AddTagHelperKeyword);
MapDirectives(ParseRemoveTagHelperDirective, SyntaxConstants.CSharp.RemoveTagHelperKeyword);
// If there wasn't any extensible directives relating to the reserved directives then map them.
if (!_directiveParserMap.ContainsKey("class"))
{
MapDirectives(ParseReservedDirective, "class");
}
if (!_directiveParserMap.ContainsKey("namespace"))
{
MapDirectives(ParseReservedDirective, "namespace");
}
}
private void EnsureDirectiveIsAtStartOfLine()
@ -883,17 +911,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
});
Keywords.Add(directive);
// These C# keywords are reserved for use in directives. It's an error to use them outside of
// a directive. This code removes the error generation if the directive *is* registered.
if (string.Equals(directive, "class", StringComparison.OrdinalIgnoreCase))
{
_keywordParserMap.Remove(CSharpKeyword.Class);
}
else if (string.Equals(directive, "namespace", StringComparison.OrdinalIgnoreCase))
{
_keywordParserMap.Remove(CSharpKeyword.Namespace);
}
}
}
@ -1409,11 +1426,22 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
ParseDirectiveBlock(directiveBuilder, descriptor, parseChildren: (childBuilder, startingBraceLocation) =>
{
NextToken();
Balance(childBuilder, BalancingModes.NoErrorOnFailure, SyntaxKind.LeftBrace, SyntaxKind.RightBrace, startingBraceLocation);
SpanContext.ChunkGenerator = new StatementChunkGenerator();
var existingEditHandler = SpanContext.EditHandler;
SpanContext.EditHandler = new CodeBlockEditHandler(Language.TokenizeString);
if (Context.FeatureFlags.AllowRazorInAllCodeBlocks)
{
var block = new Block(descriptor.Directive, directiveStart);
ParseCodeBlock(childBuilder, block);
}
else
{
Balance(childBuilder, BalancingModes.NoErrorOnFailure, SyntaxKind.LeftBrace, SyntaxKind.RightBrace, startingBraceLocation);
}
SpanContext.ChunkGenerator = new StatementChunkGenerator();
AcceptMarkerTokenIfNecessary();
childBuilder.Add(OutputTokensAsStatementLiteral());
@ -1607,7 +1635,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
MapKeywords(ParseTryStatement, CSharpKeyword.Try);
MapKeywords(ParseDoStatement, CSharpKeyword.Do);
MapKeywords(ParseUsingKeyword, CSharpKeyword.Using);
MapKeywords(ParseReservedDirective, CSharpKeyword.Class, CSharpKeyword.Namespace);
}
private void MapExpressionKeyword(Action<SyntaxListBuilder<RazorSyntaxNode>, CSharpTransitionSyntax> handler, CSharpKeyword keyword)

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

@ -76,7 +76,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
{
var relativePosition = change.Span.AbsoluteIndex - target.Position;
if (target.GetContent().IndexOfAny(new[] { '{', '}' }, relativePosition, change.Span.Length) >= 0)
if (target.GetContent().IndexOfAny(new[] { '{', '}', '@', '<', '*', }, relativePosition, change.Span.Length) >= 0)
{
return true;
}
@ -103,7 +103,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
// Internal for testing
internal static bool ContainsInvalidContent(SourceChange change)
{
if (change.NewText.IndexOfAny(new[] { '{', '}' }) >= 0)
if (change.NewText.IndexOfAny(new[] { '{', '}', '@', '<', '*', }) >= 0)
{
return true;
}

9
src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorParserFeatureFlags.cs
View File

@ -10,6 +10,7 @@ namespace Microsoft.AspNetCore.Razor.Language
var allowMinimizedBooleanTagHelperAttributes = false;
var allowHtmlCommentsInTagHelpers = false;
var allowComponentFileKind = false;
var allowRazorInAllCodeBlocks = false;
var experimental_AllowConditionalDataDashAttributes = false;
if (version.CompareTo(RazorLanguageVersion.Version_2_1) >= 0)
@ -23,6 +24,7 @@ namespace Microsoft.AspNetCore.Razor.Language
{
// Added in 3.0
allowComponentFileKind = true;
allowRazorInAllCodeBlocks = true;
}
if (version.CompareTo(RazorLanguageVersion.Experimental) >= 0)
@ -34,6 +36,7 @@ namespace Microsoft.AspNetCore.Razor.Language
allowMinimizedBooleanTagHelperAttributes,
allowHtmlCommentsInTagHelpers,
allowComponentFileKind,
allowRazorInAllCodeBlocks,
experimental_AllowConditionalDataDashAttributes);
}
@ -43,6 +46,8 @@ namespace Microsoft.AspNetCore.Razor.Language
public abstract bool AllowComponentFileKind { get; }
public abstract bool AllowRazorInAllCodeBlocks { get; }
public abstract bool EXPERIMENTAL_AllowConditionalDataDashAttributes { get; }
private class DefaultRazorParserFeatureFlags : RazorParserFeatureFlags
@ -51,11 +56,13 @@ namespace Microsoft.AspNetCore.Razor.Language
bool allowMinimizedBooleanTagHelperAttributes,
bool allowHtmlCommentsInTagHelpers,
bool allowComponentFileKind,
bool allowRazorInAllCodeBlocks,
bool experimental_AllowConditionalDataDashAttributes)
{
AllowMinimizedBooleanTagHelperAttributes = allowMinimizedBooleanTagHelperAttributes;
AllowHtmlCommentsInTagHelpers = allowHtmlCommentsInTagHelpers;
AllowComponentFileKind = allowComponentFileKind;
AllowRazorInAllCodeBlocks = allowRazorInAllCodeBlocks;
EXPERIMENTAL_AllowConditionalDataDashAttributes = experimental_AllowConditionalDataDashAttributes;
}
@ -65,6 +72,8 @@ namespace Microsoft.AspNetCore.Razor.Language
public override bool AllowComponentFileKind { get; }
public override bool AllowRazorInAllCodeBlocks { get; }
public override bool EXPERIMENTAL_AllowConditionalDataDashAttributes { get; }
}
}