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

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