Fix java/python/javascript/rust lsp backends
This commit is contained in:
parent
aacf2a4cc1
commit
f346ae0683
|
@ -300,8 +300,7 @@
|
|||
(if (configuration-layer/layer-used-p 'lsp)
|
||||
(progn
|
||||
(require 'lsp-java)
|
||||
(require 'company-lsp)
|
||||
(lsp-java-enable))
|
||||
(lsp))
|
||||
(message "`lsp' layer is not installed, please add `lsp' layer to your dotfile."))
|
||||
(if (configuration-layer/layer-used-p 'dap)
|
||||
(progn
|
||||
|
|
|
@ -440,19 +440,8 @@
|
|||
("mr" . "refactor")
|
||||
("mq" . "lsp")))
|
||||
(spacemacs/set-leader-keys-for-major-mode 'java-mode
|
||||
"gg" 'xref-find-definitions
|
||||
"gr" 'xref-find-references
|
||||
"gR" 'lsp-ui-peek-find-references
|
||||
"ga" 'xref-find-apropos
|
||||
"gA" 'lsp-ui-peek-find-workspace-symbol
|
||||
"gd" 'lsp-goto-type-definition
|
||||
"hh" 'lsp-describe-thing-at-point
|
||||
"el" 'lsp-ui-flycheck-list
|
||||
"pu" 'lsp-java-update-user-settings
|
||||
"ea" 'lsp-execute-code-action
|
||||
"qr" 'lsp-restart-workspace
|
||||
"roi" 'lsp-java-organize-imports
|
||||
"rr" 'lsp-rename
|
||||
"rai" 'lsp-java-add-import
|
||||
"ram" 'lsp-java-add-unimplemented-methods
|
||||
"rcp" 'lsp-java-create-parameter
|
||||
|
@ -462,9 +451,9 @@
|
|||
"rem" 'lsp-java-extract-method
|
||||
"cc" 'lsp-java-build-project
|
||||
"an" 'lsp-java-actionable-notifications
|
||||
"=" 'lsp-format-buffer
|
||||
|
||||
;; dap-mode
|
||||
|
||||
;; debug
|
||||
"ddj" 'dap-java-debug
|
||||
"dtt" 'dap-java-debug-test-method
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
"Setup lsp backend."
|
||||
(if (configuration-layer/layer-used-p 'lsp)
|
||||
(progn
|
||||
(lsp-javascript-typescript-enable))
|
||||
(lsp))
|
||||
(message (concat "`lsp' layer is not installed, "
|
||||
"please add `lsp' layer to your dotfile."))))
|
||||
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
js2-mode
|
||||
js2-refactor
|
||||
livid-mode
|
||||
(lsp-javascript-typescript :requires lsp-mode)
|
||||
org
|
||||
prettier-js
|
||||
skewer-mode
|
||||
|
@ -166,12 +165,6 @@
|
|||
:evil-leader-for-mode (js2-mode . "Tl"))
|
||||
(spacemacs|diminish livid-mode " 🅻" " [l]"))))
|
||||
|
||||
(defun javascript/init-lsp-javascript-typescript ()
|
||||
(use-package lsp-javascript-typescript
|
||||
:commands lsp-javascript-typescript-enable
|
||||
:defer t
|
||||
:config (spacemacs//setup-lsp-jump-handler 'js2-mode)))
|
||||
|
||||
(defun javascript/pre-init-prettier-js ()
|
||||
(if (eq javascript-fmt-tool 'prettier)
|
||||
(add-to-list 'spacemacs--prettier-modes 'js2-mode)))
|
||||
|
|
|
@ -67,8 +67,7 @@ when this mode is enabled since the minibuffer is cleared all the time."
|
|||
(defun spacemacs//python-setup-lsp ()
|
||||
"Setup lsp backend."
|
||||
(if (configuration-layer/layer-used-p 'lsp)
|
||||
(progn
|
||||
(lsp-python-enable))
|
||||
(lsp)
|
||||
(message "`lsp' layer is not installed, please add `lsp' layer to your dotfile.")))
|
||||
|
||||
(defun spacemacs//python-setup-lsp-company ()
|
||||
|
|
|
@ -42,8 +42,6 @@
|
|||
;; packages for anaconda backend
|
||||
anaconda-mode
|
||||
(company-anaconda :requires company)
|
||||
;; packages for lsp backend
|
||||
(lsp-python :requires lsp-mode)
|
||||
))
|
||||
|
||||
(defun python/init-anaconda-mode ()
|
||||
|
@ -151,11 +149,6 @@
|
|||
(spacemacs/set-leader-keys-for-major-mode 'python-mode
|
||||
"l" 'live-py-mode)))
|
||||
|
||||
(defun python/init-lsp-python ()
|
||||
(use-package lsp-python
|
||||
:commands lsp-python-enable
|
||||
:config (spacemacs//setup-lsp-jump-handler 'python-mode)))
|
||||
|
||||
(defun python/init-nose ()
|
||||
(use-package nose
|
||||
:commands (nosetests-one
|
||||
|
|
|
@ -35,8 +35,7 @@ using `cargo-process-run'."
|
|||
(defun spacemacs//rust-setup-lsp ()
|
||||
"Setup lsp backend"
|
||||
(if (configuration-layer/layer-used-p 'lsp)
|
||||
(progn
|
||||
(lsp-rust-enable))
|
||||
(lsp)
|
||||
(message "`lsp' layer is not installed, please add `lsp' layer to your dotfile.")))
|
||||
|
||||
(defun spacemacs//rust-setup-racer ()
|
||||
|
|
|
@ -22,8 +22,6 @@
|
|||
rust-mode
|
||||
smartparens
|
||||
toml-mode
|
||||
;; packages for lsp-rust
|
||||
(lsp-rust :requires lsp-mode)
|
||||
))
|
||||
|
||||
(defun rust/init-cargo ()
|
||||
|
@ -89,17 +87,6 @@
|
|||
:defer t
|
||||
:init (add-hook 'flycheck-mode-hook #'flycheck-rust-setup)))
|
||||
|
||||
(defun rust/init-lsp-rust ()
|
||||
(use-package lsp-rust
|
||||
:defer t
|
||||
:commands lsp-rust-enable
|
||||
:init (setq lsp-rust-rls-cmd rust-rls-cmd)
|
||||
:config
|
||||
(progn
|
||||
(spacemacs/lsp-bind-keys-for-mode 'rust-mode)
|
||||
(spacemacs//setup-lsp-jump-handler 'rust-mode)
|
||||
(add-hook 'rust-mode-hook #'lsp-rust-enable))))
|
||||
|
||||
(defun rust/post-init-company ()
|
||||
;; backend specific
|
||||
(spacemacs//rust-setup-company))
|
||||
|
|
|
@ -21,6 +21,8 @@
|
|||
:defer t
|
||||
:config
|
||||
(progn
|
||||
(require 'lsp-clients)
|
||||
(setq lsp-prefer-flymake nil)
|
||||
(spacemacs/lsp-bind-keys)
|
||||
(add-hook 'lsp-after-open-hook (lambda ()
|
||||
"Setup xref jump handler and declare keybinding prefixes"
|
||||
|
|
Loading…
Reference in a new issue