resolve conflicts

akkartik

Dec 6, 2024, 10:18 PM

65WSX5RJ37JLYQDJ6MYHXHWBSZWGAUAMKDNDMQ3A4K3O6TCFIXKQC

Dependencies

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

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](∅→∅)
  − function test_click_below_final_line_of_file()

  − -- cursor goes to bottom

  − check_eq(Editor_state.cursor1.line, 1, 'cursor:line')

  − check_eq(Editor_state.cursor1.pos, 4, 'cursor:pos')

  − -- selection remains empty

  − check_nil(Editor_state.selection1.line, 'selection is empty to avoid perturbing future edits')

  − -- display one line

  − App.screen.init{width=50, height=80}

  − Editor_state = edit.initialize_test_state()

  − Editor_state.lines = load_array{'abc'}

  − Text.redraw_all(Editor_state)

  − Editor_state.cursor1 = {line=1, pos=1}

  − Editor_state.screen_top1 = {line=1, pos=1}