Fix attribute parsing recovery (#10620)

* Add tests * Fix attribute parsing recovery * Update new baselines * Fix expected missing source mapping * Update pre-existing baselines * Simplify code
dotnet · Jul 19, 2024 · 4af4e6f · 4af4e6f
1 parent a12e07b
commit 4af4e6f
Show file tree

Hide file tree

Showing 69 changed files with 2,795 additions and 71 deletions.
diff --git a/...r/Microsoft.AspNetCore.Razor.Language/legacyTest/Legacy/TagHelperParseTreeRewriterTest.cs b/...r/Microsoft.AspNetCore.Razor.Language/legacyTest/Legacy/TagHelperParseTreeRewriterTest.cs
@@ -29,11 +29,11 @@ public static TheoryData GetAttributeNameValuePairsData
             return new TheoryData<string, IEnumerable<KeyValuePair<string, string>>>
             {
                 { "<a>", empty },
-                { "<a @{ } href='~/home'>", empty },
+                { "<a @{ } href='~/home'>", new[] { kvp("href", "~/home") } },
                 { "<a href=\"@true\">", new[] { kvp("href", csharp) } },
                 { "<a href=\"prefix @true suffix\">", new[] { kvp("href", $"prefix{csharp} suffix") } },
                 { "<a href=~/home>", new[] { kvp("href", "~/home") } },
-                { "<a href=~/home @{ } nothing='something'>", new[] { kvp("href", "~/home") } },
+                { "<a href=~/home @{ } nothing='something'>", new[] { kvp("href", "~/home"), kvp("nothing", "something") } },
                 {
                     "<a href=\"@DateTime.Now::0\" class='btn btn-success' random>",
                     new[] { kvp("href", $"{csharp}::0"), kvp("class", "btn btn-success"), kvp("random", "") }

diff --git a/...est/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInOpeningTagBlock.stree.txt b/...est/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInOpeningTagBlock.stree.txt
@@ -4,15 +4,14 @@
             MarkupStartTag - [0..26)::26 - [<text @* razor comment *@>] - Gen<Markup> - SpanEditHandler;Accepts:Any
                 OpenAngle;[<];
                 Text;[text];
-                MarkupMiscAttributeContent - [5..25)::20
-                    MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
-                        Whitespace;[ ];
-                    RazorComment - [6..25)::19
-                        RazorCommentTransition;[@];
-                        RazorCommentStar;[*];
-                        RazorCommentLiteral;[ razor comment ];
-                        RazorCommentStar;[*];
-                        RazorCommentTransition;[@];
+                MarkupTextLiteral - [5..6)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                    Whitespace;[ ];
+                RazorComment - [6..25)::19
+                    RazorCommentTransition;[@];
+                    RazorCommentStar;[*];
+                    RazorCommentLiteral;[ razor comment ];
+                    RazorCommentStar;[*];
+                    RazorCommentTransition;[@];
                 CloseAngle;[>];
             MarkupEndTag - [26..33)::7 - [</text>] - Gen<Markup> - SpanEditHandler;Accepts:Any
                 OpenAngle;[<];

diff --git a/...rserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredMidTag.stree.txt b/...rserTests/HtmlToCodeSwitchTest/SwitchesToCodeWhenSwapCharacterEncounteredMidTag.stree.txt
@@ -15,7 +15,7 @@
                                 MarkupStartTag - [2..14)::12 - [<foo @bar />] - Gen<Markup> - SpanEditHandler;Accepts:None
                                     OpenAngle;[<];
                                     Text;[foo];
-                                    MarkupMiscAttributeContent - [6..12)::6
+                                    MarkupMiscAttributeContent - [6..11)::5
                                         MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Whitespace;[ ];
                                         CSharpCodeBlock - [7..11)::4
@@ -26,6 +26,7 @@
                                                     CSharpCodeBlock - [8..11)::3
                                                         CSharpExpressionLiteral - [8..11)::3 - [bar] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
                                                             Identifier;[bar];
+                                    MarkupMiscAttributeContent - [11..12)::1
                                         MarkupTextLiteral - [11..12)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                                             Whitespace;[ ];
                                     ForwardSlash;[/];

diff --git a/...rBlockRewriterTest/AllowsCompatibleTagStructures_DirectiveAttribute_SelfClosing.stree.txt b/...rBlockRewriterTest/AllowsCompatibleTagStructures_DirectiveAttribute_SelfClosing.stree.txt
@@ -4,7 +4,7 @@
             MarkupStartTag - [0..25)::25 - [<input @onclick="@test"/>] - Gen<Markup> - SpanEditHandler;Accepts:Any
                 OpenAngle;[<];
                 Text;[input];
-                MarkupMiscAttributeContent - [6..23)::17
+                MarkupMiscAttributeContent - [6..15)::9
                     MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Whitespace;[ ];
                     CSharpCodeBlock - [7..15)::8
@@ -15,6 +15,7 @@
                                 CSharpCodeBlock - [8..15)::7
                                     CSharpExpressionLiteral - [8..15)::7 - [onclick] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
                                         Identifier;[onclick];
+                MarkupMiscAttributeContent - [15..23)::8
                     MarkupTextLiteral - [15..17)::2 - [="] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Equals;[=];
                         DoubleQuote;["];

diff --git a/...agHelperBlockRewriterTest/AllowsCompatibleTagStructures_DirectiveAttribute_Void.stree.txt b/...agHelperBlockRewriterTest/AllowsCompatibleTagStructures_DirectiveAttribute_Void.stree.txt
@@ -4,7 +4,7 @@
             MarkupStartTag - [0..24)::24 - [<input @onclick="@test">] - Gen<Markup> - SpanEditHandler;Accepts:Any
                 OpenAngle;[<];
                 Text;[input];
-                MarkupMiscAttributeContent - [6..23)::17
+                MarkupMiscAttributeContent - [6..15)::9
                     MarkupTextLiteral - [6..7)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Whitespace;[ ];
                     CSharpCodeBlock - [7..15)::8
@@ -15,6 +15,7 @@
                                 CSharpCodeBlock - [8..15)::7
                                     CSharpExpressionLiteral - [8..15)::7 - [onclick] - Gen<Expr> - ImplicitExpressionEditHandler;Accepts:NonWhitespace;ImplicitExpression[RTD];K14
                                         Identifier;[onclick];
+                MarkupMiscAttributeContent - [15..23)::8
                     MarkupTextLiteral - [15..17)::2 - [="] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Equals;[=];
                         DoubleQuote;["];

diff --git a/...s/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes13.stree.txt b/...s/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes13.stree.txt
@@ -4,7 +4,7 @@
             MarkupTagHelperStartTag - [0..29)::29 - [<p @DateTime.Now class="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
                 OpenAngle;[<];
                 Text;[p];
-                MarkupMiscAttributeContent - [2..28)::26
+                MarkupMiscAttributeContent - [2..16)::14
                     MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Whitespace;[ ];
                     CSharpCodeBlock - [3..16)::13
@@ -17,12 +17,19 @@
                                         Identifier;[DateTime];
                                         Dot;[.];
                                         Identifier;[Now];
-                    MarkupTextLiteral - [16..28)::12 - [ class="btn"] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                MarkupAttributeBlock - [16..28)::12 - [ class="btn"]
+                    MarkupTextLiteral - [16..17)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Whitespace;[ ];
+                    MarkupTextLiteral - [17..22)::5 - [class] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Text;[class];
-                        Equals;[=];
+                    Equals;[=];
+                    MarkupTextLiteral - [23..24)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
-                        Text;[btn];
+                    GenericBlock - [24..27)::3
+                        MarkupLiteralAttributeValue - [24..27)::3 - [btn]
+                            MarkupTextLiteral - [24..27)::3 - [btn] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                Text;[btn];
+                    MarkupTextLiteral - [27..28)::1 - ["] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         DoubleQuote;["];
                 CloseAngle;[>];
             MarkupTagHelperEndTag - [29..33)::4 - [</p>]

diff --git a/...s/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes14.stree.txt b/...s/TagHelperBlockRewriterTest/CreatesErrorForMalformedTagHelpersWithAttributes14.stree.txt
@@ -4,7 +4,7 @@
             MarkupTagHelperStartTag - [0..23)::23 - [<p @DateTime.Now="btn">] - Gen<Markup> - SpanEditHandler;Accepts:Any
                 OpenAngle;[<];
                 Text;[p];
-                MarkupMiscAttributeContent - [2..22)::20
+                MarkupMiscAttributeContent - [2..16)::14
                     MarkupTextLiteral - [2..3)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Whitespace;[ ];
                     CSharpCodeBlock - [3..16)::13
@@ -17,6 +17,7 @@
                                         Identifier;[DateTime];
                                         Dot;[.];
                                         Identifier;[Now];
+                MarkupMiscAttributeContent - [16..22)::6
                     MarkupTextLiteral - [16..22)::6 - [="btn"] - Gen<Markup> - SpanEditHandler;Accepts:Any
                         Equals;[=];
                         DoubleQuote;["];

diff --git a/...Tests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml10.stree.txt b/...Tests/TagHelperBlockRewriterTest/TagHelperParseTreeRewriter_AllowsInvalidHtml10.stree.txt
@@ -9,7 +9,7 @@
                 MarkupStartTag - [3..20)::17 - [< @DateTime.Now >] - Gen<Markup> - SpanEditHandler;Accepts:Any
                     OpenAngle;[<];
                     Text;[<Missing>];
-                    MarkupMiscAttributeContent - [4..19)::15
+                    MarkupMiscAttributeContent - [4..18)::14
                         MarkupTextLiteral - [4..5)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Whitespace;[ ];
                         CSharpCodeBlock - [5..18)::13
@@ -22,6 +22,7 @@
                                             Identifier;[DateTime];
                                             Dot;[.];
                                             Identifier;[Now];
+                    MarkupMiscAttributeContent - [18..19)::1
                         MarkupTextLiteral - [18..19)::1 - [ ] - Gen<Markup> - SpanEditHandler;Accepts:Any
                             Whitespace;[ ];
                     CloseAngle;[>];

diff --git a/...icrosoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs b/...icrosoft.AspNetCore.Razor.Language/test/IntegrationTests/CodeGenerationIntegrationTest.cs
@@ -155,6 +155,22 @@ public void CSharp8()
     [IntegrationTestFact]
     public void ConditionalAttributes() => RunTest();
 
+    [IntegrationTestFact, WorkItem("https://github.com/dotnet/razor/issues/10586")]
+    public void ConditionalAttributes2()
+    {
+        if (designTime)
+        {
+            // An error scenario: tag helper + C# dynamic content (a razor error is reported,
+            // so it is fine there is a missing mapping for the C# dynamic content).
+            ExpectedMissingSourceMappings = new()
+            {
+                { new(base.GetTestFileName() + ".cshtml", 328, 11, 8), "s" }
+            };
+        }
+
+        RunTest();
+    }
+
     [IntegrationTestFact]
     public void CodeBlockWithTextElement() => RunTest();
 

diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlAttributeTest.cs b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/Legacy/HtmlAttributeTest.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Linq;
+using Roslyn.Test.Utilities;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy;
@@ -299,6 +300,78 @@ public void ConditionalAttributesWithWeirdSpacingAreDisabledForDataAttributesInD
         ParseDocumentTest("@{<span data-foo=@foo ></span>}");
     }
 
+    [Fact, WorkItem("https://github.com/dotnet/razor/issues/10586")]
+    public void ConditionalAttribute_DynamicContentAfter()
+    {
+        ParseDocumentTest("""<p class="@c" @x />""");
+    }
+
+    [Fact, WorkItem("https://github.com/dotnet/razor/issues/10586")]
+    public void ConditionalAttribute_DynamicContentBefore()
+    {
+        ParseDocumentTest("""<p @x class="@c" />""");
+    }
+
+    [Fact, WorkItem("https://github.com/dotnet/razor/issues/10586")]
+    public void ConditionalAttribute_DynamicContentBefore_02()
+    {
+        ParseDocumentTest("""<p @(x + y) class="@c" />""");
+    }
+
+    [Fact, WorkItem("https://github.com/dotnet/razor/issues/10586")]
+    public void ConditionalAttribute_DynamicContentBefore_03()
+    {
+        ParseDocumentTest("""<p @{if (x) { @x }} class="@c" />""");
+    }
+
+    [Fact, WorkItem("https://github.com/dotnet/razor/issues/10586")]
+    public void ConditionalAttribute_DynamicContentBefore_04()
+    {
+        ParseDocumentTest("""<p @@x class="@c" />""");
+    }
+
+    [Fact, WorkItem("https://github.com/dotnet/razor/issues/10586")]
+    public void ConditionalAttribute_InvalidContentBefore()
+    {
+        ParseDocumentTest("""<p "ab" class="@c" />""");
+    }
+
+    [Fact, WorkItem("https://github.com/dotnet/razor/issues/10586")]
+    public void ConditionalAttribute_CommentAfter()
+    {
+        ParseDocumentTest("""<p class="@c" @* comment *@ />""");
+    }
+
+    [Fact, WorkItem("https://github.com/dotnet/razor/issues/10586")]
+    public void ConditionalAttribute_CommentBefore()
+    {
+        ParseDocumentTest("""<p @* comment *@ class="@c" />""");
+    }
+
+    [Fact]
+    public void EscapedAttributeName_WithValue()
+    {
+        ParseDocumentTest("""<p @@attr="value" />""");
+    }
+
+    [Fact]
+    public void EscapedAttributeName_Minimized()
+    {
+        ParseDocumentTest("""<p @@attr />""");
+    }
+
+    [Fact]
+    public void EscapedAttributeName_Eof()
+    {
+        ParseDocumentTest("""<p @@""");
+    }
+
+    [Fact]
+    public void EscapedAttributeName_InvalidName()
+    {
+        ParseDocumentTest("""<p @@"invalid" />""");
+    }
+
     [Fact]
     public void ComponentFileKind_ParsesDirectiveAttributesAsMarkup()
     {

diff --git a/...ompiler/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperParseTreeRewriterTest.cs b/...ompiler/Microsoft.AspNetCore.Razor.Language/test/Legacy/TagHelperParseTreeRewriterTest.cs
@@ -29,11 +29,11 @@ public static TheoryData GetAttributeNameValuePairsData
             return new TheoryData<string, IEnumerable<KeyValuePair<string, string>>>
             {
                 { "<a>", empty },
-                { "<a @{ } href='~/home'>", empty },
+                { "<a @{ } href='~/home'>", new[] { kvp("href", "~/home") } },
                 { "<a href=\"@true\">", new[] { kvp("href", csharp) } },
                 { "<a href=\"prefix @true suffix\">", new[] { kvp("href", $"prefix{csharp} suffix") } },
                 { "<a href=~/home>", new[] { kvp("href", "~/home") } },
-                { "<a href=~/home @{ } nothing='something'>", new[] { kvp("href", "~/home") } },
+                { "<a href=~/home @{ } nothing='something'>", new[] { kvp("href", "~/home"), kvp("nothing", "something") } },
                 {
                     "<a href=\"@DateTime.Now::0\" class='btn btn-success' random>",
                     new[] { kvp("href", $"{csharp}::0"), kvp("class", "btn btn-success"), kvp("random", "") }

diff --git a/...est/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml b/...est/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes.cshtml
@@ -12,4 +12,5 @@
     <script src="@Url.Content("~/Scripts/jquery-1.6.2.min.js")" type="text/javascript"></script>
     <script src="@Url.Content("~/Scripts/modernizr-2.0.6-development-only.js")" type="text/javascript"></script>
     <script src="http://ajax.aspnetcdn.com/ajax/jquery.ui/1.8.16/jquery-ui.min.js" type="text/javascript"></script>
-}
+    <p class="@null" />
+}
diff --git a/...st/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes2.cshtml b/...st/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes2.cshtml
@@ -0,0 +1,22 @@
+@{
+    var ch = true;
+    var cls = "bar";
+    var s = "str";
+    <a @s href="x" />
+    <p @s class="@cls" />
+    <p @s class="x @cls" />
+    <p @s class="@cls x" />
+    <input type="checkbox" @s checked="@ch" />
+    <input type="checkbox" @s checked="x @ch" />
+    <p @s class="@if(cls != null) { @cls }" />
+    <a @s href="~/x" />
+    <script @s src="@Url.Content("~/Scripts/jquery-1.6.2.min.js")" type="text/javascript"></script>
+    <p @s class="@null" />
+    <p class="@null" @s />
+
+    <p @* comment *@ @s style="@null">x</p>
+
+    <p @(s + s) style="@null">x</p>
+    <p @{if (s.Length != 0) { @s }} style="@null">x</p>
+    <p @@s style="@null">x</p>
+}