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

Change `TagHelperOutput` and `TagHelperContext` lifetimes. 

- `TagHelperOutput` and `TagHelperContext` lifetimes now mach `TagHelperExecutionContext`s. This means once a set of `TagHelper`s have run on a tag the `TagHelperOutput`/`TagHelperContext` will be re-used.
- Added tests to validate the various `Reset`/`Reinitialize` methods behaved correctly.
- Updated codegen to no longer set `TagHelperExecutionContext.Output`.

#719
This commit is contained in:
N. Taylor Mullen 2016-03-22 15:51:28 -07:00
parent d62343ade5
commit 3c73ae9cfe
36 changed files with 310 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperExecutionContext.cs
View File

@ -18,12 +18,8 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
private readonly Action<HtmlEncoder> _startTagHelperWritingScope;
private readonly Func<TagHelperContent> _endTagHelperWritingScope;
private TagHelperContent _childContent;
private string _tagName;
private string _uniqueId;
private TagMode _tagMode;
private Func<Task> _executeChildContentAsync;
private Dictionary<HtmlEncoder, TagHelperContent> _perEncoderChildContent;
private TagHelperAttributeList _htmlAttributes;
private TagHelperAttributeList _allAttributes;
/// <summary>
@ -74,6 +70,13 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
}
_tagHelpers = new List<ITagHelper>();
_allAttributes = new TagHelperAttributeList();
Context = new TagHelperContext(_allAttributes, items, uniqueId);
Output = new TagHelperOutput(tagName, new TagHelperAttributeList(), GetChildContentAsync)
{
TagMode = tagMode
};
Reinitialize(tagName, tagMode, items, uniqueId, executeChildContentAsync);
@ -108,18 +111,16 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
}
}
// Internal set for testing.
/// <summary>
/// The <see cref="ITagHelper"/>s' output.
/// The <see cref="ITagHelper"/>'s output.
/// </summary>
public TagHelperOutput Output { get; set; }
public TagHelperOutput Output { get; internal set; }
public TagHelperContext CreateTagHelperContext() =>
new TagHelperContext(_allAttributes, Items, _uniqueId);
public TagHelperOutput CreateTagHelperOutput() =>
new TagHelperOutput(_tagName, _htmlAttributes, GetChildContentAsync)
{
TagMode = _tagMode
};
/// <summary>
/// The <see cref="ITagHelper"/>'s context.
/// </summary>
public TagHelperContext Context { get; }
/// <summary>
/// Tracks the given <paramref name="tagHelper"/>.
@ -177,10 +178,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
throw new ArgumentNullException(nameof(attribute));
}
EnsureHtmlAttributes();
EnsureAllAttributes();
_htmlAttributes.Add(attribute);
Output.Attributes.Add(attribute);
_allAttributes.Add(attribute);
}
@ -196,7 +194,6 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
throw new ArgumentNullException(nameof(name));
}
EnsureAllAttributes();
_allAttributes.Add(name, value);
}
@ -236,16 +233,14 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
throw new ArgumentNullException(nameof(executeChildContentAsync));
}
_tagName = tagName;
_tagMode = tagMode;
Items = items;
_uniqueId = uniqueId;
_executeChildContentAsync = executeChildContentAsync;
_tagHelpers.Clear();
_perEncoderChildContent?.Clear();
_htmlAttributes = null;
_allAttributes = null;
_childContent = null;
Context.Reinitialize(Items, uniqueId);
Output.Reinitialize(tagName, tagMode);
}
// Internal for testing.
@ -288,21 +283,5 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
return new DefaultTagHelperContent().SetHtmlContent(childContent);
}
private void EnsureHtmlAttributes()
{
if (_htmlAttributes == null)
{
_htmlAttributes = new TagHelperAttributeList();
}
}
private void EnsureAllAttributes()
{
if (_allAttributes == null)
{
_allAttributes = new TagHelperAttributeList();
}
}
}
}

8
src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperRunner.cs
View File

@ -20,14 +20,14 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
/// </param>
/// <returns>Resulting <see cref="TagHelperOutput"/> from processing all of the
/// <paramref name="executionContext"/>'s <see cref="ITagHelper"/>s.</returns>
public async Task<TagHelperOutput> RunAsync(TagHelperExecutionContext executionContext)
public async Task RunAsync(TagHelperExecutionContext executionContext)
{
if (executionContext == null)
{
throw new ArgumentNullException(nameof(executionContext));
}
var tagHelperContext = executionContext.CreateTagHelperContext();
var tagHelperContext = executionContext.Context;
OrderTagHelpers(executionContext.TagHelpers);
@ -36,14 +36,12 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
executionContext.TagHelpers[i].Init(tagHelperContext);
}
var tagHelperOutput = executionContext.CreateTagHelperOutput();
var tagHelperOutput = executionContext.Output;
for (var i = 0; i < executionContext.TagHelpers.Count; i++)
{
await executionContext.TagHelpers[i].ProcessAsync(tagHelperContext, tagHelperOutput);
}
return tagHelperOutput;
}
private static void OrderTagHelpers(IList<ITagHelper> tagHelpers)

22
src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/DefaultTagHelperContent.cs
View File

@ -18,11 +18,14 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
public class DefaultTagHelperContent : TagHelperContent
{
private List<object> _buffer;
private bool _isModified;
private List<object> Buffer
{
get
{
_isModified = true;
if (_buffer == null)
{
_buffer = new List<object>();
@ -33,7 +36,7 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
}
/// <inheritdoc />
public override bool IsModified => _buffer != null;
public override bool IsModified => _isModified;
/// <inheritdoc />
/// <remarks>Returns <c>true</c> for a cleared <see cref="TagHelperContent"/>.</remarks>
@ -41,7 +44,7 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
{
get
{
if (_buffer == null)
if (!IsModified)
{
return true;
}
@ -83,7 +86,7 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
{
get
{
if (_buffer == null)
if (!IsModified)
{
return true;
}
@ -156,7 +159,7 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
throw new ArgumentNullException(nameof(destination));
}
if (_buffer == null)
if (!IsModified)
{
return;
}
@ -194,7 +197,7 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
throw new ArgumentNullException(nameof(destination));
}
if (_buffer == null)
if (!IsModified)
{
return;
}
@ -233,6 +236,13 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
return this;
}
/// <inheritdoc />
public override void Reinitialize()
{
_buffer?.Clear();
_isModified = false;
}
/// <inheritdoc />
public override string GetContent()
{
@ -267,7 +277,7 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
throw new ArgumentNullException(nameof(encoder));
}
if (_buffer == null)
if (!IsModified)
{
return;
}

7
src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperContent.cs
View File

@ -128,6 +128,13 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
/// <returns>A reference to this instance after the clear operation has completed.</returns>
public abstract TagHelperContent Clear();
/// <summary>
/// Clears the <see cref="TagHelperContent"/>, so it can be reused.
/// </summary>
/// <remarks>This method does more than what <see cref="Clear"/> does. It also resets the
/// <see cref="IsModified"/> flag.</remarks>
public abstract void Reinitialize();
/// <inheritdoc />
public abstract void CopyTo(IHtmlContentBuilder destination);

29
src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperContext.cs
View File

@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
/// </summary>
public class TagHelperContext
{
private static ReadOnlyTagHelperAttributeList EmptyAttributes = new TagHelperAttributeList();
private readonly TagHelperAttributeList _allAttributes;
/// <summary>
/// Instantiates a new <see cref="TagHelperContext"/>.
@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
/// <param name="uniqueId">The unique identifier for the source element this <see cref="TagHelperContext" />
/// applies to.</param>
public TagHelperContext(
ReadOnlyTagHelperAttributeList allAttributes,
TagHelperAttributeList allAttributes,
IDictionary<object, object> items,
string uniqueId)
{
@ -35,7 +35,12 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
throw new ArgumentNullException(nameof(uniqueId));
}
AllAttributes = allAttributes ?? EmptyAttributes;
if (allAttributes == null)
{
throw new ArgumentNullException(nameof(allAttributes));
}
_allAttributes = allAttributes;
Items = items;
UniqueId = uniqueId;
}
@ -43,7 +48,7 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
/// <summary>
/// Every attribute associated with the current HTML element.
/// </summary>
public ReadOnlyTagHelperAttributeList AllAttributes { get; }
public ReadOnlyTagHelperAttributeList AllAttributes => _allAttributes;
/// <summary>
/// Gets the collection of items used to communicate with other <see cref="ITagHelper"/>s.
@ -52,11 +57,23 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
/// This <see cref="IDictionary{Object, Object}" /> is copy-on-write in order to ensure items added to this
/// collection are visible only to other <see cref="ITagHelper"/>s targeting child elements.
/// </remarks>
public IDictionary<object, object> Items { get; }
public IDictionary<object, object> Items { get; private set; }
/// <summary>
/// An identifier unique to the HTML element this context is for.
/// </summary>
public string UniqueId { get; }
public string UniqueId { get; private set; }
/// <summary>
/// Clears the <see cref="TagHelperContext"/> and updates its state with the provided values.
/// </summary>
/// <param name="items">The <see cref="IDictionary{Object, Object}"/> to use.</param>
/// <param name="uniqueId">The unique id to use.</param>
public void Reinitialize(IDictionary<object, object> items, string uniqueId)
{
_allAttributes.Clear();
Items = items;
UniqueId = uniqueId;
}
}
}

51
src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperOutput.cs
View File

@ -15,7 +15,6 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
public class TagHelperOutput : IHtmlContentContainer
{
private readonly Func<bool, HtmlEncoder, Task<TagHelperContent>> _getChildContentAsync;
private TagHelperAttributeList _attributes;
private TagHelperContent _preElement;
private TagHelperContent _preContent;
private TagHelperContent _content;
@ -27,7 +26,7 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
internal TagHelperOutput(string tagName)
: this(
tagName,
null,
new TagHelperAttributeList(),
(useCachedResult, encoder) => Task.FromResult<TagHelperContent>(new DefaultTagHelperContent()))
{
}
@ -51,9 +50,14 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
throw new ArgumentNullException(nameof(getChildContentAsync));
}
if (attributes == null)
{
throw new ArgumentNullException(nameof(attributes));
}
TagName = tagName;
_getChildContentAsync = getChildContentAsync;
_attributes = attributes;
Attributes = attributes;
}
/// <summary>
@ -183,17 +187,26 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
/// a <c>Microsoft.AspNetCore.Mvc.Rendering.HtmlString</c> instance. MVC converts most other types to a
/// <see cref="string"/>, then HTML encodes the result.
/// </remarks>
public TagHelperAttributeList Attributes
{
get
{
if (_attributes == null)
{
_attributes = new TagHelperAttributeList();
}
public TagHelperAttributeList Attributes { get; }
return _attributes;
}
/// <summary>
/// Clears the <see cref="TagHelperOutput"/> and updates its state with the provided values.
/// </summary>
/// <param name="tagName">The tag name to use.</param>
/// <param name="tagMode">The <see cref="TagMode"/> to use.</param>
public void Reinitialize(string tagName, TagMode tagMode)
{
TagName = tagName;
TagMode = tagMode;
Attributes.Clear();
_preElement?.Reinitialize();
_preContent?.Reinitialize();
_content?.Reinitialize();
_postContent?.Reinitialize();
_postElement?.Reinitialize();
_wasSuppressOutputCalled = false;
}
/// <summary>
@ -336,7 +349,7 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
{
destination.AppendHtml("<");
destination.AppendHtml(TagName);
CopyAttributesTo(destination);
if (TagMode == TagMode.SelfClosing)
@ -367,7 +380,7 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
_preContent?.Clear();
_content?.Clear();
_postContent?.Clear();
_attributes?.Clear();
Attributes.Clear();
}
public void WriteTo(TextWriter writer, HtmlEncoder encoder)
@ -392,9 +405,9 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
writer.Write(TagName);
// Perf: Avoid allocating enumerator
for (var i = 0; i < (_attributes?.Count ?? 0); i++)
for (var i = 0; i < (Attributes.Count); i++)
{
var attribute = _attributes[i];
var attribute = Attributes[i];
writer.Write(" ");
writer.Write(attribute.Name);
@ -469,9 +482,9 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
StringWriter stringWriter = null;
// Perf: Avoid allocating enumerator
for (var i = 0; i < (_attributes?.Count ?? 0); i++)
for (var i = 0; i < (Attributes.Count); i++)
{
var attribute = _attributes[i];
var attribute = Attributes[i];
destination.AppendHtml(" ");
destination.AppendHtml(attribute.Name);

14
src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpTagHelperCodeRenderer.cs
View File

@ -620,15 +620,11 @@ namespace Microsoft.AspNetCore.Razor.CodeGenerators
private void RenderRunTagHelpers()
{
_writer.Write(ExecutionContextVariableName)
.Write(".")
.WriteStartAssignment(_tagHelperContext.ExecutionContextOutputPropertyName)
.Write("await ")
.WriteStartInstanceMethodInvocation(RunnerVariableName,
_tagHelperContext.RunnerRunAsyncMethodName);
_writer.Write(ExecutionContextVariableName)
.WriteEndMethodInvocation();
_writer
.Write("await ")
.WriteStartInstanceMethodInvocation(RunnerVariableName, _tagHelperContext.RunnerRunAsyncMethodName)
.Write(ExecutionContextVariableName)
.WriteEndMethodInvocation();
}
private void RenderBufferedAttributeValue(TagHelperAttributeDescriptor attributeDescriptor)

14
test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs
View File

@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
executionContext.AddMinimizedHtmlAttribute("Another attribute");
// Assert - 1
var output = executionContext.CreateTagHelperOutput();
var output = executionContext.Output;
Assert.Equal(updatedTagName, output.TagName);
Assert.Equal(updatedTagMode, output.TagMode);
var attribute = Assert.Single(output.Attributes);
@ -108,7 +108,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
executionContext.AddMinimizedHtmlAttribute("Another attribute");
// Assert
var context = executionContext.CreateTagHelperContext();
var context = executionContext.Context;
var attribute = Assert.Single(context.AllAttributes);
Assert.Equal(attribute.Name, "Another attribute");
Assert.Equal(updatedUniqueId, context.UniqueId);
@ -125,7 +125,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
var executionContext = new TagHelperExecutionContext("p", tagMode);
// Act
var output = executionContext.CreateTagHelperOutput();
var output = executionContext.Output;
// Assert
Assert.Equal(tagMode, output.TagMode);
@ -388,7 +388,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
// Act
executionContext.AddHtmlAttribute("class", "btn");
executionContext.AddHtmlAttribute("foo", "bar");
var output = executionContext.CreateTagHelperOutput();
var output = executionContext.Output;
// Assert
Assert.Equal(
@ -411,7 +411,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
// Act
executionContext.AddMinimizedHtmlAttribute("checked");
executionContext.AddMinimizedHtmlAttribute("visible");
var output = executionContext.CreateTagHelperOutput();
var output = executionContext.Output;
// Assert
Assert.Equal(
@ -438,7 +438,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
executionContext.AddHtmlAttribute("foo", "bar");
executionContext.AddMinimizedHtmlAttribute("checked");
executionContext.AddMinimizedHtmlAttribute("visible");
var output = executionContext.CreateTagHelperOutput();
var output = executionContext.Output;
// Assert
Assert.Equal(
@ -463,7 +463,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
executionContext.AddHtmlAttribute("class", "btn");
executionContext.AddTagHelperAttribute("something", true);
executionContext.AddHtmlAttribute("foo", "bar");
var context = executionContext.CreateTagHelperContext();
var context = executionContext.Context;
// Assert
Assert.Equal(

11
test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperRunnerTest.cs
View File

@ -127,10 +127,10 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
executionContext.AddTagHelperAttribute("foo", true);
// Act
var output = await runner.RunAsync(executionContext);
await runner.RunAsync(executionContext);
// Assert
Assert.Equal(tagMode, output.TagMode);
Assert.Equal(tagMode, executionContext.Output.TagMode);
}
[Fact]
@ -163,9 +163,10 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
// Act
executionContext.Add(executableTagHelper);
executionContext.AddHtmlAttribute("class", "btn");
var output = await runner.RunAsync(executionContext);
await runner.RunAsync(executionContext);
// Assert
var output = executionContext.Output;
Assert.Equal("foo", output.TagName);
Assert.Equal("somethingelse", output.Attributes["class"].Value);
Assert.Equal("world", output.Attributes["hello"].Value);
@ -183,10 +184,10 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
// Act
executionContext.Add(tagHelper);
executionContext.AddTagHelperAttribute("foo", true);
var output = await runner.RunAsync(executionContext);
await runner.RunAsync(executionContext);
// Assert
Assert.Equal("True", output.Attributes["foo"].Value);
Assert.Equal("True", executionContext.Output.Attributes["foo"].Value);
}
[Fact]

8
test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperScopeManagerTest.cs
View File

@ -132,7 +132,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
// Act
var executionContext = BeginDefaultScope(scopeManager, tagName: "p");
var output = executionContext.CreateTagHelperOutput();
var output = executionContext.Output;
// Assert
Assert.Equal("p", output.TagName);
@ -147,7 +147,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
// Act
var executionContext = BeginDefaultScope(scopeManager, tagName: "p");
executionContext = BeginDefaultScope(scopeManager, tagName: "div");
var output = executionContext.CreateTagHelperOutput();
var output = executionContext.Output;
// Assert
Assert.Equal("div", output.TagName);
@ -164,7 +164,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
// Act
var executionContext = BeginDefaultScope(scopeManager, "p", tagMode);
var output = executionContext.CreateTagHelperOutput();
var output = executionContext.Output;
// Assert
Assert.Equal(tagMode, output.TagMode);
@ -180,7 +180,7 @@ namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
var executionContext = BeginDefaultScope(scopeManager, tagName: "p");
executionContext = BeginDefaultScope(scopeManager, tagName: "div");
executionContext = scopeManager.End();
var output = executionContext.CreateTagHelperOutput();
var output = executionContext.Output;
// Assert
Assert.Equal("p", output.TagName);

14
test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs
View File

@ -12,6 +12,20 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
{
public class DefaultTagHelperContentTest
{
[Fact]
public void Reset_ClearsTheExpectedFields()
{
// Arrange
var tagHelperContent = new DefaultTagHelperContent();
tagHelperContent.SetContent("hello world");
// Act
tagHelperContent.Reinitialize();
Assert.False(tagHelperContent.IsModified);
Assert.Equal(string.Empty, tagHelperContent.GetContent());
}
[Fact]
public void CanSetContent()
{

29
test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperContextTest.cs
View File

@ -9,6 +9,35 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
{
public class TagHelperContextTest
{
[Fact]
public void Reinitialize_AllowsContextToBeReused()
{
// Arrange
var initialUniqueId = "123";
var expectedUniqueId = "456";
var initialItems = new Dictionary<object, object>
{
{ "test-entry", 1234 }
};
var expectedItems = new Dictionary<object, object>
{
{ "something", "new" }
};
var initialAttributes = new TagHelperAttributeList
{
{ "name", "value" }
};
var context = new TagHelperContext(initialAttributes, initialItems, initialUniqueId);
// Act
context.Reinitialize(expectedItems, expectedUniqueId);
// Assert
Assert.Same(expectedItems, context.Items);
Assert.Equal(expectedUniqueId, context.UniqueId);
Assert.Empty(context.AllAttributes);
}
[Fact]
public void Constructor_SetsProperties_AsExpected()
{

49
test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs
View File

@ -16,6 +16,55 @@ namespace Microsoft.AspNetCore.Razor.TagHelpers
{
public class TagHelperOutputTest
{
[Fact]
public async Task Reinitialize_AllowsOutputToBeReused()
{
// Arrange
var initialOutputChildContent = new DefaultTagHelperContent();
initialOutputChildContent.SetContent("Initial output content.");
var expectedGetChildContentContent = "Initial get child content content";
var initialGetChildContent = new DefaultTagHelperContent();
initialGetChildContent.SetContent(expectedGetChildContentContent);
Func<bool, HtmlEncoder, Task<TagHelperContent>> initialGetChildContentAsync =
(useCachedResult, encoder) => Task.FromResult<TagHelperContent>(initialGetChildContent);
var initialTagMode = TagMode.StartTagOnly;
var initialAttributes = new TagHelperAttributeList
{
{ "name", "value" }
};
var initialTagName = "initialTagName";
var output = new TagHelperOutput(initialTagName, initialAttributes, initialGetChildContentAsync)
{
TagMode = initialTagMode,
Content = initialOutputChildContent,
};
output.PreContent.SetContent("something");
output.PostContent.SetContent("something");
output.PreElement.SetContent("something");
output.PostElement.SetContent("something");
var expectedTagName = "newTagName";
var expectedTagMode = TagMode.SelfClosing;
// Act
output.Reinitialize(expectedTagName, expectedTagMode);
// Assert
Assert.Equal(expectedTagName, output.TagName);
Assert.Equal(expectedTagMode, output.TagMode);
Assert.Empty(output.Attributes);
var getChildContent = await output.GetChildContentAsync();
var content = getChildContent.GetContent();
// We're expecting the initial child content here because normally the TagHelper infrastructure would
// swap out the inner workings of GetChildContentAsync to work with its reinitialized state.
Assert.Equal(expectedGetChildContentContent, content);
Assert.False(output.PreContent.IsModified);
Assert.False(output.PostContent.IsModified);
Assert.False(output.PreElement.IsModified);
Assert.False(output.PostElement.IsModified);
}
[Fact]
public async Task GetChildContentAsync_CallsGetChildContentAsync()
{

8
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.cs
View File

@ -44,7 +44,7 @@ namespace TestOutput
__TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
__tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();
@ -72,7 +72,7 @@ __TestNamespace_InputTagHelper2.Checked = true;
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(152, 40, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -99,7 +99,7 @@ __TestNamespace_InputTagHelper2.Checked = true;
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(198, 54, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -112,7 +112,7 @@ __TestNamespace_InputTagHelper2.Checked = true;
__TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
__tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();

8
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs
View File

@ -40,7 +40,7 @@ namespace TestOutput
__TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
__tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(155, 25, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -68,7 +68,7 @@ namespace TestOutput
__TestNamespace_InputTagHelper.Type = **From custom attribute code renderer**: "text";
__tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type);
__TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(190, 71, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -92,7 +92,7 @@ __TestNamespace_InputTagHelper2.Checked = **From custom attribute code renderer*
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(271, 39, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -106,7 +106,7 @@ __TestNamespace_InputTagHelper2.Checked = **From custom attribute code renderer*
__tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();

4
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.cs
View File

@ -49,7 +49,7 @@ namespace TestOutput
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(189, 41, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -62,7 +62,7 @@ namespace TestOutput
__TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
__tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();

8
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.cs
View File

@ -41,7 +41,7 @@ namespace TestOutput
__TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
__tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(155, 25, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -69,7 +69,7 @@ namespace TestOutput
__TestNamespace_InputTagHelper.Type = "text";
__tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type);
__TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(190, 71, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -93,7 +93,7 @@ __TestNamespace_InputTagHelper2.Checked = true;
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(271, 39, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -107,7 +107,7 @@ __TestNamespace_InputTagHelper2.Checked = true;
__tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();

34
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.cs
View File

@ -83,7 +83,7 @@ namespace TestOutput
__TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(278, 66, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -92,7 +92,7 @@ namespace TestOutput
, StartTagHelperWritingScope, EndTagHelperWritingScope);
__TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
__tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();
@ -142,7 +142,7 @@ namespace TestOutput
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(431, 37, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -151,7 +151,7 @@ namespace TestOutput
, StartTagHelperWritingScope, EndTagHelperWritingScope);
__TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
__tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();
@ -180,7 +180,7 @@ namespace TestOutput
__TestNamespace_InputTagHelper.Type = __tagHelperStringValueBuffer.GetContent(HtmlEncoder);
__tagHelperExecutionContext.AddTagHelperAttribute("tYPe", __TestNamespace_InputTagHelper.Type);
__TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(490, 50, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -232,7 +232,7 @@ namespace TestOutput
__TestNamespace_InputTagHelper.Type = __tagHelperStringValueBuffer.GetContent(HtmlEncoder);
__tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type);
__TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(558, 79, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -262,7 +262,7 @@ AddHtmlAttributeValue(" ", 159, DateTime.Now, 160, 14, false);
#line default
#line hidden
EndAddHtmlAttributeValues(__tagHelperExecutionContext);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();
@ -306,7 +306,7 @@ __TestNamespace_InputTagHelper2.Checked = (@object);
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("ChecKED", __TestNamespace_InputTagHelper2.Checked);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(817, 28, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -326,7 +326,7 @@ __TestNamespace_InputTagHelper2.Checked = (@object);
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_3);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();
@ -357,7 +357,7 @@ __TestNamespace_InputTagHelper2.Checked = (@object);
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(925, 85, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -375,7 +375,7 @@ __TestNamespace_PTagHelper.Age = -1970 + @DateTimeOffset.Now.Year;
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();
@ -404,7 +404,7 @@ __TestNamespace_InputTagHelper2.Checked = DateTimeOffset.Now.Year > 2014;
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(1088, 48, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -422,7 +422,7 @@ __TestNamespace_PTagHelper.Age = DateTimeOffset.Now.Year - 1970;
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();
@ -451,7 +451,7 @@ __TestNamespace_InputTagHelper2.Checked = @( DateTimeOffset.Now.Year ) > 20
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(1216, 63, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -469,7 +469,7 @@ __TestNamespace_PTagHelper.Age = ("My age is this long.".Length);
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();
@ -498,7 +498,7 @@ __TestNamespace_PTagHelper.Age = ("My age is this long.".Length);
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(1343, 26, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -514,7 +514,7 @@ __TestNamespace_PTagHelper.Age = 123;
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_6);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();

20
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/CssSelectorTagHelperAttributes.cs
View File

@ -48,7 +48,7 @@ namespace TestOutput
__TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
__tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();
@ -69,7 +69,7 @@ namespace TestOutput
__TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
__tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();
@ -92,7 +92,7 @@ namespace TestOutput
__TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
__tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();
@ -123,7 +123,7 @@ AddHtmlAttributeValue("", 152, false, 152, 6, false);
#line hidden
AddHtmlAttributeValue("", 158, "?hello=world", 158, 12, true);
EndAddHtmlAttributeValues(__tagHelperExecutionContext);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();
@ -151,7 +151,7 @@ AddHtmlAttributeValue("", 233, false, 233, 6, false);
#line default
#line hidden
EndAddHtmlAttributeValues(__tagHelperExecutionContext);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();
@ -172,7 +172,7 @@ AddHtmlAttributeValue("", 233, false, 233, 6, false);
__TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
__tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_3);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();
@ -200,7 +200,7 @@ AddHtmlAttributeValue(" ", 328, false, 329, 7, false);
#line default
#line hidden
EndAddHtmlAttributeValues(__tagHelperExecutionContext);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();
@ -225,7 +225,7 @@ AddHtmlAttributeValue(" ", 328, false, 329, 7, false);
__tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type);
__TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_4);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(354, 42, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -243,7 +243,7 @@ AddHtmlAttributeValue(" ", 328, false, 329, 7, false);
__TestNamespace_InputTagHelper2.Type = "texty";
__tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper2.Type);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_4);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(398, 43, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -261,7 +261,7 @@ AddHtmlAttributeValue(" ", 328, false, 329, 7, false);
__TestNamespace_InputTagHelper2.Type = "checkbox";
__tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper2.Type);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_5);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(443, 45, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();

6
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.cs
View File

@ -48,7 +48,7 @@ namespace TestOutput
__tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type);
__TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(69, 39, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -74,7 +74,7 @@ __TestNamespace_InputTagHelper2.Checked = true;
__tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_3);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_4);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(114, 70, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -94,7 +94,7 @@ __TestNamespace_PTagHelper.Age = 3;
__tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();

2
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateTargetTagHelper.cs
View File

@ -44,7 +44,7 @@ __TestNamespace_InputTagHelper.Checked = true;
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper.Checked);
__TestNamespace_CatchAllTagHelper.Checked = __TestNamespace_InputTagHelper.Checked;
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(33, 40, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();

12
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.cs
View File

@ -39,7 +39,7 @@ AddHtmlAttributeValue(" ", 55, DateTime.Now, 56, 14, false);
#line default
#line hidden
EndAddHtmlAttributeValues(__tagHelperExecutionContext);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(33, 40, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -90,7 +90,7 @@ WriteTo(__razor_attribute_value_writer, string.Empty);
), 93, 44, false);
AddHtmlAttributeValue(" ", 137, "suffix", 138, 7, true);
EndAddHtmlAttributeValues(__tagHelperExecutionContext);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(77, 71, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -123,7 +123,7 @@ AddHtmlAttributeValue(" ", 210, DateTime.Now, 211, 14, false);
#line hidden
AddHtmlAttributeValue(" ", 224, "suffix", 225, 7, true);
EndAddHtmlAttributeValues(__tagHelperExecutionContext);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(152, 83, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -227,7 +227,7 @@ AddHtmlAttributeValue(" ", 404, int.MaxValue, 405, 14, false);
#line default
#line hidden
EndAddHtmlAttributeValues(__tagHelperExecutionContext);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(239, 183, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -259,7 +259,7 @@ AddHtmlAttributeValue(" ", 488, int.MaxValue, 489, 14, false);
#line default
#line hidden
EndAddHtmlAttributeValues(__tagHelperExecutionContext);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(426, 80, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -309,7 +309,7 @@ WriteTo(__razor_attribute_value_writer, string.Empty);
}
), 526, 44, false);
EndAddHtmlAttributeValues(__tagHelperExecutionContext);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(510, 64, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();

6
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.cs
View File

@ -46,7 +46,7 @@ __TestNamespace_InputTagHelper2.Checked = ;
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(38, 34, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -75,7 +75,7 @@ __TestNamespace_InputTagHelper2.Checked = ;
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(98, 34, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -93,7 +93,7 @@ __TestNamespace_PTagHelper.Age = ;
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();

10
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.cs
View File

@ -50,7 +50,7 @@ __TestNamespace_InputTagHelper.Value = MyEnum.MyValue;
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("value", __TestNamespace_InputTagHelper.Value);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(79, 33, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -72,7 +72,7 @@ AddHtmlAttributeValue("", 128, MyEnum.MySecondValue, 128, 21, false);
#line default
#line hidden
EndAddHtmlAttributeValues(__tagHelperExecutionContext);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(114, 39, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -93,7 +93,7 @@ __TestNamespace_InputTagHelper.Value = global::Microsoft.AspNetCore.Razor.Test.G
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("value", __TestNamespace_InputTagHelper.Value);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(155, 25, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -120,7 +120,7 @@ __TestNamespace_CatchAllTagHelper.CatchAll = global::Microsoft.AspNetCore.Razor.
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("catch-all", __TestNamespace_CatchAllTagHelper.CatchAll);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(182, 50, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -147,7 +147,7 @@ __TestNamespace_CatchAllTagHelper.CatchAll = enumValue;
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("catch-all", __TestNamespace_CatchAllTagHelper.CatchAll);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(234, 51, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();

2
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.cs
View File

@ -60,7 +60,7 @@ namespace TestOutput
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(184, 45, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();

2
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/IncompleteTagHelper.cs
View File

@ -33,7 +33,7 @@ namespace TestOutput
__TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
__tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(33, 10, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();

10
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.cs
View File

@ -43,7 +43,7 @@ namespace TestOutput
__tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(96, 59, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -63,7 +63,7 @@ namespace TestOutput
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
__TestNamespace_InputTagHelper.BoundRequiredString = "hello";
__tagHelperExecutionContext.AddTagHelperAttribute("input-bound-required-string", __TestNamespace_InputTagHelper.BoundRequiredString);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(161, 119, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -85,7 +85,7 @@ namespace TestOutput
__tagHelperExecutionContext.AddTagHelperAttribute("catchall-bound-string", __TestNamespace_CatchAllTagHelper.BoundRequiredString);
__TestNamespace_InputTagHelper.BoundRequiredString = "hello2";
__tagHelperExecutionContext.AddTagHelperAttribute("input-bound-required-string", __TestNamespace_InputTagHelper.BoundRequiredString);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(286, 176, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -106,7 +106,7 @@ namespace TestOutput
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
__TestNamespace_InputTagHelper.BoundRequiredString = "world";
__tagHelperExecutionContext.AddTagHelperAttribute("input-bound-required-string", __TestNamespace_InputTagHelper.BoundRequiredString);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(468, 206, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -119,7 +119,7 @@ namespace TestOutput
__TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
__tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();

4
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.cs
View File

@ -75,7 +75,7 @@ namespace TestOutput
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("checked", __TestNamespace_InputTagHelper2.Checked);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(307, 86, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -98,7 +98,7 @@ namespace TestOutput
__tagHelperExecutionContext.Add(__TestNamespace_PTagHelper);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();

8
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.Reversed.cs
View File

@ -71,7 +71,7 @@ __TestNamespace_InputTagHelper2.IntDictionaryProperty = intDictionary;
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("string-dictionary", __TestNamespace_InputTagHelper2.StringDictionaryProperty);
__TestNamespace_InputTagHelper1.StringDictionaryProperty = __TestNamespace_InputTagHelper2.StringDictionaryProperty;
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(329, 92, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -116,7 +116,7 @@ __TestNamespace_InputTagHelper2.IntDictionaryProperty = intDictionary;
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("int-prefix-grabber", __TestNamespace_InputTagHelper2.IntDictionaryProperty["grabber"]);
__TestNamespace_InputTagHelper1.IntProperty = __TestNamespace_InputTagHelper2.IntDictionaryProperty["grabber"];
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(427, 103, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -188,7 +188,7 @@ __TestNamespace_InputTagHelper2.IntDictionaryProperty["salt"] = 37;
__TestNamespace_InputTagHelper2.StringDictionaryProperty["cumin"] = __tagHelperStringValueBuffer.GetContent(HtmlEncoder);
__tagHelperExecutionContext.AddTagHelperAttribute("string-prefix-cumin", __TestNamespace_InputTagHelper2.StringDictionaryProperty["cumin"]);
__TestNamespace_InputTagHelper1.StringDictionaryProperty["cumin"] = __TestNamespace_InputTagHelper2.StringDictionaryProperty["cumin"];
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(536, 257, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -229,7 +229,7 @@ __TestNamespace_InputTagHelper2.IntDictionaryProperty["value"] = 37;
__TestNamespace_InputTagHelper2.StringDictionaryProperty["thyme"] = "string";
__tagHelperExecutionContext.AddTagHelperAttribute("string-prefix-thyme", __TestNamespace_InputTagHelper2.StringDictionaryProperty["thyme"]);
__TestNamespace_InputTagHelper1.StringDictionaryProperty["thyme"] = __TestNamespace_InputTagHelper2.StringDictionaryProperty["thyme"];
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(799, 60, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();

8
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.cs
View File

@ -71,7 +71,7 @@ __TestNamespace_InputTagHelper1.IntDictionaryProperty = intDictionary;
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("string-dictionary", __TestNamespace_InputTagHelper1.StringDictionaryProperty);
__TestNamespace_InputTagHelper2.StringDictionaryProperty = __TestNamespace_InputTagHelper1.StringDictionaryProperty;
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(329, 92, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -116,7 +116,7 @@ __TestNamespace_InputTagHelper1.IntDictionaryProperty = intDictionary;
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("int-prefix-grabber", __TestNamespace_InputTagHelper1.IntProperty);
__TestNamespace_InputTagHelper2.IntDictionaryProperty["grabber"] = __TestNamespace_InputTagHelper1.IntProperty;
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(427, 103, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -188,7 +188,7 @@ __TestNamespace_InputTagHelper1.IntDictionaryProperty["salt"] = 37;
__TestNamespace_InputTagHelper1.StringDictionaryProperty["cumin"] = __tagHelperStringValueBuffer.GetContent(HtmlEncoder);
__tagHelperExecutionContext.AddTagHelperAttribute("string-prefix-cumin", __TestNamespace_InputTagHelper1.StringDictionaryProperty["cumin"]);
__TestNamespace_InputTagHelper2.StringDictionaryProperty["cumin"] = __TestNamespace_InputTagHelper1.StringDictionaryProperty["cumin"];
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(536, 257, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -229,7 +229,7 @@ __TestNamespace_InputTagHelper1.IntDictionaryProperty["value"] = 37;
__TestNamespace_InputTagHelper1.StringDictionaryProperty["thyme"] = "string";
__tagHelperExecutionContext.AddTagHelperAttribute("string-prefix-thyme", __TestNamespace_InputTagHelper1.StringDictionaryProperty["thyme"]);
__TestNamespace_InputTagHelper2.StringDictionaryProperty["thyme"] = __TestNamespace_InputTagHelper1.StringDictionaryProperty["thyme"];
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(799, 60, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();

2
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.cs
View File

@ -42,7 +42,7 @@ __TestNamespace_PTagHelper.Age = 1337;
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();

2
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelperWithNewlineBeforeAttributes.cs
View File

@ -42,7 +42,7 @@ __TestNamespace_PTagHelper.Age = 1337;
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();

14
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.cs
View File

@ -47,7 +47,7 @@ __TestNamespace_CatchAllTagHelper.ListItems = items;
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("[item]", __TestNamespace_CatchAllTagHelper.ListItems);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(276, 45, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -68,7 +68,7 @@ __TestNamespace_CatchAllTagHelper.ArrayItems = items;
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("[(item)]", __TestNamespace_CatchAllTagHelper.ArrayItems);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(323, 49, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -92,7 +92,7 @@ __TestNamespace_CatchAllTagHelper.Event1 = doSomething();
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("(click)", __TestNamespace_CatchAllTagHelper.Event1);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_3);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();
@ -120,7 +120,7 @@ __TestNamespace_CatchAllTagHelper.Event2 = doSomething();
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("(^click)", __TestNamespace_CatchAllTagHelper.Event2);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_4);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();
@ -144,7 +144,7 @@ __TestNamespace_CatchAllTagHelper.Event2 = doSomething();
__TestNamespace_CatchAllTagHelper.StringProperty1 = "value";
__tagHelperExecutionContext.AddTagHelperAttribute("*something", __TestNamespace_CatchAllTagHelper.StringProperty1);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_5);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();
@ -163,7 +163,7 @@ __TestNamespace_CatchAllTagHelper.Event2 = doSomething();
__tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_0);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_6);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(607, 33, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -180,7 +180,7 @@ __TestNamespace_CatchAllTagHelper.Event2 = doSomething();
__TestNamespace_CatchAllTagHelper.StringProperty2 = "value";
__tagHelperExecutionContext.AddTagHelperAttribute("#local", __TestNamespace_CatchAllTagHelper.StringProperty2);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_7);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(642, 47, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();

4
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersInSection.cs
View File

@ -60,7 +60,7 @@ namespace TestOutput
, StartTagHelperWritingScope, EndTagHelperWritingScope);
__TestNamespace_NestedTagHelper = CreateTagHelper<global::TestNamespace.NestedTagHelper>();
__tagHelperExecutionContext.Add(__TestNamespace_NestedTagHelper);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();
@ -95,7 +95,7 @@ AddHtmlAttributeValue(" ", 199, DateTime.Now, 200, 14, false);
#line default
#line hidden
EndAddHtmlAttributeValues(__tagHelperExecutionContext);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();

8
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersWithWeirdlySpacedAttributes.cs
View File

@ -55,7 +55,7 @@ __TestNamespace_PTagHelper.Age = 1337;
#line hidden
__tagHelperStringValueBuffer = EndTagHelperWritingScope();
__tagHelperExecutionContext.AddHtmlAttribute("data-content", Html.Raw(__tagHelperStringValueBuffer.GetContent(HtmlEncoder)));
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();
@ -78,7 +78,7 @@ __TestNamespace_PTagHelper.Age = 1337;
__tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type);
__TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_1);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(122, 47, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -98,7 +98,7 @@ __TestNamespace_PTagHelper.Age = 1234;
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age);
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_2);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(173, 46, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -117,7 +117,7 @@ __TestNamespace_PTagHelper.Age = 1234;
__tagHelperExecutionContext.AddTagHelperAttribute("type", __TestNamespace_InputTagHelper.Type);
__TestNamespace_InputTagHelper2.Type = __TestNamespace_InputTagHelper.Type;
__tagHelperExecutionContext.AddHtmlAttribute(__tagHelperAttribute_3);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(223, 51, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();

12
test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.cs
View File

@ -54,7 +54,7 @@ __TestNamespace_PTagHelper.Age = 1337;
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
if (!__tagHelperExecutionContext.Output.IsContentModified)
{
__tagHelperExecutionContext.Output.Content = await __tagHelperExecutionContext.Output.GetChildContentAsync();
@ -84,7 +84,7 @@ __TestNamespace_PTagHelper.Age = 42;
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(143, 34, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -104,7 +104,7 @@ __TestNamespace_PTagHelper.Age = 42 + @int;
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(179, 36, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -124,7 +124,7 @@ __TestNamespace_PTagHelper.Age = int;
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(217, 31, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -144,7 +144,7 @@ __TestNamespace_PTagHelper.Age = (@int);
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(250, 34, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();
@ -171,7 +171,7 @@ __TestNamespace_PTagHelper.Age = 4 * @(@int + 2);
#line default
#line hidden
__tagHelperExecutionContext.AddTagHelperAttribute("age", __TestNamespace_PTagHelper.Age);
__tagHelperExecutionContext.Output = await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
await __tagHelperRunner.RunAsync(__tagHelperExecutionContext);
Instrumentation.BeginContext(286, 54, false);
Write(__tagHelperExecutionContext.Output);
Instrumentation.EndContext();