strip dangling vbNewLine, vbCrLf, vbCr, and vbCrLf concatenations from last non-empty line

Author: retailcoder

Rubberduck.Core/AutoComplete/Service/SelfClosingPairCompletionService.cs

@@ -221,10 +221,14 @@ private CodeString DeleteMatchingTokensMultiline(SelfClosingPair pair, CodeStrin
                             // we're not concatenating anything anymore; remove concat operator too.
                             var concatOffset = lastNonEmptyLine.EndsWith(" &") ? 2 : 1;
                             nonEmptyLines[nonEmptyLines.Length - 1] = lastNonEmptyLine.Remove(lastNonEmptyLine.Length - concatOffset);
-                            lastNonEmptyLine = nonEmptyLines[nonEmptyLines.Length - 1];
+                            TrimLastNonEmptyLine(nonEmptyLines, "& vbNewLine");
+                            TrimLastNonEmptyLine(nonEmptyLines, "& vbCrLf");
+                            TrimLastNonEmptyLine(nonEmptyLines, "& vbCr");
+                            TrimLastNonEmptyLine(nonEmptyLines, "& vbLf");
                         }
 
                         // we're keeping the closing quote, but let's put the caret inside:
+                        lastNonEmptyLine = nonEmptyLines[nonEmptyLines.Length - 1];
                         var quoteOffset = lastNonEmptyLine.EndsWith("\"") ? 1 : 0;
                         finalCaretPosition = new Selection(
                             finalCaretPosition.StartLine,
@@ -243,6 +247,18 @@ private CodeString DeleteMatchingTokensMultiline(SelfClosingPair pair, CodeStrin
 
         }
 
+        private static void TrimLastNonEmptyLine(string[] nonEmptyLines, string ending)
+        {
+            var lastNonEmptyLine = nonEmptyLines[nonEmptyLines.Length - 1];
+            if (lastNonEmptyLine.EndsWith(ending, StringComparison.OrdinalIgnoreCase))
+            {
+                var offset = lastNonEmptyLine.EndsWith(" " + ending, StringComparison.OrdinalIgnoreCase)
+                    ? ending.Length + 1
+                    : ending.Length;
+                nonEmptyLines[nonEmptyLines.Length - 1] = lastNonEmptyLine.Remove(lastNonEmptyLine.Length - offset);
+            }
+        }
+
         private Selection FindMatchingTokenPosition(SelfClosingPair pair, CodeString original)
         {
             var code = string.Join("\r\n", original.Lines) + "\r\n";

RubberduckTests/AutoComplete/SelfClosingPairCompletionTests.cs

@@ -234,12 +234,48 @@ public void WhenBackspacingClearsLineContinuatedCaretLine_PlacesCaretInsideStrin
         }
 
         [Test]
-        public void WhenBackspacingClearsLineContinuatedCaretLine_WithConcatenatedVbNewLine_PlacesCaretRightOfVbNewLineOnPreviousLine()
+        public void WhenBackspacingClearsLineContinuatedCaretLine_WithConcatenatedVbNewLine_PlacesCaretInsideStringOnPreviousLine()
         {
             var pair = new SelfClosingPair('"', '"');
             var input = Keys.Back;
             var original = "foo = \"test\" & vbNewLine & _\r\n     \"|\"".ToCodeString();
-            var expected = "foo = \"test\" & vbNewLine|".ToCodeString();
+            var expected = "foo = \"test|\"".ToCodeString();
+
+            var result = Run(pair, original, input);
+            Assert.AreEqual(expected, result);
+        }
+
+        [Test]
+        public void WhenBackspacingClearsLineContinuatedCaretLine_WithConcatenatedVbCrLf_PlacesCaretInsideStringOnPreviousLine()
+        {
+            var pair = new SelfClosingPair('"', '"');
+            var input = Keys.Back;
+            var original = "foo = \"test\" & vbCrLf & _\r\n     \"|\"".ToCodeString();
+            var expected = "foo = \"test|\"".ToCodeString();
+
+            var result = Run(pair, original, input);
+            Assert.AreEqual(expected, result);
+        }
+
+        [Test]
+        public void WhenBackspacingClearsLineContinuatedCaretLine_WithConcatenatedVbCr_PlacesCaretInsideStringOnPreviousLine()
+        {
+            var pair = new SelfClosingPair('"', '"');
+            var input = Keys.Back;
+            var original = "foo = \"test\" & vbCr & _\r\n     \"|\"".ToCodeString();
+            var expected = "foo = \"test|\"".ToCodeString();
+
+            var result = Run(pair, original, input);
+            Assert.AreEqual(expected, result);
+        }
+
+        [Test]
+        public void WhenBackspacingClearsLineContinuatedCaretLine_WithConcatenatedVbLf_PlacesCaretInsideStringOnPreviousLine()
+        {
+            var pair = new SelfClosingPair('"', '"');
+            var input = Keys.Back;
+            var original = "foo = \"test\" & vbLf & _\r\n     \"|\"".ToCodeString();
+            var expected = "foo = \"test|\"".ToCodeString();
 
             var result = Run(pair, original, input);
             Assert.AreEqual(expected, result);