From 9e6f62d1d8946e2c706a2ea46bab123f6c463ef7 Mon Sep 17 00:00:00 2001
From: rillig <rillig@NetBSD.org>
Date: Fri, 2 Jun 2023 14:34:14 +0000
Subject: [PATCH] indent: remove newline between 'switch' and '{'

---
 tests/usr.bin/indent/fmt_decl.c | 7 ++++---
 tests/usr.bin/indent/label.c    | 6 ++----
 usr.bin/indent/indent.c         | 8 ++++++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/tests/usr.bin/indent/fmt_decl.c b/tests/usr.bin/indent/fmt_decl.c
index dd584e6e6dec..01235d858fb6 100644
--- a/tests/usr.bin/indent/fmt_decl.c
+++ b/tests/usr.bin/indent/fmt_decl.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fmt_decl.c,v 1.47 2023/06/02 14:21:55 rillig Exp $	*/
+/*	$NetBSD: fmt_decl.c,v 1.48 2023/06/02 14:34:14 rillig Exp $	*/
 
 /*
  * Tests for declarations of global variables, external functions, and local
@@ -920,8 +920,9 @@ ch_isalpha(char ch)
 //indent run -i4 -di0
 // $ FIXME: 'buffer' is classified as 'word'.
 // $
-// $ XXX: 'char' is classified as 'type_in_parentheses'; check whether this
-// $ XXX: lexer symbol should only be used for types in cast expressions.
+// $ XXX: 'char' is classified as 'type_in_parentheses'; check whether
+// $ XXX: lsym_type_in_parentheses should only be used for types in cast
+// $ XXX: expressions.
 // $
 // $ FIXME: 'size_t' is classified as 'word'.
 void buf_add_chars(struct buffer *, const char *, size_t);
diff --git a/tests/usr.bin/indent/label.c b/tests/usr.bin/indent/label.c
index 48a1466d4829..03cef53681a3 100644
--- a/tests/usr.bin/indent/label.c
+++ b/tests/usr.bin/indent/label.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: label.c,v 1.6 2023/05/13 09:40:47 rillig Exp $	*/
+/*	$NetBSD: label.c,v 1.7 2023/06/02 14:34:14 rillig Exp $	*/
 
 /* See FreeBSD r303489 */
 
@@ -20,9 +20,7 @@ U: ;
 void
 t(void)
 {
-	switch (1)
-/* $ TODO: Move the '{' up to the ')'. */
-	{
+	switch (1) {
 	case 1:			/* test */
 	case 2:			/* test */
 	}
diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c
index b9043bc7c24b..eb7ff2efb2b5 100644
--- a/usr.bin/indent/indent.c
+++ b/usr.bin/indent/indent.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: indent.c,v 1.313 2023/06/02 14:21:55 rillig Exp $	*/
+/*	$NetBSD: indent.c,v 1.314 2023/06/02 14:34:14 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: indent.c,v 1.313 2023/06/02 14:21:55 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.314 2023/06/02 14:34:14 rillig Exp $");
 
 #include <sys/param.h>
 #include <err.h>
@@ -455,6 +455,10 @@ process_newline(void)
 	    && lab.len == 0 /* for preprocessing lines */
 	    && com.len == 0)
 		goto stay_in_line;
+	if (ps.s_sym[ps.tos] == psym_switch_expr && opt.brace_same_line) {
+		ps.force_nl = true;
+		goto stay_in_line;
+	}
 
 	output_line();