[Console] Don't go past exact matches when autocompleting

nicolas-grekas · nicolas-grekas · commit e18fcbc4bbe3 · 2018-04-09T12:12:41.000-05:00
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -284,7 +284,7 @@ private function autocomplete(OutputInterface $output, Question $question, $inpu
 
                 foreach ($autocomplete as $value) {
                     // If typed characters match the beginning chunk of value (e.g. [AcmeDe]moBundle)
-                    if (0 === strpos($value, $ret) && $i !== strlen($value)) {
+                    if (0 === strpos($value, $ret)) {
                         $matches[$numMatches++] = $value;
                     }
                 }
diff --git a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
@@ -160,6 +160,31 @@ public function testAskWithAutocompleteWithNonSequentialKeys()
         $this->assertEquals('AsseticBundle', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
     }
 
+    public function testAskWithAutocompleteWithExactMatch()
+    {
+        if (!$this->hasSttyAvailable()) {
+            $this->markTestSkipped('`stty` is required to test autocomplete functionality');
+        }
+
+        // <UP ARROW><UP ARROW><NEWLINE><DOWN ARROW><DOWN ARROW><NEWLINE>
+        $inputStream = $this->getInputStream("b\n");
+
+        $possibleChoices = array(
+            'a' => 'berlin',
+            'b' => 'copenhagen',
+            'c' => 'amsterdam',
+        );
+
+        $dialog = new QuestionHelper();
+        $dialog->setInputStream($inputStream);
+        $dialog->setHelperSet(new HelperSet(array(new FormatterHelper())));
+
+        $question = new ChoiceQuestion('Please select a city', $possibleChoices);
+        $question->setMaxAttempts(1);
+
+        $this->assertEquals('b', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
+    }
+
     public function testAutocompleteWithTrailingBackslash()
     {
         if (!$this->hasSttyAvailable()) {

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ private function autocomplete(OutputInterface $output, Question $question, $inpu`
`284`	`284`
`285`	`285`	`foreach ($autocomplete as $value) {`
`286`	`286`	`// If typed characters match the beginning chunk of value (e.g. [AcmeDe]moBundle)`
`287`		`- if (0 === strpos($value, $ret) && $i !== strlen($value)) {`
	`287`	`+ if (0 === strpos($value, $ret)) {`
`288`	`288`	`$matches[$numMatches++] = $value;`
`289`	`289`	`}`
`290`	`290`	`}`