Clean ns (#72)

* Bump nrepl middlewares in admin_deps.end

* Add clean_ns feature

* Add more features

Author: hkupty

Diff for: admin_deps.edn

@@ -1,7 +1,7 @@
 {:paths ["clj"]
  :deps {org.clojure/clojure {:mvn/version "1.10.1"}
         nrepl/nrepl {:mvn/version "0.6.0"}
-        cider/cider-nrepl {:mvn/version "0.22.0"}
-        refactor-nrepl {:mvn/version "2.4.0"}
-        iced-nrepl {:mvn/version "0.6.6"}
+        cider/cider-nrepl {:mvn/version "0.24.0"}
+        refactor-nrepl {:mvn/version "2.5.0"}
+        iced-nrepl {:mvn/version "1.0.0"}
         org.clojure/tools.namespace {:mvn/version "0.3.1"}}}

Diff for: lua/acid/features.lua

@@ -103,11 +103,6 @@ features.eval_expr = function(mode, replace, ns)
       .virtualtext(coord)
   end
 
-      .print{}
-      .clipboard{}
-      .virtualtext(coord)
-    end
-
   acid.run(ops.eval(payload):with_handler(midlws))
 end
 
@@ -346,6 +341,38 @@ features.run_test = function(opts)
 end
 
 
+features.thread_first = function()
+  local lines, coords = forms.form_under_cursor()
+  local content = table.concat(lines, "\n")
+  acid.run(ops['iced-refactor-thread-first']{code = content}:with_handler(
+    middlewares.refactor(utils.merge(coords, {accessor = function(dt) return dt.code end}))
+  ))
+end
+
+features.thread_last = function()
+  local lines, coords = forms.form_under_cursor()
+  local content = table.concat(lines, "\n")
+  acid.run(ops['iced-refactor-thread-last']{code = content}:with_handler(
+    middlewares.refactor(utils.merge(coords, {accessor = function(dt) return dt.code end}))
+  ))
+end
+
+--- Refactor the current file so the `(:require ...)` form is sorted.
+features.clean_ns = function()
+  local lines, coords = forms.form_under_cursor()
+  local fpath = vim.api.nvim_call_function('expand', {'%:p'})
+
+  coords.accessor = function(x)
+    return x.ns
+  end
+
+    acid.run(ops['clean-ns']{path = fpath}:with_handler(middlewares
+      .refactor(coords)
+    ))
+
+end
+
+
 features.thread_first = function()
   local lines, coords = forms.form_under_cursor()
   local content = table.concat(lines, "\n")

Diff for: plugin/acid.vim

@@ -158,10 +158,9 @@ if !g:acid_no_default_keymappings
     autocmd FileType clojure nmap <buffer> <silent> cpp        <Plug>(acid-eval-expr)
     autocmd FileType clojure nmap <buffer> <silent> cqp        <Plug>(acid-eval-print)
 
-
-    autocmd FileType clojure nmap <buffer> <silent> <C-c>ta <Plug>(acid-run-tests)
-    autocmd FileType clojure nmap <buffer> <silent> <C-c>tt <Plug>(acid-run-tests-here)
-    autocmd FileType clojure nmap <buffer> <silent> <C-c>tj <Plug>(acid-run-the-tests)
+    autocmd FileType clojure nmap <buffer> <silent> <C-c>ta    <Plug>(acid-run-tests)
+    autocmd FileType clojure nmap <buffer> <silent> <C-c>tt    <Plug>(acid-run-tests-here)
+    autocmd FileType clojure nmap <buffer> <silent> <C-c>tj    <Plug>(acid-run-the-tests)
 
     autocmd FileType clojure nmap <buffer> <silent> cr         <Plug>(acid-replace-op)
     autocmd FileType clojure vmap <buffer> <silent> cr         <Plug>(acid-replace-visual)