Merge branch 'next' into AttributableContexts

Author: MDoerner

Rubberduck.Core/AutoComplete/AutoCompleteBase.cs

@@ -9,6 +9,7 @@
 
 namespace Rubberduck.AutoComplete
 {
+
     public abstract class AutoCompleteBase : IAutoComplete
     {
         protected AutoCompleteBase(string inputToken, string outputToken)
@@ -67,7 +68,7 @@ public virtual bool Execute(AutoCompleteEventArgs e, AutoCompleteSettings settin
                 else if (input == OutputToken && nextChar == OutputToken)
                 {
                     // just move caret one character to the right & suppress the keypress
-                    pane.Selection = new Selection(pSelection.StartLine, pSelection.StartColumn + 2);
+                    pane.Selection = new Selection(pSelection.StartLine, GetPrettifiedCaretPosition(pSelection, original, original) + 1);
                     e.Handled = true;
                     return true;
                 }

Rubberduck.Core/AutoComplete/AutoCompleteBlockBase.cs

@@ -13,6 +13,7 @@
 
 namespace Rubberduck.AutoComplete
 {
+
     public abstract class AutoCompleteBlockBase : AutoCompleteBase
     {
         /// <param name="indenterSettings">Used for auto-indenting blocks as per indenter settings.</param>
@@ -24,6 +25,8 @@ protected AutoCompleteBlockBase(IConfigProvider<IndenterSettings> indenterSettin
             IndenterSettings = indenterSettings;
         }
 
+        public bool IsCapturing { get; set; }
+
         protected virtual bool FindInputTokenAtBeginningOfCurrentLine => false;
         protected virtual bool SkipPreCompilerDirective => true;
 
@@ -42,43 +45,45 @@ public override bool Execute(AutoCompleteEventArgs e, AutoCompleteSettings setti
             {
                 return false;
             }
-            
-            var module = e.CodeModule;
-            using (var pane = module.CodePane)
-            {
-                var selection = pane.Selection;
-                var originalCode = module.GetLines(selection);
-                var code = originalCode.Trim().StripStringLiterals();
-                var hasComment = code.HasComment(out int commentStart);
-
-                var isDeclareStatement = Regex.IsMatch(code, $"\\b{Tokens.Declare}\\b", RegexOptions.IgnoreCase);
-                var isExitStatement = Regex.IsMatch(code, $"\\b{Tokens.Exit}\\b", RegexOptions.IgnoreCase);
-                var isNamedArg = Regex.IsMatch(code, $"\\b{InputToken}\\:\\=", RegexOptions.IgnoreCase);
 
-                if ((SkipPreCompilerDirective && code.StartsWith("#"))
-                    || isDeclareStatement || isExitStatement || isNamedArg)
+            {
+                var module = e.CodeModule;
+                using (var pane = module.CodePane)
                 {
+                    var selection = pane.Selection;
+                    var originalCode = module.GetLines(selection);
+                    var code = originalCode.Trim().StripStringLiterals();
+                    var hasComment = code.HasComment(out int commentStart);
+
+                    var isDeclareStatement = Regex.IsMatch(code, $"\\b{Tokens.Declare}\\b", RegexOptions.IgnoreCase);
+                    var isExitStatement = Regex.IsMatch(code, $"\\b{Tokens.Exit}\\b", RegexOptions.IgnoreCase);
+                    var isNamedArg = Regex.IsMatch(code, $"\\b{InputToken}\\:\\=", RegexOptions.IgnoreCase);
+
+                    if ((SkipPreCompilerDirective && code.StartsWith("#"))
+                        || isDeclareStatement || isExitStatement || isNamedArg)
+                    {
+                        return false;
+                    }
+
+                    if (IsMatch(code) && !IsBlockCompleted(module, selection))
+                    {
+                        var indent = originalCode.TakeWhile(c => char.IsWhiteSpace(c)).Count();
+                        var newCode = OutputToken.PadLeft(OutputToken.Length + indent, ' ');
+
+                        var stdIndent = IndentBody
+                            ? IndenterSettings.Create().IndentSpaces
+                            : 0;
+
+                        module.InsertLines(selection.NextLine.StartLine, "\n" + newCode);
+
+                        module.ReplaceLine(selection.NextLine.StartLine, new string(' ', indent + stdIndent));
+                        pane.Selection = new Selection(selection.NextLine.StartLine, indent + stdIndent + 1);
+
+                        e.Handled = true;
+                        return true;
+                    }
                     return false;
                 }
-
-                if (IsMatch(code) && !IsBlockCompleted(module, selection))
-                {
-                    var indent = originalCode.TakeWhile(c => char.IsWhiteSpace(c)).Count();
-                    var newCode = OutputToken.PadLeft(OutputToken.Length + indent, ' ');
-
-                    var stdIndent = IndentBody 
-                        ? IndenterSettings.Create().IndentSpaces 
-                        : 0;
-
-                    module.InsertLines(selection.NextLine.StartLine, "\n" + newCode);
-
-                    module.ReplaceLine(selection.NextLine.StartLine, new string(' ', indent + stdIndent));
-                    pane.Selection = new Selection(selection.NextLine.StartLine, indent + stdIndent + 1);
-
-                    e.Handled = true;
-                    return true;
-                }
-                return false;
             }
         }
 
@@ -104,7 +109,7 @@ public override bool IsMatch(string code)
             return regexOk && (!hasComment || code.IndexOf(InputToken) < commentIndex);
         }
 
-        private bool IsBlockCompleted(ICodeModule module, Selection selection)
+        protected bool IsBlockCompleted(ICodeModule module, Selection selection)
         {
             string content;
             var proc = module.GetProcOfLine(selection.StartLine);

Rubberduck.Core/AutoComplete/AutoCompleteIfBlock.cs

@@ -1,13 +1,20 @@
 using Rubberduck.Parsing.Grammar;
+using Rubberduck.Parsing.VBA;
+using Rubberduck.Settings;
 using Rubberduck.SettingsProvider;
 using Rubberduck.SmartIndenter;
+using Rubberduck.VBEditor;
+using Rubberduck.VBEditor.Events;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
 
 namespace Rubberduck.AutoComplete
 {
     public class AutoCompleteIfBlock : AutoCompleteBlockBase
     {
         public AutoCompleteIfBlock(IConfigProvider<IndenterSettings> indenterSettings) 
-            : base(indenterSettings, $"{Tokens.Then}", $"{Tokens.End} {Tokens.If}") { }
+            : base(indenterSettings, $"{Tokens.If}", $"{Tokens.End} {Tokens.If}") { }
 
         // matching "If" would trigger erroneous block completion on inline if..then..else syntax.
         protected override bool MatchInputTokenAtEndOfLineOnly => true;