resolve conflicts

akkartik

Dec 26, 2023, 7:30 PM

7JEYXICU3ADDBDE7N6KLIA7F32FCEEZF7MIKK7O3KXWFZSNKTYNQC

Dependencies

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

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))