akkartik/sokoban.love - Change 5QQKIYB7UD2ULRUYWCIOU5W463S26YW4PKYQAZAXFUYRHV5HV66AC

resolve conflicts

Created by akkartik on June 11, 2024

5QQKIYB7UD2ULRUYWCIOU5W463S26YW4PKYQAZAXFUYRHV5HV66AC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in text.lua at line 10 [6.1]
B:B[5.91] → [4.1564:1594]
BD:B[5.91] → [4.1564:1594]
```
-- return y for the next line
```
Deletion in text.lua at line 11 [6.1]
∅:D[4.1594] → [7.5:73]
B:BD[8.83] → [7.5:73]
BD:BD[8.83] → [7.5:73]
B:BD[7.73] → [4.1595:1635]
BD:BD[7.73] → [4.1595:1635]
```
function Text.draw(State, line_index, y, startpos, fg, hide_cursor)
--?   print('text.draw', line_index, y)
```
Resurrecting zombie bytes in text.lua at line 11 [6.1]
B:B[8.83] → [2.4:91]
BD:B[8.83] → [2.4:91]
BD:B[8.83] → [2.4:91]
```
function Text.draw(State, line_index, y, startpos, fg, hide_cursor, show_line_numbers)
```
Solving an order conflict in text.lua at line 11 [6.1]
[4.1594]
[2.4]
Insertion in text.lua at line 12 [6.1]
[2.91]
[10.42]
```
--?   print('text.draw', line_index, y)
```
Deletion in text.lua at line 31 [6.1]
B:BD[11.363] → [12.0:19]
BD:BD[11.363] → [12.0:19]
```
--?       print(i)
```

Replacement in text.lua at line 397 [6.1]

∅:D[13.34] → [14.1186:1250]

B:BD[14.1186] → [14.1186:1250]

    if y + State.line_height > App.screen.height then break end

[13.34]

[14.1250]

    if y + State.line_height > State.bottom then break end

Deletion in text.lua at line 406 [6.1]
B:BD[15.485] → [16.220:265]
BD:BD[15.485] → [16.220:265]
```
  local y = State.bottom - State.line_height
```

Resurrecting zombie bytes in text.lua at line 406 [6.1]

B:B[17.115] → [9.707:816]

BD:B[17.115] → [9.707:816]

  -- does not modify State (except to populate line_cache)
  local loc2 = Text.to2(State, State.screen_top1)

Insertion in text.lua at line 408 [6.1]
[9.816]
[18.16685]
```
  local y = State.bottom - State.line_height
```

Replacement in text.lua at line 432 [6.1]

∅:D[13.96] → [9.1779:1843]

B:BD[9.1779] → [9.1779:1843]

    if y + State.line_height > App.screen.height then break end

[13.96]

[9.1843]

    if y + State.line_height > State.bottom then break end

Deletion in text.lua at line 967 [6.1]

B:BD[19.5776] → [16.368:468]

BD:BD[19.5776] → [16.368:468]

          pos=Text.to_pos_on_line(State, State.screen_bottom1.line, State.right-5, State.bottom-5),

Resurrecting zombie bytes in edit.lua at line 122 [21.413]
B:B[20.738] → [16.596:655]
BD:B[20.738] → [16.596:655]
```
    if y + State.line_height > State.bottom then break end
```

Replacement in edit.lua at line 128 [21.413]

B:BD[20.1000] → [2.803:909]

B:BD[20.1000] → [4.1649:1716]

    y, screen_bottom1.pos = Text.draw(State, line_index, y, startpos, fg, hide_cursor, show_line_numbers)
    y = Text.draw(State, line_index, y, startpos, fg, hide_cursor)

[20.1000]

[20.1070]

    y = Text.draw(State, line_index, y, startpos, fg, hide_cursor, show_line_numbers)

Replacement in app.lua at line 255 [23.2]

B:BD[22.748] → [3.73:117]

--?   App.screen.init{width=120, height=60}

[22.748]

[3.117]

--?   App.screen.init{width=120, height=60} -- debug: run a single test at a time like these 4 lines

Deletion in app.lua at line 259 [23.2]
B:BD[22.748] → [4.1755:1755]
∅:D[4.1755] → [9.8666:8755]
B:BD[24.842] → [9.8666:8755]
B:BD[9.8755] → [25.310:345]
```
--?   App.initialize_for_test() -- debug: run a single test at a time like these 2 lines
--?   test_click_below_all_lines()
```
Solving an order conflict in app.lua at line 259 [23.2]
[3.255]
[24.842]

Replacement in 0035-compute_scrollbar at line 6 [12.1890]

B:BD[12.2199] → [12.2199:2280]

	local bot = state.line_cache[state.screen_bottom1.line].start_screen_line_index

[12.2199]

[12.2280]

	local screen_bottom1 = Text.screen_bottom1(state)
	local bot = state.line_cache[screen_bottom1.line].start_screen_line_index

resolve conflicts

Dependencies

In channels

Change contents

Resurrecting zombie bytes in text.lua at line 10 [6.1]

Deletion in text.lua at line 11 [6.1]

Resurrecting zombie bytes in text.lua at line 11 [6.1]

Solving an order conflict in text.lua at line 11 [6.1]

Insertion in text.lua at line 12 [6.1]

Deletion in text.lua at line 31 [6.1]

Replacement in text.lua at line 397 [6.1]

Deletion in text.lua at line 406 [6.1]

Resurrecting zombie bytes in text.lua at line 406 [6.1]

Insertion in text.lua at line 408 [6.1]

Replacement in text.lua at line 432 [6.1]

Deletion in text.lua at line 967 [6.1]

Resurrecting zombie bytes in edit.lua at line 122 [21.413]

Replacement in edit.lua at line 128 [21.413]

Replacement in app.lua at line 255 [23.2]

Deletion in app.lua at line 259 [23.2]

Solving an order conflict in app.lua at line 259 [23.2]

Replacement in 0035-compute_scrollbar at line 6 [12.1890]