Merge branch 'develop'

.fs.test

@@ -0,0 +1 @@
+This is here to test some filesystem related things.

fnl/conjure/eval.fnl

@@ -43,13 +43,13 @@
                   2 (. range.end 2)}]
 
       (vim.highlight.range
-        bufnr
-        namespace
-        (config.get-in [:highlight :group])
-        hl_start
-        hl_end
-        :v
-        true)
+        bufnr namespace (config.get-in [:highlight :group]) hl_start hl_end
+        (unpack
+          ;; https://github.com/neovim/neovim/issues/14090#issuecomment-1047205812
+          (if (= 1 (nvim.fn.has "nvim-0.7"))
+            [{:regtype :v
+              :inclusive true}]
+            [:v true])))
 
       (timer.defer
         (fn []

fnl/conjure/fs.fnl

@@ -39,28 +39,22 @@
                 (join-path))]
     (if (= "" res)
       nil
-      ;; TODO: Needs to be Windows compatible?
-      (.. "/" res))))
+      (.. afs.path-sep res))))
 
-(defn upwards-file-search [orig-names orig-dir]
+(defn upwards-file-search [file-names from-dir]
   "Given a list of relative filenames and an absolute path to a directory,
   return the absolute path of the first file that matches a relative path,
   starting at the directory and then upwards towards the root directory. If no
   match is found, return nil."
-  (var names orig-names)
-  (var dir orig-dir)
-  (var file nil)
-  (while (and dir (not file))
-    (let [name (a.first names)]
-      (if name
-        (let [res (findfile name dir)]
-          (if res
-            (set file res)
-            (set names (a.rest names))))
-        (do
-          (set names orig-names)
-          (set dir (parent-dir dir))))))
-  file)
+
+  (when (and from-dir (not (a.empty? file-names)))
+    (let [result (a.some
+                   (fn [file-name]
+                     (findfile file-name from-dir))
+                   file-names)]
+      (if result
+        result
+        (upwards-file-search file-names (parent-dir from-dir))))))
 
 (defn resolve-above [names]
   "Resolve a pathless list of file names to an absolute path by looking in the

fnl/conjure/sponsors.fnl

@@ -10,6 +10,7 @@
 "davidmh"
 "dharrigan"
 "djwhitt"
+"Fedreg"
 "frenchy64"
 "fuadsaud"
 "harrygallagher4"

lua/conjure/aniseed/deps/fennel.lua

@@ -363,9 +363,9 @@ package.preload["conjure.aniseed.fennel.repl"] = package.preload["conjure.anisee
           _571_ = _572_
         end
       end
-      if ((_G.type(_571_) == "table") and ((_571_).what == "Lua") and (nil ~= (_571_).linedefined) and (nil ~= (_571_).source) and (nil ~= (_571_).short_src)) then
-        local line = (_571_).linedefined
+      if ((_G.type(_571_) == "table") and (nil ~= (_571_).source) and (nil ~= (_571_).linedefined) and ((_571_).what == "Lua") and (nil ~= (_571_).short_src)) then
         local source = (_571_).source
+        local line = (_571_).linedefined
         local src = (_571_).short_src
         local fnlsrc
         do
@@ -3456,7 +3456,7 @@ package.preload["conjure.aniseed.fennel.parser"] = package.preload["conjure.anis
         end
       end
       local function escape_char(c)
-        return ({nil, nil, nil, nil, nil, nil, "\\a", "\\b", "\\t", "\\n", "\\v", "\\f", "\\r"})[c:byte()]
+        return ({[7] = "\\a", [8] = "\\b", [9] = "\\t", [10] = "\\n", [11] = "\\v", [12] = "\\f", [13] = "\\r"})[c:byte()]
       end
       local function parse_string()
         table.insert(stack, {closer = 34})

lua/conjure/aniseed/macros.fnl

@@ -175,10 +175,10 @@
     (tset ,mod-sym ,(tostring name) ,name)])
 
 (fn defonce- [name value]
-  `(def- ,name (or ,name ,value)))
+  `(def- ,name (or (. ,mod-sym ,(tostring name)) ,value)))
 
 (fn defonce [name value]
-  `(def ,name (or ,name ,value)))
+  `(def ,name (or (. ,mod-sym ,(tostring name)) ,value)))
 
 (fn deftest [name ...]
   `(let [tests# (or (. ,mod-sym :aniseed/tests

lua/conjure/client.lua

@@ -22,9 +22,9 @@ local state_key
 local function _1_()
   return "default"
 end
-state_key = (__fnl_global__state_2dkey or dyn.new(_1_))
+state_key = ((_2amodule_2a)["state-key"] or dyn.new(_1_))
 do end (_2amodule_2a)["state-key"] = state_key
-local state = (state or {["state-key-set?"] = false})
+local state = ((_2amodule_2a).state or {["state-key-set?"] = false})
 do end (_2amodule_locals_2a)["state"] = state
 local function set_state_key_21(new_key)
   state["state-key-set?"] = true
@@ -56,7 +56,7 @@ local function new_state(init_fn)
   return _3_
 end
 _2amodule_2a["new-state"] = new_state
-local loaded = (loaded or {})
+local loaded = ((_2amodule_2a).loaded or {})
 do end (_2amodule_locals_2a)["loaded"] = loaded
 local function load_module(ft, name)
   local fnl = fennel.impl()

lua/conjure/client/clojure/nrepl/state.lua

@@ -17,6 +17,6 @@ local get
 local function _1_()
   return {conn = nil, ["auto-repl-proc"] = nil, ["join-next"] = {key = nil}}
 end
-get = (get or client["new-state"](_1_))
+get = ((_2amodule_2a).get or client["new-state"](_1_))
 do end (_2amodule_2a)["get"] = get
 return _2amodule_2a

lua/conjure/client/common-lisp/swank.lua

@@ -30,7 +30,7 @@ local state
 local function _1_()
   return {conn = nil}
 end
-state = (state or client["new-state"](_1_))
+state = ((_2amodule_2a).state or client["new-state"](_1_))
 do end (_2amodule_locals_2a)["state"] = state
 local function with_conn_or_warn(f, opts)
   local conn = state("conn")

lua/conjure/client/fennel/aniseed.lua

@@ -48,7 +48,7 @@ local function anic(mod, f_name, ...)
   return ani(mod, f_name)(...)
 end
 _2amodule_locals_2a["anic"] = anic
-local repls = (repls or {})
+local repls = ((_2amodule_2a).repls or {})
 do end (_2amodule_locals_2a)["repls"] = repls
 local function reset_repl(filename)
   local filename0 = (filename or fs["localise-path"](extract["file-path"]()))

lua/conjure/client/fennel/stdio.lua

@@ -29,7 +29,7 @@ local state
 local function _1_()
   return {repl = nil}
 end
-state = (state or client["new-state"](_1_))
+state = ((_2amodule_2a).state or client["new-state"](_1_))
 do end (_2amodule_locals_2a)["state"] = state
 local buf_suffix = ".fnl"
 _2amodule_2a["buf-suffix"] = buf_suffix

lua/conjure/client/guile/socket.lua

@@ -30,7 +30,7 @@ local state
 local function _1_()
   return {repl = nil}
 end
-state = (state or client["new-state"](_1_))
+state = ((_2amodule_2a).state or client["new-state"](_1_))
 do end (_2amodule_locals_2a)["state"] = state
 local buf_suffix = ".scm"
 _2amodule_2a["buf-suffix"] = buf_suffix

lua/conjure/client/hy/stdio.lua

@@ -30,7 +30,7 @@ local state
 local function _1_()
   return {repl = nil}
 end
-state = (state or client["new-state"](_1_))
+state = ((_2amodule_2a).state or client["new-state"](_1_))
 do end (_2amodule_locals_2a)["state"] = state
 local buf_suffix = ".hy"
 _2amodule_2a["buf-suffix"] = buf_suffix

lua/conjure/client/janet/netrepl.lua

@@ -30,7 +30,7 @@ local state
 local function _1_()
   return {conn = nil}
 end
-state = (state or client["new-state"](_1_))
+state = ((_2amodule_2a).state or client["new-state"](_1_))
 do end (_2amodule_locals_2a)["state"] = state
 local function with_conn_or_warn(f, opts)
   local conn = state("conn")

lua/conjure/client/racket/stdio.lua

@@ -29,7 +29,7 @@ local state
 local function _1_()
   return {repl = nil}
 end
-state = (state or client["new-state"](_1_))
+state = ((_2amodule_2a).state or client["new-state"](_1_))
 do end (_2amodule_locals_2a)["state"] = state
 local buf_suffix = ".rkt"
 _2amodule_2a["buf-suffix"] = buf_suffix

lua/conjure/client/scheme/stdio.lua

@@ -28,7 +28,7 @@ local state
 local function _1_()
   return {repl = nil}
 end
-state = (state or client["new-state"](_1_))
+state = ((_2amodule_2a).state or client["new-state"](_1_))
 do end (_2amodule_locals_2a)["state"] = state
 local buf_suffix = ".scm"
 _2amodule_2a["buf-suffix"] = buf_suffix