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

Rename ITagHelperDescriptorBuilder => TagHelperDescriptorBuilder. 

#1210
This commit is contained in:
N. Taylor Mullen 2017-04-11 16:56:55 -07:00
parent e5cac9fb7f
commit 1b8a4e704c
28 changed files with 161 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs
View File

@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
{ {
GenerateVCTHClass(visitor.Class, tagHelper.Value); GenerateVCTHClass(visitor.Class, tagHelper.Value);
var tagHelperTypeName = tagHelper.Value.Metadata[ITagHelperDescriptorBuilder.TypeNameKey]; var tagHelperTypeName = tagHelper.Value.Metadata[TagHelperDescriptorBuilder.TypeNameKey];
if (visitor.Fields.UsedTagHelperTypeNames.Remove(tagHelperTypeName)) if (visitor.Fields.UsedTagHelperTypeNames.Remove(tagHelperTypeName))
{ {
visitor.Fields.UsedTagHelperTypeNames.Add(GetVCTHFullName(visitor.Namespace, visitor.Class, tagHelper.Value)); visitor.Fields.UsedTagHelperTypeNames.Add(GetVCTHFullName(visitor.Namespace, visitor.Class, tagHelper.Value));

6
src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIRLoweringPhase.cs
View File

@ -515,7 +515,7 @@ namespace Microsoft.AspNetCore.Razor.Language
foreach (var descriptor in block.Binding.Descriptors) foreach (var descriptor in block.Binding.Descriptors)
{ {
var typeName = descriptor.Metadata[ITagHelperDescriptorBuilder.TypeNameKey]; var typeName = descriptor.Metadata[TagHelperDescriptorBuilder.TypeNameKey];
_tagHelperFields.UsedTagHelperTypeNames.Add(typeName); _tagHelperFields.UsedTagHelperTypeNames.Add(typeName);
} }
} }
@ -525,7 +525,7 @@ namespace Microsoft.AspNetCore.Razor.Language
var descriptors = tagHelperBinding.Descriptors; var descriptors = tagHelperBinding.Descriptors;
foreach (var descriptor in descriptors) foreach (var descriptor in descriptors)
{ {
var typeName = descriptor.Metadata[ITagHelperDescriptorBuilder.TypeNameKey]; var typeName = descriptor.Metadata[TagHelperDescriptorBuilder.TypeNameKey];
var createTagHelper = new CreateTagHelperIRNode() var createTagHelper = new CreateTagHelperIRNode()
{ {
TagHelperTypeName = typeName, TagHelperTypeName = typeName,
@ -559,7 +559,7 @@ namespace Microsoft.AspNetCore.Razor.Language
{ {
var associatedAttributeDescriptor = associatedDescriptor.BoundAttributes.First( var associatedAttributeDescriptor = associatedDescriptor.BoundAttributes.First(
attributeDescriptor => TagHelperMatchingConventions.CanSatisfyBoundAttribute(attribute.Name, attributeDescriptor)); attributeDescriptor => TagHelperMatchingConventions.CanSatisfyBoundAttribute(attribute.Name, attributeDescriptor));
var tagHelperTypeName = associatedDescriptor.Metadata[ITagHelperDescriptorBuilder.TypeNameKey]; var tagHelperTypeName = associatedDescriptor.Metadata[TagHelperDescriptorBuilder.TypeNameKey];
var attributePropertyName = associatedAttributeDescriptor.Metadata[ITagHelperBoundAttributeDescriptorBuilder.PropertyNameKey]; var attributePropertyName = associatedAttributeDescriptor.Metadata[ITagHelperBoundAttributeDescriptorBuilder.PropertyNameKey];
var setTagHelperProperty = new SetTagHelperPropertyIRNode() var setTagHelperProperty = new SetTagHelperPropertyIRNode()

6
src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperParseTreeRewriter.cs
View File

@ -273,7 +273,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
if (invalidRule != null) if (invalidRule != null)
{ {
var typeName = descriptor.Metadata[ITagHelperDescriptorBuilder.TypeNameKey]; var typeName = descriptor.Metadata[TagHelperDescriptorBuilder.TypeNameKey];
// End tag TagHelper that states it shouldn't have an end tag. // End tag TagHelper that states it shouldn't have an end tag.
errorSink.OnError( errorSink.OnError(
@ -564,8 +564,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
// Can't have a set of TagHelpers that expect different structures. // Can't have a set of TagHelpers that expect different structures.
if (baseStructure.HasValue && baseStructure != rule.TagStructure) if (baseStructure.HasValue && baseStructure != rule.TagStructure)
{ {
var baseDescriptorTypeName = baseDescriptor.Metadata[ITagHelperDescriptorBuilder.TypeNameKey]; var baseDescriptorTypeName = baseDescriptor.Metadata[TagHelperDescriptorBuilder.TypeNameKey];
var descriptorTypeName = descriptor.Metadata[ITagHelperDescriptorBuilder.TypeNameKey]; var descriptorTypeName = descriptor.Metadata[TagHelperDescriptorBuilder.TypeNameKey];
errorSink.OnError( errorSink.OnError(
tagBlock.Start, tagBlock.Start,
LegacyResources.FormatTagHelperParseTreeRewriter_InconsistentTagStructure( LegacyResources.FormatTagHelperParseTreeRewriter_InconsistentTagStructure(

4
src/Microsoft.AspNetCore.Razor.Language/TagHelperBinderSyntaxTreePass.cs
View File

@ -270,13 +270,13 @@ namespace Microsoft.AspNetCore.Razor.Language
return false; return false;
} }
if (descriptor.Kind != ITagHelperDescriptorBuilder.DescriptorKind) if (descriptor.Kind != TagHelperDescriptorBuilder.DescriptorKind)
{ {
// We only understand TagHelperDescriptors generated from ITagHelpers. // We only understand TagHelperDescriptors generated from ITagHelpers.
return false; return false;
} }
var descriptorTypeName = descriptor.Metadata[ITagHelperDescriptorBuilder.TypeNameKey]; var descriptorTypeName = descriptor.Metadata[TagHelperDescriptorBuilder.TypeNameKey];
if (lookupInfo.TypePattern.EndsWith("*", StringComparison.Ordinal)) if (lookupInfo.TypePattern.EndsWith("*", StringComparison.Ordinal))
{ {

26
src/Microsoft.AspNetCore.Razor.Language/ITagHelperDescriptorBuilder.cs → src/Microsoft.AspNetCore.Razor.Language/TagHelperDescriptorBuilder.cs
View File

@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Razor.Language.Legacy;
namespace Microsoft.AspNetCore.Razor.Language namespace Microsoft.AspNetCore.Razor.Language
{ {
public sealed class ITagHelperDescriptorBuilder public sealed class TagHelperDescriptorBuilder
{ {
public static readonly string DescriptorKind = "ITagHelper"; public static readonly string DescriptorKind = "ITagHelper";
public static readonly string TypeNameKey = "ITagHelper.TypeName"; public static readonly string TypeNameKey = "ITagHelper.TypeName";
@ -26,19 +26,19 @@ namespace Microsoft.AspNetCore.Razor.Language
private readonly Dictionary<string, string> _metadata; private readonly Dictionary<string, string> _metadata;
private HashSet<RazorDiagnostic> _diagnostics; private HashSet<RazorDiagnostic> _diagnostics;
private ITagHelperDescriptorBuilder(string typeName, string assemblyName) private TagHelperDescriptorBuilder(string typeName, string assemblyName)
{ {
_typeName = typeName; _typeName = typeName;
_assemblyName = assemblyName; _assemblyName = assemblyName;
_metadata = new Dictionary<string, string>(StringComparer.Ordinal); _metadata = new Dictionary<string, string>(StringComparer.Ordinal);
} }
public static ITagHelperDescriptorBuilder Create(string typeName, string assemblyName) public static TagHelperDescriptorBuilder Create(string typeName, string assemblyName)
{ {
return new ITagHelperDescriptorBuilder(typeName, assemblyName); return new TagHelperDescriptorBuilder(typeName, assemblyName);
} }
public ITagHelperDescriptorBuilder BindAttribute(BoundAttributeDescriptor descriptor) public TagHelperDescriptorBuilder BindAttribute(BoundAttributeDescriptor descriptor)
{ {
if (descriptor == null) if (descriptor == null)
{ {
@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.Razor.Language
return this; return this;
} }
public ITagHelperDescriptorBuilder BindAttribute(Action<ITagHelperBoundAttributeDescriptorBuilder> configure) public TagHelperDescriptorBuilder BindAttribute(Action<ITagHelperBoundAttributeDescriptorBuilder> configure)
{ {
if (configure == null) if (configure == null)
{ {
@ -67,7 +67,7 @@ namespace Microsoft.AspNetCore.Razor.Language
return BindAttribute(attributeDescriptor); return BindAttribute(attributeDescriptor);
} }
public ITagHelperDescriptorBuilder TagMatchingRule(TagMatchingRule rule) public TagHelperDescriptorBuilder TagMatchingRule(TagMatchingRule rule)
{ {
if (rule == null) if (rule == null)
{ {
@ -80,7 +80,7 @@ namespace Microsoft.AspNetCore.Razor.Language
return this; return this;
} }
public ITagHelperDescriptorBuilder TagMatchingRule(Action<TagMatchingRuleBuilder> configure) public TagHelperDescriptorBuilder TagMatchingRule(Action<TagMatchingRuleBuilder> configure)
{ {
if (configure == null) if (configure == null)
{ {
@ -96,7 +96,7 @@ namespace Microsoft.AspNetCore.Razor.Language
return TagMatchingRule(rule); return TagMatchingRule(rule);
} }
public ITagHelperDescriptorBuilder AllowChildTag(string allowedChild) public TagHelperDescriptorBuilder AllowChildTag(string allowedChild)
{ {
EnsureAllowedChildTags(); EnsureAllowedChildTags();
_allowedChildTags.Add(allowedChild); _allowedChildTags.Add(allowedChild);
@ -104,28 +104,28 @@ namespace Microsoft.AspNetCore.Razor.Language
return this; return this;
} }
public ITagHelperDescriptorBuilder TagOutputHint(string hint) public TagHelperDescriptorBuilder TagOutputHint(string hint)
{ {
_tagOutputHint = hint; _tagOutputHint = hint;
return this; return this;
} }
public ITagHelperDescriptorBuilder Documentation(string documentation) public TagHelperDescriptorBuilder Documentation(string documentation)
{ {
_documentation = documentation; _documentation = documentation;
return this; return this;
} }
public ITagHelperDescriptorBuilder AddMetadata(string key, string value) public TagHelperDescriptorBuilder AddMetadata(string key, string value)
{ {
_metadata[key] = value; _metadata[key] = value;
return this; return this;
} }
public ITagHelperDescriptorBuilder AddDiagnostic(RazorDiagnostic diagnostic) public TagHelperDescriptorBuilder AddDiagnostic(RazorDiagnostic diagnostic)
{ {
EnsureDiagnostics(); EnsureDiagnostics();
_diagnostics.Add(diagnostic); _diagnostics.Add(diagnostic);

12
src/Microsoft.CodeAnalysis.Razor/DefaultTagHelperDescriptorFactory.cs
View File

@ -73,7 +73,7 @@ namespace Microsoft.CodeAnalysis.Razor
var typeName = GetFullName(type); var typeName = GetFullName(type);
var assemblyName = type.ContainingAssembly.Identity.Name; var assemblyName = type.ContainingAssembly.Identity.Name;
var descriptorBuilder = ITagHelperDescriptorBuilder.Create(typeName, assemblyName); var descriptorBuilder = TagHelperDescriptorBuilder.Create(typeName, assemblyName);
AddBoundAttributes(type, descriptorBuilder); AddBoundAttributes(type, descriptorBuilder);
AddTagMatchingRules(type, descriptorBuilder); AddTagMatchingRules(type, descriptorBuilder);
@ -86,7 +86,7 @@ namespace Microsoft.CodeAnalysis.Razor
return descriptor; return descriptor;
} }
private void AddTagMatchingRules(INamedTypeSymbol type, ITagHelperDescriptorBuilder descriptorBuilder) private void AddTagMatchingRules(INamedTypeSymbol type, TagHelperDescriptorBuilder descriptorBuilder)
{ {
var targetElementAttributes = type var targetElementAttributes = type
.GetAttributes() .GetAttributes()
@ -130,7 +130,7 @@ namespace Microsoft.CodeAnalysis.Razor
} }
} }
private void AddBoundAttributes(INamedTypeSymbol type, ITagHelperDescriptorBuilder builder) private void AddBoundAttributes(INamedTypeSymbol type, TagHelperDescriptorBuilder builder)
{ {
var accessibleProperties = GetAccessibleProperties(type); var accessibleProperties = GetAccessibleProperties(type);
foreach (var property in accessibleProperties) foreach (var property in accessibleProperties)
@ -147,7 +147,7 @@ namespace Microsoft.CodeAnalysis.Razor
} }
} }
private void AddAllowedChildren(INamedTypeSymbol type, ITagHelperDescriptorBuilder builder) private void AddAllowedChildren(INamedTypeSymbol type, TagHelperDescriptorBuilder builder)
{ {
var restrictChildrenAttribute = type.GetAttributes().Where(a => a.AttributeClass == _restrictChildrenAttributeSymbol).FirstOrDefault(); var restrictChildrenAttribute = type.GetAttributes().Where(a => a.AttributeClass == _restrictChildrenAttributeSymbol).FirstOrDefault();
if (restrictChildrenAttribute == null) if (restrictChildrenAttribute == null)
@ -166,7 +166,7 @@ namespace Microsoft.CodeAnalysis.Razor
} }
} }
private void AddDocumentation(INamedTypeSymbol type, ITagHelperDescriptorBuilder builder) private void AddDocumentation(INamedTypeSymbol type, TagHelperDescriptorBuilder builder)
{ {
if (!DesignTime) if (!DesignTime)
{ {
@ -181,7 +181,7 @@ namespace Microsoft.CodeAnalysis.Razor
} }
} }
private void AddTagOutputHint(INamedTypeSymbol type, ITagHelperDescriptorBuilder builder) private void AddTagOutputHint(INamedTypeSymbol type, TagHelperDescriptorBuilder builder)
{ {
if (!DesignTime) if (!DesignTime)
{ {

4
src/Microsoft.CodeAnalysis.Razor/ViewComponentTagHelperDescriptorFactory.cs
View File

@ -35,7 +35,7 @@ namespace Microsoft.CodeAnalysis.Razor
var shortName = GetShortName(type); var shortName = GetShortName(type);
var tagName = $"vc:{DefaultTagHelperDescriptorFactory.ToHtmlCase(shortName)}"; var tagName = $"vc:{DefaultTagHelperDescriptorFactory.ToHtmlCase(shortName)}";
var typeName = $"__Generated__{shortName}ViewComponentTagHelper"; var typeName = $"__Generated__{shortName}ViewComponentTagHelper";
var descriptorBuilder = ITagHelperDescriptorBuilder.Create(typeName, assemblyName); var descriptorBuilder = TagHelperDescriptorBuilder.Create(typeName, assemblyName);
var methodParameters = GetInvokeMethodParameters(type); var methodParameters = GetInvokeMethodParameters(type);
descriptorBuilder.TagMatchingRule(ruleBuilder => descriptorBuilder.TagMatchingRule(ruleBuilder =>
{ {
@ -68,7 +68,7 @@ namespace Microsoft.CodeAnalysis.Razor
} }
} }
private void AddBoundAttributes(ImmutableArray<IParameterSymbol> methodParameters, ITagHelperDescriptorBuilder builder) private void AddBoundAttributes(ImmutableArray<IParameterSymbol> methodParameters, TagHelperDescriptorBuilder builder)
{ {
foreach (var parameter in methodParameters) foreach (var parameter in methodParameters)
{ {

6
src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultTagHelperResolver.cs
View File

@ -112,7 +112,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
continue; continue;
} }
var typeName = tagHelper.Metadata[ITagHelperDescriptorBuilder.TypeNameKey]; var typeName = tagHelper.Metadata[TagHelperDescriptorBuilder.TypeNameKey];
var symbol = compilation.GetTypeByMetadataName(typeName); var symbol = compilation.GetTypeByMetadataName(typeName);
if (symbol != null) if (symbol != null)
{ {
@ -186,9 +186,9 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
return builder; return builder;
} }
private ITagHelperDescriptorBuilder ShallowCopy(string tagHelperTypeName, TagHelperDescriptor tagHelper) private TagHelperDescriptorBuilder ShallowCopy(string tagHelperTypeName, TagHelperDescriptor tagHelper)
{ {
var builder = ITagHelperDescriptorBuilder.Create(tagHelperTypeName, tagHelper.AssemblyName); var builder = TagHelperDescriptorBuilder.Create(tagHelperTypeName, tagHelper.AssemblyName);
foreach (var rule in tagHelper.TagMatchingRules) foreach (var rule in tagHelper.TagMatchingRules)
{ {

2
src/Microsoft.VisualStudio.LanguageServices.Razor/TagHelperDescriptorJsonConverter.cs
View File

@ -39,7 +39,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
var diagnostics = descriptor[nameof(TagHelperDescriptor.Diagnostics)].Value<JArray>(); var diagnostics = descriptor[nameof(TagHelperDescriptor.Diagnostics)].Value<JArray>();
var metadata = descriptor[nameof(TagHelperDescriptor.Metadata)].Value<JObject>(); var metadata = descriptor[nameof(TagHelperDescriptor.Metadata)].Value<JObject>();
var builder = ITagHelperDescriptorBuilder.Create(typeName, assemblyName); var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName);
builder builder
.Documentation(documentation) .Documentation(documentation)

2
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/IntegrationTests/CodeGenerationIntegrationTest.cs
View File

@ -439,7 +439,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.IntegrationTests
string typeName, string typeName,
string assemblyName) string assemblyName)
{ {
return ITagHelperDescriptorBuilder.Create(typeName, assemblyName) return TagHelperDescriptorBuilder.Create(typeName, assemblyName)
.TagMatchingRule(ruleBuilder => ruleBuilder.RequireTagName(tagName)) .TagMatchingRule(ruleBuilder => ruleBuilder.RequireTagName(tagName))
.Build(); .Build();
} }

6
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ModelExpressionPassTest.cs
View File

@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
var tagHelpers = new[] var tagHelpers = new[]
{ {
ITagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly") TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
.BindAttribute(attribute => .BindAttribute(attribute =>
attribute attribute
.Name("Foo") .Name("Foo")
@ -65,7 +65,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
var tagHelpers = new[] var tagHelpers = new[]
{ {
ITagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly") TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
.BindAttribute(attribute => .BindAttribute(attribute =>
attribute attribute
.Name("Foo") .Name("Foo")
@ -110,7 +110,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
var tagHelpers = new[] var tagHelpers = new[]
{ {
ITagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly") TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
.BindAttribute(attribute => .BindAttribute(attribute =>
attribute attribute
.Name("Foo") .Name("Foo")

4
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperDescriptorConventionsTest.cs
View File

@ -38,7 +38,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
private static TagHelperDescriptor CreateTagHelperDescriptor() private static TagHelperDescriptor CreateTagHelperDescriptor()
{ {
var descriptor = ITagHelperDescriptorBuilder.Create("TypeName", "AssemblyName") var descriptor = TagHelperDescriptorBuilder.Create("TypeName", "AssemblyName")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule.RequireTagName("tag-name")) rule.RequireTagName("tag-name"))
.Build(); .Build();
@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
private static TagHelperDescriptor CreateViewComponentTagHelperDescriptor() private static TagHelperDescriptor CreateViewComponentTagHelperDescriptor()
{ {
var descriptor = ITagHelperDescriptorBuilder.Create("TypeName", "AssemblyName") var descriptor = TagHelperDescriptorBuilder.Create("TypeName", "AssemblyName")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule.RequireTagName("tag-name")) rule.RequireTagName("tag-name"))
.AddMetadata(ViewComponentTagHelperDescriptorConventions.ViewComponentNameKey, "ViewComponentName") .AddMetadata(ViewComponentTagHelperDescriptorConventions.ViewComponentNameKey, "ViewComponentName")

10
test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperPassTest.cs
View File

@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
var tagHelpers = new[] var tagHelpers = new[]
{ {
ITagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly") TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
.BindAttribute(attribute => .BindAttribute(attribute =>
attribute attribute
.Name("Foo") .Name("Foo")
@ -63,7 +63,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
var tagHelpers = new[] var tagHelpers = new[]
{ {
ITagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly") TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
.BindAttribute(attribute => .BindAttribute(attribute =>
attribute attribute
.Name("Foo") .Name("Foo")
@ -135,7 +135,7 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
var tagHelpers = new[] var tagHelpers = new[]
{ {
ITagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly") TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
.BindAttribute(attribute => .BindAttribute(attribute =>
attribute attribute
.Name("Foo") .Name("Foo")
@ -208,7 +208,7 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
var tagHelpers = new[] var tagHelpers = new[]
{ {
ITagHelperDescriptorBuilder.Create("PTestTagHelper", "TestAssembly") TagHelperDescriptorBuilder.Create("PTestTagHelper", "TestAssembly")
.BindAttribute(attribute => .BindAttribute(attribute =>
attribute attribute
.Name("Foo") .Name("Foo")
@ -216,7 +216,7 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule.RequireTagName("p")) rule.RequireTagName("p"))
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly") TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly")
.BindAttribute(attribute => .BindAttribute(attribute =>
attribute attribute
.Name("Foo") .Name("Foo")

2
test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIRLoweringPhaseIntegrationTest.cs
View File

@ -489,7 +489,7 @@ namespace Microsoft.AspNetCore.Razor.Language
string assemblyName, string assemblyName,
IEnumerable<Action<ITagHelperBoundAttributeDescriptorBuilder>> attributes = null) IEnumerable<Action<ITagHelperBoundAttributeDescriptorBuilder>> attributes = null)
{ {
var builder = ITagHelperDescriptorBuilder.Create(typeName, assemblyName); var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName);
if (attributes != null) if (attributes != null)
{ {

2
test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/InstrumentationPassIntegrationTest.cs
View File

@ -65,7 +65,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
string assemblyName, string assemblyName,
IEnumerable<Action<ITagHelperBoundAttributeDescriptorBuilder>> attributes = null) IEnumerable<Action<ITagHelperBoundAttributeDescriptorBuilder>> attributes = null)
{ {
var builder = ITagHelperDescriptorBuilder.Create(typeName, assemblyName); var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName);
if (attributes != null) if (attributes != null)
{ {

2
test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/TagHelpersIntegrationTest.cs
View File

@ -103,7 +103,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
string assemblyName, string assemblyName,
IEnumerable<Action<ITagHelperBoundAttributeDescriptorBuilder>> attributes = null) IEnumerable<Action<ITagHelperBoundAttributeDescriptorBuilder>> attributes = null)
{ {
var builder = ITagHelperDescriptorBuilder.Create(typeName, assemblyName); var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName);
if (attributes != null) if (attributes != null)
{ {

4
test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/RazorEditorParserTest.cs
View File

@ -86,7 +86,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
// Arrange // Arrange
var descriptors = new[] var descriptors = new[]
{ {
ITagHelperDescriptorBuilder.Create("PTagHelper", "TestAssembly") TagHelperDescriptorBuilder.Create("PTagHelper", "TestAssembly")
.TagMatchingRule(rule => rule.RequireTagName("p")) .TagMatchingRule(rule => rule.RequireTagName("p"))
.Build() .Build()
}; };
@ -231,7 +231,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
// Arrange // Arrange
var descriptors = new[] var descriptors = new[]
{ {
ITagHelperDescriptorBuilder.Create("PTagHelper", "Test") TagHelperDescriptorBuilder.Create("PTagHelper", "Test")
.TagMatchingRule(rule => rule.RequireTagName("p")) .TagMatchingRule(rule => rule.RequireTagName("p"))
.BindAttribute(attribute => attribute .BindAttribute(attribute => attribute
.Name("obj-attr") .Name("obj-attr")

20
test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperBlockRewriterTest.cs
View File

@ -111,7 +111,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
// Arrange // Arrange
var descriptors = new[] var descriptors = new[]
{ {
ITagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("*") .RequireTagName("*")
@ -216,7 +216,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
// Arrange // Arrange
var descriptors = new TagHelperDescriptor[] var descriptors = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("input") .RequireTagName("input")
@ -315,13 +315,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
var blockFactory = new BlockFactory(factory); var blockFactory = new BlockFactory(factory);
var descriptors = new TagHelperDescriptor[] var descriptors = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("InputTagHelper1", "SomeAssembly") TagHelperDescriptorBuilder.Create("InputTagHelper1", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("input") .RequireTagName("input")
.RequireTagStructure(structure1)) .RequireTagStructure(structure1))
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("InputTagHelper2", "SomeAssembly") TagHelperDescriptorBuilder.Create("InputTagHelper2", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("input") .RequireTagName("input")
@ -1193,7 +1193,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
// Arrange // Arrange
var descriptors = new TagHelperDescriptor[] var descriptors = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("PersonTagHelper", "personAssembly") TagHelperDescriptorBuilder.Create("PersonTagHelper", "personAssembly")
.TagMatchingRule(rule => rule.RequireTagName("person")) .TagMatchingRule(rule => rule.RequireTagName("person"))
.BindAttribute(attribute => .BindAttribute(attribute =>
attribute attribute
@ -2231,7 +2231,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
// Arrange // Arrange
var descriptors = new TagHelperDescriptor[] var descriptors = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("mythTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("mythTagHelper", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("myth")) .TagMatchingRule(rule => rule.RequireTagName("myth"))
.BindAttribute(attribute => .BindAttribute(attribute =>
attribute attribute
@ -3880,7 +3880,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
// Arrange // Arrange
var descriptors = new TagHelperDescriptor[] var descriptors = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("InputTagHelper1", "SomeAssembly") TagHelperDescriptorBuilder.Create("InputTagHelper1", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("input") .RequireTagName("input")
@ -3895,7 +3895,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
.PropertyName("BoundRequiredString") .PropertyName("BoundRequiredString")
.TypeName(typeof(string).FullName)) .TypeName(typeof(string).FullName))
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("InputTagHelper2", "SomeAssembly") TagHelperDescriptorBuilder.Create("InputTagHelper2", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("input") .RequireTagName("input")
@ -3906,7 +3906,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
.PropertyName("BoundRequiredInt") .PropertyName("BoundRequiredInt")
.TypeName(typeof(int).FullName)) .TypeName(typeof(int).FullName))
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("InputTagHelper3", "SomeAssembly") TagHelperDescriptorBuilder.Create("InputTagHelper3", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("input")) .TagMatchingRule(rule => rule.RequireTagName("input"))
.BindAttribute(attribute => .BindAttribute(attribute =>
attribute attribute
@ -3921,7 +3921,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
.TypeName(typeof(IDictionary<string, string>).Namespace + ".IDictionary<System.String, System.String>") .TypeName(typeof(IDictionary<string, string>).Namespace + ".IDictionary<System.String, System.String>")
.AsDictionary("string-prefix-", typeof(string).FullName)) .AsDictionary("string-prefix-", typeof(string).FullName))
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("p")) .TagMatchingRule(rule => rule.RequireTagName("p"))
.BindAttribute(attribute => .BindAttribute(attribute =>
attribute attribute

38
test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperDescriptorProviderTest.cs
View File

@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
{ {
get get
{ {
var strongPDivParent = ITagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") var strongPDivParent = TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("strong") .RequireTagName("strong")
@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
.RequireTagName("strong") .RequireTagName("strong")
.RequireParentTag("div")) .RequireParentTag("div"))
.Build(); .Build();
var catchAllPParent = ITagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly") var catchAllPParent = TagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("*") .RequireTagName("*")
@ -90,20 +90,20 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
{ {
get get
{ {
var divDescriptor = ITagHelperDescriptorBuilder.Create("DivTagHelper", "SomeAssembly") var divDescriptor = TagHelperDescriptorBuilder.Create("DivTagHelper", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("div") .RequireTagName("div")
.RequireAttribute(attribute => attribute.Name("style"))) .RequireAttribute(attribute => attribute.Name("style")))
.Build(); .Build();
var inputDescriptor = ITagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly") var inputDescriptor = TagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("input") .RequireTagName("input")
.RequireAttribute(attribute => attribute.Name("class")) .RequireAttribute(attribute => attribute.Name("class"))
.RequireAttribute(attribute => attribute.Name("style"))) .RequireAttribute(attribute => attribute.Name("style")))
.Build(); .Build();
var inputWildcardPrefixDescriptor = ITagHelperDescriptorBuilder.Create("InputWildCardAttribute", "SomeAssembly") var inputWildcardPrefixDescriptor = TagHelperDescriptorBuilder.Create("InputWildCardAttribute", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("input") .RequireTagName("input")
@ -112,20 +112,20 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
.Name("nodashprefix") .Name("nodashprefix")
.NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch))) .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch)))
.Build(); .Build();
var catchAllDescriptor = ITagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly") var catchAllDescriptor = TagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName(TagHelperMatchingConventions.ElementCatchAllName) .RequireTagName(TagHelperMatchingConventions.ElementCatchAllName)
.RequireAttribute(attribute => attribute.Name("class"))) .RequireAttribute(attribute => attribute.Name("class")))
.Build(); .Build();
var catchAllDescriptor2 = ITagHelperDescriptorBuilder.Create("CatchAllTagHelper2", "SomeAssembly") var catchAllDescriptor2 = TagHelperDescriptorBuilder.Create("CatchAllTagHelper2", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName(TagHelperMatchingConventions.ElementCatchAllName) .RequireTagName(TagHelperMatchingConventions.ElementCatchAllName)
.RequireAttribute(attribute => attribute.Name("custom")) .RequireAttribute(attribute => attribute.Name("custom"))
.RequireAttribute(attribute => attribute.Name("class"))) .RequireAttribute(attribute => attribute.Name("class")))
.Build(); .Build();
var catchAllWildcardPrefixDescriptor = ITagHelperDescriptorBuilder.Create("CatchAllWildCardAttribute", "SomeAssembly") var catchAllWildcardPrefixDescriptor = TagHelperDescriptorBuilder.Create("CatchAllWildCardAttribute", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName(TagHelperMatchingConventions.ElementCatchAllName) .RequireTagName(TagHelperMatchingConventions.ElementCatchAllName)
@ -253,7 +253,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
public void GetTagHelperBinding_ReturnsNullBindingResultPrefixAsTagName() public void GetTagHelperBinding_ReturnsNullBindingResultPrefixAsTagName()
{ {
// Arrange // Arrange
var catchAllDescriptor = ITagHelperDescriptorBuilder.Create("foo1", "SomeAssembly") var catchAllDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName(TagHelperMatchingConventions.ElementCatchAllName)) .TagMatchingRule(rule => rule.RequireTagName(TagHelperMatchingConventions.ElementCatchAllName))
.Build(); .Build();
var descriptors = new[] { catchAllDescriptor }; var descriptors = new[] { catchAllDescriptor };
@ -273,7 +273,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
public void GetTagHelperBinding_ReturnsBindingResultCatchAllDescriptorsForPrefixedTags() public void GetTagHelperBinding_ReturnsBindingResultCatchAllDescriptorsForPrefixedTags()
{ {
// Arrange // Arrange
var catchAllDescriptor = ITagHelperDescriptorBuilder.Create("foo1", "SomeAssembly") var catchAllDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName(TagHelperMatchingConventions.ElementCatchAllName)) .TagMatchingRule(rule => rule.RequireTagName(TagHelperMatchingConventions.ElementCatchAllName))
.Build(); .Build();
var descriptors = new[] { catchAllDescriptor }; var descriptors = new[] { catchAllDescriptor };
@ -300,7 +300,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
public void GetTagHelperBinding_ReturnsBindingResultDescriptorsForPrefixedTags() public void GetTagHelperBinding_ReturnsBindingResultDescriptorsForPrefixedTags()
{ {
// Arrange // Arrange
var divDescriptor = ITagHelperDescriptorBuilder.Create("foo1", "SomeAssembly") var divDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("div")) .TagMatchingRule(rule => rule.RequireTagName("div"))
.Build(); .Build();
var descriptors = new[] { divDescriptor }; var descriptors = new[] { divDescriptor };
@ -323,7 +323,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
public void GetTagHelperBinding_ReturnsNullForUnprefixedTags(string tagName) public void GetTagHelperBinding_ReturnsNullForUnprefixedTags(string tagName)
{ {
// Arrange // Arrange
var divDescriptor = ITagHelperDescriptorBuilder.Create("foo1", "SomeAssembly") var divDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName(tagName)) .TagMatchingRule(rule => rule.RequireTagName(tagName))
.Build(); .Build();
var descriptors = new[] { divDescriptor }; var descriptors = new[] { divDescriptor };
@ -343,10 +343,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
public void GetDescriptors_ReturnsNothingForUnregisteredTags() public void GetDescriptors_ReturnsNothingForUnregisteredTags()
{ {
// Arrange // Arrange
var divDescriptor = ITagHelperDescriptorBuilder.Create("foo1", "SomeAssembly") var divDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("div")) .TagMatchingRule(rule => rule.RequireTagName("div"))
.Build(); .Build();
var spanDescriptor = ITagHelperDescriptorBuilder.Create("foo2", "SomeAssembly") var spanDescriptor = TagHelperDescriptorBuilder.Create("foo2", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("span")) .TagMatchingRule(rule => rule.RequireTagName("span"))
.Build(); .Build();
var descriptors = new TagHelperDescriptor[] { divDescriptor, spanDescriptor }; var descriptors = new TagHelperDescriptor[] { divDescriptor, spanDescriptor };
@ -366,13 +366,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
public void GetDescriptors_ReturnsCatchAllsWithEveryTagName() public void GetDescriptors_ReturnsCatchAllsWithEveryTagName()
{ {
// Arrange // Arrange
var divDescriptor = ITagHelperDescriptorBuilder.Create("foo1", "SomeAssembly") var divDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("div")) .TagMatchingRule(rule => rule.RequireTagName("div"))
.Build(); .Build();
var spanDescriptor = ITagHelperDescriptorBuilder.Create("foo2", "SomeAssembly") var spanDescriptor = TagHelperDescriptorBuilder.Create("foo2", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("span")) .TagMatchingRule(rule => rule.RequireTagName("span"))
.Build(); .Build();
var catchAllDescriptor = ITagHelperDescriptorBuilder.Create("foo3", "SomeAssembly") var catchAllDescriptor = TagHelperDescriptorBuilder.Create("foo3", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName(TagHelperMatchingConventions.ElementCatchAllName)) .TagMatchingRule(rule => rule.RequireTagName(TagHelperMatchingConventions.ElementCatchAllName))
.Build(); .Build();
var descriptors = new TagHelperDescriptor[] { divDescriptor, spanDescriptor, catchAllDescriptor }; var descriptors = new TagHelperDescriptor[] { divDescriptor, spanDescriptor, catchAllDescriptor };
@ -404,7 +404,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
public void GetDescriptors_DuplicateDescriptorsAreNotPartOfTagHelperDescriptorPool() public void GetDescriptors_DuplicateDescriptorsAreNotPartOfTagHelperDescriptorPool()
{ {
// Arrange // Arrange
var divDescriptor = ITagHelperDescriptorBuilder.Create("foo1", "SomeAssembly") var divDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("div")) .TagMatchingRule(rule => rule.RequireTagName("div"))
.Build(); .Build();
var descriptors = new TagHelperDescriptor[] { divDescriptor, divDescriptor }; var descriptors = new TagHelperDescriptor[] { divDescriptor, divDescriptor };
@ -425,7 +425,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
public void GetTagHelperBinding_DescriptorWithMultipleRules_CorrectlySelectsMatchingRules() public void GetTagHelperBinding_DescriptorWithMultipleRules_CorrectlySelectsMatchingRules()
{ {
// Arrange // Arrange
var multiRuleDescriptor = ITagHelperDescriptorBuilder.Create("foo", "SomeAssembly") var multiRuleDescriptor = TagHelperDescriptorBuilder.Create("foo", "SomeAssembly")
.TagMatchingRule(rule => rule .TagMatchingRule(rule => rule
.RequireTagName(TagHelperMatchingConventions.ElementCatchAllName) .RequireTagName(TagHelperMatchingConventions.ElementCatchAllName)
.RequireParentTag("body")) .RequireParentTag("body"))

80
test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperParseTreeRewriterTest.cs
View File

@ -160,14 +160,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
// Arrange // Arrange
var descriptors = new TagHelperDescriptor[] var descriptors = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("strong")) .TagMatchingRule(rule => rule.RequireTagName("strong"))
.TagMatchingRule(rule => rule.RequireTagName("div")) .TagMatchingRule(rule => rule.RequireTagName("div"))
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("CatchALlTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("CatchALlTagHelper", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("*")) .TagMatchingRule(rule => rule.RequireTagName("*"))
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("p")) .TagMatchingRule(rule => rule.RequireTagName("p"))
.Build(), .Build(),
}; };
@ -258,13 +258,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
// Arrange // Arrange
var descriptors = new TagHelperDescriptor[] var descriptors = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("input") .RequireTagName("input")
.RequireTagStructure(TagStructure.WithoutEndTag)) .RequireTagStructure(TagStructure.WithoutEndTag))
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("strong") .RequireTagName("strong")
@ -274,7 +274,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
.RequireTagName("strong") .RequireTagName("strong")
.RequireParentTag("input")) .RequireParentTag("input"))
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("p")) .TagMatchingRule(rule => rule.RequireTagName("p"))
.Build(), .Build(),
}; };
@ -340,7 +340,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
// Arrange // Arrange
var descriptors = new TagHelperDescriptor[] var descriptors = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("strong") .RequireTagName("strong")
@ -350,7 +350,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
.RequireTagName("strong") .RequireTagName("strong")
.RequireParentTag("div")) .RequireParentTag("div"))
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("p")) .TagMatchingRule(rule => rule.RequireTagName("p"))
.Build(), .Build(),
}; };
@ -370,11 +370,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
new MarkupTagHelperBlock("th:strong"))); new MarkupTagHelperBlock("th:strong")));
var descriptors = new TagHelperDescriptor[] var descriptors = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("p")) .TagMatchingRule(rule => rule.RequireTagName("p"))
.AllowChildTag("strong") .AllowChildTag("strong")
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("strong")) .TagMatchingRule(rule => rule.RequireTagName("strong"))
.Build(), .Build(),
}; };
@ -682,7 +682,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
factory.Markup(Environment.NewLine))); factory.Markup(Environment.NewLine)));
var descriptors = new TagHelperDescriptor[] var descriptors = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("p")) .TagMatchingRule(rule => rule.RequireTagName("p"))
.AllowChildTag("br") .AllowChildTag("br")
.Build() .Build()
@ -719,7 +719,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
blockFactory.MarkupTagBlock("</strong>"))); blockFactory.MarkupTagBlock("</strong>")));
var descriptors = new TagHelperDescriptor[] var descriptors = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("strong") .RequireTagName("strong")
@ -746,18 +746,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
new MarkupTagHelperBlock("br", TagMode.StartTagOnly))); new MarkupTagHelperBlock("br", TagMode.StartTagOnly)));
var descriptors = new TagHelperDescriptor[] var descriptors = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("PTagHelper1", "SomeAssembly") TagHelperDescriptorBuilder.Create("PTagHelper1", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("p")) .TagMatchingRule(rule => rule.RequireTagName("p"))
.AllowChildTag("strong") .AllowChildTag("strong")
.AllowChildTag("br") .AllowChildTag("br")
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("PTagHelper2", "SomeAssembly") TagHelperDescriptorBuilder.Create("PTagHelper2", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("p")) .TagMatchingRule(rule => rule.RequireTagName("p"))
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("strong")) .TagMatchingRule(rule => rule.RequireTagName("strong"))
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("BRTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("BRTagHelper", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("br") .RequireTagName("br")
@ -783,18 +783,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
new MarkupTagHelperBlock("br", TagMode.StartTagOnly))); new MarkupTagHelperBlock("br", TagMode.StartTagOnly)));
var descriptors = new TagHelperDescriptor[] var descriptors = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("PTagHelper1", "SomeAssembly") TagHelperDescriptorBuilder.Create("PTagHelper1", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("p")) .TagMatchingRule(rule => rule.RequireTagName("p"))
.AllowChildTag("strong") .AllowChildTag("strong")
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("PTagHelper2", "SomeAssembly") TagHelperDescriptorBuilder.Create("PTagHelper2", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("p")) .TagMatchingRule(rule => rule.RequireTagName("p"))
.AllowChildTag("br") .AllowChildTag("br")
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("strong")) .TagMatchingRule(rule => rule.RequireTagName("strong"))
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("BRTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("BRTagHelper", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("br") .RequireTagName("br")
@ -1021,9 +1021,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
object expectedErrors) object expectedErrors)
{ {
// Arrange // Arrange
var pTagHelperBuilder = ITagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") var pTagHelperBuilder = TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("p")); .TagMatchingRule(rule => rule.RequireTagName("p"));
var strongTagHelperBuilder = ITagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") var strongTagHelperBuilder = TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("strong")); .TagMatchingRule(rule => rule.RequireTagName("strong"));
foreach (var childTag in allowedChildren) foreach (var childTag in allowedChildren)
@ -1035,7 +1035,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
{ {
pTagHelperBuilder.Build(), pTagHelperBuilder.Build(),
strongTagHelperBuilder.Build(), strongTagHelperBuilder.Build(),
ITagHelperDescriptorBuilder.Create("BRTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("BRTagHelper", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("br") .RequireTagName("br")
@ -1055,11 +1055,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
var documentContent = "<p></</p>"; var documentContent = "<p></</p>";
var descriptors = new TagHelperDescriptor[] var descriptors = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("p")) .TagMatchingRule(rule => rule.RequireTagName("p"))
.AllowChildTag("custom") .AllowChildTag("custom")
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("*")) .TagMatchingRule(rule => rule.RequireTagName("*"))
.Build(), .Build(),
}; };
@ -1088,11 +1088,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
var documentContent = "<th:p></</th:p>"; var documentContent = "<th:p></</th:p>";
var descriptors = new TagHelperDescriptor[] var descriptors = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("p")) .TagMatchingRule(rule => rule.RequireTagName("p"))
.AllowChildTag("custom") .AllowChildTag("custom")
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("*")) .TagMatchingRule(rule => rule.RequireTagName("*"))
.Build(), .Build(),
}; };
@ -1122,7 +1122,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
var expectedOutput = new MarkupBlock(new MarkupTagHelperBlock("input", TagMode.StartTagOnly)); var expectedOutput = new MarkupBlock(new MarkupTagHelperBlock("input", TagMode.StartTagOnly));
var descriptors = new TagHelperDescriptor[] var descriptors = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("input") .RequireTagName("input")
@ -1154,7 +1154,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
var expectedOutput = new MarkupBlock(blockFactory.MarkupTagBlock("</input>")); var expectedOutput = new MarkupBlock(blockFactory.MarkupTagBlock("</input>"));
var descriptors = new TagHelperDescriptor[] var descriptors = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("input") .RequireTagName("input")
@ -1187,13 +1187,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
var expectedOutput = new MarkupBlock(new MarkupTagHelperBlock("input", TagMode.StartTagOnly)); var expectedOutput = new MarkupBlock(new MarkupTagHelperBlock("input", TagMode.StartTagOnly));
var descriptors = new TagHelperDescriptor[] var descriptors = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("InputTagHelper1", "SomeAssembly") TagHelperDescriptorBuilder.Create("InputTagHelper1", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("input") .RequireTagName("input")
.RequireTagStructure(TagStructure.WithoutEndTag)) .RequireTagStructure(TagStructure.WithoutEndTag))
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("InputTagHelper2", "SomeAssembly") TagHelperDescriptorBuilder.Create("InputTagHelper2", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("input") .RequireTagName("input")
@ -1610,20 +1610,20 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
// Arrange // Arrange
var descriptors = new TagHelperDescriptor[] var descriptors = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("pTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("pTagHelper", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("p") .RequireTagName("p")
.RequireAttribute(attribute => attribute.Name("class"))) .RequireAttribute(attribute => attribute.Name("class")))
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("divTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("divTagHelper", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("div") .RequireTagName("div")
.RequireAttribute(attribute => attribute.Name("class")) .RequireAttribute(attribute => attribute.Name("class"))
.RequireAttribute(attribute => attribute.Name("style"))) .RequireAttribute(attribute => attribute.Name("style")))
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("catchAllTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("catchAllTagHelper", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("*") .RequireTagName("*")
@ -1871,13 +1871,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
// Arrange // Arrange
var descriptors = new TagHelperDescriptor[] var descriptors = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("pTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("pTagHelper", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("p") .RequireTagName("p")
.RequireAttribute(attribute => attribute.Name("class"))) .RequireAttribute(attribute => attribute.Name("class")))
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("catchAllTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("catchAllTagHelper", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("*") .RequireTagName("*")
@ -2093,7 +2093,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
// Arrange // Arrange
var descriptors = new TagHelperDescriptor[] var descriptors = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("pTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("pTagHelper", "SomeAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("p") .RequireTagName("p")
@ -2114,10 +2114,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
var blockFactory = new BlockFactory(factory); var blockFactory = new BlockFactory(factory);
var availableDescriptorsColon = new TagHelperDescriptor[] var availableDescriptorsColon = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("mythTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("mythTagHelper", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("myth")) .TagMatchingRule(rule => rule.RequireTagName("myth"))
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("mythTagHelper2", "SomeAssembly") TagHelperDescriptorBuilder.Create("mythTagHelper2", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("myth2")) .TagMatchingRule(rule => rule.RequireTagName("myth2"))
.BindAttribute(attribute => .BindAttribute(attribute =>
attribute attribute
@ -2128,7 +2128,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
}; };
var availableDescriptorsCatchAll = new TagHelperDescriptor[] var availableDescriptorsCatchAll = new TagHelperDescriptor[]
{ {
ITagHelperDescriptorBuilder.Create("mythTagHelper", "SomeAssembly") TagHelperDescriptorBuilder.Create("mythTagHelper", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName("*")) .TagMatchingRule(rule => rule.RequireTagName("*"))
.Build(), .Build(),
}; };

2
test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperRewritingTestBase.cs
View File

@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
foreach (var tagName in tagNames) foreach (var tagName in tagNames)
{ {
var descriptor = ITagHelperDescriptorBuilder.Create(tagName + "taghelper", "SomeAssembly") var descriptor = TagHelperDescriptorBuilder.Create(tagName + "taghelper", "SomeAssembly")
.TagMatchingRule(rule => rule.RequireTagName(tagName)) .TagMatchingRule(rule => rule.RequireTagName(tagName))
.Build(); .Build();
descriptors.Add(descriptor); descriptors.Add(descriptor);

2
test/Microsoft.AspNetCore.Razor.Language.Test/TagHelperBinderSyntaxTreePassTest.cs
View File

@ -1311,7 +1311,7 @@ namespace Microsoft.AspNetCore.Razor.Language
IEnumerable<Action<ITagHelperBoundAttributeDescriptorBuilder>> attributes = null, IEnumerable<Action<ITagHelperBoundAttributeDescriptorBuilder>> attributes = null,
IEnumerable<Action<TagMatchingRuleBuilder>> ruleBuilders = null) IEnumerable<Action<TagMatchingRuleBuilder>> ruleBuilders = null)
{ {
var builder = ITagHelperDescriptorBuilder.Create(typeName, assemblyName); var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName);
if (attributes != null) if (attributes != null)
{ {

2
test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/TestTagHelperDescriptors.cs
View File

@ -472,7 +472,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
IEnumerable<Action<ITagHelperBoundAttributeDescriptorBuilder>> attributes = null, IEnumerable<Action<ITagHelperBoundAttributeDescriptorBuilder>> attributes = null,
IEnumerable<Action<TagMatchingRuleBuilder>> ruleBuilders = null) IEnumerable<Action<TagMatchingRuleBuilder>> ruleBuilders = null)
{ {
var builder = ITagHelperDescriptorBuilder.Create(typeName, assemblyName); var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName);
if (attributes != null) if (attributes != null)
{ {

32
test/Microsoft.CodeAnalysis.Razor.Test/DefaultTagHelperDescriptorFactoryTest.cs
View File

@ -321,7 +321,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
{ {
{ {
typeof(EnumTagHelper), typeof(EnumTagHelper),
ITagHelperDescriptorBuilder.Create(typeof(EnumTagHelper).FullName, AssemblyName) TagHelperDescriptorBuilder.Create(typeof(EnumTagHelper).FullName, AssemblyName)
.TagMatchingRule(ruleBuilder => ruleBuilder.RequireTagName("enum")) .TagMatchingRule(ruleBuilder => ruleBuilder.RequireTagName("enum"))
.BindAttribute(builder => .BindAttribute(builder =>
builder builder
@ -338,7 +338,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
}, },
{ {
typeof(MultiEnumTagHelper), typeof(MultiEnumTagHelper),
ITagHelperDescriptorBuilder.Create(typeof(MultiEnumTagHelper).FullName, AssemblyName) TagHelperDescriptorBuilder.Create(typeof(MultiEnumTagHelper).FullName, AssemblyName)
.TagMatchingRule(ruleBuilder => ruleBuilder.RequireTagName("p")) .TagMatchingRule(ruleBuilder => ruleBuilder.RequireTagName("p"))
.TagMatchingRule(ruleBuilder => ruleBuilder.RequireTagName("input")) .TagMatchingRule(ruleBuilder => ruleBuilder.RequireTagName("input"))
.BindAttribute(builder => .BindAttribute(builder =>
@ -384,20 +384,20 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
{ {
{ {
typeof(RequiredParentTagHelper), typeof(RequiredParentTagHelper),
ITagHelperDescriptorBuilder.Create(typeof(RequiredParentTagHelper).FullName, AssemblyName) TagHelperDescriptorBuilder.Create(typeof(RequiredParentTagHelper).FullName, AssemblyName)
.TagMatchingRule(builder => builder.RequireTagName("input").RequireParentTag("div")) .TagMatchingRule(builder => builder.RequireTagName("input").RequireParentTag("div"))
.Build() .Build()
}, },
{ {
typeof(MultiSpecifiedRequiredParentTagHelper), typeof(MultiSpecifiedRequiredParentTagHelper),
ITagHelperDescriptorBuilder.Create(typeof(MultiSpecifiedRequiredParentTagHelper).FullName, AssemblyName) TagHelperDescriptorBuilder.Create(typeof(MultiSpecifiedRequiredParentTagHelper).FullName, AssemblyName)
.TagMatchingRule(builder => builder.RequireTagName("p").RequireParentTag("div")) .TagMatchingRule(builder => builder.RequireTagName("p").RequireParentTag("div"))
.TagMatchingRule(builder => builder.RequireTagName("input").RequireParentTag("section")) .TagMatchingRule(builder => builder.RequireTagName("input").RequireParentTag("section"))
.Build() .Build()
}, },
{ {
typeof(MultiWithUnspecifiedRequiredParentTagHelper), typeof(MultiWithUnspecifiedRequiredParentTagHelper),
ITagHelperDescriptorBuilder.Create(typeof(MultiWithUnspecifiedRequiredParentTagHelper).FullName, AssemblyName) TagHelperDescriptorBuilder.Create(typeof(MultiWithUnspecifiedRequiredParentTagHelper).FullName, AssemblyName)
.TagMatchingRule(builder => builder.RequireTagName("p")) .TagMatchingRule(builder => builder.RequireTagName("p"))
.TagMatchingRule(builder => builder.RequireTagName("input").RequireParentTag("div")) .TagMatchingRule(builder => builder.RequireTagName("input").RequireParentTag("div"))
.Build() .Build()
@ -432,14 +432,14 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
{ {
{ {
typeof(RestrictChildrenTagHelper), typeof(RestrictChildrenTagHelper),
ITagHelperDescriptorBuilder.Create(typeof(RestrictChildrenTagHelper).FullName, AssemblyName) TagHelperDescriptorBuilder.Create(typeof(RestrictChildrenTagHelper).FullName, AssemblyName)
.TagMatchingRule(builder => builder.RequireTagName("restrict-children")) .TagMatchingRule(builder => builder.RequireTagName("restrict-children"))
.AllowChildTag("p") .AllowChildTag("p")
.Build() .Build()
}, },
{ {
typeof(DoubleRestrictChildrenTagHelper), typeof(DoubleRestrictChildrenTagHelper),
ITagHelperDescriptorBuilder.Create(typeof(DoubleRestrictChildrenTagHelper).FullName, AssemblyName) TagHelperDescriptorBuilder.Create(typeof(DoubleRestrictChildrenTagHelper).FullName, AssemblyName)
.TagMatchingRule(builder => builder.RequireTagName("double-restrict-children")) .TagMatchingRule(builder => builder.RequireTagName("double-restrict-children"))
.AllowChildTag("p") .AllowChildTag("p")
.AllowChildTag("strong") .AllowChildTag("strong")
@ -447,7 +447,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
}, },
{ {
typeof(MultiTargetRestrictChildrenTagHelper), typeof(MultiTargetRestrictChildrenTagHelper),
ITagHelperDescriptorBuilder.Create(typeof(MultiTargetRestrictChildrenTagHelper).FullName, AssemblyName) TagHelperDescriptorBuilder.Create(typeof(MultiTargetRestrictChildrenTagHelper).FullName, AssemblyName)
.TagMatchingRule(builder => builder.RequireTagName("p")) .TagMatchingRule(builder => builder.RequireTagName("p"))
.TagMatchingRule(builder => builder.RequireTagName("div")) .TagMatchingRule(builder => builder.RequireTagName("div"))
.AllowChildTag("p") .AllowChildTag("p")
@ -485,7 +485,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
{ {
{ {
typeof(TagStructureTagHelper), typeof(TagStructureTagHelper),
ITagHelperDescriptorBuilder.Create(typeof(TagStructureTagHelper).FullName, AssemblyName) TagHelperDescriptorBuilder.Create(typeof(TagStructureTagHelper).FullName, AssemblyName)
.TagMatchingRule(builder => builder .TagMatchingRule(builder => builder
.RequireTagName("input") .RequireTagName("input")
.RequireTagStructure(TagStructure.WithoutEndTag)) .RequireTagStructure(TagStructure.WithoutEndTag))
@ -493,7 +493,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
}, },
{ {
typeof(MultiSpecifiedTagStructureTagHelper), typeof(MultiSpecifiedTagStructureTagHelper),
ITagHelperDescriptorBuilder.Create(typeof(MultiSpecifiedTagStructureTagHelper).FullName, AssemblyName) TagHelperDescriptorBuilder.Create(typeof(MultiSpecifiedTagStructureTagHelper).FullName, AssemblyName)
.TagMatchingRule(builder => builder .TagMatchingRule(builder => builder
.RequireTagName("p") .RequireTagName("p")
.RequireTagStructure(TagStructure.NormalOrSelfClosing)) .RequireTagStructure(TagStructure.NormalOrSelfClosing))
@ -504,7 +504,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
}, },
{ {
typeof(MultiWithUnspecifiedTagStructureTagHelper), typeof(MultiWithUnspecifiedTagStructureTagHelper),
ITagHelperDescriptorBuilder.Create(typeof(MultiWithUnspecifiedTagStructureTagHelper).FullName, AssemblyName) TagHelperDescriptorBuilder.Create(typeof(MultiWithUnspecifiedTagStructureTagHelper).FullName, AssemblyName)
.TagMatchingRule(builder => builder .TagMatchingRule(builder => builder
.RequireTagName("p")) .RequireTagName("p"))
.TagMatchingRule(builder => builder .TagMatchingRule(builder => builder
@ -1985,7 +1985,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
{ {
{ {
typeof(MultipleDescriptorTagHelperWithOutputElementHint), typeof(MultipleDescriptorTagHelperWithOutputElementHint),
ITagHelperDescriptorBuilder.Create(typeof(MultipleDescriptorTagHelperWithOutputElementHint).FullName, AssemblyName) TagHelperDescriptorBuilder.Create(typeof(MultipleDescriptorTagHelperWithOutputElementHint).FullName, AssemblyName)
.TagMatchingRule(builder => builder.RequireTagName("a")) .TagMatchingRule(builder => builder.RequireTagName("a"))
.TagMatchingRule(builder => builder.RequireTagName("p")) .TagMatchingRule(builder => builder.RequireTagName("p"))
.TagOutputHint("div") .TagOutputHint("div")
@ -1993,20 +1993,20 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
}, },
{ {
typeof(InheritedOutputElementHintTagHelper), typeof(InheritedOutputElementHintTagHelper),
ITagHelperDescriptorBuilder.Create(typeof(InheritedOutputElementHintTagHelper).FullName, AssemblyName) TagHelperDescriptorBuilder.Create(typeof(InheritedOutputElementHintTagHelper).FullName, AssemblyName)
.TagMatchingRule(builder => builder.RequireTagName("inherited-output-element-hint")) .TagMatchingRule(builder => builder.RequireTagName("inherited-output-element-hint"))
.Build() .Build()
}, },
{ {
typeof(OutputElementHintTagHelper), typeof(OutputElementHintTagHelper),
ITagHelperDescriptorBuilder.Create(typeof(OutputElementHintTagHelper).FullName, AssemblyName) TagHelperDescriptorBuilder.Create(typeof(OutputElementHintTagHelper).FullName, AssemblyName)
.TagMatchingRule(builder => builder.RequireTagName("output-element-hint")) .TagMatchingRule(builder => builder.RequireTagName("output-element-hint"))
.TagOutputHint("hinted-value") .TagOutputHint("hinted-value")
.Build() .Build()
}, },
{ {
typeof(OverriddenOutputElementHintTagHelper), typeof(OverriddenOutputElementHintTagHelper),
ITagHelperDescriptorBuilder.Create(typeof(OverriddenOutputElementHintTagHelper).FullName, AssemblyName) TagHelperDescriptorBuilder.Create(typeof(OverriddenOutputElementHintTagHelper).FullName, AssemblyName)
.TagMatchingRule(builder => builder.RequireTagName("overridden-output-element-hint")) .TagMatchingRule(builder => builder.RequireTagName("overridden-output-element-hint"))
.TagOutputHint("overridden") .TagOutputHint("overridden")
.Build() .Build()
@ -2271,7 +2271,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
IEnumerable<Action<ITagHelperBoundAttributeDescriptorBuilder>> attributes = null, IEnumerable<Action<ITagHelperBoundAttributeDescriptorBuilder>> attributes = null,
IEnumerable<Action<TagMatchingRuleBuilder>> ruleBuilders = null) IEnumerable<Action<TagMatchingRuleBuilder>> ruleBuilders = null)
{ {
var builder = ITagHelperDescriptorBuilder.Create(typeName, assemblyName); var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName);
if (attributes != null) if (attributes != null)
{ {

6
test/Microsoft.CodeAnalysis.Razor.Test/ViewComponentTagHelperDescriptorFactoryTest.cs
View File

@ -18,7 +18,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
var testCompilation = TestCompilation.Create(); var testCompilation = TestCompilation.Create();
var viewComponent = testCompilation.GetTypeByMetadataName(typeof(StringParameterViewComponent).FullName); var viewComponent = testCompilation.GetTypeByMetadataName(typeof(StringParameterViewComponent).FullName);
var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation); var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
var expectedDescriptor = ITagHelperDescriptorBuilder.Create( var expectedDescriptor = TagHelperDescriptorBuilder.Create(
"__Generated__StringParameterViewComponentTagHelper", "__Generated__StringParameterViewComponentTagHelper",
typeof(StringParameterViewComponent).GetTypeInfo().Assembly.GetName().Name) typeof(StringParameterViewComponent).GetTypeInfo().Assembly.GetName().Name)
.TagMatchingRule(rule => .TagMatchingRule(rule =>
@ -53,7 +53,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
var testCompilation = TestCompilation.Create(); var testCompilation = TestCompilation.Create();
var viewComponent = testCompilation.GetTypeByMetadataName(typeof(VariousParameterViewComponent).FullName); var viewComponent = testCompilation.GetTypeByMetadataName(typeof(VariousParameterViewComponent).FullName);
var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation); var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
var expectedDescriptor = ITagHelperDescriptorBuilder.Create( var expectedDescriptor = TagHelperDescriptorBuilder.Create(
"__Generated__VariousParameterViewComponentTagHelper", "__Generated__VariousParameterViewComponentTagHelper",
typeof(VariousParameterViewComponent).GetTypeInfo().Assembly.GetName().Name) typeof(VariousParameterViewComponent).GetTypeInfo().Assembly.GetName().Name)
.TagMatchingRule(rule => .TagMatchingRule(rule =>
@ -95,7 +95,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces
var testCompilation = TestCompilation.Create(); var testCompilation = TestCompilation.Create();
var viewComponent = testCompilation.GetTypeByMetadataName(typeof(GenericParameterViewComponent).FullName); var viewComponent = testCompilation.GetTypeByMetadataName(typeof(GenericParameterViewComponent).FullName);
var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation); var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation);
var expectedDescriptor = ITagHelperDescriptorBuilder.Create( var expectedDescriptor = TagHelperDescriptorBuilder.Create(
"__Generated__GenericParameterViewComponentTagHelper", "__Generated__GenericParameterViewComponentTagHelper",
typeof(GenericParameterViewComponent).GetTypeInfo().Assembly.GetName().Name) typeof(GenericParameterViewComponent).GetTypeInfo().Assembly.GetName().Name)
.TagMatchingRule(rule => .TagMatchingRule(rule =>

34
test/Microsoft.VisualStudio.LanguageServices.Razor.Test/DefaultTagHelperFactsServiceTest.cs
View File

@ -19,7 +19,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
// Arrange // Arrange
var documentDescriptors = new[] var documentDescriptors = new[]
{ {
ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
.TagMatchingRule(rule => rule.RequireTagName("*")) .TagMatchingRule(rule => rule.RequireTagName("*"))
.Build() .Build()
}; };
@ -39,7 +39,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
// Arrange // Arrange
var documentDescriptors = new[] var documentDescriptors = new[]
{ {
ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
.TagMatchingRule(rule => .TagMatchingRule(rule =>
rule rule
.RequireTagName("a") .RequireTagName("a")
@ -56,7 +56,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
.PropertyName("AspRoute") .PropertyName("AspRoute")
.AsDictionary("asp-route-", typeof(string).FullName)) .AsDictionary("asp-route-", typeof(string).FullName))
.Build(), .Build(),
ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
.TagMatchingRule(rule => rule.RequireTagName("input")) .TagMatchingRule(rule => rule.RequireTagName("input"))
.BindAttribute(attribute => .BindAttribute(attribute =>
attribute attribute
@ -88,7 +88,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
// Arrange // Arrange
var documentDescriptors = new[] var documentDescriptors = new[]
{ {
ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
.TagMatchingRule(rule => rule.RequireTagName("a")) .TagMatchingRule(rule => rule.RequireTagName("a"))
.BindAttribute(attribute => .BindAttribute(attribute =>
attribute attribute
@ -124,7 +124,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
// Arrange // Arrange
var documentDescriptors = new[] var documentDescriptors = new[]
{ {
ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
.TagMatchingRule(rule => rule.RequireTagName("input")) .TagMatchingRule(rule => rule.RequireTagName("input"))
.BindAttribute(attribute => .BindAttribute(attribute =>
attribute attribute
@ -159,7 +159,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
// Arrange // Arrange
var documentDescriptors = new[] var documentDescriptors = new[]
{ {
ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
.TagMatchingRule(rule => rule.RequireTagName("*")) .TagMatchingRule(rule => rule.RequireTagName("*"))
.Build() .Build()
}; };
@ -179,7 +179,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
// Arrange // Arrange
var documentDescriptors = new[] var documentDescriptors = new[]
{ {
ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
.TagMatchingRule(rule => rule.RequireTagName("strong")) .TagMatchingRule(rule => rule.RequireTagName("strong"))
.Build() .Build()
}; };
@ -199,7 +199,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
// Arrange // Arrange
var expectedDescriptors = new[] var expectedDescriptors = new[]
{ {
ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
.TagMatchingRule( .TagMatchingRule(
rule => rule rule => rule
.RequireTagName("a") .RequireTagName("a")
@ -209,7 +209,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
var documentDescriptors = new[] var documentDescriptors = new[]
{ {
expectedDescriptors[0], expectedDescriptors[0],
ITagHelperDescriptorBuilder.Create("TestType2", "TestAssembly") TagHelperDescriptorBuilder.Create("TestType2", "TestAssembly")
.TagMatchingRule( .TagMatchingRule(
rule => rule rule => rule
.RequireTagName("strong") .RequireTagName("strong")
@ -232,14 +232,14 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
// Arrange // Arrange
var expectedDescriptors = new[] var expectedDescriptors = new[]
{ {
ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
.TagMatchingRule(rule => rule.RequireTagName("strong")) .TagMatchingRule(rule => rule.RequireTagName("strong"))
.Build() .Build()
}; };
var documentDescriptors = new[] var documentDescriptors = new[]
{ {
expectedDescriptors[0], expectedDescriptors[0],
ITagHelperDescriptorBuilder.Create("TestType2", "TestAssembly") TagHelperDescriptorBuilder.Create("TestType2", "TestAssembly")
.TagMatchingRule(rule => rule.RequireTagName("thstrong")) .TagMatchingRule(rule => rule.RequireTagName("thstrong"))
.Build() .Build()
}; };
@ -259,7 +259,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
// Arrange // Arrange
var expectedDescriptors = new[] var expectedDescriptors = new[]
{ {
ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
.TagMatchingRule( .TagMatchingRule(
rule => rule rule => rule
.RequireTagName("strong") .RequireTagName("strong")
@ -269,7 +269,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
var documentDescriptors = new[] var documentDescriptors = new[]
{ {
expectedDescriptors[0], expectedDescriptors[0],
ITagHelperDescriptorBuilder.Create("TestType2", "TestAssembly") TagHelperDescriptorBuilder.Create("TestType2", "TestAssembly")
.TagMatchingRule( .TagMatchingRule(
rule => rule rule => rule
.RequireTagName("strong") .RequireTagName("strong")
@ -292,7 +292,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
// Arrange // Arrange
var documentDescriptors = new[] var documentDescriptors = new[]
{ {
ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
.TagMatchingRule(rule => rule.RequireTagName("div")) .TagMatchingRule(rule => rule.RequireTagName("div"))
.Build() .Build()
}; };
@ -312,7 +312,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
// Arrange // Arrange
var documentDescriptors = new[] var documentDescriptors = new[]
{ {
ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
.TagMatchingRule(rule => rule.RequireTagName("div")) .TagMatchingRule(rule => rule.RequireTagName("div"))
.Build() .Build()
}; };
@ -332,7 +332,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
// Arrange // Arrange
var expectedDescriptors = new[] var expectedDescriptors = new[]
{ {
ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") TagHelperDescriptorBuilder.Create("TestType", "TestAssembly")
.TagMatchingRule( .TagMatchingRule(
rule => rule rule => rule
.RequireTagName("p") .RequireTagName("p")
@ -342,7 +342,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
var documentDescriptors = new[] var documentDescriptors = new[]
{ {
expectedDescriptors[0], expectedDescriptors[0],
ITagHelperDescriptorBuilder.Create("TestType2", "TestAssembly") TagHelperDescriptorBuilder.Create("TestType2", "TestAssembly")
.TagMatchingRule( .TagMatchingRule(
rule => rule rule => rule
.RequireTagName("strong") .RequireTagName("strong")

4
test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TagHelperDescriptorSerializationTest.cs
View File

@ -151,9 +151,9 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor
string assemblyName, string assemblyName,
IEnumerable<Action<ITagHelperBoundAttributeDescriptorBuilder>> attributes = null, IEnumerable<Action<ITagHelperBoundAttributeDescriptorBuilder>> attributes = null,
IEnumerable<Action<TagMatchingRuleBuilder>> ruleBuilders = null, IEnumerable<Action<TagMatchingRuleBuilder>> ruleBuilders = null,
Action<ITagHelperDescriptorBuilder> configureAction = null) Action<TagHelperDescriptorBuilder> configureAction = null)
{ {
var builder = ITagHelperDescriptorBuilder.Create(typeName, assemblyName); var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName);
if (attributes != null) if (attributes != null)
{ {

2
tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/TagHelperViewModel.cs
View File

@ -20,7 +20,7 @@ namespace Microsoft.VisualStudio.RazorExtension.RazorInfo
public string TargetElement => string.Join(", ", _descriptor.TagMatchingRules.Select(rule => rule.TagName)); public string TargetElement => string.Join(", ", _descriptor.TagMatchingRules.Select(rule => rule.TagName));
public string TypeName => _descriptor.Metadata[ITagHelperDescriptorBuilder.TypeNameKey]; public string TypeName => _descriptor.Metadata[TagHelperDescriptorBuilder.TypeNameKey];
} }
} }
#endif #endif