4 files changed, 4 insertions, 27 deletions
diff --git a/src/main/kotlin/me/kyren223/trident/actions/AppendAction.kt b/src/main/kotlin/me/kyren223/trident/actions/TridentAppendAction.kt
index 1b9a2b4..1b0d33a 100644
--- a/src/main/kotlin/me/kyren223/trident/actions/AppendAction.kt
+++ b/src/main/kotlin/me/kyren223/trident/actions/TridentAppendAction.kt
@@ -7,7 +7,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
 import me.kyren223.trident.utils.TridentList
 
-class AppendAction : AnAction() {
+class TridentAppendAction : AnAction() {
     override fun actionPerformed(e: AnActionEvent) {
         val project: Project = e.project ?: return
         val file: VirtualFile = e.getData(PlatformDataKeys.VIRTUAL_FILE) ?: return
diff --git a/src/main/kotlin/me/kyren223/trident/actions/TridentListAction.kt b/src/main/kotlin/me/kyren223/trident/actions/TridentListAction.kt
index cef0bf2..0d733f3 100644
--- a/src/main/kotlin/me/kyren223/trident/actions/TridentListAction.kt
+++ b/src/main/kotlin/me/kyren223/trident/actions/TridentListAction.kt
@@ -2,32 +2,12 @@ package me.kyren223.trident.actions
 
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
-import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.command.MappingMode
-import com.maddyhome.idea.vim.key.MappingOwner
-import me.kyren223.trident.data.SettingsState
 import me.kyren223.trident.ui.TridentListMenu
 
 class TridentListAction : AnAction() {
     override fun actionPerformed(e: AnActionEvent) {
-        if (!remapped) remap()
         val project = e.project ?: return
         TridentListMenu.open(project)
     }
 
-    // TODO move the remap to somewhere else
-    private fun remap() {
-        if (!SettingsState.instance.enterToSelect) return
-        val keys = injector.parser.parseKeys(":action TridentQuickMenuSelect<cr>")
-        val keyGroup = injector.keyGroup
-        keyGroup.putKeyMapping(MappingMode.NVO,
-                injector.parser.parseKeys("<cr>"),
-                MappingOwner.Plugin.get("Trident"), keys, false
-        )
-        remapped = true
-    }
-
-    companion object {
-        var remapped = false
-    }
 }
diff --git a/src/main/kotlin/me/kyren223/trident/actions/TridentListSelectAction.kt b/src/main/kotlin/me/kyren223/trident/actions/TridentListSelectAction.kt
index d1dfd2d..1b68a59 100644
--- a/src/main/kotlin/me/kyren223/trident/actions/TridentListSelectAction.kt
+++ b/src/main/kotlin/me/kyren223/trident/actions/TridentListSelectAction.kt
@@ -3,12 +3,9 @@ package me.kyren223.trident.actions
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import me.kyren223.trident.ui.TridentListMenu
-import me.kyren223.trident.utils.TridentList
 
 class TridentListSelectAction : AnAction() {
     override fun actionPerformed(e: AnActionEvent) {
-        val project = e.project ?: return
-        TridentList.select(project, TridentListMenu.line)
+        TridentListMenu.instance?.select()
     }
-
 }
diff --git a/src/main/kotlin/me/kyren223/trident/actions/SelectAction.kt b/src/main/kotlin/me/kyren223/trident/actions/TridentSelectAction.kt
index 37617c4..60973f2 100644
--- a/src/main/kotlin/me/kyren223/trident/actions/SelectAction.kt
+++ b/src/main/kotlin/me/kyren223/trident/actions/TridentSelectAction.kt
@@ -6,10 +6,10 @@ import com.intellij.openapi.actionSystem.PlatformDataKeys
 import com.intellij.openapi.fileEditor.FileEditorManager
 import me.kyren223.trident.utils.TridentList
 
-class SelectAction : AnAction() {
+class TridentSelectAction : AnAction() {
     override fun actionPerformed(e: AnActionEvent) {
         val project = e.project ?: return
-        var index = when (val actionId = e.actionManager.getId(this)) {
+        val index = when (val actionId = e.actionManager.getId(this)) {
             NEXT -> {
                 val file = e.getData(PlatformDataKeys.VIRTUAL_FILE) ?: return
                 val current = TridentList.getIndexOfFile(project, file) ?: return