resolve conflicts

akkartik

Feb 8, 2024, 10:58 AM

PCHTG7YUTZ3FODORPEOPLQ3VG7PNNBN2KDXH32SWLH4UZBWAGJYQC

Dependencies

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

Change contents

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

[5.2]→[5.83739:83784](∅→∅),[5.83784]→[5.3561:3561](∅→∅),[5.2]→[5.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 (----------)source_text.lua (----------)source_text.lua (----------)source_text.lua (----------)source_text.lua (----------)

[5.2]→[5.147125:147164](∅→∅),[5.2]→[5.147125:147164](∅→∅),[5.147164]→[5.83786:83786](∅→∅),[5.2]→[5.147125:147164](∅→∅),[5.2]→[5.147125:147164](∅→∅),[5.2]→[5.147125:147164](∅→∅),[5.2]→[5.147125:147164](∅→∅),[5.147164]→[5.83786:83786](∅→∅)

return line_cache.screen_line_starting_pos[screen_line_index+1]
end