Clean up the botched merge

rubberduck-vba · Mar 14, 2018 · b6cc24e · b6cc24e
1 parent 8575191
commit b6cc24e
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 28 deletions.
diff --git a/Rubberduck.Core/Rubberduck.Core.csproj b/Rubberduck.Core/Rubberduck.Core.csproj
@@ -475,9 +475,6 @@
     <Compile Include="UnitTesting\IFakes.cs" />
     <Compile Include="UnitTesting\ReturnTypeConverter.cs" />
     <Compile Include="UnitTesting\PermissiveObjectComparer.cs" />
-    <Compile Include="VBERuntime\RegistryWrapper.cs" />
-    <Compile Include="VBERuntime\IVBESettings.cs" />
-    <Compile Include="VBERuntime\VBESettings.cs" />
     <Compile Include="VersionCheck\IVersionCheck.cs" />
     <Compile Include="UI\Command\MenuItems\CommandBars\AppCommandBarBase.cs" />
     <Compile Include="UI\Command\MenuItems\CommandBars\ContextSelectionLabelMenuItem.cs" />

diff --git a/Rubberduck.Core/UI/Settings/SettingsForm.cs b/Rubberduck.Core/UI/Settings/SettingsForm.cs
@@ -1,10 +1,9 @@
 using System.Windows.Forms;
 using Rubberduck.Settings;
 using Rubberduck.Common;
-using Rubberduck.VBERuntime;
+using Rubberduck.VBEditor.VBERuntime.Settings;
 using System.Collections.Generic;
 using System;
-using System.Collections.ObjectModel;
 
 namespace Rubberduck.UI.Settings
 {

diff --git a/...erduck.Core/VBERuntime/RegistryWrapper.cs → ...duck.VBEEditor/Utility/RegistryWrapper.cs b/...erduck.Core/VBERuntime/RegistryWrapper.cs → ...duck.VBEEditor/Utility/RegistryWrapper.cs
@@ -1,6 +1,6 @@
-using Microsoft.Win32;
+using Microsoft.Win32;
 
-namespace Rubberduck.VBERuntime
+namespace Rubberduck.VBEditor.Utility
 {
     public interface IRegistryWrapper
     {

diff --git a/Rubberduck.Core/VBERuntime/IVBESettings.cs → ...ditor/VBERuntime/Settings/IVBESettings.cs b/Rubberduck.Core/VBERuntime/IVBESettings.cs → ...ditor/VBERuntime/Settings/IVBESettings.cs
@@ -1,8 +1,8 @@
-namespace Rubberduck.VBERuntime
+namespace Rubberduck.VBEditor.VBERuntime.Settings
 {
     public interface IVBESettings
     {
-        VBESettings.DllVersion Version { get; }
+        DllVersion Version { get; }
         bool CompileOnDemand { get; set; }
         bool BackGroundCompile { get; set; }
     }

diff --git a/Rubberduck.Core/VBERuntime/VBESettings.cs → ...Editor/VBERuntime/Settings/VBESettings.cs b/Rubberduck.Core/VBERuntime/VBESettings.cs → ...Editor/VBERuntime/Settings/VBESettings.cs
@@ -1,36 +1,30 @@
 using System;
 using Microsoft.Win32;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+using Rubberduck.VBEditor.Utility;
 
-namespace Rubberduck.VBERuntime
+namespace Rubberduck.VBEditor.VBERuntime.Settings
 {
     public class VBESettings : IVBESettings
     {
         private const string Vbe7SettingPath = @"HKEY_CURRENT_USER\Software\Microsoft\VBA\7.0\Common";
         private const string Vbe6SettingPath = @"HKEY_CURRENT_USER\Software\Microsoft\VBA\6.0\Common";
 
-        public enum DllVersion
-        {
-            Unknown,
-            Vbe6,
-            Vbe7
-        }
-
         private readonly IRegistryWrapper _registry;
         private readonly string _activeRegistryRootPath;
-        private readonly string[] _registryRootPaths = {Vbe7SettingPath, Vbe6SettingPath};
+        private readonly string[] _registryRootPaths = { Vbe7SettingPath, Vbe6SettingPath };
 
         public VBESettings(IVBE vbe, IRegistryWrapper registry)
         {
             try
             {
-                switch (int.Parse(vbe.Version.Split('.')[0]))
+                switch (VBEDllVersion.GetCurrentVersion(vbe))
                 {
-                    case 6:
+                    case DllVersion.Vbe6:
                         Version = DllVersion.Vbe6;
                         _activeRegistryRootPath = Vbe6SettingPath;
                         break;
-                    case 7:
+                    case DllVersion.Vbe7:
                         Version = DllVersion.Vbe7;
                         _activeRegistryRootPath = Vbe7SettingPath;
                         break;
@@ -83,7 +77,7 @@ private void WriteAllRegistryPaths(string keyName, bool value)
         private bool? DWordToBooleanConverter(string path, string keyName)
         {
             return !(_registry.GetValue(path, keyName, DWordFalseValue) is int result)
-                ? (bool?) null
+                ? (bool?)null
                 : Convert.ToBoolean(result);
         }
 

diff --git a/RubberduckTests/Settings/GeneralSettingsTests.cs b/RubberduckTests/Settings/GeneralSettingsTests.cs
@@ -7,7 +7,7 @@
 using Rubberduck.Common;
 using Moq;
 using Rubberduck.UI;
-using Rubberduck.VBERuntime;
+using Rubberduck.VBEditor.VBERuntime.Settings;
 using System;
 
 namespace RubberduckTests.Settings

diff --git a/RubberduckTests/VBE/VBESettingsTests.cs b/RubberduckTests/VBE/VBESettingsTests.cs
@@ -1,7 +1,9 @@
 using Microsoft.Win32;
 using Moq;
 using NUnit.Framework;
-using Rubberduck.VBERuntime;
+using Rubberduck.VBEditor.Utility;
+using Rubberduck.VBEditor.VBERuntime;
+using Rubberduck.VBEditor.VBERuntime.Settings;
 using RubberduckTests.Mocks;
 
 namespace RubberduckTests.VBE
@@ -29,7 +31,7 @@ public void DllVersion_MustBe6()
             vbe.SetupGet(s => s.Version).Returns("6.00");
             var settings = new VBESettings(vbe.Object, registry.Object);
 
-            Assert.AreEqual(VBESettings.DllVersion.Vbe6, settings.Version);
+            Assert.AreEqual(DllVersion.Vbe6, settings.Version);
         }
 
         [Category("VBE")]
@@ -42,7 +44,7 @@ public void DllVersion_MustBe7()
             vbe.SetupGet(s => s.Version).Returns("7.00");
             var settings = new VBESettings(vbe.Object, registry.Object);
 
-            Assert.AreEqual(VBESettings.DllVersion.Vbe7, settings.Version);
+            Assert.AreEqual(DllVersion.Vbe7, settings.Version);
         }
 
         [Category("VBE")]
@@ -55,7 +57,7 @@ public void DllVersion_IsBogus()
             vbe.SetupGet(s => s.Version).Returns("foo");
             var settings = new VBESettings(vbe.Object, registry.Object);
 
-            Assert.AreEqual(VBESettings.DllVersion.Unknown, settings.Version);
+            Assert.AreEqual(DllVersion.Unknown, settings.Version);
         }
 
         [Category("VBE")]
@@ -68,7 +70,7 @@ public void DllVersion_IsNull()
             vbe.SetupGet(s => s.Version).Returns((string)null);
             var settings = new VBESettings(vbe.Object, registry.Object);
 
-            Assert.IsTrue(settings.Version == VBESettings.DllVersion.Unknown);
+            Assert.IsTrue(settings.Version == DllVersion.Unknown);
         }
 
         [Category("VBE")]