akkartik/techmeet-capture.love - Change 3R6VAVPXLFJ3HBEIK2BCRCVYK7LWNBOFRTN4BQK2N2VADA34JTIQC

resolve conflicts

Created by akkartik on October 29, 2024

3R6VAVPXLFJ3HBEIK2BCRCVYK7LWNBOFRTN4BQK2N2VADA34JTIQC

Dependencies

In channels

main

Change contents

Replacement in edit.lua at line 145 [5.413]

B:BD[4.205] → [4.205:221]

B:BD[4.221] → [6.66:113]

  while true do
    if State.cursor1.line >= #State.lines then

[4.205]

[6.113]

  local line = State.cursor1.line
  while line < #State.lines do
    line = line+1
    if State.lines[line].mode == 'text' then
      State.cursor1.line = line
      State.cursor1.pos = 1

Replacement in edit.lua at line 153 [5.413]

B:BD[6.133] → [6.133:192]

    if State.lines[State.cursor1.line].mode == 'text' then

[6.133]

[6.192]

  end
end
function edit.put_cursor_on_next_text_line_wrapping_around_if_necessary(State)
  local line = State.cursor1.line
  local max = #State.lines
  for _ = 1, max-1 do
    line = (line+1) % max
    if State.lines[line].mode == 'text' then
      State.cursor1.line = line
      State.cursor1.pos = 1

Replacement in edit.lua at line 166 [5.413]

B:BD[6.212] → [6.212:284]

    State.cursor1.line = State.cursor1.line+1
    State.cursor1.pos = 1

[6.212]

[4.349]

  end
end
function edit.put_cursor_on_next_text_loc_wrapping_around_if_necessary(State)
  local cursor_line = State.lines[State.cursor1.line].data
  if State.cursor1.pos <= utf8.len(cursor_line) then
    State.cursor1.pos = State.cursor1.pos + 1
  else
    edit.put_cursor_on_next_text_line_wrapping_around_if_necessary(State)

Replacement in edit.lua at line 431 [5.413]

B:BD[4.10170] → [4.10170:10246]

      State.cursor1.pos = State.cursor1.pos+1
      Text.search_next(State)

[4.10170]

[4.10246]

      if #State.search_term > 0 then
        edit.put_cursor_on_next_text_loc_wrapping_around_if_necessary(State)
        Text.search_next(State)
      end

Replacement in edit.lua at line 436 [5.413]

B:BD[4.10276] → [4.10276:10310]

      Text.search_previous(State)

[4.10276]

[4.10310]

      if #State.search_term > 0 then
        Text.search_previous(State)
      end

Deletion in edit.lua at line 635 [5.413]

B:BD[4.17561] → [2.194:194]

B:BD[7.394] → [8.2561:2889]

BD:BD[7.394] → [8.2561:2889]

B:BD[7.315] → [8.2256:2560]

BD:BD[7.315] → [8.2256:2560]

B:BD[9.441] → [8.2067:2255]

BD:BD[9.441] → [8.2067:2255]

B:BD[5.11621] → [3.1334:1490]

BD:BD[5.11621] → [3.1334:1490]

B:BD[5.11710] → [3.1491:1574]

BD:BD[5.11710] → [3.1491:1574]

  end
end
function edit.put_cursor_on_next_text_loc_wrapping_around_if_necessary(State)
  local cursor_line = State.lines[State.cursor1.line].data
  if State.cursor1.pos <= utf8.len(cursor_line) then
    State.cursor1.pos = State.cursor1.pos + 1
  else
    edit.put_cursor_on_next_text_line_wrapping_around_if_necessary(State)
  end
end
function edit.put_cursor_on_next_text_line_wrapping_around_if_necessary(State)
  local line = State.cursor1.line
  local max = #State.lines
  for _ = 1, max-1 do
    line = (line+1) % max
    if State.lines[line].mode == 'text' then
      State.cursor1.line = line
      State.cursor1.pos = 1
  local line = State.cursor1.line
  while line < #State.lines do
    line = line+1
    if State.lines[line].mode == 'text' then
      State.cursor1.line = line
      State.cursor1.pos = 1
      if #State.search_term > 0 then
        edit.put_cursor_on_next_text_loc_wrapping_around_if_necessary(State)
        Text.search_next(State)
      end
      if #State.search_term > 0 then
        Text.search_previous(State)
      end

Solving an order conflict in edit.lua at line 635 [5.413]
[4.17561]