Handle self-assigned declarations. Closes #3774

Author: comintern

Rubberduck.Refactorings/MoveCloserToUsage/MoveCloserToUsageRefactoring.cs

@@ -155,9 +155,10 @@ private void InsertNewDeclaration()
         {
             var subscripts = _target.Context.GetDescendent<VBAParser.SubscriptsContext>()?.GetText() ?? string.Empty;
             var identifier = _target.IsArray ? $"{_target.IdentifierName}({subscripts})" : _target.IdentifierName;
+
             var newVariable = _target.AsTypeContext is null
                 ? $"{Tokens.Dim} {identifier} {Tokens.As} {Tokens.Variant}{Environment.NewLine}"
-                : $"{Tokens.Dim} {identifier} {Tokens.As} {_target.AsTypeNameWithoutArrayDesignator}{Environment.NewLine}";
+                : $"{Tokens.Dim} {identifier} {Tokens.As} {(_target.IsSelfAssigned ? Tokens.New + " " : string.Empty)}{_target.AsTypeNameWithoutArrayDesignator}{Environment.NewLine}";
 
             var firstReference = _target.References.OrderBy(r => r.Selection.StartLine).First();
 

RubberduckTests/Refactoring/MoveCloserToUsageTests.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using System.Windows.Forms;
 using NUnit.Framework;
@@ -1182,5 +1183,39 @@ Dim bar(1, 1) As Boolean
                 Assert.AreEqual(expectedCode, rewriter.GetText());
             }
         }
+
+        [Test]
+        [Category("Refactorings")]
+        [Category("Move Closer")]
+        public void MoveCloserToUsageRefactoring_SelfAssigned()
+        {
+            //Input
+            const string inputCode =
+                @"Private bar As New Collection
+Private Sub Foo()
+    bar.Add 42
+End Sub";
+            var selection = new Selection(1, 1);
+
+            //Expectation
+            const string expectedCode =
+                @"Private Sub Foo()
+    Dim bar As New Collection
+    bar.Add 42
+End Sub";
+
+            var vbe = MockVbeBuilder.BuildFromSingleStandardModule(inputCode, out var component, selection);
+            using (var state = MockParser.CreateAndParse(vbe.Object))
+            {
+
+                var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection);
+
+                var refactoring = new MoveCloserToUsageRefactoring(vbe.Object, state, null);
+                refactoring.Refactor(qualifiedSelection);
+
+                var rewriter = state.GetRewriter(component);
+                Assert.AreEqual(expectedCode, rewriter.GetText());
+            }
+        }
     }
 }