akkartik/sokoban.love - Change D2TYFYG2SQ5FH2ET3WXJ3HFJARQLN5WCMAYZVDTB4DLFRAP3YTSQC

Merge text.love

Created by Kartik K. Agaram on October 10, 2023

D2TYFYG2SQ5FH2ET3WXJ3HFJARQLN5WCMAYZVDTB4DLFRAP3YTSQC

Dependencies

In channels

main

Change contents

File deletion: source_text_tests.lua, source_text_tests.lua

BFD:BFD[6.2] → [7.83739:83784]

BFD:BFD[7.83784] → [7.3561:3561]

B:BD[8.18053] → [5.442:497]

∅:D[5.497] → [7.73693:73738]

B:BD[7.73329] → [5.326:441]

∅:D[5.441] → [7.73442:73466]

B:BD[7.35939] → [5.7:325]

∅:D[5.325] → [7.36043:36088]

  check_eq(Editor_state.cursor1.pos, 25, 'cursor:pos')
end
function test_backspace_can_scroll_up()
  edit.run_after_mouse_release(Editor_state, Editor_state.left+2,Editor_state.top+Editor_state.line_height*2+5, 1)
  -- cursor should move
  if Version == '12.0' then
    -- HACK: Maybe v12.0 uses a different font? Strange that it only causes
    -- issues in a couple of places.
    -- We'll need to rethink our tests if issues like this start to multiply.
    App.screen.check(y, 'mno ', 'screen:3')
  else
    App.screen.check(y, 'mn', 'screen:3')
  end
end
function test_pagedown_never_moves_up()

Replacement in main.lua at line 19 [9.2]

B:BD[2.169] → [2.169:240]

  local major, minor = love.getVersion()
  Version = major..'.'..minor

[2.169]

[2.240]

  local minor_version
  Major_version, minor_version = love.getVersion()
  Version = Major_version..'.'..minor_version

Deletion in main.lua at line 33 [9.2]
∅:D[10.58] → [11.8:9]
∅:D[12.70] → [11.8:9]
∅:D[13.2321] → [11.8:9]
∅:D[14.85928] → [11.8:9]
B:BD[15.746] → [11.8:9]
B:BD[16.115] → [17.20:30]
BD:BD[16.115] → [17.20:30]
```
  end
end
```
Resurrecting zombie bytes in main.lua at line 33 [9.2]
B:B[17.30] → [17.30:31]
BD:B[17.30] → [17.30:31]

Deletion in main.lua at line 34 [9.2]

B:BD[17.31] → [17.31:776]

BD:BD[17.31] → [17.31:776]

function App.version_check()
  -- available modes: run, error
  Error_message = nil
  Error_count = 0
  -- we'll reuse error mode on load for an initial version check
  local supported_versions = {'11.4', '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
    Current_app = '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

Resurrecting zombie bytes in main.lua at line 179 [9.2]
∅:∅[2.681] → [13.6045:6071]
B:B[18.1373] → [13.6045:6071]
BD:B[2.681] → [13.6045:6071]
BD:B[18.1373] → [13.6045:6071]
```
  edit.draw(Editor_state)
```

Deletion in main.lua at line 180 [9.2]

∅:D[13.6071] → [19.46:46]

BD:BD[7.187951] → [19.46:46]

B:BD[18.1373] → [5.511:777]

BD:BD[18.1373] → [5.511:777]

B:BD[7.187951] → [5.779:779]

BD:BD[7.187951] → [5.779:779]

  if Current_app == 'error' then
    love.graphics.setColor(0,0,1)
    love.graphics.rectangle('fill', 0,0, App.screen.width, App.screen.height)
    love.graphics.setColor(1,1,1)
    love.graphics.printf(Error_message, 40,40, 600)
  elseif Current_app == 'run' then

Solving an order conflict in main.lua at line 180 [9.2]
[13.6071]
[9.416]

Deletion in main.lua at line 244 [9.2]

B:BD[20.67] → [21.12:12]

B:BD[22.188858] → [17.1044:1179]

BD:BD[22.188858] → [17.1044:1179]

  if Current_app == 'error' then
    if chord == 'C-c' then
      love.system.setClipboardText(Error_message)
    end
    return
  end

Solving an order conflict in main.lua at line 244 [9.2]
[20.67]
[23.223]
Resurrecting zombie bytes in main.lua at line 247 [9.2]
B:B[18.1512] → [2.1004:1049]
BD:B[18.1512] → [2.1004:1049]
```
  if Mode == 'version_check' then return end
```
Deletion in main.lua at line 248 [9.2]
B:BD[18.1512] → [17.1180:1224]
```
  if Current_app == 'error' then return end
```
Solving an order conflict in main.lua at line 248 [9.2]
[2.1049]
[5.780]
Deletion in main.lua at line 261 [9.2]
B:BD[24.57] → [5.853:897]
```
  if Current_app == 'error' then return end
```
Solving an order conflict in main.lua at line 261 [9.2]
[2.1118]
[25.71]
Deletion in main.lua at line 268 [9.2]
B:BD[26.507] → [3.12:12]
B:BD[7.190074] → [5.900:944]
BD:BD[7.190074] → [5.900:944]
B:BD[7.190738] → [5.996:1040]
BD:BD[7.190738] → [5.996:1040]
B:BD[27.1071] → [5.949:993]
BD:BD[27.1071] → [5.949:993]
BD:BD[27.1071] → [5.949:993]
B:BD[7.190711] → [5.995:995]
BD:BD[7.190711] → [5.995:995]
B:BD[25.355] → [5.946:946]
BD:BD[25.355] → [5.946:946]
BD:BD[25.355] → [5.946:946]
B:BD[27.889] → [5.948:948]
BD:BD[27.889] → [5.948:948]
BD:BD[27.889] → [5.948:948]
BD:BD[27.889] → [5.948:948]
B:BD[25.213] → [5.899:899]
BD:BD[25.213] → [5.899:899]
BD:BD[25.213] → [5.899:899]
∅:D[5.948] → [17.1360:1404]
B:BD[30.925] → [17.1360:1404]
BD:BD[30.925] → [17.1360:1404]
BD:BD[30.925] → [17.1360:1404]
B:BD[31.268] → [5.1042:1042]
BD:BD[31.268] → [5.1042:1042]
```
  if Current_app == 'error' then return end
  if Current_app == 'error' then return end
  if Current_app == 'error' then return end
  if Current_app == 'error' then return end
```
Solving an order conflict in main.lua at line 268 [9.2]
[26.507]
Resurrecting zombie bytes in app.lua at line 11 [33.2]
∅:∅[2.1147] → [32.4069:4091]
B:B[33.54] → [32.4069:4091]
BD:B[33.54] → [32.4069:4091]
BD:B[2.1147] → [32.4069:4091]
```
  App.snapshot_love()
```
Deletion in app.lua at line 12 [33.2]
∅:D[32.4091] → [19.84:84]
BD:BD[7.209243] → [19.84:84]
B:BD[33.54] → [5.1058:1080]
BD:BD[33.54] → [5.1058:1080]
B:BD[7.209243] → [5.1082:1082]
BD:BD[7.209243] → [5.1082:1082]
```
  App.version_check()
```
Solving an order conflict in app.lua at line 12 [33.2]
[32.4091]
[18.2266]

Merge text.love

Dependencies

In channels

Change contents

File deletion: source_text_tests.lua, source_text_tests.lua

Replacement in main.lua at line 19 [9.2]

Deletion in main.lua at line 33 [9.2]

Resurrecting zombie bytes in main.lua at line 33 [9.2]

Deletion in main.lua at line 34 [9.2]

Resurrecting zombie bytes in main.lua at line 179 [9.2]

Deletion in main.lua at line 180 [9.2]

Solving an order conflict in main.lua at line 180 [9.2]

Deletion in main.lua at line 244 [9.2]

Solving an order conflict in main.lua at line 244 [9.2]

Resurrecting zombie bytes in main.lua at line 247 [9.2]

Deletion in main.lua at line 248 [9.2]

Solving an order conflict in main.lua at line 248 [9.2]

Deletion in main.lua at line 261 [9.2]

Solving an order conflict in main.lua at line 261 [9.2]

Deletion in main.lua at line 268 [9.2]

Solving an order conflict in main.lua at line 268 [9.2]

Resurrecting zombie bytes in app.lua at line 11 [33.2]

Deletion in app.lua at line 12 [33.2]

Solving an order conflict in app.lua at line 12 [33.2]