From 01ec2202b2a35dfac350cbdcb797ce94c25ccd45 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Mon, 8 May 2017 15:39:47 -0700 Subject: [PATCH] Remove assembly name filter from THD API. - This parameter was always passed `null` by tooling in the past. #1279 --- .../DefaultTagHelperResolver.cs | 28 ++++++++----------- .../TagHelperResolver.cs | 5 ++-- .../RazorLanguageService.cs | 4 +-- .../DefaultTagHelperResolver.cs | 6 ++-- .../ITagHelperResolver.cs | 2 +- .../RazorInfo/RazorInfoViewModel.cs | 5 +--- 6 files changed, 20 insertions(+), 30 deletions(-) diff --git a/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultTagHelperResolver.cs b/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultTagHelperResolver.cs index 52b53906d9..21bd5ae0f6 100644 --- a/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultTagHelperResolver.cs +++ b/src/Microsoft.CodeAnalysis.Razor.Workspaces/DefaultTagHelperResolver.cs @@ -16,12 +16,12 @@ namespace Microsoft.CodeAnalysis.Razor public bool DesignTime { get; } - public override TagHelperResolutionResult GetTagHelpers(Compilation compilation, IEnumerable assemblyNameFilters) + public override TagHelperResolutionResult GetTagHelpers(Compilation compilation) { var descriptors = new List(); - VisitTagHelpers(compilation, assemblyNameFilters, descriptors); - VisitViewComponents(compilation, assemblyNameFilters, descriptors); + VisitTagHelpers(compilation, descriptors); + VisitViewComponents(compilation, descriptors); var diagnostics = new List(); var resolutionResult = new TagHelperResolutionResult(descriptors, diagnostics); @@ -29,7 +29,7 @@ namespace Microsoft.CodeAnalysis.Razor return resolutionResult; } - private void VisitTagHelpers(Compilation compilation, IEnumerable assemblyNameFilters, List results) + private void VisitTagHelpers(Compilation compilation, List results) { var types = new List(); var visitor = TagHelperTypeVisitor.Create(compilation, types); @@ -40,19 +40,16 @@ namespace Microsoft.CodeAnalysis.Razor foreach (var type in types) { - if (assemblyNameFilters == null || assemblyNameFilters.Contains(type.ContainingAssembly.Identity.Name)) - { - var descriptor = factory.CreateDescriptor(type); + var descriptor = factory.CreateDescriptor(type); - if (descriptor != null) - { - results.Add(descriptor); - } + if (descriptor != null) + { + results.Add(descriptor); } } } - private void VisitViewComponents(Compilation compilation, IEnumerable assemblyNameFilters, List results) + private void VisitViewComponents(Compilation compilation, List results) { var types = new List(); var visitor = ViewComponentTypeVisitor.Create(compilation, types); @@ -62,12 +59,9 @@ namespace Microsoft.CodeAnalysis.Razor var factory = new ViewComponentTagHelperDescriptorFactory(compilation); foreach (var type in types) { - if (assemblyNameFilters == null || assemblyNameFilters.Contains(type.ContainingAssembly.Identity.Name)) - { - var descriptor = factory.CreateDescriptor(type); + var descriptor = factory.CreateDescriptor(type); - results.Add(descriptor); - } + results.Add(descriptor); } } diff --git a/src/Microsoft.CodeAnalysis.Razor.Workspaces/TagHelperResolver.cs b/src/Microsoft.CodeAnalysis.Razor.Workspaces/TagHelperResolver.cs index d6f67ff082..175ea48620 100644 --- a/src/Microsoft.CodeAnalysis.Razor.Workspaces/TagHelperResolver.cs +++ b/src/Microsoft.CodeAnalysis.Razor.Workspaces/TagHelperResolver.cs @@ -10,15 +10,14 @@ namespace Microsoft.CodeAnalysis.Razor { internal abstract class TagHelperResolver : ILanguageService { - public abstract TagHelperResolutionResult GetTagHelpers(Compilation compilation, IEnumerable assemblyNameFilters); + public abstract TagHelperResolutionResult GetTagHelpers(Compilation compilation); public virtual async Task GetTagHelpersAsync( Project project, - IEnumerable assemblyNameFilters, CancellationToken cancellationToken = default(CancellationToken)) { var compilation = await project.GetCompilationAsync(cancellationToken).ConfigureAwait(false); - return GetTagHelpers(compilation, assemblyNameFilters); + return GetTagHelpers(compilation); } } } diff --git a/src/Microsoft.CodeAnalysis.Remote.Razor/RazorLanguageService.cs b/src/Microsoft.CodeAnalysis.Remote.Razor/RazorLanguageService.cs index bee6c963ea..981d28f526 100644 --- a/src/Microsoft.CodeAnalysis.Remote.Razor/RazorLanguageService.cs +++ b/src/Microsoft.CodeAnalysis.Remote.Razor/RazorLanguageService.cs @@ -27,7 +27,7 @@ namespace Microsoft.CodeAnalysis.Remote.Razor Rpc.StartListening(); } - public async Task GetTagHelpersAsync(Guid projectIdBytes, string projectDebugName, IEnumerable assemblyNameFilters, CancellationToken cancellationToken = default(CancellationToken)) + public async Task GetTagHelpersAsync(Guid projectIdBytes, string projectDebugName, CancellationToken cancellationToken = default(CancellationToken)) { var projectId = ProjectId.CreateFromSerialized(projectIdBytes, projectDebugName); @@ -35,7 +35,7 @@ namespace Microsoft.CodeAnalysis.Remote.Razor var project = solution.GetProject(projectId); var resolver = new DefaultTagHelperResolver(designTime: true); - var result = await resolver.GetTagHelpersAsync(project, assemblyNameFilters, cancellationToken).ConfigureAwait(false); + var result = await resolver.GetTagHelpersAsync(project, cancellationToken).ConfigureAwait(false); return result; } diff --git a/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultTagHelperResolver.cs b/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultTagHelperResolver.cs index f802b66e57..4b03ed2dec 100644 --- a/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultTagHelperResolver.cs +++ b/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultTagHelperResolver.cs @@ -24,7 +24,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor [Import] public SVsServiceProvider Services { get; set; } - public async Task GetTagHelpersAsync(Project project, IEnumerable assemblyNameFilters) + public async Task GetTagHelpersAsync(Project project) { try { @@ -43,7 +43,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor { var jsonObject = await session.InvokeAsync( "GetTagHelpersAsync", - new object[] { project.Id.Id, "Foo", assemblyNameFilters, }).ConfigureAwait(false); + new object[] { project.Id.Id, "Foo", }).ConfigureAwait(false); result = GetTagHelperResolutionResult(jsonObject); @@ -57,7 +57,7 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor // The OOP host is turned off, so let's do this in process. var resolver = new CodeAnalysis.Razor.DefaultTagHelperResolver(designTime: true); - result = await resolver.GetTagHelpersAsync(project, assemblyNameFilters, CancellationToken.None).ConfigureAwait(false); + result = await resolver.GetTagHelpersAsync(project, CancellationToken.None).ConfigureAwait(false); return result; } catch (Exception exception) diff --git a/src/Microsoft.VisualStudio.LanguageServices.Razor/ITagHelperResolver.cs b/src/Microsoft.VisualStudio.LanguageServices.Razor/ITagHelperResolver.cs index c994000795..5a0446c89d 100644 --- a/src/Microsoft.VisualStudio.LanguageServices.Razor/ITagHelperResolver.cs +++ b/src/Microsoft.VisualStudio.LanguageServices.Razor/ITagHelperResolver.cs @@ -10,6 +10,6 @@ namespace Microsoft.VisualStudio.LanguageServices.Razor { public interface ITagHelperResolver { - Task GetTagHelpersAsync(Project project, IEnumerable assemblyNameFilters); + Task GetTagHelpersAsync(Project project); } } diff --git a/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/RazorInfoViewModel.cs b/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/RazorInfoViewModel.cs index 4046b44fe7..1ca038199c 100644 --- a/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/RazorInfoViewModel.cs +++ b/tooling/Microsoft.VisualStudio.RazorExtension/RazorInfo/RazorInfoViewModel.cs @@ -175,10 +175,7 @@ namespace Microsoft.VisualStudio.RazorExtension.RazorInfo .Select(reference => reference.Display) .Select(filter => Path.GetFileNameWithoutExtension(filter)); var projectFilters = project.AllProjectReferences.Select(filter => solution.GetProject(filter.ProjectId).AssemblyName); - var tagHelperAssemblyFilters = assemblyFilters - .Concat(projectFilters) - .Concat(new[] { project.AssemblyName }); - var resolutionResult = await _tagHelperResolver.GetTagHelpersAsync(project, tagHelperAssemblyFilters); + var resolutionResult = await _tagHelperResolver.GetTagHelpersAsync(project); var files = GetCshtmlDocuments(project);