Added missing assertion; reduced type accessibility; removed unused code

bkoelman · Jul 5, 2018 · 7bbf4c3 · 7bbf4c3
1 parent 4fb228c
commit 7bbf4c3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/...rpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer.Test/CSharpGuidelinesAnalysisTestFixture.cs b/...rpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer.Test/CSharpGuidelinesAnalysisTestFixture.cs
@@ -5,7 +5,7 @@ namespace CSharpGuidelinesAnalyzer.Test
 {
     public abstract class CSharpGuidelinesAnalysisTestFixture : AnalysisTestFixture
     {
-        protected void VerifyGuidelineDiagnostic([NotNull] ParsedSourceCode source,
+        private protected void VerifyGuidelineDiagnostic([NotNull] ParsedSourceCode source,
             [NotNull] [ItemNotNull] params string[] messages)
         {
             Guard.NotNull(source, nameof(source));

diff --git a/src/CSharpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer.Test/ParsedSourceCode.cs b/src/CSharpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer.Test/ParsedSourceCode.cs
@@ -3,7 +3,7 @@
 
 namespace CSharpGuidelinesAnalyzer.Test
 {
-    public sealed class ParsedSourceCode
+    internal sealed class ParsedSourceCode
     {
         [NotNull]
         public AnalyzerTestContext TestContext { get; }

diff --git a/...harpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer.Test/TestDataBuilders/ITestDataBuilder.cs b/...harpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer.Test/TestDataBuilders/ITestDataBuilder.cs
@@ -2,7 +2,7 @@
 
 namespace CSharpGuidelinesAnalyzer.Test.TestDataBuilders
 {
-    public interface ITestDataBuilder<out T>
+    internal interface ITestDataBuilder<out T>
     {
         [NotNull]
         // ReSharper disable once UnusedMemberInSuper.Global

diff --git a/src/CSharpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer/Extensions/OperationExtensions.cs b/src/CSharpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer/Extensions/OperationExtensions.cs
@@ -26,7 +26,7 @@ public override IdentifierInfo VisitLocalReference([NotNull] ILocalReferenceOper
             {
                 var name = new IdentifierName(operation.Local.Name,
                     operation.Local.ToDisplayString(SymbolDisplayFormat.CSharpShortErrorMessageFormat));
-                return new IdentifierInfo(name, operation.Local.Type, "Variable");
+                return new IdentifierInfo(name, operation.Local.Type);
             }
 
             [NotNull]
@@ -36,7 +36,7 @@ public override IdentifierInfo VisitParameterReference([NotNull] IParameterRefer
                 var name = new IdentifierName(operation.Parameter.Name,
                     /* CSharpShortErrorMessageFormat returns 'int', ie. without parameter name */
                     operation.Parameter.Name);
-                return new IdentifierInfo(name, operation.Parameter.Type, operation.Parameter.Kind.ToString());
+                return new IdentifierInfo(name, operation.Parameter.Type);
             }
 
             [NotNull]
@@ -66,15 +66,15 @@ private IdentifierInfo CreateForMemberReferenceExpression([NotNull] IMemberRefer
             {
                 var name = new IdentifierName(operation.Member.Name,
                     operation.Member.ToDisplayString(SymbolDisplayFormat.CSharpShortErrorMessageFormat));
-                return new IdentifierInfo(name, memberType, operation.Member.Kind.ToString());
+                return new IdentifierInfo(name, memberType);
             }
 
             [NotNull]
             public override IdentifierInfo VisitInvocation([NotNull] IInvocationOperation operation, [CanBeNull] object argument)
             {
                 var name = new IdentifierName(operation.TargetMethod.Name,
                     operation.TargetMethod.ToDisplayString(SymbolDisplayFormat.CSharpShortErrorMessageFormat));
-                return new IdentifierInfo(name, operation.TargetMethod.ReturnType, operation.TargetMethod.GetKind());
+                return new IdentifierInfo(name, operation.TargetMethod.ReturnType);
             }
         }
 

diff --git a/src/CSharpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer/IdentifierInfo.cs b/src/CSharpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer/IdentifierInfo.cs
@@ -10,17 +10,12 @@ internal sealed class IdentifierInfo
         [NotNull]
         public ITypeSymbol Type { get; }
 
-        [NotNull]
-        public string Kind { get; }
-
-        public IdentifierInfo(IdentifierName name, [NotNull] ITypeSymbol type, [NotNull] string kind)
+        public IdentifierInfo(IdentifierName name, [NotNull] ITypeSymbol type)
         {
             Guard.NotNull(type, nameof(type));
-            Guard.NotNullNorWhiteSpace(kind, nameof(kind));
 
             Name = name;
             Type = type;
-            Kind = kind;
         }
     }
 }