akkartik/wardley.love - Change MIKAQWHPJFAELPV7ATGH6DWR7V4FKHAOYMPAKVFFSGEUNE5IVIDQC

bring back everything from commit a68647ae22

We only want to unwind the source editing.

Created by Kartik K. Agaram on November 6, 2022

MIKAQWHPJFAELPV7ATGH6DWR7V4FKHAOYMPAKVFFSGEUNE5IVIDQC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 121 [4.1]

B:BD[3.2940] → [2.75:152]

--?     print('x: '..tostring(x)..'; '..tostring(State.right-x)..'px to go')

[3.2940]

[5.3]

--?     print('x: '..tostring(x)..'; frag_width: '..tostring(frag_width)..'; '..tostring(State.right-x)..'px to go')

Replacement in text.lua at line 364 [4.1]

B:BD[6.242] → [2.153:221]

  State.cursor1.line = State.cursor1.line+1
  State.cursor1.pos = 1

[6.242]

[7.46]

  State.cursor1 = {line=State.cursor1.line+1, pos=1}

Replacement in text.lua at line 380 [4.1]

B:BD[8.858] → [2.222:312]

  State.cursor1.line = State.screen_top1.line
  State.cursor1.pos = State.screen_top1.pos

[8.858]

[9.537]

  State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}

Replacement in text.lua at line 399 [4.1]

B:BD[10.3234] → [2.313:421]

    State.screen_top1.line = State.screen_bottom1.line
    State.screen_top1.pos = State.screen_bottom1.pos

[10.3234]

[10.3318]

    State.screen_top1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos}

Replacement in text.lua at line 402 [4.1]

B:BD[11.3692] → [2.422:512]

  State.cursor1.line = State.screen_top1.line
  State.cursor1.pos = State.screen_top1.pos

[11.3692]

[9.707]

  State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}

Insertion in text.lua at line 467 [4.1]

[12.224]

[13.128]

    Text.populate_screen_line_starting_pos(State, State.cursor1.line)

Insertion in text.lua at line 613 [4.1]

[9.2786]

--?   print('to2:', State.cursor1.line, State.cursor1.pos)

Insertion in text.lua at line 615 [4.1]

[9.2832]

[14.533]

--?   print('to2: =>', top2.line, top2.screen_line, top2.screen_pos)
  -- slide to start of screen line

Insertion in text.lua at line 618 [4.1]

[14.580]

[8.3087]

--?   print('snap', State.screen_top1.line, State.screen_top1.pos, State.screen_top1.posB, State.cursor1.line, State.cursor1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)

Insertion in text.lua at line 635 [4.1]

[8.3781]

--?   print('snap =>', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)

Replacement in text.lua at line 792 [4.1]

B:BD[15.34] → [2.513:562]

  local result = {line=loc1.line, screen_line=1}

[15.34]

[16.3]

  local result = {line=loc1.line}

Replacement in search.lua at line 24 [18.48846]

B:BD[17.758] → [2.607:702]

  local pos = find(State.lines[State.cursor1.line].data, State.search_term, State.cursor1.pos)

[17.758]

[19.101]

  local pos = find(State.lines[State.cursor1.line].data, State.search_term, State.cursor1.pos, --[[literal]] true)

Replacement in search.lua at line 31 [18.48846]

B:BD[20.211] → [2.703:760]

      pos = find(State.lines[i].data, State.search_term)

[20.211]

[19.201]

      pos = find(State.lines[i].data, State.search_term, --[[from start]] nil, --[[literal]] true)

Replacement in search.lua at line 33 [18.48846]

B:BD[19.219] → [2.761:824]

        State.cursor1.line = i
        State.cursor1.pos = pos

[19.219]

[19.282]

        State.cursor1 = {line=i, pos=pos}

Replacement in search.lua at line 41 [18.48846]

B:BD[20.368] → [2.825:882]

      pos = find(State.lines[i].data, State.search_term)

[20.368]

[18.50189]

      pos = find(State.lines[i].data, State.search_term, --[[from start]] nil, --[[literal]] true)

Replacement in search.lua at line 43 [18.48846]

B:BD[18.50207] → [2.883:946]

        State.cursor1.line = i
        State.cursor1.pos = pos

[18.50207]

[18.50258]

        State.cursor1 = {line=i, pos=pos}

Replacement in search.lua at line 50 [18.48846]

B:BD[17.833] → [2.947:1019]

    pos = find(State.lines[State.cursor1.line].data, State.search_term)

[17.833]

[19.427]

    pos = find(State.lines[State.cursor1.line].data, State.search_term, --[[from start]] nil, --[[literal]] true)

Replacement in search.lua at line 70 [18.48846]

B:BD[21.800] → [2.1020:1118]

  local pos = rfind(State.lines[State.cursor1.line].data, State.search_term, State.cursor1.pos-1)

[21.800]

[18.50856]

  local pos = rfind(State.lines[State.cursor1.line].data, State.search_term, State.cursor1.pos-1, --[[literal]] true)

Replacement in search.lua at line 77 [18.48846]

B:BD[20.1238] → [2.1119:1177]

      pos = rfind(State.lines[i].data, State.search_term)

[20.1238]

[18.50998]

      pos = rfind(State.lines[i].data, State.search_term, --[[from end]] nil, --[[literal]] true)

Replacement in search.lua at line 79 [18.48846]

B:BD[18.51016] → [2.1178:1241]

        State.cursor1.line = i
        State.cursor1.pos = pos

[18.51016]

[18.51067]

        State.cursor1 = {line=i, pos=pos}

Replacement in search.lua at line 87 [18.48846]

B:BD[20.1411] → [2.1242:1300]

      pos = rfind(State.lines[i].data, State.search_term)

[20.1411]

[18.51229]

      pos = rfind(State.lines[i].data, State.search_term, --[[from end]] nil, --[[literal]] true)

Replacement in search.lua at line 89 [18.48846]

B:BD[18.51247] → [2.1301:1364]

        State.cursor1.line = i
        State.cursor1.pos = pos

[18.51247]

[18.51298]

        State.cursor1 = {line=i, pos=pos}

Replacement in search.lua at line 96 [18.48846]

B:BD[21.910] → [2.1365:1438]

    pos = rfind(State.lines[State.cursor1.line].data, State.search_term)

[21.910]

[21.983]

    pos = rfind(State.lines[State.cursor1.line].data, State.search_term, --[[from end]] nil, --[[literal]] true)

Replacement in search.lua at line 114 [18.48846]
B:BD[19.507] → [2.1439:1464]
```
function find(s, pat, i)
```
[19.507]
[19.532]
```
function find(s, pat, i, plain)
```
Replacement in search.lua at line 116 [18.48846]
B:BD[19.562] → [2.1465:1489]
```
  return s:find(pat, i)
```
[19.562]
[18.51762]
```
  return s:find(pat, i, plain)
```
Replacement in search.lua at line 119 [18.48846]
B:BD[18.51767] → [2.1490:1516]
```
function rfind(s, pat, i)
```
[18.51767]
[19.587]
```
function rfind(s, pat, i, plain)
```
Replacement in search.lua at line 125 [18.48846]
B:BD[18.51901] → [2.1517:1553]
```
  local rendpos = rs:find(rpat, ri)
```
[18.51901]
[18.51937]
```
  local rendpos = rs:find(rpat, ri, plain)
```

Insertion in main_tests.lua at line 9 [23.7]

[22.4513]

[23.309]

  check_eq(Editor_state.right, 300 - Test_margin_right, 'F - test_resize_window/baseline/left_margin')

Insertion in main_tests.lua at line 11 [23.7]
[23.332]
[23.332]
```
  -- ugly; resize switches to real, non-test margins
```

Replacement in main_tests.lua at line 14 [23.7]

B:BD[23.466] → [2.1594:1733]

  check_eq(Editor_state.left, Test_margin_left, 'F - test_resize_window/left_margin')
  -- ugly; right margin switches from 0 after resize

[23.466]

[24.401]

  check_eq(Editor_state.left, Margin_left, 'F - test_resize_window/left_margin')

Replacement in main_tests.lua at line 16 [23.7]

B:BD[24.489] → [2.1734:1840]

  check_eq(Editor_state.width, 200-Test_margin_left-Margin_right, 'F - test_resize_window/drawing_width')

[24.489]

[23.466]

  check_eq(Editor_state.width, 200-Margin_left-Margin_right, 'F - test_resize_window/drawing_width')

Deletion in main.lua at line 73 [25.2]

B:BD[2.3422] → [2.3422:3495]

  love.window.setPosition(settings.x, settings.y, settings.displayindex)

Insertion in main.lua at line 78 [25.2]

[2.3805]

  love.window.setPosition(settings.x, settings.y, settings.displayindex)

Replacement in main.lua at line 154 [25.2]
B:BD[2.6317] → [2.6317:6352]
```
  if filename:sub(1,1) ~= '/' then
```
[2.6317]
[2.6352]
```
  if is_relative_path(filename) then
```

Replacement in keychord.lua at line 59 [27.467]

B:BD[26.228] → [2.7811:7876]

  for i,x in ipairs(arr) do
    if x == elem then
      return i

[26.228]

[28.203813]

  if type(elem) == 'function' then
    for i,x in ipairs(arr) do
      if elem(x) then
        return i
      end

Insertion in keychord.lua at line 65 [27.467]

[28.203821]

[29.73]

  else
    for i,x in ipairs(arr) do
      if x == elem then
        return i
      end
    end

Replacement in file.lua at line 40 [31.15083]

B:BD[30.419] → [2.7879:7914]

    outfile:write(line.data, '\n')

[30.419]

[31.16214]

    outfile:write(line.data)
    outfile:write('\n')

Insertion in file.lua at line 61 [31.15083]

[31.18211]


function is_absolute_path(path)
  local os_path_separator = package.config:sub(1,1)
  if os_path_separator == '/' then
    -- POSIX systems permit backslashes in filenames
    return path:sub(1,1) == '/'
  elseif os_path_separator == '\\' then
    if path:sub(2,2) == ':' then return true end  -- DOS drive letter followed by volume separator
    local f = path:sub(1,1)
    return f == '/' or f == '\\'
  else
    error('What OS is this? LÖVE reports that the path separator is "'..os_path_separator..'"')
  end
end
function is_relative_path(path)
  return not is_absolute_path(path)
end

Replacement in edit.lua at line 67 [32.413]

B:BD[32.3539] → [2.7971:8036]

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

[32.3539]

[33.97660]

    filename = love.filesystem.getUserDirectory()..'/lines.txt',  -- '/' should work even on Windows

Replacement in edit.lua at line 97 [32.413]

B:BD[34.3095] → [2.8037:8080]

    State.screen_bottom1.line = line_index

[34.3095]

[35.9505]

    State.screen_bottom1 = {line=line_index, pos=nil}

Replacement in edit.lua at line 234 [32.413]

B:BD[34.7565] → [2.8212:8365]

    State.search_backup = {cursor={line=State.cursor1.line, pos=State.cursor1.pos}, screen_top={line=State.screen_top1.line, pos=State.screen_top1.pos}}

[34.7565]

[34.7718]

    State.search_backup = {
      cursor={line=State.cursor1.line, pos=State.cursor1.pos},
      screen_top={line=State.screen_top1.line, pos=State.screen_top1.pos},
    }

Insertion in edit.lua at line 330 [32.413]

[22.5400]

-- Insulate tests from some key globals so I don't have to change the vast
-- majority of tests when they're modified for the real app.

Insertion in edit.lua at line 333 [32.413]
[22.5422]
[22.5422]
```
Test_margin_right = 0
```

Replacement in edit.lua at line 340 [32.413]

B:BD[22.5600] → [2.8366:8411]

      App.screen.width,  -- right margin = 0

[22.5600]

[22.5645]

      App.screen.width - Test_margin_right,

Insertion in app.lua at line 14 [36.2]
[36.54]
[29.84]
```
  App.snapshot_love()
```

Insertion in app.lua at line 127 [36.2]

[28.209590]

[29.86]

-- save/restore various framework globals we care about -- only on very first load
function App.snapshot_love()
  if Love_snapshot then return end
  Love_snapshot = {}
  -- save the entire initial font; it doesn't seem reliably recreated using newFont
  Love_snapshot.initial_font = love.graphics.getFont()
end
function App.undo_initialize()
  love.graphics.setFont(Love_snapshot.initial_font)
end

Insertion in app.lua at line 151 [36.2]

[37.6072]

[38.1088]

end
-- operations on the LÖVE window within the monitor/display
function App.screen.resize(width, height, flags)
  App.screen.width = width
  App.screen.height = height
  App.screen.flags = flags
end
function App.screen.size()
  return App.screen.width, App.screen.height, App.screen.flags

Insertion in app.lua at line 164 [36.2]

[38.1093]

[37.6077]

function App.screen.move(x,y, displayindex)
  App.screen.x = x
  App.screen.y = y
  App.screen.displayindex = displayindex
end
function App.screen.position()
  return App.screen.x, App.screen.y, App.screen.displayindex
end

Insertion in app.lua at line 191 [36.2]

[39.1374]

[37.6421]

end
function colortable(app_color)
  return {app_color.r, app_color.g, app_color.b, app_color.a}

Insertion in app.lua at line 403 [36.2]

[37.7988]

  App.screen.resize = love.window.setMode
  App.screen.size = love.window.getMode
  App.screen.move = love.window.setPosition
  App.screen.position = love.window.getPosition

Insertion in Manual_tests.md at line 6 [40.1]
[28.210131]
[2.8731]
```
Startup:
    - terminal log shows unit tests running
```