alex/argonaut.nvim
1
Fork 0
Code Releases Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
Alex Yatskov 2024-12-31 10:20:52 -08:00
commit 0c65f3809a
3 changed files with 59 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/argonaut/options.lua
View File

@ -6,11 +6,13 @@ local options_current = {
comma_last = false,
comma_prefix = false,
comma_prefix_indent = false,
line_max = 32,
},
go = {
comma_last = true,
},
lua = {
comma_last = true,
},
}
local function setup(opt)

33
lua/argonaut/param.lua
View File

@ -5,6 +5,24 @@ local function is_empty_cell(cell)
return cell.type == 'cursor' and not cell.value:get_value():match('%S')
end
local function get_param_start_row(param)
local cell = param.cells[1]
if cell.type == 'range' then
return cell.value.start_cursor.row
elseif cell.type == 'cursor' then
return cell.value.row
end
end
local function get_param_stop_row(param)
local cell = param.cells[#param.cells]
if cell.type == 'range' then
return cell.value.stop_cursor.row
elseif cell.type == 'cursor' then
return cell.value.row
end
end
function Param.new(range, index, cells)
local param = {
range = range,
@ -72,6 +90,21 @@ function Param:write(builder, wrapped)
end
end
function Param:is_wrapped()
local previous_param = self:get_previous()
if previous_param then
return get_param_stop_row(previous_param) ~= get_param_start_row(self)
else
return self.range.start_cursor.row ~= get_param_start_row(self)
end
end
function Param:get_previous()
if self.index > 1 then
return self.range.params[self.index-1]
end
end
function Param:find_index_begin()
for i = 1, #self.cells do
if not is_empty_cell(self.cells[i]) then

28
lua/argonaut/range.lua
View File

@ -147,12 +147,25 @@ function Range:write(builder, wrapped)
builder:push_indent()
for i, param in ipairs(self.params) do
param:write(builder)
local is_first_param = i == 1
local is_last_param = i == #self.params
if not is_last_param or self:query_option('comma_last') then
builder:write(',')
if self:query_option('comma_prefix') then
if is_first_param then
if self:query_option('comma_prefix_indent') then
builder:write(' ')
end
else
builder:write(', ')
end
param:write(builder)
else
param:write(builder)
if not is_last_param or self:query_option('comma_last') then
builder:write(',')
end
end
if not is_last_param then
builder:endline()
end
@ -206,7 +219,12 @@ function Range:query_option(name)
end
function Range:is_wrapped()
return self.start_cursor.row ~= self.stop_cursor.row
for _, param in ipairs(self.params) do
if param:is_wrapped() then
return true
end
end
return false
end
function Range.__lt(range_1, range_2)