Fix/motion (#47)

* #39: Fix Motion

* #39: Fix for cpp

* #39: Add visual send

* #39: Also print the result

* Fix import

* Fix log

* Fix matching

* Avoid committing unwanted functions

Author: hkupty

API.md

@@ -160,13 +160,26 @@ Returns the coordinates for the boundaries of the current form
 **(table)** coordinates {from = {row,col}, to = {row,col}}
 
 
+## `acid.forms.form_from_motion(mode[, bufnr])`
+Extracts the form according to given motion (or visual mode)
+
+mode **(string)**: Motion mode or 'visual'
+
+*bufnr* **(int)**: Buffer number in neovim. Will take current if none given
+
+
+**(string)** symbol under cursor
+
+**(table)** coordinates {from = {row,col}, to = {row,col}, bufnr = 1}
+
+
 ## `acid.forms.form_under_cursor()`
 Extracts the innermost form under the cursor
 
 
 **(string)** symbol under cursor
 
-**(table)** coordinates {from = {row,col}, to = {row,col}}
+**(table)** coordinates {from = {row,col}, to = {row,col}, bufnr = 1}
 
 
 ## `acid.forms.symbol_under_cursor()`
@@ -175,7 +188,7 @@ Extracts the symbol under the cursor
 
 **(string)** symbol under cursor
 
-**(table)** coordinates {from = {row,col}, to = {row,col}}
+**(table)** coordinates {from = {row,col}, to = {row,col}, bofnr = 1}
 
 
 ---

githooks/pre-commit/no-taps

@@ -0,0 +1,10 @@
+#!/bin/bash
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+
+grep -q tap "${ROOT_DIR}"/lua/**/*.lua && {
+  echo "Don't commit a 'tap'."
+  exit 1
+}
+
+exit 0
+

lua/acid/commands.lua

@@ -36,6 +36,15 @@ commands.req = function(obj)
   return ops.eval{code = code}
 end
 
+commands.import = function(obj)
+
+  local code = "(import '(" ..
+    obj.java_ns .. " " .. table.concat(obj.symbols, " ") ..
+    "))"
+
+  return ops.eval{code = code}
+end
+
 commands.ns_load_all = function()
   return ops['ns-load-all']{}
 end

lua/acid/features.lua

@@ -61,15 +61,16 @@ features.eval_expr = function(mode, ns)
     local form = forms.form_under_cursor()
     payload.code = table.concat(form, "\n")
   else
-    local bufnr = vim.api.nvim_call_function("bufnr", {"%"})
-    payload.code = table.concat(forms.extract(bufnr, mode), "\n")
+    local lines = forms.form_from_motion(mode)
+    payload.code = table.concat(lines, "\n")
   end
   ns = ns or vim.api.nvim_call_function("AcidGetNs", {})
   if ns ~= nil or ns ~= "" then
     payload.ns = ns
   end
 
   acid.run(ops.eval(payload):with_handler(middlewares
+      .print{}
       .clipboard{}
       .virtualtext{}
   ))
@@ -94,7 +95,7 @@ end
 -- @tparam string java_ns Namespace of the java symbols that are being imported.
 -- @tparam {string,...} symbols List of java symbols to be imported
 features.do_import = function(java_ns, symbols)
-  acid.run(commands.req{java_ns = java_ns, symbols = symbols}:with_handler(middlewares
+  acid.run(commands.import{java_ns = java_ns, symbols = symbols}:with_handler(middlewares
     .doautocmd{autocmd = "AcidImported"}
   ))
 end
@@ -177,42 +178,39 @@ end
 --`(:requires ...)` section.
 -- @tparam string req require vector, such as `[clojure.string :as str]`.
 features.add_require = function(req)
-  local bufnr = vim.api.nvim_call_function("bufnr", {"%"})
-  local lines, coords = forms.extract(bufnr)
+  local lines, coords = forms.form_under_cursor()
   local content = table.concat(lines, "")
 
   local code = "(format-code (upd-ns '" .. content .. " :require (partial add-req '" ..  req .. ")))"
 
     acid.run(ops.eval{code = code, ns = "acid.inject"}:with_handler(middlewares
-      .refactor{from = coords.from, to = coords.to, bufnr = bufnr}
+      .refactor(coords)
     ))
 end
 
 --- Refactor the current file to remove the given argument from the
 --`(:requires ...)` section.
 -- @tparam string req require namespace, such as `clojure.string`.
 features.remove_require = function(req)
-  local bufnr = vim.api.nvim_call_function("bufnr", {"%"})
-  local lines, coords = forms.extract(bufnr)
+  local lines, coords = forms.form_under_cursor()
   local content = table.concat(lines, "")
 
   local code = "(format-code (upd-ns '" ..  content .. " :require (partial rem-req '" ..  req .. ")))"
 
     acid.run(ops.eval{code = code, ns = "acid.inject"}:with_handler(middlewares
-      .refactor{from = coords.from, to = coords.to, bufnr = bufnr}
+      .refactor(coords)
     ))
 end
 
 --- Refactor the current file so the `(:require ...)` form is sorted.
 features.sort_requires = function()
-  local bufnr = vim.api.nvim_call_function("bufnr", {"%"})
-  local lines, coords = forms.extract(bufnr)
+  local lines, coords = forms.form_under_cursor()
   local content = table.concat(lines, "")
 
   local code = "(format-code (upd-ns '" ..  content .. " :require sort-reqs))"
 
     acid.run(ops.eval{code = code, ns = "acid.inject"}:with_handler(middlewares
-      .refactor{from = coords.from, to = coords.to, bufnr = bufnr}
+      .refactor(coords)
     ))
 
 end

lua/acid/forms.lua

@@ -30,14 +30,41 @@ forms.get_form_boundaries = function()
 
   return {
     from = from,
-    to = to
+    to = to,
+    bufnr = vim.api.nvim_get_current_buf()
   }
 end
 
-forms.extract = function(bufnr)
-  local coordinates = forms.get_form_boundaries()
+forms.motion = function(bufnr, mode)
+  local b_line, b_col, e_line, e_col, _
+
+  if mode == 'visual' then
+    _, b_line, b_col = unpack(vim.api.nvim_call_function("getpos", {"v"}))
+    _, e_line, e_col = unpack(vim.api.nvim_call_function("getpos", {"."}))
+
+    b_col = b_col - 1
+    e_col = e_col - 1
+  elseif mode == 'block' then
+    b_line, b_col = unpack(vim.api.nvim_buf_get_mark(bufnr, '<'))
+    e_line, e_col = unpack(vim.api.nvim_buf_get_mark(bufnr, '>'))
+  else
+    b_line, b_col = unpack(vim.api.nvim_buf_get_mark(bufnr, '['))
+    e_line, e_col = unpack(vim.api.nvim_buf_get_mark(bufnr, ']'))
+  end
+
+  b_col = b_col + 1
+  e_col = e_col + 2
+
+  return {
+    from = {b_line, b_col},
+    to = {e_line, e_col},
+    bufnr = bufnr
+  }
+end
 
-  local lines = vim.api.nvim_buf_get_lines(bufnr, coordinates.from[1] - 1, coordinates.to[1], 0)
+
+forms.extract = function(coordinates)
+  local lines = vim.api.nvim_buf_get_lines(coordinates.bufnr, coordinates.from[1] - 1, coordinates.to[1], 0)
 
   if coordinates.from[2] ~= 0 then
     lines[1] = string.sub(lines[1], coordinates.from[2])
@@ -54,26 +81,40 @@ forms.extract = function(bufnr)
   return lines, coordinates
 end
 
+--- Extracts the form according to given motion (or visual mode)
+-- @tparam string mode Motion mode or 'visual'
+-- @tparam[opt] int bufnr Buffer number in neovim. Will take current if none given
+-- @treturn string symbol under cursor
+-- @treturn table coordinates {from = {row,col}, to = {row,col}, bufnr = 1}
+forms.form_from_motion = function(mode, bufnr)
+  bufnr = bufnr or vim.api.nvim_get_current_buf()
+  local coordinates = forms.motion(bufnr, mode)
+
+  return forms.extract(coordinates)
+
+end
+
 --- Extracts the innermost form under the cursor
 -- @treturn string symbol under cursor
--- @treturn table coordinates {from = {row,col}, to = {row,col}}
+-- @treturn table coordinates {from = {row,col}, to = {row,col}, bufnr = 1}
 forms.form_under_cursor = function()
-  local cb = vim.api.nvim_get_current_buf()
+  local coordinates = forms.get_form_boundaries()
 
-  return forms.extract(cb)
+  return forms.extract(coordinates)
 end
 
 --- Extracts the symbol under the cursor
 -- @treturn string symbol under cursor
--- @treturn table coordinates {from = {row,col}, to = {row,col}}
+-- @treturn table coordinates {from = {row,col}, to = {row,col}, bofnr = 1}
 forms.symbol_under_cursor = function()
   local cw = vim.api.nvim_call_function("expand", {"<cword>"})
   local from = vim.api.nvim_call_function("searchpos", {cw, "nc"})
   local to = vim.api.nvim_call_function("searchpos", {cw, "nce"})
 
   return cw, {
     from = from,
-    to = to
+    to = to,
+    bufnr = vim.api.nvim_get_current_buf()
   }
 end
 

lua/acid/log.lua

@@ -1,8 +1,8 @@
 -- luacheck: globals vim
 local log = {}
 
-log.msg = function(msg)
-  vim.api.nvim_out_write("[Acid] " .. msg .. "\n")
+log.msg = function(...)
+  vim.api.nvim_out_write("[Acid] " .. table.concat({...}, " ") .. "\n")
 end
 
 return log

lua/acid/nrepl.lua

@@ -174,7 +174,7 @@ nrepl.handle = {
           local opts = pending[ch]
           local port = connections.store[opts.ix][2]
           connections:select(opts.pwd, opts.ix)
-          log.msg("Connected on port" .. tostring(port))
+          log.msg("Connected on port", tostring(port))
           vim.api.nvim_command("doautocmd User AcidConnected")
           pending[ch] = nil
         end

plugin/acid.vim

@@ -54,6 +54,7 @@ map <Plug>(acid-go-to)        <Cmd>lua require("acid.features").go_to()<CR>
 map <Plug>(acid-docs)         <Cmd>lua require("acid.features").docs()<CR>
 map <Plug>(acid-eval-cmdline) <Cmd>call AcidSendEval("eval_cmdline")<CR>
 map <Plug>(acid-motion-op)    <Cmd>set opfunc=AcidMotion<CR>g@
+map <Plug>(acid-eval-visual)  <Cmd>call AcidMotion("visual")<CR>
 map <Plug>(acid-eval-expr)    <Cmd>lua require("acid.features").eval_expr()<CR>
 map <Plug>(acid-eval-print)   <Cmd>call AcidSendEval("eval_print")<CR>
 
@@ -82,6 +83,7 @@ if !g:acid_no_default_keymappings
     autocmd FileType clojure nmap <buffer> <silent> <C-c>x <Plug>(acid-eval-cmdline)
     autocmd FileType clojure imap <buffer> <silent> <C-c>x <Plug>(acid-eval-cmdline)
     autocmd FileType clojure map  <buffer> <silent> cp     <Plug>(acid-motion-op)
+    autocmd FileType clojure vmap <buffer> <silent> cp     <Plug>(acid-eval-visual)
     autocmd FileType clojure map  <buffer> <silent> cpp    <Plug>(acid-eval-expr)
     autocmd FileType clojure map  <buffer> <silent> cqp    <Plug>(acid-eval-print)