alex/argonaut.nvim
1
Fork 0
Code Releases Activity

Cleanup

Browse Source
This commit is contained in:
Alex Yatskov 2023-02-19 17:53:06 -08:00
parent 3808e7dc5f
commit e9f28f9d0d
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lua/argonaut.lua
View File

@ -57,8 +57,10 @@ local function find_brace_range(brace)
local brace_alt, _ = find_brace_alt(brace) local brace_alt, _ = find_brace_alt(brace)
assert(brace_alt) assert(brace_alt)
local row1, col1 = unpack(vim.fn.searchpairpos(escape_brace(brace), '', escape_brace(brace_alt), 'Wnb', is_string_literal)) ---@diagnostic disable-next-line: param-type-mismatch
local row1, col1 = unpack(vim.fn.searchpairpos(escape_brace(brace), '', escape_brace(brace_alt), 'Wnb', is_string_literal))
if row1 > 0 and col1 > 0 then if row1 > 0 and col1 > 0 then
---@diagnostic disable-next-line: param-type-mismatch
local row2, col2 = unpack(vim.fn.searchpairpos(escape_brace(brace), '', escape_brace(brace_alt), 'Wcn', is_string_literal)) local row2, col2 = unpack(vim.fn.searchpairpos(escape_brace(brace), '', escape_brace(brace_alt), 'Wcn', is_string_literal))
if row2 > 0 and col2 > 0 then if row2 > 0 and col2 > 0 then
return { return {
@ -115,12 +117,14 @@ local function find_closest_brace_range(braces)
end end
local function parse_brace_range(brace_range) local function parse_brace_range(brace_range)
local brace_range_params = {} brace_range.params = {}
brace_range.indent = 0
local brace_range_param = '' local brace_range_param = ''
local flush_brace_range_param = function() local flush_brace_range_param = function()
if #brace_range_param > 0 then if #brace_range_param > 0 then
brace_range_param, _ = brace_range_param:gsub('^%s*([%S%s]-)%s*$', '%1') brace_range_param, _ = brace_range_param:gsub('^%s*([%S%s]-)%s*$', '%1')
table.insert(brace_range_params, brace_range_param) table.insert(brace_range.params, brace_range_param)
brace_range_param = '' brace_range_param = ''
end end
end end
@ -143,6 +147,7 @@ local function parse_brace_range(brace_range)
local col1 = 0 local col1 = 0
if row == brace_range.row1 then if row == brace_range.row1 then
col1 = brace_range.col1 + 1 col1 = brace_range.col1 + 1
_, brace_range.indent = line:find('^%s*') ---@diagnostic disable-line: undefined-field
end end
local col2 = #line local col2 = #line
@ -176,16 +181,25 @@ local function parse_brace_range(brace_range)
flush_brace_range_param() flush_brace_range_param()
end end
end
local function wrap_brace_range(brace_range)
end
local function unwrap_brace_range(brace_range)
for _, p in ipairs(brace_range_params) do
print(p)
end
end end
local function reflow() local function reflow()
local brace_range = find_closest_brace_range({'(', '[', '{', '<'}) local brace_range = find_closest_brace_range({'(', '[', '{', '<'})
if brace_range then if brace_range then
parse_brace_range(brace_range) parse_brace_range(brace_range)
if brace_range.row1 == brace_range.row2 then
wrap_brace_range(brace_range)
else
unwrap_brace_range()
end
end end
end end