From: João Távora <joaotavora@gmail.com>
Date: Mon, 19 Jun 2023 22:31:03 +0000 (+0100)
Subject: Eglot: again fix positions of coinciding inlay hint overlays (bug#64101)
X-Git-Tag: emacs-29.1-rc1~125
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6f211bc57b922d55c9452bbfa7d01e50e82da25f;p=emacs.git

Eglot: again fix positions of coinciding inlay hint overlays (bug#64101)

This bug originated from the previous fix, and is reproducible on non
Mac OS platforms, as long as the very latest version (at time of
writing) of the rust-analyzer server is used.

* lisp/progmodes/eglot.el (eglot--update-hints-1): Reverse
priorities when pegging overlays after (i.e. when before-string is
used).
---

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 352a6ffd6b0..00f2e547e05 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -3644,7 +3644,7 @@ If NOERROR, return predicate, else erroring function."
                      (if peg-after-p
                          (make-overlay (point) (1+ (point)) nil t)
                        (make-overlay (1- (point)) (point) nil nil nil)))
-                   (do-it (label lpad rpad i)
+                   (do-it (label lpad rpad i n)
                      (let* ((firstp (zerop i))
                             (tweak-cursor-p (and firstp peg-after-p))
                             (ov (make-ov))
@@ -3657,18 +3657,18 @@ If NOERROR, return predicate, else erroring function."
                                              (1 'eglot-type-hint-face)
                                              (2 'eglot-parameter-hint-face)
                                              (_ 'eglot-inlay-hint-face))))
-                       (overlay-put ov 'priority i)
+                       (overlay-put ov 'priority (if peg-after-p i (- n i)))
                        (overlay-put ov 'eglot--inlay-hint t)
                        (overlay-put ov 'evaporate t)
                        (overlay-put ov 'eglot--overlay t))))
-                (if (stringp label) (do-it label left-pad right-pad 0)
+                (if (stringp label) (do-it label left-pad right-pad 0 1)
                   (cl-loop
                    for i from 0 for ldetail across label
                    do (eglot--dbind ((InlayHintLabelPart) value) ldetail
                         (do-it value
                                (and (zerop i) left-pad)
                                (and (= i (1- (length label))) right-pad)
-                               i)))))))))
+                               i (length label))))))))))
     (jsonrpc-async-request
      (eglot--current-server-or-lose)
      :textDocument/inlayHint