Avoid unneeded control codes to overwrite input prompt

Author: clue

src/Readline.php

@@ -427,16 +427,21 @@ public function setAutocomplete($autocomplete)
      */
     public function redraw()
     {
-        $this->output->write($this->__toString());
+        // Erase characters from cursor to end of line and then redraw actual input
+        $this->output->write("\r\033[K" . $this->getDrawString());
 
         return $this;
     }
 
-    /** @internal */
-    public function __toString()
+    /**
+     * Returns the string that is used to draw the input prompt
+     *
+     * @return string
+     * @internal
+     */
+    public function getDrawString()
     {
-        // Erase characters from cursor to end of line
-        $output = "\r\033[K" . $this->prompt;
+        $output = $this->prompt;
         if ($this->echo !== false) {
             if ($this->echo === true) {
                 $buffer = $this->linebuffer;

src/Stdio.php

@@ -148,7 +148,7 @@ public function write($data)
 
         if ($restoreReadline) {
             // write output and restore original readline prompt and line buffer
-            return $this->output->write($out . $this->readline->__toString());
+            return $this->output->write($out . $this->readline->getDrawString());
         } else {
             // restore original cursor position in readline prompt
             $pos = $this->width($this->readline->getPrompt()) + $this->readline->getCursorCell();

tests/StdioTest.php

@@ -72,7 +72,7 @@ public function testWriteWillClearReadlineWriteOutputAndRestoreReadline()
 
         $stdio->write('test');
 
-        $this->assertEquals("\r\033[K" . "test\n" . "\r\033[K" . "> input", $buffer);
+        $this->assertEquals("\r\033[K" . "test\n" . "> input", $buffer);
     }
 
     public function testWriteAgainWillMoveToPreviousLineWriteOutputAndRestoreReadlinePosition()
@@ -144,7 +144,7 @@ public function testWriteAgainWithNewlinesWillClearReadlineMoveToPreviousLineWri
 
         $stdio->write("ond" . "\n" . "third");
 
-        $this->assertEquals("\r\033[K" . "\033[A" . "\r\033[3C" . "ond\nthird\n" . "\r\033[K" . "> input", $buffer);
+        $this->assertEquals("\r\033[K" . "\033[A" . "\r\033[3C" . "ond\nthird\n" . "> input", $buffer);
     }
 
     public function testWriteAfterReadlineInputWillClearReadlineWriteOutputAndRestoreReadline()
@@ -170,7 +170,7 @@ public function testWriteAfterReadlineInputWillClearReadlineWriteOutputAndRestor
 
         $stdio->writeln('test');
 
-        $this->assertEquals("\r\033[K" . "test\n" . "\r\033[K" . "> input", $buffer);
+        $this->assertEquals("\r\033[K" . "test\n" . "> input", $buffer);
     }
 
     public function testOverwriteWillClearReadlineMoveToPreviousLineWriteOutputAndRestoreReadline()
@@ -194,7 +194,7 @@ public function testOverwriteWillClearReadlineMoveToPreviousLineWriteOutputAndRe
 
         $stdio->overwrite('overwrite');
 
-        $this->assertEquals("\r\033[K" . "\033[A" . "\r\033[K" . "overwrite\n" . "\r\033[K" . "> input", $buffer);
+        $this->assertEquals("\r\033[K" . "\033[A" . "\r\033[K" . "overwrite\n" . "> input", $buffer);
     }
 
     public function testOverwriteAfterNewlineWillClearReadlineAndWriteOutputAndRestoreReadline()
@@ -218,7 +218,7 @@ public function testOverwriteAfterNewlineWillClearReadlineAndWriteOutputAndResto
 
         $stdio->overwrite('overwrite');
 
-        $this->assertEquals("\r\033[K" . "overwrite\n" . "\r\033[K" . "> input", $buffer);
+        $this->assertEquals("\r\033[K" . "overwrite\n" . "> input", $buffer);
     }
 
     public function testWriteLineWillClearReadlineWriteOutputAndRestoreReadline()
@@ -240,7 +240,7 @@ public function testWriteLineWillClearReadlineWriteOutputAndRestoreReadline()
 
         $stdio->writeln('test');
 
-        $this->assertEquals("\r\033[K" . "test\n" . "\r\033[K" . "> input", $buffer);
+        $this->assertEquals("\r\033[K" . "test\n" . "> input", $buffer);
     }
 
     public function testWriteTwoLinesWillClearReadlineWriteOutputAndRestoreReadline()
@@ -263,7 +263,7 @@ public function testWriteTwoLinesWillClearReadlineWriteOutputAndRestoreReadline(
         $stdio->writeln('hello');
         $stdio->writeln('world');
 
-        $this->assertEquals("\r\033[K" . "hello\n" . "\r\033[K" . "> input" . "\r\033[K" . "world\n" . "\r\033[K" . "> input", $buffer);
+        $this->assertEquals("\r\033[K" . "hello\n" . "> input" . "\r\033[K" . "world\n" . "> input", $buffer);
     }
 
     public function testPauseWillBeForwardedToInput()