resolve conflicts

akkartik

Dec 7, 2023, 7:35 AM

MX7YD2WCLJSLML3DSDVU3YLTALIVPTM7H7LNGSHEEUPOJGQHWUAAC

Dependencies

• [2] LHG2QWSO resolve conflicts
• [3] VMV4LBR4 resolve conflicts
• [4] VPRGENLA hide some details within the 'warning' state
• [5] TSK2OXU2 .
• [6] ORKN6EOB Merge lines.love
• [7] EWJZ6XHB better formatting
• [8] R6GUSTBY default font size and line-height
• [9] 4VKEE43Z bugfix
• [10] HR6MLUTX show count of test failures
• [11] FJIGUGEC bugfix: version check
• [12] M6JI7UJ7 obsolete comment
• [13] YGCT2D2O start loading settings as applicable
• [14] IM6GSGVZ fix some arg names
• [15] S7ZZA3YE ugh, handle absolute as well as relative paths
• [16] G3VLJLDH use the background color
• [17] 2CK5QI7W make love event names consistent
• [18] OTIBCAUJ love2d scaffold
• [19] 3QNOKBFM beginnings of a test harness
• [20] CUFW4EJL reorganize app.lua and its comments
• [21] 6VJTQKW7 start supporting LÖVE v12
• [22] 5XQ4Y7NU reorg manual tests doc
• [23] AVTNUQYR basic test-enabled framework
• [24] WQOSZSUE warn on unused commandline args
• [25] ORRSP7FV deduce test names on failures
• [26] 6VXO3ZL3 just keep the cursor visible after any input events
• [27] AVLAYODP much simpler
• [28] 2Y7YH7UP infrastructure for caching LÖVE text objects
• [29] A4BSGS2C Merge lines.love
• [30] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing
• [31] TXDMRA5J bugfix: alt-tab shouldn't emit keypress events
• [32] JOPVPUSA editing source code from within the app
• [33] Z4KNS42N to open a file without a terminal, drag it on!
• [34] VP5KC4XZ Merge lines.love
• [35] 4U4VQWNY Merge lines.love
• [36] 5FW7YOFT highlight selection while dragging
• [37] BYG5CEMV support for naming points
• [38] MHOUX5JF experiment: turn off JIT
• [39] APX2PY6G stop tracking wallclock time
• [40] 3XQROLSK redo version checks yet again
• [41] XGHCLIKB Merge lines.love
• [42] 3QQZ7W4E bring couple more globals back to the app level
• [43] 7SICLTED check for 'error' mode in a few more places
• [44] LNUHQOGH start passing in Editor_state explicitly
• [45] ZLJYLPOT Merge lines.love
• [46] 2CTN2IEF Merge lines.love
• [47] YF2ATH2Q Merge lines.love
• [48] O5F6DNPG _yet another_ bugfix to the version check X-(
• [49] NEXUNNCF extract a function
• [50] QFOQPDDW Merge lines.love
• [51] VOU73AK6 Merge lines.love
• [52] Z4XRNDTR find text
• [53] HZRO5BV5 require editor margins to be ints
• [54] KKMFQDR4 editing source code from within the app
• [55] FE25XVZY yet another bugfix to the version check
• [56] XSLCFVFH .
• [57] AJB4LFRB try to maintain a reasonable line width
• [58] JCSLDGAH beginnings of support for multiple shapes
• [59] GFXWHTE6 mouse wheel support
• [60] HRWN5V6J Devine's suggestion to try to live with just freehand
• [61] Z2VZTIXY redo version checks
• [62] 2L5MEZV3 experiment: new edit namespace

Change contents

• edit in main.lua at line 35
  [5.127]→[5.184850:184903](∅→∅),[5.184903]→[5.33:33](∅→∅)
  − if Current_app == nil then

  − Current_app = 'run'

  −
• resurrect zombie in main.lua at line 35
  [5.127]→[4.0:106](∅→∅),[5.127]→[4.0:106](∅→∅)
  + -- Current_app =

  + -- | run

  + -- | source

  + -- | {name=warning message='...' next_app = run|source}

  +
• edit in main.lua at line 40
  [4.106]

  [5.460]
  + if Current_app == nil then

  + Current_app = 'run'
• edit in main.lua at line 78
  [5.88]→[5.186725:186729](∅→∅),[5.88]→[5.186725:186729](∅→∅)
  − end
• resurrect zombie in main.lua at line 78
  [5.31]→[5.145:298](∅→∅),[5.31]→[5.145:298](∅→∅)
  + function App.initialize_globals()

  + Supported_versions = {'11.5', '11.4', '12.0'} -- put the recommended version first

  + check_love_version_for_tests()
• edit in main.lua at line 82
  [5.611]→[5.186247:186281](∅→∅),[5.611]→[5.186247:186281](∅→∅)
  − function App.initialize_globals()
• resurrect zombie in main.lua at line 82
  [5.186281]→[5.186281:186411](∅→∅),[5.186281]→[5.186281:186411](∅→∅)
  + if Current_app == 'run' then

  + run.initialize_globals()

  + elseif Current_app == 'source' then

  + source.initialize_globals()
• edit in main.lua at line 86
  [5.186411]→[2.20:57](∅→∅)
  − elseif Current_app == 'error' then
• resurrect zombie in main.lua at line 86
  [2.57]→[5.186411:186477](∅→∅),[5.186411]→[5.186411:186477](∅→∅),[5.186411]→[5.186411:186477](∅→∅)
  + else

  + assert(false, 'unknown app "'..Current_app..'"')

  + end
• edit in main.lua at line 86
  [5.186411]

  [5.186411]
  + elseif current_app_is_warning() then
• resurrect zombie in main.lua at line 95
  [5.414]→[5.38:42](∅→∅),[5.187113]→[5.38:42](∅→∅),[5.414]→[5.38:42](∅→∅),[5.187113]→[5.38:42](∅→∅)
  + end
• edit in main.lua at line 95
  [5.414]

  [5.38]
  +

  + -- Another weird bit for a class of corner cases. E.g.:

  + -- * I press ctrl+e, switch Current_app. I don't want the new app to receive

  + -- text_input and key_release events.

  + -- If I try to avoid text_input events by switching modes on key_release, I

  + -- hit a new problem:

  + -- * I press ctrl+e, am running an untested version, Current_app goes to

  + -- 'warning', and immediately rolls back out of 'warning' in the

  + -- key_release event.

  + -- Skip_rest_of_key_events is ugly, but feels cleaner than creating yet

  + -- another possible value for Current_app.

  + Skip_rest_of_key_events = nil
• edit in main.lua at line 108
  [5.42]

  [5.1005]
  +

  + 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)
• edit in main.lua at line 155
  [5.187701]

  [5.8062]
  + if current_app_is_warning() then return end
• edit in main.lua at line 160
  [5.187701]→[4.569:615](∅→∅),[5.187701]→[4.569:615](∅→∅),[5.4536]→[2.58:95](∅→∅)
  − if current_app_is_warning() then return end

  − elseif Current_app == 'error' then
• resolve order conflict in main.lua at line 160
  [5.4536]

  [5.187341]
• edit in main.lua at line 166
  [5.187493]

  [5.187493]
  + if current_app_is_warning() then return end
• replacement in main.lua at line 184
  [2.198]→[2.198:235](∅→∅)
  − elseif Current_app == 'error' then
  [2.198]

  [5.544]
  + elseif current_app_is_warning() then
• replacement in main.lua at line 188
  [5.690]→[5.690:742](∅→∅)
  − love.graphics.printf(Error_message, 40,40, 600)
  [5.690]

  [5.187885]
  + love.graphics.printf(Current_app.message, 40,40, 600)
• edit in main.lua at line 192
  [5.187951]→[2.237:237](∅→∅),[5.330]→[4.663:702](∅→∅),[5.330]→[4.663:702](∅→∅),[5.330]→[4.663:702](∅→∅),[5.956]→[4.703:761](∅→∅),[5.956]→[4.703:761](∅→∅),[5.956]→[4.703:761](∅→∅)
  −

  − elseif current_app_is_warning() then

  − love.graphics.printf(Current_app.message, 40,40, 600)
• resolve order conflict in main.lua at line 192
  [5.187951]

  [5.416]
• edit in main.lua at line 264
  [5.1512]→[5.1180:1224](∅→∅),[5.1512]→[5.1180:1224](∅→∅)
  − if Current_app == 'error' then return end
• resurrect zombie in main.lua at line 264
  [5.1224]→[5.780:852](∅→∅),[5.1224]→[5.780:852](∅→∅)
  + -- ignore events for some time after window in focus (mostly alt-tab)
• edit in main.lua at line 264
  [5.1512]

  [5.780]
  + if current_app_is_warning() then return end
• edit in main.lua at line 281
  [5.57]

  [5.71]
  + if current_app_is_warning() then return end
• replacement in main.lua at line 298
  [5.190074]→[5.900:944](∅→∅)
  − if Current_app == 'error' then return end
  [5.190074]

  [5.190074]
  + if current_app_is_warning() then return end
• edit in main.lua at line 310
  [5.889]→[5.948:948](∅→∅),[5.889]→[5.948:948](∅→∅),[5.948]→[5.1360:1404](∅→∅),[5.925]→[5.1360:1404](∅→∅),[5.925]→[5.1360:1404](∅→∅)
  −

  − if Current_app == 'error' then return end
• resurrect zombie in main.lua at line 310
  [5.925]→[4.1098:1144](∅→∅),[5.925]→[4.1098:1144](∅→∅)
  + if current_app_is_warning() then return end
• resolve order conflict in main.lua at line 310
  [5.889]

  [4.1098]
• replacement in main.lua at line 321
  [5.1071]→[5.949:993](∅→∅)
  − if Current_app == 'error' then return end
  [5.1071]

  [5.190430]
  + if current_app_is_warning() then return end
• replacement in main.lua at line 332
  [5.190738]→[5.996:1040](∅→∅)
  − if Current_app == 'error' then return end
  [5.190738]

  [5.190738]
  + if current_app_is_warning() then return end
• edit in main.lua at line 363
  [5.268]→[2.239:239](∅→∅)
  −
• edit in main.lua at line 368
  [5.191282]→[4.1145:1191](∅→∅),[5.191282]→[4.1145:1191](∅→∅),[5.190979]→[4.1051:1097](∅→∅),[5.190979]→[4.1051:1097](∅→∅),[5.190617]→[4.1004:1050](∅→∅),[5.190617]→[4.1004:1050](∅→∅),[5.57]→[4.957:1003](∅→∅),[5.57]→[4.957:1003](∅→∅),[5.1512]→[4.910:956](∅→∅),[5.1512]→[4.910:956](∅→∅),[5.188032]→[4.616:662](∅→∅),[5.188032]→[4.616:662](∅→∅),[5.414]→[5.20:377](∅→∅),[5.414]→[5.20:377](∅→∅),[5.414]→[5.20:377](∅→∅),[5.377]→[4.187:282](∅→∅),[5.377]→[4.187:282](∅→∅),[5.377]→[4.187:282](∅→∅),[4.282]→[5.468:619](∅→∅),[5.468]→[5.468:619](∅→∅),[5.468]→[5.468:619](∅→∅),[5.468]→[5.468:619](∅→∅),[5.672]→[5.299:401](∅→∅),[5.414]→[5.299:401](∅→∅),[5.414]→[5.299:401](∅→∅),[5.414]→[5.299:401](∅→∅),[5.432]→[5.432:596](∅→∅),[5.432]→[5.432:596](∅→∅),[5.432]→[5.432:596](∅→∅),[5.186894]→[4.147:186](∅→∅),[5.186894]→[4.147:186](∅→∅)
  − if current_app_is_warning() then return end

  − if current_app_is_warning() then return end

  − if current_app_is_warning() then return end

  − if current_app_is_warning() then return end

  − if current_app_is_warning() then return end

  − if current_app_is_warning() then return end

  −

  − -- Another weird bit for a class of corner cases. E.g.:

  − -- * I press ctrl+e, switch Current_app. I don't want the new app to receive

  − -- text_input and key_release events.

  − -- If I try to avoid text_input events by switching modes on key_release, I

  − -- hit a new problem:

  − -- * I press ctrl+e, am running an untested version, Current_app goes to

  − -- 'warning', and immediately rolls back out of 'warning' in the

  − -- key_release event.

  − -- Skip_rest_of_key_events is ugly, but feels cleaner than creating yet

  − -- another possible value for Current_app.

  − Skip_rest_of_key_events = nil

  − end

  −

  − 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)

  − elseif current_app_is_warning() then
• resolve order conflict in main.lua at line 368
  [4.1581]
• edit in app.lua at line 11
  [5.54]

  [5.209221]
  + Version, Major_version = App.love_version()
• edit in app.lua at line 88
  [5.5849]

  [5.209278]
  + function App.love_version()

  + local major_version, minor_version = love.getVersion()

  + local version = major_version..'.'..minor_version

  + return version, major_version

  + end

  +
• replacement in app.lua at line 111
  [5.35229]→[5.10165:10263](∅→∅)
  − error(('There were %d test failures:\n\n%s'):format(#Test_errors, table.concat(Test_errors)))
  [5.35229]

  [5.35299]
  + local error_message = ''

  + if Warning_before_tests then

  + error_message = Warning_before_tests..'\n\n'

  + end

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

  + error(error_message)
• edit in app.lua at line 527
  [5.5849]→[5.1198:1372](∅→∅),[5.5849]→[5.1198:1372](∅→∅),[5.60589]→[5.1373:1641](∅→∅),[5.60589]→[5.1373:1641](∅→∅),[5.54]→[5.1017:1063](∅→∅),[5.54]→[5.1017:1063](∅→∅)
  − function App.love_version()

  − local major_version, minor_version = love.getVersion()

  − local version = major_version..'.'..minor_version

  − return version, major_version

  − end

  −

  − local error_message = ''

  − if Warning_before_tests then

  − error_message = Warning_before_tests..'\n\n'

  − end

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

  − error(error_message)

  − Version, Major_version = App.love_version()
• resolve order conflict in app.lua at line 527
  [5.8166]
• replacement in Manual_tests.md at line 20
  [3.40]→[3.40:179](∅→∅)
  − - run with an unsupported version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key.
  [3.40]

  [5.158]
  + - run with an untested version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key.

  + - run with a LÖVE v12 release candidate. No errors; it is a supported version. All tests pass.
• edit in Manual_tests.md at line 62
  [5.16279]→[3.181:181](∅→∅),[5.156]→[5.1642:1778](∅→∅),[5.156]→[5.1642:1778](∅→∅),[5.156]→[5.1642:1778](∅→∅),[5.1778]→[5.23:121](∅→∅),[5.295]→[5.23:121](∅→∅),[5.295]→[5.23:121](∅→∅),[5.295]→[5.23:121](∅→∅)
  −

  − - run with an untested version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key.

  − - run with a LÖVE v12 release candidate. No errors; it is a supported version. All tests pass.
• resolve order conflict in Manual_tests.md at line 62
  [5.16279]