From a0164b005d9bdd0ee59de3c90c38499fdc8ebd15 Mon Sep 17 00:00:00 2001
From: hexelium <hexelium@gmail.com>
Date: Wed, 10 Feb 2016 17:35:23 +0200
Subject: [PATCH] (#346) Fixed case when razor fails to recognize escape
 shortcut when the first character in a text is `:`. For example @::sometext.

---
 .../Parser/CSharpCodeParser.Statements.cs     |  5 +-
 .../Parser/CSharpCodeParser.cs                |  2 +-
 .../Parser/CSharp/CSharpToMarkupSwitchTest.cs | 37 +++++++++
 .../CodeGenerator/Output/Templates.cs         | 80 ++++++++++++++++---
 .../CodeGenerator/Source/Templates.cshtml     | 13 +++
 5 files changed, 122 insertions(+), 15 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Statements.cs b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Statements.cs
index c60ef809a4..cfba20e469 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Statements.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Statements.cs
@@ -464,7 +464,10 @@ namespace Microsoft.AspNetCore.Razor.Parser
             var type = CurrentSymbol.Type;
             var loc = CurrentLocation;
 
-            var isSingleLineMarkup = type == CSharpSymbolType.Transition && NextIs(CSharpSymbolType.Colon);
+            // Both cases @: and @:: are triggered as markup, second colon in second case will be triggered as a plain text
+            var isSingleLineMarkup = type == CSharpSymbolType.Transition &&
+                (NextIs(CSharpSymbolType.Colon, CSharpSymbolType.DoubleColon));
+
             var isMarkup = isSingleLineMarkup ||
                 type == CSharpSymbolType.LessThan ||
                 (type == CSharpSymbolType.Transition && NextIs(CSharpSymbolType.LessThan));
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.cs b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.cs
index 58f08045e8..e2b360b709 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.cs
@@ -637,7 +637,7 @@ namespace Microsoft.AspNetCore.Razor.Parser
             // No embedded transitions in C#, so ignore that param
             return allowTemplatesAndComments
                    && ((Language.IsTransition(CurrentSymbol)
-                        && NextIs(CSharpSymbolType.LessThan, CSharpSymbolType.Colon))
+                        && NextIs(CSharpSymbolType.LessThan, CSharpSymbolType.Colon, CSharpSymbolType.DoubleColon))
                        || Language.IsCommentStart(CurrentSymbol));
         }
 
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs
index 3504a7c482..de1cf3cb40 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs
@@ -552,6 +552,43 @@ namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
                                Factory.Code("}").AsStatement()));
         }
 
+        [Fact]
+        public void ParseBlockParsesMarkupStatementOnSwitchCharacterFollowedByDoubleColon()
+        {
+            // Arrange
+            ParseBlockTest("if(foo) { @::Sometext" + Environment.NewLine
+                         + "}",
+                           new StatementBlock(
+                               Factory.Code("if(foo) {").AsStatement(),
+                               new MarkupBlock(
+                                   Factory.Markup(" "),
+                                   Factory.MarkupTransition(),
+                                   Factory.MetaMarkup(":", HtmlSymbolType.Colon),
+                                   Factory.Markup(":Sometext" + Environment.NewLine)
+                                    .With(new SingleLineMarkupEditHandler(CSharpLanguageCharacteristics.Instance.TokenizeString, AcceptedCharacters.None))
+                                   ),
+                               Factory.Code("}").AsStatement()));
+        }
+
+
+        [Fact]
+        public void ParseBlockParsesMarkupStatementOnSwitchCharacterFollowedByTripleColon()
+        {
+            // Arrange
+            ParseBlockTest("if(foo) { @:::Sometext" + Environment.NewLine
+                         + "}",
+                           new StatementBlock(
+                               Factory.Code("if(foo) {").AsStatement(),
+                               new MarkupBlock(
+                                   Factory.Markup(" "),
+                                   Factory.MarkupTransition(),
+                                   Factory.MetaMarkup(":", HtmlSymbolType.Colon),
+                                   Factory.Markup("::Sometext" + Environment.NewLine)
+                                    .With(new SingleLineMarkupEditHandler(CSharpLanguageCharacteristics.Instance.TokenizeString, AcceptedCharacters.None))
+                                   ),
+                               Factory.Code("}").AsStatement()));
+        }
+
         [Fact]
         public void ParseBlockParsesMarkupStatementOnSwitchCharacterFollowedByColonInCodeBlock()
         {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Templates.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Templates.cs
index d60fd76cfd..64f83f0179 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Templates.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Templates.cs
@@ -1,4 +1,4 @@
-#pragma checksum "Templates.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "32d88538b3b0ca3648493b240101d304878756fe"
+#pragma checksum "Templates.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "ecd19ba0b3ae7ac597e19534c93fd2023208ae59"
 namespace TestOutput
 {
     using System;
@@ -125,38 +125,92 @@ WriteTo(__razor_template_writer, item);
 #line default
 #line hidden
             Instrumentation.EndContext();
-            Instrumentation.BeginContext(485, 20, true);
-            WriteLiteral("\r\n</p>\r\n\r\n<ul>\r\n    ");
+            Instrumentation.BeginContext(485, 15, true);
+            WriteLiteral("\r\n</p>\r\n\r\n<p>\r\n");
             Instrumentation.EndContext();
-            Instrumentation.BeginContext(506, 11, false);
+            Instrumentation.BeginContext(501, 16, false);
 #line 27 "Templates.cshtml"
-Write(Repeat(10, item => new Template(async(__razor_template_writer) => {
-    Instrumentation.BeginContext(518, 20, true);
-    WriteLiteralTo(__razor_template_writer, "<li>\r\n        Item #");
+Write(Repeat(10,
+    item => new Template(async(__razor_template_writer) => {
+    Instrumentation.BeginContext(519, 15, true);
+    WriteLiteralTo(__razor_template_writer, ": This is line#");
     Instrumentation.EndContext();
-    Instrumentation.BeginContext(539, 4, false);
+    Instrumentation.BeginContext(535, 4, false);
 #line 28 "Templates.cshtml"
 WriteTo(__razor_template_writer, item);
 
 #line default
 #line hidden
     Instrumentation.EndContext();
-    Instrumentation.BeginContext(543, 2, true);
+    Instrumentation.BeginContext(539, 18, true);
+    WriteLiteralTo(__razor_template_writer, " of markup<br />\r\n");
+    Instrumentation.EndContext();
+}
+)
+));
+
+#line default
+#line hidden
+            Instrumentation.EndContext();
+            Instrumentation.BeginContext(558, 15, true);
+            WriteLiteral("\r\n</p>\r\n\r\n<p>\r\n");
+            Instrumentation.EndContext();
+            Instrumentation.BeginContext(574, 16, false);
+#line 33 "Templates.cshtml"
+Write(Repeat(10,
+    item => new Template(async(__razor_template_writer) => {
+    Instrumentation.BeginContext(592, 16, true);
+    WriteLiteralTo(__razor_template_writer, ":: This is line#");
+    Instrumentation.EndContext();
+    Instrumentation.BeginContext(609, 4, false);
+#line 34 "Templates.cshtml"
+WriteTo(__razor_template_writer, item);
+
+#line default
+#line hidden
+    Instrumentation.EndContext();
+    Instrumentation.BeginContext(613, 18, true);
+    WriteLiteralTo(__razor_template_writer, " of markup<br />\r\n");
+    Instrumentation.EndContext();
+}
+)
+));
+
+#line default
+#line hidden
+            Instrumentation.EndContext();
+            Instrumentation.BeginContext(632, 22, true);
+            WriteLiteral("\r\n</p>\r\n\r\n\r\n<ul>\r\n    ");
+            Instrumentation.EndContext();
+            Instrumentation.BeginContext(655, 11, false);
+#line 40 "Templates.cshtml"
+Write(Repeat(10, item => new Template(async(__razor_template_writer) => {
+    Instrumentation.BeginContext(667, 20, true);
+    WriteLiteralTo(__razor_template_writer, "<li>\r\n        Item #");
+    Instrumentation.EndContext();
+    Instrumentation.BeginContext(688, 4, false);
+#line 41 "Templates.cshtml"
+WriteTo(__razor_template_writer, item);
+
+#line default
+#line hidden
+    Instrumentation.EndContext();
+    Instrumentation.BeginContext(692, 2, true);
     WriteLiteralTo(__razor_template_writer, "\r\n");
     Instrumentation.EndContext();
-#line 29 "Templates.cshtml"
+#line 42 "Templates.cshtml"
         
 
 #line default
 #line hidden
 
-#line 29 "Templates.cshtml"
+#line 42 "Templates.cshtml"
           var parent = item;
 
 #line default
 #line hidden
 
-    Instrumentation.BeginContext(576, 77, true);
+    Instrumentation.BeginContext(725, 77, true);
     WriteLiteralTo(__razor_template_writer, "        <ul>\r\n            <li>Child Items... ?</li>\r\n        </ul>\r\n    </li>");
     Instrumentation.EndContext();
 }
@@ -166,7 +220,7 @@ WriteTo(__razor_template_writer, item);
 #line default
 #line hidden
             Instrumentation.EndContext();
-            Instrumentation.BeginContext(715, 8, true);
+            Instrumentation.BeginContext(864, 8, true);
             WriteLiteral("\r\n</ul> ");
             Instrumentation.EndContext();
         }
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/Templates.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/Templates.cshtml
index c9523f0bfa..1edba0340b 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/Templates.cshtml
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/Templates.cshtml
@@ -23,6 +23,19 @@
 )
 </p>
 
+<p>
+@Repeat(10,
+    @:: This is line#@item of markup<br />
+)
+</p>
+
+<p>
+@Repeat(10,
+    @::: This is line#@item of markup<br />
+)
+</p>
+
+
 <ul>
     @Repeat(10, @<li>
         Item #@item