From: Theodor Thornhill via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
To: 太阳 <zjyzhaojiyang@hotmail.com>
Cc: 61142@debbugs.gnu.org
Subject: bug#61142: 29.0.60; java-ts-mode - Wrong indentation for the body of multiple lines conditions
Date: Sun, 05 Feb 2023 08:53:33 +0100 [thread overview]
Message-ID: <87r0v47dky.fsf@thornhill.no> (raw)
In-Reply-To: <87wn4x7lpw.fsf_-_@thornhill.no> (Theodor Thornhill's message of "Sat, 04 Feb 2023 11:45:31 +0100")
[-- Attachment #1: Type: text/plain, Size: 1098 bytes --]
Theodor Thornhill <theo@thornhill.no> writes:
> 太阳 <zjyzhaojiyang@hotmail.com> writes:
>
>> After reading treesit's manual, I found that we can use `n-p-gp` as the matcher
>> and `grand-parent` as the anchor to match the body of `if` (and `while`, which
>> has a similar issue).
>>
>> I mean a rule looks like the following:
>>
>> ```
>> ((n-p-gp nil "block" "if_statement") grand-parent java-ts-mode-indent-offset)
>> ```
>>
>>
>
>
> Thanks! We have a mechanism in place for this, see
> 'c-ts-common-statement-offset' in 'c-ts-common.el'. I didn't get to it
> yet, but I'll try to look at it this evening, unless you want to? See
> c-ts-mode for examples of how to use it, if you're interested!
>
> Theo
Hi again!
Can you test this patch for me?
@Eli: Is this ok for emacs-29? I'd love to add some test for this, but
now they are on the master branch. What is the common procedure to move
stuff from master branch to the release branch? I _can_ just add some
test to the master branch, but it would be nice to have them on emacs-29
too :-)
Theo
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Use-c-ts-common-statement-offset-in-java-ts-mode.patch --]
[-- Type: text/x-patch, Size: 4821 bytes --]
From 18beb67646446363cec98e4074822b9fcf270d12 Mon Sep 17 00:00:00 2001
From: Theodor Thornhill <theo@thornhill.no>
Date: Sun, 5 Feb 2023 08:49:08 +0100
Subject: [PATCH] Use c-ts-common-statement-offset in java-ts-mode
* lisp/progmodes/java-ts-mode.el (java-ts-mode--indent-rules): Add new
matchers to enable c-ts-common machinery.
(java-ts-mode): Add regexps.
* lisp/progmodes/c-ts-common.el (c-ts-common-statement-offset): Fix
typo.
---
lisp/progmodes/c-ts-common.el | 2 +-
lisp/progmodes/java-ts-mode.el | 34 +++++++++++++++++++++++++---------
2 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/lisp/progmodes/c-ts-common.el b/lisp/progmodes/c-ts-common.el
index 8729cae4ba..188734badb 100644
--- a/lisp/progmodes/c-ts-common.el
+++ b/lisp/progmodes/c-ts-common.el
@@ -285,7 +285,7 @@ c-ts-common-statement-offset
"This anchor is used for children of a statement inside a block.
This function basically counts the number of block nodes (i.e.,
-brackets) (defined by `c-ts-mode--indent-block-type-regexp')
+brackets) (defined by `c-ts-common-indent-block-type-regexp')
between NODE and the root node (not counting NODE itself), and
multiply that by `c-ts-common-indent-offset'.
diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
index b9f7894095..1b6f2ba8b3 100644
--- a/lisp/progmodes/java-ts-mode.el
+++ b/lisp/progmodes/java-ts-mode.el
@@ -70,22 +70,24 @@ java-ts-mode--syntax-table
(defvar java-ts-mode--indent-rules
`((java
((parent-is "program") point-min 0)
- ((node-is "}") (and parent parent-bol) 0)
+ ((match "}" "element_value_array_initializer")
+ parent-bol 0)
+ ((node-is "}") point-min c-ts-common-statement-offset)
((node-is ")") parent-bol 0)
((node-is "]") parent-bol 0)
((and (parent-is "comment") c-ts-common-looking-at-star)
c-ts-common-comment-start-after-first-star -1)
((parent-is "comment") prev-adaptive-prefix 0)
((parent-is "text_block") no-indent)
- ((parent-is "class_body") parent-bol java-ts-mode-indent-offset)
+ ((parent-is "class_body") point-min c-ts-common-statement-offset)
((parent-is "array_initializer") parent-bol java-ts-mode-indent-offset)
- ((parent-is "annotation_type_body") parent-bol java-ts-mode-indent-offset)
- ((parent-is "interface_body") parent-bol java-ts-mode-indent-offset)
- ((parent-is "constructor_body") parent-bol java-ts-mode-indent-offset)
+ ((parent-is "annotation_type_body") point-min c-ts-common-statement-offset)
+ ((parent-is "interface_body") point-min c-ts-common-statement-offset)
+ ((parent-is "constructor_body") point-min c-ts-common-statement-offset)
((parent-is "enum_body_declarations") parent-bol 0)
- ((parent-is "enum_body") parent-bol java-ts-mode-indent-offset)
- ((parent-is "switch_block") parent-bol java-ts-mode-indent-offset)
- ((parent-is "record_declaration_body") parent-bol java-ts-mode-indent-offset)
+ ((parent-is "enum_body") point-min c-ts-common-statement-offset)
+ ((parent-is "switch_block") point-min c-ts-common-statement-offset)
+ ((parent-is "record_declaration_body") point-min c-ts-common-statement-offset)
((query "(method_declaration (block _ @indent))") parent-bol java-ts-mode-indent-offset)
((query "(method_declaration (block (_) @indent))") parent-bol java-ts-mode-indent-offset)
((parent-is "local_variable_declaration") parent-bol java-ts-mode-indent-offset)
@@ -118,7 +120,7 @@ java-ts-mode--indent-rules
((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") (and parent parent-bol) java-ts-mode-indent-offset)))
+ ((parent-is "block") point-min c-ts-common-statement-offset)))
"Tree-sitter indent rules.")
(defvar java-ts-mode--keywords
@@ -300,6 +302,20 @@ java-ts-mode
(c-ts-common-comment-setup)
;; Indent.
+ (setq-local c-ts-common-indent-block-type-regexp
+ (rx (or "class_body"
+ "\\`array_initializer"
+ "annotation_type_body"
+ "interface_body"
+ "interface_constructor_body"
+ "enum_body"
+ "switch_block"
+ "record_declaration_body"
+ "block")))
+ (setq-local c-ts-common-indent-bracketless-type-regexp
+ (rx (or "if_statement" "do_statement"
+ "for_statement" "while_statement")))
+ (setq-local c-ts-common-indent-offset 'java-ts-mode-indent-offset)
(setq-local treesit-simple-indent-rules java-ts-mode--indent-rules)
;; Electric
--
2.34.1
next prev parent reply other threads:[~2023-02-05 7:53 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <handler.61142.B.16749811447164.ack@debbugs.gnu.org>
2023-02-01 8:46 ` bug#61142: Acknowledgement (29.0.60; java-ts-mode - Wrong indentation for the body of multiple lines conditions) 太阳
2023-02-04 10:45 ` bug#61142: 29.0.60; java-ts-mode - Wrong indentation for the body of multiple lines conditions Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-02-05 7:53 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors [this message]
2023-02-05 7:54 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-02-05 9:20 ` Eli Zaretskii
2023-02-05 9:28 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-02-05 10:15 ` Eli Zaretskii
2023-02-05 10:25 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-02-05 10:59 ` Eli Zaretskii
2023-02-05 13:09 ` bug#61142: 回复: " 赵 纪阳
2023-02-05 19:19 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-02-05 19:30 ` Eli Zaretskii
2023-02-05 19:32 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-02-05 20:12 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-02-05 21:20 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-02-06 2:34 ` bug#61142: 回复: " 赵 纪阳
2023-02-06 6:45 ` Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-01-29 4:00 太阳
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r0v47dky.fsf@thornhill.no \
--to=bug-gnu-emacs@gnu.org \
--cc=61142@debbugs.gnu.org \
--cc=theo@thornhill.no \
--cc=zjyzhaojiyang@hotmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).