akkartik/luaML.love - Change RVYVL6DEQCCCFEXHQGT5OLCJIMU3PROQNEELHZUHGVYQQ4RI5RQQC

resolve conflicts

Created by akkartik on June 11, 2024

RVYVL6DEQCCCFEXHQGT5OLCJIMU3PROQNEELHZUHGVYQQ4RI5RQQC

Dependencies

In channels

main

Change contents

Deletion in text.lua at line 395 [7.1]
B:BD[5.2828] → [6.478:508]
BD:BD[5.2828] → [6.478:508]
```
    y = y - State.line_height
```

Deletion in text.lua at line 464 [7.1]

B:BD[9.1280] → [6.509:668]

B:BD[6.668] → [2.5:5]

--?   print('down', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)

Resurrecting zombie bytes in text.lua at line 465 [7.1]
∅:∅[2.5] → [10.1153:1202]
∅:∅[4.110] → [10.1153:1202]
∅:∅[11.199] → [10.1153:1202]
∅:∅[8.2113] → [10.1153:1202]
B:B[5.6132] → [10.1153:1202]
BD:B[5.6132] → [10.1153:1202]
```
  assert(State.cursor1.pos, 'cursor has no pos')
```
Deletion in text.lua at line 468 [7.1]
B:BD[12.2960] → [6.669:726]
```
--?     print('cursor at final screen line of its line')
```
Deletion in text.lua at line 473 [7.1]
B:BD[13.263] → [4.169:204]
BD:BD[13.263] → [4.169:204]
∅:D[4.204] → [13.265:265]
∅:D[11.285] → [13.265:265]
BD:BD[14.5714] → [13.265:265]
```
--?       print(State.cursor1.pos)
```

Deletion in text.lua at line 475 [7.1]

B:BD[5.6537] → [6.763:895]

BD:BD[5.6537] → [6.763:895]

--?       print('screen top before:', State.screen_top1.line, State.screen_top1.pos)
--?       print('scroll up preserving cursor')

Resurrecting zombie bytes in text.lua at line 475 [7.1]

B:B[15.1321] → [8.2114:2168]

BD:B[15.1321] → [8.2114:2168]

B:B[8.2168] → [4.205:354]

BD:B[8.2168] → [4.205:354]

∅:∅[4.354] → [8.2317:2370]

∅:∅[11.431] → [8.2317:2370]

B:B[8.2317] → [8.2317:2370]

BD:B[8.2317] → [8.2317:2370]

B:B[8.2370] → [4.355:487]

BD:B[8.2370] → [4.355:487]

    local screen_bottom1 = Text.screen_bottom1(State)
--?   print('down 2', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, screen_bottom1.line, screen_bottom1.pos)
    if State.cursor1.line > screen_bottom1.line then
--?       print('screen top before:', State.screen_top1.line, State.screen_top1.pos)
--?       print('scroll up preserving cursor')

Deletion in text.lua at line 482 [7.1]

B:BD[9.1501] → [4.488:572]

--?       print('screen top after:', State.screen_top1.line, State.screen_top1.pos)

Solving an order conflict in text.lua at line 482 [7.1]
[6.980]
[12.3680]
Deletion in text.lua at line 485 [7.1]
B:BD[17.73] → [6.981:1045]
BD:BD[17.73] → [6.981:1045]
```
--?     print('cursor is NOT at final screen line of its line')
```

Resurrecting zombie bytes in text.lua at line 485 [7.1]

B:B[12.3744] → [8.2371:2489]

BD:B[12.3744] → [8.2371:2489]

B:B[8.2489] → [4.573:637]

BD:B[8.2489] → [4.573:637]

    local screen_bottom1 = Text.screen_bottom1(State)
    local scroll_down = Text.le1(screen_bottom1, State.cursor1)
--?     print('cursor is NOT at final screen line of its line')

Deletion in text.lua at line 491 [7.1]

B:BD[18.252] → [6.1046:1192]

--?     print('switching pos of screen line at cursor from '..tostring(screen_line_starting_pos)..' to '..tostring(new_screen_line_starting_pos))

Resurrecting zombie bytes in text.lua at line 492 [7.1]
∅:∅[4.784] → [19.4545:4775]
∅:∅[11.841] → [19.4545:4775]
∅:∅[16.1176] → [19.4545:4775]
∅:∅[6.1192] → [19.4545:4775]
∅:∅[12.4338] → [19.4545:4775]
B:B[16.1176] → [19.4545:4775]
B:B[6.1192] → [19.4545:4775]
B:B[12.4338] → [19.4545:4775]
BD:B[12.4338] → [19.4545:4775]
```
    local new_screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, new_screen_line_starting_pos)
    local s = string.sub(State.lines[State.cursor1.line].data, new_screen_line_starting_byte_offset)
```

Deletion in text.lua at line 495 [7.1]

B:BD[20.901] → [3.40:114]

--?     print('cursor pos is now', State.cursor1.line, State.cursor1.pos)

Deletion in text.lua at line 497 [7.1]
B:BD[21.154] → [6.1268:1315]
```
--?       print('scroll up preserving cursor')
```

Deletion in text.lua at line 499 [7.1]

B:BD[9.1771] → [6.1316:1400]

--?       print('screen top after:', State.screen_top1.line, State.screen_top1.pos)

Deletion in text.lua at line 502 [7.1]

B:BD[12.4810] → [6.1401:1558]

--?   print('=>', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)

resolve conflicts

Dependencies

In channels

Change contents

Deletion in text.lua at line 395 [7.1]

Deletion in text.lua at line 464 [7.1]

Resurrecting zombie bytes in text.lua at line 465 [7.1]

Deletion in text.lua at line 468 [7.1]

Deletion in text.lua at line 473 [7.1]

Deletion in text.lua at line 475 [7.1]

Resurrecting zombie bytes in text.lua at line 475 [7.1]

Deletion in text.lua at line 482 [7.1]

Solving an order conflict in text.lua at line 482 [7.1]

Deletion in text.lua at line 485 [7.1]

Resurrecting zombie bytes in text.lua at line 485 [7.1]

Deletion in text.lua at line 491 [7.1]

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

Deletion in text.lua at line 495 [7.1]

Deletion in text.lua at line 497 [7.1]

Deletion in text.lua at line 499 [7.1]

Deletion in text.lua at line 502 [7.1]