resolve conflicts

akkartik

Dec 6, 2024, 9:56 PM

QIR3VBYIUBADNOIRLV6Y4FUIAWM6ERGG64QIWFJUZZ72VICITGLQC

Dependencies

[2] S7CSVBHZ resolve conflicts
[3] 26V2B2QH clarify a misleading test
[4] 6VJTQKW7 start supporting LÖVE v12
[5] YXQOITYS Merge lines.love
[6] VHQCNMAR several more modules
[7] 2CTN2IEF Merge lines.love
[8] ZLJYLPOT Merge lines.love
[9] LWPFEZBI Merge lines.love
[10] 6LJZN727 handle chords
[11] TLOAPLBJ add a license
[12] CE4LZV4T drop last couple of manual tests
[13] TVCPXAAU rename
[14] 2L5MEZV3 experiment: new edit namespace
[15] T4FRZSYL delete an ancient, unused file
[16] 656FM555 bugfix: clear selection when clicking above or below lines
[17] ORKN6EOB Merge lines.love
[18] 3PSFWAIL Merge lines.love
[19] LXTTOB33 extract a couple of files
[20] JOPVPUSA editing source code from within the app
[21] AVTNUQYR basic test-enabled framework
[22] D2GCFTTT clean up repl functionality
[23] QXXISTGE resolve conflicts
[24] FHZ5AG3M resolve conflicts
[25] K2X6G75Z start writing some tests for drawings
[26] KKQKPGCI resolve conflicts
[27] XX7G2FFJ intermingle freehand line drawings with text
[28] OGUV4HSA remove some memory leaks from rendered fragments
[29] A4BSGS2C Merge lines.love
[30] FS2ITYYH record a known issue
[31] OTIBCAUJ love2d scaffold
[32] R5QXEHUI somebody stop me
[33] RSZD5A7G forgot to add json.lua
[34] BULPIBEG beginnings of a module for the text editor
[35] KMSL74GA support selections in the source editor
[36] N2NUGNN4 include a brief reference enabling many useful apps
[37] VHUNJHXB Merge lines.love
[38] MBAJPTDJ resolve conflicts
[39] SGMA5JLE save the list of tests in repo
[40] BLWAYPKV extract a module
[41] 66X36NZN a little more prose describing manual_tests
[42] TOXPJJYY resolve conflicts
[43] ZS5IYZH5 stop caching screen_bottom1
[44] RXMHAZ6V resolve conflicts
[45] 4YDBYBA4 clean up memory leak experiments
[46] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[47] VXORMHME delete experimental REPL
[48] 4SR3Z4Y3 document the version of LÖVE I've been using
[49] KKMFQDR4 editing source code from within the app
[50] ED4Z6ORC cleaner API for file-system access
[51] 3QNOKBFM beginnings of a test harness
[52] 73OCE2MC after much struggle, a brute-force undo
[53] TBTRYEBP Merge lines.love
[54] VP5KC4XZ Merge lines.love
[55] CRBLAWBO resolve conflicts
[56] ORRSP7FV deduce test names on failures
[57] SYWQBIO5 resolve conflicts

Change contents

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

[4.2]→[4.83676:83721](∅→∅),[4.2]→[4.83676:83721](∅→∅),[4.83721]→[4.3498:3498](∅→∅)

function test_click_below_final_line_of_file()
-- cursor goes to bottom
check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
check_eq(Editor_state.cursor1.pos, 4, 'cursor:pos')
-- selection remains empty
check_nil(Editor_state.selection1.line, 'selection is empty to avoid perturbing future edits')
-- display one line
App.screen.init{width=50, height=80}
Editor_state = edit.initialize_test_state()
Editor_state.lines = load_array{'abc'}
Text.redraw_all(Editor_state)
Editor_state.cursor1 = {line=1, pos=1}
Editor_state.screen_top1 = {line=1, pos=1}
replacement in source_text_tests.lua at line 322

[4.285]→[4.285:323](∅→∅)

function test_click_below_all_lines()

[4.285]

[4.323]

function test_click_below_final_line_of_file()
replacement in source_text_tests.lua at line 334

[4.796]→[4.796:821](∅→∅),[4.821]→[4.2285:2336](∅→∅),[4.16261]→[4.2285:2336](∅→∅)

-- cursor doesn't move
check_eq(Editor_state.cursor1.line, 1, 'cursor')

[4.796]

[4.822]

-- cursor goes to bottom
check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
check_eq(Editor_state.cursor1.pos, 4, 'cursor:pos')