akkartik/pong.love - Change XNDCSWPCWESQ3ZXCRWTLYEYOKFY5IVFYD24RJ2KEELVCWEVPVUQAC

resolve conflicts

Created by akkartik on October 29, 2024

XNDCSWPCWESQ3ZXCRWTLYEYOKFY5IVFYD24RJ2KEELVCWEVPVUQAC

Dependencies

In channels

main

Change contents

Deletion in text_tests.lua at line 1952 [5.2]
B:BD[4.41617] → [4.41617:41621]
B:BD[4.41621] → [6.373:373]
```
end
```

Resurrecting zombie bytes in text_tests.lua at line 1952 [5.2]

B:B[7.680] → [8.2:271]

BD:B[7.680] → [8.2:271]

B:B[8.271] → [11.2:499]

BD:B[8.271] → [11.2:499]

∅:∅[11.499] → [8.271:493]

B:B[8.271] → [8.271:493]

BD:B[8.271] → [8.271:493]

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

Solving an order conflict in text_tests.lua at line 1952 [5.2]
[4.41617]
[8.2]
Insertion in text_tests.lua at line 1980 [5.2]
[8.493]
```
end
```
Deletion in source_text_tests.lua at line 2075 [13.3561]
B:BD[12.791] → [10.1299:1303]
B:BD[10.1303] → [6.5497:5497]
```
end
```

Resurrecting zombie bytes in source_text_tests.lua at line 2075 [13.3561]

B:B[12.791] → [3.7:995]

BD:B[12.791] → [3.7:995]

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

Insertion in source_text_tests.lua at line 2103 [13.3561]
[3.995]
```
end
```
Resurrecting zombie bytes in source_edit.lua at line 175 [13.152503]
∅:∅[15.656] → [16.18427:18438]
∅:∅[18.734] → [16.18427:18438]
∅:∅[3.1823] → [16.18427:18438]
B:B[15.656] → [16.18427:18438]
B:B[16.18427] → [16.18427:18438]
BD:B[18.734] → [16.18427:18438]
```
  end
end
```

Deletion in source_edit.lua at line 298 [13.152503]

B:BD[13.158907] → [3.1824:1948]

BD:BD[13.158907] → [3.1824:1948]

B:BD[13.159150] → [3.1949:2137]

BD:BD[13.159150] → [3.1949:2137]

      State.cursor = deepcopy(State.search_backup.cursor)
      State.screen_top = deepcopy(State.search_backup.screen_top)
    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

Replacement in source_edit.lua at line 431 [13.152503]

B:BD[19.12739] → [19.12739:12817]

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

[19.12709]

[19.12817]

      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]

[19.12847]

    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

Deletion in edit.lua at line 100 [21.413]
B:BD[20.754] → [3.2155:2160]
BD:BD[20.754] → [3.2155:2160]
BD:BD[20.754] → [3.2155:2160]
```
end
```

Resurrecting zombie bytes in edit.lua at line 100 [21.413]

B:B[3.2160] → [3.2160:2802]

BD:B[3.2160] → [3.2160:2802]

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

Solving an order conflict in edit.lua at line 100 [21.413]
[24.142371]
[3.2160]
Insertion in edit.lua at line 120 [21.413]
[3.2802]
[25.58]
```
end
```
Deletion in edit.lua at line 308 [21.413]
B:BD[25.6797] → [25.6797:6873]
BD:BD[25.6797] → [25.6797:6873]
```
      State.cursor1.pos = State.cursor1.pos+1
      Text.search_next(State)
```

Resurrecting zombie bytes in edit.lua at line 312 [21.413]

∅:∅[3.2954] → [25.6873:7604]

B:B[25.6873] → [25.6873:7604]

BD:B[25.6873] → [25.6873:7604]

B:B[25.7711] → [25.7711:7991]

BD:B[25.7711] → [25.7711:7991]

    elseif chord == 'up' then
      Text.search_previous(State)
    end
    return
  elseif chord == 'C-f' then
    State.search_term = ''
    State.search_backup = {
      cursor={line=State.cursor1.line, pos=State.cursor1.pos},
      screen_top={line=State.screen_top1.line, pos=State.screen_top1.pos},
    }
  -- zoom
  elseif chord == 'C-=' then
    edit.update_font_settings(State, State.font_height+2)
    Text.redraw_all(State)
  elseif chord == 'C--' then
    if State.font_height > 2 then
      edit.update_font_settings(State, State.font_height-2)
      Text.redraw_all(State)
    end
  elseif chord == 'C-0' then
    edit.update_font_settings(State, 20)
    Text.redraw_all(State)
  -- undo
  elseif chord == 'C-z' then
    local event = undo_event(State)
    if event then
      local src = event.before
      State.screen_top1 = deepcopy(src.screen_top)
      State.cursor1 = deepcopy(src.cursor)
      State.selection1 = deepcopy(src.selection)
      patch(State.lines, event.after, event.before)

Resurrecting zombie bytes in edit.lua at line 344 [21.413]

∅:∅[26.1321] → [25.8163:8227]

B:B[25.8163] → [25.8163:8227]

BD:B[25.8163] → [25.8163:8227]

B:B[25.8334] → [25.8334:8613]

BD:B[25.8334] → [25.8334:8613]

      schedule_save(State)
    end
  elseif chord == 'C-y' then
    local event = redo_event(State)
    if event then
      local src = event.after
      State.screen_top1 = deepcopy(src.screen_top)
      State.cursor1 = deepcopy(src.cursor)
      State.selection1 = deepcopy(src.selection)
      patch(State.lines, event.before, event.after)

Resurrecting zombie bytes in edit.lua at line 355 [21.413]

∅:∅[26.1421] → [25.8715:9064]

B:B[25.8715] → [25.8715:9064]

BD:B[25.8715] → [25.8715:9064]

      schedule_save(State)
    end
  -- clipboard
  elseif chord == 'C-a' then
    State.selection1 = {line=1, pos=1}
    State.cursor1 = {line=#State.lines, pos=utf8.len(State.lines[#State.lines].data)+1}
  elseif chord == 'C-c' then
    local s = Text.selection(State)
    if s then
      App.set_clipboard(s)
    end
  elseif chord == 'C-x' then

Resurrecting zombie bytes in edit.lua at line 368 [21.413]

∅:∅[27.427] → [25.9236:9339]

B:B[25.9236] → [25.9236:9339]

BD:B[25.9236] → [25.9236:9339]

B:B[25.9446] → [25.9446:10055]

BD:B[25.9446] → [25.9446:10055]

B:B[25.10080] → [25.10080:10182]

BD:B[25.10080] → [25.10080:10182]

    if s then
      App.set_clipboard(s)
    end
    schedule_save(State)
  elseif chord == 'C-v' then
    -- We don't have a good sense of when to scroll, so we'll be conservative
    -- and sometimes scroll when we didn't quite need to.
    local before_line = State.cursor1.line
    local before = snapshot(State, before_line)
    local clipboard_data = App.get_clipboard()
    for _,code in utf8.codes(clipboard_data) do
      local c = utf8.char(code)
      if c == '\n' then
        Text.insert_return(State)
      else
        Text.insert_at_cursor(State, c)
      end
    end
    if Text.cursor_out_of_screen(State) then
      Text.snap_cursor_to_bottom_of_screen(State, State.left, State.right)
    end
    record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})

Resurrecting zombie bytes in edit.lua at line 391 [21.413]
∅:∅[28.536] → [25.10204:10211]
B:B[25.10204] → [25.10204:10211]
BD:B[25.10204] → [25.10204:10211]
B:B[25.10318] → [25.10318:10420]
BD:B[25.10318] → [25.10318:10420]
```
  else
    Text.keychord_press(State, chord)
  end
end
function edit.key_release(State, key, scancode)
end
```
Resurrecting zombie bytes in edit.lua at line 400 [21.413]
∅:∅[29.90] → [25.10475:10509]
B:B[25.10475] → [25.10475:10509]
BD:B[25.10475] → [25.10475:10509]
```
  State.font_height = font_height
```

Resurrecting zombie bytes in edit.lua at line 402 [21.413]

∅:∅[29.155] → [25.10575:11061]

∅:∅[30.1696] → [25.10575:11061]

B:B[30.1696] → [25.10575:11061]

B:B[25.10575] → [25.10575:11061]

BD:B[25.10575] → [25.10575:11061]

  State.line_height = math.floor(font_height*1.3)
end
--== some methods for tests
-- Insulate tests from some key globals so I don't have to change the vast
-- majority of tests when they're modified for the real app.
Test_margin_left = 25
Test_margin_right = 0
function edit.initialize_test_state()
  -- if you change these values, tests will start failing
  return edit.initialize_state(
      15,  -- top margin
      Test_margin_left,
      App.screen.width - Test_margin_right,

Resurrecting zombie bytes in edit.lua at line 420 [21.413]

∅:∅[30.1738] → [25.11115:11471]

B:B[25.11115] → [25.11115:11471]

BD:B[25.11115] → [25.11115:11471]

      15)  -- line height
end
-- all text_input events are also keypresses
-- TODO: handle chords of multiple keys
function edit.run_after_text_input(State, t)
  edit.keychord_press(State, t)
  edit.text_input(State, t)
  edit.key_release(State, t)
  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end
-- not all keys are text_input

Resurrecting zombie bytes in edit.lua at line 438 [21.413]

∅:∅[31.5245] → [25.11587:11811]

B:B[25.11587] → [25.11587:11811]

BD:B[25.11587] → [25.11587:11811]

  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end
function edit.run_after_mouse_click(State, x,y, mouse_button)
  App.fake_mouse_press(x,y, mouse_button)
  edit.mouse_press(State, x,y, mouse_button)

Resurrecting zombie bytes in edit.lua at line 447 [21.413]

∅:∅[32.9188] → [25.11811:12430]

B:B[25.11811] → [25.11811:12430]

BD:B[25.11811] → [25.11811:12430]

  App.fake_mouse_release(x,y, mouse_button)
  edit.mouse_release(State, x,y, mouse_button)
  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end
function edit.run_after_mouse_press(State, x,y, mouse_button)
  App.fake_mouse_press(x,y, mouse_button)
  edit.mouse_press(State, x,y, mouse_button)
  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end
function edit.run_after_mouse_release(State, x,y, mouse_button)
  App.fake_mouse_release(x,y, mouse_button)
  edit.mouse_release(State, x,y, mouse_button)
  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end

resolve conflicts

Dependencies

In channels

Change contents

Deletion in text_tests.lua at line 1952 [5.2]

Resurrecting zombie bytes in text_tests.lua at line 1952 [5.2]

Solving an order conflict in text_tests.lua at line 1952 [5.2]

Insertion in text_tests.lua at line 1980 [5.2]

Deletion in source_text_tests.lua at line 2075 [13.3561]

Resurrecting zombie bytes in source_text_tests.lua at line 2075 [13.3561]

Insertion in source_text_tests.lua at line 2103 [13.3561]

Resurrecting zombie bytes in source_edit.lua at line 175 [13.152503]

Deletion in source_edit.lua at line 298 [13.152503]

Replacement in source_edit.lua at line 431 [13.152503]

Insertion in source_edit.lua at line 434 [13.152503]

Deletion in edit.lua at line 100 [21.413]

Resurrecting zombie bytes in edit.lua at line 100 [21.413]

Solving an order conflict in edit.lua at line 100 [21.413]

Insertion in edit.lua at line 120 [21.413]

Deletion in edit.lua at line 308 [21.413]