only suggest domain when locale is already typed

stephenkhoo · stephenkhoo · commit 6e3598beee06 · 2021-10-24T22:12:51.000+08:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
@@ -332,9 +332,7 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
             return;
         }
 
-        if ($input->mustSuggestOptionValuesFor('domain')) {
-            $locale = $input->getArgument('locale');
-
+        if ($input->mustSuggestOptionValuesFor('domain') && $locale = $input->getArgument('locale')) {
             $extractedCatalogue = $this->extractMessages($locale, $this->getRootCodePaths($kernel), $input->getOption('prefix'));
 
             $currentCatalogue = $this->loadCurrentMessages($locale, $this->getRootTransPaths());
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandCompletionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandCompletionTest.php
@@ -45,7 +45,8 @@ public function testComplete(array $input, array $expectedSuggestions)
     public function provideCompletionSuggestions()
     {
         yield 'bundle' => [['en', ''], ['BaseBundle']];
-        yield 'domain' => [['en', '--domain=m'], ['messages']];
+        yield 'domain with locale' => [['en', '--domain=m'], ['messages']];
+        yield 'domain without locale' => [['--domain=m'], []];
         yield 'format' => [['en', '--format='], ['php', 'xlf', 'po', 'mo', 'yml', 'yaml', 'ts', 'csv', 'ini', 'json', 'res', 'xlf12', 'xlf20']];
         yield 'sort' => [['en', '--sort='], ['asc', 'desc']];
     }

Original file line number	Diff line number	Diff line change
`@@ -332,9 +332,7 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti`
`332`	`332`	`return;`
`333`	`333`	`}`
`334`	`334`
`335`		`- if ($input->mustSuggestOptionValuesFor('domain')) {`
`336`		`- $locale = $input->getArgument('locale');`
`337`		`-`
	`335`	`+ if ($input->mustSuggestOptionValuesFor('domain') && $locale = $input->getArgument('locale')) {`
`338`	`336`	`$extractedCatalogue = $this->extractMessages($locale, $this->getRootCodePaths($kernel), $input->getOption('prefix'));`
`339`	`337`
`340`	`338`	`$currentCatalogue = $this->loadCurrentMessages($locale, $this->getRootTransPaths());`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@ public function testComplete(array $input, array $expectedSuggestions)`
`45`	`45`	`public function provideCompletionSuggestions()`
`46`	`46`	`{`
`47`	`47`	`yield 'bundle' => [['en', ''], ['BaseBundle']];`
`48`		`- yield 'domain' => [['en', '--domain=m'], ['messages']];`
	`48`	`+ yield 'domain with locale' => [['en', '--domain=m'], ['messages']];`
	`49`	`+ yield 'domain without locale' => [['--domain=m'], []];`
`49`	`50`	`yield 'format' => [['en', '--format='], ['php', 'xlf', 'po', 'mo', 'yml', 'yaml', 'ts', 'csv', 'ini', 'json', 'res', 'xlf12', 'xlf20']];`
`50`	`51`	`yield 'sort' => [['en', '--sort='], ['asc', 'desc']];`
`51`	`52`	`}`