stephenseo
/
nvim-quickcomment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix usage of commentstring

This commit is contained in:
Stephen Seo 2022-11-03 12:54:02 +09:00
parent 079fed75a5
commit 47c0a409e1
1 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
plugin/quickcomment.lua
View File

@ -3,10 +3,10 @@ if vim.g.loaded_quickcomment then
end
vim.g.loaded_quickcomment = true
vim.g.quickcomment_escapecommentstring = function(comment_string)
vim.g.quickcomment_escapestring = function(string_to_escape)
local escaped_string = ''
comment_string:gsub(".", function(c)
string_to_escape:gsub(".", function(c)
if c:find('[-?+*%]%[.%%()$^]') == nil then
escaped_string = escaped_string .. c
else
@ -17,48 +17,41 @@ vim.g.quickcomment_escapecommentstring = function(comment_string)
return escaped_string
end
vim.g.quickcomment_getcommentstr = function ()
vim.g.quickcomment_togglecommentlines = function (line_start, line_end)
local comment_string = vim.api.nvim_buf_get_option(0, 'commentstring')
comment_string = comment_string:gsub('%%s', '')
local has_comment = string.find(comment_string, ',')
if has_comment ~= nil and has_comment > 1 then
comment_string = string.sub(comment_string, 1, has_comment - 1)
end
local colon_idx = string.find(comment_string, ':')
if colon_idx ~= nil then
comment_string = string.sub(comment_string, colon_idx + 1)
end
if string.len(comment_string) == 0 then
return nil
end
return comment_string
end
vim.g.quickcomment_togglecommentlines = function (line_start, line_end, comment_string)
if comment_string == nil then
comment_string = vim.g.quickcomment_getcommentstr()
print('QuickComment: ERROR: Unable to get comment string, "commentstring" is not defined!')
end
local escaped_comment_string = vim.g.quickcomment_escapecommentstring(comment_string)
local sub_find, sub_end = comment_string:find('%%s')
local escaped_string = ''
if sub_find ~= nil and sub_find > 1 then
escaped_string = vim.g.quickcomment_escapestring(comment_string:sub(1, sub_find - 1))
end
escaped_string = escaped_string .. '(.*)'
if sub_end < comment_string:len() then
escaped_string = escaped_string .. vim.g.quickcomment_escapestring(comment_string:sub(sub_end + 1))
end
local lines = vim.api.nvim_buf_get_lines(0, line_start, line_end, false)
for i, line in ipairs(lines) do
local start_col, end_col = string.find(line, '^%s*' .. escaped_comment_string)
if start_col ~= nil then
local comment_part = string.sub(line, 1, end_col)
local pstart_col, pend_col = string.find(comment_part, comment_string)
lines[i] = string.sub(line, 1, pstart_col - 1) .. string.sub(line, end_col + 1)
if line:find(escaped_string) == nil then
lines[i] = comment_string:format(line)
else
lines[i] = comment_string .. line
local match_cap = line:gmatch(escaped_string)
local captured = match_cap()
if captured ~= nil then
lines[i] = captured
else
print('QuickComment: ERROR: Failed to uncomment!')
end
end
end
vim.api.nvim_buf_set_lines(0, line_start, line_end, false, lines)
end
vim.g.quickcomment_togglecommentline = function (linen, comment_string)
vim.g.quickcomment_togglecommentline = function (linen)
if linen == nil then
linen = vim.api.nvim_win_get_cursor(0)[1]
end
vim.g.quickcomment_togglecommentlines(linen - 1, linen, comment_string)
vim.g.quickcomment_togglecommentlines(linen - 1, linen)
end