Pranavs cool feedback

dotnet · May 23, 2019 · 6115c18 · 6115c18
1 parent ace1eb6
commit 6115c18
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 37 deletions.
diff --git a/src/Components/Analyzers/src/ComponentParameterAnalyzer.cs b/src/Components/Analyzers/src/ComponentParameterAnalyzer.cs
@@ -52,56 +52,58 @@ public override void Initialize(AnalysisContext context)
                         }
                     }
 
-                    if (properties.Count > 0)
+                    if (properties.Count == 0)
                     {
-                        context.RegisterSymbolEndAction(context =>
-                        {
-                            var captureUnmatchedValuesParameters = new List<IPropertySymbol>();
+                        return;
+                    }
+
+                    context.RegisterSymbolEndAction(context =>
+                    {
+                        var captureUnmatchedValuesParameters = new List<IPropertySymbol>();
 
                             // Per-property validations
                             foreach (var property in properties)
+                        {
+                            if (property.SetMethod?.DeclaredAccessibility == Accessibility.Public)
                             {
-                                if (property.SetMethod?.DeclaredAccessibility == Accessibility.Public)
-                                {
-                                    context.ReportDiagnostic(Diagnostic.Create(
-                                        DiagnosticDescriptors.ComponentParametersShouldNotBePublic,
-                                        property.Locations[0],
-                                        property.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat)));
-                                }
+                                context.ReportDiagnostic(Diagnostic.Create(
+                                    DiagnosticDescriptors.ComponentParametersShouldNotBePublic,
+                                    property.Locations[0],
+                                    property.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat)));
+                            }
 
-                                if (ComponentFacts.IsParameterWithCaptureUnmatchedValues(symbols, property))
-                                {
-                                    captureUnmatchedValuesParameters.Add(property);
+                            if (ComponentFacts.IsParameterWithCaptureUnmatchedValues(symbols, property))
+                            {
+                                captureUnmatchedValuesParameters.Add(property);
 
                                     // Check the type, we need to be able to assign a Dictionary<string, object>
                                     var conversion = context.Compilation.ClassifyConversion(symbols.ParameterCaptureUnmatchedValuesRuntimeType, property.Type);
-                                    if (!conversion.Exists || conversion.IsExplicit)
-                                    {
-                                        context.ReportDiagnostic(Diagnostic.Create(
-                                            DiagnosticDescriptors.ComponentParameterCaptureUnmatchedValuesHasWrongType,
-                                            property.Locations[0],
-                                            property.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat),
-                                            property.Type.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat),
-                                            symbols.ParameterCaptureUnmatchedValuesRuntimeType.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat)));
-                                    }
+                                if (!conversion.Exists || conversion.IsExplicit)
+                                {
+                                    context.ReportDiagnostic(Diagnostic.Create(
+                                        DiagnosticDescriptors.ComponentParameterCaptureUnmatchedValuesHasWrongType,
+                                        property.Locations[0],
+                                        property.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat),
+                                        property.Type.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat),
+                                        symbols.ParameterCaptureUnmatchedValuesRuntimeType.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat)));
                                 }
                             }
+                        }
 
                             // Check if the type defines multiple CaptureUnmatchedValues parameters. Doing this outside the loop means we place the
                             // errors on the type.
                             if (captureUnmatchedValuesParameters.Count > 1)
-                            {
-                                context.ReportDiagnostic(Diagnostic.Create(
-                                    DiagnosticDescriptors.ComponentParameterCaptureUnmatchedValuesMustBeUnique,
-                                    context.Symbol.Locations[0],
-                                    type.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat),
+                        {
+                            context.ReportDiagnostic(Diagnostic.Create(
+                                DiagnosticDescriptors.ComponentParameterCaptureUnmatchedValuesMustBeUnique,
+                                context.Symbol.Locations[0],
+                                type.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat),
+                                Environment.NewLine,
+                                string.Join(
                                     Environment.NewLine,
-                                    string.Join(
-                                        Environment.NewLine,
-                                        captureUnmatchedValuesParameters.Select(p => p.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat)).OrderBy(n => n))));
-                            }
-                        });
-                    }
+                                    captureUnmatchedValuesParameters.Select(p => p.ToDisplayString(SymbolDisplayFormat.CSharpErrorMessageFormat)).OrderBy(n => n))));
+                        }
+                    });
                 }, SymbolKind.NamedType);
             });
         }

diff --git a/src/Components/Analyzers/src/ComponentSymbols.cs b/src/Components/Analyzers/src/ComponentSymbols.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Collections.Generic;
 using Microsoft.CodeAnalysis;
 
 namespace Microsoft.AspNetCore.Components.Analyzers
@@ -29,7 +30,7 @@ public static bool TryCreate(Compilation compilation, out ComponentSymbols symbo
                 return false;
             }
 
-            var dictionary = compilation.GetTypeByMetadataName(ComponentsApi.SystemCollectionsGenericDictionary);
+            var dictionary = compilation.GetTypeByMetadataName(typeof(Dictionary<,>).FullName);
             var @string = compilation.GetSpecialType(SpecialType.System_String);
             var @object = compilation.GetSpecialType(SpecialType.System_Object);
             if (dictionary == null || @string == null || @object == null)

diff --git a/src/Components/Analyzers/src/ComponentsApi.cs b/src/Components/Analyzers/src/ComponentsApi.cs
@@ -7,8 +7,6 @@ namespace Microsoft.AspNetCore.Components.Analyzers
     // Keep these in sync with the actual definitions
     internal static class ComponentsApi
     {
-        public static readonly string SystemCollectionsGenericDictionary = "System.Collections.Generic.Dictionary`2";
-
         public static readonly string AssemblyName = "Microsoft.AspNetCore.Components";
 
         public static class ParameterAttribute