resolve conflicts

akkartik

Aug 16, 2025, 8:55 PM

7IJOTKHSNMJTP66V5DRCAIIRPSPXJWIP3CDHGOZFMABECFULYAMAC

Dependencies

[2] PHZX5H25 resolve conflicts
[3] 3ZGWYYZ2 resolve conflicts
[4] B4USRORM disable DPI scaling
[5] LF7BWEG4 group all editor globals
[6] UHB4GARJ left/right margin -> left/right coordinates
[7] VESAKVTR Merge lines.love
[8] FYS7TCDW bugfix
[9] OEUU62GM Merge upstream into main
[10] 4VKEE43Z bugfix
[11] APYPFFS3 call edit rather than App callbacks in tests
[12] ORRSP7FV deduce test names on failures
[13] AQQQNDTL yet another bugfix in selection management
[14] 7CEOB56D Merge upstream into main
[15] M6TH7VSZ rip out notion of Line_width
[16] EMHRPJ3R no, that's not right
[17] T42Y5MLO explicitly specify app name
[18] J7A5ROM3 bugfix in cursor positioning
[19] GL4Q5WCV keep text from overflowing right margin
[20] 73XNHEKN Merge upstream into main
[21] 2H76FV5S bugfix: searching files containing unicode
[22] O7YTBRQY bugfix: restart search on backspace
[23] AMOPICKV bugfix: check after cursor on same line when searching upwards
[24] F4RUTOND split up editor tests between LÖVE 11 and LÖVE 12
[25] DRFE3B3Z mouse buttons are integers, not strings
[26] PNGWLAFN Merge upstream into main
[27] HTWAM4NZ bugfix: scrolling in left/right movements
[28] IWYLK45K clicking to the right of a line within line width
[29] 27DROQW2 Merge upstream into main
[30] LXTTOB33 extract a couple of files
[31] CZB4CK2R bugfix

Change contents

edit in text_tests.lua at line 2

[5.981]→[5.2:103](∅→∅),[5.981]→[5.2:103](∅→∅),[5.103]→[5.2:7](∅→∅),[5.156]→[5.2:7](∅→∅),[5.165]→[5.2:7](∅→∅),[5.1122]→[5.2:7](∅→∅),[5.7]→[5.158:158](∅→∅),[5.7]→[5.158:158](∅→∅),[5.3]→[5.7:60](∅→∅),[5.158]→[5.7:60](∅→∅),[5.7]→[5.7:60](∅→∅),[5.7]→[5.7:60](∅→∅),[5.118]→[5.118:208](∅→∅),[5.118]→[5.118:208](∅→∅),[5.4361]→[5.12632:12667](∅→∅),[5.654]→[5.12632:12667](∅→∅),[5.4361]→[5.12632:12667](∅→∅),[5.654]→[5.12632:12667](∅→∅),[5.4361]→[5.12632:12667](∅→∅),[5.246]→[5.1477:1547](∅→∅),[5.246]→[5.1477:1547](∅→∅),[5.1547]→[2.2:131](∅→∅),[5.1547]→[2.2:131](∅→∅),[2.131]→[5.4:9](∅→∅),[5.155]→[5.4:9](∅→∅),[5.256]→[5.4:9](∅→∅),[5.927]→[5.4:9](∅→∅),[2.131]→[5.4:9](∅→∅),[5.155]→[5.4:9](∅→∅),[5.256]→[5.4:9](∅→∅),[5.927]→[5.4:9](∅→∅)

check_eq(Editor_state.cursor1.pos, 15, 'cursor') -- one more than the number of UTF-8 code-points
end

function test_click_past_end_of_word_wrapping_line()
-- display a long line wrapping at a word boundary on a screen of more realistic length
y = y + Editor_state.line_height
edit.run_after_mouse_click(Editor_state, App.screen.width-2,y-2, 1)
-- cursor moves to end of screen line (one more than final character shown)
check_eq(Editor_state.cursor1.pos, 21, 'cursor')
end
edit in text_tests.lua at line 19

[5.756]→[2.133:133](∅→∅),[5.756]→[2.133:133](∅→∅)
resurrect zombie in conf.lua at line 3

[5.79]→[4.233:264](∅→∅),[5.79]→[4.233:264](∅→∅)

t.window.usedpiscale = false
resolve order conflict in conf.lua at line 3

[3.74]

[4.233]