akkartik/lines-polygon-experiment - Change 2YRXYXKERFM4O3VCRTWEUSUIHK45N3UI634VKB6QB4O23DNXMF6AC

resolve conflicts

Created by akkartik on June 11, 2024

2YRXYXKERFM4O3VCRTWEUSUIHK45N3UI634VKB6QB4O23DNXMF6AC

Dependencies

In channels

main

Change contents

Insertion in text.lua at line 964 [6.1]

[5.880]

function Text.eq2(a, b)
  return a.line == b.line and a.screen_line == b.screen_line and a.screen_pos == b.screen_pos
end

Deletion in text.lua at line 975 [6.1]
B:BD[5.1157] → [7.24:24]
∅:D[7.24] → [8.875:880]
B:BD[9.559] → [8.875:880]
B:BD[8.880] → [10.3069:3187]
BD:BD[8.880] → [10.3069:3187]
```
end
function Text.eq2(a, b)
  return a.line == b.line and a.screen_line == b.screen_line and a.screen_pos == b.screen_pos
```
Resurrecting zombie bytes in text.lua at line 975 [6.1]
B:B[10.3187] → [10.3187:3192]
BD:B[10.3187] → [10.3187:3192]
```
end
```

Insertion in source_text.lua at line 442 [11.83723]

[4.2593]

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

Replacement in source_text.lua at line 449 [11.83723]

B:BD[4.2781] → [4.2781:2874]

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

[4.2781]

[4.2874]

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

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

Replacement in source_text.lua at line 1109 [11.83723]

B:BD[11.145772] → [11.145772:145797]

B:BD[11.145797] → [12.5855:5879]

B:BD[12.5879] → [10.7724:7859]

∅:D[10.7859] → [12.6026:6034]

B:BD[12.6026] → [12.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),
      }

[11.145772]

[11.145985]

      State.cursor1 = Text.final_text_loc_on_screen(State)

Replacement in source_select.lua at line 72 [14.23288]
B:BD[13.4297] → [13.4297:4359]
```
  if y < State.line_cache[State.screen_top1.line].starty then
```
[13.4297]
[13.4359]
```
  if y < State.top then
```
Resurrecting zombie bytes in help.lua at line 45 [16.6622]
B:B[15.19842] → [2.815:878]
BD:B[15.19842] → [2.815:878]
```
  y = y + State.line_height
  App.color(Help_background_color)
```

Deletion in help.lua at line 47 [16.6622]

∅:D[2.878] → [17.208:355]

B:BD[18.349] → [17.208:355]

BD:BD[18.349] → [17.208:355]

  love.graphics.rectangle('fill', State.left,line_cache.starty, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-line_cache.starty))

Resurrecting zombie bytes in help.lua at line 47 [16.6622]

B:B[18.349] → [4.3728:3853]

BD:B[18.349] → [4.3728:3853]

  love.graphics.rectangle('fill', State.left,starty, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-starty))

Solving an order conflict in help.lua at line 47 [16.6622]
[2.878]
[4.3728]
Resurrecting zombie bytes in help.lua at line 109 [16.6622]
B:B[20.910] → [2.1382:1417]
BD:B[20.910] → [2.1382:1417]
```
  App.color(Help_background_color)
```

Deletion in help.lua at line 110 [16.6622]

∅:D[2.1417] → [17.549:696]

B:BD[18.410] → [17.549:696]

BD:BD[18.410] → [17.549:696]

  love.graphics.rectangle('fill', State.left,line_cache.starty, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-line_cache.starty))

Resurrecting zombie bytes in help.lua at line 110 [16.6622]

B:B[18.410] → [4.3929:4054]

BD:B[18.410] → [4.3929:4054]

  love.graphics.rectangle('fill', State.left,starty, State.width, math.max(Drawing.pixels(drawing.h, State.width),y-starty))

Solving an order conflict in help.lua at line 110 [16.6622]
[2.1417]
[4.3929]
Deletion in drawing_tests.lua at line 234 [22.15]
B:BD[21.52698] → [21.52698:52796]
BD:BD[21.52698] → [21.52698:52796]
```
  check_eq(Editor_state.line_cache[1].starty, Editor_state.top+Drawing_padding_top, 'baseline/y')
```
Resurrecting zombie bytes in drawing_tests.lua at line 235 [22.15]
∅:∅[4.4795] → [21.52796:52916]
B:B[21.52796] → [21.52796:52916]
BD:B[21.52796] → [21.52796:52916]
```
  check_eq(Editor_state.lines[1].h, 128, 'baseline/y')
  check_eq(#Editor_state.lines[1].shapes, 0, 'baseline/#shapes')
```
Deletion in drawing_tests.lua at line 330 [22.15]
B:BD[21.55046] → [4.4984:5077]
BD:BD[21.55046] → [4.4984:5077]
```
  check_eq(Text.starty(Editor_state, 1), Editor_state.top+Drawing_padding_top, 'baseline/y')
```

Replacement in drawing.lua at line 73 [24.98]

B:BD[18.1279] → [23.19:104]

B:BD[18.1279] → [4.5658:5725]

  Drawing.draw_pending_shape(State, line, line_cache.starty, State.left,State.right)
  Drawing.draw_pending_shape(line, starty, State.left,State.right)

[18.1279]

[25.10]

  Drawing.draw_pending_shape(State, line, starty, State.left,State.right)

Deletion in drawing.lua at line 210 [24.98]
B:BD[19.6240] → [23.106:106]
BD:BD[19.6240] → [23.106:106]
Solving an order conflict in drawing.lua at line 210 [24.98]
[19.6240]
[4.5726]

Replacement in drawing.lua at line 358 [24.98]

B:BD[26.3948] → [23.107:219]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-line_cache.starty, State.width)

[26.3948]

[19.7105]

        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-starty, State.width)

Deletion in drawing.lua at line 433 [24.98]

B:BD[27.936] → [28.4355:4551]

BD:BD[27.936] → [28.4355:4551]

B:BD[27.690] → [4.7570:7809]

BD:BD[27.690] → [4.7570:7809]

    local _,drawing,line_cache = Drawing.current_drawing(State)
    local mx,my = Drawing.coord(App.mouse_x()-State.left, State.width), Drawing.coord(App.mouse_y()-line_cache.starty, State.width)
    local drawing_index,drawing = Drawing.current_drawing(State)
    local starty = Text.starty(State, drawing_index)
    local mx,my = Drawing.coord(App.mouse_x()-State.left, State.width), Drawing.coord(App.mouse_y()-starty, State.width)

Resurrecting zombie bytes in drawing.lua at line 433 [24.98]

B:B[27.936] → [4.7810:8049]

BD:B[27.936] → [4.7810:8049]

    local drawing_index,drawing = Drawing.current_drawing(State)
    local starty = Text.starty(State, drawing_index)
    local mx,my = Drawing.coord(App.mouse_x()-State.left, State.width), Drawing.coord(App.mouse_y()-starty, State.width)

Resurrecting zombie bytes in drawing.lua at line 436 [24.98]
∅:∅[29.2661] → [30.7963:8042]
∅:∅[28.4551] → [30.7963:8042]
∅:∅[4.8049] → [30.7963:8042]
B:B[29.2661] → [30.7963:8042]
B:B[15.39140] → [30.7963:8042]
BD:B[28.4551] → [30.7963:8042]
```
    local j = Drawing.find_or_insert_point(drawing.points, mx,my, State.width)
```
Deletion in drawing.lua at line 734 [24.98]
B:BD[24.1525] → [23.221:221]
B:BD[31.2366] → [4.7262:7365]
BD:BD[31.2366] → [4.7262:7365]
B:BD[31.1231] → [4.7056:7157]
BD:BD[31.1231] → [4.7056:7157]
BD:BD[31.1231] → [4.7056:7157]
```
          local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-starty, State.width)
        local mx,my = Drawing.coord(x-State.left, State.width), Drawing.coord(y-starty, State.width)
```
Solving an order conflict in drawing.lua at line 734 [24.98]
[24.1525]
Replacement in app.lua at line 134 [34.2]
B:BD[10.8755] → [4.9246:9278]
```
--?   test_click_moves_cursor()
```
[10.8755]
[35.842]
```
--?   test_draw_rectangle()
```

resolve conflicts

Dependencies

In channels

Change contents

Insertion in text.lua at line 964 [6.1]

Deletion in text.lua at line 975 [6.1]

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

Insertion in source_text.lua at line 442 [11.83723]

Replacement in source_text.lua at line 449 [11.83723]

Deletion in source_text.lua at line 1108 [11.83723]

Replacement in source_text.lua at line 1109 [11.83723]

Replacement in source_select.lua at line 72 [14.23288]

Resurrecting zombie bytes in help.lua at line 45 [16.6622]

Deletion in help.lua at line 47 [16.6622]

Resurrecting zombie bytes in help.lua at line 47 [16.6622]

Solving an order conflict in help.lua at line 47 [16.6622]

Resurrecting zombie bytes in help.lua at line 109 [16.6622]

Deletion in help.lua at line 110 [16.6622]

Resurrecting zombie bytes in help.lua at line 110 [16.6622]

Solving an order conflict in help.lua at line 110 [16.6622]

Deletion in drawing_tests.lua at line 234 [22.15]

Resurrecting zombie bytes in drawing_tests.lua at line 235 [22.15]

Deletion in drawing_tests.lua at line 330 [22.15]

Replacement in drawing.lua at line 73 [24.98]

Deletion in drawing.lua at line 210 [24.98]

Solving an order conflict in drawing.lua at line 210 [24.98]

Replacement in drawing.lua at line 358 [24.98]

Deletion in drawing.lua at line 433 [24.98]

Resurrecting zombie bytes in drawing.lua at line 433 [24.98]

Resurrecting zombie bytes in drawing.lua at line 436 [24.98]

Deletion in drawing.lua at line 734 [24.98]

Solving an order conflict in drawing.lua at line 734 [24.98]

Replacement in app.lua at line 134 [34.2]