Fix nested C# blocks when combined with C# @ symbols.

- We used to accept until markup or an ending brace which didn't allow the parser to balance nested braces. #679
aspnet · Mar 3, 2016 · e6d4d6c · e6d4d6c
1 parent 38183b5
commit e6d4d6c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Statements.cs b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Statements.cs
@@ -654,7 +654,7 @@ private void StandardStatement()
                 {
                     Context.Source.Position = bookmark;
                     NextToken();
-                    AcceptUntil(CSharpSymbolType.LessThan, CSharpSymbolType.RightBrace);
+                    AcceptUntil(CSharpSymbolType.LessThan, CSharpSymbolType.LeftBrace, CSharpSymbolType.RightBrace);
                     return;
                 }
             }

diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpBlockTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpBlockTest.cs
@@ -15,6 +15,20 @@ namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
 {
     public class CSharpBlockTest : CsHtmlCodeParserTestBase
     {
+        [Fact]
+        public void ParseBlock_NestedCodeBlockWithCSharpAt()
+        {
+            ParseBlockTest("{ if (true) { var val = @x; if (val != 3) { } } }",
+                new StatementBlock(
+                    Factory.MetaCode("{").Accepts(AcceptedCharacters.None),
+                    Factory
+                        .Code(" if (true) { var val = @x; if (val != 3) { } } ")
+                        .AsStatement()
+                        .Accepts(AcceptedCharacters.Any)
+                        .AutoCompleteWith(autoCompleteString: null, atEndOfSpan: false),
+                    Factory.MetaCode("}").Accepts(AcceptedCharacters.None)));
+        }
+
         [Fact]
         public void ParseBlock_NestedCodeBlockWithMarkupSetsDotAsMarkup()
         {