mirror of
https://github.com/chylex/IntelliJ-IdeaVim.git
synced 2026-03-30 21:52:36 +02:00
Compare commits
8 Commits
customized
...
customized
| Author | SHA1 | Date | |
|---|---|---|---|
|
7c4efe496d
|
|||
|
19aa1f928c
|
|||
|
b7d17bbb6e
|
|||
|
91546dd0d7
|
|||
|
89e1511860
|
|||
|
507bbff1c3
|
|||
|
716956a30f
|
|||
|
dd33e39850
|
@@ -20,7 +20,7 @@ ideaVersion=2026.1
|
|||||||
# Values for type: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension-type
|
# Values for type: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension-type
|
||||||
ideaType=IU
|
ideaType=IU
|
||||||
instrumentPluginCode=true
|
instrumentPluginCode=true
|
||||||
version=chylex-53
|
version=chylex-54
|
||||||
javaVersion=21
|
javaVersion=21
|
||||||
remoteRobotVersion=0.11.23
|
remoteRobotVersion=0.11.23
|
||||||
antlrVersion=4.10.1
|
antlrVersion=4.10.1
|
||||||
|
|||||||
@@ -49,7 +49,6 @@ import com.maddyhome.idea.vim.group.NotificationService
|
|||||||
import com.maddyhome.idea.vim.group.visual.IdeaSelectionControl
|
import com.maddyhome.idea.vim.group.visual.IdeaSelectionControl
|
||||||
import com.maddyhome.idea.vim.helper.exitSelectMode
|
import com.maddyhome.idea.vim.helper.exitSelectMode
|
||||||
import com.maddyhome.idea.vim.helper.exitVisualMode
|
import com.maddyhome.idea.vim.helper.exitVisualMode
|
||||||
import com.maddyhome.idea.vim.helper.hasVisualSelection
|
|
||||||
import com.maddyhome.idea.vim.helper.isIdeaVimDisabledHere
|
import com.maddyhome.idea.vim.helper.isIdeaVimDisabledHere
|
||||||
import com.maddyhome.idea.vim.newapi.globalIjOptions
|
import com.maddyhome.idea.vim.newapi.globalIjOptions
|
||||||
import com.maddyhome.idea.vim.newapi.initInjector
|
import com.maddyhome.idea.vim.newapi.initInjector
|
||||||
@@ -333,23 +332,6 @@ internal object IdeaSpecifics {
|
|||||||
vimEditor.exitMode()
|
vimEditor.exitMode()
|
||||||
vimEditor.mode = Mode.NORMAL()
|
vimEditor.mode = Mode.NORMAL()
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
// IdeaSelectionControl will not be called if we're moving to a new variable with no change in selection.
|
|
||||||
// And if we're moving to the end of the template, the change in selection will reset us to Normal because
|
|
||||||
// IdeaSelectionControl will be called when the template is no longer active.
|
|
||||||
if ((!editor.selectionModel.hasSelection() && !vimEditor.mode.hasVisualSelection) || newIndex == -1) {
|
|
||||||
if (vimEditor.isIdeaRefactorModeSelect) {
|
|
||||||
if (vimEditor.mode !is Mode.INSERT) {
|
|
||||||
vimEditor.exitMode()
|
|
||||||
injector.application.runReadAction {
|
|
||||||
val context = injector.executionContextManager.getEditorExecutionContext(editor.vim)
|
|
||||||
VimPlugin.getChange().insertBeforeCaret(editor.vim, context)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
vimEditor.mode = Mode.NORMAL()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,5 +20,5 @@ import com.maddyhome.idea.vim.vimscript.model.functions.BuiltinFunctionHandler
|
|||||||
@VimscriptFunction(name = "pumvisible")
|
@VimscriptFunction(name = "pumvisible")
|
||||||
internal class PopupMenuVisibleFunctionHandler : BuiltinFunctionHandler<VimInt>() {
|
internal class PopupMenuVisibleFunctionHandler : BuiltinFunctionHandler<VimInt>() {
|
||||||
override fun doFunction(arguments: Arguments, editor: VimEditor, context: ExecutionContext, vimContext: VimLContext) =
|
override fun doFunction(arguments: Arguments, editor: VimEditor, context: ExecutionContext, vimContext: VimLContext) =
|
||||||
(CompletionService.getCompletionService().currentCompletion == null).asVimInt()
|
(CompletionService.getCompletionService().currentCompletion != null).asVimInt()
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user