resolve conflicts

akkartik

Dec 17, 2023, 7:50 AM

TFUNIT6MVMFDE4KDMQKQ3LFADMEI2LCVYQPIP7QQPXZYIXPRMYDAC

Dependencies

[2] YF2ATH2Q Merge lines.love
[3] WKXJNESI resolve conflicts
[4] 3MJ2PYMW resolve conflicts
[5] GJ4LBCIE streamline button.lua
[6] 7YGYHOEO Merge lines.love
[7] LNUHQOGH start passing in Editor_state explicitly
[8] Z3TDYADA mouse button state in source editor
[9] BLWAYPKV extract a module
[10] CE4LZV4T drop last couple of manual tests
[11] XX7G2FFJ intermingle freehand line drawings with text
[12] RSZD5A7G forgot to add json.lua
[13] ED4Z6ORC cleaner API for file-system access
[14] BULPIBEG beginnings of a module for the text editor
[15] UD7HNQL7 purge unused button infrastructure
[16] OGUV4HSA remove some memory leaks from rendered fragments
[17] 2L5MEZV3 experiment: new edit namespace
[18] VHUNJHXB Merge lines.love
[19] TBTRYEBP Merge lines.love
[20] VXORMHME delete experimental REPL
[21] R5QXEHUI somebody stop me
[22] YXQOITYS Merge lines.love
[23] TLOAPLBJ add a license
[24] 6D5MOJS4 allow buttons to interrupt events
[25] 6XCJX4DZ bugfix: inscript's bug
[26] 4YDBYBA4 clean up memory leak experiments
[27] 2CTN2IEF Merge lines.love
[28] ORKN6EOB Merge lines.love
[29] VP5KC4XZ Merge lines.love
[30] TVCPXAAU rename
[31] LWPFEZBI Merge lines.love
[32] R2ASHK5C fix a bad merge
[33] D2GCFTTT clean up repl functionality
[34] JOPVPUSA editing source code from within the app
[35] KMSL74GA support selections in the source editor
[36] ONHKBLLC Merge lines.love
[37] KKQKPGCI resolve conflicts
[38] T4FRZSYL delete an ancient, unused file
[39] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[40] REAIVN7W Merge lines.love
[41] OTIBCAUJ love2d scaffold
[42] 73OCE2MC after much struggle, a brute-force undo
[43] K6DTOGOQ flip return value of button handlers
[44] 34BZ5ZKN Merge lines.love
[45] AVTNUQYR basic test-enabled framework
[46] D4B52CQ2 Merge lines.love
[47] 3QNOKBFM beginnings of a test harness
[48] N2NUGNN4 include a brief reference enabling many useful apps
[49] 3PSFWAIL Merge lines.love
[50] K2X6G75Z start writing some tests for drawings
[51] 3XNFQDDN Merge lines.love
[52] 2TQUKHBC Merge lines.love
[53] 6LJZN727 handle chords
[54] ZLJYLPOT Merge lines.love
[55] 5SM6DRHK port inscript's bugfix to source editor
[56] 6VJTQKW7 start supporting LÖVE v12
[57] RU4HIK43 Merge lines.love
[58] XZ6QVCTT manually maintain mouse button press state
[59] LXTTOB33 extract a couple of files
[60] 4SR3Z4Y3 document the version of LÖVE I've been using
[61] SGMA5JLE save the list of tests in repo
[62] 66X36NZN a little more prose describing manual_tests
[63] FS2ITYYH record a known issue
[64] KKMFQDR4 editing source code from within the app
[65] CSXIZ4FA resolve conflicts
[66] VHQCNMAR several more modules

Change contents

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

[6.2]→[6.83676:83721](∅→∅),[6.2]→[6.83676:83721](∅→∅),[6.83721]→[6.3498:3498](∅→∅)

edit.draw(Editor_state)
edit.run_after_mouse_press(Editor_state, Editor_state.left+8,5, 1)
-- selection is at screen top
check(Editor_state.selection1.line ~= nil, 'selection:line-not-nil')
check_eq(Editor_state.selection1.line, 2, 'selection:line')
check_eq(Editor_state.selection1.pos, 3, 'selection:pos')
end

function test_select_text_using_mouse_starting_below_text()
-- I'd like to test what happens when a mouse click is below some page of
-- text, potentially even in the middle of a line.
-- However, it's brittle to set up a text line boundary just right.
-- So I'm going to just check things below the bottom of the final line of
-- text when it's in the middle of the screen.
-- final screen line ends in the middle of screen
App.screen.init{width=50, height=60}
Editor_state = edit.initialize_test_state()
Editor_state.lines = load_array{'abcde'}
Text.redraw_all(Editor_state)
Editor_state.cursor1 = {line=1, pos=1}
Editor_state.screen_top1 = {line=1, pos=1}
Editor_state.screen_bottom1 = {}
edit.draw(Editor_state)
local y = Editor_state.top
App.screen.check(y, 'ab', 'baseline:screen:1')
y = y + Editor_state.line_height
App.screen.check(y, 'cde', 'baseline:screen:2')
-- press mouse above first line of text
edit.run_after_mouse_press(Editor_state, 5,App.screen.height-5, 1)
-- selection is past bottom-most text in screen
check(Editor_state.selection1.line ~= nil, 'selection:line-not-nil')
check_eq(Editor_state.selection1.line, 1, 'selection:line')
check_eq(Editor_state.selection1.pos, 6, 'selection:pos')
end
file deletion: source_edit.lua (----------)source_edit.lua (----------)

[6.2]→[6.165725:165764](∅→∅),[6.2]→[6.165725:165764](∅→∅),[6.165764]→[6.152440:152440](∅→∅)

if mouse_press_consumed_by_any_button(State, x,y, mouse_button) then
-- press on a button and it returned 'true' to short-circuit
return
end
edit in source_text_tests.lua at line 884

[6.1374]

[6.1374]

edit.draw(Editor_state)
replacement in source_edit.lua at line 242

[6.436]→[6.157280:157359](∅→∅),[6.4572]→[6.157280:157359](∅→∅),[6.8954]→[6.157280:157359](∅→∅),[6.20112]→[6.157280:157359](∅→∅),[6.157280]→[6.157280:157359](∅→∅)

if mouse_press_consumed_by_any_button_handler(State, x,y, mouse_button) then

[6.4572]

[6.157359]

if mouse_press_consumed_by_any_button(State, x,y, mouse_button) then
edit in edit.lua at line 453

[6.12430]→[3.91:91](∅→∅),[6.2254]→[5.266:337](∅→∅),[6.2254]→[5.266:337](∅→∅),[6.2254]→[5.266:337](∅→∅)

if mouse_press_consumed_by_any_button(State, x,y, mouse_button) then
resolve order conflict in edit.lua at line 453

[6.12430]