From: Yuan Fu <casouri@gmail.com>
Date: Mon, 27 Nov 2023 00:38:41 +0000 (-0800)
Subject: Fix indentation for else clause in c-ts-mode (bug#67417)
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f8d9dc26c78366e1f2de9dd847fe4744f607748d;p=emacs.git

Fix indentation for else clause in c-ts-mode (bug#67417)

* lisp/progmodes/c-ts-mode.el:
(c-ts-mode--indent-styles): Add indentation for children of
else_clause.
* test/lisp/progmodes/c-ts-mode-resources/indent.erts:
(Name): Add test for else-break.  Also make the test such that it
needs to indent correctly from scratch (rather than maintaining the
already correct indentation.)
---

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 8660b65f309..5975057518e 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -452,6 +452,7 @@ MODE is either `c' or `cpp'."
            ;; These rules are for cases where the body is bracketless.
            ;; Tested by the "Bracketless Simple Statement" test.
            ((parent-is "if_statement") standalone-parent c-ts-mode-indent-offset)
+           ((parent-is "else_clause") standalone-parent c-ts-mode-indent-offset)
            ((parent-is "for_statement") standalone-parent c-ts-mode-indent-offset)
            ((parent-is "while_statement") standalone-parent c-ts-mode-indent-offset)
            ((parent-is "do_statement") standalone-parent c-ts-mode-indent-offset)
diff --git a/test/lisp/progmodes/c-ts-mode-resources/indent.erts b/test/lisp/progmodes/c-ts-mode-resources/indent.erts
index 221b3d809af..bac76fb7378 100644
--- a/test/lisp/progmodes/c-ts-mode-resources/indent.erts
+++ b/test/lisp/progmodes/c-ts-mode-resources/indent.erts
@@ -149,6 +149,21 @@ for (int i = 0;
 
 Name: Bracketless Simple Statement
 
+=-=
+for (int i = 0; i < 5; i++)
+continue;
+
+while (true)
+return 1;
+
+do
+i++;
+while (true)
+
+if (true)
+break;
+else
+break;
 =-=
 for (int i = 0; i < 5; i++)
   continue;
@@ -159,6 +174,11 @@ while (true)
 do
   i++;
 while (true)
+
+if (true)
+  break;
+else
+  break;
 =-=-=
 
 Name: Nested If-Else