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

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

[Eason Huang]

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.

--
Eason Huang

In GNU Emacs 29.0.60 (build 1, x86_64-apple-darwin22.2.0, NS
 appkit-2299.30 Version 13.1 (Build 22C65), git sha1 893ddd5903e) of
 2023-02-19 built on macbook
Windowing system distributor 'Apple', version 10.3.2299
System Description:  macOS 13.1

Configured using:
 'configure --without-native-compilation --without-dbus
 'CPPFLAGS=-I/opt/local/include
 -isysroot/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk'
 'LDFLAGS=-L/opt/local/lib -Wl,-headerpad_max_install_names -Wl,-rpath
 /opt/local/lib/gcc12
 -Wl,-syslibroot,/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
 -arch x86_64''

Configured features:
ACL GIF GLIB GMP GNUTLS JPEG JSON LCMS2 LIBXML2 MODULES NOTIFY KQUEUE NS
PDUMPER PNG RSVG SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS TREE_SITTER
WEBP XIM ZLIB

Important settings:
  value of $LC_CTYPE: en_US.UTF-8
  value of $LANG: en_US.UTF-8
  locale-coding-system: utf-8-unix

Major mode: TypeScript

Minor modes in effect:
  tooltip-mode: t
  global-eldoc-mode: t
  show-paren-mode: t
  electric-indent-mode: t
  mouse-wheel-mode: t
  tool-bar-mode: t
  menu-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  line-number-mode: t
  indent-tabs-mode: t
  transient-mark-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t

Load-path shadows:
None found.

Features:
(shadow sort mail-extr emacsbug message mailcap yank-media puny dired
dired-loaddefs rfc822 mml mml-sec password-cache epa derived epg rfc6068
epg-config gnus-util text-property-search time-date mm-decode mm-bodies
mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail
rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils vc-git
diff-mode easy-mmode vc-dispatcher typescript-ts-mode js c-ts-common
json subr-x map byte-opt gv bytecomp byte-compile imenu cc-mode cc-fonts
cc-guess cc-menus cc-cmds cc-styles cc-align cc-engine cc-vars cc-defs
treesit cl-seq cl-loaddefs cl-lib emacs-git-version rmc iso-transl
tooltip cconv eldoc paren electric uniquify ediff-hook vc-hooks
lisp-float-type elisp-mode mwheel term/ns-win ns-win ucs-normalize
mule-util term/common-win tool-bar dnd fontset image regexp-opt fringe
tabulated-list replace newcomment text-mode lisp-mode prog-mode register
page tab-bar menu-bar rfn-eshadow isearch easymenu timer select
scroll-bar mouse jit-lock font-lock syntax font-core term/tty-colors
frame minibuffer nadvice seq simple cl-generic indonesian philippine
cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao
korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech
european ethiopic indian cyrillic chinese composite emoji-zwj charscript
charprop case-table epa-hook jka-cmpr-hook help abbrev obarray oclosure
cl-preloaded button loaddefs theme-loaddefs faces cus-face macroexp
files window text-properties overlay sha1 md5 base64 format env
code-pages mule custom widget keymap hashtable-print-readable backquote
threads kqueue cocoa ns lcms2 multi-tty make-network-process emacs)

Memory information:
((conses 16 79887 12727)
 (symbols 48 8661 3)
 (strings 32 25763 2168)
 (string-bytes 1 934251)
 (vectors 16 16611)
 (vector-slots 8 226493 9391)
 (floats 8 29 58)
 (intervals 56 615 0)
 (buffers 984 14))

-- 
Eason Huang

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

[Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors]

On 19 February 2023 14:24:30 CET, Eason Huang <aqua0210@foxmail.com> wrote:
>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.
>
>--


Great, thanks! I'll fix it tonight, unless you want to devise a patch yourself?

Theo

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

[Eason Huang]

Theodor Thornhill <theo@thornhill.no> writes:

> On 19 February 2023 14:24:30 CET, Eason Huang <aqua0210@foxmail.com> wrote:
>>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.
>>
>>--
>
>
> Great, thanks! I'll fix it tonight, unless you want to devise a patch yourself?
>
Hi Theo,

Sorry, I have no idear how to fix it.

I tried the latest commit(fc4bfa76db9) of emacs-29 branch, but the issue is still existed.

-- 
Eason Huang

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

[Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors]

Eason Huang <aqua0210@foxmail.com> writes:

> Theodor Thornhill <theo@thornhill.no> writes:
>
>> On 19 February 2023 14:24:30 CET, Eason Huang <aqua0210@foxmail.com> wrote:
>>>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.
>>>
>>>--
>>
>>
>> Great, thanks! I'll fix it tonight, unless you want to devise a patch yourself?
>>
> Hi Theo,
>
> Sorry, I have no idear how to fix it.
>
> I tried the latest commit(fc4bfa76db9) of emacs-29 branch, but the issue is still existed.
>
> -- 
> Eason Huang

No problem, pushing it now.

Theo

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

[Eason Huang]

Theodor Thornhill <theo@thornhill.no> writes:

> Eason Huang <aqua0210@foxmail.com> writes:
>
>> Theodor Thornhill <theo@thornhill.no> writes:
>>
>>> On 19 February 2023 14:24:30 CET, Eason Huang <aqua0210@foxmail.com> wrote:
>>>>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.
>>>>
>>>>--
>>>
>>>
>>> Great, thanks! I'll fix it tonight, unless you want to devise a patch yourself?
>>>
>> Hi Theo,
>>
>> Sorry, I have no idear how to fix it.
>>
>> I tried the latest commit(fc4bfa76db9) of emacs-29 branch, but the issue is still existed.
>>
>> --
>> Eason Huang
>
> No problem, pushing it now.
>

Great, thanks!

I just build commit 19480aa30e3, and the issue has been fixed now.

-- 
Eason Huang

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

[Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors]

Eason Huang <aqua0210@foxmail.com> writes:

> Theodor Thornhill <theo@thornhill.no> writes:
>
>> Eason Huang <aqua0210@foxmail.com> writes:
>>
>>> Theodor Thornhill <theo@thornhill.no> writes:
>>>
>>>> On 19 February 2023 14:24:30 CET, Eason Huang <aqua0210@foxmail.com> wrote:
>>>>>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.
>>>>>
>>>>>--
>>>>
>>>>
>>>> Great, thanks! I'll fix it tonight, unless you want to devise a patch yourself?
>>>>
>>> Hi Theo,
>>>
>>> Sorry, I have no idear how to fix it.
>>>
>>> I tried the latest commit(fc4bfa76db9) of emacs-29 branch, but the issue is still existed.
>>>
>>> --
>>> Eason Huang
>>
>> No problem, pushing it now.
>>
>
> Great, thanks!
>
> I just build commit 19480aa30e3, and the issue has been fixed now.
>
> -- 
> Eason Huang

Good news!

theo

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

[Yuan Fu]

[-- 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 --]

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

[Theodor Thornhill via Bug reports for GNU Emacs, the Swiss army knife of text editors]

On 25 February 2023 06:00:45 CET, Yuan Fu <casouri@gmail.com> wrote:
>
>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
>

This is already fixed:)

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

[Yuan Fu]

> On Feb 24, 2023, at 10:12 PM, Theodor Thornhill <theo@thornhill.no> wrote:
> 
> 
> 
> On 25 February 2023 06:00:45 CET, Yuan Fu <casouri@gmail.com> wrote:
>> 
>> 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
>> 
> 
> This is already fixed:)

Oh! Glad I asked first ;-)

Yuan