Opportunistic edits

Discard variable Simplify string interpolation Suppress remove unused parameter message Suppress remove unread private member message Suppress naming rule violation message
rubberduck-vba · Apr 20, 2021 · 34dc9f4 · 34dc9f4
1 parent 7086c4c
commit 34dc9f4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/...k.CodeAnalysis/Inspections/Concrete/UnreachableCaseEvaluation/UnreachableCaseInspector.cs b/...k.CodeAnalysis/Inspections/Concrete/UnreachableCaseEvaluation/UnreachableCaseInspector.cs
@@ -225,7 +225,7 @@ private string GetBaseTypeForDeclaration(Declaration declaration)
             VBAParser.SelectCaseStmtContext selectStmt,
             IParseTreeVisitorResults parseTreeValues)
         {
-            var (typeName, value) = SelectExpressionTypeNameAndValue(selectStmt, parseTreeValues);
+            var (typeName, _) = SelectExpressionTypeNameAndValue(selectStmt, parseTreeValues);
             return typeName;
         }
 

diff --git a/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerViewModel.cs b/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerViewModel.cs
@@ -39,13 +39,15 @@ public enum CodeExplorerSortOrder
     public sealed class CodeExplorerViewModel : ViewModelBase
     {
         // ReSharper disable NotAccessedField.Local - The settings providers aren't used, but several enhancement requests will need them.
+#pragma warning disable IDE0052 // Remove unread private members
         private readonly RubberduckParserState _state;
         private readonly RemoveCommand _externalRemoveCommand;
-        private readonly IConfigurationService<GeneralSettings> _generalSettingsProvider;      
+        private readonly IConfigurationService<GeneralSettings> _generalSettingsProvider;
         private readonly IConfigurationService<WindowSettings> _windowSettingsProvider;
         private readonly IUiDispatcher _uiDispatcher;
         private readonly IVBE _vbe;
         private readonly ITemplateProvider _templateProvider;
+#pragma warning restore IDE0052 // Remove unread private members
         // ReSharper restore NotAccessedField.Local
 
         public CodeExplorerViewModel(
@@ -94,7 +96,9 @@ public sealed class CodeExplorerViewModel : ViewModelBase
 
         public ObservableCollection<ICodeExplorerNode> Projects { get; } = new ObservableCollection<ICodeExplorerNode>();
 
+#pragma warning disable IDE1006 // Naming Styles
         private ObservableCollection<Template> templates => _templateProvider.GetTemplates();
+#pragma warning restore IDE1006 // Naming Styles
 
         public ObservableCollection<Template> BuiltInTemplates =>
             new ObservableCollection<Template>(templates.Where(t => !t.IsUserDefined)

diff --git a/Rubberduck.Core/UI/UnitTesting/TestExplorerViewModel.cs b/Rubberduck.Core/UI/UnitTesting/TestExplorerViewModel.cs
@@ -54,7 +54,9 @@ internal sealed class TestExplorerViewModel : ViewModelBase, INavigateSelection,
             TestExplorerModel model,
             IClipboardWriter clipboard,
             // ReSharper disable once UnusedParameter.Local - left in place because it will likely be needed for app wide font settings, etc.
+#pragma warning disable IDE0060 // Remove unused parameter
             IConfigurationService<Configuration> configService,
+#pragma warning restore IDE0060 // Remove unused parameter
             ISettingsFormFactory settingsFormFactory,
             IRewritingManager rewritingManager,
             IAnnotationUpdater annotationUpdater)

diff --git a/RubberduckTests/CodeExplorer/MockedCodeExplorer.cs b/RubberduckTests/CodeExplorer/MockedCodeExplorer.cs
@@ -120,11 +120,11 @@ public MockedCodeExplorer(ProjectType projectType, ComponentType componentType =
                 var item = componentTypes[index];
                 if (item == ComponentType.UserForm)
                 {
-                    project.MockUserFormBuilder($"{item.ToString()}{index}", code is null ? string.Empty : code[index]).AddFormToProjectBuilder();
+                    project.MockUserFormBuilder($"{item}{index}", code is null ? string.Empty : code[index]).AddFormToProjectBuilder();
                 }
                 else
                 {
-                    project.AddComponent($"{item.ToString()}{index}", item, code is null ? string.Empty : code[index]);
+                    project.AddComponent($"{item}{index}", item, code is null ? string.Empty : code[index]);
                 }
             }