Skip to content

Commit dfac135

Browse files
authored
Fix credo language server command issues (#4228)
* Fix credo-language-server's command * Update cred-language-server's default version * Remove binary-path for credo-language-server The store path and binary path is the same, so we can just set the store path.
1 parent b6bf8a5 commit dfac135

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

Diff for: clients/lsp-credo.el

+12-7
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,16 @@
3232
:link '(url-link "https://github.com/elixir-tools/credo-language-server")
3333
:package-version '(lsp-mode . "8.0.1"))
3434

35-
(defcustom lsp-credo-command '("credo-language-server" "--stdio=true")
35+
(defcustom lsp-credo-command
36+
`(,(f-join lsp-server-install-dir "credo-language-server"
37+
"credo-language-server")
38+
"--stdio=true")
3639
"The command that starts credo-language-server."
3740
:type '(repeat :tag "List of string values" string)
3841
:group 'lsp-credo
3942
:package-version '(lsp-mode . "8.0.1"))
4043

41-
(defcustom lsp-credo-version "0.1.2"
44+
(defcustom lsp-credo-version "0.3.0"
4245
"Credo language server version to download.
4346
It has to be set before `lsp-credo.el' is loaded and it has to
4447
be available here: https://github.com/elixir-tools/credo-language-server/releases."
@@ -67,15 +70,17 @@ be available here: https://github.com/elixir-tools/credo-language-server/release
6770
(lsp-dependency
6871
'credo-language-server
6972
`(:download :url lsp-credo-download-url
70-
:store-path ,(f-join lsp-server-install-dir
71-
"credo-language-server"
72-
"credo-language-server")
73-
:binary-path lsp-credo-binary-path
73+
:store-path lsp-credo-binary-path
7474
:set-executable? t))
7575

7676
(lsp-register-client
7777
(make-lsp-client
78-
:new-connection (lsp-stdio-connection lsp-credo-command)
78+
:new-connection (lsp-stdio-connection
79+
(lambda ()
80+
`(,(or (executable-find
81+
(cl-first lsp-credo-command))
82+
(lsp-package-path 'credo-language-server))
83+
,@(cl-rest lsp-credo-command))))
7984
:activation-fn (lsp-activate-on "elixir")
8085
:priority -1
8186
:add-on? t

0 commit comments

Comments
 (0)