resolve conflicts

akkartik

Dec 26, 2023, 7:30 PM

7JEYXICU3ADDBDE7N6KLIA7F32FCEEZF7MIKK7O3KXWFZSNKTYNQC

Dependencies

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

Change contents

file deletion: source_text.lua (----------)source_text.lua (----------)

[4.2]→[4.147062:147101](∅→∅),[4.2]→[4.147062:147101](∅→∅),[4.147101]→[4.83723:83723](∅→∅)

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..'$')
replacement in source_text.lua at line 910

[4.139487]→[4.139487:139542](∅→∅)

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

[4.139487]

[4.139542]

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