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

Merge pull request #3030 from jsravn/format-with-lsp-if-enabled

Browse source 
Use lsp-format-region-or-buffer if available
This commit is contained in:
Henrik Lissner 2020-05-06 02:59:53 -04:00 • committed by GitHub
commit b5c4fce0b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/config/default/+emacs-bindings.el
View file

@ -43,7 +43,6 @@
:desc "List errors" "x" #'flycheck-list-errors) :desc "List errors" "x" #'flycheck-list-errors)
(:when (featurep! :tools lsp) (:when (featurep! :tools lsp)
:desc "LSP Code actions" "a" #'lsp-execute-code-action :desc "LSP Code actions" "a" #'lsp-execute-code-action
:desc "LSP Format buffer/region" "F" #'+default/lsp-format-region-or-buffer
:desc "LSP Organize imports" "i" #'lsp-organize-imports :desc "LSP Organize imports" "i" #'lsp-organize-imports
:desc "LSP Rename" "r" #'lsp-rename :desc "LSP Rename" "r" #'lsp-rename
(:after lsp-mode (:after lsp-mode

1
modules/config/default/+evil-bindings.el
View file

@ -360,7 +360,6 @@
:desc "Jump to documentation" "k" #'+lookup/documentation :desc "Jump to documentation" "k" #'+lookup/documentation
(:when (featurep! :tools lsp) (:when (featurep! :tools lsp)
:desc "LSP Execute code action" "a" #'lsp-execute-code-action :desc "LSP Execute code action" "a" #'lsp-execute-code-action
:desc "LSP Format buffer/region" "F" #'+default/lsp-format-region-or-buffer
:desc "LSP Organize imports" "i" #'lsp-organize-imports :desc "LSP Organize imports" "i" #'lsp-organize-imports
:desc "LSP Rename" "r" #'lsp-rename :desc "LSP Rename" "r" #'lsp-rename
(:after lsp-mode (:after lsp-mode

8
modules/editor/format/autoload/format.el
View file

@ -219,9 +219,11 @@ snippets or single lines."
is selected)." is selected)."
(interactive) (interactive)
(call-interactively (call-interactively
(if (use-region-p) (if (bound-and-true-p lsp-mode)
#'+format/region #'+default/lsp-format-region-or-buffer
#'+format/buffer))) (if (use-region-p)
#'+format/region
#'+format/buffer))))
;; ;;