Merge pull request #14 from clue-labs/redraw-echo

Do not redraw() readline if echo replacement results in same line
clue · May 17, 2015 · 6ddec4c · 6ddec4c
2 parents 60dfbf0 + a9bd82d
commit 6ddec4c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/Readline.php b/src/Readline.php
@@ -203,11 +203,15 @@ public function setInput($input)
             return $this;
         }
 
+        // remember old input length if echo replacement is used
+        $oldlen = (is_string($this->echo)) ? $this->strlen($this->linebuffer) : null;
+
         $this->linebuffer = $input;
         $this->linepos = $this->strlen($this->linebuffer);
 
         // only redraw if input should be echo'ed (i.e. is not hidden anyway)
-        if ($this->echo !== false) {
+        // and echo replacement is used, make sure the input length changes
+        if ($this->echo !== false && $this->linepos !== $oldlen) {
             $this->redraw();
         }
 

diff --git a/tests/ReadlineTest.php b/tests/ReadlineTest.php
@@ -124,6 +124,16 @@ public function testSettingInputWithEchoAsteriskDoesRedraw()
         $this->assertSame($this->readline, $this->readline->setInput('test'));
     }
 
+    public function testSettingInputWithSameLengthWithEchoAsteriskDoesNotNeedToRedraw()
+    {
+        $this->readline->setInput('test');
+        $this->readline->setEcho('*');
+
+        $this->output->expects($this->never())->method('write');
+
+        $this->assertSame($this->readline, $this->readline->setInput('demo'));
+    }
+
     public function testSettingInputWithoutEchoDoesNotNeedToRedraw()
     {
         $this->readline->setEcho(false);