resolve stale conflicts

akkartik

Feb 17, 2024, 5:32 AM

PTBOQDJ7MKVSO2ANF5J725IPRWORYKEZVUHB7B5MBGLEA7JSHLVQC

Dependencies

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

Change contents

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

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

-- cursor moves to end of screen line (one more than final character shown)
check_eq(Editor_state.cursor1.pos, 13, 'cursor:pos')
-- cursor moves to end of screen line (one more than final character shown)
check_eq(Editor_state.cursor1.pos, 13, 'cursor:pos')
-- cursor moves to end of screen line (one more than final character shown)
check_eq(Editor_state.cursor1.pos, 21, 'cursor')
end

function test_select_text()
end

function test_click_past_end_of_wrapping_line()
check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
end

function test_click_on_wrapping_line_rendered_from_partway_at_top_of_screen()
check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
file deletion: source_text.lua (----------)source_text.lua (----------)

[4.2]→[4.147125:147164](∅→∅),[4.147164]→[4.83786:83786](∅→∅),[4.2]→[4.147125:147164](∅→∅)

return line_cache.screen_line_starting_pos[screen_line_index+1]
end