akkartik/etch.love - Change LK4ZW4BBDD5LC4JK4XK5DJESSDFAIRVFPDM324S7SCAUXEXYVTLQC

bugfix

Thanks Mikoláš Štrajt.

Created by Kartik K. Agaram on March 18, 2023

LK4ZW4BBDD5LC4JK4XK5DJESSDFAIRVFPDM324S7SCAUXEXYVTLQC

Dependencies

In channels

main

Change contents

Insertion in text_tests.lua at line 1282 [4.2]

[3.12204]

[4.20697]

end
function test_up_arrow_scrolls_up_by_one_line_skipping_drawing()
  -- display lines 3/4/5 with a drawing just off screen at line 2
  App.screen.init{width=120, height=60}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc', '```lines', '```', 'def', 'ghi', 'jkl'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=3, pos=1}
  Editor_state.screen_top1 = {line=3, pos=1}
  Editor_state.screen_bottom1 = {}
  edit.draw(Editor_state)
  local y = Editor_state.top
  App.screen.check(y, 'def', 'baseline/screen:1')
  y = y + Editor_state.line_height
  App.screen.check(y, 'ghi', 'baseline/screen:2')
  y = y + Editor_state.line_height
  App.screen.check(y, 'jkl', 'baseline/screen:3')
  -- after hitting the up arrow the screen scrolls up to previous text line
  edit.run_after_keychord(Editor_state, 'up')
  check_eq(Editor_state.screen_top1.line, 1, 'screen_top')
  check_eq(Editor_state.cursor1.line, 1, 'cursor')

Replacement in text.lua at line 233 [7.1]

∅:D[5.1154] → [6.3:57]

B:BD[8.2510] → [6.3:57]

∅:D[6.57] → [9.15654:15731]

B:BD[9.15654] → [9.15654:15731]

∅:D[9.15731] → [10.540:588]

B:BD[10.540] → [10.540:588]

      local top2 = Text.to2(State, State.screen_top1)
      top2 = Text.previous_screen_line(State, top2, State.left, State.right)
      State.screen_top1 = Text.to1(State, top2)

[5.1154]

[10.588]

      State.screen_top1 = {
        line=State.cursor1.line,
        pos=Text.pos_at_start_of_screen_line(State, State.cursor1),
      }

Replacement in text.lua at line 452 [7.1]

B:BD[2.56] → [2.56:204]

    local top2 = Text.to2(State, State.screen_top1)
    top2 = Text.previous_screen_line(State, top2)
    State.screen_top1 = Text.to1(State, top2)

[2.56]

[2.204]

    State.screen_top1 = {
      line=State.cursor1.line,
      pos=Text.pos_at_start_of_screen_line(State, State.cursor1),
    }
    Text.redraw_all(State)  -- if we're scrolling, reclaim all fragments to avoid memory leaks

Replacement in text.lua at line 595 [7.1]

B:BD[11.606] → [12.2107:2209]

∅:D[12.2209] → [10.1702:1748]

B:BD[10.1702] → [10.1702:1748]

    local top2 = Text.to2(State, State.screen_top1)
    top2 = Text.previous_screen_line(State, top2)
    State.screen_top1 = Text.to1(State, top2)

[11.606]

[13.568]

    State.screen_top1 = {
      line=State.cursor1.line,
      pos=Text.pos_at_start_of_screen_line(State, State.cursor1),
    }
    Text.redraw_all(State)  -- if we're scrolling, reclaim all fragments to avoid memory leaks

Insertion in source_text_tests.lua at line 1252 [14.3498]

[3.35050]

[14.49007]

end
function test_up_arrow_scrolls_up_by_one_line_skipping_drawing()
  -- display lines 3/4/5 with a drawing just off screen at line 2
  App.screen.init{width=120, height=60}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc', '```lines', '```', 'def', 'ghi', 'jkl'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=3, pos=1}
  Editor_state.screen_top1 = {line=3, pos=1}
  Editor_state.screen_bottom1 = {}
  edit.draw(Editor_state)
  local y = Editor_state.top
  App.screen.check(y, 'def', 'baseline/screen:1')
  y = y + Editor_state.line_height
  App.screen.check(y, 'ghi', 'baseline/screen:2')
  y = y + Editor_state.line_height
  App.screen.check(y, 'jkl', 'baseline/screen:3')
  -- after hitting the up arrow the screen scrolls up to previous text line
  edit.run_after_keychord(Editor_state, 'up')
  check_eq(Editor_state.screen_top1.line, 1, 'screen_top')
  check_eq(Editor_state.cursor1.line, 1, 'cursor')

Replacement in source_text.lua at line 250 [14.83723]

B:BD[14.102512] → [14.102512:102691]

      local top2 = Text.to2(State, State.screen_top1)
      top2 = Text.previous_screen_line(State, top2, State.left, State.right)
      State.screen_top1 = Text.to1(State, top2)

[14.102512]

[14.102691]

      State.screen_top1 = {
        line=State.cursor1.line,
        pos=Text.pos_at_start_of_screen_line(State, State.cursor1),
      }

Replacement in source_text.lua at line 469 [14.83723]

B:BD[14.111167] → [14.111167:111315]

    local top2 = Text.to2(State, State.screen_top1)
    top2 = Text.previous_screen_line(State, top2)
    State.screen_top1 = Text.to1(State, top2)

[14.111167]

[14.111315]

    State.screen_top1 = {
      line=State.cursor1.line,
      pos=Text.pos_at_start_of_screen_line(State, State.cursor1),
    }
    Text.redraw_all(State)  -- if we're scrolling, reclaim all fragments to avoid memory leaks

Replacement in source_text.lua at line 612 [14.83723]

B:BD[14.123165] → [14.123165:123313]

    local top2 = Text.to2(State, State.screen_top1)
    top2 = Text.previous_screen_line(State, top2)
    State.screen_top1 = Text.to1(State, top2)

[14.123165]

[14.123313]

    State.screen_top1 = {
      line=State.cursor1.line,
      pos=Text.pos_at_start_of_screen_line(State, State.cursor1),
    }
    Text.redraw_all(State)  -- if we're scrolling, reclaim all fragments to avoid memory leaks