fix block completion

rubberduck-vba · Jun 23, 2018 · 138677c · 138677c
1 parent d45c1c7
commit 138677c
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/Rubberduck.Core/AutoComplete/AutoCompleteBlockBase.cs b/Rubberduck.Core/AutoComplete/AutoCompleteBlockBase.cs
@@ -62,7 +62,7 @@ public override bool Execute(AutoCompleteEventArgs e, AutoCompleteSettings setti
 
                 if (IsMatch(code) && !IsBlockCompleted(module, selection))
                 {
-                    var indent = code.TakeWhile(c => char.IsWhiteSpace(c)).Count();
+                    var indent = originalCode.TakeWhile(c => char.IsWhiteSpace(c)).Count();
                     var newCode = OutputToken.PadLeft(OutputToken.Length + indent, ' ');
 
                     var stdIndent = IndentBody 
@@ -99,9 +99,8 @@ public override bool IsMatch(string code)
                 regexOk = Regex.IsMatch(code, pattern, RegexOptions.IgnoreCase);
             }
 
-            return regexOk && 
-                code.HasComment(out int commentIndex) && 
-                code.IndexOf(InputToken) < commentIndex;
+            var hasComment = code.HasComment(out int commentIndex);
+            return regexOk && (!hasComment || code.IndexOf(InputToken) < commentIndex);
         }
 
         private bool IsBlockCompleted(ICodeModule module, Selection selection)