From b6082d1523b587a4bb3045e9e8a2b5a974a6e345 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Wed, 26 Feb 2014 11:07:09 -0800 Subject: [PATCH] Modify tests to account for no indent helpers. Modified outputs of generated files to not indent helpers. Also fixed LineMapping verifications. --- .../Generator/CSharpRazorCodeGeneratorTest.cs | 99 +++++++++---------- .../CodeTree/CSharpCodeBuilderTests.cs | 2 + .../CodeTree/CSharpPaddingBuilderTests.cs | 10 +- .../CodeGenerator/CS/Output/Blocks.cs | 23 +++++ .../CodeGenerator/CS/Output/CodeBlock.cs | 1 + .../CodeGenerator/CS/Output/CodeBlockAtEOF.cs | 1 + .../CS/Output/ConditionalAttributes.cs | 13 +++ .../CodeGenerator/CS/Output/DesignTime.cs | 54 +++++----- .../CodeGenerator/CS/Output/EmptyCodeBlock.cs | 1 + .../CS/Output/EmptyExplicitExpression.cs | 7 +- .../CS/Output/EmptyImplicitExpression.cs | 7 +- .../EmptyImplicitExpressionInCode.Tabs.cs | 9 +- .../Output/EmptyImplicitExpressionInCode.cs | 9 +- .../CS/Output/ExplicitExpression.cs | 2 + .../CS/Output/ExplicitExpressionAtEOF.cs | 7 +- .../CS/Output/ExpressionsInCode.cs | 10 ++ .../Output/FunctionsBlock.DesignTime.Tabs.cs | 13 +-- .../CS/Output/FunctionsBlock.DesignTime.cs | 13 +-- .../CodeGenerator/CS/Output/FunctionsBlock.cs | 8 +- .../FunctionsBlockMinimal.DesignTime.Tabs.cs | 3 +- .../CS/Output/FunctionsBlock_Tabs.cs | 8 +- .../CS/Output/Helpers.Instance.cs | 14 +++ .../CodeGenerator/CS/Output/Helpers.cs | 14 +++ .../CS/Output/HelpersMissingCloseParen.cs | 7 ++ .../CS/Output/HelpersMissingOpenBrace.cs | 9 ++ .../CS/Output/HelpersMissingOpenParen.cs | 9 ++ .../CS/Output/HiddenSpansInCode.cs | 2 + .../CS/Output/ImplicitExpression.cs | 4 + .../CS/Output/ImplicitExpressionAtEOF.cs | 7 +- .../CS/Output/Imports.DesignTime.cs | 17 ++-- .../CodeGenerator/CS/Output/Imports.cs | 7 ++ .../CS/Output/Inherits.Designtime.cs | 8 +- .../CS/Output/Inherits.Runtime.cs | 2 + .../CodeGenerator/CS/Output/InlineBlocks.cs | 9 ++ .../CS/Output/MarkupInCodeBlock.cs | 4 + .../CS/Output/NestedCodeBlocks.cs | 3 + .../CodeGenerator/CS/Output/NestedHelpers.cs | 15 +++ .../CodeGenerator/CS/Output/NoLinePragmas.cs | 24 +++++ .../CS/Output/OpenedIf.DesignTime.Tabs.cs | 5 +- .../CS/Output/OpenedIf.DesignTime.cs | 5 +- .../CodeGenerator/CS/Output/ParserError.cs | 1 + .../CS/Output/RazorComments.DesignTime.cs | 28 +++--- .../CodeGenerator/CS/Output/RazorComments.cs | 9 ++ .../CodeGenerator/CS/Output/ResolveUrl.cs | 17 ++++ .../CodeGenerator/CS/Output/Sections.cs | 1 + .../SimpleUnspacedIf.DesignTime.Tabs.cs | 4 +- .../CodeGenerator/CS/Output/Templates.cs | 27 ++++- .../Output/UnfinishedExpressionInCode.Tabs.cs | 9 +- .../CS/Output/UnfinishedExpressionInCode.cs | 9 +- .../TestFiles/DesignTime/Simple.txt | 19 ++-- 50 files changed, 420 insertions(+), 169 deletions(-) diff --git a/test/Microsoft.AspNet.Razor.Test/Generator/CSharpRazorCodeGeneratorTest.cs b/test/Microsoft.AspNet.Razor.Test/Generator/CSharpRazorCodeGeneratorTest.cs index 51898afc29..477cb85d21 100644 --- a/test/Microsoft.AspNet.Razor.Test/Generator/CSharpRazorCodeGeneratorTest.cs +++ b/test/Microsoft.AspNet.Razor.Test/Generator/CSharpRazorCodeGeneratorTest.cs @@ -86,11 +86,6 @@ namespace Microsoft.AspNet.Razor.Test.Generator [InlineData("ResolveUrl")] public void CSharpCodeGeneratorCorrectlyGeneratesRunTimeCode(string testType) { - if (!Directory.Exists("./tests")) - { - Directory.CreateDirectory("./tests"); - } - RunTest(testType); } @@ -103,8 +98,8 @@ namespace Microsoft.AspNet.Razor.Test.Generator tabTest: TabTest.Tabs, expectedDesignTimePragmas: new List() { - BuildLineMapping(1, 0,449, 20, 1, 15), - BuildLineMapping(27, 2, 12, 538, 27, 6, 3) + BuildLineMapping(1, 0, 1, 448, 20, 0, 15), + BuildLineMapping(27, 2, 12, 539, 28, 6, 3) }); } @@ -115,12 +110,12 @@ namespace Microsoft.AspNet.Razor.Test.Generator expectedDesignTimePragmas: new List() { BuildLineMapping(81, 3, 441, 20, 2, 6), - BuildLineMapping(122, 4, 551, 26, 39, 22), - BuildLineMapping(173, 5, 687, 32, 49, 58), - BuildLineMapping(238, 11, 811, 40, 2, 24), - BuildLineMapping(310, 12, 966, 46, 45, 3), - BuildLineMapping(323, 14, 1070, 52, 2, 1), - BuildLineMapping(328, 14, 1142, 56, 7, 1), + BuildLineMapping(122, 4, 39, 552, 27, 38, 22), + BuildLineMapping(173, 5, 49, 689, 34, 48, 58), + BuildLineMapping(238, 11, 815, 43, 2, 24), + BuildLineMapping(310, 12, 973, 49, 45, 3), + BuildLineMapping(323, 14, 2, 1070, 54, 6, 1), + BuildLineMapping(328, 14, 1113, 56, 7, 1), }); } @@ -143,10 +138,10 @@ namespace Microsoft.AspNet.Razor.Test.Generator RunTest("Imports", "Imports.DesignTime", designTimeMode: true, tabTest: TabTest.NoTabs, expectedDesignTimePragmas: new List() { BuildLineMapping(1, 0, 1, 51, 3, 0, 15), - BuildLineMapping(19, 1, 1, 130, 8, 0, 32), - BuildLineMapping(54, 2, 1, 226, 13, 0, 12), - BuildLineMapping(99, 4, 702, 35, 29, 21), - BuildLineMapping(161, 5, 850, 41, 35, 20), + BuildLineMapping(19, 1, 1, 132, 9, 0, 32), + BuildLineMapping(54, 2, 1, 230, 15, 0, 12), + BuildLineMapping(99, 4, 716, 37, 29, 21), + BuildLineMapping(161, 5, 860, 42, 35, 20), }); } @@ -159,9 +154,9 @@ namespace Microsoft.AspNet.Razor.Test.Generator tabTest: TabTest.NoTabs, expectedDesignTimePragmas: new List() { - BuildLineMapping(12, 0, 168, 8, 12, 4), - BuildLineMapping(33, 4, 246, 13, 12, 104), - BuildLineMapping(167, 11, 744, 34, 25, 11) + BuildLineMapping(12, 0, 12, 156, 8, 0, 4), + BuildLineMapping(33, 4, 12, 224, 14, 0, 104), + BuildLineMapping(167, 11, 724, 35, 25, 11) }); } @@ -174,9 +169,9 @@ namespace Microsoft.AspNet.Razor.Test.Generator tabTest: TabTest.Tabs, expectedDesignTimePragmas: new List() { - BuildLineMapping(12, 0, 12, 159, 8, 3, 4), - BuildLineMapping(33, 4, 12, 228, 13, 3, 104), - BuildLineMapping(167, 11, 25, 708, 34, 7, 11) + BuildLineMapping(12, 0, 12, 156, 8, 0, 4), + BuildLineMapping(33, 4, 12, 224, 14, 0, 104), + BuildLineMapping(167, 11, 25, 712, 35, 13, 11) }); } @@ -189,7 +184,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator tabTest: TabTest.Tabs, expectedDesignTimePragmas: new List() { - BuildLineMapping(16, 2, 12, 176, 8, 6, 55) + BuildLineMapping(16, 2, 12, 170, 8, 0, 55) }); } @@ -199,7 +194,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator RunTest("HiddenSpansInCode", designTimeMode: true, tabTest: TabTest.NoTabs, expectedDesignTimePragmas: new List { BuildLineMapping(2, 0, 453, 20, 2, 6), - BuildLineMapping(9, 1, 533, 26, 5, 5) + BuildLineMapping(9, 1, 535, 27, 5, 5) }); } @@ -224,7 +219,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator RunTest("Inherits", baselineName: "Inherits.Designtime", designTimeMode: true, tabTest: TabTest.NoTabs, expectedDesignTimePragmas: new List() { BuildLineMapping(20, 2, 286, 11, 10, 25), - BuildLineMapping(1, 0, 591, 25, 1, 5) + BuildLineMapping(1, 0, 1, 605, 25, 6, 5) }); } @@ -234,8 +229,8 @@ namespace Microsoft.AspNet.Razor.Test.Generator RunTest("UnfinishedExpressionInCode", tabTest: TabTest.NoTabs, designTimeMode: true, expectedDesignTimePragmas: new List() { BuildLineMapping(2, 0, 480, 20, 2, 2), - BuildLineMapping(5, 1, 579, 26, 1, 9), - BuildLineMapping(14, 1, 689, 31, 10, 2) + BuildLineMapping(5, 1, 1, 575, 26, 6, 9), + BuildLineMapping(14, 1, 673, 31, 10, 2) }); } @@ -248,8 +243,8 @@ namespace Microsoft.AspNet.Razor.Test.Generator designTimeMode: true, expectedDesignTimePragmas: new List() { BuildLineMapping(2, 0, 480, 20, 2, 2), - BuildLineMapping(5, 1, 579, 26, 1, 9), - BuildLineMapping(14, 1, 10, 683, 31, 4, 2) + BuildLineMapping(5, 1, 1, 575, 26, 6, 9), + BuildLineMapping(14, 1, 10, 667, 31, 4, 2) }); } @@ -262,17 +257,17 @@ namespace Microsoft.AspNet.Razor.Test.Generator expectedDesignTimePragmas: new List() { BuildLineMapping(222, 16, 8, 174, 9, 0, 7), - BuildLineMapping(229, 16, 315, 14, 15, 26), - BuildLineMapping(265, 18, 422, 21, 18, 9), - BuildLineMapping(274, 20, 515, 29, 0, 1), - BuildLineMapping(20, 1, 873, 46, 13, 36), - BuildLineMapping(74, 2, 1013, 53, 22, 1), - BuildLineMapping(79, 2, 1116, 58, 27, 15), - BuildLineMapping(113, 7, 1215, 65, 2, 12), - BuildLineMapping(129, 8, 1323, 71, 1, 4), - BuildLineMapping(142, 8, 1490, 77, 14, 3), - BuildLineMapping(153, 8, 1627, 84, 25, 1), - BuildLineMapping(204, 13, 1778, 91, 5, 3) + BuildLineMapping(229, 16, 317, 15, 15, 26), + BuildLineMapping(265, 18, 426, 23, 18, 9), + BuildLineMapping(274, 20, 521, 32, 0, 1), + BuildLineMapping(20, 1, 13, 880, 50, 12, 36), + BuildLineMapping(74, 2, 1027, 57, 22, 1), + BuildLineMapping(79, 2, 1118, 62, 27, 15), + BuildLineMapping(113, 7, 2, 1228, 69, 6, 12), + BuildLineMapping(129, 8, 1, 1334, 74, 6, 4), + BuildLineMapping(142, 8, 1459, 76, 14, 3), + BuildLineMapping(153, 8, 1556, 83, 25, 1), + BuildLineMapping(204, 13, 5, 1729, 93, 6, 3) }); } @@ -282,7 +277,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator { RunTest("ImplicitExpressionAtEOF", designTimeMode: true, expectedDesignTimePragmas: new List() { - BuildLineMapping(19, 2, 490, 21, 1, 0) + BuildLineMapping(19, 2, 1, 487, 20, 6, 0) }); } @@ -291,7 +286,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator { RunTest("ExplicitExpressionAtEOF", designTimeMode: true, expectedDesignTimePragmas: new List() { - BuildLineMapping(20, 2, 491, 21, 2, 0) + BuildLineMapping(20, 2, 2, 487, 20, 6, 0) }); } @@ -309,7 +304,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator { RunTest("EmptyImplicitExpression", designTimeMode: true, expectedDesignTimePragmas: new List() { - BuildLineMapping(19, 2, 490, 21, 1, 0) + BuildLineMapping(19, 2, 1, 487, 20, 6, 0) }); } @@ -319,8 +314,8 @@ namespace Microsoft.AspNet.Razor.Test.Generator RunTest("EmptyImplicitExpressionInCode", tabTest: TabTest.NoTabs, designTimeMode: true, expectedDesignTimePragmas: new List() { BuildLineMapping(2, 0, 489, 20, 2, 6), - BuildLineMapping(9, 1, 601, 27, 5, 0), - BuildLineMapping(9, 1, 700, 32, 5, 2) + BuildLineMapping(9, 1, 5, 590, 27, 6, 0), + BuildLineMapping(9, 1, 677, 32, 5, 2) }); } @@ -333,8 +328,8 @@ namespace Microsoft.AspNet.Razor.Test.Generator designTimeMode: true, expectedDesignTimePragmas: new List() { BuildLineMapping(2, 0, 489, 20, 2, 6), - BuildLineMapping(9, 1, 5, 598, 27, 2, 0), - BuildLineMapping(9, 1, 5, 694, 32, 2, 2) + BuildLineMapping(9, 1, 5, 590, 27, 6, 0), + BuildLineMapping(9, 1, 5, 674, 32, 2, 2) }); } @@ -343,7 +338,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator { RunTest("EmptyExplicitExpression", designTimeMode: true, expectedDesignTimePragmas: new List() { - BuildLineMapping(20, 2, 491, 21, 2, 0) + BuildLineMapping(20, 2, 2, 487, 20, 6, 0) }); } @@ -417,10 +412,10 @@ namespace Microsoft.AspNet.Razor.Test.Generator }, expectedDesignTimePragmas: new List() { - BuildLineMapping(17, 2, 425, 20, 1, 14), - BuildLineMapping(38, 3, 7, 497 + tabOffsetForMapping, 25, tabOffsetForMapping, 2), + BuildLineMapping(17, 2, 1, 424, 20, 0, 14), + BuildLineMapping(38, 3, 7, 498 + tabOffsetForMapping, 26, tabOffsetForMapping, 2), // Multiply the tab offset absolute index by 2 to account for the first mapping - BuildLineMapping(47, 4, 7, 557 + tabOffsetForMapping * 2, 30, tabOffsetForMapping, 0) + BuildLineMapping(47, 4, 7, 560 + tabOffsetForMapping * 2, 32, tabOffsetForMapping, 0) }); } diff --git a/test/Microsoft.AspNet.Razor.Test/Generator/CodeTree/CSharpCodeBuilderTests.cs b/test/Microsoft.AspNet.Razor.Test/Generator/CodeTree/CSharpCodeBuilderTests.cs index e6aaf09667..63792b0859 100644 --- a/test/Microsoft.AspNet.Razor.Test/Generator/CodeTree/CSharpCodeBuilderTests.cs +++ b/test/Microsoft.AspNet.Razor.Test/Generator/CodeTree/CSharpCodeBuilderTests.cs @@ -27,11 +27,13 @@ namespace Microsoft.AspNet.Razor.Test.Generator.CodeTree { #line 1 """" using FakeNamespace1 + #line default #line hidden ; #line 1 """" using FakeNamespace2.SubNamespace + #line default #line hidden ; diff --git a/test/Microsoft.AspNet.Razor.Test/Generator/CodeTree/CSharpPaddingBuilderTests.cs b/test/Microsoft.AspNet.Razor.Test/Generator/CodeTree/CSharpPaddingBuilderTests.cs index 5981c9e81f..31410d3386 100644 --- a/test/Microsoft.AspNet.Razor.Test/Generator/CodeTree/CSharpPaddingBuilderTests.cs +++ b/test/Microsoft.AspNet.Razor.Test/Generator/CodeTree/CSharpPaddingBuilderTests.cs @@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator var paddingBuilder = new CSharpPaddingBuilder(host); // Act - int padding = paddingBuilder.CalculatePadding(span); + int padding = paddingBuilder.CalculatePadding(span, 0); // Assert Assert.Equal(0, padding); @@ -39,10 +39,10 @@ namespace Microsoft.AspNet.Razor.Test.Generator var paddingBuilder = new CSharpPaddingBuilder(host); // Act - int padding = paddingBuilder.CalculatePadding(span); + int padding = paddingBuilder.CalculatePadding(span, 1); // Assert - Assert.Equal(6, padding); + Assert.Equal(5, padding); } [Theory] @@ -57,10 +57,10 @@ namespace Microsoft.AspNet.Razor.Test.Generator var paddingBuilder = new CSharpPaddingBuilder(host); // Act - int padding = paddingBuilder.CalculatePadding(span); + int padding = paddingBuilder.CalculatePadding(span, 1); // Assert - Assert.Equal(5, padding); + Assert.Equal(4, padding); } // 4 padding should result in 4 spaces. Where in the previous test (5 spaces) should result in 1 tab. diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Blocks.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Blocks.cs index ae54f143ba..6632de57a7 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Blocks.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Blocks.cs @@ -14,12 +14,14 @@ namespace TestOutput #line 1 "Blocks.cshtml" int i = 1; + #line default #line hidden WriteLiteral("\r\n\r\n"); #line 5 "Blocks.cshtml" while(i <= 10) { + #line default #line hidden @@ -27,25 +29,30 @@ namespace TestOutput Write( #line 6 "Blocks.cshtml" i + #line default #line hidden ); + WriteLiteral("

\r\n"); #line 7 "Blocks.cshtml" i += 1; } + #line default #line hidden WriteLiteral("\r\n"); #line 10 "Blocks.cshtml" if(i == 11) { + #line default #line hidden WriteLiteral("

We wrote 10 lines!

\r\n"); #line 12 "Blocks.cshtml" } + #line default #line hidden @@ -53,6 +60,7 @@ namespace TestOutput #line 14 "Blocks.cshtml" switch(i) { case 11: + #line default #line hidden @@ -60,6 +68,7 @@ namespace TestOutput #line 17 "Blocks.cshtml" break; default: + #line default #line hidden @@ -67,12 +76,14 @@ namespace TestOutput #line 20 "Blocks.cshtml" break; } + #line default #line hidden WriteLiteral("\r\n"); #line 23 "Blocks.cshtml" for(int j = 1; j <= 10; j += 2) { + #line default #line hidden @@ -80,24 +91,29 @@ namespace TestOutput Write( #line 24 "Blocks.cshtml" j + #line default #line hidden ); + WriteLiteral("

\r\n"); #line 25 "Blocks.cshtml" } + #line default #line hidden WriteLiteral("\r\n"); #line 27 "Blocks.cshtml" try { + #line default #line hidden WriteLiteral("

That time, we wrote 5 lines!

\r\n"); #line 29 "Blocks.cshtml" } catch(Exception ex) { + #line default #line hidden @@ -105,12 +121,15 @@ namespace TestOutput Write( #line 30 "Blocks.cshtml" ex.Message + #line default #line hidden ); + WriteLiteral("

\r\n"); #line 31 "Blocks.cshtml" } + #line default #line hidden @@ -118,18 +137,22 @@ namespace TestOutput Write( #line 33 "Blocks.cshtml" i + #line default #line hidden ); + WriteLiteral("

\r\n\r\n"); #line 35 "Blocks.cshtml" lock(new object()) { + #line default #line hidden WriteLiteral("

This block is locked, for your security!

\r\n"); #line 37 "Blocks.cshtml" } + #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/CodeBlock.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/CodeBlock.cs index 86f3d82880..a5935f3479 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/CodeBlock.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/CodeBlock.cs @@ -16,6 +16,7 @@ namespace TestOutput for(int i = 1; i <= 10; i++) { Output.Write("

Hello from C#, #" + i.ToString() + "

"); } + #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/CodeBlockAtEOF.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/CodeBlockAtEOF.cs index ec5def9a51..a0f8eb9f51 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/CodeBlockAtEOF.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/CodeBlockAtEOF.cs @@ -19,6 +19,7 @@ namespace TestOutput { #line 1 "CodeBlockAtEOF.cshtml" + #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ConditionalAttributes.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ConditionalAttributes.cs index 2dfc8bb774..2bfb4cc745 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ConditionalAttributes.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ConditionalAttributes.cs @@ -15,6 +15,7 @@ namespace TestOutput var ch = true; var cls = "bar"; + #line default #line hidden @@ -23,6 +24,7 @@ namespace TestOutput Tuple.Create(Tuple.Create("", 82), Tuple.Create( #line 5 "ConditionalAttributes.cshtml" cls + #line default #line hidden , 82), false)); @@ -31,6 +33,7 @@ namespace TestOutput Tuple.Create(Tuple.Create(" ", 109), Tuple.Create( #line 6 "ConditionalAttributes.cshtml" cls + #line default #line hidden , 110), false)); @@ -39,6 +42,7 @@ namespace TestOutput Tuple.Create(Tuple.Create("", 134), Tuple.Create( #line 7 "ConditionalAttributes.cshtml" cls + #line default #line hidden , 134), false), Tuple.Create(Tuple.Create(" ", 138), Tuple.Create("foo", 139), true)); @@ -47,6 +51,7 @@ namespace TestOutput Tuple.Create(Tuple.Create("", 184), Tuple.Create( #line 8 "ConditionalAttributes.cshtml" ch + #line default #line hidden , 184), false)); @@ -55,6 +60,7 @@ namespace TestOutput Tuple.Create(Tuple.Create(" ", 232), Tuple.Create( #line 9 "ConditionalAttributes.cshtml" ch + #line default #line hidden , 233), false)); @@ -63,17 +69,21 @@ namespace TestOutput Tuple.Create(Tuple.Create("", 256), Tuple.Create(new Template((__razor_attribute_value_writer) => { #line 10 "ConditionalAttributes.cshtml" if(cls != null) { + #line default #line hidden WriteTo(__razor_attribute_value_writer, #line 10 "ConditionalAttributes.cshtml" cls + #line default #line hidden ); + #line 10 "ConditionalAttributes.cshtml" } + #line default #line hidden @@ -86,6 +96,7 @@ namespace TestOutput Tuple.Create(Tuple.Create("", 328), Tuple.Create( #line 12 "ConditionalAttributes.cshtml" Url.Content("~/Scripts/jquery-1.6.2.min.js") + #line default #line hidden , 328), false)); @@ -94,12 +105,14 @@ namespace TestOutput Tuple.Create(Tuple.Create("", 426), Tuple.Create( #line 13 "ConditionalAttributes.cshtml" Url.Content("~/Scripts/modernizr-2.0.6-development-only.js") + #line default #line hidden , 426), false)); WriteLiteral(" type=\"text/javascript\">\r\n \r\n"); #line 15 "ConditionalAttributes.cshtml" + #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/DesignTime.cs index cec55a4bf7..5504a275aa 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/DesignTime.cs @@ -8,6 +8,7 @@ namespace TestOutput public static Template #line 17 "DesignTime.cshtml" Foo() { + #line default #line hidden return new Template((__razor_helper_writer) => { @@ -15,12 +16,14 @@ Foo() { if(true) { + #line default #line hidden #line 19 "DesignTime.cshtml" } + #line default #line hidden @@ -28,6 +31,7 @@ Foo() { ); #line 21 "DesignTime.cshtml" } + #line default #line hidden @@ -44,55 +48,53 @@ Foo() { public override void Execute() { #line 2 "DesignTime.cshtml" - for(int i = 1; i <= 10; i++) { + for(int i = 1; i <= 10; i++) { + #line default #line hidden - __o = -#line 3 "DesignTime.cshtml" - i +#line 1 "This is here only for document formatting." + __o = i; + #line default #line hidden - ; #line 3 "DesignTime.cshtml" } + #line default #line hidden - __o = -#line 8 "DesignTime.cshtml" - Foo(Bar.Baz) +#line 1 "This is here only for document formatting." +__o = Foo(Bar.Baz); + #line default #line hidden - ; - __o = -#line 9 "DesignTime.cshtml" - Foo( +#line 1 "This is here only for document formatting." +__o = Foo(item => new Template((__razor_template_writer) => { +#line 1 "This is here only for document formatting." + __o = baz; + #line default #line hidden - item => new Template((__razor_template_writer) => { - __o = -#line 9 "DesignTime.cshtml" - baz -#line default -#line hidden - ; - } - ) +} +) #line 9 "DesignTime.cshtml" ) + +#line default +#line hidden +; + #line default #line hidden - ; DefineSection("Footer", () => { - __o = -#line 14 "DesignTime.cshtml" - bar +#line 1 "This is here only for document formatting." +__o = bar; + #line default #line hidden - ; } ); } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyCodeBlock.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyCodeBlock.cs index d6564bdfc6..3928537e49 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyCodeBlock.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyCodeBlock.cs @@ -19,6 +19,7 @@ namespace TestOutput { #line 3 "EmptyCodeBlock.cshtml" + #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyExplicitExpression.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyExplicitExpression.cs index a3faf577b4..8a0886ee89 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyExplicitExpression.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyExplicitExpression.cs @@ -17,12 +17,11 @@ namespace TestOutput public override void Execute() { - __o = -#line 3 "EmptyExplicitExpression.cshtml" - +#line 1 "This is here only for document formatting." +__o = ; + #line default #line hidden - ; } } } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpression.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpression.cs index fd847e56a5..073eb4ea45 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpression.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpression.cs @@ -17,12 +17,11 @@ namespace TestOutput public override void Execute() { - __o = -#line 3 "EmptyImplicitExpression.cshtml" - +#line 1 "This is here only for document formatting." +__o = ; + #line default #line hidden - ; } } } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpressionInCode.Tabs.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpressionInCode.Tabs.cs index 3e35ccefe1..1622c89b65 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpressionInCode.Tabs.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpressionInCode.Tabs.cs @@ -20,17 +20,18 @@ namespace TestOutput #line 1 "EmptyImplicitExpressionInCode.cshtml" + #line default #line hidden - __o = -#line 2 "EmptyImplicitExpressionInCode.cshtml" - +#line 1 "This is here only for document formatting." +__o = ; + #line default #line hidden - ; #line 2 "EmptyImplicitExpressionInCode.cshtml" + #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpressionInCode.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpressionInCode.cs index 740bc283bd..83b3308935 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpressionInCode.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpressionInCode.cs @@ -20,17 +20,18 @@ namespace TestOutput #line 1 "EmptyImplicitExpressionInCode.cshtml" + #line default #line hidden - __o = -#line 2 "EmptyImplicitExpressionInCode.cshtml" - +#line 1 "This is here only for document formatting." +__o = ; + #line default #line hidden - ; #line 2 "EmptyImplicitExpressionInCode.cshtml" + #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ExplicitExpression.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ExplicitExpression.cs index 96cb3055fd..8cb3f2fbb4 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ExplicitExpression.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ExplicitExpression.cs @@ -15,9 +15,11 @@ namespace TestOutput Write( #line 1 "ExplicitExpression.cshtml" 1+1 + #line default #line hidden ); + } } } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ExplicitExpressionAtEOF.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ExplicitExpressionAtEOF.cs index dfd8e063f3..b809681249 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ExplicitExpressionAtEOF.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ExplicitExpressionAtEOF.cs @@ -17,12 +17,11 @@ namespace TestOutput public override void Execute() { - __o = -#line 3 "ExplicitExpressionAtEOF.cshtml" - +#line 1 "This is here only for document formatting." +__o = ; + #line default #line hidden - ; } } } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ExpressionsInCode.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ExpressionsInCode.cs index 1f49e4a25a..bd5164f592 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ExpressionsInCode.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ExpressionsInCode.cs @@ -15,6 +15,7 @@ namespace TestOutput object foo = null; string bar = "Foo"; + #line default #line hidden @@ -22,24 +23,29 @@ namespace TestOutput #line 6 "ExpressionsInCode.cshtml" if(foo != null) { + #line default #line hidden Write( #line 7 "ExpressionsInCode.cshtml" foo + #line default #line hidden ); + #line 7 "ExpressionsInCode.cshtml" } else { + #line default #line hidden WriteLiteral("

Foo is Null!

\r\n"); #line 10 "ExpressionsInCode.cshtml" } + #line default #line hidden @@ -47,18 +53,22 @@ namespace TestOutput #line 13 "ExpressionsInCode.cshtml" if(!String.IsNullOrEmpty(bar)) { + #line default #line hidden Write( #line 14 "ExpressionsInCode.cshtml" bar.Replace("F", "B") + #line default #line hidden ); + #line 14 "ExpressionsInCode.cshtml" } + #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock.DesignTime.Tabs.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock.DesignTime.Tabs.cs index 890e146d1b..2900ee527b 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock.DesignTime.Tabs.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock.DesignTime.Tabs.cs @@ -6,16 +6,18 @@ namespace TestOutput { private static object @__o; #line 1 "FunctionsBlock.cshtml" - + + #line default #line hidden #line 5 "FunctionsBlock.cshtml" - + Random _rand = new Random(); private int RandomInt() { return _rand.Next(); } + #line default #line hidden private void @__RazorDesignTimeHelpers__() @@ -30,12 +32,11 @@ namespace TestOutput public override void Execute() { - __o = -#line 12 "FunctionsBlock.cshtml" - RandomInt() +#line 1 "This is here only for document formatting." + __o = RandomInt(); + #line default #line hidden - ; } } } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock.DesignTime.cs index e776b905a1..b55d9bcf3c 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock.DesignTime.cs @@ -6,16 +6,18 @@ namespace TestOutput { private static object @__o; #line 1 "FunctionsBlock.cshtml" - + + #line default #line hidden #line 5 "FunctionsBlock.cshtml" - + Random _rand = new Random(); private int RandomInt() { return _rand.Next(); } + #line default #line hidden private void @__RazorDesignTimeHelpers__() @@ -30,12 +32,11 @@ namespace TestOutput public override void Execute() { - __o = -#line 12 "FunctionsBlock.cshtml" - RandomInt() +#line 1 "This is here only for document formatting." + __o = RandomInt(); + #line default #line hidden - ; } } } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock.cs index 7e5c31a9e0..679525dd53 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock.cs @@ -5,16 +5,18 @@ namespace TestOutput public class FunctionsBlock { #line 1 "FunctionsBlock.cshtml" - + + #line default #line hidden #line 5 "FunctionsBlock.cshtml" - + Random _rand = new Random(); private int RandomInt() { return _rand.Next(); } + #line default #line hidden #line hidden @@ -29,9 +31,11 @@ namespace TestOutput Write( #line 12 "FunctionsBlock.cshtml" RandomInt() + #line default #line hidden ); + } } } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlockMinimal.DesignTime.Tabs.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlockMinimal.DesignTime.Tabs.cs index 0aca153aba..d236672670 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlockMinimal.DesignTime.Tabs.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlockMinimal.DesignTime.Tabs.cs @@ -6,10 +6,11 @@ namespace TestOutput { private static object @__o; #line 3 "FunctionsBlockMinimal.cshtml" - + string foo(string input) { return input + "!"; } + #line default #line hidden private void @__RazorDesignTimeHelpers__() diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock_Tabs.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock_Tabs.cs index 645657b3be..6c4a3ed63b 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock_Tabs.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock_Tabs.cs @@ -5,16 +5,18 @@ namespace TestOutput public class FunctionsBlock_Tabs { #line 1 "FunctionsBlock_Tabs.cshtml" - + + #line default #line hidden #line 5 "FunctionsBlock_Tabs.cshtml" - + Random _rand = new Random(); private int RandomInt() { return _rand.Next(); } + #line default #line hidden #line hidden @@ -29,9 +31,11 @@ namespace TestOutput Write( #line 12 "FunctionsBlock_Tabs.cshtml" RandomInt() + #line default #line hidden ); + } } } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Helpers.Instance.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Helpers.Instance.cs index c7835894cd..74812fcab6 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Helpers.Instance.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Helpers.Instance.cs @@ -7,12 +7,14 @@ namespace TestOutput public Template #line 1 "Helpers.cshtml" Bold(string s) { + #line default #line hidden return new Template((__razor_helper_writer) => { #line 1 "Helpers.cshtml" s = s.ToUpper(); + #line default #line hidden @@ -20,11 +22,14 @@ Bold(string s) { WriteTo(__razor_helper_writer, #line 3 "Helpers.cshtml" s + #line default #line hidden ); + WriteLiteralTo(__razor_helper_writer, "\r\n"); #line 4 "Helpers.cshtml" + #line default #line hidden @@ -32,18 +37,21 @@ Bold(string s) { ); #line 4 "Helpers.cshtml" } + #line default #line hidden public Template #line 6 "Helpers.cshtml" Italic(string s) { + #line default #line hidden return new Template((__razor_helper_writer) => { #line 6 "Helpers.cshtml" s = s.ToUpper(); + #line default #line hidden @@ -51,11 +59,14 @@ Italic(string s) { WriteTo(__razor_helper_writer, #line 8 "Helpers.cshtml" s + #line default #line hidden ); + WriteLiteralTo(__razor_helper_writer, "\r\n"); #line 9 "Helpers.cshtml" + #line default #line hidden @@ -63,6 +74,7 @@ Italic(string s) { ); #line 9 "Helpers.cshtml" } + #line default #line hidden @@ -78,9 +90,11 @@ Italic(string s) { Write( #line 11 "Helpers.cshtml" Bold("Hello") + #line default #line hidden ); + } } } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Helpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Helpers.cs index c5762d35ed..5e01b915eb 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Helpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Helpers.cs @@ -7,12 +7,14 @@ namespace TestOutput public static Template #line 1 "Helpers.cshtml" Bold(string s) { + #line default #line hidden return new Template((__razor_helper_writer) => { #line 1 "Helpers.cshtml" s = s.ToUpper(); + #line default #line hidden @@ -20,11 +22,14 @@ Bold(string s) { WriteTo(__razor_helper_writer, #line 3 "Helpers.cshtml" s + #line default #line hidden ); + WriteLiteralTo(__razor_helper_writer, "\r\n"); #line 4 "Helpers.cshtml" + #line default #line hidden @@ -32,18 +37,21 @@ Bold(string s) { ); #line 4 "Helpers.cshtml" } + #line default #line hidden public static Template #line 6 "Helpers.cshtml" Italic(string s) { + #line default #line hidden return new Template((__razor_helper_writer) => { #line 6 "Helpers.cshtml" s = s.ToUpper(); + #line default #line hidden @@ -51,11 +59,14 @@ Italic(string s) { WriteTo(__razor_helper_writer, #line 8 "Helpers.cshtml" s + #line default #line hidden ); + WriteLiteralTo(__razor_helper_writer, "\r\n"); #line 9 "Helpers.cshtml" + #line default #line hidden @@ -63,6 +74,7 @@ Italic(string s) { ); #line 9 "Helpers.cshtml" } + #line default #line hidden @@ -78,9 +90,11 @@ Italic(string s) { Write( #line 11 "Helpers.cshtml" Bold("Hello") + #line default #line hidden ); + } } } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingCloseParen.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingCloseParen.cs index e7ef5fae51..65fce2d4e4 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingCloseParen.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingCloseParen.cs @@ -7,12 +7,14 @@ namespace TestOutput public static Template #line 1 "HelpersMissingCloseParen.cshtml" Bold(string s) { + #line default #line hidden return new Template((__razor_helper_writer) => { #line 1 "HelpersMissingCloseParen.cshtml" s = s.ToUpper(); + #line default #line hidden @@ -20,11 +22,14 @@ Bold(string s) { WriteTo(__razor_helper_writer, #line 3 "HelpersMissingCloseParen.cshtml" s + #line default #line hidden ); + WriteLiteralTo(__razor_helper_writer, "\r\n"); #line 4 "HelpersMissingCloseParen.cshtml" + #line default #line hidden @@ -32,6 +37,7 @@ Bold(string s) { ); #line 4 "HelpersMissingCloseParen.cshtml" } + #line default #line hidden @@ -39,6 +45,7 @@ public static Template #line 6 "HelpersMissingCloseParen.cshtml" Italic(string s @Bold("Hello") + #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingOpenBrace.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingOpenBrace.cs index 7c1bd23093..ce9845da9f 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingOpenBrace.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingOpenBrace.cs @@ -7,12 +7,14 @@ namespace TestOutput public static Template #line 1 "HelpersMissingOpenBrace.cshtml" Bold(string s) { + #line default #line hidden return new Template((__razor_helper_writer) => { #line 1 "HelpersMissingOpenBrace.cshtml" s = s.ToUpper(); + #line default #line hidden @@ -20,11 +22,14 @@ Bold(string s) { WriteTo(__razor_helper_writer, #line 3 "HelpersMissingOpenBrace.cshtml" s + #line default #line hidden ); + WriteLiteralTo(__razor_helper_writer, "\r\n"); #line 4 "HelpersMissingOpenBrace.cshtml" + #line default #line hidden @@ -32,12 +37,14 @@ Bold(string s) { ); #line 4 "HelpersMissingOpenBrace.cshtml" } + #line default #line hidden public static Template #line 6 "HelpersMissingOpenBrace.cshtml" Italic(string s) + #line default #line hidden @@ -52,9 +59,11 @@ Italic(string s) Write( #line 7 "HelpersMissingOpenBrace.cshtml" Italic(s) + #line default #line hidden ); + } } } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingOpenParen.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingOpenParen.cs index f966a586ae..58fa653e95 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingOpenParen.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingOpenParen.cs @@ -7,12 +7,14 @@ namespace TestOutput public static Template #line 1 "HelpersMissingOpenParen.cshtml" Bold(string s) { + #line default #line hidden return new Template((__razor_helper_writer) => { #line 1 "HelpersMissingOpenParen.cshtml" s = s.ToUpper(); + #line default #line hidden @@ -20,11 +22,14 @@ Bold(string s) { WriteTo(__razor_helper_writer, #line 3 "HelpersMissingOpenParen.cshtml" s + #line default #line hidden ); + WriteLiteralTo(__razor_helper_writer, "\r\n"); #line 4 "HelpersMissingOpenParen.cshtml" + #line default #line hidden @@ -32,12 +37,14 @@ Bold(string s) { ); #line 4 "HelpersMissingOpenParen.cshtml" } + #line default #line hidden public static Template #line 6 "HelpersMissingOpenParen.cshtml" Italic + #line default #line hidden @@ -52,9 +59,11 @@ Italic Write( #line 7 "HelpersMissingOpenParen.cshtml" Bold("Hello") + #line default #line hidden ); + } } } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HiddenSpansInCode.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HiddenSpansInCode.cs index af30784465..2e00f4dc08 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HiddenSpansInCode.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HiddenSpansInCode.cs @@ -20,11 +20,13 @@ namespace TestOutput #line 1 "HiddenSpansInCode.cshtml" + #line default #line hidden #line 2 "HiddenSpansInCode.cshtml" @Da + #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ImplicitExpression.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ImplicitExpression.cs index 7a0c76d87a..e93721ee8c 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ImplicitExpression.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ImplicitExpression.cs @@ -13,6 +13,7 @@ namespace TestOutput { #line 1 "ImplicitExpression.cshtml" for(int i = 1; i <= 10; i++) { + #line default #line hidden @@ -20,12 +21,15 @@ namespace TestOutput Write( #line 2 "ImplicitExpression.cshtml" i + #line default #line hidden ); + WriteLiteral("

\r\n"); #line 3 "ImplicitExpression.cshtml" } + #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ImplicitExpressionAtEOF.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ImplicitExpressionAtEOF.cs index 880a90e731..425a7e3e76 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ImplicitExpressionAtEOF.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ImplicitExpressionAtEOF.cs @@ -17,12 +17,11 @@ namespace TestOutput public override void Execute() { - __o = -#line 3 "ImplicitExpressionAtEOF.cshtml" - +#line 1 "This is here only for document formatting." +__o = ; + #line default #line hidden - ; } } } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Imports.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Imports.DesignTime.cs index dcd59bae68..222a1b95a6 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Imports.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Imports.DesignTime.cs @@ -2,16 +2,19 @@ namespace TestOutput { #line 1 "Imports.cshtml" using System.IO + #line default #line hidden ; #line 2 "Imports.cshtml" using Foo = System.Text.Encoding + #line default #line hidden ; #line 3 "Imports.cshtml" using System + #line default #line hidden ; @@ -31,18 +34,16 @@ using System public override void Execute() { - __o = -#line 5 "Imports.cshtml" - typeof(Path).FullName +#line 1 "This is here only for document formatting." + __o = typeof(Path).FullName; + #line default #line hidden - ; - __o = -#line 6 "Imports.cshtml" - typeof(Foo).FullName +#line 1 "This is here only for document formatting." + __o = typeof(Foo).FullName; + #line default #line hidden - ; } } } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Imports.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Imports.cs index ff7fea355a..1adbaa309d 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Imports.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Imports.cs @@ -2,16 +2,19 @@ namespace TestOutput { #line 1 "Imports.cshtml" using System.IO + #line default #line hidden ; #line 2 "Imports.cshtml" using Foo = System.Text.Encoding + #line default #line hidden ; #line 3 "Imports.cshtml" using System + #line default #line hidden ; @@ -29,16 +32,20 @@ using System Write( #line 5 "Imports.cshtml" typeof(Path).FullName + #line default #line hidden ); + WriteLiteral("

\r\n

Foo\'s actual full type name is "); Write( #line 6 "Imports.cshtml" typeof(Foo).FullName + #line default #line hidden ); + WriteLiteral("

"); } } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Inherits.Designtime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Inherits.Designtime.cs index 697b0fd7b0..a582bda285 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Inherits.Designtime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Inherits.Designtime.cs @@ -10,6 +10,7 @@ namespace TestOutput #pragma warning disable 219 #line 3 "Inherits.cshtml" foo.bar>.boz bar __inheritsHelper = null; + #line default #line hidden #pragma warning restore 219 @@ -21,12 +22,11 @@ namespace TestOutput public override void Execute() { - __o = -#line 1 "Inherits.cshtml" - foo() +#line 1 "This is here only for document formatting." +__o = foo(); + #line default #line hidden - ; } } } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Inherits.Runtime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Inherits.Runtime.cs index e0601378ab..0b4ea4fb72 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Inherits.Runtime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Inherits.Runtime.cs @@ -14,9 +14,11 @@ namespace TestOutput Write( #line 1 "Inherits.cshtml" foo() + #line default #line hidden ); + WriteLiteral("\r\n\r\n"); } } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/InlineBlocks.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/InlineBlocks.cs index b0b5aeddb1..f97c774c91 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/InlineBlocks.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/InlineBlocks.cs @@ -7,11 +7,13 @@ namespace TestOutput public static Template #line 1 "InlineBlocks.cshtml" Link(string link) { + #line default #line hidden return new Template((__razor_helper_writer) => { #line 1 "InlineBlocks.cshtml" + #line default #line hidden @@ -20,23 +22,28 @@ Link(string link) { Tuple.Create(Tuple.Create("", 42), Tuple.Create(new Template((__razor_attribute_value_writer) => { #line 2 "InlineBlocks.cshtml" if(link != null) { + #line default #line hidden WriteTo(__razor_attribute_value_writer, #line 2 "InlineBlocks.cshtml" link + #line default #line hidden ); + #line 2 "InlineBlocks.cshtml" } else { + #line default #line hidden WriteLiteralTo(__razor_attribute_value_writer, " # "); #line 2 "InlineBlocks.cshtml" } + #line default #line hidden @@ -44,6 +51,7 @@ Link(string link) { ), 42), false)); WriteLiteralTo(__razor_helper_writer, " />\r\n"); #line 3 "InlineBlocks.cshtml" + #line default #line hidden @@ -51,6 +59,7 @@ Link(string link) { ); #line 3 "InlineBlocks.cshtml" } + #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/MarkupInCodeBlock.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/MarkupInCodeBlock.cs index 33fafde719..5737eec819 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/MarkupInCodeBlock.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/MarkupInCodeBlock.cs @@ -14,6 +14,7 @@ namespace TestOutput #line 1 "MarkupInCodeBlock.cshtml" for(int i = 1; i <= 10; i++) { + #line default #line hidden @@ -21,12 +22,15 @@ namespace TestOutput Write( #line 3 "MarkupInCodeBlock.cshtml" i.ToString() + #line default #line hidden ); + WriteLiteral("

\r\n"); #line 4 "MarkupInCodeBlock.cshtml" } + #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/NestedCodeBlocks.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/NestedCodeBlocks.cs index d41094cb26..7b4da46150 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/NestedCodeBlocks.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/NestedCodeBlocks.cs @@ -14,18 +14,21 @@ namespace TestOutput #line 1 "NestedCodeBlocks.cshtml" if(foo) { + #line default #line hidden #line 2 "NestedCodeBlocks.cshtml" if(bar) { } + #line default #line hidden #line 3 "NestedCodeBlocks.cshtml" } + #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/NestedHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/NestedHelpers.cs index b55921b43f..93958b3564 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/NestedHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/NestedHelpers.cs @@ -7,6 +7,7 @@ namespace TestOutput public static Template #line 1 "NestedHelpers.cshtml" Italic(string s) { + #line default #line hidden return new Template((__razor_helper_writer) => { @@ -14,11 +15,13 @@ Italic(string s) { s = s.ToUpper(); + #line default #line hidden #line 6 "NestedHelpers.cshtml" + #line default #line hidden @@ -26,11 +29,14 @@ Italic(string s) { WriteTo(__razor_helper_writer, #line 7 "NestedHelpers.cshtml" Bold(s) + #line default #line hidden ); + WriteLiteralTo(__razor_helper_writer, "\r\n"); #line 8 "NestedHelpers.cshtml" + #line default #line hidden @@ -38,18 +44,21 @@ Italic(string s) { ); #line 8 "NestedHelpers.cshtml" } + #line default #line hidden public static Template #line 3 "NestedHelpers.cshtml" Bold(string s) { + #line default #line hidden return new Template((__razor_helper_writer) => { #line 3 "NestedHelpers.cshtml" s = s.ToUpper(); + #line default #line hidden @@ -57,12 +66,15 @@ Bold(string s) { WriteTo(__razor_helper_writer, #line 5 "NestedHelpers.cshtml" s + #line default #line hidden ); + WriteLiteralTo(__razor_helper_writer, "\r\n"); #line 6 "NestedHelpers.cshtml" + #line default #line hidden @@ -70,6 +82,7 @@ Bold(string s) { ); #line 6 "NestedHelpers.cshtml" } + #line default #line hidden @@ -84,9 +97,11 @@ Bold(string s) { Write( #line 10 "NestedHelpers.cshtml" Italic("Hello") + #line default #line hidden ); + } } } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/NoLinePragmas.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/NoLinePragmas.cs index 582a49790d..95a9512d39 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/NoLinePragmas.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/NoLinePragmas.cs @@ -14,12 +14,14 @@ namespace TestOutput #line 1 "" int i = 1; + #line default #line hidden WriteLiteral("\r\n\r\n"); #line 5 "" while(i <= 10) { + #line default #line hidden @@ -27,25 +29,30 @@ namespace TestOutput Write( #line 6 "" i + #line default #line hidden ); + WriteLiteral("

\r\n"); #line 7 "" i += 1; } + #line default #line hidden WriteLiteral("\r\n"); #line 10 "" if(i == 11) { + #line default #line hidden WriteLiteral("

We wrote 10 lines!

\r\n"); #line 12 "" } + #line default #line hidden @@ -53,6 +60,7 @@ namespace TestOutput #line 14 "" switch(i) { case 11: + #line default #line hidden @@ -60,6 +68,7 @@ namespace TestOutput #line 17 "" break; default: + #line default #line hidden @@ -67,12 +76,14 @@ namespace TestOutput #line 20 "" break; } + #line default #line hidden WriteLiteral("\r\n"); #line 23 "" for(int j = 1; j <= 10; j += 2) { + #line default #line hidden @@ -80,24 +91,29 @@ namespace TestOutput Write( #line 24 "" j + #line default #line hidden ); + WriteLiteral("

\r\n"); #line 25 "" } + #line default #line hidden WriteLiteral("\r\n"); #line 27 "" try { + #line default #line hidden WriteLiteral("

That time, we wrote 5 lines!

\r\n"); #line 29 "" } catch(Exception ex) { + #line default #line hidden @@ -105,18 +121,22 @@ namespace TestOutput Write( #line 30 "" ex.Message + #line default #line hidden ); + WriteLiteral("

\r\n"); #line 31 "" } + #line default #line hidden #line 33 "" + #line default #line hidden @@ -124,18 +144,22 @@ namespace TestOutput Write( #line 34 "" i + #line default #line hidden ); + WriteLiteral("

\r\n\r\n"); #line 36 "" lock(new object()) { + #line default #line hidden WriteLiteral("

This block is locked, for your security!

\r\n"); #line 38 "" } + #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/OpenedIf.DesignTime.Tabs.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/OpenedIf.DesignTime.Tabs.cs index 829a32c55a..4f8439a6f1 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/OpenedIf.DesignTime.Tabs.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/OpenedIf.DesignTime.Tabs.cs @@ -18,17 +18,20 @@ namespace TestOutput public override void Execute() { #line 3 "OpenedIf.cshtml" - if (true) { +if (true) { + #line default #line hidden #line 4 "OpenedIf.cshtml" + #line default #line hidden #line 5 "OpenedIf.cshtml" + #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/OpenedIf.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/OpenedIf.DesignTime.cs index 227383c944..4bd989e916 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/OpenedIf.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/OpenedIf.DesignTime.cs @@ -18,17 +18,20 @@ namespace TestOutput public override void Execute() { #line 3 "OpenedIf.cshtml" - if (true) { +if (true) { + #line default #line hidden #line 4 "OpenedIf.cshtml" + #line default #line hidden #line 5 "OpenedIf.cshtml" + #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ParserError.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ParserError.cs index 25a8405a71..75bd58771b 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ParserError.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ParserError.cs @@ -23,6 +23,7 @@ namespace TestOutput int i =10; int j =20; } + #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/RazorComments.DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/RazorComments.DesignTime.cs index 0d872a0618..a33874b795 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/RazorComments.DesignTime.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/RazorComments.DesignTime.cs @@ -20,44 +20,48 @@ namespace TestOutput #line 4 "RazorComments.cshtml" + #line default #line hidden #line 5 "RazorComments.cshtml" - + Exception foo = + #line default #line hidden #line 6 "RazorComments.cshtml" - null; + null; if(foo != null) { throw foo; } + #line default #line hidden #line 12 "RazorComments.cshtml" var bar = "@* bar *@"; + #line default #line hidden - __o = -#line 13 "RazorComments.cshtml" - bar -#line default -#line hidden - ; - __o = -#line 15 "RazorComments.cshtml" - a +#line 1 "This is here only for document formatting." + __o = bar; + #line default #line hidden +#line 1 "This is here only for document formatting." +__o = a #line 15 "RazorComments.cshtml" b + +#line default +#line hidden +; + #line default #line hidden - ; } } } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/RazorComments.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/RazorComments.cs index 4651728e81..1944eecf3a 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/RazorComments.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/RazorComments.cs @@ -15,12 +15,14 @@ namespace TestOutput #line 4 "RazorComments.cshtml" + #line default #line hidden #line 5 "RazorComments.cshtml" Exception foo = + #line default #line hidden @@ -29,12 +31,14 @@ namespace TestOutput if(foo != null) { throw foo; } + #line default #line hidden WriteLiteral("\r\n\r\n"); #line 12 "RazorComments.cshtml" var bar = "@* bar *@"; + #line default #line hidden @@ -42,20 +46,25 @@ namespace TestOutput Write( #line 13 "RazorComments.cshtml" bar + #line default #line hidden ); + WriteLiteral("

\r\n\r\n"); Write( #line 15 "RazorComments.cshtml" a + #line default #line hidden #line 15 "RazorComments.cshtml" b + #line default #line hidden ); + WriteLiteral("\r\n"); } } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ResolveUrl.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ResolveUrl.cs index 26394f77c4..b79094c09b 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ResolveUrl.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ResolveUrl.cs @@ -18,6 +18,7 @@ namespace TestOutput Tuple.Create(Tuple.Create("", 45), Tuple.Create( #line 2 "ResolveUrl.cshtml" product.id + #line default #line hidden , 45), false)); @@ -25,14 +26,17 @@ namespace TestOutput Write( #line 2 "ResolveUrl.cshtml" product.Name + #line default #line hidden ); + WriteLiteral("\r\n(Href("~/Products/"), 86), false), Tuple.Create(Tuple.Create("", 97), Tuple.Create( #line 3 "ResolveUrl.cshtml" product.id + #line default #line hidden , 97), false), Tuple.Create(Tuple.Create("", 108), Tuple.Create("/Detail", 108), true)); @@ -41,12 +45,14 @@ namespace TestOutput Tuple.Create(Tuple.Create("", 169), Tuple.Create( #line 4 "ResolveUrl.cshtml" product.id + #line default #line hidden , 169), false), Tuple.Create(Tuple.Create("", 180), Tuple.Create("/Detail", 180), true)); WriteLiteral(">Crazy Url!\r\n\r\n"); #line 6 "ResolveUrl.cshtml" + #line default #line hidden @@ -57,6 +63,7 @@ namespace TestOutput Tuple.Create(Tuple.Create("", 284), Tuple.Create( #line 9 "ResolveUrl.cshtml" product.id + #line default #line hidden , 284), false)); @@ -64,14 +71,17 @@ namespace TestOutput Write( #line 9 "ResolveUrl.cshtml" product.Name + #line default #line hidden ); + WriteLiteral("\r\n (Href("~/Products/"), 333), false), Tuple.Create(Tuple.Create("", 344), Tuple.Create( #line 10 "ResolveUrl.cshtml" product.id + #line default #line hidden , 344), false), Tuple.Create(Tuple.Create("", 355), Tuple.Create("/Detail", 355), true)); @@ -80,11 +90,13 @@ namespace TestOutput Tuple.Create(Tuple.Create("", 424), Tuple.Create( #line 11 "ResolveUrl.cshtml" product.id + #line default #line hidden , 424), false), Tuple.Create(Tuple.Create("", 435), Tuple.Create("/Detail", 435), true)); WriteLiteral(">Crazy Url!\r\n \r\n"); #line 13 "ResolveUrl.cshtml" + #line default #line hidden @@ -97,6 +109,7 @@ namespace TestOutput Tuple.Create(Tuple.Create("", 547), Tuple.Create( #line 17 "ResolveUrl.cshtml" product.id + #line default #line hidden , 547), false)); @@ -104,14 +117,17 @@ namespace TestOutput Write( #line 17 "ResolveUrl.cshtml" product.Name + #line default #line hidden ); + WriteLiteral("\r\n (Href("~/Products/"), 592), false), Tuple.Create(Tuple.Create("", 603), Tuple.Create( #line 18 "ResolveUrl.cshtml" product.id + #line default #line hidden , 603), false), Tuple.Create(Tuple.Create("", 614), Tuple.Create("/Detail", 614), true)); @@ -120,6 +136,7 @@ namespace TestOutput Tuple.Create(Tuple.Create("", 679), Tuple.Create( #line 19 "ResolveUrl.cshtml" product.id + #line default #line hidden , 679), false), Tuple.Create(Tuple.Create("", 690), Tuple.Create("/Detail", 690), true)); diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Sections.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Sections.cs index bf6ac1a58a..7bd2254dc6 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Sections.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Sections.cs @@ -14,6 +14,7 @@ namespace TestOutput #line 1 "Sections.cshtml" Layout = "_SectionTestLayout.cshtml" + #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/SimpleUnspacedIf.DesignTime.Tabs.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/SimpleUnspacedIf.DesignTime.Tabs.cs index fd0442ecb9..f6ef9ea6d5 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/SimpleUnspacedIf.DesignTime.Tabs.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/SimpleUnspacedIf.DesignTime.Tabs.cs @@ -18,15 +18,17 @@ namespace TestOutput public override void Execute() { #line 1 "SimpleUnspacedIf.cshtml" - if (true) +if (true) { + #line default #line hidden #line 3 "SimpleUnspacedIf.cshtml" } + #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Templates.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Templates.cs index cdd0317600..38f80e912c 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Templates.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Templates.cs @@ -5,7 +5,7 @@ namespace TestOutput public class Templates { #line 1 "Templates.cshtml" - + public HelperResult Repeat(int times, Func template) { return new HelperResult((writer) => { for(int i = 0; i < times; i++) { @@ -13,6 +13,7 @@ namespace TestOutput } }); } + #line default #line hidden #line hidden @@ -26,6 +27,7 @@ namespace TestOutput #line 11 "Templates.cshtml" Func foo = + #line default #line hidden @@ -34,26 +36,32 @@ namespace TestOutput WriteTo(__razor_template_writer, #line 12 "Templates.cshtml" item + #line default #line hidden ); + WriteLiteralTo(__razor_template_writer, "!"); } ) #line 12 "Templates.cshtml" ; + #line default #line hidden Write( #line 13 "Templates.cshtml" foo("") + #line default #line hidden ); + #line 13 "Templates.cshtml" + #line default #line hidden @@ -61,6 +69,7 @@ namespace TestOutput Write( #line 17 "Templates.cshtml" Repeat(10, + #line default #line hidden item => new Template((__razor_template_writer) => { @@ -68,22 +77,27 @@ namespace TestOutput WriteTo(__razor_template_writer, #line 17 "Templates.cshtml" item + #line default #line hidden ); + WriteLiteralTo(__razor_template_writer, ""); } ) #line 17 "Templates.cshtml" ) + #line default #line hidden ); + WriteLiteral("\r\n\r\n\r\n

\r\n"); Write( #line 21 "Templates.cshtml" Repeat(10, + #line default #line hidden item => new Template((__razor_template_writer) => { @@ -91,21 +105,26 @@ namespace TestOutput WriteTo(__razor_template_writer, #line 22 "Templates.cshtml" item + #line default #line hidden ); + WriteLiteralTo(__razor_template_writer, " of markup
\r\n"); } ) #line 23 "Templates.cshtml" ) + #line default #line hidden ); + WriteLiteral("\r\n

\r\n\r\n
    \r\n "); Write( #line 27 "Templates.cshtml" Repeat(10, + #line default #line hidden item => new Template((__razor_template_writer) => { @@ -113,17 +132,21 @@ namespace TestOutput WriteTo(__razor_template_writer, #line 28 "Templates.cshtml" item + #line default #line hidden ); + WriteLiteralTo(__razor_template_writer, "\r\n"); #line 29 "Templates.cshtml" + #line default #line hidden #line 29 "Templates.cshtml" var parent = item; + #line default #line hidden @@ -133,9 +156,11 @@ namespace TestOutput ) #line 34 "Templates.cshtml" ) + #line default #line hidden ); + WriteLiteral("\r\n
"); } } diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/UnfinishedExpressionInCode.Tabs.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/UnfinishedExpressionInCode.Tabs.cs index 56be9251c4..6e8bb67d1e 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/UnfinishedExpressionInCode.Tabs.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/UnfinishedExpressionInCode.Tabs.cs @@ -19,17 +19,18 @@ namespace TestOutput { #line 1 "UnfinishedExpressionInCode.cshtml" + #line default #line hidden - __o = -#line 2 "UnfinishedExpressionInCode.cshtml" - DateTime. +#line 1 "This is here only for document formatting." +__o = DateTime.; + #line default #line hidden - ; #line 2 "UnfinishedExpressionInCode.cshtml" + #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/UnfinishedExpressionInCode.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/UnfinishedExpressionInCode.cs index a7740e5ed7..f711457239 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/UnfinishedExpressionInCode.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/UnfinishedExpressionInCode.cs @@ -19,17 +19,18 @@ namespace TestOutput { #line 1 "UnfinishedExpressionInCode.cshtml" + #line default #line hidden - __o = -#line 2 "UnfinishedExpressionInCode.cshtml" - DateTime. +#line 1 "This is here only for document formatting." +__o = DateTime.; + #line default #line hidden - ; #line 2 "UnfinishedExpressionInCode.cshtml" + #line default #line hidden diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/DesignTime/Simple.txt b/test/Microsoft.AspNet.Razor.Test/TestFiles/DesignTime/Simple.txt index 75b509137c..5f8871c4e6 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/DesignTime/Simple.txt +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/DesignTime/Simple.txt @@ -19,28 +19,29 @@ #line 1 "C:\This\Path\Is\Just\For\Line\Pragmas.cshtml" string hello = "Hello, World"; + #line default #line hidden - __o = -#line 11 "C:\This\Path\Is\Just\For\Line\Pragmas.cshtml" - hello +#line 1 "This is here only for document formatting." + __o = hello; + #line default #line hidden - ; #line 13 "C:\This\Path\Is\Just\For\Line\Pragmas.cshtml" - foreach(char c in hello) { + foreach(char c in hello) { + #line default #line hidden - __o = -#line 13 "C:\This\Path\Is\Just\For\Line\Pragmas.cshtml" - c +#line 1 "This is here only for document formatting." + __o = c; + #line default #line hidden - ; #line 13 "C:\This\Path\Is\Just\For\Line\Pragmas.cshtml" } + #line default #line hidden