alex/argonaut.nvim
1
Fork 0
Code Releases Activity

Store location on wrapping

Browse Source
This commit is contained in:
Alex Yatskov 2024-04-26 18:41:25 -07:00
parent d21a56f88a
commit 121121826b
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lua/argonaut/types.lua
View File

@ -224,7 +224,7 @@ function Param.new(text, pair)
local param = { local param = {
text = text, text = text,
pair = pair, pair = pair,
active = false, offset = nil,
} }
return setmetatable(param, Param) return setmetatable(param, Param)
@ -235,10 +235,19 @@ function Param:append(char)
end end
function Param:activate() function Param:activate()
self.active = true self.offset = #self.text
end
function Param:is_active()
return self.offset ~= nil
end end
function Param:flush() function Param:flush()
if self.offset then
self.offset = math.min(self.offset, #self.text:match('(.-)%s*$'))
self.offset = self.offset - #self.text:match('^%s*')
end
self.text = self.text:match('^%s*(.-)%s*$') self.text = self.text:match('^%s*(.-)%s*$')
return #self.text > 0 return #self.text > 0
end end
@ -390,9 +399,9 @@ function WrapContext:wrap()
vim.o.shiftwidth = prev_shiftwidth vim.o.shiftwidth = prev_shiftwidth
end end
if param.active then if param:is_active() then
cursor = Cursor.get_current() cursor = Cursor.get_current()
cursor.col = #vim.fn.getline(cursor.row):match('^%s*') + 1 cursor.col = #vim.fn.getline(cursor.row):match('^%s*') + param.offset
end end
end end
@ -410,8 +419,8 @@ function WrapContext:unwrap()
local line = self.indent .. self.prefix local line = self.indent .. self.prefix
for i, param in ipairs(self.params.parsed) do for i, param in ipairs(self.params.parsed) do
if param.active then if param:is_active() then
cursor = Cursor.new(0, #line + 1) cursor = Cursor.new(0, #line + param.offset)
end end
line = line .. param.text line = line .. param.text
@ -426,7 +435,7 @@ function WrapContext:unwrap()
vim.fn.execute(string.format('%d,%dd_', self.range.start.row + 1, self.range.stop.row)) vim.fn.execute(string.format('%d,%dd_', self.range.start.row + 1, self.range.stop.row))
for _, param in ipairs(self.params.parsed) do for _, param in ipairs(self.params.parsed) do
if param.active then if param:is_active() then
cursor.row = Cursor:get_current().row - 1 cursor.row = Cursor:get_current().row - 1
end end
end end