akkartik/sokoban.love - Change ONHKBLLCD5NDO3HSSUMAMGJ7HDT53JYVV56DI42AEYI3W63GKACQC

Merge lines.love

Created by Kartik K. Agaram on June 4, 2023

ONHKBLLCD5NDO3HSSUMAMGJ7HDT53JYVV56DI42AEYI3W63GKACQC

Dependencies

In channels

main

Change contents

File deletion: source_text_tests.lua, source_text_tests.lua

BFD:BFD[8.2] → [9.83676:83721]

BFD:BFD[9.83721] → [9.3498:3498]

B:BD[10.30731] → [7.2940:3735]

∅:D[7.3735] → [9.33133:33138]

B:BD[11.9175] → [7.909:2939]

∅:D[7.2939] → [11.9175:9225]

B:BD[10.30265] → [7.120:908]

∅:D[7.908] → [11.9170:9175]

B:BD[9.3537] → [7.7:119]

∅:D[7.119] → [9.3537:3568]

end
function test_select_all_text()
  -- display a single line of text
  App.screen.init{width=75, height=80}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc def'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=1}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  edit.draw(Editor_state)
  -- select all
  App.fake_key_press('lctrl')
  edit.run_after_keychord(Editor_state, 'C-a')
  App.fake_key_release('lctrl')
  edit.key_release(Editor_state, 'lctrl')
  -- selection
  check_eq(Editor_state.selection1.line, 1, 'selection:line')
  check_eq(Editor_state.selection1.pos, 1, 'selection:pos')
  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
  check_eq(Editor_state.cursor1.pos, 8, 'cursor:pos')
end
function test_select_text_using_mouse_starting_above_text_wrapping_line()
  -- first screen line starts in the middle of a line
  App.screen.init{width=50, height=60}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc', 'defgh', 'xyz'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=2, pos=5}
  Editor_state.screen_top1 = {line=2, pos=3}
  Editor_state.screen_bottom1 = {}
  -- press mouse above first line of text
  edit.run_after_mouse_press(Editor_state, Editor_state.left+8,5, 1)
  -- selection is at screen top
  check(Editor_state.selection1.line ~= nil, 'selection:line-not-nil')
  check_eq(Editor_state.selection1.line, 2, 'selection:line')
  check_eq(Editor_state.selection1.pos, 3, 'selection:pos')
end
function test_select_text_using_mouse_starting_below_text()
  -- I'd like to test what happens when a mouse click is below some page of
  -- text, potentially even in the middle of a line.
  -- However, it's brittle to set up a text line boundary just right.
  -- So I'm going to just check things below the bottom of the final line of
  -- text when it's in the middle of the screen.
  -- final screen line ends in the middle of screen
  App.screen.init{width=50, height=60}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abcde'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=1}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  edit.draw(Editor_state)
  local y = Editor_state.top
  App.screen.check(y, 'ab', 'baseline:screen:1')
  y = y + Editor_state.line_height
  App.screen.check(y, 'cde', 'baseline:screen:2')
  -- press mouse above first line of text
  edit.run_after_mouse_press(Editor_state, 5,App.screen.height-5, 1)
  -- selection is past bottom-most text in screen
  check(Editor_state.selection1.line ~= nil, 'selection:line-not-nil')
  check_eq(Editor_state.selection1.line, 1, 'selection:line')
  check_eq(Editor_state.selection1.pos, 6, 'selection:pos')
end
function test_select_text_using_mouse_and_shift()
end
function test_select_text_using_mouse_starting_above_text()
  App.screen.init{width=50, height=60}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc', 'def', 'xyz'}
  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 = {}
  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache
  -- press mouse above first line of text
  edit.run_after_mouse_press(Editor_state, Editor_state.left+8,5, 1)
  check(Editor_state.selection1.line ~= nil, 'selection:line-not-nil')
  check_eq(Editor_state.selection1.line, 1, 'selection:line')
  check_eq(Editor_state.selection1.pos, 1, 'selection:pos')
end
-- Arguably this should be called source_edit_tests.lua,
-- but that would mess up the git blame at this point.
function test_initial_state()

File deletion: source_text.lua, source_text.lua

BFD:BFD[8.2] → [9.147062:147101]

BFD:BFD[9.147101] → [9.83723:83723]

B:BD[9.125077] → [7.3775:4251]

∅:D[7.4251] → [9.125621:125738]

B:BD[9.124402] → [7.3737:3774]

∅:D[7.3774] → [9.124721:125077]

function Text.pos_at_end_of_screen_line(State, loc1)
  Text.populate_screen_line_starting_pos(State, loc1.line)
  local line_cache = State.line_cache[loc1.line]
  local most_recent_final_pos = utf8.len(State.lines[loc1.line].data)+1
  for i=#line_cache.screen_line_starting_pos,1,-1 do
    local spos = line_cache.screen_line_starting_pos[i]
    if spos <= loc1.pos then
      return most_recent_final_pos
    end
    most_recent_final_pos = spos-1
  end
  assert(false)
end
function Text.cursor_at_final_screen_line(State)
  Text.populate_screen_line_starting_pos(State, State.cursor1.line)
-- result: pos, index of screen line
function Text.pos_at_start_of_screen_line(State, loc1)
  Text.populate_screen_line_starting_pos(State, loc1.line)
  local line_cache = State.line_cache[loc1.line]
  for i=#line_cache.screen_line_starting_pos,1,-1 do
    local spos = line_cache.screen_line_starting_pos[i]
    if spos <= loc1.pos then
      return spos,i
    end
  end
  assert(false)
end

File deletion: source_edit.lua, source_edit.lua

BFD:BFD[8.2] → [9.165725:165764]

BFD:BFD[9.165764] → [9.152440:152440]

B:BD[11.32086] → [7.5902:6097]

∅:D[7.6097] → [12.11:220]

B:BD[13.7153] → [7.5785:5901]

∅:D[7.5901] → [11.31612:32086]

B:BD[11.31348] → [7.5701:5784]

∅:D[7.5784] → [13.7018:7153]

B:BD[11.31211] → [7.5636:5700]

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

B:BD[14.22324] → [7.5528:5635]

∅:D[7.5635] → [14.22347:22385]

B:BD[9.157693] → [7.5219:5527]

∅:D[7.5527] → [9.157693:157698]

B:BD[15.130] → [7.5203:5218]

∅:D[7.5218] → [14.22274:22284]

B:BD[13.6941] → [7.5187:5202]

∅:D[7.5202] → [14.21857:22192]

B:BD[16.2433] → [7.5107:5186]

∅:D[7.5186] → [11.30898:31038]

B:BD[9.157379] → [7.4833:5106]

∅:D[7.5106] → [9.157379:157427]

B:BD[9.157151] → [7.4727:4832]

∅:D[7.4832] → [9.157217:157379]

B:BD[9.156525] → [7.4686:4726]

∅:D[7.4726] → [9.156525:156628]

B:BD[9.156342] → [7.4600:4685]

∅:D[7.4685] → [14.21245:21511]

B:BD[9.155992] → [7.4562:4599]

∅:D[7.4599] → [14.19945:19977]

B:BD[9.155762] → [7.4516:4561]

∅:D[7.4561] → [9.155762:155884]

--?     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
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
--?           print_and_log(('edit.mouse_release: cursor now %d,%d'):format(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
            end
          end
          State.old_cursor1, State.old_selection1, State.mousepress_shift = nil
          if eq(State.cursor1, State.selection1) then
            State.selection1 = {}
          end
          break
        end
      end
    end
--?           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: no current drawing')
    for line_index,line in ipairs(State.lines) do
      if line.mode == 'text' then
        if Text.in_line(State, line_index, x,y) then
--?   print_and_log(('edit.mouse_release: cursor at %d,%d'):format(State.cursor1.line, State.cursor1.pos))
  if State.lines.current_drawing then
  -- still here? click 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),
  }
end
        return
      end
        return
      end
    elseif line.mode == 'drawing' then
      local line_cache = State.line_cache[line_index]
      if Drawing.in_drawing(line, line_cache, x, y, State.left,State.right) then
        State.lines.current_drawing_index = line_index
        State.lines.current_drawing = line
        Drawing.before = snapshot(State, line_index)
--?         print_and_log(('edit.mouse_press: in line %d'):format(line_index))
        State.old_cursor1 = State.cursor1
        State.old_selection1 = State.selection1
        State.mousepress_shift = App.shift_down()
  if y < State.top then
    State.old_cursor1 = State.cursor1
    State.old_selection1 = State.selection1
    State.mousepress_shift = App.shift_down()
    State.selection1 = {
        line=State.screen_top1.line,
        pos=State.screen_top1.pos,
    }
    return
  end
  for line_index,line in ipairs(State.lines) do
--?   print_and_log(('edit.mouse_press: cursor at %d,%d'):format(State.cursor1.line, State.cursor1.pos))
  if mouse_press_consumed_by_any_button_handler(State, x,y, mouse_button) then
    -- press on a button and it returned 'true' to short-circuit
    return
  end
  State.screen_bottom1 = screen_bottom1
  if State.search_term then
    Text.draw_search_bar(State)
  end
end
function edit.update(State, dt)
      y, screen_bottom1.pos = Text.draw(State, line_index, y, startpos, hide_cursor)
--?       print('=> y', y)
    elseif line.mode == 'drawing' then
      y = y+Drawing_padding_top
      Drawing.draw(State, line_index, y)
      y = y + Drawing.pixels(line.h, State.width) + Drawing_padding_bottom
    else
      print(line.mode)
      assert(false)
    screen_bottom1.line = line_index
    if line.mode == 'text' then
  local screen_bottom1 = {line=nil, pos=nil}
--?   print('== draw')
  for line_index = State.screen_top1.line,#State.lines do
    local line = State.lines[line_index]

File deletion: source.lua, source.lua
BFD:BFD[8.2] → [9.177652:177686]
BFD:BFD[8.2] → [9.177652:177686]
BFD:BFD[9.177686] → [9.165766:165766]
B:BD[9.168401] → [7.6099:6153]
∅:D[7.6153] → [9.168401:168537]
```
function print_and_log(s)
  print(s)
  log(3, s)
end
function source.load_settings()
  local settings = Settings.source
  love.graphics.setFont(love.graphics.newFont(settings.font_height))
```
File deletion: run.lua, run.lua
BFD:BFD[8.2] → [9.184046:184077]
BFD:BFD[8.2] → [9.184046:184077]
BFD:BFD[9.184077] → [9.178044:178044]
B:BD[9.179346] → [18.330:384]
∅:D[18.384] → [9.179346:179444]
```
function print_and_log(s)
  print(s)
  log(3, s)
end
function run.load_settings()
  love.graphics.setFont(love.graphics.newFont(Settings.font_height))
```

Insertion in source_text_tests.lua at line 2 [19.3561]

[19.3600]

-- Arguably this should be called source_edit_tests.lua,
-- but that would mess up the git blame at this point.

Insertion in source_text_tests.lua at line 831 [19.3561]

[20.6905]

[21.9170]

end
function test_select_text_using_mouse_starting_above_text()
  App.screen.init{width=50, height=60}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc', 'def', 'xyz'}
  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 = {}
  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache
  -- press mouse above first line of text
  edit.run_after_mouse_press(Editor_state, Editor_state.left+8,5, 1)
  check(Editor_state.selection1.line ~= nil, 'selection:line-not-nil')
  check_eq(Editor_state.selection1.line, 1, 'selection:line')
  check_eq(Editor_state.selection1.pos, 1, 'selection:pos')

Insertion in source_text_tests.lua at line 850 [19.3561]

[21.9175]

function test_select_text_using_mouse_starting_above_text_wrapping_line()
  -- first screen line starts in the middle of a line
  App.screen.init{width=50, height=60}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc', 'defgh', 'xyz'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=2, pos=5}
  Editor_state.screen_top1 = {line=2, pos=3}
  Editor_state.screen_bottom1 = {}
  -- press mouse above first line of text
  edit.run_after_mouse_press(Editor_state, Editor_state.left+8,5, 1)
  -- selection is at screen top
  check(Editor_state.selection1.line ~= nil, 'selection:line-not-nil')
  check_eq(Editor_state.selection1.line, 2, 'selection:line')
  check_eq(Editor_state.selection1.pos, 3, 'selection:pos')
end
function test_select_text_using_mouse_starting_below_text()
  -- I'd like to test what happens when a mouse click is below some page of
  -- text, potentially even in the middle of a line.
  -- However, it's brittle to set up a text line boundary just right.
  -- So I'm going to just check things below the bottom of the final line of
  -- text when it's in the middle of the screen.
  -- final screen line ends in the middle of screen
  App.screen.init{width=50, height=60}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abcde'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=1}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  edit.draw(Editor_state)
  local y = Editor_state.top
  App.screen.check(y, 'ab', 'baseline:screen:1')
  y = y + Editor_state.line_height
  App.screen.check(y, 'cde', 'baseline:screen:2')
  -- press mouse above first line of text
  edit.run_after_mouse_press(Editor_state, 5,App.screen.height-5, 1)
  -- selection is past bottom-most text in screen
  check(Editor_state.selection1.line ~= nil, 'selection:line-not-nil')
  check_eq(Editor_state.selection1.line, 1, 'selection:line')
  check_eq(Editor_state.selection1.pos, 6, 'selection:pos')
end

Insertion in source_text_tests.lua at line 946 [19.3561]

[20.7371]

[19.33196]

end
function test_select_all_text()
  -- display a single line of text
  App.screen.init{width=75, height=80}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc def'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=1}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  edit.draw(Editor_state)
  -- select all
  App.fake_key_press('lctrl')
  edit.run_after_keychord(Editor_state, 'C-a')
  App.fake_key_release('lctrl')
  edit.key_release(Editor_state, 'lctrl')
  -- selection
  check_eq(Editor_state.selection1.line, 1, 'selection:line')
  check_eq(Editor_state.selection1.pos, 1, 'selection:pos')
  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
  check_eq(Editor_state.cursor1.pos, 8, 'cursor:pos')

Insertion in source_text.lua at line 653 [19.83786]
[19.124465]
[19.124784]
```
-- result: pos, index of screen line
```

Insertion in source_text.lua at line 666 [19.83786]

[19.125684]

function Text.pos_at_end_of_screen_line(State, loc1)
  Text.populate_screen_line_starting_pos(State, loc1.line)
  local line_cache = State.line_cache[loc1.line]
  local most_recent_final_pos = utf8.len(State.lines[loc1.line].data)+1
  for i=#line_cache.screen_line_starting_pos,1,-1 do
    local spos = line_cache.screen_line_starting_pos[i]
    if spos <= loc1.pos then
      return most_recent_final_pos
    end
    most_recent_final_pos = spos-1
  end
  assert(false)
end

Deletion in source_edit.lua at line 79 [19.152503]

B:BD[21.23466] → [21.23466:23568]

    -- when selecting text, avoid recomputing some state on every single frame
    recent_mouse = {},

Insertion in source_edit.lua at line 156 [19.152503]
[19.155825]
[19.155825]
```
  local screen_bottom1 = {line=nil, pos=nil}
```
Replacement in source_edit.lua at line 162 [19.152503]
B:BD[19.156055] → [22.8541:8595]
```
    State.screen_bottom1 = {line=line_index, pos=nil}
```
[19.156055]
[23.18495]
```
    screen_bottom1.line = line_index
```

Replacement in source_edit.lua at line 185 [19.152503]

B:BD[19.156405] → [22.8708:8799]

      y, State.screen_bottom1.pos = Text.draw(State, line_index, y, startpos, hide_cursor)

[19.156405]

[23.19795]

      y, screen_bottom1.pos = Text.draw(State, line_index, y, startpos, hide_cursor)

Insertion in source_edit.lua at line 196 [19.152503]
[19.156588]
[19.156588]
```
  State.screen_bottom1 = screen_bottom1
```

Replacement in source_edit.lua at line 227 [19.152503]

B:BD[19.157214] → [24.395:436]

--?   print('press', State.cursor1.line)

[19.157214]

[19.157280]

--?   print_and_log(('edit.mouse_press: cursor at %d,%d'):format(State.cursor1.line, State.cursor1.pos))

Insertion in source_edit.lua at line 233 [19.152503]

[19.157442]

  if y < State.top then
    State.old_cursor1 = State.cursor1
    State.old_selection1 = State.selection1
    State.mousepress_shift = App.shift_down()
    State.selection1 = {
        line=State.screen_top1.line,
        pos=State.screen_top1.pos,
    }
    return
  end

Insertion in source_edit.lua at line 256 [19.152503]

[25.5682]

[21.24094]

--?         print_and_log(('edit.mouse_press: in line %d'):format(line_index))

Replacement in source_edit.lua at line 264 [19.152503]
B:BD[22.9085] → [22.9085:9161]
∅:D[22.9161] → [23.20393:20407]
∅:D[21.24399] → [23.20393:20407]
B:BD[23.20393] → [23.20393:20407]
```
--?         print('selection', State.selection1.line, State.selection1.pos)
        break
```
[22.9085]
[23.20407]
```
        return
```
Replacement in source_edit.lua at line 273 [19.152503]
∅:D[25.5749] → [23.20810:20824]
B:BD[23.20810] → [23.20810:20824]
```
        break
```
[25.5749]
[23.20824]
```
        return
```

Insertion in source_edit.lua at line 277 [19.152503]

[19.157756]


  -- still here? click 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),
  }

Replacement in source_edit.lua at line 290 [19.152503]

B:BD[23.20874] → [24.437:480]

--?   print('release', State.cursor1.line)

[23.20874]

[23.20897]

--?   print_and_log(('edit.mouse_release: cursor at %d,%d'):format(State.cursor1.line, State.cursor1.pos))

Insertion in source_edit.lua at line 299 [19.152503]
[21.24407]
[21.24407]
```
--?     print_and_log('edit.mouse_release: no current drawing')
```

Replacement in source_edit.lua at line 303 [19.152503]

B:BD[21.24544] → [21.24544:24583]

--?           print('reset selection')

[21.24544]

[22.9162]

--?           print_and_log(('edit.mouse_release: in line %d'):format(line_index))

Replacement in source_edit.lua at line 308 [19.152503]

B:BD[22.9297] → [22.9297:9366]

--?           print('cursor', State.cursor1.line, State.cursor1.pos)

[22.9297]

[21.24808]

--?           print_and_log(('edit.mouse_release: cursor now %d,%d'):format(State.cursor1.line, State.cursor1.pos))

Replacement in source_edit.lua at line 324 [19.152503]

B:BD[21.25282] → [21.25282:25355]

--?     print('selection:', State.selection1.line, State.selection1.pos)

[21.25282]

[26.11]

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

Insertion in source.lua at line 116 [19.165829]
[19.168464]
[19.168464]
```
function print_and_log(s)
  print(s)
  log(3, s)
end
```
Resurrecting zombie bytes in select.lua at line 62 [29.43980]
B:B[27.706] → [28.6274:6326]
BD:B[27.706] → [28.6274:6326]
```
    local s = line.data:sub(lo_offset, hi_offset-1)
```
Insertion in run.lua at line 51 [19.178107]
[19.179202]
[19.179202]
```
function print_and_log(s)
  print(s)
  log(3, s)
end
```

Replacement in edit.lua at line 110 [32.413]

B:BD[31.3095] → [23.37275:37329]

    State.screen_bottom1 = {line=line_index, pos=nil}

[31.3095]

[33.9505]

    screen_bottom1.line = line_index

Deletion in edit.lua at line 115 [32.413]
B:BD[33.9658] → [23.37331:37331]
B:BD[31.3095] → [6.1997:2034]
BD:BD[31.3095] → [6.1997:2034]
B:BD[32.5239] → [6.2035:2107]
BD:BD[32.5239] → [6.2035:2107]
```
    screen_bottom1.line = line_index
      y, screen_bottom1.pos = Text.draw(State, line_index, y, startpos)
```
Solving an order conflict in edit.lua at line 115 [32.413]
[33.9658]
[32.5845]

Replacement in edit.lua at line 116 [32.413]

B:BD[32.5853] → [33.9659:9735]

    y, State.screen_bottom1.pos = Text.draw(State, line_index, y, startpos)

[32.5853]

[33.9765]

    y, screen_bottom1.pos = Text.draw(State, line_index, y, startpos)

Deletion in edit.lua at line 149 [32.413]
B:BD[31.4581] → [35.84:125]
BD:BD[31.4581] → [35.84:125]
```
--?   print('press', State.cursor1.line)
```

Resurrecting zombie bytes in edit.lua at line 149 [32.413]

B:B[32.7017] → [37.1049:1226]

BD:B[32.7017] → [37.1049:1226]

B:B[37.1226] → [39.793:865]

BD:B[37.1226] → [39.793:865]

∅:∅[39.865] → [37.1257:1281]

B:B[37.1257] → [37.1257:1281]

BD:B[37.1257] → [37.1257:1281]

  if y < State.top then
    State.old_cursor1 = State.cursor1
    State.old_selection1 = State.selection1
    State.mousepress_shift = App.shift_down()
    State.selection1 = {
        line=State.screen_top1.line,
        pos=State.screen_top1.pos,
    }
    return
  end

Insertion in edit.lua at line 149 [32.413]

[31.4581]

[37.1049]

--?   print_and_log(('edit.mouse_press: cursor at %d,%d'):format(State.cursor1.line, State.cursor1.pos))

Replacement in edit.lua at line 171 [32.413]

B:BD[33.10408] → [33.10408:10473]

      --    i.e. mouse_released should never look at shift state

[33.10408]

[33.10473]

      --    i.e. mouse_release should never look at shift state
--?       print_and_log(('edit.mouse_press: in line %d'):format(line_index))

Deletion in edit.lua at line 180 [32.413]
B:BD[33.10729] → [33.10729:10815]
B:BD[33.10815] → [25.8761:8761]
B:BD[31.4581] → [6.2149:2254]
BD:BD[31.4581] → [6.2149:2254]
B:BD[32.7962] → [6.2255:2270]
BD:BD[32.7962] → [6.2255:2270]
B:BD[15.788] → [6.2271:2286]
BD:BD[15.788] → [6.2271:2286]
BD:BD[15.788] → [6.2271:2286]
```
--?       print('selection', State.selection1.line, State.selection1.pos)
      break
--?   print_and_log(('edit.mouse_press: cursor at %d,%d'):format(State.cursor1.line, State.cursor1.pos))
        return
        return
```
Solving an order conflict in edit.lua at line 180 [32.413]
[33.10729]
Insertion in edit.lua at line 180 [32.413]
[0.6324]
[32.8345]
```
      return
```

Replacement in edit.lua at line 196 [32.413]

B:BD[31.5338] → [36.28:71]

--?   print('release', State.cursor1.line)

[31.5338]

[33.10816]

--?   print_and_log(('edit.mouse_release(%d,%d): cursor at %d,%d'):format(x,y, State.cursor1.line, State.cursor1.pos))

Replacement in edit.lua at line 199 [32.413]

B:BD[33.10913] → [33.10913:10948]

--?       print('reset selection')

[33.10913]

[33.10948]

--?       print_and_log(('edit.mouse_release: in line %d'):format(line_index))

Replacement in edit.lua at line 204 [32.413]

B:BD[33.11067] → [33.11067:11132]

--?       print('cursor', State.cursor1.line, State.cursor1.pos)

[33.11067]

[33.11132]

--?       print_and_log(('edit.mouse_release: cursor now %d,%d'):format(State.cursor1.line, State.cursor1.pos))

Deletion in edit.lua at line 210 [32.413]
B:BD[33.11328] → [36.73:73]
B:BD[31.5338] → [6.2596:2703]
BD:BD[31.5338] → [6.2596:2703]
B:BD[32.8804] → [6.2704:2768]
BD:BD[32.8804] → [6.2704:2768]
```
--?   print_and_log(('edit.mouse_release: cursor at %d,%d'):format(State.cursor1.line, State.cursor1.pos))
--?     print_and_log('edit.mouse_release: no current drawing')
```
Solving an order conflict in edit.lua at line 210 [32.413]
[33.11328]
[32.9594]

Deletion in edit.lua at line 218 [32.413]

B:BD[32.9624] → [6.2970:3165]

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

Resurrecting zombie bytes in edit.lua at line 218 [32.413]
∅:∅[30.936] → [12.1864:1870]
∅:∅[18.1241] → [12.1864:1870]
∅:∅[6.3165] → [12.1864:1870]
B:B[31.6276] → [12.1864:1870]
BD:B[31.6276] → [12.1864:1870]
```
  end
```

Deletion in edit.lua at line 219 [32.413]

B:BD[12.1870] → [26.1957:2028]

--?   print('selection:', State.selection1.line, State.selection1.pos)

Resurrecting zombie bytes in edit.lua at line 219 [32.413]

∅:∅[26.2028] → [12.1870:2073]

B:B[12.1870] → [12.1870:2073]

BD:B[12.1870] → [12.1870:2073]

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}
    for i=1,math.floor(dy) do
      Text.up(State)
    end

Insertion in edit.lua at line 219 [32.413]

[12.1870]

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

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

∅:∅[40.182] → [12.2080:2225]

B:B[12.2080] → [12.2080:2225]

BD:B[12.2080] → [12.2080:2225]

    State.cursor1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos}
    for i=1,math.floor(-dy) do
      Text.down(State)
    end

Deletion in edit.lua at line 438 [32.413]
B:BD[41.7287] → [2.29:29]
B:BD[42.258] → [6.2769:2852]
BD:BD[42.258] → [6.2769:2852]
B:BD[32.9165] → [6.2853:2969]
BD:BD[32.9165] → [6.2853:2969]
B:BD[16.5449] → [7.6169:6248]
BD:BD[16.5449] → [7.6169:6248]
BD:BD[16.5449] → [7.6169:6248]
```
--?           print_and_log(('edit.mouse_release: in line %d'):format(line_index))
--?           print_and_log(('edit.mouse_release: cursor now %d,%d'):format(State.cursor1.line, State.cursor1.pos))
--?         print_and_log(('edit.mouse_press: in line %d'):format(line_index))
```
Solving an order conflict in edit.lua at line 438 [32.413]
[41.7287]

Merge lines.love

Dependencies

In channels

Change contents

File deletion: source_text_tests.lua, source_text_tests.lua

File deletion: source_text.lua, source_text.lua

File deletion: source_edit.lua, source_edit.lua

File deletion: source.lua, source.lua

File deletion: run.lua, run.lua

Insertion in source_text_tests.lua at line 2 [19.3561]

Insertion in source_text_tests.lua at line 831 [19.3561]

Insertion in source_text_tests.lua at line 850 [19.3561]

Insertion in source_text_tests.lua at line 946 [19.3561]

Insertion in source_text.lua at line 653 [19.83786]

Insertion in source_text.lua at line 666 [19.83786]

Deletion in source_edit.lua at line 79 [19.152503]

Insertion in source_edit.lua at line 156 [19.152503]

Replacement in source_edit.lua at line 162 [19.152503]

Replacement in source_edit.lua at line 185 [19.152503]

Insertion in source_edit.lua at line 196 [19.152503]

Replacement in source_edit.lua at line 227 [19.152503]

Insertion in source_edit.lua at line 233 [19.152503]

Insertion in source_edit.lua at line 256 [19.152503]

Replacement in source_edit.lua at line 264 [19.152503]

Replacement in source_edit.lua at line 273 [19.152503]

Insertion in source_edit.lua at line 277 [19.152503]

Replacement in source_edit.lua at line 290 [19.152503]

Insertion in source_edit.lua at line 299 [19.152503]

Replacement in source_edit.lua at line 303 [19.152503]

Replacement in source_edit.lua at line 308 [19.152503]

Replacement in source_edit.lua at line 324 [19.152503]

Insertion in source.lua at line 116 [19.165829]

Resurrecting zombie bytes in select.lua at line 62 [29.43980]

Insertion in run.lua at line 51 [19.178107]

Replacement in edit.lua at line 110 [32.413]

Deletion in edit.lua at line 115 [32.413]

Solving an order conflict in edit.lua at line 115 [32.413]

Replacement in edit.lua at line 116 [32.413]

Deletion in edit.lua at line 149 [32.413]

Resurrecting zombie bytes in edit.lua at line 149 [32.413]

Insertion in edit.lua at line 149 [32.413]

Replacement in edit.lua at line 171 [32.413]

Deletion in edit.lua at line 180 [32.413]

Solving an order conflict in edit.lua at line 180 [32.413]

Insertion in edit.lua at line 180 [32.413]

Replacement in edit.lua at line 196 [32.413]

Replacement in edit.lua at line 199 [32.413]

Replacement in edit.lua at line 204 [32.413]

Deletion in edit.lua at line 210 [32.413]

Solving an order conflict in edit.lua at line 210 [32.413]

Deletion in edit.lua at line 218 [32.413]

Resurrecting zombie bytes in edit.lua at line 218 [32.413]

Deletion in edit.lua at line 219 [32.413]

Resurrecting zombie bytes in edit.lua at line 219 [32.413]

Insertion in edit.lua at line 219 [32.413]

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

Deletion in edit.lua at line 438 [32.413]

Solving an order conflict in edit.lua at line 438 [32.413]