resolve conflicts

akkartik

Feb 8, 2024, 10:54 AM

NBTKJTI5MDKJNTD7JAORTXPPKTYVLVT4DEWSPRYBQAM6QVWNWXCAC

Dependencies

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

Change contents

• file deletion: source_text_tests.lua (----------)source_text_tests.lua (----------)
  [4.2]→[4.83676:83721](∅→∅),[4.2]→[4.83676:83721](∅→∅),[4.83721]→[4.3498:3498](∅→∅)
  − -- 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.147062:147101](∅→∅),[4.2]→[4.147062:147101](∅→∅),[4.147101]→[4.83723:83723](∅→∅)
  − return line_cache.screen_line_starting_pos[screen_line_index+1]

  − end
• replacement in source_text_tests.lua at line 488
  [4.22860]→[4.22860:22900](∅→∅)
  − -- cursor moves to end of screen line
  [4.22860]

  [4.3500]
  + -- cursor moves to end of screen line (one more than final character shown)
• replacement in source_text_tests.lua at line 490
  [4.3556]→[4.3556:3611](∅→∅)
  − check_eq(Editor_state.cursor1.pos, 12, 'cursor:pos')
  [4.3556]

  [4.23075]
  + check_eq(Editor_state.cursor1.pos, 13, 'cursor:pos')
• replacement in source_text_tests.lua at line 509
  [4.23964]→[4.23964:24004](∅→∅)
  − -- cursor moves to end of screen line
  [4.23964]

  [4.3666]
  + -- cursor moves to end of screen line (one more than final character shown)
• replacement in source_text_tests.lua at line 511
  [4.3722]→[4.3722:3777](∅→∅)
  − check_eq(Editor_state.cursor1.pos, 12, 'cursor:pos')
  [4.3722]

  [4.24257]
  + check_eq(Editor_state.cursor1.pos, 13, 'cursor:pos')
• replacement in source_text_tests.lua at line 579
  [4.27776]→[4.27776:27816](∅→∅),[4.27816]→[4.4368:4419](∅→∅)
  − -- cursor moves to end of screen line

  − check_eq(Editor_state.cursor1.pos, 20, 'cursor')
  [4.27776]

  [4.730]
  + -- cursor moves to end of screen line (one more than final character shown)

  + check_eq(Editor_state.cursor1.pos, 21, 'cursor')
• replacement in source_text.lua at line 801
  [4.134978]→[4.6521:6595](∅→∅)
  − return line_cache.screen_line_starting_pos[screen_line_index+1]-1
  [4.134978]

  [4.135059]
  + return line_cache.screen_line_starting_pos[screen_line_index+1]