Add form-node? to every lisp client reusing the new node-surrounded-b…

…y-form-pair-chars? function

Should fix #358 nicely!

fnl/conjure/client/clojure/nrepl/init.fnl

@@ -9,11 +9,13 @@
              action conjure.client.clojure.nrepl.action
              server conjure.client.clojure.nrepl.server
              parse conjure.client.clojure.nrepl.parse
-             client conjure.client}})
+             client conjure.client
+             ts conjure.tree-sitter}})
 
 (def buf-suffix ".cljc")
 (def comment-prefix "; ")
 (def- cfg (config.get-in-fn [:client :clojure :nrepl]))
+(def form-node? ts.node-surrounded-by-form-pair-chars?)
 
 (config.merge
   {:client

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

@@ -8,11 +8,13 @@
              str conjure.aniseed.string
              config conjure.config
              client conjure.client
-             remote conjure.remote.swank}})
+             remote conjure.remote.swank
+             ts conjure.tree-sitter}})
 
 (def buf-suffix ".lisp")
 (def context-pattern "%(%s*defpackage%s+(.-)[%s){]")
 (def comment-prefix "; ")
+(def form-node? ts.node-surrounded-by-form-pair-chars?)
 
 ;; ------------ common lisp client
 ;; Can parse simple forms

fnl/conjure/client/fennel/aniseed.fnl

@@ -9,11 +9,13 @@
              text conjure.text
              log conjure.log
              config conjure.config
-             extract conjure.extract}})
+             extract conjure.extract
+             ts conjure.tree-sitter}})
 
 (def buf-suffix ".fnl")
 (def context-pattern "%(%s*module%s+(.-)[%s){]")
 (def comment-prefix "; ")
+(def form-node? ts.node-surrounded-by-form-pair-chars?)
 
 (config.merge
   {:client

fnl/conjure/client/fennel/stdio.fnl

@@ -7,7 +7,8 @@
              text conjure.text
              mapping conjure.mapping
              client conjure.client
-             log conjure.log}
+             log conjure.log
+             ts conjure.tree-sitter}
    require-macros [conjure.macros]})
 
 (config.merge
@@ -26,6 +27,7 @@
 
 (def buf-suffix ".fnl")
 (def comment-prefix "; ")
+(def form-node? ts.node-surrounded-by-form-pair-chars?)
 
 (defn- with-repl-or-warn [f opts]
   (let [repl (state :repl)]

fnl/conjure/client/guile/socket.fnl

@@ -8,7 +8,8 @@
              mapping conjure.mapping
              client conjure.client
              log conjure.log
-             extract conjure.extract}
+             extract conjure.extract
+             ts conjure.tree-sitter}
    require-macros [conjure.macros]})
 
 (config.merge
@@ -26,6 +27,7 @@
 (def buf-suffix ".scm")
 (def comment-prefix "; ")
 (def context-pattern "%(define%-module%s+(%([%g%s]-%))")
+(def form-node? ts.node-surrounded-by-form-pair-chars?)
 
 (defn- with-repl-or-warn [f opts]
   (let [repl (state :repl)]

fnl/conjure/client/hy/stdio.fnl

@@ -8,7 +8,8 @@
              text conjure.text
              mapping conjure.mapping
              client conjure.client
-             log conjure.log}
+             log conjure.log
+             ts conjure.tree-sitter}
    require-macros [conjure.macros]})
 
 (config.merge
@@ -27,6 +28,7 @@
 
 (def buf-suffix ".hy")
 (def comment-prefix "; ")
+(def form-node? ts.node-surrounded-by-form-pair-chars?)
 
 (defn- with-repl-or-warn [f opts]
   (let [repl (state :repl)]

fnl/conjure/client/janet/netrepl.fnl

@@ -7,10 +7,12 @@
              log conjure.log
              config conjure.config
              client conjure.client
-             remote conjure.remote.netrepl}})
+             remote conjure.remote.netrepl
+             ts conjure.tree-sitter}})
 
 (def buf-suffix ".janet")
 (def comment-prefix "# ")
+(def form-node? ts.node-surrounded-by-form-pair-chars?)
 
 (config.merge
   {:client

fnl/conjure/client/racket/stdio.fnl

@@ -7,7 +7,8 @@
              text conjure.text
              mapping conjure.mapping
              client conjure.client
-             log conjure.log}
+             log conjure.log
+             ts conjure.tree-sitter}
    require-macros [conjure.macros]})
 
 (config.merge
@@ -27,6 +28,7 @@
 (def buf-suffix ".rkt")
 (def comment-prefix "; ")
 (def context-pattern "%(%s*module%s+(.-)[%s){]")
+(def form-node? ts.node-surrounded-by-form-pair-chars?)
 
 (defn- with-repl-or-warn [f opts]
   (let [repl (state :repl)]

fnl/conjure/client/scheme/stdio.fnl

@@ -6,7 +6,8 @@
              config conjure.config
              mapping conjure.mapping
              client conjure.client
-             log conjure.log}
+             log conjure.log
+             ts conjure.tree-sitter}
    require-macros [conjure.macros]})
 
 (config.merge
@@ -26,6 +27,7 @@
 
 (def buf-suffix ".scm")
 (def comment-prefix "; ")
+(def form-node? ts.node-surrounded-by-form-pair-chars?)
 
 (defn- with-repl-or-warn [f opts]
   (let [repl (state :repl)]

lua/conjure/client/clojure/nrepl/init.lua

@@ -11,7 +11,7 @@ do
   _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"]
 end
 local autoload = (require("conjure.aniseed.autoload")).autoload
-local a, action, bridge, client, config, eval, mapping, nvim, parse, server, str = autoload("conjure.aniseed.core"), autoload("conjure.client.clojure.nrepl.action"), autoload("conjure.bridge"), autoload("conjure.client"), autoload("conjure.config"), autoload("conjure.eval"), autoload("conjure.mapping"), autoload("conjure.aniseed.nvim"), autoload("conjure.client.clojure.nrepl.parse"), autoload("conjure.client.clojure.nrepl.server"), autoload("conjure.aniseed.string")
+local a, action, bridge, client, config, eval, mapping, nvim, parse, server, str, ts = autoload("conjure.aniseed.core"), autoload("conjure.client.clojure.nrepl.action"), autoload("conjure.bridge"), autoload("conjure.client"), autoload("conjure.config"), autoload("conjure.eval"), autoload("conjure.mapping"), autoload("conjure.aniseed.nvim"), autoload("conjure.client.clojure.nrepl.parse"), autoload("conjure.client.clojure.nrepl.server"), autoload("conjure.aniseed.string"), autoload("conjure.tree-sitter")
 do end (_2amodule_locals_2a)["a"] = a
 _2amodule_locals_2a["action"] = action
 _2amodule_locals_2a["bridge"] = bridge
@@ -23,12 +23,15 @@ _2amodule_locals_2a["nvim"] = nvim
 _2amodule_locals_2a["parse"] = parse
 _2amodule_locals_2a["server"] = server
 _2amodule_locals_2a["str"] = str
+_2amodule_locals_2a["ts"] = ts
 local buf_suffix = ".cljc"
 _2amodule_2a["buf-suffix"] = buf_suffix
 local comment_prefix = "; "
 _2amodule_2a["comment-prefix"] = comment_prefix
 local cfg = config["get-in-fn"]({"client", "clojure", "nrepl"})
 do end (_2amodule_locals_2a)["cfg"] = cfg
+local form_node_3f = ts["node-surrounded-by-form-pair-chars?"]
+_2amodule_2a["form-node?"] = form_node_3f
 config.merge({client = {clojure = {nrepl = {connection = {default_host = "localhost", port_files = {".nrepl-port", ".shadow-cljs/nrepl.port"}, auto_repl = {enabled = true, hidden = false, cmd = "bb nrepl-server localhost:8794", port_file = ".nrepl-port", port = "8794"}}, eval = {pretty_print = true, raw_out = false, auto_require = true, print_quota = nil, print_function = "conjure.internal/pprint", print_options = {length = 500, level = 50}}, interrupt = {sample_limit = 0.3}, refresh = {after = nil, before = nil, dirs = nil}, test = {current_form_names = {"deftest"}, raw_out = false, runner = "clojure", call_suffix = nil}, mapping = {disconnect = "cd", connect_port_file = "cf", interrupt = "ei", last_exception = "ve", result_1 = "v1", result_2 = "v2", result_3 = "v3", view_source = "vs", session_clone = "sc", session_fresh = "sf", session_close = "sq", session_close_all = "sQ", session_list = "sl", session_next = "sn", session_prev = "sp", session_select = "ss", run_all_tests = "ta", run_current_ns_tests = "tn", run_alternate_ns_tests = "tN", run_current_test = "tc", refresh_changed = "rr", refresh_all = "ra", refresh_clear = "rc"}, completion = {cljs = {use_suitable = true}, with_context = false}}}}})
 local function context(header)
   local _1_ = header

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

@@ -11,7 +11,7 @@ do
   _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"]
 end
 local autoload = (require("conjure.aniseed.autoload")).autoload
-local a, bridge, client, config, log, mapping, nvim, remote, str, text = autoload("conjure.aniseed.core"), autoload("conjure.bridge"), autoload("conjure.client"), autoload("conjure.config"), autoload("conjure.log"), autoload("conjure.mapping"), autoload("conjure.aniseed.nvim"), autoload("conjure.remote.swank"), autoload("conjure.aniseed.string"), autoload("conjure.text")
+local a, bridge, client, config, log, mapping, nvim, remote, str, text, ts = autoload("conjure.aniseed.core"), autoload("conjure.bridge"), autoload("conjure.client"), autoload("conjure.config"), autoload("conjure.log"), autoload("conjure.mapping"), autoload("conjure.aniseed.nvim"), autoload("conjure.remote.swank"), autoload("conjure.aniseed.string"), autoload("conjure.text"), autoload("conjure.tree-sitter")
 do end (_2amodule_locals_2a)["a"] = a
 _2amodule_locals_2a["bridge"] = bridge
 _2amodule_locals_2a["client"] = client
@@ -22,12 +22,15 @@ _2amodule_locals_2a["nvim"] = nvim
 _2amodule_locals_2a["remote"] = remote
 _2amodule_locals_2a["str"] = str
 _2amodule_locals_2a["text"] = text
+_2amodule_locals_2a["ts"] = ts
 local buf_suffix = ".lisp"
 _2amodule_2a["buf-suffix"] = buf_suffix
 local context_pattern = "%(%s*defpackage%s+(.-)[%s){]"
 _2amodule_2a["context-pattern"] = context_pattern
 local comment_prefix = "; "
 _2amodule_2a["comment-prefix"] = comment_prefix
+local form_node_3f = ts["node-surrounded-by-form-pair-chars?"]
+_2amodule_2a["form-node?"] = form_node_3f
 config.merge({client = {common_lisp = {swank = {connection = {default_host = "127.0.0.1", default_port = "4005"}, mapping = {connect = "cc", disconnect = "cd"}}}}})
 local state
 local function _1_()

lua/conjure/client/fennel/aniseed.lua

@@ -11,7 +11,7 @@ do
   _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"]
 end
 local autoload = (require("conjure.aniseed.autoload")).autoload
-local a, client, config, extract, fs, log, mapping, nvim, str, text, view = autoload("conjure.aniseed.core"), autoload("conjure.client"), autoload("conjure.config"), autoload("conjure.extract"), autoload("conjure.fs"), autoload("conjure.log"), autoload("conjure.mapping"), autoload("conjure.aniseed.nvim"), autoload("conjure.aniseed.string"), autoload("conjure.text"), autoload("conjure.aniseed.view")
+local a, client, config, extract, fs, log, mapping, nvim, str, text, ts, view = autoload("conjure.aniseed.core"), autoload("conjure.client"), autoload("conjure.config"), autoload("conjure.extract"), autoload("conjure.fs"), autoload("conjure.log"), autoload("conjure.mapping"), autoload("conjure.aniseed.nvim"), autoload("conjure.aniseed.string"), autoload("conjure.text"), autoload("conjure.tree-sitter"), autoload("conjure.aniseed.view")
 do end (_2amodule_locals_2a)["a"] = a
 _2amodule_locals_2a["client"] = client
 _2amodule_locals_2a["config"] = config
@@ -22,13 +22,16 @@ _2amodule_locals_2a["mapping"] = mapping
 _2amodule_locals_2a["nvim"] = nvim
 _2amodule_locals_2a["str"] = str
 _2amodule_locals_2a["text"] = text
+_2amodule_locals_2a["ts"] = ts
 _2amodule_locals_2a["view"] = view
 local buf_suffix = ".fnl"
 _2amodule_2a["buf-suffix"] = buf_suffix
 local context_pattern = "%(%s*module%s+(.-)[%s){]"
 _2amodule_2a["context-pattern"] = context_pattern
 local comment_prefix = "; "
 _2amodule_2a["comment-prefix"] = comment_prefix
+local form_node_3f = ts["node-surrounded-by-form-pair-chars?"]
+_2amodule_2a["form-node?"] = form_node_3f
 config.merge({client = {fennel = {aniseed = {mapping = {run_buf_tests = "tt", run_all_tests = "ta", reset_repl = "rr", reset_all_repls = "ra"}, aniseed_module_prefix = "conjure.aniseed.", use_metadata = true}}}})
 local cfg = config["get-in-fn"]({"client", "fennel", "aniseed"})
 do end (_2amodule_locals_2a)["cfg"] = cfg

lua/conjure/client/fennel/stdio.lua

@@ -11,7 +11,7 @@ do
   _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"]
 end
 local autoload = (require("conjure.aniseed.autoload")).autoload
-local a, client, config, log, mapping, nvim, stdio, str, text, _ = autoload("conjure.aniseed.core"), autoload("conjure.client"), autoload("conjure.config"), autoload("conjure.log"), autoload("conjure.mapping"), autoload("conjure.aniseed.nvim"), autoload("conjure.remote.stdio"), autoload("conjure.aniseed.string"), autoload("conjure.text"), nil
+local a, client, config, log, mapping, nvim, stdio, str, text, ts, _ = autoload("conjure.aniseed.core"), autoload("conjure.client"), autoload("conjure.config"), autoload("conjure.log"), autoload("conjure.mapping"), autoload("conjure.aniseed.nvim"), autoload("conjure.remote.stdio"), autoload("conjure.aniseed.string"), autoload("conjure.text"), autoload("conjure.tree-sitter"), nil
 _2amodule_locals_2a["a"] = a
 _2amodule_locals_2a["client"] = client
 _2amodule_locals_2a["config"] = config
@@ -21,6 +21,7 @@ _2amodule_locals_2a["nvim"] = nvim
 _2amodule_locals_2a["stdio"] = stdio
 _2amodule_locals_2a["str"] = str
 _2amodule_locals_2a["text"] = text
+_2amodule_locals_2a["ts"] = ts
 _2amodule_locals_2a["_"] = _
 config.merge({client = {fennel = {stdio = {mapping = {start = "cs", stop = "cS", eval_reload = "eF"}, command = "fennel", prompt_pattern = ">> "}}}})
 local cfg = config["get-in-fn"]({"client", "fennel", "stdio"})
@@ -35,6 +36,8 @@ local buf_suffix = ".fnl"
 _2amodule_2a["buf-suffix"] = buf_suffix
 local comment_prefix = "; "
 _2amodule_2a["comment-prefix"] = comment_prefix
+local form_node_3f = ts["node-surrounded-by-form-pair-chars?"]
+_2amodule_2a["form-node?"] = form_node_3f
 local function with_repl_or_warn(f, opts)
   local repl = state("repl")
   if repl then

lua/conjure/client/guile/socket.lua

@@ -11,7 +11,7 @@ do
   _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"]
 end
 local autoload = (require("conjure.aniseed.autoload")).autoload
-local a, client, config, extract, log, mapping, nvim, socket, str, text, _ = autoload("conjure.aniseed.core"), autoload("conjure.client"), autoload("conjure.config"), autoload("conjure.extract"), autoload("conjure.log"), autoload("conjure.mapping"), autoload("conjure.aniseed.nvim"), autoload("conjure.remote.socket"), autoload("conjure.aniseed.string"), autoload("conjure.text"), nil
+local a, client, config, extract, log, mapping, nvim, socket, str, text, ts, _ = autoload("conjure.aniseed.core"), autoload("conjure.client"), autoload("conjure.config"), autoload("conjure.extract"), autoload("conjure.log"), autoload("conjure.mapping"), autoload("conjure.aniseed.nvim"), autoload("conjure.remote.socket"), autoload("conjure.aniseed.string"), autoload("conjure.text"), autoload("conjure.tree-sitter"), nil
 _2amodule_locals_2a["a"] = a
 _2amodule_locals_2a["client"] = client
 _2amodule_locals_2a["config"] = config
@@ -22,6 +22,7 @@ _2amodule_locals_2a["nvim"] = nvim
 _2amodule_locals_2a["socket"] = socket
 _2amodule_locals_2a["str"] = str
 _2amodule_locals_2a["text"] = text
+_2amodule_locals_2a["ts"] = ts
 _2amodule_locals_2a["_"] = _
 config.merge({client = {guile = {socket = {mapping = {connect = "cc", disconnect = "cd"}, pipename = nil}}}})
 local cfg = config["get-in-fn"]({"client", "guile", "socket"})
@@ -38,6 +39,8 @@ local comment_prefix = "; "
 _2amodule_2a["comment-prefix"] = comment_prefix
 local context_pattern = "%(define%-module%s+(%([%g%s]-%))"
 _2amodule_2a["context-pattern"] = context_pattern
+local form_node_3f = ts["node-surrounded-by-form-pair-chars?"]
+_2amodule_2a["form-node?"] = form_node_3f
 local function with_repl_or_warn(f, opts)
   local repl = state("repl")
   if (repl and ("connected" == repl.status)) then

lua/conjure/client/hy/stdio.lua

@@ -11,7 +11,7 @@ do
   _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"]
 end
 local autoload = (require("conjure.aniseed.autoload")).autoload
-local a, client, config, extract, log, mapping, nvim, stdio, str, text, _ = autoload("conjure.aniseed.core"), autoload("conjure.client"), autoload("conjure.config"), autoload("conjure.extract"), autoload("conjure.log"), autoload("conjure.mapping"), autoload("conjure.aniseed.nvim"), autoload("conjure.remote.stdio"), autoload("conjure.aniseed.string"), autoload("conjure.text"), nil
+local a, client, config, extract, log, mapping, nvim, stdio, str, text, ts, _ = autoload("conjure.aniseed.core"), autoload("conjure.client"), autoload("conjure.config"), autoload("conjure.extract"), autoload("conjure.log"), autoload("conjure.mapping"), autoload("conjure.aniseed.nvim"), autoload("conjure.remote.stdio"), autoload("conjure.aniseed.string"), autoload("conjure.text"), autoload("conjure.tree-sitter"), nil
 _2amodule_locals_2a["a"] = a
 _2amodule_locals_2a["client"] = client
 _2amodule_locals_2a["config"] = config
@@ -22,6 +22,7 @@ _2amodule_locals_2a["nvim"] = nvim
 _2amodule_locals_2a["stdio"] = stdio
 _2amodule_locals_2a["str"] = str
 _2amodule_locals_2a["text"] = text
+_2amodule_locals_2a["ts"] = ts
 _2amodule_locals_2a["_"] = _
 config.merge({client = {hy = {stdio = {mapping = {start = "cs", stop = "cS", interrupt = "ei"}, command = "hy --repl-output-fn=hy.repr", prompt_pattern = "=> "}}}})
 local cfg = config["get-in-fn"]({"client", "hy", "stdio"})
@@ -36,6 +37,8 @@ local buf_suffix = ".hy"
 _2amodule_2a["buf-suffix"] = buf_suffix
 local comment_prefix = "; "
 _2amodule_2a["comment-prefix"] = comment_prefix
+local form_node_3f = ts["node-surrounded-by-form-pair-chars?"]
+_2amodule_2a["form-node?"] = form_node_3f
 local function with_repl_or_warn(f, opts)
   local repl = state("repl")
   if repl then

lua/conjure/client/janet/netrepl.lua

@@ -11,7 +11,7 @@ do
   _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"]
 end
 local autoload = (require("conjure.aniseed.autoload")).autoload
-local a, bridge, client, config, log, mapping, nvim, remote, text = autoload("conjure.aniseed.core"), autoload("conjure.bridge"), autoload("conjure.client"), autoload("conjure.config"), autoload("conjure.log"), autoload("conjure.mapping"), autoload("conjure.aniseed.nvim"), autoload("conjure.remote.netrepl"), autoload("conjure.text")
+local a, bridge, client, config, log, mapping, nvim, remote, text, ts = autoload("conjure.aniseed.core"), autoload("conjure.bridge"), autoload("conjure.client"), autoload("conjure.config"), autoload("conjure.log"), autoload("conjure.mapping"), autoload("conjure.aniseed.nvim"), autoload("conjure.remote.netrepl"), autoload("conjure.text"), autoload("conjure.tree-sitter")
 do end (_2amodule_locals_2a)["a"] = a
 _2amodule_locals_2a["bridge"] = bridge
 _2amodule_locals_2a["client"] = client
@@ -21,10 +21,13 @@ _2amodule_locals_2a["mapping"] = mapping
 _2amodule_locals_2a["nvim"] = nvim
 _2amodule_locals_2a["remote"] = remote
 _2amodule_locals_2a["text"] = text
+_2amodule_locals_2a["ts"] = ts
 local buf_suffix = ".janet"
 _2amodule_2a["buf-suffix"] = buf_suffix
 local comment_prefix = "# "
 _2amodule_2a["comment-prefix"] = comment_prefix
+local form_node_3f = ts["node-surrounded-by-form-pair-chars?"]
+_2amodule_2a["form-node?"] = form_node_3f
 config.merge({client = {janet = {netrepl = {connection = {default_host = "127.0.0.1", default_port = "9365"}, mapping = {connect = "cc", disconnect = "cd"}}}}})
 local state
 local function _1_()

lua/conjure/client/racket/stdio.lua

@@ -11,7 +11,7 @@ do
   _2amodule_locals_2a = (_2amodule_2a)["aniseed/locals"]
 end
 local autoload = (require("conjure.aniseed.autoload")).autoload
-local a, client, config, log, mapping, nvim, stdio, str, text, _ = autoload("conjure.aniseed.core"), autoload("conjure.client"), autoload("conjure.config"), autoload("conjure.log"), autoload("conjure.mapping"), autoload("conjure.aniseed.nvim"), autoload("conjure.remote.stdio"), autoload("conjure.aniseed.string"), autoload("conjure.text"), nil
+local a, client, config, log, mapping, nvim, stdio, str, text, ts, _ = autoload("conjure.aniseed.core"), autoload("conjure.client"), autoload("conjure.config"), autoload("conjure.log"), autoload("conjure.mapping"), autoload("conjure.aniseed.nvim"), autoload("conjure.remote.stdio"), autoload("conjure.aniseed.string"), autoload("conjure.text"), autoload("conjure.tree-sitter"), nil
 _2amodule_locals_2a["a"] = a
 _2amodule_locals_2a["client"] = client
 _2amodule_locals_2a["config"] = config
@@ -21,6 +21,7 @@ _2amodule_locals_2a["nvim"] = nvim
 _2amodule_locals_2a["stdio"] = stdio
 _2amodule_locals_2a["str"] = str
 _2amodule_locals_2a["text"] = text
+_2amodule_locals_2a["ts"] = ts
 _2amodule_locals_2a["_"] = _
 config.merge({client = {racket = {stdio = {mapping = {start = "cs", stop = "cS", interrupt = "ei"}, command = "racket", prompt_pattern = "\n?[\"%w%-./_]*> "}}}})
 local cfg = config["get-in-fn"]({"client", "racket", "stdio"})
@@ -37,6 +38,8 @@ local comment_prefix = "; "
 _2amodule_2a["comment-prefix"] = comment_prefix
 local context_pattern = "%(%s*module%s+(.-)[%s){]"
 _2amodule_2a["context-pattern"] = context_pattern
+local form_node_3f = ts["node-surrounded-by-form-pair-chars?"]
+_2amodule_2a["form-node?"] = form_node_3f
 local function with_repl_or_warn(f, opts)
   local repl = state("repl")
   if repl then