resolve conflicts

akkartik

Oct 30, 2024, 1:16 AM

S7CSVBHZ4AORIP4VIQETFAVXVMNKERVOI5DENNTU73ZO2L667N7QC

Dependencies

[2] FBBHEUQN resolve conflicts
[3] OXIU3SJ2 bugfix #3, attempt #2 in search UI
[4] 3QNOKBFM beginnings of a test harness
[5] OGUV4HSA remove some memory leaks from rendered fragments
[6] CRBLAWBO resolve conflicts
[7] I4S4EFYX Merge lines.love
[8] O7YTBRQY bugfix: restart search on backspace
[9] T4FRZSYL delete an ancient, unused file
[10] 66X36NZN a little more prose describing manual_tests
[11] K2X6G75Z start writing some tests for drawings
[12] 4SR3Z4Y3 document the version of LÖVE I've been using
[13] BLWAYPKV extract a module
[14] VHUNJHXB Merge lines.love
[15] KKQKPGCI resolve conflicts
[16] 6PRGXS6X bugfix #3 in search UI
[17] SGMA5JLE save the list of tests in repo
[18] ZLJYLPOT Merge lines.love
[19] 5ZA3BRNY add state arg to a few functions
[20] 2TQUKHBC Merge lines.love
[21] 7VGDIPLC more robust state validation
[22] TVCPXAAU rename
[23] 73OCE2MC after much struggle, a brute-force undo
[24] 2H76FV5S bugfix: searching files containing unicode
[25] KMSL74GA support selections in the source editor
[26] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[27] 7YGYHOEO Merge lines.love
[28] AVTNUQYR basic test-enabled framework
[29] 3PSFWAIL Merge lines.love
[30] 4FTOQOPZ bugfix #2 in search UI
[31] D2GCFTTT clean up repl functionality
[32] 4YDBYBA4 clean up memory leak experiments
[33] LWPFEZBI Merge lines.love
[34] QMRQL2FO resolve conflicts
[35] LNUHQOGH start passing in Editor_state explicitly
[36] IENTL2IT indent
[37] N2NUGNN4 include a brief reference enabling many useful apps
[38] YXQOITYS Merge lines.love
[39] OI4FPFIN support drawings in the source editor
[40] CQVWNL4M resolve conflicts
[41] 4J3Y3DJW pijul bug: redo upstream change
[42] JOPVPUSA editing source code from within the app
[43] GVJEOWYQ resolve conflicts
[44] QZUFJMD5 resolve conflicts
[45] XX7G2FFJ intermingle freehand line drawings with text
[46] A4BSGS2C Merge lines.love
[47] IX5YTLSV state validation in source editor as well
[48] ISOFHXB2 App.width can no longer take a Text
[49] ED4Z6ORC cleaner API for file-system access
[50] OTIBCAUJ love2d scaffold
[51] 2L5MEZV3 experiment: new edit namespace
[52] TFUNIT6M resolve conflicts
[53] ORRSP7FV deduce test names on failures
[54] 6LJZN727 handle chords
[55] 2CTN2IEF Merge lines.love
[56] SYWQBIO5 resolve conflicts
[57] LF7BWEG4 group all editor globals
[58] VP5KC4XZ Merge lines.love
[59] KKMFQDR4 editing source code from within the app
[60] RXMHAZ6V resolve conflicts
[61] VXORMHME delete experimental REPL
[62] CE4LZV4T drop last couple of manual tests
[63] RAXUQQ6Z Merge lines.love
[64] NVSC4N4K change a helper slightly
[65] RSZD5A7G forgot to add json.lua
[66] TLOAPLBJ add a license
[67] 6VJTQKW7 start supporting LÖVE v12
[68] R5QXEHUI somebody stop me
[69] 3XNFQDDN Merge lines.love
[70] VHQCNMAR several more modules
[71] ORKN6EOB Merge lines.love
[72] TBTRYEBP Merge lines.love
[73] MBAJPTDJ resolve conflicts
[74] TYLURRX3 resolve conflicts
[75] 34BZ5ZKN Merge lines.love
[76] WKXJNESI resolve conflicts
[77] TOXPJJYY resolve conflicts
[78] LXTTOB33 extract a couple of files
[79] G54H3YG2 get rid of all bifold text
[80] R2ASHK5C fix a bad merge
[81] QXXISTGE resolve conflicts
[82] FS2ITYYH record a known issue
[83] U3MJNFUY Merge lines.love
[84] T6A5SZGB bugfix: restart search on backspace
[85] BULPIBEG beginnings of a module for the text editor

Change contents

file deletion: source_text_tests.lua (----------)source_text_tests.lua (----------)

[4.2]→[4.83676:83721](∅→∅),[4.2]→[4.83676:83721](∅→∅),[4.83721]→[4.3498:3498](∅→∅)

end

function test_search_downwards_from_end_of_line()
App.screen.init{width=120, height=60}
Editor_state = edit.initialize_test_state()
Editor_state.lines = load_array{'abc', 'def', 'ghi'}
Text.redraw_all(Editor_state)
Editor_state.cursor1 = {line=1, pos=4}
Editor_state.screen_top1 = {line=1, pos=1}
edit.draw(Editor_state)
-- search for empty string
edit.run_after_keychord(Editor_state, 'C-f', 'f')
edit.run_after_keychord(Editor_state, 'down', 'down')
-- no crash
end
Editor_state.screen_top1 = {line=1, pos=1}
edit.draw(Editor_state)
-- search for empty string
edit.run_after_keychord(Editor_state, 'C-f', 'f')
edit.run_after_keychord(Editor_state, 'down', 'down')
-- no crash
end

function test_search_downwards_from_final_pos_of_line()
App.screen.init{width=120, height=60}
Editor_state = edit.initialize_test_state()
Editor_state.lines = load_array{'abc', 'def', 'ghi'}
Text.redraw_all(Editor_state)
Editor_state.cursor1 = {line=1, pos=3}
file deletion: source_edit.lua (----------)source_edit.lua (----------)

[4.2]→[4.165725:165764](∅→∅),[4.2]→[4.165725:165764](∅→∅),[4.165764]→[4.152440:152440](∅→∅)

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
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
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)
State.cursor = deepcopy(State.search_backup.cursor)
State.screen_top = deepcopy(State.search_backup.screen_top)
Text.search_next(State)
if #State.search_term > 0 then
edit.put_cursor_on_next_text_loc_wrapping_around_if_necessary(State)
Text.search_next(State)
end
Text.search_previous(State)
end
return
elseif chord == 'C-f' then
State.search_term = ''
State.search_backup = {
elseif chord == 'up' then
elseif chord == 'down' then
end
break
end
break
end
edit in source_text_tests.lua at line 2075

[4.791]

[4.83734]

end

function test_search_downwards_from_end_of_line()
App.screen.init{width=120, height=60}
Editor_state = edit.initialize_test_state()
Editor_state.lines = load_array{'abc', 'def', 'ghi'}
Text.redraw_all(Editor_state)
Editor_state.cursor1 = {line=1, pos=4}
Editor_state.screen_top1 = {line=1, pos=1}
edit.draw(Editor_state)
-- search for empty string
edit.run_after_keychord(Editor_state, 'C-f', 'f')
edit.run_after_keychord(Editor_state, 'down', 'down')
-- no crash
end

function test_search_downwards_from_final_pos_of_line()
App.screen.init{width=120, height=60}
Editor_state = edit.initialize_test_state()
Editor_state.lines = load_array{'abc', 'def', 'ghi'}
Text.redraw_all(Editor_state)
Editor_state.cursor1 = {line=1, pos=3}
Editor_state.screen_top1 = {line=1, pos=1}
edit.draw(Editor_state)
-- search for empty string
edit.run_after_keychord(Editor_state, 'C-f', 'f')
edit.run_after_keychord(Editor_state, 'down', 'down')
-- no crash
replacement in source_edit.lua at line 145

[4.438]→[4.438:454](∅→∅),[4.454]→[4.516:563](∅→∅)

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

[4.438]

[4.563]

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 source_edit.lua at line 153

[4.583]→[4.583:642](∅→∅)

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

[4.583]

[4.642]

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 source_edit.lua at line 166

[4.662]→[4.662:734](∅→∅)

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

[4.662]

[4.18427]

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 source_edit.lua at line 431

[4.158937]→[4.158937:158969](∅→∅),[4.158969]→[4.9367:9413](∅→∅)

elseif chord == 'down' then
State.cursor1.pos = State.cursor1.pos+1

[4.158907]

[4.159120]

State.cursor = deepcopy(State.search_backup.cursor)
State.screen_top = deepcopy(State.search_backup.screen_top)
edit in source_edit.lua at line 434

[4.159150]

[4.159150]

elseif chord == 'down' then
if #State.search_term > 0 then
edit.put_cursor_on_next_text_loc_wrapping_around_if_necessary(State)
Text.search_next(State)
end
edit in edit.lua at line 98

[4.754]

[4.29]

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
break
end
end
end

function edit.put_cursor_on_next_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
replacement in edit.lua at line 308

[4.6797]→[4.6797:6873](∅→∅)

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

[4.6797]

[4.6873]

if #State.search_term > 0 then
edit.put_cursor_on_next_loc_wrapping_around_if_necessary(State)
Text.search_next(State)
end
edit in edit.lua at line 469

[4.12430]→[2.429:429](∅→∅),[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.35:191](∅→∅),[4.11621]→[3.35:191](∅→∅),[4.11710]→[4.198:232](∅→∅),[4.11710]→[4.198:232](∅→∅)

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
Text.search_previous(State)
resolve order conflict in edit.lua at line 469

[4.12430]