akkartik/pong.love - Change YAU43TBB2N2EZE2REHBY3IZHC42N6PXBAVZHPVML23KCB2SIGG7QC

resolve conflicts

Created by akkartik on June 28, 2024

YAU43TBB2N2EZE2REHBY3IZHC42N6PXBAVZHPVML23KCB2SIGG7QC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 258 [7.1]

B:BD[6.91200] → [6.91200:91274]

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

[6.91200]

[6.91274]

      State.selection1 = deepcopy(State.cursor1)

Replacement in text.lua at line 263 [7.1]

B:BD[6.91377] → [6.91377:91451]

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

[6.91377]

[6.91451]

      State.selection1 = deepcopy(State.cursor1)

Replacement in text.lua at line 275 [7.1]

B:BD[6.91781] → [6.91781:91855]

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

[6.91781]

[6.91855]

      State.selection1 = deepcopy(State.cursor1)

Replacement in text.lua at line 280 [7.1]

B:BD[6.91965] → [6.91965:92039]

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

[6.91965]

[6.92039]

      State.selection1 = deepcopy(State.cursor1)

Replacement in text.lua at line 291 [7.1]

B:BD[6.92316] → [6.92316:92390]

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

[6.92316]

[6.92390]

      State.selection1 = deepcopy(State.cursor1)

Replacement in text.lua at line 296 [7.1]

B:BD[6.92500] → [6.92500:92574]

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

[6.92500]

[6.92574]

      State.selection1 = deepcopy(State.cursor1)

Replacement in text.lua at line 307 [7.1]

B:BD[6.92831] → [6.92831:92905]

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

[6.92831]

[6.92905]

      State.selection1 = deepcopy(State.cursor1)

Replacement in text.lua at line 312 [7.1]

B:BD[6.93005] → [6.93005:93079]

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

[6.93005]

[6.93079]

      State.selection1 = deepcopy(State.cursor1)

Replacement in text.lua at line 323 [7.1]

B:BD[6.93349] → [6.93349:93423]

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

[6.93349]

[6.93423]

      State.selection1 = deepcopy(State.cursor1)

Replacement in text.lua at line 328 [7.1]

B:BD[6.93531] → [6.93531:93605]

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

[6.93531]

[6.93605]

      State.selection1 = deepcopy(State.cursor1)

Replacement in text.lua at line 345 [7.1]

B:BD[8.785] → [8.785:860]

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

[8.785]

[8.860]

  State.cursor1 = deepcopy(State.screen_top1)

Replacement in text.lua at line 383 [7.1]

∅:D[8.2091] → [6.95650:95725]

B:BD[6.95650] → [6.95650:95725]

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

[8.2091]

[6.95725]

  State.cursor1 = deepcopy(State.screen_top1)

Replacement in text.lua at line 487 [7.1]

B:BD[6.100736] → [6.100736:100818]

    State.screen_top1 = {line=State.cursor1.line, pos=State.cursor1.pos}  -- copy

[6.100736]

[6.100818]

    State.screen_top1 = deepcopy(State.cursor1)

Replacement in text.lua at line 927 [7.1]

B:BD[6.113806] → [6.113806:113883]

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

[6.113806]

[8.4701]

    State.cursor1 = deepcopy(State.screen_top1)

Deletion in text.lua at line 993 [7.1]
B:BD[6.115541] → [8.4819:4819]
B:BD[9.4578] → [10.0:49]
BD:BD[9.4578] → [10.0:49]
B:BD[9.4765] → [10.50:99]
BD:BD[9.4765] → [10.50:99]
B:BD[9.5158] → [10.100:149]
BD:BD[9.5158] → [10.100:149]
B:BD[9.5350] → [10.150:199]
BD:BD[9.5350] → [10.150:199]
B:BD[9.5674] → [10.200:249]
BD:BD[9.5674] → [10.200:249]
B:BD[9.5790] → [10.250:299]
BD:BD[9.5790] → [10.250:299]
B:BD[9.6176] → [10.300:349]
BD:BD[9.6176] → [10.300:349]
B:BD[9.6361] → [10.350:399]
BD:BD[9.6361] → [10.350:399]
B:BD[9.6748] → [10.400:449]
BD:BD[9.6748] → [10.400:449]
B:BD[9.6937] → [10.450:499]
BD:BD[9.6937] → [10.450:499]
B:BD[12.407] → [10.500:546]
BD:BD[12.407] → [10.500:546]
B:BD[12.1239] → [10.547:593]
BD:BD[12.1239] → [10.547:593]
BD:BD[12.1239] → [10.547:593]
B:BD[14.7649] → [10.594:642]
BD:BD[14.7649] → [10.594:642]
```
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
  State.cursor1 = deepcopy(State.screen_top1)
  State.cursor1 = deepcopy(State.screen_top1)
    State.screen_top1 = deepcopy(State.cursor1)
```
Solving an order conflict in text.lua at line 993 [7.1]
[6.115541]
[15.790]
Deletion in text.lua at line 994 [7.1]
B:BD[15.794] → [8.4821:4821]
B:BD[16.5461] → [10.643:691]
BD:BD[16.5461] → [10.643:691]
BD:BD[16.5461] → [10.643:691]
```
    State.cursor1 = deepcopy(State.screen_top1)
```

Replacement in source_text.lua at line 341 [18.83786]

B:BD[17.6521] → [17.6521:6595]

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

[17.6521]

[17.6595]

      State.selection1 = deepcopy(State.cursor1)

Replacement in source_text.lua at line 346 [18.83786]

B:BD[17.6698] → [17.6698:6772]

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

[17.6698]

[17.6772]

      State.selection1 = deepcopy(State.cursor1)

Replacement in source_text.lua at line 358 [18.83786]

B:BD[17.7102] → [17.7102:7176]

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

[17.7102]

[17.7176]

      State.selection1 = deepcopy(State.cursor1)

Replacement in source_text.lua at line 363 [18.83786]

B:BD[17.7286] → [17.7286:7360]

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

[17.7286]

[17.7360]

      State.selection1 = deepcopy(State.cursor1)

Replacement in source_text.lua at line 374 [18.83786]

B:BD[17.7637] → [17.7637:7711]

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

[17.7637]

[17.7711]

      State.selection1 = deepcopy(State.cursor1)

Replacement in source_text.lua at line 379 [18.83786]

B:BD[17.7821] → [17.7821:7895]

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

[17.7821]

[17.7895]

      State.selection1 = deepcopy(State.cursor1)

Replacement in source_text.lua at line 390 [18.83786]

B:BD[17.8152] → [17.8152:8226]

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

[17.8152]

[17.8226]

      State.selection1 = deepcopy(State.cursor1)

Replacement in source_text.lua at line 395 [18.83786]

B:BD[17.8326] → [17.8326:8400]

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

[17.8326]

[17.8400]

      State.selection1 = deepcopy(State.cursor1)

Replacement in source_text.lua at line 406 [18.83786]

B:BD[17.8670] → [17.8670:8744]

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

[17.8670]

[17.8744]

      State.selection1 = deepcopy(State.cursor1)

Replacement in source_text.lua at line 411 [18.83786]

B:BD[17.8852] → [17.8852:8926]

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

[17.8852]

[17.8926]

      State.selection1 = deepcopy(State.cursor1)

Replacement in source_text.lua at line 428 [18.83786]

B:BD[8.5898] → [8.5898:5973]

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

[8.5898]

[8.5973]

  State.cursor1 = deepcopy(State.screen_top1)

Replacement in source_text.lua at line 477 [18.83786]
∅:D[8.7710] → [17.10787:10862]
B:BD[17.10787] → [17.10787:10862]
```
  State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
```
[8.7710]
[17.10862]
```
  State.cursor1 = deepcopy(State.screen_top1)
```

Replacement in source_text.lua at line 597 [18.83786]

B:BD[19.3298] → [19.3298:3380]

    State.screen_top1 = {line=State.cursor1.line, pos=State.cursor1.pos}  -- copy

[19.3298]

[19.3380]

    State.screen_top1 = deepcopy(State.cursor1)

Replacement in source_text.lua at line 1106 [18.83786]

B:BD[19.19630] → [19.19630:19707]

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

[19.19630]

[8.11216]

    State.cursor1 = deepcopy(State.screen_top1)

Deletion in source_text.lua at line 1174 [18.83786]
B:BD[19.21703] → [8.11334:11334]
B:BD[20.21621] → [5.8:57]
BD:BD[20.21621] → [5.8:57]
B:BD[20.21770] → [5.58:107]
BD:BD[20.21770] → [5.58:107]
B:BD[20.21973] → [5.108:157]
BD:BD[20.21973] → [5.108:157]
B:BD[20.22122] → [5.158:207]
BD:BD[20.22122] → [5.158:207]
B:BD[20.22325] → [5.208:257]
BD:BD[20.22325] → [5.208:257]
B:BD[20.22474] → [5.258:307]
BD:BD[20.22474] → [5.258:307]
B:BD[20.22677] → [5.308:357]
BD:BD[20.22677] → [5.308:357]
B:BD[20.22826] → [5.358:407]
BD:BD[20.22826] → [5.358:407]
B:BD[20.23029] → [5.408:457]
BD:BD[20.23029] → [5.408:457]
B:BD[20.23178] → [5.458:507]
BD:BD[20.23178] → [5.458:507]
B:BD[22.2372] → [5.508:554]
BD:BD[22.2372] → [5.508:554]
B:BD[22.4184] → [5.555:601]
BD:BD[22.4184] → [5.555:601]
BD:BD[22.4184] → [5.555:601]
B:BD[18.145626] → [5.651:699]
BD:BD[18.145626] → [5.651:699]
BD:BD[18.145626] → [5.651:699]
B:BD[18.118588] → [5.602:650]
BD:BD[18.118588] → [5.602:650]
```
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
      State.selection1 = deepcopy(State.cursor1)
  State.cursor1 = deepcopy(State.screen_top1)
  State.cursor1 = deepcopy(State.screen_top1)
    State.cursor1 = deepcopy(State.screen_top1)
    State.screen_top1 = deepcopy(State.cursor1)
```
Solving an order conflict in source_text.lua at line 1174 [18.83786]
[19.21703]
Deletion in source_edit.lua at line 278 [18.152503]
B:BD[24.1036] → [5.704:754]
BD:BD[24.1036] → [5.704:754]
B:BD[26.84] → [5.755:803]
BD:BD[26.84] → [5.755:803]
BD:BD[26.84] → [5.755:803]
```
      State.cursor1 = deepcopy(State.screen_top1)
    State.cursor1 = deepcopy(State.screen_top1)
```

Replacement in source_edit.lua at line 311 [18.152503]

B:BD[25.1982] → [25.1982:2061]

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

[25.1982]

[25.2061]

      State.cursor1 = deepcopy(State.screen_top1)

Replacement in source_edit.lua at line 354 [18.152503]

B:BD[28.83] → [28.83:160]

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

[28.83]

[27.407]

    State.cursor1 = deepcopy(State.screen_top1)

Replacement in select.lua at line 3 [29.43980]

B:BD[6.116752] → [6.116752:117032]

-- Return any intersection of the region from State.selection1 to State.cursor1 (or
-- current mouse, if mouse is pressed; or recent mouse if mouse is pressed and
-- currently over a drawing) with the region between {line=line_index, pos=apos}
-- and {line=line_index, pos=bpos}.

[6.116752]

[6.117032]

-- Return any intersection of the region from State.selection1 to
-- State.cursor1 (or current mouse, if mouse is pressed) with the region
-- between {line=line_index, pos=apos} and {line=line_index, pos=bpos}.

Deletion in select.lua at line 47 [29.43980]
B:BD[6.118665] → [6.118665:118724]
```
-- Creates text objects every time, so use this sparingly.
```

Deletion in select.lua at line 57 [29.43980]

B:BD[6.119067] → [2.43:43]

B:BD[29.44053] → [4.14:225]

BD:BD[29.44053] → [4.14:225]

-- Return any intersection of the region from State.selection1 to
-- State.cursor1 (or current mouse, if mouse is pressed) with the region
-- between {line=line_index, pos=apos} and {line=line_index, pos=bpos}.

Solving an order conflict in select.lua at line 57 [29.43980]
[6.119067]
[30.6213]
Deletion in edit.lua at line 240 [32.413]
B:BD[31.4804] → [31.4804:4881]
BD:BD[31.4804] → [31.4804:4881]
```
    State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
```
Resurrecting zombie bytes in edit.lua at line 241 [32.413]
∅:∅[5.918] → [31.4881:4961]
B:B[31.4881] → [31.4881:4961]
BD:B[31.4881] → [31.4881:4961]
```
    for i=1,math.floor(dy) do
      Text.up(State)
    end
  elseif dy < 0 then
```

Resurrecting zombie bytes in edit.lua at line 246 [32.413]

∅:∅[22.9168] → [31.5044:5289]

B:B[31.5044] → [31.5044:5289]

B:B[22.9168] → [31.5044:5289]

BD:B[31.5044] → [31.5044:5289]

B:B[31.5396] → [31.5396:5769]

BD:B[31.5396] → [31.5396:5769]

    for i=1,math.floor(-dy) do
      Text.down(State)
    end
  end
end
function edit.text_input(State, t)
--?   print('text input', t)
  if State.search_term then
    State.search_term = State.search_term..t
    Text.search_next(State)
  else
    Text.text_input(State, t)
  end
  schedule_save(State)
end
function edit.keychord_press(State, chord, key)
  if State.selection1.line and
      -- printable character created using shift key => delete selection
      -- (we're not creating any ctrl-shift- or alt-shift- combinations using regular/printable keys)
      (not App.shift_down() or utf8.len(key) == 1) and

Resurrecting zombie bytes in edit.lua at line 269 [32.413]

∅:∅[33.5120] → [31.5956:6048]

B:B[31.5956] → [31.5956:6048]

BD:B[31.5956] → [31.5956:6048]

B:B[31.6155] → [31.6155:6765]

BD:B[31.6155] → [31.6155:6765]

    Text.delete_selection(State, State.left, State.right)
  end
  if State.search_term then
    if chord == 'escape' then
      State.search_term = nil
      State.cursor1 = State.search_backup.cursor
      State.screen_top1 = State.search_backup.screen_top
      State.search_backup = nil
      Text.redraw_all(State)  -- if we're scrolling, reclaim all fragments to avoid memory leaks
    elseif chord == 'return' then
      State.search_term = nil
      State.search_backup = nil
    elseif chord == 'backspace' then
      local len = utf8.len(State.search_term)
      local byte_offset = Text.offset(State.search_term, len)
      State.search_term = string.sub(State.search_term, 1, byte_offset-1)

Resurrecting zombie bytes in edit.lua at line 288 [32.413]

∅:∅[5.1073] → [31.6765:7604]

B:B[31.6765] → [31.6765:7604]

BD:B[31.6765] → [31.6765:7604]

B:B[31.7711] → [31.7711:8227]

BD:B[31.7711] → [31.7711:8227]

B:B[31.8334] → [31.8334:9064]

BD:B[31.8334] → [31.8334:9064]

B:B[31.9171] → [31.9171:9339]

BD:B[31.9171] → [31.9171:9339]

B:B[31.9446] → [31.9446:10211]

BD:B[31.9446] → [31.9446:10211]

B:B[31.10318] → [31.10318:10509]

BD:B[31.10318] → [31.10318:10509]

    elseif chord == 'down' then
      State.cursor1.pos = State.cursor1.pos+1
      Text.search_next(State)
    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)
      patch_placeholders(State.line_cache, event.after, event.before)
      -- if we're scrolling, reclaim all fragments to avoid memory leaks
      Text.redraw_all(State)
      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)
      -- if we're scrolling, reclaim all fragments to avoid memory leaks
      Text.redraw_all(State)
      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
    local s = Text.cut_selection(State, State.left, State.right)
    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
    schedule_save(State)
    record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})
  -- dispatch to text
  else
    Text.keychord_press(State, chord)
  end
end
function edit.key_release(State, key, scancode)
end
function edit.update_font_settings(State, font_height)
  State.font_height = font_height

Resurrecting zombie bytes in edit.lua at line 385 [32.413]

∅:∅[34.1696] → [31.10575:11061]

B:B[31.10575] → [31.10575:11061]

BD:B[31.10575] → [31.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 403 [32.413]

∅:∅[34.1738] → [31.11115:11471]

B:B[31.11115] → [31.11115:11471]

BD:B[31.11115] → [31.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 421 [32.413]

∅:∅[33.5245] → [31.11587:11811]

B:B[31.11587] → [31.11587:11811]

BD:B[31.11587] → [31.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 430 [32.413]

∅:∅[22.9188] → [31.11811:12430]

B:B[31.11811] → [31.11811:12430]

BD:B[31.11811] → [31.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