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

Commit 62fad09

Browse files
committed
Addressed feedback
- Renamed TagBindingResult to TagHelperBinding - Added reference to TagHelperBinding in SetTagHelperPropertyIRNode - Cleanup
1 parent a2bf241 commit 62fad09

15 files changed

+352
-356
lines changed

src/Microsoft.AspNetCore.Razor.Evolution/DefaultRazorIRLoweringPhase.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -485,9 +485,8 @@ public override void VisitTagHelperBlock(TagHelperChunkGenerator chunkGenerator,
485485

486486
_builder.Pop(); // Pop InitializeTagHelperStructureIRNode
487487

488-
var descriptors = tagHelperBlock.BindingResult.Descriptors;
489-
AddTagHelperCreation(descriptors);
490-
AddTagHelperAttributes(tagHelperBlock.Attributes, descriptors);
488+
AddTagHelperCreation(tagHelperBlock.BindingResult);
489+
AddTagHelperAttributes(tagHelperBlock.Attributes, tagHelperBlock.BindingResult);
491490
AddExecuteTagHelpers();
492491

493492
_builder.Pop(); // Pop TagHelperIRNode
@@ -508,8 +507,9 @@ private void DeclareTagHelperFields(TagHelperBlock block)
508507
}
509508
}
510509

511-
private void AddTagHelperCreation(IEnumerable<TagHelperDescriptor> descriptors)
510+
private void AddTagHelperCreation(TagHelperBinding tagHelperBinding)
512511
{
512+
var descriptors = tagHelperBinding.Descriptors;
513513
foreach (var descriptor in descriptors)
514514
{
515515
var typeName = descriptor.Metadata[ITagHelperDescriptorBuilder.TypeNameKey];
@@ -523,8 +523,9 @@ private void AddTagHelperCreation(IEnumerable<TagHelperDescriptor> descriptors)
523523
}
524524
}
525525

526-
private void AddTagHelperAttributes(IList<TagHelperAttributeNode> attributes, IEnumerable<TagHelperDescriptor> descriptors)
526+
private void AddTagHelperAttributes(IList<TagHelperAttributeNode> attributes, TagHelperBinding tagHelperBinding)
527527
{
528+
var descriptors = tagHelperBinding.Descriptors;
528529
var renderedBoundAttributeNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
529530
foreach (var attribute in attributes)
530531
{
@@ -554,6 +555,7 @@ private void AddTagHelperAttributes(IList<TagHelperAttributeNode> attributes, IE
554555
AttributeName = attribute.Name,
555556
TagHelperTypeName = tagHelperTypeName,
556557
Descriptor = associatedAttributeDescriptor,
558+
TagHelperBinding = tagHelperBinding,
557559
ValueStyle = attribute.ValueStyle,
558560
Source = BuildSourceSpanFromNode(attributeValueNode),
559561
IsIndexerNameMatch = associatedAttributeDescriptor.IsIndexerNameMatch(attribute.Name),

src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/SetPreallocatedTagHelperPropertyIRNode.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System.Collections.Generic;
5+
using Microsoft.AspNetCore.Razor.Evolution.Legacy;
56

67
namespace Microsoft.AspNetCore.Razor.Evolution.Intermediate
78
{
@@ -23,6 +24,8 @@ public class SetPreallocatedTagHelperPropertyIRNode : RazorIRNode
2324

2425
public BoundAttributeDescriptor Descriptor { get; set; }
2526

27+
internal TagHelperBinding TagHelperBinding { get; set; }
28+
2629
public bool IsIndexerNameMatch { get; set; }
2730

2831
public override void Accept(RazorIRNodeVisitor visitor)

src/Microsoft.AspNetCore.Razor.Evolution/Intermediate/SetTagHelperPropertyIRNode.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ public class SetTagHelperPropertyIRNode : RazorIRNode
2525

2626
public BoundAttributeDescriptor Descriptor { get; set; }
2727

28+
internal TagHelperBinding TagHelperBinding { get; set; }
29+
2830
public bool IsIndexerNameMatch { get; set; }
2931

3032
public override void Accept(RazorIRNodeVisitor visitor)

src/Microsoft.AspNetCore.Razor.Evolution/Legacy/TagBindingResult.cs renamed to src/Microsoft.AspNetCore.Razor.Evolution/Legacy/TagHelperBinding.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
77
{
8-
internal sealed class TagBindingResult
8+
internal sealed class TagHelperBinding
99
{
1010
public IReadOnlyDictionary<TagHelperDescriptor, IEnumerable<TagMatchingRule>> _applicableDescriptorMappings;
1111

12-
public TagBindingResult(IReadOnlyDictionary<TagHelperDescriptor, IEnumerable<TagMatchingRule>> applicableDescriptorMappings)
12+
public TagHelperBinding(IReadOnlyDictionary<TagHelperDescriptor, IEnumerable<TagMatchingRule>> applicableDescriptorMappings)
1313
{
1414
_applicableDescriptorMappings = applicableDescriptorMappings;
1515
Descriptors = _applicableDescriptorMappings.Keys;

src/Microsoft.AspNetCore.Razor.Evolution/Legacy/TagHelperBlock.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public TagHelperBlock(TagHelperBlockBuilder source)
6363
/// <summary>
6464
/// <see cref="TagHelperDescriptor"/> bindings for the HTML element.
6565
/// </summary>
66-
public TagBindingResult BindingResult { get; }
66+
public TagHelperBinding BindingResult { get; }
6767

6868
/// <summary>
6969
/// The HTML attributes.

src/Microsoft.AspNetCore.Razor.Evolution/Legacy/TagHelperBlockBuilder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public TagHelperBlockBuilder(
3737
TagMode tagMode,
3838
SourceLocation start,
3939
IList<TagHelperAttributeNode> attributes,
40-
TagBindingResult bindingResult)
40+
TagHelperBinding bindingResult)
4141
{
4242
TagName = tagName;
4343
TagMode = tagMode;
@@ -88,7 +88,7 @@ internal TagHelperBlockBuilder(
8888
/// <summary>
8989
/// <see cref="TagHelperDescriptor"/>s for the HTML element.
9090
/// </summary>
91-
public TagBindingResult BindingResult { get; }
91+
public TagHelperBinding BindingResult { get; }
9292

9393
/// <summary>
9494
/// The HTML attributes.

src/Microsoft.AspNetCore.Razor.Evolution/Legacy/TagHelperBlockRewriter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public static TagHelperBlockBuilder Rewrite(
1717
string tagName,
1818
bool validStructure,
1919
Block tag,
20-
TagBindingResult bindingResult,
20+
TagHelperBinding bindingResult,
2121
ErrorSink errorSink)
2222
{
2323
// There will always be at least one child for the '<'.
@@ -32,7 +32,7 @@ private static IList<TagHelperAttributeNode> GetTagAttributes(
3232
string tagName,
3333
bool validStructure,
3434
Block tagBlock,
35-
TagBindingResult bindingResult,
35+
TagHelperBinding bindingResult,
3636
ErrorSink errorSink)
3737
{
3838
var attributes = new List<TagHelperAttributeNode>();
@@ -114,7 +114,7 @@ private static IList<TagHelperAttributeNode> GetTagAttributes(
114114
private static TagMode GetTagMode(
115115
string tagName,
116116
Block beginTagBlock,
117-
TagBindingResult bindingResult,
117+
TagHelperBinding bindingResult,
118118
ErrorSink errorSink)
119119
{
120120
var childSpan = beginTagBlock.FindLastDescendentSpan();

src/Microsoft.AspNetCore.Razor.Evolution/Legacy/TagHelperDescriptorProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public TagHelperDescriptorProvider(string tagHelperPrefix, IEnumerable<TagHelper
4444
/// <returns><see cref="TagHelperDescriptor"/>s that apply to the given <paramref name="tagName"/>.
4545
/// Will return an empty <see cref="Enumerable" /> if no <see cref="TagHelperDescriptor"/>s are
4646
/// found.</returns>
47-
public TagBindingResult GetTagHelperBinding(
47+
public TagHelperBinding GetTagHelperBinding(
4848
string tagName,
4949
IEnumerable<KeyValuePair<string, string>> attributes,
5050
string parentTagName)
@@ -97,7 +97,7 @@ public TagBindingResult GetTagHelperBinding(
9797
return null;
9898
}
9999

100-
var tagMappingResult = new TagBindingResult(applicableDescriptorMappings);
100+
var tagMappingResult = new TagHelperBinding(applicableDescriptorMappings);
101101

102102
return tagMappingResult;
103103
}

src/Microsoft.AspNetCore.Razor.Evolution/Legacy/TagHelperParseTreeRewriter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ private bool TryRewriteTagHelper(Block tagBlock, ErrorSink errorSink)
174174
return false;
175175
}
176176

177-
TagBindingResult tagHelperBinding;
177+
TagHelperBinding tagHelperBinding;
178178

179179
if (!IsPotentialTagHelper(tagName, tagBlock))
180180
{
@@ -545,7 +545,7 @@ private static void OnAllowedChildrenTagError(
545545
}
546546

547547
private static void ValidateBinding(
548-
TagBindingResult bindingResult,
548+
TagHelperBinding bindingResult,
549549
string tagName,
550550
Block tagBlock,
551551
ErrorSink errorSink)

src/Microsoft.AspNetCore.Razor.Evolution/RazorPreallocatedTagHelperAttributeOptimizationPass.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ public override void VisitSetTagHelperProperty(SetTagHelperPropertyIRNode node)
139139
TagHelperTypeName = node.TagHelperTypeName,
140140
PropertyName = node.PropertyName,
141141
Descriptor = node.Descriptor,
142+
TagHelperBinding = node.TagHelperBinding,
142143
Parent = node.Parent,
143144
IsIndexerNameMatch = node.IsIndexerNameMatch,
144145
};

0 commit comments

Comments
 (0)