resolve conflicts

akkartik

Aug 19, 2025, 4:55 AM

WV2NJUISBUL33UBBNOGAFMCB3KW74VFXI5EIDBUXFUQMENP3GOGAC

Dependencies

[2] 7QBK5QAS resolve conflicts
[3] LPSPW23C resolve conflicts
[4] X6DXCO6K resolve conflicts
[5] VZPH3XJK update source editor
[6] SGMA5JLE save the list of tests in repo
[7] ED4Z6ORC cleaner API for file-system access
[8] FS2ITYYH record a known issue
[9] 2EELKVO2 resolve conflicts
[10] BRBXUGRG resolve conflicts
[11] F4RUTOND split up editor tests between LÖVE 11 and LÖVE 12
[12] RLCO2SNK wrap lines like lines2 forks
[13] FYJXSWXV resolve conflicts
[14] OTIBCAUJ love2d scaffold
[15] N2NUGNN4 include a brief reference enabling many useful apps
[16] A3PSROTJ reenable DPI scaling
[17] D43U7GQ4 alter on-disk representation (manifest files)
[18] VHUNJHXB Merge lines.love
[19] 4YDBYBA4 clean up memory leak experiments
[20] 3V2R6YS6 merge bugfix
[21] 6LJZN727 handle chords
[22] VXRYVZ74 Merge text.love
[23] VLTU33KW resolve conflicts
[24] RSZD5A7G forgot to add json.lua
[25] U3ILRRMO backport a critical patch for iOS
[26] RUB7L6GY resolve conflicts
[27] HKZATWO5 resolve conflicts
[28] XX7G2FFJ intermingle freehand line drawings with text
[29] 73OCE2MC after much struggle, a brute-force undo
[30] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
[31] K2X6G75Z start writing some tests for drawings
[32] KKMFQDR4 editing source code from within the app
[33] 3PSFWAIL Merge lines.love
[34] 2L5MEZV3 experiment: new edit namespace
[35] MBAJPTDJ resolve conflicts
[36] PJ5PQAQE record support for multiple versions
[37] PCHTG7YU resolve conflicts
[38] T4FRZSYL delete an ancient, unused file
[39] TVCPXAAU rename
[40] UEG224LH debug animations
[41] ML34DNND delete a stale file
[42] FDUYCS33 resolve conflicts
[43] ORKN6EOB Merge lines.love
[44] KMSL74GA support selections in the source editor
[45] 36Z442IV back to commit 8123959e52f without code editing
[46] T42Y5MLO explicitly specify app name
[47] R6MNUXDJ pijul bug
[48] JOPVPUSA editing source code from within the app
[49] AVTNUQYR basic test-enabled framework
[50] DHPAIM7J resolve conflicts
[51] CZ6X73VY merge bugfix
[52] 4Y2QDDAZ resolve conflicts
[53] 3QNOKBFM beginnings of a test harness
[54] 6VJTQKW7 start supporting LÖVE v12
[55] 66X36NZN a little more prose describing manual_tests
[56] 5255G4IV resolve conflicts
[57] MEWFN45R resolve conflicts
[58] OL7ZCZWD Merge text.love
[59] 5OVKHVY6 nice way to make on.* handlers more discoverable
[60] UZHSWA3D Merge text0
[61] CZQ3NJ4N Merge text0
[62] 57HKHZ7Z include the tool that's mentioned in representation.md
[63] LXTTOB33 extract a couple of files
[64] B4USRORM disable DPI scaling
[65] LWPFEZBI Merge lines.love
[66] BLWAYPKV extract a module
[67] JNJ4R56X support running tests multiple times
[68] VHQCNMAR several more modules
[69] VXORMHME delete experimental REPL
[70] LRDM35CE app running again
[71] BULPIBEG beginnings of a module for the text editor
[72] CE4LZV4T drop last couple of manual tests
[73] ZLJYLPOT Merge lines.love
[74] HZENSQEQ resolve conflicts
[75] VP5KC4XZ Merge lines.love
[76] 5T2AKBEX resolve conflicts
[77] R5QXEHUI somebody stop me
[78] I5OOVAZO resolve conflicts
[79] KKQKPGCI resolve conflicts
[80] D2GCFTTT clean up repl functionality
[81] SW5GN5LP suggest a default layout for freewheeling apps
[82] CD7JC76C resolve conflicts
[83] EZHO4TSW new file-system format for freewheeling apps
[84] 2DVVKKVA flesh out Readme
[85] 4SR3Z4Y3 document the version of LÖVE I've been using
[86] OGUV4HSA remove some memory leaks from rendered fragments
[87] GVOLLPQF bugfix: initial textinput event on iOS
[88] TLOAPLBJ add a license
[89] 2CFLXLIE Merge text.love

Change contents

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

[5.2]→[5.0:45](∅→∅),[5.2]→[5.0:45](∅→∅),[5.45]→[5.46:46](∅→∅)

App.screen.check(y, 'I’m ad', 'screen:3')
App.screen.check(y, 'hi ', 'baseline/screen:3')
App.screen.check(y, 'hi ', 'screen:1')
App.screen.check(y, 'jkl m', 'screen:2')
App.screen.check(y, 'no p', 'screen:3')
end

function test_pagedown_never_moves_up()
-- draw the final screen line of a wrapping line
App.screen.init{width=Editor_state.left+30, height=60}
Editor_state = edit.initialize_test_state()
Editor_state.lines = load_array{'abc def ghi'}
Text.redraw_all(Editor_state)
y = y + Editor_state.line_height
y = y + Editor_state.line_height
-- after pagedown we scroll down the very long wrapping line
edit.run_after_keychord(Editor_state, 'pagedown', 'pagedown')
check_eq(Editor_state.screen_top1.line, 1, 'screen_top:line')
end

function test_click_past_end_of_screen_line()
-- display a wrapping line
App.screen.init{width=75, height=80}
Editor_state = edit.initialize_test_state()
-- 12345678901234
Editor_state.lines = load_array{"madam I'm adam"}
Text.redraw_all(Editor_state)
Editor_state.cursor1 = {line=1, pos=1}
Editor_state.screen_top1 = {line=1, pos=1}
edit in conf.lua at line 3

[5.62]→[5.17:17](∅→∅),[5.62]→[5.17:17](∅→∅),[5.62]→[5.17:17](∅→∅)
edit in app.lua at line 74

[2.76]→[5.283:353](∅→∅),[5.283]→[5.283:353](∅→∅),[5.353]→[2.77:351](∅→∅),[2.351]→[5.0:39](∅→∅),[5.548]→[5.0:39](∅→∅),[5.39]→[5.548:563](∅→∅),[5.548]→[5.548:563](∅→∅),[5.870]→[4.23:67](∅→∅)

love.window.setMode(width, height, flags)
if OS == 'iOS' then
love.keyboard.setTextInput(has_text_input) -- iOS recreates the window on setMode
-- this property is part of the window
-- https://github.com/love2d/love/issues/1959
love.keyboard.setKeyRepeat(true)
end
end

App.screen.resize = function(w, h, flags)
resolve order conflict in app.lua at line 74

[2.76]

[4.67]
replacement in app.lua at line 82

[4.560]→[4.560:600](∅→∅)

w, h = love.window.toPixels(w, h)

[4.560]

[4.600]

width, height = love.window.toPixels(width, height)
replacement in app.lua at line 84

[4.608]→[4.608:645](∅→∅)

love.window.setMode(w, h, flags)

[4.608]

[4.645]

love.window.setMode(width, height, flags)
if OS == 'iOS' then
love.keyboard.setTextInput(has_text_input) -- iOS recreates the window on setMode
-- this property is part of the window
-- https://github.com/love2d/love/issues/1959
love.keyboard.setKeyRepeat(true)
end
edit in app.lua at line 92

[4.651]

[5.1036]