From ad7ea4451badcb8e43ae92640d4a7c6a8a0e117a Mon Sep 17 00:00:00 2001 From: john muhl Date: Mon, 4 Sep 2023 11:36:42 -0500 Subject: [PATCH] Fix java-ts-mode tests * 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. --- admin/notes/tree-sitter/build-module/batch.sh | 1 + lisp/progmodes/java-ts-mode.el | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/admin/notes/tree-sitter/build-module/batch.sh b/admin/notes/tree-sitter/build-module/batch.sh index 1d4076564dc..3c4e1472c89 100755 --- 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 863adeb9245..99d34789dcc 100644 --- a/lisp/progmodes/java-ts-mode.el +++ b/lisp/progmodes/java-ts-mode.el @@ -356,7 +356,7 @@ java-ts-mode (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 @@ java-ts-mode "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) -- 2.41.0