mirror of
https://github.com/chylex/IntelliJ-IdeaVim.git
synced 2025-07-05 05:38:52 +02:00
Compare commits
2 Commits
e096b803c5
...
3cc9ce73b9
Author | SHA1 | Date | |
---|---|---|---|
3cc9ce73b9 | |||
9370fb7809 |
@ -20,7 +20,7 @@ ideaVersion=2025.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=IC
|
ideaType=IC
|
||||||
instrumentPluginCode=true
|
instrumentPluginCode=true
|
||||||
version=chylex-1
|
version=chylex-47
|
||||||
javaVersion=21
|
javaVersion=21
|
||||||
remoteRobotVersion=0.11.23
|
remoteRobotVersion=0.11.23
|
||||||
antlrVersion=4.10.1
|
antlrVersion=4.10.1
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
package com.maddyhome.idea.vim.action
|
package com.maddyhome.idea.vim.action
|
||||||
|
|
||||||
import com.google.common.collect.ImmutableSet
|
import com.google.common.collect.ImmutableSet
|
||||||
|
import com.intellij.codeInsight.completion.CompletionService
|
||||||
import com.intellij.codeInsight.lookup.LookupManager
|
import com.intellij.codeInsight.lookup.LookupManager
|
||||||
import com.intellij.openapi.actionSystem.ActionManager
|
import com.intellij.openapi.actionSystem.ActionManager
|
||||||
import com.intellij.openapi.actionSystem.ActionUpdateThread
|
import com.intellij.openapi.actionSystem.ActionUpdateThread
|
||||||
@ -208,6 +209,10 @@ class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
|
|||||||
return ActionEnableStatus.yes("Vim only editor keys", LogLevel.INFO)
|
return ActionEnableStatus.yes("Vim only editor keys", LogLevel.INFO)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (CompletionService.getCompletionService().currentCompletion != null) {
|
||||||
|
return ActionEnableStatus.no("Code completion active", LogLevel.INFO)
|
||||||
|
}
|
||||||
|
|
||||||
val savedShortcutConflicts = VimPlugin.getKey().savedShortcutConflicts
|
val savedShortcutConflicts = VimPlugin.getKey().savedShortcutConflicts
|
||||||
val info = savedShortcutConflicts[keyStroke]
|
val info = savedShortcutConflicts[keyStroke]
|
||||||
return when (info?.forEditor(editor.vim)) {
|
return when (info?.forEditor(editor.vim)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user