Skip to content
This repository was archived by the owner on Dec 19, 2018. It is now read-only.

Commit d09dec9

Browse files
author
NTaylorMullen
committed
Rebased.
1 parent bcde857 commit d09dec9

File tree

7 files changed

+217
-182
lines changed

7 files changed

+217
-182
lines changed

‎test/Microsoft.AspNet.Razor.Test/Generator/RazorCodeGeneratorTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ private void RunTestInternal(string name,
115115
host.DefaultClassName = name;
116116

117117
// Add support for templates, etc.
118-
host.GeneratedClassContext = new GeneratedClassContext(GeneratedTagHelperRenderingContext.Default,
118+
host.GeneratedClassContext = new GeneratedClassContext(GeneratedTagHelperContext.Default,
119119
GeneratedClassContext.DefaultExecuteMethodName,
120120
GeneratedClassContext.DefaultWriteMethodName,
121121
GeneratedClassContext.DefaultWriteLiteralMethodName,

‎test/Microsoft.AspNet.Razor.Test/Parser/PartialParsing/PartialParsingTestBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ protected static RazorEngineHost CreateHost()
5858
{
5959
return new RazorEngineHost(new TLanguage())
6060
{
61-
GeneratedClassContext = new GeneratedClassContext(GeneratedTagHelperRenderingContext.Default,
61+
GeneratedClassContext = new GeneratedClassContext(GeneratedTagHelperContext.Default,
6262
"Execute",
6363
"Write",
6464
"WriteLiteral",

‎test/Microsoft.AspNet.Razor.Test/RazorEngineHostTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ private static RazorEngineHost CreateHost()
119119
private static void VerifyCommonDefaults(RazorEngineHost host)
120120
{
121121
Assert.Equal(GeneratedClassContext.Default, host.GeneratedClassContext);
122-
Assert.Equal(GeneratedTagHelperRenderingContext.Default, host.GeneratedClassContext.GeneratedTagHelperRenderingContext);
122+
Assert.Equal(GeneratedTagHelperContext.Default, host.GeneratedClassContext.GeneratedTagHelperContext);
123123
Assert.Empty(host.NamespaceImports);
124124
Assert.False(host.DesignTimeMode);
125125
Assert.Equal(RazorEngineHost.InternalDefaultClassName, host.DefaultClassName);

‎test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/BasicTagHelpers.cs‎

Lines changed: 49 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ namespace TestOutput
66
public class BasicTagHelpers
77
{
88
[Activate]
9-
private ITagHelperManager __tagHelperManager { get; set; }
9+
private ITagHelperRunner __tagHelperRunner { get; set; }
10+
[Activate]
11+
private ITagHelperScopeManager __tagHelperScopeManager { get; set; }
1012
#line hidden
1113
public BasicTagHelpers()
1214
{
@@ -15,50 +17,57 @@ public BasicTagHelpers()
1517
#pragma warning disable 1998
1618
public override async Task ExecuteAsync()
1719
{
18-
var __tagHelperAttributeValue = string.Empty;
19-
PTagHelper __p_PTagHelper_None;
20-
InputTagHelper __input_InputTagHelper_None;
21-
InputTagHelper2 __input_InputTagHelper2_None;
20+
var __tagHelperBufferedStringValue = string.Empty;
21+
TagHelperExecutionContext __executionContext = null;
22+
PTagHelper __PTagHelper;
23+
InputTagHelper __InputTagHelper;
24+
InputTagHelper2 __InputTagHelper2;
2225
WriteLiteral("<div class=\"randomNonTagHelperAttribute\">\r\n ");
23-
__p_PTagHelper_None = __tagHelperManager.StartTagHelper<PTagHelper>();
24-
__tagHelperManager.AddHTMLAttribute("class", "Hello World");
25-
__tagHelperManager.StartActiveTagHelpers("p");
26-
__tagHelperManager.ExecuteTagHelpers();
27-
WriteLiteral(__tagHelperManager.GenerateTagStart());
26+
__executionContext = __tagHelperScopeManager.Begin("p");
27+
__PTagHelper = CreateTagHelper<PTagHelper>();
28+
__executionContext.Add(__PTagHelper);
29+
__executionContext.AddHtmlAttribute("class", "Hello World");
30+
__executionContext.Output = await __tagHelperRunner.RunAsync(__executionContext);
31+
WriteLiteral(__executionContext.Output.GenerateTagStart());
2832
WriteLiteral("\r\n ");
29-
__p_PTagHelper_None = __tagHelperManager.StartTagHelper<PTagHelper>();
30-
__tagHelperManager.StartActiveTagHelpers("p");
31-
__tagHelperManager.ExecuteTagHelpers();
32-
WriteLiteral(__tagHelperManager.GenerateTagStart());
33-
WriteLiteral(__tagHelperManager.GenerateTagEnd());
34-
__tagHelperManager.EndTagHelpers();
33+
__executionContext = __tagHelperScopeManager.Begin("p");
34+
__PTagHelper = CreateTagHelper<PTagHelper>();
35+
__executionContext.Add(__PTagHelper);
36+
__executionContext.Output = await __tagHelperRunner.RunAsync(__executionContext);
37+
WriteLiteral(__executionContext.Output.GenerateTagStart());
38+
WriteLiteral(__executionContext.Output.GenerateTagEnd());
39+
__executionContext = __tagHelperScopeManager.End();
3540
WriteLiteral("\r\n ");
36-
__input_InputTagHelper_None = __tagHelperManager.StartTagHelper<InputTagHelper>();
37-
__input_InputTagHelper_None.Type = "text";
38-
__tagHelperManager.AddTagHelperAttribute("type", __input_InputTagHelper_None.Type);
39-
__input_InputTagHelper2_None = __tagHelperManager.StartTagHelper<InputTagHelper2>();
40-
__input_InputTagHelper2_None.Type = __input_InputTagHelper_None.Type;
41-
__tagHelperManager.StartActiveTagHelpers("input");
42-
__tagHelperManager.ExecuteTagHelpers();
43-
WriteLiteral(__tagHelperManager.GenerateTagStart());
44-
WriteLiteral(__tagHelperManager.GenerateTagEnd());
45-
__tagHelperManager.EndTagHelpers();
41+
__executionContext = __tagHelperScopeManager.Begin("input");
42+
__InputTagHelper = CreateTagHelper<InputTagHelper>();
43+
__executionContext.Add(__InputTagHelper);
44+
__InputTagHelper.Type = "text";
45+
__executionContext.AddTagHelperAttribute("type", __InputTagHelper.Type);
46+
__InputTagHelper2 = CreateTagHelper<InputTagHelper2>();
47+
__executionContext.Add(__InputTagHelper2);
48+
__InputTagHelper2.Type = __InputTagHelper.Type;
49+
__executionContext.Output = await __tagHelperRunner.RunAsync(__executionContext);
50+
WriteLiteral(__executionContext.Output.GenerateTagStart());
51+
WriteLiteral(__executionContext.Output.GenerateTagEnd());
52+
__executionContext = __tagHelperScopeManager.End();
4653
WriteLiteral("\r\n ");
47-
__input_InputTagHelper_None = __tagHelperManager.StartTagHelper<InputTagHelper>();
48-
__input_InputTagHelper_None.Type = "checkbox";
49-
__tagHelperManager.AddTagHelperAttribute("type", __input_InputTagHelper_None.Type);
50-
__input_InputTagHelper2_None = __tagHelperManager.StartTagHelper<InputTagHelper2>();
51-
__input_InputTagHelper2_None.Type = __input_InputTagHelper_None.Type;
52-
__input_InputTagHelper2_None.Checked = true;
53-
__tagHelperManager.AddTagHelperAttribute("checked", __input_InputTagHelper2_None.Checked);
54-
__tagHelperManager.StartActiveTagHelpers("input");
55-
__tagHelperManager.ExecuteTagHelpers();
56-
WriteLiteral(__tagHelperManager.GenerateTagStart());
57-
WriteLiteral(__tagHelperManager.GenerateTagEnd());
58-
__tagHelperManager.EndTagHelpers();
54+
__executionContext = __tagHelperScopeManager.Begin("input");
55+
__InputTagHelper = CreateTagHelper<InputTagHelper>();
56+
__executionContext.Add(__InputTagHelper);
57+
__InputTagHelper.Type = "checkbox";
58+
__executionContext.AddTagHelperAttribute("type", __InputTagHelper.Type);
59+
__InputTagHelper2 = CreateTagHelper<InputTagHelper2>();
60+
__executionContext.Add(__InputTagHelper2);
61+
__InputTagHelper2.Type = __InputTagHelper.Type;
62+
__InputTagHelper2.Checked = true;
63+
__executionContext.AddTagHelperAttribute("checked", __InputTagHelper2.Checked);
64+
__executionContext.Output = await __tagHelperRunner.RunAsync(__executionContext);
65+
WriteLiteral(__executionContext.Output.GenerateTagStart());
66+
WriteLiteral(__executionContext.Output.GenerateTagEnd());
67+
__executionContext = __tagHelperScopeManager.End();
5968
WriteLiteral("\r\n ");
60-
WriteLiteral(__tagHelperManager.GenerateTagEnd());
61-
__tagHelperManager.EndTagHelpers();
69+
WriteLiteral(__executionContext.Output.GenerateTagEnd());
70+
__executionContext = __tagHelperScopeManager.End();
6271
WriteLiteral("\r\n</div>");
6372
}
6473
#pragma warning restore 1998

0 commit comments

Comments
 (0)