keymap and behavior auto-complete now respect : as meaning look at tags, not descriptions

Signed-off-by: Chris Granger <[email protected]>

Author: ibdknox

src/lt/objs/command.cljs

@@ -14,11 +14,14 @@
                                 (:command k)
                                 k))))
 
-(defn completions []
-  (map #(if-not (:desc %)
-          #js {:completion (str (:command %)) :text (str (:command %))}
-          #js {:completion (str (:command %)) :text (:desc %)})
-       (vals (:commands @manager))))
+(defn completions [token]
+  (if (and token
+           (= (subs token 0 1) ":"))
+    (map #(do #js {:completion (str (:command %)) :text (str (:command %))}) (vals (:commands @manager)))
+    (map #(if-not (:desc %)
+            #js {:completion (str (:command %)) :text (str (:command %))}
+            #js {:completion (str (:command %)) :text (:desc %)})
+         (vals (:commands @manager)))))
 
 (defn exec!
   "Execute a Light Table command with the given args"

src/lt/objs/langs/behaviors.cljs

@@ -74,12 +74,14 @@
     (aset cur "select" wrapped-replacement))
   cur)
 
-
-(defn user-behavior-completions []
-  (map #(if-not (:desc %)
-          (->wrapped-behavior % #js {:text (str (:name %))})
-          (->wrapped-behavior % #js {:text (:desc %)}))
-       (filter #(= (:type %) :user) (vals @object/behaviors))))
+(defn user-behavior-completions [_ _ token]
+  (if (and token
+           (= (subs token 0 1) ":"))
+    (map #(->wrapped-behavior % #js {:text (str (:name %))}) (vals @object/behaviors))
+    (map #(if-not (:desc %)
+            (->wrapped-behavior % #js {:text (str (:name %))})
+            (->wrapped-behavior % #js {:text (:desc %)}))
+         (filter #(= (:type %) :user) (vals @object/behaviors)))))
 
 (def completions {:root [#js {:completion ":+"}
                          #js {:completion ":-"}]
@@ -103,13 +105,13 @@
 
 (behavior ::behavior-hints
                   :triggers #{:hints+}
-                  :reaction (fn [this hints]
+                  :reaction (fn [this hints token]
                               (let [comps (completions (pos->state this))]
                                 (if-not comps
                                   hints
                                   (if (fn? comps)
                                     (let [idx (->index this)]
-                                      (comps (pos->behavior this (- idx 2)) (dec idx)))
+                                      (comps (pos->behavior this (- idx 2)) (dec idx) token))
                                     comps)))))
 
 (behavior ::show-info-on-move

src/lt/objs/langs/keymap.cljs

@@ -70,12 +70,12 @@
 (behavior ::keymap-hints
                   :triggers #{:hints+}
                   :exclusive [:lt.plugins.auto-complete/textual-hints]
-                  :reaction (fn [this hints]
+                  :reaction (fn [this hints token]
                               (let [comps (completions (pos->state this))]
                                 (if-not comps
                                   hints
                                   (if (fn? comps)
-                                    (comps)
+                                    (comps token)
                                     comps)))))
 
 (behavior ::show-info-on-move

src/lt/plugins/auto_complete.cljs

@@ -147,11 +147,12 @@
 
 (def hinter (-> (scmd/filter-list {:items (fn []
                                             (when-let [cur (pool/last-active)]
-                                              (distinct-completions
-                                               (if (:starting-token @hinter)
-                                                 (remove #(= (-> @hinter :starting-token :string) (.-completion %))
-                                                         (object/raise-reduce cur :hints+ []))
-                                                 (object/raise-reduce cur :hints+ [])))))
+                                              (let [token (-> @hinter :starting-token :string)]
+                                                (distinct-completions
+                                                 (if token
+                                                   (remove #(= token (.-completion %))
+                                                           (object/raise-reduce cur :hints+ [] token))
+                                                   (object/raise-reduce cur :hints+ []))))))
                                    :key text|completion})
                 (object/add-tags [:hinter])))
 
@@ -338,4 +339,4 @@
                       (js/CodeMirror.extendMode "clojure" (clj->js {:hint-pattern #"[\w\-\>\:\*\$\?\<\!\+\.\/foo]"}))
                       (js/CodeMirror.extendMode "text/x-clojurescript" (clj->js {:hint-pattern #"[\w\-\>\:\*\$\?\<\!\+\.\/foo]"}))
                       (js/CodeMirror.extendMode "css" (clj->js {:hint-pattern #"[\w\.\-\#]"}))
-                      ))
+                      ))