Merge branch 'rubberduck-vba/next' into 1584_UnreachableSelectCase

Author: BZngr

Rubberduck.Core/Refactorings/MoveCloserToUsage/MoveCloserToUsageRefactoring.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using Antlr4.Runtime;
+using Antlr4.Runtime.Misc;
 using Rubberduck.Common;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Rewriter;
@@ -198,7 +199,8 @@ private void UpdateCallsToOtherModule(IEnumerable<IdentifierReference> reference
                 }
 
                 var rewriter = _state.GetRewriter(reference.QualifiedModuleName);
-                rewriter.Replace(parent as ParserRuleContext, reference.IdentifierName);
+                var tokenInterval = Interval.Of(parent.SourceInterval.a, reference.Context.SourceInterval.b);
+                rewriter.Replace(tokenInterval, reference.IdentifierName);
 
                 _rewriters.Add(rewriter);
             }

Rubberduck.Deployment/BuildRegistryScript.ps1

@@ -95,9 +95,17 @@ try
 				if (Test-Path -Path $regFile -PathType Leaf)
 				{
 					$datetime = Get-Date;
-					& reg.exe import $regFile;
+					if ([Environment]::Is64BitOperatingSystem)
+					{
+						& reg.exe import $regFile /reg:32;
+						& reg.exe import $regFile /reg:64;
+					}
+					else 
+					{
+						& reg.exe import $regFile;
+					}
 					& reg.exe import ($dir + "\RubberduckAddinRegistry.reg");
-					Move-Item -Path $regFile -Destination ($regFile + ".imported_" + $datetime.ToUniversalTime().ToString("yyyyMMddhhmmss") + ".txt" )
+					Move-Item -Path $regFile -Destination ($regFile + ".imported_" + $datetime.ToUniversalTime().ToString("yyyyMMddHHmmss") + ".txt" )
 				}
 			}
 			else

Rubberduck.Deployment/Writers/LocalDebugRegistryWriter.cs

@@ -13,6 +13,7 @@ public class LocalDebugRegistryWriter : IRegistryWriter
     {
         public string Write(IOrderedEnumerable<RegistryEntry> entries)
         {
+            //System.Diagnostics.Debugger.Launch(); //uncomment if need to debug
             var sb = new StringBuilder("Windows Registry Editor Version 5.00" + Environment.NewLine + Environment.NewLine);
             var distinctKeys = new List<string>();
 
@@ -30,12 +31,14 @@ public string Write(IOrderedEnumerable<RegistryEntry> entries)
                     throw new InvalidOperationException("Unexpected registry entry: " + entry.Key);
                 }
 
-                var value = ReplacePlaceholder(entry.Value, entry.Bitness);
-
-                var key = Registry.CurrentUser.CreateSubKey(entry.Key);
-                if (!(string.IsNullOrWhiteSpace(entry.Name) && string.IsNullOrWhiteSpace(value)))
+                if (Environment.Is64BitOperatingSystem)
+                {
+                    MakeRegistryEntries(entry, RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Registry32));
+                    MakeRegistryEntries(entry, RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Registry64));
+                }
+                else 
                 {
-                    key.SetValue(entry.Name, value);
+                    MakeRegistryEntries(entry, Registry.CurrentUser);
                 }
 
                 if (!distinctKeys.Contains(entry.Key))
@@ -53,6 +56,18 @@ public string Write(IOrderedEnumerable<RegistryEntry> entries)
             return sb.ToString();
         }
 
+        private void MakeRegistryEntries(RegistryEntry entry, RegistryKey hKey) 
+        {
+            var key = hKey.CreateSubKey(entry.Key);
+
+            var value = ReplacePlaceholder(entry.Value, entry.Bitness);
+
+            if (!(string.IsNullOrWhiteSpace(entry.Name) && string.IsNullOrWhiteSpace(value)))
+            {
+                key.SetValue(entry.Name, value);
+            }
+        }
+
         //Cache the string so we call the AssemblyDirectory only once
         private string _currentPath;
         private string ReplacePlaceholder(string value, Bitness bitness)

RubberduckTests/Refactoring/MoveCloserToUsageTests.cs

@@ -880,5 +880,43 @@ Private Sub Foo()
                 Assert.AreEqual(inputCode, rewriter.GetText());
             }
         }
+
+        [Test]
+        [Category("Move Closer")]
+        [Category("Refactorings")]
+        public void MoveCloser_RespectsObjectProperties_InUsages()
+        {
+            const string input = @"Option Explicit
+
+Public Sub Test()
+    Dim foo As Object
+    Debug.Print ""Some statements between""
+    Debug.Print ""Declaration and first usage!""
+    Set foo = CreateObject(""Some.Object"")
+    foo.Name = ""FooName""
+    foo.OtherProperty = 1626
+End Sub";
+
+            const string expected = @"Option Explicit
+
+Public Sub Test()
+    Debug.Print ""Some statements between""
+    Debug.Print ""Declaration and first usage!""
+    Dim foo As Object
+Set foo = CreateObject(""Some.Object"")
+    foo.Name = ""FooName""
+    foo.OtherProperty = 1626
+End Sub";
+
+            var vbe = MockVbeBuilder.BuildFromSingleStandardModule(input, out var component);
+            using (var state = MockParser.CreateAndParse(vbe.Object))
+            {
+                var messageBox = new Mock<IMessageBox>();
+                var refactoring = new MoveCloserToUsageRefactoring(vbe.Object, state, messageBox.Object);
+                refactoring.Refactor(state.AllUserDeclarations.First(d => d.DeclarationType == DeclarationType.Variable));
+                var rewriter = state.GetRewriter(component);
+                Assert.AreEqual(expected, rewriter.GetText());
+            }
+        }
     }
 }