Support tab-completion on attribute sets
Example: $ nix-repl '<nixos>' > config.services.xserver.desktop<TAB> comletes to > config.services.xserver.desktopManager You also get suggestions if there are multiple matches: > config.services.xserver.desktopManager.kde4 config.services.xserver.desktopManager.kde4.enable config.services.xserver.desktopManager.kde4.phononBackends
This commit is contained in:
parent
8e765b8876
commit
e133e91410
1 changed files with 34 additions and 5 deletions
29
nix-repl.cc
29
nix-repl.cc
|
@ -183,12 +183,41 @@ void NixRepl::completePrefix(string prefix)
|
||||||
{
|
{
|
||||||
completions.clear();
|
completions.clear();
|
||||||
|
|
||||||
|
size_t dot = prefix.rfind('.');
|
||||||
|
|
||||||
|
if (dot == string::npos) {
|
||||||
|
/* This is a variable name; look it up in the current scope. */
|
||||||
StringSet::iterator i = varNames.lower_bound(prefix);
|
StringSet::iterator i = varNames.lower_bound(prefix);
|
||||||
while (i != varNames.end()) {
|
while (i != varNames.end()) {
|
||||||
if (string(*i, 0, prefix.size()) != prefix) break;
|
if (string(*i, 0, prefix.size()) != prefix) break;
|
||||||
completions.insert(*i);
|
completions.insert(*i);
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
try {
|
||||||
|
/* This is an expression that should evaluate to an
|
||||||
|
attribute set. Evaluate it to get the names of the
|
||||||
|
attributes. */
|
||||||
|
string expr(prefix, 0, dot);
|
||||||
|
string prefix2 = string(prefix, dot + 1);
|
||||||
|
|
||||||
|
Expr * e = parseString(expr);
|
||||||
|
Value v;
|
||||||
|
e->eval(state, *env, v);
|
||||||
|
state.forceAttrs(v);
|
||||||
|
|
||||||
|
foreach (Bindings::iterator, i, *v.attrs) {
|
||||||
|
string name = i->name;
|
||||||
|
if (string(name, 0, prefix2.size()) != prefix2) continue;
|
||||||
|
completions.insert(expr + "." + name);
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (ParseError & e) {
|
||||||
|
// Quietly ignore parse errors.
|
||||||
|
}catch (EvalError & e) {
|
||||||
|
// Quietly ignore evaluation errors.
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue