resolve conflicts

akkartik

Dec 9, 2023, 6:00 PM

CSXIZ4FAELRZLG75S7B5R6TMWMASBK7VQ5R7B6NOUBIWMBLXK5KQC

Dependencies

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

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](∅→∅)

assert(false, ('Text.offset(%d) called on a string of length %d (byte size %d); this is likely a failure to handle utf8\n\n^%s$\n'):format(pos1, utf8.len(s), #s, s))
end
replacement in source_text.lua at line 977

[4.142357]→[4.142357:142380](∅→∅)

print(pos1, #s, s)

[4.142357]

[4.142380]

assert(false, ('Text.offset(%d) called on a string of length %d (byte size %d); this is likely a failure to handle utf8\n\n^%s$\n'):format(pos1, utf8.len(s), #s, s))
edit in source_text.lua at line 979

[4.142386]→[4.2403:2489](∅→∅)

assert(result, "Text.offset returned nil; this is likely a failure to handle utf8")