Address PR feedback from Larry

dotnet · Apr 1, 2016 · 42458ea · 42458ea
1 parent 0760f9d
commit 42458ea
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 26 deletions.
diff --git a/src/Microsoft.CodeAnalysis.Analyzers/Core/CodeAnalysisDiagnosticsResources.Designer.cs b/src/Microsoft.CodeAnalysis.Analyzers/Core/CodeAnalysisDiagnosticsResources.Designer.cs
diff --git a/src/Microsoft.CodeAnalysis.Analyzers/Core/CodeAnalysisDiagnosticsResources.resx b/src/Microsoft.CodeAnalysis.Analyzers/Core/CodeAnalysisDiagnosticsResources.resx
@@ -142,25 +142,25 @@
     <value>Apply DiagnosticAnalyzer attribute for both '{0}' and '{1}'.</value>
   </data>
   <data name="MissingSymbolKindArgumentToRegisterActionMessage" xml:space="preserve">
-    <value>Specify at least one SymbolKind of interest while registering a symbol analyzer action.</value>
+    <value>Specify at least one SymbolKind of interest when registering a symbol analyzer action.</value>
   </data>
   <data name="MissingSyntaxKindArgumentToRegisterActionMessage" xml:space="preserve">
-    <value>Specify at least one SyntaxKind of interest while registering a syntax node analyzer action.</value>
+    <value>Specify at least one SyntaxKind of interest when registering a syntax node analyzer action.</value>
   </data>
   <data name="MissingOperationKindArgumentToRegisterActionMessage" xml:space="preserve">
-    <value>Specify at least one OperationKind of interest while registering an operation analyzer action.</value>
+    <value>Specify at least one OperationKind of interest when registering an operation analyzer action.</value>
   </data>
   <data name="MissingKindArgumentToRegisterActionTitle" xml:space="preserve">
-    <value>Missing kind argument while registering an analyzer action.</value>
+    <value>Missing kind argument when registering an analyzer action.</value>
   </data>
   <data name="MissingKindArgumentToRegisterActionDescription" xml:space="preserve">
-    <value>You must specify at least one syntax/symbol/operation kinds of interest while registering a syntax/symbol/operation analyzer action. Otherwise, the registered action will be dead code and will never be invoked during analysis.</value>
+    <value>You must specify at least one syntax, symbol or operation kind when registering a syntax, symbol, or operation analyzer action respectively. Otherwise, the registered action will never be invoked during analysis.</value>
   </data>
   <data name="UnsupportedSymbolKindArgumentToRegisterActionMessage" xml:space="preserve">
     <value>SymbolKind '{0}' is not supported for symbol analyzer actions.</value>
   </data>
   <data name="UnsupportedSymbolKindArgumentToRegisterActionTitle" xml:space="preserve">
-    <value>Unsupported SymbolKind argument while registering a symbol analyzer action.</value>
+    <value>Unsupported SymbolKind argument when registering a symbol analyzer action.</value>
   </data>
   <data name="InvalidReportDiagnosticMessage" xml:space="preserve">
     <value>ReportDiagnostic invoked with an unsupported DiagnosticDescriptor '{0}'.</value>

diff --git a/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/RegisterActionAnalyzer.cs b/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/RegisterActionAnalyzer.cs
@@ -113,6 +113,8 @@ public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics
             {
                 return ImmutableArray.Create(
                     MissingSymbolKindArgumentRule,
+                    MissingSyntaxKindArgumentRule,
+                    MissingOperationKindArgumentRule,
                     UnsupportedSymbolKindArgumentRule,
                     InvalidSyntaxKindTypeArgumentRule,
                     StartActionWithNoRegisteredActionsRule,

diff --git a/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/ReportDiagnosticAnalyzer.cs b/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/ReportDiagnosticAnalyzer.cs
@@ -106,7 +106,7 @@ protected override DiagnosticAnalyzerSymbolAnalyzer GetDiagnosticAnalyzerSymbolA
                 return null;
             }
 
-            var contextTypes = ImmutableHashSet.Create(compilationEndAnalysisContext, codeBlockAnalysisContext,
+            ImmutableHashSet<INamedTypeSymbol> contextTypes = ImmutableHashSet.Create(compilationEndAnalysisContext, codeBlockAnalysisContext,
                 operationBlockAnalysisContext, operationAnalysisContext, semanticModelAnalysisContext, symbolAnalysisContext, syntaxNodeAnalysisContext, syntaxTreeAnalysisContext);
 
             return GetAnalyzer(contextTypes, diagnosticType, diagnosticDescriptorType, diagnosticAnalyzer, diagnosticAnalyzerAttribute);

diff --git a/...CodeAnalysis.Analyzers/Test/MetaAnalyzers/MissingKindArgumentToRegisterActionRuleTests.cs b/...CodeAnalysis.Analyzers/Test/MetaAnalyzers/MissingKindArgumentToRegisterActionRuleTests.cs
@@ -264,7 +264,7 @@ private static DiagnosticResult GetExpectedDiagnostic(string language, int line,
                     break;
 
                 default:
-                    throw new NotSupportedException();
+                    throw new ArgumentException("kind");
             }
 
             string fileName = language == LanguageNames.CSharp ? "Test0.cs" : "Test0.vb";

diff --git a/....CodeAnalysis.Analyzers/Test/MetaAnalyzers/StartActionWithNoRegisteredActionsRuleTests.cs b/....CodeAnalysis.Analyzers/Test/MetaAnalyzers/StartActionWithNoRegisteredActionsRuleTests.cs
@@ -206,7 +206,7 @@ private static void AnalyzeCodeBlockStart(CodeBlockStartAnalysisContext<SyntaxKi
         }
 
         [Fact]
-        public void CSharp_NoDiagnosticCases_3()
+        public void CSharp_NoDiagnosticCases_OperationAnalyzerRegistration()
         {
             var source = @"
 using System;
@@ -215,7 +215,7 @@ public void CSharp_NoDiagnosticCases_3()
 using Microsoft.CodeAnalysis.Diagnostics;
 
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
-abstract class MyAnalyzer : DiagnosticAnalyzer
+class MyAnalyzer : DiagnosticAnalyzer
 {
     public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics
     {
@@ -236,7 +236,7 @@ private static void AnalyzeOperation(OperationAnalysisContext context)
 }
 
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
-abstract class MyAnalyzer2 : DiagnosticAnalyzer
+class MyAnalyzer2 : DiagnosticAnalyzer
 {
     public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics
     {
@@ -259,7 +259,7 @@ private static void AnalyzeOperationBlock(OperationBlockAnalysisContext context)
         }
 
         [Fact]
-        public void CSharp_NoDiagnosticCases_4()
+        public void CSharp_NoDiagnosticCases_NestedOperationAnalyzerRegistration()
         {
             var source = @"
 using System;
@@ -268,7 +268,7 @@ public void CSharp_NoDiagnosticCases_4()
 using Microsoft.CodeAnalysis.Diagnostics;
 
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
-abstract class MyAnalyzer : DiagnosticAnalyzer
+class MyAnalyzer : DiagnosticAnalyzer
 {
     public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics
     {
@@ -315,7 +315,7 @@ private static void AnalyzeOperationBlockStart(OperationBlockStartAnalysisContex
 
             VerifyCSharp(source, addLanguageSpecificCodeAnalysisReference: false);
         }
-
+    
         [Fact]
         public void VisualBasic_NoDiagnosticCases()
         {
@@ -401,7 +401,7 @@ End Class
         }
 
         [Fact]
-        public void VisualBasic_NoDiagnosticCases_3()
+        public void VisualBasic_NoDiagnosticCases_OperationAnalyzerRegistration()
         {
             var source = @"
 Imports System
@@ -410,7 +410,7 @@ Imports Microsoft.CodeAnalysis
 Imports Microsoft.CodeAnalysis.Diagnostics
 
 <DiagnosticAnalyzer(LanguageNames.VisualBasic)> _
-MustInherit Class MyAnalyzer
+Class MyAnalyzer
 	Inherits DiagnosticAnalyzer
 	Public Overrides ReadOnly Property SupportedDiagnostics() As ImmutableArray(Of DiagnosticDescriptor)
 		Get
@@ -427,7 +427,7 @@ End Sub
 End Class
 
 <DiagnosticAnalyzer(LanguageNames.VisualBasic)> _
-MustInherit Class MyAnalyzer2
+Class MyAnalyzer2
 	Inherits DiagnosticAnalyzer
 	Public Overrides ReadOnly Property SupportedDiagnostics() As ImmutableArray(Of DiagnosticDescriptor)
 		Get
@@ -447,7 +447,7 @@ End Class
         }
 
         [Fact]
-        public void VisualBasic_NoDiagnosticCases_4()
+        public void VisualBasic_NoDiagnosticCases_NestedOperationAnalyzerRegistration()
         {
             var source = @"
 Imports System
@@ -540,7 +540,7 @@ private static DiagnosticResult GetExpectedDiagnostic(string language, int line,
                     break;
 
                 default:
-                    throw new NotSupportedException();
+                    throw new ArgumentException("kind");
             }
 
             string message = string.Format(CodeAnalysisDiagnosticsResources.StartActionWithNoRegisteredActionsMessage, parameterName, arg2);

diff --git a/...rosoft.CodeAnalysis.Analyzers/Test/MetaAnalyzers/StartActionWithOnlyEndActionRuleTests.cs b/...rosoft.CodeAnalysis.Analyzers/Test/MetaAnalyzers/StartActionWithOnlyEndActionRuleTests.cs
@@ -381,7 +381,7 @@ private static DiagnosticResult GetExpectedDiagnostic(string language, int line,
                     break;
 
                 default:
-                    throw new NotSupportedException();
+                    throw new ArgumentException("kind");
             }
 
             string message = string.Format(CodeAnalysisDiagnosticsResources.StartActionWithOnlyEndActionMessage, parameterName, endActionName, statelessActionName, arg4);