1
0
mirror of https://github.com/chylex/IntelliJ-IdeaVim.git synced 2025-08-21 07:54:06 +02:00

Compare commits

..

2 Commits

Author SHA1 Message Date
c9eb104a45 Set plugin version to chylex-25 2024-01-27 06:20:22 +01:00
ade53624cc Apply scrolloff after executing native IDEA actions 2024-01-27 06:12:04 +01:00
2 changed files with 3 additions and 5 deletions

View File

@@ -11,7 +11,7 @@
ideaVersion=2023.3.2 ideaVersion=2023.3.2
downloadIdeaSources=true downloadIdeaSources=true
instrumentPluginCode=true instrumentPluginCode=true
version=chylex-26 version=chylex-25
javaVersion=17 javaVersion=17
remoteRobotVersion=0.11.21 remoteRobotVersion=0.11.21
antlrVersion=4.10.1 antlrVersion=4.10.1

View File

@@ -34,6 +34,7 @@ import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.action.VimShortcutKeyAction import com.maddyhome.idea.vim.action.VimShortcutKeyAction
import com.maddyhome.idea.vim.api.injector import com.maddyhome.idea.vim.api.injector
import com.maddyhome.idea.vim.group.NotificationService import com.maddyhome.idea.vim.group.NotificationService
import com.maddyhome.idea.vim.helper.EditorHelper
import com.maddyhome.idea.vim.helper.isIdeaVimDisabledHere import com.maddyhome.idea.vim.helper.isIdeaVimDisabledHere
import com.maddyhome.idea.vim.helper.vimStateMachine import com.maddyhome.idea.vim.helper.vimStateMachine
import com.maddyhome.idea.vim.newapi.globalIjOptions import com.maddyhome.idea.vim.newapi.globalIjOptions
@@ -56,7 +57,6 @@ internal object IdeaSpecifics {
private val surrounderAction = private val surrounderAction =
"com.intellij.codeInsight.generation.surroundWith.SurroundWithHandler\$InvokeSurrounderAction" "com.intellij.codeInsight.generation.surroundWith.SurroundWithHandler\$InvokeSurrounderAction"
private var editor: Editor? = null private var editor: Editor? = null
private var caretOffset = -1
private var completionPrevDocumentLength: Int? = null private var completionPrevDocumentLength: Int? = null
private var completionPrevDocumentOffset: Int? = null private var completionPrevDocumentOffset: Int? = null
override fun beforeActionPerformed(action: AnAction, event: AnActionEvent) { override fun beforeActionPerformed(action: AnAction, event: AnActionEvent) {
@@ -65,7 +65,6 @@ internal object IdeaSpecifics {
val hostEditor = event.dataContext.getData(CommonDataKeys.HOST_EDITOR) val hostEditor = event.dataContext.getData(CommonDataKeys.HOST_EDITOR)
if (hostEditor != null) { if (hostEditor != null) {
editor = hostEditor editor = hostEditor
caretOffset = hostEditor.caretModel.offset
} }
val isVimAction = (action as? AnActionWrapper)?.delegate is VimShortcutKeyAction val isVimAction = (action as? AnActionWrapper)?.delegate is VimShortcutKeyAction
@@ -132,13 +131,12 @@ internal object IdeaSpecifics {
} }
//endregion //endregion
if (caretOffset != -1 && caretOffset != editor.caretModel.offset) { if (EditorHelper.getVisibleArea(editor).let { it.width > 0 && it.height > 0 }) {
injector.scroll.scrollCaretIntoView(editor.vim) injector.scroll.scrollCaretIntoView(editor.vim)
} }
} }
this.editor = null this.editor = null
this.caretOffset = -1
} }
} }