procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use c-ts-common baseline rule in java-ts-mode (bug#75154)

Browse source 
Use it for function parameters.

* lisp/progmodes/java-ts-mode.el:
(java-ts-mode--standalone-predicate): New function.
(java-ts-mode--indent-rules): Comment out rules for function
parameters and statements, and add
c-ts-common-baseline-indent-rule as fallback.
(java-ts-mode): Setup.
(java-ts-mode--first-line-on-multi-line-string): Mark BOL as
unused.
* test/lisp/progmodes/java-ts-mode-resources/indent.erts:
New test.
This commit is contained in:
Yuan Fu 2025-02-13 18:24:41 -08:00
parent affb2ba77b
commit 93cd55f40e
No known key found for this signature in database
GPG key ID: 56E19BC57664A442
2 changed files with 47 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lisp/progmodes/java-ts-mode.el
View file

@ -91,7 +91,18 @@ again."
table)
"Syntax table for `java-ts-mode'.")
(defun java-ts-mode--first-line-on-multi-line-string (_node parent bol &rest _)
(defun java-ts-mode--standalone-predicate (node)
"Java's standalone predicate.
Return t if NODE is on the start of a line."
(save-excursion
(goto-char (treesit-node-start node))
(if (looking-back (rx bol (* whitespace) (? ".")) (pos-bol))
t
(back-to-indentation)
(when (eq (char-after) ?.)
(point)))))
(defun java-ts-mode--first-line-on-multi-line-string (_node parent _bol &rest _)
"Simple-indent matcher for the first line in a multi-line string block.
PARENT and BOL are the as in other matchers."
(and (treesit-node-match-p parent "multiline_string_fragment")
@ -154,8 +165,8 @@ PARENT and BOL are the as in other matchers."
((parent-is "argument_list") parent-bol java-ts-mode-indent-offset)
((parent-is "annotation_argument_list") parent-bol java-ts-mode-indent-offset)
((parent-is "modifiers") parent-bol 0)
((parent-is "formal_parameters") parent-bol java-ts-mode-indent-offset)
((parent-is "formal_parameter") parent-bol 0)
;; ((parent-is "formal_parameters") parent-bol java-ts-mode-indent-offset)
;; ((parent-is "formal_parameter") parent-bol 0)
((parent-is "init_declarator") parent-bol java-ts-mode-indent-offset)
((parent-is "if_statement") parent-bol java-ts-mode-indent-offset)
((parent-is "for_statement") parent-bol java-ts-mode-indent-offset)
@ -164,7 +175,8 @@ PARENT and BOL are the as in other matchers."
((parent-is "case_statement") parent-bol java-ts-mode-indent-offset)
((parent-is "labeled_statement") parent-bol java-ts-mode-indent-offset)
((parent-is "do_statement") parent-bol java-ts-mode-indent-offset)
((parent-is "block") standalone-parent java-ts-mode-indent-offset)))
;; ((parent-is "block") standalone-parent java-ts-mode-indent-offset)
c-ts-common-baseline-indent-rule))
"Tree-sitter indent rules.")
(defvar java-ts-mode--keywords
@ -401,6 +413,9 @@ Return nil if there is no name or if NODE is not a defun node."
(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)
(setq-local treesit-simple-indent-standalone-predicate
#'java-ts-mode--standalone-predicate)
(setq-local c-ts-common-list-indent-style 'simple)
;; Electric
(setq-local electric-indent-chars

28
test/lisp/progmodes/java-ts-mode-resources/indent.erts
View file

@ -141,3 +141,31 @@ public class Java {
}
}
=-=-=
Name: Method chaining
=-=
public class FloodFill {
public static void main(String[] args) {
List<Foo> stream = students.stream(MAX_VALUE)
.filter(item -> {
return item.getValue() > 100 &&
item.isActive();
})
.map()
.collect();
}
}
=-=
public class FloodFill {
public static void main(String[] args) {
List<Foo> stream = students.stream(MAX_VALUE)
.filter(item -> {
return item.getValue() > 100 &&
item.isActive();
})
.map()
.collect();
}
}
=-=-=