huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modify tests to account for no indent helpers. 

Modified outputs of generated files to not indent helpers.  Also fixed LineMapping verifications.
This commit is contained in:
N. Taylor Mullen 2014-02-26 11:07:09 -08:00
parent f5759635b1
commit b6082d1523
50 changed files with 420 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
test/Microsoft.AspNet.Razor.Test/Generator/CSharpRazorCodeGeneratorTest.cs
View File

@ -86,11 +86,6 @@ namespace Microsoft.AspNet.Razor.Test.Generator
[InlineData("ResolveUrl")] [InlineData("ResolveUrl")]
public void CSharpCodeGeneratorCorrectlyGeneratesRunTimeCode(string testType) public void CSharpCodeGeneratorCorrectlyGeneratesRunTimeCode(string testType)
{ {
if (!Directory.Exists("./tests"))
{
Directory.CreateDirectory("./tests");
}
RunTest(testType); RunTest(testType);
} }
@ -103,8 +98,8 @@ namespace Microsoft.AspNet.Razor.Test.Generator
tabTest: TabTest.Tabs, tabTest: TabTest.Tabs,
expectedDesignTimePragmas: new List<LineMapping>() expectedDesignTimePragmas: new List<LineMapping>()
{ {
BuildLineMapping(1, 0,449, 20, 1, 15), BuildLineMapping(1, 0, 1, 448, 20, 0, 15),
BuildLineMapping(27, 2, 12, 538, 27, 6, 3) BuildLineMapping(27, 2, 12, 539, 28, 6, 3)
}); });
} }
@ -115,12 +110,12 @@ namespace Microsoft.AspNet.Razor.Test.Generator
expectedDesignTimePragmas: new List<LineMapping>() expectedDesignTimePragmas: new List<LineMapping>()
{ {
BuildLineMapping(81, 3, 441, 20, 2, 6), BuildLineMapping(81, 3, 441, 20, 2, 6),
BuildLineMapping(122, 4, 551, 26, 39, 22), BuildLineMapping(122, 4, 39, 552, 27, 38, 22),
BuildLineMapping(173, 5, 687, 32, 49, 58), BuildLineMapping(173, 5, 49, 689, 34, 48, 58),
BuildLineMapping(238, 11, 811, 40, 2, 24), BuildLineMapping(238, 11, 815, 43, 2, 24),
BuildLineMapping(310, 12, 966, 46, 45, 3), BuildLineMapping(310, 12, 973, 49, 45, 3),
BuildLineMapping(323, 14, 1070, 52, 2, 1), BuildLineMapping(323, 14, 2, 1070, 54, 6, 1),
BuildLineMapping(328, 14, 1142, 56, 7, 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<LineMapping>() RunTest("Imports", "Imports.DesignTime", designTimeMode: true, tabTest: TabTest.NoTabs, expectedDesignTimePragmas: new List<LineMapping>()
{ {
BuildLineMapping(1, 0, 1, 51, 3, 0, 15), BuildLineMapping(1, 0, 1, 51, 3, 0, 15),
BuildLineMapping(19, 1, 1, 130, 8, 0, 32), BuildLineMapping(19, 1, 1, 132, 9, 0, 32),
BuildLineMapping(54, 2, 1, 226, 13, 0, 12), BuildLineMapping(54, 2, 1, 230, 15, 0, 12),
BuildLineMapping(99, 4, 702, 35, 29, 21), BuildLineMapping(99, 4, 716, 37, 29, 21),
BuildLineMapping(161, 5, 850, 41, 35, 20), BuildLineMapping(161, 5, 860, 42, 35, 20),
}); });
} }
@ -159,9 +154,9 @@ namespace Microsoft.AspNet.Razor.Test.Generator
tabTest: TabTest.NoTabs, tabTest: TabTest.NoTabs,
expectedDesignTimePragmas: new List<LineMapping>() expectedDesignTimePragmas: new List<LineMapping>()
{ {
BuildLineMapping(12, 0, 168, 8, 12, 4), BuildLineMapping(12, 0, 12, 156, 8, 0, 4),
BuildLineMapping(33, 4, 246, 13, 12, 104), BuildLineMapping(33, 4, 12, 224, 14, 0, 104),
BuildLineMapping(167, 11, 744, 34, 25, 11) BuildLineMapping(167, 11, 724, 35, 25, 11)
}); });
} }
@ -174,9 +169,9 @@ namespace Microsoft.AspNet.Razor.Test.Generator
tabTest: TabTest.Tabs, tabTest: TabTest.Tabs,
expectedDesignTimePragmas: new List<LineMapping>() expectedDesignTimePragmas: new List<LineMapping>()
{ {
BuildLineMapping(12, 0, 12, 159, 8, 3, 4), BuildLineMapping(12, 0, 12, 156, 8, 0, 4),
BuildLineMapping(33, 4, 12, 228, 13, 3, 104), BuildLineMapping(33, 4, 12, 224, 14, 0, 104),
BuildLineMapping(167, 11, 25, 708, 34, 7, 11) BuildLineMapping(167, 11, 25, 712, 35, 13, 11)
}); });
} }
@ -189,7 +184,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator
tabTest: TabTest.Tabs, tabTest: TabTest.Tabs,
expectedDesignTimePragmas: new List<LineMapping>() expectedDesignTimePragmas: new List<LineMapping>()
{ {
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<LineMapping> RunTest("HiddenSpansInCode", designTimeMode: true, tabTest: TabTest.NoTabs, expectedDesignTimePragmas: new List<LineMapping>
{ {
BuildLineMapping(2, 0, 453, 20, 2, 6), 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<LineMapping>() RunTest("Inherits", baselineName: "Inherits.Designtime", designTimeMode: true, tabTest: TabTest.NoTabs, expectedDesignTimePragmas: new List<LineMapping>()
{ {
BuildLineMapping(20, 2, 286, 11, 10, 25), 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<LineMapping>() RunTest("UnfinishedExpressionInCode", tabTest: TabTest.NoTabs, designTimeMode: true, expectedDesignTimePragmas: new List<LineMapping>()
{ {
BuildLineMapping(2, 0, 480, 20, 2, 2), BuildLineMapping(2, 0, 480, 20, 2, 2),
BuildLineMapping(5, 1, 579, 26, 1, 9), BuildLineMapping(5, 1, 1, 575, 26, 6, 9),
BuildLineMapping(14, 1, 689, 31, 10, 2) BuildLineMapping(14, 1, 673, 31, 10, 2)
}); });
} }
@ -248,8 +243,8 @@ namespace Microsoft.AspNet.Razor.Test.Generator
designTimeMode: true, expectedDesignTimePragmas: new List<LineMapping>() designTimeMode: true, expectedDesignTimePragmas: new List<LineMapping>()
{ {
BuildLineMapping(2, 0, 480, 20, 2, 2), BuildLineMapping(2, 0, 480, 20, 2, 2),
BuildLineMapping(5, 1, 579, 26, 1, 9), BuildLineMapping(5, 1, 1, 575, 26, 6, 9),
BuildLineMapping(14, 1, 10, 683, 31, 4, 2) BuildLineMapping(14, 1, 10, 667, 31, 4, 2)
}); });
} }
@ -262,17 +257,17 @@ namespace Microsoft.AspNet.Razor.Test.Generator
expectedDesignTimePragmas: new List<LineMapping>() expectedDesignTimePragmas: new List<LineMapping>()
{ {
BuildLineMapping(222, 16, 8, 174, 9, 0, 7), BuildLineMapping(222, 16, 8, 174, 9, 0, 7),
BuildLineMapping(229, 16, 315, 14, 15, 26), BuildLineMapping(229, 16, 317, 15, 15, 26),
BuildLineMapping(265, 18, 422, 21, 18, 9), BuildLineMapping(265, 18, 426, 23, 18, 9),
BuildLineMapping(274, 20, 515, 29, 0, 1), BuildLineMapping(274, 20, 521, 32, 0, 1),
BuildLineMapping(20, 1, 873, 46, 13, 36), BuildLineMapping(20, 1, 13, 880, 50, 12, 36),
BuildLineMapping(74, 2, 1013, 53, 22, 1), BuildLineMapping(74, 2, 1027, 57, 22, 1),
BuildLineMapping(79, 2, 1116, 58, 27, 15), BuildLineMapping(79, 2, 1118, 62, 27, 15),
BuildLineMapping(113, 7, 1215, 65, 2, 12), BuildLineMapping(113, 7, 2, 1228, 69, 6, 12),
BuildLineMapping(129, 8, 1323, 71, 1, 4), BuildLineMapping(129, 8, 1, 1334, 74, 6, 4),
BuildLineMapping(142, 8, 1490, 77, 14, 3), BuildLineMapping(142, 8, 1459, 76, 14, 3),
BuildLineMapping(153, 8, 1627, 84, 25, 1), BuildLineMapping(153, 8, 1556, 83, 25, 1),
BuildLineMapping(204, 13, 1778, 91, 5, 3) 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<LineMapping>() RunTest("ImplicitExpressionAtEOF", designTimeMode: true, expectedDesignTimePragmas: new List<LineMapping>()
{ {
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<LineMapping>() RunTest("ExplicitExpressionAtEOF", designTimeMode: true, expectedDesignTimePragmas: new List<LineMapping>()
{ {
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<LineMapping>() RunTest("EmptyImplicitExpression", designTimeMode: true, expectedDesignTimePragmas: new List<LineMapping>()
{ {
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<LineMapping>() RunTest("EmptyImplicitExpressionInCode", tabTest: TabTest.NoTabs, designTimeMode: true, expectedDesignTimePragmas: new List<LineMapping>()
{ {
BuildLineMapping(2, 0, 489, 20, 2, 6), BuildLineMapping(2, 0, 489, 20, 2, 6),
BuildLineMapping(9, 1, 601, 27, 5, 0), BuildLineMapping(9, 1, 5, 590, 27, 6, 0),
BuildLineMapping(9, 1, 700, 32, 5, 2) BuildLineMapping(9, 1, 677, 32, 5, 2)
}); });
} }
@ -333,8 +328,8 @@ namespace Microsoft.AspNet.Razor.Test.Generator
designTimeMode: true, expectedDesignTimePragmas: new List<LineMapping>() designTimeMode: true, expectedDesignTimePragmas: new List<LineMapping>()
{ {
BuildLineMapping(2, 0, 489, 20, 2, 6), BuildLineMapping(2, 0, 489, 20, 2, 6),
BuildLineMapping(9, 1, 5, 598, 27, 2, 0), BuildLineMapping(9, 1, 5, 590, 27, 6, 0),
BuildLineMapping(9, 1, 5, 694, 32, 2, 2) 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<LineMapping>() RunTest("EmptyExplicitExpression", designTimeMode: true, expectedDesignTimePragmas: new List<LineMapping>()
{ {
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<LineMapping>() expectedDesignTimePragmas: new List<LineMapping>()
{ {
BuildLineMapping(17, 2, 425, 20, 1, 14), BuildLineMapping(17, 2, 1, 424, 20, 0, 14),
BuildLineMapping(38, 3, 7, 497 + tabOffsetForMapping, 25, tabOffsetForMapping, 2), BuildLineMapping(38, 3, 7, 498 + tabOffsetForMapping, 26, tabOffsetForMapping, 2),
// Multiply the tab offset absolute index by 2 to account for the first mapping // 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)
}); });
} }

2
test/Microsoft.AspNet.Razor.Test/Generator/CodeTree/CSharpCodeBuilderTests.cs
View File

@ -27,11 +27,13 @@ namespace Microsoft.AspNet.Razor.Test.Generator.CodeTree
{ {
#line 1 """" #line 1 """"
using FakeNamespace1 using FakeNamespace1
#line default #line default
#line hidden #line hidden
; ;
#line 1 """" #line 1 """"
using FakeNamespace2.SubNamespace using FakeNamespace2.SubNamespace
#line default #line default
#line hidden #line hidden
; ;

10
test/Microsoft.AspNet.Razor.Test/Generator/CodeTree/CSharpPaddingBuilderTests.cs
View File

@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator
var paddingBuilder = new CSharpPaddingBuilder(host); var paddingBuilder = new CSharpPaddingBuilder(host);
// Act // Act
int padding = paddingBuilder.CalculatePadding(span); int padding = paddingBuilder.CalculatePadding(span, 0);
// Assert // Assert
Assert.Equal(0, padding); Assert.Equal(0, padding);
@ -39,10 +39,10 @@ namespace Microsoft.AspNet.Razor.Test.Generator
var paddingBuilder = new CSharpPaddingBuilder(host); var paddingBuilder = new CSharpPaddingBuilder(host);
// Act // Act
int padding = paddingBuilder.CalculatePadding(span); int padding = paddingBuilder.CalculatePadding(span, 1);
// Assert // Assert
Assert.Equal(6, padding); Assert.Equal(5, padding);
} }
[Theory] [Theory]
@ -57,10 +57,10 @@ namespace Microsoft.AspNet.Razor.Test.Generator
var paddingBuilder = new CSharpPaddingBuilder(host); var paddingBuilder = new CSharpPaddingBuilder(host);
// Act // Act
int padding = paddingBuilder.CalculatePadding(span); int padding = paddingBuilder.CalculatePadding(span, 1);
// Assert // 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. // 4 padding should result in 4 spaces. Where in the previous test (5 spaces) should result in 1 tab.

23
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Blocks.cs
View File

@ -14,12 +14,14 @@ namespace TestOutput
#line 1 "Blocks.cshtml" #line 1 "Blocks.cshtml"
int i = 1; int i = 1;
#line default #line default
#line hidden #line hidden
WriteLiteral("\r\n\r\n"); WriteLiteral("\r\n\r\n");
#line 5 "Blocks.cshtml" #line 5 "Blocks.cshtml"
while(i <= 10) { while(i <= 10) {
#line default #line default
#line hidden #line hidden
@ -27,25 +29,30 @@ namespace TestOutput
Write( Write(
#line 6 "Blocks.cshtml" #line 6 "Blocks.cshtml"
i i
#line default #line default
#line hidden #line hidden
); );
WriteLiteral("</p>\r\n"); WriteLiteral("</p>\r\n");
#line 7 "Blocks.cshtml" #line 7 "Blocks.cshtml"
i += 1; i += 1;
} }
#line default #line default
#line hidden #line hidden
WriteLiteral("\r\n"); WriteLiteral("\r\n");
#line 10 "Blocks.cshtml" #line 10 "Blocks.cshtml"
if(i == 11) { if(i == 11) {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <p>We wrote 10 lines!</p>\r\n"); WriteLiteral(" <p>We wrote 10 lines!</p>\r\n");
#line 12 "Blocks.cshtml" #line 12 "Blocks.cshtml"
} }
#line default #line default
#line hidden #line hidden
@ -53,6 +60,7 @@ namespace TestOutput
#line 14 "Blocks.cshtml" #line 14 "Blocks.cshtml"
switch(i) { switch(i) {
case 11: case 11:
#line default #line default
#line hidden #line hidden
@ -60,6 +68,7 @@ namespace TestOutput
#line 17 "Blocks.cshtml" #line 17 "Blocks.cshtml"
break; break;
default: default:
#line default #line default
#line hidden #line hidden
@ -67,12 +76,14 @@ namespace TestOutput
#line 20 "Blocks.cshtml" #line 20 "Blocks.cshtml"
break; break;
} }
#line default #line default
#line hidden #line hidden
WriteLiteral("\r\n"); WriteLiteral("\r\n");
#line 23 "Blocks.cshtml" #line 23 "Blocks.cshtml"
for(int j = 1; j <= 10; j += 2) { for(int j = 1; j <= 10; j += 2) {
#line default #line default
#line hidden #line hidden
@ -80,24 +91,29 @@ namespace TestOutput
Write( Write(
#line 24 "Blocks.cshtml" #line 24 "Blocks.cshtml"
j j
#line default #line default
#line hidden #line hidden
); );
WriteLiteral("</p>\r\n"); WriteLiteral("</p>\r\n");
#line 25 "Blocks.cshtml" #line 25 "Blocks.cshtml"
} }
#line default #line default
#line hidden #line hidden
WriteLiteral("\r\n"); WriteLiteral("\r\n");
#line 27 "Blocks.cshtml" #line 27 "Blocks.cshtml"
try { try {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <p>That time, we wrote 5 lines!</p>\r\n"); WriteLiteral(" <p>That time, we wrote 5 lines!</p>\r\n");
#line 29 "Blocks.cshtml" #line 29 "Blocks.cshtml"
} catch(Exception ex) { } catch(Exception ex) {
#line default #line default
#line hidden #line hidden
@ -105,12 +121,15 @@ namespace TestOutput
Write( Write(
#line 30 "Blocks.cshtml" #line 30 "Blocks.cshtml"
ex.Message ex.Message
#line default #line default
#line hidden #line hidden
); );
WriteLiteral("</p>\r\n"); WriteLiteral("</p>\r\n");
#line 31 "Blocks.cshtml" #line 31 "Blocks.cshtml"
} }
#line default #line default
#line hidden #line hidden
@ -118,18 +137,22 @@ namespace TestOutput
Write( Write(
#line 33 "Blocks.cshtml" #line 33 "Blocks.cshtml"
i i
#line default #line default
#line hidden #line hidden
); );
WriteLiteral("</p>\r\n\r\n"); WriteLiteral("</p>\r\n\r\n");
#line 35 "Blocks.cshtml" #line 35 "Blocks.cshtml"
lock(new object()) { lock(new object()) {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <p>This block is locked, for your security!</p>\r\n"); WriteLiteral(" <p>This block is locked, for your security!</p>\r\n");
#line 37 "Blocks.cshtml" #line 37 "Blocks.cshtml"
} }
#line default #line default
#line hidden #line hidden

1
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/CodeBlock.cs
View File

@ -16,6 +16,7 @@ namespace TestOutput
for(int i = 1; i <= 10; i++) { for(int i = 1; i <= 10; i++) {
Output.Write("<p>Hello from C#, #" + i.ToString() + "</p>"); Output.Write("<p>Hello from C#, #" + i.ToString() + "</p>");
} }
#line default #line default
#line hidden #line hidden

1
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/CodeBlockAtEOF.cs
View File

@ -19,6 +19,7 @@ namespace TestOutput
{ {
#line 1 "CodeBlockAtEOF.cshtml" #line 1 "CodeBlockAtEOF.cshtml"
#line default #line default
#line hidden #line hidden

13
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ConditionalAttributes.cs
View File

@ -15,6 +15,7 @@ namespace TestOutput
var ch = true; var ch = true;
var cls = "bar"; var cls = "bar";
#line default #line default
#line hidden #line hidden
@ -23,6 +24,7 @@ namespace TestOutput
Tuple.Create(Tuple.Create("", 82), Tuple.Create<System.Object, System.Int32>( Tuple.Create(Tuple.Create("", 82), Tuple.Create<System.Object, System.Int32>(
#line 5 "ConditionalAttributes.cshtml" #line 5 "ConditionalAttributes.cshtml"
cls cls
#line default #line default
#line hidden #line hidden
, 82), false)); , 82), false));
@ -31,6 +33,7 @@ namespace TestOutput
Tuple.Create(Tuple.Create(" ", 109), Tuple.Create<System.Object, System.Int32>( Tuple.Create(Tuple.Create(" ", 109), Tuple.Create<System.Object, System.Int32>(
#line 6 "ConditionalAttributes.cshtml" #line 6 "ConditionalAttributes.cshtml"
cls cls
#line default #line default
#line hidden #line hidden
, 110), false)); , 110), false));
@ -39,6 +42,7 @@ namespace TestOutput
Tuple.Create(Tuple.Create("", 134), Tuple.Create<System.Object, System.Int32>( Tuple.Create(Tuple.Create("", 134), Tuple.Create<System.Object, System.Int32>(
#line 7 "ConditionalAttributes.cshtml" #line 7 "ConditionalAttributes.cshtml"
cls cls
#line default #line default
#line hidden #line hidden
, 134), false), Tuple.Create(Tuple.Create(" ", 138), Tuple.Create("foo", 139), true)); , 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<System.Object, System.Int32>( Tuple.Create(Tuple.Create("", 184), Tuple.Create<System.Object, System.Int32>(
#line 8 "ConditionalAttributes.cshtml" #line 8 "ConditionalAttributes.cshtml"
ch ch
#line default #line default
#line hidden #line hidden
, 184), false)); , 184), false));
@ -55,6 +60,7 @@ namespace TestOutput
Tuple.Create(Tuple.Create(" ", 232), Tuple.Create<System.Object, System.Int32>( Tuple.Create(Tuple.Create(" ", 232), Tuple.Create<System.Object, System.Int32>(
#line 9 "ConditionalAttributes.cshtml" #line 9 "ConditionalAttributes.cshtml"
ch ch
#line default #line default
#line hidden #line hidden
, 233), false)); , 233), false));
@ -63,17 +69,21 @@ namespace TestOutput
Tuple.Create(Tuple.Create("", 256), Tuple.Create<System.Object, System.Int32>(new Template((__razor_attribute_value_writer) => { Tuple.Create(Tuple.Create("", 256), Tuple.Create<System.Object, System.Int32>(new Template((__razor_attribute_value_writer) => {
#line 10 "ConditionalAttributes.cshtml" #line 10 "ConditionalAttributes.cshtml"
if(cls != null) { if(cls != null) {
#line default #line default
#line hidden #line hidden
WriteTo(__razor_attribute_value_writer, WriteTo(__razor_attribute_value_writer,
#line 10 "ConditionalAttributes.cshtml" #line 10 "ConditionalAttributes.cshtml"
cls cls
#line default #line default
#line hidden #line hidden
); );
#line 10 "ConditionalAttributes.cshtml" #line 10 "ConditionalAttributes.cshtml"
} }
#line default #line default
#line hidden #line hidden
@ -86,6 +96,7 @@ namespace TestOutput
Tuple.Create(Tuple.Create("", 328), Tuple.Create<System.Object, System.Int32>( Tuple.Create(Tuple.Create("", 328), Tuple.Create<System.Object, System.Int32>(
#line 12 "ConditionalAttributes.cshtml" #line 12 "ConditionalAttributes.cshtml"
Url.Content("~/Scripts/jquery-1.6.2.min.js") Url.Content("~/Scripts/jquery-1.6.2.min.js")
#line default #line default
#line hidden #line hidden
, 328), false)); , 328), false));
@ -94,12 +105,14 @@ namespace TestOutput
Tuple.Create(Tuple.Create("", 426), Tuple.Create<System.Object, System.Int32>( Tuple.Create(Tuple.Create("", 426), Tuple.Create<System.Object, System.Int32>(
#line 13 "ConditionalAttributes.cshtml" #line 13 "ConditionalAttributes.cshtml"
Url.Content("~/Scripts/modernizr-2.0.6-development-only.js") Url.Content("~/Scripts/modernizr-2.0.6-development-only.js")
#line default #line default
#line hidden #line hidden
, 426), false)); , 426), false));
WriteLiteral(" type=\"text/javascript\"></script>\r\n <script src=\"http://ajax.aspnetcdn.com/aja" + WriteLiteral(" type=\"text/javascript\"></script>\r\n <script src=\"http://ajax.aspnetcdn.com/aja" +
"x/jquery.ui/1.8.16/jquery-ui.min.js\" type=\"text/javascript\"></script>\r\n"); "x/jquery.ui/1.8.16/jquery-ui.min.js\" type=\"text/javascript\"></script>\r\n");
#line 15 "ConditionalAttributes.cshtml" #line 15 "ConditionalAttributes.cshtml"
#line default #line default
#line hidden #line hidden

54
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/DesignTime.cs
View File

@ -8,6 +8,7 @@ namespace TestOutput
public static Template public static Template
#line 17 "DesignTime.cshtml" #line 17 "DesignTime.cshtml"
Foo() { Foo() {
#line default #line default
#line hidden #line hidden
return new Template((__razor_helper_writer) => { return new Template((__razor_helper_writer) => {
@ -15,12 +16,14 @@ Foo() {
if(true) { if(true) {
#line default #line default
#line hidden #line hidden
#line 19 "DesignTime.cshtml" #line 19 "DesignTime.cshtml"
} }
#line default #line default
#line hidden #line hidden
@ -28,6 +31,7 @@ Foo() {
); );
#line 21 "DesignTime.cshtml" #line 21 "DesignTime.cshtml"
} }
#line default #line default
#line hidden #line hidden
@ -44,55 +48,53 @@ Foo() {
public override void Execute() public override void Execute()
{ {
#line 2 "DesignTime.cshtml" #line 2 "DesignTime.cshtml"
for(int i = 1; i <= 10; i++) { for(int i = 1; i <= 10; i++) {
#line default #line default
#line hidden #line hidden
__o = #line 1 "This is here only for document formatting."
#line 3 "DesignTime.cshtml" __o = i;
i
#line default #line default
#line hidden #line hidden
;
#line 3 "DesignTime.cshtml" #line 3 "DesignTime.cshtml"
} }
#line default #line default
#line hidden #line hidden
__o = #line 1 "This is here only for document formatting."
#line 8 "DesignTime.cshtml" __o = Foo(Bar.Baz);
Foo(Bar.Baz)
#line default #line default
#line hidden #line hidden
; #line 1 "This is here only for document formatting."
__o = __o = Foo(item => new Template((__razor_template_writer) => {
#line 9 "DesignTime.cshtml" #line 1 "This is here only for document formatting."
Foo( __o = baz;
#line default #line default
#line hidden #line hidden
item => new Template((__razor_template_writer) => { }
__o = )
#line 9 "DesignTime.cshtml"
baz
#line default
#line hidden
;
}
)
#line 9 "DesignTime.cshtml" #line 9 "DesignTime.cshtml"
) )
#line default
#line hidden
;
#line default #line default
#line hidden #line hidden
;
DefineSection("Footer", () => { DefineSection("Footer", () => {
__o = #line 1 "This is here only for document formatting."
#line 14 "DesignTime.cshtml" __o = bar;
bar
#line default #line default
#line hidden #line hidden
;
} }
); );
} }

1
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyCodeBlock.cs
View File

@ -19,6 +19,7 @@ namespace TestOutput
{ {
#line 3 "EmptyCodeBlock.cshtml" #line 3 "EmptyCodeBlock.cshtml"
#line default #line default
#line hidden #line hidden

5
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyExplicitExpression.cs
View File

@ -17,12 +17,11 @@ namespace TestOutput
public override void Execute() public override void Execute()
{ {
__o = #line 1 "This is here only for document formatting."
#line 3 "EmptyExplicitExpression.cshtml" __o = ;
#line default #line default
#line hidden #line hidden
;
} }
} }
} }

5
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpression.cs
View File

@ -17,12 +17,11 @@ namespace TestOutput
public override void Execute() public override void Execute()
{ {
__o = #line 1 "This is here only for document formatting."
#line 3 "EmptyImplicitExpression.cshtml" __o = ;
#line default #line default
#line hidden #line hidden
;
} }
} }
} }

13
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpressionInCode.Tabs.cs
View File

@ -20,17 +20,18 @@ namespace TestOutput
#line 1 "EmptyImplicitExpressionInCode.cshtml" #line 1 "EmptyImplicitExpressionInCode.cshtml"
#line default
#line hidden
__o =
#line 2 "EmptyImplicitExpressionInCode.cshtml"
#line default #line default
#line hidden #line hidden
;
#line 1 "This is here only for document formatting."
__o = ;
#line default
#line hidden
#line 2 "EmptyImplicitExpressionInCode.cshtml" #line 2 "EmptyImplicitExpressionInCode.cshtml"
#line default #line default
#line hidden #line hidden

13
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/EmptyImplicitExpressionInCode.cs
View File

@ -20,17 +20,18 @@ namespace TestOutput
#line 1 "EmptyImplicitExpressionInCode.cshtml" #line 1 "EmptyImplicitExpressionInCode.cshtml"
#line default
#line hidden
__o =
#line 2 "EmptyImplicitExpressionInCode.cshtml"
#line default #line default
#line hidden #line hidden
;
#line 1 "This is here only for document formatting."
__o = ;
#line default
#line hidden
#line 2 "EmptyImplicitExpressionInCode.cshtml" #line 2 "EmptyImplicitExpressionInCode.cshtml"
#line default #line default
#line hidden #line hidden

2
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ExplicitExpression.cs
View File

@ -15,9 +15,11 @@ namespace TestOutput
Write( Write(
#line 1 "ExplicitExpression.cshtml" #line 1 "ExplicitExpression.cshtml"
1+1 1+1
#line default #line default
#line hidden #line hidden
); );
} }
} }
} }

5
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ExplicitExpressionAtEOF.cs
View File

@ -17,12 +17,11 @@ namespace TestOutput
public override void Execute() public override void Execute()
{ {
__o = #line 1 "This is here only for document formatting."
#line 3 "ExplicitExpressionAtEOF.cshtml" __o = ;
#line default #line default
#line hidden #line hidden
;
} }
} }
} }

10
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ExpressionsInCode.cs
View File

@ -15,6 +15,7 @@ namespace TestOutput
object foo = null; object foo = null;
string bar = "Foo"; string bar = "Foo";
#line default #line default
#line hidden #line hidden
@ -22,24 +23,29 @@ namespace TestOutput
#line 6 "ExpressionsInCode.cshtml" #line 6 "ExpressionsInCode.cshtml"
if(foo != null) { if(foo != null) {
#line default #line default
#line hidden #line hidden
Write( Write(
#line 7 "ExpressionsInCode.cshtml" #line 7 "ExpressionsInCode.cshtml"
foo foo
#line default #line default
#line hidden #line hidden
); );
#line 7 "ExpressionsInCode.cshtml" #line 7 "ExpressionsInCode.cshtml"
} else { } else {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <p>Foo is Null!</p>\r\n"); WriteLiteral(" <p>Foo is Null!</p>\r\n");
#line 10 "ExpressionsInCode.cshtml" #line 10 "ExpressionsInCode.cshtml"
} }
#line default #line default
#line hidden #line hidden
@ -47,18 +53,22 @@ namespace TestOutput
#line 13 "ExpressionsInCode.cshtml" #line 13 "ExpressionsInCode.cshtml"
if(!String.IsNullOrEmpty(bar)) { if(!String.IsNullOrEmpty(bar)) {
#line default #line default
#line hidden #line hidden
Write( Write(
#line 14 "ExpressionsInCode.cshtml" #line 14 "ExpressionsInCode.cshtml"
bar.Replace("F", "B") bar.Replace("F", "B")
#line default #line default
#line hidden #line hidden
); );
#line 14 "ExpressionsInCode.cshtml" #line 14 "ExpressionsInCode.cshtml"
} }
#line default #line default
#line hidden #line hidden

9
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock.DesignTime.Tabs.cs
View File

@ -8,6 +8,7 @@ namespace TestOutput
#line 1 "FunctionsBlock.cshtml" #line 1 "FunctionsBlock.cshtml"
#line default #line default
#line hidden #line hidden
#line 5 "FunctionsBlock.cshtml" #line 5 "FunctionsBlock.cshtml"
@ -16,6 +17,7 @@ namespace TestOutput
private int RandomInt() { private int RandomInt() {
return _rand.Next(); return _rand.Next();
} }
#line default #line default
#line hidden #line hidden
private void @__RazorDesignTimeHelpers__() private void @__RazorDesignTimeHelpers__()
@ -30,12 +32,11 @@ namespace TestOutput
public override void Execute() public override void Execute()
{ {
__o = #line 1 "This is here only for document formatting."
#line 12 "FunctionsBlock.cshtml" __o = RandomInt();
RandomInt()
#line default #line default
#line hidden #line hidden
;
} }
} }
} }

9
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock.DesignTime.cs
View File

@ -8,6 +8,7 @@ namespace TestOutput
#line 1 "FunctionsBlock.cshtml" #line 1 "FunctionsBlock.cshtml"
#line default #line default
#line hidden #line hidden
#line 5 "FunctionsBlock.cshtml" #line 5 "FunctionsBlock.cshtml"
@ -16,6 +17,7 @@ namespace TestOutput
private int RandomInt() { private int RandomInt() {
return _rand.Next(); return _rand.Next();
} }
#line default #line default
#line hidden #line hidden
private void @__RazorDesignTimeHelpers__() private void @__RazorDesignTimeHelpers__()
@ -30,12 +32,11 @@ namespace TestOutput
public override void Execute() public override void Execute()
{ {
__o = #line 1 "This is here only for document formatting."
#line 12 "FunctionsBlock.cshtml" __o = RandomInt();
RandomInt()
#line default #line default
#line hidden #line hidden
;
} }
} }
} }

4
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock.cs
View File

@ -7,6 +7,7 @@ namespace TestOutput
#line 1 "FunctionsBlock.cshtml" #line 1 "FunctionsBlock.cshtml"
#line default #line default
#line hidden #line hidden
#line 5 "FunctionsBlock.cshtml" #line 5 "FunctionsBlock.cshtml"
@ -15,6 +16,7 @@ namespace TestOutput
private int RandomInt() { private int RandomInt() {
return _rand.Next(); return _rand.Next();
} }
#line default #line default
#line hidden #line hidden
#line hidden #line hidden
@ -29,9 +31,11 @@ namespace TestOutput
Write( Write(
#line 12 "FunctionsBlock.cshtml" #line 12 "FunctionsBlock.cshtml"
RandomInt() RandomInt()
#line default #line default
#line hidden #line hidden
); );
} }
} }
} }

1
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlockMinimal.DesignTime.Tabs.cs
View File

@ -10,6 +10,7 @@ namespace TestOutput
string foo(string input) { string foo(string input) {
return input + "!"; return input + "!";
} }
#line default #line default
#line hidden #line hidden
private void @__RazorDesignTimeHelpers__() private void @__RazorDesignTimeHelpers__()

4
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/FunctionsBlock_Tabs.cs
View File

@ -7,6 +7,7 @@ namespace TestOutput
#line 1 "FunctionsBlock_Tabs.cshtml" #line 1 "FunctionsBlock_Tabs.cshtml"
#line default #line default
#line hidden #line hidden
#line 5 "FunctionsBlock_Tabs.cshtml" #line 5 "FunctionsBlock_Tabs.cshtml"
@ -15,6 +16,7 @@ namespace TestOutput
private int RandomInt() { private int RandomInt() {
return _rand.Next(); return _rand.Next();
} }
#line default #line default
#line hidden #line hidden
#line hidden #line hidden
@ -29,9 +31,11 @@ namespace TestOutput
Write( Write(
#line 12 "FunctionsBlock_Tabs.cshtml" #line 12 "FunctionsBlock_Tabs.cshtml"
RandomInt() RandomInt()
#line default #line default
#line hidden #line hidden
); );
} }
} }
} }

14
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Helpers.Instance.cs
View File

@ -7,12 +7,14 @@ namespace TestOutput
public Template public Template
#line 1 "Helpers.cshtml" #line 1 "Helpers.cshtml"
Bold(string s) { Bold(string s) {
#line default #line default
#line hidden #line hidden
return new Template((__razor_helper_writer) => { return new Template((__razor_helper_writer) => {
#line 1 "Helpers.cshtml" #line 1 "Helpers.cshtml"
s = s.ToUpper(); s = s.ToUpper();
#line default #line default
#line hidden #line hidden
@ -20,11 +22,14 @@ Bold(string s) {
WriteTo(__razor_helper_writer, WriteTo(__razor_helper_writer,
#line 3 "Helpers.cshtml" #line 3 "Helpers.cshtml"
s s
#line default #line default
#line hidden #line hidden
); );
WriteLiteralTo(__razor_helper_writer, "</strong>\r\n"); WriteLiteralTo(__razor_helper_writer, "</strong>\r\n");
#line 4 "Helpers.cshtml" #line 4 "Helpers.cshtml"
#line default #line default
#line hidden #line hidden
@ -32,18 +37,21 @@ Bold(string s) {
); );
#line 4 "Helpers.cshtml" #line 4 "Helpers.cshtml"
} }
#line default #line default
#line hidden #line hidden
public Template public Template
#line 6 "Helpers.cshtml" #line 6 "Helpers.cshtml"
Italic(string s) { Italic(string s) {
#line default #line default
#line hidden #line hidden
return new Template((__razor_helper_writer) => { return new Template((__razor_helper_writer) => {
#line 6 "Helpers.cshtml" #line 6 "Helpers.cshtml"
s = s.ToUpper(); s = s.ToUpper();
#line default #line default
#line hidden #line hidden
@ -51,11 +59,14 @@ Italic(string s) {
WriteTo(__razor_helper_writer, WriteTo(__razor_helper_writer,
#line 8 "Helpers.cshtml" #line 8 "Helpers.cshtml"
s s
#line default #line default
#line hidden #line hidden
); );
WriteLiteralTo(__razor_helper_writer, "</em>\r\n"); WriteLiteralTo(__razor_helper_writer, "</em>\r\n");
#line 9 "Helpers.cshtml" #line 9 "Helpers.cshtml"
#line default #line default
#line hidden #line hidden
@ -63,6 +74,7 @@ Italic(string s) {
); );
#line 9 "Helpers.cshtml" #line 9 "Helpers.cshtml"
} }
#line default #line default
#line hidden #line hidden
@ -78,9 +90,11 @@ Italic(string s) {
Write( Write(
#line 11 "Helpers.cshtml" #line 11 "Helpers.cshtml"
Bold("Hello") Bold("Hello")
#line default #line default
#line hidden #line hidden
); );
} }
} }
} }

14
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Helpers.cs
View File

@ -7,12 +7,14 @@ namespace TestOutput
public static Template public static Template
#line 1 "Helpers.cshtml" #line 1 "Helpers.cshtml"
Bold(string s) { Bold(string s) {
#line default #line default
#line hidden #line hidden
return new Template((__razor_helper_writer) => { return new Template((__razor_helper_writer) => {
#line 1 "Helpers.cshtml" #line 1 "Helpers.cshtml"
s = s.ToUpper(); s = s.ToUpper();
#line default #line default
#line hidden #line hidden
@ -20,11 +22,14 @@ Bold(string s) {
WriteTo(__razor_helper_writer, WriteTo(__razor_helper_writer,
#line 3 "Helpers.cshtml" #line 3 "Helpers.cshtml"
s s
#line default #line default
#line hidden #line hidden
); );
WriteLiteralTo(__razor_helper_writer, "</strong>\r\n"); WriteLiteralTo(__razor_helper_writer, "</strong>\r\n");
#line 4 "Helpers.cshtml" #line 4 "Helpers.cshtml"
#line default #line default
#line hidden #line hidden
@ -32,18 +37,21 @@ Bold(string s) {
); );
#line 4 "Helpers.cshtml" #line 4 "Helpers.cshtml"
} }
#line default #line default
#line hidden #line hidden
public static Template public static Template
#line 6 "Helpers.cshtml" #line 6 "Helpers.cshtml"
Italic(string s) { Italic(string s) {
#line default #line default
#line hidden #line hidden
return new Template((__razor_helper_writer) => { return new Template((__razor_helper_writer) => {
#line 6 "Helpers.cshtml" #line 6 "Helpers.cshtml"
s = s.ToUpper(); s = s.ToUpper();
#line default #line default
#line hidden #line hidden
@ -51,11 +59,14 @@ Italic(string s) {
WriteTo(__razor_helper_writer, WriteTo(__razor_helper_writer,
#line 8 "Helpers.cshtml" #line 8 "Helpers.cshtml"
s s
#line default #line default
#line hidden #line hidden
); );
WriteLiteralTo(__razor_helper_writer, "</em>\r\n"); WriteLiteralTo(__razor_helper_writer, "</em>\r\n");
#line 9 "Helpers.cshtml" #line 9 "Helpers.cshtml"
#line default #line default
#line hidden #line hidden
@ -63,6 +74,7 @@ Italic(string s) {
); );
#line 9 "Helpers.cshtml" #line 9 "Helpers.cshtml"
} }
#line default #line default
#line hidden #line hidden
@ -78,9 +90,11 @@ Italic(string s) {
Write( Write(
#line 11 "Helpers.cshtml" #line 11 "Helpers.cshtml"
Bold("Hello") Bold("Hello")
#line default #line default
#line hidden #line hidden
); );
} }
} }
} }

7
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingCloseParen.cs
View File

@ -7,12 +7,14 @@ namespace TestOutput
public static Template public static Template
#line 1 "HelpersMissingCloseParen.cshtml" #line 1 "HelpersMissingCloseParen.cshtml"
Bold(string s) { Bold(string s) {
#line default #line default
#line hidden #line hidden
return new Template((__razor_helper_writer) => { return new Template((__razor_helper_writer) => {
#line 1 "HelpersMissingCloseParen.cshtml" #line 1 "HelpersMissingCloseParen.cshtml"
s = s.ToUpper(); s = s.ToUpper();
#line default #line default
#line hidden #line hidden
@ -20,11 +22,14 @@ Bold(string s) {
WriteTo(__razor_helper_writer, WriteTo(__razor_helper_writer,
#line 3 "HelpersMissingCloseParen.cshtml" #line 3 "HelpersMissingCloseParen.cshtml"
s s
#line default #line default
#line hidden #line hidden
); );
WriteLiteralTo(__razor_helper_writer, "</strong>\r\n"); WriteLiteralTo(__razor_helper_writer, "</strong>\r\n");
#line 4 "HelpersMissingCloseParen.cshtml" #line 4 "HelpersMissingCloseParen.cshtml"
#line default #line default
#line hidden #line hidden
@ -32,6 +37,7 @@ Bold(string s) {
); );
#line 4 "HelpersMissingCloseParen.cshtml" #line 4 "HelpersMissingCloseParen.cshtml"
} }
#line default #line default
#line hidden #line hidden
@ -39,6 +45,7 @@ public static Template
#line 6 "HelpersMissingCloseParen.cshtml" #line 6 "HelpersMissingCloseParen.cshtml"
Italic(string s Italic(string s
@Bold("Hello") @Bold("Hello")
#line default #line default
#line hidden #line hidden

9
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingOpenBrace.cs
View File

@ -7,12 +7,14 @@ namespace TestOutput
public static Template public static Template
#line 1 "HelpersMissingOpenBrace.cshtml" #line 1 "HelpersMissingOpenBrace.cshtml"
Bold(string s) { Bold(string s) {
#line default #line default
#line hidden #line hidden
return new Template((__razor_helper_writer) => { return new Template((__razor_helper_writer) => {
#line 1 "HelpersMissingOpenBrace.cshtml" #line 1 "HelpersMissingOpenBrace.cshtml"
s = s.ToUpper(); s = s.ToUpper();
#line default #line default
#line hidden #line hidden
@ -20,11 +22,14 @@ Bold(string s) {
WriteTo(__razor_helper_writer, WriteTo(__razor_helper_writer,
#line 3 "HelpersMissingOpenBrace.cshtml" #line 3 "HelpersMissingOpenBrace.cshtml"
s s
#line default #line default
#line hidden #line hidden
); );
WriteLiteralTo(__razor_helper_writer, "</strong>\r\n"); WriteLiteralTo(__razor_helper_writer, "</strong>\r\n");
#line 4 "HelpersMissingOpenBrace.cshtml" #line 4 "HelpersMissingOpenBrace.cshtml"
#line default #line default
#line hidden #line hidden
@ -32,12 +37,14 @@ Bold(string s) {
); );
#line 4 "HelpersMissingOpenBrace.cshtml" #line 4 "HelpersMissingOpenBrace.cshtml"
} }
#line default #line default
#line hidden #line hidden
public static Template public static Template
#line 6 "HelpersMissingOpenBrace.cshtml" #line 6 "HelpersMissingOpenBrace.cshtml"
Italic(string s) Italic(string s)
#line default #line default
#line hidden #line hidden
@ -52,9 +59,11 @@ Italic(string s)
Write( Write(
#line 7 "HelpersMissingOpenBrace.cshtml" #line 7 "HelpersMissingOpenBrace.cshtml"
Italic(s) Italic(s)
#line default #line default
#line hidden #line hidden
); );
} }
} }
} }

9
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingOpenParen.cs
View File

@ -7,12 +7,14 @@ namespace TestOutput
public static Template public static Template
#line 1 "HelpersMissingOpenParen.cshtml" #line 1 "HelpersMissingOpenParen.cshtml"
Bold(string s) { Bold(string s) {
#line default #line default
#line hidden #line hidden
return new Template((__razor_helper_writer) => { return new Template((__razor_helper_writer) => {
#line 1 "HelpersMissingOpenParen.cshtml" #line 1 "HelpersMissingOpenParen.cshtml"
s = s.ToUpper(); s = s.ToUpper();
#line default #line default
#line hidden #line hidden
@ -20,11 +22,14 @@ Bold(string s) {
WriteTo(__razor_helper_writer, WriteTo(__razor_helper_writer,
#line 3 "HelpersMissingOpenParen.cshtml" #line 3 "HelpersMissingOpenParen.cshtml"
s s
#line default #line default
#line hidden #line hidden
); );
WriteLiteralTo(__razor_helper_writer, "</strong>\r\n"); WriteLiteralTo(__razor_helper_writer, "</strong>\r\n");
#line 4 "HelpersMissingOpenParen.cshtml" #line 4 "HelpersMissingOpenParen.cshtml"
#line default #line default
#line hidden #line hidden
@ -32,12 +37,14 @@ Bold(string s) {
); );
#line 4 "HelpersMissingOpenParen.cshtml" #line 4 "HelpersMissingOpenParen.cshtml"
} }
#line default #line default
#line hidden #line hidden
public static Template public static Template
#line 6 "HelpersMissingOpenParen.cshtml" #line 6 "HelpersMissingOpenParen.cshtml"
Italic Italic
#line default #line default
#line hidden #line hidden
@ -52,9 +59,11 @@ Italic
Write( Write(
#line 7 "HelpersMissingOpenParen.cshtml" #line 7 "HelpersMissingOpenParen.cshtml"
Bold("Hello") Bold("Hello")
#line default #line default
#line hidden #line hidden
); );
} }
} }
} }

2
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HiddenSpansInCode.cs
View File

@ -20,11 +20,13 @@ namespace TestOutput
#line 1 "HiddenSpansInCode.cshtml" #line 1 "HiddenSpansInCode.cshtml"
#line default #line default
#line hidden #line hidden
#line 2 "HiddenSpansInCode.cshtml" #line 2 "HiddenSpansInCode.cshtml"
@Da @Da
#line default #line default
#line hidden #line hidden

4
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ImplicitExpression.cs
View File

@ -13,6 +13,7 @@ namespace TestOutput
{ {
#line 1 "ImplicitExpression.cshtml" #line 1 "ImplicitExpression.cshtml"
for(int i = 1; i <= 10; i++) { for(int i = 1; i <= 10; i++) {
#line default #line default
#line hidden #line hidden
@ -20,12 +21,15 @@ namespace TestOutput
Write( Write(
#line 2 "ImplicitExpression.cshtml" #line 2 "ImplicitExpression.cshtml"
i i
#line default #line default
#line hidden #line hidden
); );
WriteLiteral("</p>\r\n"); WriteLiteral("</p>\r\n");
#line 3 "ImplicitExpression.cshtml" #line 3 "ImplicitExpression.cshtml"
} }
#line default #line default
#line hidden #line hidden

5
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ImplicitExpressionAtEOF.cs
View File

@ -17,12 +17,11 @@ namespace TestOutput
public override void Execute() public override void Execute()
{ {
__o = #line 1 "This is here only for document formatting."
#line 3 "ImplicitExpressionAtEOF.cshtml" __o = ;
#line default #line default
#line hidden #line hidden
;
} }
} }
} }

17
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Imports.DesignTime.cs
View File

@ -2,16 +2,19 @@ namespace TestOutput
{ {
#line 1 "Imports.cshtml" #line 1 "Imports.cshtml"
using System.IO using System.IO
#line default #line default
#line hidden #line hidden
; ;
#line 2 "Imports.cshtml" #line 2 "Imports.cshtml"
using Foo = System.Text.Encoding using Foo = System.Text.Encoding
#line default #line default
#line hidden #line hidden
; ;
#line 3 "Imports.cshtml" #line 3 "Imports.cshtml"
using System using System
#line default #line default
#line hidden #line hidden
; ;
@ -31,18 +34,16 @@ using System
public override void Execute() public override void Execute()
{ {
__o = #line 1 "This is here only for document formatting."
#line 5 "Imports.cshtml" __o = typeof(Path).FullName;
typeof(Path).FullName
#line default #line default
#line hidden #line hidden
; #line 1 "This is here only for document formatting."
__o = __o = typeof(Foo).FullName;
#line 6 "Imports.cshtml"
typeof(Foo).FullName
#line default #line default
#line hidden #line hidden
;
} }
} }
} }

7
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Imports.cs
View File

@ -2,16 +2,19 @@ namespace TestOutput
{ {
#line 1 "Imports.cshtml" #line 1 "Imports.cshtml"
using System.IO using System.IO
#line default #line default
#line hidden #line hidden
; ;
#line 2 "Imports.cshtml" #line 2 "Imports.cshtml"
using Foo = System.Text.Encoding using Foo = System.Text.Encoding
#line default #line default
#line hidden #line hidden
; ;
#line 3 "Imports.cshtml" #line 3 "Imports.cshtml"
using System using System
#line default #line default
#line hidden #line hidden
; ;
@ -29,16 +32,20 @@ using System
Write( Write(
#line 5 "Imports.cshtml" #line 5 "Imports.cshtml"
typeof(Path).FullName typeof(Path).FullName
#line default #line default
#line hidden #line hidden
); );
WriteLiteral("</p>\r\n<p>Foo\'s actual full type name is "); WriteLiteral("</p>\r\n<p>Foo\'s actual full type name is ");
Write( Write(
#line 6 "Imports.cshtml" #line 6 "Imports.cshtml"
typeof(Foo).FullName typeof(Foo).FullName
#line default #line default
#line hidden #line hidden
); );
WriteLiteral("</p>"); WriteLiteral("</p>");
} }
} }

8
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Inherits.Designtime.cs
View File

@ -10,6 +10,7 @@ namespace TestOutput
#pragma warning disable 219 #pragma warning disable 219
#line 3 "Inherits.cshtml" #line 3 "Inherits.cshtml"
foo.bar<baz<biz>>.boz bar __inheritsHelper = null; foo.bar<baz<biz>>.boz bar __inheritsHelper = null;
#line default #line default
#line hidden #line hidden
#pragma warning restore 219 #pragma warning restore 219
@ -21,12 +22,11 @@ namespace TestOutput
public override void Execute() public override void Execute()
{ {
__o = #line 1 "This is here only for document formatting."
#line 1 "Inherits.cshtml" __o = foo();
foo()
#line default #line default
#line hidden #line hidden
;
} }
} }
} }

2
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Inherits.Runtime.cs
View File

@ -14,9 +14,11 @@ namespace TestOutput
Write( Write(
#line 1 "Inherits.cshtml" #line 1 "Inherits.cshtml"
foo() foo()
#line default #line default
#line hidden #line hidden
); );
WriteLiteral("\r\n\r\n"); WriteLiteral("\r\n\r\n");
} }
} }

9
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/InlineBlocks.cs
View File

@ -7,11 +7,13 @@ namespace TestOutput
public static Template public static Template
#line 1 "InlineBlocks.cshtml" #line 1 "InlineBlocks.cshtml"
Link(string link) { Link(string link) {
#line default #line default
#line hidden #line hidden
return new Template((__razor_helper_writer) => { return new Template((__razor_helper_writer) => {
#line 1 "InlineBlocks.cshtml" #line 1 "InlineBlocks.cshtml"
#line default #line default
#line hidden #line hidden
@ -20,23 +22,28 @@ Link(string link) {
Tuple.Create(Tuple.Create("", 42), Tuple.Create<System.Object, System.Int32>(new Template((__razor_attribute_value_writer) => { Tuple.Create(Tuple.Create("", 42), Tuple.Create<System.Object, System.Int32>(new Template((__razor_attribute_value_writer) => {
#line 2 "InlineBlocks.cshtml" #line 2 "InlineBlocks.cshtml"
if(link != null) { if(link != null) {
#line default #line default
#line hidden #line hidden
WriteTo(__razor_attribute_value_writer, WriteTo(__razor_attribute_value_writer,
#line 2 "InlineBlocks.cshtml" #line 2 "InlineBlocks.cshtml"
link link
#line default #line default
#line hidden #line hidden
); );
#line 2 "InlineBlocks.cshtml" #line 2 "InlineBlocks.cshtml"
} else { } else {
#line default #line default
#line hidden #line hidden
WriteLiteralTo(__razor_attribute_value_writer, " # "); WriteLiteralTo(__razor_attribute_value_writer, " # ");
#line 2 "InlineBlocks.cshtml" #line 2 "InlineBlocks.cshtml"
} }
#line default #line default
#line hidden #line hidden
@ -44,6 +51,7 @@ Link(string link) {
), 42), false)); ), 42), false));
WriteLiteralTo(__razor_helper_writer, " />\r\n"); WriteLiteralTo(__razor_helper_writer, " />\r\n");
#line 3 "InlineBlocks.cshtml" #line 3 "InlineBlocks.cshtml"
#line default #line default
#line hidden #line hidden
@ -51,6 +59,7 @@ Link(string link) {
); );
#line 3 "InlineBlocks.cshtml" #line 3 "InlineBlocks.cshtml"
} }
#line default #line default
#line hidden #line hidden

4
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/MarkupInCodeBlock.cs
View File

@ -14,6 +14,7 @@ namespace TestOutput
#line 1 "MarkupInCodeBlock.cshtml" #line 1 "MarkupInCodeBlock.cshtml"
for(int i = 1; i <= 10; i++) { for(int i = 1; i <= 10; i++) {
#line default #line default
#line hidden #line hidden
@ -21,12 +22,15 @@ namespace TestOutput
Write( Write(
#line 3 "MarkupInCodeBlock.cshtml" #line 3 "MarkupInCodeBlock.cshtml"
i.ToString() i.ToString()
#line default #line default
#line hidden #line hidden
); );
WriteLiteral("</p>\r\n"); WriteLiteral("</p>\r\n");
#line 4 "MarkupInCodeBlock.cshtml" #line 4 "MarkupInCodeBlock.cshtml"
} }
#line default #line default
#line hidden #line hidden

3
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/NestedCodeBlocks.cs
View File

@ -14,18 +14,21 @@ namespace TestOutput
#line 1 "NestedCodeBlocks.cshtml" #line 1 "NestedCodeBlocks.cshtml"
if(foo) { if(foo) {
#line default #line default
#line hidden #line hidden
#line 2 "NestedCodeBlocks.cshtml" #line 2 "NestedCodeBlocks.cshtml"
if(bar) { if(bar) {
} }
#line default #line default
#line hidden #line hidden
#line 3 "NestedCodeBlocks.cshtml" #line 3 "NestedCodeBlocks.cshtml"
} }
#line default #line default
#line hidden #line hidden

15
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/NestedHelpers.cs
View File

@ -7,6 +7,7 @@ namespace TestOutput
public static Template public static Template
#line 1 "NestedHelpers.cshtml" #line 1 "NestedHelpers.cshtml"
Italic(string s) { Italic(string s) {
#line default #line default
#line hidden #line hidden
return new Template((__razor_helper_writer) => { return new Template((__razor_helper_writer) => {
@ -14,11 +15,13 @@ Italic(string s) {
s = s.ToUpper(); s = s.ToUpper();
#line default #line default
#line hidden #line hidden
#line 6 "NestedHelpers.cshtml" #line 6 "NestedHelpers.cshtml"
#line default #line default
#line hidden #line hidden
@ -26,11 +29,14 @@ Italic(string s) {
WriteTo(__razor_helper_writer, WriteTo(__razor_helper_writer,
#line 7 "NestedHelpers.cshtml" #line 7 "NestedHelpers.cshtml"
Bold(s) Bold(s)
#line default #line default
#line hidden #line hidden
); );
WriteLiteralTo(__razor_helper_writer, "</em>\r\n"); WriteLiteralTo(__razor_helper_writer, "</em>\r\n");
#line 8 "NestedHelpers.cshtml" #line 8 "NestedHelpers.cshtml"
#line default #line default
#line hidden #line hidden
@ -38,18 +44,21 @@ Italic(string s) {
); );
#line 8 "NestedHelpers.cshtml" #line 8 "NestedHelpers.cshtml"
} }
#line default #line default
#line hidden #line hidden
public static Template public static Template
#line 3 "NestedHelpers.cshtml" #line 3 "NestedHelpers.cshtml"
Bold(string s) { Bold(string s) {
#line default #line default
#line hidden #line hidden
return new Template((__razor_helper_writer) => { return new Template((__razor_helper_writer) => {
#line 3 "NestedHelpers.cshtml" #line 3 "NestedHelpers.cshtml"
s = s.ToUpper(); s = s.ToUpper();
#line default #line default
#line hidden #line hidden
@ -57,12 +66,15 @@ Bold(string s) {
WriteTo(__razor_helper_writer, WriteTo(__razor_helper_writer,
#line 5 "NestedHelpers.cshtml" #line 5 "NestedHelpers.cshtml"
s s
#line default #line default
#line hidden #line hidden
); );
WriteLiteralTo(__razor_helper_writer, "</strong>\r\n"); WriteLiteralTo(__razor_helper_writer, "</strong>\r\n");
#line 6 "NestedHelpers.cshtml" #line 6 "NestedHelpers.cshtml"
#line default #line default
#line hidden #line hidden
@ -70,6 +82,7 @@ Bold(string s) {
); );
#line 6 "NestedHelpers.cshtml" #line 6 "NestedHelpers.cshtml"
} }
#line default #line default
#line hidden #line hidden
@ -84,9 +97,11 @@ Bold(string s) {
Write( Write(
#line 10 "NestedHelpers.cshtml" #line 10 "NestedHelpers.cshtml"
Italic("Hello") Italic("Hello")
#line default #line default
#line hidden #line hidden
); );
} }
} }
} }

24
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/NoLinePragmas.cs
View File

@ -14,12 +14,14 @@ namespace TestOutput
#line 1 "" #line 1 ""
int i = 1; int i = 1;
#line default #line default
#line hidden #line hidden
WriteLiteral("\r\n\r\n"); WriteLiteral("\r\n\r\n");
#line 5 "" #line 5 ""
while(i <= 10) { while(i <= 10) {
#line default #line default
#line hidden #line hidden
@ -27,25 +29,30 @@ namespace TestOutput
Write( Write(
#line 6 "" #line 6 ""
i i
#line default #line default
#line hidden #line hidden
); );
WriteLiteral("</p>\r\n"); WriteLiteral("</p>\r\n");
#line 7 "" #line 7 ""
i += 1; i += 1;
} }
#line default #line default
#line hidden #line hidden
WriteLiteral("\r\n"); WriteLiteral("\r\n");
#line 10 "" #line 10 ""
if(i == 11) { if(i == 11) {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <p>We wrote 10 lines!</p>\r\n"); WriteLiteral(" <p>We wrote 10 lines!</p>\r\n");
#line 12 "" #line 12 ""
} }
#line default #line default
#line hidden #line hidden
@ -53,6 +60,7 @@ namespace TestOutput
#line 14 "" #line 14 ""
switch(i) { switch(i) {
case 11: case 11:
#line default #line default
#line hidden #line hidden
@ -60,6 +68,7 @@ namespace TestOutput
#line 17 "" #line 17 ""
break; break;
default: default:
#line default #line default
#line hidden #line hidden
@ -67,12 +76,14 @@ namespace TestOutput
#line 20 "" #line 20 ""
break; break;
} }
#line default #line default
#line hidden #line hidden
WriteLiteral("\r\n"); WriteLiteral("\r\n");
#line 23 "" #line 23 ""
for(int j = 1; j <= 10; j += 2) { for(int j = 1; j <= 10; j += 2) {
#line default #line default
#line hidden #line hidden
@ -80,24 +91,29 @@ namespace TestOutput
Write( Write(
#line 24 "" #line 24 ""
j j
#line default #line default
#line hidden #line hidden
); );
WriteLiteral("</p>\r\n"); WriteLiteral("</p>\r\n");
#line 25 "" #line 25 ""
} }
#line default #line default
#line hidden #line hidden
WriteLiteral("\r\n"); WriteLiteral("\r\n");
#line 27 "" #line 27 ""
try { try {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <p>That time, we wrote 5 lines!</p>\r\n"); WriteLiteral(" <p>That time, we wrote 5 lines!</p>\r\n");
#line 29 "" #line 29 ""
} catch(Exception ex) { } catch(Exception ex) {
#line default #line default
#line hidden #line hidden
@ -105,18 +121,22 @@ namespace TestOutput
Write( Write(
#line 30 "" #line 30 ""
ex.Message ex.Message
#line default #line default
#line hidden #line hidden
); );
WriteLiteral("</p>\r\n"); WriteLiteral("</p>\r\n");
#line 31 "" #line 31 ""
} }
#line default #line default
#line hidden #line hidden
#line 33 "" #line 33 ""
#line default #line default
#line hidden #line hidden
@ -124,18 +144,22 @@ namespace TestOutput
Write( Write(
#line 34 "" #line 34 ""
i i
#line default #line default
#line hidden #line hidden
); );
WriteLiteral("</p>\r\n\r\n"); WriteLiteral("</p>\r\n\r\n");
#line 36 "" #line 36 ""
lock(new object()) { lock(new object()) {
#line default #line default
#line hidden #line hidden
WriteLiteral(" <p>This block is locked, for your security!</p>\r\n"); WriteLiteral(" <p>This block is locked, for your security!</p>\r\n");
#line 38 "" #line 38 ""
} }
#line default #line default
#line hidden #line hidden

5
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/OpenedIf.DesignTime.Tabs.cs
View File

@ -18,17 +18,20 @@ namespace TestOutput
public override void Execute() public override void Execute()
{ {
#line 3 "OpenedIf.cshtml" #line 3 "OpenedIf.cshtml"
if (true) { if (true) {
#line default #line default
#line hidden #line hidden
#line 4 "OpenedIf.cshtml" #line 4 "OpenedIf.cshtml"
#line default #line default
#line hidden #line hidden
#line 5 "OpenedIf.cshtml" #line 5 "OpenedIf.cshtml"
#line default #line default
#line hidden #line hidden

5
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/OpenedIf.DesignTime.cs
View File

@ -18,17 +18,20 @@ namespace TestOutput
public override void Execute() public override void Execute()
{ {
#line 3 "OpenedIf.cshtml" #line 3 "OpenedIf.cshtml"
if (true) { if (true) {
#line default #line default
#line hidden #line hidden
#line 4 "OpenedIf.cshtml" #line 4 "OpenedIf.cshtml"
#line default #line default
#line hidden #line hidden
#line 5 "OpenedIf.cshtml" #line 5 "OpenedIf.cshtml"
#line default #line default
#line hidden #line hidden

1
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ParserError.cs
View File

@ -23,6 +23,7 @@ namespace TestOutput
int i =10; int i =10;
int j =20; int j =20;
} }
#line default #line default
#line hidden #line hidden

26
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/RazorComments.DesignTime.cs
View File

@ -20,44 +20,48 @@ namespace TestOutput
#line 4 "RazorComments.cshtml" #line 4 "RazorComments.cshtml"
#line default #line default
#line hidden #line hidden
#line 5 "RazorComments.cshtml" #line 5 "RazorComments.cshtml"
Exception foo = Exception foo =
#line default #line default
#line hidden #line hidden
#line 6 "RazorComments.cshtml" #line 6 "RazorComments.cshtml"
null; null;
if(foo != null) { if(foo != null) {
throw foo; throw foo;
} }
#line default #line default
#line hidden #line hidden
#line 12 "RazorComments.cshtml" #line 12 "RazorComments.cshtml"
var bar = "@* bar *@"; var bar = "@* bar *@";
#line default #line default
#line hidden #line hidden
__o = #line 1 "This is here only for document formatting."
#line 13 "RazorComments.cshtml" __o = bar;
bar
#line default
#line hidden
;
__o =
#line 15 "RazorComments.cshtml"
a
#line default #line default
#line hidden #line hidden
#line 1 "This is here only for document formatting."
__o = a
#line 15 "RazorComments.cshtml" #line 15 "RazorComments.cshtml"
b b
#line default
#line hidden
;
#line default #line default
#line hidden #line hidden
;
} }
} }
} }

9
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/RazorComments.cs
View File

@ -15,12 +15,14 @@ namespace TestOutput
#line 4 "RazorComments.cshtml" #line 4 "RazorComments.cshtml"
#line default #line default
#line hidden #line hidden
#line 5 "RazorComments.cshtml" #line 5 "RazorComments.cshtml"
Exception foo = Exception foo =
#line default #line default
#line hidden #line hidden
@ -29,12 +31,14 @@ namespace TestOutput
if(foo != null) { if(foo != null) {
throw foo; throw foo;
} }
#line default #line default
#line hidden #line hidden
WriteLiteral("\r\n\r\n"); WriteLiteral("\r\n\r\n");
#line 12 "RazorComments.cshtml" #line 12 "RazorComments.cshtml"
var bar = "@* bar *@"; var bar = "@* bar *@";
#line default #line default
#line hidden #line hidden
@ -42,20 +46,25 @@ namespace TestOutput
Write( Write(
#line 13 "RazorComments.cshtml" #line 13 "RazorComments.cshtml"
bar bar
#line default #line default
#line hidden #line hidden
); );
WriteLiteral("</p>\r\n\r\n"); WriteLiteral("</p>\r\n\r\n");
Write( Write(
#line 15 "RazorComments.cshtml" #line 15 "RazorComments.cshtml"
a a
#line default #line default
#line hidden #line hidden
#line 15 "RazorComments.cshtml" #line 15 "RazorComments.cshtml"
b b
#line default #line default
#line hidden #line hidden
); );
WriteLiteral("\r\n"); WriteLiteral("\r\n");
} }
} }

17
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ResolveUrl.cs
View File

@ -18,6 +18,7 @@ namespace TestOutput
Tuple.Create(Tuple.Create("", 45), Tuple.Create<System.Object, System.Int32>( Tuple.Create(Tuple.Create("", 45), Tuple.Create<System.Object, System.Int32>(
#line 2 "ResolveUrl.cshtml" #line 2 "ResolveUrl.cshtml"
product.id product.id
#line default #line default
#line hidden #line hidden
, 45), false)); , 45), false));
@ -25,14 +26,17 @@ namespace TestOutput
Write( Write(
#line 2 "ResolveUrl.cshtml" #line 2 "ResolveUrl.cshtml"
product.Name product.Name
#line default #line default
#line hidden #line hidden
); );
WriteLiteral("</a>\r\n<a"); WriteLiteral("</a>\r\n<a");
WriteAttribute("href", Tuple.Create(" href=\"", 79), Tuple.Create("\"", 115), Tuple.Create(Tuple.Create("", 86), Tuple.Create<System.Object, System.Int32>(Href("~/Products/"), 86), false), WriteAttribute("href", Tuple.Create(" href=\"", 79), Tuple.Create("\"", 115), Tuple.Create(Tuple.Create("", 86), Tuple.Create<System.Object, System.Int32>(Href("~/Products/"), 86), false),
Tuple.Create(Tuple.Create("", 97), Tuple.Create<System.Object, System.Int32>( Tuple.Create(Tuple.Create("", 97), Tuple.Create<System.Object, System.Int32>(
#line 3 "ResolveUrl.cshtml" #line 3 "ResolveUrl.cshtml"
product.id product.id
#line default #line default
#line hidden #line hidden
, 97), false), Tuple.Create(Tuple.Create("", 108), Tuple.Create("/Detail", 108), true)); , 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<System.Object, System.Int32>( Tuple.Create(Tuple.Create("", 169), Tuple.Create<System.Object, System.Int32>(
#line 4 "ResolveUrl.cshtml" #line 4 "ResolveUrl.cshtml"
product.id product.id
#line default #line default
#line hidden #line hidden
, 169), false), Tuple.Create(Tuple.Create("", 180), Tuple.Create("/Detail", 180), true)); , 169), false), Tuple.Create(Tuple.Create("", 180), Tuple.Create("/Detail", 180), true));
WriteLiteral(">Crazy Url!</a>\r\n\r\n"); WriteLiteral(">Crazy Url!</a>\r\n\r\n");
#line 6 "ResolveUrl.cshtml" #line 6 "ResolveUrl.cshtml"
#line default #line default
#line hidden #line hidden
@ -57,6 +63,7 @@ namespace TestOutput
Tuple.Create(Tuple.Create("", 284), Tuple.Create<System.Object, System.Int32>( Tuple.Create(Tuple.Create("", 284), Tuple.Create<System.Object, System.Int32>(
#line 9 "ResolveUrl.cshtml" #line 9 "ResolveUrl.cshtml"
product.id product.id
#line default #line default
#line hidden #line hidden
, 284), false)); , 284), false));
@ -64,14 +71,17 @@ namespace TestOutput
Write( Write(
#line 9 "ResolveUrl.cshtml" #line 9 "ResolveUrl.cshtml"
product.Name product.Name
#line default #line default
#line hidden #line hidden
); );
WriteLiteral("</a>\r\n <a"); WriteLiteral("</a>\r\n <a");
WriteAttribute("href", Tuple.Create(" href=\"", 326), Tuple.Create("\"", 362), Tuple.Create(Tuple.Create("", 333), Tuple.Create<System.Object, System.Int32>(Href("~/Products/"), 333), false), WriteAttribute("href", Tuple.Create(" href=\"", 326), Tuple.Create("\"", 362), Tuple.Create(Tuple.Create("", 333), Tuple.Create<System.Object, System.Int32>(Href("~/Products/"), 333), false),
Tuple.Create(Tuple.Create("", 344), Tuple.Create<System.Object, System.Int32>( Tuple.Create(Tuple.Create("", 344), Tuple.Create<System.Object, System.Int32>(
#line 10 "ResolveUrl.cshtml" #line 10 "ResolveUrl.cshtml"
product.id product.id
#line default #line default
#line hidden #line hidden
, 344), false), Tuple.Create(Tuple.Create("", 355), Tuple.Create("/Detail", 355), true)); , 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<System.Object, System.Int32>( Tuple.Create(Tuple.Create("", 424), Tuple.Create<System.Object, System.Int32>(
#line 11 "ResolveUrl.cshtml" #line 11 "ResolveUrl.cshtml"
product.id product.id
#line default #line default
#line hidden #line hidden
, 424), false), Tuple.Create(Tuple.Create("", 435), Tuple.Create("/Detail", 435), true)); , 424), false), Tuple.Create(Tuple.Create("", 435), Tuple.Create("/Detail", 435), true));
WriteLiteral(">Crazy Url!</a>\r\n \r\n"); WriteLiteral(">Crazy Url!</a>\r\n \r\n");
#line 13 "ResolveUrl.cshtml" #line 13 "ResolveUrl.cshtml"
#line default #line default
#line hidden #line hidden
@ -97,6 +109,7 @@ namespace TestOutput
Tuple.Create(Tuple.Create("", 547), Tuple.Create<System.Object, System.Int32>( Tuple.Create(Tuple.Create("", 547), Tuple.Create<System.Object, System.Int32>(
#line 17 "ResolveUrl.cshtml" #line 17 "ResolveUrl.cshtml"
product.id product.id
#line default #line default
#line hidden #line hidden
, 547), false)); , 547), false));
@ -104,14 +117,17 @@ namespace TestOutput
Write( Write(
#line 17 "ResolveUrl.cshtml" #line 17 "ResolveUrl.cshtml"
product.Name product.Name
#line default #line default
#line hidden #line hidden
); );
WriteLiteral("</a>\r\n <a"); WriteLiteral("</a>\r\n <a");
WriteAttribute("href", Tuple.Create(" href=\"", 585), Tuple.Create("\"", 621), Tuple.Create(Tuple.Create("", 592), Tuple.Create<System.Object, System.Int32>(Href("~/Products/"), 592), false), WriteAttribute("href", Tuple.Create(" href=\"", 585), Tuple.Create("\"", 621), Tuple.Create(Tuple.Create("", 592), Tuple.Create<System.Object, System.Int32>(Href("~/Products/"), 592), false),
Tuple.Create(Tuple.Create("", 603), Tuple.Create<System.Object, System.Int32>( Tuple.Create(Tuple.Create("", 603), Tuple.Create<System.Object, System.Int32>(
#line 18 "ResolveUrl.cshtml" #line 18 "ResolveUrl.cshtml"
product.id product.id
#line default #line default
#line hidden #line hidden
, 603), false), Tuple.Create(Tuple.Create("", 614), Tuple.Create("/Detail", 614), true)); , 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<System.Object, System.Int32>( Tuple.Create(Tuple.Create("", 679), Tuple.Create<System.Object, System.Int32>(
#line 19 "ResolveUrl.cshtml" #line 19 "ResolveUrl.cshtml"
product.id product.id
#line default #line default
#line hidden #line hidden
, 679), false), Tuple.Create(Tuple.Create("", 690), Tuple.Create("/Detail", 690), true)); , 679), false), Tuple.Create(Tuple.Create("", 690), Tuple.Create("/Detail", 690), true));

1
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Sections.cs
View File

@ -14,6 +14,7 @@ namespace TestOutput
#line 1 "Sections.cshtml" #line 1 "Sections.cshtml"
Layout = "_SectionTestLayout.cshtml" Layout = "_SectionTestLayout.cshtml"
#line default #line default
#line hidden #line hidden

4
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/SimpleUnspacedIf.DesignTime.Tabs.cs
View File

@ -18,15 +18,17 @@ namespace TestOutput
public override void Execute() public override void Execute()
{ {
#line 1 "SimpleUnspacedIf.cshtml" #line 1 "SimpleUnspacedIf.cshtml"
if (true) if (true)
{ {
#line default #line default
#line hidden #line hidden
#line 3 "SimpleUnspacedIf.cshtml" #line 3 "SimpleUnspacedIf.cshtml"
} }
#line default #line default
#line hidden #line hidden

25
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Templates.cs
View File

@ -13,6 +13,7 @@ namespace TestOutput
} }
}); });
} }
#line default #line default
#line hidden #line hidden
#line hidden #line hidden
@ -26,6 +27,7 @@ namespace TestOutput
#line 11 "Templates.cshtml" #line 11 "Templates.cshtml"
Func<dynamic, object> foo = Func<dynamic, object> foo =
#line default #line default
#line hidden #line hidden
@ -34,26 +36,32 @@ namespace TestOutput
WriteTo(__razor_template_writer, WriteTo(__razor_template_writer,
#line 12 "Templates.cshtml" #line 12 "Templates.cshtml"
item item
#line default #line default
#line hidden #line hidden
); );
WriteLiteralTo(__razor_template_writer, "!"); WriteLiteralTo(__razor_template_writer, "!");
} }
) )
#line 12 "Templates.cshtml" #line 12 "Templates.cshtml"
; ;
#line default #line default
#line hidden #line hidden
Write( Write(
#line 13 "Templates.cshtml" #line 13 "Templates.cshtml"
foo("") foo("")
#line default #line default
#line hidden #line hidden
); );
#line 13 "Templates.cshtml" #line 13 "Templates.cshtml"
#line default #line default
#line hidden #line hidden
@ -61,6 +69,7 @@ namespace TestOutput
Write( Write(
#line 17 "Templates.cshtml" #line 17 "Templates.cshtml"
Repeat(10, Repeat(10,
#line default #line default
#line hidden #line hidden
item => new Template((__razor_template_writer) => { item => new Template((__razor_template_writer) => {
@ -68,22 +77,27 @@ namespace TestOutput
WriteTo(__razor_template_writer, WriteTo(__razor_template_writer,
#line 17 "Templates.cshtml" #line 17 "Templates.cshtml"
item item
#line default #line default
#line hidden #line hidden
); );
WriteLiteralTo(__razor_template_writer, "</li>"); WriteLiteralTo(__razor_template_writer, "</li>");
} }
) )
#line 17 "Templates.cshtml" #line 17 "Templates.cshtml"
) )
#line default #line default
#line hidden #line hidden
); );
WriteLiteral("\r\n</ul>\r\n\r\n<p>\r\n"); WriteLiteral("\r\n</ul>\r\n\r\n<p>\r\n");
Write( Write(
#line 21 "Templates.cshtml" #line 21 "Templates.cshtml"
Repeat(10, Repeat(10,
#line default #line default
#line hidden #line hidden
item => new Template((__razor_template_writer) => { item => new Template((__razor_template_writer) => {
@ -91,21 +105,26 @@ namespace TestOutput
WriteTo(__razor_template_writer, WriteTo(__razor_template_writer,
#line 22 "Templates.cshtml" #line 22 "Templates.cshtml"
item item
#line default #line default
#line hidden #line hidden
); );
WriteLiteralTo(__razor_template_writer, " of markup<br/>\r\n"); WriteLiteralTo(__razor_template_writer, " of markup<br/>\r\n");
} }
) )
#line 23 "Templates.cshtml" #line 23 "Templates.cshtml"
) )
#line default #line default
#line hidden #line hidden
); );
WriteLiteral("\r\n</p>\r\n\r\n<ul>\r\n "); WriteLiteral("\r\n</p>\r\n\r\n<ul>\r\n ");
Write( Write(
#line 27 "Templates.cshtml" #line 27 "Templates.cshtml"
Repeat(10, Repeat(10,
#line default #line default
#line hidden #line hidden
item => new Template((__razor_template_writer) => { item => new Template((__razor_template_writer) => {
@ -113,17 +132,21 @@ namespace TestOutput
WriteTo(__razor_template_writer, WriteTo(__razor_template_writer,
#line 28 "Templates.cshtml" #line 28 "Templates.cshtml"
item item
#line default #line default
#line hidden #line hidden
); );
WriteLiteralTo(__razor_template_writer, "\r\n"); WriteLiteralTo(__razor_template_writer, "\r\n");
#line 29 "Templates.cshtml" #line 29 "Templates.cshtml"
#line default #line default
#line hidden #line hidden
#line 29 "Templates.cshtml" #line 29 "Templates.cshtml"
var parent = item; var parent = item;
#line default #line default
#line hidden #line hidden
@ -133,9 +156,11 @@ namespace TestOutput
) )
#line 34 "Templates.cshtml" #line 34 "Templates.cshtml"
) )
#line default #line default
#line hidden #line hidden
); );
WriteLiteral("\r\n</ul> "); WriteLiteral("\r\n</ul> ");
} }
} }

9
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/UnfinishedExpressionInCode.Tabs.cs
View File

@ -19,17 +19,18 @@ namespace TestOutput
{ {
#line 1 "UnfinishedExpressionInCode.cshtml" #line 1 "UnfinishedExpressionInCode.cshtml"
#line default #line default
#line hidden #line hidden
__o = #line 1 "This is here only for document formatting."
#line 2 "UnfinishedExpressionInCode.cshtml" __o = DateTime.;
DateTime.
#line default #line default
#line hidden #line hidden
;
#line 2 "UnfinishedExpressionInCode.cshtml" #line 2 "UnfinishedExpressionInCode.cshtml"
#line default #line default
#line hidden #line hidden

9
test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/UnfinishedExpressionInCode.cs
View File

@ -19,17 +19,18 @@ namespace TestOutput
{ {
#line 1 "UnfinishedExpressionInCode.cshtml" #line 1 "UnfinishedExpressionInCode.cshtml"
#line default #line default
#line hidden #line hidden
__o = #line 1 "This is here only for document formatting."
#line 2 "UnfinishedExpressionInCode.cshtml" __o = DateTime.;
DateTime.
#line default #line default
#line hidden #line hidden
;
#line 2 "UnfinishedExpressionInCode.cshtml" #line 2 "UnfinishedExpressionInCode.cshtml"
#line default #line default
#line hidden #line hidden

19
test/Microsoft.AspNet.Razor.Test/TestFiles/DesignTime/Simple.txt
View File

@ -19,28 +19,29 @@
#line 1 "C:\This\Path\Is\Just\For\Line\Pragmas.cshtml" #line 1 "C:\This\Path\Is\Just\For\Line\Pragmas.cshtml"
string hello = "Hello, World"; string hello = "Hello, World";
#line default #line default
#line hidden #line hidden
__o = #line 1 "This is here only for document formatting."
#line 11 "C:\This\Path\Is\Just\For\Line\Pragmas.cshtml" __o = hello;
hello
#line default #line default
#line hidden #line hidden
;
#line 13 "C:\This\Path\Is\Just\For\Line\Pragmas.cshtml" #line 13 "C:\This\Path\Is\Just\For\Line\Pragmas.cshtml"
foreach(char c in hello) { foreach(char c in hello) {
#line default #line default
#line hidden #line hidden
__o = #line 1 "This is here only for document formatting."
#line 13 "C:\This\Path\Is\Just\For\Line\Pragmas.cshtml" __o = c;
c
#line default #line default
#line hidden #line hidden
;
#line 13 "C:\This\Path\Is\Just\For\Line\Pragmas.cshtml" #line 13 "C:\This\Path\Is\Just\For\Line\Pragmas.cshtml"
} }
#line default #line default
#line hidden #line hidden