akkartik/pong.love - Change ZMRMC3O6RXECMBAPOOKUSYDJ3K6CQVRFHFE2BID4BUBOL3YB6MGAC

Merge text.love

Created by Kartik K. Agaram on December 23, 2022

ZMRMC3O6RXECMBAPOOKUSYDJ3K6CQVRFHFE2BID4BUBOL3YB6MGAC

Dependencies

In channels

main

Change contents

File deletion: text_tests.lua, source_text_tests.lua, text_tests.lua

BFD:BFD[4.2] → [5.43801:43839]

BFD:BFD[4.2] → [6.43:88]

BFD:BFD[6.88] → [5.2:2]

BFD:BFD[4.2] → [5.43801:43839]

BFD:BFD[5.43839] → [5.2:2]

B:BD[7.93] → [8.2:55]

∅:D[8.55] → [9.13019:13335]

  -- selection persists even after shift is released
  check_eq(Editor_state.selection1.line, 1, 'F - test_select_text/selection:line')
  check_eq(Editor_state.selection1.pos, 1, 'F - test_select_text/selection:pos')
  check_eq(Editor_state.cursor1.line, 1, 'F - test_select_text/cursor:line')
  check_eq(Editor_state.cursor1.pos, 2, 'F - test_select_text/cursor:pos')

Replacement in source_text_tests.lua at line 610 [10.3561]

B:BD[2.2812] → [2.2812:2864]

  -- selection persists even after shift is release

[2.2812]

[11.1365]

  -- selection persists even after shift is released

Deletion in source_text_tests.lua at line 2057 [10.3561]
B:BD[12.83508] → [2.5317:5317]
B:BD[13.2863] → [3.6:59]
BD:BD[13.2863] → [3.6:59]
BD:BD[13.2863] → [3.6:59]
```
  -- selection persists even after shift is released
```
Solving an order conflict in source_text_tests.lua at line 2057 [10.3561]
[12.83508]

Deletion in main.lua at line 200 [17.2]

B:BD[14.3121] → [15.14956:15065]

B:BD[15.15065] → [16.489:489]

function App.keyreleased(chord, key)
  -- ignore events for some time after window in focus (mostly alt-tab)

Replacement in main.lua at line 207 [17.2]

B:BD[15.15103] → [2.7583:7645]

    if pong.key_release then pong.key_release(chord, key) end

[15.15103]

[15.15167]

    if pong.key_release then pong.key_release(key, scancode) end

Deletion in main.lua at line 209 [17.2]
B:BD[15.15205] → [2.7647:7647]
BD:BD[15.15205] → [2.7647:7647]
BD:BD[15.15205] → [2.7647:7647]
∅:D[2.7647] → [7.4885:4951]
B:BD[19.190433] → [7.4885:4951]
BD:BD[19.190433] → [7.4885:4951]
B:BD[19.190333] → [18.58:121]
BD:BD[19.190333] → [18.58:121]
```
    if source.key_release then source.key_release(chord, key) end
    if run.key_release then run.key_release(key, scancode) end
```
Resurrecting zombie bytes in main.lua at line 209 [17.2]
B:B[19.190433] → [3.144:213]
BD:B[19.190433] → [3.144:213]
```
    if source.key_release then source.key_release(key, scancode) end
```
Solving an order conflict in main.lua at line 209 [17.2]
[15.15205]
[3.144]
Deletion in main.lua at line 252 [17.2]
B:BD[10.190716] → [2.7993:7993]
B:BD[20.268] → [3.357:357]
BD:BD[20.268] → [3.357:357]
B:BD[10.190137] → [3.214:281]
BD:BD[10.190137] → [3.214:281]
B:BD[10.190246] → [3.282:355]
BD:BD[10.190246] → [3.282:355]
```
    if run.mouse_press then run.mouse_press(x,y, mouse_button) end
    if source.mouse_press then source.mouse_press(x,y, mouse_button) end
```
Solving an order conflict in main.lua at line 252 [17.2]
[10.190716]

Merge text.love

Dependencies

In channels

Change contents

File deletion: text_tests.lua, source_text_tests.lua, text_tests.lua

Replacement in source_text_tests.lua at line 610 [10.3561]

Deletion in source_text_tests.lua at line 2057 [10.3561]

Solving an order conflict in source_text_tests.lua at line 2057 [10.3561]

Deletion in main.lua at line 200 [17.2]

Replacement in main.lua at line 207 [17.2]

Deletion in main.lua at line 209 [17.2]

Resurrecting zombie bytes in main.lua at line 209 [17.2]

Solving an order conflict in main.lua at line 209 [17.2]

Deletion in main.lua at line 252 [17.2]

Solving an order conflict in main.lua at line 252 [17.2]