akkartik/template-live-editor - Change S7CSVBHZ4AORIP4VIQETFAVXVMNKERVOI5DENNTU73ZO2L667N7QC

resolve conflicts

Created by akkartik on October 29, 2024

S7CSVBHZ4AORIP4VIQETFAVXVMNKERVOI5DENNTU73ZO2L667N7QC

Dependencies

In channels

main

Change contents

File deletion: source_text_tests.lua, source_text_tests.lua

BFD:BFD[4.2] → [5.83676:83721]

BFD:BFD[5.83721] → [5.3498:3498]

B:BD[7.1363] → [8.499:768]

∅:D[9.1002] → [8.768:990]

B:BD[8.768] → [8.768:990]

∅:D[8.990] → [5.83671:83675]

B:BD[8.768] → [9.505:1002]

end
function test_search_downwards_from_end_of_line()
  App.screen.init{width=120, height=60}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc', 'def', 'ghi'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=4}
  Editor_state.screen_top1 = {line=1, pos=1}
  edit.draw(Editor_state)
  -- search for empty string
  edit.run_after_keychord(Editor_state, 'C-f', 'f')
  edit.run_after_keychord(Editor_state, 'down', 'down')
  -- no crash
end
  Editor_state.screen_top1 = {line=1, pos=1}
  edit.draw(Editor_state)
  -- search for empty string
  edit.run_after_keychord(Editor_state, 'C-f', 'f')
  edit.run_after_keychord(Editor_state, 'down', 'down')
  -- no crash
end
function test_search_downwards_from_final_pos_of_line()
  App.screen.init{width=120, height=60}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc', 'def', 'ghi'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=3}

File deletion: source_edit.lua, source_edit.lua

BFD:BFD[4.2] → [5.165725:165764]

BFD:BFD[5.165764] → [5.152440:152440]

B:BD[10.108] → [8.996:1184]

B:BD[11.79] → [8.1185:1489]

B:BD[11.158] → [8.1490:1818]

B:BD[5.158844] → [8.1819:1973]

B:BD[5.158906] → [9.1008:1164]

B:BD[5.159117] → [3.0:34]

∅:D[3.34] → [5.159151:159254]

∅:D[9.1248] → [5.159151:159254]

∅:D[9.1164] → [5.159087:159117]

∅:D[8.1973] → [5.158874:158906]

∅:D[8.1818] → [10.321:327]

∅:D[8.1489] → [11.138:158]

∅:D[8.1184] → [11.59:79]

  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
  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
  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)
      State.cursor = deepcopy(State.search_backup.cursor)
      State.screen_top = deepcopy(State.search_backup.screen_top)
      Text.search_next(State)
      if #State.search_term > 0 then
        edit.put_cursor_on_next_text_loc_wrapping_around_if_necessary(State)
        Text.search_next(State)
      end
      Text.search_previous(State)
    end
    return
  elseif chord == 'C-f' then
    State.search_term = ''
    State.search_backup = {
    elseif chord == 'up' then
    elseif chord == 'down' then
  end
      break
    end
      break
    end

Insertion in source_text_tests.lua at line 2075 [13.3561]

[12.791]

[13.83734]

end
function test_search_downwards_from_end_of_line()
  App.screen.init{width=120, height=60}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc', 'def', 'ghi'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=4}
  Editor_state.screen_top1 = {line=1, pos=1}
  edit.draw(Editor_state)
  -- search for empty string
  edit.run_after_keychord(Editor_state, 'C-f', 'f')
  edit.run_after_keychord(Editor_state, 'down', 'down')
  -- no crash
end
function test_search_downwards_from_final_pos_of_line()
  App.screen.init{width=120, height=60}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc', 'def', 'ghi'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=3}
  Editor_state.screen_top1 = {line=1, pos=1}
  edit.draw(Editor_state)
  -- search for empty string
  edit.run_after_keychord(Editor_state, 'C-f', 'f')
  edit.run_after_keychord(Editor_state, 'down', 'down')
  -- no crash

Replacement in source_edit.lua at line 145 [13.152503]

B:BD[14.438] → [14.438:454]

B:BD[14.454] → [15.516:563]

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

[14.438]

[15.563]

  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 source_edit.lua at line 153 [13.152503]

B:BD[15.583] → [15.583:642]

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

[15.583]

[15.642]

  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 source_edit.lua at line 166 [13.152503]

B:BD[15.662] → [15.662:734]

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

[15.662]

[16.18427]

  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 source_edit.lua at line 431 [13.152503]

B:BD[13.158937] → [13.158937:158969]

B:BD[13.158969] → [17.9367:9413]

    elseif chord == 'down' then
      State.cursor1.pos = State.cursor1.pos+1

[13.158907]

[13.159120]

      State.cursor = deepcopy(State.search_backup.cursor)
      State.screen_top = deepcopy(State.search_backup.screen_top)

Insertion in source_edit.lua at line 434 [13.152503]

[13.159150]

    elseif chord == 'down' then
      if #State.search_term > 0 then
        edit.put_cursor_on_next_text_loc_wrapping_around_if_necessary(State)
        Text.search_next(State)
      end

Insertion in edit.lua at line 98 [20.413]

[18.754]

[19.29]

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
      break
    end
  end
end
function edit.put_cursor_on_next_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

Replacement in edit.lua at line 308 [20.413]

B:BD[19.6797] → [19.6797:6873]

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

[19.6797]

[19.6873]

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

Deletion in edit.lua at line 469 [20.413]

B:BD[19.12430] → [2.429:429]

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

BD:BD[11.394] → [8.2561:2889]

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

BD:BD[11.315] → [8.2256:2560]

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

BD:BD[10.441] → [8.2067:2255]

B:BD[20.11621] → [3.35:191]

BD:BD[20.11621] → [3.35:191]

B:BD[20.11710] → [21.198:232]

BD:BD[20.11710] → [21.198:232]

  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
      Text.search_previous(State)

Solving an order conflict in edit.lua at line 469 [20.413]
[19.12430]