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

Fix #3054: format with lsp only if server is capable

Browse source 
And fall back to format-all otherwise.
This commit is contained in:
Henrik Lissner 2020-05-06 16:29:32 -04:00
parent da2247e3d6
commit 200ab5b9af
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -219,13 +219,15 @@ snippets or single lines."
is selected)." is selected)."
(interactive) (interactive)
(call-interactively (call-interactively
(if (bound-and-true-p lsp-mode)
(if (doom-region-active-p) (if (doom-region-active-p)
(if (and (bound-and-true-p lsp-mode)
(lsp-feature? "textDocument/rangeFormatting"))
#'lsp-format-region #'lsp-format-region
#'lsp-format-buffer) #'+format/region)
(if (use-region-p) (if (and (bound-and-true-p lsp-mode)
#'+format/region (lsp-feature? "textDocument/formatting"))
#'+format/buffer)))) #'lsp-format-buffer
#'+format/buffer)))
;; ;;