Rename collection element type to singular

Vogel612 · Vogel612 · commit 12947e2e5222 · 2019-04-03T00:44:40.000+02:00
diff --git a/Rubberduck.Core/Settings/ExperimentalFeatures.cs b/Rubberduck.Core/Settings/ExperimentalFeatures.cs
@@ -1,10 +1,10 @@
 ﻿using System.Xml.Serialization;
 using Rubberduck.UI;
-using Rubberduck.Resources;
+using Rubberduck.Resources.Experimentals;
 
 namespace Rubberduck.Settings
 {
-    public class ExperimentalFeatures : ViewModelBase
+    public class ExperimentalFeature : ViewModelBase
     {
         private bool _isEnabled;
         public bool IsEnabled
@@ -30,7 +30,7 @@ public string Key
         }
 
         [XmlIgnore]
-        public string DisplayValue => Key == null ? string.Empty : RubberduckUI.ResourceManager.GetString(Key);
+        public string DisplayValue => Key == null ? string.Empty : ExperimentalNames.ResourceManager.GetString(Key);
 
         public override string ToString()
         {
@@ -39,7 +39,7 @@ public override string ToString()
 
         public override bool Equals(object obj)
         {
-            return obj is ExperimentalFeatures value &&
+            return obj is ExperimentalFeature value &&
                    value.IsEnabled == IsEnabled &&
                    value.Key == Key;
         }
diff --git a/Rubberduck.Core/Settings/GeneralSettings.cs b/Rubberduck.Core/Settings/GeneralSettings.cs
@@ -20,7 +20,7 @@ public interface IGeneralSettings
         bool UserEditedLogLevel { get; set; }
         int MinimumLogLevel { get; set; }
         bool SetDpiUnaware { get; set; }
-        List<ExperimentalFeatures> EnableExperimentalFeatures { get; set; }
+        List<ExperimentalFeature> EnableExperimentalFeatures { get; set; }
     }
 
     [SettingsSerializeAs(SettingsSerializeAs.Xml)]
@@ -73,7 +73,7 @@ public int MinimumLogLevel
 
         public bool SetDpiUnaware { get; set; }
 
-        public List<ExperimentalFeatures> EnableExperimentalFeatures { get; set; } = new List<ExperimentalFeatures>();
+        public List<ExperimentalFeature> EnableExperimentalFeatures { get; set; } = new List<ExperimentalFeature>();
 
         public GeneralSettings()
         {
diff --git a/Rubberduck.Core/UI/Settings/GeneralSettingsViewModel.cs b/Rubberduck.Core/UI/Settings/GeneralSettingsViewModel.cs
@@ -60,7 +60,7 @@ public GeneralSettingsViewModel(
             _hotkeyService = hotkeyService;
         }
 
-        public List<ExperimentalFeatures> ExperimentalFeatures { get; set; }
+        public List<ExperimentalFeature> ExperimentalFeatures { get; set; }
 
         public ObservableCollection<DisplayLanguageSetting> Languages { get; set; } 
 
@@ -307,9 +307,10 @@ private void TransferSettingsToView(IGeneralSettings general, IHotkeySettings ho
             _selectedLogLevel = LogLevels.First(l => l.Ordinal == general.MinimumLogLevel);
 
             ExperimentalFeatures = _experimentalFeatureTypes
+                // extract the resource key to use
                 .SelectMany(s => s.CustomAttributes.Where(a => a.ConstructorArguments.Any()).Select(a => (string)a.ConstructorArguments.First().Value))
                 .Distinct()
-                .Select(s => new ExperimentalFeatures { IsEnabled = general.EnableExperimentalFeatures.SingleOrDefault(d => d.Key == s)?.IsEnabled ?? false, Key = s })
+                .Select(s => new ExperimentalFeature { IsEnabled = general.EnableExperimentalFeatures.SingleOrDefault(d => d.Key == s)?.IsEnabled ?? false, Key = s })
                 .ToList();
         }
 
diff --git a/RubberduckTests/CodeExplorer/MockedCodeExplorer.cs b/RubberduckTests/CodeExplorer/MockedCodeExplorer.cs
@@ -431,9 +431,9 @@ private Configuration GetDefaultUnitTestConfig()
 
             var generalSettings = new GeneralSettings
             {
-                EnableExperimentalFeatures = new List<ExperimentalFeatures>
+                EnableExperimentalFeatures = new List<ExperimentalFeature>
                     {
-                        new ExperimentalFeatures()
+                        new ExperimentalFeature()
                     }
             };
 
diff --git a/RubberduckTests/IoCContainer/IoCRegistrationTests.cs b/RubberduckTests/IoCContainer/IoCRegistrationTests.cs
@@ -28,9 +28,9 @@ public void RegistrationOfRubberduckIoCContainerWithSC_NoException()
 
             var initialSettings = new GeneralSettings
             {
-                EnableExperimentalFeatures = new List<ExperimentalFeatures>
+                EnableExperimentalFeatures = new List<ExperimentalFeature>
                 {
-                    new ExperimentalFeatures()
+                    new ExperimentalFeature()
                 }
             };
 
@@ -55,7 +55,7 @@ public void RegistrationOfRubberduckIoCContainerWithoutSC_NoException()
             var addin = addInBuilder.Build().Object;
             var vbeNativeApi = new Mock<IVbeNativeApi>();
 
-            var initialSettings = new GeneralSettings {EnableExperimentalFeatures = new List<ExperimentalFeatures>()};
+            var initialSettings = new GeneralSettings {EnableExperimentalFeatures = new List<ExperimentalFeature>()};
 
             using (var container =
                 new WindsorContainer().Install(new RubberduckIoCInstaller(ide, addin, initialSettings, vbeNativeApi.Object)))
diff --git a/RubberduckTests/IoCContainer/IoCResolvingTests.cs b/RubberduckTests/IoCContainer/IoCResolvingTests.cs
@@ -31,9 +31,9 @@ public void ResolveInspections_NoException()
 
             var initialSettings = new GeneralSettings
             {
-                EnableExperimentalFeatures = new List<ExperimentalFeatures>
+                EnableExperimentalFeatures = new List<ExperimentalFeature>
                 {
-                    new ExperimentalFeatures()
+                    new ExperimentalFeature()
                 }
             };
 
@@ -74,9 +74,9 @@ public void ResolveRubberduckParserState_NoException()
 
             var initialSettings = new GeneralSettings
             {
-                EnableExperimentalFeatures = new List<ExperimentalFeatures>
+                EnableExperimentalFeatures = new List<ExperimentalFeature>
                 {
-                    new ExperimentalFeatures()
+                    new ExperimentalFeature()
                 }
             };
 
diff --git a/RubberduckTests/Settings/GeneralSettingsTests.cs b/RubberduckTests/Settings/GeneralSettingsTests.cs
@@ -46,9 +46,9 @@ private Configuration GetDefaultConfig()
                 Language = new DisplayLanguageSetting("en-US"),
                 IsAutoSaveEnabled = false,
                 AutoSavePeriod = 10,
-                EnableExperimentalFeatures = new List<ExperimentalFeatures>
+                EnableExperimentalFeatures = new List<ExperimentalFeature>
                 {
-                    new ExperimentalFeatures()
+                    new ExperimentalFeature()
                 }
                 //Delimiter = '.'
             };

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`using System.Xml.Serialization;`
`2`	`2`	`using Rubberduck.UI;`
`3`		`-using Rubberduck.Resources;`
	`3`	`+using Rubberduck.Resources.Experimentals;`
`4`	`4`
`5`	`5`	`namespace Rubberduck.Settings`
`6`	`6`	`{`
`7`		`- public class ExperimentalFeatures : ViewModelBase`
	`7`	`+ public class ExperimentalFeature : ViewModelBase`
`8`	`8`	`{`
`9`	`9`	`private bool _isEnabled;`
`10`	`10`	`public bool IsEnabled`
`@@ -30,7 +30,7 @@ public string Key`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`[XmlIgnore]`
`33`		`- public string DisplayValue => Key == null ? string.Empty : RubberduckUI.ResourceManager.GetString(Key);`
	`33`	`+ public string DisplayValue => Key == null ? string.Empty : ExperimentalNames.ResourceManager.GetString(Key);`
`34`	`34`
`35`	`35`	`public override string ToString()`
`36`	`36`	`{`
`@@ -39,7 +39,7 @@ public override string ToString()`
`39`	`39`
`40`	`40`	`public override bool Equals(object obj)`
`41`	`41`	`{`
`42`		`- return obj is ExperimentalFeatures value &&`
	`42`	`+ return obj is ExperimentalFeature value &&`
`43`	`43`	`value.IsEnabled == IsEnabled &&`
`44`	`44`	`value.Key == Key;`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public interface IGeneralSettings`
`20`	`20`	`bool UserEditedLogLevel { get; set; }`
`21`	`21`	`int MinimumLogLevel { get; set; }`
`22`	`22`	`bool SetDpiUnaware { get; set; }`
`23`		`- List<ExperimentalFeatures> EnableExperimentalFeatures { get; set; }`
	`23`	`+ List<ExperimentalFeature> EnableExperimentalFeatures { get; set; }`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`[SettingsSerializeAs(SettingsSerializeAs.Xml)]`
`@@ -73,7 +73,7 @@ public int MinimumLogLevel`
`73`	`73`
`74`	`74`	`public bool SetDpiUnaware { get; set; }`
`75`	`75`
`76`		`- public List<ExperimentalFeatures> EnableExperimentalFeatures { get; set; } = new List<ExperimentalFeatures>();`
	`76`	`+ public List<ExperimentalFeature> EnableExperimentalFeatures { get; set; } = new List<ExperimentalFeature>();`
`77`	`77`
`78`	`78`	`public GeneralSettings()`
`79`	`79`	`{`
Original file line number	Diff line number	Diff line change
`@@ -431,9 +431,9 @@ private Configuration GetDefaultUnitTestConfig()`
`431`	`431`
`432`	`432`	`var generalSettings = new GeneralSettings`
`433`	`433`	`{`
`434`		`- EnableExperimentalFeatures = new List<ExperimentalFeatures>`
	`434`	`+ EnableExperimentalFeatures = new List<ExperimentalFeature>`
`435`	`435`	`{`
`436`		`- new ExperimentalFeatures()`
	`436`	`+ new ExperimentalFeature()`
`437`	`437`	`}`
`438`	`438`	`};`
`439`	`439`
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,9 @@ public void RegistrationOfRubberduckIoCContainerWithSC_NoException()`
`28`	`28`
`29`	`29`	`var initialSettings = new GeneralSettings`
`30`	`30`	`{`
`31`		`- EnableExperimentalFeatures = new List<ExperimentalFeatures>`
	`31`	`+ EnableExperimentalFeatures = new List<ExperimentalFeature>`
`32`	`32`	`{`
`33`		`- new ExperimentalFeatures()`
	`33`	`+ new ExperimentalFeature()`
`34`	`34`	`}`
`35`	`35`	`};`
`36`	`36`
`@@ -55,7 +55,7 @@ public void RegistrationOfRubberduckIoCContainerWithoutSC_NoException()`
`55`	`55`	`var addin = addInBuilder.Build().Object;`
`56`	`56`	`var vbeNativeApi = new Mock<IVbeNativeApi>();`
`57`	`57`
`58`		`- var initialSettings = new GeneralSettings {EnableExperimentalFeatures = new List<ExperimentalFeatures>()};`
	`58`	`+ var initialSettings = new GeneralSettings {EnableExperimentalFeatures = new List<ExperimentalFeature>()};`
`59`	`59`
`60`	`60`	`using (var container =`
`61`	`61`	`new WindsorContainer().Install(new RubberduckIoCInstaller(ide, addin, initialSettings, vbeNativeApi.Object)))`
Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,9 @@ public void ResolveInspections_NoException()`
`31`	`31`
`32`	`32`	`var initialSettings = new GeneralSettings`
`33`	`33`	`{`
`34`		`- EnableExperimentalFeatures = new List<ExperimentalFeatures>`
	`34`	`+ EnableExperimentalFeatures = new List<ExperimentalFeature>`
`35`	`35`	`{`
`36`		`- new ExperimentalFeatures()`
	`36`	`+ new ExperimentalFeature()`
`37`	`37`	`}`
`38`	`38`	`};`
`39`	`39`
`@@ -74,9 +74,9 @@ public void ResolveRubberduckParserState_NoException()`
`74`	`74`
`75`	`75`	`var initialSettings = new GeneralSettings`
`76`	`76`	`{`
`77`		`- EnableExperimentalFeatures = new List<ExperimentalFeatures>`
	`77`	`+ EnableExperimentalFeatures = new List<ExperimentalFeature>`
`78`	`78`	`{`
`79`		`- new ExperimentalFeatures()`
	`79`	`+ new ExperimentalFeature()`
`80`	`80`	`}`
`81`	`81`	`};`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,9 @@ private Configuration GetDefaultConfig()`
`46`	`46`	`Language = new DisplayLanguageSetting("en-US"),`
`47`	`47`	`IsAutoSaveEnabled = false,`
`48`	`48`	`AutoSavePeriod = 10,`
`49`		`- EnableExperimentalFeatures = new List<ExperimentalFeatures>`
	`49`	`+ EnableExperimentalFeatures = new List<ExperimentalFeature>`
`50`	`50`	`{`
`51`		`- new ExperimentalFeatures()`
	`51`	`+ new ExperimentalFeature()`
`52`	`52`	`}`
`53`	`53`	`//Delimiter = '.'`
`54`	`54`	`};`