Support restoring current user input when cycling history

Author: clue

src/Readline/MemoryHistory.php

@@ -8,6 +8,7 @@ class MemoryHistory implements History
 {
     private $lines = array();
     private $position = null;
+    private $unsaved = null;
 
     public function addLine($line)
     {
@@ -29,8 +30,7 @@ public function moveUp(Readline $readline)
         if ($this->position === null) {
             // first time up => move to last entry
             $this->position = count($this->lines) - 1;
-
-            // TODO: buffer current user input
+            $this->unsaved = $readline->getInput();
         } else {
             // somewhere in the list => move by one
             $this->position--;
@@ -50,8 +50,8 @@ public function moveDown(Readline $readline)
             $this->position++;
             $readline->setInput($this->lines[$this->position]);
         } else {
-            // moved beyond bottom => restore empty input
-            $readline->setInput('');
+            // moved beyond bottom => restore original unsaved input
+            $readline->setInput($this->unsaved);
             $this->position = null;
         }
     }

tests/Readline/MemoryHistoryTest.php

@@ -74,4 +74,28 @@ public function testMovingInEmptyHistoryDoesNothing()
         $this->history->moveUp($this->readline);
         $this->history->moveDown($this->readline);
     }
+
+    public function testMovingUpClearsCurrentInput()
+    {
+        $this->readline->expects($this->once())->method('getInput')->will($this->returnValue('input'));
+
+        $this->history->addLine('first');
+
+        $this->readline->expects($this->once())->method('setInput')->with($this->equalTo('first'));
+
+        $this->history->moveUp($this->readline);
+
+        return $this->history;
+    }
+
+    /**
+     * @depends testMovingUpClearsCurrentInput
+     * @param History $history
+     */
+    public function testMovingDownRestoresLastBufferAgain(History $history)
+    {
+        $this->readline->expects($this->once())->method('setInput')->with($this->equalTo('input'));
+
+        $history->moveDown($this->readline);
+    }
 }