Fix nullref in ComponentsAnalyzer (#18608)

dotnet · Jan 28, 2020 · 5473500 · 5473500
1 parent 2481862
commit 5473500
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -30,6 +30,9 @@
     -->
     <IsStableBuild>false</IsStableBuild>
     <IsStableBuild Condition=" '$(DotNetFinalVersionKind)' == 'release' ">true</IsStableBuild>
+
+    <!-- Workaround issue with ComponentsAnalyzer throwing for interfaces -->
+    <DisableImplicitComponentsAnalyzers>true</DisableImplicitComponentsAnalyzers>
   </PropertyGroup>
 
   <Import Project="eng\FlakyTests.BeforeArcade.props" />

diff --git a/src/Components/Analyzers/src/InternalUsageAnalyzer.cs b/src/Components/Analyzers/src/InternalUsageAnalyzer.cs
@@ -126,7 +126,7 @@ private void AnalyzeSymbol(SymbolAnalysisContext context)
         // Similar logic here to VisitDeclarationSymbol, keep these in sync.
         private void VisitOperationSymbol(OperationAnalysisContext context, ISymbol symbol)
         {
-            if (symbol.ContainingAssembly == context.Compilation.Assembly)
+            if (symbol == null || symbol.ContainingAssembly == context.Compilation.Assembly)
             {
                 // The type is being referenced within the same assembly. This is valid use of an "internal" type
                 return;
@@ -155,7 +155,7 @@ private void VisitOperationSymbol(OperationAnalysisContext context, ISymbol symb
         // Similar logic here to VisitOperationSymbol, keep these in sync.
         private void VisitDeclarationSymbol(SymbolAnalysisContext context, ISymbol symbol, ISymbol symbolForDiagnostic)
         {
-            if (symbol.ContainingAssembly == context.Compilation.Assembly)
+            if (symbol == null || symbol.ContainingAssembly == context.Compilation.Assembly)
             {
                 // This is part of the compilation, avoid this analyzer when building from source.
                 return;

diff --git a/...estFiles/ComponentInternalUsageDiagnosticsAnalyzerTest/UsesRendererTypesInDeclarations.cs b/...estFiles/ComponentInternalUsageDiagnosticsAnalyzerTest/UsesRendererTypesInDeclarations.cs
@@ -22,11 +22,15 @@ protected override void HandleException(Exception exception)
             throw new NotImplementedException();
         }
 
-        /*MMParameter*/protected override Task UpdateDisplayAsync(in RenderBatch renderBatch) 
+        /*MMParameter*/protected override Task UpdateDisplayAsync(in RenderBatch renderBatch)
         {
             throw new NotImplementedException();
         }
 
         /*MMReturnType*/private Renderer GetRenderer() => _field;
+
+        public interface ITestInterface
+        {
+        }
     }
 }