Changed deindent, so that if the deindent runs into an unusual line with a partial indent at the front, it'll still de-indent that. (#193)

This commit is contained in:
Adam 2021-05-19 16:41:28 -04:00 committed by GitHub
parent 86a7037ed9
commit b278306fc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions

View File

@ -45,15 +45,22 @@ local function insert_at_start_of_selected_lines(text, skip_empty)
doc():set_selection(line1, col1 + #text, line2, col2 + #text, swap)
end
local function remove_from_start_of_selected_lines(text, skip_empty)
local function remove_from_start_of_selected_lines(text, skip_empty, remove_partial)
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)
for i = #text, 1, -1 do
if line_text:sub(1, i) == text:sub(1, i)
and (not skip_empty or line_text:find("%S"))
then
doc():remove(line, 1, line, i + 1)
break
end
if not remove_partial then
break
end
end
end
doc():set_selection(line1, col1 - #text, line2, col2 - #text, swap)
@ -193,7 +200,7 @@ local commands = {
["doc:unindent"] = function()
local text = get_indent_string()
remove_from_start_of_selected_lines(text)
remove_from_start_of_selected_lines(text, false, true)
end,
["doc:duplicate-lines"] = function()