akkartik/etch.love - Change VSBSWTE4IVQDRXLPQ7VTDIIEBEF7GMGRBHZ2IA73ZR6B2KZWI5JAC

bugfix: where cursor is drawn

The published version of lines.love was broken for almost an hour. The cursor would render one position to the right of where it really is. To fix it, this commit rolls back 26ba6e4e5a71. There doesn't seem a good way to test it.

Created by Kartik K. Agaram on July 20, 2022

VSBSWTE4IVQDRXLPQ7VTDIIEBEF7GMGRBHZ2IA73ZR6B2KZWI5JAC

Dependencies

In channels

main

Change contents

Replacement in text_tests.lua at line 288 [6.2]

B:BD[4.957] → [5.2:109]

  check_eq(Editor_state.cursor1.pos, 1, 'F - test_click_with_mouse_takes_margins_into_account/cursor:pos')

[4.957]

[4.1064]

  check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_with_mouse_takes_margins_into_account/cursor:pos')

Replacement in text_tests.lua at line 378 [6.2]

B:BD[4.1942] → [5.110:207]

  check_eq(Editor_state.cursor1.pos, 1, 'F - test_click_with_mouse_on_wrapping_line/cursor:pos')

[4.1942]

[4.2039]

  check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_with_mouse_on_wrapping_line/cursor:pos')

Replacement in text_tests.lua at line 398 [6.2]

B:BD[4.3041] → [5.208:332]

  check_eq(Editor_state.cursor1.pos, 1, 'F - test_click_with_mouse_on_wrapping_line_takes_margins_into_account/cursor:pos')

[4.3041]

[4.3165]

  check_eq(Editor_state.cursor1.pos, 2, 'F - test_click_with_mouse_on_wrapping_line_takes_margins_into_account/cursor:pos')

Replacement in text_tests.lua at line 837 [6.2]

B:BD[7.19632] → [5.333:420]

  check_eq(Editor_state.cursor1.pos, 1, 'F - test_move_cursor_using_mouse/cursor:pos')

[7.19632]

[7.19719]

  check_eq(Editor_state.cursor1.pos, 2, 'F - test_move_cursor_using_mouse/cursor:pos')

Replacement in text_tests.lua at line 858 [6.2]

B:BD[7.20562] → [5.421:514]

  check_eq(Editor_state.selection1.pos, 1, 'F - test_select_text_using_mouse/selection:pos')

[7.20562]

[7.20655]

  check_eq(Editor_state.selection1.pos, 2, 'F - test_select_text_using_mouse/selection:pos')

Replacement in text_tests.lua at line 883 [6.2]

B:BD[7.21674] → [5.515:618]

  check_eq(Editor_state.selection1.pos, 1, 'F - test_select_text_using_mouse_and_shift/selection:pos')

[7.21674]

[7.21777]

  check_eq(Editor_state.selection1.pos, 2, 'F - test_select_text_using_mouse_and_shift/selection:pos')

Replacement in text_tests.lua at line 914 [6.2]

B:BD[7.23026] → [5.619:733]

  check_eq(Editor_state.selection1.pos, 1, 'F - test_select_text_repeatedly_using_mouse_and_shift/selection:pos')

[7.23026]

[7.23140]

  check_eq(Editor_state.selection1.pos, 2, 'F - test_select_text_repeatedly_using_mouse_and_shift/selection:pos')

Replacement in text_tests.lua at line 916 [6.2]

B:BD[7.23250] → [5.734:842]

  check_eq(Editor_state.cursor1.pos, 1, 'F - test_select_text_repeatedly_using_mouse_and_shift/cursor:pos')

[7.23250]

[6.6250]

  check_eq(Editor_state.cursor1.pos, 2, 'F - test_select_text_repeatedly_using_mouse_and_shift/cursor:pos')

Replacement in text_tests.lua at line 1132 [6.2]

B:BD[7.28919] → [5.843:949]

  check_eq(Editor_state.cursor1.pos, 6, 'F - test_down_arrow_scrolls_down_by_one_screen_line/cursor:pos')

[7.28919]

[8.8650]

  check_eq(Editor_state.cursor1.pos, 5, 'F - test_down_arrow_scrolls_down_by_one_screen_line/cursor:pos')

Replacement in text_tests.lua at line 1696 [6.2]

B:BD[5.1178] → [5.1178:1291]

  check_eq(Editor_state.cursor1.pos, 25, 'F - test_position_cursor_on_recently_edited_wrapping_line/cursor:pos')

[5.1178]

[6.33305]

  check_eq(Editor_state.cursor1.pos, 26, 'F - test_position_cursor_on_recently_edited_wrapping_line/cursor:pos')

Replacement in text.lua at line 806 [10.1]
B:BD[9.7300] → [5.1293:1327]
```
  local max_x = Text.x(line, len)
```
[9.7300]
[9.7344]
```
  local max_x = Text.x_after(line, len)
```

Replacement in text.lua at line 813 [10.1]

B:BD[9.7496] → [5.1328:1412]

    local currxmin = Text.x(line, curr+1)
    local currxmax = Text.x(line, curr+2)

[9.7496]

[2.673]

    local currxmin = Text.x_after(line, curr+1)
    local currxmax = Text.x_after(line, curr+2)

Replacement in text.lua at line 831 [10.1]
B:BD[11.3662] → [5.1413:1437]
```
function Text.x(s, pos)
```
[11.3662]
[11.3692]
```
function Text.x_after(s, pos)
```

Insertion in text.lua at line 839 [10.1]

[9.7881]

[12.3394]

function Text.x(s, pos)
  local offset = Text.offset(s, pos)
  local s_before = s:sub(1, offset-1)
  local text_before = App.newText(love.graphics.getFont(), s_before)
  return App.width(text_before)
end

Insertion in Manual_tests.md at line 11 [13.1]

[3.168]


* How the screen looks. Our tests use a level of indirection to check text and
  graphics printed to screen, but not the precise pixels they translate to.
    - where exactly the cursor is drawn to highlight a given character