akkartik/etch.love - Change J7A5ROM3MKBKJYZ4WKOHGS74DLM6VSC7HXLZHRCIQEGZSNARCTIAC

bugfix in cursor positioning

scenario:

create a long wrapping line
tap past end of first screen line

Before this commit the cursor would be positioned not quite at the end of the screen line but one character before. In effect there was no way to position cursor at end of a wrapping line.

I'm not sure how this bug has lasted so long. It was introduced in commit 8d3adfa36 back in June 2022, which was itself billed as a bugfix for "clicking past end of screen line". But when I go back to it this bug exists even back then. How did I miss it?! I wrote a test back then – and the test was wrong, has always been wrong.

Created by akkartik on February 8, 2024

J7A5ROM3MKBKJYZ4WKOHGS74DLM6VSC7HXLZHRCIQEGZSNARCTIAC

Dependencies

In channels

main

Change contents

Replacement in text_tests.lua at line 488 [5.2]

∅:D[3.1263] → [4.690:730]

B:BD[4.690] → [4.690:730]

  -- cursor moves to end of screen line

[3.1263]

[6.3494]

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

Replacement in text_tests.lua at line 490 [5.2]

B:BD[6.3550] → [6.3550:3605]

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

[6.3550]

[4.879]

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

Replacement in text_tests.lua at line 509 [5.2]

∅:D[3.1334] → [7.715:755]

B:BD[7.715] → [7.715:755]

  -- cursor moves to end of screen line

[3.1334]

[6.3660]

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

Replacement in text_tests.lua at line 511 [5.2]

B:BD[6.3716] → [6.3716:3771]

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

[6.3716]

[7.982]

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

Replacement in text_tests.lua at line 579 [5.2]

∅:D[8.301] → [9.803:843]

∅:D[3.1547] → [9.803:843]

B:BD[9.803] → [9.803:843]

B:BD[9.843] → [6.4362:4413]

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

[3.1547]

[10.2]

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

Replacement in text.lua at line 739 [13.1]

B:BD[11.1535] → [12.6144:6218]

        return line_cache.screen_line_starting_pos[screen_line_index+1]-1

[11.1535]

[14.528]

        return line_cache.screen_line_starting_pos[screen_line_index+1]

Replacement in source_text_tests.lua at line 488 [15.3498]

B:BD[15.22797] → [15.22797:22837]

  -- cursor moves to end of screen line

[15.22797]

[6.26860]

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

Replacement in source_text_tests.lua at line 490 [15.3498]

B:BD[6.26916] → [6.26916:26971]

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

[6.26916]

[15.23012]

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

Replacement in source_text_tests.lua at line 509 [15.3498]

B:BD[15.23901] → [15.23901:23941]

  -- cursor moves to end of screen line

[15.23901]

[6.27026]

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

Replacement in source_text_tests.lua at line 511 [15.3498]

B:BD[6.27082] → [6.27082:27137]

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

[6.27082]

[15.24194]

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

Replacement in source_text_tests.lua at line 579 [15.3498]

B:BD[15.27713] → [15.27713:27753]

B:BD[15.27753] → [6.27728:27779]

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

[15.27713]

[16.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 [15.83723]

B:BD[15.134915] → [2.4993:5067]

        return line_cache.screen_line_starting_pos[screen_line_index+1]-1

[15.134915]

[15.134996]

        return line_cache.screen_line_starting_pos[screen_line_index+1]