resolve conflicts

akkartik

Oct 30, 2024, 1:25 AM

QSHQIVF3JASUFN56WXNZRZW2CQAZXB2V43YQJVBZ3FPRTVULZJ6QC

Dependencies

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

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