akkartik/view.love - Change 76EMLHMQNNS7BIJ5OKBSYWX7ZS4WUK7BXGW6QBOMOZKCZ6DXEHWQC

resolve conflicts

Created by akkartik on July 10, 2024

76EMLHMQNNS7BIJ5OKBSYWX7ZS4WUK7BXGW6QBOMOZKCZ6DXEHWQC

Dependencies

In channels

main

Change contents

File deletion: undo.lua

BF:BFD[7.2] → [5.0:32]

BF:BFD[5.32] → [5.33:33]

B:BD[5.33] → [5.34:516]

-- https://stackoverflow.com/questions/640642/how-do-you-copy-a-lua-table-by-value/26367080#26367080
function deepcopy(obj, seen)
  if type(obj) ~= 'table' then return obj end
  if seen and seen[obj] then return seen[obj] end
  local s = seen or {}
  local result = setmetatable({}, getmetatable(obj))
  s[obj] = result
  for k,v in pairs(obj) do
    result[deepcopy(k, s)] = deepcopy(v, s)
  end
  return result
end
function minmax(a, b)
  return math.min(a,b), math.max(a,b)
end

File un-deletion: undo.lua, undo.lua
BFD:BF[8.2772] → [8.1:1]
BFD:BF[7.2] → [8.2740:2772]
BFD:BF[7.2] → [8.2740:2772]

Replacement in undo.lua at line 1 [8.1]

B:BD[9.269] → [10.0:56]

BD:BD[9.269] → [10.0:56]

    table.insert(event.lines, deepcopy(State.lines[i]))

[8.1]

-- https://stackoverflow.com/questions/640642/how-do-you-copy-a-lua-table-by-value/26367080#26367080
function deepcopy(obj, seen)
  if type(obj) ~= 'table' then return obj end
  if seen and seen[obj] then return seen[obj] end
  local s = seen or {}
  local result = setmetatable({}, getmetatable(obj))
  s[obj] = result
  for k,v in pairs(obj) do
    result[deepcopy(k, s)] = deepcopy(v, s)
  end
  return result
end
function minmax(a, b)
  return math.min(a,b), math.max(a,b)
end

Deletion in text.lua at line 140 [14.1]
B:BD[12.1104] → [13.33:132]
BD:BD[12.1104] → [13.33:132]
BD:BD[12.1104] → [13.33:132]
```
      Text.redraw_all(State)  -- if we're scrolling, reclaim all line caches to avoid memory leaks
```

Deletion in edit.lua at line 289 [16.413]

B:BD[15.7991] → [6.1222:1321]

BD:BD[15.7991] → [6.1222:1321]

B:BD[15.8613] → [6.1322:1421]

BD:BD[15.8613] → [6.1322:1421]

      Text.redraw_all(State)  -- if we're scrolling, reclaim all line caches to avoid memory leaks
      Text.redraw_all(State)  -- if we're scrolling, reclaim all line caches to avoid memory leaks