akkartik/view.love - Change NZFPRI5PD5IHUB7TIJWDEL53QGS7POWJES7JPMET6KFCP3RWBFRQC

resolve conflicts

Created by akkartik on June 11, 2024

NZFPRI5PD5IHUB7TIJWDEL53QGS7POWJES7JPMET6KFCP3RWBFRQC

Dependencies

In channels

main

Change contents

Insertion in text_tests.lua at line 558 [7.2]
[6.48]
[6.93]
Deletion in text_tests.lua at line 565 [7.2]
B:BD[6.351] → [6.351:386]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in text_tests.lua at line 566 [7.2]

B:BD[6.417] → [6.417:512]

  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache

[6.417]

[6.512]

  edit.draw(Editor_state)  -- populate line_cache.startpos for each line

Deletion in text.lua at line 138 [9.1]
B:BD[8.385] → [4.4:4]
B:BD[10.1073] → [11.43:141]
BD:BD[10.1073] → [11.43:141]
```
--?   print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)
```
Solving an order conflict in text.lua at line 138 [9.1]
[8.385]
[13.1137]

Deletion in text.lua at line 140 [9.1]

B:BD[10.1369] → [11.142:242]

BD:BD[10.1369] → [11.142:242]

B:BD[14.15513] → [11.243:351]

BD:BD[14.15513] → [11.243:351]

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

Replacement in text.lua at line 325 [9.1]

B:BD[15.1280] → [5.97:199]

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

[15.1280]

[16.1153]

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

Replacement in text.lua at line 329 [9.1]

B:BD[17.2960] → [5.200:253]

    print('cursor at final screen line of its line')

[17.2960]

[18.5428]

--?     print('cursor at final screen line of its line')

Replacement in text.lua at line 334 [9.1]
B:BD[19.263] → [5.254:285]
```
      print(State.cursor1.pos)
```
[19.263]
[19.265]
```
--?       print(State.cursor1.pos)
```

Replacement in text.lua at line 337 [9.1]

B:BD[11.2168] → [5.286:431]

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

[11.2168]

[11.2317]

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

Replacement in text.lua at line 339 [9.1]

B:BD[11.2370] → [5.432:556]

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

[11.2370]

[15.1451]

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

Replacement in text.lua at line 342 [9.1]

B:BD[15.1501] → [5.557:637]

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

[15.1501]

[17.3680]

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

Replacement in text.lua at line 348 [9.1]

B:BD[11.2489] → [5.638:698]

    print('cursor is NOT at final screen line of its line')

[11.2489]

[20.113]

--?     print('cursor is NOT at final screen line of its line')

Replacement in text.lua at line 352 [9.1]

B:BD[21.252] → [5.699:841]

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

[21.252]

[22.4545]

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

Replacement in text.lua at line 356 [9.1]

B:BD[23.901] → [5.842:912]

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

[23.901]

[24.130]

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

Replacement in text.lua at line 358 [9.1]

B:BD[24.154] → [5.913:956]

      print('scroll up preserving cursor')

[24.154]

[15.1721]

--?       print('scroll up preserving cursor')

Replacement in text.lua at line 360 [9.1]

B:BD[15.1771] → [5.957:1037]

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

[15.1771]

[17.4796]

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

Replacement in text.lua at line 363 [9.1]

B:BD[17.4810] → [5.1038:1138]

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

[17.4810]

[25.6091]

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

Replacement in select.lua at line 80 [7.43980]

B:BD[26.1166] → [3.13:109]

  return State.screen_bottom1.line, Text.pos_at_end_of_screen_line(State, State.screen_bottom1)

[26.1166]

[7.47844]

  local screen_bottom1 = Text.screen_bottom1(State)
  return screen_bottom1.line, Text.pos_at_end_of_screen_line(State, screen_bottom1)

Deletion in select.lua at line 110 [7.43980]

B:BD[7.46495] → [11.8130:8266]

BD:BD[7.46495] → [11.8130:8266]

  local screen_bottom1 = Text.screen_bottom1(State)
  return screen_bottom1.line, Text.pos_at_end_of_screen_line(State, screen_bottom1)

Solving an order conflict in select.lua at line 110 [7.43980]
[7.48809]