Merge pull request #2115 from comintern/next

retailcoder · web-flow · commit cd6d4d235c2a · 2016-07-22T01:33:55.000-04:00
Remove IEnumerable&lt;IInspection&gt; dependency from CodeInspectionSettings
diff --git a/RetailCoder.VBE/Settings/CodeInspectionConfigProvider.cs b/RetailCoder.VBE/Settings/CodeInspectionConfigProvider.cs
@@ -1,42 +1,35 @@
 ﻿using System.Collections.Generic;
-using System.Linq;
 using Rubberduck.Inspections;
 using Rubberduck.SettingsProvider;
 
 namespace Rubberduck.Settings
 {
     public interface ICodeInspectionConfigProvider
     {
-        CodeInspectionSettings Create(IEnumerable<IInspection> inspections);
+        CodeInspectionSettings Create();
         CodeInspectionSettings CreateDefaults();
         void Save(CodeInspectionSettings settings);
     }
 
     public class CodeInspectionConfigProvider : ICodeInspectionConfigProvider
     {
         private readonly IPersistanceService<CodeInspectionSettings> _persister;
-        private IEnumerable<IInspection> _inspections;
 
         public CodeInspectionConfigProvider(IPersistanceService<CodeInspectionSettings> persister)
         {
             _persister = persister;
         }
 
-        public CodeInspectionSettings Create(IEnumerable<IInspection> inspections)
+        public CodeInspectionSettings Create()
         {
-            if (inspections == null) return null;
-
-            _inspections = inspections;
-            var prototype = new CodeInspectionSettings(GetDefaultCodeInspections(), new WhitelistedIdentifierSetting[] {});
-            return _persister.Load(prototype) ?? prototype;
+            var prototype = new CodeInspectionSettings(GetDefaultCodeInspections(), new WhitelistedIdentifierSetting[] { });
+            return _persister.Load(prototype) ?? prototype;            
         }
 
         public CodeInspectionSettings CreateDefaults()
         {
-            //This sucks.
-            return _inspections != null
-                ? new CodeInspectionSettings(GetDefaultCodeInspections(), new WhitelistedIdentifierSetting[] {})
-                : null;
+            //This no longer sucks.
+            return new CodeInspectionSettings(GetDefaultCodeInspections(), new WhitelistedIdentifierSetting[] {});
         }
 
         public void Save(CodeInspectionSettings settings)
@@ -46,9 +39,47 @@ public void Save(CodeInspectionSettings settings)
 
         public HashSet<CodeInspectionSetting> GetDefaultCodeInspections()
         {
-            return new HashSet<CodeInspectionSetting>(_inspections.Select(x =>
-                        new CodeInspectionSetting(x.Name, x.Description, x.InspectionType, x.DefaultSeverity,
-                            x.DefaultSeverity)));
+            //*This* sucks now.
+            return new HashSet<CodeInspectionSetting>
+            {
+                new CodeInspectionSetting("ObjectVariableNotSetInspection", string.Empty, CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.Suggestion,  CodeInspectionSeverity.Suggestion),
+                new CodeInspectionSetting("FunctionReturnValueNotUsedInspection", string.Empty, CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.Warning,  CodeInspectionSeverity.Warning),
+                new CodeInspectionSetting("SelfAssignedDeclarationInspection", string.Empty, CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.Hint,  CodeInspectionSeverity.Hint),
+                new CodeInspectionSetting("MoveFieldCloserToUsageInspection", string.Empty, CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.Suggestion,  CodeInspectionSeverity.Suggestion),
+                new CodeInspectionSetting("EncapsulatePublicFieldInspection", string.Empty, CodeInspectionType.MaintainabilityAndReadabilityIssues, CodeInspectionSeverity.Suggestion,  CodeInspectionSeverity.Suggestion),
+                new CodeInspectionSetting("EmptyStringLiteralInspection", string.Empty, CodeInspectionType.LanguageOpportunities, CodeInspectionSeverity.Warning,  CodeInspectionSeverity.Warning),
+                new CodeInspectionSetting("ImplicitActiveSheetReferenceInspection", string.Empty, CodeInspectionType.MaintainabilityAndReadabilityIssues, CodeInspectionSeverity.Warning,  CodeInspectionSeverity.Warning),
+                new CodeInspectionSetting("ImplicitActiveWorkbookReferenceInspection", string.Empty, CodeInspectionType.MaintainabilityAndReadabilityIssues, CodeInspectionSeverity.Warning,  CodeInspectionSeverity.Warning),
+                new CodeInspectionSetting("MultipleFolderAnnotationsInspection", string.Empty, CodeInspectionType.MaintainabilityAndReadabilityIssues, CodeInspectionSeverity.Error,  CodeInspectionSeverity.Error),
+                new CodeInspectionSetting("ProcedureCanBeWrittenAsFunctionInspection", string.Empty, CodeInspectionType.LanguageOpportunities, CodeInspectionSeverity.Suggestion,  CodeInspectionSeverity.Suggestion),
+                new CodeInspectionSetting("UseMeaningfulNameInspection", string.Empty, CodeInspectionType.MaintainabilityAndReadabilityIssues, CodeInspectionSeverity.Suggestion,  CodeInspectionSeverity.Suggestion),
+                new CodeInspectionSetting("WriteOnlyPropertyInspection", string.Empty, CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.Suggestion,  CodeInspectionSeverity.Suggestion),
+                new CodeInspectionSetting("UntypedFunctionUsageInspection", string.Empty, CodeInspectionType.LanguageOpportunities, CodeInspectionSeverity.Hint,  CodeInspectionSeverity.Hint),
+                new CodeInspectionSetting("AssignedByValParameterInspection", string.Empty, CodeInspectionType.LanguageOpportunities, CodeInspectionSeverity.Warning,  CodeInspectionSeverity.Warning),
+                new CodeInspectionSetting("ConstantNotUsedInspection", string.Empty, CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.Warning,  CodeInspectionSeverity.Warning),
+                new CodeInspectionSetting("DefaultProjectNameInspection", string.Empty, CodeInspectionType.MaintainabilityAndReadabilityIssues, CodeInspectionSeverity.Suggestion,  CodeInspectionSeverity.Suggestion),
+                new CodeInspectionSetting("ImplicitPublicMemberInspection", string.Empty, CodeInspectionType.MaintainabilityAndReadabilityIssues, CodeInspectionSeverity.Hint,  CodeInspectionSeverity.Hint),
+                new CodeInspectionSetting("MultilineParameterInspection", string.Empty, CodeInspectionType.MaintainabilityAndReadabilityIssues, CodeInspectionSeverity.Suggestion,  CodeInspectionSeverity.Suggestion),
+                new CodeInspectionSetting("NonReturningFunctionInspection", string.Empty, CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.Error,  CodeInspectionSeverity.Error),
+                new CodeInspectionSetting("ObsoleteCallStatementInspection", string.Empty, CodeInspectionType.LanguageOpportunities, CodeInspectionSeverity.Suggestion,  CodeInspectionSeverity.Suggestion),
+                new CodeInspectionSetting("ObsoleteGlobalInspection", string.Empty, CodeInspectionType.LanguageOpportunities, CodeInspectionSeverity.Suggestion,  CodeInspectionSeverity.Suggestion),
+                new CodeInspectionSetting("ObsoleteLetStatementInspection", string.Empty, CodeInspectionType.LanguageOpportunities, CodeInspectionSeverity.Suggestion,  CodeInspectionSeverity.Suggestion),
+                new CodeInspectionSetting("ObsoleteTypeHintInspection", string.Empty, CodeInspectionType.LanguageOpportunities, CodeInspectionSeverity.Suggestion,  CodeInspectionSeverity.Suggestion),
+                new CodeInspectionSetting("OptionBaseInspection", string.Empty, CodeInspectionType.MaintainabilityAndReadabilityIssues, CodeInspectionSeverity.Hint,  CodeInspectionSeverity.Hint),
+                new CodeInspectionSetting("ParameterCanBeByValInspection", string.Empty, CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.Suggestion,  CodeInspectionSeverity.Suggestion),
+                new CodeInspectionSetting("ParameterNotUsedInspection", string.Empty, CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.Warning,  CodeInspectionSeverity.Warning),
+                new CodeInspectionSetting("ProcedureNotUsedInspection", string.Empty, CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.Warning,  CodeInspectionSeverity.Warning),
+                new CodeInspectionSetting("UnassignedVariableUsageInspection", string.Empty, CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.Error,  CodeInspectionSeverity.Error),
+                new CodeInspectionSetting("VariableNotUsedInspection", string.Empty, CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.Warning,  CodeInspectionSeverity.Warning),
+                new CodeInspectionSetting("VariableNotAssignedInspection", string.Empty, CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.Warning,  CodeInspectionSeverity.Warning),
+                new CodeInspectionSetting("ImplicitByRefParameterInspection", string.Empty, CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.Hint,  CodeInspectionSeverity.Hint),
+                new CodeInspectionSetting("ImplicitVariantReturnTypeInspection", string.Empty, CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.Hint,  CodeInspectionSeverity.Hint),
+                new CodeInspectionSetting("MultipleDeclarationsInspection", string.Empty, CodeInspectionType.MaintainabilityAndReadabilityIssues, CodeInspectionSeverity.Warning,  CodeInspectionSeverity.Warning),
+                new CodeInspectionSetting("ObsoleteCommentSyntaxInspection", string.Empty, CodeInspectionType.LanguageOpportunities, CodeInspectionSeverity.Suggestion,  CodeInspectionSeverity.Suggestion),
+                new CodeInspectionSetting("OptionExplicitInspection", string.Empty, CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.Error,  CodeInspectionSeverity.Error),
+                new CodeInspectionSetting("VariableTypeNotDeclaredInspection", string.Empty, CodeInspectionType.LanguageOpportunities, CodeInspectionSeverity.Warning,  CodeInspectionSeverity.Warning),
+                new CodeInspectionSetting("MalformedAnnotationInspection", string.Empty, CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.Error,  CodeInspectionSeverity.Error)
+            };
         }
     }
 }
diff --git a/RetailCoder.VBE/Settings/ConfigurationLoader.cs b/RetailCoder.VBE/Settings/ConfigurationLoader.cs
@@ -1,7 +1,5 @@
 ﻿using System;
-using System.Collections.Generic;
 using System.Linq;
-using Rubberduck.Inspections;
 using Rubberduck.SmartIndenter;
 
 namespace Rubberduck.Settings
@@ -32,19 +30,15 @@ public class ConfigurationLoader : IGeneralConfigService
         private readonly IUnitTestConfigProvider _unitTestProvider;
         private readonly IIndenterConfigProvider _indenterProvider;
 
-        private readonly IEnumerable<IInspection> _inspections;
-
         public ConfigurationLoader(IGeneralConfigProvider generalProvider, IHotkeyConfigProvider hotkeyProvider, IToDoListConfigProvider todoProvider,
-                                   ICodeInspectionConfigProvider inspectionProvider, IUnitTestConfigProvider unitTestProvider, IIndenterConfigProvider indenterProvider,
-                                   IEnumerable<IInspection> inspections)
+                                   ICodeInspectionConfigProvider inspectionProvider, IUnitTestConfigProvider unitTestProvider, IIndenterConfigProvider indenterProvider)
         {
             _generalProvider = generalProvider;
             _hotkeyProvider = hotkeyProvider;
             _todoProvider = todoProvider;
             _inspectionProvider = inspectionProvider;
             _unitTestProvider = unitTestProvider;
             _indenterProvider = indenterProvider;
-            _inspections = inspections;
         }
 
         /// <summary>
@@ -59,32 +53,14 @@ public virtual Configuration LoadConfiguration()
                     _generalProvider.Create(),
                     _hotkeyProvider.Create(),
                     _todoProvider.Create(),
-                    _inspectionProvider.Create(_inspections),
+                    _inspectionProvider.Create(),
                     _unitTestProvider.Create(),
                     _indenterProvider.Create()
                 )
-            };
-            MergeImplementedInspectionsNotInConfig(config.UserSettings.CodeInspectionSettings);
+            };            
             return config;
         }
 
-        private void MergeImplementedInspectionsNotInConfig(ICodeInspectionSettings config)
-        {
-            foreach (var implementedInspection in _inspections)
-            {
-                var inspection = config.CodeInspections.SingleOrDefault(i => i.Name.Equals(implementedInspection.Name));
-                if (inspection == null)
-                {
-                    config.CodeInspections.Add(new CodeInspectionSetting(implementedInspection));
-                }
-                else
-                {
-                    // description isn't serialized
-                    inspection.Description = implementedInspection.Description;
-                }
-            }
-        }
-
         public Configuration GetDefaultConfiguration()
         {
             return new Configuration
@@ -104,7 +80,7 @@ public Configuration GetDefaultConfiguration()
         public void SaveConfiguration(Configuration toSerialize)
         {
             var langChanged = _generalProvider.Create().Language.Code != toSerialize.UserSettings.GeneralSettings.Language.Code;
-            var oldInspectionSettings = _inspectionProvider.Create(_inspections).CodeInspections.Select(s => Tuple.Create(s.Name, s.Severity));
+            var oldInspectionSettings = _inspectionProvider.Create().CodeInspections.Select(s => Tuple.Create(s.Name, s.Severity));
             var newInspectionSettings = toSerialize.UserSettings.CodeInspectionSettings.CodeInspections.Select(s => Tuple.Create(s.Name, s.Severity));
 
             _generalProvider.Save(toSerialize.UserSettings.GeneralSettings);
diff --git a/RetailCoder.VBE/UI/Command/FindSymbolCommand.cs b/RetailCoder.VBE/UI/Command/FindSymbolCommand.cs
@@ -37,9 +37,17 @@ protected override void ExecuteImpl(object parameter)
             var viewModel = new FindSymbolViewModel(_state.AllDeclarations.Where(item => !item.IsBuiltIn), _iconCache);
             using (var view = new FindSymbolDialog(viewModel))
             {
-                viewModel.Navigate += (sender, e) => { _navigateCommand.Execute(e); view.Hide(); };
+                viewModel.Navigate += (sender, e) => { view.Hide(); };
+                viewModel.Navigate += OnDialogNavigate;
                 view.ShowDialog();
+                _navigateCommand.Execute(_selected);
             }
         }
+
+        private NavigateCodeEventArgs _selected;
+        private void OnDialogNavigate(object sender, NavigateCodeEventArgs e)
+        {
+            _selected = e;
+        }
     }
 }
diff --git a/RetailCoder.VBE/UI/Settings/InspectionSettingsViewModel.cs b/RetailCoder.VBE/UI/Settings/InspectionSettingsViewModel.cs
@@ -1,6 +1,5 @@
 ﻿using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Globalization;
 using System.Linq;
 using System.Windows.Data;
 using NLog;
diff --git a/RubberduckTests/CodeExplorer/CodeExplorerTests.cs b/RubberduckTests/CodeExplorer/CodeExplorerTests.cs
@@ -122,7 +122,7 @@ public void AddTestModule()
             var mockHost = new Mock<IHostApplication>();
             mockHost.SetupAllProperties();
 
-            var configLoader = new Mock<ConfigurationLoader>(null, null, null, null, null, null, null);
+            var configLoader = new Mock<ConfigurationLoader>(null, null, null, null, null, null);
             configLoader.Setup(c => c.LoadConfiguration()).Returns(GetDefaultUnitTestConfig());
 
             var state = new RubberduckParserState(new Mock<ISinks>().Object);
@@ -1385,7 +1385,7 @@ private IIndenterSettings GetDefaultIndenterSettings()
 
         private ConfigurationLoader GetDelimiterConfigLoader()
         {
-            var configLoader = new Mock<ConfigurationLoader>(null, null, null, null, null, null, null);
+            var configLoader = new Mock<ConfigurationLoader>(null, null, null, null, null, null);
             configLoader.Setup(c => c.LoadConfiguration()).Returns(GetDelimiterConfig());
 
             return configLoader.Object;
diff --git a/RubberduckTests/Inspections/ProcedureShouldBeFunctionInspectionTests.cs b/RubberduckTests/Inspections/ProcedureShouldBeFunctionInspectionTests.cs
@@ -187,7 +187,7 @@ public void ProcedureShouldBeFunction_DoesNotReturnsResult_MultipleByRefParams()
 End Sub";
 
             //Arrange
-            var settings = new Mock<ConfigurationLoader>(null, null, null, null, null, null, null);
+            var settings = new Mock<ConfigurationLoader>(null, null, null, null, null, null);
             var config = GetTestConfig();
             settings.Setup(x => x.LoadConfiguration()).Returns(config);
 

Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,17 @@ protected override void ExecuteImpl(object parameter)`
`37`	`37`	`var viewModel = new FindSymbolViewModel(_state.AllDeclarations.Where(item => !item.IsBuiltIn), _iconCache);`
`38`	`38`	`using (var view = new FindSymbolDialog(viewModel))`
`39`	`39`	`{`
`40`		`- viewModel.Navigate += (sender, e) => { _navigateCommand.Execute(e); view.Hide(); };`
	`40`	`+ viewModel.Navigate += (sender, e) => { view.Hide(); };`
	`41`	`+ viewModel.Navigate += OnDialogNavigate;`
`41`	`42`	`view.ShowDialog();`
	`43`	`+ _navigateCommand.Execute(_selected);`
`42`	`44`	`}`
`43`	`45`	`}`
	`46`	`+`
	`47`	`+ private NavigateCodeEventArgs _selected;`
	`48`	`+ private void OnDialogNavigate(object sender, NavigateCodeEventArgs e)`
	`49`	`+ {`
	`50`	`+ _selected = e;`
	`51`	`+ }`
`44`	`52`	`}`
`45`	`53`	`}`