resolve conflicts

akkartik

Oct 30, 2024, 1:25 AM

QSHQIVF3JASUFN56WXNZRZW2CQAZXB2V43YQJVBZ3FPRTVULZJ6QC

Dependencies

[2] CZ6X73VY merge bugfix
[3] S7CSVBHZ resolve conflicts
[4] VHUNJHXB Merge lines.love
[5] VLTU33KW resolve conflicts
[6] KQ22RW43 resolve conflicts
[7] RSZD5A7G forgot to add json.lua
[8] 3QNOKBFM beginnings of a test harness
[9] TLOAPLBJ add a license
[10] XX7G2FFJ intermingle freehand line drawings with text
[11] VHQCNMAR several more modules
[12] OGUV4HSA remove some memory leaks from rendered fragments
[13] BULPIBEG beginnings of a module for the text editor
[14] JOPVPUSA editing source code from within the app
[15] ZLJYLPOT Merge lines.love
[16] TOXPJJYY resolve conflicts
[17] CE4LZV4T drop last couple of manual tests
[18] QXXISTGE resolve conflicts
[19] 4SR3Z4Y3 document the version of LÖVE I've been using
[20] VXORMHME delete experimental REPL
[21] 36Z442IV back to commit 8123959e52f without code editing
[22] 4YDBYBA4 clean up memory leak experiments
[23] 6VJTQKW7 start supporting LÖVE v12
[24] 73OCE2MC after much struggle, a brute-force undo
[25] 6LJZN727 handle chords
[26] A4BSGS2C Merge lines.love
[27] RAXUQQ6Z Merge lines.love
[28] D2GCFTTT clean up repl functionality
[29] LWPFEZBI Merge lines.love
[30] K2X6G75Z start writing some tests for drawings
[31] BLWAYPKV extract a module
[32] RXMHAZ6V resolve conflicts
[33] ECBDENZ4 Merge text.love
[34] FS2ITYYH record a known issue
[35] U3MJNFUY Merge lines.love
[36] AVTNUQYR basic test-enabled framework
[37] ZJFSVE47 Merge text.love
[38] R56CKHYZ Merge text.love
[39] 2L5MEZV3 experiment: new edit namespace
[40] 34BZ5ZKN Merge lines.love
[41] 3PSFWAIL Merge lines.love
[42] TVCPXAAU rename
[43] SGMA5JLE save the list of tests in repo
[44] 2TQUKHBC Merge lines.love
[45] VXRYVZ74 Merge text.love
[46] I4S4EFYX Merge lines.love
[47] T4FRZSYL delete an ancient, unused file
[48] 66X36NZN a little more prose describing manual_tests
[49] OTYGZVPW Merge text.love
[50] ED4Z6ORC cleaner API for file-system access
[51] CAG7PP5Y Merge text.love
[52] MBAJPTDJ resolve conflicts
[53] R6MNUXDJ pijul bug
[54] 4Y2QDDAZ resolve conflicts
[55] KKQKPGCI resolve conflicts
[56] ORKN6EOB Merge lines.love
[57] N2NUGNN4 include a brief reference enabling many useful apps
[58] 2CFLXLIE Merge text.love
[59] VBU5YHLR Merge lines.love
[60] TBTRYEBP Merge lines.love
[61] R5QXEHUI somebody stop me
[62] 3G723RV5 Merge text.love
[63] KMSL74GA support selections in the source editor
[64] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[65] M5JXTW56 Merge text.love
[66] LXTTOB33 extract a couple of files
[67] KKMFQDR4 editing source code from within the app
[68] PJ5PQAQE record support for multiple versions
[69] SLMSBVJW resolve conflicts
[70] 7LXXQBNE resolve conflicts
[71] SYWQBIO5 resolve conflicts
[72] 2CTN2IEF Merge lines.love
[73] VP5KC4XZ Merge lines.love
[74] KJLZCK2R resolve conflicts
[75] OTIBCAUJ love2d scaffold

Change contents

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

[4.2]→[4.83739:83784](∅→∅),[4.2]→[4.83739:83784](∅→∅),[4.83784]→[4.3561:3561](∅→∅)

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
end
file deletion: source_edit.lua (----------)source_edit.lua (----------)

[4.2]→[4.165788:165827](∅→∅),[4.2]→[4.165788:165827](∅→∅),[4.165827]→[4.152503:152503](∅→∅)

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)
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
elseif chord == 'up' then
Text.search_previous(State)
end
return
elseif chord == 'C-f' then
State.search_term = ''
State.search_backup = {
Text.search_next(State)
end
end

break
end
break
end