removed redundant ctor param, fixed inline-if behavior

Author: retailcoder

Rubberduck.Core/AutoComplete/AutoCompleteBlockBase.cs

@@ -12,28 +12,21 @@ public abstract class AutoCompleteBlockBase : AutoCompleteBase
         /// <param name="indenterSettings">Used for auto-indenting blocks as per indenter settings.</param>
         /// <param name="inputToken">The token that starts the block, i.e. what to detect.</param>
         /// <param name="outputToken">The token that closes the block, i.e. what to insert.</param>
-        /// <param name="committedOnly">Indicates whether line of code was committed, i.e. selection is on the line underneath the code string.</param>
-        protected AutoCompleteBlockBase(IVBETypeLibsAPI api, IIndenterSettings indenterSettings, string inputToken, string outputToken, bool committedOnly = true)
+        protected AutoCompleteBlockBase(IVBETypeLibsAPI api, IIndenterSettings indenterSettings, string inputToken, string outputToken)
             :base(inputToken, outputToken)
         {
             _api = api;
             _indenterSettings = indenterSettings;
-            _committedOnly = committedOnly;
         }
 
         protected virtual bool FindInputTokenAtBeginningOfCurrentLine => false;
 
         private readonly IVBETypeLibsAPI _api;
         private readonly IIndenterSettings _indenterSettings;
-        private readonly bool _committedOnly;
 
         protected virtual bool ExecuteOnCommittedInputOnly => true;
         protected virtual bool MatchInputTokenAtEndOfLineOnly => false;
 
-        private string _pattern => MatchInputTokenAtEndOfLineOnly
-                                    ? $"\\b{InputToken}\\r\\n$"
-                                    : $"\\b{InputToken}\\b";
-
         private bool _executing;
         public override bool Execute(AutoCompleteEventArgs e)
         {
@@ -45,7 +38,11 @@ public override bool Execute(AutoCompleteEventArgs e)
             var selection = e.CodePane.Selection;
             var stdIndent = _indenterSettings.IndentSpaces;
 
-            if ((!_committedOnly || e.IsCommitted) && Regex.IsMatch(e.OldCode.Trim(), _pattern))
+            var isMatch = MatchInputTokenAtEndOfLineOnly 
+                            ? e.OldCode.EndsWith(InputToken)
+                            : Regex.IsMatch(e.OldCode.Trim(), $"\\b{InputToken}\\b");
+
+            if (isMatch && (!ExecuteOnCommittedInputOnly || e.IsCommitted))
             {
                 var indent = e.OldCode.TakeWhile(c => char.IsWhiteSpace(c)).Count();
                 using (var module = e.CodePane.CodeModule)
@@ -54,6 +51,7 @@ public override bool Execute(AutoCompleteEventArgs e)
                     var code = OutputToken.PadLeft(OutputToken.Length + indent, ' ');
                     if (module.GetLines(selection.NextLine) == code)
                     {
+                        _executing = false;
                         return false;
                     }
 

Rubberduck.Core/AutoComplete/AutoCompleteIfBlock.cs

@@ -1,6 +1,7 @@
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.SmartIndenter;
 using Rubberduck.VBEditor.ComManagement.TypeLibsAPI;
+using Rubberduck.VBEditor.Events;
 
 namespace Rubberduck.AutoComplete
 {

Rubberduck.Core/AutoComplete/AutoCompleteOnErrorResumeNextBlock.cs

@@ -7,6 +7,8 @@ namespace Rubberduck.AutoComplete
     public class AutoCompleteOnErrorResumeNextBlock : AutoCompleteBlockBase
     {
         public AutoCompleteOnErrorResumeNextBlock(IVBETypeLibsAPI api, IIndenterSettings indenterSettings)
-            : base(api, indenterSettings, $"{Tokens.On} {Tokens.Error} {Tokens.Resume} {Tokens.Next}", $"{Tokens.On} {Tokens.Error} {Tokens.GoTo} 0", false) { }
+            : base(api, indenterSettings, $"{Tokens.On} {Tokens.Error} {Tokens.Resume} {Tokens.Next}", $"{Tokens.On} {Tokens.Error} {Tokens.GoTo} 0") { }
+
+        protected override bool ExecuteOnCommittedInputOnly => false;
     }
 }