akkartik/techmeet.love - Change VC3YS42DKQ5PVDV3YJEBWIMOUN6DVZK3C2WOJMCM5SDIH4WNJMDQC

resolve conflicts

Created by akkartik on June 11, 2024

VC3YS42DKQ5PVDV3YJEBWIMOUN6DVZK3C2WOJMCM5SDIH4WNJMDQC

Dependencies

In channels

main

Change contents

Deletion in text.lua at line 20 [10.1]
B:BD[7.138] → [8.320:363]
BD:BD[7.138] → [8.320:363]
```
      final_screen_line_starting_pos = pos
```

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

B:B[8.363] → [12.3:191]

BD:B[8.363] → [12.3:191]

      local screen_line = Text.screen_line(line, line_cache, i)
--?       print('text.draw:', screen_line, 'at', line_index,pos, 'after', x,y)
      local frag_len = utf8.len(screen_line)

Resurrecting zombie bytes in text.lua at line 203 [10.1]
B:B[13.1073] → [14.3:32]
BD:B[13.1073] → [14.3:32]
```
--?   print('textinput '..t)
```
Solving an order conflict in text.lua at line 204 [10.1]
[14.32]
[11.43]

Deletion in text.lua at line 424 [10.1]

B:BD[15.434] → [4.4:101]

--?   print_and_log(('Text.pageup %d,%d'):format(State.screen_top1.line, State.screen_top1.pos))

Deletion in text.lua at line 469 [10.1]

B:BD[16.858] → [4.102:200]

BD:BD[16.858] → [4.102:200]

B:BD[15.621] → [4.201:299]

BD:BD[15.621] → [4.201:299]

--? 	print_and_log(('Text.pageup B %d,%d'):format(State.screen_top1.line, State.screen_top1.pos))
--? 	print_and_log(('Text.pageup C %d,%d'):format(State.screen_top1.line, State.screen_top1.pos))

Deletion in text.lua at line 544 [10.1]

B:BD[17.1152] → [5.6:165]

--?   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 545 [10.1]
∅:∅[5.165] → [17.1153:1202]
∅:∅[11.2113] → [17.1153:1202]
B:B[18.6132] → [17.1153:1202]
BD:B[18.6132] → [17.1153:1202]
```
  assert(State.cursor1.pos, 'cursor has no pos')
```

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

B:B[19.1321] → [20.221:288]

BD:B[19.1321] → [20.221:288]

B:B[18.6537] → [20.289:421]

BD:B[18.6537] → [20.289:421]

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

Insertion in text.lua at line 562 [10.1]

[20.288]

[20.289]

    local screen_bottom1 = Text.screen_bottom1(State)
    if State.cursor1.line > screen_bottom1.line then

Deletion in text.lua at line 566 [10.1]

B:BD[19.1321] → [11.2114:2370]

BD:BD[19.1321] → [11.2114:2370]

    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

Solving an order conflict in text.lua at line 566 [10.1]
[20.421]
[15.1451]

Replacement in text.lua at line 571 [10.1]

B:BD[22.3744] → [23.5:75]

    local scroll_down = Text.le1(State.screen_bottom1, State.cursor1)

[22.3744]

[20.507]

    local screen_bottom1 = Text.screen_bottom1(State)
    local scroll_down = Text.le1(screen_bottom1, State.cursor1)

Replacement in text.lua at line 588 [10.1]

B:BD[22.4810] → [24.31:188]

B:BD[22.4810] → [11.2490:2594]

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

[22.4810]

[25.6091]

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

Replacement in text.lua at line 798 [10.1]

B:BD[26.580] → [27.3:162]

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

[26.580]

[20.1221]

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

Deletion in text.lua at line 837 [10.1]
B:BD[20.1851] → [28.265:265]
BD:BD[20.1851] → [28.265:265]
∅:D[28.265] → [29.1263:1425]
B:BD[16.3781] → [29.1263:1425]
BD:BD[16.3781] → [29.1263:1425]
```
--?   print('snap =>', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)
```
Resurrecting zombie bytes in text.lua at line 837 [10.1]
B:B[16.3781] → [11.2959:3068]
BD:B[16.3781] → [11.2959:3068]
```
--?   print('snap =>', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)
```
Solving an order conflict in text.lua at line 837 [10.1]
[20.1851]
[11.2959]

Deletion in text.lua at line 844 [10.1]

B:BD[30.1027] → [2.3:101]

BD:BD[30.1027] → [2.3:101]

  if line_cache == nil or line_cache.starty == nil then return false end  -- outside current page

Deletion in text.lua at line 1199 [10.1]

B:BD[31.974] → [27.164:164]

B:BD[26.580] → [11.2852:2958]

BD:BD[26.580] → [11.2852:2958]

B:BD[22.3744] → [11.2371:2489]

BD:BD[22.3744] → [11.2371:2489]

--?   print('snap', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)
    local screen_bottom1 = Text.screen_bottom1(State)
    local scroll_down = Text.le1(screen_bottom1, State.cursor1)

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

Insertion in source_text.lua at line 442 [32.83723]

[6.2593]

    if State.lines[loc2.line].mode == 'drawing' then
      y = y + Drawing_padding_top
    end

Replacement in source_text.lua at line 449 [32.83723]

B:BD[6.2781] → [6.2781:2874]

      y = y + Drawing_padding_height + Drawing.pixels(State.lines[loc2.line].h, State.width)

[6.2781]

[6.2874]

      y = y + Drawing.pixels(State.lines[loc2.line].h, State.width) + Drawing_padding_bottom

Deletion in source_text.lua at line 1108 [32.83723]
∅:D[11.7723] → [32.145702:145727]
B:BD[32.145702] → [32.145702:145727]
```
--?     print('too low')
```

Replacement in source_text.lua at line 1109 [32.83723]

B:BD[32.145772] → [32.145772:145797]

B:BD[32.145797] → [33.5855:5879]

B:BD[33.5879] → [11.7724:7859]

∅:D[11.7859] → [33.6026:6034]

B:BD[33.6026] → [33.6026:6034]

--?       print('tweak')
      State.cursor1 = {
          line=screen_bottom1.line,
          pos=Text.to_pos_on_line(State, screen_bottom1.line, State.right-5, App.screen.height-5),
      }

[32.145772]

[32.145985]

      State.cursor1 = Text.final_text_loc_on_screen(State)

Replacement in source_select.lua at line 72 [35.23288]
B:BD[34.4297] → [34.4297:4359]
```
  if y < State.line_cache[State.screen_top1.line].starty then
```
[34.4297]
[34.4359]
```
  if y < State.top then
```

Deletion in search.lua at line 72 [36.48846]

B:BD[36.50515] → [3.16:157]

  if Text.lt1(State.cursor1, State.screen_top1) or 
      (State.screen_bottom1.line and Text.lt1(State.screen_bottom1, State.cursor1)) then

Replacement in search.lua at line 73 [36.48846]

B:BD[11.8319] → [11.8319:8415]

  if Text.lt1(State.cursor1, State.screen_top1) or Text.lt1(screen_bottom1, State.cursor1) then

[11.8319]

[37.832]

  if Text.lt1(State.cursor1, State.screen_top1) or
      (screen_bottom1.line and Text.lt1(screen_bottom1, State.cursor1)) then

Deletion in search.lua at line 129 [36.48846]

B:BD[36.51555] → [3.158:298]

  if Text.lt1(State.cursor1, State.screen_top1) or
      (State.screen_bottom1.line and Text.lt1(State.screen_bottom1, State.cursor1)) then

Replacement in search.lua at line 130 [36.48846]

B:BD[11.8468] → [11.8468:8564]

  if Text.lt1(State.cursor1, State.screen_top1) or Text.lt1(screen_bottom1, State.cursor1) then

[11.8468]

[37.1877]

  if Text.lt1(State.cursor1, State.screen_top1) or
      (screen_bottom1.line and Text.lt1(screen_bottom1, State.cursor1)) then

Deletion in run.lua at line 368 [32.178044]

B:BD[38.13390] → [39.17:57]

∅:D[40.62] → [39.57:269]

B:BD[39.57] → [39.57:269]

          if not App.mouse_down(1) then
            for _,line_cache in ipairs(pane.line_cache) do line_cache.starty = nil end  -- just in case we scrolled at some point without sending information to any of the panes currently on screen
          end

Deletion in edit.lua at line 185 [42.413]
B:BD[21.2388] → [41.35:35]
BD:BD[21.2388] → [41.35:35]
∅:D[41.35] → [43.1997:2034]
B:BD[44.3095] → [43.1997:2034]
BD:BD[44.3095] → [43.1997:2034]
```
    screen_bottom1.line = line_index
```

Deletion in edit.lua at line 218 [42.413]

B:BD[45.2054] → [3.617:733]

∅:D[3.733] → [41.36:76]

∅:D[46.1556] → [41.36:76]

B:BD[45.2054] → [41.36:76]

∅:D[41.76] → [28.945:1075]

B:BD[45.2054] → [28.945:1075]

--?   print_and_log(('edit.draw screen bottom %s %s,%s'):format(State.id, screen_bottom1.line, screen_bottom1.pos))
  State.screen_bottom1 = screen_bottom1
--?   print('screen bottom: '..tostring(State.screen_bottom1.pos)..' in '..tostring(State.lines[State.screen_bottom1.line].data))

Deletion in edit.lua at line 276 [42.413]

B:BD[42.7091] → [47.30:84]

B:BD[47.84] → [48.1191:1399]

      local line_cache = State.line_cache[line_index]
--?       if line_cache and line_cache.starty then
--?         log(2, os.date('%Y/%m/%d/%H-%M-%S')..' edit.mouse_pressed c: line index '..tostring(line_index)..' starts at '..line_cache.starty)
--?       end

Deletion in edit.lua at line 299 [42.413]

B:BD[49.111] → [50.501:601]

BD:BD[49.111] → [50.501:601]

      if State.editable and Drawing.in_drawing(line, line_cache, x, y, State.left,State.right) then

Deletion in edit.lua at line 380 [42.413]
∅:D[51.182] → [52.2080:2163]
B:BD[52.2080] → [52.2080:2163]
D:D[51.182] → [52.2080:2163]
BD:BD[52.2080] → [52.2080:2163]
```
    State.cursor1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos}
```
Resurrecting zombie bytes in edit.lua at line 382 [42.413]
∅:∅[53.212] → [52.2163:2225]
B:B[52.2163] → [52.2163:2225]
BD:B[52.2163] → [52.2163:2225]
```
    for i=1,math.floor(-dy) do
      Text.down(State)
    end
```

Deletion in drawing.lua at line 10 [55.98]

B:BD[54.1580] → [50.604:743]

  if State.editable and pmx < State.right and pmy > line_cache.starty and pmy < line_cache.starty+Drawing.pixels(line.h, State.width) then

Replacement in drawing.lua at line 11 [55.98]

B:BD[6.5126] → [6.5126:5224]

  if pmx < State.right and pmy > starty and pmy < starty+Drawing.pixels(line.h, State.width) then

[6.5126]

[56.1026]

  if State.editable and pmx < State.right and pmy > starty and pmy < starty+Drawing.pixels(line.h, State.width) then

Deletion in drawing.lua at line 254 [55.98]
B:BD[49.2924] → [40.267:302]
BD:BD[49.2924] → [40.267:302]
```
  if line_cache.starty == nil then
```

Resurrecting zombie bytes in drawing.lua at line 254 [55.98]

B:B[40.302] → [40.302:443]

BD:B[40.302] → [40.302:443]

    -- some event cleared starty just this frame
    -- draw in this frame will soon set starty
    -- just skip this frame
    return
  end

Insertion in drawing.lua at line 254 [55.98]

[57.179]

[40.302]

  local starty = Text.starty(State, State.lines.current_drawing_index)
  if starty == nil then

Deletion in drawing.lua at line 262 [55.98]

B:BD[57.179] → [6.6354:6449]

BD:BD[57.179] → [6.6354:6449]

B:BD[59.207] → [17.7775:7852]

BD:BD[59.207] → [17.7775:7852]

  local starty = Text.starty(State, State.lines.current_drawing_index)
  if starty == nil then
  assert(drawing.mode == 'drawing', 'Drawing.update: line is not a drawing')

Solving an order conflict in drawing.lua at line 262 [55.98]
[5.2102]
[60.17]
Replacement in app.lua at line 135 [61.2]
B:BD[11.8755] → [6.9246:9278]
```
--?   test_click_moves_cursor()
```
[11.8755]
[62.842]
```
--?   test_click_below_all_lines()
```

resolve conflicts

Dependencies

In channels

Change contents

Deletion in text.lua at line 20 [10.1]

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

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

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

Deletion in text.lua at line 424 [10.1]

Deletion in text.lua at line 469 [10.1]

Deletion in text.lua at line 544 [10.1]

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

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

Insertion in text.lua at line 562 [10.1]

Deletion in text.lua at line 566 [10.1]

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

Replacement in text.lua at line 571 [10.1]

Replacement in text.lua at line 588 [10.1]

Replacement in text.lua at line 798 [10.1]

Deletion in text.lua at line 837 [10.1]

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

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

Deletion in text.lua at line 844 [10.1]

Deletion in text.lua at line 1199 [10.1]

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

Insertion in source_text.lua at line 442 [32.83723]

Replacement in source_text.lua at line 449 [32.83723]

Deletion in source_text.lua at line 1108 [32.83723]

Replacement in source_text.lua at line 1109 [32.83723]

Replacement in source_select.lua at line 72 [35.23288]

Deletion in search.lua at line 72 [36.48846]

Replacement in search.lua at line 73 [36.48846]

Deletion in search.lua at line 129 [36.48846]

Replacement in search.lua at line 130 [36.48846]

Deletion in run.lua at line 368 [32.178044]

Deletion in edit.lua at line 185 [42.413]

Deletion in edit.lua at line 218 [42.413]

Deletion in edit.lua at line 276 [42.413]

Deletion in edit.lua at line 299 [42.413]

Deletion in edit.lua at line 380 [42.413]

Resurrecting zombie bytes in edit.lua at line 382 [42.413]

Deletion in drawing.lua at line 10 [55.98]

Replacement in drawing.lua at line 11 [55.98]

Deletion in drawing.lua at line 254 [55.98]

Resurrecting zombie bytes in drawing.lua at line 254 [55.98]

Insertion in drawing.lua at line 254 [55.98]

Deletion in drawing.lua at line 262 [55.98]

Solving an order conflict in drawing.lua at line 262 [55.98]

Replacement in app.lua at line 135 [61.2]