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

fix(indent-guides): interop with lsp-ui-peek

Browse source 
Ref: #8052
This commit is contained in:
Henrik Lissner 2024-09-08 17:48:39 -04:00
parent 0461c5de5f
commit af814ff86a
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

25
modules/ui/indent-guides/config.el
View file

@ -60,4 +60,27 @@ be enabled. If any function returns non-nil, the mode will not be activated."
;; completion or eldoc popups).
;; REVIEW: Swap with `frame-parent' when 27 support is dropped
(defun +indent-guides-in-childframe-p ()
(frame-parameter nil 'parent-frame))))
(frame-parameter nil 'parent-frame)))
(when (modulep! :tools lsp)
;; HACK: lsp-ui-peek uses overlays, and indent-bars doesn't know how to deal
;; with all the whitespace it uses to format its popups, spamming it with
;; indent guides. Making the two work together is a project for another
;; day, so disable `indent-bars-mode' while its active instead. Doesn't
;; affect character bars though.
;; REVIEW: Report this upstream to `indent-bars'?
(defadvice! +indent-guides--remove-after-lsp-ui-peek-a (&rest _)
:after #'lsp-ui-peek--peek-new
(when (and indent-bars-mode
(not indent-bars-prefer-character)
(overlayp lsp-ui-peek--overlay))
(save-excursion
(let ((indent-bars--display-function #'ignore)
(indent-bars--display-blank-lines-function #'ignore))
(indent-bars--fontify (overlay-start lsp-ui-peek--overlay)
(1+ (overlay-end lsp-ui-peek--overlay))
nil)))))
(defadvice! +indent-guides--restore-after-lsp-ui-peek-a (&rest _)
:after #'lsp-ui-peek--peek-hide
(unless indent-bars-prefer-character
(indent-bars-setup)))))