Merge pull request #5348 from retailcoder/next

Honor SCP killswitch setting
rubberduck-vba · Jan 12, 2020 · 60f6985 · 60f6985
2 parents 2ab49f2 + b969ddc
commit 60f6985
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Rubberduck.Core/AutoComplete/SelfClosingPairs/SelfClosingPairHandler.cs b/Rubberduck.Core/AutoComplete/SelfClosingPairs/SelfClosingPairHandler.cs
@@ -40,7 +40,7 @@ public SelfClosingPairHandler(ICodePaneHandler pane, SelfClosingPairCompletionSe
         public override bool Handle(AutoCompleteEventArgs e, AutoCompleteSettings settings, out CodeString result)
         {
             result = null;
-            if (!_scpInputLookup.TryGetValue(e.Character, out var pair) && e.Character != '\b')
+            if (!settings.SelfClosingPairs.IsEnabled || !_scpInputLookup.TryGetValue(e.Character, out var pair) && e.Character != '\b')
             {
                 // not an interesting keypress.
                 return false;

diff --git a/RubberduckTests/AutoComplete/SelfClosingPairHandlerTests.cs b/RubberduckTests/AutoComplete/SelfClosingPairHandlerTests.cs
@@ -20,6 +20,18 @@ private bool Run(SelfClosingPairTestInfo info)
             return false;
         }
 
+        [Test]
+        public void GivenDisabledSelfClosingPairs_BailsOut()
+        {
+            var input = '"';
+            var original = "DoSomething |".ToCodeString();
+            var info = new SelfClosingPairTestInfo(original, input);
+            info.Settings.SelfClosingPairs.IsEnabled = false;
+
+            Assert.IsFalse(Run(info));
+            Assert.IsNull(info.Result);
+        }
+
         [Test]
         public void GivenInvalidInput_ResultIsNull()
         {