bug#61626: 29.0.60; The indentation of switch case is broken on typescript-ts-mode and tsx-ts-mode

[Yuan Fu <casouri@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1182 bytes --]


Eason Huang <aqua0210@foxmail.com> writes:

> Hello Theodor and Emacs dev team,
>
> Recently I found that the indentation is broken in typescript-ts-mode
> and tsx-ts-mode. When I press RET (M-x newline) after the ':' in the
> case clause, it will always indent to the the same position of previouse line.
>
> For example:
> In typescript-ts-mode and tsx-ts-mode will get this result as below:
>
> ```
> let day: number = 1;
>
> switch (day) {
> case 0:
> console.log("It is a Sunday.");
> break;
> case 1:
> console.log("It is a Monday.");
> break;
> default:
> console.log("No such day exists!");
> break;
> }
> ```
> expected:
>
> ```
> let day: number = 1;
>
> switch (day) {
> case 0:
>   console.log("It is a Sunday.");
>   break;
> case 1:
>   console.log("It is a Monday.");
>   break;
> default:
>   console.log("No such day exists!");
> break;
> }
> ```
>
> steps to reprodue:
>
> 1. start emacs with `emacs -Q`
> 2. C-x C-f ~/test.tsx to open a test.tsx
> 3. M-x typescript-ts-mode
> 4. input the exmaple code mentioned above
> 5. you will see the result.

The following patch should fix this, Theo, WDYT?

Yuan


[-- Attachment #2: switch-case.patch --]
[-- Type: application/octet-stream, Size: 1580 bytes --]

From 6d42b7e63b39a18c027ad1115033704f4084e0b9 Mon Sep 17 00:00:00 2001
From: Yuan Fu <casouri@gmail.com>
Date: Fri, 24 Feb 2023 20:59:04 -0800
Subject: [PATCH] Fix switch-case indentation in typescript-ts-mode (bug#61626)

* lisp/progmodes/typescript-ts-mode.el:
(typescript-ts-mode--indent-rules): Add indent rule for case and
default.
---
 lisp/progmodes/typescript-ts-mode.el | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el
index 5b49b8f50a8..1ce76cdf517 100644
--- a/lisp/progmodes/typescript-ts-mode.el
+++ b/lisp/progmodes/typescript-ts-mode.el
@@ -81,8 +81,14 @@ typescript-ts-mode--indent-rules
      ((parent-is "member_expression") parent-bol typescript-ts-mode-indent-offset)
      ((parent-is "named_imports") parent-bol typescript-ts-mode-indent-offset)
      ((parent-is "statement_block") parent-bol typescript-ts-mode-indent-offset)
+     ;; Children under "case:"
      ((parent-is "switch_case") parent-bol typescript-ts-mode-indent-offset)
+     ;; "case:"
+     ((node-is "switch_case") parent-bol 0)
+     ;; Children under "default:"
      ((parent-is "switch_default") parent-bol typescript-ts-mode-indent-offset)
+     ;; "default:"
+     ((node-is "switch_default") parent-bol 0)
      ((parent-is "type_arguments") parent-bol typescript-ts-mode-indent-offset)
      ((parent-is "variable_declarator") parent-bol typescript-ts-mode-indent-offset)
      ((parent-is "arguments") parent-bol typescript-ts-mode-indent-offset)
-- 
2.33.1


[-- Attachment #3: Type: text/plain, Size: 2 bytes --]