Merge pull request rubberduck-vba#3573 from IvenBach/Rubberdeck.Inspe…

…ctions_C#6&7_Update C#6/C#7 technical debt payment
retailcoder · Dec 14, 2017 · 7d8cfd9 · 7d8cfd9
2 parents 8657b1c + a60871b
commit 7d8cfd9
Show file tree

Hide file tree

Showing 105 changed files with 223 additions and 422 deletions.
diff --git a/Rubberduck.Inspections/Abstract/InspectionBase.cs b/Rubberduck.Inspections/Abstract/InspectionBase.cs
@@ -36,7 +36,7 @@ protected InspectionBase(RubberduckParserState state, CodeInspectionSeverity def
         /// <summary>
         /// Gets a localized string representing a short name/description for the inspection.
         /// </summary>
-        public virtual string Description => InspectionsUI.ResourceManager.GetString(Name + "Name", CultureInfo.CurrentUICulture);
+        public virtual string Description => InspectionsUI.ResourceManager.GetString($"{Name}Name", CultureInfo.CurrentUICulture);
 
         /// <summary>
         /// Gets the type of inspection; used for regrouping inspections.
@@ -56,13 +56,13 @@ protected InspectionBase(RubberduckParserState state, CodeInspectionSeverity def
         /// <summary>
         /// Meta-information about why an inspection exists.
         /// </summary>
-        public virtual string Meta => InspectionsUI.ResourceManager.GetString(Name + "Meta", CultureInfo.CurrentUICulture);
+        public virtual string Meta => InspectionsUI.ResourceManager.GetString($"{Name}Meta", CultureInfo.CurrentUICulture);
 
         /// <summary>
         /// Gets a localized string representing the type of inspection.
         /// <see cref="InspectionType"/>
         /// </summary>
-        public virtual string InspectionTypeName => InspectionsUI.ResourceManager.GetString("CodeInspectionSettings_" + InspectionType.ToString(), CultureInfo.CurrentUICulture);
+        public virtual string InspectionTypeName => InspectionsUI.ResourceManager.GetString($"CodeInspectionSettings_{InspectionType.ToString()}", CultureInfo.CurrentUICulture);
 
         /// <summary>
         /// Gets a string representing the text that must be present in an 
@@ -112,9 +112,9 @@ protected bool IsIgnoringInspectionResultFor(QualifiedModuleName module, int lin
                     return true;
                 }
 
-                if (ignoreModuleAnnotation != null &&
-                    (ignoreModuleAnnotation.InspectionNames.Contains(AnnotationName) ||
-                     !ignoreModuleAnnotation.InspectionNames.Any()))
+                if (ignoreModuleAnnotation != null
+                    && (ignoreModuleAnnotation.InspectionNames.Contains(AnnotationName)
+                    || !ignoreModuleAnnotation.InspectionNames.Any()))
                 {
                     return true;
                 }

diff --git a/Rubberduck.Inspections/Abstract/InspectionResultBase.cs b/Rubberduck.Inspections/Abstract/InspectionResultBase.cs
@@ -57,11 +57,15 @@ public int CompareTo(IInspectionResult other)
         public string ToClipboardString()
         {           
             var module = QualifiedSelection.QualifiedName;
-            var documentName = Target != null ? Target.ProjectDisplayName : string.Empty;
+            var documentName = Target != null 
+                ? Target.ProjectDisplayName 
+                : string.Empty;
             if (string.IsNullOrEmpty(documentName))
             {
                 var component = module.Component;
-                documentName = component != null ? component.ParentProject.ProjectDisplayName : string.Empty;
+                documentName = component != null 
+                    ? component.ParentProject.ProjectDisplayName 
+                    : string.Empty;
             }
             if (string.IsNullOrEmpty(documentName))
             {
@@ -72,7 +76,7 @@ public string ToClipboardString()
                 InspectionsUI.QualifiedSelectionInspection,
                 Inspection.Severity,
                 Description,
-                "(" + documentName + ")",
+                $"({documentName})",
                 module.ProjectName,
                 module.ComponentName,
                 QualifiedSelection.Selection.StartLine);
@@ -81,7 +85,10 @@ public string ToClipboardString()
         private NavigateCodeEventArgs _navigationArgs;
         public NavigateCodeEventArgs GetNavigationArgs()
         {
-            if (_navigationArgs != null) { return _navigationArgs; }
+            if (_navigationArgs != null)
+            {
+                return _navigationArgs;
+            }
 
             _navigationArgs = new NavigateCodeEventArgs(QualifiedSelection);
             return _navigationArgs;

diff --git a/Rubberduck.Inspections/Concrete/ApplicationWorksheetFunctionInspection.cs b/Rubberduck.Inspections/Concrete/ApplicationWorksheetFunctionInspection.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Rubberduck.Inspections.Abstract;
 using Rubberduck.Inspections.Results;

diff --git a/Rubberduck.Inspections/Concrete/AssignedByValParameterInspection.cs b/Rubberduck.Inspections/Concrete/AssignedByValParameterInspection.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Rubberduck.Inspections.Abstract;

diff --git a/Rubberduck.Inspections/Concrete/BooleanAssignedInIfElseInspection.cs b/Rubberduck.Inspections/Concrete/BooleanAssignedInIfElseInspection.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Antlr4.Runtime;
 using Rubberduck.Inspections.Abstract;

diff --git a/Rubberduck.Inspections/Concrete/ConstantNotUsedInspection.cs b/Rubberduck.Inspections/Concrete/ConstantNotUsedInspection.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Antlr4.Runtime;

diff --git a/Rubberduck.Inspections/Concrete/DefaultProjectNameInspection.cs b/Rubberduck.Inspections/Concrete/DefaultProjectNameInspection.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Rubberduck.Inspections.Abstract;
 using Rubberduck.Inspections.Results;

diff --git a/Rubberduck.Inspections/Concrete/EmptyBlockInspectionListenerBase.cs b/Rubberduck.Inspections/Concrete/EmptyBlockInspectionListenerBase.cs
@@ -35,16 +35,15 @@ public void AddResult(QualifiedContext<ParserRuleContext> qualifiedContext)
 
         private bool BlockContainsExecutableStatements(VBAParser.BlockContext block)
         {
-            return block != null && block.children != null && ContainsExecutableStatements(block);
+            return block?.children != null && ContainsExecutableStatements(block);
         }
 
         private bool ContainsExecutableStatements(VBAParser.BlockContext block)
         {
             foreach (var child in block.children)
             {
-                if (child is VBAParser.BlockStmtContext)
+                if (child is VBAParser.BlockStmtContext blockStmt)
                 {
-                    var blockStmt = (VBAParser.BlockStmtContext)child;
                     var mainBlockStmt = blockStmt.mainBlockStmt();
 
                     if (mainBlockStmt == null)

diff --git a/Rubberduck.Inspections/Concrete/EmptyCaseBlockInspection.cs b/Rubberduck.Inspections/Concrete/EmptyCaseBlockInspection.cs
@@ -5,7 +5,6 @@
 using Rubberduck.Parsing.Inspections.Abstract;
 using Rubberduck.Parsing.Inspections.Resources;
 using Rubberduck.Parsing.VBA;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 

diff --git a/Rubberduck.Inspections/Concrete/EmptyDoWhileBlockInspection.cs b/Rubberduck.Inspections/Concrete/EmptyDoWhileBlockInspection.cs
@@ -5,7 +5,6 @@
 using Rubberduck.Parsing.Inspections.Abstract;
 using Rubberduck.Parsing.Inspections.Resources;
 using Rubberduck.Parsing.VBA;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 

diff --git a/Rubberduck.Inspections/Concrete/EmptyElseBlockInspection.cs b/Rubberduck.Inspections/Concrete/EmptyElseBlockInspection.cs
@@ -5,7 +5,6 @@
 using Rubberduck.Parsing.Inspections.Abstract;
 using Rubberduck.Parsing.Inspections.Resources;
 using Rubberduck.Parsing.VBA;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 

diff --git a/Rubberduck.Inspections/Concrete/EmptyForEachBlockInspection.cs b/Rubberduck.Inspections/Concrete/EmptyForEachBlockInspection.cs
@@ -5,7 +5,6 @@
 using Rubberduck.Parsing.Inspections.Abstract;
 using Rubberduck.Parsing.Inspections.Resources;
 using Rubberduck.Parsing.VBA;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 

diff --git a/Rubberduck.Inspections/Concrete/EmptyForLoopBlockInspection.cs b/Rubberduck.Inspections/Concrete/EmptyForLoopBlockInspection.cs
@@ -5,7 +5,6 @@
 using Rubberduck.Parsing.Inspections.Abstract;
 using Rubberduck.Parsing.Inspections.Resources;
 using Rubberduck.Parsing.VBA;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 

diff --git a/Rubberduck.Inspections/Concrete/EmptyIfBlockInspection.cs b/Rubberduck.Inspections/Concrete/EmptyIfBlockInspection.cs
@@ -7,7 +7,6 @@
 using Rubberduck.Parsing.Inspections.Abstract;
 using Rubberduck.Parsing.Inspections.Resources;
 using Rubberduck.Parsing.VBA;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 

diff --git a/Rubberduck.Inspections/Concrete/EmptyModuleInspection.cs b/Rubberduck.Inspections/Concrete/EmptyModuleInspection.cs
@@ -7,15 +7,14 @@
 using Rubberduck.Parsing.Inspections.Resources;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
-using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.SafeComWrappers;
 
 namespace Rubberduck.Inspections.Concrete
 {
 
     public sealed class EmptyModuleInspection : InspectionBase
     {
-        private EmptyModuleVisitor _emptyModuleVisitor;
+        private readonly EmptyModuleVisitor _emptyModuleVisitor;
 
         public EmptyModuleInspection(RubberduckParserState state,
             CodeInspectionSeverity defaultSeverity = CodeInspectionSeverity.Hint)

diff --git a/Rubberduck.Inspections/Concrete/EmptyStringLiteralInspection.cs b/Rubberduck.Inspections/Concrete/EmptyStringLiteralInspection.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Antlr4.Runtime;
 using Rubberduck.Inspections.Abstract;

diff --git a/Rubberduck.Inspections/Concrete/EmptyWhileWendBlockInspection.cs b/Rubberduck.Inspections/Concrete/EmptyWhileWendBlockInspection.cs
@@ -5,7 +5,6 @@
 using Rubberduck.Parsing.Inspections.Abstract;
 using Rubberduck.Parsing.Inspections.Resources;
 using Rubberduck.Parsing.VBA;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 

diff --git a/Rubberduck.Inspections/Concrete/EncapsulatePublicFieldInspection.cs b/Rubberduck.Inspections/Concrete/EncapsulatePublicFieldInspection.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Rubberduck.Inspections.Abstract;
 using Rubberduck.Inspections.Results;

diff --git a/Rubberduck.Inspections/Concrete/FunctionReturnValueNotUsedInspection.cs b/Rubberduck.Inspections/Concrete/FunctionReturnValueNotUsedInspection.cs
@@ -77,35 +77,13 @@ private bool IsRecursive(Declaration function)
 
         private bool IsReturnValueUsed(Declaration function)
         {
-            foreach (var usage in function.References)
-            {
-                if (IsAddressOfCall(usage))
-                {
-                    continue;
-                }
-                if (IsTypeOfExpression(usage))
-                {
-                    continue;
-                }
-                if (IsCallStmt(usage)) // IsIndexExprOrCallStmt(usage))
-                {
-                    continue;
-                }
-                if (IsLet(usage))
-                {
-                    continue;
-                }
-                if (IsSet(usage))
-                {
-                    continue;
-                }
-                if (IsReturnStatement(function, usage))
-                {
-                    continue;
-                }
-                return true;
-            }
-            return false;
+            return (from usage in function.References
+                    where !IsAddressOfCall(usage)
+                    where !IsTypeOfExpression(usage)
+                    where !IsCallStmt(usage)
+                    where !IsLet(usage)
+                    where !IsSet(usage)
+                    select usage).Any(usage => !IsReturnStatement(function, usage));
         }
 
         private bool IsAddressOfCall(IdentifierReference usage)
@@ -161,23 +139,15 @@ private bool IsIndexExprContext(IdentifierReference usage)
         private bool IsLet(IdentifierReference usage)
         {
             var letStmt = ParserRuleContextHelper.GetParent<VBAParser.LetStmtContext>(usage.Context);
-            if (letStmt == null)
-            {
-                return false;
-            }
-            bool isLetAssignmentTarget = letStmt == usage.Context;
-            return isLetAssignmentTarget;
+
+            return letStmt != null && letStmt == usage.Context;
         }
 
         private bool IsSet(IdentifierReference usage)
         {
             var setStmt = ParserRuleContextHelper.GetParent<VBAParser.SetStmtContext>(usage.Context);
-            if (setStmt == null)
-            {
-                return false;
-            }
-            bool isSetAssignmentTarget = setStmt == usage.Context;
-            return isSetAssignmentTarget;
+
+            return setStmt != null && setStmt == usage.Context;
         }
     }
 }
diff --git a/Rubberduck.Inspections/Concrete/HostSpecificExpressionInspection.cs b/Rubberduck.Inspections/Concrete/HostSpecificExpressionInspection.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Rubberduck.Inspections.Abstract;

diff --git a/Rubberduck.Inspections/Concrete/HungarianNotationInspection.cs b/Rubberduck.Inspections/Concrete/HungarianNotationInspection.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -119,7 +118,7 @@ protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
                                       HungarianIdentifierRegex.IsMatch(declaration.IdentifierName))
                 .Select(issue => new DeclarationInspectionResult(this,
                                                       string.Format(InspectionsUI.IdentifierNameInspectionResultFormat,
-                                                                    RubberduckUI.ResourceManager.GetString("DeclarationType_" + issue.DeclarationType, CultureInfo.CurrentUICulture),
+                                                                    RubberduckUI.ResourceManager.GetString($"DeclarationType_{issue.DeclarationType}", CultureInfo.CurrentUICulture),
                                                                     issue.IdentifierName),
                                                       issue));
 

diff --git a/Rubberduck.Inspections/Concrete/ImplicitActiveSheetReferenceInspection.cs b/Rubberduck.Inspections/Concrete/ImplicitActiveSheetReferenceInspection.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Rubberduck.Inspections.Abstract;
 using Rubberduck.Inspections.Results;

diff --git a/Rubberduck.Inspections/Concrete/ImplicitActiveWorkbookReferenceInspection.cs b/Rubberduck.Inspections/Concrete/ImplicitActiveWorkbookReferenceInspection.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Rubberduck.Inspections.Abstract;

diff --git a/Rubberduck.Inspections/Concrete/ImplicitByRefModifierInspection.cs b/Rubberduck.Inspections/Concrete/ImplicitByRefModifierInspection.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Antlr4.Runtime;

diff --git a/Rubberduck.Inspections/Concrete/ImplicitDefaultMemberAssignmentInspection.cs b/Rubberduck.Inspections/Concrete/ImplicitDefaultMemberAssignmentInspection.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Rubberduck.Inspections.Abstract;

diff --git a/Rubberduck.Inspections/Concrete/ImplicitPublicMemberInspection.cs b/Rubberduck.Inspections/Concrete/ImplicitPublicMemberInspection.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Rubberduck.Inspections.Abstract;

diff --git a/Rubberduck.Inspections/Concrete/ImplicitVariantReturnTypeInspection.cs b/Rubberduck.Inspections/Concrete/ImplicitVariantReturnTypeInspection.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Antlr4.Runtime;

diff --git a/Rubberduck.Inspections/Concrete/IntegerDataTypeInspection.cs b/Rubberduck.Inspections/Concrete/IntegerDataTypeInspection.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using Rubberduck.Common;
@@ -20,7 +19,7 @@ public IntegerDataTypeInspection(RubberduckParserState state) : base(state, Code
         {
         }
 
-        public override CodeInspectionType InspectionType { get; } = CodeInspectionType.CodeQualityIssues;
+        public override CodeInspectionType InspectionType => CodeInspectionType.CodeQualityIssues;
 
         protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
         {
@@ -38,7 +37,7 @@ protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
                 .Select(issue =>
                     new DeclarationInspectionResult(this,
                         string.Format(InspectionsUI.IntegerDataTypeInspectionResultFormat,
-                            RubberduckUI.ResourceManager.GetString("DeclarationType_" + issue.DeclarationType, CultureInfo.CurrentUICulture), issue.IdentifierName),
+                            RubberduckUI.ResourceManager.GetString($"DeclarationType_{issue.DeclarationType}", CultureInfo.CurrentUICulture), issue.IdentifierName),
                         issue));
 
             return result;

diff --git a/Rubberduck.Inspections/Concrete/LineLabelNotUsedInspection.cs b/Rubberduck.Inspections/Concrete/LineLabelNotUsedInspection.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Antlr4.Runtime;

diff --git a/Rubberduck.Inspections/Concrete/MemberNotOnInterfaceInspection.cs b/Rubberduck.Inspections/Concrete/MemberNotOnInterfaceInspection.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Rubberduck.Inspections.Abstract;
 using Rubberduck.Inspections.Results;

diff --git a/Rubberduck.Inspections/Concrete/MissingAnnotationArgumentInspection.cs b/Rubberduck.Inspections/Concrete/MissingAnnotationArgumentInspection.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Antlr4.Runtime;

diff --git a/Rubberduck.Inspections/Concrete/MissingAnnotationInspection.cs b/Rubberduck.Inspections/Concrete/MissingAnnotationInspection.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using Antlr4.Runtime;
 using Rubberduck.Inspections.Abstract;

diff --git a/Rubberduck.Inspections/Concrete/MissingAttributeInspection.cs b/Rubberduck.Inspections/Concrete/MissingAttributeInspection.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Antlr4.Runtime;

diff --git a/Rubberduck.Inspections/Concrete/ModuleScopeDimKeywordInspection.cs b/Rubberduck.Inspections/Concrete/ModuleScopeDimKeywordInspection.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Antlr4.Runtime;