Merge pull request #597 from jolicode/tweak-path-completions

Tweak path directory suggestions to include a leading dir separator
jolicode · Dec 30, 2024 · 3dbf4cf · 3dbf4cf
2 parents 902c05d + 91bf094
commit 3dbf4cf
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 22 deletions.
diff --git a/src/Console/Command/TaskCommand.php b/src/Console/Command/TaskCommand.php
@@ -330,7 +330,7 @@ private function getPathSuggestions(string $path, string $baseValue): array
         }
 
         return array_map(
-            fn (string $item) => $baseValue . $item,
+            fn (string $item) => $baseValue . $item . (is_dir($baseValue . $item) ? DIRECTORY_SEPARATOR : ''),
             array_filter(
                 $items,
                 fn (string $suggestion) => '.' !== $suggestion && '..' !== $suggestion,

diff --git a/tests/AutocompleteTest.php b/tests/AutocompleteTest.php
@@ -91,33 +91,33 @@ public function providePathCompletionTests(): \Generator
         $fs->mkdir($tmpDir . '/bar');
         $fs->touch($tmpDir . '/foo/baz.txt');
 
-        yield [task_with_path_argument(...), [''], ['bin', 'doc', 'src', 'tools']];
-        yield [task_with_path_argument(...), ['.'], ['bin', 'doc', 'src', 'tools']];
-        yield [task_with_path_argument(...), ['./'], ['./bin', './doc', './src', './tools']];
-        yield [task_with_path_argument(...), ['b'], ['bin', 'doc', 'src', 'tools']];
+        yield [task_with_path_argument(...), [''], ['bin/', 'doc/', 'src/', 'tools/']];
+        yield [task_with_path_argument(...), ['.'], ['bin/', 'doc/', 'src/', 'tools/']];
+        yield [task_with_path_argument(...), ['./'], ['./bin/', './doc/', './src/', './tools/']];
+        yield [task_with_path_argument(...), ['b'], ['bin/', 'doc/', 'src/', 'tools/']];
         yield [task_with_path_argument(...), ['bin'], ['bin/castor']];
         yield [task_with_path_argument(...), ['bin/'], ['bin/castor']];
         yield [task_with_path_argument(...), ['yolooooooooo'], []];
         yield [task_with_path_argument(...), ['yolooooooooo/'], []];
-        yield [task_with_path_argument(...), [$tmpDir], [$tmpDir . '/bar', $tmpDir . '/foo'], true];
-        yield [task_with_path_argument(...), [$tmpDir . '/'], [$tmpDir . '/bar', $tmpDir . '/foo'], true];
-        yield [task_with_path_argument(...), [$tmpDir . '/.'], [$tmpDir . '/bar', $tmpDir . '/foo'], true];
-        yield [task_with_path_argument(...), [$tmpDir . '/./'], [$tmpDir . '/./bar', $tmpDir . '/./foo'], true];
-        yield [task_with_path_argument(...), [$tmpDir . '/f'], [$tmpDir . '/bar', $tmpDir . '/foo'], true];
-
-        yield [task_with_path_option(...), ['--option'], ['bin', 'doc', 'src', 'tools']];
-        yield [task_with_path_option(...), ['--option', '.'], ['bin', 'doc', 'src', 'tools']];
-        yield [task_with_path_option(...), ['--option', './'], ['./bin', './doc', './src', './tools']];
-        yield [task_with_path_option(...), ['--option', 'b'], ['bin', 'doc', 'src', 'tools']];
+        yield [task_with_path_argument(...), [$tmpDir], [$tmpDir . '/bar/', $tmpDir . '/foo/'], true];
+        yield [task_with_path_argument(...), [$tmpDir . '/'], [$tmpDir . '/bar/', $tmpDir . '/foo/'], true];
+        yield [task_with_path_argument(...), [$tmpDir . '/.'], [$tmpDir . '/bar/', $tmpDir . '/foo/'], true];
+        yield [task_with_path_argument(...), [$tmpDir . '/./'], [$tmpDir . '/./bar/', $tmpDir . '/./foo/'], true];
+        yield [task_with_path_argument(...), [$tmpDir . '/f'], [$tmpDir . '/bar/', $tmpDir . '/foo/'], true];
+
+        yield [task_with_path_option(...), ['--option'], ['bin/', 'doc/', 'src/', 'tools/']];
+        yield [task_with_path_option(...), ['--option', '.'], ['bin/', 'doc/', 'src/', 'tools/']];
+        yield [task_with_path_option(...), ['--option', './'], ['./bin/', './doc/', './src/', './tools/']];
+        yield [task_with_path_option(...), ['--option', 'b'], ['bin/', 'doc/', 'src/', 'tools/']];
         yield [task_with_path_option(...), ['--option', 'bin'], ['bin/castor']];
         yield [task_with_path_option(...), ['--option', 'bin/'], ['bin/castor']];
         yield [task_with_path_option(...), ['--option', 'yolooooooooo'], []];
         yield [task_with_path_option(...), ['--option', 'yolooooooooo/'], []];
-        yield [task_with_path_option(...), ['--option', $tmpDir], [$tmpDir . '/bar', $tmpDir . '/foo'], true];
-        yield [task_with_path_option(...), ['--option', $tmpDir . '/'], [$tmpDir . '/bar', $tmpDir . '/foo'], true];
-        yield [task_with_path_option(...), ['--option', $tmpDir . '/.'], [$tmpDir . '/bar', $tmpDir . '/foo'], true];
-        yield [task_with_path_option(...), ['--option', $tmpDir . '/./'], [$tmpDir . '/./bar', $tmpDir . '/./foo'], true];
-        yield [task_with_path_option(...), ['--option', $tmpDir . '/f'], [$tmpDir . '/bar', $tmpDir . '/foo'], true];
+        yield [task_with_path_option(...), ['--option', $tmpDir], [$tmpDir . '/bar/', $tmpDir . '/foo/'], true];
+        yield [task_with_path_option(...), ['--option', $tmpDir . '/'], [$tmpDir . '/bar/', $tmpDir . '/foo/'], true];
+        yield [task_with_path_option(...), ['--option', $tmpDir . '/.'], [$tmpDir . '/bar/', $tmpDir . '/foo/'], true];
+        yield [task_with_path_option(...), ['--option', $tmpDir . '/./'], [$tmpDir . '/./bar/', $tmpDir . '/./foo/'], true];
+        yield [task_with_path_option(...), ['--option', $tmpDir . '/f'], [$tmpDir . '/bar/', $tmpDir . '/foo/'], true];
     }
 }
 

diff --git a/tests/Generated/ArgsAutocompletePathTest.php b/tests/Generated/ArgsAutocompletePathTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Castor\Tests\Generated;
+
+use Castor\Tests\TaskTestCase;
+use Symfony\Component\Process\Exception\ProcessFailedException;
+
+class ArgsAutocompletePathTest extends TaskTestCase
+{
+    // args:autocomplete-path
+    public function test(): void
+    {
+        $process = $this->runTask(['args:autocomplete-path', 'FIXME(argument)']);
+
+        if (0 !== $process->getExitCode()) {
+            throw new ProcessFailedException($process);
+        }
+
+        $this->assertStringEqualsFile(__FILE__ . '.output.txt', $process->getOutput());
+        $this->assertSame('', $process->getErrorOutput());
+    }
+}
diff --git a/tests/Generated/ArgsAutocompletePathTest.php.output.txt b/tests/Generated/ArgsAutocompletePathTest.php.output.txt
@@ -0,0 +1,4 @@
+array(1) {
+  [0]=>
+  string(15) "FIXME(argument)"
+}
diff --git a/tests/Generated/SshDownloadTest.php.output.txt b/tests/Generated/SshDownloadTest.php.output.txt
@@ -1,6 +1,6 @@
 In ssh.php line XXXX:
 
- [ERROR] The following process did not finish successfully (exit code 1):
+ [ERROR] The following process did not finish successfully (exit code 255):
 
 scp -r [email protected]:/tmp/test.html /var/www/index.html
 
diff --git a/tests/Generated/SshUploadTest.php.output.txt b/tests/Generated/SshUploadTest.php.output.txt
@@ -1,6 +1,6 @@
 In ssh.php line XXXX:
 
- [ERROR] The following process did not finish successfully (exit code 1):
+ [ERROR] The following process did not finish successfully (exit code 255):
 
 scp -r .../examples/ssh.php [email protected]:/var/www/index.html