1 files changed, 9 insertions, 1 deletions
diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
index 23e166ee4c3..9155a7fff25 100644
--- a/lisp/progmodes/java-ts-mode.el
+++ b/lisp/progmodes/java-ts-mode.el
@@ -321,7 +321,15 @@ the subtrees."
              (append "{}():;," electric-indent-chars))
  ;; Navigation.
-  (setq-local treesit-defun-type-regexp "declaration")
+  (setq-local treesit-defun-type-regexp
+              (regexp-opt '("method_declaration"
+                            "class_declaration"
+                            "record_declaration"
+                            "interface_declaration"
+                            "enum_declaration"
+                            "import_declaration"
+                            "package_declaration"
+                            "module_declaration")))
  ;; Font-lock.
  (setq-local treesit-font-lock-settings java-ts-mode--font-lock-settings)

diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el index 23e166ee4c3..9155a7fff25 100644 --- a/lisp/progmodes/java-ts-mode.el +++ b/lisp/progmodes/java-ts-mode.el
@@ -321,7 +321,15 @@ the subtrees."
321	(append "{}():;," electric-indent-chars))	321	(append "{}():;," electric-indent-chars))
322		322
323	;; Navigation.	323	;; Navigation.
324	(setq-local treesit-defun-type-regexp "declaration")	324	(setq-local treesit-defun-type-regexp
		325	(regexp-opt '("method_declaration"
		326	"class_declaration"
		327	"record_declaration"
		328	"interface_declaration"
		329	"enum_declaration"
		330	"import_declaration"
		331	"package_declaration"
		332	"module_declaration")))
325		333
326	;; Font-lock.	334	;; Font-lock.
327	(setq-local treesit-font-lock-settings java-ts-mode--font-lock-settings)	335	(setq-local treesit-font-lock-settings java-ts-mode--font-lock-settings)