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

#1393 followup (#1463) 

* Fix incorrect check in doc:raw_remove

Restore caret position on command doc:cut

* merge cursors and fix new line in clipboard

* add new line to the last copied line
This commit is contained in:
vqn 2023-04-10 21:57:11 +02:00 committed by takase1121
parent d497402c30
commit f60228f610
No known key found for this signature in database
GPG Key ID: 60EEFFC68EB3031B
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,10 +62,10 @@ local function cut_or_copy(delete)
local text = "" local text = ""
core.cursor_clipboard = {} core.cursor_clipboard = {}
core.cursor_clipboard_whole_line = {} core.cursor_clipboard_whole_line = {}
for idx, line1, col1, line2, col2 in doc():get_selections() do for idx, line1, col1, line2, col2 in doc():get_selections(true, true) do
if line1 ~= line2 or col1 ~= col2 then if line1 ~= line2 or col1 ~= col2 then
text = doc():get_text(line1, col1, line2, col2) text = doc():get_text(line1, col1, line2, col2)
full_text = full_text == "" and text or (full_text .. " " .. text) full_text = full_text == "" and text or (text .. " " .. full_text)
core.cursor_clipboard_whole_line[idx] = false core.cursor_clipboard_whole_line[idx] = false
if delete then if delete then
doc():delete_to_cursor(idx, 0) doc():delete_to_cursor(idx, 0)
@ -73,7 +73,7 @@ local function cut_or_copy(delete)
else -- Cut/copy whole line else -- Cut/copy whole line
-- Remove newline from the text. It will be added as needed on paste. -- Remove newline from the text. It will be added as needed on paste.
text = string.sub(doc().lines[line1], 1, -2) text = string.sub(doc().lines[line1], 1, -2)
full_text = full_text == "" and text or (full_text .. text .. "\n") full_text = full_text == "" and text .. "\n" or (text .. "\n" .. full_text)
core.cursor_clipboard_whole_line[idx] = true core.cursor_clipboard_whole_line[idx] = true
if delete then if delete then
if line1 < #doc().lines then if line1 < #doc().lines then
@ -83,10 +83,12 @@ local function cut_or_copy(delete)
else else
doc():remove(line1 - 1, math.huge, line1, math.huge) doc():remove(line1 - 1, math.huge, line1, math.huge)
end end
doc():set_selections(idx, line1, col1, line2, col2)
end end
end end
core.cursor_clipboard[idx] = text core.cursor_clipboard[idx] = text
end end
if delete then doc():merge_cursors() end
core.cursor_clipboard["full"] = full_text core.cursor_clipboard["full"] = full_text
system.set_clipboard(full_text) system.set_clipboard(full_text)
end end

2
data/core/doc/init.lua
View File

@ -453,7 +453,7 @@ function Doc:raw_remove(line1, col1, line2, col2, undo_stack, time)
end end
end end
if cline2 > line1 or (cline2 == line2 and ccol2 > col1) then if cline2 > line1 or (cline2 == line1 and ccol2 > col1) then
if cline2 > line2 then if cline2 > line2 then
l2 = l2 - line_removal l2 = l2 - line_removal
else else