Skip to content

chore: refactor utils.get_lines #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 20, 2021
Merged

chore: refactor utils.get_lines #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff00e3e
chore: refactor `utils.get_lines`
numToStr Nov 20, 2021
52e4102
cut down 2 line
numToStr Nov 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions lua/Comment/opfunc.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ function O.opfunc(cfg, vmode, cmode, ctype, cmotion)

cmotion = cmotion == U.cmotion._ and U.cmotion[vmode] or cmotion

local lines, range = U.get_lines(vmode, ctype)

local range = U.get_region(vmode)
local same_line = range.srow == range.erow
local partial_block = cmotion == U.cmotion.char or cmotion == U.cmotion.v
local block_x = partial_block and same_line
Expand All @@ -61,6 +60,7 @@ function O.opfunc(cfg, vmode, cmode, ctype, cmotion)
}

local lcs, rcs = U.parse_cstr(cfg, ctx)
local lines = U.get_lines(range)

if block_x then
ctx.cmode = O.blockwise_x({
Expand Down Expand Up @@ -173,16 +173,17 @@ end
---@return integer CMode
function O.blockwise(p, partial)
-- Block wise, only when there are more than 1 lines
local sln, eln = p.lines[1], p.lines[2]
local sln, eln = p.lines[1], p.lines[#p.lines]
local lcs_esc, rcs_esc = U.escape(p.lcs), U.escape(p.rcs)
local padding, pp = U.get_padding(p.cfg.padding)

-- These string should be checked for comment/uncomment
local sln_check = sln
local eln_check = eln
local sln_check, eln_check
if partial then
sln_check = sln:sub(p.range.scol + 1)
eln_check = eln:sub(0, p.range.ecol + 1)
else
sln_check, eln_check = sln, eln
end

-- If given mode is toggle then determine whether to comment or not
Expand Down
28 changes: 6 additions & 22 deletions lua/Comment/utils.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,9 @@ function U.get_region(vmode)
local sln, eln

if vmode:match('[vV]') then
sln = m(buf, '<')
eln = m(buf, '>')
sln, eln = m(buf, '<'), m(buf, '>')
else
sln = m(buf, '[')
eln = m(buf, ']')
sln, eln = m(buf, '['), m(buf, ']')
end

return {
Expand Down Expand Up @@ -158,29 +156,15 @@ function U.get_count_lines(count)
end

---Get lines from a NORMAL/VISUAL mode
---@param vmode string VIM mode
---@param ctype CType
---@param range CRange
---@return CLines
---@return CRange
function U.get_lines(vmode, ctype)
local range = U.get_region(vmode)

function U.get_lines(range)
-- If start and end is same, then just return the current line
local lines
if range.srow == range.erow then
lines = { A.nvim_get_current_line() }
elseif ctype == U.ctype.block then
-- In block we only need the starting and endling line
lines = {
A.nvim_buf_get_lines(0, range.srow - 1, range.srow, false)[1],
A.nvim_buf_get_lines(0, range.erow - 1, range.erow, false)[1],
}
else
-- decrementing `scol` by one bcz marks are 1 based but lines are 0 based
lines = A.nvim_buf_get_lines(0, range.srow - 1, range.erow, false)
return { A.nvim_get_current_line() }
end

return lines, range
return A.nvim_buf_get_lines(0, range.srow - 1, range.erow, false)
end

---Validates and unwraps the given commentstring
Expand Down