Subject: bug#76704: 30.1; Indentation of braces on separate line in js-ts-mode

From: Vincenzo Pupillo <[email-masked]>
Date: Sat, 22 Mar 2025 23:48:57 +0100

Ciao,
a rule like this:
((node-is "statement_block") parent-bol 0)

works for function but brakes the indentation of expressione like this:
const Geek = (a, b) =>
  {
	return (a + " " + b);
  }

In the attached patch, I have added a new rule specifically for this case.

Vincenzo

In data sabato 22 marzo 2025 13:24:16 Ora standard dell’Europa centrale, Eli 
Zaretskii ha scritto:
> Ping!  Juri and Vincenzo, please chime in.
> 
> > Cc: [email-masked]
> > Date: Sun, 09 Mar 2025 12:00:16 +0200
> > From: Eli Zaretskii <[email-masked]>
> > 
> > > Date: Sun, 02 Mar 2025 20:44:39 +0100
> > > From:  Fabian Brosda via "Bug reports for GNU Emacs,
> > > 
> > >  the Swiss army knife of text editors" <[email-masked]>
> > > 
> > > Hi,
> > > 
> > > when using js-ts-mode instead of js-mode, braces, which are put on a
> > > separate line are indented one level too much.  Here is a simple example
> > > of how the indentation looks like, after using indent-region on the
> > > whole function:
> > > 
> > > ```
> > > function test(x)
> > > 
> > >     {
> > >     
> > > 	    if(x)
> > > 	    
> > > 	        {
> > > 	        
> > > 		        return a;
> > > 	        
> > > 	        }
> > > 	    
> > > 	    else
> > > 	    
> > > 	        {
> > > 	        
> > > 		        return b;
> > > 	        
> > > 	        }
> > >     
> > >     }
> > > 
> > > ```
> > > 
> > > The used tree-sitter grammar is downloaded from
> > > https://github.com/tree-sitter/tree-sitter-javascript.
> > > 
> > > Having braces on a separate line is probably not the most common for
> > > javascript, but using indent-region in the js-mode, does yield the
> > > expected result.  The js.el file does already contain a comment
> > > mentioning braces in js--treesit-indent-rules.  But even based on the
> > > git history it is not clear to me, what exactly is meant:
> > > 
> > > ```
> > > 
> > >        ;; "{" on the newline.
> > >        ((node-is "statement_block") parent-bol js-indent-level)
> > > 
> > > ```
> > > 
> > > Link:
> > > https://github.com/emacs-mirror/emacs/blob/master/lisp/progmodes/js.el#
> > > L3457
> > > 
> > > If I replace 'js-indent-level' with '0' in this line, the indentation
> > > would
> > > be correct, but this might have unwanted side-effects I overlooked.
> > > 
> > > My current emacs version:
> > > 
> > > GNU Emacs 30.1 (build 2, x86_64-pc-linux-gnu, GTK+ Version 3.24.48,
> > > cairo version 1.18.2)
> > > 
> > > Thanks for looking into this.
> > 
> > Juri and Vincenzo, any comments?

>From 56f0bfe99b0c4cda1e36686e48c58d0d017bda21 Mon Sep 17 00:00:00 2001
From: Vincenzo Pupillo <[email-masked]>
Date: Sat, 22 Mar 2025 23:43:52 +0100
Subject: [PATCH] Fix indentation of "{" when on a new line of a function
 declaration.

* lisp/progmodes/js.el
(js--treesit-indent-rules): New rule for the indentation of "{" when
of a new line of a function declaration. (bug#76704)
---
 lisp/progmodes/js.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 3e789218fde..6943ffc2d28 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3464,7 +3464,10 @@ js--treesit-indent-rules
        ((parent-is "ternary_expression") parent-bol js-indent-level)
        ((parent-is "member_expression") parent-bol js-indent-level)
        ((node-is ,switch-case) parent-bol 0)
-       ;; "{" on the newline.
+       ;; "{" on the newline for functions.
+       ((query "(function_declaration body: (statement_block \"{\") @indent)")
+         parent-bol 0)
+       ;; "{" on the newline in other cases.
        ((node-is "statement_block") parent-bol js-indent-level)
        ((parent-is "named_imports") parent-bol js-indent-level)
        ((parent-is "statement_block") parent-bol js-indent-level)
-- 
2.49.0