akkartik/pong.love - Change JJ74YKGVDPNVI54TXGSXVS5ORMYHCWSILAMVVHQQXWUA65GIG7EAC

resolve conflicts

Created by akkartik on July 22, 2024

JJ74YKGVDPNVI54TXGSXVS5ORMYHCWSILAMVVHQQXWUA65GIG7EAC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 126 [5.1]

B:BD[4.66] → [4.66:143]

      -- The modifiers didn't change the key. Handle it in keychord_pressed.

[4.66]

[4.143]

      -- The modifiers didn't change the key. Handle it in keychord_press.

Replacement in text.lua at line 152 [5.1]

B:BD[6.85870] → [6.85870:85904]

  --== shortcuts that mutate text

[6.85870]

[6.85904]

  --== shortcuts that mutate text (must schedule_save)

Deletion in text.lua at line 157 [5.1]
B:BD[6.86053] → [6.86053:86079]
```
    State.selection1 = {}
```
Deletion in text.lua at line 160 [5.1]
B:BD[6.86229] → [6.86229:86254]
```
    schedule_save(State)
```
Insertion in text.lua at line 161 [5.1]
[6.86356]
[6.86356]
```
    schedule_save(State)
```
Deletion in text.lua at line 171 [5.1]
B:BD[6.87015] → [6.87015:87040]
```
    schedule_save(State)
```
Insertion in text.lua at line 172 [5.1]
[6.87129]
[6.87129]
```
    schedule_save(State)
```

Insertion in text.lua at line 214 [5.1]

[7.689]

[6.89235]

    record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})

Deletion in text.lua at line 216 [5.1]

B:BD[6.89260] → [6.89260:89349]

    record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})

Deletion in text.lua at line 246 [5.1]
B:BD[6.90819] → [6.90819:90844]
```
    schedule_save(State)
```
Insertion in text.lua at line 247 [5.1]
[6.90933]
[6.90933]
```
    schedule_save(State)
```
Deletion in text.lua at line 992 [5.1]
B:BD[6.115541] → [8.716:716]
B:BD[9.66] → [10.4:79]
BD:BD[9.66] → [10.4:79]
B:BD[11.121] → [12.4:59]
BD:BD[11.121] → [12.4:59]
BD:BD[11.121] → [12.4:59]
B:BD[15.113] → [12.60:162]
BD:BD[15.113] → [12.60:162]
B:BD[16.1459] → [12.163:188]
BD:BD[16.1459] → [12.163:188]
B:BD[17.916] → [12.189:278]
BD:BD[17.916] → [12.189:278]
BD:BD[17.916] → [12.189:278]
B:BD[16.1891] → [12.279:304]
BD:BD[16.1891] → [12.279:304]
```
      -- The modifiers didn't change the key. Handle it in keychord_press.
  --== shortcuts that mutate text (must schedule_save)
    record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})
    schedule_save(State)
    record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})
    schedule_save(State)
```
Solving an order conflict in text.lua at line 992 [5.1]
[6.115541]
[18.790]

Replacement in source_text.lua at line 201 [19.83786]

B:BD[4.309] → [4.309:386]

      -- The modifiers didn't change the key. Handle it in keychord_pressed.

[4.309]

[4.386]

      -- The modifiers didn't change the key. Handle it in keychord_press.

Deletion in source_text.lua at line 233 [19.83786]
B:BD[13.98626] → [20.16925:16951]
```
    State.selection1 = {}
```

Insertion in source_text.lua at line 236 [19.83786]

[13.98776]

    record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})

Deletion in source_text.lua at line 238 [19.83786]

B:BD[13.98801] → [13.98801:98903]

    record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})

Deletion in source_text.lua at line 247 [19.83786]
B:BD[13.99562] → [13.99562:99587]
```
    schedule_save(State)
```
Insertion in source_text.lua at line 248 [19.83786]
[13.99676]
[13.99676]
```
    schedule_save(State)
```

Insertion in source_text.lua at line 295 [19.83786]

[21.4479]

    record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})

Deletion in source_text.lua at line 297 [19.83786]

B:BD[21.4504] → [21.4504:4593]

    record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})

Insertion in source_text.lua at line 329 [19.83786]

[21.6140]

    record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})

Deletion in source_text.lua at line 331 [19.83786]

B:BD[21.6165] → [21.6165:6254]

    record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})

Deletion in source_text.lua at line 1173 [19.83786]
B:BD[22.21703] → [8.1402:1402]
B:BD[23.70] → [3.8:83]
BD:BD[23.70] → [3.8:83]
B:BD[19.99332] → [3.84:109]
BD:BD[19.99332] → [3.84:109]
B:BD[19.99991] → [3.110:199]
BD:BD[19.99991] → [3.110:199]
B:BD[25.1088] → [3.200:289]
BD:BD[25.1088] → [3.200:289]
BD:BD[25.1088] → [3.200:289]
B:BD[19.105518] → [3.290:315]
BD:BD[19.105518] → [3.290:315]
```
      -- The modifiers didn't change the key. Handle it in keychord_press.
    schedule_save(State)
    record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})
    record_undo_event(State, {before=before, after=snapshot(State, State.cursor1.line)})
    schedule_save(State)
```
Solving an order conflict in source_text.lua at line 1173 [19.83786]
[22.21703]
Deletion in source_edit.lua at line 192 [19.152503]
B:BD[26.19441] → [26.19441:19485]
BD:BD[26.19441] → [26.19441:19485]
```
                       schedule_save(State)
```

Resurrecting zombie bytes in source_edit.lua at line 192 [19.152503]

B:B[26.19485] → [26.19485:19609]

BD:B[26.19485] → [26.19485:19609]

                       record_undo_event(State, {before=Drawing.before, after=snapshot(State, line_index-1, line_index+1)})

Resurrecting zombie bytes in source_edit.lua at line 194 [19.152503]
∅:∅[3.364] → [26.19609:19646]
B:B[26.19609] → [26.19609:19646]
BD:B[26.19609] → [26.19609:19646]
```
                     end,
        })
```
Deletion in source_edit.lua at line 277 [19.152503]
B:BD[26.21189] → [3.365:390]
BD:BD[26.21189] → [3.365:390]
```
    schedule_save(State)
```
Deletion in source_edit.lua at line 302 [19.152503]
B:BD[28.9367] → [28.9367:9392]
```
    schedule_save(State)
```
Insertion in source_edit.lua at line 306 [19.152503]
[28.9568]
[28.9568]
```
    schedule_save(State)
```

Deletion in source_edit.lua at line 494 [19.152503]

B:BD[13.154203] → [13.154203:154330]

B:BD[13.154330] → [8.1827:1827]

    schedule_save(State)
    record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})

Resurrecting zombie bytes in source_edit.lua at line 494 [19.152503]
B:B[19.163035] → [3.391:493]
BD:B[19.163035] → [3.391:493]
```
    record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})
```
Solving an order conflict in source_edit.lua at line 494 [19.152503]
[13.154203]
[3.391]
Resurrecting zombie bytes in source_edit.lua at line 495 [19.152503]
∅:∅[29.332] → [26.21762:21853]
∅:∅[30.586] → [26.21762:21853]
∅:∅[8.1827] → [26.21762:21853]
∅:∅[13.154330] → [26.21762:21853]
B:B[19.163162] → [26.21762:21853]
BD:B[19.163162] → [26.21762:21853]
B:B[26.21895] → [26.21895:22039]
BD:B[26.21895] → [26.21895:22039]
```
  -- dispatch to drawing or text
  elseif App.mouse_down(1) or chord:sub(1,2) == 'C-' then
    local drawing_index, drawing = Drawing.current_drawing(State)
    if drawing_index then
      local before = snapshot(State, drawing_index)
```
Insertion in source_edit.lua at line 495 [19.152503]
[3.493]
[26.21762]
```
    schedule_save(State)
```

Resurrecting zombie bytes in source_edit.lua at line 502 [19.152503]

∅:∅[32.6019] → [26.22084:22390]

B:B[26.22084] → [26.22084:22390]

BD:B[26.22084] → [26.22084:22390]

      record_undo_event(State, {before=before, after=snapshot(State, drawing_index)})
      schedule_save(State)
    end
  elseif chord == 'escape' and not App.mouse_down(1) then
    for _,line in ipairs(State.lines) do
      if line.mode == 'drawing' then
        line.show_help = false
      end
    end

Resurrecting zombie bytes in source_edit.lua at line 512 [19.152503]

∅:∅[33.678] → [26.22441:23003]

B:B[26.22441] → [26.22441:23003]

BD:B[26.22441] → [26.22441:23003]

    if chord == 'return' then
      State.current_drawing_mode = State.previous_drawing_mode
      State.previous_drawing_mode = nil
    else
      local before = snapshot(State, State.lines.current_drawing_index)
      local drawing = State.lines.current_drawing
      local p = drawing.points[drawing.pending.target_point]
      if chord == 'escape' then
        p.name = nil
        record_undo_event(State, {before=before, after=snapshot(State, State.lines.current_drawing_index)})
      elseif chord == 'backspace' then
        local len = utf8.len(p.name)

Resurrecting zombie bytes in source_edit.lua at line 530 [19.152503]
∅:∅[33.983] → [26.23263:23306]
B:B[26.23263] → [26.23263:23306]
BD:B[26.23263] → [26.23263:23306]
```
      end
    end
    schedule_save(State)
```
Deletion in edit.lua at line 368 [35.413]
B:BD[34.10055] → [34.10055:10080]
BD:BD[34.10055] → [34.10055:10080]
```
    schedule_save(State)
```
Resurrecting zombie bytes in edit.lua at line 368 [35.413]
B:B[34.10080] → [34.10080:10182]
BD:B[34.10080] → [34.10080:10182]
```
    record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})
```
Deletion in edit.lua at line 369 [35.413]
B:BD[34.10182] → [34.10182:10204]
BD:BD[34.10182] → [34.10182:10204]
```
  -- dispatch to text
```
Resurrecting zombie bytes in edit.lua at line 370 [35.413]
∅:∅[3.536] → [34.10204:10211]
B:B[34.10204] → [34.10204:10211]
BD:B[34.10204] → [34.10204:10211]
B:B[34.10318] → [34.10318:10420]
BD:B[34.10318] → [34.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 379 [35.413]
∅:∅[36.90] → [34.10475:10509]
B:B[34.10475] → [34.10475:10509]
BD:B[34.10475] → [34.10475:10509]
```
  State.font_height = font_height
```

Resurrecting zombie bytes in edit.lua at line 381 [35.413]

∅:∅[36.155] → [34.10575:11061]

∅:∅[37.1696] → [34.10575:11061]

B:B[37.1696] → [34.10575:11061]

B:B[34.10575] → [34.10575:11061]

BD:B[34.10575] → [34.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 399 [35.413]

∅:∅[37.1738] → [34.11115:11471]

B:B[34.11115] → [34.11115:11471]

BD:B[34.11115] → [34.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 417 [35.413]

∅:∅[38.5245] → [34.11587:11811]

B:B[34.11587] → [34.11587:11811]

BD:B[34.11587] → [34.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 426 [35.413]

∅:∅[39.9188] → [34.11811:12430]

B:B[34.11811] → [34.11811:12430]

BD:B[34.11811] → [34.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

Replacement in text.lua at line 126 [5.1]

Replacement in text.lua at line 152 [5.1]

Deletion in text.lua at line 157 [5.1]

Deletion in text.lua at line 160 [5.1]

Insertion in text.lua at line 161 [5.1]

Deletion in text.lua at line 171 [5.1]

Insertion in text.lua at line 172 [5.1]

Insertion in text.lua at line 214 [5.1]

Deletion in text.lua at line 216 [5.1]

Deletion in text.lua at line 246 [5.1]

Insertion in text.lua at line 247 [5.1]

Deletion in text.lua at line 992 [5.1]

Solving an order conflict in text.lua at line 992 [5.1]

Replacement in source_text.lua at line 201 [19.83786]

Deletion in source_text.lua at line 233 [19.83786]

Insertion in source_text.lua at line 236 [19.83786]

Deletion in source_text.lua at line 238 [19.83786]

Deletion in source_text.lua at line 247 [19.83786]

Insertion in source_text.lua at line 248 [19.83786]

Insertion in source_text.lua at line 295 [19.83786]

Deletion in source_text.lua at line 297 [19.83786]

Insertion in source_text.lua at line 329 [19.83786]

Deletion in source_text.lua at line 331 [19.83786]

Deletion in source_text.lua at line 1173 [19.83786]

Solving an order conflict in source_text.lua at line 1173 [19.83786]

Deletion in source_edit.lua at line 192 [19.152503]

Resurrecting zombie bytes in source_edit.lua at line 192 [19.152503]

Resurrecting zombie bytes in source_edit.lua at line 194 [19.152503]

Deletion in source_edit.lua at line 277 [19.152503]

Deletion in source_edit.lua at line 302 [19.152503]

Insertion in source_edit.lua at line 306 [19.152503]

Deletion in source_edit.lua at line 494 [19.152503]

Resurrecting zombie bytes in source_edit.lua at line 494 [19.152503]

Solving an order conflict in source_edit.lua at line 494 [19.152503]

Resurrecting zombie bytes in source_edit.lua at line 495 [19.152503]

Insertion in source_edit.lua at line 495 [19.152503]

Resurrecting zombie bytes in source_edit.lua at line 502 [19.152503]

Resurrecting zombie bytes in source_edit.lua at line 512 [19.152503]

Resurrecting zombie bytes in source_edit.lua at line 530 [19.152503]

Deletion in edit.lua at line 368 [35.413]

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

Deletion in edit.lua at line 369 [35.413]

Resurrecting zombie bytes in edit.lua at line 370 [35.413]

Resurrecting zombie bytes in edit.lua at line 379 [35.413]

Resurrecting zombie bytes in edit.lua at line 381 [35.413]

Resurrecting zombie bytes in edit.lua at line 399 [35.413]

Resurrecting zombie bytes in edit.lua at line 417 [35.413]

Resurrecting zombie bytes in edit.lua at line 426 [35.413]