Update Aniseed autoload again, fix completion of autoloaded modules

Author: Olical

fnl/conjure/client/fennel/aniseed.fnl

@@ -113,13 +113,21 @@
 
 (defn value->completions [x]
   (when (= :table (type x))
-    (a.map
-      (fn [[k v]]
-        {:word k
-         :kind (type v)
-         :menu nil
-         :info nil})
-      (a.kv-pairs x))))
+    (->> (if (. x :aniseed/autoload-enabled?)
+           (do
+             (. x :trick-aniseed-into-loading-the-module)
+             (. x :aniseed/autoload-module))
+           x)
+         (a.kv-pairs)
+         (a.filter
+           (fn [[k v]]
+             (not (text.starts-with k "aniseed/"))))
+         (a.map
+           (fn [[k v]]
+             {:word k
+              :kind (type v)
+              :menu nil
+              :info nil})))))
 
 (defn completions [opts]
   (let [code (when (not (str.blank? opts.prefix))
@@ -131,6 +139,7 @@
                    (a.concat
                      (value->completions (a.get m :aniseed/locals))
                      (value->completions (a.get-in m [:aniseed/local-fns :require]))
+                     (value->completions (a.get-in m [:aniseed/local-fns :autoload]))
                      mods)
                    mods))
         result-fn

lua/conjure/aniseed/autoload.lua

@@ -41,13 +41,13 @@ do
   do
     local v_0_0
     local function autoload1(name)
-      local res = {["conjure.aniseed.autoload/enabled?"] = true, ["conjure.aniseed.autoload/module"] = false}
+      local res = {["aniseed/autoload-enabled?"] = true, ["aniseed/autoload-module"] = false}
       local function ensure()
-        if res["conjure.aniseed.autoload/module"] then
-          return res["conjure.aniseed.autoload/module"]
+        if res["aniseed/autoload-module"] then
+          return res["aniseed/autoload-module"]
         else
           local m = require(name)
-          res["conjure.aniseed.autoload/module"] = m
+          res["aniseed/autoload-module"] = m
           return m
         end
       end

lua/conjure/client/fennel/aniseed.lua

@@ -333,7 +333,21 @@ do
           local v = _arg_0_[2]
           return {info = nil, kind = type(v), menu = nil, word = k}
         end
-        return a.map(_3_, a["kv-pairs"](x))
+        local function _5_(_4_0)
+          local _arg_0_ = _4_0
+          local k = _arg_0_[1]
+          local v = _arg_0_[2]
+          return not text["starts-with"](k, "aniseed/")
+        end
+        local function _6_()
+          if x["aniseed/autoload-enabled?"] then
+            do local _ = x["trick-aniseed-into-loading-the-module"] end
+            return x["aniseed/autoload-module"]
+          else
+            return x
+          end
+        end
+        return a.map(_3_, a.filter(_5_, a["kv-pairs"](_6_())))
       end
     end
     v_0_0 = value__3ecompletions0
@@ -365,7 +379,7 @@ do
         end
         ok_3f, m = (opts.context and pcall(_3_))
         if ok_3f then
-          locals = a.concat(value__3ecompletions(a.get(m, "aniseed/locals")), value__3ecompletions(a["get-in"](m, {"aniseed/local-fns", "require"})), mods)
+          locals = a.concat(value__3ecompletions(a.get(m, "aniseed/locals")), value__3ecompletions(a["get-in"](m, {"aniseed/local-fns", "require"})), value__3ecompletions(a["get-in"](m, {"aniseed/local-fns", "autoload"})), mods)
         else
           locals = mods
         end