Skip to content

Commit

Permalink
nix repl: Add :ll to show all recently loaded variables
Browse files Browse the repository at this point in the history
Invoking `:ll` will start a pager with all variables which have just
been loaded by `:lf`, `:l`, or by a flake provided to `nix repl` as an
argument.

#11404
  • Loading branch information
kstrafe committed Sep 21, 2024
1 parent e3c6451 commit ff12410
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 3 deletions.
20 changes: 19 additions & 1 deletion src/libcmd/repl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ struct NixRepl

const static int envSize = 32768;
std::shared_ptr<StaticEnv> staticEnv;
Value lastLoaded;
Env * env;
int displ;
StringSet varNames;
Expand All @@ -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);
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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()
{
Expand Down Expand Up @@ -792,6 +808,8 @@ void NixRepl::addAttrsToScope(Value & attrs)
staticEnv->deduplicate();
notice("Added %1% variables.", attrs.attrs()->size());

lastLoaded = attrs;

const int max_print = 10;
int counter = 0;
std::string loaded;
Expand All @@ -809,7 +827,7 @@ void NixRepl::addAttrsToScope(Value & attrs)
notice("- %1%", loaded);

if (attrs.attrs()->size() > max_print)
notice("... and %1% more", attrs.attrs()->size() - max_print);
notice("... and %1% more; view with :ll", attrs.attrs()->size() - max_print);
}


Expand Down
4 changes: 2 additions & 2 deletions tests/functional/repl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ 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'
... and 3 more; view with :ll'

# Test the `:reload` mechansim with flakes:
# - Eval `./flake#changingThing`
Expand Down Expand Up @@ -329,7 +329,7 @@ runRepl () {
-e "s@$nixVersion@<nix version>@g" \
-e "s@Added [0-9]* variables@Added <number omitted> variables@g" \
-e '/^- /d' \
-e '/\.\.\. and [0-9]* more/d' \
-e '/\.\.\. and [0-9]* more; view with :ll/d' \
| grep -vF $'warning: you don\'t have Internet access; disabling some network-dependent features' \
;
}
Expand Down

0 comments on commit ff12410

Please sign in to comment.