From 22f86d25e9d7f26d4e27004c4788639846c72ad1 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 24 Sep 2025 00:08:34 -0400 Subject: [PATCH] fix(elixir): void-variable lsp-elixir-server-command Amend: 4f62b503b9c0 --- modules/lang/elixir/config.el | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/modules/lang/elixir/config.el b/modules/lang/elixir/config.el index f74c592c9..e43980a2c 100644 --- a/modules/lang/elixir/config.el +++ b/modules/lang/elixir/config.el @@ -32,14 +32,6 @@ (sp-local-pair "fn " " end" :unless '(sp-in-comment-p sp-in-string-p))) (when (modulep! +lsp) - ;; HACK: lsp-elixir is hardcoded to use the server `lsp-install-server' - ;; installs, ignoring any system-provided executables. This fixes that, so - ;; long as the user hasn't changed `lsp-elixir-server-command' themselves, - (when (and (member lsp-elixir-server-command - '(("language_server.bat") - ("language_server.sh"))) - (executable-find "elixir-ls")) - (setq lsp-elixir-server-command "elixir-ls")) (add-hook (intern (format "%s-local-vars-hook" mode)) #'lsp! 'append)) (use-package! flycheck-credo @@ -70,7 +62,17 @@ (when (modulep! +lsp) (after! lsp-mode - (add-to-list 'lsp-file-watch-ignored-directories "[/\\\\]_build\\'"))) + (add-to-list 'lsp-file-watch-ignored-directories "[/\\\\]_build\\'")) + (after! lsp-elixir + ;; HACK: lsp-elixir is hardcoded to use the server `lsp-install-server' + ;; installs, ignoring any system-provided executables. This fixes that, + ;; so long as the user hasn't changed `lsp-elixir-server-command' + ;; themselves, + (when (and (member lsp-elixir-server-command + '(("language_server.bat") + ("language_server.sh"))) + (executable-find "elixir-ls")) + (setq lsp-elixir-server-command "elixir-ls")))) :config (+elixir-common-config 'elixir-mode))