resolve stale conflicts

akkartik

Feb 17, 2024, 5:32 AM

PTBOQDJ7MKVSO2ANF5J725IPRWORYKEZVUHB7B5MBGLEA7JSHLVQC

Dependencies

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

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