akkartik/pong.love - Change 7TNVOEVBH43S2RZJSTV4MYWPT7JCWP4OX6UK3DKTQP2E3TSBASXAC

Merge text.love

Created by Kartik K. Agaram on September 20, 2023

7TNVOEVBH43S2RZJSTV4MYWPT7JCWP4OX6UK3DKTQP2E3TSBASXAC

Dependencies

In channels

main

Change contents

Insertion in text_tests.lua at line 252 [5.2]
[4.12555]
[4.12555]
```
  Editor_state.selection1 = {}
```
Insertion in text_tests.lua at line 272 [5.2]
[4.13397]
[4.13397]
```
  Editor_state.selection1 = {}
```
Insertion in text_tests.lua at line 291 [5.2]
[4.14135]
[4.14135]
```
  Editor_state.selection1 = {}
```

Insertion in text_tests.lua at line 297 [5.2]

[4.14345]

  -- selection remains empty
  check_nil(Editor_state.selection1.line, 'selection is empty to avoid perturbing future edits')

Insertion in text_tests.lua at line 301 [5.2]

[4.14350]

function test_click_below_all_lines()
  -- display one line
  App.screen.init{width=50, height=80}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=1}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  Editor_state.selection1 = {}
  -- click below first line
  edit.draw(Editor_state)
  edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+50, 1)
  -- cursor doesn't move
  check_eq(Editor_state.cursor1.line, 1, 'cursor')
  -- selection remains empty
  check_nil(Editor_state.selection1.line, 'selection is empty to avoid perturbing future edits')
end

Deletion in text_tests.lua at line 2047 [5.2]

B:BD[6.434] → [7.2:33]

BD:BD[6.434] → [7.2:33]

B:BD[9.689] → [7.34:65]

BD:BD[9.689] → [7.34:65]

B:BD[10.7940] → [7.66:97]

BD:BD[10.7940] → [7.66:97]

B:BD[11.473] → [7.98:816]

BD:BD[11.473] → [7.98:816]

B:BD[13.2330] → [7.817:943]

BD:BD[13.2330] → [7.817:943]

  Editor_state.selection1 = {}
  Editor_state.selection1 = {}
  Editor_state.selection1 = {}
  check_eq(Editor_state.cursor1.line, 1, 'cursor')
  -- selection remains empty
  check_nil(Editor_state.selection1.line, 'selection is empty to avoid perturbing future edits')
end
function test_click_below_all_lines()
  -- display one line
  App.screen.init{width=50, height=80}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=1}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  Editor_state.selection1 = {}
  -- click below first line
  edit.draw(Editor_state)
  edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+50, 1)
  -- cursor doesn't move
  -- selection remains empty
  check_nil(Editor_state.selection1.line, 'selection is empty to avoid perturbing future edits')

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

Deletion in source_text_tests.lua at line 137 [15.3561]

B:BD[15.14387] → [3.7:38]

BD:BD[15.14387] → [3.7:38]

B:BD[15.15292] → [3.39:70]

BD:BD[15.15292] → [3.39:70]

B:BD[15.16102] → [3.71:102]

BD:BD[15.16102] → [3.71:102]

B:BD[15.16261] → [3.103:821]

BD:BD[15.16261] → [3.103:821]

  Editor_state.selection1 = {}
  Editor_state.selection1 = {}
  Editor_state.selection1 = {}
  check_eq(Editor_state.cursor1.line, 1, 'cursor')
  -- selection remains empty
  check_nil(Editor_state.selection1.line, 'selection is empty to avoid perturbing future edits')
end
function test_click_below_all_lines()
  -- display one line
  App.screen.init{width=50, height=80}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=1}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  Editor_state.selection1 = {}
  -- click below first line
  edit.draw(Editor_state)
  edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+50, 1)
  -- cursor doesn't move

Insertion in source_text_tests.lua at line 278 [15.3561]
[8.14212]
[8.14212]
```
  Editor_state.selection1 = {}
```
Insertion in source_text_tests.lua at line 298 [15.3561]
[8.15117]
[8.15117]
```
  Editor_state.selection1 = {}
```
Insertion in source_text_tests.lua at line 317 [15.3561]
[8.15927]
[8.15927]
```
  Editor_state.selection1 = {}
```

Insertion in source_text_tests.lua at line 323 [15.3561]

[12.1809]

[8.16177]

  -- selection remains empty
  check_nil(Editor_state.selection1.line, 'selection is empty to avoid perturbing future edits')

Insertion in source_text_tests.lua at line 327 [15.3561]

[8.16182]

function test_click_below_all_lines()
  -- display one line
  App.screen.init{width=50, height=80}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=1}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  Editor_state.selection1 = {}
  -- click below first line
  edit.draw(Editor_state)
  edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+50, 1)
  -- cursor doesn't move
  check_eq(Editor_state.cursor1.line, 1, 'cursor')
  -- selection remains empty
  check_nil(Editor_state.selection1.line, 'selection is empty to avoid perturbing future edits')
end

Deletion in source_text_tests.lua at line 2144 [15.3561]
B:BD[17.1303] → [18.7981:7981]
B:BD[19.2336] → [3.822:948]
BD:BD[19.2336] → [3.822:948]
BD:BD[19.2336] → [3.822:948]
```
  -- selection remains empty
  check_nil(Editor_state.selection1.line, 'selection is empty to avoid perturbing future edits')
```
Solving an order conflict in source_text_tests.lua at line 2144 [15.3561]
[17.1303]
Deletion in source_edit.lua at line 285 [15.152503]
B:BD[20.4960] → [3.954:1009]
BD:BD[20.4960] → [3.954:1009]
```
  -- still here? mouse press is below all screen lines
```

Replacement in source_edit.lua at line 298 [15.152503]

B:BD[18.9020] → [18.9020:9069]

  -- still here? click is below all screen lines

[18.9020]

[18.9069]

  -- still here? mouse press is below all screen lines

Insertion in source_edit.lua at line 320 [15.152503]

[18.9500]

[21.9575]

    if y < State.top then
      State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
      edit.clean_up_mouse_press(State)
      return
    end

Replacement in source_edit.lua at line 335 [15.152503]

∅:D[18.9701] → [21.9955:10399]

B:BD[21.9955] → [21.9955:10399]

          if State.mousepress_shift then
            if State.old_selection1.line == nil then
              State.selection1 = State.old_cursor1
            else
              State.selection1 = State.old_selection1
            end
          end
          State.old_cursor1, State.old_selection1, State.mousepress_shift = nil
          if eq(State.cursor1, State.selection1) then
            State.selection1 = {}
          end
          break

[18.9701]

[21.10399]

          edit.clean_up_mouse_press(State)
          return

Insertion in source_edit.lua at line 340 [15.152503]

[21.10429]

[18.9702]


    -- still here? mouse release is below all screen lines
    State.cursor1.line, State.cursor1.pos = State.screen_bottom1.line, Text.pos_at_end_of_screen_line(State, State.screen_bottom1)
    edit.clean_up_mouse_press(State)

Insertion in source_edit.lua at line 345 [15.152503]

[18.9897]

[22.10]

  end
end
function edit.clean_up_mouse_press(State)
  if State.mousepress_shift then
    if State.old_selection1.line == nil then
      State.selection1 = State.old_cursor1
    else
      State.selection1 = State.old_selection1
    end
  end
  State.old_cursor1, State.old_selection1, State.mousepress_shift = nil
  if eq(State.cursor1, State.selection1) then
    State.selection1 = {}

Deletion in source_edit.lua at line 631 [15.152503]

B:BD[8.156934] → [23.200:200]

B:BD[20.5440] → [3.1010:1176]

BD:BD[20.5440] → [3.1010:1176]

B:BD[20.5641] → [3.1177:1237]

BD:BD[20.5641] → [3.1177:1237]

B:BD[24.25282] → [3.1238:1466]

BD:BD[24.25282] → [3.1238:1466]

B:BD[20.5837] → [3.1467:1704]

BD:BD[20.5837] → [3.1467:1704]

B:BD[25.17] → [3.1705:1855]

BD:BD[25.17] → [3.1705:1855]

    if y < State.top then
      State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
      edit.clean_up_mouse_press(State)
      return
    end
          edit.clean_up_mouse_press(State)
          return
    -- still here? mouse release is below all screen lines
    State.cursor1.line, State.cursor1.pos = State.screen_bottom1.line, Text.pos_at_end_of_screen_line(State, State.screen_bottom1)
    edit.clean_up_mouse_press(State)
  end
end
function edit.clean_up_mouse_press(State)
  if State.mousepress_shift then
    if State.old_selection1.line == nil then
      State.selection1 = State.old_cursor1
    else
      State.selection1 = State.old_selection1
    end
  State.old_cursor1, State.old_selection1, State.mousepress_shift = nil
  if eq(State.cursor1, State.selection1) then
    State.selection1 = {}
  end

Solving an order conflict in source_edit.lua at line 631 [15.152503]
[8.156934]
Deletion in edit.lua at line 195 [27.413]
B:BD[26.3203] → [26.3203:3252]
BD:BD[26.3203] → [26.3203:3252]
```
  -- still here? click is below all screen lines
```

Resurrecting zombie bytes in edit.lua at line 196 [27.413]

∅:∅[3.1928] → [26.3252:3727]

B:B[26.3252] → [26.3252:3727]

BD:B[26.3252] → [26.3252:3727]

  State.old_cursor1 = State.cursor1
  State.old_selection1 = State.selection1
  State.mousepress_shift = App.shift_down()
  State.selection1 = {
      line=State.screen_bottom1.line,
      pos=Text.pos_at_end_of_screen_line(State, State.screen_bottom1),
  }
end
function edit.mouse_release(State, x,y, mouse_button)
  if State.search_term then return end
--?   print_and_log(('edit.mouse_release(%d,%d): cursor at %d,%d'):format(x,y, State.cursor1.line, State.cursor1.pos))

Resurrecting zombie bytes in edit.lua at line 213 [27.413]

∅:∅[3.2084] → [26.3727:4134]

B:B[26.3727] → [26.3727:4134]

BD:B[26.3727] → [26.3727:4134]

  for line_index,line in ipairs(State.lines) do
    if Text.in_line(State, line_index, x,y) then
--?       print_and_log(('edit.mouse_release: in line %d'):format(line_index))
      State.cursor1 = {
          line=line_index,
          pos=Text.to_pos_on_line(State, line_index, x, y),
      }
--?       print_and_log(('edit.mouse_release: cursor now %d,%d'):format(State.cursor1.line, State.cursor1.pos))

Deletion in edit.lua at line 221 [27.413]

B:BD[26.4134] → [26.4134:4530]

BD:BD[26.4134] → [26.4134:4530]

      if State.mousepress_shift then
        if State.old_selection1.line == nil then
          State.selection1 = State.old_cursor1
        else
          State.selection1 = State.old_selection1
        end
      end
      State.old_cursor1, State.old_selection1, State.mousepress_shift = nil
      if eq(State.cursor1, State.selection1) then
        State.selection1 = {}
      end
      break

Resurrecting zombie bytes in edit.lua at line 223 [27.413]
∅:∅[3.2137] → [26.4530:4544]
B:B[26.4530] → [26.4530:4544]
BD:B[26.4530] → [26.4530:4544]
```
    end
  end
```

Resurrecting zombie bytes in edit.lua at line 229 [27.413]

∅:∅[3.2360] → [26.4544:4742]

B:B[26.4544] → [26.4544:4742]

BD:B[26.4544] → [26.4544:4742]

--?   print_and_log(('edit.mouse_release: finally selection %s,%s cursor %d,%d'):format(tostring(State.selection1.line), tostring(State.selection1.pos), State.cursor1.line, State.cursor1.pos))
end

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

∅:∅[3.2748] → [26.4742:12430]

B:B[26.4742] → [26.4742:12430]

BD:B[26.4742] → [26.4742:12430]

function edit.mouse_wheel_move(State, dx,dy)
  if dy > 0 then
    State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
    for i=1,math.floor(dy) do
      Text.up(State)
    end
  elseif dy < 0 then
    State.cursor1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos}
    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
    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll
    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
      chord ~= 'C-a' and chord ~= 'C-c' and chord ~= 'C-x' and chord ~= 'backspace' and chord ~= 'delete' and chord ~= 'C-z' and chord ~= 'C-y' and not App.is_cursor_movement(chord) then
    Text.delete_selection(State, State.left, State.right)
  end
  if State.search_term then
    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll
    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)
    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
    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll
    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
    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll
    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
    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll
    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
    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll
    -- 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
    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll
    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
  love.graphics.setFont(love.graphics.newFont(State.font_height))
  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,
      14,  -- font height assuming default LÖVE font
      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
function edit.run_after_keychord(State, chord)
  edit.keychord_press(State, chord)
  edit.key_release(State, chord)
  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)
  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

Merge text.love

Dependencies

In channels

Change contents

Insertion in text_tests.lua at line 252 [5.2]

Insertion in text_tests.lua at line 272 [5.2]

Insertion in text_tests.lua at line 291 [5.2]

Insertion in text_tests.lua at line 297 [5.2]

Insertion in text_tests.lua at line 301 [5.2]

Deletion in text_tests.lua at line 2047 [5.2]

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

Deletion in source_text_tests.lua at line 137 [15.3561]

Insertion in source_text_tests.lua at line 278 [15.3561]

Insertion in source_text_tests.lua at line 298 [15.3561]

Insertion in source_text_tests.lua at line 317 [15.3561]

Insertion in source_text_tests.lua at line 323 [15.3561]

Insertion in source_text_tests.lua at line 327 [15.3561]

Deletion in source_text_tests.lua at line 2144 [15.3561]

Solving an order conflict in source_text_tests.lua at line 2144 [15.3561]

Deletion in source_edit.lua at line 285 [15.152503]