akkartik/pong.love - Change FULK37LWMRZQBK7EZFO2YVE2CNP26QXVKF652JM7UC77I3LBCRKQC

Merge text.love

Created by Kartik K. Agaram on August 18, 2022

FULK37LWMRZQBK7EZFO2YVE2CNP26QXVKF652JM7UC77I3LBCRKQC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in text.lua at line 488 [10.1]
B:B[9.277] → [7.3:24]
BD:B[9.277] → [7.3:24]
```
    Text.left(State)
```
Resurrecting zombie bytes in text.lua at line 490 [10.1]
B:B[9.324] → [7.25:47]
BD:B[9.324] → [7.25:47]
```
    Text.right(State)
```
Resurrecting zombie bytes in text.lua at line 492 [10.1]
B:B[11.8804] → [7.48:69]
BD:B[11.8804] → [7.48:69]
```
    Text.left(State)
```
Resurrecting zombie bytes in text.lua at line 494 [10.1]
B:B[11.8952] → [7.70:92]
BD:B[11.8952] → [7.70:92]
```
    Text.right(State)
```
Resurrecting zombie bytes in text.lua at line 497 [10.1]
B:B[9.456] → [7.93:119]
BD:B[9.456] → [7.93:119]
```
    Text.word_left(State)
```
Resurrecting zombie bytes in text.lua at line 499 [10.1]
B:B[9.794] → [7.120:147]
BD:B[9.794] → [7.120:147]
```
    Text.word_right(State)
```
Resurrecting zombie bytes in text.lua at line 501 [10.1]
B:B[11.9221] → [7.148:174]
BD:B[11.9221] → [7.148:174]
```
    Text.word_left(State)
```
Resurrecting zombie bytes in text.lua at line 503 [10.1]
B:B[11.9376] → [7.175:202]
BD:B[11.9376] → [7.175:202]
```
    Text.word_right(State)
```
Resurrecting zombie bytes in text.lua at line 507 [10.1]
B:B[12.115] → [7.203:231]
BD:B[12.115] → [7.203:231]
```
    Text.end_of_line(State)
```
Resurrecting zombie bytes in text.lua at line 511 [10.1]
B:B[11.9798] → [7.232:260]
BD:B[11.9798] → [7.232:260]
```
    Text.end_of_line(State)
```
Resurrecting zombie bytes in text.lua at line 513 [10.1]
B:B[13.3984] → [7.261:280]
BD:B[13.3984] → [7.261:280]
```
    Text.up(State)
```
Resurrecting zombie bytes in text.lua at line 515 [10.1]
B:B[13.4463] → [7.281:302]
BD:B[13.4463] → [7.281:302]
```
    Text.down(State)
```
Resurrecting zombie bytes in text.lua at line 517 [10.1]
B:B[11.10118] → [7.303:322]
BD:B[11.10118] → [7.303:322]
```
    Text.up(State)
```
Resurrecting zombie bytes in text.lua at line 519 [10.1]
B:B[11.10263] → [7.323:344]
BD:B[11.10263] → [7.323:344]
```
    Text.down(State)
```
Resurrecting zombie bytes in text.lua at line 521 [10.1]
B:B[14.33] → [7.345:368]
BD:B[14.33] → [7.345:368]
```
    Text.pageup(State)
```
Resurrecting zombie bytes in text.lua at line 523 [10.1]
B:B[14.893] → [7.369:394]
BD:B[14.893] → [7.369:394]
```
    Text.pagedown(State)
```
Resurrecting zombie bytes in text.lua at line 525 [10.1]
B:B[11.10534] → [7.395:418]
BD:B[11.10534] → [7.395:418]
```
    Text.pageup(State)
```
Resurrecting zombie bytes in text.lua at line 527 [10.1]
B:B[11.10687] → [7.419:444]
BD:B[11.10687] → [7.419:444]
```
    Text.pagedown(State)
```

Deletion in text.lua at line 591 [10.1]

B:BD[15.4029] → [16.3:112]

  local screen_line_starting_pos, screen_line_index = Text.pos_at_start_of_screen_line(State, State.cursor1)

Solving an order conflict in text.lua at line 591 [10.1]
[3.112]
[17.295]
Deletion in text.lua at line 603 [10.1]
B:BD[18.4667] → [19.357:441]
BD:BD[18.4667] → [19.357:441]
```
        State.screen_top1 = {line=State.cursor1.line, pos=screen_line_starting_pos}
```
Deletion in text.lua at line 607 [10.1]
B:BD[15.5047] → [19.442:501]
BD:BD[15.5047] → [19.442:501]
```
      State.screen_top1.line = State.cursor1.line  -- BUG?
```
Resurrecting zombie bytes in text.lua at line 645 [10.1]
∅:∅[21.110] → [22.1303:1361]
B:B[17.3695] → [22.1303:1361]
BD:B[21.110] → [22.1303:1361]
BD:B[17.3695] → [22.1303:1361]
```
    -- move down one screen line (A side) in current line
```
Resurrecting zombie bytes in text.lua at line 646 [10.1]
B:B[17.3744] → [4.3:73]
BD:B[17.3744] → [4.3:73]
```
    local scroll_down = Text.le1(State.screen_bottom1, State.cursor1)
```
Solving an order conflict in text.lua at line 646 [10.1]
[22.1361]
[4.3]

Deletion in text.lua at line 648 [10.1]

B:BD[17.3993] → [3.113:224]

    local screen_line_starting_pos, screen_line_index = Text.pos_at_start_of_screen_line(State, State.cursor1)

Deletion in text.lua at line 931 [10.1]

B:BD[23.1332] → [3.413:714]

function Text.pos_at_start_of_screen_line(State, loc1)
  Text.populate_screen_line_starting_pos(State, loc1.line)
  local line_cache = State.line_cache[loc1.line]
  for i=#line_cache.screen_line_starting_pos,1,-1 do
    local spos = line_cache.screen_line_starting_pos[i]
    if spos <= loc1.pos then

Deletion in text.lua at line 1294 [10.1]
B:BD[24.192] → [5.3:52]
BD:BD[24.192] → [5.3:52]
```
  local line_cache = State.line_cache[loc1.line]
```
Solving an order conflict in text.lua at line 1294 [10.1]
[26.1053]
[24.192]

Deletion in text.lua at line 1295 [10.1]

B:BD[24.251] → [26.1054:1163]

  for i=#line_cache.screen_line_starting_pos,1,-1 do
    local spos = line_cache.screen_line_starting_pos[i]

Deletion in text.lua at line 1475 [10.1]

B:BD[27.419] → [16.600:676]

--?   local botpos = Text.pos_at_start_of_screen_line(State, State.cursor1)

Solving an order conflict in text.lua at line 1475 [10.1]
[3.1221]
[28.1062]
Deletion in select.lua at line 27 [30.43980]
B:BD[29.2509] → [16.679:762]
BD:BD[29.2509] → [16.679:762]
```
    State.screen_top1.pos = Text.pos_at_start_of_screen_line(State, State.cursor1)
```

Deletion in search.lua at line 63 [30.48846]

B:BD[31.880] → [3.1225:1296]

    local pos = Text.pos_at_start_of_screen_line(State, State.cursor1)

Deletion in search.lua at line 109 [30.48846]

B:BD[31.1925] → [3.1297:1368]

    local pos = Text.pos_at_start_of_screen_line(State, State.cursor1)

Deletion in edit.lua at line 224 [32.413]
B:BD[26.2426] → [26.2426:2436]
```
  -- zoom
```
Solving an order conflict in edit.lua at line 224 [32.413]
[26.2426]
[6.15]
Deletion in edit.lua at line 234 [32.413]
B:BD[33.6870] → [26.2437:2447]
```
  -- undo
```

Merge text.love

Dependencies

In channels

Change contents

Resurrecting zombie bytes in text.lua at line 488 [10.1]

Resurrecting zombie bytes in text.lua at line 490 [10.1]

Resurrecting zombie bytes in text.lua at line 492 [10.1]

Resurrecting zombie bytes in text.lua at line 494 [10.1]

Resurrecting zombie bytes in text.lua at line 497 [10.1]

Resurrecting zombie bytes in text.lua at line 499 [10.1]

Resurrecting zombie bytes in text.lua at line 501 [10.1]

Resurrecting zombie bytes in text.lua at line 503 [10.1]

Resurrecting zombie bytes in text.lua at line 507 [10.1]

Resurrecting zombie bytes in text.lua at line 511 [10.1]

Resurrecting zombie bytes in text.lua at line 513 [10.1]

Resurrecting zombie bytes in text.lua at line 515 [10.1]

Resurrecting zombie bytes in text.lua at line 517 [10.1]

Resurrecting zombie bytes in text.lua at line 519 [10.1]

Resurrecting zombie bytes in text.lua at line 521 [10.1]

Resurrecting zombie bytes in text.lua at line 523 [10.1]

Resurrecting zombie bytes in text.lua at line 525 [10.1]

Resurrecting zombie bytes in text.lua at line 527 [10.1]

Deletion in text.lua at line 591 [10.1]

Solving an order conflict in text.lua at line 591 [10.1]

Deletion in text.lua at line 603 [10.1]

Deletion in text.lua at line 607 [10.1]

Resurrecting zombie bytes in text.lua at line 645 [10.1]

Resurrecting zombie bytes in text.lua at line 646 [10.1]

Solving an order conflict in text.lua at line 646 [10.1]

Deletion in text.lua at line 648 [10.1]

Deletion in text.lua at line 931 [10.1]

Deletion in text.lua at line 1294 [10.1]

Solving an order conflict in text.lua at line 1294 [10.1]

Deletion in text.lua at line 1295 [10.1]

Deletion in text.lua at line 1475 [10.1]

Solving an order conflict in text.lua at line 1475 [10.1]

Deletion in select.lua at line 27 [30.43980]

Deletion in search.lua at line 63 [30.48846]

Deletion in search.lua at line 109 [30.48846]

Deletion in edit.lua at line 224 [32.413]

Solving an order conflict in edit.lua at line 224 [32.413]

Deletion in edit.lua at line 234 [32.413]