Fix java-ts-mode tests (bug#65738)

* admin/notes/tree-sitter/build-module/batch.sh (languages):
Add Java.
* lisp/progmodes/java-ts-mode.el (java-ts-mode): Pass a list
to 'treesit-thing-settings'.

diff --git a/admin/notes/tree-sitter/build-module/batch.sh b/admin/notes/tree-sitter/build-module/batch.sh
index 1d4076564dcd8296f893a281b90e48ab998d3ec4..3c4e1472c894bb7ff3fa5b8bad53e856bedd67ab 100755 (executable)
--- a/admin/notes/tree-sitter/build-module/batch.sh
+++ b/admin/notes/tree-sitter/build-module/batch.sh
@@ -13,6 +13,7 @@ languages=(
     'go-mod'
     'heex'
     'html'
+    'java'
     'javascript'
     'json'
     'python'

diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
index 863adeb9245bc94d2b7dc83191b711b00a4221bc..99d34789dcc7bba5ac1e94b6fad2fa0f27c19a21 100644 (file)
--- a/lisp/progmodes/java-ts-mode.el
+++ b/lisp/progmodes/java-ts-mode.el
@@ -356,7 +356,7 @@ Return nil if there is no name or if NODE is not a defun node."
   (setq-local treesit-defun-name-function #'java-ts-mode--defun-name)
 
   (setq-local treesit-thing-settings
-              `(java
+              `((java
                 (sexp ,(rx (or "annotation"
                                "parenthesized_expression"
                                "argument_list"
@@ -378,7 +378,7 @@ Return nil if there is no name or if NODE is not a defun node."
                                    "import_declaration")))
                 (text ,(regexp-opt '("line_comment"
                                      "block_comment"
-                                     "text_block")))))
+                                     "text_block"))))))
 
   ;; Font-lock.
   (setq-local treesit-font-lock-settings java-ts-mode--font-lock-settings)