next/previous completion popup with Ctrl-n/Ctrl-p

Author: fominok

src/main/clojure/fominok/ideahelix/core.clj

@@ -5,7 +5,7 @@
 (ns fominok.ideahelix.core
   (:require
     [cider.nrepl :refer (cider-nrepl-handler)]
-    [fominok.ideahelix.editor :refer [handle-editor-event state-atom]]
+    [fominok.ideahelix.editor :refer [handle-editor-event state-atom quit-insert-mode]]
     [fominok.ideahelix.editor.selection :refer :all]
     [fominok.ideahelix.editor.ui :as ui]
     [nrepl.server :refer [start-server]])
@@ -53,4 +53,10 @@
                                  (ihx-apply-selection! document))))))))
 
 
+(defn focus-lost
+  [project ^Editor editor]
+  (let [state (or (get @state-atom project) {:mode :normal})]
+    (quit-insert-mode project state (.getDocument editor))))
+
+
 (defonce -server (start-server :port 7888 :handler cider-nrepl-handler))

src/main/clojure/fominok/ideahelix/editor.clj

@@ -13,6 +13,10 @@
     [fominok.ideahelix.editor.util :refer [get-editor-height]]
     [fominok.ideahelix.keymap :refer [defkeymap]])
   (:import
+    (com.intellij.codeInsight.lookup
+      LookupManager)
+    (com.intellij.codeInsight.lookup.impl
+      LookupImpl)
     (com.intellij.ide.actions.searcheverywhere
       SearchEverywhereManager)
     (com.intellij.openapi.actionSystem
@@ -40,7 +44,7 @@
         1))))
 
 
-(defn- quit-insert-mode
+(defn quit-insert-mode
   [project state document]
   (doseq [[editor {:keys [mark-action pre-selections]}] (:per-editor state)]
     (restore-selections pre-selections (:insertion-kind state) editor document)
@@ -517,7 +521,24 @@
     (\o
       [editor] (actions editor "UnsplitAll")
       [state] (assoc state :mode :normal))
-    (_ [state] (assoc state :mode :normal))))
+    (_ [state] (assoc state :mode :normal)))
+
+  (:insert
+    ((:or (:ctrl \n) (:ctrl \u000e))
+     "Select next completion item"
+     [state editor event]
+     (when (= (.getID event) KeyEvent/KEY_PRESSED)
+       (when-let [^LookupImpl lookup (LookupManager/getActiveLookup editor)]
+         (.setSelectedIndex lookup (inc (.getSelectedIndex lookup)))
+         state)))
+    ((:or (:ctrl \p) (:ctrl \u0010))
+     "Select next completion item"
+     [state editor event]
+     (when (= (.getID event) KeyEvent/KEY_PRESSED)
+       (when-let [^LookupImpl lookup (LookupManager/getActiveLookup editor)]
+         (.setSelectedIndex lookup (dec (.getSelectedIndex lookup)))
+         state)))
+    (_ [state] (assoc state :pass true))))
 
 
 (defn handle-editor-event
@@ -533,14 +554,14 @@
               (= (.getKeyCode event) KeyEvent/VK_ESCAPE) (result-fn)
               (and debounce (= (.getID event) KeyEvent/KEY_TYPED))
               (assoc project-state :debounce false)
-              :else :pass)
+              :else (result-fn))
             (if (= (.getID event) KeyEvent/KEY_PRESSED)
               (result-fn)
               nil))
           (catch StartMarkAction$AlreadyStartedException _
             (quit-insert-mode project project-state (.getDocument editor))))]
     (cond
-      (= :pass result) false
+      (:pass result) false
       (map? result) (do
                       (.consume event)
                       (let [new-state (merge project-state result)]

src/main/clojure/fominok/ideahelix/keymap.clj

@@ -51,6 +51,7 @@
 ;; One of possible dependencies of the statement to expect.
 (s/def ::dep
   (s/or :char (partial = 'char) ; typed character
+        :event (partial = 'event) ; keyboard event that triggered this handler
         :editor (partial = 'editor) ; editor in focus
         :state (partial = 'state) ; ideahelix->project state
         :document (partial = 'document) ; document instance running in the editor
@@ -148,6 +149,7 @@
         (into [] (mapcat
                    (fn [[kw sym]]
                      [sym (case kw
+                            :event event
                             :state project-state
                             :project project
                             :document `(.getDocument ~editor)

src/main/kotlin/fominok/ideahelix/Init.kt

@@ -27,6 +27,7 @@ class Init : ProjectActivity {
     override suspend fun execute(project: Project) {
         val pushEvent: IFn
         val focusEditor: IFn
+        val focusLost: IFn
 
         // Per https://plugins.jetbrains.com/docs/intellij/plugin-class-loaders.html#using-serviceloader:
         val currentThread = Thread.currentThread()
@@ -40,6 +41,7 @@ class Init : ProjectActivity {
 
             pushEvent = Clojure.`var`("fominok.ideahelix.core", "push-event") as IFn
             focusEditor = Clojure.`var`("fominok.ideahelix.core", "focus-editor") as IFn
+            focusLost = Clojure.`var`("fominok.ideahelix.core", "focus-lost") as IFn
         } finally {
             currentThread.contextClassLoader = originalClassLoader
         }
@@ -72,6 +74,13 @@ class Init : ProjectActivity {
                     focusEditor.invoke(project, editor)
                 })
             }
+
+            override fun focusLost(editor: Editor) {
+                super.focusLost(editor)
+                applicationManager.invokeLater({
+                    focusLost.invoke(project, editor)
+                })
+            }
         }, project)