resolve conflicts

akkartik

May 6, 2025, 9:38 PM

53GCKYYSOMELQH4I7S575PCM5AMXPHLQZKRBX2MT3BNJ6FW4J3UQC

Dependencies

[2] KFCDC75U Merge lines.love
[3] ZDPKT7VB resolve conflicts
[4] A42EMHOQ plumb through all supported args in LÖVE handlers
[5] 4EGQRXDA bugfix: naming points
[6] KVEEGWKS remove some dead code
[7] VYIA2JFX resolve conflicts
[8] 54HQZ536 resolve conflicts
[9] 4ATFJ4RX resolve conflicts
[10] 23MA4T3G add state arg to Drawing.keychord_pressed
[11] DJQXH5EC Merge lines.love
[12] VOJISLDC resolve conflicts
[13] MTJEVRJR add state arg to a few functions
[14] P4NJ2KS7 resolve conflicts
[15] VPRGENLA hide some details within the 'warning' state
[16] O47TQ6W6 resolve conflicts
[17] LF7BWEG4 group all editor globals
[18] KF72R2XX resolve conflicts
[19] TWSPUEHF resolve conflicts
[20] GYTD7DDW resolve conflicts
[21] 6XCJX4DZ bugfix: inscript's bug
[22] 3OTESDW6 move drawing.starty into line cache
[23] S7ZZA3YE ugh, handle absolute as well as relative paths
[24] FWPU6TTQ resolve conflicts
[25] CIK3U5S6 Merge lines.love
[26] APX2PY6G stop tracking wallclock time
[27] Z5WOBP27 Merge lines.love
[28] PTDO2SOT add state arg to schedule_save
[29] 2CK5QI7W make love event names consistent
[30] XZ6QVCTT manually maintain mouse button press state
[31] KKMFQDR4 editing source code from within the app
[32] QAMVLUK2 fix a crash involving mouse and drawings
[33] SPNMXTYR have file API operate on state object
[34] LJW6E6DU resolve conflicts
[35] LNUHQOGH start passing in Editor_state explicitly
[36] 6VJTQKW7 start supporting LÖVE v12
[37] 5CDHNEKR Merge lines.love
[38] XQV3PNH2 resolve conflicts
[39] 7FPELAZB ah, I see the problem
[40] 235D5R3Z resolve conflicts
[41] MNV7KM3T resolve conflicts
[42] APOMBXMU resolve conflicts
[43] DLQAEAC7 add state arg to Drawing.mouse_pressed
[44] EHADZNMB show any error after switching to source editor
[45] TXDMRA5J bugfix: alt-tab shouldn't emit keypress events
[46] QJISOCHJ some temporary logging to catch a bug
[47] 2TCIWW6Z stop caching starty
[48] 57OGXVHZ Merge lines.love
[49] KYNGDE2C consistent names in a few more places
[50] IFTYOERM line.y -> line_cache.starty in a few more places
[51] 3XQROLSK redo version checks yet again
[52] 5ITAXPEP wait a little to flush disk before quitting
[53] 7SICLTED check for 'error' mode in a few more places
[54] KVHUFUFV reorg
[55] 2L5MEZV3 experiment: new edit namespace
[56] OWE64YJ2 Merge lines.love
[57] KNWMKLNJ Merge lines.love
[58] 3R6VAVPX resolve conflicts
[59] QXVD2RIF add state arg to Drawing.mouse_released
[*] OTIBCAUJ love2d scaffold

Change contents

resurrect zombie in main.lua at line 213

[4.2203]→[5.188715:188787](∅→∅),[5.4577]→[5.188715:188787](∅→∅),[5.188715]→[5.188715:188787](∅→∅),[5.4577]→[5.188715:188787](∅→∅)

-- ignore events for some time after window in focus (mostly alt-tab)
resurrect zombie in main.lua at line 215

[5.619]→[5.188836:188858](∅→∅),[5.188836]→[5.188836:188858](∅→∅),[5.188836]→[5.188836:188858](∅→∅)

return
end
--
resurrect zombie in main.lua at line 228

[5.1179]→[5.188858:189132](∅→∅),[5.188858]→[5.188858:189132](∅→∅),[5.188858]→[5.188858:189132](∅→∅)

if chord == 'C-e' then
-- carefully save settings
if Current_app == 'run' then
local source_settings = Settings.source
Settings = run.settings()
Settings.source = source_settings
if run.quit then run.quit() end
Current_app = 'source'
resurrect zombie in main.lua at line 237

[5.429]→[5.189132:189284](∅→∅),[5.189132]→[5.189132:189284](∅→∅),[5.189132]→[5.189132:189284](∅→∅)

elseif Current_app == 'source' then
Settings.source = source.settings()
if source.quit then source.quit() end
Current_app = 'run'
resurrect zombie in main.lua at line 243

[5.445]→[5.189284:189585](∅→∅),[5.456]→[5.189284:189585](∅→∅),[5.909]→[5.189284:189585](∅→∅),[5.189284]→[5.189284:189585](∅→∅),[5.189284]→[5.189284:189585](∅→∅)

else
assert(false, 'unknown app "'..Current_app..'"')
end
Settings.current_app = Current_app
love.filesystem.write('config', json.encode(Settings))
-- reboot
load_file_from_source_or_save_directory('main.lua')
App.undo_initialize()
App.run_tests_and_initialize()
resurrect zombie in main.lua at line 253

[5.1482]→[5.189585:189596](∅→∅),[5.189585]→[5.189585:189596](∅→∅),[5.189585]→[5.189585:189596](∅→∅)

return
resurrect zombie in main.lua at line 257

[4.2291]→[5.189698:189736](∅→∅),[5.4644]→[5.189698:189736](∅→∅),[5.189698]→[5.189698:189736](∅→∅),[5.4644]→[5.189698:189736](∅→∅)

elseif Current_app == 'source' then
resurrect zombie in main.lua at line 259

[5.483]→[5.189812:189872](∅→∅),[4.2385]→[5.189812:189872](∅→∅),[5.4717]→[5.189812:189872](∅→∅),[5.189812]→[5.189812:189872](∅→∅),[5.4717]→[5.189812:189872](∅→∅),[5.189812]→[5.189812:189872](∅→∅)

else
assert(false, 'unknown app "'..Current_app..'"')
replacement in edit.lua at line 231

[5.3400]→[5.3400:3452](∅→∅)

function edit.mouse_press(State, x,y, mouse_button)

[5.3400]

[5.3452]

function edit.mouse_press(State, x,y, mouse_button, is_touch, presses)
replacement in edit.lua at line 278

[5.5354]→[5.5354:5420](∅→∅)

Drawing.mouse_press(State, line_index, x,y, mouse_button)

[5.5354]

[5.5420]

Drawing.mouse_press(State, line_index, x,y, mouse_button, is_touch, presses)
replacement in edit.lua at line 291

[5.5772]→[5.5772:5826](∅→∅)

function edit.mouse_release(State, x,y, mouse_button)

[5.5772]

[5.5826]

function edit.mouse_release(State, x,y, mouse_button, is_touch, presses)
replacement in edit.lua at line 296

[5.6010]→[5.6010:6062](∅→∅)

Drawing.mouse_release(State, x,y, mouse_button)

[5.6010]

[5.6087]

Drawing.mouse_release(State, x,y, mouse_button, is_touch, presses)
replacement in edit.lua at line 382

[5.8791]→[5.8791:8839](∅→∅)

function edit.keychord_press(State, chord, key)

[5.8791]

[5.8839]

function edit.keychord_press(State, chord, key, scancode, is_repeat)
replacement in edit.lua at line 501

[5.14010]→[5.14010:14053](∅→∅)

Drawing.keychord_press(State, chord)

[5.14010]

[5.14053]

Drawing.keychord_press(State, chord, key, scancode, is_repeat)
replacement in edit.lua at line 534

[5.15458]→[5.15458:15496](∅→∅)

Text.keychord_press(State, chord)

[5.15351]

[5.827]

Text.keychord_press(State, chord, key, scancode, is_repeat)
edit in edit.lua at line 611

[5.17561]→[3.285:285](∅→∅),[5.15878]→[4.3786:3850](∅→∅),[5.15878]→[4.3786:3850](∅→∅),[5.2865]→[4.3716:3785](∅→∅),[5.2865]→[4.3716:3785](∅→∅),[5.10343]→[4.3646:3715](∅→∅),[5.10343]→[4.3646:3715](∅→∅),[5.5377]→[4.3574:3645](∅→∅),[5.5377]→[4.3574:3645](∅→∅),[5.8364]→[4.3500:3573](∅→∅),[5.8364]→[4.3500:3573](∅→∅),[5.2295]→[4.3414:3499](∅→∅),[5.2295]→[4.3414:3499](∅→∅),[5.6757]→[4.3342:3413](∅→∅),[5.6757]→[4.3342:3413](∅→∅)

Text.keychord_press(State, chord, key, scancode, is_repeat)
Drawing.keychord_press(State, chord, key, scancode, is_repeat)
function edit.keychord_press(State, chord, key, scancode, is_repeat)
Drawing.mouse_release(State, x,y, mouse_button, is_touch, presses)
function edit.mouse_release(State, x,y, mouse_button, is_touch, presses)
Drawing.mouse_press(State, line_index, x,y, mouse_button, is_touch, presses)
function edit.mouse_press(State, x,y, mouse_button, is_touch, presses)
resolve order conflict in edit.lua at line 611

[5.17561]