yogsototh/doom-emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor(format): improve lsp/eglot formatter dispatchers

Browse source
This commit is contained in:
Henrik Lissner 2024-02-14 18:09:15 -05:00 committed by Yann Esposito (Yogsototh)
parent 02ce4ee2b9
commit 773bf46f5e
Signed by untrusted user who does not match committer: yogsototh
GPG key ID: 7B19A4C650D59646
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -95,17 +95,19 @@ is selected)."
Does nothing if `+format-with-lsp' is nil or the active server doesn't support
the requested feature."
(when (and +format-with-lsp
(bound-and-true-p lsp-mode)
(lsp-feature?
(if (eq op 'buffer)
"textDocument/formatting"
"textDocument/rangeFormatting")))
(call-interactively
(if (eq op 'buffer)
#'lsp-format-buffer
#'lsp-format-region))
t))
(and +format-with-lsp
(bound-and-true-p lsp-mode)
(pcase op
('buffer (condition-case _
;; Avoid lsp-feature? checks for this, since
;; `lsp-format-buffer' does its own, and allows clients
;; without formatting support (but with rangeFormatting,
;; for some reason) to work.
(always (lsp-format-buffer))
('lsp-capability-not-supported nil)))
('region (if (lsp-feature? "textDocument/rangeFormatting")
(always (lsp-format-region beg end))))
(_ (error "Invalid formatter operation: %s" op)))))
;;;###autoload
(defun +format-with-eglot-fn (beg end op)
@ -113,16 +115,14 @@ the requested feature."
Does nothing if `+format-with-lsp' is nil or the active server doesn't support
the requested feature."
(when (and +format-with-lsp
(bound-and-true-p eglot-managed-mode)
(eglot--server-capable
(if (eq op 'buffer)
:documentFormattingProvider
:documentRangeFormattingProvider)))
(if (eq op 'buffer)
(eglot-format-buffer)
(eglot-format beg end))
t))
(and +format-with-lsp
(bound-and-true-p eglot-managed-mode)
(pcase op
('buffer (if (eglot--server-capable :documentFormattingProvider)
(always (eglot-format-buffer))))
('region (if (eglot--server-capable :documentRangeFormattingProvider)
(always (eglot-format beg end))))
(_ (error "Invalid formatter operation: %s" op)))))
;;;###autoload
(defun +format-in-org-src-blocks-fn (beg end _op)