Default and user inspection settings will be merged together

Author: rkapka

RetailCoder.VBE/Settings/CodeInspectionConfigProvider.cs

@@ -23,7 +23,11 @@ public CodeInspectionConfigProvider(IPersistanceService<CodeInspectionSettings>
 
         public CodeInspectionSettings Create()
         {
-            return _persister.Load(_defaultSettings) ?? _defaultSettings;
+            // Loaded settings don't contain defaults, so we need to combine user settings with defaults.
+            var loaded = _persister.Load(_defaultSettings);
+            loaded?.CodeInspections.UnionWith(_defaultSettings.CodeInspections);
+
+            return loaded ?? _defaultSettings;
         }
 
         public CodeInspectionSettings CreateDefaults()

RetailCoder.VBE/Settings/CodeInspectionSettings.cs

@@ -156,16 +156,14 @@ public override bool Equals(object obj)
         {
             return obj is CodeInspectionSetting inspectionSetting &&
                    inspectionSetting.InspectionType == InspectionType &&
-                   inspectionSetting.Name == Name &&
-                   inspectionSetting.Severity == Severity;
+                   inspectionSetting.Name == Name;
         }
 
         public override int GetHashCode()
         {
             unchecked
             {
                 var hashCode = Name?.GetHashCode() ?? 0;
-                hashCode = (hashCode * 397) ^ (int)Severity;
                 hashCode = (hashCode * 397) ^ (int)InspectionType;
                 return hashCode;
             }

RubberduckTests/Settings/CodeInspectionConfigProviderTests.cs

@@ -1,7 +1,11 @@
-using Moq;
+using System.Collections.Generic;
+using System.Linq;
+using Moq;
 using NUnit.Framework;
 using Rubberduck.Parsing.Inspections.Abstract;
+using Rubberduck.Parsing.Inspections.Resources;
 using Rubberduck.Settings;
+using Rubberduck.SettingsProvider;
 
 namespace RubberduckTests.Settings
 {
@@ -20,5 +24,39 @@ public void SettingsForFoundInspectionsAreAddedToDefaultSettings()
 
             Assert.NotNull(defaults.GetSetting(inspectionMock.Object.GetType()));
         }
+
+        [Category("Settings")]
+        [Test]
+        public void UserSettingsAreCombinedWithDefaultSettings()
+        {
+            var userSetting = new CodeInspectionSetting("Foo", CodeInspectionType.CodeQualityIssues);
+            var userSettings = new CodeInspectionSettings { CodeInspections = new HashSet<CodeInspectionSetting>(new[] {userSetting})};
+            var persisterMock = new Mock<IPersistanceService<CodeInspectionSettings>>();
+            persisterMock.Setup(persister => persister.Load(It.IsAny<CodeInspectionSettings>())).Returns(userSettings);
+            var configProvider = new CodeInspectionConfigProvider(persisterMock.Object, Enumerable.Empty<IInspection>());
+
+            var settings = configProvider.Create().CodeInspections;
+            var defaultSettings = configProvider.CreateDefaults().CodeInspections;
+
+            Assert.Contains(userSetting, settings.ToArray());
+            Assert.IsTrue(defaultSettings.All(s => settings.Contains(s)));
+        }
+
+        [Category("Settings")]
+        [Test]
+        public void UserSettingsAreNotDuplicatedWithDefaultSettings()
+        {
+            var defaultSettings = new CodeInspectionConfigProvider(null, Enumerable.Empty<IInspection>()).CreateDefaults().CodeInspections;
+            var userSetting = defaultSettings.First();
+            var userSettings = new CodeInspectionSettings { CodeInspections = new HashSet<CodeInspectionSetting>(new[] { userSetting }) };
+            var persisterMock = new Mock<IPersistanceService<CodeInspectionSettings>>();
+            persisterMock.Setup(persister => persister.Load(It.IsAny<CodeInspectionSettings>())).Returns(userSettings);
+            var configProvider = new CodeInspectionConfigProvider(persisterMock.Object, Enumerable.Empty<IInspection>());
+
+            var settings = configProvider.Create().CodeInspections;
+
+            Assert.AreEqual(defaultSettings.Count, settings.Count);
+            Assert.Contains(userSetting, settings.ToArray());
+        }
     }
 }