akkartik/capture.love - Change XQV3PNH2QH3YTPPMYWZ5IBIMRCSKKQKGFHUAOGFAGIY4P2FCDCEAC

resolve conflicts

Created by akkartik on June 11, 2024

XQV3PNH2QH3YTPPMYWZ5IBIMRCSKKQKGFHUAOGFAGIY4P2FCDCEAC

Dependencies

In channels

main

Change contents

Insertion in source_text.lua at line 442 [4.83723]

[3.2593]

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

Replacement in source_text.lua at line 449 [4.83723]

B:BD[3.2781] → [3.2781:2874]

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

[3.2781]

[3.2874]

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

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

Replacement in source_text.lua at line 1109 [4.83723]

B:BD[4.145772] → [4.145772:145797]

B:BD[4.145797] → [6.5855:5879]

B:BD[6.5879] → [5.7724:7859]

∅:D[5.7859] → [6.6026:6034]

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

[4.145772]

[4.145985]

      State.cursor1 = Text.final_text_loc_on_screen(State)

Replacement in source_select.lua at line 72 [8.23288]
B:BD[7.4297] → [7.4297:4359]
```
  if y < State.line_cache[State.screen_top1.line].starty then
```
[7.4297]
[7.4359]
```
  if y < State.top then
```
Deletion in edit.lua at line 168 [10.413]
B:BD[9.952] → [9.952:997]
```
  local screen_bottom1 = {line=nil, pos=nil}
```
Deletion in edit.lua at line 173 [10.413]
B:BD[9.1227] → [9.1227:1264]
```
    screen_bottom1.line = line_index
```

Replacement in edit.lua at line 195 [10.413]

B:BD[9.2351] → [9.2351:2423]

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

[9.2351]

[9.2423]

      y = Text.draw(State, line_index, y, startpos)

Deletion in edit.lua at line 205 [10.413]
B:BD[9.2703] → [9.2703:2743]
```
  State.screen_bottom1 = screen_bottom1
```

Replacement in edit.lua at line 278 [10.413]

B:BD[9.5068] → [9.5068:5203]

      local line_cache = State.line_cache[line_index]
      if Drawing.in_drawing(line, line_cache, x, y, State.left,State.right) then

[9.5068]

[9.5203]

      if Drawing.in_drawing(State, line_index, x, y, State.left,State.right) then

Replacement in edit.lua at line 292 [10.413]

B:BD[9.5631] → [9.5631:5767]

  State.selection1 = {
      line=State.screen_bottom1.line,
      pos=Text.pos_at_end_of_screen_line(State, State.screen_bottom1),
  }

[9.5631]

[9.5767]

  State.selection1 = Text.final_text_loc_on_screen(State)

Replacement in edit.lua at line 330 [10.413]

B:BD[11.373] → [11.373:504]

    State.cursor1.line, State.cursor1.pos = State.screen_bottom1.line, Text.pos_at_end_of_screen_line(State, State.screen_bottom1)

[11.373]

[11.504]

    State.cursor1 = Text.final_text_loc_on_screen(State)

Replacement in edit.lua at line 358 [10.413]

B:BD[9.7749] → [9.7749:7832]

    State.cursor1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos}

[9.7749]

[9.7832]

    State.cursor1 = Text.screen_bottom1(State)

Deletion in edit.lua at line 396 [10.413]

B:BD[9.9421] → [9.9421:9528]

    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll

Deletion in edit.lua at line 500 [10.413]
B:BD[9.13824] → [9.13824:13866]
```
    -- DON'T reset line_cache.starty here
```

Deletion in edit.lua at line 536 [10.413]

B:BD[9.15351] → [9.15351:15458]

    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll

Insertion in edit.lua at line 590 [10.413]
[9.16942]
[9.16942]
```
  edit.draw(State)
```
Deletion in edit.lua at line 613 [10.413]
B:BD[9.17561] → [2.104:104]
B:BD[12.182] → [5.8618:8665]
BD:BD[12.182] → [5.8618:8665]
B:BD[10.5239] → [5.8565:8617]
BD:BD[10.5239] → [5.8565:8617]
B:BD[10.8089] → [3.4055:4137]
BD:BD[10.8089] → [3.4055:4137]
B:BD[13.834] → [14.1152:1171]
BD:BD[13.834] → [14.1152:1171]
B:BD[15.3196] → [14.1094:1151]
BD:BD[15.3196] → [14.1094:1151]
B:BD[16.2459] → [14.1035:1093]
BD:BD[16.2459] → [14.1035:1093]
```
    State.cursor1 = Text.screen_bottom1(State)
      y = Text.draw(State, line_index, y, startpos)
      if Drawing.in_drawing(State, line_index, x, y, State.left,State.right) then
  edit.draw(State)
    State.cursor1 = Text.final_text_loc_on_screen(State)
  State.selection1 = Text.final_text_loc_on_screen(State)
```
Solving an order conflict in edit.lua at line 613 [10.413]
[9.17561]
Replacement in app.lua at line 134 [17.2]
B:BD[5.8755] → [3.9246:9278]
```
--?   test_click_moves_cursor()
```
[5.8755]
[18.842]
```
--?   test_click_below_all_lines()
```

resolve conflicts

Dependencies

In channels

Change contents

Insertion in source_text.lua at line 442 [4.83723]

Replacement in source_text.lua at line 449 [4.83723]

Deletion in source_text.lua at line 1108 [4.83723]

Replacement in source_text.lua at line 1109 [4.83723]

Replacement in source_select.lua at line 72 [8.23288]

Deletion in edit.lua at line 168 [10.413]

Deletion in edit.lua at line 173 [10.413]

Replacement in edit.lua at line 195 [10.413]

Deletion in edit.lua at line 205 [10.413]

Replacement in edit.lua at line 278 [10.413]

Replacement in edit.lua at line 292 [10.413]

Replacement in edit.lua at line 330 [10.413]

Replacement in edit.lua at line 358 [10.413]

Deletion in edit.lua at line 396 [10.413]

Deletion in edit.lua at line 500 [10.413]

Deletion in edit.lua at line 536 [10.413]

Insertion in edit.lua at line 590 [10.413]

Deletion in edit.lua at line 613 [10.413]

Solving an order conflict in edit.lua at line 613 [10.413]

Replacement in app.lua at line 134 [17.2]