fix: nvim 0.11.2 support (#35)

Author: bennypowers

Makefile

@@ -1,2 +1,4 @@
-test: *
-	nvim --headless -u test/init.lua -c "lua require'plenary.test_harness'.test_directory('test/', {minimal_init='test/init.lua',sequential=true})"
+.PHONY: test
+
+test:
+	nvim --headless -u test/init.lua -c "lua local file = os.getenv('TEST_FILE') or 'test/'; require'plenary.test_harness'.test_directory(file, {minimal_init='test/init.lua',sequential=true})"

lua/splitjoin.lua

@@ -6,18 +6,18 @@ local get_parser = vim.treesitter.get_parser
 local is_in_node_range = vim.treesitter.is_in_node_range
 
 ---@class SplitjoinLanguageOptions
----@field default_indent string
----@field surround string[] tuple of surround strings
----@field separator string=','
----@field separator_is_node boolean=true
----@field padding string
----@field trailing_separator boolean=true true when a trailing separator (e.g. trailing comma) is permitted/desired
+---@field default_indent? string
+---@field surround? string[] tuple of surround strings
+---@field separator? string=','
+---@field separator_is_node? boolean=true
+---@field padding? string
+---@field trailing_separator? boolean=true true when a trailing separator (e.g. trailing comma) is permitted/desired
 
 ---@class SplitjoinLanguageConfig
 ---@field nodes table<string, SplitjoinLanguageOptions>
 
 ---@class SplitjoinOptions
----@field default_indent string
+---@field default_indent? string
 ---@field languages table<string, SplitjoinLanguageOptions>
 
 local Splitjoin = {}

lua/splitjoin/languages/ecmascript/defaults.lua

@@ -62,10 +62,10 @@ return {
       join = ECMAScript.join_arrow_function,
     },
 
-    -- comment = {
-    --   split = ECMAScript.split_comment,
-    --   join = ECMAScript.join_comment,
-    -- }
+    comment = {
+      split = ECMAScript.split_comment,
+      join = ECMAScript.join_comment,
+    }
 
   },
 

lua/splitjoin/languages/ecmascript/functions.lua

@@ -98,32 +98,88 @@ function ECMAScript.join_arrow_function(node, options)
   Node.goto_node(node)
 end
 
--- function ECMAScript.split_comment(node, options)
---   local text = Node.get_text(node)
---   if String.is_multiline(text) or vim.startwith(text, '//') then return end
---   local indent = options.default_indent or ' '
---   local append, get = String.append('')
---   append(
---     '/**\n',
---     indent,
---     '* ',
---     text.gsub([[(^/**)|(*/$)]], '')
---     '\n */'
---   )
---   Node.replace(node, get())
---   Node.trim_line_end(node)
---   Node.trim_line_end(node, 1)
---   Node.goto_node(node)
--- end
---
--- function ECMAScript.join_comment(node, options)
---   local text = Node.get_text(node)
---   if String.is_multiline(text) or vim.startwith(text, '//') then return end
---   local row, col = node:range()
---   local comment = vim.treesitter.get_node{ pos = { row, col - 1 } }
---   local description = text.gsub([[(^/**)|(*/$)]], '');
---   Node.replace(comment, '/** ' .. description .. ' */')
---   Node.goto_node(comment)
--- end
+function ECMAScript.split_comment(node, options)
+  local text = Node.get_text(node)
+  if String.is_multiline(text) or vim.startswith(text, '//') then return end
+  local indent = options.default_indent or ' '
+  local append, get = String.append('')
+  local description = text
+    :gsub("^/%*%*", "")   -- Remove leading /**
+    :gsub("%*/$", "")     -- Remove trailing */
+    :gsub("^%s+", "")     -- Remove leading whitespace
+    :gsub("%s+$", "")     -- Remove trailing whitespace
+  append(
+    '/**\n',
+    indent,
+    '* ',
+    description,
+    '\n */'
+  )
+  Node.replace(node, get())
+  Node.trim_line_end(node)
+  Node.trim_line_end(node, 1)
+  Node.goto_node(node)
+end
+
+function ECMAScript.join_comment(node, options)
+  local text = Node.get_text(node)
+
+  if vim.startswith(text, '/**') and String.is_multiline(text) then
+    -- Join JSDoc comment
+    local description = text
+      :gsub("^/%*%*", "")
+      :gsub("%*/$", "")
+      :gsub("\r", "")
+      :gsub("^\n*", "")
+      :gsub("\n%s*%*%s?", "\n") -- Remove leading * on every line
+      :gsub("^%s*%*%s?", "")    -- Remove * at the start if present
+      :gsub("^%s+", "")         -- Trim leading whitespace
+      :gsub("%s+$", "")         -- Trim trailing whitespace
+
+    if not description:find("\n") then
+      Node.replace(node, '/** ' .. description .. ' */')
+    else
+      -- Reformat multiline comment
+      local indent = options and options.default_indent or ' '
+      local lines = {}
+      for line in description:gmatch("[^\n]+") do
+        table.insert(lines, indent .. '* ' .. line)
+      end
+      Node.replace(node, '/**\n' .. table.concat(lines, '\n') .. '\n' .. indent .. '*/')
+    end
+    Node.goto_node(node)
+    return
+  end
+
+  if String.is_multiline(text) or vim.startswith(text, '//') then return end
+  local row, col = node:range()
+  local comment = vim.treesitter.get_node{ pos = { row, col - 1 } }
+
+  -- Remove /**, */, normalize whitespace, remove leading * on each line
+  local description = text
+    :gsub("^/%*%*", "")
+    :gsub("%*/$", "")
+    :gsub("\r", "")
+    :gsub("^\n*", "")
+    :gsub("\n%s*%*%s?", "\n") -- Remove leading * on every line
+    :gsub("^%s*%*%s?", "")    -- Remove * at the start if present
+    :gsub("^%s+", "")         -- Trim leading whitespace
+    :gsub("%s+$", "")         -- Trim trailing whitespace
+
+  -- Now check if the description is a single line (no internal newlines)
+  if not description:find("\n") then
+    Node.replace(comment, '/** ' .. description .. ' */')
+  else
+    local indent = options and options.default_indent or ' '
+    local lines = {}
+    for line in description:gmatch("[^\n]+") do
+      table.insert(lines, indent .. '* ' .. line)
+    end
+    Node.replace(comment, '/**\n' .. table.concat(lines, '\n') .. '\n' .. indent .. '*/')
+  end
+  Node.goto_node(comment)
+end
+
+
 
 return ECMAScript