akkartik/wardley.love - Change 3MQ7ESDB6EZS6N4KXHP5BDMBU4RAXCQ3D6WJE3GAR6ITDGOKGAKAC

resolve conflicts

Created by akkartik on September 20, 2023

3MQ7ESDB6EZS6N4KXHP5BDMBU4RAXCQ3D6WJE3GAR6ITDGOKGAKAC

Dependencies

In channels

main

Change contents

File deletion: source_text_tests.lua, source_text_tests.lua

BFD:BFD[4.2] → [5.83676:83721]

BFD:BFD[5.83721] → [5.3498:3498]

B:BD[5.14324] → [3.979:1010]

B:BD[5.15229] → [3.1011:1042]

B:BD[5.16039] → [3.1043:1074]

B:BD[5.16198] → [3.1075:1793]

B:BD[7.25696] → [3.1794:1920]

∅:D[3.1920] → [5.16289:16320]

∅:D[3.1793] → [7.25645:25696]

∅:D[3.1074] → [5.16039:16198]

∅:D[3.1042] → [5.15229:15388]

∅:D[3.1010] → [5.14324:14506]

  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')
end
function test_draw_text()
  check_eq(Editor_state.cursor1.line, 1, 'cursor')
  -- 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
  -- 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
  -- 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[4.2] → [5.165725:165764]

BFD:BFD[5.165764] → [5.152440:152440]

B:BD[8.5220] → [3.1921:1976]

B:BD[8.5700] → [3.1977:2143]

B:BD[8.5901] → [3.2144:2204]

B:BD[9.32086] → [3.2205:2433]

B:BD[8.6097] → [3.2434:2671]

B:BD[10.17] → [3.2672:2822]

∅:D[3.2822] → [10.17:161]

∅:D[3.2671] → [10.11:17]

∅:D[3.2433] → [8.5902:6097]

∅:D[3.2204] → [9.32056:32086]

∅:D[3.2143] → [9.31211:31348]

∅:D[3.1976] → [8.5269:5527]

  -- still here? mouse press is below all screen lines
    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
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
--?     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
      end
    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
  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 [11.3561]
[11.14387]
[11.14387]
```
  Editor_state.selection1 = {}
```
Insertion in source_text_tests.lua at line 298 [11.3561]
[11.15292]
[11.15292]
```
  Editor_state.selection1 = {}
```
Insertion in source_text_tests.lua at line 317 [11.3561]
[11.16102]
[11.16102]
```
  Editor_state.selection1 = {}
```

Insertion in source_text_tests.lua at line 322 [11.3561]

[11.16261]

[12.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 [11.3561]

[12.2336]

[11.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 [11.152503]

B:BD[6.4960] → [6.4960:5009]

  -- still here? click is below all screen lines

[6.4960]

[6.5009]

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

Insertion in source_edit.lua at line 320 [11.152503]

[6.5440]

[13.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 [11.152503]

∅:D[6.5641] → [13.24808:25252]

∅:D[14.9366] → [13.24808:25252]

B:BD[13.24808] → [13.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

[6.5641]

[13.25252]

          edit.clean_up_mouse_press(State)
          return

Insertion in source_edit.lua at line 340 [11.152503]

[13.25282]

[6.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 [11.152503]

[6.5837]

[15.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 [11.152503]

[15.17]

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

Insertion in edit.lua at line 208 [17.413]

[6.6458]

[16.10816]

  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

Deletion in edit.lua at line 221 [17.413]

∅:D[6.6651] → [16.11132:11328]

B:BD[16.11132] → [16.11132:11328]

B:BD[16.11328] → [6.6653:6653]

B:BD[19.2768] → [3.2879:2984]

BD:BD[19.2768] → [3.2879:2984]

      if State.mousepress_shift then
        if State.old_selection1.line == nil then
          State.selection1 = State.old_cursor1
        else
          State.selection1 = State.old_selection1
    if y < State.top then
      State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}

Resurrecting zombie bytes in edit.lua at line 221 [17.413]
B:B[3.2984] → [3.2984:3045]
BD:B[3.2984] → [3.2984:3045]
BD:B[3.2984] → [3.2984:3045]
```
      edit.clean_up_mouse_press(State)
      return
    end
```
Solving an order conflict in edit.lua at line 221 [17.413]
[6.6651]
[3.2984]
Insertion in edit.lua at line 224 [17.413]
[3.3044]
[3.3044]
```
  end
```

Deletion in edit.lua at line 226 [17.413]

B:BD[19.2969] → [3.3046:3106]

BD:BD[19.2969] → [3.3046:3106]

∅:D[18.73] → [17.9594:9616]

∅:D[3.3106] → [17.9594:9616]

∅:D[6.6653] → [17.9594:9616]

∅:D[20.8763] → [17.9594:9616]

∅:D[16.11328] → [17.9594:9616]

B:BD[17.9594] → [17.9594:9616]

B:BD[17.9616] → [16.11329:11507]

∅:D[16.11507] → [17.9616:9624]

B:BD[17.9616] → [17.9616:9624]

B:BD[17.9624] → [3.3107:3335]

BD:BD[17.9624] → [3.3107:3335]

B:BD[19.3165] → [3.3336:3342]

BD:BD[19.3165] → [3.3336:3342]

          edit.clean_up_mouse_press(State)
          return
        end
      end
      State.old_cursor1, State.old_selection1, State.mousepress_shift = nil
      if eq(State.cursor1, State.selection1) then
        State.selection1 = {}
      end
      break
    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)
  end

Resurrecting zombie bytes in edit.lua at line 226 [17.413]

B:B[3.3342] → [3.3342:3573]

BD:B[3.3342] → [3.3342:3573]

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

[3.3045]

[3.3342]

  -- 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))

Deletion in edit.lua at line 240 [17.413]

B:BD[10.1870] → [6.6654:6847]

--?   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))