Merge pull request #3573 from IvenBach/Rubberdeck.Inspections_C#6&7_Update

C#6/C#7 technical debt payment

Author: retailcoder

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;
                 }

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;

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;

Rubberduck.Inspections/Concrete/AssignedByValParameterInspection.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Rubberduck.Inspections.Abstract;

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;

Rubberduck.Inspections/Concrete/ConstantNotUsedInspection.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Antlr4.Runtime;

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;

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)

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;
 

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;