akkartik/capture.love - Change MSDHRXWUFZFE6DZTRMJLLCKZYW4RDMNYK367X5NFKKNP55EJJ7VAC

Merge upstream into main

Created by Kartik K. Agaram on July 13, 2022

MSDHRXWUFZFE6DZTRMJLLCKZYW4RDMNYK367X5NFKKNP55EJJ7VAC

Dependencies

In channels

main

Change contents

Deletion in main_tests.lua at line 12 [6.7]

B:BD[4.631] → [5.84826:85118]

BD:BD[4.631] → [5.84826:85118]

B:BD[4.64] → [3.17142:17201]

BD:BD[4.64] → [3.17142:17201]

B:BD[7.234] → [5.85186:85266]

BD:BD[7.234] → [5.85186:85266]

B:BD[5.85266] → [8.167:197]

BD:BD[5.85266] → [8.167:197]

B:BD[7.99] → [3.17202:17261]

BD:BD[7.99] → [3.17202:17261]

  check_eq(#Editor_state.lines, 3, 'F - test_drop_file/#lines')
  check_eq(Editor_state.lines[1].data, 'abc', 'F - test_drop_file/lines:1')
  check_eq(Editor_state.lines[2].data, 'def', 'F - test_drop_file/lines:2')
  check_eq(Editor_state.lines[3].data, 'ghi', 'F - test_drop_file/lines:3')
  App.screen.init{width=Editor_state.left+300, height=300}
  Editor_state.lines = load_array{'abc', 'def'}
  Editor_state.filename = 'foo'
  schedule_save(Editor_state)
  App.screen.init{width=Editor_state.left+300, height=300}

Deletion in main.lua at line 17 [10.2]

B:BD[9.4] → [2.8:147]

BD:BD[9.4] → [2.8:147]

Directory = love.filesystem.getUserDirectory()..'/pensieve'
Filename = love.filesystem.getUserDirectory()..'/lines.txt'  -- just for tests

Deletion in main.lua at line 40 [10.2]

B:BD[2.168] → [2.168:303]

B:BD[12.63] → [5.85310:85546]

BD:BD[12.63] → [5.85310:85546]

B:BD[13.319] → [5.85547:85585]

BD:BD[13.319] → [5.85547:85585]

B:BD[13.383] → [5.85586:85823]

BD:BD[13.383] → [5.85586:85823]

B:BD[13.540] → [5.85824:85864]

BD:BD[13.540] → [5.85824:85864]

B:BD[14.466] → [5.85865:85928]

BD:BD[14.466] → [5.85865:85928]

  Filename = Directory..os.date('/%Y/%m/%d/%H-%M-%S')
  os.execute('mkdir -p '..dirname(Filename))
  assert(not file_exists(Filename))
    Editor_state.filename = arg[1]
    Editor_state.lines = load_from_disk(Editor_state.filename)
    Editor_state.screen_top1 = {line=1, pos=1}
    Editor_state.cursor1 = {line=1, pos=1}
    for i,line in ipairs(Editor_state.lines) do
        Editor_state.cursor1.line = i
    Editor_state.lines = load_from_disk(Editor_state.filename)
    if Editor_state.cursor1.line > #Editor_state.lines or Editor_state.lines[Editor_state.cursor1.line].mode ~= 'text' then
      for i,line in ipairs(Editor_state.lines) do
          Editor_state.cursor1.line = i
  love.window.setTitle('lines.love - '..Editor_state.filename)

Solving an order conflict in main.lua at line 40 [10.2]
[2.168]

Insertion in main.lua at line 40 [10.2]

[0.9]

[15.8]

  Editor_state.filename = Editor_state.directory..os.date('/%Y/%m/%d/%H-%M-%S')
  os.execute('mkdir -p '..dirname(Editor_state.filename))
  assert(not file_exists(Editor_state.filename))

Replacement in main.lua at line 44 [10.2]

B:BD[15.9] → [2.304:356]

  love.window.setTitle('capture.love - '..Filename)

[15.9]

[16.8]

  love.window.setTitle('capture.love - '..Editor_state.filename)

Deletion in main.lua at line 66 [10.2]
∅:D[3.17444] → [5.85929:85973]
B:BD[17.517] → [5.85929:85973]
```
  Editor_state.filename = settings.filename
```
Deletion in main.lua at line 70 [10.2]
∅:D[3.17700] → [5.85974:86064]
B:BD[13.983] → [5.85974:86064]
```
  Editor_state.screen_top1 = settings.screen_top
  Editor_state.cursor1 = settings.cursor
```
Deletion in main.lua at line 105 [10.2]
B:BD[7.1059] → [5.86541:86634]
BD:BD[7.1059] → [5.86541:86634]
B:BD[18.8235] → [5.86635:86680]
BD:BD[18.8235] → [5.86635:86680]
B:BD[19.88] → [5.86681:86725]
BD:BD[19.88] → [5.86681:86725]
B:BD[20.16] → [5.86726:86772]
BD:BD[20.16] → [5.86726:86772]
B:BD[14.532] → [5.86773:86809]
BD:BD[14.532] → [5.86773:86809]
B:BD[14.568] → [5.86810:86891]
BD:BD[14.568] → [5.86810:86891]
```
  if Editor_state.next_save then
    save_to_disk(Editor_state.lines, Editor_state.filename)
  Editor_state.filename = file:getFilename()
  Editor_state.lines = load_from_file(file)
  for i,line in ipairs(Editor_state.lines) do
      Editor_state.cursor1.line = i
  love.window.setTitle('Text with Editor_state.lines - '..Editor_state.filename)
```

Deletion in main.lua at line 127 [10.2]

B:BD[21.135] → [5.86892:86933]

∅:D[5.86933] → [22.36:181]

B:BD[22.36] → [22.36:181]

  local filename = Editor_state.filename
  if filename:sub(1,1) ~= '/' then
    filename = love.filesystem.getWorkingDirectory()..'/'..filename  -- '/' should work even on Windows
  end

Replacement in main.lua at line 131 [10.2]
∅:D[5.86976] → [22.182:205]
B:BD[23.37] → [22.182:205]
B:BD[22.205] → [5.86977:87047]
```
    filename=filename,
    screen_top=Editor_state.screen_top1, cursor=Editor_state.cursor1}
```
[5.86976]
[21.339]
```
  }
```
Deletion in file.lua at line 2 [24.15083]
B:BD[24.15167] → [2.363:364]
BD:BD[24.15167] → [2.363:364]

Resurrecting zombie bytes in file.lua at line 2 [24.15083]

B:B[2.364] → [2.364:529]

BD:B[2.364] → [2.364:529]

function file_exists(filename)
  local infile = App.open_for_reading(filename)
  if infile then
    infile:close()
    return true
  else
    return false
  end
end

Insertion in file.lua at line 11 [24.15083]
[2.529]
[24.15168]

Replacement in edit.lua at line 106 [11.413]

B:BD[11.3616] → [5.97595:97660]

    filename = love.filesystem.getUserDirectory()..'/lines.txt',

[11.3616]

[5.97660]

    directory = love.filesystem.getUserDirectory()..'/pensieve',
    filename = love.filesystem.getUserDirectory()..'/lines.txt',  -- just for tests

Merge upstream into main

Dependencies

In channels

Change contents

Deletion in main_tests.lua at line 12 [6.7]

Deletion in main.lua at line 17 [10.2]

Deletion in main.lua at line 40 [10.2]

Solving an order conflict in main.lua at line 40 [10.2]

Insertion in main.lua at line 40 [10.2]

Replacement in main.lua at line 44 [10.2]

Deletion in main.lua at line 66 [10.2]

Deletion in main.lua at line 70 [10.2]

Deletion in main.lua at line 105 [10.2]

Deletion in main.lua at line 127 [10.2]

Replacement in main.lua at line 131 [10.2]

Deletion in file.lua at line 2 [24.15083]

Resurrecting zombie bytes in file.lua at line 2 [24.15083]

Insertion in file.lua at line 11 [24.15083]

Replacement in edit.lua at line 106 [11.413]