From 9db7cce5ff14d9680152918afdd59ea6d961461c Mon Sep 17 00:00:00 2001
From: Kevin Robert Stravers <kevin@stravers.net>
Date: Mon, 2 Sep 2024 18:51:32 -0400
Subject: [PATCH] nix repl: Add `:ll` to show all recently loaded variables

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.

https://github.com/NixOS/nix/issues/11404
---
 src/libcmd/repl.cc       | 20 +++++++++++++++++++-
 tests/functional/repl.sh |  4 ++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/libcmd/repl.cc b/src/libcmd/repl.cc
index 0aed7eda8..dea62ac9f 100644
--- a/src/libcmd/repl.cc
+++ b/src/libcmd/repl.cc
@@ -72,6 +72,7 @@ struct NixRepl
 
     const static int envSize = 32768;
     std::shared_ptr<StaticEnv> staticEnv;
+    Value lastLoaded;
     Env * env;
     int displ;
     StringSet varNames;
@@ -96,6 +97,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);
@@ -470,6 +472,10 @@ ProcessLineResult NixRepl::processLine(std::string line)
         loadFlake(arg);
     }
 
+    else if (command == ":ll" || command == ":last-flake") {
+        showLastLoaded();
+    }
+
     else if (command == ":r" || command == ":reload") {
         state->resetFileCache();
         reloadFiles();
@@ -750,6 +756,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,12 +807,14 @@ void NixRepl::addAttrsToScope(Value & attrs)
     staticEnv->deduplicate();
     notice("Added %1% variables.", attrs.attrs()->size());
 
+    lastLoaded = attrs;
+
     const int max_print = 10;
     int count = 0;
     for (auto & i : *attrs.attrs()) {
         count += 1;
         if (count > max_print) {
-            notice("... And %1% other variables", attrs.attrs()->size() - max_print);
+            notice("... And %1% other variables, use :ll to see these", attrs.attrs()->size() - max_print);
             break;
         }
 
diff --git a/tests/functional/repl.sh b/tests/functional/repl.sh
index cdd4d9dd4..56a927ff2 100755
--- a/tests/functional/repl.sh
+++ b/tests/functional/repl.sh
@@ -193,7 +193,7 @@ attributes = builtins.foldl\' (x: y: x // y) {} (map (x: { ${builtins.toString x
 - 7
 - 8
 - 9
-... And 3 other variables
+... And 3 other variables, use :ll to see these
 '
 
 # Test the `:reload` mechansim with flakes:
@@ -346,7 +346,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]* other variables/d' \
+      -e '/\.\.\. And [0-9]* other variables, use :ll to see these/d' \
     | grep -vF $'warning: you don\'t have Internet access; disabling some network-dependent features' \
     ;
 }