Merge pull request #4569 from retailcoder/bugfix

SCP Fix
rubberduck-vba · Nov 30, 2018 · d5b900d · d5b900d
2 parents 0bda237 + b524fb7
commit d5b900d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 9 deletions.
diff --git a/Rubberduck.Core/AppMenu.cs b/Rubberduck.Core/AppMenu.cs
@@ -38,6 +38,7 @@ public void Initialize()
             {
                 menu.Initialize();
             }
+            EvaluateCanExecute(_parser.State);
         }
 
         public void OnSelectedDeclarationChange(object sender, DeclarationChangedEventArgs e)

diff --git a/Rubberduck.Core/AutoComplete/Service/SelfClosingPairHandler.cs b/Rubberduck.Core/AutoComplete/Service/SelfClosingPairHandler.cs
@@ -66,11 +66,11 @@ public override bool Handle(AutoCompleteEventArgs e, AutoCompleteSettings settin
                         break;
                     }
                 }
+            }
 
-                if (result == null)
-                {
-                    return false;
-                }
+            if (result == null)
+            {
+                return false;
             }
 
             var snippetPosition = new Selection(result.SnippetPosition.StartLine, 1, result.SnippetPosition.EndLine, 1);
@@ -109,21 +109,28 @@ private bool HandleInternal(AutoCompleteEventArgs e, CodeString original, SelfCl
                 return false;
             }
 
-            result = CodePaneHandler.Prettify(e.Module, result);
+            var reprettified = CodePaneHandler.Prettify(e.Module, result);
+            if (pair.OpeningChar == '(' && e.Character == pair.OpeningChar && !reprettified.Equals(result))
+            {
+                // VBE eats it. bail out but don't swallow the keypress.
+                e.Handled = false;
+                result = null;
+                return false;
+            }
 
-            var currentLine = result.Lines[result.CaretPosition.StartLine];
+            var currentLine = reprettified.Lines[reprettified.CaretPosition.StartLine];
             if (!string.IsNullOrWhiteSpace(currentLine) &&
                 currentLine.EndsWith(" ") &&
-                result.CaretPosition.StartColumn == currentLine.Length)
+                reprettified.CaretPosition.StartColumn == currentLine.Length)
             {
-                result = result.ReplaceLine(result.CaretPosition.StartLine, currentLine.TrimEnd());
+                result = reprettified.ReplaceLine(reprettified.CaretPosition.StartLine, currentLine.TrimEnd());
             }
 
             if (pair.OpeningChar == '(' && 
                 e.Character == pair.OpeningChar &&
                 !result.CaretLine.EndsWith($"{pair.OpeningChar}{pair.ClosingChar}"))
             {
-                // VBE eats it. bail out but still swallow the keypress, since we've already re-prettified.
+                // VBE eats it. bail out but still swallow the keypress.
                 e.Handled = true;
                 result = null;
                 return false;

diff --git a/RubberduckTests/AutoComplete/SelfClosingPairHandlerTests.cs b/RubberduckTests/AutoComplete/SelfClosingPairHandlerTests.cs
@@ -103,6 +103,17 @@ public void GivenOpeningParenthesisOnOtherwiseNonEmptyLine_ReturnsFalseAndSwallo
             Assert.IsTrue(info.Args.Handled);
         }
 
+        [Test]
+        public void GivenOpeningParenthesisOnCallStatement_ReturnsFalseAndLetsKeypressThrough()
+        {
+            var input = '(';
+            var original = "Call DoSomething|".ToCodeString();
+            var rePrettified = "Call DoSomething|".ToCodeString();
+            var info = new SelfClosingPairTestInfo(original, input, rePrettified);
+
+            Assert.IsFalse(Run(info));
+            Assert.IsFalse(info.Args.Handled);
+        }
         [Test]
         public void GivenBackspaceOnMatchedPair_DeletesMatchingTokens()
         {