resolve conflicts

akkartik

Dec 7, 2023, 8:51 AM

F2P336NOB6PL52DRVGBHW7UG4NUJFRQJWJNMQNX4JE52N5BA7Y5QC

Dependencies

[2] 5RLCALX5 Merge text0
[3] THJX6RCJ Merge text0
[4] JZTUZQ35 resolve conflicts
[5] POQ23S4H fix startup test failures from the driver
[6] XSKVRP2S resolve conflicts
[7] ULKNZUZK resolve conflicts
[8] N2NUGNN4 include a brief reference enabling many useful apps
[9] NVTUHXC4 maintain the initial font size in a global
[10] D2TYFYG2 Merge text.love
[11] 2Y7YH7UP infrastructure for caching LÖVE text objects
[12] SDRXK4X5 move
[13] 36Z442IV back to commit 8123959e52f without code editing
[14] B5SFL7HP Merge text0
[15] OTIBCAUJ love2d scaffold
[16] JCSLDGAH beginnings of support for multiple shapes
[17] E3PF2R6Q stray dead code
[18] T7QIIGQ6 attempt at better error recovery
[19] Z2VZTIXY redo version checks
[20] M7UODV5H Merge text0
[21] QMSYY47G Merge text0
[22] QRUFNFPP Merge text0
[23] JFFUF5AL override mouse state lookups in tests
[24] ZLJGZYQG select text with shift + mouseclick
[25] YT5P6TO6 bugfix: save previous file when dropping a new one on
[26] LRDM35CE app running again
[27] ZC7UBMKI pijul bug
[28] CZQ3NJ4N Merge text0
[29] JOPVPUSA editing source code from within the app
[30] PESSMQBJ no, make sure to compute line width after screen dimensions
[31] MX7YD2WC resolve conflicts
[32] AVTNUQYR basic test-enabled framework
[33] C3GUE45I Merge text.love
[34] CYGNFOA5 Merge text0
[35] KWIIU3KR document available modes
[36] AD34IX2Z couple more tests
[37] JF5L2BBS test harness now supports copy/paste
[38] YJ6ASFBG yet another fork trying to integrate my live framework with everything else
[39] TSV3KPBR tweak format of test failures
[40] YF2ATH2Q Merge lines.love
[41] 3XQROLSK redo version checks yet again
[42] TXDMRA5J bugfix: alt-tab shouldn't emit keypress events
[43] Y5XAFGMW Merge text.love
[44] PJ5PQAQE record support for multiple versions
[45] FE25XVZY yet another bugfix to the version check
[46] LXFHXL2N Merge text.love
[47] TVSDIF6D resolve conflicts
[48] 2CTN2IEF Merge lines.love
[49] JXI7KJSL Merge text0
[50] GSIADI3S run all tests on startup
[51] RHARLLIQ Merge text0
[52] KKMFQDR4 editing source code from within the app
[53] APX2PY6G stop tracking wallclock time
[54] VUAAYL6X handlers for _all_ LÖVE events
[55] GQBMVYD4 Merge text.love
[56] ARYMNK52 merge bugfix: show test failures
[57] VPRGENLA hide some details within the 'warning' state
[58] JNJ4R56X support running tests multiple times
[59] ZKH2N6MN Merge text0
[60] YGCT2D2O start loading settings as applicable
[61] ORRSP7FV deduce test names on failures
[62] G2SVT3RO Merge text0
[63] AFDLKNAP resolve conflicts
[64] 2ZCXBDLY Merge text.love
[*] 3QNOKBFM beginnings of a test harness
[*] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing

Change contents

edit in reference.md at line 24

[8.509]→[3.538:604](∅→∅)

## Functions you can implement that will get automatically called
resurrect zombie in reference.md at line 24

[8.509]→[8.0:144](∅→∅),[8.509]→[8.0:144](∅→∅)

* `Version` -- the running version of LÖVE as a string, e.g. '11.4'.
* `Major_version` -- just the part before the period as an int, e.g. 11.
edit in reference.md at line 27

[8.144]

[8.948]

## Functions you can implement that will get automatically called
edit in main.lua at line 15

[8.38]→[8.8:161](∅→∅),[8.38]→[8.8:161](∅→∅),[8.161]→[6.10:128](∅→∅),[8.120]→[8.124:243](∅→∅),[6.128]→[8.124:243](∅→∅),[8.124]→[8.124:243](∅→∅),[8.243]→[8.162:530](∅→∅),[8.240]→[8.162:530](∅→∅),[8.240]→[8.162:530](∅→∅),[8.243]→[8.162:530](∅→∅),[8.530]→[8.122:122](∅→∅),[8.530]→[8.122:122](∅→∅)

-- available modes: run, error
Mode = 'run'
Error_message = nil
Error_count = 0
-- we'll reuse error mode on load for an initial version check
Supported_versions = {'11.5', '11.4', '11.3', '11.2', '11.1', '11.0', '12.0'} -- put the recommended version first
local minor_version
Major_version, minor_version = love.getVersion()
Version = Major_version..'.'..minor_version
if array.find(Supported_versions, Version) == nil then
Mode = 'error'
Error_message = ("This app doesn't support version %s; please use version %s. Press any key to try it with this version anyway."):format(Version, Supported_versions[1])
print(Error_message)
-- continue initializing everything; hopefully we won't have errors during initialization
replacement in main.lua at line 17

[8.2139]→[7.11:130](∅→∅)

Supported_versions = {'11.5', '11.4', '12.0'} -- put the recommended version first
check_love_version_for_tests()

[8.2139]

[7.130]

Supported_versions = {'11.5', '11.4', '11.3', '11.2', '11.1', '11.0', '12.0'} -- put the recommended version first
-- Mode initialized elsewhere. Available modes: run, error
Error_count = 0
edit in main.lua at line 32

[8.719]→[8.719:980](∅→∅),[8.980]→[8.1005:1016](∅→∅),[8.1005]→[8.1005:1016](∅→∅)

function check_love_version_for_tests()
if array.find(Supported_versions, Version) == nil then
-- warning to include in an error message if any tests failed
Warning_before_tests = ("This app hasn't been tested with LÖVE version %s."):format(Version)
end
end
edit in main.lua at line 40

[8.104]→[2.9:9](∅→∅),[8.2567]→[7.164:164](∅→∅),[8.2567]→[7.164:164](∅→∅)
edit in main.lua at line 66

[7.232]

[7.232]

-- we'll reuse error mode on load for an initial version check
replacement in main.lua at line 68

[7.289]→[7.289:316](∅→∅)

Mode = 'version_check'

[7.289]

[7.316]

Mode = 'error'
if Error_message == nil then Error_message = '' end
Error_message = ("This app hasn't been tested with LÖVE version %s; please use version %s if you run into errors. Press a key to try recovering.\n\n%s"):format(Version, Supported_versions[1], Error_message)
print(Error_message)
edit in main.lua at line 160

[8.473]→[7.411:622](∅→∅),[8.473]→[7.411:622](∅→∅)

love.graphics.printf(("This app hasn't been tested with LÖVE version %s; please switch to version %s if you run into issues. Press any key to continue."):format(Version, Supported_versions[1]), 40,40, 400)
resurrect zombie in main.lua at line 160

[7.622]→[8.664:681](∅→∅),[8.755]→[8.664:681](∅→∅),[8.664]→[8.664:681](∅→∅),[8.664]→[8.664:681](∅→∅)

return
end
resolve order conflict in main.lua at line 160

[8.755]

[8.664]
edit in main.lua at line 163

[8.40]→[4.13:13](∅→∅),[8.6071]→[7.624:624](∅→∅),[8.6071]→[7.624:624](∅→∅)
resolve order conflict in main.lua at line 163

[8.40]

[8.416]
edit in main.lua at line 225

[8.1283]→[4.15:15](∅→∅),[8.67]→[7.626:626](∅→∅),[8.67]→[7.626:626](∅→∅)
resolve order conflict in main.lua at line 225

[8.1283]

[8.223]
edit in main.lua at line 229

[8.1049]→[7.628:628](∅→∅),[8.1049]→[7.628:628](∅→∅)
resolve order conflict in main.lua at line 229

[8.287]

[8.780]
edit in main.lua at line 235

[8.112]→[7.630:630](∅→∅),[8.112]→[7.630:630](∅→∅)
resolve order conflict in main.lua at line 235

[8.1329]

[8.3116]
edit in main.lua at line 264

[8.247]→[6.130:130](∅→∅),[8.466]→[7.634:634](∅→∅),[8.466]→[7.634:634](∅→∅),[8.336]→[7.636:636](∅→∅),[8.336]→[7.636:636](∅→∅),[7.636]→[8.1577:1581](∅→∅),[8.1577]→[8.1577:1581](∅→∅),[8.1581]→[7.638:638](∅→∅)

end
resolve order conflict in main.lua at line 264

[8.247]
edit in app.lua at line 142

[8.61]

[5.0]

print('tests failed; mode error')
edit in app.lua at line 145

[5.50]→[5.50:189](∅→∅),[8.61]→[7.692:721](∅→∅)

Error_message = 'There were test failures:\n\n'..table.concat(Test_errors, '\n')
live.send_run_time_error_to_driver(Error_message)
local error_message = ''
resolve order conflict in app.lua at line 145

[5.50]
edit in app.lua at line 145

[0.716]

[7.721]

Error_message = ''
replacement in app.lua at line 147

[7.754]→[7.754:805](∅→∅)

error_message = Warning_before_tests..'\n\n'

[7.754]

[7.805]

Error_message = Warning_before_tests..'\n\n'
replacement in app.lua at line 149

[7.813]→[7.813:960](∅→∅)

error_message = error_message .. ('There were %d test failures:\n%s'):format(#Test_errors, table.concat(Test_errors))
error(error_message)

[7.813]

[8.131]

Error_message = Error_message .. 'There were test failures:\n\n'..table.concat(Test_errors, '\n')
live.send_run_time_error_to_driver(Error_message)
edit in app.lua at line 153

[8.276]→[8.140:162](∅→∅),[8.276]→[8.140:162](∅→∅)

App.version_check()
edit in app.lua at line 551

[8.8166]→[7.1147:1147](∅→∅),[8.8166]→[7.1147:1147](∅→∅)
edit in Manual_tests.md at line 13

[7.1386]

[8.169]

- create a couple of spuriously failing tests. Run with an untested version. Error message includes message about untested version.