chylex/IntelliJ-IdeaVim
1
0
Fork 0
mirror of https://github.com/chylex/IntelliJ-IdeaVim.git synced 2025-03-04 21:32:52 +01:00
Code

Fix caret position at end of file with scrolloff

Browse Source
This commit is contained in:
Matt Ellis 2021-03-22 10:10:36 +00:00
parent 36901194dc
commit ee38944cf9
No known key found for this signature in database
GPG Key ID: FA6025D54131324B
3 changed files with 49 additions and 9 deletions
src/com/maddyhome/idea/vim/group
MotionGroup.java
test/org/jetbrains/plugins/ideavim/action/scroll
ScrollLastScreenLineActionTest.ktScrollLineDownActionTest.kt

4
src/com/maddyhome/idea/vim/group/MotionGroup.java
View File

@ -186,11 +186,13 @@ public class MotionGroup {
final int topVisualLine = getVisualLineAtTopOfScreen(editor);
final int bottomVisualLine = getVisualLineAtBottomOfScreen(editor);
final int caretVisualLine = editor.getCaretModel().getVisualPosition().line;
final int lastVisualLine = EditorHelper.getVisualLineCount(editor) - 1;
final int newVisualLine;
if (caretVisualLine < topVisualLine + scrollOffset) {
newVisualLine = normalizeVisualLine(editor, topVisualLine + scrollOffset);
}
else if (caretVisualLine > bottomVisualLine - scrollOffset) {
else if (bottomVisualLine < lastVisualLine && caretVisualLine > bottomVisualLine - scrollOffset) {
newVisualLine = normalizeVisualLine(editor, bottomVisualLine - scrollOffset);
}
else {

35
test/org/jetbrains/plugins/ideavim/action/scroll/ScrollLastScreenLineActionTest.kt
View File

@ -18,7 +18,7 @@
package org.jetbrains.plugins.ideavim.action.scroll
import com.maddyhome.idea.vim.helper.StringHelper
import com.maddyhome.idea.vim.helper.StringHelper.parseKeys
import com.maddyhome.idea.vim.option.OptionsManager
import org.jetbrains.plugins.ideavim.VimTestCase
@ -30,7 +30,7 @@ class ScrollLastScreenLineActionTest : VimTestCase() {
fun `test scroll current line to bottom of screen`() {
configureByPages(5)
setPositionAndScroll(40, 60)
typeText(StringHelper.parseKeys("zb"))
typeText(parseKeys("zb"))
assertPosition(60, 0)
assertVisibleArea(26, 60)
}
@ -38,7 +38,7 @@ class ScrollLastScreenLineActionTest : VimTestCase() {
fun `test scroll current line to bottom of screen and leave cursor in current column`() {
configureByLines(100, " I found it in a legendary land")
setPositionAndScroll(40, 60, 14)
typeText(StringHelper.parseKeys("zb"))
typeText(parseKeys("zb"))
assertPosition(60, 14)
assertVisibleArea(26, 60)
}
@ -47,7 +47,7 @@ class ScrollLastScreenLineActionTest : VimTestCase() {
OptionsManager.scrolloff.set(10)
configureByPages(5)
setPositionAndScroll(40, 60)
typeText(StringHelper.parseKeys("zb"))
typeText(parseKeys("zb"))
assertPosition(60, 0)
assertVisibleArea(36, 70)
}
@ -55,7 +55,7 @@ class ScrollLastScreenLineActionTest : VimTestCase() {
fun `test scrolls count line to bottom of screen`() {
configureByPages(5)
setPositionAndScroll(40, 60)
typeText(StringHelper.parseKeys("100zb"))
typeText(parseKeys("100zb"))
assertPosition(99, 0)
assertVisibleArea(65, 99)
}
@ -64,7 +64,7 @@ class ScrollLastScreenLineActionTest : VimTestCase() {
OptionsManager.scrolloff.set(10)
configureByPages(5)
setPositionAndScroll(40, 60)
typeText(StringHelper.parseKeys("100zb"))
typeText(parseKeys("100zb"))
assertPosition(99, 0)
assertVisibleArea(75, 109)
}
@ -73,7 +73,7 @@ class ScrollLastScreenLineActionTest : VimTestCase() {
OptionsManager.scrolljump.set(10)
configureByPages(5)
setPositionAndScroll(40, 60)
typeText(StringHelper.parseKeys("zb"))
typeText(parseKeys("zb"))
assertPosition(60, 0)
assertVisibleArea(26, 60)
}
@ -81,8 +81,27 @@ class ScrollLastScreenLineActionTest : VimTestCase() {
fun `test scrolls correctly when less than a page to scroll`() {
configureByPages(5)
setPositionAndScroll(5, 15)
typeText(StringHelper.parseKeys("zb"))
typeText(parseKeys("zb"))
assertPosition(15, 0)
assertVisibleArea(0, 34)
}
fun `test scrolls last line to bottom of screen with virtual space`() {
configureByLines(100, " I found it in a legendary land")
setEditorVirtualSpace()
setPositionAndScroll(80, 99, 4)
typeText(parseKeys("zb"))
assertPosition(99, 4)
assertVisibleArea(65, 99)
}
fun `test scrolls last line to bottom of screen with virtual space when caret less than scrolloff from bottom`() {
OptionsManager.scrolloff.set(10)
configureByLines(100, " I found it in a legendary land")
setEditorVirtualSpace()
setPositionAndScroll(80, 97, 4)
typeText(parseKeys("zb"))
assertPosition(97, 4)
assertVisibleArea(65, 99)
}
}

19
test/org/jetbrains/plugins/ideavim/action/scroll/ScrollLineDownActionTest.kt
View File

@ -108,4 +108,23 @@ class ScrollLineDownActionTest : VimTestCase() {
typeText(parseKeys("Vjjjj", "<C-E>"))
assertVisibleArea(21, 55)
}
fun `test scroll last line down at end of file with virtual space`() {
configureByLines(100, " I found it in a legendary land")
setEditorVirtualSpace()
setPositionAndScroll(75, 99, 4)
typeText(parseKeys("<C-E>"))
assertPosition(99, 4)
assertVisibleArea(76, 99)
}
fun `test scroll line down at end of file with virtual space and scrolloff`() {
OptionsManager.scrolloff.set(10)
configureByLines(100, " I found it in a legendary land")
setEditorVirtualSpace()
setPositionAndScroll(75, 95, 4)
typeText(parseKeys("<C-E>"))
assertPosition(95, 4)
assertVisibleArea(76, 99)
}
}