lua/argonaut/config.lua

@@ -11,10 +11,6 @@ local configs = {
     go = {
         comma_last = true,
     },
-    vim = {
-        brace_last_wrap = false,
-        line_prefix = '\\ ',
-    }
 }
 
 local function set(opts, filetypes)

lua/argonaut/types.lua

@@ -262,9 +262,8 @@ end
 local ParamList = {}
 ParamList.__index = ParamList
 
-function ParamList.new(range)
+function ParamList.new()
     local params = {
-        range = range,
         current = nil,
         parsed = {},
     }
@@ -281,7 +280,7 @@ function ParamList:flush()
     end
 end
 
-function ParamList:update(char, brace_stack, cursor)
+function ParamList:update(char, brace_stack, range, cursor)
     if not cursor:is_string() then
         brace_stack:update(char)
         if brace_stack:empty() and char == ',' then
@@ -293,7 +292,7 @@ function ParamList:update(char, brace_stack, cursor)
     if self.current then
         self.current:append(char)
     else
-        self.current = Param.new(char, self.range)
+        self.current = Param.new(char, range)
     end
 
     if cursor == Cursor.get_current() then
@@ -301,72 +300,30 @@ function ParamList:update(char, brace_stack, cursor)
     end
 end
 
-function ParamList:parse()
+function ParamList:parse(range)
     local brace_stack = BraceStack:new()
 
-    for row = self.range.start.row, self.range.stop.row do
+    for row = range.start.row, range.stop.row do
         local line = vim.fn.getline(row)
 
         local start_col = 1
-        if row == self.range.start.row then
+        if row == range.start.row then
-            start_col = self.range.start.col + 1
+            start_col = range.start.col + 1
         end
 
         local stop_col = #line
-        if row == self.range.stop.row then
+        if row == range.stop.row then
-            stop_col = self.range.stop.col - 1
+            stop_col = range.stop.col - 1
         end
 
         for col = start_col, stop_col do
-            self:update(line:sub(col, col), brace_stack, Cursor.new(row, col))
+            self:update(line:sub(col, col), brace_stack, range, Cursor.new(row, col))
         end
     end
 
     self:flush()
 end
 
---
--- Builder
---
-
-local Builder = {}
-Builder.__index = Builder
-
-function Builder.new(indent_level, indent_block)
-    local builder = {
-        lines = {},
-        line = '',
-        indent_level = indent_level,
-        indent_block = indent_block,
-    }
-
-    return setmetatable(builder, Builder)
-end
-
-function Builder:indent()
-    self.indent_level = self.indent_level + 1
-end
-
-function Builder:unindent()
-    assert(self.indent_level > 0)
-    self.indent_level = self.indent_level - 1
-end
-
-function Builder:update(text)
-    self.line = self.line .. text
-end
-
-function Builder:flush()
-    local indent = string.rep(self.indent_block, self.indent_level)
-    table.insert(self.lines, indent .. self.line)
-    self.line = ''
-end
-
-function Builder:get_offset()
-    local indent = string.rep(self.indent_block, self.indent_level)
-    return Cursor.new(#self.lines, #self.line + #indent)
-end
-
 --
 -- WrapContext
 --
@@ -394,94 +351,67 @@ function WrapContext:parse()
     end
 
     local first_line = vim.fn.getline(self.range.start.row)
-    local indent = #first_line:match('^(%s*)')
+    self.indent = first_line:match('^(%s*)')
-    self.prefix = first_line:sub(indent + 1, self.range.start.col)
+    self.prefix = first_line:sub(#self.indent + 1, self.range.start.col)
-    if vim.o.expandtab then
-        self.indent_level = indent / vim.o.shiftwidth
-        self.indent_block = string.rep(' ', vim.o.shiftwidth)
-    else
-        self.indent_level = indent
-        self.indent_block = '\t'
-    end
 
     local last_line = vim.fn.getline(self.range.stop.row)
     self.suffix = last_line:sub(self.range.stop.col)
 
-    self.params = ParamList.new(self.range)
+    self.params = ParamList.new()
-    self.params:parse()
+    self.params:parse(self.range)
 
     return true
 end
 
-function WrapContext:update_builder_param(builder, param, opt)
-    local text = param.text
-    if #opt.line_prefix > 0 then
-        text = param.text:match('^%s*[' .. opt.line_prefix .. ']?%s*(.*)')
-    end
-
-    local cursor = nil
-    if param:is_active() then
-        cursor = builder:get_offset()
-        cursor.row = cursor.row + self.range.start.row
-        cursor.col = cursor.col + param.offset - (#param.text - #text)
-    end
-
-    builder:update(text)
-    return cursor
-end
-
 function WrapContext:wrap(opt)
-    local builder = Builder.new(self.indent_level, self.indent_block)
+    vim.fn.setline(self.range.start.row, self.indent .. self.prefix)
-    builder:update(self.prefix)
-    builder:flush()
-    builder:indent()
 
     local cursor = nil
+    local row = self.range.start.row
+
     for i, param in ipairs(self.params.parsed) do
-        local is_first_param = i == 1
+        local first_param = i == 1
-        local is_last_param = i == #self.params.parsed
+        local last_param = i == #self.params.parsed
 
+        local line = ''
         if opt.comma_prefix then
-            builder:update(opt.line_prefix)
+            line = line .. self.indent .. opt.line_prefix
-            if not is_first_param then
+            if not first_param then
-                builder:update(', ')
+                line = line .. ', '
-            elseif opt.comma_prefix_indent and not is_last_param then
-                builder:update('  ')
             end
-
+            line = line .. param.text
-            cursor = self:update_builder_param(builder, param, opt) or cursor
         else
-            builder:update(opt.line_prefix)
+            line = line .. self.indent .. opt.line_prefix .. param.text
-            cursor = self:update_builder_param(builder, param, opt) or cursor
+            if not last_param or opt.comma_last then
-
+                line = line .. ','
-            if not is_last_param or opt.comma_last then
-                builder:update(',')
             end
         end
 
-        if is_last_param and not opt.brace_last_wrap then
+        if last_param and not opt.brace_last_wrap then
-            builder:update(self.suffix)
+            line = line .. self.suffix
         end
 
-        builder:flush()
+        vim.fn.append(row, line)
+        row = row + 1
+        vim.fn.execute(string.format('%d>', row))
+
+        if first_param and opt.comma_prefix_indent then
+            local prev_shiftwidth = vim.o.shiftwidth
+            vim.o.shiftwidth = prev_shiftwidth - 2
+            vim.fn.execute(string.format('%d>', row))
+            vim.o.shiftwidth = prev_shiftwidth
         end
 
-    if not opt.brace_last_indent then
+        if param:is_active() then
-        builder:unindent()
+            cursor = Cursor.get_current()
+            cursor.col = #vim.fn.getline(cursor.row):match('^%s*') + param.offset
+        end
     end
 
     if opt.brace_last_wrap then
-        builder:update(self.suffix)
+        vim.fn.append(row, self.indent .. self.suffix)
-        builder:flush()
+        if opt.brace_last_indent then
-    end
+            vim.fn.execute(string.format('%d>', row + 1))
-
-    local row = self.range.start.row
-    for i, line in ipairs(builder.lines) do
-        if i == 1 then
-            vim.fn.setline(row, line)
-        else
-            vim.fn.append(row, line)
-            row = row + 1
         end
     end
 
@@ -496,28 +426,30 @@ function WrapContext:unwrap(opt)
         padding = ' '
     end
 
-    local builder = Builder.new(self.indent_level, self.indent_block)
+    local line = self.indent .. self.prefix .. padding
-    builder:update(self.prefix)
-    builder:update(padding)
 
     local cursor = nil
     for i, param in ipairs(self.params.parsed) do
-        cursor = self:update_builder_param(builder, param, opt) or cursor
+        if param:is_active() then
+            cursor = Cursor.new(0, #line + param.offset)
+        end
+
+        line = line .. param.text
         if i < #self.params.parsed then
-            builder:update(', ')
+            line = line .. ', '
         end
     end
 
-    builder:update(padding)
+    line = line .. padding .. self.suffix
-    builder:update(self.suffix)
-    builder:flush()
 
-    vim.fn.setline(self.range.start.row, builder.lines[1])
+    vim.fn.setline(self.range.start.row, line)
-    vim.fn.execute(string.format(
+    vim.fn.execute(string.format('%d,%dd_', self.range.start.row + 1, self.range.stop.row))
-        '%d,%dd_',
+
-        self.range.start.row + 1,
+    for _, param in ipairs(self.params.parsed) do
-        self.range.stop.row
+        if param:is_active() then
-    ))
+            cursor.row = Cursor:get_current().row - 1
+        end
+    end
 
     if cursor then
         cursor:set_current()