proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-08-03 22:56:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CLIHandler: consider valid prefixes for completion

Browse Source 
With the change introduced in 57c0d0c69c
completion of partial commands stopped working (e.g. typing qm res<TAB><TAB>
yields nothing instead of 'reset resize resume rescan')

By returning undef as 'ref' 'print_bash_completion' has no reference of the
available (sub) commands anymore.

By checking if the current argument is a valid prefix of a possible command,
and conditionally not setting the 'ref' hash to undef, the functionality is
restored.

Additionally a small whitespace glitch was fixed.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
This commit is contained in:
Stoiko Ivanov 2019-07-30 14:42:12 +02:00 committed by Thomas Lamprecht
parent 93e9f666ab
commit 6bd0783c11
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/PVE/CLIHandler.pm
View File

@ -108,13 +108,15 @@ my $abort = sub {
};
my $expand_command_name = sub {
my ($def, $cmd) = @_;
my ($def, $cmd, $enforce_exact) = @_;
return $cmd if exists $def->{$cmd}; # command is already complete
my $is_alias = sub { ref($_[0]) eq 'HASH' && exists($_[0]->{alias}) };
my @expanded = grep { /^\Q$cmd\E/ && !$is_alias->($def->{$_}) } keys %$def;
return @expanded if !$enforce_exact;
return $expanded[0] if scalar(@expanded) == 1; # enforce exact match
return undef;
@ -143,18 +145,23 @@ sub resolve_cmd {
my $last_arg_id = scalar(@$argv) - 1;
for my $i (0..$last_arg_id) {
$cmd = $expand_command_name->($def, $argv->[$i]);
$cmd = $expand_command_name->($def, $argv->[$i], 1);
if (defined($cmd)) {
# If the argument was expanded (or was already complete) and it
# is the final argument, tell our caller about it:
$expanded_last_arg = $cmd if $i == $last_arg_id;
} else {
# Otherwise continue with the unexpanded version of it.
$cmd = $argv->[$i];
$cmd = $argv->[$i];
}
$cmdstr .= " $cmd";
if (!defined($def->{$cmd})) {
# $cmd still could be a valid prefix for bash_completion
# in that case keep $def as it is, else set it to undef
$def = undef if !$expand_command_name->($def, $cmd);
last;
}
$def = $def->{$cmd};
last if !defined($def);
if (ref($def) eq 'ARRAY') {
# could expand to a real command, rest of $argv are its arguments