Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch tool detection for lsp-unzip (#3022) #4472

Merged
merged 2 commits into from
Sep 30, 2024
Merged

Switch tool detection for lsp-unzip (#3022) #4472

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe48989
Fix tool detection order for lsp-unzip on windows (#3022)
Horrih Jun 10, 2024
9aa4c88
Merge branch 'master' into fix-lsp-unzip-windows
jcs090218 Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.org
View file
Open in desktop
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
View file
Open in desktop
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
Loading