resolve conflicts

akkartik

Dec 17, 2023, 7:56 AM

5LN2NUSEFCHSFMWWMGMBNYRAUTWDWHELROWX6HKVFC573NJ2FDFAC

Dependencies

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

Change contents

• file deletion: source_text.lua (----------)source_text.lua (----------)
  [7.2]→[7.147125:147164](∅→∅),[7.147164]→[7.83786:83786](∅→∅),[7.2]→[7.147125:147164](∅→∅)
  − assert(false, ('Text.offset(%d) called on a string of length %d (byte size %d); this is likely a failure to handle utf8\n\n^%s$\n'):format(pos1, utf8.len(s), #s, s))

  − end
• file deletion: source_text_tests.lua (----------)source_text_tests.lua (----------)
  [7.2]→[7.83739:83784](∅→∅),[7.2]→[7.83739:83784](∅→∅),[7.83784]→[7.3561:3561](∅→∅)
  − edit.draw(Editor_state)

  − edit.run_after_mouse_press(Editor_state, Editor_state.left+8,5, 1)

  − -- selection is at screen top

  − check(Editor_state.selection1.line ~= nil, 'selection:line-not-nil')

  − check_eq(Editor_state.selection1.line, 2, 'selection:line')

  − check_eq(Editor_state.selection1.pos, 3, 'selection:pos')

  − end

  −

  − function test_select_text_using_mouse_starting_below_text()

  − -- I'd like to test what happens when a mouse click is below some page of

  − -- text, potentially even in the middle of a line.

  − -- However, it's brittle to set up a text line boundary just right.

  − -- So I'm going to just check things below the bottom of the final line of

  − -- text when it's in the middle of the screen.

  − -- final screen line ends in the middle of screen

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

  − Editor_state = edit.initialize_test_state()

  − Editor_state.lines = load_array{'abcde'}

  − Text.redraw_all(Editor_state)

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

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

  − Editor_state.screen_bottom1 = {}

  − edit.draw(Editor_state)

  − local y = Editor_state.top

  − App.screen.check(y, 'ab', 'baseline:screen:1')

  − y = y + Editor_state.line_height

  − App.screen.check(y, 'cde', 'baseline:screen:2')

  − -- press mouse above first line of text

  − edit.run_after_mouse_press(Editor_state, 5,App.screen.height-5, 1)

  − -- selection is past bottom-most text in screen

  − check(Editor_state.selection1.line ~= nil, 'selection:line-not-nil')

  − check_eq(Editor_state.selection1.line, 1, 'selection:line')

  − check_eq(Editor_state.selection1.pos, 6, 'selection:pos')

  − end

  −
• file deletion: source_edit.lua (----------)source_edit.lua (----------)
  [7.2]→[7.165788:165827](∅→∅),[7.2]→[7.165788:165827](∅→∅),[7.165827]→[7.152503:152503](∅→∅)
  − if mouse_press_consumed_by_any_button(State, x,y, mouse_button) then

  − -- press on a button and it returned 'true' to short-circuit

  − return

  − end

  −