resolve conflicts

akkartik

Jan 22, 2025, 11:52 PM

KFEUQWHXY4OG7GJZWNQPNZWJKEOE5LD4HE2IBCVCV5EEC7DGK26AC

Dependencies

• [2] FHZ5AG3M resolve conflicts
• [3] ZLWFFQHI bugfix: scrolling up using scroll wheel
• [4] QXXISTGE resolve conflicts
• [5] TBTRYEBP Merge lines.love
• [6] SYWQBIO5 resolve conflicts
• [7] CRBLAWBO resolve conflicts
• [8] CQVWNL4M resolve conflicts
• [9] ED4Z6ORC cleaner API for file-system access
• [10] 66X36NZN a little more prose describing manual_tests
• [11] 3QNOKBFM beginnings of a test harness
• [12] TOXPJJYY resolve conflicts
• [13] VHUNJHXB Merge lines.love
• [14] BULPIBEG beginnings of a module for the text editor
• [15] AVTNUQYR basic test-enabled framework
• [16] K2X6G75Z start writing some tests for drawings
• [17] I4S4EFYX Merge lines.love
• [18] MBAJPTDJ resolve conflicts
• [19] OI4FPFIN support drawings in the source editor
• [20] TYLURRX3 resolve conflicts
• [21] 6VJTQKW7 start supporting LÖVE v12
• [22] O7YTBRQY bugfix: restart search on backspace
• [23] QIR3VBYI resolve conflicts
• [24] FS2ITYYH record a known issue
• [25] 4SR3Z4Y3 document the version of LÖVE I've been using
• [26] WKXJNESI resolve conflicts
• [27] TFUNIT6M resolve conflicts
• [28] 4YDBYBA4 clean up memory leak experiments
• [29] VHQCNMAR several more modules
• [30] QMRQL2FO resolve conflicts
• [31] SGMA5JLE save the list of tests in repo
• [32] ORKN6EOB Merge lines.love
• [33] BLWAYPKV extract a module
• [34] QZUFJMD5 resolve conflicts
• [35] CE4LZV4T drop last couple of manual tests
• [36] FBBHEUQN resolve conflicts
• [37] 3PSFWAIL Merge lines.love
• [38] D2GCFTTT clean up repl functionality
• [39] OTIBCAUJ love2d scaffold
• [40] LWPFEZBI Merge lines.love
• [41] NVSC4N4K change a helper slightly
• [42] XX7G2FFJ intermingle freehand line drawings with text
• [43] 7YGYHOEO Merge lines.love
• [44] KMSL74GA support selections in the source editor
• [45] U3MJNFUY Merge lines.love
• [46] ZLJYLPOT Merge lines.love
• [47] R2ASHK5C fix a bad merge
• [48] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
• [49] VXORMHME delete experimental REPL
• [50] S7CSVBHZ resolve conflicts
• [51] KKMFQDR4 editing source code from within the app
• [52] VP5KC4XZ Merge lines.love
• [53] 73OCE2MC after much struggle, a brute-force undo
• [54] 3XNFQDDN Merge lines.love
• [55] T4FRZSYL delete an ancient, unused file
• [56] TVCPXAAU rename
• [57] IENTL2IT indent
• [58] YXQOITYS Merge lines.love
• [59] F5KCYFOY simpler implementation of bugfix #2
• [60] KKQKPGCI resolve conflicts
• [61] 2CTN2IEF Merge lines.love
• [62] OGUV4HSA remove some memory leaks from rendered fragments
• [63] 2L5MEZV3 experiment: new edit namespace
• [64] RXMHAZ6V resolve conflicts
• [65] GVJEOWYQ resolve conflicts
• [66] 34BZ5ZKN Merge lines.love
• [67] JOPVPUSA editing source code from within the app
• [68] LXTTOB33 extract a couple of files
• [69] TLOAPLBJ add a license
• [70] R5QXEHUI somebody stop me
• [71] RSZD5A7G forgot to add json.lua
• [72] N2NUGNN4 include a brief reference enabling many useful apps
• [73] 6LJZN727 handle chords

Change contents

• file deletion: source_edit.lua (----------)source_edit.lua (----------)
  [4.2]→[4.165725:165764](∅→∅),[4.2]→[4.165725:165764](∅→∅),[4.165764]→[4.152440:152440](∅→∅)
  − if State.lines[line].mode == 'text' then return end

  − while line <= #State.lines and State.lines[line].mode ~= 'text' do

  − end

  − if line <= #State.lines and State.lines[line].mode == 'text' then

  − State.cursor1.line = line

  − State.cursor1.pos = 1

  − end

  − line = line+1
• replacement in source_edit.lua at line 146
  [4.1035]→[4.1035:1066](∅→∅)
  − while line < #State.lines do
  [4.1035]

  [4.1066]
  + if State.lines[line].mode == 'text' then return end

  + while line <= #State.lines and State.lines[line].mode ~= 'text' do
• replacement in source_edit.lua at line 149
  [4.1389]→[4.1389:1494](∅→∅),[4.1494]→[4.642:662](∅→∅),[4.642]→[4.642:662](∅→∅)
  − if State.lines[line].mode == 'text' then

  − State.cursor1.line = line

  − State.cursor1.pos = 1

  − break

  − end
  [4.1084]

  [4.18427]
  + end

  + if line <= #State.lines and State.lines[line].mode == 'text' then

  + State.cursor1.line = line

  + State.cursor1.pos = 1
• edit in edit.lua at line 447
  [4.12430]→[2.84:84](∅→∅),[4.2150]→[3.408:538](∅→∅),[4.2150]→[3.408:538](∅→∅),[4.2150]→[3.408:538](∅→∅),[4.2101]→[3.284:407](∅→∅),[4.2101]→[3.284:407](∅→∅)
  −

  − end

  − if line <= #State.lines and State.lines[line].mode == 'text' then

  − State.cursor1.line = line

  − State.cursor1.pos = 1

  − if State.lines[line].mode == 'text' then return end

  − while line <= #State.lines and State.lines[line].mode ~= 'text' do
• resolve order conflict in edit.lua at line 447
  [4.12430]