KILL_WHOLE_LINE doesn't work for last line in buffer, fixes #339

jline · Jan 29, 2019 · a8ce4e8 · a8ce4e8
1 parent b807f97
commit a8ce4e8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/reader/src/main/java/org/jline/reader/impl/LineReaderImpl.java b/reader/src/main/java/org/jline/reader/impl/LineReaderImpl.java
@@ -5003,7 +5003,9 @@ protected boolean killWholeLine() {
                 while (end < buf.length() && buf.atChar(end) != '\n') {
                     end++;
                 }
-                end++;
+                if (end < buf.length()) {
+                    end++;
+                }
             }
         }
         String killed = buf.substring(start, end);

diff --git a/reader/src/test/java/org/jline/reader/impl/KillRingTest.java b/reader/src/test/java/org/jline/reader/impl/KillRingTest.java
@@ -12,6 +12,7 @@
 
 import static org.jline.reader.LineReader.BACKWARD_KILL_WORD;
 import static org.jline.reader.LineReader.BACKWARD_WORD;
+import static org.jline.reader.LineReader.KILL_WHOLE_LINE;
 import static org.jline.reader.LineReader.KILL_WORD;
 import static org.jline.reader.LineReader.YANK;
 import static org.jline.reader.LineReader.YANK_POP;
@@ -174,4 +175,11 @@ public void testBufferMixedKillsAndYank() throws Exception {
         assertBuffer("", b = b.op(BACKWARD_KILL_WORD));
         assertBuffer("This is a test", b = b.op(YANK));
     }
+
+    @Test
+    public void testKillWholeLine() throws Exception {
+        TestBuffer b = new TestBuffer("b");
+        assertBuffer("", b = b.op(KILL_WHOLE_LINE));
+        assertBuffer("b", b = b.op(YANK));
+    }
 }
diff --git a/reader/src/test/java/org/jline/reader/impl/ReaderTestSupport.java b/reader/src/test/java/org/jline/reader/impl/ReaderTestSupport.java
@@ -39,6 +39,7 @@
 import static org.jline.reader.LineReader.DOWN_HISTORY;
 import static org.jline.reader.LineReader.END_OF_LINE;
 import static org.jline.reader.LineReader.FORWARD_WORD;
+import static org.jline.reader.LineReader.KILL_WHOLE_LINE;
 import static org.jline.reader.LineReader.KILL_WORD;
 import static org.jline.reader.LineReader.UP_HISTORY;
 import static org.jline.reader.LineReader.YANK;
@@ -164,6 +165,7 @@ private String getKeyForAction(final String key) {
             case BEGINNING_OF_LINE:    return "\033[H";
             case END_OF_LINE:          return "\u0005";
             case KILL_WORD:            return "\u001Bd";
+            case KILL_WHOLE_LINE:      return "\u0015";
             case BACKWARD_KILL_WORD:   return "\u0017";
             case ACCEPT_LINE:          return "\n";
             case UP_HISTORY:           return "\033[A";