2016-02-09 22:07:48 +02:00
|
|
|
#include "args.hh"
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
#include "args/root.hh"
|
2016-02-09 22:07:48 +02:00
|
|
|
#include "hash.hh"
|
2023-10-25 07:43:36 +03:00
|
|
|
#include "environment-variables.hh"
|
|
|
|
#include "signals.hh"
|
|
|
|
#include "users.hh"
|
2023-06-16 22:19:14 +03:00
|
|
|
#include "json-utils.hh"
|
2016-02-09 22:07:48 +02:00
|
|
|
|
2021-09-01 09:19:51 +03:00
|
|
|
#include <fstream>
|
|
|
|
#include <string>
|
2021-08-28 23:26:53 +03:00
|
|
|
#include <regex>
|
2020-05-10 22:35:07 +03:00
|
|
|
#include <glob.h>
|
|
|
|
|
2016-02-09 22:07:48 +02:00
|
|
|
namespace nix {
|
|
|
|
|
2020-05-04 23:40:19 +03:00
|
|
|
void Args::addFlag(Flag && flag_)
|
2017-06-07 19:41:20 +03:00
|
|
|
{
|
2020-05-04 23:40:19 +03:00
|
|
|
auto flag = std::make_shared<Flag>(std::move(flag_));
|
|
|
|
if (flag->handler.arity != ArityAny)
|
|
|
|
assert(flag->handler.arity == flag->labels.size());
|
2017-06-07 19:41:20 +03:00
|
|
|
assert(flag->longName != "");
|
2020-05-04 23:40:19 +03:00
|
|
|
longFlags[flag->longName] = flag;
|
2021-02-07 21:44:56 +02:00
|
|
|
for (auto & alias : flag->aliases)
|
|
|
|
longFlags[alias] = flag;
|
2020-05-04 23:40:19 +03:00
|
|
|
if (flag->shortName) shortFlags[flag->shortName] = flag;
|
2017-06-07 19:41:20 +03:00
|
|
|
}
|
|
|
|
|
2021-02-26 15:55:54 +02:00
|
|
|
void Args::removeFlag(const std::string & longName)
|
|
|
|
{
|
|
|
|
auto flag = longFlags.find(longName);
|
|
|
|
assert(flag != longFlags.end());
|
|
|
|
if (flag->second->shortName) shortFlags.erase(flag->second->shortName);
|
|
|
|
longFlags.erase(flag);
|
|
|
|
}
|
|
|
|
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
void Completions::setType(AddCompletions::Type t)
|
|
|
|
{
|
|
|
|
type = t;
|
|
|
|
}
|
|
|
|
|
2020-10-09 10:39:51 +03:00
|
|
|
void Completions::add(std::string completion, std::string description)
|
|
|
|
{
|
2023-02-10 23:17:09 +02:00
|
|
|
description = trim(description);
|
2023-02-10 19:03:19 +02:00
|
|
|
// ellipsize overflowing content on the back of the description
|
|
|
|
auto end_index = description.find_first_of(".\n");
|
|
|
|
if (end_index != std::string::npos) {
|
|
|
|
auto needs_ellipsis = end_index != description.size() - 1;
|
|
|
|
description.resize(end_index);
|
|
|
|
if (needs_ellipsis)
|
|
|
|
description.append(" [...]");
|
|
|
|
}
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
completions.insert(Completion {
|
2020-10-09 22:55:59 +03:00
|
|
|
.completion = completion,
|
|
|
|
.description = description
|
|
|
|
});
|
2020-10-09 10:39:51 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
bool Completion::operator<(const Completion & other) const
|
|
|
|
{ return completion < other.completion || (completion == other.completion && description < other.description); }
|
|
|
|
|
2020-05-10 21:32:21 +03:00
|
|
|
std::string completionMarker = "___COMPLETE___";
|
|
|
|
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
RootArgs & Args::getRoot()
|
|
|
|
{
|
|
|
|
Args * p = this;
|
|
|
|
while (p->parent)
|
|
|
|
p = p->parent;
|
|
|
|
|
|
|
|
auto * res = dynamic_cast<RootArgs *>(p);
|
|
|
|
assert(res);
|
|
|
|
return *res;
|
|
|
|
}
|
|
|
|
|
|
|
|
std::optional<std::string> RootArgs::needsCompletion(std::string_view s)
|
2020-05-10 21:32:21 +03:00
|
|
|
{
|
|
|
|
if (!completions) return {};
|
|
|
|
auto i = s.find(completionMarker);
|
|
|
|
if (i != std::string::npos)
|
|
|
|
return std::string(s.begin(), i);
|
|
|
|
return {};
|
|
|
|
}
|
|
|
|
|
2023-05-12 20:46:37 +03:00
|
|
|
/**
|
|
|
|
* Basically this is `typedef std::optional<Parser> Parser(std::string_view s, Strings & r);`
|
|
|
|
*
|
|
|
|
* Except we can't recursively reference the Parser typedef, so we have to write a class.
|
|
|
|
*/
|
|
|
|
struct Parser {
|
|
|
|
std::string_view remaining;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @brief Parse the next character(s)
|
|
|
|
*
|
|
|
|
* @param r
|
|
|
|
* @return std::shared_ptr<Parser>
|
|
|
|
*/
|
|
|
|
virtual void operator()(std::shared_ptr<Parser> & state, Strings & r) = 0;
|
|
|
|
|
|
|
|
Parser(std::string_view s) : remaining(s) {};
|
2023-11-19 02:46:48 +02:00
|
|
|
|
|
|
|
virtual ~Parser() { };
|
2023-05-12 20:46:37 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
struct ParseQuoted : public Parser {
|
|
|
|
/**
|
|
|
|
* @brief Accumulated string
|
|
|
|
*
|
|
|
|
* Parsed argument up to this point.
|
|
|
|
*/
|
|
|
|
std::string acc;
|
|
|
|
|
|
|
|
ParseQuoted(std::string_view s) : Parser(s) {};
|
|
|
|
|
|
|
|
virtual void operator()(std::shared_ptr<Parser> & state, Strings & r) override;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
struct ParseUnquoted : public Parser {
|
|
|
|
/**
|
|
|
|
* @brief Accumulated string
|
|
|
|
*
|
|
|
|
* Parsed argument up to this point. Empty string is not representable in
|
|
|
|
* unquoted syntax, so we use it for the initial state.
|
|
|
|
*/
|
|
|
|
std::string acc;
|
|
|
|
|
|
|
|
ParseUnquoted(std::string_view s) : Parser(s) {};
|
|
|
|
|
|
|
|
virtual void operator()(std::shared_ptr<Parser> & state, Strings & r) override {
|
|
|
|
if (remaining.empty()) {
|
|
|
|
if (!acc.empty())
|
|
|
|
r.push_back(acc);
|
|
|
|
state = nullptr; // done
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
switch (remaining[0]) {
|
|
|
|
case ' ': case '\t': case '\n': case '\r':
|
|
|
|
if (!acc.empty())
|
|
|
|
r.push_back(acc);
|
|
|
|
state = std::make_shared<ParseUnquoted>(ParseUnquoted(remaining.substr(1)));
|
|
|
|
return;
|
|
|
|
case '`':
|
|
|
|
if (remaining.size() > 1 && remaining[1] == '`') {
|
|
|
|
state = std::make_shared<ParseQuoted>(ParseQuoted(remaining.substr(2)));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
throw Error("single backtick is not a supported syntax in the nix shebang.");
|
|
|
|
|
|
|
|
// reserved characters
|
|
|
|
// meaning to be determined, or may be reserved indefinitely so that
|
|
|
|
// #!nix syntax looks unambiguous
|
|
|
|
case '$':
|
|
|
|
case '*':
|
|
|
|
case '~':
|
|
|
|
case '<':
|
|
|
|
case '>':
|
|
|
|
case '|':
|
|
|
|
case ';':
|
|
|
|
case '(':
|
|
|
|
case ')':
|
|
|
|
case '[':
|
|
|
|
case ']':
|
|
|
|
case '{':
|
|
|
|
case '}':
|
|
|
|
case '\'':
|
|
|
|
case '"':
|
|
|
|
case '\\':
|
|
|
|
throw Error("unsupported unquoted character in nix shebang: " + std::string(1, remaining[0]) + ". Use double backticks to escape?");
|
|
|
|
|
|
|
|
case '#':
|
|
|
|
if (acc.empty()) {
|
|
|
|
throw Error ("unquoted nix shebang argument cannot start with #. Use double backticks to escape?");
|
|
|
|
} else {
|
|
|
|
acc += remaining[0];
|
|
|
|
remaining = remaining.substr(1);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
|
|
|
acc += remaining[0];
|
|
|
|
remaining = remaining.substr(1);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
assert(false);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
void ParseQuoted::operator()(std::shared_ptr<Parser> &state, Strings & r) {
|
|
|
|
if (remaining.empty()) {
|
|
|
|
throw Error("unterminated quoted string in nix shebang");
|
|
|
|
}
|
|
|
|
switch (remaining[0]) {
|
2023-11-06 19:19:14 +02:00
|
|
|
case ' ':
|
|
|
|
if ((remaining.size() == 3 && remaining[1] == '`' && remaining[2] == '`')
|
|
|
|
|| (remaining.size() > 3 && remaining[1] == '`' && remaining[2] == '`' && remaining[3] != '`')) {
|
|
|
|
// exactly two backticks mark the end of a quoted string, but a preceding space is ignored if present.
|
|
|
|
state = std::make_shared<ParseUnquoted>(ParseUnquoted(remaining.substr(3)));
|
|
|
|
r.push_back(acc);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
// just a normal space
|
|
|
|
acc += remaining[0];
|
|
|
|
remaining = remaining.substr(1);
|
|
|
|
return;
|
|
|
|
}
|
2023-05-12 20:46:37 +03:00
|
|
|
case '`':
|
2023-11-06 19:19:14 +02:00
|
|
|
// exactly two backticks mark the end of a quoted string
|
|
|
|
if ((remaining.size() == 2 && remaining[1] == '`')
|
|
|
|
|| (remaining.size() > 2 && remaining[1] == '`' && remaining[2] != '`')) {
|
2023-05-12 20:46:37 +03:00
|
|
|
state = std::make_shared<ParseUnquoted>(ParseUnquoted(remaining.substr(2)));
|
|
|
|
r.push_back(acc);
|
|
|
|
return;
|
|
|
|
}
|
2023-11-06 19:19:14 +02:00
|
|
|
|
|
|
|
// a sequence of at least 3 backticks is one escape-backtick which is ignored, followed by any number of backticks, which are verbatim
|
|
|
|
else if (remaining.size() >= 3 && remaining[1] == '`' && remaining[2] == '`') {
|
|
|
|
// ignore "escape" backtick
|
|
|
|
remaining = remaining.substr(1);
|
|
|
|
// add the rest
|
|
|
|
while (remaining.size() > 0 && remaining[0] == '`') {
|
|
|
|
acc += '`';
|
|
|
|
remaining = remaining.substr(1);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
2023-05-12 20:46:37 +03:00
|
|
|
else {
|
|
|
|
acc += remaining[0];
|
|
|
|
remaining = remaining.substr(1);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
acc += remaining[0];
|
|
|
|
remaining = remaining.substr(1);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
assert(false);
|
|
|
|
}
|
|
|
|
|
2023-11-06 19:19:14 +02:00
|
|
|
Strings parseShebangContent(std::string_view s) {
|
2023-05-12 20:46:37 +03:00
|
|
|
Strings result;
|
|
|
|
std::shared_ptr<Parser> parserState(std::make_shared<ParseUnquoted>(ParseUnquoted(s)));
|
|
|
|
|
|
|
|
// trampoline == iterated strategy pattern
|
|
|
|
while (parserState) {
|
|
|
|
auto currentState = parserState;
|
|
|
|
(*currentState)(parserState, result);
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2023-10-23 19:38:54 +03:00
|
|
|
void RootArgs::parseCmdline(const Strings & _cmdline, bool allowShebang)
|
2016-02-09 22:07:48 +02:00
|
|
|
{
|
|
|
|
Strings pendingArgs;
|
|
|
|
bool dashDash = false;
|
|
|
|
|
|
|
|
Strings cmdline(_cmdline);
|
|
|
|
|
2020-05-10 21:32:21 +03:00
|
|
|
if (auto s = getEnv("NIX_GET_COMPLETIONS")) {
|
|
|
|
size_t n = std::stoi(*s);
|
|
|
|
assert(n > 0 && n <= cmdline.size());
|
|
|
|
*std::next(cmdline.begin(), n - 1) += completionMarker;
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
completions = std::make_shared<Completions>();
|
2020-05-11 22:38:17 +03:00
|
|
|
verbosity = lvlError;
|
2020-05-10 21:32:21 +03:00
|
|
|
}
|
|
|
|
|
2021-01-28 16:37:43 +02:00
|
|
|
bool argsSeen = false;
|
2021-08-28 23:26:53 +03:00
|
|
|
|
|
|
|
// Heuristic to see if we're invoked as a shebang script, namely,
|
|
|
|
// if we have at least one argument, it's the name of an
|
|
|
|
// executable file, and it starts with "#!".
|
|
|
|
Strings savedArgs;
|
2023-05-12 14:44:25 +03:00
|
|
|
if (allowShebang){
|
2021-08-28 23:26:53 +03:00
|
|
|
auto script = *cmdline.begin();
|
|
|
|
try {
|
2021-09-01 09:19:51 +03:00
|
|
|
std::ifstream stream(script);
|
|
|
|
char shebang[3]={0,0,0};
|
|
|
|
stream.get(shebang,3);
|
|
|
|
if (strncmp(shebang,"#!",2) == 0){
|
2021-08-28 23:26:53 +03:00
|
|
|
for (auto pos = std::next(cmdline.begin()); pos != cmdline.end();pos++)
|
|
|
|
savedArgs.push_back(*pos);
|
|
|
|
cmdline.clear();
|
|
|
|
|
2021-09-01 09:19:51 +03:00
|
|
|
std::string line;
|
|
|
|
std::getline(stream,line);
|
2023-05-12 14:44:25 +03:00
|
|
|
static const std::string commentChars("#/\\%@*-");
|
2023-05-12 20:46:37 +03:00
|
|
|
std::string shebangContent;
|
2022-11-26 16:06:39 +02:00
|
|
|
while (std::getline(stream,line) && !line.empty() && commentChars.find(line[0]) != std::string::npos){
|
2021-08-28 23:26:53 +03:00
|
|
|
line = chomp(line);
|
|
|
|
|
|
|
|
std::smatch match;
|
2023-05-12 20:46:37 +03:00
|
|
|
// We match one space after `nix` so that we preserve indentation.
|
|
|
|
// No space is necessary for an empty line. An empty line has basically no effect.
|
|
|
|
if (std::regex_match(line, match, std::regex("^#!\\s*nix(:? |$)(.*)$")))
|
|
|
|
shebangContent += match[2].str() + "\n";
|
|
|
|
}
|
|
|
|
for (const auto & word : parseShebangContent(shebangContent)) {
|
|
|
|
cmdline.push_back(word);
|
2021-08-28 23:26:53 +03:00
|
|
|
}
|
|
|
|
cmdline.push_back(script);
|
2023-05-12 20:54:54 +03:00
|
|
|
commandBaseDir = dirOf(script);
|
2021-08-28 23:26:53 +03:00
|
|
|
for (auto pos = savedArgs.begin(); pos != savedArgs.end();pos++)
|
|
|
|
cmdline.push_back(*pos);
|
|
|
|
}
|
2023-12-02 00:03:28 +02:00
|
|
|
} catch (SystemError &) { }
|
2021-08-28 23:26:53 +03:00
|
|
|
}
|
2016-02-09 22:07:48 +02:00
|
|
|
for (auto pos = cmdline.begin(); pos != cmdline.end(); ) {
|
|
|
|
|
|
|
|
auto arg = *pos;
|
|
|
|
|
|
|
|
/* Expand compound dash options (i.e., `-qlf' -> `-q -l -f',
|
|
|
|
`-j3` -> `-j 3`). */
|
|
|
|
if (!dashDash && arg.length() > 2 && arg[0] == '-' && arg[1] != '-' && isalpha(arg[1])) {
|
2022-02-25 17:00:00 +02:00
|
|
|
*pos = (std::string) "-" + arg[1];
|
2016-02-09 22:07:48 +02:00
|
|
|
auto next = pos; ++next;
|
|
|
|
for (unsigned int j = 2; j < arg.length(); j++)
|
|
|
|
if (isalpha(arg[j]))
|
2022-02-25 17:00:00 +02:00
|
|
|
cmdline.insert(next, (std::string) "-" + arg[j]);
|
2016-02-09 22:07:48 +02:00
|
|
|
else {
|
2022-02-25 17:00:00 +02:00
|
|
|
cmdline.insert(next, std::string(arg, j));
|
2016-02-09 22:07:48 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
arg = *pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!dashDash && arg == "--") {
|
|
|
|
dashDash = true;
|
|
|
|
++pos;
|
|
|
|
}
|
|
|
|
else if (!dashDash && std::string(arg, 0, 1) == "-") {
|
|
|
|
if (!processFlag(pos, cmdline.end()))
|
2020-04-22 02:07:07 +03:00
|
|
|
throw UsageError("unrecognised flag '%1%'", arg);
|
2016-02-09 22:07:48 +02:00
|
|
|
}
|
|
|
|
else {
|
2021-01-28 16:37:43 +02:00
|
|
|
if (!argsSeen) {
|
|
|
|
argsSeen = true;
|
|
|
|
initialFlagsProcessed();
|
|
|
|
}
|
2020-12-03 23:45:44 +02:00
|
|
|
pos = rewriteArgs(cmdline, pos);
|
2016-02-09 22:07:48 +02:00
|
|
|
pendingArgs.push_back(*pos++);
|
|
|
|
if (processArgs(pendingArgs, false))
|
|
|
|
pendingArgs.clear();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
processArgs(pendingArgs, true);
|
2021-01-28 16:37:43 +02:00
|
|
|
|
|
|
|
if (!argsSeen)
|
|
|
|
initialFlagsProcessed();
|
2023-01-17 02:13:31 +02:00
|
|
|
|
|
|
|
/* Now that we are done parsing, make sure that any experimental
|
|
|
|
* feature required by the flags is enabled */
|
|
|
|
for (auto & f : flagExperimentalFeatures)
|
|
|
|
experimentalFeatureSettings.require(f);
|
|
|
|
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
/* Now that all the other args are processed, run the deferred completions.
|
|
|
|
*/
|
|
|
|
for (auto d : deferredCompletions)
|
|
|
|
d.completer(*completions, d.n, d.prefix);
|
2016-02-09 22:07:48 +02:00
|
|
|
}
|
|
|
|
|
2023-05-12 20:54:54 +03:00
|
|
|
Path Args::getCommandBaseDir() const
|
|
|
|
{
|
2023-10-23 19:38:54 +03:00
|
|
|
assert(parent);
|
|
|
|
return parent->getCommandBaseDir();
|
|
|
|
}
|
|
|
|
|
|
|
|
Path RootArgs::getCommandBaseDir() const
|
|
|
|
{
|
|
|
|
return commandBaseDir;
|
2023-05-12 20:54:54 +03:00
|
|
|
}
|
|
|
|
|
2016-02-09 22:07:48 +02:00
|
|
|
bool Args::processFlag(Strings::iterator & pos, Strings::iterator end)
|
|
|
|
{
|
|
|
|
assert(pos != end);
|
|
|
|
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
auto & rootArgs = getRoot();
|
|
|
|
|
2016-02-09 22:07:48 +02:00
|
|
|
auto process = [&](const std::string & name, const Flag & flag) -> bool {
|
|
|
|
++pos;
|
2023-01-17 02:13:31 +02:00
|
|
|
|
|
|
|
if (auto & f = flag.experimentalFeature)
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
rootArgs.flagExperimentalFeatures.insert(*f);
|
2023-01-17 02:13:31 +02:00
|
|
|
|
2017-10-24 13:45:11 +03:00
|
|
|
std::vector<std::string> args;
|
2020-07-01 21:31:39 +03:00
|
|
|
bool anyCompleted = false;
|
2020-05-04 23:40:19 +03:00
|
|
|
for (size_t n = 0 ; n < flag.handler.arity; ++n) {
|
2017-08-29 15:28:57 +03:00
|
|
|
if (pos == end) {
|
2022-06-20 05:15:38 +03:00
|
|
|
if (flag.handler.arity == ArityAny || anyCompleted) break;
|
2023-01-17 02:13:31 +02:00
|
|
|
throw UsageError(
|
|
|
|
"flag '%s' requires %d argument(s), but only %d were given",
|
|
|
|
name, flag.handler.arity, n);
|
2017-08-29 15:28:57 +03:00
|
|
|
}
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
if (auto prefix = rootArgs.needsCompletion(*pos)) {
|
2022-02-18 14:24:39 +02:00
|
|
|
anyCompleted = true;
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
if (flag.completer) {
|
|
|
|
rootArgs.deferredCompletions.push_back({
|
|
|
|
.completer = flag.completer,
|
|
|
|
.n = n,
|
|
|
|
.prefix = *prefix,
|
|
|
|
});
|
|
|
|
}
|
2022-02-18 14:24:39 +02:00
|
|
|
}
|
2020-05-10 22:50:32 +03:00
|
|
|
args.push_back(*pos++);
|
2016-02-09 22:07:48 +02:00
|
|
|
}
|
2020-07-01 21:31:39 +03:00
|
|
|
if (!anyCompleted)
|
|
|
|
flag.handler.fun(std::move(args));
|
2016-02-09 22:07:48 +02:00
|
|
|
return true;
|
|
|
|
};
|
|
|
|
|
2022-02-25 17:00:00 +02:00
|
|
|
if (std::string(*pos, 0, 2) == "--") {
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
if (auto prefix = rootArgs.needsCompletion(*pos)) {
|
2020-05-10 21:32:21 +03:00
|
|
|
for (auto & [name, flag] : longFlags) {
|
|
|
|
if (!hiddenCategories.count(flag->category)
|
|
|
|
&& hasPrefix(name, std::string(*prefix, 2)))
|
2023-01-17 02:13:31 +02:00
|
|
|
{
|
|
|
|
if (auto & f = flag->experimentalFeature)
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
rootArgs.flagExperimentalFeatures.insert(*f);
|
|
|
|
rootArgs.completions->add("--" + name, flag->description);
|
2023-01-17 02:13:31 +02:00
|
|
|
}
|
2020-05-10 21:32:21 +03:00
|
|
|
}
|
2022-02-18 14:24:39 +02:00
|
|
|
return false;
|
2020-05-10 21:32:21 +03:00
|
|
|
}
|
2022-02-25 17:00:00 +02:00
|
|
|
auto i = longFlags.find(std::string(*pos, 2));
|
2016-02-09 22:07:48 +02:00
|
|
|
if (i == longFlags.end()) return false;
|
2017-06-07 19:41:20 +03:00
|
|
|
return process("--" + i->first, *i->second);
|
2016-02-09 22:07:48 +02:00
|
|
|
}
|
|
|
|
|
2022-02-25 17:00:00 +02:00
|
|
|
if (std::string(*pos, 0, 1) == "-" && pos->size() == 2) {
|
2016-02-09 22:07:48 +02:00
|
|
|
auto c = (*pos)[1];
|
|
|
|
auto i = shortFlags.find(c);
|
|
|
|
if (i == shortFlags.end()) return false;
|
2017-06-07 19:41:20 +03:00
|
|
|
return process(std::string("-") + c, *i->second);
|
2016-02-09 22:07:48 +02:00
|
|
|
}
|
|
|
|
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
if (auto prefix = rootArgs.needsCompletion(*pos)) {
|
2020-05-10 21:32:21 +03:00
|
|
|
if (prefix == "-") {
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
rootArgs.completions->add("--");
|
2020-10-09 10:39:51 +03:00
|
|
|
for (auto & [flagName, flag] : shortFlags)
|
2023-01-17 02:13:31 +02:00
|
|
|
if (experimentalFeatureSettings.isEnabled(flag->experimentalFeature))
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
rootArgs.completions->add(std::string("-") + flagName, flag->description);
|
2020-05-10 21:32:21 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-02-09 22:07:48 +02:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool Args::processArgs(const Strings & args, bool finish)
|
|
|
|
{
|
|
|
|
if (expectedArgs.empty()) {
|
|
|
|
if (!args.empty())
|
2020-04-22 02:07:07 +03:00
|
|
|
throw UsageError("unexpected argument '%1%'", args.front());
|
2016-02-09 22:07:48 +02:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
auto & rootArgs = getRoot();
|
|
|
|
|
2016-02-09 22:07:48 +02:00
|
|
|
auto & exp = expectedArgs.front();
|
|
|
|
|
|
|
|
bool res = false;
|
|
|
|
|
2020-05-11 16:46:18 +03:00
|
|
|
if ((exp.handler.arity == ArityAny && finish) ||
|
|
|
|
(exp.handler.arity != ArityAny && args.size() == exp.handler.arity))
|
2016-02-09 22:07:48 +02:00
|
|
|
{
|
2017-10-24 13:45:11 +03:00
|
|
|
std::vector<std::string> ss;
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
bool anyCompleted = false;
|
2020-05-11 16:46:18 +03:00
|
|
|
for (const auto &[n, s] : enumerate(args)) {
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
if (auto prefix = rootArgs.needsCompletion(s)) {
|
|
|
|
anyCompleted = true;
|
2022-02-18 14:24:39 +02:00
|
|
|
ss.push_back(*prefix);
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
if (exp.completer) {
|
|
|
|
rootArgs.deferredCompletions.push_back({
|
|
|
|
.completer = exp.completer,
|
|
|
|
.n = n,
|
|
|
|
.prefix = *prefix,
|
|
|
|
});
|
|
|
|
}
|
2022-02-18 14:24:39 +02:00
|
|
|
} else
|
|
|
|
ss.push_back(s);
|
2020-05-11 16:46:18 +03:00
|
|
|
}
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
if (!anyCompleted)
|
|
|
|
exp.handler.fun(ss);
|
2023-10-24 23:22:05 +03:00
|
|
|
|
2023-12-06 15:13:45 +02:00
|
|
|
/* Move the list element to the processedArgs. This is almost the same as
|
2023-10-24 23:22:05 +03:00
|
|
|
`processedArgs.push_back(expectedArgs.front()); expectedArgs.pop_front()`,
|
|
|
|
except that it will only adjust the next and prev pointers of the list
|
|
|
|
elements, meaning the actual contents don't move in memory. This is
|
|
|
|
critical to prevent invalidating internal pointers! */
|
|
|
|
processedArgs.splice(
|
|
|
|
processedArgs.end(),
|
|
|
|
expectedArgs,
|
|
|
|
expectedArgs.begin(),
|
|
|
|
++expectedArgs.begin());
|
|
|
|
|
2016-02-09 22:07:48 +02:00
|
|
|
res = true;
|
|
|
|
}
|
|
|
|
|
2017-07-14 14:44:45 +03:00
|
|
|
if (finish && !expectedArgs.empty() && !expectedArgs.front().optional)
|
2016-02-09 22:07:48 +02:00
|
|
|
throw UsageError("more arguments are required");
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2020-08-17 18:44:52 +03:00
|
|
|
nlohmann::json Args::toJSON()
|
|
|
|
{
|
|
|
|
auto flags = nlohmann::json::object();
|
|
|
|
|
|
|
|
for (auto & [name, flag] : longFlags) {
|
|
|
|
auto j = nlohmann::json::object();
|
2023-09-23 06:55:06 +03:00
|
|
|
j["hiddenCategory"] = hiddenCategories.count(flag->category) > 0;
|
2021-02-07 21:44:56 +02:00
|
|
|
if (flag->aliases.count(name)) continue;
|
2020-08-17 18:44:52 +03:00
|
|
|
if (flag->shortName)
|
|
|
|
j["shortName"] = std::string(1, flag->shortName);
|
|
|
|
if (flag->description != "")
|
2022-09-13 17:58:32 +03:00
|
|
|
j["description"] = trim(flag->description);
|
2021-01-25 20:03:13 +02:00
|
|
|
j["category"] = flag->category;
|
2020-08-17 18:44:52 +03:00
|
|
|
if (flag->handler.arity != ArityAny)
|
|
|
|
j["arity"] = flag->handler.arity;
|
|
|
|
if (!flag->labels.empty())
|
|
|
|
j["labels"] = flag->labels;
|
2023-06-16 22:19:14 +03:00
|
|
|
j["experimental-feature"] = flag->experimentalFeature;
|
2020-08-17 18:44:52 +03:00
|
|
|
flags[name] = std::move(j);
|
|
|
|
}
|
|
|
|
|
|
|
|
auto args = nlohmann::json::array();
|
|
|
|
|
|
|
|
for (auto & arg : expectedArgs) {
|
|
|
|
auto j = nlohmann::json::object();
|
|
|
|
j["label"] = arg.label;
|
|
|
|
j["optional"] = arg.optional;
|
|
|
|
if (arg.handler.arity != ArityAny)
|
|
|
|
j["arity"] = arg.handler.arity;
|
|
|
|
args.push_back(std::move(j));
|
|
|
|
}
|
|
|
|
|
|
|
|
auto res = nlohmann::json::object();
|
2022-09-13 17:58:32 +03:00
|
|
|
res["description"] = trim(description());
|
2020-08-17 18:44:52 +03:00
|
|
|
res["flags"] = std::move(flags);
|
|
|
|
res["args"] = std::move(args);
|
2020-12-07 14:04:24 +02:00
|
|
|
auto s = doc();
|
|
|
|
if (s != "") res.emplace("doc", stripIndentation(s));
|
2020-08-17 18:44:52 +03:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
static void _completePath(AddCompletions & completions, std::string_view prefix, bool onlyDirs)
|
2020-05-10 22:35:07 +03:00
|
|
|
{
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
completions.setType(Completions::Type::Filenames);
|
2020-05-11 16:46:18 +03:00
|
|
|
glob_t globbuf;
|
2022-02-19 15:26:34 +02:00
|
|
|
int flags = GLOB_NOESCAPE;
|
2020-05-12 12:08:59 +03:00
|
|
|
#ifdef GLOB_ONLYDIR
|
|
|
|
if (onlyDirs)
|
|
|
|
flags |= GLOB_ONLYDIR;
|
|
|
|
#endif
|
2022-02-19 15:26:34 +02:00
|
|
|
// using expandTilde here instead of GLOB_TILDE(_CHECK) so that ~<Tab> expands to /home/user/
|
|
|
|
if (glob((expandTilde(prefix) + "*").c_str(), flags, nullptr, &globbuf) == 0) {
|
2020-05-12 12:08:59 +03:00
|
|
|
for (size_t i = 0; i < globbuf.gl_pathc; ++i) {
|
|
|
|
if (onlyDirs) {
|
2022-02-18 14:26:40 +02:00
|
|
|
auto st = stat(globbuf.gl_pathv[i]);
|
2020-05-12 12:08:59 +03:00
|
|
|
if (!S_ISDIR(st.st_mode)) continue;
|
|
|
|
}
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
completions.add(globbuf.gl_pathv[i]);
|
2020-05-12 12:08:59 +03:00
|
|
|
}
|
2020-05-10 22:35:07 +03:00
|
|
|
}
|
2022-02-19 15:26:34 +02:00
|
|
|
globfree(&globbuf);
|
2020-05-10 22:35:07 +03:00
|
|
|
}
|
|
|
|
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
void Args::completePath(AddCompletions & completions, size_t, std::string_view prefix)
|
2020-05-11 23:04:13 +03:00
|
|
|
{
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
_completePath(completions, prefix, false);
|
2020-05-11 23:04:13 +03:00
|
|
|
}
|
|
|
|
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
void Args::completeDir(AddCompletions & completions, size_t, std::string_view prefix)
|
2020-05-11 23:04:13 +03:00
|
|
|
{
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
_completePath(completions, prefix, true);
|
2020-05-11 23:04:13 +03:00
|
|
|
}
|
|
|
|
|
2016-02-09 22:07:48 +02:00
|
|
|
Strings argvToStrings(int argc, char * * argv)
|
|
|
|
{
|
|
|
|
Strings args;
|
|
|
|
argc--; argv++;
|
|
|
|
while (argc--) args.push_back(*argv++);
|
|
|
|
return args;
|
|
|
|
}
|
|
|
|
|
2023-01-17 06:01:18 +02:00
|
|
|
std::optional<ExperimentalFeature> Command::experimentalFeature ()
|
|
|
|
{
|
|
|
|
return { Xp::NixCommand };
|
|
|
|
}
|
|
|
|
|
2023-12-06 15:13:45 +02:00
|
|
|
MultiCommand::MultiCommand(std::string_view commandName, const Commands & commands_)
|
2021-01-28 17:04:47 +02:00
|
|
|
: commands(commands_)
|
2023-12-06 15:13:45 +02:00
|
|
|
, commandName(commandName)
|
2018-11-22 17:03:31 +02:00
|
|
|
{
|
2020-05-11 16:46:18 +03:00
|
|
|
expectArgs({
|
2020-08-17 20:33:18 +03:00
|
|
|
.label = "subcommand",
|
2020-05-11 16:46:18 +03:00
|
|
|
.optional = true,
|
2022-10-22 16:25:35 +03:00
|
|
|
.handler = {[=,this](std::string s) {
|
2020-05-11 16:46:18 +03:00
|
|
|
assert(!command);
|
|
|
|
auto i = commands.find(s);
|
2022-03-03 11:50:35 +02:00
|
|
|
if (i == commands.end()) {
|
|
|
|
std::set<std::string> commandNames;
|
|
|
|
for (auto & [name, _] : commands)
|
|
|
|
commandNames.insert(name);
|
|
|
|
auto suggestions = Suggestions::bestMatches(commandNames, s);
|
|
|
|
throw UsageError(suggestions, "'%s' is not a recognised command", s);
|
|
|
|
}
|
2020-05-11 16:46:18 +03:00
|
|
|
command = {s, i->second()};
|
2021-09-13 15:41:28 +03:00
|
|
|
command->second->parent = this;
|
2022-02-18 14:24:39 +02:00
|
|
|
}},
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
.completer = {[&](AddCompletions & completions, size_t, std::string_view prefix) {
|
2022-02-18 14:24:39 +02:00
|
|
|
for (auto & [name, command] : commands)
|
|
|
|
if (hasPrefix(name, prefix))
|
Overhaul completions, redo #6693 (#8131)
As I complained in
https://github.com/NixOS/nix/pull/6784#issuecomment-1421777030 (a
comment on the wrong PR, sorry again!), #6693 introduced a second
completions mechanism to fix a bug. Having two completion mechanisms
isn't so nice.
As @thufschmitt also pointed out, it was a bummer to go from `FlakeRef`
to `std::string` when collecting flake refs. Now it is `FlakeRefs`
again.
The underlying issue that sought to work around was that completion of
arguments not at the end can still benefit from the information from
latter arguments.
To fix this better, we rip out that change and simply defer all
completion processing until after all the (regular, already-complete)
arguments have been passed.
In addition, I noticed the original completion logic used some global
variables. I do not like global variables, because even if they save
lines of code, they also obfuscate the architecture of the code.
I got rid of them moved them to a new `RootArgs` class, which now has
`parseCmdline` instead of `Args`. The idea is that we have many argument
parsers from subcommands and what-not, but only one root args that owns
the other per actual parsing invocation. The state that was global is
now part of the root args instead.
This did, admittedly, add a bunch of new code. And I do feel bad about
that. So I went and added a lot of API docs to try to at least make the
current state of things clear to the next person.
--
This is needed for RFC 134 (tracking issue #7868). It was very hard to
modularize `Installable` parsing when there were two completion
arguments. I wouldn't go as far as to say it is *easy* now, but at least
it is less hard (and the completions test finally passed).
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-10-23 16:03:11 +03:00
|
|
|
completions.add(name);
|
2020-05-11 16:46:18 +03:00
|
|
|
}}
|
|
|
|
});
|
2020-05-05 16:18:23 +03:00
|
|
|
|
|
|
|
categories[Command::catDefault] = "Available commands";
|
2018-11-22 17:03:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
bool MultiCommand::processFlag(Strings::iterator & pos, Strings::iterator end)
|
|
|
|
{
|
|
|
|
if (Args::processFlag(pos, end)) return true;
|
2020-05-05 16:18:23 +03:00
|
|
|
if (command && command->second->processFlag(pos, end)) return true;
|
2018-11-22 17:03:31 +02:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool MultiCommand::processArgs(const Strings & args, bool finish)
|
|
|
|
{
|
|
|
|
if (command)
|
2020-05-05 16:18:23 +03:00
|
|
|
return command->second->processArgs(args, finish);
|
2018-11-22 17:03:31 +02:00
|
|
|
else
|
|
|
|
return Args::processArgs(args, finish);
|
|
|
|
}
|
|
|
|
|
2020-08-17 18:44:52 +03:00
|
|
|
nlohmann::json MultiCommand::toJSON()
|
|
|
|
{
|
|
|
|
auto cmds = nlohmann::json::object();
|
|
|
|
|
|
|
|
for (auto & [name, commandFun] : commands) {
|
|
|
|
auto command = commandFun();
|
|
|
|
auto j = command->toJSON();
|
2021-01-25 19:19:32 +02:00
|
|
|
auto cat = nlohmann::json::object();
|
|
|
|
cat["id"] = command->category();
|
2022-09-13 17:58:32 +03:00
|
|
|
cat["description"] = trim(categories[command->category()]);
|
2023-06-16 22:19:14 +03:00
|
|
|
cat["experimental-feature"] = command->experimentalFeature();
|
2023-08-11 13:00:11 +03:00
|
|
|
j["category"] = std::move(cat);
|
2020-08-17 18:44:52 +03:00
|
|
|
cmds[name] = std::move(j);
|
|
|
|
}
|
|
|
|
|
|
|
|
auto res = Args::toJSON();
|
|
|
|
res["commands"] = std::move(cmds);
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2016-02-09 22:07:48 +02:00
|
|
|
}
|