akkartik/pong.love - Change NAGDS5E2LF4PFXZS72KKDWQ5K5KMZXLV763Q4VCKIT6GOBAWB6MAC

Merge text.love

Created by Kartik K. Agaram on February 1, 2023

NAGDS5E2LF4PFXZS72KKDWQ5K5KMZXLV763Q4VCKIT6GOBAWB6MAC

Dependencies

In channels

main

Change contents

File deletion: text.lua, source_text.lua, text.lua

BFD:BFD[5.2] → [6.1451:1483]

BFD:BFD[5.2] → [7.90:129]

BFD:BFD[7.129] → [6.1:1]

BFD:BFD[5.2] → [6.1451:1483]

BFD:BFD[6.1483] → [6.1:1]

B:BD[8.442] → [4.59:59]

B:BD[9.4051] → [4.3:57]

∅:D[4.57] → [9.4094:4502]

      State.cursor1 = {line=new_cursor_line, pos=nil}
      Text.populate_screen_line_starting_pos(State, State.cursor1.line)
      -- previous text line found, pick its final screen line
--?       print('has multiple screen lines')
      local screen_line_starting_pos = State.line_cache[State.cursor1.line].screen_line_starting_pos
--?       print(#screen_line_starting_pos)
      screen_line_starting_pos = screen_line_starting_pos[#screen_line_starting_pos]

Insertion in source_text_tests.lua at line 1028 [11.3561]

[10.38076]

function test_down_arrow_skips_drawing()
  -- some lines of text with a drawing intermixed
  local drawing_width = 50
  App.screen.init{width=Editor_state.left+drawing_width, height=100}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc',               -- height 15
                                  '```lines', '```',   -- height 25
                                  'ghi'}
  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
  local drawing_height = Drawing_padding_height + drawing_width/2  -- default
  y = y + drawing_height
  App.screen.check(y, 'ghi', 'baseline/screen:3')
  check(Editor_state.cursor_x, 'baseline/cursor_x')
  -- after hitting the down arrow the cursor moves down by 2 lines, skipping the drawing
  edit.run_after_keychord(Editor_state, 'down')
  check_eq(Editor_state.cursor1.line, 3, 'cursor')
end

Insertion in source_text_tests.lua at line 1201 [11.3561]

[10.47403]

function test_up_arrow_skips_drawing()
  -- some lines of text with a drawing intermixed
  local drawing_width = 50
  App.screen.init{width=Editor_state.left+drawing_width, height=100}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc',               -- height 15
                                  '```lines', '```',   -- height 25
                                  'ghi'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=3, 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
  local drawing_height = Drawing_padding_height + drawing_width/2  -- default
  y = y + drawing_height
  App.screen.check(y, 'ghi', 'baseline/screen:3')
  check(Editor_state.cursor_x, 'baseline/cursor_x')
  -- after hitting the up arrow the cursor moves up by 2 lines, skipping the drawing
  edit.run_after_keychord(Editor_state, 'up')
  check_eq(Editor_state.cursor1.line, 1, 'cursor')
end

Deletion in source_text_tests.lua at line 1742 [11.3561]

B:BD[10.77177] → [3.18268:18268]

B:BD[12.8922] → [4.63:1164]

BD:BD[12.8922] → [4.63:1164]

B:BD[11.47572] → [4.1165:2258]

BD:BD[11.47572] → [4.1165:2258]

end
function test_down_arrow_skips_drawing()
  -- some lines of text with a drawing intermixed
  local drawing_width = 50
  App.screen.init{width=Editor_state.left+drawing_width, height=100}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc',               -- height 15
                                  '```lines', '```',   -- height 25
                                  'ghi'}
  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
  local drawing_height = Drawing_padding_height + drawing_width/2  -- default
  y = y + drawing_height
  App.screen.check(y, 'ghi', 'baseline/screen:3')
  check(Editor_state.cursor_x, 'baseline/cursor_x')
  -- after hitting the down arrow the cursor moves down by 2 lines, skipping the drawing
  edit.run_after_keychord(Editor_state, 'down')
  check_eq(Editor_state.cursor1.line, 3, 'cursor')
function test_up_arrow_skips_drawing()
  -- some lines of text with a drawing intermixed
  local drawing_width = 50
  App.screen.init{width=Editor_state.left+drawing_width, height=100}
  Editor_state = edit.initialize_test_state()
  Editor_state.lines = load_array{'abc',               -- height 15
                                  '```lines', '```',   -- height 25
                                  'ghi'}
  Text.redraw_all(Editor_state)
  Editor_state.cursor1 = {line=3, 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
  local drawing_height = Drawing_padding_height + drawing_width/2  -- default
  y = y + drawing_height
  App.screen.check(y, 'ghi', 'baseline/screen:3')
  check(Editor_state.cursor_x, 'baseline/cursor_x')
  -- after hitting the up arrow the cursor moves up by 2 lines, skipping the drawing
  edit.run_after_keychord(Editor_state, 'up')
  check_eq(Editor_state.cursor1.line, 1, 'cursor')
end

Solving an order conflict in source_text_tests.lua at line 1742 [11.3561]
[10.77177]
[13.13325]
Deletion in source_text.lua at line 683 [11.83786]
B:BD[14.5724] → [14.5724:5785]
BD:BD[14.5724] → [14.5724:5785]
```
        State.cursor1 = {line=State.cursor1.line-1, pos=nil}
```

Resurrecting zombie bytes in source_text.lua at line 684 [11.83786]

∅:∅[4.2316] → [14.5785:6569]

B:B[14.5785] → [14.5785:6569]

BD:B[14.5785] → [14.5785:6569]

        Text.populate_screen_line_starting_pos(State, State.cursor1.line)
        -- previous text line found, pick its final screen line
--?         print('has multiple screen lines')
        local screen_line_starting_pos = State.line_cache[State.cursor1.line].screen_line_starting_pos
--?         print(#screen_line_starting_pos)
        screen_line_starting_pos = screen_line_starting_pos[#screen_line_starting_pos]
        local screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, screen_line_starting_pos)
        local s = string.sub(State.lines[State.cursor1.line].data, screen_line_starting_byte_offset)
        State.cursor1.pos = screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1
        break
      end

Deletion in source_text.lua at line 722 [11.83786]
B:BD[14.6750] → [14.6750:6812]
BD:BD[14.6750] → [14.6750:6812]
```
        State.cursor1 = {line=State.cursor1.line-1, posB=nil}
```

Resurrecting zombie bytes in source_text.lua at line 723 [11.83786]

∅:∅[4.2374] → [14.6812:7469]

B:B[14.6812] → [14.6812:7469]

BD:B[14.6812] → [14.6812:7469]

        Text.populate_screen_line_starting_pos(State, State.cursor1.line)
        local prev_line_cache = State.line_cache[State.cursor1.line]
        local prev_screen_line_starting_pos = prev_line_cache.screen_line_starting_pos[#prev_line_cache.screen_line_starting_pos]
        local prev_screen_line_starting_byte_offset = Text.offset(State.lines[State.cursor1.line].data, prev_screen_line_starting_pos)
        local s = string.sub(State.lines[State.cursor1.line].data, prev_screen_line_starting_byte_offset)
        State.cursor1.pos = prev_screen_line_starting_pos + Text.nearest_cursor_pos(s, State.cursor_x, State.left) - 1
        break
      end