Added quick access to mode keymaps with ",".

Added multimethod to describe mode.

src/cljs/proton/core.cljs

@@ -52,9 +52,9 @@
 (defonce command-tree (atom {}))
 (defonce current-chain (atom []))
 
-(def mode-key :m)
+(def mode-keys [:m (keyword ",")])
 (defn is-mode-key? [chain-key]
-  (not (nil? (some #{mode-key} chain-key))))
+  (not (nil? (some #{(first chain-key)} mode-keys))))
 
 (defn chain [e]
   (let [key-code (helpers/extract-keycode-from-event e)
@@ -153,6 +153,7 @@
                 (atom-env/mark-last-step-as-completed!))))
 
           (atom-env/insert-process-step! "All done!" "")
+          (proton/init-modes-for-layers all-layers)
           (mode-manager/activate-mode (atom-env/get-active-editor))
           (.setTimeout js/window #(atom-env/hide-modal-panel) 3000))))))
 
@@ -161,10 +162,21 @@
   (atom-env/update-bottom-panel (helpers/tree->html @command-tree))
   (atom-env/activate-proton-mode!))
 
+(defn on-comma []
+  (reset! current-chain [])
+  (if-let [mode-keymap (mode-manager/get-mode-keybindings (atom-env/get-active-editor))]
+   (let [core-mode-key (first mode-keys)]
+    (swap! current-chain conj core-mode-key)
+    (swap! command-tree assoc-in [:m] mode-keymap)
+    (atom-env/update-bottom-panel (helpers/tree->html (get-in @command-tree @current-chain)))
+    (atom-env/activate-proton-mode!))))
+
 (defn activate [state]
   (.setTimeout js/window #(init) 2000)
   (let [disposable (.onDidMatchBinding keymaps #(if (= "space" (.-keystrokes %)) (on-space)))]
     (swap! disposables conj disposable))
+  (let [disposable (.onDidMatchBinding keymaps #(if (= "," (.-keystrokes %)) (on-comma)))]
+    (swap! disposables conj disposable))
   (swap! disposables conj (proton/panel-item-subscription))
   (.add subscriptions (.add commands "atom-text-editor.proton-mode" "proton:chain" chain)))
 
@@ -173,6 +185,8 @@
   (doseq [disposable @disposables]
     (.log js/console disposable)
     (.dispose disposable))
+  (reset! mode-manager/editors {})
+  (reset! mode-manager/modes {})
   (atom-env/reset-process-steps!))
 
 (defn serialize [] nil)

src/cljs/proton/layers/base.cljs

@@ -9,3 +9,4 @@
 (defmulti get-packages dispatch)
 (defmulti get-keybindings dispatch)
 (defmulti get-keymaps dispatch)
+(defmulti describe-mode dispatch)

src/cljs/proton/layers/core/core.cljs

@@ -1,5 +1,5 @@
 (ns proton.layers.core.core
-  (:use [proton.layers.base :only [init-layer! get-initial-config get-keybindings get-packages get-keymaps]])
+  (:use [proton.layers.base :only [init-layer! get-initial-config get-keybindings get-packages get-keymaps describe-mode]])
   (:require [proton.lib.proton :as proton]
             [proton.lib.package_manager :as package]
             [proton.layers.core.keybindings :refer [keybindings]]
@@ -55,3 +55,4 @@
 (defmethod get-keybindings :core [] @keybindings)
 (defmethod get-keymaps :core [] @keymaps)
 (defmethod get-packages :core [] @packages)
+(defmethod describe-mode :core [] {})

src/cljs/proton/layers/lang/clojure/core.cljs

@@ -1,25 +1,29 @@
 (ns proton.layers.lang.clojure.core
   (:require [proton.lib.mode :as mode :refer [define-mode define-keybindings]]
             [proton.lib.atom :as atom-env :refer [set-grammar]])
-  (:use [proton.layers.base :only [init-layer! get-initial-config get-keybindings get-packages get-keymaps]]))
+  (:use [proton.layers.base :only [init-layer! get-initial-config get-keybindings get-packages get-keymaps describe-mode]]))
+
+(defn- clojure-mode-init []
+ (atom-env/set-grammar "Clojure"))
 
 (defmethod init-layer! :lang/clojure
   [_ config]
-  ()
-  (mode/define-mode :clojure
-     :atom-grammars ["Clojure"]
-     :file-extensions [#"\.proton$"]
-     :init (fn []
-            (atom-env/set-grammar "Clojure")))
-  (mode/define-keybindings :clojure
-    {:t {:category "toggles"
-         :p {:action "parinfer:toggleMode" :title "Toggle Parinfer Mode"}}})
   (println "init clojure"))
 
 (defmethod get-packages :lang/clojure
   []
   [:Parinfer])
 
+(defmethod describe-mode :lang/clojure []
+  {:mode-name :clojure
+   :atom-grammars ["Clojure"]
+   :file-extensions [#"\.proton$"]
+   :mode-keybindings
+   {:t {:category "toggles"
+        :p {:action "parinfer:toggleMode" :title "Toggle Parinfer Mode"}}}
+   :init clojure-mode-init})
+
+
 (defmethod get-keymaps :lang/clojure [] [])
 (defmethod get-initial-config :lang/clojure [] [])
 (defmethod get-keybindings :lang/clojure [] {})

src/cljs/proton/layers/lang/julia/core.cljs

@@ -1,5 +1,5 @@
 (ns proton.layers.lang.julia.core
-  (:use [proton.layers.base :only [init-layer! get-initial-config get-keybindings get-packages get-keymaps]]))
+  (:use [proton.layers.base :only [init-layer! get-initial-config get-keybindings get-packages get-keymaps describe-mode]]))
 
 (defmethod get-initial-config :lang/julia
   []
@@ -25,3 +25,4 @@
 (defmethod get-keybindings :julia [] (get-keybindings :lang/julia))
 (defmethod get-initial-config :julia [] (get-initial-config :lang/julia))
 (defmethod init-layer! :julia [] (init-layer! :lang/julia))
+(defmethod describe-mode :lang/julia [] {})

src/cljs/proton/layers/lang/latex/core.cljs

@@ -1,5 +1,5 @@
 (ns proton.layers.lang.latex.core
-  (:use [proton.layers.base :only [init-layer! get-initial-config get-keybindings get-packages get-keymaps]]))
+  (:use [proton.layers.base :only [init-layer! get-initial-config get-keybindings get-packages get-keymaps describe-mode]]))
 
 (defmethod get-initial-config :lang/latex []
   ["proton.lang.latex.use-latex-plus" false])
@@ -33,3 +33,5 @@
 (defmethod get-keymaps :lang/latex
   []
   [])
+
+(defmethod describe-mode :lang/latex [] {})

src/cljs/proton/layers/lang/python/core.cljs

@@ -1,5 +1,5 @@
 (ns proton.layers.lang.python.core
-  (:use [proton.layers.base :only [init-layer! get-initial-config get-keybindings get-packages get-keymaps]]))
+  (:use [proton.layers.base :only [init-layer! get-initial-config get-keybindings get-packages get-keymaps describe-mode]]))
 
 (defmethod init-layer! :lang/python
   [_ config]
@@ -20,3 +20,4 @@
 (defmethod get-keybindings :python [] (get-keybindings :lang/python))
 (defmethod get-initial-config :python [] (get-initial-config :lang/python))
 (defmethod init-layer! :python [] (init-layer! :lang/python))
+(defmethod describe-mode :lang/python [] {})

src/cljs/proton/layers/tools/git/core.cljs

@@ -1,5 +1,5 @@
 (ns proton.layers.tools.git.core
-  (:use [proton.layers.base :only [init-layer! get-initial-config get-keybindings get-packages get-keymaps]]))
+  (:use [proton.layers.base :only [init-layer! get-initial-config get-keybindings get-packages get-keymaps describe-mode]]))
 
 (defmethod init-layer! :tools/git
   [_ config]
@@ -35,3 +35,4 @@
 (defmethod get-keybindings :git [] (get-keybindings :tools/git))
 (defmethod get-initial-config :git [] (get-initial-config :tools/git))
 (defmethod init-layer! :git [] (init-layer! :tools/git))
+(defmethod describe-mode :git [] {})

src/cljs/proton/layers/tools/minimap/core.cljs

@@ -1,5 +1,5 @@
 (ns proton.layers.tools.minimap.core
-  (:use [proton.layers.base :only [init-layer! get-initial-config get-keybindings get-packages get-keymaps]]))
+  (:use [proton.layers.base :only [init-layer! get-initial-config get-keybindings get-packages get-keymaps describe-mode]]))
 
 (defmethod init-layer! :tools/minimap
   [_ config]
@@ -17,3 +17,4 @@
 
 (defmethod get-keymaps :tools/minimap [] [])
 (defmethod get-initial-config :tools/minimap [] [])
+(defmethod describe-mode :tools/minimap [] {})

src/cljs/proton/lib/mode.cljs

@@ -23,8 +23,8 @@
 
 (defn is-mode-activated? [editor] (get editor :active))
 
-(defn define-mode [name & options]
-  (swap! modes assoc-in [name] (apply hash-map options)))
+(defn define-mode [name options]
+  (swap! modes assoc-in [name] options))
 
 (defn define-keybindings [name keymap]
   (swap! modes assoc-in [name :mode-keybindings] keymap))

src/cljs/proton/lib/proton.cljs

@@ -40,6 +40,11 @@
 (defn init-layers! [layers config]
   (doall (map #(layerbase/init-layer! (keyword %) config) layers)))
 
+(defn init-modes-for-layers [layers]
+  (doall
+    (map #(mode-manager/define-mode (get % :mode-name) (dissoc % :mode-name))
+     (filter #(not (nil? (get % :mode-name))) (map #(layerbase/describe-mode %) layers)))))
+
 (defn- on-active-pane-item [item]
   (if-let [editor (atom-env/get-active-editor)]
     (when (= (.-id editor) (.-id item))