From 2ccbf3a45ccb5b1ac469f3d429faf4c51c56f38a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 22 Jun 2022 23:39:50 +0200 Subject: style: Keep values next to their keyword. This ensures we print '#:key value' rather than insert a newline between '#:key' and 'value' as was the case before. * guix/scripts/style.scm (pretty-print-with-comments)[print-sequence]: When ITEM is a keyword, loop with FIRST? = true. * tests/style.scm: Add test. --- tests/style.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'tests') diff --git a/tests/style.scm b/tests/style.scm index 41f7e31cce..48d975df94 100644 --- a/tests/style.scm +++ b/tests/style.scm @@ -492,6 +492,18 @@ mnopqrstuvwxyz.\")" '(#:phases %standard-phases #:tests? #f)))") +;; '#:key value' is kept on the same line. +(test-pretty-print "\ +(package + (name \"keyword-value-same-line\") + (arguments + (list #:phases #~(modify-phases %standard-phases + (add-before 'x 'y + (lambda* (#:key inputs #:allow-other-keys) + (foo bar baz)))) + #:make-flags #~'(\"ANSWER=42\") + #:tests? #f)))") + (test-equal "pretty-print-with-comments, canonicalize-comment" "\ (list abc -- cgit v1.2.3