akkartik/view.love - Change YXQOITYSGYQQBOMF7CJ33C2CTDAI5R2W2RCRSKJ6JTLV7MS4WVXAC

Merge lines.love

Created by Kartik K. Agaram on September 20, 2023

YXQOITYSGYQQBOMF7CJ33C2CTDAI5R2W2RCRSKJ6JTLV7MS4WVXAC

Dependencies

In channels

main

Change contents

File deletion: source_text_tests.lua, source_text_tests.lua

BFD:BFD[5.2] → [6.83676:83721]

BFD:BFD[6.83721] → [6.3498:3498]

B:BD[8.25696] → [4.1801:1927]

∅:D[4.1927] → [6.16289:16320]

B:BD[6.16198] → [4.1082:1800]

∅:D[4.1800] → [8.25645:25696]

B:BD[6.16039] → [4.1050:1081]

∅:D[4.1081] → [6.16039:16198]

B:BD[6.15229] → [4.1018:1049]

∅:D[4.1049] → [6.15229:15388]

B:BD[6.14324] → [4.986:1017]

∅:D[4.1017] → [6.14324:14506]

  -- selection remains empty
  check_nil(Editor_state.selection1.line, 'selection is empty to avoid perturbing future edits')
end
function test_draw_text()
  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
  check_eq(Editor_state.cursor1.line, 1, 'cursor')
  Editor_state.selection1 = {}
  -- click on the empty line
  edit.draw(Editor_state)
  edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)
  -- cursor moves
  Editor_state.selection1 = {}
  -- click on the other line
  edit.draw(Editor_state)
  edit.run_after_mouse_click(Editor_state, Editor_state.left+8,Editor_state.top+5, 1)
  -- cursor moves
  Editor_state.selection1 = {}
  -- click to the left of the line
  edit.draw(Editor_state)
  edit.run_after_mouse_click(Editor_state, Editor_state.left-4,Editor_state.top+5, 1)
  -- cursor moves to start of line

File deletion: source_edit.lua, source_edit.lua

BFD:BFD[5.2] → [6.165725:165764]

BFD:BFD[6.165764] → [6.152440:152440]

B:BD[9.17] → [4.2684:2834]

∅:D[4.2834] → [9.17:161]

B:BD[10.6097] → [4.2446:2683]

∅:D[4.2683] → [9.11:17]

B:BD[11.32086] → [4.2217:2445]

∅:D[4.2445] → [10.5902:6097]

B:BD[10.5901] → [4.2156:2216]

∅:D[4.2216] → [11.32056:32086]

B:BD[10.5700] → [4.1989:2155]

∅:D[4.2155] → [11.31211:31348]

B:BD[10.5220] → [4.1933:1988]

∅:D[4.1988] → [10.5269:5527]

  State.old_cursor1, State.old_selection1, State.mousepress_shift = nil
  if eq(State.cursor1, State.selection1) then
    State.selection1 = {}
  end
end
function edit.mouse_wheel_move(State, dx,dy)
  if dy > 0 then
    State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
  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
    -- 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)
--?     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))
          edit.clean_up_mouse_press(State)
          return
        end
      end
    end
    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
    for line_index,line in ipairs(State.lines) do
      if line.mode == 'text' then
        if Text.in_line(State, line_index, x,y) then
  -- still here? mouse press is below all screen lines
  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),
  }

Insertion in source_text_tests.lua at line 278 [12.3561]
[12.14387]
[12.14387]
```
  Editor_state.selection1 = {}
```
Insertion in source_text_tests.lua at line 298 [12.3561]
[12.15292]
[12.15292]
```
  Editor_state.selection1 = {}
```
Insertion in source_text_tests.lua at line 317 [12.3561]
[12.16102]
[12.16102]
```
  Editor_state.selection1 = {}
```

Insertion in source_text_tests.lua at line 322 [12.3561]

[12.16261]

[13.2285]

  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 342 [12.3561]

[13.2336]

[12.16352]

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

Replacement in source_edit.lua at line 298 [12.152503]

B:BD[7.4960] → [7.4960:5009]

  -- still here? click is below all screen lines

[7.4960]

[7.5009]

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

Insertion in source_edit.lua at line 320 [12.152503]

[7.5440]

[14.24407]

    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 [12.152503]

∅:D[7.5641] → [14.24808:25252]

∅:D[15.9366] → [14.24808:25252]

B:BD[14.24808] → [14.24808:25252]

          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

[7.5641]

[14.25252]

          edit.clean_up_mouse_press(State)
          return

Insertion in source_edit.lua at line 340 [12.152503]

[14.25282]

[7.5642]


    -- 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 [12.152503]

[7.5837]

[16.11]

  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

Insertion in source_edit.lua at line 356 [12.152503]

[16.17]

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

Replacement in edit.lua at line 195 [17.413]

B:BD[2.3203] → [2.3203:3252]

  -- still here? click is below all screen lines

[2.3203]

[2.3252]

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

Insertion in edit.lua at line 208 [17.413]

[2.3727]

  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 edit.lua at line 221 [17.413]

B:BD[2.4134] → [2.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

[2.4134]

[2.4530]

      edit.clean_up_mouse_press(State)
      return

Insertion in edit.lua at line 225 [17.413]

[2.4544]


  -- 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 edit.lua at line 232 [17.413]

[2.4742]

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 = {}
  end
end

Deletion in edit.lua at line 462 [17.413]

B:BD[18.2969] → [4.3075:3135]

BD:BD[18.2969] → [4.3075:3135]

B:BD[9.1870] → [4.3603:3753]

BD:BD[9.1870] → [4.3603:3753]

B:BD[18.3165] → [4.3365:3602]

BD:BD[18.3165] → [4.3365:3602]

B:BD[17.9624] → [4.3136:3364]

BD:BD[17.9624] → [4.3136:3364]

B:BD[18.2768] → [4.2908:3074]

BD:BD[18.2768] → [4.2908:3074]

B:BD[18.2288] → [4.2852:2907]

BD:BD[18.2288] → [4.2852:2907]

          edit.clean_up_mouse_press(State)
          return
  State.old_cursor1, State.old_selection1, State.mousepress_shift = nil
  if eq(State.cursor1, State.selection1) then
    State.selection1 = {}
  end
  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
    -- 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)
    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
  -- still here? mouse press is below all screen lines

Solving an order conflict in edit.lua at line 462 [17.413]
[2.12430]