Merge lines.love

Dependencies

• [2] SAEJWMTK Merge upstream into main
• [3] LXW73CJ3 Merge lines.love
• [4] APX2PY6G stop tracking wallclock time
• [5] TO6Y2G3U more decoupling editor tests from App
• [6] KVHUFUFV reorg
• [7] 7DYUAOI6 test: undo moving point
• [8] KKMFQDR4 editing source code from within the app
• [9] PX7DDEMO autosave slightly less aggressively
• [10] KAUD3YIK tests: deleting points/shapes
• [11] EQP53UQV autosave slightly less aggressively
• [12] S7ZZA3YE ugh, handle absolute as well as relative paths
• [13] L6XA5EY2 test: moving a point
• [14] 27DROQW2 Merge upstream into main
• [15] 4AXV2HG4 all pending manual tests done!
• [16] Y4VYNEGF test: autosave after name/move/delete of point
• [*] OTIBCAUJ love2d scaffold
• [*] K2X6G75Z start writing some tests for drawings

Change contents

• edit in main.lua at line 161
  [5.188787]→[5.188787:188836](∅→∅),[5.188787]→[5.188787:188836](∅→∅)
  − if App.getTime() < Last_focus_time + 0.01 then
• resurrect zombie in main.lua at line 162
  [4.619]→[5.188836:189596](∅→∅),[5.188836]→[5.188836:189596](∅→∅),[5.188836]→[5.188836:189596](∅→∅)
  + return

  + end

  + --

  + 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'

  + elseif Current_app == 'source' then

  + Settings.source = source.settings()

  + if source.quit then source.quit() end

  + Current_app = 'run'

  + 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()

  + return
• edit in drawing_tests.lua at line 409
  [5.1129]→[5.1129:1155](∅→∅),[5.1129]→[5.1129:1155](∅→∅)
  − App.wait_fake_time(3.1)
• edit in drawing_tests.lua at line 436
  [5.1193]→[5.1193:1219](∅→∅),[5.1219]→[2.17:17](∅→∅)
  − App.wait_fake_time(3.1)

  −
• resurrect zombie in drawing_tests.lua at line 436
  [5.1193]→[4.1045:1081](∅→∅),[5.1193]→[4.1045:1081](∅→∅)
  + Current_time = Current_time + 3.1
• resolve order conflict in drawing_tests.lua at line 436
  [5.1193]

  [4.1045]
• resurrect zombie in drawing_tests.lua at line 437
  [2.17]→[5.214:245](∅→∅),[4.1081]→[5.214:245](∅→∅),[5.1219]→[5.214:245](∅→∅),[5.1219]→[5.214:245](∅→∅)
  + edit.update(Editor_state, 0)
• edit in drawing_tests.lua at line 497
  [5.1260]→[5.1260:1286](∅→∅),[5.1286]→[2.19:19](∅→∅)
  − App.wait_fake_time(3.1)

  −
• resurrect zombie in drawing_tests.lua at line 497
  [5.1260]→[4.1082:1118](∅→∅),[5.1260]→[4.1082:1118](∅→∅)
  + Current_time = Current_time + 3.1
• resolve order conflict in drawing_tests.lua at line 497
  [5.1260]

  [4.1082]
• resurrect zombie in drawing_tests.lua at line 498
  [2.19]→[5.281:312](∅→∅),[4.1118]→[5.281:312](∅→∅),[5.1286]→[5.281:312](∅→∅),[5.1286]→[5.281:312](∅→∅)
  + edit.update(Editor_state, 0)
• edit in drawing_tests.lua at line 622
  [5.1388]→[5.1388:1414](∅→∅),[5.1414]→[2.21:21](∅→∅)
  − App.wait_fake_time(3.1)

  −
• resurrect zombie in drawing_tests.lua at line 622
  [5.1388]→[4.1156:1192](∅→∅),[5.1388]→[4.1156:1192](∅→∅)
  + Current_time = Current_time + 3.1
• resolve order conflict in drawing_tests.lua at line 622
  [5.1388]

  [4.1156]
• resurrect zombie in drawing_tests.lua at line 623
  [2.21]→[5.380:411](∅→∅),[4.1192]→[5.380:411](∅→∅),[5.1414]→[5.380:411](∅→∅),[5.1414]→[5.380:411](∅→∅)
  + edit.update(Editor_state, 0)
• edit in drawing_tests.lua at line 663
  [5.1452]→[5.1452:1478](∅→∅),[5.1478]→[2.23:23](∅→∅)
  − App.wait_fake_time(3.1)

  −
• resurrect zombie in drawing_tests.lua at line 663
  [5.1452]→[4.1193:1229](∅→∅),[5.1452]→[4.1193:1229](∅→∅)
  + Current_time = Current_time + 3.1
• resolve order conflict in drawing_tests.lua at line 663
  [5.1452]

  [4.1193]
• resurrect zombie in drawing_tests.lua at line 664
  [2.23]→[5.412:443](∅→∅),[4.1229]→[5.412:443](∅→∅),[5.1478]→[5.412:443](∅→∅),[5.1478]→[5.412:443](∅→∅)
  + edit.update(Editor_state, 0)