Skip to content

Commit

Permalink
Fix tool detection order for lsp-unzip on windows (#3022)
Browse files Browse the repository at this point in the history
It caused issues on windows if unzip was found on the PATH
  • Loading branch information
Horrih committed Jun 10, 2024
1 parent c7f048f commit fe48989
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.org
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 4 additions & 1 deletion lsp-mode.el
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down

0 comments on commit fe48989

Please sign in to comment.