fmt: recognize or blocks in call args (#19690)

vlang · Oct 29, 2023 · 5c2eafc · 5c2eafc
1 parent b9d0aed
commit 5c2eafc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/cmd/tools/vcreate/vcreate_input_test.v b/cmd/tools/vcreate/vcreate_input_test.v
@@ -3,7 +3,7 @@ import v.vmod
 
 const (
 	// Expect has to be installed for the test.
-	expect_exe        = os.quoted_path(os.find_abs_path_of_executable('expect') or {
+	expect_exe = os.quoted_path(os.find_abs_path_of_executable('expect') or {
 		eprintln('skipping test, since expect is missing')
 		exit(0)
 	})

diff --git a/vlib/v/fmt/fmt.v b/vlib/v/fmt/fmt.v
@@ -788,7 +788,8 @@ fn expr_is_single_line(expr ast.Expr) bool {
 			}
 		}
 		ast.CallExpr {
-			if expr.or_block.stmts.len > 1 {
+			if expr.or_block.stmts.len > 1 || expr.args.any(it.expr is ast.CallExpr
+				&& it.expr.or_block.stmts.len > 1) {
 				return false
 			}
 		}

diff --git a/vlib/v/fmt/tests/consts_with_or_block_keep.vv b/vlib/v/fmt/tests/consts_with_or_block_keep.vv
@@ -0,0 +1,13 @@
+import os
+
+const (
+	exe = os.find_abs_path_of_executable('my_exe') or {
+		eprintln('skipping test, since `my_exe` is missing')
+		exit(0)
+	}
+	exe_quoted = os.quoted_path(os.find_abs_path_of_executable('my_exe') or {
+		eprintln('skipping test, since `my_exe` is missing')
+		exit(0)
+	})
+	single_line_test_path = os.join_path(os.vtmp_dir(), 'my_test_path')
+)