|
32 | 32 | :link '(url-link "https://github.com/elixir-tools/credo-language-server")
|
33 | 33 | :package-version '(lsp-mode . "8.0.1"))
|
34 | 34 |
|
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") |
36 | 39 | "The command that starts credo-language-server."
|
37 | 40 | :type '(repeat :tag "List of string values" string)
|
38 | 41 | :group 'lsp-credo
|
39 | 42 | :package-version '(lsp-mode . "8.0.1"))
|
40 | 43 |
|
41 |
| -(defcustom lsp-credo-version "0.1.2" |
| 44 | +(defcustom lsp-credo-version "0.3.0" |
42 | 45 | "Credo language server version to download.
|
43 | 46 | It has to be set before `lsp-credo.el' is loaded and it has to
|
44 | 47 | 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
|
67 | 70 | (lsp-dependency
|
68 | 71 | 'credo-language-server
|
69 | 72 | `(: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 |
74 | 74 | :set-executable? t))
|
75 | 75 |
|
76 | 76 | (lsp-register-client
|
77 | 77 | (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)))) |
79 | 84 | :activation-fn (lsp-activate-on "elixir")
|
80 | 85 | :priority -1
|
81 | 86 | :add-on? t
|
|
0 commit comments