chylex/IntelliJ-IdeaVim
1
0
Fork 0
mirror of https://github.com/chylex/IntelliJ-IdeaVim.git synced 2025-07-29 16:59:01 +02:00
Code

Do not connect to the EditorAcgtionManager before the first editor is created

Browse Source
This commit is contained in:
Alex Plate 2019-11-07 12:40:56 +03:00
parent a6a60b6e71
commit 2e8dc4234f
No known key found for this signature in database
GPG Key ID: 0B97153C8FFEC09F
1 changed files with 19 additions and 7 deletions

26
src/com/maddyhome/idea/vim/listener/ListenerManager.kt
View File

@ -160,12 +160,6 @@ object VimListenerManager {
object GlobalListeners {
@JvmStatic
fun enable() {
val typedAction = EditorActionManager.getInstance().typedAction
if (typedAction.rawHandler !is VimTypedActionHandler) {
// Actually this if should always be true, but just as protection
EventFacade.getInstance().setupTypedActionHandler(VimTypedActionHandler(typedAction.rawHandler))
}
OptionsManager.number.addOptionChangeListener(EditorGroup.NumberChangeListener.INSTANCE)
OptionsManager.relativenumber.addOptionChangeListener(EditorGroup.NumberChangeListener.INSTANCE)
@ -173,7 +167,9 @@ object VimListenerManager {
}
fun disable() {
EventFacade.getInstance().restoreTypedActionHandler()
if (VimEditorFactoryListener.typedHandlerConnected) {
EventFacade.getInstance().restoreTypedActionHandler()
}
OptionsManager.number.removeOptionChangeListener(EditorGroup.NumberChangeListener.INSTANCE)
OptionsManager.relativenumber.removeOptionChangeListener(EditorGroup.NumberChangeListener.INSTANCE)
@ -252,7 +248,23 @@ object VimListenerManager {
}
private object VimEditorFactoryListener : EditorFactoryListener {
var typedHandlerConnected = false
private fun enableTypedHandler() {
if (typedHandlerConnected) return
typedHandlerConnected = true
// There is no sense to connect to EditorActionManager before the first editor was created
val typedAction = EditorActionManager.getInstance().typedAction
if (typedAction.rawHandler !is VimTypedActionHandler) {
// Actually this if should always be true, but just as protection
EventFacade.getInstance().setupTypedActionHandler(VimTypedActionHandler(typedAction.rawHandler))
}
}
override fun editorCreated(event: EditorFactoryEvent) {
enableTypedHandler()
VimPlugin.getEditor().editorCreated(event.editor)
VimPlugin.getMotion().editorCreated(event)
VimPlugin.getChange().editorCreated(event)