akkartik/pong.love - Change 22K3VJIL4SRPXVAEJSWRS7KM4UPV4SOODPSTSSKPFWKLTYRG365QC

Merge text.love

Created by Kartik K. Agaram on November 4, 2022

22K3VJIL4SRPXVAEJSWRS7KM4UPV4SOODPSTSSKPFWKLTYRG365QC

Dependencies

In channels

main

Change contents

File deletion: edit.lua, source_edit.lua, edit.lua
BFD:BFD[4.2] → [5.16048:16080]
BFD:BFD[4.2] → [7.173:212]
BFD:BFD[7.212] → [5.413:413]
BFD:BFD[4.2] → [5.16048:16080]
BFD:BFD[5.16080] → [5.413:413]
B:BD[8.312] → [9.789:895]
∅:D[9.895] → [5.6621:6632]
B:BD[10.43] → [9.727:788]
∅:D[3.544] → [11.421:445]
∅:D[9.788] → [11.421:445]
B:BD[12.4252] → [3.483:544]
```
    State.next_save = Current_time + 3  -- short enough that you're likely to still remember what you did
  end
end
  if State.next_save and State.next_save < Current_time then
    save_to_disk(State)
  if State.next_save and State.next_save < Current_time then
```

File deletion: source_tests.lua, source_tests.lua

BFD:BFD[4.2] → [13.150262:150302]

BFD:BFD[13.150302] → [13.147166:147166]

B:BD[15.3366] → [3.82:118]

∅:D[3.118] → [15.3392:4073]

B:BD[15.1688] → [3.45:81]

∅:D[3.81] → [15.1714:3366]

B:BD[15.659] → [3.8:44]

∅:D[3.44] → [15.685:1688]

  Current_time = Current_time + 0.1
  App.run_after_keychord('C-l')
  -- margins are now adjusted
  check_eq(Editor_state.left, Margin_left, 'F - test_show_log_browser_side_resizes_both_sides_if_cannot_double_window_width/edit:left')
  check_eq(Editor_state.right, App.screen.width/2 - Margin_right, 'F - test_show_log_browser_side_resizes_both_sides_if_cannot_double_window_width/edit:right')
  check_eq(Log_browser_state.left, App.screen.width/2 + Margin_left, 'F - test_show_log_browser_side_resizes_both_sides_if_cannot_double_window_width/log:left')
  check_eq(Log_browser_state.right, App.screen.width - Margin_right, 'F - test_show_log_browser_side_resizes_both_sides_if_cannot_double_window_width/log:right')
  Current_time = Current_time + 0.1
  App.run_after_keychord('C-l')
  -- window width is doubled
  check_eq(App.screen.width, 600, 'F - test_show_log_browser_side_doubles_window_width_if_possible/display:width')
  -- left side margins are unchanged
  check_eq(Editor_state.left, Margin_left, 'F - test_show_log_browser_side_doubles_window_width_if_possible/edit:left')
  check_eq(Editor_state.right, old_editor_right, 'F - test_show_log_browser_side_doubles_window_width_if_possible/edit:right')
  -- log browser margins are adjusted
  check_eq(Log_browser_state.left, App.screen.width/2 + Margin_left, 'F - test_show_log_browser_side_doubles_window_width_if_possible/log:left')
  check_eq(Log_browser_state.right, App.screen.width - Margin_right, 'F - test_show_log_browser_side_doubles_window_width_if_possible/log:right')
end
function test_show_log_browser_side_resizes_both_sides_if_cannot_double_window_width()
  io.write('\ntest_show_log_browser_side_resizes_both_sides_if_cannot_double_window_width')
  -- initialize screen dimensions and indicate that it is maximized
  App.screen.init{width=300, height=300}
  Display_width = 300
  -- initialize source app with left side occupying more than half the display
  Current_app = 'source'
  Editor_state = edit.initialize_test_state()
  Editor_state.filename = 'foo'
  Editor_state.left = Margin_left
  Editor_state.right = 200
  Text.redraw_all(Editor_state)
  Log_browser_state = edit.initialize_test_state()
  -- log browser has some arbitrary margins
  Log_browser_state.left = 200 + Margin_left
  Log_browser_state.right = 400
  Text.redraw_all(Log_browser_state)
  log_browser.parse(Log_browser_state)
  -- display log browser
  Current_time = Current_time + 0.1
  App.run_after_keychord('C-l')
  check(Show_log_browser_side, 'F - test_show_log_browser_side')
end
function test_show_log_browser_side_doubles_window_width_if_possible()
  io.write('\ntest_show_log_browser_side_doubles_window_width_if_possible')
  -- initialize screen dimensions to half width
  App.screen.init{width=300, height=300}
  Display_width = App.screen.width*2
  -- initialize source app with left side occupying entire window (half the display)
  Current_app = 'source'
  Editor_state = edit.initialize_test_state()
  Editor_state.filename = 'foo'
  Editor_state.left = Margin_left
  Editor_state.right = App.screen.width - Margin_right
  local old_editor_right = Editor_state.right
  Text.redraw_all(Editor_state)
  Log_browser_state = edit.initialize_test_state()
  -- log browser has some arbitrary margins
  Log_browser_state.left = 200 + Margin_left
  Log_browser_state.right = 400
  Text.redraw_all(Log_browser_state)
  log_browser.parse(Log_browser_state)
  -- display log browser

Replacement in source_tests.lua at line 34 [16.7]
B:BD[14.656] → [14.656:682]
```
  App.wait_fake_time(0.1)
```
[14.656]
[14.682]
```
  Current_time = Current_time + 0.1
```
Replacement in source_tests.lua at line 59 [16.7]
B:BD[14.1685] → [14.1685:1711]
```
  App.wait_fake_time(0.1)
```
[14.1685]
[14.1711]
```
  Current_time = Current_time + 0.1
```
Replacement in source_tests.lua at line 90 [16.7]
B:BD[14.3363] → [14.3363:3389]
```
  App.wait_fake_time(0.1)
```
[14.3363]
[14.3389]
```
  Current_time = Current_time + 0.1
```

Replacement in source_edit.lua at line 192 [13.152503]

B:BD[17.20090] → [18.148199:148261]

  if State.next_save and State.next_save < App.getTime() then

[17.20090]

[18.148261]

  if State.next_save and State.next_save < Current_time then

Replacement in source_edit.lua at line 200 [13.152503]

B:BD[18.148385] → [18.148385:148492]

    State.next_save = App.getTime() + 3  -- short enough that you're likely to still remember what you did

[18.148385]

[18.148492]

    State.next_save = Current_time + 3  -- short enough that you're likely to still remember what you did

Deletion in source_edit.lua at line 213 [13.152503]
B:BD[17.20090] → [3.122:183]
BD:BD[17.20090] → [3.122:183]
B:BD[13.156877] → [3.184:290]
BD:BD[13.156877] → [3.184:290]
```
  if State.next_save and State.next_save < Current_time then
    State.next_save = Current_time + 3  -- short enough that you're likely to still remember what you did
```
Solving an order conflict in source_edit.lua at line 213 [13.152503]
[18.148722]
[17.20091]

Replacement in main.lua at line 74 [20.2]

∅:D[7.632] → [19.12344:12431]

B:BD[21.44] → [19.12344:12431]

B:BD[7.634] → [7.635:670]

  Last_focus_time = App.getTime()  -- https://love2d.org/forums/viewtopic.php?p=249700
  Last_resize_time = App.getTime()

[7.632]

[7.670]

  Current_time = 0
  Last_focus_time = 0  -- https://love2d.org/forums/viewtopic.php?p=249700
  Last_resize_time = 0

Deletion in main.lua at line 97 [20.2]
∅:D[22.187078] → [22.187078:187113]
B:BD[22.187078] → [22.187078:187113]
BD:BD[22.187078] → [22.187078:187113]
B:BD[22.186991] → [3.297:414]
BD:BD[22.186991] → [3.297:414]
```
  Last_resize_time = App.getTime()
  Current_time = 0
  Last_focus_time = 0  -- https://love2d.org/forums/viewtopic.php?p=249700
  Last_resize_time = 0
```
Resurrecting zombie bytes in main.lua at line 97 [20.2]
∅:∅[3.414] → [23.38:42]
B:B[22.187113] → [23.38:42]
B:B[22.187113] → [23.38:42]
BD:B[22.187113] → [23.38:42]
```
end
```
Insertion in main.lua at line 97 [20.2]
[13.186477]
[23.38]
```
  Last_resize_time = Current_time
```
Deletion in main.lua at line 107 [20.2]
B:BD[19.13262] → [7.692:692]
B:BD[22.187634] → [9.415:449]
BD:BD[22.187634] → [9.415:449]
BD:BD[22.187634] → [9.415:449]
B:BD[13.187512] → [3.416:416]
BD:BD[13.187512] → [3.416:416]
∅:D[3.416] → [9.450:485]
B:BD[22.188051] → [9.450:485]
```
  Last_resize_time = Current_time
    Last_focus_time = Current_time
```
Solving an order conflict in main.lua at line 107 [20.2]
[19.13262]
[24.1113]
Replacement in main.lua at line 112 [20.2]
B:BD[19.13364] → [19.13364:13400]
```
    Last_focus_time = App.getTime()
```
[19.13364]
[19.13400]
```
    Last_focus_time = Current_time
```
Resurrecting zombie bytes in main.lua at line 186 [20.2]
B:B[25.1512] → [19.14651:14723]
BD:B[25.1512] → [19.14651:14723]
```
  -- ignore events for some time after window in focus (mostly alt-tab)
```
Deletion in main.lua at line 187 [20.2]
B:BD[19.14723] → [7.700:700]
BD:BD[19.14723] → [7.700:700]
B:BD[25.1512] → [13.189334:189406]
BD:BD[25.1512] → [13.189334:189406]
B:BD[13.189406] → [3.469:469]
BD:BD[13.189406] → [3.469:469]
```
  -- ignore events for some time after window in focus (mostly alt-tab)
```
Solving an order conflict in main.lua at line 187 [20.2]
[19.14723]
[9.620]
Resurrecting zombie bytes in main.lua at line 200 [20.2]
B:B[26.3121] → [19.14956:15065]
BD:B[26.3121] → [19.14956:15065]
```
function App.keyreleased(chord, key)
  -- ignore events for some time after window in focus (mostly alt-tab)
```
Deletion in main.lua at line 202 [20.2]
B:BD[19.15065] → [7.711:711]
BD:BD[19.15065] → [7.711:711]
B:BD[26.3121] → [13.189648:189757]
BD:BD[26.3121] → [13.189648:189757]
B:BD[13.189757] → [3.471:471]
BD:BD[13.189757] → [3.471:471]
```
function App.keyreleased(chord, key)
  -- ignore events for some time after window in focus (mostly alt-tab)
```
Solving an order conflict in main.lua at line 202 [20.2]
[19.15065]
[9.669]
Deletion in main.lua at line 252 [20.2]
B:BD[13.190716] → [2.615:615]
B:BD[27.268] → [3.473:473]
BD:BD[27.268] → [3.473:473]

Merge text.love

Dependencies

In channels

Change contents

File deletion: edit.lua, source_edit.lua, edit.lua

File deletion: source_tests.lua, source_tests.lua

Replacement in source_tests.lua at line 34 [16.7]

Replacement in source_tests.lua at line 59 [16.7]

Replacement in source_tests.lua at line 90 [16.7]

Replacement in source_edit.lua at line 192 [13.152503]

Replacement in source_edit.lua at line 200 [13.152503]

Deletion in source_edit.lua at line 213 [13.152503]

Solving an order conflict in source_edit.lua at line 213 [13.152503]

Replacement in main.lua at line 74 [20.2]

Deletion in main.lua at line 97 [20.2]

Resurrecting zombie bytes in main.lua at line 97 [20.2]

Insertion in main.lua at line 97 [20.2]

Deletion in main.lua at line 107 [20.2]

Solving an order conflict in main.lua at line 107 [20.2]

Replacement in main.lua at line 112 [20.2]

Resurrecting zombie bytes in main.lua at line 186 [20.2]

Deletion in main.lua at line 187 [20.2]

Solving an order conflict in main.lua at line 187 [20.2]

Resurrecting zombie bytes in main.lua at line 200 [20.2]

Deletion in main.lua at line 202 [20.2]

Solving an order conflict in main.lua at line 202 [20.2]

Deletion in main.lua at line 252 [20.2]