nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-22 06:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

printAttrs: Force item before determining whether to print multi-line

Browse Source
This commit is contained in:
Robert Hensing 2024-07-14 14:28:21 +02:00
parent ece334b532
commit a0635a80b2
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libexpr/print.cc
View File

@ -299,6 +299,9 @@ private:
output << ANSI_NORMAL; output << ANSI_NORMAL;
} }
/**
* @note This may force items.
*/
bool shouldPrettyPrintAttrs(AttrVec & v) bool shouldPrettyPrintAttrs(AttrVec & v)
{ {
if (!options.shouldPrettyPrint() || v.empty()) { if (!options.shouldPrettyPrint() || v.empty()) {
@ -315,6 +318,9 @@ private:
return true; return true;
} }
// It is ok to force the item(s) here, because they will be printed anyway.
state.forceValue(*item, item->determinePos(noPos));
// Pretty-print single-item attrsets only if they contain nested // Pretty-print single-item attrsets only if they contain nested
// structures. // structures.
auto itemType = item->type(); auto itemType = item->type();

4
tests/functional/repl/pretty-print-idempotent.expected
View File

@ -2,9 +2,7 @@ Nix <nix version>
Type :? for help. Type :? for help.
Added <number omitted> variables. Added <number omitted> variables.
{ { homepage = "https://example.com"; }
homepage = "https://example.com";
}
{ homepage = "https://example.com"; } { homepage = "https://example.com"; }