akkartik/pong.love - Change Q65423XUYWJ5ESAH2B63MJKJUXSTQDANPZRRMQNYTDF3YGT5HLRAC

resolve conflicts

Created by akkartik on June 11, 2024

Q65423XUYWJ5ESAH2B63MJKJUXSTQDANPZRRMQNYTDF3YGT5HLRAC

Dependencies

In channels

main

Change contents

Deletion in text_tests.lua at line 52 [7.2]
B:BD[6.5175] → [6.5175:5210]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 231 [7.2]
B:BD[6.11649] → [6.11649:11684]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in text_tests.lua at line 232 [7.2]

B:BD[6.11715] → [6.11715:11810]

  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache

[6.11715]

[6.11810]

  edit.draw(Editor_state)  -- populate line_cache.startpos for each line

Deletion in text_tests.lua at line 249 [7.2]
B:BD[6.12520] → [6.12520:12555]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 268 [7.2]
B:BD[6.13362] → [6.13362:13397]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 286 [7.2]
B:BD[6.14100] → [6.14100:14135]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 304 [7.2]
B:BD[8.529] → [8.529:564]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 321 [7.2]
B:BD[6.14635] → [6.14635:14670]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 337 [7.2]
B:BD[6.15218] → [6.15218:15253]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 353 [7.2]
B:BD[6.15804] → [6.15804:15839]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 370 [7.2]
B:BD[6.16459] → [6.16459:16494]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 388 [7.2]
B:BD[6.17320] → [6.17320:17355]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 405 [7.2]
B:BD[6.18098] → [6.18098:18133]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 422 [7.2]
B:BD[6.18789] → [6.18789:18824]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 440 [7.2]
B:BD[6.19461] → [6.19461:19496]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 462 [7.2]
B:BD[6.20435] → [6.20435:20470]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 482 [7.2]
B:BD[6.21263] → [6.21263:21298]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 505 [7.2]
B:BD[6.22314] → [6.22314:22349]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 529 [7.2]
B:BD[6.23447] → [6.23447:23482]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 547 [7.2]
B:BD[6.24152] → [6.24152:24187]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 569 [7.2]
B:BD[6.25085] → [6.25085:25120]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 586 [7.2]
B:BD[6.25765] → [6.25765:25800]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 602 [7.2]
B:BD[6.26400] → [6.26400:26435]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 623 [7.2]
B:BD[6.27242] → [6.27242:27277]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 640 [7.2]
B:BD[6.27881] → [6.27881:27916]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 657 [7.2]
B:BD[6.28519] → [6.28519:28554]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 675 [7.2]
B:BD[6.29204] → [6.29204:29239]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 698 [7.2]
B:BD[6.30128] → [6.30128:30163]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 716 [7.2]
B:BD[6.30800] → [6.30800:30835]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 744 [7.2]
B:BD[6.31920] → [6.31920:31955]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 760 [7.2]
B:BD[6.32618] → [6.32618:32653]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 788 [7.2]
B:BD[6.33762] → [6.33762:33797]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in text_tests.lua at line 789 [7.2]

B:BD[6.33828] → [6.33828:33923]

  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache

[6.33828]

[6.33923]

  edit.draw(Editor_state)  -- populate line_cache.startpos for each line

Deletion in text_tests.lua at line 807 [7.2]
B:BD[9.431] → [9.431:466]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in text_tests.lua at line 808 [7.2]

B:BD[9.497] → [9.497:592]

  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache

[9.497]

[9.592]

  edit.draw(Editor_state)  -- populate line_cache.startpos for each line

Deletion in text_tests.lua at line 824 [7.2]
B:BD[9.1289] → [9.1289:1324]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 846 [7.2]
B:BD[9.2348] → [9.2348:2383]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 866 [7.2]
B:BD[6.34743] → [6.34743:34778]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in text_tests.lua at line 867 [7.2]

B:BD[6.34809] → [6.34809:34904]

  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache

[6.34809]

[6.34904]

  edit.draw(Editor_state)  -- populate line_cache.startpos for each line

Deletion in text_tests.lua at line 890 [7.2]
B:BD[6.36006] → [6.36006:36041]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in text_tests.lua at line 891 [7.2]

B:BD[6.36072] → [6.36072:36167]

  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache

[6.36072]

[6.36167]

  edit.draw(Editor_state)  -- populate line_cache.startpos for each line

Deletion in text_tests.lua at line 919 [7.2]
B:BD[9.3247] → [9.3247:3282]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 940 [7.2]
B:BD[6.37647] → [6.37647:37682]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 955 [7.2]
B:BD[6.38179] → [6.38179:38214]
```
  Editor_state.screen_bottom1 = {}
```

Deletion in text_tests.lua at line 971 [7.2]

B:BD[6.38812] → [6.38812:39590]

B:BD[6.39590] → [10.1705:1769]

∅:D[10.1769] → [6.39642:40101]

B:BD[6.39642] → [6.39642:40101]

function test_pagedown_often_shows_start_of_wrapping_line()
  -- draw a few lines ending in part of a wrapping line
  App.screen.init{width=50, height=60}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc', 'def ghi jkl', 'mno'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=1, pos=1}
  Editor_state.screen_top1 = {line=1, pos=1}
  Editor_state.screen_bottom1 = {}
  edit.draw(Editor_state)
  local y = Editor_state.top
  App.screen.check(y, 'abc', 'baseline/screen:1')
  y = y + Editor_state.line_height
  App.screen.check(y, 'def ', 'baseline/screen:2')
  y = y + Editor_state.line_height
  App.screen.check(y, 'ghi ', 'baseline/screen:3')
  -- after pagedown we start drawing from the bottom _line_ (multiple screen lines)
  edit.run_after_keychord(Editor_state, 'pagedown', 'pagedown')
  check_eq(Editor_state.screen_top1.line, 2, 'screen_top:line')
  check_eq(Editor_state.screen_top1.pos, 1, 'screen_top:pos')
  check_eq(Editor_state.cursor1.line, 2, 'cursor:line')
  check_eq(Editor_state.cursor1.pos, 1, 'cursor:pos')
  y = Editor_state.top
  App.screen.check(y, 'def ', 'screen:1')
  y = y + Editor_state.line_height
  App.screen.check(y, 'ghi ', 'screen:2')
  y = y + Editor_state.line_height
  App.screen.check(y, 'jkl', 'screen:3')
end

Deletion in text_tests.lua at line 979 [7.2]
B:BD[6.40545] → [6.40545:40580]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1013 [7.2]
B:BD[11.408] → [11.408:443]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1027 [7.2]
B:BD[11.988] → [11.988:1023]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1056 [7.2]
B:BD[11.2212] → [11.2212:2247]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1083 [7.2]
B:BD[11.3387] → [11.3387:3422]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1111 [7.2]
B:BD[11.4697] → [11.4697:4732]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1138 [7.2]
B:BD[11.5876] → [11.5876:5911]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1171 [7.2]
B:BD[11.7424] → [11.7424:7459]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1199 [7.2]
B:BD[11.8571] → [11.8571:8606]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1226 [7.2]
B:BD[11.9728] → [11.9728:9763]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1253 [7.2]
B:BD[11.10927] → [11.10927:10962]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1282 [7.2]
B:BD[11.12237] → [11.12237:12272]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1308 [7.2]
B:BD[11.13253] → [11.13253:13288]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1332 [7.2]
B:BD[11.14285] → [11.14285:14320]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1360 [7.2]
B:BD[11.15580] → [11.15580:15615]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1386 [7.2]
B:BD[11.16743] → [11.16743:16778]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1414 [7.2]
B:BD[11.17951] → [11.17951:17986]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1436 [7.2]
B:BD[11.18918] → [11.18918:18953]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1454 [7.2]
B:BD[11.19728] → [11.19728:19763]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1483 [7.2]
B:BD[11.21002] → [11.21002:21037]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1511 [7.2]
B:BD[11.22256] → [11.22256:22291]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1540 [7.2]
B:BD[11.23563] → [11.23563:23598]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1568 [7.2]
B:BD[11.24799] → [11.24799:24834]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1598 [7.2]
B:BD[11.26122] → [11.26122:26157]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1631 [7.2]
B:BD[11.27673] → [11.27673:27708]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1658 [7.2]
B:BD[11.28834] → [11.28834:28869]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1792 [7.2]
B:BD[11.34791] → [11.34791:34826]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1826 [7.2]
B:BD[11.36236] → [11.36236:36271]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1864 [7.2]
B:BD[11.37930] → [11.37930:37965]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1884 [7.2]
B:BD[11.38757] → [11.38757:38792]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1910 [7.2]
B:BD[11.39864] → [11.39864:39899]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1927 [7.2]
B:BD[11.40569] → [11.40569:40604]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1944 [7.2]
B:BD[11.41251] → [11.41251:41286]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in text_tests.lua at line 1953 [7.2]
B:BD[11.41621] → [2.403:403]
B:BD[12.171] → [4.2:75]
BD:BD[12.171] → [4.2:75]
BD:BD[12.171] → [4.2:75]
B:BD[15.497] → [16.196:269]
BD:BD[15.497] → [16.196:269]
B:BD[17.22267] → [16.344:417]
BD:BD[17.22267] → [16.344:417]
B:BD[17.21125] → [16.270:343]
BD:BD[17.21125] → [16.270:343]
B:BD[17.20197] → [4.76:149]
BD:BD[17.20197] → [4.76:149]
```
  edit.draw(Editor_state)  -- populate line_cache.startpos for each line
  edit.draw(Editor_state)  -- populate line_cache.startpos for each line
  edit.draw(Editor_state)  -- populate line_cache.startpos for each line
  edit.draw(Editor_state)  -- populate line_cache.startpos for each line
  edit.draw(Editor_state)  -- populate line_cache.startpos for each line
```
Solving an order conflict in text_tests.lua at line 1953 [7.2]
[11.41621]

Resurrecting zombie bytes in text.lua at line 1 [19.1]

B:B[19.1] → [6.82700:82878]

BD:B[19.1] → [6.82700:82878]

-- text editor, particularly text drawing, horizontal wrap, vertical scrolling
Text = {}
-- draw a line starting from startpos to screen at y between State.left and State.right

Deletion in text.lua at line 5 [19.1]

B:BD[6.82878] → [21.3:83]

-- return y for the next line, and position of start of final screen line drawn

Resurrecting zombie bytes in text.lua at line 5 [19.1]

∅:∅[21.83] → [6.82950:83130]

B:B[6.82950] → [6.82950:83130]

BD:B[6.82950] → [6.82950:83130]

∅:∅[22.161] → [23.3:63]

B:B[24.47] → [23.3:63]

BD:B[22.161] → [23.3:63]

function Text.draw(State, line_index, y, startpos)
--?   print('text.draw', line_index, y)
  local line = State.lines[line_index]
  local line_cache = State.line_cache[line_index]
  Text.populate_screen_line_starting_pos(State, line_index)

Insertion in text.lua at line 5 [19.1]
[6.82878]
[6.82950]
```
-- return y for the next line
```
Deletion in text.lua at line 10 [19.1]
B:BD[6.83130] → [6.83130:83154]
BD:BD[6.83130] → [6.83130:83154]
```
  line_cache.starty = y
```
Deletion in text.lua at line 12 [19.1]
∅:D[6.83208] → [22.85:161]
B:BD[25.1768] → [22.85:161]
BD:BD[25.1768] → [22.85:161]
```
  local final_screen_line_starting_pos = startpos  -- track value to return
```

Resurrecting zombie bytes in text.lua at line 16 [19.1]

B:B[22.319] → [6.83209:83260]

BD:B[22.319] → [6.83209:83260]

B:B[6.83291] → [6.83291:83300]

BD:B[6.83291] → [6.83291:83300]

B:B[22.363] → [26.3:191]

BD:B[22.363] → [26.3:191]

    if pos < startpos then
      -- render nothing
    else
      local screen_line = Text.screen_line(line, line_cache, i)
--?       print('text.draw:', screen_line, 'at', line_index,pos, 'after', x,y)
      local frag_len = utf8.len(screen_line)

Deletion in text.lua at line 19 [19.1]
∅:D[6.83300] → [22.320:363]
B:BD[27.138] → [22.320:363]
BD:BD[27.138] → [22.320:363]
```
      final_screen_line_starting_pos = pos
```
Replacement in text.lua at line 59 [19.1]
B:BD[28.250] → [28.250:293]
```
  return y, final_screen_line_starting_pos
```
[28.250]
[28.293]
```
  return y
```
Deletion in text.lua at line 94 [19.1]
B:BD[29.91] → [20.0:30]
BD:BD[29.91] → [20.0:30]
BD:BD[29.91] → [20.0:30]
B:BD[31.37] → [20.31:42]
BD:BD[31.37] → [20.31:42]
BD:BD[31.37] → [20.31:42]
```
-- return y for the next line
  return y
```
Solving an order conflict in text.lua at line 94 [19.1]
[28.1332]
[32.222]

Replacement in text.lua at line 133 [19.1]

B:BD[6.84785] → [6.84785:84936]

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

[6.84785]

[6.84936]

--?   print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)

Replacement in text.lua at line 165 [19.1]

B:BD[6.86440] → [6.86440:86593]

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

[6.86440]

[6.86593]

--?     print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)

Replacement in text.lua at line 170 [19.1]

B:BD[6.86846] → [6.86846:87007]

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

[6.86846]

[6.87007]

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

Replacement in text.lua at line 344 [19.1]

B:BD[6.94206] → [6.94206:94228]

--?   print('pageup')

[6.94206]

[6.94228]

  State.screen_top1 = Text.previous_screen_top1(State)
  State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
  Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary(State)
  Text.redraw_all(State)  -- if we're scrolling, reclaim all fragments to avoid memory leaks
end
-- return the top y coordinate of a given line_index,
-- or nil if no part of it is on screen
function Text.starty(State, line_index)

Replacement in text.lua at line 354 [19.1]

B:BD[6.94269] → [6.94269:94350]

  local top2 = Text.to2(State, State.screen_top1)
--?   print(App.screen.height)

[6.94269]

[6.94350]

  -- does not modify State (except to populate line_cache)
  if line_index < State.screen_top1.line then return end
  local loc2 = Text.to2(State, State.screen_top1)
  local y = State.top
  while true do
    if loc2.line == line_index then return y end
    y = y + State.line_height
    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  -- end of file
    loc2 = next_loc2
  end
end
function Text.previous_screen_top1(State)
  -- duplicate some logic from love.draw
  -- does not modify State (except to populate line_cache)
  local loc2 = Text.to2(State, State.screen_top1)

Replacement in text.lua at line 374 [19.1]

B:BD[6.94426] → [6.94426:94570]

--?     print(y, top2.line, top2.screen_line, top2.screen_pos)
    if State.screen_top1.line == 1 and State.screen_top1.pos == 1 then break end

[6.94426]

[6.94570]

    if loc2.line == 1 and loc2.screen_line == 1 and loc2.screen_pos == 1 then break end

Replacement in text.lua at line 376 [19.1]

B:BD[6.94600] → [6.94600:94650]

    top2 = Text.previous_screen_line(State, top2)

[6.94600]

[6.94650]

    loc2 = Text.previous_screen_line(State, loc2)

Replacement in text.lua at line 378 [19.1]

B:BD[6.94656] → [6.94656:94983]

  State.screen_top1 = Text.to1(State, top2)
  State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
  Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary(State)
--?   print(State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)
--?   print('pageup end')

[6.94656]

[6.94983]

  return Text.to1(State, loc2)

Replacement in text.lua at line 382 [19.1]

B:BD[6.95018] → [6.95018:95650]

--?   print('pagedown')
  -- If a line/paragraph gets to a page boundary, I often want to scroll
  -- before I get to the bottom.
  -- However, only do this if it makes forward progress.
  local bot2 = Text.to2(State, State.screen_bottom1)
  if bot2.screen_line > 1 then
    bot2.screen_line = math.max(bot2.screen_line-10, 1)
  end
  local new_top1 = Text.to1(State, bot2)
  if Text.lt1(State.screen_top1, new_top1) then
    State.screen_top1 = new_top1
  else
    State.screen_top1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos}
  end
--?   print('setting top to', State.screen_top1.line, State.screen_top1.pos)

[6.95018]

[6.95650]

  State.screen_top1 = Text.screen_bottom1(State)

Deletion in text.lua at line 385 [19.1]
B:BD[6.95809] → [6.95809:95856]
```
--?   print('top now', State.screen_top1.line)
```

Replacement in text.lua at line 386 [19.1]

B:BD[6.95949] → [6.95949:95977]

--?   print('pagedown end')

[6.95949]

[6.95977]

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
    y = y + State.line_height
    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)

Replacement in text.lua at line 443 [19.1]

B:BD[6.98242] → [6.98242:98401]

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

[6.98242]

[33.770]

--?   print('down', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)

Replacement in text.lua at line 454 [19.1]

B:BD[6.98851] → [6.98851:98910]

    if State.cursor1.line > State.screen_bottom1.line then

[6.98851]

[6.98910]

    local screen_bottom1 = Text.screen_bottom1(State)
--?   print('down 2', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, screen_bottom1.line, screen_bottom1.pos)
    if State.cursor1.line > screen_bottom1.line then

Replacement in text.lua at line 464 [19.1]

B:BD[6.99240] → [6.99240:99310]

    local scroll_down = Text.le1(State.screen_bottom1, State.cursor1)

[6.99240]

[6.99310]

    local screen_bottom1 = Text.screen_bottom1(State)
    local scroll_down = Text.le1(screen_bottom1, State.cursor1)

Replacement in text.lua at line 481 [19.1]

B:BD[6.100462] → [6.100462:100619]

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

[6.100462]

[6.100619]

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

Insertion in text.lua at line 614 [19.1]

[6.103892]

function Text.final_text_loc_on_screen(State)
  local screen_bottom1 = Text.screen_bottom1(State)
  return {
    line=screen_bottom1.line,
    pos=Text.pos_at_end_of_screen_line(State, screen_bottom1),
  }
end

Replacement in text.lua at line 643 [19.1]

B:BD[6.104800] → [6.104800:104959]

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

[6.104800]

[6.104959]

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

Replacement in text.lua at line 660 [19.1]

B:BD[6.105669] → [6.105669:105831]

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

[6.105669]

[6.105831]

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

Replacement in text.lua at line 667 [19.1]

B:BD[6.106064] → [6.106064:106190]

  if line_cache.starty == nil then return false end  -- outside current page
  if y < line_cache.starty then return false end

[6.106064]

[6.106190]

  local starty = Text.starty(State, line_index)
  if starty == nil then return false end  -- outside current page
  if y < starty then return false end

Replacement in text.lua at line 671 [19.1]

B:BD[6.106250] → [6.106250:106427]

  return y < line_cache.starty + State.line_height*(#line_cache.screen_line_starting_pos - Text.screen_line_index(line_cache.screen_line_starting_pos, line_cache.startpos) + 1)

[6.106250]

[6.106427]

  return y < starty + State.line_height*(#line_cache.screen_line_starting_pos - Text.screen_line_index(line_cache.screen_line_starting_pos, line_cache.startpos) + 1)

Replacement in text.lua at line 678 [19.1]

B:BD[6.106628] → [33.1109:1176]

  assert(my >= line_cache.starty, 'failed to map y pixel to line')

[6.106628]

[6.106662]

  local starty = Text.starty(State, line_index)
  assert(my >= starty, 'failed to map y pixel to line')

Replacement in text.lua at line 681 [19.1]
B:BD[6.106703] → [6.106703:106733]
```
  local y = line_cache.starty
```
[6.106703]
[6.106733]
```
  local y = starty
```

Insertion in text.lua at line 864 [19.1]

[6.112278]

function Text.eq2(a, b)
  return a.line == b.line and a.screen_line == b.screen_line and a.screen_pos == b.screen_pos
end

Insertion in text.lua at line 889 [19.1]

[6.112901]

function Text.next_screen_line(State, loc2)
  Text.populate_screen_line_starting_pos(State, loc2.line)
  if loc2.screen_line >= #State.line_cache[loc2.line].screen_line_starting_pos then
    if loc2.line < #State.lines then
      return {line=loc2.line+1, screen_line=1, screen_pos=1}
    else
      return loc2
    end
  else
    return {line=loc2.line, screen_line=loc2.screen_line+1, screen_pos=1}
  end
end

Insertion in text.lua at line 925 [19.1]
[6.113753]
[6.113753]
```
  local screen_bottom1 = Text.screen_bottom1(State)
```

Replacement in text.lua at line 928 [19.1]

B:BD[6.113883] → [6.113883:113970]

  elseif State.cursor1.line >= State.screen_bottom1.line then
--?     print('too low')

[6.113883]

[6.113970]

  elseif State.cursor1.line >= screen_bottom1.line then

Replacement in text.lua at line 930 [19.1]

B:BD[6.114015] → [6.114015:114219]

--?       print('tweak')
      State.cursor1 = {
          line=State.screen_bottom1.line,
          pos=Text.to_pos_on_line(State, State.screen_bottom1.line, State.right-5, App.screen.height-5),
      }

[6.114015]

[6.114219]

      State.cursor1 = Text.final_text_loc_on_screen(State)

Deletion in text.lua at line 939 [19.1]

B:BD[6.114374] → [6.114374:114684]

  -- this approach is cheaper and almost works, except on the final screen
  -- where file ends above bottom of screen
--?   local botpos = Text.pos_at_start_of_screen_line(State, State.cursor1)
--?   local botline1 = {line=State.cursor1.line, pos=botpos}
--?   return Text.lt1(State.screen_bottom1, botline1)

Deletion in text.lua at line 993 [19.1]

B:BD[6.115541] → [6.115541:115545]

B:BD[6.115545] → [2.480:480]

B:BD[34.1073] → [20.43:141]

BD:BD[34.1073] → [20.43:141]

B:BD[34.1369] → [20.142:242]

BD:BD[34.1369] → [20.142:242]

B:BD[35.15513] → [20.243:351]

BD:BD[35.15513] → [20.243:351]

B:BD[36.434] → [20.352:659]

BD:BD[36.434] → [20.352:659]

B:BD[20.659] → [16.418:802]

BD:BD[20.659] → [16.418:802]

B:BD[16.897] → [16.897:946]

BD:BD[16.897] → [16.897:946]

B:BD[16.946] → [37.4:34]

BD:BD[16.946] → [37.4:34]

∅:D[37.34] → [16.1186:1398]

B:BD[16.1186] → [16.1186:1398]

BD:BD[16.1186] → [16.1186:1398]

∅:D[16.1398] → [20.659:706]

B:BD[20.659] → [20.659:706]

BD:BD[20.659] → [20.659:706]

B:BD[38.115] → [20.707:816]

BD:BD[38.115] → [20.707:816]

B:BD[35.16711] → [20.817:905]

BD:BD[35.16711] → [20.817:905]

B:BD[20.905] → [37.35:65]

BD:BD[20.905] → [37.35:65]

∅:D[37.65] → [20.1107:1157]

B:BD[38.563] → [20.1107:1157]

BD:BD[38.563] → [20.1107:1157]

B:BD[39.83] → [20.1158:1189]

BD:BD[39.83] → [20.1158:1189]

B:BD[36.652] → [20.1190:1239]

BD:BD[36.652] → [20.1190:1239]

B:BD[40.1257] → [20.1240:1539]

BD:BD[40.1257] → [20.1240:1539]

B:BD[20.1539] → [37.66:96]

BD:BD[20.1539] → [37.66:96]

∅:D[37.96] → [20.1779:2006]

B:BD[20.1779] → [20.1779:2006]

BD:BD[20.1779] → [20.1779:2006]

B:BD[36.1280] → [5.4:110]

BD:BD[36.1280] → [5.4:110]

B:BD[39.2960] → [5.111:168]

BD:BD[39.2960] → [5.111:168]

B:BD[41.263] → [5.169:204]

BD:BD[41.263] → [5.169:204]

∅:D[5.204] → [41.265:265]

∅:D[37.285] → [41.265:265]

BD:BD[42.5714] → [41.265:265]

B:BD[43.1321] → [20.2114:2168]

BD:BD[43.1321] → [20.2114:2168]

B:BD[20.2168] → [5.205:354]

BD:BD[20.2168] → [5.205:354]

∅:D[5.354] → [20.2317:2370]

∅:D[37.431] → [20.2317:2370]

B:BD[20.2317] → [20.2317:2370]

BD:BD[20.2317] → [20.2317:2370]

B:BD[39.3744] → [20.2371:2489]

BD:BD[39.3744] → [20.2371:2489]

B:BD[20.2489] → [5.573:637]

BD:BD[20.2489] → [5.573:637]

B:BD[20.2370] → [5.355:487]

BD:BD[20.2370] → [5.355:487]

B:BD[36.1501] → [5.488:572]

BD:BD[36.1501] → [5.488:572]

B:BD[45.252] → [5.638:784]

BD:BD[45.252] → [5.638:784]

B:BD[32.901] → [5.785:859]

BD:BD[32.901] → [5.785:859]

B:BD[46.154] → [5.860:907]

BD:BD[46.154] → [5.860:907]

B:BD[36.1771] → [5.908:992]

BD:BD[36.1771] → [5.908:992]

B:BD[47.1785] → [48.91:137]

BD:BD[47.1785] → [48.91:137]

B:BD[48.137] → [20.2595:2647]

BD:BD[48.137] → [20.2595:2647]

B:BD[20.2647] → [37.1139:1247]

BD:BD[20.2647] → [37.1139:1247]

end
--?   print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)
--?     print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)
--?       print('=>', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)
  State.screen_top1 = Text.previous_screen_top1(State)
  State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
  Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary(State)
  Text.redraw_all(State)  -- if we're scrolling, reclaim all fragments to avoid memory leaks
end
-- return the top y coordinate of a given line_index,
-- or nil if no part of it is on screen
function Text.starty(State, line_index)
  -- duplicate some logic from love.draw
  -- does not modify State (except to populate line_cache)
  if line_index < State.screen_top1.line then return end
  local loc2 = Text.to2(State, State.screen_top1)
  local y = State.top
  while true do
    if loc2.line == line_index then return y end
    y = y + State.line_height
    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  -- end of file
    loc2 = next_loc2
  end
end
function Text.previous_screen_top1(State)
  -- does not modify State (except to populate line_cache)
  local loc2 = Text.to2(State, State.screen_top1)
    if loc2.line == 1 and loc2.screen_line == 1 and loc2.screen_pos == 1 then break end
    y = y - State.line_height
    loc2 = Text.previous_screen_line(State, loc2)
  return Text.to1(State, loc2)
  State.screen_top1 = Text.screen_bottom1(State)
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
    y = y + State.line_height
    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)
--?   print('down', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)
--?     print('cursor at final screen line of its line')
--?       print(State.cursor1.pos)
    local screen_bottom1 = Text.screen_bottom1(State)
--?   print('down 2', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, screen_bottom1.line, screen_bottom1.pos)
    if State.cursor1.line > screen_bottom1.line then
    local screen_bottom1 = Text.screen_bottom1(State)
    local scroll_down = Text.le1(screen_bottom1, State.cursor1)
--?     print('cursor is NOT at final screen line of its line')
--?       print('screen top before:', State.screen_top1.line, State.screen_top1.pos)
--?       print('scroll up preserving cursor')
--?       print('screen top after:', State.screen_top1.line, State.screen_top1.pos)
--?     print('switching pos of screen line at cursor from '..tostring(screen_line_starting_pos)..' to '..tostring(new_screen_line_starting_pos))
--?     print('cursor pos is now', State.cursor1.line, State.cursor1.pos)
--?       print('scroll up preserving cursor')
--?       print('screen top after:', State.screen_top1.line, State.screen_top1.pos)
function Text.final_text_loc_on_screen(State)
  local screen_bottom1 = Text.screen_bottom1(State)
  return {
    line=screen_bottom1.line,
    pos=Text.pos_at_end_of_screen_line(State, screen_bottom1),
  }

Resurrecting zombie bytes in text.lua at line 993 [19.1]
∅:∅[37.1247] → [48.790:794]
B:B[48.790] → [48.790:794]
BD:B[48.790] → [48.790:794]
BD:B[48.790] → [48.790:794]
```
end
```
Solving an order conflict in text.lua at line 993 [19.1]
[6.115541]
[48.790]

Deletion in text.lua at line 994 [19.1]

B:BD[48.794] → [48.794:795]

BD:BD[48.794] → [48.794:795]

B:BD[49.580] → [20.2852:2958]

BD:BD[49.580] → [20.2852:2958]

B:BD[40.3781] → [20.2959:3068]

BD:BD[40.3781] → [20.2959:3068]

B:BD[51.1027] → [16.1399:1551]

BD:BD[51.1027] → [16.1399:1551]

B:BD[53.481] → [16.1552:1718]

BD:BD[53.481] → [16.1552:1718]

B:BD[51.1078] → [16.1719:1823]

BD:BD[51.1078] → [16.1719:1823]

B:BD[54.904] → [16.1824:1843]

BD:BD[54.904] → [16.1824:1843]

B:BD[56.880] → [20.3069:3192]

BD:BD[56.880] → [20.3069:3192]

B:BD[57.1229] → [20.3193:3248]

BD:BD[57.1229] → [20.3193:3248]

B:BD[20.3364] → [20.3364:3721]

BD:BD[20.3364] → [20.3364:3721]

B:BD[59.720] → [20.3722:3774]

BD:BD[59.720] → [20.3722:3774]

B:BD[40.5538] → [20.3775:3831]

BD:BD[40.5538] → [20.3775:3831]

B:BD[60.180] → [20.3832:3891]

BD:BD[60.180] → [20.3832:3891]

B:BD[39.4810] → [5.993:1097]

BD:BD[39.4810] → [5.993:1097]


--?   print('snap', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)
--?   print('snap =>', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)
  local starty = Text.starty(State, line_index)
  if starty == nil then return false end  -- outside current page
  if y < starty then return false end
  return y < starty + State.line_height*(#line_cache.screen_line_starting_pos - Text.screen_line_index(line_cache.screen_line_starting_pos, line_cache.startpos) + 1)
  local starty = Text.starty(State, line_index)
  assert(my >= starty, 'failed to map y pixel to line')
  local y = starty
function Text.eq2(a, b)
  return a.line == b.line and a.screen_line == b.screen_line and a.screen_pos == b.screen_pos
end
  end
end
function Text.next_screen_line(State, loc2)
  Text.populate_screen_line_starting_pos(State, loc2.line)
  if loc2.screen_line >= #State.line_cache[loc2.line].screen_line_starting_pos then
    if loc2.line < #State.lines then
      return {line=loc2.line+1, screen_line=1, screen_pos=1}
    else
      return loc2
    end
  else
    return {line=loc2.line, screen_line=loc2.screen_line+1, screen_pos=1}
  local screen_bottom1 = Text.screen_bottom1(State)
  elseif State.cursor1.line >= screen_bottom1.line then
      State.cursor1 = Text.final_text_loc_on_screen(State)
--?   print('=>', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)

Solving an order conflict in text.lua at line 994 [19.1]
[48.794]
Deletion in source_text_tests.lua at line 19 [63.3561]
B:BD[61.902] → [61.902:942]
BD:BD[61.902] → [61.902:942]
```
  App.screen.init{width=120, height=60}
```

Resurrecting zombie bytes in source_text_tests.lua at line 20 [63.3561]

∅:∅[37.1292] → [61.942:1201]

B:B[61.942] → [61.942:1201]

BD:B[61.942] → [61.942:1201]

  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{}
  Text.redraw_all(Editor_state)
  edit.draw(Editor_state)
  edit.run_after_mouse_click(Editor_state, 8,Editor_state.top+8, 1)
  -- cursor skips drawing to always remain on text

Resurrecting zombie bytes in source_text_tests.lua at line 28 [63.3561]

∅:∅[64.386] → [61.1363:1412]

B:B[61.1363] → [61.1363:1412]

BD:B[61.1363] → [61.1363:1412]

B:B[61.1461] → [61.1461:1893]

BD:B[61.1461] → [61.1461:1893]

end
function test_backspace_to_delete_drawing()
  -- display a drawing followed by a line of text (you shouldn't ever have a drawing right at the end)
  App.screen.init{width=120, height=60}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'```lines', '```', ''}
  Text.redraw_all(Editor_state)
  -- cursor is on text as always (outside tests this will get initialized correctly)
  Editor_state.cursor1.line = 2
  -- backspacing deletes the drawing

Deletion in source_text_tests.lua at line 78 [63.3561]
B:BD[13.5623] → [13.5623:5658]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 136 [63.3561]
B:BD[63.12576] → [37.1293:1353]
BD:BD[63.12576] → [37.1293:1353]
BD:BD[63.12576] → [37.1293:1353]
B:BD[63.13062] → [37.1354:1414]
BD:BD[63.13062] → [37.1354:1414]
BD:BD[63.13062] → [37.1354:1414]
B:BD[67.348] → [37.1415:1488]
BD:BD[67.348] → [37.1415:1488]
B:BD[68.1185] → [37.1489:1549]
BD:BD[68.1185] → [37.1489:1549]
B:BD[68.2257] → [37.1550:1608]
BD:BD[68.2257] → [37.1550:1608]
B:BD[68.8436] → [37.1609:1682]
BD:BD[68.8436] → [37.1609:1682]
B:BD[70.509] → [37.1683:1756]
BD:BD[70.509] → [37.1683:1756]
```
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
  edit.run_after_keychord(Editor_state, 'M-right', 'right')
  edit.draw(Editor_state)  -- populate line_cache.startpos for each line
  edit.run_after_keychord(Editor_state, 'S-right', 'right')
  edit.run_after_keychord(Editor_state, 'right', 'right')
  edit.draw(Editor_state)  -- populate line_cache.startpos for each line
  edit.draw(Editor_state)  -- populate line_cache.startpos for each line
```
Deletion in source_text_tests.lua at line 138 [63.3561]
B:BD[68.9604] → [37.1757:1830]
BD:BD[68.9604] → [37.1757:1830]
B:BD[68.11105] → [37.1831:1904]
BD:BD[68.11105] → [37.1831:1904]
```
  edit.draw(Editor_state)  -- populate line_cache.startpos for each line
  edit.draw(Editor_state)  -- populate line_cache.startpos for each line
```

Replacement in source_text_tests.lua at line 234 [63.3561]

B:BD[13.12401] → [10.5311:5372]

  edit.run_after_keychord(Editor_state, 'M-right',  'right')

[13.12401]

[62.965]

  edit.run_after_keychord(Editor_state, 'M-right', 'right')

Replacement in source_text_tests.lua at line 245 [63.3561]

B:BD[13.12887] → [10.5373:5434]

  edit.run_after_keychord(Editor_state, 'M-right',  'right')

[13.12887]

[62.1015]

  edit.run_after_keychord(Editor_state, 'M-right', 'right')

Deletion in source_text_tests.lua at line 257 [63.3561]
B:BD[13.13499] → [13.13499:13534]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in source_text_tests.lua at line 258 [63.3561]

B:BD[14.297] → [14.297:392]

  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache

[14.297]

[14.392]

  edit.draw(Editor_state)  -- populate line_cache.startpos for each line

Deletion in source_text_tests.lua at line 275 [63.3561]
B:BD[13.14177] → [13.14177:14212]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 294 [63.3561]
B:BD[13.15082] → [13.15082:15117]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 312 [63.3561]
B:BD[13.15892] → [13.15892:15927]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 330 [63.3561]
B:BD[8.1478] → [8.1478:1513]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 347 [63.3561]
B:BD[13.16498] → [13.16498:16533]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 363 [63.3561]
B:BD[13.17178] → [13.17178:17213]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 379 [63.3561]
B:BD[13.17893] → [13.17893:17928]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 396 [63.3561]
B:BD[13.18706] → [13.18706:18741]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 414 [63.3561]
B:BD[13.19642] → [13.19642:19677]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 431 [63.3561]
B:BD[13.20515] → [13.20515:20550]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 448 [63.3561]
B:BD[13.21387] → [13.21387:21422]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 466 [63.3561]
B:BD[13.22243] → [13.22243:22278]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 488 [63.3561]
B:BD[13.23428] → [13.23428:23463]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 508 [63.3561]
B:BD[13.24522] → [13.24522:24557]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 531 [63.3561]
B:BD[13.25811] → [13.25811:25846]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 555 [63.3561]
B:BD[13.27250] → [13.27250:27285]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 573 [63.3561]
B:BD[69.1071] → [69.1071:1106]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in source_text_tests.lua at line 576 [63.3561]

B:BD[69.1184] → [10.5435:5496]

  edit.run_after_keychord(Editor_state, 'S-right',  'right')

[69.1184]

[69.1235]

  edit.run_after_keychord(Editor_state, 'S-right', 'right')

Deletion in source_text_tests.lua at line 595 [63.3561]
B:BD[69.2157] → [69.2157:2192]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in source_text_tests.lua at line 597 [63.3561]

B:BD[69.2256] → [10.5497:5556]

  edit.run_after_keychord(Editor_state, 'right',  'right')

[69.2256]

[69.2305]

  edit.run_after_keychord(Editor_state, 'right', 'right')

Deletion in source_text_tests.lua at line 612 [63.3561]
B:BD[69.2987] → [69.2987:3022]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 628 [63.3561]
B:BD[69.3706] → [69.3706:3741]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 649 [63.3561]
B:BD[69.4689] → [69.4689:4724]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 666 [63.3561]
B:BD[69.5425] → [69.5425:5460]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 683 [63.3561]
B:BD[69.6135] → [69.6135:6170]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 701 [63.3561]
B:BD[69.6899] → [69.6899:6934]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 724 [63.3561]
B:BD[13.28076] → [13.28076:28111]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 742 [63.3561]
B:BD[13.28867] → [13.28867:28902]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 770 [63.3561]
B:BD[13.30256] → [13.30256:30291]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 786 [63.3561]
B:BD[13.31161] → [13.31161:31196]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 814 [63.3561]
B:BD[69.8368] → [69.8368:8403]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in source_text_tests.lua at line 815 [63.3561]

B:BD[69.8434] → [69.8434:8529]

  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache

[69.8434]

[69.8529]

  edit.draw(Editor_state)  -- populate line_cache.startpos for each line

Deletion in source_text_tests.lua at line 833 [63.3561]
B:BD[9.4688] → [9.4688:4723]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in source_text_tests.lua at line 834 [63.3561]

B:BD[9.4754] → [9.4754:4849]

  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache

[9.4754]

[9.4849]

  edit.draw(Editor_state)  -- populate line_cache.startpos for each line

Deletion in source_text_tests.lua at line 850 [63.3561]
B:BD[9.5546] → [9.5546:5581]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 872 [63.3561]
B:BD[9.6605] → [9.6605:6640]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 892 [63.3561]
B:BD[69.9532] → [69.9532:9567]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in source_text_tests.lua at line 893 [63.3561]

B:BD[69.9598] → [69.9598:9693]

  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache

[69.9598]

[69.9693]

  edit.draw(Editor_state)  -- populate line_cache.startpos for each line

Deletion in source_text_tests.lua at line 916 [63.3561]
B:BD[69.11033] → [69.11033:11068]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in source_text_tests.lua at line 917 [63.3561]

B:BD[69.11099] → [69.11099:11194]

  edit.draw(Editor_state)  -- populate line_cache.starty for each line Editor_state.line_cache

[69.11099]

[69.11194]

  edit.draw(Editor_state)  -- populate line_cache.startpos for each line

Deletion in source_text_tests.lua at line 945 [63.3561]
B:BD[9.7499] → [9.7499:7534]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 966 [63.3561]
B:BD[69.12933] → [69.12933:12968]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 981 [63.3561]
B:BD[13.33340] → [13.33340:33375]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1010 [63.3561]
B:BD[61.2889] → [61.2889:2924]
BD:BD[61.2889] → [61.2889:2924]
```
  Editor_state.screen_bottom1 = {}
```

Resurrecting zombie bytes in source_text_tests.lua at line 1010 [63.3561]

B:B[61.2924] → [61.2924:3224]

BD:B[61.2924] → [61.2924:3224]

  local drawing_height = Drawing_padding_height + drawing_width/2  -- default
  -- initially the screen displays the first line and the drawing
  -- 15px margin + 15px line1 + 10px margin + 25px drawing + 10px margin = 75px < screen height 80px
  edit.draw(Editor_state)
  local y = Editor_state.top

Resurrecting zombie bytes in source_text_tests.lua at line 1016 [63.3561]
∅:∅[64.7840] → [61.3307:3464]
B:B[61.3307] → [61.3307:3464]
BD:B[61.3307] → [61.3307:3464]
```
  -- after pagedown the screen draws the drawing up top
  -- 15px margin + 10px margin + 25px drawing + 10px margin + 15px line3 = 75px < screen height 80px
```
Resurrecting zombie bytes in source_text_tests.lua at line 1021 [63.3561]
∅:∅[64.7951] → [61.3692:3732]
B:B[61.3692] → [61.3692:3732]
BD:B[61.3692] → [61.3692:3732]
```
  y = Editor_state.top + drawing_height
```
Deletion in source_text_tests.lua at line 1033 [63.3561]
B:BD[13.34605] → [13.34605:34640]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1067 [63.3561]
B:BD[13.36285] → [13.36285:36320]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1081 [63.3561]
B:BD[13.36976] → [13.36976:37011]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1113 [63.3561]
B:BD[72.531] → [72.531:566]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1134 [63.3561]
B:BD[13.38521] → [13.38521:38556]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1161 [63.3561]
B:BD[13.40120] → [13.40120:40155]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1189 [63.3561]
B:BD[13.41990] → [13.41990:42025]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1216 [63.3561]
B:BD[13.43970] → [13.43970:44005]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1249 [63.3561]
B:BD[13.46377] → [13.46377:46412]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1280 [63.3561]
B:BD[72.1631] → [72.1631:1666]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1301 [63.3561]
B:BD[13.47825] → [13.47825:47860]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1328 [63.3561]
B:BD[73.419] → [73.419:454]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1349 [63.3561]
B:BD[13.49370] → [13.49370:49405]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1376 [63.3561]
B:BD[13.51054] → [13.51054:51089]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1405 [63.3561]
B:BD[13.52910] → [13.52910:52945]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1431 [63.3561]
B:BD[13.54255] → [13.54255:54290]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1455 [63.3561]
B:BD[13.55437] → [13.55437:55472]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1483 [63.3561]
B:BD[13.57173] → [13.57173:57208]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1509 [63.3561]
B:BD[13.58799] → [13.58799:58834]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1537 [63.3561]
B:BD[13.60476] → [13.60476:60511]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1559 [63.3561]
B:BD[13.61954] → [13.61954:61989]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1577 [63.3561]
B:BD[13.63135] → [13.63135:63170]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1606 [63.3561]
B:BD[13.64861] → [13.64861:64896]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1634 [63.3561]
B:BD[13.66591] → [13.66591:66626]
```
  Editor_state.screen_bottom1 = {}
```

Replacement in source_text_tests.lua at line 1644 [63.3561]

B:BD[13.67252] → [10.7399:7458]

  edit.run_after_keychord(Editor_state, 'right',  'right')

[13.67252]

[62.15575]

  edit.run_after_keychord(Editor_state, 'right', 'right')

Deletion in source_text_tests.lua at line 1663 [63.3561]
B:BD[13.68401] → [13.68401:68436]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1691 [63.3561]
B:BD[13.70051] → [13.70051:70086]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1721 [63.3561]
B:BD[13.71822] → [13.71822:71857]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1754 [63.3561]
B:BD[13.73935] → [13.73935:73970]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1781 [63.3561]
B:BD[13.75417] → [13.75417:75452]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1915 [63.3561]
B:BD[69.13655] → [69.13655:13690]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1949 [63.3561]
B:BD[69.15145] → [69.15145:15180]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 1987 [63.3561]
B:BD[68.20140] → [68.20140:20175]
BD:BD[68.20140] → [68.20140:20175]
```
  Editor_state.screen_bottom1 = {}
```
Resurrecting zombie bytes in source_text_tests.lua at line 1987 [63.3561]
B:B[68.20175] → [68.20175:20227]
BD:B[68.20175] → [68.20175:20227]
```
  edit.draw(Editor_state)
  -- delete selected text
```
Resurrecting zombie bytes in source_text_tests.lua at line 1992 [63.3561]
∅:∅[64.22103] → [68.20461:20471]
B:B[68.20461] → [68.20461:20471]
BD:B[68.20461] → [68.20461:20471]
```
  -- undo
```
Resurrecting zombie bytes in source_text_tests.lua at line 1995 [63.3561]
∅:∅[74.4101] → [68.20565:20592]
B:B[68.20565] → [68.20565:20592]
BD:B[68.20565] → [68.20565:20592]
```
  -- selection is restored
```
Resurrecting zombie bytes in source_text_tests.lua at line 1998 [63.3561]
∅:∅[64.22206] → [68.20760:20765]
B:B[68.20760] → [68.20760:20765]
BD:B[68.20760] → [68.20760:20765]
```
end
```
Deletion in source_text_tests.lua at line 2007 [63.3561]
B:BD[13.80441] → [13.80441:80476]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 2033 [63.3561]
B:BD[13.81613] → [13.81613:81648]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 2050 [63.3561]
B:BD[13.82347] → [13.82347:82382]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 2067 [63.3561]
B:BD[13.83081] → [13.83081:83116]
```
  Editor_state.screen_bottom1 = {}
```
Deletion in source_text_tests.lua at line 2076 [63.3561]
B:BD[71.1303] → [2.885:885]
B:BD[63.67421] → [37.1905:1963]
BD:BD[63.67421] → [37.1905:1963]
BD:BD[63.67421] → [37.1905:1963]
```
  edit.run_after_keychord(Editor_state, 'right', 'right')
```
Solving an order conflict in source_text_tests.lua at line 2076 [63.3561]
[71.1303]

Replacement in source_text.lua at line 5 [63.83786]

B:BD[13.83750] → [21.155:235]

-- return y for the next line, and position of start of final screen line drawn

[13.83750]

[76.8]

-- return y for the next line

Deletion in source_text.lua at line 9 [63.83786]
B:BD[13.83973] → [13.83973:83997]
```
  line_cache.starty = y
```

Deletion in source_text.lua at line 11 [63.83786]

B:BD[73.1128] → [21.236:312]

  local final_screen_line_starting_pos = startpos  -- track value to return

Deletion in source_text.lua at line 25 [63.83786]
B:BD[13.87400] → [28.2823:2823]
BD:BD[13.87400] → [28.2823:2823]
B:BD[63.84027] → [37.1965:1995]
BD:BD[63.84027] → [37.1965:1995]
BD:BD[63.84027] → [37.1965:1995]
∅:D[21.521] → [77.413:456]
∅:D[33.2062] → [77.413:456]
∅:D[28.2823] → [77.413:456]
B:BD[63.87831] → [77.413:456]
BD:BD[63.87831] → [77.413:456]
```
-- return y for the next line
      final_screen_line_starting_pos = pos
```
Solving an order conflict in source_text.lua at line 25 [63.83786]
[13.87400]
[78.49]
Resurrecting zombie bytes in source_text.lua at line 82 [63.83786]
B:B[77.1941] → [21.1027:1041]
BD:B[77.1941] → [21.1027:1041]
```
    end
  end
```
Deletion in source_text.lua at line 84 [63.83786]
∅:D[21.1041] → [77.1942:1985]
B:BD[63.89166] → [77.1942:1985]
BD:BD[63.89166] → [77.1942:1985]
```
  return y, final_screen_line_starting_pos
```
Resurrecting zombie bytes in source_text.lua at line 84 [63.83786]
B:B[63.89166] → [37.1996:2007]
BD:B[63.89166] → [37.1996:2007]
```
  return y
```
Solving an order conflict in source_text.lua at line 84 [63.83786]
[21.1041]
[37.1996]

Resurrecting zombie bytes in source_text.lua at line 85 [63.83786]

∅:∅[37.2007] → [77.1985:2220]

B:B[77.1985] → [77.1985:2220]

BD:B[77.1985] → [77.1985:2220]

end
function Text.screen_line(line, line_cache, i)
  local pos = line_cache.screen_line_starting_pos[i]
  local offset = Text.offset(line.data, pos)
  if i >= #line_cache.screen_line_starting_pos then
    return line.data:sub(offset)

Replacement in source_text.lua at line 208 [63.83786]

B:BD[13.96937] → [13.96937:97088]

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

[13.96937]

[13.97088]

--?   print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)

Replacement in source_text.lua at line 241 [63.83786]

B:BD[13.98987] → [13.98987:99140]

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

[13.98987]

[13.99140]

--?     print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)

Replacement in source_text.lua at line 246 [63.83786]

B:BD[13.99393] → [13.99393:99554]

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

[13.99393]

[13.99554]

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

Replacement in source_text.lua at line 427 [63.83786]

B:BD[28.9540] → [28.9540:9562]

--?   print('pageup')

[28.9540]

[28.9562]

  State.screen_top1 = Text.previous_screen_top1(State)
  State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
  Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary(State)
  Text.redraw_all(State)  -- if we're scrolling, reclaim all fragments to avoid memory leaks
end
-- return the top y coordinate of a given line_index,
-- or nil if no part of it is on screen
function Text.starty(State, line_index)

Replacement in source_text.lua at line 437 [63.83786]

B:BD[28.9603] → [28.9603:9684]

  local top2 = Text.to2(State, State.screen_top1)
--?   print(App.screen.height)

[28.9603]

[28.9684]

  -- does not modify State (except to populate line_cache)
  if line_index < State.screen_top1.line then return end
  local loc2 = Text.to2(State, State.screen_top1)
  local y = State.top
  while true do
    if State.lines[loc2.line].mode == 'drawing' then
      y = y + Drawing_padding_top
    end
    if loc2.line == line_index then return y end
    if State.lines[loc2.line].mode == 'text' then
      y = y + State.line_height
    elseif State.lines[loc2.line].mode == 'drawing' then
      y = y + Drawing.pixels(State.lines[loc2.line].h, State.width) + Drawing_padding_bottom
    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  -- end of file
    loc2 = next_loc2
  end
end
function Text.previous_screen_top1(State)
  -- duplicate some logic from love.draw
  -- does not modify State (except to populate line_cache)
  local loc2 = Text.to2(State, State.screen_top1)

Replacement in source_text.lua at line 464 [63.83786]

B:BD[28.9760] → [28.9760:9967]

--?     print(y, top2.line, top2.screen_line, top2.screen_pos)
    if State.screen_top1.line == 1 and State.screen_top1.pos == 1 then break end
    if State.lines[State.screen_top1.line].mode == 'text' then

[28.9760]

[28.9967]

    if loc2.line == 1 and loc2.screen_line == 1 and loc2.screen_pos == 1 then break end
    if State.lines[loc2.line].mode == 'text' then

Replacement in source_text.lua at line 467 [63.83786]

B:BD[28.9999] → [28.9999:10175]

    elseif State.lines[State.screen_top1.line].mode == 'drawing' then
      y = y - Drawing_padding_height - Drawing.pixels(State.lines[State.screen_top1.line].h, State.width)

[28.9999]

[28.10175]

    elseif State.lines[loc2.line].mode == 'drawing' then
      y = y - Drawing_padding_height - Drawing.pixels(State.lines[loc2.line].h, State.width)

Replacement in source_text.lua at line 470 [63.83786]
B:BD[28.10183] → [28.10183:10233]
```
    top2 = Text.previous_screen_line(State, top2)
```
[28.10183]
[28.10233]
```
    loc2 = Text.previous_screen_line(State, loc2)
```

Replacement in source_text.lua at line 472 [63.83786]

B:BD[28.10239] → [28.10239:10566]

  State.screen_top1 = Text.to1(State, top2)
  State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
  Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary(State)
--?   print(State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)
--?   print('pageup end')

[28.10239]

[28.10566]

  return Text.to1(State, loc2)

Replacement in source_text.lua at line 476 [63.83786]

B:BD[28.10601] → [28.10601:10787]

--?   print('pagedown')
  State.screen_top1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos}
--?   print('setting top to', State.screen_top1.line, State.screen_top1.pos)

[28.10601]

[28.10787]

  State.screen_top1 = Text.screen_bottom1(State)

Deletion in source_text.lua at line 479 [63.83786]
B:BD[28.10946] → [28.10946:10993]
```
--?   print('top now', State.screen_top1.line)
```

Replacement in source_text.lua at line 480 [63.83786]

B:BD[28.11086] → [28.11086:11114]

--?   print('pagedown end')

[28.11086]

[28.11114]

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)

Replacement in source_text.lua at line 547 [63.83786]

B:BD[79.596] → [79.596:755]

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

[79.596]

[79.755]

--?   print('down', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)

Replacement in source_text.lua at line 564 [63.83786]

B:BD[79.1401] → [79.1401:1460]

    if State.cursor1.line > State.screen_bottom1.line then

[79.1401]

[79.1460]

    local screen_bottom1 = Text.screen_bottom1(State)
--?   print('down 2', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, screen_bottom1.line, screen_bottom1.pos)
    if State.cursor1.line > screen_bottom1.line then

Replacement in source_text.lua at line 574 [63.83786]

B:BD[79.1790] → [79.1790:1860]

    local scroll_down = Text.le1(State.screen_bottom1, State.cursor1)

[79.1790]

[79.1860]

    local screen_bottom1 = Text.screen_bottom1(State)
    local scroll_down = Text.le1(screen_bottom1, State.cursor1)

Replacement in source_text.lua at line 591 [63.83786]

B:BD[79.3024] → [79.3024:3181]

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

[79.3024]

[79.3181]

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

Insertion in source_text.lua at line 728 [63.83786]
[79.7181]
[79.7181]
```
  assert(State.lines[loc1.line].mode == 'text')
```

Insertion in source_text.lua at line 740 [63.83786]

[79.7636]

end
function Text.final_text_loc_on_screen(State)
  local screen_bottom1 = Text.screen_bottom1(State)
  if State.lines[screen_bottom1.line].mode == 'text' then
    return {
      line=screen_bottom1.line,
      pos=Text.pos_at_end_of_screen_line(State, screen_bottom1),
    }
  end
  local loc2 = Text.to2(State, screen_bottom1)
  while true do
    if State.lines[loc2.line].mode == 'text' then break end
    assert(loc2.line > 1 or loc2.screen_line > 1 and loc2.screen_pos > 1)  -- elsewhere we're making sure there's always at least one text line on screen
    loc2 = Text.previous_screen_line(State, loc2)
  end
  local result = Text.to1(State, loc2)
  result.pos = Text.pos_at_end_of_screen_line(State, result)
  return result

Replacement in source_text.lua at line 801 [63.83786]

B:BD[79.9342] → [79.9342:9501]

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

[79.9342]

[79.9501]

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

Replacement in source_text.lua at line 831 [63.83786]

B:BD[79.10809] → [79.10809:10971]

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

[79.10809]

[79.10971]

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

Replacement in source_text.lua at line 838 [63.83786]

B:BD[79.11204] → [79.11204:11330]

  if line_cache.starty == nil then return false end  -- outside current page
  if y < line_cache.starty then return false end

[79.11204]

[79.11330]

  local starty = Text.starty(State, line_index)
  if starty == nil then return false end  -- outside current page
  if y < starty then return false end

Replacement in source_text.lua at line 842 [63.83786]

B:BD[79.11390] → [79.11390:11567]

  return y < line_cache.starty + State.line_height*(#line_cache.screen_line_starting_pos - Text.screen_line_index(line_cache.screen_line_starting_pos, line_cache.startpos) + 1)

[79.11390]

[79.11567]

  return y < starty + State.line_height*(#line_cache.screen_line_starting_pos - Text.screen_line_index(line_cache.screen_line_starting_pos, line_cache.startpos) + 1)

Replacement in source_text.lua at line 849 [63.83786]

B:BD[79.11768] → [79.11768:11835]

  assert(my >= line_cache.starty, 'failed to map y pixel to line')

[79.11768]

[79.11835]

  local starty = Text.starty(State, line_index)
  assert(my >= starty, 'failed to map y pixel to line')

Replacement in source_text.lua at line 852 [63.83786]
B:BD[79.11876] → [79.11876:11906]
```
  local y = line_cache.starty
```
[79.11876]
[79.11906]
```
  local y = starty
```

Insertion in source_text.lua at line 1038 [63.83786]

[79.17856]

function Text.eq2(a, b)
  return a.line == b.line and a.screen_line == b.screen_line and a.screen_pos == b.screen_pos
end

Insertion in source_text.lua at line 1065 [63.83786]

[79.18725]

function Text.next_screen_line(State, loc2)
  if State.lines[loc2.line].mode == 'drawing' then
    return {line=loc2.line+1, screen_line=1, screen_pos=1}
  end
  Text.populate_screen_line_starting_pos(State, loc2.line)
  if loc2.screen_line >= #State.line_cache[loc2.line].screen_line_starting_pos then
    if loc2.line < #State.lines then
      return {line=loc2.line+1, screen_line=1, screen_pos=1}
    else
      return loc2
    end
  else
    return {line=loc2.line, screen_line=loc2.screen_line+1, screen_pos=1}
  end
end

Insertion in source_text.lua at line 1104 [63.83786]
[79.19577]
[79.19577]
```
  local screen_bottom1 = Text.screen_bottom1(State)
```

Replacement in source_text.lua at line 1107 [63.83786]

B:BD[79.19707] → [79.19707:19794]

  elseif State.cursor1.line >= State.screen_bottom1.line then
--?     print('too low')

[79.19707]

[79.19794]

  elseif State.cursor1.line >= screen_bottom1.line then

Replacement in source_text.lua at line 1109 [63.83786]

B:BD[79.19839] → [79.19839:20043]

--?       print('tweak')
      State.cursor1 = {
          line=State.screen_bottom1.line,
          pos=Text.to_pos_on_line(State, State.screen_bottom1.line, State.right-5, App.screen.height-5),
      }

[79.19839]

[79.20043]

      State.cursor1 = Text.final_text_loc_on_screen(State)

Deletion in source_text.lua at line 1118 [63.83786]

B:BD[79.20204] → [79.20204:20514]

  -- this approach is cheaper and almost works, except on the final screen
  -- where file ends above bottom of screen
--?   local botpos = Text.pos_at_start_of_screen_line(State, State.cursor1)
--?   local botline1 = {line=State.cursor1.line, pos=botpos}
--?   return Text.lt1(State.screen_bottom1, botline1)

Deletion in source_text.lua at line 1174 [63.83786]

B:BD[79.21703] → [2.961:961]

B:BD[63.97366] → [37.2008:2106]

BD:BD[63.97366] → [37.2008:2106]

B:BD[63.99416] → [37.2107:2207]

BD:BD[63.99416] → [37.2107:2207]

B:BD[63.99822] → [37.2208:2316]

BD:BD[63.99822] → [37.2208:2316]

B:BD[63.107562] → [37.2317:2763]

BD:BD[63.107562] → [37.2317:2763]

B:BD[63.107625] → [37.2764:3761]

BD:BD[63.107625] → [37.2764:3761]

B:BD[63.107782] → [37.3762:3900]

BD:BD[63.107782] → [37.3762:3900]

B:BD[61.5135] → [37.3901:4051]

BD:BD[61.5135] → [37.3901:4051]

B:BD[61.5319] → [37.4052:4102]

BD:BD[61.5319] → [37.4052:4102]

B:BD[63.108038] → [37.4103:4134]

BD:BD[63.108038] → [37.4103:4134]

B:BD[63.108429] → [37.4135:4184]

BD:BD[63.108429] → [37.4135:4184]

B:BD[63.145835] → [37.7747:7806]

BD:BD[63.145835] → [37.7747:7806]

B:BD[63.145703] → [37.7690:7746]

BD:BD[63.145703] → [37.7690:7746]

B:BD[63.145573] → [37.7637:7689]

BD:BD[63.145573] → [37.7637:7689]

B:BD[63.144279] → [37.7108:7636]

BD:BD[63.144279] → [37.7108:7636]

B:BD[80.7111] → [37.6984:7107]

BD:BD[80.7111] → [37.6984:7107]

B:BD[63.131023] → [37.6964:6983]

BD:BD[63.131023] → [37.6964:6983]

B:BD[63.130948] → [37.6859:6963]

BD:BD[63.130948] → [37.6859:6963]

B:BD[80.5669] → [37.6692:6858]

BD:BD[80.5669] → [37.6692:6858]

B:BD[63.128885] → [37.6539:6691]

BD:BD[63.128885] → [37.6539:6691]

B:BD[63.128406] → [37.6429:6538]

BD:BD[63.128406] → [37.6429:6538]

B:BD[80.5213] → [37.6322:6428]

BD:BD[80.5213] → [37.6322:6428]

B:BD[81.1819] → [37.5589:6321]

BD:BD[81.1819] → [37.5589:6321]

B:BD[70.3828] → [37.5540:5588]

BD:BD[70.3828] → [37.5540:5588]

B:BD[63.118244] → [37.5435:5539]

BD:BD[63.118244] → [37.5435:5539]

B:BD[80.4302] → [37.5316:5434]

BD:BD[80.4302] → [37.5316:5434]

B:BD[63.115473] → [37.5059:5315]

BD:BD[63.115473] → [37.5059:5315]

B:BD[81.1324] → [37.4952:5058]

BD:BD[81.1324] → [37.4952:5058]

B:BD[63.109133] → [37.4185:4951]

BD:BD[63.109133] → [37.4185:4951]

--?   print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)
--?     print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)
--?       print('=>', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)
  State.screen_top1 = Text.previous_screen_top1(State)
  State.cursor1 = {line=State.screen_top1.line, pos=State.screen_top1.pos}
  Text.move_cursor_down_to_next_text_line_while_scrolling_again_if_necessary(State)
  Text.redraw_all(State)  -- if we're scrolling, reclaim all fragments to avoid memory leaks
end
-- return the top y coordinate of a given line_index,
-- or nil if no part of it is on screen
function Text.starty(State, line_index)
  -- does not modify State (except to populate line_cache)
  if line_index < State.screen_top1.line then return end
  local loc2 = Text.to2(State, State.screen_top1)
  local y = State.top
  while true do
    if State.lines[loc2.line].mode == 'drawing' then
      y = y + Drawing_padding_top
    end
    if loc2.line == line_index then return y end
    if State.lines[loc2.line].mode == 'text' then
      y = y + State.line_height
    elseif State.lines[loc2.line].mode == 'drawing' then
      y = y + Drawing.pixels(State.lines[loc2.line].h, State.width) + Drawing_padding_bottom
    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  -- end of file
    loc2 = next_loc2
  end
end
function Text.previous_screen_top1(State)
  -- duplicate some logic from love.draw
  -- does not modify State (except to populate line_cache)
  local loc2 = Text.to2(State, State.screen_top1)
    if loc2.line == 1 and loc2.screen_line == 1 and loc2.screen_pos == 1 then break end
    if State.lines[loc2.line].mode == 'text' then
    elseif State.lines[loc2.line].mode == 'drawing' then
      y = y - Drawing_padding_height - Drawing.pixels(State.lines[loc2.line].h, State.width)
    loc2 = Text.previous_screen_line(State, loc2)
  return Text.to1(State, loc2)
  State.screen_top1 = Text.screen_bottom1(State)
      State.cursor1 = Text.final_text_loc_on_screen(State)
  elseif State.cursor1.line >= screen_bottom1.line then
  local screen_bottom1 = Text.screen_bottom1(State)
function Text.next_screen_line(State, loc2)
  if State.lines[loc2.line].mode == 'drawing' then
    return {line=loc2.line+1, screen_line=1, screen_pos=1}
  end
  Text.populate_screen_line_starting_pos(State, loc2.line)
  if loc2.screen_line >= #State.line_cache[loc2.line].screen_line_starting_pos then
    if loc2.line < #State.lines then
      return {line=loc2.line+1, screen_line=1, screen_pos=1}
    else
      return loc2
    end
  else
    return {line=loc2.line, screen_line=loc2.screen_line+1, screen_pos=1}
  end
end
end
function Text.eq2(a, b)
  return a.line == b.line and a.screen_line == b.screen_line and a.screen_pos == b.screen_pos
  local y = starty
  local starty = Text.starty(State, line_index)
  assert(my >= starty, 'failed to map y pixel to line')
  return y < starty + State.line_height*(#line_cache.screen_line_starting_pos - Text.screen_line_index(line_cache.screen_line_starting_pos, line_cache.startpos) + 1)
  local starty = Text.starty(State, line_index)
  if starty == nil then return false end  -- outside current page
  if y < starty then return false end
--?   print('snap =>', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)
--?   print('snap', State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos)
end
function Text.final_text_loc_on_screen(State)
  local screen_bottom1 = Text.screen_bottom1(State)
  if State.lines[screen_bottom1.line].mode == 'text' then
    return {
      line=screen_bottom1.line,
      pos=Text.pos_at_end_of_screen_line(State, screen_bottom1),
    }
  end
  local loc2 = Text.to2(State, screen_bottom1)
  while true do
    if State.lines[loc2.line].mode == 'text' then break end
    assert(loc2.line > 1 or loc2.screen_line > 1 and loc2.screen_pos > 1)  -- elsewhere we're making sure there's always at least one text line on screen
    loc2 = Text.previous_screen_line(State, loc2)
  end
  local result = Text.to1(State, loc2)
  result.pos = Text.pos_at_end_of_screen_line(State, result)
  return result
  assert(State.lines[loc1.line].mode == 'text')
--?   print('=>', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)
    local screen_bottom1 = Text.screen_bottom1(State)
    local scroll_down = Text.le1(screen_bottom1, State.cursor1)
    local screen_bottom1 = Text.screen_bottom1(State)
--?   print('down 2', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos, screen_bottom1.line, screen_bottom1.pos)
    if State.cursor1.line > screen_bottom1.line then
--?   print('down', State.cursor1.line, State.cursor1.pos, State.screen_top1.line, State.screen_top1.pos)
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)

Solving an order conflict in source_text.lua at line 1174 [63.83786]
[79.21703]
Deletion in source_edit.lua at line 36 [63.152503]
B:BD[61.17256] → [61.17256:17321]
BD:BD[61.17256] → [61.17256:17321]
```
    --    a (y) coord in pixels (updated while painting screen),
```

Resurrecting zombie bytes in source_edit.lua at line 36 [63.152503]

B:B[61.17321] → [61.17321:18044]

BD:B[61.17321] → [61.17321:18044]

    --    a (h)eight,
    --    an array of points, and
    --    an array of shapes
    -- a shape is a table containing:
    --    a mode
    --    an array points for mode 'freehand' (raw x,y coords; freehand drawings don't pollute the points array of a drawing)
    --    an array vertices for mode 'polygon', 'rectangle', 'square'
    --    p1, p2 for mode 'line'
    --    center, radius for mode 'circle'
    --    center, radius, start_angle, end_angle for mode 'arc'
    -- Unless otherwise specified, coord fields are normalized; a drawing is always 256 units wide
    -- The field names are carefully chosen so that switching modes in midstream
    -- remembers previously entered points where that makes sense.

Deletion in source_edit.lua at line 56 [63.152503]
B:BD[13.145515] → [13.145515:145585]
```
    --   starty, the y coord in pixels the line starts rendering from
```
Deletion in source_edit.lua at line 69 [63.152503]
B:BD[13.146472] → [6.116653:116653]
Resurrecting zombie bytes in source_edit.lua at line 69 [63.152503]
B:B[63.154525] → [37.7811:7870]
BD:B[63.154525] → [37.7811:7870]
```
    --
    -- On lines that are drawings, pos will be nil.
```
Solving an order conflict in source_edit.lua at line 69 [63.152503]
[13.146472]
[37.7811]

Deletion in source_edit.lua at line 72 [63.152503]

B:BD[80.8188] → [80.8188:8337]

BD:BD[80.8188] → [80.8188:8337]

    cursor1 = {line=1, pos=1},  -- position of cursor
    screen_bottom1 = {line=1, pos=1},  -- position of start of screen line at bottom of screen

Resurrecting zombie bytes in source_edit.lua at line 72 [63.152503]
B:B[80.8337] → [73.7215:7216]
BD:B[80.8337] → [73.7215:7216]

Insertion in source_edit.lua at line 72 [63.152503]

[80.8188]

[73.7215]

    cursor1 = {line=1, pos=1},  -- position of cursor; must be on a text line

Deletion in source_edit.lua at line 167 [63.152503]
B:BD[13.147775] → [9.8446:8491]
```
  local screen_bottom1 = {line=nil, pos=nil}
```
Deletion in source_edit.lua at line 172 [63.152503]
B:BD[13.147962] → [9.8495:8495]
BD:BD[13.147962] → [9.8495:8495]
∅:D[9.8495] → [70.4302:4339]
B:BD[63.156055] → [70.4302:4339]
BD:BD[63.156055] → [70.4302:4339]
```
    screen_bottom1.line = line_index
```
Resurrecting zombie bytes in source_edit.lua at line 172 [63.152503]
∅:∅[70.4339] → [61.18495:18527]
∅:∅[80.8595] → [61.18495:18527]
∅:∅[13.148026] → [61.18495:18527]
B:B[80.8595] → [61.18495:18527]
B:B[63.156119] → [61.18495:18527]
BD:B[70.4339] → [61.18495:18527]
```
    if line.mode == 'text' then
```
Deletion in source_edit.lua at line 198 [63.152503]
B:BD[13.148080] → [76.406:406]
BD:BD[13.148080] → [76.406:406]
∅:D[76.406] → [83.964:1068]
B:BD[63.156405] → [83.964:1068]
BD:BD[63.156405] → [83.964:1068]
```
      y, screen_bottom1.pos = Text.draw(State, line_index, y, startpos, hide_cursor, show_line_numbers)
```
Resurrecting zombie bytes in source_edit.lua at line 198 [63.152503]
B:B[63.156405] → [37.7950:8034]
BD:B[63.156405] → [37.7950:8034]
```
      y = Text.draw(State, line_index, y, startpos, hide_cursor, show_line_numbers)
```
Solving an order conflict in source_edit.lua at line 198 [63.152503]
[13.148080]
[37.7950]
Deletion in source_edit.lua at line 208 [63.152503]
B:BD[13.148095] → [9.8498:8538]
```
  State.screen_bottom1 = screen_bottom1
```
Deletion in source_edit.lua at line 277 [63.152503]
B:BD[73.8645] → [84.141:141]
B:BD[61.20456] → [37.8035:8117]
BD:BD[61.20456] → [37.8035:8117]
```
      if Drawing.in_drawing(State, line_index, x, y, State.left,State.right) then
```
Solving an order conflict in source_edit.lua at line 277 [63.152503]
[73.8645]
[70.4943]
Deletion in source_edit.lua at line 278 [63.152503]
B:BD[70.5131] → [37.8118:8176]
BD:BD[70.5131] → [37.8118:8176]
BD:BD[70.5131] → [37.8118:8176]
B:BD[85.1298] → [37.8177:8234]
BD:BD[85.1298] → [37.8177:8234]
B:BD[86.241] → [37.8235:8282]
BD:BD[86.241] → [37.8235:8282]
BD:BD[86.241] → [37.8235:8282]
```
  State.selection1 = Text.final_text_loc_on_screen(State)
    State.cursor1 = Text.final_text_loc_on_screen(State)
    State.cursor1 = Text.screen_bottom1(State)
```

Replacement in source_edit.lua at line 280 [63.152503]

B:BD[73.8775] → [73.8775:8910]

      local line_cache = State.line_cache[line_index]
      if Drawing.in_drawing(line, line_cache, x, y, State.left,State.right) then

[73.8775]

[73.8910]

      if Drawing.in_drawing(State, line_index, x, y, State.left,State.right) then

Replacement in source_edit.lua at line 294 [63.152503]

B:BD[9.9191] → [9.9191:9327]

  State.selection1 = {
      line=State.screen_bottom1.line,
      pos=Text.pos_at_end_of_screen_line(State, State.screen_bottom1),
  }

[9.9191]

[73.9156]

  State.selection1 = Text.final_text_loc_on_screen(State)

Replacement in source_edit.lua at line 332 [63.152503]

B:BD[8.2244] → [8.2244:2375]

    State.cursor1.line, State.cursor1.pos = State.screen_bottom1.line, Text.pos_at_end_of_screen_line(State, State.screen_bottom1)

[8.2244]

[8.2375]

    State.cursor1 = Text.final_text_loc_on_screen(State)

Replacement in source_edit.lua at line 360 [63.152503]

B:BD[87.240] → [87.240:323]

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

[87.240]

[76.453]

    State.cursor1 = Text.screen_bottom1(State)

Replacement in source_edit.lua at line 394 [63.152503]

B:BD[73.11672] → [88.11:198]

      chord ~= 'C-a' and chord ~= 'C-c' and chord ~= 'C-x' and chord ~= 'backspace' and chord ~= 'delete' and chord ~= 'C-z' and chord ~= 'C-y' and not App.is_cursor_movement(chord) then

[73.11672]

[73.11840]

      chord ~= 'C-a' and chord ~= 'C-c' and chord ~= 'C-x' and chord ~= 'backspace' and chord ~= 'delete' and chord ~= 'C-z' and chord ~= 'C-y' and not App.is_cursor_movement(key) then

Deletion in source_edit.lua at line 398 [63.152503]

B:BD[73.11932] → [73.11932:12039]

    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll

Deletion in source_edit.lua at line 502 [63.152503]
B:BD[61.21853] → [61.21853:21895]
BD:BD[61.21853] → [61.21853:21895]
```
    -- DON'T reset line_cache.starty here
```

Resurrecting zombie bytes in source_edit.lua at line 502 [63.152503]

B:B[61.21895] → [61.21895:22039]

BD:B[61.21895] → [61.21895:22039]

    local drawing_index, drawing = Drawing.current_drawing(State)
    if drawing_index then
      local before = snapshot(State, drawing_index)

Resurrecting zombie bytes in source_edit.lua at line 506 [63.152503]

∅:∅[67.6019] → [61.22084:22390]

B:B[61.22084] → [61.22084:22390]

BD:B[61.22084] → [61.22084:22390]

      record_undo_event(State, {before=before, after=snapshot(State, drawing_index)})
      schedule_save(State)
    end
  elseif chord == 'escape' and not App.mouse_down(1) then
    for _,line in ipairs(State.lines) do
      if line.mode == 'drawing' then
        line.show_help = false
      end
    end

Resurrecting zombie bytes in source_edit.lua at line 516 [63.152503]

∅:∅[89.678] → [61.22441:23003]

B:B[61.22441] → [61.22441:23003]

BD:B[61.22441] → [61.22441:23003]

    if chord == 'return' then
      State.current_drawing_mode = State.previous_drawing_mode
      State.previous_drawing_mode = nil
    else
      local before = snapshot(State, State.lines.current_drawing_index)
      local drawing = State.lines.current_drawing
      local p = drawing.points[drawing.pending.target_point]
      if chord == 'escape' then
        p.name = nil
        record_undo_event(State, {before=before, after=snapshot(State, State.lines.current_drawing_index)})
      elseif chord == 'backspace' then
        local len = utf8.len(p.name)

Resurrecting zombie bytes in source_edit.lua at line 534 [63.152503]
∅:∅[89.983] → [61.23263:23306]
B:B[61.23263] → [61.23263:23306]
BD:B[61.23263] → [61.23263:23306]
```
      end
    end
    schedule_save(State)
```

Deletion in source_edit.lua at line 537 [63.152503]

B:BD[68.25659] → [37.8283:8468]

BD:BD[68.25659] → [37.8283:8468]

      chord ~= 'C-a' and chord ~= 'C-c' and chord ~= 'C-x' and chord ~= 'backspace' and chord ~= 'delete' and chord ~= 'C-z' and chord ~= 'C-y' and not App.is_cursor_movement(key) then

Solving an order conflict in source_edit.lua at line 537 [63.152503]
[61.23306]
[13.154331]

Deletion in source_edit.lua at line 538 [63.152503]

B:BD[13.154338] → [13.154338:154445]

    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll

Insertion in source_edit.lua at line 592 [63.152503]
[14.6054]
[13.156383]
```
  edit.draw(State)
```
Deletion in source_edit.lua at line 615 [63.152503]
B:BD[13.156934] → [3.87:87]
B:BD[67.6436] → [37.8469:8488]
BD:BD[67.6436] → [37.8469:8488]
BD:BD[67.6436] → [37.8469:8488]
B:BD[80.8188] → [37.7871:7949]
BD:BD[80.8188] → [37.7871:7949]
```
  edit.draw(State)
    cursor1 = {line=1, pos=1},  -- position of cursor; must be on a text line
```
Solving an order conflict in source_edit.lua at line 615 [63.152503]
[13.156934]

Deletion in source.lua at line 305 [92.5]

∅:D[14.6510] → [91.213:327]

B:BD[91.213] → [91.213:327]

    for _,line_cache in ipairs(Editor_state.line_cache) do line_cache.starty = nil end  -- just in case we scroll

Replacement in select.lua at line 72 [7.43980]
B:BD[9.9998] → [9.9998:10060]
```
  if y < State.line_cache[State.screen_top1.line].starty then
```
[9.9998]
[9.10060]
```
  if y < State.top then
```

Replacement in select.lua at line 80 [7.43980]

B:BD[6.119973] → [9.10118:10214]

  return State.screen_bottom1.line, Text.pos_at_end_of_screen_line(State, State.screen_bottom1)

[6.119973]

  local screen_bottom1 = Text.screen_bottom1(State)
  return screen_bottom1.line, Text.pos_at_end_of_screen_line(State, screen_bottom1)

Deletion in select.lua at line 164 [7.43980]
B:BD[6.122836] → [28.14814:14814]
B:BD[47.1839] → [16.3628:3652]
BD:BD[47.1839] → [16.3628:3652]
BD:BD[47.1839] → [16.3628:3652]
B:BD[7.46495] → [20.8130:8266]
BD:BD[7.46495] → [20.8130:8266]
```
  if y < State.top then
  local screen_bottom1 = Text.screen_bottom1(State)
  return screen_bottom1.line, Text.pos_at_end_of_screen_line(State, screen_bottom1)
```
Solving an order conflict in select.lua at line 164 [7.43980]
[6.122836]

Deletion in edit.lua at line 22 [93.413]

B:BD[6.130525] → [6.130525:130595]

    --   starty, the y coord in pixels the line starts rendering from

Resurrecting zombie bytes in edit.lua at line 22 [93.413]
∅:∅[6.130595] → [94.108:189]
B:B[95.8031] → [94.108:189]
BD:B[95.8031] → [94.108:189]
```
    --   fragments: snippets of the line guaranteed to not straddle screen lines
```

Insertion in edit.lua at line 35 [93.413]

[6.131301]

    --
    -- On lines that are drawings, pos will be nil.

Replacement in edit.lua at line 38 [93.413]

B:BD[6.131390] → [6.131390:131539]

    cursor1 = {line=1, pos=1},  -- position of cursor
    screen_bottom1 = {line=1, pos=1},  -- position of start of screen line at bottom of screen

[6.131390]

[6.131539]

    cursor1 = {line=1, pos=1},  -- position of cursor; must be on a text line

Deletion in edit.lua at line 101 [93.413]
B:BD[6.142371] → [96.1096:1096]
B:BD[17.96483] → [48.796:855]
BD:BD[17.96483] → [48.796:855]
BD:BD[17.96483] → [48.796:855]
B:BD[17.96572] → [48.856:934]
BD:BD[17.96572] → [48.856:934]
```
    --
    -- On lines that are drawings, pos will be nil.
    cursor1 = {line=1, pos=1},  -- position of cursor; must be on a text line
```
Solving an order conflict in edit.lua at line 101 [93.413]
[6.142371]
[98.34]
Deletion in edit.lua at line 110 [93.413]
B:BD[98.527] → [98.527:572]
BD:BD[98.527] → [98.527:572]
```
  local screen_bottom1 = {line=nil, pos=nil}
```

Resurrecting zombie bytes in edit.lua at line 110 [93.413]

B:B[98.572] → [98.572:802]

BD:B[98.572] → [98.572:802]

B:B[98.839] → [98.839:1000]

BD:B[98.839] → [98.839:1000]

--?   print('== draw')
  for line_index = State.screen_top1.line,#State.lines do
    local line = State.lines[line_index]
--?     print('draw:', y, line_index, line)
    if y + State.line_height > App.screen.height then break end
--?     print('text.draw', y, line_index)
    local startpos = 1
    if line_index == State.screen_top1.line then
      startpos = State.screen_top1.pos
    end

Deletion in edit.lua at line 115 [93.413]
B:BD[98.802] → [98.802:839]
BD:BD[98.802] → [98.802:839]
```
    screen_bottom1.line = line_index
```
Deletion in edit.lua at line 120 [93.413]
B:BD[98.1000] → [98.1000:1070]
BD:BD[98.1000] → [98.1000:1070]
```
    y, screen_bottom1.pos = Text.draw(State, line_index, y, startpos)
```

Resurrecting zombie bytes in edit.lua at line 121 [93.413]

∅:∅[37.8960] → [98.1070:1101]

B:B[98.1070] → [98.1070:1101]

BD:B[98.1070] → [98.1070:1101]

B:B[98.1141] → [98.1141:1822]

BD:B[98.1141] → [98.1141:1822]

--?     print('=> y', y)
  end
  if State.search_term then
    Text.draw_search_bar(State)
  end
  return y
end
function edit.update(State, dt)
  if State.next_save and State.next_save < Current_time then
    save_to_disk(State)
    State.next_save = nil
  end
end
function schedule_save(State)
  if State.next_save == nil then
    State.next_save = Current_time + 3  -- short enough that you're likely to still remember what you did
  end
end
function edit.quit(State)
  -- make sure to save before quitting
  if State.next_save then
    save_to_disk(State)
    -- give some time for the OS to flush everything to disk
    love.timer.sleep(0.1)
  end
end
function edit.mouse_press(State, x,y, mouse_button)

Deletion in edit.lua at line 123 [93.413]
B:BD[98.1101] → [98.1101:1141]
BD:BD[98.1101] → [98.1101:1141]
```
  State.screen_bottom1 = screen_bottom1
```
Resurrecting zombie bytes in edit.lua at line 153 [93.413]
∅:∅[99.176] → [98.1822:1861]
B:B[98.1822] → [98.1822:1861]
BD:B[98.1822] → [98.1822:1861]
```
  if State.search_term then return end
```

Resurrecting zombie bytes in edit.lua at line 155 [93.413]

∅:∅[100.63] → [98.1861:3203]

B:B[98.1861] → [98.1861:3203]

BD:B[98.1861] → [98.1861:3203]

--?   print_and_log(('edit.mouse_press: cursor at %d,%d'):format(State.cursor1.line, State.cursor1.pos))
  if y < State.top then
    State.old_cursor1 = State.cursor1
    State.old_selection1 = State.selection1
    State.mousepress_shift = App.shift_down()
    State.selection1 = {
        line=State.screen_top1.line,
        pos=State.screen_top1.pos,
    }
    return
  end
  for line_index,line in ipairs(State.lines) do
    if Text.in_line(State, line_index, x,y) then
      -- delicate dance between cursor, selection and old cursor/selection
      -- scenarios:
      --  regular press+release: sets cursor, clears selection
      --  shift press+release:
      --    sets selection to old cursor if not set otherwise leaves it untouched
      --    sets cursor
      --  press and hold to start a selection: sets selection on press, cursor on release
      --  press and hold, then press shift: ignore shift
      --    i.e. mouse_release should never look at shift state
--?       print_and_log(('edit.mouse_press: in line %d'):format(line_index))
      State.old_cursor1 = State.cursor1
      State.old_selection1 = State.selection1
      State.mousepress_shift = App.shift_down()
      State.selection1 = {
          line=line_index,
          pos=Text.to_pos_on_line(State, line_index, x, y),
      }
      return
    end
  end

Resurrecting zombie bytes in edit.lua at line 191 [93.413]
∅:∅[85.1928] → [98.3252:3374]
B:B[98.3252] → [98.3252:3374]
BD:B[98.3252] → [98.3252:3374]
```
  State.old_cursor1 = State.cursor1
  State.old_selection1 = State.selection1
  State.mousepress_shift = App.shift_down()
```

Deletion in edit.lua at line 194 [93.413]

B:BD[98.3374] → [98.3374:3510]

BD:BD[98.3374] → [98.3374:3510]

  State.selection1 = {
      line=State.screen_bottom1.line,
      pos=Text.pos_at_end_of_screen_line(State, State.screen_bottom1),
  }

Resurrecting zombie bytes in edit.lua at line 195 [93.413]

∅:∅[37.9019] → [98.3510:3727]

B:B[98.3510] → [98.3510:3727]

BD:B[98.3510] → [98.3510:3727]

end
function edit.mouse_release(State, x,y, mouse_button)
  if State.search_term then return end
--?   print_and_log(('edit.mouse_release(%d,%d): cursor at %d,%d'):format(x,y, State.cursor1.line, State.cursor1.pos))

Resurrecting zombie bytes in edit.lua at line 206 [93.413]

∅:∅[85.2084] → [98.3727:4134]

B:B[98.3727] → [98.3727:4134]

BD:B[98.3727] → [98.3727:4134]

  for line_index,line in ipairs(State.lines) do
    if Text.in_line(State, line_index, x,y) then
--?       print_and_log(('edit.mouse_release: in line %d'):format(line_index))
      State.cursor1 = {
          line=line_index,
          pos=Text.to_pos_on_line(State, line_index, x, y),
      }
--?       print_and_log(('edit.mouse_release: cursor now %d,%d'):format(State.cursor1.line, State.cursor1.pos))

Resurrecting zombie bytes in edit.lua at line 216 [93.413]
∅:∅[85.2137] → [98.4530:4544]
B:B[98.4530] → [98.4530:4544]
BD:B[98.4530] → [98.4530:4544]
```
    end
  end
```

Resurrecting zombie bytes in edit.lua at line 222 [93.413]

∅:∅[85.2360] → [98.4544:4742]

B:B[98.4544] → [98.4544:4742]

BD:B[98.4544] → [98.4544:4742]

--?   print_and_log(('edit.mouse_release: finally selection %s,%s cursor %d,%d'):format(tostring(State.selection1.line), tostring(State.selection1.pos), State.cursor1.line, State.cursor1.pos))
end

Resurrecting zombie bytes in edit.lua at line 239 [93.413]

∅:∅[85.2748] → [98.4742:4961]

B:B[98.4742] → [98.4742:4961]

BD:B[98.4742] → [98.4742:4961]

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

Deletion in edit.lua at line 246 [93.413]
B:BD[98.4961] → [98.4961:5044]
BD:BD[98.4961] → [98.4961:5044]
```
    State.cursor1 = {line=State.screen_bottom1.line, pos=State.screen_bottom1.pos}
```

Resurrecting zombie bytes in edit.lua at line 248 [93.413]

∅:∅[37.9168] → [98.5044:5289]

B:B[98.5044] → [98.5044:5289]

BD:B[98.5044] → [98.5044:5289]

B:B[98.5396] → [98.5396:5769]

BD:B[98.5396] → [98.5396:5769]

    for i=1,math.floor(-dy) do
      Text.down(State)
    end
  end
end
function edit.text_input(State, t)
--?   print('text input', t)
  if State.search_term then
    State.search_term = State.search_term..t
    Text.search_next(State)
  else
    Text.text_input(State, t)
  end
  schedule_save(State)
end
function edit.keychord_press(State, chord, key)
  if State.selection1.line and
      -- printable character created using shift key => delete selection
      -- (we're not creating any ctrl-shift- or alt-shift- combinations using regular/printable keys)
      (not App.shift_down() or utf8.len(key) == 1) and

Resurrecting zombie bytes in edit.lua at line 271 [93.413]

∅:∅[74.5120] → [98.5956:6048]

B:B[98.5956] → [98.5956:6048]

BD:B[98.5956] → [98.5956:6048]

B:B[98.6155] → [98.6155:7604]

BD:B[98.6155] → [98.6155:7604]

B:B[98.7711] → [98.7711:8227]

BD:B[98.7711] → [98.7711:8227]

B:B[98.8334] → [98.8334:9064]

BD:B[98.8334] → [98.8334:9064]

B:B[98.9171] → [98.9171:9339]

BD:B[98.9171] → [98.9171:9339]

B:B[98.9446] → [98.9446:10211]

BD:B[98.9446] → [98.9446:10211]

B:B[98.10318] → [98.10318:10509]

BD:B[98.10318] → [98.10318:10509]

    Text.delete_selection(State, State.left, State.right)
  end
  if State.search_term then
    if chord == 'escape' then
      State.search_term = nil
      State.cursor1 = State.search_backup.cursor
      State.screen_top1 = State.search_backup.screen_top
      State.search_backup = nil
      Text.redraw_all(State)  -- if we're scrolling, reclaim all fragments to avoid memory leaks
    elseif chord == 'return' then
      State.search_term = nil
      State.search_backup = nil
    elseif chord == 'backspace' then
      local len = utf8.len(State.search_term)
      local byte_offset = Text.offset(State.search_term, len)
      State.search_term = string.sub(State.search_term, 1, byte_offset-1)
    elseif chord == 'down' then
      State.cursor1.pos = State.cursor1.pos+1
      Text.search_next(State)
    elseif chord == 'up' then
      Text.search_previous(State)
    end
    return
  elseif chord == 'C-f' then
    State.search_term = ''
    State.search_backup = {
      cursor={line=State.cursor1.line, pos=State.cursor1.pos},
      screen_top={line=State.screen_top1.line, pos=State.screen_top1.pos},
    }
  -- zoom
  elseif chord == 'C-=' then
    edit.update_font_settings(State, State.font_height+2)
    Text.redraw_all(State)
  elseif chord == 'C--' then
    if State.font_height > 2 then
      edit.update_font_settings(State, State.font_height-2)
      Text.redraw_all(State)
    end
  elseif chord == 'C-0' then
    edit.update_font_settings(State, 20)
    Text.redraw_all(State)
  -- undo
  elseif chord == 'C-z' then
    local event = undo_event(State)
    if event then
      local src = event.before
      State.screen_top1 = deepcopy(src.screen_top)
      State.cursor1 = deepcopy(src.cursor)
      State.selection1 = deepcopy(src.selection)
      patch(State.lines, event.after, event.before)
      patch_placeholders(State.line_cache, event.after, event.before)
      -- if we're scrolling, reclaim all fragments to avoid memory leaks
      Text.redraw_all(State)
      schedule_save(State)
    end
  elseif chord == 'C-y' then
    local event = redo_event(State)
    if event then
      local src = event.after
      State.screen_top1 = deepcopy(src.screen_top)
      State.cursor1 = deepcopy(src.cursor)
      State.selection1 = deepcopy(src.selection)
      patch(State.lines, event.before, event.after)
      -- if we're scrolling, reclaim all fragments to avoid memory leaks
      Text.redraw_all(State)
      schedule_save(State)
    end
  -- clipboard
  elseif chord == 'C-a' then
    State.selection1 = {line=1, pos=1}
    State.cursor1 = {line=#State.lines, pos=utf8.len(State.lines[#State.lines].data)+1}
  elseif chord == 'C-c' then
    local s = Text.selection(State)
    if s then
      App.set_clipboard(s)
    end
  elseif chord == 'C-x' then
    local s = Text.cut_selection(State, State.left, State.right)
    if s then
      App.set_clipboard(s)
    end
    schedule_save(State)
  elseif chord == 'C-v' then
    -- We don't have a good sense of when to scroll, so we'll be conservative
    -- and sometimes scroll when we didn't quite need to.
    local before_line = State.cursor1.line
    local before = snapshot(State, before_line)
    local clipboard_data = App.get_clipboard()
    for _,code in utf8.codes(clipboard_data) do
      local c = utf8.char(code)
      if c == '\n' then
        Text.insert_return(State)
      else
        Text.insert_at_cursor(State, c)
      end
    end
    if Text.cursor_out_of_screen(State) then
      Text.snap_cursor_to_bottom_of_screen(State, State.left, State.right)
    end
    schedule_save(State)
    record_undo_event(State, {before=before, after=snapshot(State, before_line, State.cursor1.line)})
  -- dispatch to text
  else
    Text.keychord_press(State, chord)
  end
end
function edit.key_release(State, key, scancode)
end
function edit.update_font_settings(State, font_height)
  State.font_height = font_height

Deletion in edit.lua at line 274 [93.413]

B:BD[98.6048] → [98.6048:6155]

BD:BD[98.6048] → [98.6048:6155]

    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll

Deletion in edit.lua at line 374 [93.413]

B:BD[98.10211] → [98.10211:10318]

BD:BD[98.10211] → [98.10211:10318]

    for _,line_cache in ipairs(State.line_cache) do line_cache.starty = nil end  -- just in case we scroll

Resurrecting zombie bytes in edit.lua at line 384 [93.413]

∅:∅[102.1696] → [98.10575:11061]

B:B[98.10575] → [98.10575:11061]

BD:B[98.10575] → [98.10575:11061]

  State.line_height = math.floor(font_height*1.3)
end
--== some methods for tests
-- 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.
Test_margin_left = 25
Test_margin_right = 0
function edit.initialize_test_state()
  -- if you change these values, tests will start failing
  return edit.initialize_state(
      15,  -- top margin
      Test_margin_left,
      App.screen.width - Test_margin_right,

Resurrecting zombie bytes in edit.lua at line 402 [93.413]

∅:∅[102.1738] → [98.11115:11471]

B:B[98.11115] → [98.11115:11471]

BD:B[98.11115] → [98.11115:11471]

      15)  -- line height
end
-- all text_input events are also keypresses
-- TODO: handle chords of multiple keys
function edit.run_after_text_input(State, t)
  edit.keychord_press(State, t)
  edit.text_input(State, t)
  edit.key_release(State, t)
  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end
-- not all keys are text_input

Resurrecting zombie bytes in edit.lua at line 420 [93.413]

∅:∅[74.5245] → [98.11587:11811]

B:B[98.11587] → [98.11587:11811]

BD:B[98.11587] → [98.11587:11811]

  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end
function edit.run_after_mouse_click(State, x,y, mouse_button)
  App.fake_mouse_press(x,y, mouse_button)
  edit.mouse_press(State, x,y, mouse_button)

Resurrecting zombie bytes in edit.lua at line 429 [93.413]

∅:∅[37.9188] → [98.11811:12430]

B:B[98.11811] → [98.11811:12430]

BD:B[98.11811] → [98.11811:12430]

  App.fake_mouse_release(x,y, mouse_button)
  edit.mouse_release(State, x,y, mouse_button)
  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end
function edit.run_after_mouse_press(State, x,y, mouse_button)
  App.fake_mouse_press(x,y, mouse_button)
  edit.mouse_press(State, x,y, mouse_button)
  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end
function edit.run_after_mouse_release(State, x,y, mouse_button)
  App.fake_mouse_release(x,y, mouse_button)
  edit.mouse_release(State, x,y, mouse_button)
  App.screen.contents = {}
  edit.update(State, 0)
  edit.draw(State)
end

resolve conflicts

Dependencies

In channels

Change contents

Deletion in text_tests.lua at line 52 [7.2]

Deletion in text_tests.lua at line 231 [7.2]

Replacement in text_tests.lua at line 232 [7.2]

Deletion in text_tests.lua at line 249 [7.2]

Deletion in text_tests.lua at line 268 [7.2]

Deletion in text_tests.lua at line 286 [7.2]

Deletion in text_tests.lua at line 304 [7.2]

Deletion in text_tests.lua at line 321 [7.2]

Deletion in text_tests.lua at line 337 [7.2]

Deletion in text_tests.lua at line 353 [7.2]

Deletion in text_tests.lua at line 370 [7.2]

Deletion in text_tests.lua at line 388 [7.2]

Deletion in text_tests.lua at line 405 [7.2]

Deletion in text_tests.lua at line 422 [7.2]

Deletion in text_tests.lua at line 440 [7.2]

Deletion in text_tests.lua at line 462 [7.2]

Deletion in text_tests.lua at line 482 [7.2]

Deletion in text_tests.lua at line 505 [7.2]

Deletion in text_tests.lua at line 529 [7.2]

Deletion in text_tests.lua at line 547 [7.2]

Deletion in text_tests.lua at line 569 [7.2]

Deletion in text_tests.lua at line 586 [7.2]

Deletion in text_tests.lua at line 602 [7.2]

Deletion in text_tests.lua at line 623 [7.2]

Deletion in text_tests.lua at line 640 [7.2]

Deletion in text_tests.lua at line 657 [7.2]

Deletion in text_tests.lua at line 675 [7.2]

Deletion in text_tests.lua at line 698 [7.2]

Deletion in text_tests.lua at line 716 [7.2]

Deletion in text_tests.lua at line 744 [7.2]

Deletion in text_tests.lua at line 760 [7.2]

Deletion in text_tests.lua at line 788 [7.2]

Replacement in text_tests.lua at line 789 [7.2]

Deletion in text_tests.lua at line 807 [7.2]

Replacement in text_tests.lua at line 808 [7.2]

Deletion in text_tests.lua at line 824 [7.2]

Deletion in text_tests.lua at line 846 [7.2]

Deletion in text_tests.lua at line 866 [7.2]

Replacement in text_tests.lua at line 867 [7.2]

Deletion in text_tests.lua at line 890 [7.2]

Replacement in text_tests.lua at line 891 [7.2]

Deletion in text_tests.lua at line 919 [7.2]

Deletion in text_tests.lua at line 940 [7.2]

Deletion in text_tests.lua at line 955 [7.2]

Deletion in text_tests.lua at line 971 [7.2]

Deletion in text_tests.lua at line 979 [7.2]

Deletion in text_tests.lua at line 1013 [7.2]

Deletion in text_tests.lua at line 1027 [7.2]

Deletion in text_tests.lua at line 1056 [7.2]

Deletion in text_tests.lua at line 1083 [7.2]

Deletion in text_tests.lua at line 1111 [7.2]

Deletion in text_tests.lua at line 1138 [7.2]

Deletion in text_tests.lua at line 1171 [7.2]

Deletion in text_tests.lua at line 1199 [7.2]

Deletion in text_tests.lua at line 1226 [7.2]

Deletion in text_tests.lua at line 1253 [7.2]

Deletion in text_tests.lua at line 1282 [7.2]

Deletion in text_tests.lua at line 1308 [7.2]

Deletion in text_tests.lua at line 1332 [7.2]

Deletion in text_tests.lua at line 1360 [7.2]

Deletion in text_tests.lua at line 1386 [7.2]

Deletion in text_tests.lua at line 1414 [7.2]

Deletion in text_tests.lua at line 1436 [7.2]

Deletion in text_tests.lua at line 1454 [7.2]

Deletion in text_tests.lua at line 1483 [7.2]

Deletion in text_tests.lua at line 1511 [7.2]

Deletion in text_tests.lua at line 1540 [7.2]

Deletion in text_tests.lua at line 1568 [7.2]

Deletion in text_tests.lua at line 1598 [7.2]

Deletion in text_tests.lua at line 1631 [7.2]

Deletion in text_tests.lua at line 1658 [7.2]

Deletion in text_tests.lua at line 1792 [7.2]

Deletion in text_tests.lua at line 1826 [7.2]

Deletion in text_tests.lua at line 1864 [7.2]

Deletion in text_tests.lua at line 1884 [7.2]

Deletion in text_tests.lua at line 1910 [7.2]