resolve conflicts

akkartik

Dec 26, 2023, 7:34 PM

2CEAF7YRI2ZKITZES5XGJEAPTCU46PPDNQTMJQQNVOE5Y656LWYAC

Dependencies

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

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..'$')