Merge from origin/emacs-30

b7f6cde419f Disable xwidgets with recent webkitgtk versions (Bug#66068)
a6dafbc2bc5 ; * lisp/editorconfig.el (editorconfig-indentation-alist)...
0834106a620 Fix treesit--merge-ranges (bug#73324)
76c6b4d2799 Fix midnight-mode documentation
f7782522207 ; Fix my email address
db22efca8d4 editorconfig.el: Fix too naive sync from upstream
0f12d6dd23c ; * etc/NEWS: Announce 'doc-view-mpdf--use-svg'.
29d50e245f8 * lisp/progmodes/eglot.el (eglot--signal-textDocument/did...

# Conflicts:
#	etc/NEWS
#	lisp/treesit.el

1 files changed, 5 insertions, 0 deletions

diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index 7eecbdcfa94..ca595c41244 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -686,6 +686,11 @@ visible_end.)"
       (should (equal '((16 . 28)) (treesit-query-range
                                    'javascript query nil nil '(1 . -1)))))))
 
+(ert-deftest treesit-range-merge ()
+  "Test merging ranges."
+  (should (equal (treesit--merge-ranges '((1 . 1) (3 . 483)) nil 1 488)
+                 nil)))
+
 (ert-deftest treesit-range-fixup-after-edit ()
   "Tests if Emacs can fix OOB ranges after deleting text or narrowing."
   (skip-unless (treesit-language-available-p 'json))