resolve conflicts

akkartik

Nov 25, 2023, 3:40 AM

ULEQ62Z7ZM2J2JE6WHTTO5EANEHVT7KXCWRXJXL36XIIULQ3AIEAC

Dependencies

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

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

if x == 0 and bpos == 0 then
assert(false, ("Infinite loop while line-wrapping. Editor is %dpx wide; window is %dpx wide"):format(State.width, App.screen.width))
end
-- Perform some early sanity checking here, in hopes that we correctly call
-- this whenever we change editor state.
if State.right <= State.left then
assert(false, ('Right margin %d must be to the right of the left margin %d'):format(State.right, State.left))
end

State.line_cache = {}
for i=1,#State.lines do
State.line_cache[i] = {}
end
pos = pos + bpos
local boffset = Text.offset(frag, bpos+1) -- byte _after_ bpos
frag = string.sub(frag, boffset)
--? if bpos > 0 then
--? print('after chop:', frag)
--? end
frag_width = App.width(frag)
end
--? print('screen line:', pos)