Page MenuHomePhabricator
Files F13242880

D9268.diff
No OneTemporary
Actions

D9268.diff
View Options

diff --git a/src/workflow/ArcanistShellCompleteWorkflow.php b/src/workflow/ArcanistShellCompleteWorkflow.php
--- a/src/workflow/ArcanistShellCompleteWorkflow.php
+++ b/src/workflow/ArcanistShellCompleteWorkflow.php
@@ -30,8 +30,9 @@
public function getArguments() {
return array(
'current' => array(
- 'help' => 'Current term in the argument list being completed.',
'param' => 'cursor_position',
+ 'paramtype' => 'int',
+ 'help' => 'Current term in the argument list being completed.',
),
'*' => 'argv',
);
@@ -42,7 +43,6 @@
}
public function run() {
-
$pos = $this->getArgument('current');
$argv = $this->getArgument('argv', array());
$argc = count($argv);
@@ -50,6 +50,11 @@
$pos = $argc - 1;
}
+ if ($pos > $argc) {
+ throw new ArcanistUsageException(
+ 'Specified position is greater than the number of arguments provided.');
+ }
+
// Determine which revision control system the working copy uses, so we
// can filter out commands and flags which aren't supported. If we can't
// figure it out, just return all flags/commands.
@@ -70,7 +75,7 @@
$arc_config = $this->getArcanistConfiguration();
- if ($pos == 1) {
+ if ($pos <= 1) {
$workflows = $arc_config->buildAllWorkflows();
$complete = array();
@@ -81,8 +86,7 @@
$supported = $workflow->getSupportedRevisionControlSystems();
- $ok = (in_array('any', $supported)) ||
- (in_array($vcs, $supported));
+ $ok = (in_array('any', $supported) || in_array($vcs, $supported));
if (!$ok) {
continue;
}
@@ -146,7 +150,6 @@
}
return 0;
} else {
-
$output = array();
foreach ($arguments as $argument => $spec) {
if ($argument == '*') {
@@ -181,7 +184,7 @@
$branches = ipull($branches, 'name');
$output = $branches;
} else {
- $output = array("FILE");
+ $output = array('FILE');
}
}

File Metadata

Mime Type
text/plain
Expires
Fri, May 24, 3:10 AM (3 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6284263
Default Alt Text
D9268.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility