fix: closest node

lua/splitjoin.lua

@@ -34,16 +34,26 @@ local function get_node(bufnr, winnr)
   local langtree = tsparser:language_for_range { row, col, row, col };
   local lang = langtree:lang()
   local query = vim.treesitter.get_query(lang, 'splitjoin')
+  local nodes = {}
   if query then
     for _, node, _ in query:iter_captures(tstree:root(), bufnr, row - 1, row) do
       if vim.treesitter.is_in_node_range(node, row - 1, col) then
-        local start_row, start_col, end_row, end_col = node:range()
-        local range = { start_row, start_col, end_row, end_col }
-        local source = vim.treesitter.get_node_text(node, bufnr)
-        return node, range, source, lang
+        table.insert(nodes, node)
       end
     end
   end
+
+  local node = nodes[#nodes]
+  if node then
+    local getter = U.get_config_operative_node(lang, node:type())
+    if getter then
+      node = getter(node) or node
+    end
+    local start_row, start_col, end_row, end_col = node:range()
+    local range = { start_row, start_col, end_row, end_col }
+    local source = vim.treesitter.get_node_text(node, bufnr)
+    return node, range, source, lang
+  end
 end
 
 ---@return string[]

lua/splitjoin/languages/css.lua

@@ -12,4 +12,11 @@ return {
   separators = {
     block = ';',
   },
+  before = {
+    block = function(op, _, _, lines)
+      if op == 'join' then
+        -- lines[#lines] = lines[#lines] .. ';'
+      end
+    end
+  }
 }

lua/splitjoin/languages/typescript.lua

@@ -1,5 +1,8 @@
 local U = require'splitjoin.util'
 
+local flatten = vim.tbl_flatten
+local map = vim.tbl_map
+
 ---@type SplitjoinLanguageConfig
 return {
   extends = 'ecmascript',
@@ -8,18 +11,36 @@ return {
       union_type = true,
     },
   },
+
+  -- config
   separators = {
     union_type = '|',
   },
+
+  -- hooks
+  operative_node = {
+    union_type = function(node)
+      local n = node
+      local p = n:parent()
+      while p and p:type() == 'union_type' do
+        n = p
+        p = n:parent()
+      end
+      return n
+    end,
+  },
   before = {
-    union_type = function(op, node, base_indent, lines)
-      if op == 'split' and U.node_is_sep_first('typescript', node:type()) then
-        table.insert(lines, 1, '')
+    union_type = function(op, _, _, lines)
+      if op == 'split' then
+        local sep_first = U.node_is_sep_first('typescript', 'union_type')
+        if sep_first then
+          table.insert(lines, 1, '')
+        end
+        return lines
       end
-      return lines
     end
   },
   after = {
-    union_type = U.trim_end,
+    union_type = U.trim_end
   },
 }

lua/splitjoin/util.lua

@@ -131,6 +131,7 @@ M.node_is_no_trailing_comma = get_config_for('no_trailing_comma')
 
 M.get_config_after = get_config_for('after', M.jump_to_node_end_at)
 M.get_config_before = get_config_for('before', function(_, _, _, lines) return lines end)
+M.get_config_operative_node = get_config_for('operative_node')
 M.get_config_separators = get_config_for('separators')
 M.get_config_indent = get_config_for('default_indent')
 

test/css_spec.lua

@@ -1,17 +1,34 @@
-local strings = require'plenary.strings'
+local d = require'plenary.strings'.dedent
 
 local H = require'test.helpers'
 
-describe('css', function()
-  H.make_suite(
-    'css',
-    'block',
-    'a { color: blue; font: 12px "Fira Code", monospace }',
-    strings.dedent[[
+local lang = 'css'
+
+describe(lang, function()
+
+  H.make_suite(lang, 'block',
+    d[[
+      a { color: blue }
+    ]],
+    d[[
+      a {
+        color: blue;
+      }
+    ]],
+    ':'
+  )
+
+  H.make_suite(lang, 'block with list',
+    d[[
+      a { color: blue; font: 12px "Fira Code", monospace }
+    ]],
+    d[[
       a {
         color: blue;
         font: 12px "Fira Code", monospace;
-      }]],
+      }
+    ]],
     ';'
   )
+
 end)

test/fixtures/css.css

@@ -1 +1,3 @@
+a { color: blue }
+
 a { color: blue; font: 12px "Fira Code", monospace }

test/fixtures/javascript.js

@@ -11,3 +11,5 @@ const notObj = 1
 function thingy() {
   return new Knaidlach(a, b, c);
 }
+
+f(a, b, g(c, d))

test/fixtures/lua.lua

@@ -11,3 +11,5 @@ end
 local a, b, c = d
 
 a, b, c = d
+
+f(a, b, c, g(d, e))

test/helpers.lua

@@ -20,39 +20,56 @@ function M.read_lines(path)
   return lines
 end
 
+function M.skip(lang, name, fixture, split_expected, go_to)
+
+end
+
+function M.get_buf_text(bufnr)
+  return table.concat(vim.api.nvim_buf_get_text(bufnr, 0, 0, -1, -1, {}), '\n')
+end
+
 function M.make_suite(lang, name, fixture, split_expected, go_to)
   local assert = require 'luassert'
   local splitjoin = require'splitjoin'
-
   describe(name, function()
-    before_each(function()
-      bufnr = vim.api.nvim_create_buf(true, false)
-      vim.api.nvim_win_set_buf(0, bufnr)
-      vim.opt.filetype = lang
-      local lines = vim.split(fixture, '\n', { plain = true, trimempty = false })
-      vim.api.nvim_buf_set_lines(bufnr, 0, 1, false, lines)
-      if type(go_to) == 'string' then
-        vim.cmd.norm('f'..go_to)
-      elseif type(go_to) == 'table' then
-        vim.api.nvim_win_set_cursor(0, go_to)
-      end
-    end)
 
-    after_each(function()
-      vim.api.nvim_buf_delete(bufnr, { force = true })
-    end)
+    describe('splits', function()
+        local bufnr
 
-    it('splits', function()
-      splitjoin.split()
-      assert.same(split_expected,
-                  table.concat(vim.api.nvim_buf_get_text(bufnr, 0, 0, -1, -1, {}), '\n'))
-    end)
+        local function create ()
+        if not bufnr then
+          bufnr = vim.api.nvim_create_buf(true, false)
+          vim.api.nvim_win_set_buf(0, bufnr)
+          vim.opt.filetype = lang
+          local lines = vim.split(fixture, '\n', { plain = true, trimempty = false })
+          vim.api.nvim_buf_set_lines(bufnr, 0, 1, false, lines)
+          if type(go_to) == 'string' then
+            vim.cmd.norm('f'..go_to)
+          elseif type(go_to) == 'table' then
+            vim.api.nvim_win_set_cursor(0, go_to)
+          end
+        end
+        end
+
+        local function destroy()
+          vim.api.nvim_buf_delete(bufnr, { force = true })
+          bufnr = nil
+        end
+
+      before_each(create)
+      after_each(destroy)
 
-    it('and rejoins', function()
-      splitjoin.split()
-      splitjoin.join()
-      assert.same(fixture,
-                  table.concat(vim.api.nvim_buf_get_text(bufnr, 0, 0, -1, -1, {}), '\n'))
+      it('as expected', function()
+        splitjoin.split()
+        assert.same(split_expected, M.get_buf_text(bufnr))
+      end)
+      describe('and rejoins', function()
+        it('as expected', function()
+          splitjoin.split()
+          splitjoin.join()
+          assert.same(fixture, M.get_buf_text(bufnr))
+        end)
+      end)
     end)
   end)
 end