mirror of
https://github.com/chylex/IntelliJ-IdeaVim.git
synced 2026-06-14 17:02:31 +02:00
Compare commits
26 Commits
customized
...
105892301d
| Author | SHA1 | Date | |
|---|---|---|---|
|
105892301d
|
|||
|
77b1730c60
|
|||
|
52a21229c1
|
|||
|
5bcaf55fd7
|
|||
|
a6e9784c52
|
|||
|
7badd2dc35
|
|||
|
8eae71653f
|
|||
|
9a6d4e15c3
|
|||
|
43d003f0ad
|
|||
|
88b703f447
|
|||
|
13d3130032
|
|||
|
6e52372f77
|
|||
|
d2cdda3f30
|
|||
|
503a2f274b
|
|||
|
e665ed9f04
|
|||
|
16c1cd1926
|
|||
|
f8158a4b9b
|
|||
|
847fb277f2
|
|||
|
511a71a8a0
|
|||
|
f92b2e4277
|
|||
|
fe256170b4
|
|||
|
0af65bda54
|
|||
|
7f9fa40a40
|
|||
|
6b17a963db
|
|||
|
64aa59b5a5
|
|||
|
9845668c5b
|
@@ -375,7 +375,7 @@ intellijPlatform {
|
||||
)
|
||||
|
||||
ideaVersion {
|
||||
sinceBuild.set("253")
|
||||
sinceBuild.set("2025.3")
|
||||
untilBuild.set(provider { null })
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ ideaVersion=2026.1
|
||||
# Values for type: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension-type
|
||||
ideaType=IU
|
||||
instrumentPluginCode=true
|
||||
version=chylex-54
|
||||
version=chylex-53
|
||||
javaVersion=21
|
||||
remoteRobotVersion=0.11.23
|
||||
antlrVersion=4.10.1
|
||||
|
||||
@@ -49,6 +49,7 @@ import com.maddyhome.idea.vim.group.NotificationService
|
||||
import com.maddyhome.idea.vim.group.visual.IdeaSelectionControl
|
||||
import com.maddyhome.idea.vim.helper.exitSelectMode
|
||||
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.newapi.globalIjOptions
|
||||
import com.maddyhome.idea.vim.newapi.initInjector
|
||||
@@ -332,6 +333,23 @@ internal object IdeaSpecifics {
|
||||
vimEditor.exitMode()
|
||||
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")
|
||||
internal class PopupMenuVisibleFunctionHandler : BuiltinFunctionHandler<VimInt>() {
|
||||
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