From d4357c173a33ee1d9dc449c7ea892956aa6adea2 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 22 Aug 2024 16:08:45 -0400 Subject: [PATCH] fix(lsp): void-variable lsp-client-packages error Regression introduced in 32d9369, due to evaluating this snippet too early (before lsp-mode was loaded). Amend: 32d9369091d5 Fix: #7713 --- modules/tools/lsp/+lsp.el | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/tools/lsp/+lsp.el b/modules/tools/lsp/+lsp.el index 6deef2c4e..e3f3988a2 100644 --- a/modules/tools/lsp/+lsp.el +++ b/modules/tools/lsp/+lsp.el @@ -43,10 +43,6 @@ Can be a list of backends; accepts any value `company-backends' accepts.") (when (modulep! :config default +bindings) (setq lsp-keymap-prefix nil)) - ;; HACK: See emacs-lsp/lsp-mode#3577 - (unless (modulep! :lang terraform) - (setq lsp-client-packages (delete 'lsp-terraform lsp-client-packages))) - (unless (featurep :system 'windows) ;; HACK: Frustratingly enough, the value of `lsp-zig-download-url-format' is ;; used immediately while the lsp-zig package is loading, so changing it @@ -88,6 +84,9 @@ Can be a list of backends; accepts any value `company-backends' accepts.") :implementations '(lsp-find-implementation :async t) :type-definition #'lsp-find-type-definition) + ;; HACK: See emacs-lsp/lsp-mode#3577 + (unless (modulep! :lang terraform) + (setq lsp-client-packages (delete 'lsp-terraform lsp-client-packages))) (defadvice! +lsp--respect-user-defined-checkers-a (fn &rest args) "Ensure user-defined `flycheck-checker' isn't overwritten by `lsp'."