resolve conflicts

akkartik

Jul 22, 2024, 9:30 PM

52YBYUCOCTGKE36WK3U2DSSCJR322B7SOA5VVHDXFLLOZVNNILXAC

Dependencies

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

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

-- The modifiers didn't change the key. Handle it in keychord_press.
schedule_save(State)
record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})
record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})
schedule_save(State)
--== shortcuts that move the cursor
elseif chord == 'left' then
Text.left(State)
schedule_save(State)
schedule_save(State)
elseif chord == 'tab' then
local before = snapshot(State, State.cursor1.line)
return
else
-- Key mutated by the keyboard layout. Continue below.
end
end
file deletion: source_edit.lua (----------)source_edit.lua (----------)

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

schedule_save(State)
schedule_save(State)
record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})
schedule_save(State)
else
end,
})