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

Mark whitespace between tag helper directive and its value as Markup

This commit is contained in:
Ajay Bhargav Baaskaran 2017-08-28 21:06:57 -07:00
parent 1b5bd4afac
commit f3d121cacf
2 changed files with 117 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2148,11 +2148,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
var keywordLength = Span.End.AbsoluteIndex - Span.Start.AbsoluteIndex; var keywordLength = Span.End.AbsoluteIndex - Span.Start.AbsoluteIndex;
var foundWhitespace = At(CSharpSymbolType.WhiteSpace); var foundWhitespace = At(CSharpSymbolType.WhiteSpace);
AcceptWhile(CSharpSymbolType.WhiteSpace);
// If we found whitespace then any content placed within the whitespace MAY cause a destructive change // If we found whitespace then any content placed within the whitespace MAY cause a destructive change
// to the document. We can't accept it. // to the document. We can't accept it.
Output(SpanKindInternal.MetaCode, foundWhitespace ? AcceptedCharactersInternal.None : AcceptedCharactersInternal.AnyExceptNewline); var acceptedCharacters = foundWhitespace ? AcceptedCharactersInternal.None : AcceptedCharactersInternal.AnyExceptNewline;
Output(SpanKindInternal.MetaCode, acceptedCharacters);
AcceptWhile(CSharpSymbolType.WhiteSpace);
Span.ChunkGenerator = SpanChunkGenerator.Null;
Output(SpanKindInternal.Markup, acceptedCharacters);
if (EndOfFile || At(CSharpSymbolType.NewLine)) if (EndOfFile || At(CSharpSymbolType.NewLine))
{ {

146
test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpDirectivesTest.cs
View File

@ -347,8 +347,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
new DirectiveBlock( new DirectiveBlock(
Factory.Code(Environment.NewLine + " ").AsStatement(), Factory.Code(Environment.NewLine + " ").AsStatement(),
Factory.CodeTransition(), Factory.CodeTransition(),
Factory.MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword + " ") Factory
.Accepts(AcceptedCharactersInternal.None), .MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword)
.Accepts(AcceptedCharactersInternal.None),
Factory
.Span(SpanKindInternal.Markup, " ", markup: false)
.Accepts(AcceptedCharactersInternal.None),
Factory.Code("\"*, Foo\"") Factory.Code("\"*, Foo\"")
.AsAddTagHelper( .AsAddTagHelper(
"\"*, Foo\"", "\"*, Foo\"",
@ -370,8 +374,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
.AutoCompleteWith(autoCompleteString: null, atEndOfSpan: false), .AutoCompleteWith(autoCompleteString: null, atEndOfSpan: false),
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory.MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword + " ") Factory
.Accepts(AcceptedCharactersInternal.None), .MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword)
.Accepts(AcceptedCharactersInternal.None),
Factory
.Span(SpanKindInternal.Markup, " ", markup: false)
.Accepts(AcceptedCharactersInternal.None),
Factory.Code("\"*, Foo\"") Factory.Code("\"*, Foo\"")
.AsAddTagHelper( .AsAddTagHelper(
"\"*, Foo\"", "\"*, Foo\"",
@ -1013,7 +1021,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory Factory
.MetaCode(SyntaxConstants.CSharp.TagHelperPrefixKeyword + " ") .MetaCode(SyntaxConstants.CSharp.TagHelperPrefixKeyword)
.Accepts(AcceptedCharactersInternal.None),
Factory
.Span(SpanKindInternal.Markup, " ", markup: false)
.Accepts(AcceptedCharactersInternal.None), .Accepts(AcceptedCharactersInternal.None),
Factory.Code("\"\"") Factory.Code("\"\"")
.AsTagHelperPrefixDirective("\"\"", string.Empty))); .AsTagHelperPrefixDirective("\"\"", string.Empty)));
@ -1026,7 +1037,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory Factory
.MetaCode(SyntaxConstants.CSharp.TagHelperPrefixKeyword + " ") .MetaCode(SyntaxConstants.CSharp.TagHelperPrefixKeyword)
.Accepts(AcceptedCharactersInternal.None),
Factory
.Span(SpanKindInternal.Markup, " ", markup: false)
.Accepts(AcceptedCharactersInternal.None), .Accepts(AcceptedCharactersInternal.None),
Factory.Code("Foo") Factory.Code("Foo")
.AsTagHelperPrefixDirective("Foo", "Foo"))); .AsTagHelperPrefixDirective("Foo", "Foo")));
@ -1039,7 +1053,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory Factory
.MetaCode(SyntaxConstants.CSharp.TagHelperPrefixKeyword + " ") .MetaCode(SyntaxConstants.CSharp.TagHelperPrefixKeyword)
.Accepts(AcceptedCharactersInternal.None),
Factory
.Span(SpanKindInternal.Markup, " ", markup: false)
.Accepts(AcceptedCharactersInternal.None), .Accepts(AcceptedCharactersInternal.None),
Factory.Code("\"Foo\"") Factory.Code("\"Foo\"")
.AsTagHelperPrefixDirective("\"Foo\"", "Foo"))); .AsTagHelperPrefixDirective("\"Foo\"", "Foo")));
@ -1058,7 +1075,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory Factory
.MetaCode(SyntaxConstants.CSharp.TagHelperPrefixKeyword + " ") .MetaCode(SyntaxConstants.CSharp.TagHelperPrefixKeyword)
.Accepts(AcceptedCharactersInternal.None),
Factory
.Span(SpanKindInternal.Markup, " ", markup: false)
.Accepts(AcceptedCharactersInternal.None), .Accepts(AcceptedCharactersInternal.None),
Factory.EmptyCSharp() Factory.EmptyCSharp()
.AsTagHelperPrefixDirective(string.Empty, string.Empty, expectedError) .AsTagHelperPrefixDirective(string.Empty, string.Empty, expectedError)
@ -1087,7 +1107,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory Factory
.MetaCode(SyntaxConstants.CSharp.TagHelperPrefixKeyword + " ") .MetaCode(SyntaxConstants.CSharp.TagHelperPrefixKeyword)
.Accepts(AcceptedCharactersInternal.None),
Factory
.Span(SpanKindInternal.Markup, " ", markup: false)
.Accepts(AcceptedCharactersInternal.None), .Accepts(AcceptedCharactersInternal.None),
Factory.Code("\"Foo") Factory.Code("\"Foo")
.AsTagHelperPrefixDirective("\"Foo", "\"Foo", expectedErrors))); .AsTagHelperPrefixDirective("\"Foo", "\"Foo", expectedErrors)));
@ -1115,7 +1138,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory Factory
.MetaCode(SyntaxConstants.CSharp.TagHelperPrefixKeyword + " ") .MetaCode(SyntaxConstants.CSharp.TagHelperPrefixKeyword)
.Accepts(AcceptedCharactersInternal.None),
Factory
.Span(SpanKindInternal.Markup, " ", markup: false)
.Accepts(AcceptedCharactersInternal.None), .Accepts(AcceptedCharactersInternal.None),
Factory.Code("Foo \"") Factory.Code("Foo \"")
.AsTagHelperPrefixDirective("Foo \"", "Foo \"", expectedErrors))); .AsTagHelperPrefixDirective("Foo \"", "Foo \"", expectedErrors)));
@ -1135,8 +1161,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
ParseBlockTest("@removeTagHelper \"\"", ParseBlockTest("@removeTagHelper \"\"",
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory.MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword + " ") Factory
.Accepts(AcceptedCharactersInternal.None), .MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword)
.Accepts(AcceptedCharactersInternal.None),
Factory
.Span(SpanKindInternal.Markup, " ", markup: false)
.Accepts(AcceptedCharactersInternal.None),
Factory.Code("\"\"") Factory.Code("\"\"")
.AsRemoveTagHelper( .AsRemoveTagHelper(
"\"\"", "\"\"",
@ -1158,8 +1188,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
ParseBlockTest("@removeTagHelper Foo", ParseBlockTest("@removeTagHelper Foo",
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory.MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword + " ") Factory
.Accepts(AcceptedCharactersInternal.None), .MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword)
.Accepts(AcceptedCharactersInternal.None),
Factory
.Span(SpanKindInternal.Markup, " ", markup: false)
.Accepts(AcceptedCharactersInternal.None),
Factory.Code("Foo") Factory.Code("Foo")
.AsRemoveTagHelper( .AsRemoveTagHelper(
"Foo", "Foo",
@ -1181,8 +1215,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
ParseBlockTest("@removeTagHelper \"Foo\"", ParseBlockTest("@removeTagHelper \"Foo\"",
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory.MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword + " ") Factory
.Accepts(AcceptedCharactersInternal.None), .MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword)
.Accepts(AcceptedCharactersInternal.None),
Factory
.Span(SpanKindInternal.Markup, " ", markup: false)
.Accepts(AcceptedCharactersInternal.None),
Factory.Code("\"Foo\"") Factory.Code("\"Foo\"")
.AsRemoveTagHelper( .AsRemoveTagHelper(
"\"Foo\"", "\"Foo\"",
@ -1196,7 +1234,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
ParseBlockTest("@removeTagHelper Foo, Bar ", ParseBlockTest("@removeTagHelper Foo, Bar ",
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory.MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword + " ") Factory.MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword)
.Accepts(AcceptedCharactersInternal.None),
Factory.Span(SpanKindInternal.Markup, " ", markup: false)
.Accepts(AcceptedCharactersInternal.None), .Accepts(AcceptedCharactersInternal.None),
Factory.Code("Foo, Bar ") Factory.Code("Foo, Bar ")
.AsRemoveTagHelper( .AsRemoveTagHelper(
@ -1226,7 +1266,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
ParseBlockTest("@removeTagHelper ", ParseBlockTest("@removeTagHelper ",
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory.MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword + " ") Factory.MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword)
.Accepts(AcceptedCharactersInternal.None),
Factory.Span(SpanKindInternal.Markup, " ", markup: false)
.Accepts(AcceptedCharactersInternal.None), .Accepts(AcceptedCharactersInternal.None),
Factory.EmptyCSharp() Factory.EmptyCSharp()
.AsRemoveTagHelper(string.Empty, string.Empty, legacyErrors: expectedErrors) .AsRemoveTagHelper(string.Empty, string.Empty, legacyErrors: expectedErrors)
@ -1255,8 +1297,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
ParseBlockTest("@removeTagHelper \"Foo", ParseBlockTest("@removeTagHelper \"Foo",
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory.MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword + " ") Factory
.Accepts(AcceptedCharactersInternal.None), .MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword)
.Accepts(AcceptedCharactersInternal.None),
Factory
.Span(SpanKindInternal.Markup, " ", markup: false)
.Accepts(AcceptedCharactersInternal.None),
Factory.Code("\"Foo") Factory.Code("\"Foo")
.AsRemoveTagHelper("\"Foo", "\"Foo", legacyErrors: expectedErrors))); .AsRemoveTagHelper("\"Foo", "\"Foo", legacyErrors: expectedErrors)));
} }
@ -1283,8 +1329,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
ParseBlockTest("@removeTagHelper Foo\"", ParseBlockTest("@removeTagHelper Foo\"",
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory.MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword + " ") Factory
.Accepts(AcceptedCharactersInternal.None), .MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword)
.Accepts(AcceptedCharactersInternal.None),
Factory
.Span(SpanKindInternal.Markup, " ", markup: false)
.Accepts(AcceptedCharactersInternal.None),
Factory.Code("Foo\"") Factory.Code("Foo\"")
.AsRemoveTagHelper("Foo\"", "Foo\"", legacyErrors: expectedErrors) .AsRemoveTagHelper("Foo\"", "Foo\"", legacyErrors: expectedErrors)
.Accepts(AcceptedCharactersInternal.AnyExceptNewline))); .Accepts(AcceptedCharactersInternal.AnyExceptNewline)));
@ -1304,8 +1354,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
ParseBlockTest("@addTagHelper \"\"", ParseBlockTest("@addTagHelper \"\"",
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory.MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword + " ") Factory
.Accepts(AcceptedCharactersInternal.None), .MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword)
.Accepts(AcceptedCharactersInternal.None),
Factory
.Span(SpanKindInternal.Markup, " ", markup: false)
.Accepts(AcceptedCharactersInternal.None),
Factory.Code("\"\"") Factory.Code("\"\"")
.AsAddTagHelper( .AsAddTagHelper(
"\"\"", "\"\"",
@ -1327,7 +1381,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
ParseBlockTest("@addTagHelper Foo", ParseBlockTest("@addTagHelper Foo",
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory.MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword + " ") Factory.MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword)
.Accepts(AcceptedCharactersInternal.None),
Factory.Span(SpanKindInternal.Markup, " ", markup: false)
.Accepts(AcceptedCharactersInternal.None), .Accepts(AcceptedCharactersInternal.None),
Factory.Code("Foo") Factory.Code("Foo")
.AsAddTagHelper( .AsAddTagHelper(
@ -1350,8 +1406,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
ParseBlockTest("@addTagHelper \"Foo\"", ParseBlockTest("@addTagHelper \"Foo\"",
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory.MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword + " ") Factory
.Accepts(AcceptedCharactersInternal.None), .MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword)
.Accepts(AcceptedCharactersInternal.None),
Factory
.Span(SpanKindInternal.Markup, " ", markup: false)
.Accepts(AcceptedCharactersInternal.None),
Factory.Code("\"Foo\"") Factory.Code("\"Foo\"")
.AsAddTagHelper( .AsAddTagHelper(
"\"Foo\"", "\"Foo\"",
@ -1365,8 +1425,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
ParseBlockTest("@addTagHelper Foo, Bar ", ParseBlockTest("@addTagHelper Foo, Bar ",
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory.MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword + " ") Factory
.Accepts(AcceptedCharactersInternal.None), .MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword)
.Accepts(AcceptedCharactersInternal.None),
Factory
.Span(SpanKindInternal.Markup, " ", markup: false)
.Accepts(AcceptedCharactersInternal.None),
Factory.Code("Foo, Bar ") Factory.Code("Foo, Bar ")
.AsAddTagHelper( .AsAddTagHelper(
"Foo, Bar", "Foo, Bar",
@ -1395,8 +1459,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
ParseBlockTest("@addTagHelper ", ParseBlockTest("@addTagHelper ",
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory.MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword + " ") Factory
.Accepts(AcceptedCharactersInternal.None), .MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword)
.Accepts(AcceptedCharactersInternal.None),
Factory
.Span(SpanKindInternal.Markup, " ", markup: false)
.Accepts(AcceptedCharactersInternal.None),
Factory.EmptyCSharp() Factory.EmptyCSharp()
.AsAddTagHelper(string.Empty, string.Empty, legacyErrors: expectedErrors) .AsAddTagHelper(string.Empty, string.Empty, legacyErrors: expectedErrors)
.Accepts(AcceptedCharactersInternal.AnyExceptNewline))); .Accepts(AcceptedCharactersInternal.AnyExceptNewline)));
@ -1424,8 +1492,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
ParseBlockTest("@addTagHelper \"Foo", ParseBlockTest("@addTagHelper \"Foo",
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory.MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword + " ") Factory
.Accepts(AcceptedCharactersInternal.None), .MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword)
.Accepts(AcceptedCharactersInternal.None),
Factory
.Span(SpanKindInternal.Markup, " ", markup: false)
.Accepts(AcceptedCharactersInternal.None),
Factory.Code("\"Foo") Factory.Code("\"Foo")
.AsAddTagHelper("\"Foo", "\"Foo", legacyErrors: expectedErrors))); .AsAddTagHelper("\"Foo", "\"Foo", legacyErrors: expectedErrors)));
} }
@ -1452,8 +1524,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
ParseBlockTest("@addTagHelper Foo\"", ParseBlockTest("@addTagHelper Foo\"",
new DirectiveBlock( new DirectiveBlock(
Factory.CodeTransition(), Factory.CodeTransition(),
Factory.MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword + " ") Factory
.Accepts(AcceptedCharactersInternal.None), .MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword)
.Accepts(AcceptedCharactersInternal.None),
Factory
.Span(SpanKindInternal.Markup, " ", markup: false)
.Accepts(AcceptedCharactersInternal.None),
Factory.Code("Foo\"") Factory.Code("Foo\"")
.AsAddTagHelper("Foo\"", "Foo\"", legacyErrors: expectedErrors) .AsAddTagHelper("Foo\"", "Foo\"", legacyErrors: expectedErrors)
.Accepts(AcceptedCharactersInternal.AnyExceptNewline))); .Accepts(AcceptedCharactersInternal.AnyExceptNewline)));