resolve conflicts

akkartik

Oct 30, 2024, 3:57 AM

FHZ5AG3MCKSJQWTENRB54NDDPPG6NNOVRBYBS4F3T7JCGKY3AANQC

Dependencies

[2] B3PRPOPH some more renames
[3] F5KCYFOY simpler implementation of bugfix #2
[4] BULPIBEG beginnings of a module for the text editor
[5] OGUV4HSA remove some memory leaks from rendered fragments
[6] 3XNFQDDN Merge lines.love
[7] 73OCE2MC after much struggle, a brute-force undo
[8] LWPFEZBI Merge lines.love
[9] ORKN6EOB Merge lines.love
[10] QXXISTGE resolve conflicts
[11] QMRQL2FO resolve conflicts
[12] VP5KC4XZ Merge lines.love
[13] 66X36NZN a little more prose describing manual_tests
[14] TVCPXAAU rename
[15] D2GCFTTT clean up repl functionality
[16] VHQCNMAR several more modules
[17] 34BZ5ZKN Merge lines.love
[18] TBTRYEBP Merge lines.love
[19] 6LJZN727 handle chords
[20] TFUNIT6M resolve conflicts
[21] OXIU3SJ2 bugfix #3, attempt #2 in search UI
[22] FS2ITYYH record a known issue
[23] CE4LZV4T drop last couple of manual tests
[24] MBAJPTDJ resolve conflicts
[25] I4S4EFYX Merge lines.love
[26] T4FRZSYL delete an ancient, unused file
[27] CQVWNL4M resolve conflicts
[28] N2NUGNN4 include a brief reference enabling many useful apps
[29] 7YGYHOEO Merge lines.love
[30] 3PSFWAIL Merge lines.love
[31] JOPVPUSA editing source code from within the app
[32] 4SR3Z4Y3 document the version of LÖVE I've been using
[33] R2ASHK5C fix a bad merge
[34] TOXPJJYY resolve conflicts
[35] TYLURRX3 resolve conflicts
[36] RXMHAZ6V resolve conflicts
[37] SGMA5JLE save the list of tests in repo
[38] QZUFJMD5 resolve conflicts
[39] 4FTOQOPZ bugfix #2 in search UI
[40] SYWQBIO5 resolve conflicts
[41] YXQOITYS Merge lines.love
[42] ZLJYLPOT Merge lines.love
[43] 6VJTQKW7 start supporting LÖVE v12
[44] AF253GHL bugfix
[45] K2X6G75Z start writing some tests for drawings
[46] RSZD5A7G forgot to add json.lua
[47] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[48] KMSL74GA support selections in the source editor
[49] S7CSVBHZ resolve conflicts
[50] LXTTOB33 extract a couple of files
[51] 2CTN2IEF Merge lines.love
[52] VXORMHME delete experimental REPL
[53] OTIBCAUJ love2d scaffold
[54] KKQKPGCI resolve conflicts
[55] 4YDBYBA4 clean up memory leak experiments
[56] VHUNJHXB Merge lines.love
[57] ED4Z6ORC cleaner API for file-system access
[58] TLOAPLBJ add a license
[59] CRBLAWBO resolve conflicts
[60] AVTNUQYR basic test-enabled framework
[61] KKMFQDR4 editing source code from within the app
[62] WKXJNESI resolve conflicts
[63] XX7G2FFJ intermingle freehand line drawings with text
[64] BLWAYPKV extract a module
[65] R5QXEHUI somebody stop me
[66] 3QNOKBFM beginnings of a test harness
[67] GVJEOWYQ resolve conflicts
[68] 2L5MEZV3 experiment: new edit namespace
[69] 7VGDIPLC more robust state validation
[70] FBBHEUQN resolve conflicts

Change contents

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

[4.2]→[4.165725:165764](∅→∅),[4.2]→[4.165725:165764](∅→∅),[4.165764]→[4.152440:152440](∅→∅)

Text.right(State)
Text.search_next(State)
end
edit in source_edit.lua at line 148

[4.1084]→[4.1084:1189](∅→∅),[4.1189]→[4.563:583](∅→∅),[4.563]→[4.563:583](∅→∅),[4.583]→[4.1190:1389](∅→∅)

if State.lines[line].mode == 'text' then
State.cursor1.line = line
State.cursor1.pos = 1
break
end
end
end

function edit.put_cursor_on_next_text_line_wrapping_around_if_necessary(State)
local line = State.cursor1.line
local max = #State.lines
for _ = 1, max-1 do
line = (line+1) % max
edit in source_edit.lua at line 153

[4.662]→[4.1495:1823](∅→∅)

end
end

function edit.put_cursor_on_next_text_loc_wrapping_around_if_necessary(State)
local cursor_line = State.lines[State.cursor1.line].data
if State.cursor1.pos <= utf8.len(cursor_line) then
State.cursor1.pos = State.cursor1.pos + 1
else
edit.put_cursor_on_next_text_line_wrapping_around_if_necessary(State)
replacement in source_edit.lua at line 414

[4.2018]→[4.2018:2095](∅→∅)

edit.put_cursor_on_next_text_loc_wrapping_around_if_necessary(State)

[4.2018]

[4.2095]

Text.right(State)
edit in edit.lua at line 98

[4.754]→[4.2155:2160](∅→∅),[4.2160]→[2.126:200](∅→∅),[2.200]→[4.2239:2722](∅→∅),[4.2239]→[4.2239:2722](∅→∅),[4.2722]→[2.201:270](∅→∅),[2.270]→[4.2796:2802](∅→∅),[4.2796]→[4.2796:2802](∅→∅)

end

function edit.put_cursor_on_next_line_wrapping_around_if_necessary(State)
local line = State.cursor1.line
local max = #State.lines
for _ = 1, max-1 do
line = (line+1) % max
if State.lines[line].mode == 'text' then
State.cursor1.line = line
State.cursor1.pos = 1
break
end
end
end

function edit.put_cursor_on_next_loc_wrapping_around_if_necessary(State)
local cursor_line = State.lines[State.cursor1.line].data
if State.cursor1.pos <= utf8.len(cursor_line) then
State.cursor1.pos = State.cursor1.pos + 1
else
edit.put_cursor_on_next_line_wrapping_around_if_necessary(State)
end
replacement in edit.lua at line 287

[4.2840]→[4.2840:2912](∅→∅)

edit.put_cursor_on_next_loc_wrapping_around_if_necessary(State)

[4.2840]

[4.2912]

Text.right(State)
edit in edit.lua at line 447

[4.12430]→[4.2956:2956](∅→∅),[4.72]→[3.56:82](∅→∅),[4.72]→[3.56:82](∅→∅)

Text.right(State)
resolve order conflict in edit.lua at line 447

[4.12430]