Partial implementation of virtualedit config

This does not support all config settings,
but does add the 'onemore' option.

This partly addresses https://youtrack.jetbrains.com/issue/VIM-844

src/com/maddyhome/idea/vim/action/change/delete/DeleteCharacterAction.kt

@@ -24,6 +24,8 @@ import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.command.Argument
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
+import com.maddyhome.idea.vim.helper.commandState
+import com.maddyhome.idea.vim.helper.previousCommand
 
 class DeleteCharacterAction : ChangeEditorActionHandler.ForEachCaret() {
   override val type: Command.Type = Command.Type.DELETE

src/com/maddyhome/idea/vim/action/change/delete/DeleteMotionAction.kt

@@ -25,6 +25,8 @@ import com.maddyhome.idea.vim.action.DuplicableOperatorAction
 import com.maddyhome.idea.vim.command.Argument
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
+import com.maddyhome.idea.vim.helper.commandState
+import com.maddyhome.idea.vim.helper.previousCommand
 
 class DeleteMotionAction : ChangeEditorActionHandler.ForEachCaret(), DuplicableOperatorAction {
   override val type: Command.Type = Command.Type.DELETE

src/com/maddyhome/idea/vim/action/motion/leftright/MotionArrowRightAction.kt

@@ -27,6 +27,9 @@ import com.maddyhome.idea.vim.command.Argument
 import com.maddyhome.idea.vim.command.MotionType
 import com.maddyhome.idea.vim.handler.NonShiftedSpecialKeyHandler
 import com.maddyhome.idea.vim.helper.StringHelper.parseKeys
+import com.maddyhome.idea.vim.helper.commandState
+import com.maddyhome.idea.vim.helper.isEndAllowed
+import com.maddyhome.idea.vim.helper.mode
 import java.awt.event.KeyEvent
 import javax.swing.KeyStroke
 
@@ -39,7 +42,8 @@ class MotionArrowRightAction : NonShiftedSpecialKeyHandler(), ComplicatedKeysAct
   )
 
   override fun offset(editor: Editor, caret: Caret, context: DataContext, count: Int, rawCount: Int, argument: Argument?): Int {
-    return VimPlugin.getMotion().moveCaretHorizontal(editor, caret, count, false)
+    val allowPastEnd = editor.commandState.isEndAllowed
+    return VimPlugin.getMotion().moveCaretHorizontal(editor, caret, count, allowPastEnd)
   }
 }
 

src/com/maddyhome/idea/vim/action/motion/updown/MotionArrowDownAction.kt

@@ -29,6 +29,9 @@ import com.maddyhome.idea.vim.command.MotionType
 import com.maddyhome.idea.vim.handler.NonShiftedSpecialKeyHandler
 import com.maddyhome.idea.vim.helper.EditorHelper
 import com.maddyhome.idea.vim.helper.StringHelper.parseKeys
+import com.maddyhome.idea.vim.helper.inNormalMode
+import com.maddyhome.idea.vim.helper.inSelectMode
+import com.maddyhome.idea.vim.helper.inSingleCommandMode
 import java.awt.event.KeyEvent
 import javax.swing.KeyStroke
 
@@ -40,7 +43,7 @@ class MotionArrowDownAction : NonShiftedSpecialKeyHandler(), ComplicatedKeysActi
   private var col: Int = 0
 
   override fun offset(editor: Editor, caret: Caret, context: DataContext, count: Int, rawCount: Int, argument: Argument?): Int {
-    return VimPlugin.getMotion().moveCaretVertical(editor, caret, count)
+    return VimPlugin.getMotion().moveCaretVertical(editor, caret, count, editor.inNormalMode);
   }
 
   override fun preOffsetComputation(editor: Editor, caret: Caret, context: DataContext, cmd: Command): Boolean {

src/com/maddyhome/idea/vim/action/motion/updown/MotionArrowUpAction.kt

@@ -29,6 +29,9 @@ import com.maddyhome.idea.vim.command.MotionType
 import com.maddyhome.idea.vim.handler.NonShiftedSpecialKeyHandler
 import com.maddyhome.idea.vim.helper.EditorHelper
 import com.maddyhome.idea.vim.helper.StringHelper.parseKeys
+import com.maddyhome.idea.vim.helper.inNormalMode
+import com.maddyhome.idea.vim.helper.inSelectMode
+import com.maddyhome.idea.vim.helper.inSingleCommandMode
 import java.awt.event.KeyEvent
 import javax.swing.KeyStroke
 
@@ -40,7 +43,7 @@ class MotionArrowUpAction : NonShiftedSpecialKeyHandler(), ComplicatedKeysAction
   private var col: Int = 0
 
   override fun offset(editor: Editor, caret: Caret, context: DataContext, count: Int, rawCount: Int, argument: Argument?): Int {
-    return VimPlugin.getMotion().moveCaretVertical(editor, caret, -count)
+    return VimPlugin.getMotion().moveCaretVertical(editor, caret, -count, editor.inNormalMode);
   }
 
   override fun preOffsetComputation(editor: Editor, caret: Caret, context: DataContext, cmd: Command): Boolean {

src/com/maddyhome/idea/vim/action/motion/updown/MotionDownActions.kt

@@ -31,6 +31,9 @@ import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.MotionType
 import com.maddyhome.idea.vim.handler.MotionActionHandler
 import com.maddyhome.idea.vim.helper.EditorHelper
+import com.maddyhome.idea.vim.helper.inNormalMode
+import com.maddyhome.idea.vim.helper.inSelectMode
+import com.maddyhome.idea.vim.helper.inSingleCommandMode
 
 sealed class MotionDownBase : MotionActionHandler.ForEachCaret() {
   private var col: Int = 0
@@ -50,7 +53,7 @@ open class MotionDownAction : MotionDownBase() {
   override val motionType: MotionType = MotionType.LINE_WISE
 
   override fun getOffset(editor: Editor, caret: Caret, context: DataContext, count: Int, rawCount: Int, argument: Argument?): Int {
-    return VimPlugin.getMotion().moveCaretVertical(editor, caret, count)
+    return VimPlugin.getMotion().moveCaretVertical(editor, caret, count, editor.inNormalMode)
   }
 }
 
@@ -75,6 +78,6 @@ class MotionDownNotLineWiseAction : MotionDownBase() {
   override val motionType: MotionType = MotionType.EXCLUSIVE
 
   override fun getOffset(editor: Editor, caret: Caret, context: DataContext, count: Int, rawCount: Int, argument: Argument?): Int {
-    return VimPlugin.getMotion().moveCaretVertical(editor, caret, count)
+    return VimPlugin.getMotion().moveCaretVertical(editor, caret, count, editor.inNormalMode)
   }
 }

src/com/maddyhome/idea/vim/action/motion/updown/MotionShiftDownAction.kt

@@ -24,8 +24,7 @@ import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.group.MotionGroup
 import com.maddyhome.idea.vim.handler.ShiftedArrowKeyHandler
-import com.maddyhome.idea.vim.helper.EditorHelper
-import com.maddyhome.idea.vim.helper.vimForEachCaret
+import com.maddyhome.idea.vim.helper.*
 
 /**
  * @author Alex Plate
@@ -37,7 +36,7 @@ class MotionShiftDownAction : ShiftedArrowKeyHandler() {
 
   override fun motionWithKeyModel(editor: Editor, context: DataContext, cmd: Command) {
     editor.vimForEachCaret { caret ->
-      val vertical = VimPlugin.getMotion().moveCaretVertical(editor, caret, cmd.count)
+      val vertical = VimPlugin.getMotion().moveCaretVertical(editor, caret, cmd.count, editor.inNormalMode)
       val col = EditorHelper.prepareLastColumn(editor, caret)
       MotionGroup.moveCaret(editor, caret, vertical)
 

src/com/maddyhome/idea/vim/action/motion/updown/MotionShiftUpAction.kt

@@ -24,8 +24,7 @@ import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.group.MotionGroup
 import com.maddyhome.idea.vim.handler.ShiftedArrowKeyHandler
-import com.maddyhome.idea.vim.helper.EditorHelper
-import com.maddyhome.idea.vim.helper.vimForEachCaret
+import com.maddyhome.idea.vim.helper.*
 
 /**
  * @author Alex Plate
@@ -37,7 +36,7 @@ class MotionShiftUpAction : ShiftedArrowKeyHandler() {
 
   override fun motionWithKeyModel(editor: Editor, context: DataContext, cmd: Command) {
     editor.vimForEachCaret { caret ->
-      val vertical = VimPlugin.getMotion().moveCaretVertical(editor, caret, -cmd.count)
+      val vertical = VimPlugin.getMotion().moveCaretVertical(editor, caret, -cmd.count, editor.inNormalMode)
       val col = EditorHelper.prepareLastColumn(editor, caret)
       MotionGroup.moveCaret(editor, caret, vertical)
 

src/com/maddyhome/idea/vim/action/motion/updown/MotionUpActions.kt

@@ -31,6 +31,9 @@ import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.MotionType
 import com.maddyhome.idea.vim.handler.MotionActionHandler
 import com.maddyhome.idea.vim.helper.EditorHelper
+import com.maddyhome.idea.vim.helper.inNormalMode
+import com.maddyhome.idea.vim.helper.inSelectMode
+import com.maddyhome.idea.vim.helper.inSingleCommandMode
 
 sealed class MotionUpBase : MotionActionHandler.ForEachCaret() {
   private var col: Int = 0
@@ -49,7 +52,7 @@ open class MotionUpAction : MotionUpBase() {
   override val motionType: MotionType = MotionType.LINE_WISE
 
   override fun getOffset(editor: Editor, caret: Caret, context: DataContext, count: Int, rawCount: Int, argument: Argument?): Int {
-    return VimPlugin.getMotion().moveCaretVertical(editor, caret, -count)
+    return VimPlugin.getMotion().moveCaretVertical(editor, caret, -count, editor.inNormalMode)
   }
 }
 
@@ -73,6 +76,6 @@ class MotionUpNotLineWiseAction : MotionUpBase() {
   override val motionType: MotionType = MotionType.EXCLUSIVE
 
   override fun getOffset(editor: Editor, caret: Caret, context: DataContext, count: Int, rawCount: Int, argument: Argument?): Int {
-    return VimPlugin.getMotion().moveCaretVertical(editor, caret, -count)
+    return VimPlugin.getMotion().moveCaretVertical(editor, caret, -count, editor.inNormalMode)
   }
 }

src/com/maddyhome/idea/vim/command/CommandState.kt

@@ -21,11 +21,8 @@ import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.diagnostic.debug
 import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.CommandState
-import com.maddyhome.idea.vim.helper.DigraphResult
-import com.maddyhome.idea.vim.helper.DigraphSequence
-import com.maddyhome.idea.vim.helper.noneOfEnum
-import com.maddyhome.idea.vim.helper.vimCommandState
+import com.maddyhome.idea.vim.action.motion.updown.*
+import com.maddyhome.idea.vim.helper.*
 import com.maddyhome.idea.vim.key.CommandPartNode
 import com.maddyhome.idea.vim.option.OptionsManager.showmode
 import org.jetbrains.annotations.ApiStatus
@@ -61,6 +58,8 @@ class CommandState private constructor() {
   var executingCommand: Command? = null
     private set
 
+  var previousCommand: Command? = null
+
   // Keep the compatibility with the IdeaVim-EasyMotion plugin before the stable release
   @get:Deprecated("")
   @get:ApiStatus.ScheduledForRemoval(inVersion = "0.58")
@@ -75,6 +74,9 @@ class CommandState private constructor() {
   }
 
   fun setExecutingCommand(cmd: Command) {
+    if (previousCommand != null && !cmd.isUpDownMotion){
+      previousCommand = executingCommand // track the previous motion command for some edge cases around '$'
+    }
     executingCommand = cmd
   }
 

src/com/maddyhome/idea/vim/group/ChangeGroup.java

@@ -173,7 +173,7 @@ public void insertNewLineAbove(final @NotNull Editor editor, @NotNull DataContex
         firstLiners.add(caret);
       }
       else {
-        MotionGroup.moveCaret(editor, caret, VimPlugin.getMotion().moveCaretVertical(editor, caret, -1));
+        MotionGroup.moveCaret(editor, caret, VimPlugin.getMotion().moveCaretVertical(editor, caret, -1, false));
         MotionGroup.moveCaret(editor, caret, VimPlugin.getMotion().moveCaretToLineEnd(editor, caret));
       }
     }
@@ -183,7 +183,7 @@ public void insertNewLineAbove(final @NotNull Editor editor, @NotNull DataContex
 
     for (Caret caret : editor.getCaretModel().getAllCarets()) {
       if (firstLiners.contains(caret)) {
-        MotionGroup.moveCaret(editor, caret, VimPlugin.getMotion().moveCaretVertical(editor, caret, -1));
+        MotionGroup.moveCaret(editor, caret, VimPlugin.getMotion().moveCaretVertical(editor, caret, -1, false));
       }
     }
   }
@@ -204,15 +204,15 @@ private void insertNewLineAbove(@NotNull Editor editor, @NotNull Caret caret, in
       firstLiner = true;
     }
     else {
-      MotionGroup.moveCaret(editor, caret, VimPlugin.getMotion().moveCaretVertical(editor, caret, -1));
+      MotionGroup.moveCaret(editor, caret, VimPlugin.getMotion().moveCaretVertical(editor, caret, -1, false));
       MotionGroup.moveCaret(editor, caret, VimPlugin.getMotion().moveCaretToLineEnd(editor, caret));
     }
 
     UserDataManager.setVimChangeActionSwitchMode(editor, CommandState.Mode.INSERT);
     insertText(editor, caret, "\n" + IndentConfig.create(editor).createIndentBySize(col));
 
     if (firstLiner) {
-      MotionGroup.moveCaret(editor, caret, VimPlugin.getMotion().moveCaretVertical(editor, caret, -1));
+      MotionGroup.moveCaret(editor, caret, VimPlugin.getMotion().moveCaretVertical(editor, caret, -1, false));
     }
   }
 
@@ -766,15 +766,26 @@ public void beforeProcessKey(final @NotNull Editor editor,
    * @return true if able to delete the text, false if not
    */
   public boolean deleteEndOfLine(@NotNull Editor editor, @NotNull Caret caret, int count) {
+    int initialOffset = caret.getOffset();
     int offset = VimPlugin.getMotion().moveCaretToLineEndOffset(editor, caret, count - 1, true);
+
+    int startOffset = initialOffset;
+    if (offset == initialOffset) startOffset--; // handle delete from virtual space
+
     if (offset != -1) {
-      final TextRange rangeToDelete = new TextRange(caret.getOffset(), offset);
+      final TextRange rangeToDelete = new TextRange(startOffset, offset);
       editor.getCaretModel().getAllCarets().stream().filter(c -> c != caret && rangeToDelete.contains(c.getOffset()))
         .forEach(c -> editor.getCaretModel().removeCaret(c));
       boolean res = deleteText(editor, rangeToDelete, SelectionType.CHARACTER_WISE);
-      int pos = VimPlugin.getMotion().moveCaretHorizontal(editor, caret, -1, false);
-      if (pos != -1) {
-        MotionGroup.moveCaret(editor, caret, pos);
+
+      if (CommandStateHelper.getUsesVirtualSpace()) {
+        MotionGroup.moveCaret(editor, caret, startOffset);
+      }
+      else {
+        int pos = VimPlugin.getMotion().moveCaretHorizontal(editor, caret, -1, false);
+        if (pos != -1) {
+          MotionGroup.moveCaret(editor, caret, pos);
+        }
       }
 
       return res;

src/com/maddyhome/idea/vim/group/MotionGroup.java

@@ -31,13 +31,15 @@
 import com.intellij.openapi.vfs.VirtualFileSystem;
 import com.maddyhome.idea.vim.KeyHandler;
 import com.maddyhome.idea.vim.VimPlugin;
+import com.maddyhome.idea.vim.action.motion.leftright.MotionLastColumnAction;
 import com.maddyhome.idea.vim.command.*;
 import com.maddyhome.idea.vim.common.Jump;
 import com.maddyhome.idea.vim.common.Mark;
 import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.ex.ExOutputModel;
 import com.maddyhome.idea.vim.group.visual.VimSelection;
 import com.maddyhome.idea.vim.group.visual.VisualGroupKt;
+import com.maddyhome.idea.vim.handler.EditorActionHandlerBase;
 import com.maddyhome.idea.vim.handler.MotionActionHandler;
 import com.maddyhome.idea.vim.handler.TextObjectActionHandler;
 import com.maddyhome.idea.vim.helper.*;
@@ -1150,7 +1152,7 @@ private void scrollLineToScreenLocation(@NotNull Editor editor,
       else {
         offset = moveCaretVertical(editor, editor.getCaretModel().getPrimaryCaret(),
                                    EditorHelper.visualLineToLogicalLine(editor, visualLine) -
-                                   editor.getCaretModel().getLogicalPosition().line);
+                                   editor.getCaretModel().getLogicalPosition().line, false);
       }
 
       moveCaret(editor, editor.getCaretModel().getPrimaryCaret(), offset);
@@ -1184,7 +1186,7 @@ public int moveCaretGotoNextTab(@NotNull Editor editor, @NotNull DataContext con
     return editor.getCaretModel().getOffset();
   }
 
-  public int moveCaretVertical(@NotNull Editor editor, @NotNull Caret caret, int count) {
+  public int moveCaretVertical(@NotNull Editor editor, @NotNull Caret caret, int count, boolean useEndOfLineTracking) {
     VisualPosition pos = caret.getVisualPosition();
     final LogicalPosition logicalPosition = caret.getLogicalPosition();
     if ((pos.line == 0 && count < 0) || (pos.line >= EditorHelper.getVisualLineCount(editor) - 1 && count > 0)) {
@@ -1217,12 +1219,28 @@ public int moveCaretVertical(@NotNull Editor editor, @NotNull Caret caret, int c
       col = EditorHelper
         .normalizeVisualColumn(editor, line, col, CommandStateHelper.isEndAllowed(CommandStateHelper.getMode(editor)));
       col += newInlineElements;
-      VisualPosition newPos = new VisualPosition(line, col);
 
+      if (useEndOfLineTracking && InLastColumnMode(editor) && !caret.hasSelection()) {
+          // we're in 'last column' mode (after pressing '$'); Run to last column
+          int newLastColumn = EditorHelper.lastColumnForLine(editor, line, CommandStateHelper.isEndAllowed(mode));
+          col = newLastColumn;
+      }
+
+      VisualPosition newPos = new VisualPosition(line, col);
       return EditorHelper.visualPositionToOffset(editor, newPos);
     }
   }
 
+  private boolean InLastColumnMode(@NotNull Editor editor) {
+    Command state = CommandStateHelper.getPreviousCommand(editor);
+    if (state == null) return false;
+
+    EditorActionHandlerBase action = state.getAction();
+    if (action == null) return false;
+
+    return action instanceof MotionLastColumnAction;
+  }
+
   public int moveCaretToLinePercent(@NotNull Editor editor, int count) {
     if (count > 100) count = 100;
 

src/com/maddyhome/idea/vim/handler/ChangeEditorActionHandler.kt

@@ -26,6 +26,7 @@ import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.action.change.VimRepeater
 import com.maddyhome.idea.vim.command.Argument
 import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.helper.previousCommand
 import com.maddyhome.idea.vim.helper.vimChangeActionSwitchMode
 import com.maddyhome.idea.vim.helper.vimLastColumn
 

src/com/maddyhome/idea/vim/handler/EditorActionHandlerBase.kt

@@ -25,13 +25,11 @@ import com.intellij.openapi.editor.Caret
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.actionSystem.CaretSpecificDataContext
 import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.action.motion.updown.*
 import com.maddyhome.idea.vim.command.Argument
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.helper.StringHelper
-import com.maddyhome.idea.vim.helper.commandState
-import com.maddyhome.idea.vim.helper.getTopLevelEditor
-import com.maddyhome.idea.vim.helper.noneOfEnum
+import com.maddyhome.idea.vim.helper.*
 import java.util.*
 import javax.swing.KeyStroke
 
@@ -91,6 +89,10 @@ abstract class EditorActionHandlerBase(private val myRunForEachCaret: Boolean) {
     }
 
     if (!baseExecute(editor, caret, CaretSpecificDataContext(context, caret), cmd)) VimPlugin.indicateError()
+
+    if (!cmd.isUpDownMotion){
+      editor.previousCommand = cmd // track the previous motion command for some edge cases
+    }
   }
 
   open fun process(cmd: Command) {