From f60f7660136551e38303557469b228870a8086a8 Mon Sep 17 00:00:00 2001 From: Kien Nguyen Date: Mon, 23 Sep 2024 02:46:07 -0700 Subject: [PATCH] lsp-roslyn: make it compatibale with emacs-lsp-booster for windows --- clients/lsp-roslyn.el | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/clients/lsp-roslyn.el b/clients/lsp-roslyn.el index 59bc471731..9a086f79d1 100644 --- a/clients/lsp-roslyn.el +++ b/clients/lsp-roslyn.el @@ -120,7 +120,10 @@ Gotten from https://dev.azure.com/azure-public/vside/_artifacts/feed/vs-impl/NuG :sentinel sentinel :stderr stderr-buf :noquery t - :command (list "PowerShell" "-NoProfile" "-ExecutionPolicy" "Bypass" "-Command" lsp-roslyn--stdpipe-path "." lsp-roslyn--pipe-name))) + :command (lsp-resolve-final-command + `("PowerShell" "-NoProfile" "-ExecutionPolicy" "Bypass" "-Command" + ,lsp-roslyn--stdpipe-path "." + ,lsp-roslyn--pipe-name)))) (t (make-network-process :name process-name :remote lsp-roslyn--pipe-name @@ -143,12 +146,11 @@ creates another process connecting to the named pipe it specifies." :filter 'lsp-roslyn--parent-process-filter :sentinel sentinel :stderr parent-stderr-buf - :command (append - (list lsp-roslyn-dotnet-executable - (lsp-roslyn--get-server-dll-path) - (format "--logLevel=%s" lsp-roslyn-server-log-level) - (format "--extensionLogDirectory=%s" lsp-roslyn-server-log-directory)) - lsp-roslyn-server-extra-args) + :command `(,lsp-roslyn-dotnet-executable + ,(lsp-roslyn--get-server-dll-path) + ,(format "--logLevel=%s" lsp-roslyn-server-log-level) + ,(format "--extensionLogDirectory=%s" lsp-roslyn-server-log-directory) + ,@lsp-roslyn-server-extra-args) :noquery t))) (accept-process-output command-process lsp-roslyn-server-timeout-seconds) ; wait for JSON with pipe name to print on stdout, like {"pipeName":"\\\\.\\pipe\\d1b72351"} (when (not lsp-roslyn--pipe-name)