max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-25 23:36:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10209 from 9999years/rethrow-for-top-level-errors-in-repl

Browse source 
Print top-level errors normally in `nix repl`
This commit is contained in:
Théophane Hufschmitt 2024-03-11 21:11:28 +01:00 committed by GitHub
commit 18b2ef8b20
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 91 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libcmd/repl.cc
View file

@ -123,7 +123,8 @@ struct NixRepl
.force = true, .force = true,
.derivationPaths = true, .derivationPaths = true,
.maxDepth = maxDepth, .maxDepth = maxDepth,
.prettyIndent = 2 .prettyIndent = 2,
.errors = ErrorPrintBehavior::ThrowTopLevel,
}); });
} }
}; };

30
src/libexpr/print-options.hh
View file

@ -8,6 +8,29 @@
namespace nix { namespace nix {
/**
* How errors should be handled when printing values.
*/
enum class ErrorPrintBehavior {
/**
* Print the first line of the error in brackets: `«error: oh no!»`
*/
Print,
/**
* Throw the error to the code that attempted to print the value, instead
* of suppressing it it.
*/
Throw,
/**
* Only throw the error if encountered at the top level of the expression.
*
* This will cause expressions like `builtins.throw "uh oh!"` to throw
* errors, but will print attribute sets and other nested structures
* containing values that error (like `nixpkgs`) normally.
*/
ThrowTopLevel,
};
/** /**
* Options for printing Nix values. * Options for printing Nix values.
*/ */
@ -68,6 +91,11 @@ struct PrintOptions
*/ */
size_t prettyIndent = 0; size_t prettyIndent = 0;
/**
* How to handle errors encountered while printing values.
*/
ErrorPrintBehavior errors = ErrorPrintBehavior::Print;
/** /**
* True if pretty-printing is enabled. * True if pretty-printing is enabled.
*/ */
@ -86,7 +114,7 @@ static PrintOptions errorPrintOptions = PrintOptions {
.maxDepth = 10, .maxDepth = 10,
.maxAttrs = 10, .maxAttrs = 10,
.maxListItems = 10, .maxListItems = 10,
.maxStringLength = 1024 .maxStringLength = 1024,
}; };
} }

120
src/libexpr/print.cc
View file

@ -271,25 +271,21 @@ private:
void printDerivation(Value & v) void printDerivation(Value & v)
{ {
try { Bindings::iterator i = v.attrs->find(state.sDrvPath);
Bindings::iterator i = v.attrs->find(state.sDrvPath); NixStringContext context;
NixStringContext context; std::string storePath;
std::string storePath; if (i != v.attrs->end())
if (i != v.attrs->end()) storePath = state.store->printStorePath(state.coerceToStorePath(i->pos, *i->value, context, "while evaluating the drvPath of a derivation"));
storePath = state.store->printStorePath(state.coerceToStorePath(i->pos, *i->value, context, "while evaluating the drvPath of a derivation"));
if (options.ansiColors) if (options.ansiColors)
output << ANSI_GREEN; output << ANSI_GREEN;
output << "«derivation"; output << "«derivation";
if (!storePath.empty()) { if (!storePath.empty()) {
output << " " << storePath; output << " " << storePath;
}
output << "»";
if (options.ansiColors)
output << ANSI_NORMAL;
} catch (Error & e) {
printError_(e);
} }
output << "»";
if (options.ansiColors)
output << ANSI_NORMAL;
} }
bool shouldPrettyPrintAttrs(AttrVec & v) bool shouldPrettyPrintAttrs(AttrVec & v)
@ -510,64 +506,68 @@ private:
output.flush(); output.flush();
checkInterrupt(); checkInterrupt();
if (options.force) { try {
try { if (options.force) {
state.forceValue(v, v.determinePos(noPos)); state.forceValue(v, v.determinePos(noPos));
} catch (Error & e) {
printError_(e);
return;
} }
}
switch (v.type()) { switch (v.type()) {
case nInt: case nInt:
printInt(v); printInt(v);
break; break;
case nFloat: case nFloat:
printFloat(v); printFloat(v);
break; break;
case nBool: case nBool:
printBool(v); printBool(v);
break; break;
case nString: case nString:
printString(v); printString(v);
break; break;
case nPath: case nPath:
printPath(v); printPath(v);
break; break;
case nNull: case nNull:
printNull(); printNull();
break; break;
case nAttrs: case nAttrs:
printAttrs(v, depth); printAttrs(v, depth);
break; break;
case nList: case nList:
printList(v, depth); printList(v, depth);
break; break;
case nFunction: case nFunction:
printFunction(v); printFunction(v);
break; break;
case nThunk: case nThunk:
printThunk(v); printThunk(v);
break; break;
case nExternal: case nExternal:
printExternal(v); printExternal(v);
break; break;
default: default:
printUnknown(); printUnknown();
break; break;
}
} catch (Error & e) {
if (options.errors == ErrorPrintBehavior::Throw
|| (options.errors == ErrorPrintBehavior::ThrowTopLevel
&& depth == 0)) {
throw;
}
printError_(e);
} }
} }