resolve conflicts

akkartik

Nov 26, 2023, 12:02 AM

VTCPDL3ATJW4KWWCRDKOI2HG36JEBIKFLFYFNGWTZEUIAA4M3U5AC

Dependencies

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

Change contents

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

[4.2]→[4.147062:147101](∅→∅),[4.2]→[4.147062:147101](∅→∅),[4.147101]→[4.83723:83723](∅→∅)

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)
replacement in source_text.lua at line 202

[4.97240]→[4.97240:97313](∅→∅)

if App.ctrl_down() or App.alt_down() or App.cmd_down() then return end

[4.97240]

[4.97313]

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