mirror of
https://github.com/chylex/IntelliJ-IdeaVim.git
synced 2026-06-14 17:02:31 +02:00
Compare commits
28 Commits
898f37796e
...
customized
| Author | SHA1 | Date | |
|---|---|---|---|
|
7c4efe496d
|
|||
|
19aa1f928c
|
|||
|
b7d17bbb6e
|
|||
|
91546dd0d7
|
|||
|
89e1511860
|
|||
|
507bbff1c3
|
|||
|
716956a30f
|
|||
|
dd33e39850
|
|||
|
ebc77454ab
|
|||
|
c9193cb6d4
|
|||
|
13246c0a80
|
|||
|
b0ff57a4f5
|
|||
|
f4e0684ca8
|
|||
|
3a3e7952b1
|
|||
|
1ff6066e33
|
|||
|
3a9abba410
|
|||
|
510f8f948e
|
|||
|
b623bf739c
|
|||
|
c99d97b3bc
|
|||
|
6b8eb8952f
|
|||
|
25d70ee975
|
|||
|
cbc9637d17
|
|||
|
0d893d9961
|
|||
|
4ac3a1eaaa
|
|||
|
86a6e9643f
|
|||
|
8b06078607
|
|||
|
924455907a
|
|||
|
40367859b8
|
@@ -303,11 +303,6 @@ tasks {
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
buildPlugin {
|
||||
dependsOn(sourcesJar)
|
||||
from(sourcesJar) { into("lib/src") }
|
||||
}
|
||||
}
|
||||
|
||||
java {
|
||||
@@ -380,13 +375,7 @@ intellijPlatform {
|
||||
)
|
||||
|
||||
ideaVersion {
|
||||
// Let the Gradle plugin set the since-build version. It defaults to the version of the IDE we're building against
|
||||
// specified as two components, `{branch}.{build}` (e.g., "241.15989"). There is no third component specified.
|
||||
// The until-build version defaults to `{branch}.*`, but we want to support _all_ future versions, so we set it
|
||||
// with a null provider (the provider is important).
|
||||
// By letting the Gradle plugin handle this, the Plugin DevKit IntelliJ plugin cannot help us with the "Usage of
|
||||
// IntelliJ API not available in older IDEs" inspection. However, since our since-build is the version we compile
|
||||
// against, we can never get an API that's newer - it would be an unresolved symbol.
|
||||
sinceBuild.set("253")
|
||||
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-53
|
||||
version=chylex-54
|
||||
javaVersion=21
|
||||
remoteRobotVersion=0.11.23
|
||||
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.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
|
||||
@@ -333,23 +332,6 @@ 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