Fix edge cases for H, L and M and introduce 'startofline' option

resources/META-INF/includes/VimActions.xml

@@ -126,8 +126,10 @@
     <vimAction implementation="com.maddyhome.idea.vim.action.motion.mark.MotionJumpNextAction" mappingModes="N" keys="«C-I»,«Tab»"/>
     <vimAction implementation="com.maddyhome.idea.vim.action.motion.mark.MotionJumpPreviousAction" mappingModes="N" keys="«C-O»,«C-T»"/>
     <!-- Screen -->
-    <vimAction implementation="com.maddyhome.idea.vim.action.motion.screen.MotionFirstScreenLineAction" mappingModes="NXO" keys="H"/>
-    <vimAction implementation="com.maddyhome.idea.vim.action.motion.screen.MotionLastScreenLineAction" mappingModes="NXO" keys="L"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.screen.MotionFirstScreenLineAction" mappingModes="NX" keys="H"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.screen.MotionOpPendingFirstScreenLineAction" mappingModes="O" keys="H"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.screen.MotionLastScreenLineAction" mappingModes="NX" keys="L"/>
+    <vimAction implementation="com.maddyhome.idea.vim.action.motion.screen.MotionOpPendingLastScreenLineAction" mappingModes="O" keys="L"/>
     <vimAction implementation="com.maddyhome.idea.vim.action.motion.screen.MotionMiddleScreenLineAction" mappingModes="NXO" keys="M"/>
     <!-- Scroll -->
     <vimAction implementation="com.maddyhome.idea.vim.action.motion.scroll.MotionScrollFirstScreenLinePageStartAction" mappingModes="NXO" keys="z+"/>

src/com/maddyhome/idea/vim/action/motion/screen/MotionFirstScreenLineAction.kt

@@ -22,13 +22,24 @@ import com.intellij.openapi.editor.Caret
 import com.intellij.openapi.editor.Editor
 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.command.CommandFlags
 import com.maddyhome.idea.vim.command.MotionType
 import com.maddyhome.idea.vim.handler.MotionActionHandler
 import com.maddyhome.idea.vim.helper.enumSetOf
 import java.util.*
 
-class MotionFirstScreenLineAction : MotionActionHandler.ForEachCaret() {
+/*
+                                                *H*
+H                       To line [count] from top (Home) of window (default:
+                        first line on the window) on the first non-blank
+                        character |linewise|.  See also 'startofline' option.
+                        Cursor is adjusted for 'scrolloff' option, unless an
+                        operator is pending, in which case the text may
+                        scroll.  E.g. "yH" yanks from the first visible line
+                        until the cursor line (inclusive).
+ */
+abstract class MotionFirstScreenLineActionBase(private val operatorPending: Boolean) : MotionActionHandler.ForEachCaret() {
   override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_SAVE_JUMP)
 
   override val motionType: MotionType = MotionType.LINE_WISE
@@ -41,6 +52,20 @@ class MotionFirstScreenLineAction : MotionActionHandler.ForEachCaret() {
     rawCount: Int,
     argument: Argument?
   ): Int {
-    return VimPlugin.getMotion().moveCaretToFirstScreenLine(editor, count)
+
+    // Only apply scrolloff for NX motions. For op pending, use the actual first line and apply scrolloff after.
+    // E.g. yH will yank from first visible line to current line, but it also moves the caret to the first visible line.
+    // This is inside scrolloff, so Vim scrolls
+    return VimPlugin.getMotion().moveCaretToFirstScreenLine(editor, caret, count, !operatorPending)
+  }
+
+  override fun postMove(editor: Editor, caret: Caret, context: DataContext, cmd: Command) {
+    if (operatorPending) {
+      // Convert current caret line from a 0-based logical line to a 1-based logical line
+      VimPlugin.getMotion().scrollLineToFirstScreenLine(editor, caret.logicalPosition.line + 1, false)
+    }
   }
 }
+
+class MotionFirstScreenLineAction : MotionFirstScreenLineActionBase(false)
+class MotionOpPendingFirstScreenLineAction : MotionFirstScreenLineActionBase(true)

src/com/maddyhome/idea/vim/action/motion/screen/MotionLastScreenLineAction.kt

@@ -22,13 +22,24 @@ import com.intellij.openapi.editor.Caret
 import com.intellij.openapi.editor.Editor
 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.command.CommandFlags
 import com.maddyhome.idea.vim.command.MotionType
 import com.maddyhome.idea.vim.handler.MotionActionHandler
 import com.maddyhome.idea.vim.helper.enumSetOf
 import java.util.*
 
-class MotionLastScreenLineAction : MotionActionHandler.ForEachCaret() {
+/*
+                                                *L*
+L                       To line [count] from bottom of window (default: Last
+                        line on the window) on the first non-blank character
+                        |linewise|.  See also 'startofline' option.
+                        Cursor is adjusted for 'scrolloff' option, unless an
+                        operator is pending, in which case the text may
+                        scroll.  E.g. "yL" yanks from the cursor to the last
+                        visible line.
+ */
+abstract class MotionLastScreenLineActionBase(private val operatorPending: Boolean) : MotionActionHandler.ForEachCaret() {
   override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_SAVE_JUMP)
 
   override val motionType: MotionType = MotionType.LINE_WISE
@@ -41,6 +52,16 @@ class MotionLastScreenLineAction : MotionActionHandler.ForEachCaret() {
     rawCount: Int,
     argument: Argument?
   ): Int {
-    return VimPlugin.getMotion().moveCaretToLastScreenLine(editor, count)
+    return VimPlugin.getMotion().moveCaretToLastScreenLine(editor, caret, count, !operatorPending)
+  }
+
+  override fun postMove(editor: Editor, caret: Caret, context: DataContext, cmd: Command) {
+    if (operatorPending) {
+      // Convert current caret line from a 0-based logical line to a 1-based logical line
+      VimPlugin.getMotion().scrollLineToFirstScreenLine(editor, caret.logicalPosition.line + 1, false)
+    }
   }
 }
+
+class MotionLastScreenLineAction : MotionLastScreenLineActionBase(false)
+class MotionOpPendingLastScreenLineAction : MotionLastScreenLineActionBase(true)

src/com/maddyhome/idea/vim/action/motion/screen/MotionMiddleScreenLineAction.kt

@@ -28,6 +28,11 @@ import com.maddyhome.idea.vim.handler.MotionActionHandler
 import com.maddyhome.idea.vim.helper.enumSetOf
 import java.util.*
 
+/*
+                                                 *M*
+M                       To Middle line of window, on the first non-blank
+                        character |linewise|.  See also 'startofline' option.
+ */
 class MotionMiddleScreenLineAction : MotionActionHandler.ForEachCaret() {
   override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_SAVE_JUMP)
 
@@ -41,6 +46,6 @@ class MotionMiddleScreenLineAction : MotionActionHandler.ForEachCaret() {
     rawCount: Int,
     argument: Argument?
   ): Int {
-    return VimPlugin.getMotion().moveCaretToMiddleScreenLine(editor)
+    return VimPlugin.getMotion().moveCaretToMiddleScreenLine(editor, caret)
   }
 }

src/com/maddyhome/idea/vim/action/motion/scroll/MotionScrollHalfPageDownAction.kt

@@ -32,6 +32,6 @@ class MotionScrollHalfPageDownAction : VimActionHandler.SingleExecution() {
   override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_IGNORE_SCROLL_JUMP)
 
   override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean {
-    return VimPlugin.getMotion().scrollScreen(editor, cmd.rawCount, true)
+    return VimPlugin.getMotion().scrollScreen(editor, editor.caretModel.primaryCaret, cmd.rawCount, true)
   }
 }

src/com/maddyhome/idea/vim/action/motion/scroll/MotionScrollHalfPageUpAction.kt

@@ -32,6 +32,6 @@ class MotionScrollHalfPageUpAction : VimActionHandler.SingleExecution() {
   override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_IGNORE_SCROLL_JUMP)
 
   override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean {
-    return VimPlugin.getMotion().scrollScreen(editor, cmd.rawCount, false)
+    return VimPlugin.getMotion().scrollScreen(editor, editor.caretModel.primaryCaret, cmd.rawCount, false)
   }
 }

src/com/maddyhome/idea/vim/action/motion/scroll/MotionScrollPageDownAction.kt

@@ -39,7 +39,7 @@ class MotionScrollPageDownAction : VimActionHandler.SingleExecution() {
   override val flags: EnumSet<CommandFlags> = enumSetOf(FLAG_IGNORE_SCROLL_JUMP)
 
   override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean {
-    return VimPlugin.getMotion().scrollFullPage(editor, cmd.count)
+    return VimPlugin.getMotion().scrollFullPage(editor, editor.caretModel.primaryCaret, cmd.count)
   }
 }
 
@@ -54,6 +54,6 @@ class MotionScrollPageDownInsertModeAction : VimActionHandler.SingleExecution(),
   override val flags: EnumSet<CommandFlags> = enumSetOf(FLAG_IGNORE_SCROLL_JUMP, FLAG_CLEAR_STROKES)
 
   override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean {
-    return VimPlugin.getMotion().scrollFullPage(editor, cmd.count)
+    return VimPlugin.getMotion().scrollFullPage(editor, editor.caretModel.primaryCaret, cmd.count)
   }
 }

src/com/maddyhome/idea/vim/action/motion/scroll/MotionScrollPageUpAction.kt

@@ -39,7 +39,7 @@ class MotionScrollPageUpAction : VimActionHandler.SingleExecution() {
   override val flags: EnumSet<CommandFlags> = enumSetOf(FLAG_IGNORE_SCROLL_JUMP)
 
   override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean {
-    return VimPlugin.getMotion().scrollFullPage(editor, -cmd.count)
+    return VimPlugin.getMotion().scrollFullPage(editor, editor.caretModel.primaryCaret, -cmd.count)
   }
 }
 
@@ -54,6 +54,6 @@ class MotionScrollPageUpInsertModeAction : VimActionHandler.SingleExecution(), C
   override val flags: EnumSet<CommandFlags> = enumSetOf(FLAG_IGNORE_SCROLL_JUMP, FLAG_CLEAR_STROKES)
 
   override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean {
-    return VimPlugin.getMotion().scrollFullPage(editor, -cmd.count)
+    return VimPlugin.getMotion().scrollFullPage(editor, editor.caretModel.primaryCaret, -cmd.count)
   }
 }

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

@@ -26,6 +26,7 @@ import com.maddyhome.idea.vim.command.Argument
 import com.maddyhome.idea.vim.command.CommandFlags
 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.enumSetOf
 import java.util.*
 
@@ -42,7 +43,8 @@ class MotionGotoLineFirstAction : MotionActionHandler.ForEachCaret() {
     rawCount: Int,
     argument: Argument?
   ): Int {
-    return VimPlugin.getMotion().moveCaretGotoLineFirst(editor, count - 1)
+    val line = EditorHelper.normalizeLine(editor, count - 1)
+    return VimPlugin.getMotion().moveCaretToLineWithStartOfLineOption(editor, line, caret)
   }
 }
 
@@ -59,6 +61,7 @@ class MotionGotoLineFirstInsertAction : MotionActionHandler.ForEachCaret() {
     rawCount: Int,
     argument: Argument?
   ): Int {
-    return VimPlugin.getMotion().moveCaretGotoLineFirst(editor, count - 1)
+    val line = EditorHelper.normalizeLine(editor, count - 1)
+    return VimPlugin.getMotion().moveCaretToLineStart(editor, line)
   }
 }

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

@@ -25,6 +25,7 @@ import com.maddyhome.idea.vim.command.Argument
 import com.maddyhome.idea.vim.command.CommandFlags
 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.enumSetOf
 import java.util.*
 
@@ -41,6 +42,14 @@ class MotionGotoLineLastAction : MotionActionHandler.ForEachCaret() {
     rawCount: Int,
     argument: Argument?
   ): Int {
-    return VimPlugin.getMotion().moveCaretGotoLineLast(editor, rawCount)
+    val line = EditorHelper.normalizeLine(
+      editor,
+      if (rawCount == 0) {
+        EditorHelper.getLineCount(editor) - 1
+      } else {
+        rawCount - 1
+      }
+    )
+    return VimPlugin.getMotion().moveCaretToLineWithStartOfLineOption(editor, line, caret)
   }
 }

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

@@ -43,7 +43,7 @@ class MotionPercentOrMatchAction : MotionActionHandler.ForEachCaret() {
     return if (rawCount == 0) {
       VimPlugin.getMotion().moveCaretToMatchingPair(editor, caret)
     } else {
-      VimPlugin.getMotion().moveCaretToLinePercent(editor, count)
+      VimPlugin.getMotion().moveCaretToLinePercent(editor, caret, count)
     }
   }
 

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

@@ -46,6 +46,6 @@ class MotionShiftDownAction : ShiftedArrowKeyHandler() {
   }
 
   override fun motionWithoutKeyModel(editor: Editor, context: DataContext, cmd: Command) {
-    VimPlugin.getMotion().scrollFullPage(editor, cmd.count)
+    VimPlugin.getMotion().scrollFullPage(editor, editor.caretModel.primaryCaret, cmd.count)
   }
 }

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

@@ -46,6 +46,6 @@ class MotionShiftUpAction : ShiftedArrowKeyHandler() {
   }
 
   override fun motionWithoutKeyModel(editor: Editor, context: DataContext, cmd: Command) {
-    VimPlugin.getMotion().scrollFullPage(editor, -cmd.count)
+    VimPlugin.getMotion().scrollFullPage(editor, editor.caretModel.primaryCaret, -cmd.count)
   }
 }

src/com/maddyhome/idea/vim/ex/CommandParser.kt

@@ -208,7 +208,7 @@ object CommandParser {
     val argument = StringBuilder() // The command's argument(s)
     var location: StringBuffer? = null // The current range text
     var offsetSign = 1 // Sign of current range offset
-    var offsetNumber = 0 // The value of the current range offset
+    var offsetNumber = -1 // The value of the current range offset
     var offsetTotal = 0 // The sum of all the current range offsets
     var move = false // , vs. ; separated ranges (true=; false=,)
     var patternType = 0.toChar() // ? or /
@@ -251,7 +251,7 @@ object CommandParser {
           State.RANGE -> {
             location = StringBuffer()
             offsetTotal = 0
-            offsetNumber = 0
+            offsetNumber = -1
             move = false
             if (ch in '0'..'9') {
               state = State.RANGE_LINE
@@ -401,7 +401,7 @@ object CommandParser {
             }
           State.RANGE_OFFSET -> {
             // Figure out the sign of the offset and reset the offset value
-            offsetNumber = 0
+            offsetNumber = -1
             if (ch == '+') {
               offsetSign = 1
             } else if (ch == '-') {
@@ -418,7 +418,7 @@ object CommandParser {
             }
           State.RANGE_OFFSET_DONE -> {
             // No number implies a one
-            if (offsetNumber == 0) {
+            if (offsetNumber == -1) {
               offsetNumber = 1
             }
             // Update offset total for this range
@@ -433,7 +433,7 @@ object CommandParser {
           }
           State.RANGE_OFFSET_NUM -> // Update the value of the current offset
             if (ch in '0'..'9') {
-              offsetNumber = offsetNumber * 10 + (ch - '0')
+              offsetNumber = (if (offsetNumber == -1) 0 else offsetNumber) * 10 + (ch - '0')
               state = State.RANGE_OFFSET_MAYBE_DONE
               reprocess = false
             } else if (ch == '+' || ch == '-') {

src/com/maddyhome/idea/vim/ex/handler/GotoLineHandler.kt

@@ -53,7 +53,8 @@ class GotoLineHandler : CommandHandler.ForEachCaret() {
     val line = min(cmd.getLine(editor, caret), EditorHelper.getLineCount(editor) - 1)
 
     if (line >= 0) {
-      MotionGroup.moveCaret(editor, caret, VimPlugin.getMotion().moveCaretToLineStartSkipLeading(editor, line))
+      val offset = VimPlugin.getMotion().moveCaretToLineWithStartOfLineOption(editor, line, caret)
+      MotionGroup.moveCaret(editor, caret, offset)
       return true
     }
 

src/com/maddyhome/idea/vim/ex/handler/RepeatHandler.kt

@@ -47,7 +47,7 @@ class RepeatHandler : CommandHandler.ForEachCaret() {
     MotionGroup.moveCaret(
       editor,
       caret,
-      VimPlugin.getMotion().moveCaretToLine(editor, line, editor.caretModel.primaryCaret)
+      VimPlugin.getMotion().moveCaretToLineWithSameColumn(editor, line, editor.caretModel.primaryCaret)
     )
 
     if (arg == ':') {

src/com/maddyhome/idea/vim/ex/ranges/Ranges.kt

@@ -153,7 +153,7 @@ class Ranges {
       if (range.isMove) {
         MotionGroup.moveCaret(
           editor, editor.caretModel.primaryCaret,
-          VimPlugin.getMotion().moveCaretToLine(editor, endLine, editor.caretModel.primaryCaret)
+          VimPlugin.getMotion().moveCaretToLineWithSameColumn(editor, endLine, editor.caretModel.primaryCaret)
         )
       }
       // Did that last range represent the start of the file?
@@ -177,7 +177,7 @@ class Ranges {
       if (range.isMove) MotionGroup.moveCaret(
         editor,
         caret,
-        VimPlugin.getMotion().moveCaretToLine(editor, endLine, editor.caretModel.primaryCaret)
+        VimPlugin.getMotion().moveCaretToLineWithSameColumn(editor, endLine, editor.caretModel.primaryCaret)
       )
       lastZero = endLine < 0
       ++count

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

@@ -1140,6 +1140,9 @@ public boolean deleteRange(@NotNull Editor editor,
                              @Nullable SelectionType type,
                              boolean isChange) {
 
+    // Update the last column before we delete, or we might be retrieving the data for a line that no longer exists
+    UserDataManager.setVimLastColumn(caret, InlayHelperKt.getInlayAwareVisualColumn(caret));
+
     boolean removeLastNewLine = removeLastNewLine(editor, range, type);
     final boolean res = deleteText(editor, range, type);
     if (removeLastNewLine) {
@@ -1150,7 +1153,7 @@ public boolean deleteRange(@NotNull Editor editor,
     if (res) {
       int pos = EditorHelper.normalizeOffset(editor, range.getStartOffset(), isChange);
       if (type == SelectionType.LINE_WISE) {
-        pos = VimPlugin.getMotion().moveCaretToLineStart(editor, editor.offsetToLogicalPosition(pos).line);
+        pos = VimPlugin.getMotion().moveCaretToLineWithStartOfLineOption(editor, editor.offsetToLogicalPosition(pos).line, caret);
       }
       MotionGroup.moveCaret(editor, caret, pos);
     }
@@ -1649,6 +1652,9 @@ public void indentRange(@NotNull Editor editor,
       logger.debug("count=" + count);
     }
 
+    // Update the last column before we indent, or we might be retrieving the data for a line that no longer exists
+    UserDataManager.setVimLastColumn(caret, InlayHelperKt.getInlayAwareVisualColumn(caret));
+
     IndentConfig indentConfig = IndentConfig.create(editor, context);
 
     final int sline = editor.offsetToLogicalPosition(range.getStartOffset()).line;
@@ -1710,7 +1716,7 @@ public void indentRange(@NotNull Editor editor,
 
     if (!CommandStateHelper.inInsertMode(editor)) {
       if (!range.isMultiple()) {
-        MotionGroup.moveCaret(editor, caret, VimPlugin.getMotion().moveCaretToLineStartSkipLeading(editor, sline));
+        MotionGroup.moveCaret(editor, caret, VimPlugin.getMotion().moveCaretToLineWithStartOfLineOption(editor, sline, caret));
       }
       else {
         MotionGroup.moveCaret(editor, caret, range.getStartOffset());