resolve conflicts

akkartik

Feb 8, 2024, 10:58 AM

PCHTG7YUTZ3FODORPEOPLQ3VG7PNNBN2KDXH32SWLH4UZBWAGJYQC

Dependencies

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

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