akkartik/lines.love - Change 356GY7IQ467QQMIPFMEETHTXLSZE65HA36PXSOW4KKXBUHSMBQTAC

unify two similar functions

The cost is just having to tweak a few more brittle tests. I can't actually perceive any difference in how the cursor moves when I click on text.

Created by Kartik K. Agaram on July 19, 2022

356GY7IQ467QQMIPFMEETHTXLSZE65HA36PXSOW4KKXBUHSMBQTAC

Dependencies

In channels

main

Change contents

Deletion in text_tests.lua at line 269 [4.2]

B:BD[2.84] → [2.84:164]

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

Replacement in text_tests.lua at line 288 [4.2]

B:BD[2.957] → [2.957:1064]

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

[2.957]

[2.1064]

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

Replacement in text_tests.lua at line 378 [4.2]

B:BD[2.1942] → [2.1942:2039]

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

[2.1942]

[2.2039]

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

Replacement in text_tests.lua at line 398 [4.2]

B:BD[2.3041] → [2.3041:3165]

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

[2.3041]

[2.3165]

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

Replacement in text_tests.lua at line 837 [4.2]

B:BD[5.19632] → [5.19632:19719]

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

[5.19632]

[5.19719]

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

Replacement in text_tests.lua at line 858 [4.2]

B:BD[5.20562] → [5.20562:20655]

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

[5.20562]

[5.20655]

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

Replacement in text_tests.lua at line 883 [4.2]

B:BD[5.21674] → [5.21674:21777]

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

[5.21674]

[5.21777]

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

Replacement in text_tests.lua at line 914 [4.2]

B:BD[5.23026] → [5.23026:23140]

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

[5.23026]

[5.23140]

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

Replacement in text_tests.lua at line 916 [4.2]

B:BD[5.23250] → [5.23250:23358]

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

[5.23250]

[4.6250]

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

Replacement in text_tests.lua at line 1132 [4.2]

B:BD[5.28919] → [5.28919:29025]

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

[5.28919]

[6.8650]

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

Replacement in text_tests.lua at line 1685 [4.2]

∅:D[7.5226] → [5.44858:44946]

B:BD[4.32440] → [5.44858:44946]

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

[7.5226]

[6.12445]

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

Replacement in text_tests.lua at line 1695 [4.2]

B:BD[4.33154] → [5.45164:45341]

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

[4.33154]

[4.33305]

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

Replacement in text.lua at line 818 [9.1]
B:BD[8.7300] → [3.3519:3559]
```
  local max_x = Text.x_after(line, len)
```
[8.7300]
[8.7344]
```
  local max_x = Text.x(line, len)
```

Replacement in text.lua at line 825 [9.1]

B:BD[8.7496] → [3.3560:3656]

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

[8.7496]

[8.7596]

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

Replacement in text.lua at line 843 [9.1]
B:BD[3.3662] → [3.3662:3692]
```
function Text.x_after(s, pos)
```
[3.3662]
[3.3692]
```
function Text.x(s, pos)
```
Deletion in text.lua at line 851 [9.1]
B:BD[8.7881] → [10.336:360]
B:BD[10.360] → [11.837:874]
∅:D[11.874] → [10.414:521]
B:BD[10.414] → [10.414:521]
B:BD[10.521] → [12.3909:3941]
∅:D[10.570] → [13.3290:3295]
∅:D[14.1366] → [13.3290:3295]
∅:D[12.3941] → [13.3290:3295]
B:BD[13.3290] → [13.3290:3295]
```
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
```