Merge pull request #2817 from nosami/dev/nosami/fix-2766

Close signature help and completion window when escape is pressed
VsVim · May 26, 2020 · 5b6b3ff · 5b6b3ff
2 parents e0cdedf + dbbf091
commit 5b6b3ff
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Src/VimMac/Properties/AddinInfo.cs b/Src/VimMac/Properties/AddinInfo.cs
@@ -5,7 +5,7 @@
 [assembly: Addin(
     "VsVim",
     Namespace = "Vim.Mac",
-    Version = "2.8.0.7"
+    Version = "2.8.0.8"
 )]
 
 [assembly: AddinName("VsVim")]

diff --git a/Src/VimMac/VimKeyProcessor.cs b/Src/VimMac/VimKeyProcessor.cs
@@ -129,7 +129,7 @@ private bool ShouldBeProcessedByVim(KeyEventArgs e)
             if (_completionBroker.IsCompletionActive(TextView) && !IsEscapeKey(e))
                 return false;
 
-            if (_signatureHelpBroker.IsSignatureHelpActive(TextView))
+            if (_signatureHelpBroker.IsSignatureHelpActive(TextView) && !IsEscapeKey(e))
                 return false;
 
             if (_inlineRenameListenerFactory.InRename)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -17,7 +17,7 @@ jobs:
       filePath: Scripts/build.sh
   - task: PublishBuildArtifacts@1
     inputs:
-      pathToPublish: Binaries/Debug/VimMac/net472/Vim.Mac.VsVim_2.8.0.7.mpack
+      pathToPublish: Binaries/Debug/VimMac/net472/Vim.Mac.VsVim_2.8.0.8.mpack
       artifactName: VSMacExtension
 
 - job: VsVim_Build_Test