alex/argonaut.nvim
1
Fork 0
Code Releases Activity

Cleanup

Browse Source
This commit is contained in:
Alex Yatskov 2023-02-20 12:35:38 -08:00
parent 351f0f3183
commit 64ee7ec609
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lua/argonaut.lua
View File

@ -22,18 +22,7 @@ local function get_cursor_pos()
return {row = row, col = col} return {row = row, col = col}
end end
local function is_string_literal(pos) local function get_brace_alt(brace)
if not pos then
pos = get_cursor_pos()
end
local syn_id = vim.fn.synID(pos.row, pos.col, false)
local syn_attr = vim.fn.synIDattr(syn_id, 'name')
return syn_attr:find('String$')
end
local function find_brace_alt(brace)
local brace_pairs = {{'(', ')'}, {'[', ']'}, {'{', '}'}, {'<', '>'}} local brace_pairs = {{'(', ')'}, {'[', ']'}, {'{', '}'}, {'<', '>'}}
for _, brace_pair in ipairs(brace_pairs) do for _, brace_pair in ipairs(brace_pairs) do
@ -45,8 +34,19 @@ local function find_brace_alt(brace)
end end
end end
local function is_string_literal(pos)
if not pos then
pos = get_cursor_pos()
end
local syn_id = vim.fn.synID(pos.row, pos.col, false)
local syn_attr = vim.fn.synIDattr(syn_id, 'name')
return syn_attr:find('String$')
end
local function find_brace_range(brace) local function find_brace_range(brace)
local brace_alt, _ = find_brace_alt(brace) local brace_alt, _ = get_brace_alt(brace)
assert(brace_alt) assert(brace_alt)
local escape_brace = function(brace_raw) local escape_brace = function(brace_raw)
@ -137,7 +137,7 @@ local function parse_brace_range(brace_range)
local brace_stack = {} local brace_stack = {}
local update_brace_stack = function(c) local update_brace_stack = function(c)
local brace_stack_size = #brace_stack local brace_stack_size = #brace_stack
local brace_alt, brace_open = find_brace_alt(c) local brace_alt, brace_open = get_brace_alt(c)
if brace_stack_size > 0 and brace_alt == brace_stack[brace_stack_size] and not brace_open then if brace_stack_size > 0 and brace_alt == brace_stack[brace_stack_size] and not brace_open then
table.remove(brace_stack, brace_stack_size) table.remove(brace_stack, brace_stack_size)
elseif brace_alt then elseif brace_alt then