Skip to content

Commit a52ef29

Browse files
authored
lsp-roslyn: make it compatibale with emacs-lsp-booster for windows (#4560)
1 parent 6fff2a9 commit a52ef29

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

clients/lsp-roslyn.el

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,10 @@ Gotten from https://dev.azure.com/azure-public/vside/_artifacts/feed/vs-impl/NuG
120120
:sentinel sentinel
121121
:stderr stderr-buf
122122
:noquery t
123-
:command (list "PowerShell" "-NoProfile" "-ExecutionPolicy" "Bypass" "-Command" lsp-roslyn--stdpipe-path "." lsp-roslyn--pipe-name)))
123+
:command (lsp-resolve-final-command
124+
`("PowerShell" "-NoProfile" "-ExecutionPolicy" "Bypass" "-Command"
125+
,lsp-roslyn--stdpipe-path "."
126+
,lsp-roslyn--pipe-name))))
124127
(t (make-network-process
125128
:name process-name
126129
:remote lsp-roslyn--pipe-name
@@ -143,12 +146,11 @@ creates another process connecting to the named pipe it specifies."
143146
:filter 'lsp-roslyn--parent-process-filter
144147
:sentinel sentinel
145148
:stderr parent-stderr-buf
146-
:command (append
147-
(list lsp-roslyn-dotnet-executable
148-
(lsp-roslyn--get-server-dll-path)
149-
(format "--logLevel=%s" lsp-roslyn-server-log-level)
150-
(format "--extensionLogDirectory=%s" lsp-roslyn-server-log-directory))
151-
lsp-roslyn-server-extra-args)
149+
:command `(,lsp-roslyn-dotnet-executable
150+
,(lsp-roslyn--get-server-dll-path)
151+
,(format "--logLevel=%s" lsp-roslyn-server-log-level)
152+
,(format "--extensionLogDirectory=%s" lsp-roslyn-server-log-directory)
153+
,@lsp-roslyn-server-extra-args)
152154
:noquery t)))
153155
(accept-process-output command-process lsp-roslyn-server-timeout-seconds) ; wait for JSON with pipe name to print on stdout, like {"pipeName":"\\\\.\\pipe\\d1b72351"}
154156
(when (not lsp-roslyn--pipe-name)

0 commit comments

Comments
 (0)