Babashka nrepl (#80)

* Adapt to modern API

* Drop unused nrepl flags

* Fix print not working for bad statuses

* Remove TAP

* Add require to utils

* Add babashka nrepl server

* Replace nrepl server for admin sessions

* Add flag for not autosaving

* Improvements to output buffer

* Ensure uses babashka only if it exists

Author: hkupty

lua/acid/connections.lua

@@ -57,7 +57,7 @@ end
 -- @tparam[opt] string pwd path (usually project root).
 -- @treturn string Id of the current connection for the path or nil.
 connections.peek = function(pwd)
-  pwd = pwd_to_key(pwd or vim.api.nvim_call_function("getcwd", {}))
+  pwd = pwd_to_key(pwd or vim.fn.getcwd())
   return connections.current[pwd]
 end
 
@@ -76,9 +76,9 @@ end
 
 connections.search = function(pwd)
   pwd = pwd_to_key(pwd)
-  local fpath = vim.api.nvim_call_function("findfile", {pwd .. ".nrepl-port"})
+  local fpath = vim.fn.findfile(pwd .. ".nrepl-port")
   if fpath ~= "" then
-    local portno = table.concat(vim.api.nvim_call_function("readfile", {fpath}), "")
+    local portno = table.concat(vim.fn.readfile(fpath), "")
     local conn = {"127.0.0.1", utils.trim(portno)}
     return connections.add(conn)
   end

lua/acid/core.lua

@@ -43,7 +43,7 @@ core.send = function(connection, obj, handler)
   end
 
   if obj.code ~= nil then
-    output.draw(conn_id, {(obj.ns or "") .. "=> " .. obj.code})
+    output.draw(conn_id, (obj.ns or "") .. "=> " .. obj.code)
   end
 
   if obj.id == nil then

lua/acid/init.lua

@@ -8,6 +8,7 @@ local connections = require("acid.connections")
 local utils = require("acid.utils")
 local sessions = require("acid.sessions")
 local admin_session_path
+local has_bb
 local acid = {}
 
 --- Checks whether a connection exists for supplied path or not.
@@ -57,24 +58,37 @@ end
 -- or for things that clojure could deal with better while not having a
 -- nrepl session to use.
 acid.admin_session_start = function()
+  local nrepl = require("acid.nrepl")
   if admin_session_path == nil then
-    admin_session_path = vim.fn.fnamemodify(vim.fn.findfile("admin_deps.edn", vim.api.nvim_get_option('rtp')), ":p:h")
+    admin_session_path = utils.ensure_path(
+      vim.fn.fnamemodify(vim.fn.findfile("admin_deps.edn", vim.api.nvim_get_option('rtp')), ":p:h")
+    )
   end
 
-  if require("acid.nrepl").cache[admin_session_path] ~= nil then
+  if has_bb == nil then
+    has_bb = vim.fn.executable('bb') == 1
+  end
 
+  if nrepl.cache[admin_session_path] ~= nil then
     return acid.admin_session()
   end
 
-  local nrepl = require("acid.nrepl")
-  nrepl.start{
-    pwd = admin_session_path,
-    skip_autocmd = true,
-    deps_file = admin_session_path .. "/admin_deps.edn"
-  }
+  if has_bb then
+    nrepl.bbnrepl{
+      pwd = admin_session_path,
+    }
+  else
+    nrepl.start{
+      pwd = admin_session_path,
+      skip_autocmd = true,
+      deps_file = admin_session_path .. "/admin_deps.edn"
+    }
+  end
+
 end
 
 acid.admin_session = function()
+
   local conn = connections.get(admin_session_path)
 
   if conn ~= nil and conn[2] ~= nil then

lua/acid/middlewares/output.lua

@@ -12,26 +12,23 @@ output.middleware = function(config)
       local conn_id = sessions.reverse_lookup(session)
 
       if data.out ~= nil then
-        local out = {}
-        data.out:gsub("[^\n]+", function(dt) table.insert(out, dt) end)
-        output.draw(conn_id, out)
+        output.draw(conn_id, data.out)
       end
       if data.value ~= nil then
-        output.draw(conn_id, {"=> " .. data.value})
+        output.draw(conn_id, "=> " .. data.value)
       end
       if data.ex ~= nil then
-        output.draw(conn_id, {"!! " .. data.ex})
+        output.draw(conn_id, "!! " .. data.ex)
       end
       if data.err ~= nil then
         local out = {}
-        data.err:gsub("[^\n]+", function(dt) table.insert(out, "!! " .. dt) end)
-        output.draw(conn_id, out)
+        output.draw(conn_id, data.err)
       end
 
       if config.accessor ~= nil then
         local msg = config.accessor(data)
         if msg ~= nil and msg ~= "" then
-          output.draw(conn_id, {"<> " .. msg})
+          output.draw(conn_id, "<> " .. msg)
         end
       end
 

lua/acid/middlewares/print.lua

@@ -26,9 +26,9 @@ do_print.middleware = function(config)
         end
       end
 
-      if utils.find(config.status, "namespace-not-found") then
+      if utils.find(data.status, "namespace-not-found") then
         log.msg("Namespace not found")
-      elseif utils.find(config.status, "error") then
+      elseif utils.find(data.status, "error") then
         log.msg("Error")
       end
 

lua/acid/middlewares/quickfix.lua

@@ -30,7 +30,6 @@ quickfix.set = function(config)
                   '**/' .. assert.file,
                   false,
                   true)[1]
-                tap(fpath)
                 table.insert(qf, {
                   module = ns .. "/" .. test,
                   lnum  = assert.line,
@@ -42,7 +41,6 @@ quickfix.set = function(config)
             end
           end
         end
-        tap(qf)
         vim.fn.setqflist({}, 'r', {
             id = config.qflistid,
             items = qf

lua/acid/nrepl.lua

@@ -79,15 +79,6 @@ local build_cmd = function(obj)
     table.insert(opts, obj.bind)
   end
 
-  if obj.host ~= nil or obj.connect ~= nil then
-    table.insert(opts,"-c")
-  end
-
-  if obj.host ~= nil then
-    table.insert(opts,"-h")
-    table.insert(opts, obj.host)
-  end
-
   return opts
 end
 
@@ -102,17 +93,13 @@ nrepl.default_middlewares = {'nrepl/nrepl', 'cider/cider-nrepl', 'refactor-nrepl
 -- @tparam[opt] string obj.pwd Path where the nrepl process will be started
 -- @tparam[opt] table obj.middlewares List of middlewares.
 -- @tparam[opt] string obj.alias aliases on the local deps.edn
--- @tparam[opt] string obj.connect -c parameter for the nrepl process
+-- @tparam[opt] int obj.port -p parameter for the nrepl process
 -- @tparam[opt] string obj.bind -b parameter for the nrepl process
 -- @tparam[opt] boolean obj.skip_autocmd don't fire an autocmd after starting this repl
 -- @tparam[opt] boolean obj.disable_output_capture disables output capturing.
 -- @treturn boolean Whether it was possible to spawn a nrepl process
 nrepl.start = function(obj)
-  local pwd = obj.pwd or vim.api.nvim_call_function("getcwd", {})
-
-  if not utils.ends_with(pwd, "/") then
-    pwd = pwd .. "/"
-  end
+  local pwd = utils.ensure_path(obj.pwd or vim.api.nvim_call_function("getcwd", {}))
 
   local selected = obj.middlewares or nrepl.default_middlewares
   local bind = obj.bind
@@ -121,8 +108,6 @@ nrepl.start = function(obj)
     port = obj.port,
     alias = obj.alias,
     bind = obj.bind,
-    host = obj.host,
-    connect = obj.connect,
     deps_file = obj.deps_file
   }
 
@@ -139,7 +124,7 @@ nrepl.start = function(obj)
 
    if ret <= 0 then
      -- TODO log, inform..
-     return
+     return false
    end
 
    local conn = {bind, obj.port}
@@ -155,12 +140,49 @@ nrepl.start = function(obj)
   nrepl.cache[pwd].id = conn_id
 
   job_mapping[ret] = {pwd = pwd, conn = conn_id, init = false}
-  if obj.disable_output_capture == false then
+
+  if not obj.disable_output_capture then
     output.buffer(conn_id)
   end
   return true
 end
 
+nrepl.bbnrepl = function(obj)
+  local pwd = utils.ensure_path(obj.pwd or vim.api.nvim_call_function("getcwd", {}))
+
+  obj.port = obj.port or "1667"
+
+  local cmd = {
+    "bb", "--nrepl-server", obj.port
+  }
+
+  local ret = nvim.nvim_call_function('jobstart', {
+      cmd , {
+        on_exit = "AcidJobCleanup",
+        cwd = pwd
+      }
+    })
+
+   if ret <= 0 then
+     -- TODO log, inform..
+     return false
+   end
+
+   local conn = {"127.0.0.1", obj.port}
+
+   nrepl.cache[pwd] = {
+     skip_autocmd = true,
+     job = ret,
+     addr = conn
+   }
+
+  local conn_id = connections.add(conn)
+  connections.select(obj.pwd, conn_id)
+
+  nrepl.cache[pwd].id = conn_id
+
+end
+
 --- Stops a nrepl process managed by acid
 -- @tparam table obj Configuration for the nrepl process to be stopped
 -- @tparam string obj.pwd Path where the nrepl process was started

lua/acid/output.lua

@@ -1,5 +1,6 @@
 -- luacheck: globals vim
 
+local connections = require("acid.connections")
 local output = {}
 
 local location = function(opts)
@@ -10,7 +11,6 @@ local location = function(opts)
     width = opts.width or 60,
     height = height,
     row = 0,
-    focusable = false,
     col = width - (opts.width or 60)
   }
 end
@@ -29,7 +29,7 @@ output.buffer = function(conn)
 end
 
 output.window = function(conn, opts)
-  local buf =  output.buffer(conn)
+  local buf = output.buffer(conn)
   local winnr = vim.fn.bufwinnr(buf)
   local winid
 
@@ -45,7 +45,7 @@ output.window = function(conn, opts)
   vim.api.nvim_set_current_win(winid)
 end
 
-output.close_window = function(conn, opts)
+output.close_window = function(conn)
   local buf = output.buffer(conn)
   local winnr = vim.fn.bufwinnr(buf)
 
@@ -55,14 +55,42 @@ output.close_window = function(conn, opts)
   end
 end
 
-
 output.draw = function(conn, lines)
   local buf = output.conn_to_buf[conn]
+
+  if type(lines) == "string" then
+    old = lines
+    lines = {}
+    old:gsub("[^\n]+", function(dt) table.insert(lines, dt) end)
+  end
   if buf == nil then
     return
   end
 
   vim.api.nvim_buf_set_lines(buf, -1, -1, false, lines)
 end
 
+
+output.open = function()
+  local conn = connections.peek()
+
+  output.window(conn)
+end
+
+output.close = function()
+  local conn = connections.peek()
+  output.close_window(conn)
+end
+
+output.clear = function(conn)
+  conn = conn or connections.peek()
+
+  local buf = output.conn_to_buf[conn]
+  if buf == nil then
+    return
+  end
+
+  vim.api.nvim_buf_set_lines(buf, 0, -1, false, {})
+end
+
 return output

lua/acid/sessions.lua

@@ -1,6 +1,7 @@
 -- luacheck: globals vim
 local connections = require("acid.connections")
 local ops = require("acid.ops")
+local utils = require("acid.utils")
 local core = require("acid.core")
 
 local pwd_to_key = function(pwd)

lua/acid/utils.lua

@@ -5,6 +5,13 @@ utils.pack = function (...)
   return {n=select('#',...); ...}
 end
 
+utils.ensure_path = function(pwd)
+  if not utils.ends_with(pwd, "/") then
+    pwd = pwd .. "/"
+  end
+  return pwd
+end
+
 
 
 utils.trim = vim.trim or function(str)