Merge branch 'rubberduck-vba/next' into next

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);
             }

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());
+            }
+        }
     }
 }