resolve conflicts

akkartik

Nov 25, 2023, 3:37 AM

6Z6WH62W4SGWWX75JQ2HVH2TC3IIWLNMA66UMTWWYSKPV7VS7IXAC

Dependencies

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

Change contents

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

[5.2]→[5.147062:147101](∅→∅),[5.2]→[5.147062:147101](∅→∅),[5.147101]→[5.83723:83723](∅→∅)

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

[5.2886]→[5.2886:2956](∅→∅)

-- everything works if bpos == 0, but is a little inefficient

[5.2886]

[5.2956]

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
edit in source_text.lua at line 1040

[5.146584]

[5.146584]

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