merge bugfix

akkartik

Sep 5, 2024, 8:53 PM

CZ6X73VY6CKBHNLFLWA4DXLYVIWI5W4WPDIHJL3N6OBMTXQDC3RQC

Dependencies

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

Change contents

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

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

function Text.cut_selection_and_record_undo_event(State)
Text.delete_selection_and_record_undo_event(State)
function Text.delete_selection_and_record_undo_event(State)
if State.selection1.line == nil then return end
local minl,maxl = minmax(State.selection1.line, State.cursor1.line)
local before = snapshot(State, minl, maxl)
Text.delete_selection_without_undo(State)
record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})
end

function Text.delete_selection_without_undo(State)
if State.selection1.line == nil then return end
-- min,max = sorted(State.selection1,State.cursor1)
local minl,minp = State.selection1.line,State.selection1.pos
local maxl,maxp = State.cursor1.line,State.cursor1.pos
if minl > maxl then
minl,maxl = maxl,minl
minp,maxp = maxp,minp
elseif minl == maxl then
if minp > maxp then
minp,maxp = maxp,minp
end
end
-- update State.cursor1 and State.selection1
State.cursor1.line = minl
State.cursor1.pos = minp
if Text.lt1(State.cursor1, State.screen_top1) then
State.screen_top1.line = State.cursor1.line
State.screen_top1.pos = Text.pos_at_start_of_screen_line(State, State.cursor1)
end
State.selection1 = {}
-- delete everything between min (inclusive) and max (exclusive)
Text.clear_screen_line_cache(State, minl)
local min_offset = Text.offset(State.lines[minl].data, minp)
local max_offset = Text.offset(State.lines[maxl].data, maxp)
if minl == maxl then
--? print('minl == maxl')
State.lines[minl].data = State.lines[minl].data:sub(1, min_offset-1)..State.lines[minl].data:sub(max_offset)
return
end
return result
end

if State.selection1.line == nil then return end
local result = Text.selection(State)
file deletion: source_text.lua (----------)source_text.lua (----------)

[4.2]→[4.147125:147164](∅→∅),[4.147164]→[4.83786:83786](∅→∅),[4.2]→[4.147125:147164](∅→∅)

Text.delete_selection_and_record_undo_event(State)
Text.delete_selection_and_record_undo_event(State)
schedule_save(State)
return
end
schedule_save(State)
return
end
file deletion: source_edit.lua (----------)source_edit.lua (----------)

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

Drawing.before = nil
Text.delete_selection_and_record_undo_event(State)
local s = Text.cut_selection_and_record_undo_event(State)
if s then
end
schedule_save(State)