akkartik/template-carousel-mobile - Change NBTKJTI5MDKJNTD7JAORTXPPKTYVLVT4DEWSPRYBQAM6QVWNWXCAC

resolve conflicts

Created by akkartik on February 8, 2024

NBTKJTI5MDKJNTD7JAORTXPPKTYVLVT4DEWSPRYBQAM6QVWNWXCAC

Dependencies

In channels

main

Change contents

File deletion: source_text_tests.lua, source_text_tests.lua

BFD:BFD[4.2] → [5.83676:83721]

BFD:BFD[5.83721] → [5.3498:3498]

B:BD[5.22797] → [3.473:551]

B:BD[6.26916] → [3.552:607]

B:BD[5.23901] → [3.608:686]

B:BD[6.27082] → [3.687:742]

B:BD[5.27713] → [3.743:872]

∅:D[3.872] → [7.730:763]

∅:D[3.742] → [5.24194:24247]

∅:D[3.686] → [6.27026:27082]

∅:D[3.607] → [5.23012:23095]

∅:D[3.551] → [6.26860:26916]

  -- cursor moves to end of screen line (one more than final character shown)
  check_eq(Editor_state.cursor1.pos, 13, 'cursor:pos')
  -- cursor moves to end of screen line (one more than final character shown)
  check_eq(Editor_state.cursor1.pos, 13, 'cursor:pos')
  -- cursor moves to end of screen line (one more than final character shown)
  check_eq(Editor_state.cursor1.pos, 21, 'cursor')
end
function test_select_text()
end
function test_click_past_end_of_wrapping_line()
  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')
end
function test_click_on_wrapping_line_rendered_from_partway_at_top_of_screen()
  check_eq(Editor_state.cursor1.line, 1, 'cursor:line')

File deletion: source_text.lua, source_text.lua
BFD:BFD[4.2] → [5.147062:147101]
BFD:BFD[4.2] → [5.147062:147101]
BFD:BFD[5.147101] → [5.83723:83723]
B:BD[5.134915] → [3.873:945]
∅:D[3.945] → [5.134996:135006]
```
        return line_cache.screen_line_starting_pos[screen_line_index+1]
      end
```

Replacement in source_text_tests.lua at line 488 [9.3561]

B:BD[9.22860] → [9.22860:22900]

  -- cursor moves to end of screen line

[9.22860]

[10.3500]

  -- cursor moves to end of screen line (one more than final character shown)

Replacement in source_text_tests.lua at line 490 [9.3561]

B:BD[10.3556] → [10.3556:3611]

  check_eq(Editor_state.cursor1.pos, 12, 'cursor:pos')

[10.3556]

[9.23075]

  check_eq(Editor_state.cursor1.pos, 13, 'cursor:pos')

Replacement in source_text_tests.lua at line 509 [9.3561]

B:BD[9.23964] → [9.23964:24004]

  -- cursor moves to end of screen line

[9.23964]

[10.3666]

  -- cursor moves to end of screen line (one more than final character shown)

Replacement in source_text_tests.lua at line 511 [9.3561]

B:BD[10.3722] → [10.3722:3777]

  check_eq(Editor_state.cursor1.pos, 12, 'cursor:pos')

[10.3722]

[9.24257]

  check_eq(Editor_state.cursor1.pos, 13, 'cursor:pos')

Replacement in source_text_tests.lua at line 579 [9.3561]

B:BD[9.27776] → [9.27776:27816]

B:BD[9.27816] → [10.4368:4419]

  -- cursor moves to end of screen line
  check_eq(Editor_state.cursor1.pos, 20, 'cursor')

[9.27776]

[11.730]

  -- cursor moves to end of screen line (one more than final character shown)
  check_eq(Editor_state.cursor1.pos, 21, 'cursor')

Replacement in source_text.lua at line 801 [9.83786]

B:BD[9.134978] → [12.6521:6595]

        return line_cache.screen_line_starting_pos[screen_line_index+1]-1

[9.134978]

[9.135059]

        return line_cache.screen_line_starting_pos[screen_line_index+1]