akkartik/pong.love - Change TLT6DHBC3QNRVG2NCOESDUIVMHXWOVVTSZ2NBPNHXHG2GEDB62TAC

Merge text.love

Created by Kartik K. Agaram on October 9, 2023

TLT6DHBC3QNRVG2NCOESDUIVMHXWOVVTSZ2NBPNHXHG2GEDB62TAC

Dependencies

In channels

main

Change contents

Replacement in text_tests.lua at line 1064 [6.2]

B:BD[4.41276] → [5.2:42]

  App.screen.check(y, 'mn', 'screen:3')

[4.41276]

[5.42]

  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

Replacement in text_tests.lua at line 1709 [6.2]

B:BD[5.27057] → [5.27057:27172]

  edit.run_after_mouse_release(Editor_state, Editor_state.left+8,Editor_state.top+Editor_state.line_height*2+5, 1)

[5.27057]

[5.27172]

  edit.run_after_mouse_release(Editor_state, Editor_state.left+2,Editor_state.top+Editor_state.line_height*2+5, 1)

Replacement in text_tests.lua at line 1712 [6.2]

B:BD[5.27252] → [5.27252:27307]

  check_eq(Editor_state.cursor1.pos, 26, 'cursor:pos')

[5.27252]

[5.27307]

  check_eq(Editor_state.cursor1.pos, 25, 'cursor:pos')

Deletion in text_tests.lua at line 2054 [6.2]

B:BD[5.41621] → [2.945:945]

B:BD[7.26911] → [8.2:320]

BD:BD[7.26911] → [8.2:320]

B:BD[6.33004] → [8.321:436]

BD:BD[6.33004] → [8.321:436]

B:BD[10.18567] → [8.437:492]

BD:BD[10.18567] → [8.437:492]

  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
  edit.run_after_mouse_release(Editor_state, Editor_state.left+2,Editor_state.top+Editor_state.line_height*2+5, 1)
  check_eq(Editor_state.cursor1.pos, 25, 'cursor:pos')

Solving an order conflict in text_tests.lua at line 2054 [6.2]
[5.41621]

Replacement in source_text_tests.lua at line 1089 [13.3561]

B:BD[9.35770] → [12.111:151]

  App.screen.check(y, 'mn', 'screen:3')

[9.35770]

[9.35874]

  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

Replacement in source_text_tests.lua at line 1806 [13.3561]

B:BD[9.73160] → [14.13207:13322]

  edit.run_after_mouse_release(Editor_state, Editor_state.left+8,Editor_state.top+Editor_state.line_height*2+5, 1)

[9.73160]

[9.73273]

  edit.run_after_mouse_release(Editor_state, Editor_state.left+2,Editor_state.top+Editor_state.line_height*2+5, 1)

Replacement in source_text_tests.lua at line 1809 [13.3561]

B:BD[11.17295] → [11.17295:17350]

  check_eq(Editor_state.cursor1.pos, 26, 'cursor:pos')

[11.17295]

[9.73524]

  check_eq(Editor_state.cursor1.pos, 25, 'cursor:pos')

Deletion in source_text_tests.lua at line 2151 [13.3561]

B:BD[15.1303] → [2.1894:1894]

B:BD[13.35939] → [3.7:325]

BD:BD[13.35939] → [3.7:325]

B:BD[13.73329] → [3.326:441]

BD:BD[13.73329] → [3.326:441]

B:BD[17.18053] → [3.442:497]

BD:BD[17.18053] → [3.442:497]

  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
  edit.run_after_mouse_release(Editor_state, Editor_state.left+2,Editor_state.top+Editor_state.line_height*2+5, 1)
  check_eq(Editor_state.cursor1.pos, 25, 'cursor:pos')

Solving an order conflict in source_text_tests.lua at line 2151 [13.3561]
[15.1303]

Insertion in main.lua at line 61 [19.2]

[9.157467]

[18.1118]

  end
end
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

Replacement in main.lua at line 146 [19.2]

B:BD[20.1373] → [21.13637:13669]

  if Current_app == 'pong' then

[20.1373]

[21.13669]

  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 == 'pong' then

Deletion in main.lua at line 158 [19.2]

B:BD[22.1521] → [16.696:696]

B:BD[20.1373] → [3.511:777]

BD:BD[20.1373] → [3.511:777]

B:BD[13.187951] → [3.779:779]

BD:BD[13.187951] → [3.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 158 [19.2]
[22.1521]
[19.416]
Deletion in main.lua at line 221 [19.2]
B:BD[20.1512] → [21.14651:14723]
B:BD[21.14723] → [23.487:487]
```
  -- ignore events for some time after window in focus (mostly alt-tab)
```
Insertion in main.lua at line 253 [19.2]
[21.15373]
[24.334]
```
  if Current_app == 'error' then return end
```
Insertion in main.lua at line 265 [19.2]
[25.322]
[25.322]
```
  if Current_app == 'error' then return end
```
Insertion in main.lua at line 276 [19.2]
[25.644]
[26.12]
```
  if Current_app == 'error' then return end
```
Deletion in main.lua at line 280 [19.2]
B:BD[13.190074] → [3.900:944]
BD:BD[13.190074] → [3.900:944]
B:BD[27.355] → [3.946:946]
BD:BD[27.355] → [3.946:946]
BD:BD[27.355] → [3.946:946]
B:BD[29.889] → [3.948:948]
BD:BD[29.889] → [3.948:948]
BD:BD[29.889] → [3.948:948]
BD:BD[29.889] → [3.948:948]
BD:BD[29.889] → [3.948:948]
∅:D[3.948] → [31.1360:1404]
B:BD[32.925] → [31.1360:1404]
BD:BD[32.925] → [31.1360:1404]
BD:BD[32.925] → [31.1360:1404]
BD:BD[32.925] → [31.1360:1404]
```
  if Current_app == 'error' then return end
  if Current_app == 'error' then return end
```
Solving an order conflict in main.lua at line 280 [19.2]
[26.146]
[25.711]
Insertion in main.lua at line 287 [19.2]
[25.874]
[25.874]
```
  if Current_app == 'error' then return end
```

Deletion in main.lua at line 303 [19.2]

B:BD[29.1071] → [3.949:993]

BD:BD[29.1071] → [3.949:993]

B:BD[13.190711] → [3.995:995]

BD:BD[13.190711] → [3.995:995]

B:BD[13.190738] → [3.996:1040]

BD:BD[13.190738] → [3.996:1040]

B:BD[33.268] → [3.1042:1042]

BD:BD[33.268] → [3.1042:1042]

B:BD[34.115] → [31.20:776]

BD:BD[34.115] → [31.20:776]

  if Current_app == 'error' then return end
  if Current_app == 'error' then return end
  end
end
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

Solving an order conflict in main.lua at line 303 [19.2]
[25.1309]
Insertion in app.lua at line 11 [35.2]
[35.54]
[36.346]
```
  App.version_check()
```
Deletion in app.lua at line 13 [35.2]
B:BD[36.368] → [16.842:842]
B:BD[35.54] → [3.1058:1080]
BD:BD[35.54] → [3.1058:1080]
B:BD[13.209243] → [3.1082:1082]
BD:BD[13.209243] → [3.1082:1082]
```
  App.version_check()
```
Solving an order conflict in app.lua at line 13 [35.2]
[36.368]
[20.2266]

Merge text.love

Dependencies

In channels

Change contents

Replacement in text_tests.lua at line 1064 [6.2]

Replacement in text_tests.lua at line 1709 [6.2]

Replacement in text_tests.lua at line 1712 [6.2]

Deletion in text_tests.lua at line 2054 [6.2]

Solving an order conflict in text_tests.lua at line 2054 [6.2]

Replacement in source_text_tests.lua at line 1089 [13.3561]

Replacement in source_text_tests.lua at line 1806 [13.3561]

Replacement in source_text_tests.lua at line 1809 [13.3561]

Deletion in source_text_tests.lua at line 2151 [13.3561]

Solving an order conflict in source_text_tests.lua at line 2151 [13.3561]

Insertion in main.lua at line 61 [19.2]

Replacement in main.lua at line 146 [19.2]

Deletion in main.lua at line 158 [19.2]

Solving an order conflict in main.lua at line 158 [19.2]

Deletion in main.lua at line 221 [19.2]

Insertion in main.lua at line 253 [19.2]

Insertion in main.lua at line 265 [19.2]

Insertion in main.lua at line 276 [19.2]

Deletion in main.lua at line 280 [19.2]

Solving an order conflict in main.lua at line 280 [19.2]

Insertion in main.lua at line 287 [19.2]

Deletion in main.lua at line 303 [19.2]

Solving an order conflict in main.lua at line 303 [19.2]

Insertion in app.lua at line 11 [35.2]

Deletion in app.lua at line 13 [35.2]

Solving an order conflict in app.lua at line 13 [35.2]