diff options
| author |  Tom Willemse | 2020-07-14 09:56:29 -0700 |
|---|---|---|
| committer | Tom Willemse | 2020-07-14 09:56:29 -0700 |
| commit | dc25705048fec827f32525059d4f3b4358273caf (patch) | |
| tree | 8674d36dcd27780496e43dee16551e678e1970fb /oni-python/oni-python.el | |
| parent | dbf740ba1eb7e50461a2dec3638c79570101af6b (diff) | |
| download | emacs-config-dc25705048fec827f32525059d4f3b4358273caf.tar.gz emacs-config-dc25705048fec827f32525059d4f3b4358273caf.zip | |
Use ‘lsp’ for python code development instead of jedi
Diffstat (limited to 'oni-python/oni-python.el')
| -rw-r--r-- | oni-python/oni-python.el | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/oni-python/oni-python.el b/oni-python/oni-python.el index 39454a7..d18fc9b 100644 --- a/oni-python/oni-python.el +++ b/oni-python/oni-python.el @@ -4,8 +4,8 @@ ;; Author: Tom Willemse <tom@ryuslash.org> ;; Keywords: local -;; Version: 2020.0305.222235 -;; Package-Requires: (oni-yasnippet oni-company company-jedi oni-fci oni-flycheck oni-hydra rainbow-delimiters reformatter traad) +;; Version: 2020.0706.231614 +;; Package-Requires: (oni-yasnippet oni-company oni-fci oni-flycheck oni-hydra oni-lsp rainbow-delimiters reformatter traad) ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -75,8 +75,6 @@ for indentation." (setq-local whitespace-style '(face tabs)) (whitespace-mode)) -(add-to-list 'company-backends 'company-jedi) - (reformatter-define python-black :program "black" :args `("--line-length" ,(number-to-string fill-column) "-") @@ -89,15 +87,16 @@ for indentation." (define-key python-mode-map (kbd "C-c r") 'python-refactor-hydra/body) +(add-hook 'python-mode-hook 'company-mode) (add-hook 'python-mode-hook 'electric-indent-local-mode) (add-hook 'python-mode-hook 'electric-pair-local-mode) -(add-hook 'python-mode-hook 'flycheck-mode) (add-hook 'python-mode-hook 'fci-mode) -(add-hook 'python-mode-hook 'company-mode) -(add-hook 'python-mode-hook 'rainbow-delimiters-mode) -(add-hook 'python-mode-hook 'python-black-on-save-mode) +(add-hook 'python-mode-hook 'flycheck-mode) +(add-hook 'python-mode-hook 'lsp) (add-hook 'python-mode-hook 'oni-python-set-fill-column) (add-hook 'python-mode-hook 'oni-python-whitespace-mode) +(add-hook 'python-mode-hook 'python-black-on-save-mode) +(add-hook 'python-mode-hook 'rainbow-delimiters-mode) ;;;###autoload (with-eval-after-load 'python |