Skip to content

Commit 2406009

Browse files
committed
removed fluff
1 parent ddb2993 commit 2406009

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

Rubberduck.Core/AutoComplete/AutoCompleteBase.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,19 @@ protected AutoCompleteBase(string inputToken, string outputToken)
1414
public string InputToken { get; }
1515
public string OutputToken { get; }
1616

17-
private bool _executing;
18-
1917
public virtual bool Execute(AutoCompleteEventArgs e)
2018
{
2119
var selection = e.CodePane.Selection;
22-
if (_executing || selection.StartColumn < 2) { return false; }
20+
if (selection.StartColumn < 2) { return false; }
2321

2422
if (!e.IsCommitted && e.OldCode.Substring(selection.StartColumn - 2, 1) == InputToken)
2523
{
2624
using (var module = e.CodePane.CodeModule)
2725
{
28-
_executing = true;
2926
var newCode = e.OldCode.Insert(selection.StartColumn - 1, OutputToken);
3027
module.ReplaceLine(e.CodePane.Selection.StartLine, newCode);
3128
e.CodePane.Selection = selection;
3229
e.NewCode = newCode;
33-
_executing = false;
3430
return true;
3531
}
3632
}

Rubberduck.Core/AutoComplete/AutoCompleteBlockBase.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@ protected AutoCompleteBlockBase(IIndenterSettings indenterSettings, string input
2727

2828
protected virtual bool IndentBody => true;
2929

30-
private bool _executing;
3130
public override bool Execute(AutoCompleteEventArgs e)
3231
{
33-
if (_executing || (SkipPreCompilerDirective && e.OldCode.Trim().StartsWith("#")))
32+
if (SkipPreCompilerDirective && e.OldCode.Trim().StartsWith("#"))
3433
{
3534
return false;
3635
}
@@ -51,11 +50,9 @@ public override bool Execute(AutoCompleteEventArgs e)
5150
var indent = e.OldCode.TakeWhile(c => char.IsWhiteSpace(c)).Count();
5251
using (var module = e.CodePane.CodeModule)
5352
{
54-
_executing = true;
5553
var code = OutputToken.PadLeft(OutputToken.Length + indent, ' ');
5654
if (module.GetLines(selection.NextLine) == code)
5755
{
58-
_executing = false;
5956
return false;
6057
}
6158

@@ -65,7 +62,6 @@ public override bool Execute(AutoCompleteEventArgs e)
6562
e.CodePane.Selection = new VBEditor.Selection(selection.StartLine, indent + stdIndent + 1);
6663

6764
e.NewCode = e.OldCode;
68-
_executing = false;
6965
return true;
7066
}
7167
}

0 commit comments

Comments
 (0)