From ffd414eb756dcb3c64348551d5dbaf674c0d4900 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 23 Oct 2023 18:38:54 +0200
Subject: [PATCH] Fix nix shebang interaction with #8131 overhaul completions

---
 src/libcmd/installables.cc |  4 +++-
 src/libutil/args.cc        | 19 ++++++++-----------
 src/libutil/args.hh        | 17 +----------------
 src/libutil/args/root.hh   | 14 +++++++++++++-
 4 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc
index f840865d2..1c6103020 100644
--- a/src/libcmd/installables.cc
+++ b/src/libcmd/installables.cc
@@ -294,7 +294,9 @@ void completeFlakeRefWithFragment(
                 prefixRoot = ".";
             }
             auto flakeRefS = std::string(prefix.substr(0, hash));
-            auto flakeRef = parseFlakeRef(expandTilde(flakeRefS), absPath(getCommandBaseDir()));
+
+            // TODO: ideally this would use the command base directory instead of assuming ".".
+            auto flakeRef = parseFlakeRef(expandTilde(flakeRefS), absPath("."));
 
             auto evalCache = openEvalCache(*evalState,
                 std::make_shared<flake::LockedFlake>(lockFlake(*evalState, flakeRef, lockFlags)));
diff --git a/src/libutil/args.cc b/src/libutil/args.cc
index 0012b3f47..5ba1e5c55 100644
--- a/src/libutil/args.cc
+++ b/src/libutil/args.cc
@@ -80,12 +80,6 @@ std::optional<std::string> RootArgs::needsCompletion(std::string_view s)
     return {};
 }
 
-void RootArgs::parseCmdline(const Strings & _cmdline)
-{
-    // Default via 5.1.2.2.1 in C standard
-    Args::parseCmdline(_cmdline, false);
-}
-
 /**
  * Basically this is `typedef std::optional<Parser> Parser(std::string_view s, Strings & r);`
  *
@@ -227,7 +221,7 @@ static Strings parseShebangContent(std::string_view s) {
     return result;
 }
 
-void Args::parseCmdline(const Strings & _cmdline, bool allowShebang)
+void RootArgs::parseCmdline(const Strings & _cmdline, bool allowShebang)
 {
     Strings pendingArgs;
     bool dashDash = false;
@@ -339,10 +333,13 @@ void Args::parseCmdline(const Strings & _cmdline, bool allowShebang)
 
 Path Args::getCommandBaseDir() const
 {
-    if (parent)
-        return parent->getCommandBaseDir();
-    else
-        return commandBaseDir;
+    assert(parent);
+    return parent->getCommandBaseDir();
+}
+
+Path RootArgs::getCommandBaseDir() const
+{
+    return commandBaseDir;
 }
 
 bool Args::processFlag(Strings::iterator & pos, Strings::iterator end)
diff --git a/src/libutil/args.hh b/src/libutil/args.hh
index 9c942606e..30a44cd10 100644
--- a/src/libutil/args.hh
+++ b/src/libutil/args.hh
@@ -24,24 +24,9 @@ class AddCompletions;
 
 class Args
 {
-    /**
-     * @brief The command's "working directory", but only set when top level.
-     *
-     * Use getCommandBaseDir() to get the directory regardless of whether this
-     * is a top-level command or subcommand.
-     *
-     * @see getCommandBaseDir()
-     */
-    Path commandBaseDir = ".";
 
 public:
 
-    /**
-     * Parse the command line with argv0, throwing a UsageError if something
-       goes wrong.
-     */
-    void parseCmdline(const Strings & _cmdline, bool allowShebang);
-
     /**
      * Return a short one-line description of the command.
     */
@@ -62,7 +47,7 @@ public:
      *
      * This only returns the correct value after parseCmdline() has run.
      */
-    Path getCommandBaseDir() const;
+    virtual Path getCommandBaseDir() const;
 
 protected:
 
diff --git a/src/libutil/args/root.hh b/src/libutil/args/root.hh
index bb98732a1..5c55c37a5 100644
--- a/src/libutil/args/root.hh
+++ b/src/libutil/args/root.hh
@@ -29,14 +29,26 @@ struct Completions final : AddCompletions
  */
 class RootArgs : virtual public Args
 {
+    /**
+     * @brief The command's "working directory", but only set when top level.
+     *
+     * Use getCommandBaseDir() to get the directory regardless of whether this
+     * is a top-level command or subcommand.
+     *
+     * @see getCommandBaseDir()
+     */
+    Path commandBaseDir = ".";
+
 public:
     /** Parse the command line, throwing a UsageError if something goes
      * wrong.
      */
-    void parseCmdline(const Strings & cmdline);
+    void parseCmdline(const Strings & cmdline, bool allowShebang = false);
 
     std::shared_ptr<Completions> completions;
 
+    Path getCommandBaseDir() const override;
+
 protected:
 
     friend class Args;