From: Yuan Fu <casouri@gmail.com>
Date: Tue, 7 Feb 2023 02:48:04 +0000 (-0800)
Subject: Make java-ts-mode use the c-ts-common-indent-type-regexp-alist
X-Git-Tag: emacs-29.0.90~474
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=746748f5c28;p=emacs.git

Make java-ts-mode use the c-ts-common-indent-type-regexp-alist

* lisp/progmodes/java-ts-mode.el:
(java-ts-mode): Setup c-ts-common-indent-type-regexp-alist.
---

diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
index 1d7bdb07224..dc651c11a00 100644
--- a/lisp/progmodes/java-ts-mode.el
+++ b/lisp/progmodes/java-ts-mode.el
@@ -303,20 +303,22 @@ Return nil if there is no name or if NODE is not a defun node."
   (c-ts-common-comment-setup)
 
   ;; Indent.
-  (setq-local c-ts-common-indent-block-type-regexp
-              (regexp-opt '("class_body"
-                            "array_initializer"
-                            "constructor_body"
-                            "annotation_type_body"
-                            "interface_body"
-                            "enum_body"
-                            "switch_block"
-                            "record_declaration_body"
-                            "block")))
-  (setq-local c-ts-common-indent-bracketless-type-regexp
-              (regexp-opt '("if_statement"
-                            "for_statement"
-                            "while_statement")))
+  (setq-local c-ts-common-indent-type-regexp-alist
+              `((block . ,(rx (or "class_body"
+                                  "array_initializer"
+                                  "constructor_body"
+                                  "annotation_type_body"
+                                  "interface_body"
+                                  "enum_body"
+                                  "switch_block"
+                                  "record_declaration_body"
+                                  "block")))
+                (close-bracket . "}")
+                (if . "if_statement")
+                (else . ("if_statement" . "alternative"))
+                (for . "for_statement")
+                (while . "while_statement")
+                (do . "do_statement")))
   (setq-local c-ts-common-indent-offset 'java-ts-mode-indent-offset)
   (setq-local treesit-simple-indent-rules java-ts-mode--indent-rules)