fixes #4460

rubberduck-vba · Oct 26, 2018 · 77574e4 · 77574e4
1 parent 85e435f
commit 77574e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/Rubberduck.VBEEditor/SourceCodeHandling/CodePaneSourceCodeHandler.cs b/Rubberduck.VBEEditor/SourceCodeHandling/CodePaneSourceCodeHandler.cs
@@ -125,10 +125,10 @@ public CodeString Prettify(ICodeModule module, CodeString original)
             }
 
             var prettifiedPosition = new Selection(
-                    original.SnippetPosition.StartLine - 1 + original.CaretPosition.StartLine,
+                    original.SnippetPosition.ToZeroBased().StartLine + original.CaretPosition.StartLine,
                     prettifiedCode[original.CaretPosition.StartLine].Trim().Length == 0
                         ? indent
-                        : Math.Min(prettifiedCode[original.CaretPosition.StartLine].Length, prettifiedCaretCharIndex + 1))
+                        : Math.Min(prettifiedCode[original.CaretPosition.StartLine].Length, original.CaretPosition.StartColumn))
                 .ToOneBased();
 
             SetSelection(module, prettifiedPosition);

diff --git a/RubberduckTests/AutoComplete/SelfClosingPairCompletionTests.cs b/RubberduckTests/AutoComplete/SelfClosingPairCompletionTests.cs
@@ -176,22 +176,6 @@ public void DeletingOpeningChar_IndexExpr()
             Assert.AreEqual(expected, result);
         }
 
-        [Test] // ref. #4460
-        public void OpeningOnSecondLineDoesNotJumpToEndOfLine()
-        {
-            var pair = new SelfClosingPair('"', '"');
-            var input = '"';
-            var original = @"
-ExecuteStoredProcedure (""AddAppointmentCountForAClinic"", False,dbconfig.SQLConString, _
-                | thisClinic.ClinicID ,".ToCodeString();
-            var expected = @"
-ExecuteStoredProcedure (""AddAppointmentCountForAClinic"", False,dbconfig.SQLConString, _
-                ""|"" thisClinic.ClinicID ,".ToCodeString();
-
-            var result = Run(pair, original, input);
-            Assert.AreEqual(expected, result);
-        }
-
         [Test]
         public void DeletingOpeningCharRemovesPairedClosingChar_NestedParensMultiline()
         {