resolve conflicts

akkartik

Dec 2, 2023, 6:24 AM

GFBOJWNEEYQ5JE2ILT7FX3HWTBBZTEOI7SSNDLKR3XGKL56YC3AAC

Dependencies

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

Change contents

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

[4.2]→[4.30050:30091](∅→∅),[4.2]→[4.30050:30091](∅→∅),[4.30091]→[4.23288:23288](∅→∅)

if State.mouse_down then
maxl,maxp = Text.mouse_pos(State)
else
maxl,maxp = State.cursor1.line,State.cursor1.pos
end
if Text.lt1({line=maxl, pos=maxp},
{line=minl, pos=minp}) then
minl,maxl = maxl,minl
minp,maxp = maxp,minp
end
-- check if intervals are disjoint
if line_index < minl then return nil,nil end
if line_index > maxl then return nil,nil end
if line_index == minl and bpos <= minp then return nil,nil end
if line_index == maxl and apos >= maxp then return nil,nil end
-- compare bounds more carefully (start inclusive, end exclusive)
local a_ge = Text.le1({line=minl, pos=minp}, {line=line_index, pos=apos})
local b_lt = Text.lt1({line=line_index, pos=bpos}, {line=maxl, pos=maxp})
file deletion: source_edit.lua (----------)source_edit.lua (----------)

[4.2]→[4.165788:165827](∅→∅),[4.2]→[4.165788:165827](∅→∅),[4.165827]→[4.152503:152503](∅→∅)

State.mouse_down = mouse_button
State.mouse_down = nil
if State.lines.current_drawing then
--? print_and_log(('edit.mouse_press: cursor at %d,%d'):format(State.cursor1.line, State.cursor1.pos))