From 2e51ab2c2bb04b94cd57ba43bc792640d04849d6 Mon Sep 17 00:00:00 2001 From: Charles Gonnaud Date: Sun, 9 Jun 2024 08:37:20 +0200 Subject: [PATCH] Switch tool detection for lsp-unzip (#3022) It caused issues on windows if unzip was found on the PATH --- CHANGELOG.org | 1 + lsp-mode.el | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index 0f486bb97a4..55431a29c89 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -4,6 +4,7 @@ * Add SQL support * Add support for Meson build system. (~meson-mode~). * Add support for go to definition for external files (.dll) in CSharp projects for OmniSharp server. + * 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 dce5851e790..cd9629c792f 100644 --- a/lsp-mode.el +++ b/lsp-mode.el @@ -8350,8 +8350,8 @@ 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) - ((executable-find "powershell") lsp-ext-pwsh-script) + (cond ((executable-find "powershell") lsp-ext-pwsh-script) + ((executable-find "unzip") lsp-ext-unzip-script) (t nil))) "The script to unzip." :group 'lsp-mode