Fix lsp packages failing to load

As of emacs-lsp/lsp-mode@b9b0f34 there is no more lsp-clients, so load
these lsp packages after lsp-mode instead.
This commit is contained in:
Henrik Lissner 2020-08-20 03:53:45 -04:00
parent 91ab02951d
commit f6f90c9791
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
5 changed files with 7 additions and 6 deletions

View file

@ -252,7 +252,8 @@ If rtags or rdm aren't available, fail silently instead of throwing a breaking e
(use-package! ccls (use-package! ccls
:when (and (featurep! +lsp) (not (featurep! :tools lsp +eglot))) :when (featurep! +lsp)
:unless (featurep! :tools lsp +eglot)
:after lsp :after lsp
:init :init
(after! projectile (after! projectile

View file

@ -1,7 +1,7 @@
;;; lang/haskell/+lsp.el -*- lexical-binding: t; -*- ;;; lang/haskell/+lsp.el -*- lexical-binding: t; -*-
(use-package! lsp-haskell (use-package! lsp-haskell
:after lsp-clients :after lsp-mode
:preface (add-hook 'haskell-mode-local-vars-hook #'lsp!) :preface (add-hook 'haskell-mode-local-vars-hook #'lsp!)
:config :config
(when IS-MAC (when IS-MAC

View file

@ -2,7 +2,7 @@
;;;###if (featurep! +lsp) ;;;###if (featurep! +lsp)
(use-package! lsp-java (use-package! lsp-java
:after lsp-clients :after lsp-mode
:preface :preface
(setq lsp-java-workspace-dir (concat doom-etc-dir "java-workspace")) (setq lsp-java-workspace-dir (concat doom-etc-dir "java-workspace"))
(add-hook 'java-mode-local-vars-hook #'lsp!) (add-hook 'java-mode-local-vars-hook #'lsp!)

View file

@ -67,7 +67,7 @@
(use-package! lsp-julia (use-package! lsp-julia
:when (featurep! +lsp) :when (featurep! +lsp)
:after lsp-clients :after lsp-mode
:preface :preface
(setq lsp-julia-default-environment "~/.julia/environments/v1.0") (setq lsp-julia-default-environment "~/.julia/environments/v1.0")
(when (featurep! +lsp) (when (featurep! +lsp)

View file

@ -316,11 +316,11 @@ called.")
(use-package! lsp-python-ms (use-package! lsp-python-ms
:unless (featurep! +pyright) :unless (featurep! +pyright)
:after lsp-clients :after lsp-mode
:preface :preface
(after! python (after! python
(setq lsp-python-ms-python-executable-cmd python-shell-interpreter))) (setq lsp-python-ms-python-executable-cmd python-shell-interpreter)))
(use-package! lsp-pyright (use-package! lsp-pyright
:when (featurep! +pyright) :when (featurep! +pyright)
:after lsp-clients)) :after lsp-mode))