From 1b8a4e704c67c5c18cf6995a470b21303ef33834 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Tue, 11 Apr 2017 16:56:55 -0700 Subject: [PATCH] Rename ITagHelperDescriptorBuilder => TagHelperDescriptorBuilder. #1210 --- .../ViewComponentTagHelperPass.cs | 2 +- .../DefaultRazorIRLoweringPhase.cs | 6 +- .../Legacy/TagHelperParseTreeRewriter.cs | 6 +- .../TagHelperBinderSyntaxTreePass.cs | 4 +- ...ilder.cs => TagHelperDescriptorBuilder.cs} | 26 +++--- .../DefaultTagHelperDescriptorFactory.cs | 12 +-- ...ViewComponentTagHelperDescriptorFactory.cs | 4 +- .../DefaultTagHelperResolver.cs | 6 +- .../TagHelperDescriptorJsonConverter.cs | 2 +- .../CodeGenerationIntegrationTest.cs | 2 +- .../ModelExpressionPassTest.cs | 6 +- ...onentTagHelperDescriptorConventionsTest.cs | 4 +- .../ViewComponentTagHelperPassTest.cs | 10 +-- ...aultRazorIRLoweringPhaseIntegrationTest.cs | 2 +- .../InstrumentationPassIntegrationTest.cs | 2 +- .../TagHelpersIntegrationTest.cs | 2 +- .../Legacy/RazorEditorParserTest.cs | 4 +- .../Legacy/TagHelperBlockRewriterTest.cs | 20 ++--- .../Legacy/TagHelperDescriptorProviderTest.cs | 38 ++++----- .../Legacy/TagHelperParseTreeRewriterTest.cs | 80 +++++++++---------- .../Legacy/TagHelperRewritingTestBase.cs | 2 +- .../TagHelperBinderSyntaxTreePassTest.cs | 2 +- .../TestTagHelperDescriptors.cs | 2 +- .../DefaultTagHelperDescriptorFactoryTest.cs | 32 ++++---- ...ComponentTagHelperDescriptorFactoryTest.cs | 6 +- .../DefaultTagHelperFactsServiceTest.cs | 34 ++++---- .../TagHelperDescriptorSerializationTest.cs | 4 +- .../RazorInfo/TagHelperViewModel.cs | 2 +- 28 files changed, 161 insertions(+), 161 deletions(-) rename src/Microsoft.AspNetCore.Razor.Language/{ITagHelperDescriptorBuilder.cs => TagHelperDescriptorBuilder.cs} (87%) diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs index ccab7ef443..e296019a0f 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs @@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions { 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)) { visitor.Fields.UsedTagHelperTypeNames.Add(GetVCTHFullName(visitor.Namespace, visitor.Class, tagHelper.Value)); diff --git a/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIRLoweringPhase.cs b/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIRLoweringPhase.cs index 215d0ea86d..ea5f3dd5a0 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIRLoweringPhase.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIRLoweringPhase.cs @@ -515,7 +515,7 @@ namespace Microsoft.AspNetCore.Razor.Language foreach (var descriptor in block.Binding.Descriptors) { - var typeName = descriptor.Metadata[ITagHelperDescriptorBuilder.TypeNameKey]; + var typeName = descriptor.Metadata[TagHelperDescriptorBuilder.TypeNameKey]; _tagHelperFields.UsedTagHelperTypeNames.Add(typeName); } } @@ -525,7 +525,7 @@ namespace Microsoft.AspNetCore.Razor.Language var descriptors = tagHelperBinding.Descriptors; foreach (var descriptor in descriptors) { - var typeName = descriptor.Metadata[ITagHelperDescriptorBuilder.TypeNameKey]; + var typeName = descriptor.Metadata[TagHelperDescriptorBuilder.TypeNameKey]; var createTagHelper = new CreateTagHelperIRNode() { TagHelperTypeName = typeName, @@ -559,7 +559,7 @@ namespace Microsoft.AspNetCore.Razor.Language { var associatedAttributeDescriptor = associatedDescriptor.BoundAttributes.First( 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 setTagHelperProperty = new SetTagHelperPropertyIRNode() diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperParseTreeRewriter.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperParseTreeRewriter.cs index f9741819da..e17d91fe5f 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperParseTreeRewriter.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperParseTreeRewriter.cs @@ -273,7 +273,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy 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. errorSink.OnError( @@ -564,8 +564,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Can't have a set of TagHelpers that expect different structures. if (baseStructure.HasValue && baseStructure != rule.TagStructure) { - var baseDescriptorTypeName = baseDescriptor.Metadata[ITagHelperDescriptorBuilder.TypeNameKey]; - var descriptorTypeName = descriptor.Metadata[ITagHelperDescriptorBuilder.TypeNameKey]; + var baseDescriptorTypeName = baseDescriptor.Metadata[TagHelperDescriptorBuilder.TypeNameKey]; + var descriptorTypeName = descriptor.Metadata[TagHelperDescriptorBuilder.TypeNameKey]; errorSink.OnError( tagBlock.Start, LegacyResources.FormatTagHelperParseTreeRewriter_InconsistentTagStructure( diff --git a/src/Microsoft.AspNetCore.Razor.Language/TagHelperBinderSyntaxTreePass.cs b/src/Microsoft.AspNetCore.Razor.Language/TagHelperBinderSyntaxTreePass.cs index e6f6332e25..eae5ba5868 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/TagHelperBinderSyntaxTreePass.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/TagHelperBinderSyntaxTreePass.cs @@ -270,13 +270,13 @@ namespace Microsoft.AspNetCore.Razor.Language return false; } - if (descriptor.Kind != ITagHelperDescriptorBuilder.DescriptorKind) + if (descriptor.Kind != TagHelperDescriptorBuilder.DescriptorKind) { // We only understand TagHelperDescriptors generated from ITagHelpers. return false; } - var descriptorTypeName = descriptor.Metadata[ITagHelperDescriptorBuilder.TypeNameKey]; + var descriptorTypeName = descriptor.Metadata[TagHelperDescriptorBuilder.TypeNameKey]; if (lookupInfo.TypePattern.EndsWith("*", StringComparison.Ordinal)) { diff --git a/src/Microsoft.AspNetCore.Razor.Language/ITagHelperDescriptorBuilder.cs b/src/Microsoft.AspNetCore.Razor.Language/TagHelperDescriptorBuilder.cs similarity index 87% rename from src/Microsoft.AspNetCore.Razor.Language/ITagHelperDescriptorBuilder.cs rename to src/Microsoft.AspNetCore.Razor.Language/TagHelperDescriptorBuilder.cs index e25321a3b6..9c37badcf6 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/ITagHelperDescriptorBuilder.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/TagHelperDescriptorBuilder.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Razor.Language.Legacy; namespace Microsoft.AspNetCore.Razor.Language { - public sealed class ITagHelperDescriptorBuilder + public sealed class TagHelperDescriptorBuilder { public static readonly string DescriptorKind = "ITagHelper"; public static readonly string TypeNameKey = "ITagHelper.TypeName"; @@ -26,19 +26,19 @@ namespace Microsoft.AspNetCore.Razor.Language private readonly Dictionary _metadata; private HashSet _diagnostics; - private ITagHelperDescriptorBuilder(string typeName, string assemblyName) + private TagHelperDescriptorBuilder(string typeName, string assemblyName) { _typeName = typeName; _assemblyName = assemblyName; _metadata = new Dictionary(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) { @@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.Razor.Language return this; } - public ITagHelperDescriptorBuilder BindAttribute(Action configure) + public TagHelperDescriptorBuilder BindAttribute(Action configure) { if (configure == null) { @@ -67,7 +67,7 @@ namespace Microsoft.AspNetCore.Razor.Language return BindAttribute(attributeDescriptor); } - public ITagHelperDescriptorBuilder TagMatchingRule(TagMatchingRule rule) + public TagHelperDescriptorBuilder TagMatchingRule(TagMatchingRule rule) { if (rule == null) { @@ -80,7 +80,7 @@ namespace Microsoft.AspNetCore.Razor.Language return this; } - public ITagHelperDescriptorBuilder TagMatchingRule(Action configure) + public TagHelperDescriptorBuilder TagMatchingRule(Action configure) { if (configure == null) { @@ -96,7 +96,7 @@ namespace Microsoft.AspNetCore.Razor.Language return TagMatchingRule(rule); } - public ITagHelperDescriptorBuilder AllowChildTag(string allowedChild) + public TagHelperDescriptorBuilder AllowChildTag(string allowedChild) { EnsureAllowedChildTags(); _allowedChildTags.Add(allowedChild); @@ -104,28 +104,28 @@ namespace Microsoft.AspNetCore.Razor.Language return this; } - public ITagHelperDescriptorBuilder TagOutputHint(string hint) + public TagHelperDescriptorBuilder TagOutputHint(string hint) { _tagOutputHint = hint; return this; } - public ITagHelperDescriptorBuilder Documentation(string documentation) + public TagHelperDescriptorBuilder Documentation(string documentation) { _documentation = documentation; return this; } - public ITagHelperDescriptorBuilder AddMetadata(string key, string value) + public TagHelperDescriptorBuilder AddMetadata(string key, string value) { _metadata[key] = value; return this; } - public ITagHelperDescriptorBuilder AddDiagnostic(RazorDiagnostic diagnostic) + public TagHelperDescriptorBuilder AddDiagnostic(RazorDiagnostic diagnostic) { EnsureDiagnostics(); _diagnostics.Add(diagnostic); diff --git a/src/Microsoft.CodeAnalysis.Razor/DefaultTagHelperDescriptorFactory.cs b/src/Microsoft.CodeAnalysis.Razor/DefaultTagHelperDescriptorFactory.cs index e015722323..fc5fe6f567 100644 --- a/src/Microsoft.CodeAnalysis.Razor/DefaultTagHelperDescriptorFactory.cs +++ b/src/Microsoft.CodeAnalysis.Razor/DefaultTagHelperDescriptorFactory.cs @@ -73,7 +73,7 @@ namespace Microsoft.CodeAnalysis.Razor var typeName = GetFullName(type); var assemblyName = type.ContainingAssembly.Identity.Name; - var descriptorBuilder = ITagHelperDescriptorBuilder.Create(typeName, assemblyName); + var descriptorBuilder = TagHelperDescriptorBuilder.Create(typeName, assemblyName); AddBoundAttributes(type, descriptorBuilder); AddTagMatchingRules(type, descriptorBuilder); @@ -86,7 +86,7 @@ namespace Microsoft.CodeAnalysis.Razor return descriptor; } - private void AddTagMatchingRules(INamedTypeSymbol type, ITagHelperDescriptorBuilder descriptorBuilder) + private void AddTagMatchingRules(INamedTypeSymbol type, TagHelperDescriptorBuilder descriptorBuilder) { var targetElementAttributes = type .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); 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(); 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) { @@ -181,7 +181,7 @@ namespace Microsoft.CodeAnalysis.Razor } } - private void AddTagOutputHint(INamedTypeSymbol type, ITagHelperDescriptorBuilder builder) + private void AddTagOutputHint(INamedTypeSymbol type, TagHelperDescriptorBuilder builder) { if (!DesignTime) { diff --git a/src/Microsoft.CodeAnalysis.Razor/ViewComponentTagHelperDescriptorFactory.cs b/src/Microsoft.CodeAnalysis.Razor/ViewComponentTagHelperDescriptorFactory.cs index 938d5f52bb..52c6902afa 100644 --- a/src/Microsoft.CodeAnalysis.Razor/ViewComponentTagHelperDescriptorFactory.cs +++ b/src/Microsoft.CodeAnalysis.Razor/ViewComponentTagHelperDescriptorFactory.cs @@ -35,7 +35,7 @@ namespace Microsoft.CodeAnalysis.Razor var shortName = GetShortName(type); var tagName = $"vc:{DefaultTagHelperDescriptorFactory.ToHtmlCase(shortName)}"; var typeName = $"__Generated__{shortName}ViewComponentTagHelper"; - var descriptorBuilder = ITagHelperDescriptorBuilder.Create(typeName, assemblyName); + var descriptorBuilder = TagHelperDescriptorBuilder.Create(typeName, assemblyName); var methodParameters = GetInvokeMethodParameters(type); descriptorBuilder.TagMatchingRule(ruleBuilder => { @@ -68,7 +68,7 @@ namespace Microsoft.CodeAnalysis.Razor } } - private void AddBoundAttributes(ImmutableArray methodParameters, ITagHelperDescriptorBuilder builder) + private void AddBoundAttributes(ImmutableArray methodParameters, TagHelperDescriptorBuilder builder) { foreach (var parameter in methodParameters) { diff --git a/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultTagHelperResolver.cs b/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultTagHelperResolver.cs index 3492c83353..09d4901ce0 100644 --- a/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultTagHelperResolver.cs +++ b/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultTagHelperResolver.cs @@ -112,7 +112,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor continue; } - var typeName = tagHelper.Metadata[ITagHelperDescriptorBuilder.TypeNameKey]; + var typeName = tagHelper.Metadata[TagHelperDescriptorBuilder.TypeNameKey]; var symbol = compilation.GetTypeByMetadataName(typeName); if (symbol != null) { @@ -186,9 +186,9 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor 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) { diff --git a/src/Microsoft.VisualStudio.LanguageServices.Razor/TagHelperDescriptorJsonConverter.cs b/src/Microsoft.VisualStudio.LanguageServices.Razor/TagHelperDescriptorJsonConverter.cs index 6a30cc934f..e32c18a74e 100644 --- a/src/Microsoft.VisualStudio.LanguageServices.Razor/TagHelperDescriptorJsonConverter.cs +++ b/src/Microsoft.VisualStudio.LanguageServices.Razor/TagHelperDescriptorJsonConverter.cs @@ -39,7 +39,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor var diagnostics = descriptor[nameof(TagHelperDescriptor.Diagnostics)].Value(); var metadata = descriptor[nameof(TagHelperDescriptor.Metadata)].Value(); - var builder = ITagHelperDescriptorBuilder.Create(typeName, assemblyName); + var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName); builder .Documentation(documentation) diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/IntegrationTests/CodeGenerationIntegrationTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/IntegrationTests/CodeGenerationIntegrationTest.cs index 779a691a3a..a195666fad 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/IntegrationTests/CodeGenerationIntegrationTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/IntegrationTests/CodeGenerationIntegrationTest.cs @@ -439,7 +439,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.IntegrationTests string typeName, string assemblyName) { - return ITagHelperDescriptorBuilder.Create(typeName, assemblyName) + return TagHelperDescriptorBuilder.Create(typeName, assemblyName) .TagMatchingRule(ruleBuilder => ruleBuilder.RequireTagName(tagName)) .Build(); } diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ModelExpressionPassTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ModelExpressionPassTest.cs index 13871526a6..0a22d698f4 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ModelExpressionPassTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ModelExpressionPassTest.cs @@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions var tagHelpers = new[] { - ITagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly") .BindAttribute(attribute => attribute .Name("Foo") @@ -65,7 +65,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions var tagHelpers = new[] { - ITagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly") .BindAttribute(attribute => attribute .Name("Foo") @@ -110,7 +110,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions var tagHelpers = new[] { - ITagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly") .BindAttribute(attribute => attribute .Name("Foo") diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperDescriptorConventionsTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperDescriptorConventionsTest.cs index 14804faece..f0bd076179 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperDescriptorConventionsTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperDescriptorConventionsTest.cs @@ -38,7 +38,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions private static TagHelperDescriptor CreateTagHelperDescriptor() { - var descriptor = ITagHelperDescriptorBuilder.Create("TypeName", "AssemblyName") + var descriptor = TagHelperDescriptorBuilder.Create("TypeName", "AssemblyName") .TagMatchingRule(rule => rule.RequireTagName("tag-name")) .Build(); @@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions private static TagHelperDescriptor CreateViewComponentTagHelperDescriptor() { - var descriptor = ITagHelperDescriptorBuilder.Create("TypeName", "AssemblyName") + var descriptor = TagHelperDescriptorBuilder.Create("TypeName", "AssemblyName") .TagMatchingRule(rule => rule.RequireTagName("tag-name")) .AddMetadata(ViewComponentTagHelperDescriptorConventions.ViewComponentNameKey, "ViewComponentName") diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperPassTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperPassTest.cs index 91647039f4..c80f07367f 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperPassTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/ViewComponentTagHelperPassTest.cs @@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions var tagHelpers = new[] { - ITagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly") .BindAttribute(attribute => attribute .Name("Foo") @@ -63,7 +63,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions var tagHelpers = new[] { - ITagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly") .BindAttribute(attribute => attribute .Name("Foo") @@ -135,7 +135,7 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore. var tagHelpers = new[] { - ITagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly") .BindAttribute(attribute => attribute .Name("Foo") @@ -208,7 +208,7 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore. var tagHelpers = new[] { - ITagHelperDescriptorBuilder.Create("PTestTagHelper", "TestAssembly") + TagHelperDescriptorBuilder.Create("PTestTagHelper", "TestAssembly") .BindAttribute(attribute => attribute .Name("Foo") @@ -216,7 +216,7 @@ public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore. .TagMatchingRule(rule => rule.RequireTagName("p")) .Build(), - ITagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestTagHelper", "TestAssembly") .BindAttribute(attribute => attribute .Name("Foo") diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIRLoweringPhaseIntegrationTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIRLoweringPhaseIntegrationTest.cs index 3359877a5b..44f58f4108 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIRLoweringPhaseIntegrationTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorIRLoweringPhaseIntegrationTest.cs @@ -489,7 +489,7 @@ namespace Microsoft.AspNetCore.Razor.Language string assemblyName, IEnumerable> attributes = null) { - var builder = ITagHelperDescriptorBuilder.Create(typeName, assemblyName); + var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName); if (attributes != null) { diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/InstrumentationPassIntegrationTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/InstrumentationPassIntegrationTest.cs index ba16858237..5c6605caa3 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/InstrumentationPassIntegrationTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/InstrumentationPassIntegrationTest.cs @@ -65,7 +65,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests string assemblyName, IEnumerable> attributes = null) { - var builder = ITagHelperDescriptorBuilder.Create(typeName, assemblyName); + var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName); if (attributes != null) { diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/TagHelpersIntegrationTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/TagHelpersIntegrationTest.cs index e27e0241c7..e15f9f6258 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/TagHelpersIntegrationTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/IntegrationTests/TagHelpersIntegrationTest.cs @@ -103,7 +103,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests string assemblyName, IEnumerable> attributes = null) { - var builder = ITagHelperDescriptorBuilder.Create(typeName, assemblyName); + var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName); if (attributes != null) { diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/RazorEditorParserTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/RazorEditorParserTest.cs index b1038b63ce..af34aaaa69 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/RazorEditorParserTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/RazorEditorParserTest.cs @@ -86,7 +86,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Arrange var descriptors = new[] { - ITagHelperDescriptorBuilder.Create("PTagHelper", "TestAssembly") + TagHelperDescriptorBuilder.Create("PTagHelper", "TestAssembly") .TagMatchingRule(rule => rule.RequireTagName("p")) .Build() }; @@ -231,7 +231,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Arrange var descriptors = new[] { - ITagHelperDescriptorBuilder.Create("PTagHelper", "Test") + TagHelperDescriptorBuilder.Create("PTagHelper", "Test") .TagMatchingRule(rule => rule.RequireTagName("p")) .BindAttribute(attribute => attribute .Name("obj-attr") diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperBlockRewriterTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperBlockRewriterTest.cs index cf2dd4ae71..e79df95330 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperBlockRewriterTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperBlockRewriterTest.cs @@ -111,7 +111,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Arrange var descriptors = new[] { - ITagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("*") @@ -216,7 +216,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Arrange var descriptors = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("input") @@ -315,13 +315,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var blockFactory = new BlockFactory(factory); var descriptors = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("InputTagHelper1", "SomeAssembly") + TagHelperDescriptorBuilder.Create("InputTagHelper1", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("input") .RequireTagStructure(structure1)) .Build(), - ITagHelperDescriptorBuilder.Create("InputTagHelper2", "SomeAssembly") + TagHelperDescriptorBuilder.Create("InputTagHelper2", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("input") @@ -1193,7 +1193,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Arrange var descriptors = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("PersonTagHelper", "personAssembly") + TagHelperDescriptorBuilder.Create("PersonTagHelper", "personAssembly") .TagMatchingRule(rule => rule.RequireTagName("person")) .BindAttribute(attribute => attribute @@ -2231,7 +2231,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Arrange var descriptors = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("mythTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("mythTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("myth")) .BindAttribute(attribute => attribute @@ -3880,7 +3880,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Arrange var descriptors = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("InputTagHelper1", "SomeAssembly") + TagHelperDescriptorBuilder.Create("InputTagHelper1", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("input") @@ -3895,7 +3895,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy .PropertyName("BoundRequiredString") .TypeName(typeof(string).FullName)) .Build(), - ITagHelperDescriptorBuilder.Create("InputTagHelper2", "SomeAssembly") + TagHelperDescriptorBuilder.Create("InputTagHelper2", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("input") @@ -3906,7 +3906,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy .PropertyName("BoundRequiredInt") .TypeName(typeof(int).FullName)) .Build(), - ITagHelperDescriptorBuilder.Create("InputTagHelper3", "SomeAssembly") + TagHelperDescriptorBuilder.Create("InputTagHelper3", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("input")) .BindAttribute(attribute => attribute @@ -3921,7 +3921,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy .TypeName(typeof(IDictionary).Namespace + ".IDictionary") .AsDictionary("string-prefix-", typeof(string).FullName)) .Build(), - ITagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("p")) .BindAttribute(attribute => attribute diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperDescriptorProviderTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperDescriptorProviderTest.cs index 0933454431..fc62962df5 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperDescriptorProviderTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperDescriptorProviderTest.cs @@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { get { - var strongPDivParent = ITagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") + var strongPDivParent = TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("strong") @@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy .RequireTagName("strong") .RequireParentTag("div")) .Build(); - var catchAllPParent = ITagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly") + var catchAllPParent = TagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("*") @@ -90,20 +90,20 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { get { - var divDescriptor = ITagHelperDescriptorBuilder.Create("DivTagHelper", "SomeAssembly") + var divDescriptor = TagHelperDescriptorBuilder.Create("DivTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("div") .RequireAttribute(attribute => attribute.Name("style"))) .Build(); - var inputDescriptor = ITagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly") + var inputDescriptor = TagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("input") .RequireAttribute(attribute => attribute.Name("class")) .RequireAttribute(attribute => attribute.Name("style"))) .Build(); - var inputWildcardPrefixDescriptor = ITagHelperDescriptorBuilder.Create("InputWildCardAttribute", "SomeAssembly") + var inputWildcardPrefixDescriptor = TagHelperDescriptorBuilder.Create("InputWildCardAttribute", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("input") @@ -112,20 +112,20 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy .Name("nodashprefix") .NameComparisonMode(RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch))) .Build(); - var catchAllDescriptor = ITagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly") + var catchAllDescriptor = TagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName(TagHelperMatchingConventions.ElementCatchAllName) .RequireAttribute(attribute => attribute.Name("class"))) .Build(); - var catchAllDescriptor2 = ITagHelperDescriptorBuilder.Create("CatchAllTagHelper2", "SomeAssembly") + var catchAllDescriptor2 = TagHelperDescriptorBuilder.Create("CatchAllTagHelper2", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName(TagHelperMatchingConventions.ElementCatchAllName) .RequireAttribute(attribute => attribute.Name("custom")) .RequireAttribute(attribute => attribute.Name("class"))) .Build(); - var catchAllWildcardPrefixDescriptor = ITagHelperDescriptorBuilder.Create("CatchAllWildCardAttribute", "SomeAssembly") + var catchAllWildcardPrefixDescriptor = TagHelperDescriptorBuilder.Create("CatchAllWildCardAttribute", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName(TagHelperMatchingConventions.ElementCatchAllName) @@ -253,7 +253,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public void GetTagHelperBinding_ReturnsNullBindingResultPrefixAsTagName() { // Arrange - var catchAllDescriptor = ITagHelperDescriptorBuilder.Create("foo1", "SomeAssembly") + var catchAllDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName(TagHelperMatchingConventions.ElementCatchAllName)) .Build(); var descriptors = new[] { catchAllDescriptor }; @@ -273,7 +273,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public void GetTagHelperBinding_ReturnsBindingResultCatchAllDescriptorsForPrefixedTags() { // Arrange - var catchAllDescriptor = ITagHelperDescriptorBuilder.Create("foo1", "SomeAssembly") + var catchAllDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName(TagHelperMatchingConventions.ElementCatchAllName)) .Build(); var descriptors = new[] { catchAllDescriptor }; @@ -300,7 +300,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public void GetTagHelperBinding_ReturnsBindingResultDescriptorsForPrefixedTags() { // Arrange - var divDescriptor = ITagHelperDescriptorBuilder.Create("foo1", "SomeAssembly") + var divDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("div")) .Build(); var descriptors = new[] { divDescriptor }; @@ -323,7 +323,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public void GetTagHelperBinding_ReturnsNullForUnprefixedTags(string tagName) { // Arrange - var divDescriptor = ITagHelperDescriptorBuilder.Create("foo1", "SomeAssembly") + var divDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName(tagName)) .Build(); var descriptors = new[] { divDescriptor }; @@ -343,10 +343,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public void GetDescriptors_ReturnsNothingForUnregisteredTags() { // Arrange - var divDescriptor = ITagHelperDescriptorBuilder.Create("foo1", "SomeAssembly") + var divDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("div")) .Build(); - var spanDescriptor = ITagHelperDescriptorBuilder.Create("foo2", "SomeAssembly") + var spanDescriptor = TagHelperDescriptorBuilder.Create("foo2", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("span")) .Build(); var descriptors = new TagHelperDescriptor[] { divDescriptor, spanDescriptor }; @@ -366,13 +366,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public void GetDescriptors_ReturnsCatchAllsWithEveryTagName() { // Arrange - var divDescriptor = ITagHelperDescriptorBuilder.Create("foo1", "SomeAssembly") + var divDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("div")) .Build(); - var spanDescriptor = ITagHelperDescriptorBuilder.Create("foo2", "SomeAssembly") + var spanDescriptor = TagHelperDescriptorBuilder.Create("foo2", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("span")) .Build(); - var catchAllDescriptor = ITagHelperDescriptorBuilder.Create("foo3", "SomeAssembly") + var catchAllDescriptor = TagHelperDescriptorBuilder.Create("foo3", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName(TagHelperMatchingConventions.ElementCatchAllName)) .Build(); var descriptors = new TagHelperDescriptor[] { divDescriptor, spanDescriptor, catchAllDescriptor }; @@ -404,7 +404,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public void GetDescriptors_DuplicateDescriptorsAreNotPartOfTagHelperDescriptorPool() { // Arrange - var divDescriptor = ITagHelperDescriptorBuilder.Create("foo1", "SomeAssembly") + var divDescriptor = TagHelperDescriptorBuilder.Create("foo1", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("div")) .Build(); var descriptors = new TagHelperDescriptor[] { divDescriptor, divDescriptor }; @@ -425,7 +425,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public void GetTagHelperBinding_DescriptorWithMultipleRules_CorrectlySelectsMatchingRules() { // Arrange - var multiRuleDescriptor = ITagHelperDescriptorBuilder.Create("foo", "SomeAssembly") + var multiRuleDescriptor = TagHelperDescriptorBuilder.Create("foo", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName(TagHelperMatchingConventions.ElementCatchAllName) .RequireParentTag("body")) diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperParseTreeRewriterTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperParseTreeRewriterTest.cs index 5df65e0f09..dd36773127 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperParseTreeRewriterTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperParseTreeRewriterTest.cs @@ -160,14 +160,14 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Arrange var descriptors = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("strong")) .TagMatchingRule(rule => rule.RequireTagName("div")) .Build(), - ITagHelperDescriptorBuilder.Create("CatchALlTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("CatchALlTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("*")) .Build(), - ITagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("p")) .Build(), }; @@ -258,13 +258,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Arrange var descriptors = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("input") .RequireTagStructure(TagStructure.WithoutEndTag)) .Build(), - ITagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("strong") @@ -274,7 +274,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy .RequireTagName("strong") .RequireParentTag("input")) .Build(), - ITagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("p")) .Build(), }; @@ -340,7 +340,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Arrange var descriptors = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("strong") @@ -350,7 +350,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy .RequireTagName("strong") .RequireParentTag("div")) .Build(), - ITagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("p")) .Build(), }; @@ -370,11 +370,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("th:strong"))); var descriptors = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("p")) .AllowChildTag("strong") .Build(), - ITagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("strong")) .Build(), }; @@ -682,7 +682,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy factory.Markup(Environment.NewLine))); var descriptors = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("p")) .AllowChildTag("br") .Build() @@ -719,7 +719,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy blockFactory.MarkupTagBlock(""))); var descriptors = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("strong") @@ -746,18 +746,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("br", TagMode.StartTagOnly))); var descriptors = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("PTagHelper1", "SomeAssembly") + TagHelperDescriptorBuilder.Create("PTagHelper1", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("p")) .AllowChildTag("strong") .AllowChildTag("br") .Build(), - ITagHelperDescriptorBuilder.Create("PTagHelper2", "SomeAssembly") + TagHelperDescriptorBuilder.Create("PTagHelper2", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("p")) .Build(), - ITagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("strong")) .Build(), - ITagHelperDescriptorBuilder.Create("BRTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("BRTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("br") @@ -783,18 +783,18 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy new MarkupTagHelperBlock("br", TagMode.StartTagOnly))); var descriptors = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("PTagHelper1", "SomeAssembly") + TagHelperDescriptorBuilder.Create("PTagHelper1", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("p")) .AllowChildTag("strong") .Build(), - ITagHelperDescriptorBuilder.Create("PTagHelper2", "SomeAssembly") + TagHelperDescriptorBuilder.Create("PTagHelper2", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("p")) .AllowChildTag("br") .Build(), - ITagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("strong")) .Build(), - ITagHelperDescriptorBuilder.Create("BRTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("BRTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("br") @@ -1021,9 +1021,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy object expectedErrors) { // Arrange - var pTagHelperBuilder = ITagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") + var pTagHelperBuilder = TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("p")); - var strongTagHelperBuilder = ITagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") + var strongTagHelperBuilder = TagHelperDescriptorBuilder.Create("StrongTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("strong")); foreach (var childTag in allowedChildren) @@ -1035,7 +1035,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy { pTagHelperBuilder.Build(), strongTagHelperBuilder.Build(), - ITagHelperDescriptorBuilder.Create("BRTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("BRTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("br") @@ -1055,11 +1055,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var documentContent = "

"; var descriptors = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("p")) .AllowChildTag("custom") .Build(), - ITagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("*")) .Build(), }; @@ -1088,11 +1088,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var documentContent = ""; var descriptors = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("PTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("p")) .AllowChildTag("custom") .Build(), - ITagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("CatchAllTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("*")) .Build(), }; @@ -1122,7 +1122,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var expectedOutput = new MarkupBlock(new MarkupTagHelperBlock("input", TagMode.StartTagOnly)); var descriptors = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("input") @@ -1154,7 +1154,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var expectedOutput = new MarkupBlock(blockFactory.MarkupTagBlock("")); var descriptors = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("InputTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("input") @@ -1187,13 +1187,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var expectedOutput = new MarkupBlock(new MarkupTagHelperBlock("input", TagMode.StartTagOnly)); var descriptors = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("InputTagHelper1", "SomeAssembly") + TagHelperDescriptorBuilder.Create("InputTagHelper1", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("input") .RequireTagStructure(TagStructure.WithoutEndTag)) .Build(), - ITagHelperDescriptorBuilder.Create("InputTagHelper2", "SomeAssembly") + TagHelperDescriptorBuilder.Create("InputTagHelper2", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("input") @@ -1610,20 +1610,20 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Arrange var descriptors = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("pTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("pTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("p") .RequireAttribute(attribute => attribute.Name("class"))) .Build(), - ITagHelperDescriptorBuilder.Create("divTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("divTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("div") .RequireAttribute(attribute => attribute.Name("class")) .RequireAttribute(attribute => attribute.Name("style"))) .Build(), - ITagHelperDescriptorBuilder.Create("catchAllTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("catchAllTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("*") @@ -1871,13 +1871,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Arrange var descriptors = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("pTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("pTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("p") .RequireAttribute(attribute => attribute.Name("class"))) .Build(), - ITagHelperDescriptorBuilder.Create("catchAllTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("catchAllTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("*") @@ -2093,7 +2093,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy // Arrange var descriptors = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("pTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("pTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule .RequireTagName("p") @@ -2114,10 +2114,10 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy var blockFactory = new BlockFactory(factory); var availableDescriptorsColon = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("mythTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("mythTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("myth")) .Build(), - ITagHelperDescriptorBuilder.Create("mythTagHelper2", "SomeAssembly") + TagHelperDescriptorBuilder.Create("mythTagHelper2", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("myth2")) .BindAttribute(attribute => attribute @@ -2128,7 +2128,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy }; var availableDescriptorsCatchAll = new TagHelperDescriptor[] { - ITagHelperDescriptorBuilder.Create("mythTagHelper", "SomeAssembly") + TagHelperDescriptorBuilder.Create("mythTagHelper", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName("*")) .Build(), }; diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperRewritingTestBase.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperRewritingTestBase.cs index 9b20b8792d..dae7c968ca 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperRewritingTestBase.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperRewritingTestBase.cs @@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy foreach (var tagName in tagNames) { - var descriptor = ITagHelperDescriptorBuilder.Create(tagName + "taghelper", "SomeAssembly") + var descriptor = TagHelperDescriptorBuilder.Create(tagName + "taghelper", "SomeAssembly") .TagMatchingRule(rule => rule.RequireTagName(tagName)) .Build(); descriptors.Add(descriptor); diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TagHelperBinderSyntaxTreePassTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/TagHelperBinderSyntaxTreePassTest.cs index 0c89220f3d..1ce4ae11f5 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/TagHelperBinderSyntaxTreePassTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TagHelperBinderSyntaxTreePassTest.cs @@ -1311,7 +1311,7 @@ namespace Microsoft.AspNetCore.Razor.Language IEnumerable> attributes = null, IEnumerable> ruleBuilders = null) { - var builder = ITagHelperDescriptorBuilder.Create(typeName, assemblyName); + var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName); if (attributes != null) { diff --git a/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/TestTagHelperDescriptors.cs b/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/TestTagHelperDescriptors.cs index ad40972883..a19488fdad 100644 --- a/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/TestTagHelperDescriptors.cs +++ b/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/TestTagHelperDescriptors.cs @@ -472,7 +472,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests IEnumerable> attributes = null, IEnumerable> ruleBuilders = null) { - var builder = ITagHelperDescriptorBuilder.Create(typeName, assemblyName); + var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName); if (attributes != null) { diff --git a/test/Microsoft.CodeAnalysis.Razor.Test/DefaultTagHelperDescriptorFactoryTest.cs b/test/Microsoft.CodeAnalysis.Razor.Test/DefaultTagHelperDescriptorFactoryTest.cs index 167cb48d3e..73c15373e1 100644 --- a/test/Microsoft.CodeAnalysis.Razor.Test/DefaultTagHelperDescriptorFactoryTest.cs +++ b/test/Microsoft.CodeAnalysis.Razor.Test/DefaultTagHelperDescriptorFactoryTest.cs @@ -321,7 +321,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces { { typeof(EnumTagHelper), - ITagHelperDescriptorBuilder.Create(typeof(EnumTagHelper).FullName, AssemblyName) + TagHelperDescriptorBuilder.Create(typeof(EnumTagHelper).FullName, AssemblyName) .TagMatchingRule(ruleBuilder => ruleBuilder.RequireTagName("enum")) .BindAttribute(builder => builder @@ -338,7 +338,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces }, { typeof(MultiEnumTagHelper), - ITagHelperDescriptorBuilder.Create(typeof(MultiEnumTagHelper).FullName, AssemblyName) + TagHelperDescriptorBuilder.Create(typeof(MultiEnumTagHelper).FullName, AssemblyName) .TagMatchingRule(ruleBuilder => ruleBuilder.RequireTagName("p")) .TagMatchingRule(ruleBuilder => ruleBuilder.RequireTagName("input")) .BindAttribute(builder => @@ -384,20 +384,20 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces { { typeof(RequiredParentTagHelper), - ITagHelperDescriptorBuilder.Create(typeof(RequiredParentTagHelper).FullName, AssemblyName) + TagHelperDescriptorBuilder.Create(typeof(RequiredParentTagHelper).FullName, AssemblyName) .TagMatchingRule(builder => builder.RequireTagName("input").RequireParentTag("div")) .Build() }, { 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("input").RequireParentTag("section")) .Build() }, { typeof(MultiWithUnspecifiedRequiredParentTagHelper), - ITagHelperDescriptorBuilder.Create(typeof(MultiWithUnspecifiedRequiredParentTagHelper).FullName, AssemblyName) + TagHelperDescriptorBuilder.Create(typeof(MultiWithUnspecifiedRequiredParentTagHelper).FullName, AssemblyName) .TagMatchingRule(builder => builder.RequireTagName("p")) .TagMatchingRule(builder => builder.RequireTagName("input").RequireParentTag("div")) .Build() @@ -432,14 +432,14 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces { { typeof(RestrictChildrenTagHelper), - ITagHelperDescriptorBuilder.Create(typeof(RestrictChildrenTagHelper).FullName, AssemblyName) + TagHelperDescriptorBuilder.Create(typeof(RestrictChildrenTagHelper).FullName, AssemblyName) .TagMatchingRule(builder => builder.RequireTagName("restrict-children")) .AllowChildTag("p") .Build() }, { typeof(DoubleRestrictChildrenTagHelper), - ITagHelperDescriptorBuilder.Create(typeof(DoubleRestrictChildrenTagHelper).FullName, AssemblyName) + TagHelperDescriptorBuilder.Create(typeof(DoubleRestrictChildrenTagHelper).FullName, AssemblyName) .TagMatchingRule(builder => builder.RequireTagName("double-restrict-children")) .AllowChildTag("p") .AllowChildTag("strong") @@ -447,7 +447,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces }, { typeof(MultiTargetRestrictChildrenTagHelper), - ITagHelperDescriptorBuilder.Create(typeof(MultiTargetRestrictChildrenTagHelper).FullName, AssemblyName) + TagHelperDescriptorBuilder.Create(typeof(MultiTargetRestrictChildrenTagHelper).FullName, AssemblyName) .TagMatchingRule(builder => builder.RequireTagName("p")) .TagMatchingRule(builder => builder.RequireTagName("div")) .AllowChildTag("p") @@ -485,7 +485,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces { { typeof(TagStructureTagHelper), - ITagHelperDescriptorBuilder.Create(typeof(TagStructureTagHelper).FullName, AssemblyName) + TagHelperDescriptorBuilder.Create(typeof(TagStructureTagHelper).FullName, AssemblyName) .TagMatchingRule(builder => builder .RequireTagName("input") .RequireTagStructure(TagStructure.WithoutEndTag)) @@ -493,7 +493,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces }, { typeof(MultiSpecifiedTagStructureTagHelper), - ITagHelperDescriptorBuilder.Create(typeof(MultiSpecifiedTagStructureTagHelper).FullName, AssemblyName) + TagHelperDescriptorBuilder.Create(typeof(MultiSpecifiedTagStructureTagHelper).FullName, AssemblyName) .TagMatchingRule(builder => builder .RequireTagName("p") .RequireTagStructure(TagStructure.NormalOrSelfClosing)) @@ -504,7 +504,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces }, { typeof(MultiWithUnspecifiedTagStructureTagHelper), - ITagHelperDescriptorBuilder.Create(typeof(MultiWithUnspecifiedTagStructureTagHelper).FullName, AssemblyName) + TagHelperDescriptorBuilder.Create(typeof(MultiWithUnspecifiedTagStructureTagHelper).FullName, AssemblyName) .TagMatchingRule(builder => builder .RequireTagName("p")) .TagMatchingRule(builder => builder @@ -1985,7 +1985,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces { { typeof(MultipleDescriptorTagHelperWithOutputElementHint), - ITagHelperDescriptorBuilder.Create(typeof(MultipleDescriptorTagHelperWithOutputElementHint).FullName, AssemblyName) + TagHelperDescriptorBuilder.Create(typeof(MultipleDescriptorTagHelperWithOutputElementHint).FullName, AssemblyName) .TagMatchingRule(builder => builder.RequireTagName("a")) .TagMatchingRule(builder => builder.RequireTagName("p")) .TagOutputHint("div") @@ -1993,20 +1993,20 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces }, { typeof(InheritedOutputElementHintTagHelper), - ITagHelperDescriptorBuilder.Create(typeof(InheritedOutputElementHintTagHelper).FullName, AssemblyName) + TagHelperDescriptorBuilder.Create(typeof(InheritedOutputElementHintTagHelper).FullName, AssemblyName) .TagMatchingRule(builder => builder.RequireTagName("inherited-output-element-hint")) .Build() }, { typeof(OutputElementHintTagHelper), - ITagHelperDescriptorBuilder.Create(typeof(OutputElementHintTagHelper).FullName, AssemblyName) + TagHelperDescriptorBuilder.Create(typeof(OutputElementHintTagHelper).FullName, AssemblyName) .TagMatchingRule(builder => builder.RequireTagName("output-element-hint")) .TagOutputHint("hinted-value") .Build() }, { typeof(OverriddenOutputElementHintTagHelper), - ITagHelperDescriptorBuilder.Create(typeof(OverriddenOutputElementHintTagHelper).FullName, AssemblyName) + TagHelperDescriptorBuilder.Create(typeof(OverriddenOutputElementHintTagHelper).FullName, AssemblyName) .TagMatchingRule(builder => builder.RequireTagName("overridden-output-element-hint")) .TagOutputHint("overridden") .Build() @@ -2271,7 +2271,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces IEnumerable> attributes = null, IEnumerable> ruleBuilders = null) { - var builder = ITagHelperDescriptorBuilder.Create(typeName, assemblyName); + var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName); if (attributes != null) { diff --git a/test/Microsoft.CodeAnalysis.Razor.Test/ViewComponentTagHelperDescriptorFactoryTest.cs b/test/Microsoft.CodeAnalysis.Razor.Test/ViewComponentTagHelperDescriptorFactoryTest.cs index e3976031a6..35a39901a2 100644 --- a/test/Microsoft.CodeAnalysis.Razor.Test/ViewComponentTagHelperDescriptorFactoryTest.cs +++ b/test/Microsoft.CodeAnalysis.Razor.Test/ViewComponentTagHelperDescriptorFactoryTest.cs @@ -18,7 +18,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces var testCompilation = TestCompilation.Create(); var viewComponent = testCompilation.GetTypeByMetadataName(typeof(StringParameterViewComponent).FullName); var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation); - var expectedDescriptor = ITagHelperDescriptorBuilder.Create( + var expectedDescriptor = TagHelperDescriptorBuilder.Create( "__Generated__StringParameterViewComponentTagHelper", typeof(StringParameterViewComponent).GetTypeInfo().Assembly.GetName().Name) .TagMatchingRule(rule => @@ -53,7 +53,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces var testCompilation = TestCompilation.Create(); var viewComponent = testCompilation.GetTypeByMetadataName(typeof(VariousParameterViewComponent).FullName); var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation); - var expectedDescriptor = ITagHelperDescriptorBuilder.Create( + var expectedDescriptor = TagHelperDescriptorBuilder.Create( "__Generated__VariousParameterViewComponentTagHelper", typeof(VariousParameterViewComponent).GetTypeInfo().Assembly.GetName().Name) .TagMatchingRule(rule => @@ -95,7 +95,7 @@ namespace Microsoft.CodeAnalysis.Razor.Workspaces var testCompilation = TestCompilation.Create(); var viewComponent = testCompilation.GetTypeByMetadataName(typeof(GenericParameterViewComponent).FullName); var factory = new ViewComponentTagHelperDescriptorFactory(testCompilation); - var expectedDescriptor = ITagHelperDescriptorBuilder.Create( + var expectedDescriptor = TagHelperDescriptorBuilder.Create( "__Generated__GenericParameterViewComponentTagHelper", typeof(GenericParameterViewComponent).GetTypeInfo().Assembly.GetName().Name) .TagMatchingRule(rule => diff --git a/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/DefaultTagHelperFactsServiceTest.cs b/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/DefaultTagHelperFactsServiceTest.cs index 2ef35046e8..d9e9eb4f33 100644 --- a/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/DefaultTagHelperFactsServiceTest.cs +++ b/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/DefaultTagHelperFactsServiceTest.cs @@ -19,7 +19,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor // Arrange var documentDescriptors = new[] { - ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestType", "TestAssembly") .TagMatchingRule(rule => rule.RequireTagName("*")) .Build() }; @@ -39,7 +39,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor // Arrange var documentDescriptors = new[] { - ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestType", "TestAssembly") .TagMatchingRule(rule => rule .RequireTagName("a") @@ -56,7 +56,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor .PropertyName("AspRoute") .AsDictionary("asp-route-", typeof(string).FullName)) .Build(), - ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestType", "TestAssembly") .TagMatchingRule(rule => rule.RequireTagName("input")) .BindAttribute(attribute => attribute @@ -88,7 +88,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor // Arrange var documentDescriptors = new[] { - ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestType", "TestAssembly") .TagMatchingRule(rule => rule.RequireTagName("a")) .BindAttribute(attribute => attribute @@ -124,7 +124,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor // Arrange var documentDescriptors = new[] { - ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestType", "TestAssembly") .TagMatchingRule(rule => rule.RequireTagName("input")) .BindAttribute(attribute => attribute @@ -159,7 +159,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor // Arrange var documentDescriptors = new[] { - ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestType", "TestAssembly") .TagMatchingRule(rule => rule.RequireTagName("*")) .Build() }; @@ -179,7 +179,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor // Arrange var documentDescriptors = new[] { - ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestType", "TestAssembly") .TagMatchingRule(rule => rule.RequireTagName("strong")) .Build() }; @@ -199,7 +199,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor // Arrange var expectedDescriptors = new[] { - ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestType", "TestAssembly") .TagMatchingRule( rule => rule .RequireTagName("a") @@ -209,7 +209,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor var documentDescriptors = new[] { expectedDescriptors[0], - ITagHelperDescriptorBuilder.Create("TestType2", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestType2", "TestAssembly") .TagMatchingRule( rule => rule .RequireTagName("strong") @@ -232,14 +232,14 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor // Arrange var expectedDescriptors = new[] { - ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestType", "TestAssembly") .TagMatchingRule(rule => rule.RequireTagName("strong")) .Build() }; var documentDescriptors = new[] { expectedDescriptors[0], - ITagHelperDescriptorBuilder.Create("TestType2", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestType2", "TestAssembly") .TagMatchingRule(rule => rule.RequireTagName("thstrong")) .Build() }; @@ -259,7 +259,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor // Arrange var expectedDescriptors = new[] { - ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestType", "TestAssembly") .TagMatchingRule( rule => rule .RequireTagName("strong") @@ -269,7 +269,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor var documentDescriptors = new[] { expectedDescriptors[0], - ITagHelperDescriptorBuilder.Create("TestType2", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestType2", "TestAssembly") .TagMatchingRule( rule => rule .RequireTagName("strong") @@ -292,7 +292,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor // Arrange var documentDescriptors = new[] { - ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestType", "TestAssembly") .TagMatchingRule(rule => rule.RequireTagName("div")) .Build() }; @@ -312,7 +312,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor // Arrange var documentDescriptors = new[] { - ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestType", "TestAssembly") .TagMatchingRule(rule => rule.RequireTagName("div")) .Build() }; @@ -332,7 +332,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor // Arrange var expectedDescriptors = new[] { - ITagHelperDescriptorBuilder.Create("TestType", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestType", "TestAssembly") .TagMatchingRule( rule => rule .RequireTagName("p") @@ -342,7 +342,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor var documentDescriptors = new[] { expectedDescriptors[0], - ITagHelperDescriptorBuilder.Create("TestType2", "TestAssembly") + TagHelperDescriptorBuilder.Create("TestType2", "TestAssembly") .TagMatchingRule( rule => rule .RequireTagName("strong") diff --git a/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TagHelperDescriptorSerializationTest.cs b/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TagHelperDescriptorSerializationTest.cs index e9c867d754..7a0020c8e0 100644 --- a/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TagHelperDescriptorSerializationTest.cs +++ b/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/TagHelperDescriptorSerializationTest.cs @@ -151,9 +151,9 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor string assemblyName, IEnumerable> attributes = null, IEnumerable> ruleBuilders = null, - Action configureAction = null) + Action configureAction = null) { - var builder = ITagHelperDescriptorBuilder.Create(typeName, assemblyName); + var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName); if (attributes != null) { diff --git a/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/TagHelperViewModel.cs b/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/TagHelperViewModel.cs index aa7e523042..8b619dd15f 100644 --- a/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/TagHelperViewModel.cs +++ b/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/TagHelperViewModel.cs @@ -20,7 +20,7 @@ namespace Microsoft.VisualStudio.RazorExtension.RazorInfo 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 \ No newline at end of file