closes #4505

Author: retailcoder

Rubberduck.Core/AutoComplete/Service/SelfClosingPairHandler.cs

@@ -41,6 +41,11 @@ public override bool Handle(AutoCompleteEventArgs e, AutoCompleteSettings settin
             }
 
             var original = CodePaneHandler.GetCurrentLogicalLine(e.Module);
+            if (original == null)
+            {
+                // selection spans more than a single logical line
+                return false;
+            }
 
             if (pair != null)
             {
@@ -74,6 +79,13 @@ public override bool Handle(AutoCompleteEventArgs e, AutoCompleteSettings settin
 
         private bool HandleInternal(AutoCompleteEventArgs e, CodeString original, SelfClosingPair pair, out CodeString result)
         {
+            if (!original.CaretPosition.IsSingleCharacter)
+            {
+                // todo: WrapSelection?
+                result = null;
+                return false;
+            }
+
             var isPresent = original.CaretLine.EndsWith($"{pair.OpeningChar}{pair.ClosingChar}");
 
             if (!_scpService.Execute(pair, original, e.Character, out result))

Rubberduck.Core/AutoComplete/Service/SmartConcatenationHandler.cs

@@ -25,8 +25,9 @@ public override bool Handle(AutoCompleteEventArgs e, AutoCompleteSettings settin
             }
 
             var currentContent = CodePaneHandler.GetCurrentLogicalLine(e.Module);
-            if (!currentContent.IsInsideStringLiteral)
+            if (!currentContent?.IsInsideStringLiteral ?? true)
             {
+                // selection spans more than a single logical line
                 return false;
             }
 

Rubberduck.VBEEditor/SourceCodeHandling/CodePaneSourceCodeHandler.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using Rubberduck.VBEditor.ComManagement;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+using System.Reflection;
 
 namespace Rubberduck.VBEditor.SourceCodeHandling
 {
@@ -165,42 +166,51 @@ private static CodeString GetPrettifiedCodeString(CodeString original, Selection
             return result;
         }
 
+        private const string LineContinuation = " _";
+
         public CodeString GetCurrentLogicalLine(ICodeModule module)
         {
-            const string lineContinuation = " _";
-
             Selection pSelection;
             using (var pane = module.CodePane)
             {
                 pSelection = pane.Selection;
             }
 
-            var currentLineIndex = pSelection.StartLine;
-            var currentLine = module.GetLines(currentLineIndex, 1);
+            var selectedLines = module.GetLines(pSelection.StartLine, pSelection.LineCount).Replace("\r", string.Empty).Split('\n');
+            var currentLine = selectedLines[0];
 
-            var caretLine = (currentLineIndex, currentLine);
-            var lines = new List<(int Line, string Content)> {caretLine};
+            var caretStartLine = (pSelection.StartLine, currentLine);
+            var lines = new List<(int pLine, string Content)> {caretStartLine};
 
-            while (currentLineIndex >= 1)
+            // selection line may not be the only physical line in the complete logical line; accounts for line continuations.
+            InsertPhysicalLinesAboveSelectionStart(lines, module, pSelection.StartLine);
+            AppendPhysicalLinesBelowSelectionStart(lines, module, pSelection.StartLine, currentLine);
+
+            var logicalLine = string.Join("\r\n", lines.Select(e => e.Content));
+
+            var zCaretLine = lines.IndexOf(caretStartLine);
+            var zCaretColumn = pSelection.StartColumn - 1;
+            var caretPosition = new Selection(
+                zCaretLine, zCaretColumn, zCaretLine + pSelection.LineCount - 1, pSelection.EndColumn - 1);
+
+            var pStartLine = lines[0].pLine;
+            var pEndLine = lines[lines.Count - 1].pLine;
+            var snippetPosition = new Selection(pStartLine, 1, pEndLine, 1);
+
+            if (lines[0].pLine < pSelection.StartLine || lines.Last().pLine > pSelection.EndLine)
             {
-                currentLineIndex--;
-                if (currentLineIndex >= 1)
-                {
-                    currentLine = module.GetLines(currentLineIndex, 1);
-                    if (currentLine.EndsWith(lineContinuation))
-                    {
-                        lines.Insert(0, (currentLineIndex, currentLine));
-                    }
-                    else
-                    {
-                        break;
-                    }
-                }
+                // selection spans more than a single logical line
+                return null;
             }
 
-            currentLineIndex = pSelection.StartLine;
-            currentLine = caretLine.currentLine;
-            while (currentLineIndex <= module.CountOfLines && currentLine.EndsWith(lineContinuation))
+            var result = new CodeString(logicalLine, caretPosition, snippetPosition);
+            return result;
+        }
+
+        private void AppendPhysicalLinesBelowSelectionStart(ICollection<(int Line, string Content)> lines, ICodeModule module, int currentLineIndex, string currentLine)
+        {
+            // assumes caret line is already in the list.
+            while (currentLineIndex <= module.CountOfLines && currentLine.EndsWith(LineContinuation))
             {
                 currentLineIndex++;
                 if (currentLineIndex <= module.CountOfLines)
@@ -213,21 +223,27 @@ public CodeString GetCurrentLogicalLine(ICodeModule module)
                     break;
                 }
             }
+        }
 
-            var logicalLine = string.Join("\r\n", lines.Select(e => e.Content));
-            var zCaretLine = lines.IndexOf(caretLine);
-            var zCaretColumn = pSelection.StartColumn - 1;
-
-            var startLine = lines[0].Line;
-            var endLine = lines[lines.Count - 1].Line;
-
-            var result = new CodeString(
-                logicalLine,
-                new Selection(zCaretLine, zCaretColumn),
-                new Selection(startLine, 1, endLine, 1));
-
-            return result;
-
+        private void InsertPhysicalLinesAboveSelectionStart(IList<(int Line, string Content)> lines, ICodeModule module, int currentLineIndex)
+        {
+            // assumes caret line is already in the list.
+            while (currentLineIndex >= 1)
+            {
+                currentLineIndex--;
+                if (currentLineIndex >= 1)
+                {
+                    var currentLine = module.GetLines(currentLineIndex, 1);
+                    if (currentLine.EndsWith(LineContinuation))
+                    {
+                        lines.Insert(0, (currentLineIndex, currentLine));
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+            }
         }
 
         public CodeString GetCurrentLogicalLine(QualifiedModuleName module)