akkartik/sokoban.love - Change RXMHAZ6VL4EJMYEZM32G4W54EPF3BPWPIGASJ7ND45FJ5F6TJCZAC

resolve conflicts

Created by akkartik on July 10, 2024

RXMHAZ6VL4EJMYEZM32G4W54EPF3BPWPIGASJ7ND45FJ5F6TJCZAC

Dependencies

In channels

main

Change contents

File deletion: source_undo.lua, source_undo.lua

BFD:BFD[5.2] → [6.3457:3496]

BFD:BFD[6.3496] → [6.5:5]

B:BD[6.1982] → [3.57:113]

∅:D[3.113] → [6.2080:2401]

    table.insert(event.lines, deepcopy(State.lines[i]))
  end
  return event
end
function patch(lines, from, to)
--?   if #from.lines == 1 and #to.lines == 1 then
--?     assert(from.start_line == from.end_line)
--?     assert(to.start_line == to.end_line)
--?     assert(from.start_line == to.start_line)
--?     lines[from.start_line] = to.lines[1]
--?     return
--?   end

File deletion: source_text.lua, source_text.lua

BFD:BFD[5.2] → [6.147062:147101]

BFD:BFD[6.147101] → [6.83723:83723]

B:BD[8.2660] → [4.658:757]

B:BD[9.4458] → [4.758:853]

B:BD[6.108930] → [4.854:949]

B:BD[8.2790] → [4.950:1047]

B:BD[8.3015] → [4.1048:1145]

B:BD[9.6960] → [4.1146:1241]

B:BD[6.146487] → [4.1242:1278]

∅:D[4.1278] → [10.279:557]

∅:D[4.1241] → [6.128682:128822]

∅:D[4.1145] → [6.123313:123324]

∅:D[4.1047] → [6.111315:111326]

∅:D[4.949] → [9.5132:5898]

∅:D[4.853] → [9.4551:4556]

∅:D[4.757] → [6.102788:102856]

      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
  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
    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
--?   print('clearing line caches')
  -- Perform some early sanity checking here, in hopes that we correctly call
  -- this whenever we change editor state.
  if State.right <= State.left then
    assert(false, ('Right margin %d must be to the right of the left margin %d'):format(State.right, State.left))
  end
end
function Text.in_line(State, line_index, x,y)
  local line = State.lines[line_index]
  local line_cache = State.line_cache[line_index]
  end
end
  end
end
end
-- return the location of the start of the bottom-most line on screen
function Text.screen_bottom1(State)
  -- duplicate some logic from love.draw
  -- does not modify State (except to populate line_cache)
  local loc2 = Text.to2(State, State.screen_top1)
  local y = State.top
  while true do
    if State.lines[loc2.line].mode == 'text' then
      y = y + State.line_height
    elseif State.lines[loc2.line].mode == 'drawing' then
      y = y + Drawing_padding_height + Drawing.pixels(State.lines[loc2.line].h, State.width)
    end
    if y + State.line_height > App.screen.height then break end
    local next_loc2 = Text.next_screen_line(State, loc2)
    if Text.eq2(next_loc2, loc2) then break end
    loc2 = next_loc2
  end
  return Text.to1(State, loc2)
end
    end
    Text.clear_screen_line_cache(State, State.cursor1.line)

File deletion: source_edit.lua, source_edit.lua

BFD:BFD[5.2] → [6.165725:165764]

BFD:BFD[6.165764] → [6.152440:152440]

B:BD[6.153505] → [4.1283:1397]

B:BD[6.158402] → [4.1398:1497]

B:BD[11.23121] → [4.1498:1597]

B:BD[11.23211] → [4.1598:1697]

∅:D[4.1697] → [6.161779:161829]

∅:D[4.1597] → [6.161276:161340]

∅:D[4.1497] → [6.158499:158563]

∅:D[4.1397] → [6.153789:154135]

    --   screen_line_starting_pos: optional array of codepoint indices if it wraps over more than one screen line
      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
      Text.redraw_all(State)  -- if we're scrolling, reclaim all line caches to avoid memory leaks
      schedule_save(State)
    end
  -- clipboard
      schedule_save(State)
    end
  elseif chord == 'C-y' then
    elseif chord == 'return' then
      State.search_term = nil
    line_cache = {},
    -- Given wrapping, any potential location for the text cursor can be described in two ways:
    -- * schema 1: As a combination of line index and position within a line (in utf8 codepoint units)
    -- * schema 2: As a combination of line index, screen line index within the line, and a position within the screen line.

Deletion in undo.lua at line 59 [14.1]

B:BD[12.269] → [13.1:33]

B:BD[13.33] → [15.2:2]

B:BD[15.2] → [15.3:102]

B:BD[15.102] → [7.2:2]

    local line = State.lines[i]
    table.insert(event.lines, {data=line.data})  -- I've forgotten: should we deepcopy(line.data)?

Deletion in source_undo.lua at line 60 [16.68]
B:BD[16.1968] → [16.1968:2030]
```
  -- deep copy lines without cached stuff like text fragments
```

Replacement in source_undo.lua at line 61 [16.68]

B:BD[16.2045] → [16.2045:2077]

B:BD[16.2077] → [17.108:140]

B:BD[17.140] → [15.109:223]

∅:D[15.223] → [17.221:260]

B:BD[17.221] → [17.221:260]

B:BD[17.260] → [15.224:356]

∅:D[15.356] → [17.750:759]

B:BD[17.750] → [17.750:759]

B:BD[17.759] → [7.309:373]

∅:D[7.373] → [17.802:810]

B:BD[17.802] → [17.802:810]

    local line = State.lines[i]
    if line.mode == 'text' then
      table.insert(event.lines, {mode='text', data=line.data})  -- I've forgotten: should we deepcopy(line.data)?
    elseif line.mode == 'drawing' then
      table.insert(event.lines, {mode='drawing', h=line.h, points=deepcopy(line.points), shapes=deepcopy(line.shapes), pending={}})
    else
      assert(false, ('unknown line mode %s'):format(line.mode))
    end

[16.2045]

[16.2143]

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

Deletion in source_undo.lua at line 84 [16.68]

B:BD[16.2725] → [16.2725:2775]

B:BD[16.2775] → [7.538:615]

∅:D[7.615] → [16.2818:2900]

B:BD[16.2818] → [16.2818:2900]

B:BD[16.2900] → [7.616:701]

∅:D[7.701] → [16.2951:3037]

B:BD[16.2951] → [16.2951:3037]

function patch_placeholders(line_cache, from, to)
  assert(from.start_line == to.start_line, 'failed to patch undo operation')
  for i=from.end_line,from.start_line,-1 do
    table.remove(line_cache, i)
  end
  assert(#to.lines == to.end_line-to.start_line+1, 'failed to patch undo operation')
  for i=1,#to.lines do
    table.insert(line_cache, to.start_line+i-1, {})
  end
end

Replacement in source_text.lua at line 292 [16.83786]

∅:D[18.2025] → [16.102754:102851]

B:BD[16.102754] → [16.102754:102851]

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

[18.2025]

[16.102851]

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

Replacement in source_text.lua at line 430 [16.83786]

B:BD[19.2531] → [19.2531:2624]

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

[19.2531]

[19.2624]

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

Replacement in source_text.lua at line 479 [16.83786]

B:BD[16.109040] → [16.109040:109133]

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

[16.108993]

[19.4185]

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

Replacement in source_text.lua at line 541 [16.83786]

B:BD[18.4150] → [18.4150:4245]

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

[18.4150]

[16.111378]

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

Replacement in source_text.lua at line 687 [16.83786]

B:BD[18.4881] → [18.4881:4976]

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

[18.4881]

[16.123376]

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

Replacement in source_text.lua at line 832 [16.83786]

∅:D[18.5608] → [16.128639:128732]

∅:D[19.6538] → [16.128639:128732]

B:BD[16.128639] → [16.128639:128732]

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

[19.6538]

[16.128745]

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

Replacement in source_text.lua at line 1121 [16.83786]
B:BD[16.146550] → [16.146550:146584]
```
--?   print('clearing fragments')
```
[16.146550]
[20.201]
```
--?   print('clearing line caches')
```

Replacement in source_edit.lua at line 56 [16.152503]

B:BD[16.153638] → [15.1398:1479]

∅:D[15.1479] → [16.153739:153852]

B:BD[16.153739] → [16.153739:153852]

    --   fragments: snippets of the line guaranteed to not straddle screen lines
    --   screen_line_starting_pos: optional array of grapheme indices if it wraps over more than one screen line

[16.153568]

[16.153852]

    --   screen_line_starting_pos: optional array of codepoint indices if it wraps over more than one screen line

Replacement in source_edit.lua at line 402 [16.152503]

B:BD[16.158465] → [16.158465:158562]

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

[16.158465]

[16.158562]

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

Deletion in source_edit.lua at line 444 [16.152503]
B:BD[16.161167] → [16.161167:161237]
```
      patch_placeholders(State.line_cache, event.after, event.before)
```

Replacement in source_edit.lua at line 446 [16.152503]

∅:D[17.21671] → [16.161237:161339]

B:BD[16.161237] → [16.161237:161339]

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

[17.21671]

[16.161339]

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

Replacement in source_edit.lua at line 459 [16.152503]

∅:D[17.21761] → [16.161740:161842]

B:BD[16.161740] → [16.161740:161842]

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

[17.21761]

[16.161842]

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

Replacement in edit.lua at line 277 [22.413]

B:BD[21.6353] → [21.6353:6450]

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

[21.6353]

[21.6450]

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

Replacement in edit.lua at line 322 [22.413]

B:BD[21.7991] → [21.7991:8163]

      patch_placeholders(State.line_cache, event.after, event.before)
      -- if we're scrolling, reclaim all fragments to avoid memory leaks
      Text.redraw_all(State)

[21.7991]

[21.8163]

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

Replacement in edit.lua at line 333 [22.413]

B:BD[21.8613] → [21.8613:8715]

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

[21.8613]

[21.8715]

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

Deletion in edit.lua at line 449 [22.413]
B:BD[21.12430] → [2.1075:1075]
B:BD[23.296] → [4.1915:2014]
BD:BD[23.296] → [4.1915:2014]
BD:BD[23.296] → [4.1915:2014]
B:BD[23.104] → [4.1815:1914]
BD:BD[23.104] → [4.1815:1914]
BD:BD[23.104] → [4.1815:1914]
B:BD[25.7184] → [4.1715:1814]
BD:BD[25.7184] → [4.1715:1814]
```
      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
      Text.redraw_all(State)  -- if we're scrolling, reclaim all line caches to avoid memory leaks
```
Solving an order conflict in edit.lua at line 449 [22.413]
[21.12430]