diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el index 9ed6b6321..56ca83b97 100644 --- a/modules/lang/cc/config.el +++ b/modules/lang/cc/config.el @@ -232,4 +232,4 @@ This is ignored by ccls.") (setq-local company-transformers nil) (setq-local company-lsp-async t) (setq-local company-lsp-cache-candidates nil) - (lsp))) + (lsp!))) diff --git a/modules/lang/java/+lsp.el b/modules/lang/java/+lsp.el index cd6f4c15a..c6bb00f94 100644 --- a/modules/lang/java/+lsp.el +++ b/modules/lang/java/+lsp.el @@ -3,8 +3,9 @@ (def-package! lsp-java :after-call java-mode - :init (add-hook 'java-mode-hook #'lsp!) + :init (add-hook 'java-mode-local-vars-hook #'lsp!) :config + (setq lsp-java-server-install-dir (concat doom-etc-dir "eclipse.jdt.ls/server/")) ;; TODO keybinds ;; TODO treemacs integration (?) ) diff --git a/modules/lang/php/config.el b/modules/lang/php/config.el index 0dba0138c..55a01fe46 100644 --- a/modules/lang/php/config.el +++ b/modules/lang/php/config.el @@ -13,7 +13,7 @@ (set-formatter! 'php-mode #'php-cs-fixer-fix) (if (featurep! +lsp) - (add-hook 'php-mode-hook #'lsp!) + (add-hook 'php-mode-local-vars-hook #'lsp!) ;; `+php-company-backend' uses `company-phpactor', `php-extras-company' or ;; `company-dabbrev-code', in that order. (set-company-backend! 'php-mode '+php-company-backend 'company-dabbrev-code)) diff --git a/modules/lang/ruby/config.el b/modules/lang/ruby/config.el index 034ae11ba..00705cd9f 100644 --- a/modules/lang/ruby/config.el +++ b/modules/lang/ruby/config.el @@ -20,7 +20,7 @@ (set-repl-handler! '(ruby-mode enh-ruby-mode) #'inf-ruby) (when (featurep! +lsp) - (add-hook 'enh-ruby-mode-hook #'lsp!)) + (add-hook 'enh-ruby-mode-local-vars-hook #'lsp!)) (after! company-dabbrev-code (add-to-list 'company-dabbrev-code-modes 'enh-ruby-mode nil #'eq)