akkartik/mastodon-unfurl.love - Change MU2HIRR62BULXR6QKVGJNUWSURYYJ2YFCHUHS4BOI3KHUM725BLAC

Merge lines.love

Created by Kartik K. Agaram on March 26, 2023

MU2HIRR62BULXR6QKVGJNUWSURYYJ2YFCHUHS4BOI3KHUM725BLAC

Dependencies

In channels

main

Change contents

Deletion in text.lua at line 164 [7.1]
B:BD[6.79] → [5.3:60]
BD:BD[6.79] → [5.3:60]
```
  assert(State.lines[State.cursor1.line].mode == 'text')
```
Solving an order conflict in text.lua at line 164 [7.1]
[9.2204]
[10.3]
Deletion in edit.lua at line 89 [12.413]
B:BD[11.565] → [11.565:648]
BD:BD[11.565] → [11.565:648]
```
  return loc1.line > #State.lines
      or loc1.pos > #State.lines[loc1.line].data
```

Resurrecting zombie bytes in edit.lua at line 89 [12.413]

B:B[11.565] → [4.26:258]

BD:B[11.565] → [4.26:258]

  if loc1.line > #State.lines then return true end
  local l = State.lines[loc1.line]
  if l.mode ~= 'text' then return false end  -- pos is irrelevant to validity for a drawing line
  return loc1.pos > #State.lines[loc1.line].data

Resurrecting zombie bytes in edit.lua at line 152 [12.413]
B:B[14.4581] → [5.84:125]
BD:B[14.4581] → [5.84:125]
```
--?   print('press', State.cursor1.line)
```

Resurrecting zombie bytes in edit.lua at line 179 [12.413]

B:B[12.8468] → [8.10816:11328]

BD:B[12.8468] → [8.10816:11328]

  for line_index,line in ipairs(State.lines) do
    if Text.in_line(State, line_index, x,y) then
--?       print('reset selection')
      State.cursor1 = {
          line=line_index,
          pos=Text.to_pos_on_line(State, line_index, x, y),
      }
--?       print('cursor', State.cursor1.line, State.cursor1.pos)
      if State.mousepress_shift then
        if State.old_selection1.line == nil then
          State.selection1 = State.old_cursor1
        else
          State.selection1 = State.old_selection1

Insertion in edit.lua at line 179 [12.413]
[14.5338]
[8.10816]
```
--?   print('release', State.cursor1.line)
```
Deletion in edit.lua at line 193 [12.413]
B:BD[8.11328] → [15.8763:8763]
B:BD[14.5338] → [5.126:169]
BD:BD[14.5338] → [5.126:169]
```
--?   print('release', State.cursor1.line)
```
Solving an order conflict in edit.lua at line 193 [12.413]
[8.11328]
[12.9594]
Deletion in edit.lua at line 225 [12.413]
B:BD[16.2117] → [5.200:283]
BD:BD[16.2117] → [5.200:283]
```
  elseif State.lines.current_drawing and State.current_drawing_mode == 'name' then
```

Deletion in edit.lua at line 349 [12.413]

B:BD[8.11602] → [15.8798:8798]

B:BD[12.15043] → [5.284:367]

BD:BD[12.15043] → [5.284:367]

B:BD[12.15593] → [17.26:330]

BD:BD[12.15593] → [17.26:330]

  elseif State.lines.current_drawing and State.current_drawing_mode == 'name' then
        if len > 0 then
          local byte_offset = Text.offset(p.name, len-1)
          if len == 1 then byte_offset = 0 end
          p.name = string.sub(p.name, 1, byte_offset)
          record_undo_event(State, {before=before, after=snapshot(State, State.lines.current_drawing_index)})
        end

Solving an order conflict in edit.lua at line 349 [12.413]
[8.11602]
[12.15871]
Replacement in drawing_tests.lua at line 429 [19.15]
B:BD[18.25944] → [18.25944:25971]
```
function test_move_point()
```
[18.25944]
[18.26003]
```
function test_name_point_then_hit_backspace()
```
Insertion in drawing_tests.lua at line 438 [19.15]
[18.26373]
[18.26373]
```
  -- draw a line
```
Deletion in drawing_tests.lua at line 442 [19.15]
B:BD[18.26631] → [20.31738:31738]
B:BD[21.19] → [17.332:378]
BD:BD[21.19] → [17.332:378]
```
function test_name_point_then_hit_backspace()
```

Resurrecting zombie bytes in drawing_tests.lua at line 442 [19.15]

B:B[17.378] → [17.378:1638]

BD:B[17.378] → [17.378:1638]

  -- create a drawing with a line
  App.screen.init{width=Test_margin_left+256, height=300}  -- drawing coordinates 1:1 with pixels
  Editor_state = edit.initialize_test_state()
  Editor_state.filename = 'foo'
  Editor_state.lines = load_array{'```lines', '```', ''}
  Text.redraw_all(Editor_state)
  Editor_state.current_drawing_mode = 'line'
  edit.draw(Editor_state)
  -- draw a line
  edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)
  edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)
  local drawing = Editor_state.lines[1]
  check_eq(#drawing.shapes, 1, 'baseline/#shapes')
  check_eq(#drawing.points, 2, 'baseline/#points')
  check_eq(drawing.shapes[1].mode, 'line', 'baseline/shape:1')
  local p1 = drawing.points[drawing.shapes[1].p1]
  local p2 = drawing.points[drawing.shapes[1].p2]
  check_eq(p1.x, 5, 'baseline/p1:x')
  check_eq(p1.y, 6, 'baseline/p1:y')
  check_eq(p2.x, 35, 'baseline/p2:x')
  check_eq(p2.y, 36, 'baseline/p2:y')
  check_nil(p2.name, 'baseline/p2:name')
  -- enter 'name' mode without moving the mouse
  edit.run_after_keychord(Editor_state, 'C-n')
  check_eq(Editor_state.current_drawing_mode, 'name', 'mode:1')

Solving an order conflict in drawing_tests.lua at line 442 [19.15]
[18.26631]

Insertion in drawing_tests.lua at line 442 [19.15]

[0.143]

[17.378]

  check_eq(#drawing.shapes, 1, 'baseline/#shapes')
  check_eq(#drawing.points, 2, 'baseline/#points')
  check_eq(drawing.shapes[1].mode, 'line', 'baseline/shape:1')
  local p1 = drawing.points[drawing.shapes[1].p1]
  local p2 = drawing.points[drawing.shapes[1].p2]
  check_eq(p1.x, 5, 'baseline/p1:x')
  check_eq(p1.y, 6, 'baseline/p1:y')
  check_eq(p2.x, 35, 'baseline/p2:x')
  check_eq(p2.y, 36, 'baseline/p2:y')
  check_nil(p2.name, 'baseline/p2:name')
  -- enter 'name' mode without moving the mouse
  edit.run_after_keychord(Editor_state, 'C-n')
  check_eq(Editor_state.current_drawing_mode, 'name', 'mode:1')
  -- hit backspace
  edit.run_after_keychord(Editor_state, 'backspace')
  -- no crash
end
function test_name_point_then_exit_drawing()

Insertion in drawing_tests.lua at line 467 [19.15]
[17.677]
[17.677]
```
  edit.check_locs(Editor_state)
```

Replacement in drawing_tests.lua at line 487 [19.15]

B:BD[17.1638] → [17.1638:1724]

BD:BD[17.1638] → [17.1638:1724]

  -- hit backspace
  edit.run_after_keychord(Editor_state, 'backspace')
  -- no crash

[17.1638]

[17.1724]

  -- click outside the drawing
  edit.run_after_mouse_click(Editor_state, App.screen.width-5, App.screen.height-5, 1)
  -- press a key
  edit.run_after_text_input(Editor_state, 'a')
  -- key goes to text
  check_eq(Editor_state.lines[2].data, 'a')

Insertion in drawing_tests.lua at line 495 [19.15]

[17.1729]

[22.56390]

function test_move_point()
  -- create a drawing with a line
  App.screen.init{width=Test_margin_left+256, height=300}  -- drawing coordinates 1:1 with pixels
  Editor_state = edit.initialize_test_state()
  Editor_state.filename = 'foo'
  Editor_state.lines = load_array{'```lines', '```', ''}
  Text.redraw_all(Editor_state)
  Editor_state.current_drawing_mode = 'line'
  edit.draw(Editor_state)
  edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)
  edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)
  local drawing = Editor_state.lines[1]

Deletion in drawing_tests.lua at line 830 [19.15]

B:BD[18.44405] → [20.35176:35176]

B:BD[17.1729] → [5.369:1959]

BD:BD[17.1729] → [5.369:1959]

function test_name_point_then_exit_drawing()
  -- create a drawing with a line
  App.screen.init{width=Test_margin_left+256, height=300}  -- drawing coordinates 1:1 with pixels
  Editor_state = edit.initialize_test_state()
  Editor_state.filename = 'foo'
  Editor_state.lines = load_array{'```lines', '```', ''}
  Text.redraw_all(Editor_state)
  edit.check_locs(Editor_state)
  Editor_state.current_drawing_mode = 'line'
  edit.draw(Editor_state)
  -- draw a line
  edit.run_after_mouse_press(Editor_state, Editor_state.left+5, Editor_state.top+Drawing_padding_top+6, 1)
  edit.run_after_mouse_release(Editor_state, Editor_state.left+35, Editor_state.top+Drawing_padding_top+36, 1)
  local drawing = Editor_state.lines[1]
  check_eq(#drawing.shapes, 1, 'baseline/#shapes')
  check_eq(#drawing.points, 2, 'baseline/#points')
  check_eq(drawing.shapes[1].mode, 'line', 'baseline/shape:1')
  local p1 = drawing.points[drawing.shapes[1].p1]
  local p2 = drawing.points[drawing.shapes[1].p2]
  check_eq(p1.x, 5, 'baseline/p1:x')
  check_eq(p1.y, 6, 'baseline/p1:y')
  check_eq(p2.x, 35, 'baseline/p2:x')
  check_eq(p2.y, 36, 'baseline/p2:y')
  check_nil(p2.name, 'baseline/p2:name')
  -- enter 'name' mode without moving the mouse
  edit.run_after_keychord(Editor_state, 'C-n')
  check_eq(Editor_state.current_drawing_mode, 'name', 'mode:1')
  -- click outside the drawing
  edit.run_after_mouse_click(Editor_state, App.screen.width-5, App.screen.height-5, 1)
  -- press a key
  edit.run_after_text_input(Editor_state, 'a')
  -- key goes to text
  check_eq(Editor_state.lines[2].data, 'a')
end

Solving an order conflict in drawing_tests.lua at line 830 [19.15]
[18.44405]

Merge lines.love

Dependencies

In channels

Change contents

Deletion in text.lua at line 164 [7.1]

Solving an order conflict in text.lua at line 164 [7.1]

Deletion in edit.lua at line 89 [12.413]

Resurrecting zombie bytes in edit.lua at line 89 [12.413]

Resurrecting zombie bytes in edit.lua at line 152 [12.413]

Resurrecting zombie bytes in edit.lua at line 179 [12.413]

Insertion in edit.lua at line 179 [12.413]

Deletion in edit.lua at line 193 [12.413]

Solving an order conflict in edit.lua at line 193 [12.413]

Deletion in edit.lua at line 225 [12.413]

Deletion in edit.lua at line 349 [12.413]

Solving an order conflict in edit.lua at line 349 [12.413]

Replacement in drawing_tests.lua at line 429 [19.15]

Insertion in drawing_tests.lua at line 438 [19.15]

Deletion in drawing_tests.lua at line 442 [19.15]

Resurrecting zombie bytes in drawing_tests.lua at line 442 [19.15]

Solving an order conflict in drawing_tests.lua at line 442 [19.15]

Insertion in drawing_tests.lua at line 442 [19.15]

Insertion in drawing_tests.lua at line 467 [19.15]

Replacement in drawing_tests.lua at line 487 [19.15]

Insertion in drawing_tests.lua at line 495 [19.15]

Deletion in drawing_tests.lua at line 830 [19.15]

Solving an order conflict in drawing_tests.lua at line 830 [19.15]