puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Accept and discard fragments in getFlakeRefForCompletion

Browse source 
Otherwise trying to complete `nix build foo#bar --update-input <Tab>`
fails with "unexpected fragment"
This commit is contained in:
Naïm Favier 2022-02-18 13:19:57 +01:00
parent c28e2b1b29
commit 7f5cf87d56
No known key found for this signature in database
GPG key ID: 49B07322580B7EE2
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libcmd/command.hh
View file

@ -134,7 +134,7 @@ struct InstallableCommand : virtual Args, SourceExprCommand
std::optional<FlakeRef> getFlakeRefForCompletion() override std::optional<FlakeRef> getFlakeRefForCompletion() override
{ {
return parseFlakeRef(_installable, absPath(".")); return parseFlakeRefWithFragment(_installable, absPath(".")).first;
} }
private: private:

4
src/libcmd/installables.cc
View file

@ -905,10 +905,10 @@ std::optional<FlakeRef> InstallablesCommand::getFlakeRefForCompletion()
{ {
if (_installables.empty()) { if (_installables.empty()) {
if (useDefaultInstallables()) if (useDefaultInstallables())
return parseFlakeRef(".", absPath(".")); return parseFlakeRefWithFragment(".", absPath(".")).first;
return {}; return {};
} }
return parseFlakeRef(_installables.front(), absPath(".")); return parseFlakeRefWithFragment(_installables.front(), absPath(".")).first;
} }
InstallableCommand::InstallableCommand() InstallableCommand::InstallableCommand()