emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update lsp-python-ms config to reflect changes upstream

Browse source 
mspyls should be installed with M-x lsp-install-server from now on.
This commit is contained in:
Henrik Lissner 2020-01-10 04:39:22 -05:00
parent 780100131d
commit 4acd60aba3
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 8 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/lang/python/config.el
View file

@ -282,15 +282,11 @@ called.")
(use-package! lsp-python-ms
:when (featurep! +lsp)
:after (python lsp-clients)
:after lsp-clients
:preface
(autoload 'lsp-python-ms-update-server "lsp-python-ms" nil t)
(autoload 'lsp-python-ms-setup "lsp-python-ms" nil t)
(after! python
(setq lsp-python-ms-python-executable-cmd python-shell-interpreter))
:init
(setq lsp-python-ms-dir (concat doom-etc-dir "mspyls/"))
;; HACK If you don't have python installed, then opening python buffers with
;; this on causes a "wrong number of arguments: nil 0" error, because of
;; careless usage of `cl-destructuring-bind'. This silences that error,
@ -298,16 +294,7 @@ called.")
;; python installed!
(defadvice! +python--silence-errors-a (orig-fn &rest args)
:around #'lsp-python-ms--extra-init-params
(ignore-errors (apply orig-fn args)))
;; HACK lsp-python-ms shouldn't install itself if it isn't present. This
;; circumvents LSP falling back to pyls when lsp-python-ms is absent.
;; Installing the server should be a deliberate act; either 'M-x
;; lsp-python-ms-setup' or setting `lsp-python-ms-executable' to an
;; existing install will do.
(defadvice! +python--dont-auto-install-server-a ()
:override #'lsp-python-ms--command-string
lsp-python-ms-executable))
(ignore-errors (apply orig-fn args))))
(use-package! cython-mode