walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 14 Wiki Activity

Fixed commenting and uncommenting. (#224)

This commit is contained in:
Adam 2021-05-28 02:17:49 -04:00 committed by GitHub
parent 34e38dd04a
commit 4ffb5e3672
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
data/core/commands/doc.lua
View File

@ -33,33 +33,6 @@ local function doc_multiline_selection(sort)
return line1, col1, line2, col2, swap return line1, col1, line2, col2, swap
end end
local function insert_at_start_of_selected_lines(text, skip_empty)
local line1, col1, line2, col2, swap = doc_multiline_selection(true)
for line = line1, line2 do
local line_text = doc().lines[line]
if (not skip_empty or line_text:find("%S")) then
doc():insert(line, 1, text)
end
end
doc():set_selection(line1, col1 + #text, line2, col2 + #text, swap)
end
local function remove_from_start_of_selected_lines(text, skip_empty)
local line1, col1, line2, col2, swap = doc_multiline_selection(true)
for line = line1, line2 do
local line_text = doc().lines[line]
if line_text:sub(1, #text) == text
and (not skip_empty or line_text:find("%S"))
then
doc():remove(line, 1, line, #text + 1)
end
end
doc():set_selection(line1, col1 - #text, line2, col2 - #text, swap)
end
local function append_line_if_last_line(line) local function append_line_if_last_line(line)
if line >= #doc().lines then if line >= #doc().lines then
doc():insert(line, math.huge, "\n") doc():insert(line, math.huge, "\n")
@ -281,19 +254,31 @@ local commands = {
["doc:toggle-line-comments"] = function() ["doc:toggle-line-comments"] = function()
local comment = doc().syntax.comment local comment = doc().syntax.comment
if not comment then return end if not comment then return end
local indentation = get_indent_string()
local comment_text = comment .. " " local comment_text = comment .. " "
local line1, _, line2 = doc():get_selection(true) local line1, _, line2 = doc_multiline_selection(true)
local uncomment = true local uncomment = true
local start_offset = math.huge
for line = line1, line2 do for line = line1, line2 do
local text = doc().lines[line] local text = doc().lines[line]
if text:find("%S") and text:find(comment_text, 1, true) ~= 1 then local s = text:find("%S")
local cs, ce = text:find(comment_text, s, true)
if s and cs ~= s then
uncomment = false uncomment = false
start_offset = math.min(start_offset, s)
end end
end end
if uncomment then for line = line1, line2 do
remove_from_start_of_selected_lines(comment_text, true) local text = doc().lines[line]
else local s = text:find("%S")
insert_at_start_of_selected_lines(comment_text, true) if uncomment then
local cs, ce = text:find(comment_text, s, true)
if ce then
doc():remove(line, cs, line, ce + 1)
end
elseif s then
doc():insert(line, start_offset, comment_text)
end
end end
end, end,