Use cursor class in QuestionHelper

pierredup · pierredup · commit 6ff23957114b · 2019-12-10T15:41:36.000+02:00
diff --git a/src/Symfony/Component/Console/Cursor.php b/src/Symfony/Component/Console/Cursor.php
@@ -57,12 +57,12 @@ public function moveToPosition(int $column, int $row)
 
     public function savePosition()
     {
-        $this->output->write("\x1b[s");
+        $this->output->write("\x1b7");
     }
 
     public function restorePosition()
     {
-        $this->output->write("\x1b[u");
+        $this->output->write("\x1b8");
     }
 
     public function hide()
@@ -76,11 +76,15 @@ public function show()
     }
 
     /**
-     * Clears all the output from the of the current line.
+     * Clears all the output from the current line.
      */
-    public function clearLine()
+    public function clearLine(bool $fromCurrentPosition = false)
     {
-        $this->output->write("\x1b[2K");
+        if (true === $fromCurrentPosition) {
+            $this->output->write("\x1b[K");
+        } else {
+            $this->output->write("\x1b[2K");
+        }
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Console\Helper;
 
+use Symfony\Component\Console\Cursor;
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
@@ -203,6 +204,8 @@ protected function writeError(OutputInterface $output, \Exception $error)
      */
     private function autocomplete(OutputInterface $output, Question $question, $inputStream, callable $autocomplete): string
     {
+        $cursor = new Cursor($output);
+
         $fullChoice = '';
         $ret = '';
 
@@ -232,7 +235,7 @@ private function autocomplete(OutputInterface $output, Question $question, $inpu
                     --$i;
                     $fullChoice = self::substr($fullChoice, 0, $i);
                     // Move cursor backwards
-                    $output->write("\033[1D");
+                    $cursor->moveLeft();
                 }
 
                 if (0 === $i) {
@@ -319,16 +322,16 @@ function ($match) use ($ret) {
             }
 
             // Erase characters from cursor to end of line
-            $output->write("\033[K");
+            $cursor->clearLine(true);
 
             if ($numMatches > 0 && -1 !== $ofs) {
                 // Save cursor position
-                $output->write("\0337");
+                $cursor->savePosition();
                 // Write highlighted text, complete the partially entered response
                 $charactersEntered = \strlen(trim($this->mostRecentlyEnteredValue($fullChoice)));
                 $output->write('<hl>'.OutputFormatter::escapeTrailingBackslash(substr($matches[$ofs], $charactersEntered)).'</hl>');
                 // Restore cursor position
-                $output->write("\0338");
+                $cursor->restorePosition();
             }
         }
 
diff --git a/src/Symfony/Component/Console/Tests/CursorTest.php b/src/Symfony/Component/Console/Tests/CursorTest.php
@@ -19,12 +19,12 @@ class CursorTest extends TestCase
 {
     protected $stream;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->stream = fopen('php://memory', 'r+');
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         fclose($this->stream);
         $this->stream = null;
@@ -135,7 +135,7 @@ public function testSavePosition()
 
         $cursor->savePosition();
 
-        $this->assertEquals("\x1b[s", $this->getOutputContent($output));
+        $this->assertEquals("\x1b7", $this->getOutputContent($output));
     }
 
     public function testHide()
@@ -162,7 +162,7 @@ public function testRestorePosition()
 
         $cursor->restorePosition();
 
-        $this->assertEquals("\x1b[u", $this->getOutputContent($output));
+        $this->assertEquals("\x1b8", $this->getOutputContent($output));
     }
 
     public function testClearOutput()

Original file line number	Diff line number	Diff line change
`@@ -57,12 +57,12 @@ public function moveToPosition(int $column, int $row)`
`57`	`57`
`58`	`58`	`public function savePosition()`
`59`	`59`	`{`
`60`		`- $this->output->write("\x1b[s");`
	`60`	`+ $this->output->write("\x1b7");`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`public function restorePosition()`
`64`	`64`	`{`
`65`		`- $this->output->write("\x1b[u");`
	`65`	`+ $this->output->write("\x1b8");`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public function hide()`
`@@ -76,11 +76,15 @@ public function show()`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`/**`
`79`		`- * Clears all the output from the of the current line.`
	`79`	`+ * Clears all the output from the current line.`
`80`	`80`	`*/`
`81`		`- public function clearLine()`
	`81`	`+ public function clearLine(bool $fromCurrentPosition = false)`
`82`	`82`	`{`
`83`		`- $this->output->write("\x1b[2K");`
	`83`	`+ if (true === $fromCurrentPosition) {`
	`84`	`+ $this->output->write("\x1b[K");`
	`85`	`+ } else {`
	`86`	`+ $this->output->write("\x1b[2K");`
	`87`	`+ }`
`84`	`88`	`}`
`85`	`89`
`86`	`90`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,12 @@ class CursorTest extends TestCase`
`19`	`19`	`{`
`20`	`20`	`protected $stream;`
`21`	`21`
`22`		`- protected function setUp()`
	`22`	`+ protected function setUp(): void`
`23`	`23`	`{`
`24`	`24`	`$this->stream = fopen('php://memory', 'r+');`
`25`	`25`	`}`
`26`	`26`
`27`		`- protected function tearDown()`
	`27`	`+ protected function tearDown(): void`
`28`	`28`	`{`
`29`	`29`	`fclose($this->stream);`
`30`	`30`	`$this->stream = null;`
`@@ -135,7 +135,7 @@ public function testSavePosition()`
`135`	`135`
`136`	`136`	`$cursor->savePosition();`
`137`	`137`
`138`		`- $this->assertEquals("\x1b[s", $this->getOutputContent($output));`
	`138`	`+ $this->assertEquals("\x1b7", $this->getOutputContent($output));`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`public function testHide()`
`@@ -162,7 +162,7 @@ public function testRestorePosition()`
`162`	`162`
`163`	`163`	`$cursor->restorePosition();`
`164`	`164`
`165`		`- $this->assertEquals("\x1b[u", $this->getOutputContent($output));`
	`165`	`+ $this->assertEquals("\x1b8", $this->getOutputContent($output));`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`public function testClearOutput()`