resolve conflicts

akkartik

Nov 26, 2023, 12:09 AM

YY472LBUNKSCLF5GIQ6YTIQEZUZNKLAUCEB4NSQE2DTTXJ7OJQMAC

Dependencies

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