akkartik/sokoban.love - Change VOU73AK6XOVIOCY6PHUXS5RQZ2TGFEF7RYNOKFE2XSHRCZBAJMYQC

Merge lines.love

Created by Kartik K. Agaram on March 24, 2023

VOU73AK6XOVIOCY6PHUXS5RQZ2TGFEF7RYNOKFE2XSHRCZBAJMYQC

Dependencies

In channels

main

Change contents

File deletion: source_edit.lua, source_edit.lua

BFD:BFD[4.2] → [5.165725:165764]

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

B:BD[7.32159] → [8.11:220]

∅:D[3.32] → [8.227:372]

B:BD[8.227] → [8.227:372]

∅:D[8.372] → [9.22639:22645]

B:BD[8.220] → [3.11:32]

  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
    State.cursor1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos}
    for i=1,math.floor(-dy) do
      Text.down(State)
    end
  end
  elseif dy < 0 then

File deletion: source.lua, source.lua

BFD:BFD[4.2] → [5.177652:177686]

BFD:BFD[5.177686] → [5.165766:165766]

B:BD[5.175762] → [8.374:652]

∅:D[8.652] → [10.3448:3478]

function source.mouse_wheel_move(dx,dy)
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
  if Focus == 'edit' then
    return edit.mouse_wheel_move(Editor_state, dx,dy)
  else
    return log_browser.mouse_wheel_move(Log_browser_state, dx,dy)
  end
end
function source.text_input(t)

File deletion: run.lua, run.lua
BFD:BFD[4.2] → [5.184046:184077]
BFD:BFD[4.2] → [5.184046:184077]
BFD:BFD[5.184077] → [5.178044:178044]
B:BD[5.183379] → [3.38:75]
∅:D[3.75] → [8.692:766]
B:BD[8.692] → [8.692:766]
∅:D[3.128] → [8.816:821]
B:BD[8.816] → [8.816:821]
∅:D[8.821] → [10.4163:4190]
B:BD[8.766] → [3.76:128]
```
function run.mouse_wheel_move(dx,dy)
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
end
function run.text_input(t)
  return edit.mouse_wheel_move(Editor_state, dx,dy)
```

File deletion: log_browser.lua, log_browser.lua

BFD:BFD[4.2] → [5.203223:203262]

BFD:BFD[5.203262] → [5.191782:191782]

B:BD[5.202665] → [8.1627:1855]

∅:D[8.1855] → [5.202665:203163]

B:BD[5.202646] → [8.1411:1626]

∅:D[8.1626] → [5.202646:202665]

B:BD[5.201789] → [8.1382:1410]

∅:D[8.1410] → [5.201991:202646]

B:BD[5.201568] → [8.1355:1381]

∅:D[8.1381] → [5.201759:201789]

B:BD[10.5164] → [8.1132:1272]

∅:D[3.152] → [8.1279:1354]

B:BD[8.1279] → [8.1279:1354]

∅:D[8.1354] → [5.201426:201431]

B:BD[8.1272] → [3.131:152]

function log_browser.down(State)
  while State.screen_top1.line < #State.lines do
    State.screen_top1.line = State.screen_top1.line+1
    if should_show(State.lines[State.screen_top1.line]) then
      break
    end
  end
end
function log_browser.height(State, line_index)
  local line = State.lines[line_index]
  if line.data == nil then
    -- section header
    return State.line_height
  elseif type(line.data) == 'string' then
    return State.line_height
  else
    if line.height == nil then
--?       print('nil line height! rendering off screen to calculate')
      line.height = log_render[line.data.name](line.data, State.left, App.screen.height, State.right-State.left)
    end
    return line.height
  end
end
    end
  end
end
function log_browser.up(State)
  while State.screen_top1.line > 1 do
    State.screen_top1.line = State.screen_top1.line-1
    if should_show(State.lines[State.screen_top1.line]) then
      break
    end
  end
end
    log_browser.down(State)
  elseif chord == 'pageup' then
    local y = 0
    while State.screen_top1.line > 1 and y < App.screen.height - 100 do
      State.screen_top1.line = State.screen_top1.line - 1
      if should_show(State.lines[State.screen_top1.line]) then
        y = y + log_browser.height(State, State.screen_top1.line)
      end
    end
  elseif chord == 'pagedown' then
    local y = 0
    while State.screen_top1.line < #State.lines and y < App.screen.height - 100 do
      if should_show(State.lines[State.screen_top1.line]) then
        y = y + log_browser.height(State, State.screen_top1.line)
      end
      State.screen_top1.line = State.screen_top1.line + 1
    log_browser.up(State)
  elseif chord == 'down' then
end
function log_browser.mouse_wheel_move(State, dx,dy)
  if dy > 0 then
    for i=1,math.floor(dy) do
      log_browser.up(State)
    end
    for i=1,math.floor(-dy) do
      log_browser.down(State)
    end
  end
end
  elseif dy < 0 then

Insertion in source_edit.lua at line 305 [13.152503]

[11.25355]

[12.21189]

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

Insertion in source.lua at line 326 [13.165829]

[13.175825]

[14.7081]

function source.mouse_wheel_move(dx,dy)
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
  if Focus == 'edit' then
    return edit.mouse_wheel_move(Editor_state, dx,dy)
  else
    return log_browser.mouse_wheel_move(Log_browser_state, dx,dy)
  end
end

Insertion in run.lua at line 166 [13.178107]

[13.183200]

[14.7796]

function run.mouse_wheel_move(dx,dy)
  Cursor_time = 0  -- ensure cursor is visible immediately after it moves
  return edit.mouse_wheel_move(Editor_state, dx,dy)
end

Resurrecting zombie bytes in main.lua at line 236 [15.2]
B:B[10.5101] → [8.823:894]
BD:B[10.5101] → [8.823:894]
```
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
end
```
Solving an order conflict in main.lua at line 236 [15.2]
[16.355]
[8.823]
Replacement in main.lua at line 241 [15.2]
B:BD[8.894] → [8.894:925]
BD:BD[8.894] → [8.894:925]
```
function App.wheelmoved(dx,dy)
```
[8.894]
[8.925]
```
function App.mousereleased(x,y, mouse_button)
```

Replacement in main.lua at line 243 [15.2]

B:BD[8.956] → [8.956:1021]

BD:BD[8.956] → [8.956:1021]

    if run.mouse_wheel_move then run.mouse_wheel_move(dx,dy) end

[8.956]

[8.1021]

    if run.mouse_release then run.mouse_release(x,y, mouse_button) end

Replacement in main.lua at line 245 [15.2]

B:BD[8.1059] → [8.1059:1130]

BD:BD[8.1059] → [8.1059:1130]

    if source.mouse_wheel_move then source.mouse_wheel_move(dx,dy) end

[8.1059]

[5.191200]

    if source.mouse_release then source.mouse_release(x,y, mouse_button) end

Replacement in main.lua at line 251 [15.2]
B:BD[17.102] → [13.190384:190430]
```
function App.mousereleased(x,y, mouse_button)
```
[17.102]
[13.190430]
```
function App.wheelmoved(dx,dy)
```

Replacement in main.lua at line 253 [15.2]

B:BD[13.190461] → [14.8324:8395]

    if run.mouse_release then run.mouse_release(x,y, mouse_button) end

[13.190461]

[13.190534]

    if run.mouse_wheel_move then run.mouse_wheel_move(dx,dy) end

Replacement in main.lua at line 255 [15.2]

B:BD[13.190572] → [14.8396:8473]

    if source.mouse_release then source.mouse_release(x,y, mouse_button) end

[13.190572]

[13.190651]

    if source.mouse_wheel_move then source.mouse_wheel_move(dx,dy) end

Insertion in log_browser.lua at line 264 [13.191243]

[14.8596]

[13.200887]

end
function log_browser.mouse_wheel_move(State, dx,dy)
  if dy > 0 then
    for i=1,math.floor(dy) do
      log_browser.up(State)
    end
  elseif dy < 0 then
    for i=1,math.floor(-dy) do
      log_browser.down(State)
    end
  end

Replacement in log_browser.lua at line 284 [13.191243]

B:BD[13.201029] → [13.201029:201220]

    while State.screen_top1.line > 1 do
      State.screen_top1.line = State.screen_top1.line-1
      if should_show(State.lines[State.screen_top1.line]) then
        break
      end
    end

[13.201029]

[13.201220]

    log_browser.up(State)

Replacement in log_browser.lua at line 286 [13.191243]

B:BD[13.201250] → [13.201250:201452]

    while State.screen_top1.line < #State.lines do
      State.screen_top1.line = State.screen_top1.line+1
      if should_show(State.lines[State.screen_top1.line]) then
        break
      end
    end

[13.201250]

[13.201452]

    log_browser.down(State)

Insertion in log_browser.lua at line 302 [13.191243]

[13.202107]

    end
  end
end
function log_browser.up(State)
  while State.screen_top1.line > 1 do
    State.screen_top1.line = State.screen_top1.line-1
    if should_show(State.lines[State.screen_top1.line]) then
      break

Insertion in log_browser.lua at line 315 [13.191243]

[13.202126]

function log_browser.down(State)
  while State.screen_top1.line < #State.lines do
    State.screen_top1.line = State.screen_top1.line+1
    if should_show(State.lines[State.screen_top1.line]) then
      break
    end
  end
end

Resurrecting zombie bytes in edit.lua at line 199 [19.413]

B:B[18.6276] → [8.1864:2073]

BD:B[18.6276] → [8.1864:2073]

B:B[8.2073] → [3.161:182]

BD:B[8.2073] → [3.161:182]

∅:∅[3.182] → [8.2080:2225]

B:B[8.2080] → [8.2080:2225]

BD:B[8.2080] → [8.2080:2225]

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

Insertion in edit.lua at line 200 [19.413]

[8.1870]

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

Deletion in edit.lua at line 215 [19.413]
B:BD[19.9691] → [20.11508:11579]
```
--?   print('selection:', State.selection1.line, State.selection1.pos)
```