alex/argonaut.nvim
1
Fork 0
Code Releases Activity

Fixes

Browse Source
This commit is contained in:
Alex Yatskov 2023-02-20 12:23:29 -08:00
parent a887c2734d
commit 7c105a37c2
1 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lua/argonaut.lua
View File

@ -129,7 +129,6 @@ local function parse_brace_range(brace_range)
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')
table.insert(brace_range.params, brace_range_param) table.insert(brace_range.params, brace_range_param)
brace_range_param = '' brace_range_param = ''
end end
@ -147,10 +146,13 @@ local function parse_brace_range(brace_range)
end end
local brace_range_elements = {} local brace_range_elements = {}
local pad_newline = false
for row = brace_range.row1, brace_range.row2 do for row = brace_range.row1, brace_range.row2 do
local lead_padding = true
local line = vim.fn.getline(row) local line = vim.fn.getline(row)
local col1 = 0 local col1 = 1
if row == brace_range.row1 then if row == brace_range.row1 then
col1 = brace_range.col1 + 1 col1 = brace_range.col1 + 1
end end
@ -160,11 +162,34 @@ local function parse_brace_range(brace_range)
col2 = brace_range.col2 - 1 col2 = brace_range.col2 - 1
end end
for i = col1, col2 do for col = col1, col2 do
table.insert(brace_range_elements, { local c = line:sub(col, col) ---@diagnostic disable-line: undefined-field
char = line:sub(i, i), ---@diagnostic disable-line: undefined-field assert(#c > 0)
literal = is_string_literal({row = row, col = i}),
}) if lead_padding then
if c:match('%s') then
if pad_newline and col == col1 then
c = ' '
else
c = nil
end
else
lead_padding = false
end
end
if c then
table.insert(brace_range_elements, {
char = c,
literal = is_string_literal({row = row, col = col}),
})
if c == ',' then
pad_newline = true
else
pad_newline = false
end
end
end end
end end