From 0c953155001e49d92a15dbce3db1a9ea98d0697f Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Fri, 30 Oct 2015 17:16:54 -0700 Subject: [PATCH] Update tests to not require quotes for TH directives. - Updated .cshtml files to not provide quotes for the various `TagHelper` directives. - Updated `TagHelper` directive parsing tests. This also involved removing several tests that expected errors which no longer occur since we don't have to ensure quotes are balanced. - Updated line mappings which significantly changed due to us no longer generating line pragmas at design time for `TagHelper` directives. #561 --- .../CSharpTagHelperRenderingTest.cs | 961 +++++++++--------- .../Framework/TestSpanBuilder.cs | 13 +- .../Parser/CSharp/CSharpDirectivesTest.cs | 224 +--- .../TagHelperDirectiveSpanVisitorTest.cs | 30 +- .../Output/AddTagHelperDirective.cs | 8 +- ...AttributeTargetingTagHelpers.DesignTime.cs | 8 +- .../Output/AttributeTargetingTagHelpers.cs | 22 +- ...TagHelpers.CustomAttributeCodeGenerator.cs | 22 +- .../Output/BasicTagHelpers.DesignTime.cs | 8 +- .../BasicTagHelpers.Prefixed.DesignTime.cs | 16 +- .../Output/BasicTagHelpers.Prefixed.cs | 14 +- .../Output/BasicTagHelpers.RemoveTagHelper.cs | 4 +- .../CodeGenerator/Output/BasicTagHelpers.cs | 22 +- .../Output/ComplexTagHelpers.DesignTime.cs | 8 +- .../CodeGenerator/Output/ComplexTagHelpers.cs | 98 +- ...DuplicateAttributeTagHelpers.DesignTime.cs | 8 +- .../Output/DuplicateAttributeTagHelpers.cs | 16 +- .../Output/DuplicateTargetTagHelper.cs | 6 +- .../DynamicAttributeTagHelpers.DesignTime.cs | 8 +- .../Output/DynamicAttributeTagHelpers.cs | 76 +- .../EmptyAttributeTagHelpers.DesignTime.cs | 8 +- .../Output/EmptyAttributeTagHelpers.cs | 18 +- .../Output/EnumTagHelpers.DesignTime.cs | 8 +- .../CodeGenerator/Output/EnumTagHelpers.cs | 28 +- .../Output/EscapedTagHelpers.DesignTime.cs | 8 +- .../CodeGenerator/Output/EscapedTagHelpers.cs | 12 +- .../Output/IncompleteTagHelper.cs | 6 +- .../Output/MinimizedTagHelpers.DesignTime.cs | 8 +- .../Output/MinimizedTagHelpers.cs | 24 +- .../NestedScriptTagTagHelpers.DesignTime.cs | 8 +- .../Output/NestedScriptTagTagHelpers.cs | 18 +- .../PrefixedAttributeTagHelpers.DesignTime.cs | 8 +- .../PrefixedAttributeTagHelpers.Reversed.cs | 22 +- .../Output/PrefixedAttributeTagHelpers.cs | 22 +- .../Output/RemoveTagHelperDirective.cs | 8 +- .../Output/SingleTagHelper.DesignTime.cs | 8 +- .../CodeGenerator/Output/SingleTagHelper.cs | 8 +- ...gleTagHelperWithNewlineBeforeAttributes.cs | 8 +- .../SymbolBoundAttributes.DesignTime.cs | 8 +- .../Output/SymbolBoundAttributes.cs | 36 +- .../Output/TagHelpersInSection.cs | 28 +- .../TagHelpersWithWeirdlySpacedAttributes.cs | 20 +- ...sitionsInTagHelperAttributes.DesignTime.cs | 8 +- .../TransitionsInTagHelperAttributes.cs | 40 +- .../Source/AddTagHelperDirective.cshtml | 2 +- .../AttributeTargetingTagHelpers.cshtml | 2 +- .../Source/BasicTagHelpers.Prefixed.cshtml | 4 +- .../BasicTagHelpers.RemoveTagHelper.cshtml | 4 +- .../Source/BasicTagHelpers.cshtml | 2 +- .../Source/ComplexTagHelpers.cshtml | 2 +- .../DuplicateAttributeTagHelpers.cshtml | 2 +- .../Source/DuplicateTargetTagHelper.cshtml | 2 +- .../Source/DynamicAttributeTagHelpers.cshtml | 2 +- .../Source/EmptyAttributeTagHelpers.cshtml | 2 +- .../Source/EnumTagHelpers.cshtml | 2 +- .../Source/EscapedTagHelpers.cshtml | 2 +- .../Source/IncompleteTagHelper.cshtml | 2 +- .../Source/MinimizedTagHelpers.cshtml | 2 +- .../Source/NestedScriptTagTagHelpers.cshtml | 2 +- .../Source/PrefixedAttributeTagHelpers.cshtml | 2 +- .../Source/RemoveTagHelperDirective.cshtml | 2 +- .../Source/SingleTagHelper.cshtml | 2 +- ...agHelperWithNewlineBeforeAttributes.cshtml | 2 +- .../Source/SymbolBoundAttributes.cshtml | 2 +- .../Source/TagHelpersInSection.cshtml | 2 +- ...gHelpersWithWeirdlySpacedAttributes.cshtml | 2 +- .../TransitionsInTagHelperAttributes.cshtml | 2 +- 67 files changed, 860 insertions(+), 1132 deletions(-) diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs b/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs index c7c77201c8..b6d369d4bd 100644 --- a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs @@ -550,16 +550,17 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 421, - generatedLineIndex: 14, - characterOffsetIndex: 14, - contentLength: 17), + documentCharacterOffsetIndex: 14, + generatedAbsoluteIndex: 372, + generatedLineIndex: 12, + generatedCharacterOffsetIndex: 48, + contentLength: 15), BuildLineMapping( - documentAbsoluteIndex: 63, + documentAbsoluteIndex: 61, documentLineIndex: 2, documentCharacterOffsetIndex: 28, - generatedAbsoluteIndex: 987, - generatedLineIndex: 33, + generatedAbsoluteIndex: 892, + generatedLineIndex: 27, generatedCharacterOffsetIndex: 33, contentLength: 4), } @@ -573,23 +574,24 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 421, - generatedLineIndex: 14, - characterOffsetIndex: 14, - contentLength: 17), + documentCharacterOffsetIndex: 14, + generatedAbsoluteIndex: 372, + generatedLineIndex: 12, + generatedCharacterOffsetIndex: 48, + contentLength: 15), BuildLineMapping( - documentAbsoluteIndex: 202, + documentAbsoluteIndex: 200, documentLineIndex: 5, - generatedAbsoluteIndex: 1388, - generatedLineIndex: 37, + generatedAbsoluteIndex: 1293, + generatedLineIndex: 31, characterOffsetIndex: 38, contentLength: 23), BuildLineMapping( - documentAbsoluteIndex: 285, + documentAbsoluteIndex: 283, documentLineIndex: 6, documentCharacterOffsetIndex: 40, - generatedAbsoluteIndex: 2029, - generatedLineIndex: 48, + generatedAbsoluteIndex: 1934, + generatedLineIndex: 42, generatedCharacterOffsetIndex: 42, contentLength: 4), } @@ -603,22 +605,24 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 17, documentLineIndex: 0, - generatedAbsoluteIndex: 442, - generatedLineIndex: 14, - characterOffsetIndex: 17, - contentLength: 5), + documentCharacterOffsetIndex: 17, + generatedAbsoluteIndex: 381, + generatedLineIndex: 12, + generatedCharacterOffsetIndex: 48, + contentLength: 3), BuildLineMapping( - documentAbsoluteIndex: 38, + documentAbsoluteIndex: 36, documentLineIndex: 1, - generatedAbsoluteIndex: 601, - generatedLineIndex: 21, - characterOffsetIndex: 14, - contentLength: 17), + documentCharacterOffsetIndex: 14, + generatedAbsoluteIndex: 436, + generatedLineIndex: 13, + generatedCharacterOffsetIndex: 48, + contentLength: 15), BuildLineMapping( - documentAbsoluteIndex: 226, + documentAbsoluteIndex: 222, documentLineIndex: 7, - generatedAbsoluteIndex: 1648, - generatedLineIndex: 45, + generatedAbsoluteIndex: 1437, + generatedLineIndex: 33, characterOffsetIndex: 43, contentLength: 4), } @@ -632,325 +636,326 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 425, - generatedLineIndex: 14, - characterOffsetIndex: 14, - contentLength: 17), + documentCharacterOffsetIndex: 14, + generatedAbsoluteIndex: 374, + generatedLineIndex: 12, + generatedCharacterOffsetIndex: 48, + contentLength: 15), BuildLineMapping( - documentAbsoluteIndex: 36, + documentAbsoluteIndex: 34, documentLineIndex: 2, documentCharacterOffsetIndex: 1, - generatedAbsoluteIndex: 1055, - generatedLineIndex: 34, + generatedAbsoluteIndex: 958, + generatedLineIndex: 28, generatedCharacterOffsetIndex: 0, contentLength: 48), BuildLineMapping( - documentAbsoluteIndex: 211, + documentAbsoluteIndex: 209, documentLineIndex: 9, - generatedAbsoluteIndex: 1173, - generatedLineIndex: 43, + generatedAbsoluteIndex: 1076, + generatedLineIndex: 37, characterOffsetIndex: 0, contentLength: 12), BuildLineMapping( - documentAbsoluteIndex: 224, + documentAbsoluteIndex: 222, documentLineIndex: 9, documentCharacterOffsetIndex: 13, - generatedAbsoluteIndex: 1269, - generatedLineIndex: 49, + generatedAbsoluteIndex: 1172, + generatedLineIndex: 43, generatedCharacterOffsetIndex: 12, contentLength: 27), BuildLineMapping( - documentAbsoluteIndex: 352, + documentAbsoluteIndex: 350, documentLineIndex: 12, - generatedAbsoluteIndex: 1817, - generatedLineIndex: 61, + generatedAbsoluteIndex: 1720, + generatedLineIndex: 55, characterOffsetIndex: 0, contentLength: 48), BuildLineMapping( - documentAbsoluteIndex: 446, + documentAbsoluteIndex: 444, documentLineIndex: 15, - generatedAbsoluteIndex: 2189, - generatedLineIndex: 71, + generatedAbsoluteIndex: 2092, + generatedLineIndex: 65, characterOffsetIndex: 46, contentLength: 8), BuildLineMapping( - documentAbsoluteIndex: 463, + documentAbsoluteIndex: 461, documentLineIndex: 15, - generatedAbsoluteIndex: 2485, - generatedLineIndex: 78, + generatedAbsoluteIndex: 2388, + generatedLineIndex: 72, characterOffsetIndex: 63, contentLength: 4), BuildLineMapping( - documentAbsoluteIndex: 507, + documentAbsoluteIndex: 505, documentLineIndex: 16, - generatedAbsoluteIndex: 2894, - generatedLineIndex: 86, + generatedAbsoluteIndex: 2797, + generatedLineIndex: 80, characterOffsetIndex: 31, contentLength: 30), BuildLineMapping( - documentAbsoluteIndex: 574, + documentAbsoluteIndex: 572, documentLineIndex: 17, documentCharacterOffsetIndex: 30, - generatedAbsoluteIndex: 3386, - generatedLineIndex: 95, + generatedAbsoluteIndex: 3289, + generatedLineIndex: 89, generatedCharacterOffsetIndex: 29, contentLength: 10), BuildLineMapping( - documentAbsoluteIndex: 606, + documentAbsoluteIndex: 604, documentLineIndex: 17, documentCharacterOffsetIndex: 62, - generatedAbsoluteIndex: 3529, - generatedLineIndex: 101, + generatedAbsoluteIndex: 3432, + generatedLineIndex: 95, generatedCharacterOffsetIndex: 61, contentLength: 1), BuildLineMapping( - documentAbsoluteIndex: 607, + documentAbsoluteIndex: 605, documentLineIndex: 17, documentCharacterOffsetIndex: 63, - generatedAbsoluteIndex: 3664, - generatedLineIndex: 107, + generatedAbsoluteIndex: 3567, + generatedLineIndex: 101, generatedCharacterOffsetIndex: 62, contentLength: 8), BuildLineMapping( - documentAbsoluteIndex: 637, + documentAbsoluteIndex: 635, documentLineIndex: 17, documentCharacterOffsetIndex: 93, - generatedAbsoluteIndex: 3835, - generatedLineIndex: 113, + generatedAbsoluteIndex: 3738, + generatedLineIndex: 107, generatedCharacterOffsetIndex: 91, contentLength: 1), BuildLineMapping( - documentAbsoluteIndex: 638, + documentAbsoluteIndex: 636, documentLineIndex: 17, documentCharacterOffsetIndex: 94, - generatedAbsoluteIndex: 4000, - generatedLineIndex: 119, + generatedAbsoluteIndex: 3903, + generatedLineIndex: 113, generatedCharacterOffsetIndex: 92, contentLength: 1), BuildLineMapping( - documentAbsoluteIndex: 643, + documentAbsoluteIndex: 641, documentLineIndex: 18, - generatedAbsoluteIndex: 4227, - generatedLineIndex: 127, + generatedAbsoluteIndex: 4130, + generatedLineIndex: 121, characterOffsetIndex: 0, contentLength: 15), BuildLineMapping( - documentAbsoluteIndex: 163, + documentAbsoluteIndex: 161, documentLineIndex: 7, - generatedAbsoluteIndex: 4438, - generatedLineIndex: 134, + generatedAbsoluteIndex: 4341, + generatedLineIndex: 128, characterOffsetIndex: 32, contentLength: 12), BuildLineMapping( - documentAbsoluteIndex: 769, + documentAbsoluteIndex: 767, documentLineIndex: 21, - generatedAbsoluteIndex: 4521, - generatedLineIndex: 139, + generatedAbsoluteIndex: 4424, + generatedLineIndex: 133, characterOffsetIndex: 0, contentLength: 12), BuildLineMapping( - documentAbsoluteIndex: 783, + documentAbsoluteIndex: 781, documentLineIndex: 21, - generatedAbsoluteIndex: 4619, - generatedLineIndex: 145, + generatedAbsoluteIndex: 4522, + generatedLineIndex: 139, characterOffsetIndex: 14, contentLength: 21), BuildLineMapping( - documentAbsoluteIndex: 836, + documentAbsoluteIndex: 834, documentLineIndex: 22, documentCharacterOffsetIndex: 29, - generatedAbsoluteIndex: 4962, - generatedLineIndex: 153, + generatedAbsoluteIndex: 4865, + generatedLineIndex: 147, generatedCharacterOffsetIndex: 42, contentLength: 1), BuildLineMapping( - documentAbsoluteIndex: 837, + documentAbsoluteIndex: 835, documentLineIndex: 22, documentCharacterOffsetIndex: 30, - generatedAbsoluteIndex: 4963, - generatedLineIndex: 153, + generatedAbsoluteIndex: 4866, + generatedLineIndex: 147, generatedCharacterOffsetIndex: 43, contentLength: 7), BuildLineMapping( - documentAbsoluteIndex: 844, + documentAbsoluteIndex: 842, documentLineIndex: 22, documentCharacterOffsetIndex: 37, - generatedAbsoluteIndex: 4970, - generatedLineIndex: 153, + generatedAbsoluteIndex: 4873, + generatedLineIndex: 147, generatedCharacterOffsetIndex: 50, contentLength: 1), BuildLineMapping( - documentAbsoluteIndex: 711, + documentAbsoluteIndex: 709, documentLineIndex: 20, documentCharacterOffsetIndex: 39, - generatedAbsoluteIndex: 5175, - generatedLineIndex: 159, + generatedAbsoluteIndex: 5078, + generatedLineIndex: 153, generatedCharacterOffsetIndex: 38, contentLength: 23), BuildLineMapping( - documentAbsoluteIndex: 734, + documentAbsoluteIndex: 732, documentLineIndex: 20, documentCharacterOffsetIndex: 62, - generatedAbsoluteIndex: 5198, - generatedLineIndex: 159, + generatedAbsoluteIndex: 5101, + generatedLineIndex: 153, generatedCharacterOffsetIndex: 61, contentLength: 7), BuildLineMapping( - documentAbsoluteIndex: 976, + documentAbsoluteIndex: 974, documentLineIndex: 25, documentCharacterOffsetIndex: 61, - generatedAbsoluteIndex: 5544, - generatedLineIndex: 166, + generatedAbsoluteIndex: 5447, + generatedLineIndex: 160, generatedCharacterOffsetIndex: 60, contentLength: 1), BuildLineMapping( - documentAbsoluteIndex: 977, + documentAbsoluteIndex: 975, documentLineIndex: 25, documentCharacterOffsetIndex: 62, - generatedAbsoluteIndex: 5545, - generatedLineIndex: 166, + generatedAbsoluteIndex: 5448, + generatedLineIndex: 160, generatedCharacterOffsetIndex: 61, contentLength: 30), BuildLineMapping( - documentAbsoluteIndex: 1007, + documentAbsoluteIndex: 1005, documentLineIndex: 25, documentCharacterOffsetIndex: 92, - generatedAbsoluteIndex: 5575, - generatedLineIndex: 166, + generatedAbsoluteIndex: 5478, + generatedLineIndex: 160, generatedCharacterOffsetIndex: 91, contentLength: 1), BuildLineMapping( - documentAbsoluteIndex: 879, + documentAbsoluteIndex: 877, documentLineIndex: 24, documentCharacterOffsetIndex: 16, - generatedAbsoluteIndex: 5775, - generatedLineIndex: 172, + generatedAbsoluteIndex: 5678, + generatedLineIndex: 166, generatedCharacterOffsetIndex: 33, contentLength: 8), BuildLineMapping( - documentAbsoluteIndex: 887, + documentAbsoluteIndex: 885, documentLineIndex: 24, documentCharacterOffsetIndex: 24, - generatedAbsoluteIndex: 5783, - generatedLineIndex: 172, + generatedAbsoluteIndex: 5686, + generatedLineIndex: 166, generatedCharacterOffsetIndex: 41, contentLength: 1), BuildLineMapping( - documentAbsoluteIndex: 888, + documentAbsoluteIndex: 886, documentLineIndex: 24, documentCharacterOffsetIndex: 25, - generatedAbsoluteIndex: 5784, - generatedLineIndex: 172, + generatedAbsoluteIndex: 5687, + generatedLineIndex: 166, generatedCharacterOffsetIndex: 42, contentLength: 23), BuildLineMapping( - documentAbsoluteIndex: 1106, + documentAbsoluteIndex: 1104, documentLineIndex: 28, documentCharacterOffsetIndex: 28, - generatedAbsoluteIndex: 6128, - generatedLineIndex: 179, + generatedAbsoluteIndex: 6031, + generatedLineIndex: 173, generatedCharacterOffsetIndex: 42, contentLength: 30), BuildLineMapping( - documentAbsoluteIndex: 1044, + documentAbsoluteIndex: 1042, documentLineIndex: 27, documentCharacterOffsetIndex: 16, - generatedAbsoluteIndex: 6357, - generatedLineIndex: 185, + generatedAbsoluteIndex: 6260, + generatedLineIndex: 179, generatedCharacterOffsetIndex: 33, contentLength: 30), BuildLineMapping( - documentAbsoluteIndex: 1234, + documentAbsoluteIndex: 1232, documentLineIndex: 31, documentCharacterOffsetIndex: 28, - generatedAbsoluteIndex: 6708, - generatedLineIndex: 192, + generatedAbsoluteIndex: 6611, + generatedLineIndex: 186, generatedCharacterOffsetIndex: 42, contentLength: 3), BuildLineMapping( - documentAbsoluteIndex: 1237, + documentAbsoluteIndex: 1235, documentLineIndex: 31, documentCharacterOffsetIndex: 31, - generatedAbsoluteIndex: 6711, - generatedLineIndex: 192, + generatedAbsoluteIndex: 6614, + generatedLineIndex: 186, generatedCharacterOffsetIndex: 45, contentLength: 2), BuildLineMapping( - documentAbsoluteIndex: 1239, + documentAbsoluteIndex: 1237, documentLineIndex: 31, documentCharacterOffsetIndex: 33, - generatedAbsoluteIndex: 6713, - generatedLineIndex: 192, + generatedAbsoluteIndex: 6616, + generatedLineIndex: 186, generatedCharacterOffsetIndex: 47, contentLength: 27), BuildLineMapping( - documentAbsoluteIndex: 1266, + documentAbsoluteIndex: 1264, documentLineIndex: 31, documentCharacterOffsetIndex: 60, - generatedAbsoluteIndex: 6740, - generatedLineIndex: 192, + generatedAbsoluteIndex: 6643, + generatedLineIndex: 186, generatedCharacterOffsetIndex: 74, contentLength: 1), BuildLineMapping( - documentAbsoluteIndex: 1267, + documentAbsoluteIndex: 1265, documentLineIndex: 31, documentCharacterOffsetIndex: 61, - generatedAbsoluteIndex: 6741, - generatedLineIndex: 192, + generatedAbsoluteIndex: 6644, + generatedLineIndex: 186, generatedCharacterOffsetIndex: 75, contentLength: 10), BuildLineMapping( - documentAbsoluteIndex: 1171, + documentAbsoluteIndex: 1169, documentLineIndex: 30, documentCharacterOffsetIndex: 17, - generatedAbsoluteIndex: 6950, - generatedLineIndex: 198, + generatedAbsoluteIndex: 6853, + generatedLineIndex: 192, generatedCharacterOffsetIndex: 33, contentLength: 1), BuildLineMapping( - documentAbsoluteIndex: 1172, + documentAbsoluteIndex: 1170, documentLineIndex: 30, documentCharacterOffsetIndex: 18, - generatedAbsoluteIndex: 6951, - generatedLineIndex: 198, + generatedAbsoluteIndex: 6854, + generatedLineIndex: 192, generatedCharacterOffsetIndex: 34, contentLength: 29), BuildLineMapping( - documentAbsoluteIndex: 1201, + documentAbsoluteIndex: 1199, documentLineIndex: 30, documentCharacterOffsetIndex: 47, - generatedAbsoluteIndex: 6980, - generatedLineIndex: 198, + generatedAbsoluteIndex: 6883, + generatedLineIndex: 192, generatedCharacterOffsetIndex: 63, contentLength: 1), BuildLineMapping( - documentAbsoluteIndex: 1306, + documentAbsoluteIndex: 1304, documentLineIndex: 33, - generatedAbsoluteIndex: 7061, - generatedLineIndex: 203, + generatedAbsoluteIndex: 6964, + generatedLineIndex: 197, characterOffsetIndex: 9, contentLength: 11), BuildLineMapping( - documentAbsoluteIndex: 1361, + documentAbsoluteIndex: 1359, documentLineIndex: 33, documentCharacterOffsetIndex: 64, - generatedAbsoluteIndex: 7422, - generatedLineIndex: 207, + generatedAbsoluteIndex: 7325, + generatedLineIndex: 201, generatedCharacterOffsetIndex: 63, contentLength: 7), BuildLineMapping( - documentAbsoluteIndex: 1326, + documentAbsoluteIndex: 1324, documentLineIndex: 33, documentCharacterOffsetIndex: 29, - generatedAbsoluteIndex: 7620, - generatedLineIndex: 213, + generatedAbsoluteIndex: 7523, + generatedLineIndex: 207, generatedCharacterOffsetIndex: 33, contentLength: 3), BuildLineMapping( - documentAbsoluteIndex: 1390, + documentAbsoluteIndex: 1388, documentLineIndex: 35, - generatedAbsoluteIndex: 7735, - generatedLineIndex: 224, + generatedAbsoluteIndex: 7638, + generatedLineIndex: 218, characterOffsetIndex: 0, contentLength: 1), } @@ -964,32 +969,33 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 439, - generatedLineIndex: 14, - characterOffsetIndex: 14, - contentLength: 11), + documentCharacterOffsetIndex: 14, + generatedAbsoluteIndex: 381, + generatedLineIndex: 12, + generatedCharacterOffsetIndex: 48, + contentLength: 9), BuildLineMapping( - documentAbsoluteIndex: 62, + documentAbsoluteIndex: 60, documentLineIndex: 3, documentCharacterOffsetIndex: 26, - generatedAbsoluteIndex: 1471, - generatedLineIndex: 38, + generatedAbsoluteIndex: 1367, + generatedLineIndex: 32, generatedCharacterOffsetIndex: 42, contentLength: 0), BuildLineMapping( - documentAbsoluteIndex: 122, + documentAbsoluteIndex: 120, documentLineIndex: 5, documentCharacterOffsetIndex: 30, - generatedAbsoluteIndex: 1942, - generatedLineIndex: 47, + generatedAbsoluteIndex: 1838, + generatedLineIndex: 41, generatedCharacterOffsetIndex: 42, contentLength: 0), BuildLineMapping( - documentAbsoluteIndex: 88, + documentAbsoluteIndex: 86, documentLineIndex: 4, documentCharacterOffsetIndex: 12, - generatedAbsoluteIndex: 2147, - generatedLineIndex: 53, + generatedAbsoluteIndex: 2043, + generatedLineIndex: 47, generatedCharacterOffsetIndex: 33, contentLength: 0), } @@ -1003,29 +1009,30 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 425, - generatedLineIndex: 14, - characterOffsetIndex: 14, - contentLength: 11), + documentCharacterOffsetIndex: 14, + generatedAbsoluteIndex: 374, + generatedLineIndex: 12, + generatedCharacterOffsetIndex: 48, + contentLength: 9), BuildLineMapping( - documentAbsoluteIndex: 102, + documentAbsoluteIndex: 100, documentLineIndex: 3, - generatedAbsoluteIndex: 993, - generatedLineIndex: 33, + generatedAbsoluteIndex: 896, + generatedLineIndex: 27, characterOffsetIndex: 29, contentLength: 12), BuildLineMapping( - documentAbsoluteIndex: 200, + documentAbsoluteIndex: 198, documentLineIndex: 5, - generatedAbsoluteIndex: 1334, - generatedLineIndex: 40, + generatedAbsoluteIndex: 1237, + generatedLineIndex: 34, characterOffsetIndex: 51, contentLength: 12), BuildLineMapping( - documentAbsoluteIndex: 223, + documentAbsoluteIndex: 221, documentLineIndex: 5, - generatedAbsoluteIndex: 1644, - generatedLineIndex: 47, + generatedAbsoluteIndex: 1547, + generatedLineIndex: 41, characterOffsetIndex: 74, contentLength: 4), } @@ -1039,24 +1046,25 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 447, - generatedLineIndex: 14, - characterOffsetIndex: 14, - contentLength: 14), + documentCharacterOffsetIndex: 14, + generatedAbsoluteIndex: 385, + generatedLineIndex: 12, + generatedCharacterOffsetIndex: 48, + contentLength: 12), BuildLineMapping( - documentAbsoluteIndex: 186, + documentAbsoluteIndex: 184, documentLineIndex: 5, documentCharacterOffsetIndex: 36, - generatedAbsoluteIndex: 1706, - generatedLineIndex: 40, + generatedAbsoluteIndex: 1598, + generatedLineIndex: 34, generatedCharacterOffsetIndex: 42, contentLength: 4), BuildLineMapping( - documentAbsoluteIndex: 232, + documentAbsoluteIndex: 230, documentLineIndex: 6, documentCharacterOffsetIndex: 36, - generatedAbsoluteIndex: 2302, - generatedLineIndex: 50, + generatedAbsoluteIndex: 2194, + generatedLineIndex: 44, generatedCharacterOffsetIndex: 42, contentLength: 4), } @@ -1070,90 +1078,91 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 445, - generatedLineIndex: 14, - characterOffsetIndex: 14, - contentLength: 17), + documentCharacterOffsetIndex: 14, + generatedAbsoluteIndex: 384, + generatedLineIndex: 12, + generatedCharacterOffsetIndex: 48, + contentLength: 15), BuildLineMapping( - documentAbsoluteIndex: 37, + documentAbsoluteIndex: 35, documentLineIndex: 2, - generatedAbsoluteIndex: 1014, - generatedLineIndex: 33, + generatedAbsoluteIndex: 907, + generatedLineIndex: 27, characterOffsetIndex: 2, contentLength: 242), BuildLineMapping( - documentAbsoluteIndex: 370, + documentAbsoluteIndex: 368, documentLineIndex: 15, documentCharacterOffsetIndex: 43, - generatedAbsoluteIndex: 1602, - generatedLineIndex: 50, + generatedAbsoluteIndex: 1495, + generatedLineIndex: 44, generatedCharacterOffsetIndex: 56, contentLength: 13), BuildLineMapping( - documentAbsoluteIndex: 404, + documentAbsoluteIndex: 402, documentLineIndex: 15, - generatedAbsoluteIndex: 1897, - generatedLineIndex: 56, + generatedAbsoluteIndex: 1790, + generatedLineIndex: 50, characterOffsetIndex: 77, contentLength: 16), BuildLineMapping( - documentAbsoluteIndex: 468, + documentAbsoluteIndex: 466, documentLineIndex: 16, documentCharacterOffsetIndex: 43, - generatedAbsoluteIndex: 2390, - generatedLineIndex: 64, + generatedAbsoluteIndex: 2283, + generatedLineIndex: 58, generatedCharacterOffsetIndex: 56, contentLength: 13), BuildLineMapping( - documentAbsoluteIndex: 502, + documentAbsoluteIndex: 500, documentLineIndex: 16, - generatedAbsoluteIndex: 2685, - generatedLineIndex: 70, + generatedAbsoluteIndex: 2578, + generatedLineIndex: 64, characterOffsetIndex: 77, contentLength: 2), BuildLineMapping( - documentAbsoluteIndex: 526, + documentAbsoluteIndex: 524, documentLineIndex: 16, - generatedAbsoluteIndex: 3013, - generatedLineIndex: 76, + generatedAbsoluteIndex: 2906, + generatedLineIndex: 70, characterOffsetIndex: 101, contentLength: 2), BuildLineMapping( - documentAbsoluteIndex: 590, + documentAbsoluteIndex: 588, documentLineIndex: 18, documentCharacterOffsetIndex: 31, - generatedAbsoluteIndex: 3477, - generatedLineIndex: 84, + generatedAbsoluteIndex: 3370, + generatedLineIndex: 78, generatedCharacterOffsetIndex: 46, contentLength: 2), BuildLineMapping( - documentAbsoluteIndex: 611, + documentAbsoluteIndex: 609, documentLineIndex: 18, documentCharacterOffsetIndex: 52, - generatedAbsoluteIndex: 3749, - generatedLineIndex: 90, + generatedAbsoluteIndex: 3642, + generatedLineIndex: 84, generatedCharacterOffsetIndex: 64, contentLength: 2), BuildLineMapping( - documentAbsoluteIndex: 634, + documentAbsoluteIndex: 632, documentLineIndex: 18, - generatedAbsoluteIndex: 4047, - generatedLineIndex: 96, + generatedAbsoluteIndex: 3940, + generatedLineIndex: 90, characterOffsetIndex: 75, contentLength: 2), BuildLineMapping( - documentAbsoluteIndex: 783, + documentAbsoluteIndex: 781, documentLineIndex: 20, - generatedAbsoluteIndex: 4772, - generatedLineIndex: 106, + generatedAbsoluteIndex: 4665, + generatedLineIndex: 100, characterOffsetIndex: 42, contentLength: 8), BuildLineMapping( - documentAbsoluteIndex: 826, + documentAbsoluteIndex: 824, documentLineIndex: 21, documentCharacterOffsetIndex: 29, - generatedAbsoluteIndex: 5379, - generatedLineIndex: 115, + generatedAbsoluteIndex: 5272, + generatedLineIndex: 109, generatedCharacterOffsetIndex: 65, contentLength: 2), } @@ -1167,24 +1176,25 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 447, - generatedLineIndex: 14, - characterOffsetIndex: 14, - contentLength: 17), + documentCharacterOffsetIndex: 14, + generatedAbsoluteIndex: 385, + generatedLineIndex: 12, + generatedCharacterOffsetIndex: 48, + contentLength: 15), BuildLineMapping( - documentAbsoluteIndex: 146, + documentAbsoluteIndex: 144, documentLineIndex: 4, documentCharacterOffsetIndex: 34, - generatedAbsoluteIndex: 1857, - generatedLineIndex: 42, + generatedAbsoluteIndex: 1749, + generatedLineIndex: 36, generatedCharacterOffsetIndex: 42, contentLength: 4), BuildLineMapping( - documentAbsoluteIndex: 43, + documentAbsoluteIndex: 41, documentLineIndex: 2, documentCharacterOffsetIndex: 8, - generatedAbsoluteIndex: 2070, - generatedLineIndex: 48, + generatedAbsoluteIndex: 1962, + generatedLineIndex: 42, generatedCharacterOffsetIndex: 33, contentLength: 1), } @@ -1198,222 +1208,223 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 443, - generatedLineIndex: 14, - characterOffsetIndex: 14, - contentLength: 17), + documentCharacterOffsetIndex: 14, + generatedAbsoluteIndex: 383, + generatedLineIndex: 12, + generatedCharacterOffsetIndex: 48, + contentLength: 15), BuildLineMapping( - documentAbsoluteIndex: 59, + documentAbsoluteIndex: 57, documentLineIndex: 2, - generatedAbsoluteIndex: 1038, - generatedLineIndex: 33, + generatedAbsoluteIndex: 932, + generatedLineIndex: 27, characterOffsetIndex: 24, contentLength: 12), BuildLineMapping( - documentAbsoluteIndex: 96, + documentAbsoluteIndex: 94, documentLineIndex: 4, documentCharacterOffsetIndex: 17, - generatedAbsoluteIndex: 1248, - generatedLineIndex: 39, + generatedAbsoluteIndex: 1142, + generatedLineIndex: 33, generatedCharacterOffsetIndex: 16, contentLength: 12), BuildLineMapping( - documentAbsoluteIndex: 109, + documentAbsoluteIndex: 107, documentLineIndex: 4, - generatedAbsoluteIndex: 1370, - generatedLineIndex: 45, + generatedAbsoluteIndex: 1264, + generatedLineIndex: 39, characterOffsetIndex: 30, contentLength: 12), BuildLineMapping( - documentAbsoluteIndex: 121, + documentAbsoluteIndex: 119, documentLineIndex: 4, - generatedAbsoluteIndex: 1503, - generatedLineIndex: 50, + generatedAbsoluteIndex: 1397, + generatedLineIndex: 44, characterOffsetIndex: 42, contentLength: 10), BuildLineMapping( - documentAbsoluteIndex: 132, + documentAbsoluteIndex: 130, documentLineIndex: 4, - generatedAbsoluteIndex: 1646, - generatedLineIndex: 56, + generatedAbsoluteIndex: 1540, + generatedLineIndex: 50, characterOffsetIndex: 53, contentLength: 5), BuildLineMapping( - documentAbsoluteIndex: 137, + documentAbsoluteIndex: 135, documentLineIndex: 4, - generatedAbsoluteIndex: 1788, - generatedLineIndex: 61, + generatedAbsoluteIndex: 1682, + generatedLineIndex: 55, characterOffsetIndex: 58, contentLength: 2), BuildLineMapping( - documentAbsoluteIndex: 176, + documentAbsoluteIndex: 174, documentLineIndex: 6, - generatedAbsoluteIndex: 1995, - generatedLineIndex: 68, + generatedAbsoluteIndex: 1889, + generatedLineIndex: 62, characterOffsetIndex: 22, contentLength: 12), BuildLineMapping( - documentAbsoluteIndex: 214, + documentAbsoluteIndex: 212, documentLineIndex: 6, - generatedAbsoluteIndex: 2212, - generatedLineIndex: 74, + generatedAbsoluteIndex: 2106, + generatedLineIndex: 68, characterOffsetIndex: 60, contentLength: 12), BuildLineMapping( - documentAbsoluteIndex: 256, + documentAbsoluteIndex: 254, documentLineIndex: 8, - generatedAbsoluteIndex: 2421, - generatedLineIndex: 80, + generatedAbsoluteIndex: 2315, + generatedLineIndex: 74, characterOffsetIndex: 15, contentLength: 13), BuildLineMapping( - documentAbsoluteIndex: 271, + documentAbsoluteIndex: 269, documentLineIndex: 8, documentCharacterOffsetIndex: 30, - generatedAbsoluteIndex: 2542, - generatedLineIndex: 85, + generatedAbsoluteIndex: 2436, + generatedLineIndex: 79, generatedCharacterOffsetIndex: 29, contentLength: 12), BuildLineMapping( - documentAbsoluteIndex: 284, + documentAbsoluteIndex: 282, documentLineIndex: 8, - generatedAbsoluteIndex: 2677, - generatedLineIndex: 91, + generatedAbsoluteIndex: 2571, + generatedLineIndex: 85, characterOffsetIndex: 43, contentLength: 12), BuildLineMapping( - documentAbsoluteIndex: 296, + documentAbsoluteIndex: 294, documentLineIndex: 8, - generatedAbsoluteIndex: 2823, - generatedLineIndex: 96, + generatedAbsoluteIndex: 2717, + generatedLineIndex: 90, characterOffsetIndex: 55, contentLength: 10), BuildLineMapping( - documentAbsoluteIndex: 307, + documentAbsoluteIndex: 305, documentLineIndex: 8, - generatedAbsoluteIndex: 2979, - generatedLineIndex: 102, + generatedAbsoluteIndex: 2873, + generatedLineIndex: 96, characterOffsetIndex: 66, contentLength: 5), BuildLineMapping( - documentAbsoluteIndex: 312, + documentAbsoluteIndex: 310, documentLineIndex: 8, - generatedAbsoluteIndex: 3134, - generatedLineIndex: 107, + generatedAbsoluteIndex: 3028, + generatedLineIndex: 101, characterOffsetIndex: 71, contentLength: 2), BuildLineMapping( - documentAbsoluteIndex: 316, + documentAbsoluteIndex: 314, documentLineIndex: 8, - generatedAbsoluteIndex: 3291, - generatedLineIndex: 113, + generatedAbsoluteIndex: 3185, + generatedLineIndex: 107, characterOffsetIndex: 75, contentLength: 12), BuildLineMapping( - documentAbsoluteIndex: 348, + documentAbsoluteIndex: 346, documentLineIndex: 9, - generatedAbsoluteIndex: 3466, - generatedLineIndex: 119, + generatedAbsoluteIndex: 3360, + generatedLineIndex: 113, characterOffsetIndex: 17, contentLength: 13), BuildLineMapping( - documentAbsoluteIndex: 363, + documentAbsoluteIndex: 361, documentLineIndex: 9, documentCharacterOffsetIndex: 32, - generatedAbsoluteIndex: 3590, - generatedLineIndex: 124, + generatedAbsoluteIndex: 3484, + generatedLineIndex: 118, generatedCharacterOffsetIndex: 31, contentLength: 12), BuildLineMapping( - documentAbsoluteIndex: 376, + documentAbsoluteIndex: 374, documentLineIndex: 9, - generatedAbsoluteIndex: 3728, - generatedLineIndex: 130, + generatedAbsoluteIndex: 3622, + generatedLineIndex: 124, characterOffsetIndex: 45, contentLength: 12), BuildLineMapping( - documentAbsoluteIndex: 388, + documentAbsoluteIndex: 386, documentLineIndex: 9, - generatedAbsoluteIndex: 3877, - generatedLineIndex: 135, + generatedAbsoluteIndex: 3771, + generatedLineIndex: 129, characterOffsetIndex: 57, contentLength: 10), BuildLineMapping( - documentAbsoluteIndex: 399, + documentAbsoluteIndex: 397, documentLineIndex: 9, - generatedAbsoluteIndex: 4036, - generatedLineIndex: 141, + generatedAbsoluteIndex: 3930, + generatedLineIndex: 135, characterOffsetIndex: 68, contentLength: 5), BuildLineMapping( - documentAbsoluteIndex: 404, + documentAbsoluteIndex: 402, documentLineIndex: 9, - generatedAbsoluteIndex: 4194, - generatedLineIndex: 146, + generatedAbsoluteIndex: 4088, + generatedLineIndex: 140, characterOffsetIndex: 73, contentLength: 2), BuildLineMapping( - documentAbsoluteIndex: 408, + documentAbsoluteIndex: 406, documentLineIndex: 9, - generatedAbsoluteIndex: 4354, - generatedLineIndex: 152, + generatedAbsoluteIndex: 4248, + generatedLineIndex: 146, characterOffsetIndex: 77, contentLength: 12), BuildLineMapping( - documentAbsoluteIndex: 445, + documentAbsoluteIndex: 443, documentLineIndex: 11, - generatedAbsoluteIndex: 4566, - generatedLineIndex: 158, + generatedAbsoluteIndex: 4460, + generatedLineIndex: 152, characterOffsetIndex: 17, contentLength: 13), BuildLineMapping( - documentAbsoluteIndex: 460, + documentAbsoluteIndex: 458, documentLineIndex: 11, - generatedAbsoluteIndex: 4691, - generatedLineIndex: 163, + generatedAbsoluteIndex: 4585, + generatedLineIndex: 157, characterOffsetIndex: 32, contentLength: 12), BuildLineMapping( - documentAbsoluteIndex: 492, + documentAbsoluteIndex: 490, documentLineIndex: 11, - generatedAbsoluteIndex: 4847, - generatedLineIndex: 168, + generatedAbsoluteIndex: 4741, + generatedLineIndex: 162, characterOffsetIndex: 64, contentLength: 12), BuildLineMapping( - documentAbsoluteIndex: 529, + documentAbsoluteIndex: 527, documentLineIndex: 13, documentCharacterOffsetIndex: 17, - generatedAbsoluteIndex: 5058, - generatedLineIndex: 174, + generatedAbsoluteIndex: 4952, + generatedLineIndex: 168, generatedCharacterOffsetIndex: 16, contentLength: 12), BuildLineMapping( - documentAbsoluteIndex: 542, + documentAbsoluteIndex: 540, documentLineIndex: 13, - generatedAbsoluteIndex: 5181, - generatedLineIndex: 180, + generatedAbsoluteIndex: 5075, + generatedLineIndex: 174, characterOffsetIndex: 30, contentLength: 12), BuildLineMapping( - documentAbsoluteIndex: 554, + documentAbsoluteIndex: 552, documentLineIndex: 13, - generatedAbsoluteIndex: 5315, - generatedLineIndex: 185, + generatedAbsoluteIndex: 5209, + generatedLineIndex: 179, characterOffsetIndex: 42, contentLength: 10), BuildLineMapping( - documentAbsoluteIndex: 565, + documentAbsoluteIndex: 563, documentLineIndex: 13, - generatedAbsoluteIndex: 5459, - generatedLineIndex: 191, + generatedAbsoluteIndex: 5353, + generatedLineIndex: 185, characterOffsetIndex: 53, contentLength: 5), BuildLineMapping( - documentAbsoluteIndex: 570, + documentAbsoluteIndex: 568, documentLineIndex: 13, - generatedAbsoluteIndex: 5602, - generatedLineIndex: 196, + generatedAbsoluteIndex: 5496, + generatedLineIndex: 190, characterOffsetIndex: 58, contentLength: 2), } @@ -1427,129 +1438,130 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 455, - generatedLineIndex: 14, - characterOffsetIndex: 14, - contentLength: 17), + documentCharacterOffsetIndex: 14, + generatedAbsoluteIndex: 389, + generatedLineIndex: 12, + generatedCharacterOffsetIndex: 48, + contentLength: 15), BuildLineMapping( - documentAbsoluteIndex: 35, + documentAbsoluteIndex: 33, documentLineIndex: 1, - generatedAbsoluteIndex: 929, - generatedLineIndex: 32, + generatedAbsoluteIndex: 817, + generatedLineIndex: 26, characterOffsetIndex: 2, contentLength: 59), BuildLineMapping( - documentAbsoluteIndex: 122, + documentAbsoluteIndex: 120, documentLineIndex: 6, documentCharacterOffsetIndex: 23, - generatedAbsoluteIndex: 1200, - generatedLineIndex: 41, + generatedAbsoluteIndex: 1088, + generatedLineIndex: 35, generatedCharacterOffsetIndex: 33, contentLength: 4), BuildLineMapping( - documentAbsoluteIndex: 157, + documentAbsoluteIndex: 155, documentLineIndex: 7, - generatedAbsoluteIndex: 1396, - generatedLineIndex: 47, + generatedAbsoluteIndex: 1284, + generatedLineIndex: 41, characterOffsetIndex: 12, contentLength: 6), BuildLineMapping( - documentAbsoluteIndex: 171, + documentAbsoluteIndex: 169, documentLineIndex: 7, documentCharacterOffsetIndex: 26, - generatedAbsoluteIndex: 1520, - generatedLineIndex: 52, + generatedAbsoluteIndex: 1408, + generatedLineIndex: 46, generatedCharacterOffsetIndex: 33, contentLength: 2), BuildLineMapping( - documentAbsoluteIndex: 202, + documentAbsoluteIndex: 200, documentLineIndex: 8, documentCharacterOffsetIndex: 21, - generatedAbsoluteIndex: 1735, - generatedLineIndex: 58, + generatedAbsoluteIndex: 1623, + generatedLineIndex: 52, generatedCharacterOffsetIndex: 33, contentLength: 5), BuildLineMapping( - documentAbsoluteIndex: 207, + documentAbsoluteIndex: 205, documentLineIndex: 8, documentCharacterOffsetIndex: 26, - generatedAbsoluteIndex: 1740, - generatedLineIndex: 58, + generatedAbsoluteIndex: 1628, + generatedLineIndex: 52, generatedCharacterOffsetIndex: 38, contentLength: 1), BuildLineMapping( - documentAbsoluteIndex: 208, + documentAbsoluteIndex: 206, documentLineIndex: 8, documentCharacterOffsetIndex: 27, - generatedAbsoluteIndex: 1741, - generatedLineIndex: 58, + generatedAbsoluteIndex: 1629, + generatedLineIndex: 52, generatedCharacterOffsetIndex: 39, contentLength: 3), BuildLineMapping( - documentAbsoluteIndex: 241, + documentAbsoluteIndex: 239, documentLineIndex: 9, documentCharacterOffsetIndex: 22, - generatedAbsoluteIndex: 1958, - generatedLineIndex: 64, + generatedAbsoluteIndex: 1846, + generatedLineIndex: 58, generatedCharacterOffsetIndex: 33, contentLength: 3), BuildLineMapping( - documentAbsoluteIndex: 274, + documentAbsoluteIndex: 272, documentLineIndex: 10, documentCharacterOffsetIndex: 22, - generatedAbsoluteIndex: 2175, - generatedLineIndex: 70, + generatedAbsoluteIndex: 2063, + generatedLineIndex: 64, generatedCharacterOffsetIndex: 33, contentLength: 1), BuildLineMapping( - documentAbsoluteIndex: 275, + documentAbsoluteIndex: 273, documentLineIndex: 10, documentCharacterOffsetIndex: 23, - generatedAbsoluteIndex: 2176, - generatedLineIndex: 70, + generatedAbsoluteIndex: 2064, + generatedLineIndex: 64, generatedCharacterOffsetIndex: 34, contentLength: 4), BuildLineMapping( - documentAbsoluteIndex: 279, + documentAbsoluteIndex: 277, documentLineIndex: 10, documentCharacterOffsetIndex: 27, - generatedAbsoluteIndex: 2180, - generatedLineIndex: 70, + generatedAbsoluteIndex: 2068, + generatedLineIndex: 64, generatedCharacterOffsetIndex: 38, contentLength: 1), BuildLineMapping( - documentAbsoluteIndex: 307, + documentAbsoluteIndex: 305, documentLineIndex: 11, - generatedAbsoluteIndex: 2381, - generatedLineIndex: 76, + generatedAbsoluteIndex: 2269, + generatedLineIndex: 70, characterOffsetIndex: 19, contentLength: 6), BuildLineMapping( - documentAbsoluteIndex: 321, + documentAbsoluteIndex: 319, documentLineIndex: 11, - generatedAbsoluteIndex: 2506, - generatedLineIndex: 81, + generatedAbsoluteIndex: 2394, + generatedLineIndex: 75, characterOffsetIndex: 33, contentLength: 4), BuildLineMapping( - documentAbsoluteIndex: 325, + documentAbsoluteIndex: 323, documentLineIndex: 11, - generatedAbsoluteIndex: 2510, - generatedLineIndex: 81, + generatedAbsoluteIndex: 2398, + generatedLineIndex: 75, characterOffsetIndex: 37, contentLength: 2), BuildLineMapping( - documentAbsoluteIndex: 327, + documentAbsoluteIndex: 325, documentLineIndex: 11, - generatedAbsoluteIndex: 2512, - generatedLineIndex: 81, + generatedAbsoluteIndex: 2400, + generatedLineIndex: 75, characterOffsetIndex: 39, contentLength: 8), BuildLineMapping( - documentAbsoluteIndex: 335, + documentAbsoluteIndex: 333, documentLineIndex: 11, - generatedAbsoluteIndex: 2520, - generatedLineIndex: 81, + generatedAbsoluteIndex: 2408, + generatedLineIndex: 75, characterOffsetIndex: 47, contentLength: 1), } @@ -1563,44 +1575,45 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 441, - generatedLineIndex: 14, - characterOffsetIndex: 14, - contentLength: 17), + documentCharacterOffsetIndex: 14, + generatedAbsoluteIndex: 382, + generatedLineIndex: 12, + generatedCharacterOffsetIndex: 48, + contentLength: 15), BuildLineMapping( - documentAbsoluteIndex: 182, + documentAbsoluteIndex: 180, documentLineIndex: 5, - generatedAbsoluteIndex: 1087, - generatedLineIndex: 34, + generatedAbsoluteIndex: 982, + generatedLineIndex: 28, characterOffsetIndex: 0, contentLength: 12), BuildLineMapping( - documentAbsoluteIndex: 195, + documentAbsoluteIndex: 193, documentLineIndex: 5, documentCharacterOffsetIndex: 13, - generatedAbsoluteIndex: 1190, - generatedLineIndex: 40, + generatedAbsoluteIndex: 1085, + generatedLineIndex: 34, generatedCharacterOffsetIndex: 12, contentLength: 30), BuildLineMapping( - documentAbsoluteIndex: 339, + documentAbsoluteIndex: 337, documentLineIndex: 7, - generatedAbsoluteIndex: 1555, - generatedLineIndex: 48, + generatedAbsoluteIndex: 1450, + generatedLineIndex: 42, characterOffsetIndex: 50, contentLength: 23), BuildLineMapping( - documentAbsoluteIndex: 389, + documentAbsoluteIndex: 387, documentLineIndex: 7, - generatedAbsoluteIndex: 1904, - generatedLineIndex: 55, + generatedAbsoluteIndex: 1799, + generatedLineIndex: 49, characterOffsetIndex: 100, contentLength: 4), BuildLineMapping( - documentAbsoluteIndex: 424, + documentAbsoluteIndex: 422, documentLineIndex: 9, - generatedAbsoluteIndex: 1987, - generatedLineIndex: 60, + generatedAbsoluteIndex: 1882, + generatedLineIndex: 54, characterOffsetIndex: 0, contentLength: 15), } @@ -1614,40 +1627,41 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 433, - generatedLineIndex: 14, - characterOffsetIndex: 14, - contentLength: 9), + documentCharacterOffsetIndex: 14, + generatedAbsoluteIndex: 378, + generatedLineIndex: 12, + generatedCharacterOffsetIndex: 48, + contentLength: 7), BuildLineMapping( - documentAbsoluteIndex: 296, + documentAbsoluteIndex: 294, documentLineIndex: 11, documentCharacterOffsetIndex: 18, - generatedAbsoluteIndex: 1045, - generatedLineIndex: 33, + generatedAbsoluteIndex: 944, + generatedLineIndex: 27, generatedCharacterOffsetIndex: 46, contentLength: 5), BuildLineMapping( - documentAbsoluteIndex: 345, + documentAbsoluteIndex: 343, documentLineIndex: 12, documentCharacterOffsetIndex: 20, - generatedAbsoluteIndex: 1281, - generatedLineIndex: 39, + generatedAbsoluteIndex: 1180, + generatedLineIndex: 33, generatedCharacterOffsetIndex: 47, contentLength: 5), BuildLineMapping( - documentAbsoluteIndex: 399, + documentAbsoluteIndex: 397, documentLineIndex: 13, documentCharacterOffsetIndex: 23, - generatedAbsoluteIndex: 1513, - generatedLineIndex: 45, + generatedAbsoluteIndex: 1412, + generatedLineIndex: 39, generatedCharacterOffsetIndex: 43, contentLength: 13), BuildLineMapping( - documentAbsoluteIndex: 481, + documentAbsoluteIndex: 479, documentLineIndex: 14, documentCharacterOffsetIndex: 24, - generatedAbsoluteIndex: 1753, - generatedLineIndex: 51, + generatedAbsoluteIndex: 1652, + generatedLineIndex: 45, generatedCharacterOffsetIndex: 43, contentLength: 13), } @@ -1661,70 +1675,71 @@ namespace Microsoft.AspNet.Razor.Test.Generator BuildLineMapping( documentAbsoluteIndex: 14, documentLineIndex: 0, - generatedAbsoluteIndex: 419, - generatedLineIndex: 14, - characterOffsetIndex: 14, - contentLength: 17), + documentCharacterOffsetIndex: 14, + generatedAbsoluteIndex: 371, + generatedLineIndex: 12, + generatedCharacterOffsetIndex: 48, + contentLength: 15), BuildLineMapping( - documentAbsoluteIndex: 37, + documentAbsoluteIndex: 35, documentLineIndex: 2, - generatedAbsoluteIndex: 964, - generatedLineIndex: 33, + generatedAbsoluteIndex: 870, + generatedLineIndex: 27, characterOffsetIndex: 2, contentLength: 39), BuildLineMapping( - documentAbsoluteIndex: 96, + documentAbsoluteIndex: 94, documentLineIndex: 6, documentCharacterOffsetIndex: 15, - generatedAbsoluteIndex: 1320, - generatedLineIndex: 42, + generatedAbsoluteIndex: 1226, + generatedLineIndex: 36, generatedCharacterOffsetIndex: 39, contentLength: 14), BuildLineMapping( - documentAbsoluteIndex: 131, + documentAbsoluteIndex: 129, documentLineIndex: 7, - generatedAbsoluteIndex: 1628, - generatedLineIndex: 49, + generatedAbsoluteIndex: 1534, + generatedLineIndex: 43, characterOffsetIndex: 15, contentLength: 20), BuildLineMapping( - documentAbsoluteIndex: 171, + documentAbsoluteIndex: 169, documentLineIndex: 8, documentCharacterOffsetIndex: 14, - generatedAbsoluteIndex: 2011, - generatedLineIndex: 56, + generatedAbsoluteIndex: 1917, + generatedLineIndex: 50, generatedCharacterOffsetIndex: 84, contentLength: 7), BuildLineMapping( - documentAbsoluteIndex: 198, + documentAbsoluteIndex: 196, documentLineIndex: 9, documentCharacterOffsetIndex: 14, - generatedAbsoluteIndex: 2382, - generatedLineIndex: 63, + generatedAbsoluteIndex: 2288, + generatedLineIndex: 57, generatedCharacterOffsetIndex: 84, contentLength: 13), BuildLineMapping( - documentAbsoluteIndex: 224, + documentAbsoluteIndex: 222, documentLineIndex: 9, documentCharacterOffsetIndex: 40, - generatedAbsoluteIndex: 2553, - generatedLineIndex: 68, + generatedAbsoluteIndex: 2459, + generatedLineIndex: 62, generatedCharacterOffsetIndex: 90, contentLength: 7), BuildLineMapping( - documentAbsoluteIndex: 251, + documentAbsoluteIndex: 249, documentLineIndex: 10, documentCharacterOffsetIndex: 15, - generatedAbsoluteIndex: 2879, - generatedLineIndex: 75, + generatedAbsoluteIndex: 2785, + generatedLineIndex: 69, generatedCharacterOffsetIndex: 39, contentLength: 9), BuildLineMapping( - documentAbsoluteIndex: 274, + documentAbsoluteIndex: 272, documentLineIndex: 10, documentCharacterOffsetIndex: 38, - generatedAbsoluteIndex: 3001, - generatedLineIndex: 80, + generatedAbsoluteIndex: 2907, + generatedLineIndex: 74, generatedCharacterOffsetIndex: 45, contentLength: 9), } @@ -1800,34 +1815,40 @@ namespace Microsoft.AspNet.Razor.Test.Generator public void CSharpChunkGenerator_CorrectlyGeneratesMappings_ForRemoveTagHelperDirective() { // Act & Assert - RunTagHelperTest("RemoveTagHelperDirective", - designTimeMode: true, - expectedDesignTimePragmas: new List() - { - BuildLineMapping(documentAbsoluteIndex: 17, - documentLineIndex: 0, - generatedAbsoluteIndex: 442, - generatedLineIndex: 14, - characterOffsetIndex: 17, - contentLength: 17) - }); + RunTagHelperTest( + "RemoveTagHelperDirective", + designTimeMode: true, + expectedDesignTimePragmas: new List() + { + BuildLineMapping( + documentAbsoluteIndex: 17, + documentLineIndex: 0, + documentCharacterOffsetIndex: 17, + generatedAbsoluteIndex: 381, + generatedLineIndex: 12, + generatedCharacterOffsetIndex: 48, + contentLength: 15), + }); } [Fact] public void CSharpChunkGenerator_CorrectlyGeneratesMappings_ForAddTagHelperDirective() { // Act & Assert - RunTagHelperTest("AddTagHelperDirective", - designTimeMode: true, - expectedDesignTimePragmas: new List() - { - BuildLineMapping(documentAbsoluteIndex: 14, - documentLineIndex: 0, - generatedAbsoluteIndex: 433, - generatedLineIndex: 14, - characterOffsetIndex: 14, - contentLength: 17) - }); + RunTagHelperTest( + "AddTagHelperDirective", + designTimeMode: true, + expectedDesignTimePragmas: new List() + { + BuildLineMapping( + documentAbsoluteIndex: 14, + documentLineIndex: 0, + documentCharacterOffsetIndex: 14, + generatedAbsoluteIndex: 378, + generatedLineIndex: 12, + generatedCharacterOffsetIndex: 48, + contentLength: 15), + }); } [Fact] diff --git a/test/Microsoft.AspNet.Razor.Test/Framework/TestSpanBuilder.cs b/test/Microsoft.AspNet.Razor.Test/Framework/TestSpanBuilder.cs index 9f607c7db7..270ef9f038 100644 --- a/test/Microsoft.AspNet.Razor.Test/Framework/TestSpanBuilder.cs +++ b/test/Microsoft.AspNet.Razor.Test/Framework/TestSpanBuilder.cs @@ -332,25 +332,24 @@ namespace Microsoft.AspNet.Razor.Test.Framework .Accepts(AcceptedCharacters.AnyExceptNewline); } - public SpanConstructor AsAddTagHelper(string lookupText) + public SpanConstructor AsAddTagHelper() { return _self - .With( - new AddOrRemoveTagHelperChunkGenerator(removeTagHelperDescriptors: false, lookupText: lookupText)) + .With(new AddTagHelperChunkGenerator()) .Accepts(AcceptedCharacters.AnyExceptNewline); } - public SpanConstructor AsRemoveTagHelper(string lookupText) + public SpanConstructor AsRemoveTagHelper() { return _self - .With(new AddOrRemoveTagHelperChunkGenerator(removeTagHelperDescriptors: true, lookupText: lookupText)) + .With(new RemoveTagHelperChunkGenerator()) .Accepts(AcceptedCharacters.AnyExceptNewline); } - public SpanConstructor AsTagHelperPrefixDirective(string prefix) + public SpanConstructor AsTagHelperPrefixDirective() { return _self - .With(new TagHelperPrefixDirectiveChunkGenerator(prefix)) + .With(new TagHelperPrefixDirectiveChunkGenerator()) .Accepts(AcceptedCharacters.AnyExceptNewline); } diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpDirectivesTest.cs b/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpDirectivesTest.cs index 79cd217c7c..7c853b0966 100644 --- a/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpDirectivesTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpDirectivesTest.cs @@ -11,30 +11,17 @@ namespace Microsoft.AspNet.Razor.Test.Parser.CSharp { public class CSharpDirectivesTest : CsHtmlCodeParserTestBase { - [Fact] - public void TagHelperPrefixDirective_NoValueSucceeds() - { - ParseBlockTest("@tagHelperPrefix \"\"", - new DirectiveBlock( - Factory.CodeTransition(), - Factory - .MetaCode(SyntaxConstants.CSharp.TagHelperPrefixKeyword + " ") - .Accepts(AcceptedCharacters.None), - Factory.Code("\"\"") - .AsTagHelperPrefixDirective(string.Empty))); - } - [Fact] public void TagHelperPrefixDirective_Succeeds() { - ParseBlockTest("@tagHelperPrefix \"Foo\"", + ParseBlockTest("@tagHelperPrefix Foo", new DirectiveBlock( Factory.CodeTransition(), Factory .MetaCode(SyntaxConstants.CSharp.TagHelperPrefixKeyword + " ") .Accepts(AcceptedCharacters.None), - Factory.Code("\"Foo\"") - .AsTagHelperPrefixDirective("Foo"))); + Factory.Code("Foo") + .AsTagHelperPrefixDirective())); } [Fact] @@ -47,7 +34,7 @@ namespace Microsoft.AspNet.Razor.Test.Parser.CSharp .MetaCode(SyntaxConstants.CSharp.TagHelperPrefixKeyword + " ") .Accepts(AcceptedCharacters.None), Factory.EmptyCSharp() - .AsStatement() + .AsTagHelperPrefixDirective() .Accepts(AcceptedCharacters.AnyExceptNewline)), new RazorError( RazorResources.FormatParseError_DirectiveMustHaveValue( @@ -55,87 +42,28 @@ namespace Microsoft.AspNet.Razor.Test.Parser.CSharp absoluteIndex: 1, lineIndex: 0, columnIndex: 1, length: 15)); } - [Fact] - public void TagHelperPrefixDirective_StartQuoteRequiresDoubleQuotesAroundValue() - { - ParseBlockTest("@tagHelperPrefix \"Foo", - new DirectiveBlock( - Factory.CodeTransition(), - Factory - .MetaCode(SyntaxConstants.CSharp.TagHelperPrefixKeyword + " ") - .Accepts(AcceptedCharacters.None), - Factory.Code("\"Foo") - .AsTagHelperPrefixDirective("Foo")), - new RazorError( - RazorResources.ParseError_Unterminated_String_Literal, - absoluteIndex: 17, lineIndex: 0, columnIndex: 17, length: 1), - new RazorError( - RazorResources.FormatParseError_DirectiveMustBeSurroundedByQuotes( - SyntaxConstants.CSharp.TagHelperPrefixKeyword), - absoluteIndex: 17, lineIndex: 0, columnIndex: 17, length: 4)); - } - - [Fact] - public void TagHelperPrefixDirective_EndQuoteRequiresDoubleQuotesAroundValue() - { - ParseBlockTest("@tagHelperPrefix Foo\"", - new DirectiveBlock( - Factory.CodeTransition(), - Factory - .MetaCode(SyntaxConstants.CSharp.TagHelperPrefixKeyword + " ") - .Accepts(AcceptedCharacters.None), - Factory.Code("Foo\"") - .AsStatement() - .Accepts(AcceptedCharacters.AnyExceptNewline)), - new RazorError( - RazorResources.ParseError_Unterminated_String_Literal, - absoluteIndex: 20, lineIndex: 0, columnIndex: 20, length: 1), - new RazorError( - RazorResources.FormatParseError_DirectiveMustBeSurroundedByQuotes( - SyntaxConstants.CSharp.TagHelperPrefixKeyword), - absoluteIndex: 17, lineIndex: 0, columnIndex: 17, length: 4)); - } - - [Fact] - public void TagHelperPrefixDirective_RequiresDoubleQuotesAroundValue() - { - ParseBlockTest("@tagHelperPrefix Foo", - new DirectiveBlock( - Factory.CodeTransition(), - Factory - .MetaCode(SyntaxConstants.CSharp.TagHelperPrefixKeyword + " ") - .Accepts(AcceptedCharacters.None), - Factory.Code("Foo") - .AsStatement() - .Accepts(AcceptedCharacters.AnyExceptNewline)), - new RazorError( - RazorResources.FormatParseError_DirectiveMustBeSurroundedByQuotes( - SyntaxConstants.CSharp.TagHelperPrefixKeyword), - absoluteIndex: 17, lineIndex: 0, columnIndex: 17, length: 3)); - } - [Fact] public void RemoveTagHelperDirective_Succeeds() { - ParseBlockTest("@removeTagHelper \"Foo\"", + ParseBlockTest("@removeTagHelper Foo", new DirectiveBlock( Factory.CodeTransition(), Factory.MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword + " ") .Accepts(AcceptedCharacters.None), - Factory.Code("\"Foo\"") - .AsRemoveTagHelper("Foo"))); + Factory.Code("Foo") + .AsRemoveTagHelper())); } [Fact] public void RemoveTagHelperDirective_SupportsSpaces() { - ParseBlockTest("@removeTagHelper \" Foo, Bar \" ", + ParseBlockTest("@removeTagHelper Foo, Bar ", new DirectiveBlock( Factory.CodeTransition(), - Factory.MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword + " ") + Factory.MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword + " ") .Accepts(AcceptedCharacters.None), - Factory.Code("\" Foo, Bar \" ") - .AsRemoveTagHelper("Foo, Bar") + Factory.Code("Foo, Bar ") + .AsRemoveTagHelper() .Accepts(AcceptedCharacters.AnyExceptNewline))); } @@ -148,7 +76,7 @@ namespace Microsoft.AspNet.Razor.Test.Parser.CSharp Factory.MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword + " ") .Accepts(AcceptedCharacters.None), Factory.EmptyCSharp() - .AsStatement() + .AsRemoveTagHelper() .Accepts(AcceptedCharacters.AnyExceptNewline)), new RazorError( RazorResources.FormatParseError_DirectiveMustHaveValue( @@ -156,84 +84,28 @@ namespace Microsoft.AspNet.Razor.Test.Parser.CSharp absoluteIndex: 1, lineIndex: 0, columnIndex: 1, length: 15)); } - [Fact] - public void RemoveTagHelperDirective_StartQuoteRequiresDoubleQuotesAroundValue() - { - ParseBlockTest("@removeTagHelper \"Foo", - new DirectiveBlock( - Factory.CodeTransition(), - Factory.MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword + " ") - .Accepts(AcceptedCharacters.None), - Factory.Code("\"Foo") - .AsRemoveTagHelper("Foo")), - new RazorError( - RazorResources.ParseError_Unterminated_String_Literal, - absoluteIndex: 17, lineIndex: 0, columnIndex: 17, length: 1), - new RazorError( - RazorResources.FormatParseError_DirectiveMustBeSurroundedByQuotes( - SyntaxConstants.CSharp.RemoveTagHelperKeyword), - absoluteIndex: 17, lineIndex: 0, columnIndex: 17, length: 4)); - } - - [Fact] - public void RemoveTagHelperDirective_EndQuoteRequiresDoubleQuotesAroundValue() - { - ParseBlockTest("@removeTagHelper Foo\"", - new DirectiveBlock( - Factory.CodeTransition(), - Factory.MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword + " ") - .Accepts(AcceptedCharacters.None), - Factory.Code("Foo\"") - .AsStatement() - .Accepts(AcceptedCharacters.AnyExceptNewline)), - new RazorError( - RazorResources.ParseError_Unterminated_String_Literal, - absoluteIndex: 20, lineIndex: 0, columnIndex: 20, length: 1), - new RazorError( - RazorResources.FormatParseError_DirectiveMustBeSurroundedByQuotes( - SyntaxConstants.CSharp.RemoveTagHelperKeyword), - absoluteIndex: 17, lineIndex: 0, columnIndex: 17, length: 4)); - } - - [Fact] - public void RemoveTagHelperDirective_RequiresDoubleQuotesAroundValue() - { - ParseBlockTest("@removeTagHelper Foo", - new DirectiveBlock( - Factory.CodeTransition(), - Factory.MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword + " ") - .Accepts(AcceptedCharacters.None), - Factory.Code("Foo") - .AsStatement() - .Accepts(AcceptedCharacters.AnyExceptNewline)), - new RazorError( - RazorResources.FormatParseError_DirectiveMustBeSurroundedByQuotes( - SyntaxConstants.CSharp.RemoveTagHelperKeyword), - absoluteIndex: 17, lineIndex: 0, columnIndex: 17, length: 3)); - } - [Fact] public void AddTagHelperDirective_Succeeds() { - ParseBlockTest("@addTagHelper \"Foo\"", + ParseBlockTest("@addTagHelper Foo", new DirectiveBlock( Factory.CodeTransition(), Factory.MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword + " ") .Accepts(AcceptedCharacters.None), - Factory.Code("\"Foo\"") - .AsAddTagHelper("Foo"))); + Factory.Code("Foo") + .AsAddTagHelper())); } [Fact] public void AddTagHelperDirectiveSupportsSpaces() { - ParseBlockTest("@addTagHelper \" Foo, Bar \" ", + ParseBlockTest("@addTagHelper Foo, Bar ", new DirectiveBlock( Factory.CodeTransition(), - Factory.MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword + " ") + Factory.MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword + " ") .Accepts(AcceptedCharacters.None), - Factory.Code("\" Foo, Bar \" ") - .AsAddTagHelper("Foo, Bar"))); + Factory.Code("Foo, Bar ") + .AsAddTagHelper())); } [Fact] @@ -245,69 +117,13 @@ namespace Microsoft.AspNet.Razor.Test.Parser.CSharp Factory.MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword + " ") .Accepts(AcceptedCharacters.None), Factory.EmptyCSharp() - .AsStatement() + .AsAddTagHelper() .Accepts(AcceptedCharacters.AnyExceptNewline)), new RazorError( RazorResources.FormatParseError_DirectiveMustHaveValue(SyntaxConstants.CSharp.AddTagHelperKeyword), absoluteIndex: 1, lineIndex: 0, columnIndex: 1, length: 12)); } - [Fact] - public void AddTagHelperDirectiveWithStartQuoteRequiresDoubleQuotesAroundValue() - { - ParseBlockTest("@addTagHelper \"Foo", - new DirectiveBlock( - Factory.CodeTransition(), - Factory.MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword + " ") - .Accepts(AcceptedCharacters.None), - Factory.Code("\"Foo") - .AsAddTagHelper("Foo")), - new RazorError( - RazorResources.ParseError_Unterminated_String_Literal, - absoluteIndex: 14, lineIndex: 0, columnIndex: 14, length: 1), - new RazorError( - RazorResources.FormatParseError_DirectiveMustBeSurroundedByQuotes( - SyntaxConstants.CSharp.AddTagHelperKeyword), - absoluteIndex: 14, lineIndex: 0, columnIndex: 14, length: 4)); - } - - [Fact] - public void AddTagHelperDirectiveWithEndQuoteRequiresDoubleQuotesAroundValue() - { - ParseBlockTest("@addTagHelper Foo\"", - new DirectiveBlock( - Factory.CodeTransition(), - Factory.MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword + " ") - .Accepts(AcceptedCharacters.None), - Factory.Code("Foo\"") - .AsStatement() - .Accepts(AcceptedCharacters.AnyExceptNewline)), - new RazorError( - RazorResources.ParseError_Unterminated_String_Literal, - absoluteIndex: 17, lineIndex: 0, columnIndex: 17, length: 1), - new RazorError( - RazorResources.FormatParseError_DirectiveMustBeSurroundedByQuotes( - SyntaxConstants.CSharp.AddTagHelperKeyword), - absoluteIndex: 14, lineIndex: 0, columnIndex: 14, length: 4)); - } - - [Fact] - public void AddTagHelperDirectiveRequiresDoubleQuotesAroundValue() - { - ParseBlockTest("@addTagHelper Foo", - new DirectiveBlock( - Factory.CodeTransition(), - Factory.MetaCode(SyntaxConstants.CSharp.AddTagHelperKeyword + " ") - .Accepts(AcceptedCharacters.None), - Factory.Code("Foo") - .AsStatement() - .Accepts(AcceptedCharacters.AnyExceptNewline)), - new RazorError( - RazorResources.FormatParseError_DirectiveMustBeSurroundedByQuotes( - SyntaxConstants.CSharp.AddTagHelperKeyword), - absoluteIndex: 14, lineIndex: 0, columnIndex: 14, length: 3)); - } - [Fact] public void InheritsDirective() { diff --git a/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs b/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs index db0b78973c..a1db3f7921 100644 --- a/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs @@ -32,10 +32,10 @@ namespace Microsoft.AspNet.Razor.Compilation.TagHelpers resolver.Object, new ErrorSink()); var document = new MarkupBlock( - Factory.Code("\"one\"").AsAddTagHelper("one"), - Factory.Code("\"two\"").AsRemoveTagHelper("two"), - Factory.Code("\"three\"").AsRemoveTagHelper("three"), - Factory.Code("\"four\"").AsTagHelperPrefixDirective("four")); + Factory.Code("one").AsAddTagHelper(), + Factory.Code("two").AsRemoveTagHelper(), + Factory.Code("three").AsRemoveTagHelper(), + Factory.Code("four").AsTagHelperPrefixDirective()); // Act tagHelperDirectiveSpanVisitor.GetDescriptors(document); @@ -52,10 +52,10 @@ namespace Microsoft.AspNet.Razor.Compilation.TagHelpers var resolver = new TestTagHelperDescriptorResolver(); var tagHelperDirectiveSpanVisitor = new TagHelperDirectiveSpanVisitor(resolver, new ErrorSink()); var document = new MarkupBlock( - Factory.Code("\"one\"").AsAddTagHelper("one"), - Factory.Code("\"two\"").AsRemoveTagHelper("two"), - Factory.Code("\"three\"").AsRemoveTagHelper("three"), - Factory.Code("\"four\"").AsTagHelperPrefixDirective("four")); + Factory.Code("one").AsAddTagHelper(), + Factory.Code("two").AsRemoveTagHelper(), + Factory.Code("three").AsRemoveTagHelper(), + Factory.Code("four").AsTagHelperPrefixDirective()); var expectedDescriptors = new TagHelperDirectiveDescriptor[] { new TagHelperDirectiveDescriptor @@ -138,10 +138,10 @@ namespace Microsoft.AspNet.Razor.Compilation.TagHelpers return new TagHelperDescriptorResolutionContext(expectedEndDirectiveDescriptors, errorSink); }); var document = new MarkupBlock( - Factory.Code("\"one\"").AsAddTagHelper("one"), - Factory.Code("\"two\"").AsRemoveTagHelper("two"), - Factory.Code("\"three\"").AsRemoveTagHelper("three"), - Factory.Code("\"four\"").AsTagHelperPrefixDirective("four")); + Factory.Code("one").AsAddTagHelper(), + Factory.Code("two").AsRemoveTagHelper(), + Factory.Code("three").AsRemoveTagHelper(), + Factory.Code("four").AsTagHelperPrefixDirective()); // Act @@ -165,7 +165,7 @@ namespace Microsoft.AspNet.Razor.Compilation.TagHelpers Factory .MetaCode(SyntaxConstants.CSharp.TagHelperPrefixKeyword + " ") .Accepts(AcceptedCharacters.None), - Factory.Code("\"something\"").AsTagHelperPrefixDirective("something"))); + Factory.Code("something").AsTagHelperPrefixDirective())); var expectedDirectiveDescriptor = new TagHelperDirectiveDescriptor { @@ -195,7 +195,7 @@ namespace Microsoft.AspNet.Razor.Compilation.TagHelpers Factory.CodeTransition(), Factory.MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword + " ") .Accepts(AcceptedCharacters.None), - Factory.Code("\"something\"").AsAddTagHelper("something")) + Factory.Code("something").AsAddTagHelper()) ); var expectedRegistration = new TagHelperDirectiveDescriptor { @@ -222,7 +222,7 @@ namespace Microsoft.AspNet.Razor.Compilation.TagHelpers Factory.CodeTransition(), Factory.MetaCode(SyntaxConstants.CSharp.RemoveTagHelperKeyword + " ") .Accepts(AcceptedCharacters.None), - Factory.Code("\"something\"").AsRemoveTagHelper("something")) + Factory.Code("something").AsRemoveTagHelper()) ); var expectedRegistration = new TagHelperDirectiveDescriptor { diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AddTagHelperDirective.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AddTagHelperDirective.cs index ead528b077..aa584f80ae 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AddTagHelperDirective.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AddTagHelperDirective.cs @@ -10,13 +10,7 @@ namespace TestOutput { #pragma warning disable 219 string __tagHelperDirectiveSyntaxHelper = null; - __tagHelperDirectiveSyntaxHelper = -#line 1 "AddTagHelperDirective.cshtml" - "**??**??*, nice" - -#line default -#line hidden - ; + __tagHelperDirectiveSyntaxHelper = "something, nice"; #pragma warning restore 219 } #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.DesignTime.cs index 4f02bdb60f..c1c885d7a8 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.DesignTime.cs @@ -10,13 +10,7 @@ namespace TestOutput { #pragma warning disable 219 string __tagHelperDirectiveSyntaxHelper = null; - __tagHelperDirectiveSyntaxHelper = -#line 1 "AttributeTargetingTagHelpers.cshtml" - "*, something" - -#line default -#line hidden - ; + __tagHelperDirectiveSyntaxHelper = "*, something"; #pragma warning restore 219 } #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.cs index 0a8cb2fdf0..1c88a9485c 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.cs @@ -1,4 +1,4 @@ -#pragma checksum "AttributeTargetingTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "edaa271f830648a99892d01bb55f49e328fa621c" +#pragma checksum "AttributeTargetingTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "6c8b55df08e7538ff6155a5bc3b8135b305ad08a" namespace TestOutput { using System; @@ -26,15 +26,15 @@ namespace TestOutput public override async Task ExecuteAsync() { __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); - Instrumentation.BeginContext(30, 2, true); + Instrumentation.BeginContext(28, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(47, 9, true); + Instrumentation.BeginContext(45, 9, true); WriteLiteral("\r\n

"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("strong", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(78, 5, true); + Instrumentation.BeginContext(76, 5, true); WriteLiteral("Hello"); Instrumentation.EndContext(); } @@ -43,11 +43,11 @@ namespace TestOutput __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper); __tagHelperExecutionContext.AddHtmlAttribute("catchAll", Html.Raw("hi")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(56, 36, false); + Instrumentation.BeginContext(54, 36, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(92, 62, true); + Instrumentation.BeginContext(90, 62, true); WriteLiteral("World

\r\n \r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -67,11 +67,11 @@ __TestNamespace_InputTagHelper2.Checked = true; #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(154, 40, false); + Instrumentation.BeginContext(152, 40, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(194, 6, true); + Instrumentation.BeginContext(192, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -94,11 +94,11 @@ __TestNamespace_InputTagHelper2.Checked = true; __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.AddHtmlAttribute("catchAll", Html.Raw("hi")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(200, 54, false); + Instrumentation.BeginContext(198, 54, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(254, 2, true); + Instrumentation.BeginContext(252, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); } @@ -107,7 +107,7 @@ __TestNamespace_InputTagHelper2.Checked = true; __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw("btn")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(32, 228, false); + Instrumentation.BeginContext(30, 228, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs index 98687e8efb..37e860e021 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs @@ -1,4 +1,4 @@ -#pragma checksum "BasicTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3cdbdfa1515b87565e2f00812f0093dbe8e49667" +#pragma checksum "BasicTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5ac93855b03fe3c5d7e0c927f4ebbb8c67711220" namespace TestOutput { using System.Threading.Tasks; @@ -24,11 +24,11 @@ namespace TestOutput public override async Task ExecuteAsync() { __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); - Instrumentation.BeginContext(33, 71, true); + Instrumentation.BeginContext(31, 71, true); WriteLiteral("\r\n
\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(145, 10, true); + Instrumentation.BeginContext(143, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { @@ -37,11 +37,11 @@ namespace TestOutput __TestNamespace_PTagHelper = CreateTagHelper(); __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(155, 7, false); + Instrumentation.BeginContext(153, 7, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(162, 10, true); + Instrumentation.BeginContext(160, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => { @@ -65,11 +65,11 @@ namespace TestOutput __tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type); __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(172, 71, false); + Instrumentation.BeginContext(170, 71, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(243, 10, true); + Instrumentation.BeginContext(241, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -89,11 +89,11 @@ __TestNamespace_InputTagHelper2.Checked = **From custom attribute code renderer* #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(253, 39, false); + Instrumentation.BeginContext(251, 39, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(292, 6, true); + Instrumentation.BeginContext(290, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); } @@ -103,11 +103,11 @@ __TestNamespace_InputTagHelper2.Checked = **From custom attribute code renderer* __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw("Hello World")); __tagHelperExecutionContext.AddHtmlAttribute("data-delay", Html.Raw("1000")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(104, 198, false); + Instrumentation.BeginContext(102, 198, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(302, 8, true); + Instrumentation.BeginContext(300, 8, true); WriteLiteral("\r\n
"); Instrumentation.EndContext(); } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.DesignTime.cs index 319bb469c1..81c34212ac 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.DesignTime.cs @@ -10,13 +10,7 @@ namespace TestOutput { #pragma warning disable 219 string __tagHelperDirectiveSyntaxHelper = null; - __tagHelperDirectiveSyntaxHelper = -#line 1 "BasicTagHelpers.cshtml" - "something, nice" - -#line default -#line hidden - ; + __tagHelperDirectiveSyntaxHelper = "something, nice"; #pragma warning restore 219 } #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.DesignTime.cs index d119bc52ec..fa7872ed7d 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.DesignTime.cs @@ -10,20 +10,8 @@ namespace TestOutput { #pragma warning disable 219 string __tagHelperDirectiveSyntaxHelper = null; - __tagHelperDirectiveSyntaxHelper = -#line 1 "BasicTagHelpers.Prefixed.cshtml" - "THS" - -#line default -#line hidden - ; - __tagHelperDirectiveSyntaxHelper = -#line 2 "BasicTagHelpers.Prefixed.cshtml" - "something, nice" - -#line default -#line hidden - ; + __tagHelperDirectiveSyntaxHelper = "THS"; + __tagHelperDirectiveSyntaxHelper = "something, nice"; #pragma warning restore 219 } #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.cs index bd4c79849a..c0de8783f7 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.cs @@ -1,4 +1,4 @@ -#pragma checksum "BasicTagHelpers.Prefixed.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "44eafd8ba2adb5f9e260d37e87544c018e182eed" +#pragma checksum "BasicTagHelpers.Prefixed.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "58d527033ea3d1d7e092e5e3561d80a474d60e97" namespace TestOutput { using System; @@ -25,11 +25,11 @@ namespace TestOutput public override async Task ExecuteAsync() { __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); - Instrumentation.BeginContext(57, 52, true); + Instrumentation.BeginContext(53, 52, true); WriteLiteral("\r\n\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(135, 56, true); + Instrumentation.BeginContext(131, 56, true); WriteLiteral("\r\n

\r\n \r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => { @@ -49,11 +49,11 @@ namespace TestOutput #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(191, 41, false); + Instrumentation.BeginContext(187, 41, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(232, 6, true); + Instrumentation.BeginContext(228, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); } @@ -62,11 +62,11 @@ namespace TestOutput __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw("Hello World")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(109, 136, false); + Instrumentation.BeginContext(105, 136, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(245, 11, true); + Instrumentation.BeginContext(241, 11, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.RemoveTagHelper.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.RemoveTagHelper.cs index 2c5cbd0dc8..02b643b554 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.RemoveTagHelper.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.RemoveTagHelper.cs @@ -1,4 +1,4 @@ -#pragma checksum "BasicTagHelpers.RemoveTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "833fbb5056a48116b0fe6386da7b14bc18d3b330" +#pragma checksum "BasicTagHelpers.RemoveTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "69b58621318bc8f4c0498f15f088da6220f94ffe" namespace TestOutput { using System; @@ -14,7 +14,7 @@ namespace TestOutput #pragma warning disable 1998 public override async Task ExecuteAsync() { - Instrumentation.BeginContext(72, 187, true); + Instrumentation.BeginContext(68, 187, true); WriteLiteral("\r\n
\r\n

\r\n " + "

\r\n \r\n \r\n

\r\n
"); diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.cs index 6ef46dacdf..7f9c7ddf34 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.cs @@ -1,4 +1,4 @@ -#pragma checksum "BasicTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3cdbdfa1515b87565e2f00812f0093dbe8e49667" +#pragma checksum "BasicTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5ac93855b03fe3c5d7e0c927f4ebbb8c67711220" namespace TestOutput { using System; @@ -25,11 +25,11 @@ namespace TestOutput public override async Task ExecuteAsync() { __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); - Instrumentation.BeginContext(33, 71, true); + Instrumentation.BeginContext(31, 71, true); WriteLiteral("\r\n
\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(145, 10, true); + Instrumentation.BeginContext(143, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { @@ -38,11 +38,11 @@ namespace TestOutput __TestNamespace_PTagHelper = CreateTagHelper(); __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(155, 7, false); + Instrumentation.BeginContext(153, 7, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(162, 10, true); + Instrumentation.BeginContext(160, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => { @@ -66,11 +66,11 @@ namespace TestOutput __tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type); __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(172, 71, false); + Instrumentation.BeginContext(170, 71, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(243, 10, true); + Instrumentation.BeginContext(241, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -90,11 +90,11 @@ __TestNamespace_InputTagHelper2.Checked = true; #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(253, 39, false); + Instrumentation.BeginContext(251, 39, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(292, 6, true); + Instrumentation.BeginContext(290, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); } @@ -104,11 +104,11 @@ __TestNamespace_InputTagHelper2.Checked = true; __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw("Hello World")); __tagHelperExecutionContext.AddHtmlAttribute("data-delay", Html.Raw("1000")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(104, 198, false); + Instrumentation.BeginContext(102, 198, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(302, 8, true); + Instrumentation.BeginContext(300, 8, true); WriteLiteral("\r\n
"); Instrumentation.EndContext(); } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.DesignTime.cs index 0f908d0e0b..0aa22d7132 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.DesignTime.cs @@ -10,13 +10,7 @@ namespace TestOutput { #pragma warning disable 219 string __tagHelperDirectiveSyntaxHelper = null; - __tagHelperDirectiveSyntaxHelper = -#line 1 "ComplexTagHelpers.cshtml" - "T?g??lpe*, nice" - -#line default -#line hidden - ; + __tagHelperDirectiveSyntaxHelper = "something, nice"; #pragma warning restore 219 } #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.cs index 4a58d04085..3f65bfeee2 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.cs @@ -1,4 +1,4 @@ -#pragma checksum "ComplexTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "7e06587198159a7cdea48c42e64a766a79a12cf7" +#pragma checksum "ComplexTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3cc5f5ed458e4e33874c4242798b195a31ab065c" namespace TestOutput { using System; @@ -25,7 +25,7 @@ namespace TestOutput public override async Task ExecuteAsync() { __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); - Instrumentation.BeginContext(33, 2, true); + Instrumentation.BeginContext(31, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); #line 3 "ComplexTagHelpers.cshtml" @@ -37,11 +37,11 @@ namespace TestOutput #line default #line hidden - Instrumentation.BeginContext(84, 55, true); + Instrumentation.BeginContext(82, 55, true); WriteLiteral("
\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(177, 34, true); + Instrumentation.BeginContext(175, 34, true); WriteLiteral("\r\n

Set Time:

\r\n"); Instrumentation.EndContext(); #line 10 "ComplexTagHelpers.cshtml" @@ -57,11 +57,11 @@ namespace TestOutput #line default #line hidden - Instrumentation.BeginContext(251, 16, true); + Instrumentation.BeginContext(249, 16, true); WriteLiteral(" "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(270, 10, true); + Instrumentation.BeginContext(268, 10, true); WriteLiteral("New Time: "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -77,7 +77,7 @@ namespace TestOutput __tagHelperExecutionContext.AddHtmlAttribute("value", Html.Raw("")); __tagHelperExecutionContext.AddHtmlAttribute("placeholder", Html.Raw("Enter in a new time...")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(280, 66, false); + Instrumentation.BeginContext(278, 66, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); @@ -86,11 +86,11 @@ namespace TestOutput __TestNamespace_PTagHelper = CreateTagHelper(); __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(267, 83, false); + Instrumentation.BeginContext(265, 83, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(350, 2, true); + Instrumentation.BeginContext(348, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); #line 13 "ComplexTagHelpers.cshtml" @@ -101,11 +101,11 @@ namespace TestOutput #line default #line hidden - Instrumentation.BeginContext(400, 16, true); + Instrumentation.BeginContext(398, 16, true); WriteLiteral(" "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(419, 14, true); + Instrumentation.BeginContext(417, 14, true); WriteLiteral("Current Time: "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -132,7 +132,7 @@ namespace TestOutput #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(433, 37, false); + Instrumentation.BeginContext(431, 37, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); @@ -141,11 +141,11 @@ namespace TestOutput __TestNamespace_PTagHelper = CreateTagHelper(); __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(416, 58, false); + Instrumentation.BeginContext(414, 58, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(474, 18, true); + Instrumentation.BeginContext(472, 18, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -166,11 +166,11 @@ namespace TestOutput __tagHelperExecutionContext.AddTagHelperAttribute("tYPe", __TestNamespace_InputTagHelper.Type); __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(492, 50, false); + Instrumentation.BeginContext(490, 50, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(542, 18, true); + Instrumentation.BeginContext(540, 18, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => { @@ -218,11 +218,11 @@ namespace TestOutput __tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type); __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(560, 79, false); + Instrumentation.BeginContext(558, 79, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(641, 2, true); + Instrumentation.BeginContext(639, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); #line 19 "ComplexTagHelpers.cshtml" @@ -231,7 +231,7 @@ namespace TestOutput #line default #line hidden - Instrumentation.BeginContext(658, 8, true); + Instrumentation.BeginContext(656, 8, true); WriteLiteral(" "); Instrumentation.EndContext(); } @@ -239,24 +239,24 @@ namespace TestOutput __TestNamespace_PTagHelper = CreateTagHelper(); __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "time", 3); - AddHtmlAttributeValue("", 148, "Current", 148, 7, true); - AddHtmlAttributeValue(" ", 155, "Time:", 156, 6, true); + AddHtmlAttributeValue("", 146, "Current", 146, 7, true); + AddHtmlAttributeValue(" ", 153, "Time:", 154, 6, true); #line 8 "ComplexTagHelpers.cshtml" -AddHtmlAttributeValue(" ", 161, DateTime.Now, 162, 14, false); +AddHtmlAttributeValue(" ", 159, DateTime.Now, 160, 14, false); #line default #line hidden EndAddHtmlAttributeValues(__tagHelperExecutionContext); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(139, 529, false); + Instrumentation.BeginContext(137, 529, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(670, 10, true); + Instrumentation.BeginContext(668, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(767, 2, true); + Instrumentation.BeginContext(765, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); #line 22 "ComplexTagHelpers.cshtml" @@ -271,7 +271,7 @@ AddHtmlAttributeValue(" ", 161, DateTime.Now, 162, 14, false); #line default #line hidden - Instrumentation.BeginContext(807, 12, true); + Instrumentation.BeginContext(805, 12, true); WriteLiteral(" "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => { @@ -288,11 +288,11 @@ __TestNamespace_InputTagHelper2.Checked = (@object); #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("ChecKED", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(819, 28, false); + Instrumentation.BeginContext(817, 28, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(847, 10, true); + Instrumentation.BeginContext(845, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); } @@ -308,15 +308,15 @@ __TestNamespace_InputTagHelper2.Checked = (@object); __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age); __tagHelperExecutionContext.AddHtmlAttribute("unbound", Html.Raw("second value")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(680, 181, false); + Instrumentation.BeginContext(678, 181, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(861, 10, true); + Instrumentation.BeginContext(859, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(913, 14, true); + Instrumentation.BeginContext(911, 14, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -335,11 +335,11 @@ __TestNamespace_InputTagHelper2.Checked = (@object); #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(927, 85, false); + Instrumentation.BeginContext(925, 85, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(1012, 10, true); + Instrumentation.BeginContext(1010, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); } @@ -353,15 +353,15 @@ __TestNamespace_PTagHelper.Age = -1970 + @DateTimeOffset.Now.Year; #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(871, 155, false); + Instrumentation.BeginContext(869, 155, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(1026, 10, true); + Instrumentation.BeginContext(1024, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(1076, 14, true); + Instrumentation.BeginContext(1074, 14, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => { @@ -378,11 +378,11 @@ __TestNamespace_InputTagHelper2.Checked = DateTimeOffset.Now.Year > 2014; #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(1090, 48, false); + Instrumentation.BeginContext(1088, 48, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(1138, 10, true); + Instrumentation.BeginContext(1136, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); } @@ -396,15 +396,15 @@ __TestNamespace_PTagHelper.Age = DateTimeOffset.Now.Year - 1970; #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(1036, 116, false); + Instrumentation.BeginContext(1034, 116, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(1152, 10, true); + Instrumentation.BeginContext(1150, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(1204, 14, true); + Instrumentation.BeginContext(1202, 14, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -421,11 +421,11 @@ __TestNamespace_InputTagHelper2.Checked = @( DateTimeOffset.Now.Year ) > 20 #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(1218, 63, false); + Instrumentation.BeginContext(1216, 63, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(1281, 10, true); + Instrumentation.BeginContext(1279, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); } @@ -439,14 +439,14 @@ __TestNamespace_PTagHelper.Age = ("My age is this long.".Length); #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(1162, 133, false); + Instrumentation.BeginContext(1160, 133, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(1295, 10, true); + Instrumentation.BeginContext(1293, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); - Instrumentation.BeginContext(1306, 11, false); + Instrumentation.BeginContext(1304, 11, false); #line 34 "ComplexTagHelpers.cshtml" Write(someMethod(item => new Template(async(__razor_template_writer) => { __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { @@ -464,7 +464,7 @@ __TestNamespace_PTagHelper.Age = ("My age is this long.".Length); #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(1345, 26, false); + Instrumentation.BeginContext(1343, 26, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); @@ -480,7 +480,7 @@ __TestNamespace_PTagHelper.Age = 123; __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age); __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw("hello")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(1318, 57, false); + Instrumentation.BeginContext(1316, 57, false); await WriteTagHelperToAsync(__razor_template_writer, __tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); @@ -491,7 +491,7 @@ __TestNamespace_PTagHelper.Age = 123; #line default #line hidden Instrumentation.EndContext(); - Instrumentation.BeginContext(1376, 14, true); + Instrumentation.BeginContext(1374, 14, true); WriteLiteral("\r\n
\r\n"); Instrumentation.EndContext(); #line 36 "ComplexTagHelpers.cshtml" diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.DesignTime.cs index 4a64e9949f..2c51b12a51 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.DesignTime.cs @@ -10,13 +10,7 @@ namespace TestOutput { #pragma warning disable 219 string __tagHelperDirectiveSyntaxHelper = null; - __tagHelperDirectiveSyntaxHelper = -#line 1 "DuplicateAttributeTagHelpers.cshtml" - "something, nice" - -#line default -#line hidden - ; + __tagHelperDirectiveSyntaxHelper = "something, nice"; #pragma warning restore 219 } #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.cs index d83ce990b5..f501188847 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.cs @@ -1,4 +1,4 @@ -#pragma checksum "DuplicateAttributeTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "af64a6adaf73e4143024a1145e70cbd3a24d2c0e" +#pragma checksum "DuplicateAttributeTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "84ecb9053de09ef4f2a69927fed3e41e188c730b" namespace TestOutput { using System; @@ -25,11 +25,11 @@ namespace TestOutput public override async Task ExecuteAsync() { __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); - Instrumentation.BeginContext(33, 2, true); + Instrumentation.BeginContext(31, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(65, 6, true); + Instrumentation.BeginContext(63, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -44,11 +44,11 @@ namespace TestOutput __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; __tagHelperExecutionContext.AddHtmlAttribute("TYPE", Html.Raw("checkbox")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(71, 39, false); + Instrumentation.BeginContext(69, 39, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(110, 6, true); + Instrumentation.BeginContext(108, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -70,11 +70,11 @@ __TestNamespace_InputTagHelper2.Checked = true; __tagHelperExecutionContext.AddHtmlAttribute("type", Html.Raw("checkbox")); __tagHelperExecutionContext.AddHtmlAttribute("checked", Html.Raw("false")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(116, 70, false); + Instrumentation.BeginContext(114, 70, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(186, 2, true); + Instrumentation.BeginContext(184, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); } @@ -90,7 +90,7 @@ __TestNamespace_PTagHelper.Age = 3; __tagHelperExecutionContext.AddHtmlAttribute("AGE", Html.Raw("40")); __tagHelperExecutionContext.AddHtmlAttribute("Age", Html.Raw("500")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(35, 157, false); + Instrumentation.BeginContext(33, 157, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateTargetTagHelper.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateTargetTagHelper.cs index e349cd9e36..4da8a8e2a6 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateTargetTagHelper.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateTargetTagHelper.cs @@ -1,4 +1,4 @@ -#pragma checksum "DuplicateTargetTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "77e70e938d77f71e489354b1e7c351c588001690" +#pragma checksum "DuplicateTargetTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1014725b9048d825ce97b0e5e260ac35f057fe0a" namespace TestOutput { using System; @@ -24,7 +24,7 @@ namespace TestOutput public override async Task ExecuteAsync() { __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); - Instrumentation.BeginContext(33, 2, true); + Instrumentation.BeginContext(31, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -45,7 +45,7 @@ __TestNamespace_InputTagHelper.Checked = true; __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper.Checked); __TestNamespace_CatchAllTagHelper.Checked = __TestNamespace_InputTagHelper.Checked; __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(35, 40, false); + Instrumentation.BeginContext(33, 40, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.DesignTime.cs index da08b546ac..0d0e312108 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.DesignTime.cs @@ -10,13 +10,7 @@ namespace TestOutput { #pragma warning disable 219 string __tagHelperDirectiveSyntaxHelper = null; - __tagHelperDirectiveSyntaxHelper = -#line 1 "DynamicAttributeTagHelpers.cshtml" - "something, nice" - -#line default -#line hidden - ; + __tagHelperDirectiveSyntaxHelper = "something, nice"; #pragma warning restore 219 } #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.cs index d2e4df0801..b00955ae3a 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.cs @@ -1,4 +1,4 @@ -#pragma checksum "DynamicAttributeTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "782463195265ee647cc2fc63fd5095a80090845b" +#pragma checksum "DynamicAttributeTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "107e341010aad754fc5c952722dbfdc7e33fc38e" namespace TestOutput { using System; @@ -23,7 +23,7 @@ namespace TestOutput public override async Task ExecuteAsync() { __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); - Instrumentation.BeginContext(33, 2, true); + Instrumentation.BeginContext(31, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -32,19 +32,19 @@ namespace TestOutput __TestNamespace_InputTagHelper = CreateTagHelper(); __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "unbound", 2); - AddHtmlAttributeValue("", 51, "prefix", 51, 6, true); + AddHtmlAttributeValue("", 49, "prefix", 49, 6, true); #line 3 "DynamicAttributeTagHelpers.cshtml" -AddHtmlAttributeValue(" ", 57, DateTime.Now, 58, 14, false); +AddHtmlAttributeValue(" ", 55, DateTime.Now, 56, 14, false); #line default #line hidden EndAddHtmlAttributeValues(__tagHelperExecutionContext); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(35, 40, false); + Instrumentation.BeginContext(33, 40, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(75, 4, true); + Instrumentation.BeginContext(73, 4, true); WriteLiteral("\r\n\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -53,14 +53,14 @@ AddHtmlAttributeValue(" ", 57, DateTime.Now, 58, 14, false); __TestNamespace_InputTagHelper = CreateTagHelper(); __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "unbound", 2); - AddHtmlAttributeValue("", 95, new Template(async(__razor_attribute_value_writer) => { + AddHtmlAttributeValue("", 93, new Template(async(__razor_attribute_value_writer) => { #line 5 "DynamicAttributeTagHelpers.cshtml" if (true) { #line default #line hidden - Instrumentation.BeginContext(109, 12, false); + Instrumentation.BeginContext(107, 12, false); #line 5 "DynamicAttributeTagHelpers.cshtml" WriteTo(__razor_attribute_value_writer, string.Empty); @@ -73,7 +73,7 @@ WriteTo(__razor_attribute_value_writer, string.Empty); #line default #line hidden - Instrumentation.BeginContext(132, 5, false); + Instrumentation.BeginContext(130, 5, false); #line 5 "DynamicAttributeTagHelpers.cshtml" WriteTo(__razor_attribute_value_writer, false); @@ -87,15 +87,15 @@ WriteTo(__razor_attribute_value_writer, string.Empty); #line hidden } - ), 95, 44, false); - AddHtmlAttributeValue(" ", 139, "suffix", 140, 7, true); + ), 93, 44, false); + AddHtmlAttributeValue(" ", 137, "suffix", 138, 7, true); EndAddHtmlAttributeValues(__tagHelperExecutionContext); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(79, 71, false); + Instrumentation.BeginContext(77, 71, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(150, 4, true); + Instrumentation.BeginContext(148, 4, true); WriteLiteral("\r\n\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -115,20 +115,20 @@ WriteTo(__razor_attribute_value_writer, string.Empty); __TestNamespace_InputTagHelper.Bound = __tagHelperStringValueBuffer.GetContent(HtmlEncoder); __tagHelperExecutionContext.AddTagHelperAttribute("bound", __TestNamespace_InputTagHelper.Bound); BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "unbound", 3); - AddHtmlAttributeValue("", 206, "prefix", 206, 6, true); + AddHtmlAttributeValue("", 204, "prefix", 204, 6, true); #line 7 "DynamicAttributeTagHelpers.cshtml" -AddHtmlAttributeValue(" ", 212, DateTime.Now, 213, 14, false); +AddHtmlAttributeValue(" ", 210, DateTime.Now, 211, 14, false); #line default #line hidden - AddHtmlAttributeValue(" ", 226, "suffix", 227, 7, true); + AddHtmlAttributeValue(" ", 224, "suffix", 225, 7, true); EndAddHtmlAttributeValues(__tagHelperExecutionContext); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(154, 83, false); + Instrumentation.BeginContext(152, 83, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(237, 4, true); + Instrumentation.BeginContext(235, 4, true); WriteLiteral("\r\n\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -182,18 +182,18 @@ AddHtmlAttributeValue(" ", 212, DateTime.Now, 213, 14, false); __tagHelperExecutionContext.AddTagHelperAttribute("bound", __TestNamespace_InputTagHelper.Bound); BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "unbound", 3); #line 10 "DynamicAttributeTagHelpers.cshtml" -AddHtmlAttributeValue("", 347, long.MinValue, 347, 14, false); +AddHtmlAttributeValue("", 345, long.MinValue, 345, 14, false); #line default #line hidden - AddHtmlAttributeValue(" ", 361, new Template(async(__razor_attribute_value_writer) => { + AddHtmlAttributeValue(" ", 359, new Template(async(__razor_attribute_value_writer) => { #line 10 "DynamicAttributeTagHelpers.cshtml" if (true) { #line default #line hidden - Instrumentation.BeginContext(376, 12, false); + Instrumentation.BeginContext(374, 12, false); #line 10 "DynamicAttributeTagHelpers.cshtml" WriteTo(__razor_attribute_value_writer, string.Empty); @@ -206,7 +206,7 @@ AddHtmlAttributeValue("", 347, long.MinValue, 347, 14, false); #line default #line hidden - Instrumentation.BeginContext(399, 5, false); + Instrumentation.BeginContext(397, 5, false); #line 10 "DynamicAttributeTagHelpers.cshtml" WriteTo(__razor_attribute_value_writer, false); @@ -220,19 +220,19 @@ AddHtmlAttributeValue("", 347, long.MinValue, 347, 14, false); #line hidden } - ), 362, 45, false); + ), 360, 45, false); #line 10 "DynamicAttributeTagHelpers.cshtml" -AddHtmlAttributeValue(" ", 406, int.MaxValue, 407, 14, false); +AddHtmlAttributeValue(" ", 404, int.MaxValue, 405, 14, false); #line default #line hidden EndAddHtmlAttributeValues(__tagHelperExecutionContext); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(241, 183, false); + Instrumentation.BeginContext(239, 183, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(424, 4, true); + Instrumentation.BeginContext(422, 4, true); WriteLiteral("\r\n\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -242,29 +242,29 @@ AddHtmlAttributeValue(" ", 406, int.MaxValue, 407, 14, false); __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "unbound", 5); #line 12 "DynamicAttributeTagHelpers.cshtml" -AddHtmlAttributeValue("", 444, long.MinValue, 444, 14, false); +AddHtmlAttributeValue("", 442, long.MinValue, 442, 14, false); #line default #line hidden #line 12 "DynamicAttributeTagHelpers.cshtml" -AddHtmlAttributeValue(" ", 458, DateTime.Now, 459, 14, false); +AddHtmlAttributeValue(" ", 456, DateTime.Now, 457, 14, false); #line default #line hidden - AddHtmlAttributeValue(" ", 472, "static", 473, 7, true); - AddHtmlAttributeValue(" ", 479, "content", 483, 11, true); + AddHtmlAttributeValue(" ", 470, "static", 471, 7, true); + AddHtmlAttributeValue(" ", 477, "content", 481, 11, true); #line 12 "DynamicAttributeTagHelpers.cshtml" -AddHtmlAttributeValue(" ", 490, int.MaxValue, 491, 14, false); +AddHtmlAttributeValue(" ", 488, int.MaxValue, 489, 14, false); #line default #line hidden EndAddHtmlAttributeValues(__tagHelperExecutionContext); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(428, 80, false); + Instrumentation.BeginContext(426, 80, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(508, 4, true); + Instrumentation.BeginContext(506, 4, true); WriteLiteral("\r\n\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -273,14 +273,14 @@ AddHtmlAttributeValue(" ", 490, int.MaxValue, 491, 14, false); __TestNamespace_InputTagHelper = CreateTagHelper(); __tagHelperExecutionContext.Add(__TestNamespace_InputTagHelper); BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "unbound", 1); - AddHtmlAttributeValue("", 528, new Template(async(__razor_attribute_value_writer) => { + AddHtmlAttributeValue("", 526, new Template(async(__razor_attribute_value_writer) => { #line 14 "DynamicAttributeTagHelpers.cshtml" if (true) { #line default #line hidden - Instrumentation.BeginContext(542, 12, false); + Instrumentation.BeginContext(540, 12, false); #line 14 "DynamicAttributeTagHelpers.cshtml" WriteTo(__razor_attribute_value_writer, string.Empty); @@ -293,7 +293,7 @@ WriteTo(__razor_attribute_value_writer, string.Empty); #line default #line hidden - Instrumentation.BeginContext(565, 5, false); + Instrumentation.BeginContext(563, 5, false); #line 14 "DynamicAttributeTagHelpers.cshtml" WriteTo(__razor_attribute_value_writer, false); @@ -307,10 +307,10 @@ WriteTo(__razor_attribute_value_writer, string.Empty); #line hidden } - ), 528, 44, false); + ), 526, 44, false); EndAddHtmlAttributeValues(__tagHelperExecutionContext); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(512, 64, false); + Instrumentation.BeginContext(510, 64, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.DesignTime.cs index 92cd01206c..aa780a5ec2 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.DesignTime.cs @@ -10,13 +10,7 @@ namespace TestOutput { #pragma warning disable 219 string __tagHelperDirectiveSyntaxHelper = null; - __tagHelperDirectiveSyntaxHelper = -#line 1 "EmptyAttributeTagHelpers.cshtml" - "something" - -#line default -#line hidden - ; + __tagHelperDirectiveSyntaxHelper = "something"; #pragma warning restore 219 } #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.cs index 26fe1b2864..cb6cf9f8a7 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.cs @@ -1,4 +1,4 @@ -#pragma checksum "EmptyAttributeTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "cdf68f4aae781fadf4445e465c23df6d758fcd81" +#pragma checksum "EmptyAttributeTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "ab5e45403d2c57cfdbab9546c3a27eea94f0fb5c" namespace TestOutput { using System; @@ -25,7 +25,7 @@ namespace TestOutput public override async Task ExecuteAsync() { __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); - Instrumentation.BeginContext(27, 13, true); + Instrumentation.BeginContext(25, 13, true); WriteLiteral("\r\n
\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -46,15 +46,15 @@ __TestNamespace_InputTagHelper2.Checked = ; __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw("")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(40, 34, false); + Instrumentation.BeginContext(38, 34, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(74, 6, true); + Instrumentation.BeginContext(72, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(90, 10, true); + Instrumentation.BeginContext(88, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -75,11 +75,11 @@ __TestNamespace_InputTagHelper2.Checked = ; __tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked); __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw("")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(100, 34, false); + Instrumentation.BeginContext(98, 34, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(134, 6, true); + Instrumentation.BeginContext(132, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); } @@ -93,11 +93,11 @@ __TestNamespace_PTagHelper.Age = ; #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(80, 64, false); + Instrumentation.BeginContext(78, 64, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(144, 8, true); + Instrumentation.BeginContext(142, 8, true); WriteLiteral("\r\n
"); Instrumentation.EndContext(); } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.DesignTime.cs index b1b53cf8a1..a9a9b455f3 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.DesignTime.cs @@ -10,13 +10,7 @@ namespace TestOutput { #pragma warning disable 219 string __tagHelperDirectiveSyntaxHelper = null; - __tagHelperDirectiveSyntaxHelper = -#line 1 "EnumTagHelpers.cshtml" - "something, nice" - -#line default -#line hidden - ; + __tagHelperDirectiveSyntaxHelper = "something, nice"; #pragma warning restore 219 } #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.cs index 4feba44b16..2d9cc358e7 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.cs @@ -1,4 +1,4 @@ -#pragma checksum "EnumTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "57102d182f8d5da659bb113653552ea18f42bb76" +#pragma checksum "EnumTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "f9124dcd7da8c06ab193a971690c676c5e0adaac" namespace TestOutput { using System; @@ -24,7 +24,7 @@ namespace TestOutput public override async Task ExecuteAsync() { __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); - Instrumentation.BeginContext(33, 2, true); + Instrumentation.BeginContext(31, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); #line 3 "EnumTagHelpers.cshtml" @@ -34,7 +34,7 @@ namespace TestOutput #line default #line hidden - Instrumentation.BeginContext(79, 2, true); + Instrumentation.BeginContext(77, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -51,11 +51,11 @@ __TestNamespace_InputTagHelper.Value = MyEnum.MyValue; #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("value", __TestNamespace_InputTagHelper.Value); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(81, 33, false); + Instrumentation.BeginContext(79, 33, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(114, 2, true); + Instrumentation.BeginContext(112, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -67,17 +67,17 @@ __TestNamespace_InputTagHelper.Value = MyEnum.MyValue; __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper); BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "class", 1); #line 8 "EnumTagHelpers.cshtml" -AddHtmlAttributeValue("", 130, MyEnum.MySecondValue, 130, 21, false); +AddHtmlAttributeValue("", 128, MyEnum.MySecondValue, 128, 21, false); #line default #line hidden EndAddHtmlAttributeValues(__tagHelperExecutionContext); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(116, 39, false); + Instrumentation.BeginContext(114, 39, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(155, 2, true); + Instrumentation.BeginContext(153, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -94,11 +94,11 @@ __TestNamespace_InputTagHelper.Value = Microsoft.AspNet.Razor.Test.Generator.MyE #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("value", __TestNamespace_InputTagHelper.Value); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(157, 25, false); + Instrumentation.BeginContext(155, 25, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(182, 2, true); + Instrumentation.BeginContext(180, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -121,11 +121,11 @@ __TestNamespace_CatchAllTagHelper.CatchAll = Microsoft.AspNet.Razor.Test.Generat #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("catch-all", __TestNamespace_CatchAllTagHelper.CatchAll); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(184, 50, false); + Instrumentation.BeginContext(182, 50, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(234, 2, true); + Instrumentation.BeginContext(232, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -148,11 +148,11 @@ __TestNamespace_CatchAllTagHelper.CatchAll = enumValue; #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("catch-all", __TestNamespace_CatchAllTagHelper.CatchAll); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(236, 51, false); + Instrumentation.BeginContext(234, 51, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(287, 2, true); + Instrumentation.BeginContext(285, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.DesignTime.cs index 1d18cd9356..2da21ca935 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.DesignTime.cs @@ -10,13 +10,7 @@ namespace TestOutput { #pragma warning disable 219 string __tagHelperDirectiveSyntaxHelper = null; - __tagHelperDirectiveSyntaxHelper = -#line 1 "EscapedTagHelpers.cshtml" - "something" - -#line default -#line hidden - ; + __tagHelperDirectiveSyntaxHelper = "something"; #pragma warning restore 219 } #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.cs index b7c675adec..55b1e2fdde 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.cs @@ -1,4 +1,4 @@ -#pragma checksum "EscapedTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "dcdd88b4f52fa03367f94849021a84a290cb3c1e" +#pragma checksum "EscapedTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "93da17a7091c4d218cfc54282dec1b7b7beac072" namespace TestOutput { using System; @@ -24,17 +24,17 @@ namespace TestOutput public override async Task ExecuteAsync() { __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); - Instrumentation.BeginContext(27, 72, true); + Instrumentation.BeginContext(25, 72, true); WriteLiteral("\r\n
\r\n \r\n
"); Instrumentation.EndContext(); } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/IncompleteTagHelper.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/IncompleteTagHelper.cs index 9aa22725c6..ee5afd5108 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/IncompleteTagHelper.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/IncompleteTagHelper.cs @@ -1,4 +1,4 @@ -#pragma checksum "IncompleteTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "dba409dce3afe321d920e4e62a5701c09d7bbea8" +#pragma checksum "IncompleteTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "762284e0617212ef833fd39f08039bf078039570" namespace TestOutput { using System; @@ -23,7 +23,7 @@ namespace TestOutput public override async Task ExecuteAsync() { __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); - Instrumentation.BeginContext(33, 2, true); + Instrumentation.BeginContext(31, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { @@ -33,7 +33,7 @@ namespace TestOutput __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw("")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(35, 10, false); + Instrumentation.BeginContext(33, 10, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.DesignTime.cs index 7d10d15c21..d6a4f08419 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.DesignTime.cs @@ -10,13 +10,7 @@ namespace TestOutput { #pragma warning disable 219 string __tagHelperDirectiveSyntaxHelper = null; - __tagHelperDirectiveSyntaxHelper = -#line 1 "MinimizedTagHelpers.cshtml" - "something, nice" - -#line default -#line hidden - ; + __tagHelperDirectiveSyntaxHelper = "something, nice"; #pragma warning restore 219 } #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.cs index 990d35816c..6cceb534ea 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.cs @@ -1,4 +1,4 @@ -#pragma checksum "MinimizedTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "07839be4304797e30b19b50b95e2247c93cdff06" +#pragma checksum "MinimizedTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "1356aa716cf24203ad0a7415f199cce7e97089db" namespace TestOutput { using System; @@ -24,11 +24,11 @@ namespace TestOutput public override async Task ExecuteAsync() { __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); - Instrumentation.BeginContext(33, 2, true); + Instrumentation.BeginContext(31, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(64, 34, true); + Instrumentation.BeginContext(62, 34, true); WriteLiteral("\r\n \r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -39,11 +39,11 @@ namespace TestOutput __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw("btn")); __tagHelperExecutionContext.AddMinimizedHtmlAttribute("catchall-unbound-required"); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(98, 59, false); + Instrumentation.BeginContext(96, 59, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(157, 6, true); + Instrumentation.BeginContext(155, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -59,11 +59,11 @@ namespace TestOutput __TestNamespace_InputTagHelper.BoundRequiredString = "hello"; __tagHelperExecutionContext.AddTagHelperAttribute("input-bound-required-string", __TestNamespace_InputTagHelper.BoundRequiredString); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(163, 119, false); + Instrumentation.BeginContext(161, 119, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(282, 6, true); + Instrumentation.BeginContext(280, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -81,11 +81,11 @@ namespace TestOutput __TestNamespace_InputTagHelper.BoundRequiredString = "hello2"; __tagHelperExecutionContext.AddTagHelperAttribute("input-bound-required-string", __TestNamespace_InputTagHelper.BoundRequiredString); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(288, 176, false); + Instrumentation.BeginContext(286, 176, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(464, 6, true); + Instrumentation.BeginContext(462, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -102,11 +102,11 @@ namespace TestOutput __TestNamespace_InputTagHelper.BoundRequiredString = "world"; __tagHelperExecutionContext.AddTagHelperAttribute("input-bound-required-string", __TestNamespace_InputTagHelper.BoundRequiredString); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(470, 206, false); + Instrumentation.BeginContext(468, 206, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(676, 2, true); + Instrumentation.BeginContext(674, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); } @@ -115,7 +115,7 @@ namespace TestOutput __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper); __tagHelperExecutionContext.AddMinimizedHtmlAttribute("catchall-unbound-required"); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(35, 647, false); + Instrumentation.BeginContext(33, 647, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.DesignTime.cs index f300d8730b..4a6474409d 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.DesignTime.cs @@ -10,13 +10,7 @@ namespace TestOutput { #pragma warning disable 219 string __tagHelperDirectiveSyntaxHelper = null; - __tagHelperDirectiveSyntaxHelper = -#line 1 "NestedScriptTagTagHelpers.cshtml" - "something, nice" - -#line default -#line hidden - ; + __tagHelperDirectiveSyntaxHelper = "something, nice"; #pragma warning restore 219 } #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.cs index 4a7140046c..171ef1fb52 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.cs @@ -1,4 +1,4 @@ -#pragma checksum "NestedScriptTagTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "9e6bc8d09df124eda650118b208b7c5e6e058f6b" +#pragma checksum "NestedScriptTagTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "e3cbc45bc2d4185bf69128f14721795d68e6961a" namespace TestOutput { using System; @@ -25,12 +25,12 @@ namespace TestOutput public override async Task ExecuteAsync() { __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); - Instrumentation.BeginContext(33, 106, true); + Instrumentation.BeginContext(31, 106, true); WriteLiteral("\r\n\r\n"); Instrumentation.EndContext(); #line 10 "NestedScriptTagTagHelpers.cshtml" @@ -89,7 +89,7 @@ namespace TestOutput #line default #line hidden - Instrumentation.BeginContext(439, 129, true); + Instrumentation.BeginContext(437, 129, true); WriteLiteral(" \r\n "); Instrumentation.EndContext(); @@ -100,11 +100,11 @@ namespace TestOutput __tagHelperExecutionContext.AddHtmlAttribute("class", Html.Raw("Hello World")); __tagHelperExecutionContext.AddHtmlAttribute("data-delay", Html.Raw("1000")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(139, 433, false); + Instrumentation.BeginContext(137, 433, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(572, 23, true); + Instrumentation.BeginContext(570, 23, true); WriteLiteral("\r\n \r\n"); Instrumentation.EndContext(); } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.DesignTime.cs index 250d014983..b99ba9cebf 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.DesignTime.cs @@ -10,13 +10,7 @@ namespace TestOutput { #pragma warning disable 219 string __tagHelperDirectiveSyntaxHelper = null; - __tagHelperDirectiveSyntaxHelper = -#line 1 "PrefixedAttributeTagHelpers.cshtml" - "something, nice" - -#line default -#line hidden - ; + __tagHelperDirectiveSyntaxHelper = "something, nice"; #pragma warning restore 219 } #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.Reversed.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.Reversed.cs index e2a37f7bbf..c4dc7fdf5f 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.Reversed.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.Reversed.cs @@ -1,4 +1,4 @@ -#pragma checksum "PrefixedAttributeTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4e7fe9697b745af1a07d41f6a8532fdc288fa046" +#pragma checksum "PrefixedAttributeTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5ae668a393146e4a06179eb37952603907a9b825" namespace TestOutput { using System; @@ -24,7 +24,7 @@ namespace TestOutput public override async Task ExecuteAsync() { __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); - Instrumentation.BeginContext(33, 2, true); + Instrumentation.BeginContext(31, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); #line 3 "PrefixedAttributeTagHelpers.cshtml" @@ -42,7 +42,7 @@ namespace TestOutput #line default #line hidden - Instrumentation.BeginContext(282, 49, true); + Instrumentation.BeginContext(280, 49, true); WriteLiteral("\r\n
\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -68,11 +68,11 @@ __TestNamespace_InputTagHelper2.IntDictionaryProperty = intDictionary; __tagHelperExecutionContext.AddTagHelperAttribute("string-dictionary", __TestNamespace_InputTagHelper2.StringDictionaryProperty); __TestNamespace_InputTagHelper1.StringDictionaryProperty = __TestNamespace_InputTagHelper2.StringDictionaryProperty; __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(331, 92, false); + Instrumentation.BeginContext(329, 92, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(423, 6, true); + Instrumentation.BeginContext(421, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -113,11 +113,11 @@ __TestNamespace_InputTagHelper2.IntDictionaryProperty = intDictionary; __tagHelperExecutionContext.AddTagHelperAttribute("int-prefix-grabber", __TestNamespace_InputTagHelper2.IntDictionaryProperty["grabber"]); __TestNamespace_InputTagHelper1.IntProperty = __TestNamespace_InputTagHelper2.IntDictionaryProperty["grabber"]; __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(429, 103, false); + Instrumentation.BeginContext(427, 103, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(532, 6, true); + Instrumentation.BeginContext(530, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -185,11 +185,11 @@ __TestNamespace_InputTagHelper2.IntDictionaryProperty["salt"] = 37; __tagHelperExecutionContext.AddTagHelperAttribute("string-prefix-cumin", __TestNamespace_InputTagHelper2.StringDictionaryProperty["cumin"]); __TestNamespace_InputTagHelper1.StringDictionaryProperty["cumin"] = __TestNamespace_InputTagHelper2.StringDictionaryProperty["cumin"]; __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(538, 257, false); + Instrumentation.BeginContext(536, 257, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(795, 6, true); + Instrumentation.BeginContext(793, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -226,11 +226,11 @@ __TestNamespace_InputTagHelper2.IntDictionaryProperty["value"] = 37; __tagHelperExecutionContext.AddTagHelperAttribute("string-prefix-thyme", __TestNamespace_InputTagHelper2.StringDictionaryProperty["thyme"]); __TestNamespace_InputTagHelper1.StringDictionaryProperty["thyme"] = __TestNamespace_InputTagHelper2.StringDictionaryProperty["thyme"]; __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(801, 60, false); + Instrumentation.BeginContext(799, 60, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(861, 8, true); + Instrumentation.BeginContext(859, 8, true); WriteLiteral("\r\n
"); Instrumentation.EndContext(); } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.cs index d6fb794a2e..a6b7ac9315 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.cs @@ -1,4 +1,4 @@ -#pragma checksum "PrefixedAttributeTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4e7fe9697b745af1a07d41f6a8532fdc288fa046" +#pragma checksum "PrefixedAttributeTagHelpers.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5ae668a393146e4a06179eb37952603907a9b825" namespace TestOutput { using System; @@ -24,7 +24,7 @@ namespace TestOutput public override async Task ExecuteAsync() { __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); - Instrumentation.BeginContext(33, 2, true); + Instrumentation.BeginContext(31, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); #line 3 "PrefixedAttributeTagHelpers.cshtml" @@ -42,7 +42,7 @@ namespace TestOutput #line default #line hidden - Instrumentation.BeginContext(282, 49, true); + Instrumentation.BeginContext(280, 49, true); WriteLiteral("\r\n
\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -68,11 +68,11 @@ __TestNamespace_InputTagHelper1.IntDictionaryProperty = intDictionary; __tagHelperExecutionContext.AddTagHelperAttribute("string-dictionary", __TestNamespace_InputTagHelper1.StringDictionaryProperty); __TestNamespace_InputTagHelper2.StringDictionaryProperty = __TestNamespace_InputTagHelper1.StringDictionaryProperty; __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(331, 92, false); + Instrumentation.BeginContext(329, 92, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(423, 6, true); + Instrumentation.BeginContext(421, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -113,11 +113,11 @@ __TestNamespace_InputTagHelper1.IntDictionaryProperty = intDictionary; __tagHelperExecutionContext.AddTagHelperAttribute("int-prefix-grabber", __TestNamespace_InputTagHelper1.IntProperty); __TestNamespace_InputTagHelper2.IntDictionaryProperty["grabber"] = __TestNamespace_InputTagHelper1.IntProperty; __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(429, 103, false); + Instrumentation.BeginContext(427, 103, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(532, 6, true); + Instrumentation.BeginContext(530, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -185,11 +185,11 @@ __TestNamespace_InputTagHelper1.IntDictionaryProperty["salt"] = 37; __tagHelperExecutionContext.AddTagHelperAttribute("string-prefix-cumin", __TestNamespace_InputTagHelper1.StringDictionaryProperty["cumin"]); __TestNamespace_InputTagHelper2.StringDictionaryProperty["cumin"] = __TestNamespace_InputTagHelper1.StringDictionaryProperty["cumin"]; __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(538, 257, false); + Instrumentation.BeginContext(536, 257, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(795, 6, true); + Instrumentation.BeginContext(793, 6, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -226,11 +226,11 @@ __TestNamespace_InputTagHelper1.IntDictionaryProperty["value"] = 37; __tagHelperExecutionContext.AddTagHelperAttribute("string-prefix-thyme", __TestNamespace_InputTagHelper1.StringDictionaryProperty["thyme"]); __TestNamespace_InputTagHelper2.StringDictionaryProperty["thyme"] = __TestNamespace_InputTagHelper1.StringDictionaryProperty["thyme"]; __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(801, 60, false); + Instrumentation.BeginContext(799, 60, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(861, 8, true); + Instrumentation.BeginContext(859, 8, true); WriteLiteral("\r\n
"); Instrumentation.EndContext(); } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/RemoveTagHelperDirective.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/RemoveTagHelperDirective.cs index cce1db7b4e..4fdfa42ead 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/RemoveTagHelperDirective.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/RemoveTagHelperDirective.cs @@ -10,13 +10,7 @@ namespace TestOutput { #pragma warning disable 219 string __tagHelperDirectiveSyntaxHelper = null; - __tagHelperDirectiveSyntaxHelper = -#line 1 "RemoveTagHelperDirective.cshtml" - "something, nice" - -#line default -#line hidden - ; + __tagHelperDirectiveSyntaxHelper = "something, nice"; #pragma warning restore 219 } #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.DesignTime.cs index 044c100379..5287820258 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.DesignTime.cs @@ -10,13 +10,7 @@ namespace TestOutput { #pragma warning disable 219 string __tagHelperDirectiveSyntaxHelper = null; - __tagHelperDirectiveSyntaxHelper = -#line 1 "SingleTagHelper.cshtml" - "something, nice" - -#line default -#line hidden - ; + __tagHelperDirectiveSyntaxHelper = "something, nice"; #pragma warning restore 219 } #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.cs index 28a91d5fb9..003714fa36 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.cs @@ -1,4 +1,4 @@ -#pragma checksum "SingleTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "070b72826371f13e4d364e6324cf512220ec1c0f" +#pragma checksum "SingleTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "4d7ff17da750ffcbca3130faffef1030e5eb03b8" namespace TestOutput { using System; @@ -23,11 +23,11 @@ namespace TestOutput public override async Task ExecuteAsync() { __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); - Instrumentation.BeginContext(33, 2, true); + Instrumentation.BeginContext(31, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(69, 11, true); + Instrumentation.BeginContext(67, 11, true); WriteLiteral("Body of Tag"); Instrumentation.EndContext(); } @@ -42,7 +42,7 @@ __TestNamespace_PTagHelper.Age = 1337; #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(35, 49, false); + Instrumentation.BeginContext(33, 49, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelperWithNewlineBeforeAttributes.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelperWithNewlineBeforeAttributes.cs index 5b319d94bb..6e372510b7 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelperWithNewlineBeforeAttributes.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelperWithNewlineBeforeAttributes.cs @@ -1,4 +1,4 @@ -#pragma checksum "SingleTagHelperWithNewlineBeforeAttributes.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "95e2e2bab663b8be9934a66150af50a2a6ee08e7" +#pragma checksum "SingleTagHelperWithNewlineBeforeAttributes.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "83a2d9976b209020f80917aa61a3338e37d3c446" namespace TestOutput { using System; @@ -23,11 +23,11 @@ namespace TestOutput public override async Task ExecuteAsync() { __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); - Instrumentation.BeginContext(33, 2, true); + Instrumentation.BeginContext(31, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(73, 11, true); + Instrumentation.BeginContext(71, 11, true); WriteLiteral("Body of Tag"); Instrumentation.EndContext(); } @@ -42,7 +42,7 @@ __TestNamespace_PTagHelper.Age = 1337; #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(35, 53, false); + Instrumentation.BeginContext(33, 53, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.DesignTime.cs index 8c5cd4b309..3aee94ce7b 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.DesignTime.cs @@ -10,13 +10,7 @@ namespace TestOutput { #pragma warning disable 219 string __tagHelperDirectiveSyntaxHelper = null; - __tagHelperDirectiveSyntaxHelper = -#line 1 "SymbolBoundAttributes.cshtml" - "*, nice" - -#line default -#line hidden - ; + __tagHelperDirectiveSyntaxHelper = "*, nice"; #pragma warning restore 219 } #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.cs index 6044dc1a4e..a1031bd918 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.cs @@ -1,4 +1,4 @@ -#pragma checksum "SymbolBoundAttributes.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "65ef0c8f673481f5ab85bd4936f91f31e84c490c" +#pragma checksum "SymbolBoundAttributes.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "85cdc137d6a8c95fa926441de44d5187d5c8051e" namespace TestOutput { using System; @@ -23,7 +23,7 @@ namespace TestOutput public override async Task ExecuteAsync() { __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); - Instrumentation.BeginContext(25, 253, true); + Instrumentation.BeginContext(23, 253, true); WriteLiteral("\r\n
    \r\n
      \r\n\r\n\r\n\r\n\r\n
      \r\n
      { @@ -64,15 +64,15 @@ __TestNamespace_CatchAllTagHelper.ArrayItems = items; __tagHelperExecutionContext.AddTagHelperAttribute("[(item)]", __TestNamespace_CatchAllTagHelper.ArrayItems); __tagHelperExecutionContext.AddHtmlAttribute("[(item)]", Html.Raw("items")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(325, 49, false); + Instrumentation.BeginContext(323, 49, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(374, 2, true); + Instrumentation.BeginContext(372, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("button", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(438, 8, true); + Instrumentation.BeginContext(436, 8, true); WriteLiteral("Click Me"); Instrumentation.EndContext(); } @@ -88,15 +88,15 @@ __TestNamespace_CatchAllTagHelper.Event1 = doSomething(); __tagHelperExecutionContext.AddTagHelperAttribute("(click)", __TestNamespace_CatchAllTagHelper.Event1); __tagHelperExecutionContext.AddHtmlAttribute("(click)", Html.Raw("doSomething()")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(376, 79, false); + Instrumentation.BeginContext(374, 79, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(455, 2, true); + Instrumentation.BeginContext(453, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("button", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(521, 8, true); + Instrumentation.BeginContext(519, 8, true); WriteLiteral("Click Me"); Instrumentation.EndContext(); } @@ -112,15 +112,15 @@ __TestNamespace_CatchAllTagHelper.Event2 = doSomething(); __tagHelperExecutionContext.AddTagHelperAttribute("(^click)", __TestNamespace_CatchAllTagHelper.Event2); __tagHelperExecutionContext.AddHtmlAttribute("(^click)", Html.Raw("doSomething()")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(457, 81, false); + Instrumentation.BeginContext(455, 81, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(538, 2, true); + Instrumentation.BeginContext(536, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("template", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(594, 2, true); + Instrumentation.BeginContext(592, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); } @@ -132,11 +132,11 @@ __TestNamespace_CatchAllTagHelper.Event2 = doSomething(); __tagHelperExecutionContext.AddTagHelperAttribute("*something", __TestNamespace_CatchAllTagHelper.StringProperty1); __tagHelperExecutionContext.AddHtmlAttribute("*something", Html.Raw("value")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(540, 67, false); + Instrumentation.BeginContext(538, 67, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(607, 2, true); + Instrumentation.BeginContext(605, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { @@ -147,11 +147,11 @@ __TestNamespace_CatchAllTagHelper.Event2 = doSomething(); __tagHelperExecutionContext.AddMinimizedHtmlAttribute("bound"); __tagHelperExecutionContext.AddMinimizedHtmlAttribute("#localminimized"); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(609, 33, false); + Instrumentation.BeginContext(607, 33, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(642, 2, true); + Instrumentation.BeginContext(640, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { @@ -164,7 +164,7 @@ __TestNamespace_CatchAllTagHelper.Event2 = doSomething(); __tagHelperExecutionContext.AddTagHelperAttribute("#local", __TestNamespace_CatchAllTagHelper.StringProperty2); __tagHelperExecutionContext.AddHtmlAttribute("#local", Html.Raw("value")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(644, 47, false); + Instrumentation.BeginContext(642, 47, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersInSection.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersInSection.cs index 45f41fdf61..f428452c76 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersInSection.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersInSection.cs @@ -1,4 +1,4 @@ -#pragma checksum "TagHelpersInSection.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "b6492c68360b85d4993de94eeac547b7fb012a26" +#pragma checksum "TagHelpersInSection.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "f23e7b19a8af7b8fe9c6cb784e5a4bc60537c66b" namespace TestOutput { using System; @@ -24,7 +24,7 @@ namespace TestOutput public override async Task ExecuteAsync() { __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); - Instrumentation.BeginContext(33, 2, true); + Instrumentation.BeginContext(31, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); #line 3 "TagHelpersInSection.cshtml" @@ -34,22 +34,22 @@ namespace TestOutput #line default #line hidden - Instrumentation.BeginContext(71, 2, true); + Instrumentation.BeginContext(69, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); DefineSection("MySection", async(__razor_template_writer) => { - Instrumentation.BeginContext(93, 21, true); + Instrumentation.BeginContext(91, 21, true); WriteLiteralTo(__razor_template_writer, "\r\n
      \r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("mytaghelper", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(217, 52, true); + Instrumentation.BeginContext(215, 52, true); WriteLiteral("\r\n In None ContentBehavior.\r\n "); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("nestedtaghelper", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(286, 26, true); + Instrumentation.BeginContext(284, 26, true); WriteLiteral("Some buffered values with "); Instrumentation.EndContext(); - Instrumentation.BeginContext(313, 4, false); + Instrumentation.BeginContext(311, 4, false); #line 11 "TagHelpersInSection.cshtml" Write(code); @@ -61,11 +61,11 @@ namespace TestOutput __TestNamespace_NestedTagHelper = CreateTagHelper(); __tagHelperExecutionContext.Add(__TestNamespace_NestedTagHelper); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(269, 66, false); + Instrumentation.BeginContext(267, 66, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(335, 10, true); + Instrumentation.BeginContext(333, 10, true); WriteLiteral("\r\n "); Instrumentation.EndContext(); } @@ -83,20 +83,20 @@ namespace TestOutput __TestNamespace_MyTagHelper.BoundProperty = __tagHelperStringValueBuffer.GetContent(HtmlEncoder); __tagHelperExecutionContext.AddTagHelperAttribute("boundproperty", __TestNamespace_MyTagHelper.BoundProperty); BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "unboundproperty", 3); - AddHtmlAttributeValue("", 188, "Current", 188, 7, true); - AddHtmlAttributeValue(" ", 195, "Time:", 196, 6, true); + AddHtmlAttributeValue("", 186, "Current", 186, 7, true); + AddHtmlAttributeValue(" ", 193, "Time:", 194, 6, true); #line 9 "TagHelpersInSection.cshtml" -AddHtmlAttributeValue(" ", 201, DateTime.Now, 202, 14, false); +AddHtmlAttributeValue(" ", 199, DateTime.Now, 200, 14, false); #line default #line hidden EndAddHtmlAttributeValues(__tagHelperExecutionContext); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(114, 245, false); + Instrumentation.BeginContext(112, 245, false); await WriteTagHelperToAsync(__razor_template_writer, __tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(359, 14, true); + Instrumentation.BeginContext(357, 14, true); WriteLiteralTo(__razor_template_writer, "\r\n
      \r\n"); Instrumentation.EndContext(); } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersWithWeirdlySpacedAttributes.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersWithWeirdlySpacedAttributes.cs index 54eebf80bf..747462c5cf 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersWithWeirdlySpacedAttributes.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersWithWeirdlySpacedAttributes.cs @@ -1,4 +1,4 @@ -#pragma checksum "TagHelpersWithWeirdlySpacedAttributes.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "61ec0611b60d88357a6c3b6551513ebf6223f6ee" +#pragma checksum "TagHelpersWithWeirdlySpacedAttributes.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "44db1fa170a6845ec719f4200e4bb1f639830b49" namespace TestOutput { using System; @@ -25,11 +25,11 @@ namespace TestOutput public override async Task ExecuteAsync() { __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner(); - Instrumentation.BeginContext(33, 2, true); + Instrumentation.BeginContext(31, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(105, 11, true); + Instrumentation.BeginContext(103, 11, true); WriteLiteral("Body of Tag"); Instrumentation.EndContext(); } @@ -52,11 +52,11 @@ __TestNamespace_PTagHelper.Age = 1337; __tagHelperStringValueBuffer = EndTagHelperWritingScope(); __tagHelperExecutionContext.AddHtmlAttribute("data-content", Html.Raw(__tagHelperStringValueBuffer.GetContent(HtmlEncoder))); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(35, 85, false); + Instrumentation.BeginContext(33, 85, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(120, 4, true); + Instrumentation.BeginContext(118, 4, true); WriteLiteral("\r\n\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -71,11 +71,11 @@ __TestNamespace_PTagHelper.Age = 1337; __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; __tagHelperExecutionContext.AddHtmlAttribute("data-content", Html.Raw("hello")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(124, 47, false); + Instrumentation.BeginContext(122, 47, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(171, 4, true); + Instrumentation.BeginContext(169, 4, true); WriteLiteral("\r\n\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { @@ -91,11 +91,11 @@ __TestNamespace_PTagHelper.Age = 1234; __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age); __tagHelperExecutionContext.AddHtmlAttribute("data-content", Html.Raw("hello2")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(175, 46, false); + Instrumentation.BeginContext(173, 46, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(221, 4, true); + Instrumentation.BeginContext(219, 4, true); WriteLiteral("\r\n\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => { @@ -110,7 +110,7 @@ __TestNamespace_PTagHelper.Age = 1234; __TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type; __tagHelperExecutionContext.AddHtmlAttribute("data-content", Html.Raw("blah")); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(225, 51, false); + Instrumentation.BeginContext(223, 51, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.DesignTime.cs index 4dc08dc6c5..07674f6e61 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.DesignTime.cs @@ -10,13 +10,7 @@ namespace TestOutput { #pragma warning disable 219 string __tagHelperDirectiveSyntaxHelper = null; - __tagHelperDirectiveSyntaxHelper = -#line 1 "TransitionsInTagHelperAttributes.cshtml" - "something, nice" - -#line default -#line hidden - ; + __tagHelperDirectiveSyntaxHelper = "something, nice"; #pragma warning restore 219 } #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.cs index 72637c2668..ea816ce355 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.cs @@ -1,4 +1,4 @@ -#pragma checksum "TransitionsInTagHelperAttributes.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "050ce5cabf326eaa117aa12f5a1a10dbf82a8917" +#pragma checksum "TransitionsInTagHelperAttributes.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "b9b5a5baa9e2ea89cb37a127c0623b083bff74c3" namespace TestOutput { using System; @@ -31,11 +31,11 @@ namespace TestOutput #line default #line hidden - Instrumentation.BeginContext(97, 2, true); + Instrumentation.BeginContext(95, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { - Instrumentation.BeginContext(128, 11, true); + Instrumentation.BeginContext(126, 11, true); WriteLiteral("Body of Tag"); Instrumentation.EndContext(); } @@ -43,9 +43,9 @@ namespace TestOutput __TestNamespace_PTagHelper = CreateTagHelper(); __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "class", 1); - AddHtmlAttributeValue("", 109, new Template(async(__razor_attribute_value_writer) => { + AddHtmlAttributeValue("", 107, new Template(async(__razor_attribute_value_writer) => { } - ), 109, 6, false); + ), 107, 6, false); EndAddHtmlAttributeValues(__tagHelperExecutionContext); #line 7 "TransitionsInTagHelperAttributes.cshtml" __TestNamespace_PTagHelper.Age = 1337; @@ -54,11 +54,11 @@ __TestNamespace_PTagHelper.Age = 1337; #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(99, 44, false); + Instrumentation.BeginContext(97, 44, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(143, 2, true); + Instrumentation.BeginContext(141, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { @@ -68,7 +68,7 @@ __TestNamespace_PTagHelper.Age = 1337; __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "class", 1); #line 8 "TransitionsInTagHelperAttributes.cshtml" -AddHtmlAttributeValue("", 155, @class, 155, 9, false); +AddHtmlAttributeValue("", 153, @class, 153, 9, false); #line default #line hidden @@ -80,11 +80,11 @@ __TestNamespace_PTagHelper.Age = 42; #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(145, 34, false); + Instrumentation.BeginContext(143, 34, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(179, 2, true); + Instrumentation.BeginContext(177, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { @@ -100,11 +100,11 @@ __TestNamespace_PTagHelper.Age = 42 + @int; #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(181, 36, false); + Instrumentation.BeginContext(179, 36, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(217, 2, true); + Instrumentation.BeginContext(215, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { @@ -120,11 +120,11 @@ __TestNamespace_PTagHelper.Age = int; #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(219, 31, false); + Instrumentation.BeginContext(217, 31, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(250, 2, true); + Instrumentation.BeginContext(248, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { @@ -140,11 +140,11 @@ __TestNamespace_PTagHelper.Age = (@int); #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(252, 34, false); + Instrumentation.BeginContext(250, 34, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(286, 2, true); + Instrumentation.BeginContext(284, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => { @@ -153,9 +153,9 @@ __TestNamespace_PTagHelper.Age = (@int); __TestNamespace_PTagHelper = CreateTagHelper(); __tagHelperExecutionContext.Add(__TestNamespace_PTagHelper); BeginAddHtmlAttributeValues(__tagHelperExecutionContext, "class", 2); - AddHtmlAttributeValue("", 298, "custom-", 298, 7, true); + AddHtmlAttributeValue("", 296, "custom-", 296, 7, true); #line 12 "TransitionsInTagHelperAttributes.cshtml" -AddHtmlAttributeValue("", 305, @class, 305, 9, false); +AddHtmlAttributeValue("", 303, @class, 303, 9, false); #line default #line hidden @@ -167,11 +167,11 @@ __TestNamespace_PTagHelper.Age = 4 * @(@int + 2); #line hidden __tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age); __tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext); - Instrumentation.BeginContext(288, 54, false); + Instrumentation.BeginContext(286, 54, false); await WriteTagHelperAsync(__tagHelperExecutionContext); Instrumentation.EndContext(); __tagHelperExecutionContext = __tagHelperScopeManager.End(); - Instrumentation.BeginContext(342, 2, true); + Instrumentation.BeginContext(340, 2, true); WriteLiteral("\r\n"); Instrumentation.EndContext(); } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/AddTagHelperDirective.cshtml b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/AddTagHelperDirective.cshtml index ec52e3df02..924029743e 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/AddTagHelperDirective.cshtml +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/AddTagHelperDirective.cshtml @@ -1 +1 @@ -@addTagHelper "**??**??*, nice" \ No newline at end of file +@addTagHelper something, nice \ No newline at end of file diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/AttributeTargetingTagHelpers.cshtml b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/AttributeTargetingTagHelpers.cshtml index 29eb377ba0..0b7f7f0092 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/AttributeTargetingTagHelpers.cshtml +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/AttributeTargetingTagHelpers.cshtml @@ -1,4 +1,4 @@ -@addTagHelper "*, something" +@addTagHelper *, something

      HelloWorld

      diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.Prefixed.cshtml b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.Prefixed.cshtml index b98a3704ac..683e30c98e 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.Prefixed.cshtml +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.Prefixed.cshtml @@ -1,5 +1,5 @@ -@tagHelperPrefix "THS" -@addTagHelper "something, nice" +@tagHelperPrefix THS +@addTagHelper something, nice diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.RemoveTagHelper.cshtml b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.RemoveTagHelper.cshtml index 5232656930..5fde1b5245 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.RemoveTagHelper.cshtml +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.RemoveTagHelper.cshtml @@ -1,5 +1,5 @@ -@addTagHelper "something, nice" -@removeTagHelper "doesntmatter, nice" +@addTagHelper something, nice +@removeTagHelper doesntmatter, nice

      diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.cshtml b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.cshtml index 79d9283f9d..d11d4d5309 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.cshtml +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.cshtml @@ -1,4 +1,4 @@ -@addTagHelper "something, nice" +@addTagHelper something, nice

      diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/ComplexTagHelpers.cshtml b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/ComplexTagHelpers.cshtml index 617404625f..e14e76dbb0 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/ComplexTagHelpers.cshtml +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/ComplexTagHelpers.cshtml @@ -1,4 +1,4 @@ -@addTagHelper "T?g??lpe*, nice" +@addTagHelper something, nice @if (true) { diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/DuplicateAttributeTagHelpers.cshtml b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/DuplicateAttributeTagHelpers.cshtml index 900a174557..2fdedfa703 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/DuplicateAttributeTagHelpers.cshtml +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/DuplicateAttributeTagHelpers.cshtml @@ -1,4 +1,4 @@ -@addTagHelper "something, nice" +@addTagHelper something, nice

      diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/DuplicateTargetTagHelper.cshtml b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/DuplicateTargetTagHelper.cshtml index d3c68eb0d4..d4429862bc 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/DuplicateTargetTagHelper.cshtml +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/DuplicateTargetTagHelper.cshtml @@ -1,3 +1,3 @@ -@addTagHelper "something, nice" +@addTagHelper something, nice \ No newline at end of file diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/DynamicAttributeTagHelpers.cshtml b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/DynamicAttributeTagHelpers.cshtml index 8cf97d3f5d..8480908aca 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/DynamicAttributeTagHelpers.cshtml +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/DynamicAttributeTagHelpers.cshtml @@ -1,4 +1,4 @@ -@addTagHelper "something, nice" +@addTagHelper something, nice diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EmptyAttributeTagHelpers.cshtml b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EmptyAttributeTagHelpers.cshtml index e2f6f7d196..afe5f6ad7b 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EmptyAttributeTagHelpers.cshtml +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EmptyAttributeTagHelpers.cshtml @@ -1,4 +1,4 @@ -@addTagHelper "something" +@addTagHelper something

      diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EnumTagHelpers.cshtml b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EnumTagHelpers.cshtml index 42f2e818d9..903e99ebe4 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EnumTagHelpers.cshtml +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EnumTagHelpers.cshtml @@ -1,4 +1,4 @@ -@addTagHelper "something, nice" +@addTagHelper something, nice @{ var enumValue = MyEnum.MyValue; diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EscapedTagHelpers.cshtml b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EscapedTagHelpers.cshtml index 98b14e719e..2cd3a16374 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EscapedTagHelpers.cshtml +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EscapedTagHelpers.cshtml @@ -1,4 +1,4 @@ -@addTagHelper "something" +@addTagHelper something diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/IncompleteTagHelper.cshtml b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/IncompleteTagHelper.cshtml index 9a70d2a485..add07acf43 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/IncompleteTagHelper.cshtml +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/IncompleteTagHelper.cshtml @@ -1,3 +1,3 @@ -@addTagHelper "something, nice" +@addTagHelper something, nice

      diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/NestedScriptTagTagHelpers.cshtml b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/NestedScriptTagTagHelpers.cshtml index 27a29b23b4..6ebcc156f0 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/NestedScriptTagTagHelpers.cshtml +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/NestedScriptTagTagHelpers.cshtml @@ -1,4 +1,4 @@ -@addTagHelper "something, nice" +@addTagHelper something, nice