chylex/IntelliJ-AceJump
1
0
Fork 0
mirror of https://github.com/chylex/IntelliJ-AceJump.git synced 2024-11-25 17:42:46 +01:00
Code

Compare commits

base: chylex:6de52d21b67746c06f2dcc9ad6ba1e1798453d23
Branches Tags
chylex:master
chylex:vim
chylex:pr-optimize-search
chylex:broken-idea-2
chylex:broken-idea
chylex:experimental-rework
chylex:experimental-rework-progsel
chylex:experimental-interactive-modes
chylex:customized
chylex:experimental
...
compare: chylex:100001ffcabf41086216192c25253724556467d7
Branches Tags
chylex:vim
chylex:pr-optimize-search
chylex:broken-idea-2
chylex:broken-idea
chylex:master
chylex:experimental-rework
chylex:experimental-rework-progsel
chylex:experimental-interactive-modes
chylex:customized
chylex:experimental

3 Commits
6de52d21b6 ... 100001ffca

Author SHA1 Message Date
chylex
100001ffca
Set version to chylex-13 2023-10-04 02:41:33 +02:00
chylex
184896a6cb
Update for IdeaVIM chylex-16 2023-10-04 02:41:05 +02:00
chylex
8563400946
Set plugin version to chylex-12 2023-10-04 02:40:51 +02:00
3 changed files with 23 additions and 17 deletions
Show Stats Expand all files Collapse all files

6
build.gradle.kts
View File

@ -8,7 +8,7 @@ plugins {
}
group = "org.acejump"
version = "chylex-11"
version = "chylex-13"
repositories {
mavenCentral()
@ -19,9 +19,9 @@ kotlin {
}
intellij {
version.set("2023.1")
version.set("2023.2")
updateSinceUntilBuild.set(false)
plugins.add("IdeaVIM:chylex-15")
plugins.add("IdeaVIM:chylex-16")
pluginsRepositories {
custom("https://intellij.chylex.com")

21
src/main/kotlin/org/acejump/action/AceVimAction.kt
View File

@ -6,23 +6,19 @@ import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.WriteAction
import com.intellij.openapi.project.DumbAwareAction
import com.maddyhome.idea.vim.KeyHandler
import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.action.change.change.ChangeVisualAction
import com.maddyhome.idea.vim.action.change.delete.DeleteVisualAction
import com.maddyhome.idea.vim.action.copy.YankVisualAction
import com.maddyhome.idea.vim.api.injector
import com.maddyhome.idea.vim.command.MappingMode.OP_PENDING
import com.maddyhome.idea.vim.command.OperatorArguments
import com.maddyhome.idea.vim.command.VimStateMachine
import com.maddyhome.idea.vim.group.visual.vimSetSelection
import com.maddyhome.idea.vim.helper.inVisualMode
import com.maddyhome.idea.vim.helper.vimSelectionStart
import com.maddyhome.idea.vim.helper.vimStateMachine
import com.maddyhome.idea.vim.newapi.vim
import org.acejump.boundaries.StandardBoundaries.AFTER_CARET
import org.acejump.boundaries.StandardBoundaries.BEFORE_CARET
import org.acejump.boundaries.StandardBoundaries.CARET_LINE
import org.acejump.boundaries.StandardBoundaries.VISIBLE_ON_SCREEN
import com.maddyhome.idea.vim.state.mode.SelectionType
import org.acejump.boundaries.StandardBoundaries.*
import org.acejump.modes.JumpMode
import org.acejump.search.Pattern
import org.acejump.search.Tag
@ -49,7 +45,7 @@ sealed class AceVimAction : DumbAwareAction() {
state.act(AceTagAction.JumpToSearchStart, acceptedTag, wasUpperCase, isFinal = true)
if (selectionStart != null) {
caret.vimSetSelection(selectionStart, caret.offset, moveCaretToSelectionEnd = true)
caret.vim.vimSetSelection(selectionStart, caret.offset, moveCaretToSelectionEnd = true)
}
else {
val vim = editor.vim
@ -60,8 +56,8 @@ sealed class AceVimAction : DumbAwareAction() {
commandState.reset()
KeyHandler.getInstance().fullReset(vim)
VimPlugin.getVisualMotion().enterVisualMode(vim, VimStateMachine.SubMode.VISUAL_CHARACTER)
caret.vimSetSelection(caret.offset, initialOffset, moveCaretToSelectionEnd = true)
AceVimUtil.enterVisualMode(vim, SelectionType.CHARACTER_WISE)
caret.vim.vimSetSelection(caret.offset, initialOffset, moveCaretToSelectionEnd = true)
val action = when (key) {
'd' -> DeleteVisualAction()
@ -76,12 +72,9 @@ sealed class AceVimAction : DumbAwareAction() {
commandState.commandBuilder.pushCommandPart(action)
val cmd = commandState.commandBuilder.buildCommand()
val operatorArguments = OperatorArguments(
commandState.mappingState.mappingMode == OP_PENDING,
cmd.rawCount, commandState.mode, commandState.subMode
)
val operatorArguments = OperatorArguments(commandState.mappingState.mappingMode == OP_PENDING, cmd.rawCount, commandState.mode)
commandState.setExecutingCommand(cmd)
commandState.executingCommand = cmd
injector.actionExecutor.executeVimAction(vim, action, context, operatorArguments)
// TODO does not update status
}

13
src/main/kotlin/org/acejump/action/AceVimUtil.java Normal file
View File

@ -0,0 +1,13 @@
package org.acejump.action;
import com.maddyhome.idea.vim.VimPlugin;
import com.maddyhome.idea.vim.api.VimEditor;
import com.maddyhome.idea.vim.state.mode.SelectionType;
final class AceVimUtil {
private AceVimUtil() {}
public static void enterVisualMode(final VimEditor vim, final SelectionType mode) {
VimPlugin.getVisualMotion().enterVisualMode(vim, mode);
}
}