mirror of
https://github.com/NixOS/nix
synced 2024-10-18 00:16:11 -04:00
Merge ff1241075b
into 806a91f7bf
This commit is contained in:
commit
73e0ad3d48
|
@ -66,6 +66,7 @@ struct NixRepl
|
|||
|
||||
const static int envSize = 32768;
|
||||
std::shared_ptr<StaticEnv> staticEnv;
|
||||
Value lastLoaded;
|
||||
Env * env;
|
||||
int displ;
|
||||
StringSet varNames;
|
||||
|
@ -90,6 +91,7 @@ struct NixRepl
|
|||
void loadFile(const Path & path);
|
||||
void loadFlake(const std::string & flakeRef);
|
||||
void loadFiles();
|
||||
void showLastLoaded();
|
||||
void reloadFiles();
|
||||
void addAttrsToScope(Value & attrs);
|
||||
void addVarToScope(const Symbol name, Value & v);
|
||||
|
@ -464,6 +466,10 @@ ProcessLineResult NixRepl::processLine(std::string line)
|
|||
loadFlake(arg);
|
||||
}
|
||||
|
||||
else if (command == ":ll" || command == ":last-loaded") {
|
||||
showLastLoaded();
|
||||
}
|
||||
|
||||
else if (command == ":r" || command == ":reload") {
|
||||
state->resetFileCache();
|
||||
reloadFiles();
|
||||
|
@ -751,6 +757,16 @@ void NixRepl::initEnv()
|
|||
varNames.emplace(state->symbols[i.first]);
|
||||
}
|
||||
|
||||
void NixRepl::showLastLoaded()
|
||||
{
|
||||
RunPager pager;
|
||||
|
||||
for (auto & i : *lastLoaded.attrs()) {
|
||||
std::string_view name = state->symbols[i.name];
|
||||
logger->cout(name);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void NixRepl::reloadFiles()
|
||||
{
|
||||
|
@ -791,6 +807,27 @@ void NixRepl::addAttrsToScope(Value & attrs)
|
|||
staticEnv->sort();
|
||||
staticEnv->deduplicate();
|
||||
notice("Added %1% variables.", attrs.attrs()->size());
|
||||
|
||||
lastLoaded = attrs;
|
||||
|
||||
const int max_print = 10;
|
||||
int counter = 0;
|
||||
std::string loaded;
|
||||
for (auto & i : attrs.attrs()->lexicographicOrder(state->symbols)) {
|
||||
if (counter >= max_print)
|
||||
break;
|
||||
|
||||
if (counter > 0)
|
||||
loaded += ", ";
|
||||
|
||||
loaded += state->symbols[i->name];
|
||||
counter += 1;
|
||||
}
|
||||
|
||||
notice("- %1%", loaded);
|
||||
|
||||
if (attrs.attrs()->size() > max_print)
|
||||
notice("... and %1% more; view with :ll", attrs.attrs()->size() - max_print);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -153,6 +153,32 @@ foo + baz
|
|||
' "3" \
|
||||
./flake ./flake\#bar --experimental-features 'flakes'
|
||||
|
||||
testReplResponse $'
|
||||
:a { a = 1; b = 2; longerName = 3; "with spaces" = 4; }
|
||||
' 'Added 4 variables.
|
||||
- a, b, longerName, with spaces
|
||||
'
|
||||
|
||||
cat <<EOF > attribute-set.nix
|
||||
{
|
||||
a = 1;
|
||||
b = 2;
|
||||
longerName = 3;
|
||||
"with spaces" = 4;
|
||||
}
|
||||
EOF
|
||||
testReplResponse '
|
||||
:l ./attribute-set.nix
|
||||
' 'Added 4 variables.
|
||||
- a, b, longerName, with spaces
|
||||
'
|
||||
|
||||
testReplResponseNoRegex $'
|
||||
:a builtins.foldl\' (x: y: x // y) {} (map (x: { ${builtins.toString x} = x; }) (builtins.genList (x: x) 13))
|
||||
' 'Added 13 variables.
|
||||
- 0, 1, 10, 11, 12, 2, 3, 4, 5, 6
|
||||
... and 3 more; view with :ll'
|
||||
|
||||
# Test the `:reload` mechansim with flakes:
|
||||
# - Eval `./flake#changingThing`
|
||||
# - Modify the flake
|
||||
|
@ -302,6 +328,8 @@ runRepl () {
|
|||
-e "s@$testDirNoUnderscores@/path/to/tests/functional@g" \
|
||||
-e "s@$nixVersion@<nix version>@g" \
|
||||
-e "s@Added [0-9]* variables@Added <number omitted> variables@g" \
|
||||
-e '/^- /d' \
|
||||
-e '/\.\.\. and [0-9]* more; view with :ll/d' \
|
||||
| grep -vF $'warning: you don\'t have Internet access; disabling some network-dependent features' \
|
||||
;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue