Support for the vi 'P' (put before) command, fixes #82

jline · Jan 3, 2017 · c9768fc · c9768fc
1 parent cddb9ac
commit c9768fc
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/reader/src/main/java/org/jline/reader/impl/LineReaderImpl.java b/reader/src/main/java/org/jline/reader/impl/LineReaderImpl.java
@@ -2960,6 +2960,19 @@ protected boolean viPutAfter() {
         return true;
     }
 
+    protected boolean viPutBefore() {
+        if (yankBuffer.length () != 0) {
+            if (buf.cursor() > 0) {
+                buf.move(-1);
+            }
+            for (int i = 0; i < count; i++) {
+                putString(yankBuffer);
+            }
+            buf.move(-1);
+        }
+        return true;
+    }
+
     protected boolean doLowercaseVersion() {
         bindingReader.runMacro(getLastBinding().toLowerCase());
         return true;
@@ -3201,6 +3214,7 @@ protected Map<String, Widget> builtinWidgets() {
         widgets.put(VI_OPEN_LINE_ABOVE, this::viOpenLineAbove);
         widgets.put(VI_OPEN_LINE_BELOW, this::viOpenLineBelow);
         widgets.put(VI_PUT_AFTER, this::viPutAfter);
+        widgets.put(VI_PUT_BEFORE, this::viPutBefore);
         widgets.put(VI_REPEAT_FIND, this::viRepeatFind);
         widgets.put(VI_REPEAT_SEARCH, this::viRepeatSearch);
         widgets.put(VI_REPLACE_CHARS, this::viReplaceChars);
@@ -5041,7 +5055,7 @@ public KeyMap<Binding> viCmd() {
         bind(vicmd, VI_JOIN,                                "J");
         bind(vicmd, VI_REV_REPEAT_SEARCH,                   "N");
         bind(vicmd, VI_OPEN_LINE_ABOVE,                     "O");
-        bind(vicmd, VI_PUT_AFTER,                           "P");
+        bind(vicmd, VI_PUT_BEFORE,                          "P");
         bind(vicmd, VI_REPLACE,                             "R");
         bind(vicmd, VI_KILL_LINE,                           "S");
         bind(vicmd, VI_FIND_PREV_CHAR_SKIP,                 "T");

diff --git a/reader/src/test/java/org/jline/reader/impl/ViMoveModeTest.java b/reader/src/test/java/org/jline/reader/impl/ViMoveModeTest.java
@@ -749,11 +749,20 @@ public void testWordRight() throws Exception {
          * Yank word right
          */
         b = (new TestBuffer("big brown pickles"))
-            .escape()
-            .append("02yw$p")
-            .enter();
-        assertLine("big brown picklesbig brown ", b, false);
+                .escape()
+                .append("02yw$piz")
+                .enter();
+        assertLine("big brown picklesbig brownz ", b, false);
 
+        /*
+         * Put before
+         */
+        b = (new TestBuffer("big brown pickles"))
+                .escape()
+                .append("02yw$Piz")
+                .enter();
+        assertLine("big brown picklebig brownz s", b, false);
+
         /*
          * Change word right
          */