resolve conflicts

akkartik

Oct 29, 2024, 11:14 PM

3R6VAVPXLFJ3HBEIK2BCRCVYK7LWNBOFRTN4BQK2N2VADA34JTIQC

Dependencies

[2] FWPU6TTQ resolve conflicts
[3] 4FTOQOPZ bugfix #2 in search UI
[4] LF7BWEG4 group all editor globals
[5] O7YTBRQY bugfix: restart search on backspace
[6] 54HQZ536 resolve conflicts
[7] 7VGDIPLC more robust state validation
[8] T6A5SZGB bugfix: restart search on backspace
[9] 5ZA3BRNY add state arg to a few functions
[10] TWSPUEHF resolve conflicts
[11] APOMBXMU resolve conflicts
[12] KNWMKLNJ Merge lines.love
[13] VYIA2JFX resolve conflicts
[14] 4ATFJ4RX resolve conflicts
[15] CIK3U5S6 Merge lines.love
[16] IENTL2IT indent
[17] Z5WOBP27 Merge lines.love
[18] 5CDHNEKR Merge lines.love
[19] VOJISLDC resolve conflicts
[20] 2L5MEZV3 experiment: new edit namespace
[21] P4NJ2KS7 resolve conflicts
[22] KF72R2XX resolve conflicts
[23] GYTD7DDW resolve conflicts
[24] LNUHQOGH start passing in Editor_state explicitly
[25] NVSC4N4K change a helper slightly
[26] OO5GDU53 pijul bug: why did previous change not have any effect?
[27] OWE64YJ2 Merge lines.love
[28] XQV3PNH2 resolve conflicts
[29] 235D5R3Z resolve conflicts

Change contents

replacement in edit.lua at line 145

[4.205]→[4.205:221](∅→∅),[4.221]→[4.66:113](∅→∅)

while true do
if State.cursor1.line >= #State.lines then

[4.205]

[4.113]

local line = State.cursor1.line
while line < #State.lines do
line = line+1
if State.lines[line].mode == 'text' then
State.cursor1.line = line
State.cursor1.pos = 1
replacement in edit.lua at line 153

[4.133]→[4.133:192](∅→∅)

if State.lines[State.cursor1.line].mode == 'text' then

[4.133]

[4.192]

end
end

function edit.put_cursor_on_next_text_line_wrapping_around_if_necessary(State)
local line = State.cursor1.line
local max = #State.lines
for _ = 1, max-1 do
line = (line+1) % max
if State.lines[line].mode == 'text' then
State.cursor1.line = line
State.cursor1.pos = 1
replacement in edit.lua at line 166

[4.212]→[4.212:284](∅→∅)

State.cursor1.line = State.cursor1.line+1
State.cursor1.pos = 1

[4.212]

[4.349]

end
end

function edit.put_cursor_on_next_text_loc_wrapping_around_if_necessary(State)
local cursor_line = State.lines[State.cursor1.line].data
if State.cursor1.pos <= utf8.len(cursor_line) then
State.cursor1.pos = State.cursor1.pos + 1
else
edit.put_cursor_on_next_text_line_wrapping_around_if_necessary(State)
replacement in edit.lua at line 431

[4.10170]→[4.10170:10246](∅→∅)

State.cursor1.pos = State.cursor1.pos+1
Text.search_next(State)

[4.10170]

[4.10246]

if #State.search_term > 0 then
edit.put_cursor_on_next_text_loc_wrapping_around_if_necessary(State)
Text.search_next(State)
end
replacement in edit.lua at line 436

[4.10276]→[4.10276:10310](∅→∅)

Text.search_previous(State)

[4.10276]

[4.10310]

if #State.search_term > 0 then
Text.search_previous(State)
end
edit in edit.lua at line 635

[4.17561]→[2.194:194](∅→∅),[4.394]→[4.2561:2889](∅→∅),[4.394]→[4.2561:2889](∅→∅),[4.394]→[4.2561:2889](∅→∅),[4.315]→[4.2256:2560](∅→∅),[4.315]→[4.2256:2560](∅→∅),[4.441]→[4.2067:2255](∅→∅),[4.441]→[4.2067:2255](∅→∅),[4.441]→[4.2067:2255](∅→∅),[4.11621]→[3.1334:1490](∅→∅),[4.11621]→[3.1334:1490](∅→∅),[4.11710]→[3.1491:1574](∅→∅),[4.11710]→[3.1491:1574](∅→∅)

end
end

function edit.put_cursor_on_next_text_loc_wrapping_around_if_necessary(State)
local cursor_line = State.lines[State.cursor1.line].data
if State.cursor1.pos <= utf8.len(cursor_line) then
State.cursor1.pos = State.cursor1.pos + 1
else
edit.put_cursor_on_next_text_line_wrapping_around_if_necessary(State)
end
end

function edit.put_cursor_on_next_text_line_wrapping_around_if_necessary(State)
local line = State.cursor1.line
local max = #State.lines
for _ = 1, max-1 do
line = (line+1) % max
if State.lines[line].mode == 'text' then
State.cursor1.line = line
State.cursor1.pos = 1
local line = State.cursor1.line
while line < #State.lines do
line = line+1
if State.lines[line].mode == 'text' then
State.cursor1.line = line
State.cursor1.pos = 1
if #State.search_term > 0 then
edit.put_cursor_on_next_text_loc_wrapping_around_if_necessary(State)
Text.search_next(State)
end
if #State.search_term > 0 then
Text.search_previous(State)
end
resolve order conflict in edit.lua at line 635

[4.17561]