akkartik/pong.love - Change VIGITGW5FAYYF4PDK6XAPI4S43X4FMAMBH77VLGMKLNUY7JJHR4QC

Merge text.love

Created by Kartik K. Agaram on March 23, 2023

VIGITGW5FAYYF4PDK6XAPI4S43X4FMAMBH77VLGMKLNUY7JJHR4QC

Dependencies

In channels

main

Change contents

File deletion: edit.lua, source_edit.lua, edit.lua

BFD:BFD[4.2] → [5.16048:16080]

BFD:BFD[4.2] → [6.173:212]

BFD:BFD[6.212] → [5.413:413]

BFD:BFD[4.2] → [5.16048:16080]

BFD:BFD[5.16080] → [5.413:413]

B:BD[7.6276] → [8.1864:1870]

B:BD[8.1870] → [3.1957:2028]

∅:D[3.2028] → [8.1870:2073]

B:BD[8.1870] → [8.1870:2073]

∅:D[9.182] → [8.2080:2225]

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

∅:D[8.2225] → [5.9685:9691]

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

  end
--?   print('selection:', State.selection1.line, State.selection1.pos)
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] → [10.177715:177749]

BFD:BFD[10.177749] → [10.165829:165829]

B:BD[10.175825] → [3.388:666]

∅:D[3.666] → [11.7081:7111]

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] → [10.183867:183898]
BFD:BFD[4.2] → [10.183867:183898]
BFD:BFD[10.183898] → [10.178107:178107]
B:BD[10.183200] → [3.671:839]
∅:D[3.839] → [11.7796:7823]
```
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
function run.text_input(t)
```

File deletion: log_browser.lua, log_browser.lua

BFD:BFD[4.2] → [10.202684:202723]

BFD:BFD[10.202723] → [10.191243:191243]

B:BD[10.202126] → [3.1720:1948]

∅:D[3.1948] → [10.202126:202624]

B:BD[10.202107] → [3.1504:1719]

∅:D[3.1719] → [10.202107:202126]

B:BD[10.201250] → [3.1475:1503]

∅:D[3.1503] → [10.201452:202107]

B:BD[10.201029] → [3.1448:1474]

∅:D[3.1474] → [10.201220:201250]

B:BD[11.8596] → [3.1211:1447]

∅:D[3.1447] → [10.200887:200892]

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
  elseif dy < 0 then
    for i=1,math.floor(-dy) do
      log_browser.down(State)
    end
  end
end

Deletion in source_edit.lua at line 255 [10.152503]

B:BD[13.25355] → [3.11:386]

BD:BD[13.25355] → [3.11:386]

  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

Solving an order conflict in source_edit.lua at line 255 [10.152503]
[12.8735]
[14.151238]

Insertion in source_edit.lua at line 305 [10.152503]

[12.10502]

  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 321 [15.5]

[15.9498]

[16.6701]

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 main.lua at line 241 [18.2]

[17.102]

[15.15979]

function App.wheelmoved(dx,dy)
  if Current_app == 'run' then
    if run.mouse_wheel_move then run.mouse_wheel_move(dx,dy) end
  elseif Current_app == 'source' then
    if source.mouse_wheel_move then source.mouse_wheel_move(dx,dy) end
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
end

Deletion in main.lua at line 263 [18.2]
B:BD[15.16150] → [16.7991:7991]
B:BD[17.102] → [3.1040:1071]
BD:BD[17.102] → [3.1040:1071]
B:BD[10.190461] → [3.1072:1137]
BD:BD[10.190461] → [3.1072:1137]
B:BD[10.190572] → [3.1138:1209]
BD:BD[10.190572] → [3.1138:1209]
∅:D[6.724] → [10.190651:190711]
∅:D[3.1209] → [10.190651:190711]
∅:D[16.7991] → [10.190651:190711]
∅:D[11.8473] → [10.190651:190711]
B:BD[10.190651] → [10.190651:190711]
∅:D[19.64] → [17.235:241]
∅:D[15.16210] → [17.235:241]
∅:D[10.190711] → [17.235:241]
∅:D[20.191472] → [17.235:241]
B:BD[17.235] → [17.235:241]
B:BD[17.241] → [10.190712:190716]
B:BD[10.190716] → [21.138:138]
```
function App.wheelmoved(dx,dy)
    if run.mouse_wheel_move then run.mouse_wheel_move(dx,dy) end
    if source.mouse_wheel_move then source.mouse_wheel_move(dx,dy) end
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
end
```
Resurrecting zombie bytes in main.lua at line 263 [18.2]
∅:∅[3.842] → [8.823:893]
B:B[22.5101] → [8.823:893]
BD:B[22.5101] → [8.823:893]
BD:B[22.5101] → [8.823:893]
```
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
end
```
Solving an order conflict in main.lua at line 263 [18.2]
[15.16150]
[3.842]
Deletion in main.lua at line 267 [18.2]
B:BD[8.893] → [8.893:894]
BD:BD[8.893] → [8.893:894]
BD:BD[8.893] → [8.893:894]
B:BD[8.894] → [3.843:889]
BD:BD[8.894] → [3.843:889]
BD:BD[8.894] → [3.843:889]
∅:D[3.889] → [8.925:956]
B:BD[8.925] → [8.925:956]
BD:BD[8.925] → [8.925:956]
BD:BD[8.925] → [8.925:956]
BD:BD[8.925] → [8.925:956]
B:BD[8.956] → [3.890:961]
BD:BD[8.956] → [3.890:961]
BD:BD[8.956] → [3.890:961]
BD:BD[8.956] → [3.890:961]
∅:D[3.961] → [8.1021:1059]
B:BD[8.1021] → [8.1021:1059]
BD:BD[8.1021] → [8.1021:1059]
BD:BD[8.1021] → [8.1021:1059]
BD:BD[8.1021] → [8.1021:1059]
B:BD[8.1059] → [3.962:1039]
BD:BD[8.1059] → [3.962:1039]
BD:BD[8.1059] → [3.962:1039]
BD:BD[8.1059] → [3.962:1039]
```
function App.mousereleased(x,y, mouse_button)
  if Current_app == 'run' then
    if run.mouse_release then run.mouse_release(x,y, mouse_button) end
  elseif Current_app == 'source' then
    if source.mouse_release then source.mouse_release(x,y, mouse_button) end
```

Insertion in log_browser.lua at line 264 [24.5]

[16.8116]

[23.477]

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

B:BD[25.186] → [26.5:45]

∅:D[26.45] → [25.225:281]

B:BD[25.225] → [25.225:281]

B:BD[25.281] → [26.46:133]

∅:D[26.133] → [25.281:289]

B:BD[25.281] → [25.281:289]

    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

[25.186]

[25.289]

    log_browser.up(State)

Replacement in log_browser.lua at line 286 [24.5]

B:BD[25.319] → [26.134:185]

∅:D[26.185] → [25.369:425]

B:BD[25.369] → [25.369:425]

B:BD[25.425] → [26.186:273]

∅:D[26.273] → [25.425:433]

B:BD[25.425] → [25.425:433]

    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

[25.319]

[25.433]

    log_browser.down(State)

Insertion in log_browser.lua at line 302 [24.5]

[25.936]

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

[27.423]

[15.18581]

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