fix ESC handling on popups

Author: fominok

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

@@ -23,10 +23,11 @@
 
 (defn push-event
   [project focus-owner event]
-  (condp instance? focus-owner
-    EditorComponentImpl
-    (handle-editor-event project (.getEditor ^EditorComponentImpl focus-owner) event)
-    false))
+  (boolean
+    (when (instance? EditorComponentImpl focus-owner)
+      (let [editor (.getEditor ^EditorComponentImpl focus-owner)]
+        (when-not (.isOneLineMode editor)
+          (handle-editor-event project editor event))))))
 
 
 (defn- caret-listener
@@ -53,10 +54,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))))
+#_(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

@@ -548,7 +548,10 @@
         (try
           (if (= mode :insert)
             (cond
-              (= (.getKeyCode event) KeyEvent/VK_ESCAPE) (result-fn)
+              (and (= (.getID event) KeyEvent/KEY_PRESSED)
+                   (= (.getKeyCode event) KeyEvent/VK_ESCAPE)) (result-fn)
+              (and (not= (.getID event) KeyEvent/KEY_PRESSED)
+                   (= (.getKeyCode event) KeyEvent/VK_ESCAPE)) nil
               (and debounce (= (.getID event) KeyEvent/KEY_TYPED))
               (assoc project-state :debounce false)
               :else (result-fn))

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

@@ -4,7 +4,8 @@
 
 (ns fominok.ideahelix.editor.ui
   (:require
-    [clojure.string :as str])
+    [clojure.string :as str]
+    [fominok.ideahelix.editor.util :refer [when-let*]])
   (:import
     (com.intellij.openapi.editor
       CaretVisualAttributes
@@ -20,16 +21,16 @@
 (defn update-mode-panel!
   [project editor-state]
   (let [id (ModePanel/ID)
-        status-bar (.. WindowManager getInstance (getStatusBar project))
-        widget (.getWidget status-bar id)
         mode-text (str/upper-case (name (or (:mode editor-state)
                                             :normal)))
         widget-text
         (str
           (when-let [prefix (:prefix editor-state)] (format "(%s) " (apply str prefix)))
           mode-text)]
-    (.setText widget widget-text)
-    (.updateWidget status-bar id)))
+    (when-let* [status-bar (.. WindowManager getInstance (getStatusBar project))
+                widget (.getWidget status-bar id)]
+               (.setText widget widget-text)
+               (.updateWidget status-bar id))))
 
 
 (defn highlight-primary-caret

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

@@ -5,6 +5,14 @@
 (ns fominok.ideahelix.editor.util)
 
 
+(defmacro when-let*
+  ([bindings & body]
+   (if (seq bindings)
+     `(when-let [~(first bindings) ~(second bindings)]
+        (when-let* ~(drop 2 bindings) ~@body))
+     `(do ~@body))))
+
+
 (defn deep-merge
   [& maps]
   (reduce (fn [m1 m2]

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

@@ -75,12 +75,12 @@ class Init : ProjectActivity {
                 })
             }
 
-            override fun focusLost(editor: Editor) {
+            /*override fun focusLost(editor: Editor) {
                 super.focusLost(editor)
                 applicationManager.invokeLater({
                     focusLost.invoke(project, editor)
                 })
-            }
+            }*/
         }, project)