Use IAssemblySymbol for tag helper discovery (#30560)

captainsafia · web-flow · commit 407b197dd9f9 · 2021-03-02T16:04:20.000-08:00
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperDescriptorProvider.cs
@@ -38,13 +38,10 @@ public void Execute(TagHelperDescriptorProviderContext context)
             var types = new List<INamedTypeSymbol>();
             var visitor = new ViewComponentTypeVisitor(vcAttribute, nonVCAttribute, types);
 
-            var targetReference = context.Items.GetTargetMetadataReference();
-            if (targetReference is not null)
+            var targetAssembly = context.Items.GetTargetAssembly();
+            if (targetAssembly is not null)
             {
-                if (compilation.GetAssemblyOrModuleSymbol(targetReference) is IAssemblySymbol targetAssembly && IsTagHelperAssembly(targetAssembly))
-                {
-                    visitor.Visit(targetAssembly.GlobalNamespace);
-                }
+                visitor.Visit(targetAssembly.GlobalNamespace);
             }
             else
             {
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/BindTagHelperDescriptorProvider.cs
@@ -101,6 +101,12 @@ public void Execute(TagHelperDescriptorProviderContext context)
                 return;
             }
 
+            var targetAssembly = context.Items.GetTargetAssembly();
+            if (targetAssembly is not null && !SymbolEqualityComparer.Default.Equals(targetAssembly, bindMethods.ContainingAssembly))
+            {
+                return;
+            }
+
             // Tag Helper defintion for case #1. This is the most general case.
             context.Results.Add(CreateFallbackBindTagHelper());
 
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/ComponentTagHelperDescriptorProvider.cs
@@ -40,14 +40,10 @@ public void Execute(TagHelperDescriptorProviderContext context)
             var types = new List<INamedTypeSymbol>();
             var visitor = new ComponentTypeVisitor(symbols, types);
 
-            var targetReference = context.Items.GetTargetMetadataReference();
-            if (targetReference is not null)
+            var targetAssembly = context.Items.GetTargetAssembly();
+            if (targetAssembly is not null)
             {
-                if (compilation.GetAssemblyOrModuleSymbol(targetReference) is IAssemblySymbol targetAssembly)
-                {
-                    visitor.Visit(targetAssembly.GlobalNamespace);
-                }
-
+                visitor.Visit(targetAssembly.GlobalNamespace);
             }
             else
             {
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/DefaultTagHelperDescriptorProvider.cs
@@ -35,13 +35,10 @@ public void Execute(TagHelperDescriptorProviderContext context)
             var types = new List<INamedTypeSymbol>();
             var visitor = new TagHelperTypeVisitor(iTagHelper, types);
 
-            var targetReference = context.Items.GetTargetMetadataReference();
-            if (targetReference is not null)
+            var targetAssembly = context.Items.GetTargetAssembly();
+            if (targetAssembly is not null)
             {
-                if (compilation.GetAssemblyOrModuleSymbol(targetReference) is IAssemblySymbol targetAssembly && IsTagHelperAssembly(targetAssembly))
-                {
-                    visitor.Visit(targetAssembly.GlobalNamespace);
-                }
+                visitor.Visit(targetAssembly.GlobalNamespace);
             }
             else
             {
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/EventHandlerTagHelperDescriptorProvider.cs
@@ -47,15 +47,10 @@ private List<EventHandlerData> GetEventHandlerData(TagHelperDescriptorProviderCo
             var types = new List<INamedTypeSymbol>();
             var visitor = new EventHandlerDataVisitor(types);
 
-
-            var targetReference = context.Items.GetTargetMetadataReference();
-            if (targetReference is not null)
+            var targetAssembly = context.Items.GetTargetAssembly();
+            if (targetAssembly is not null)
             {
-                if (compilation.GetAssemblyOrModuleSymbol(targetReference) is IAssemblySymbol targetAssembly)
-                {
-                    visitor.Visit(targetAssembly.GlobalNamespace);
-                }
-
+                visitor.Visit(targetAssembly.GlobalNamespace);
             }
             else
             {
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/KeyTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/KeyTagHelperDescriptorProvider.cs
@@ -35,6 +35,12 @@ public void Execute(TagHelperDescriptorProviderContext context)
                 return;
             }
 
+            var targetAssembly = context.Items.GetTargetAssembly();
+            if (targetAssembly is not null && !SymbolEqualityComparer.Default.Equals(targetAssembly, renderTreeBuilderType.ContainingAssembly))
+            {
+                return;
+            }
+
             context.Results.Add(CreateKeyTagHelper());
         }
 
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/RefTagHelperDescriptorProvider.cs
@@ -35,6 +35,12 @@ public void Execute(TagHelperDescriptorProviderContext context)
                 return;
             }
 
+            var targetAssembly = context.Items.GetTargetAssembly();
+            if (targetAssembly is not null && !SymbolEqualityComparer.Default.Equals(targetAssembly, elementReference.ContainingAssembly))
+            {
+                return;
+            }
+
             context.Results.Add(CreateRefTagHelper());
         }
 
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/SplatTagHelperDescriptorProvider.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/SplatTagHelperDescriptorProvider.cs
@@ -35,6 +35,12 @@ public void Execute(TagHelperDescriptorProviderContext context)
                 return;
             }
 
+            var targetAssembly = context.Items.GetTargetAssembly();
+            if (targetAssembly is not null && !SymbolEqualityComparer.Default.Equals(targetAssembly, renderTreeBuilder.ContainingAssembly))
+            {
+                return;
+            }
+
             context.Results.Add(CreateSplatTagHelper());
         }
 
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/src/TagHelperTargetAssemblyExtensions.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/src/TagHelperTargetAssemblyExtensions.cs
@@ -7,23 +7,23 @@
 
 namespace Microsoft.CodeAnalysis.Razor
 {
-    internal static class TagHelperTargetReferenceExtensions
+    internal static class TagHelperTargetAssemblyExtensions
     {
         private static readonly object TargetAssemblyKey = new object();
 
-        public static MetadataReference? GetTargetMetadataReference(this ItemCollection items)
+        public static IAssemblySymbol? GetTargetAssembly(this ItemCollection items)
         {
-            if (items.Count == 0 || items[TargetAssemblyKey] is not MetadataReference reference)
+            if (items.Count == 0 || items[TargetAssemblyKey] is not IAssemblySymbol symbol)
             {
                 return null;
             }
 
-            return reference;
+            return symbol;
         }
 
-        public static void SetTargetMetadataReference(this ItemCollection items, MetadataReference reference)
+        public static void SetTargetAssembly(this ItemCollection items, IAssemblySymbol symbol)
         {
-            items[TargetAssemblyKey] = reference;
+            items[TargetAssemblyKey] = symbol;
         }
     }
 }
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
@@ -1617,7 +1617,7 @@ public Task SetParametersAsync(ParameterView parameters)
 
             var context = TagHelperDescriptorProviderContext.Create();
             context.SetCompilation(compilation);
-            context.Items.SetTargetMetadataReference(compilation.References.Single(r => r.Display.Contains("Microsoft.CodeAnalysis.Razor.Test.dll")));
+            context.Items.SetTargetAssembly((IAssemblySymbol) compilation.GetAssemblyOrModuleSymbol(compilation.References.First(r => r.Display.Contains("Microsoft.CodeAnalysis.Razor.Test.dll"))));
             var provider = new ComponentTagHelperDescriptorProvider();
 
             // Act
diff --git a/src/Razor/Microsoft.CodeAnalysis.Razor/test/DefaultTagHelperDescriptorProviderTest.cs b/src/Razor/Microsoft.CodeAnalysis.Razor/test/DefaultTagHelperDescriptorProviderTest.cs
@@ -85,7 +85,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output) {
         }
 
         [Fact]
-        public void Execute_WithTargetMetadataReference_Works()
+        public void Execute_WithTargetAssembly_Works()
         {
             // Arrange
             var testTagHelper = "TestAssembly.TestTagHelper";
@@ -104,7 +104,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output) {
 
             var context = TagHelperDescriptorProviderContext.Create();
             context.SetCompilation(compilation);
-            context.Items.SetTargetMetadataReference(compilation.References.First(r => r.Display.Contains("Microsoft.CodeAnalysis.Razor.Test.dll")));
+            context.Items.SetTargetAssembly((IAssemblySymbol) compilation.GetAssemblyOrModuleSymbol(compilation.References.First(r => r.Display.Contains("Microsoft.CodeAnalysis.Razor.Test.dll"))));
 
             // Act
             descriptorProvider.Execute(context);

Original file line number	Diff line number	Diff line change
`@@ -38,13 +38,10 @@ public void Execute(TagHelperDescriptorProviderContext context)`
`38`	`38`	`var types = new List<INamedTypeSymbol>();`
`39`	`39`	`var visitor = new ViewComponentTypeVisitor(vcAttribute, nonVCAttribute, types);`
`40`	`40`
`41`		`- var targetReference = context.Items.GetTargetMetadataReference();`
`42`		`- if (targetReference is not null)`
	`41`	`+ var targetAssembly = context.Items.GetTargetAssembly();`
	`42`	`+ if (targetAssembly is not null)`
`43`	`43`	`{`
`44`		`- if (compilation.GetAssemblyOrModuleSymbol(targetReference) is IAssemblySymbol targetAssembly && IsTagHelperAssembly(targetAssembly))`
`45`		`- {`
`46`		`- visitor.Visit(targetAssembly.GlobalNamespace);`
`47`		`- }`
	`44`	`+ visitor.Visit(targetAssembly.GlobalNamespace);`
`48`	`45`	`}`
`49`	`46`	`else`
`50`	`47`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,14 +40,10 @@ public void Execute(TagHelperDescriptorProviderContext context)`
`40`	`40`	`var types = new List<INamedTypeSymbol>();`
`41`	`41`	`var visitor = new ComponentTypeVisitor(symbols, types);`
`42`	`42`
`43`		`- var targetReference = context.Items.GetTargetMetadataReference();`
`44`		`- if (targetReference is not null)`
	`43`	`+ var targetAssembly = context.Items.GetTargetAssembly();`
	`44`	`+ if (targetAssembly is not null)`
`45`	`45`	`{`
`46`		`- if (compilation.GetAssemblyOrModuleSymbol(targetReference) is IAssemblySymbol targetAssembly)`
`47`		`- {`
`48`		`- visitor.Visit(targetAssembly.GlobalNamespace);`
`49`		`- }`
`50`		`-`
	`46`	`+ visitor.Visit(targetAssembly.GlobalNamespace);`
`51`	`47`	`}`
`52`	`48`	`else`
`53`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -35,13 +35,10 @@ public void Execute(TagHelperDescriptorProviderContext context)`
`35`	`35`	`var types = new List<INamedTypeSymbol>();`
`36`	`36`	`var visitor = new TagHelperTypeVisitor(iTagHelper, types);`
`37`	`37`
`38`		`- var targetReference = context.Items.GetTargetMetadataReference();`
`39`		`- if (targetReference is not null)`
	`38`	`+ var targetAssembly = context.Items.GetTargetAssembly();`
	`39`	`+ if (targetAssembly is not null)`
`40`	`40`	`{`
`41`		`- if (compilation.GetAssemblyOrModuleSymbol(targetReference) is IAssemblySymbol targetAssembly && IsTagHelperAssembly(targetAssembly))`
`42`		`- {`
`43`		`- visitor.Visit(targetAssembly.GlobalNamespace);`
`44`		`- }`
	`41`	`+ visitor.Visit(targetAssembly.GlobalNamespace);`
`45`	`42`	`}`
`46`	`43`	`else`
`47`	`44`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,15 +47,10 @@ private List<EventHandlerData> GetEventHandlerData(TagHelperDescriptorProviderCo`
`47`	`47`	`var types = new List<INamedTypeSymbol>();`
`48`	`48`	`var visitor = new EventHandlerDataVisitor(types);`
`49`	`49`
`50`		`-`
`51`		`- var targetReference = context.Items.GetTargetMetadataReference();`
`52`		`- if (targetReference is not null)`
	`50`	`+ var targetAssembly = context.Items.GetTargetAssembly();`
	`51`	`+ if (targetAssembly is not null)`
`53`	`52`	`{`
`54`		`- if (compilation.GetAssemblyOrModuleSymbol(targetReference) is IAssemblySymbol targetAssembly)`
`55`		`- {`
`56`		`- visitor.Visit(targetAssembly.GlobalNamespace);`
`57`		`- }`
`58`		`-`
	`53`	`+ visitor.Visit(targetAssembly.GlobalNamespace);`
`59`	`54`	`}`
`60`	`55`	`else`
`61`	`56`	`{`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,12 @@ public void Execute(TagHelperDescriptorProviderContext context)`
`35`	`35`	`return;`
`36`	`36`	`}`
`37`	`37`
	`38`	`+ var targetAssembly = context.Items.GetTargetAssembly();`
	`39`	`+ if (targetAssembly is not null && !SymbolEqualityComparer.Default.Equals(targetAssembly, renderTreeBuilderType.ContainingAssembly))`
	`40`	`+ {`
	`41`	`+ return;`
	`42`	`+ }`
	`43`	`+`
`38`	`44`	`context.Results.Add(CreateKeyTagHelper());`
`39`	`45`	`}`
`40`	`46`
Original file line number	Diff line number	Diff line change
`@@ -7,23 +7,23 @@`
`7`	`7`
`8`	`8`	`namespace Microsoft.CodeAnalysis.Razor`
`9`	`9`	`{`
`10`		`- internal static class TagHelperTargetReferenceExtensions`
	`10`	`+ internal static class TagHelperTargetAssemblyExtensions`
`11`	`11`	`{`
`12`	`12`	`private static readonly object TargetAssemblyKey = new object();`
`13`	`13`
`14`		`- public static MetadataReference? GetTargetMetadataReference(this ItemCollection items)`
	`14`	`+ public static IAssemblySymbol? GetTargetAssembly(this ItemCollection items)`
`15`	`15`	`{`
`16`		`- if (items.Count == 0 \|\| items[TargetAssemblyKey] is not MetadataReference reference)`
	`16`	`+ if (items.Count == 0 \|\| items[TargetAssemblyKey] is not IAssemblySymbol symbol)`
`17`	`17`	`{`
`18`	`18`	`return null;`
`19`	`19`	`}`
`20`	`20`
`21`		`- return reference;`
	`21`	`+ return symbol;`
`22`	`22`	`}`
`23`	`23`
`24`		`- public static void SetTargetMetadataReference(this ItemCollection items, MetadataReference reference)`
	`24`	`+ public static void SetTargetAssembly(this ItemCollection items, IAssemblySymbol symbol)`
`25`	`25`	`{`
`26`		`- items[TargetAssemblyKey] = reference;`
	`26`	`+ items[TargetAssemblyKey] = symbol;`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output) {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`[Fact]`
`88`		`- public void Execute_WithTargetMetadataReference_Works()`
	`88`	`+ public void Execute_WithTargetAssembly_Works()`
`89`	`89`	`{`
`90`	`90`	`// Arrange`
`91`	`91`	`var testTagHelper = "TestAssembly.TestTagHelper";`
`@@ -104,7 +104,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output) {`
`104`	`104`
`105`	`105`	`var context = TagHelperDescriptorProviderContext.Create();`
`106`	`106`	`context.SetCompilation(compilation);`
`107`		`- context.Items.SetTargetMetadataReference(compilation.References.First(r => r.Display.Contains("Microsoft.CodeAnalysis.Razor.Test.dll")));`
	`107`	`+ context.Items.SetTargetAssembly((IAssemblySymbol) compilation.GetAssemblyOrModuleSymbol(compilation.References.First(r => r.Display.Contains("Microsoft.CodeAnalysis.Razor.Test.dll"))));`
`108`	`108`
`109`	`109`	`// Act`
`110`	`110`	`descriptorProvider.Execute(context);`