SCP appears to (finally) work. mostly.

Author: retailcoder

Rubberduck.Core/AutoComplete/AutoCompleteKeyDownHandler.cs

@@ -30,18 +30,20 @@ public AutoCompleteKeyDownHandler(Func<AutoCompleteSettings> getSettings, Func<L
         public void Run(ICodeModule module, Selection pSelection, AutoCompleteEventArgs e)
         {
             var currentContent = module.GetLines(pSelection);
-            if (HandleSmartConcat(e, pSelection, currentContent, module))
-            {
-                return;
-            }
+            HandleSmartConcat(e, pSelection, currentContent, module);
+            if (e.Handled) { return; }
 
             HandleSelfClosingPairs(e, module, pSelection);
+            if (e.Handled) { return; }
+
+            //HandleSomethingElse(?)
+            //if (e.Handled) { return; }
         }
 
         /// <summary>
-        /// Adds a line continuation when {ENTER} is pressed inside a string literal; returns false otherwise.
+        /// Adds a line continuation when {ENTER} is pressed inside a string literal.
         /// </summary>
-        private bool HandleSmartConcat(AutoCompleteEventArgs e, Selection pSelection, string currentContent, ICodeModule module)
+        private void HandleSmartConcat(AutoCompleteEventArgs e, Selection pSelection, string currentContent, ICodeModule module)
         {
             var shouldHandle = _getSettings().EnableSmartConcat &&
                                e.Character == '\r' &&
@@ -57,19 +59,15 @@ private bool HandleSmartConcat(AutoCompleteEventArgs e, Selection pSelection, st
                 if (e.ControlDown)
                 {
                     code = $"{currentContent.Substring(0, pSelection.StartColumn - 1)}\" & vbNewLine & _\r\n{whitespace}\"{currentContent.Substring(pSelection.StartColumn - 1)}";
-
                 }
 
                 module.ReplaceLine(pSelection.StartLine, code);
                 using (var pane = module.CodePane)
                 {
                     pane.Selection = new Selection(pSelection.StartLine + 1, indent + currentContent.Substring(pSelection.StartColumn - 2).Length);
                     e.Handled = true;
-                    return true;
                 }
             }
-
-            return false;
         }
 
         private void HandleSelfClosingPairs(AutoCompleteEventArgs e, ICodeModule module, Selection pSelection)
@@ -115,7 +113,10 @@ private void HandleSelfClosingPairs(AutoCompleteEventArgs e, ICodeModule module,
 
                         module.DeleteLines(result.SnippetPosition);
                         module.InsertLines(result.SnippetPosition.StartLine, result.Code);
-                        var finalSelection = new Selection(result.SnippetPosition.StartLine, result.CaretPosition.StartColumn + 1);
+                        var offByOne = result.Code != module.GetLines(result.SnippetPosition);
+
+                        var finalSelection = new Selection(result.SnippetPosition.StartLine, result.CaretPosition.StartColumn + 1)
+                            .ShiftRight(offByOne ? 1 : 0);
                         pane.Selection = finalSelection;
                         e.Handled = true;
                         return;

Rubberduck.Core/AutoComplete/AutoCompleteService.cs

@@ -108,6 +108,7 @@ public void ApplyAutoCompleteSettings(Configuration config)
 
         private void HandleKeyDown(object sender, AutoCompleteEventArgs e)
         {
+            Debug.Assert(_enabled, "KeyDown controller is executing, but auto-completion service is disabled.");
             if (e.Character == default && !e.IsDelete)
             {
                 return;

Rubberduck.Core/AutoComplete/SelfClosingPairCompletion/CodeStringPrettifier.cs

@@ -21,6 +21,8 @@ public CodeString Prettify(ICodeModule module, CodeString original)
                 }
             }
 
+            var indent = originalCode.TakeWhile(c => c == ' ').Count();
+
             module.DeleteLines(original.SnippetPosition.StartLine, original.SnippetPosition.LineCount);
             module.InsertLines(original.SnippetPosition.StartLine, originalCode);
             var prettifiedCode = module.GetLines(original.SnippetPosition);
@@ -40,7 +42,7 @@ public CodeString Prettify(ICodeModule module, CodeString original)
                 }
             }
 
-            var prettifiedPosition = new Selection(original.SnippetPosition.StartLine - 1, prettifiedCaretCharIndex + 1).ToOneBased();
+            var prettifiedPosition = new Selection(original.SnippetPosition.StartLine - 1, originalCode.Trim().Length == 0 ? indent : prettifiedCaretCharIndex + 1).ToOneBased();
             using (var pane = module.CodePane)
             {
                 pane.Selection = prettifiedPosition;

Rubberduck.Core/AutoComplete/SelfClosingPairCompletion/SelfClosingPairCompletionService.cs

@@ -58,7 +58,9 @@ private CodeString HandleOpeningChar(SelfClosingPair pair, CodeString original)
             lines[original.CaretPosition.StartLine] = 
                 string.IsNullOrEmpty(original.Code) 
                     ? autoCode 
-                    : line.Insert(original.CaretPosition.StartColumn, autoCode);
+                    : original.CaretPosition.StartColumn == line.Length 
+                        ? line + autoCode 
+                        : line.Insert(original.CaretPosition.StartColumn, autoCode);
 
             return new CodeString(string.Join("\n", lines), nextPosition, original.SnippetPosition);
         }