resolve conflicts

akkartik

Nov 26, 2023, 12:09 AM

YY472LBUNKSCLF5GIQ6YTIQEZUZNKLAUCEB4NSQE2DTTXJ7OJQMAC

Dependencies

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

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

if App.any_modifier_down() then
if App.key_down(t) then
-- The modifiers didn't change the key. Handle it in keychord_pressed.
return
else
-- Key mutated by the keyboard layout. Continue below.
end
end
local before = snapshot(State, State.cursor1.line)
--? print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)
Text.insert_at_cursor(State, t)
if State.cursor_y > App.screen.height - State.line_height then
Text.populate_screen_line_starting_pos(State, State.cursor1.line)
Text.snap_cursor_to_bottom_of_screen(State, State.left, State.right)
end
record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})
end

function Text.insert_at_cursor(State, t)