diff --git a/README.adoc b/README.adoc index cb7bd38e..aa72c7c7 100644 --- a/README.adoc +++ b/README.adoc @@ -10,7 +10,7 @@ Conjure is an interactive environment for evaluating code within your running pr The core features of Conjure are language agnostic (although it's targeted at Lisps _for now_), with each language client providing their own extra tools. Here's the currently supported languages, contributions and 3rd party plugins that add clients are highly encouraged! You can find a https://github.com/Olical/conjure/wiki/Client-features[comparison table for all clients and supported features] in the wiki. * https://clojure.org/[Clojure] over https://nrepl.org/[nREPL] (https://github.com/Olical/conjure/wiki/Quick-start:-Clojure[quickstart]) - * https://fennel-lang.org/[Fennel] inside Neovim via Lua and https://github.com/Olical/aniseed[Aniseed] (https://github.com/Olical/conjure/wiki/Quick-start:-Fennel-(Aniseed)[quickstart]) + * https://fennel-lang.org/[Fennel] inside Neovim via Lua and https://github.com/Olical/nfnl[nfnl] (https://github.com/Olical/conjure/wiki/Quick-start:-Fennel-(nfnl)[quickstart]) * https://fennel-lang.org[Fennel] outside of Neovim within any Lua process through an stdio REPL (https://github.com/Olical/conjure/wiki/Quick-start:-Fennel-(stdio)[quickstart]) * https://janet-lang.org/[Janet] over https://github.com/janet-lang/spork/#networked-repl[spork/netrepl] (https://github.com/Olical/conjure/wiki/Quick-start:-Janet-(netrepl)[quickstart]) * https://janet-lang.org/[Janet] over stdio (https://github.com/Olical/conjure/wiki/Quick-start:-Janet-(stdio)[quickstart]) diff --git a/doc/conjure-client-fennel-stdio.txt b/doc/conjure-client-fennel-stdio.txt index 931cfdf4..2d167bee 100644 --- a/doc/conjure-client-fennel-stdio.txt +++ b/doc/conjure-client-fennel-stdio.txt @@ -15,7 +15,7 @@ INTRODUCTION *conjure-client-fennel-stdio-introduction* Conjure starts a Fennel REPL within Neovim when you first open a Fennel file. -The default Fennel filetype client is `conjure.client.fennel.aniseed`, to use +The default Fennel filetype client is `conjure.client.fennel.nfnl`, to use this client instead you must override the configuration. > let g:conjure#filetype#fennel = "conjure.client.fennel.stdio" diff --git a/fnl/conjure/client/fennel/aniseed.fnl b/fnl/conjure/client/fennel/aniseed.fnl index 5784f82a..5b96fe2a 100644 --- a/fnl/conjure/client/fennel/aniseed.fnl +++ b/fnl/conjure/client/fennel/aniseed.fnl @@ -24,8 +24,7 @@ {:fennel {:aniseed {:aniseed_module_prefix :conjure.aniseed. - :use_metadata true - :deprecation_warning true}}}}) + :use_metadata true}}}}) (when (config.get-in [:mapping :enable_defaults]) (config.merge @@ -274,17 +273,6 @@ (when (not ok?) (opts.cb locals)))) -(fn on-load [] - (when (and (= "conjure.client.fennel.aniseed" (config.get-in [:filetype :fennel])) - (cfg [:deprecation_warning])) - (log.append - ["; Warning: https://github.com/Olical/nfnl will eventually replace Aniseed as the default Fennel client." - "; Set the following to keep things as they are indefinitely:" - "(set vim.g.conjure#filetype#fennel \"conjure.client.fennel.aniseed\")" - "" - "; Set the following to suppress this warning:" - "(set vim.g.conjure#client#fennel#aniseed#deprecation_warning false)"]))) - {: buf-suffix : comment-node? : comment-prefix @@ -303,5 +291,4 @@ : reset-repl : run-all-tests : run-buf-tests - : value->completions - : on-load} + : value->completions} diff --git a/lua/conjure/client/fennel/aniseed.lua b/lua/conjure/client/fennel/aniseed.lua index f55f093a..3b2cf3ba 100644 --- a/lua/conjure/client/fennel/aniseed.lua +++ b/lua/conjure/client/fennel/aniseed.lua @@ -19,7 +19,7 @@ end local buf_suffix = ".fnl" local context_pattern = "%(%s*module%s+(.-)[%s){]" local comment_prefix = "; " -config.merge({client = {fennel = {aniseed = {aniseed_module_prefix = "conjure.aniseed.", use_metadata = true, deprecation_warning = true}}}}) +config.merge({client = {fennel = {aniseed = {aniseed_module_prefix = "conjure.aniseed.", use_metadata = true}}}}) if config["get-in"]({"mapping", "enable_defaults"}) then config.merge({client = {fennel = {aniseed = {mapping = {run_buf_tests = "tt", run_all_tests = "ta", reset_repl = "rr", reset_all_repls = "ra"}}}}}) else @@ -304,11 +304,4 @@ local function completions(opts) return nil end end -local function on_load() - if (("conjure.client.fennel.aniseed" == config["get-in"]({"filetype", "fennel"})) and cfg({"deprecation_warning"})) then - return log.append({"; Warning: https://github.com/Olical/nfnl will eventually replace Aniseed as the default Fennel client.", "; Set the following to keep things as they are indefinitely:", "(set vim.g.conjure#filetype#fennel \"conjure.client.fennel.aniseed\")", "", "; Set the following to suppress this warning:", "(set vim.g.conjure#client#fennel#aniseed#deprecation_warning false)"}) - else - return nil - end -end -return {["buf-suffix"] = buf_suffix, ["comment-node?"] = comment_node_3f, ["comment-prefix"] = comment_prefix, completions = completions, ["context-pattern"] = context_pattern, ["default-module-name"] = default_module_name, ["display-result"] = display_result, ["doc-str"] = doc_str, ["eval-file"] = eval_file, ["eval-str"] = eval_str, ["form-node?"] = form_node_3f, ["module-name"] = module_name, ["on-filetype"] = on_filetype, repl = repl, ["reset-all-repls"] = reset_all_repls, ["reset-repl"] = reset_repl, ["run-all-tests"] = run_all_tests, ["run-buf-tests"] = run_buf_tests, ["value->completions"] = value__3ecompletions, ["on-load"] = on_load} +return {["buf-suffix"] = buf_suffix, ["comment-node?"] = comment_node_3f, ["comment-prefix"] = comment_prefix, completions = completions, ["context-pattern"] = context_pattern, ["default-module-name"] = default_module_name, ["display-result"] = display_result, ["doc-str"] = doc_str, ["eval-file"] = eval_file, ["eval-str"] = eval_str, ["form-node?"] = form_node_3f, ["module-name"] = module_name, ["on-filetype"] = on_filetype, repl = repl, ["reset-all-repls"] = reset_all_repls, ["reset-repl"] = reset_repl, ["run-all-tests"] = run_all_tests, ["run-buf-tests"] = run_buf_tests, ["value->completions"] = value__3ecompletions}