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

lang/python: silence errors when python isn't present

Browse source
This commit is contained in:
Henrik Lissner 2019-12-22 23:00:26 -05:00
parent 0d01413de9
commit 327d359fd3
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -95,12 +95,13 @@ called.")
(add-hook! 'python-mode-local-vars-hook (add-hook! 'python-mode-local-vars-hook
(defun +python-init-anaconda-mode-maybe-h () (defun +python-init-anaconda-mode-maybe-h ()
"Enable `anaconda-mode' if `lsp-mode' isn't." "Enable `anaconda-mode' if `lsp-mode' is absent and
`python-shell-interpreter' is present."
(unless (or (bound-and-true-p lsp-mode) (unless (or (bound-and-true-p lsp-mode)
(bound-and-true-p lsp--buffer-deferred)) (bound-and-true-p lsp--buffer-deferred)
(not (executable-find python-shell-interpreter)))
(anaconda-mode +1)))) (anaconda-mode +1))))
:config :config
(add-hook 'anaconda-mode-hook #'anaconda-eldoc-mode)
(set-company-backend! 'anaconda-mode '(company-anaconda)) (set-company-backend! 'anaconda-mode '(company-anaconda))
(set-lookup-handlers! 'anaconda-mode (set-lookup-handlers! 'anaconda-mode
:definition #'anaconda-mode-find-definitions :definition #'anaconda-mode-find-definitions
@ -108,6 +109,8 @@ called.")
:documentation #'anaconda-mode-show-doc) :documentation #'anaconda-mode-show-doc)
(set-popup-rule! "^\\*anaconda-mode" :select nil) (set-popup-rule! "^\\*anaconda-mode" :select nil)
(add-hook 'anaconda-mode-hook #'anaconda-eldoc-mode)
(defun +python-auto-kill-anaconda-processes-h () (defun +python-auto-kill-anaconda-processes-h ()
"Kill anaconda processes if this buffer is the last python buffer." "Kill anaconda processes if this buffer is the last python buffer."
(when (and (eq major-mode 'python-mode) (when (and (eq major-mode 'python-mode)
@ -286,11 +289,20 @@ called.")
(after! python (after! python
(setq lsp-python-ms-python-executable-cmd python-shell-interpreter)) (setq lsp-python-ms-python-executable-cmd python-shell-interpreter))
;; 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,
;; since we may still want to write some python on a system without
;; 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 ;; 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. ;; circumvents LSP falling back to pyls when lsp-python-ms is absent.
;; Installing the server should be a deliberate act; either 'M-x ;; Installing the server should be a deliberate act; either 'M-x
;; lsp-python-ms-setup' or setting `lsp-python-ms-executable' to an existing ;; lsp-python-ms-setup' or setting `lsp-python-ms-executable' to an
;; install will do. ;; existing install will do.
(defadvice! +python--dont-auto-install-server-a () (defadvice! +python--dont-auto-install-server-a ()
:override #'lsp-python-ms--command-string :override #'lsp-python-ms--command-string
lsp-python-ms-executable)) lsp-python-ms-executable))