[Console] Fix autocompletion of argument with default value

GromNaN · GromNaN · commit f5746f1afa54 · 2021-12-20T17:11:12.000+01:00
diff --git a/src/Symfony/Component/Console/Completion/CompletionInput.php b/src/Symfony/Component/Console/Completion/CompletionInput.php
@@ -109,12 +109,12 @@ public function bind(InputDefinition $definition): void
         // complete argument value
         $this->completionType = self::TYPE_ARGUMENT_VALUE;
 
-        $arguments = $this->getArguments();
-        foreach ($arguments as $argumentName => $argumentValue) {
-            if (null === $argumentValue) {
+        foreach ($this->definition->getArguments() as $argumentName => $argument) {
+            if (!isset($this->arguments[$argumentName])) {
                 break;
             }
 
+            $argumentValue = $this->arguments[$argumentName];
             $this->completionName = $argumentName;
             if (\is_array($argumentValue)) {
                 $this->completionValue = $argumentValue ? $argumentValue[array_key_last($argumentValue)] : null;
@@ -124,7 +124,7 @@ public function bind(InputDefinition $definition): void
         }
 
         if ($this->currentIndex >= \count($this->tokens)) {
-            if (null === $arguments[$argumentName] || $this->definition->getArgument($argumentName)->isArray()) {
+            if (!isset($this->arguments[$argumentName]) || $this->definition->getArgument($argumentName)->isArray()) {
                 $this->completionName = $argumentName;
                 $this->completionValue = '';
             } else {
diff --git a/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php b/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php
@@ -92,7 +92,7 @@ public function provideCompletionSuggestions()
 
         yield 'nothing' => [
             [''],
-            [],
+            ['completion', 'help', 'list', 'foo:bar'],
         ];
 
         yield 'command_name' => [
diff --git a/src/Symfony/Component/Console/Tests/Completion/CompletionInputTest.php b/src/Symfony/Component/Console/Tests/Completion/CompletionInputTest.php
@@ -97,6 +97,20 @@ public function provideBindWithLastArrayArgumentData()
         yield [CompletionInput::fromTokens(['bin/console', 'symfony', 'sen'], 2), 'sen'];
     }
 
+    public function testBindArgumentWithDefault()
+    {
+        $definition = new InputDefinition([
+            new InputArgument('arg-with-default', InputArgument::OPTIONAL, '', 'default'),
+        ]);
+
+        $input = CompletionInput::fromTokens(['bin/console'], 1);
+        $input->bind($definition);
+
+        $this->assertEquals(CompletionInput::TYPE_ARGUMENT_VALUE, $input->getCompletionType(), 'Unexpected type');
+        $this->assertEquals('arg-with-default', $input->getCompletionName(), 'Unexpected name');
+        $this->assertEquals('', $input->getCompletionValue(), 'Unexpected value');
+    }
+
     /**
      * @dataProvider provideFromStringData
      */
