File tree Expand file tree Collapse file tree 3 files changed +12
-4
lines changed Expand file tree Collapse file tree 3 files changed +12
-4
lines changed Original file line number Diff line number Diff line change 19
19
longer generated. *This is a breaking change.* (See #4430.)
20
20
* If asm-lsp is installed, lsp-asm won't try to download it to cache store
21
21
* Fix lsp-unzip on windows when unzip was found on the PATH
22
+ * Fix zls wrong bin path
22
23
23
24
** 9.0.0
24
25
* Add language server config for QML (Qt Modeling Language) using qmlls.
Original file line number Diff line number Diff line change @@ -236,7 +236,7 @@ If `true', replace the text after the cursor."
236
236
This is differ from the variable `lsp-zig-zls-executable' ; this is local storage
237
237
and not the global storage."
238
238
(f-join lsp-zig-server-store-path
239
- (pcase system-type ('windows-nt " bin/ zls.exe" ) (_ " bin/ zls" ))))
239
+ (pcase system-type ('windows-nt " zls.exe" ) (_ " zls" ))))
240
240
241
241
(lsp-dependency
242
242
'zls
Original file line number Diff line number Diff line change @@ -8450,7 +8450,11 @@ archive (e.g. when the archive has multiple files)"
8450
8450
8451
8451
;; unzip
8452
8452
8453
- (defconst lsp-ext-pwsh-script "powershell -noprofile -noninteractive \
8453
+ (defconst lsp-ext-pwsh-script "pwsh -noprofile -noninteractive \
8454
+ -nologo -ex bypass -c Expand-Archive -Path '%s' -DestinationPath '%s'"
8455
+ "Pwsh script to unzip file.")
8456
+
8457
+ (defconst lsp-ext-powershell-script "powershell -noprofile -noninteractive \
8454
8458
-nologo -ex bypass -command Expand-Archive -path '%s' -dest '%s'"
8455
8459
"Powershell script to unzip file.")
8456
8460
@@ -8459,10 +8463,13 @@ archive (e.g. when the archive has multiple files)"
8459
8463
8460
8464
(defcustom lsp-unzip-script (lambda ()
8461
8465
(cond ((and (eq system-type 'windows-nt)
8462
- (executable-find "powershell "))
8466
+ (executable-find "pwsh "))
8463
8467
lsp-ext-pwsh-script)
8468
+ ((and (eq system-type 'windows-nt)
8469
+ (executable-find "powershell"))
8470
+ lsp-ext-powershell-script)
8464
8471
((executable-find "unzip") lsp-ext-unzip-script)
8465
- ((executable-find "powershell ") lsp-ext-pwsh-script)
8472
+ ((executable-find "pwsh ") lsp-ext-pwsh-script)
8466
8473
(t nil)))
8467
8474
"The script to unzip."
8468
8475
:group 'lsp-mode
You can’t perform that action at this time.
0 commit comments