Sync eglot.el and eglot-tests.el from upstream

Author: joaotavora

eglot-tests.el

@@ -299,7 +299,7 @@ directory hierarchy."
          (eglot-sync-connect t)
          (eglot-connect-timeout timeout)
          (eglot-server-programs
-          (if server `((,major-mode . ,(string-split server)))
+          (if server `((,major-mode . ,(split-string server)))
             eglot-server-programs)))
     (apply #'eglot--connect (eglot--guess-contact))))
 
@@ -775,7 +775,7 @@ directory hierarchy."
   ;; This originally appeared in github#1339
   (skip-unless (executable-find "rust-analyzer"))
   (skip-unless (executable-find "cargo"))
-  (skip-when (getenv "EMACS_EMBA_CI"))
+  (skip-unless (not (getenv "EMACS_EMBA_CI")))
   (eglot--with-fixture
       '(("cmpl-project" .
          (("main.rs" .
@@ -1576,7 +1576,14 @@ GUESSED-MAJOR-MODES-SYM are bound to the useful return values of
       '(3 "Timeout waiting for semantic tokens")
     (while (not (save-excursion
                   (goto-char pos)
-                  (text-property-search-forward 'eglot--semtok-faces)))
+                  (cl-loop
+                   for from = (point) then to
+                   while (< from (point-max))
+                   for faces = (get-text-property from 'eglot--semtok-faces)
+                   for to = (or (next-single-property-change
+                                 from 'eglot--semtok-faces)
+                                (point-max))
+                   when faces return t)))
       (accept-process-output nil 0.1)
       (font-lock-ensure))))
 

eglot.el

@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2018-2026 Free Software Foundation, Inc.
 
-;; Version: 1.20
+;; Version: 1.21
 ;; Author: João Távora <joaotavora@gmail.com>
 ;; Maintainer: João Távora <joaotavora@gmail.com>
 ;; URL: https://github.com/joaotavora/eglot
@@ -1132,7 +1132,7 @@ object."
              :rangeFormatting    `(:dynamicRegistration :json-false)
              :rename             `(:dynamicRegistration :json-false)
              :semanticTokens     `(:dynamicRegistration :json-false
-                                   :requests '(:full (:delta t))
+                                   :requests (:full (:delta t))
                                    :overlappingTokenSupport t
                                    :multilineTokenSupport t
                                    :tokenTypes [,@eglot-semantic-token-types]
@@ -2172,21 +2172,21 @@ MARKUP is either an LSP MarkedString or MarkupContent object."
       (setq-local markdown-fontify-code-blocks-natively t)
       (insert string)
       (let ((inhibit-message t)
-            (message-log-max nil)
-            match)
+            (message-log-max nil))
         (ignore-errors (delay-mode-hooks (funcall render-mode)))
         (font-lock-ensure)
         (goto-char (point-min))
         (let ((inhibit-read-only t))
-          (when (fboundp 'text-property-search-forward)
-            ;; If `render-mode' is `gfm-view-mode', the `invisible'
-            ;; regions are set to `markdown-markup'.  Set them to 't'
-            ;; instead, since this has actual meaning in the "*eldoc*"
-            ;; buffer where we're taking this string (#bug79552).
-            (while (setq match (text-property-search-forward 'invisible))
-              (put-text-property (prop-match-beginning match)
-                                 (prop-match-end match)
-                                 'invisible t))))
+          ;; If `render-mode' is `gfm-view-mode', the `invisible'
+          ;; regions are set to `markdown-markup'.  Set them to 't'
+          ;; instead, since this has actual meaning in the "*eldoc*"
+          ;; buffer where we're taking this string (#bug79552).
+          (cl-loop for from = (point) then to
+                   while (< from (point-max))
+                   for inv = (get-text-property from 'invisible)
+                   for to = (next-single-property-change from 'invisible)
+                   when inv
+                   do (put-text-property from to 'invisible t)))
         (string-trim (buffer-string))))))
 
 (defun eglot--read-server (prompt &optional dont-if-just-the-one)
@@ -5017,11 +5017,11 @@ See `eglot--semtok-request' implementation for details.")
 
 (defun eglot--semtok-after-send-changes ()
   ;; (trace-values "Dispatching")
-  (setf (plist-get eglot--semtok-state :dispatched) t))
+  (setf (cl-getf eglot--semtok-state :dispatched) t))
 
 (cl-defun eglot--semtok-request (beg end &aux (docver eglot--docver))
   "Ask for tokens.  Arrange for BEG..END to be font-lock flushed."
-  (cl-macrolet ((c (tag) `(plist-get eglot--semtok-state ,tag)))
+  (cl-macrolet ((c (tag) `(cl-getf eglot--semtok-state ,tag)))
     (cl-labels
         ((req (method &optional params cont
                       &aux (buf (current-buffer)))
@@ -5125,12 +5125,12 @@ lock machinery calls us again."
    (with-silent-modifications
      (save-excursion
        (cl-loop
-        initially (goto-char beg)
-        for match = (text-property-search-forward 'eglot--semtok-faces)
-        while (and match (< (point) end))
-        do (dolist (f (prop-match-value match))
-             (add-face-text-property
-              (prop-match-beginning match) (prop-match-end match) f)))))))
+        for from = beg then to
+        while (< from end)
+        for faces = (get-text-property from 'eglot--semtok-faces)
+        for to = (or (next-single-property-change from 'eglot--semtok-faces nil end) end)
+        when faces
+        do (dolist (f faces) (add-face-text-property from to f)))))))
 
 
 ;;; Call and type hierarchies