diff --git a/CHANGELOG.org b/CHANGELOG.org index a8543e39373..955237f4767 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -5,6 +5,7 @@ * Add support for Meson build system. (~meson-mode~). * Add support for go to definition for external files (.dll) in CSharp projects for OmniSharp server. * Added a new optional ~:action-filter~ argument when defining LSP clients that allows code action requests to be modified before they are sent to the server. This is used by the Haskell language server client to work around an ~lsp-mode~ parsing quirk that incorrectly sends ~null~ values instead of ~false~ in code action requests. + * Fix lsp-unzip on windows when unzip was found on the PATH ** 9.0.0 * Add language server config for QML (Qt Modeling Language) using qmlls. diff --git a/lsp-mode.el b/lsp-mode.el index 36ab06e5e01..b85de1cde20 100644 --- a/lsp-mode.el +++ b/lsp-mode.el @@ -8399,7 +8399,10 @@ archive (e.g. when the archive has multiple files)" "Unzip script to unzip file.") (defcustom lsp-unzip-script (lambda () - (cond ((executable-find "unzip") lsp-ext-unzip-script) + (cond ((and (eq system-type 'windows-nt) + (executable-find "powershell")) + lsp-ext-pwsh-script) + ((executable-find "unzip") lsp-ext-unzip-script) ((executable-find "powershell") lsp-ext-pwsh-script) (t nil))) "The script to unzip."