resolve conflicts

akkartik

Dec 26, 2023, 7:34 PM

2CEAF7YRI2ZKITZES5XGJEAPTCU46PPDNQTMJQQNVOE5Y656LWYAC

Dependencies

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

Change contents

• file deletion: source_text.lua (----------)source_text.lua (----------)
  [4.2]→[4.147125:147164](∅→∅),[4.2]→[4.147125:147164](∅→∅),[4.147164]→[4.83786:83786](∅→∅)
  − local len = utf8.len(s)

  − local offset = Text.offset(s, math.min(pos+1, len+1))

  − local s_before = s:sub(1, offset-1)

  − --? print('^'..s_before..'$')