akkartik/sokoban.love - Change 2H76FV5SK3ZWFVQ6ISAOSUJQWW4SSNPRDEI75JIQAJRPIVWPOCDAC

bugfix: searching files containing unicode

Before this change the cursor was moving, but not being highlighted properly when the cursor line contained unicode before the cursor.

Created by Kartik K. Agaram on May 13, 2023

2H76FV5SK3ZWFVQ6ISAOSUJQWW4SSNPRDEI75JIQAJRPIVWPOCDAC

Dependencies

In channels

main

Change contents

Replacement in text_tests.lua at line 1988 [6.2]

B:BD[4.140] → [5.2:76]

  Editor_state.lines = load_array{'```lines', '```', 'def', 'ghi', 'deg'}

[4.140]

[4.202]

  Editor_state.lines = load_array{'```lines', '```', 'def', 'ghi', '’deg'}  -- contains unicode quote in final line

Replacement in text_tests.lua at line 2009 [6.2]

B:BD[3.22894] → [3.22894:22950]

  check_eq(Editor_state.cursor1.pos, 1, '2/cursor:pos')

[3.22894]

[4.1423]

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

Replacement in text_tests.lua at line 2015 [6.2]

B:BD[7.155] → [7.155:200]

  Editor_state.lines = load_array{'abc abd'}

[7.155]

[7.200]

  Editor_state.lines = load_array{'’abc', 'abd'}  -- contains unicode quote

Replacement in text_tests.lua at line 2017 [6.2]
B:BD[7.232] → [7.232:273]
```
  Editor_state.cursor1 = {line=1, pos=2}
```
[7.232]
[7.273]
```
  Editor_state.cursor1 = {line=2, pos=1}
```

Replacement in text_tests.lua at line 2027 [6.2]

B:BD[3.23009] → [3.23009:23065]

  check_eq(Editor_state.cursor1.pos, 1, '2/cursor:pos')

[3.23009]

[7.741]

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

Replacement in text_tests.lua at line 2033 [6.2]

B:BD[8.150] → [8.150:191]

  Editor_state.lines = load_array{'abc'}

[8.150]

[8.191]

  Editor_state.lines = load_array{'’abc', 'def'}  -- contains unicode quote in first line

Replacement in text_tests.lua at line 2035 [6.2]
B:BD[8.223] → [8.223:264]
```
  Editor_state.cursor1 = {line=1, pos=3}
```
[8.223]
[8.264]
```
  Editor_state.cursor1 = {line=2, pos=1}
```

Replacement in text_tests.lua at line 2045 [6.2]

B:BD[3.23124] → [3.23124:23180]

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

[3.23124]

[8.712]

  check_eq(Editor_state.cursor1.pos, 2, '1/cursor:pos')

Replacement in text_tests.lua at line 2051 [6.2]

B:BD[9.166] → [9.166:211]

  Editor_state.lines = load_array{'abc abd'}

[9.166]

[9.211]

  Editor_state.lines = load_array{'abc ’abd'}  -- contains unicode quote

Replacement in text_tests.lua at line 2063 [6.2]

B:BD[3.23239] → [3.23239:23295]

  check_eq(Editor_state.cursor1.pos, 5, '1/cursor:pos')

[3.23239]

[9.752]

  check_eq(Editor_state.cursor1.pos, 6, '1/cursor:pos')

Replacement in source_text_tests.lua at line 1958 [10.3498]

B:BD[10.80428] → [11.5257:5331]

  Editor_state.lines = load_array{'```lines', '```', 'def', 'ghi', 'deg'}

[10.80428]

[10.80490]

  Editor_state.lines = load_array{'```lines', '```', 'def', 'ghi', '’deg'}  -- contains unicode quote in final line

Replacement in source_text_tests.lua at line 1979 [10.3498]

B:BD[3.45740] → [3.45740:45796]

  check_eq(Editor_state.cursor1.pos, 1, '2/cursor:pos')

[3.45740]

[10.81459]

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

Replacement in source_text_tests.lua at line 1985 [10.3498]

B:BD[10.81617] → [10.81617:81662]

  Editor_state.lines = load_array{'abc abd'}

[10.81617]

[10.81662]

  Editor_state.lines = load_array{'’abc', 'abd'}  -- contains unicode quote

Replacement in source_text_tests.lua at line 1987 [10.3498]
B:BD[10.81694] → [10.81694:81735]
```
  Editor_state.cursor1 = {line=1, pos=2}
```
[10.81694]
[10.81735]
```
  Editor_state.cursor1 = {line=2, pos=1}
```

Replacement in source_text_tests.lua at line 1997 [10.3498]

B:BD[3.45855] → [3.45855:45911]

  check_eq(Editor_state.cursor1.pos, 1, '2/cursor:pos')

[3.45855]

[10.82203]

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

Replacement in source_text_tests.lua at line 2003 [10.3498]

B:BD[10.82355] → [10.82355:82396]

  Editor_state.lines = load_array{'abc'}

[10.82355]

[10.82396]

  Editor_state.lines = load_array{'’abc', 'def'}  -- contains unicode quote in first line

Replacement in source_text_tests.lua at line 2005 [10.3498]
B:BD[10.82428] → [10.82428:82469]
```
  Editor_state.cursor1 = {line=1, pos=3}
```
[10.82428]
[10.82469]
```
  Editor_state.cursor1 = {line=2, pos=1}
```

Replacement in source_text_tests.lua at line 2015 [10.3498]

B:BD[3.45970] → [3.45970:46026]

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

[3.45970]

[10.82917]

  check_eq(Editor_state.cursor1.pos, 2, '1/cursor:pos')

Replacement in source_text_tests.lua at line 2021 [10.3498]

B:BD[10.83085] → [10.83085:83130]

  Editor_state.lines = load_array{'abc abd'}

[10.83085]

[10.83130]

  Editor_state.lines = load_array{'abc ’abd'}  -- contains unicode quote

Replacement in source_text_tests.lua at line 2033 [10.3498]

B:BD[3.46085] → [3.46085:46141]

  check_eq(Editor_state.cursor1.pos, 5, '1/cursor:pos')

[3.46085]

[10.83671]

  check_eq(Editor_state.cursor1.pos, 6, '1/cursor:pos')

Replacement in search.lua at line 21 [6.48846]

B:BD[8.758] → [2.14:129]

∅:D[2.129] → [12.101:143]

B:BD[12.101] → [12.101:143]

  local pos = find(State.lines[State.cursor1.line].data, State.search_term, State.cursor1.pos, --[[literal]] true)
  if pos then
    State.cursor1.pos = pos

[8.758]

[6.49862]

  local curr_pos = State.cursor1.pos
  local curr_line = State.lines[State.cursor1.line].data
  local curr_offset = Text.offset(curr_line, curr_pos)
  local offset = find(curr_line, State.search_term, curr_offset, --[[literal]] true)
  if offset then
    State.cursor1.pos = utf8.len(curr_line, 1, offset)

Replacement in search.lua at line 28 [6.48846]
B:BD[6.49868] → [6.49868:49889]
```
  if pos == nil then
```
[6.49868]
[8.759]
```
  if offset == nil then
```

Replacement in search.lua at line 31 [6.48846]

B:BD[13.211] → [2.130:229]

∅:D[2.229] → [12.201:219]

B:BD[12.201] → [12.201:219]

B:BD[12.219] → [10.177689:177731]

      pos = find(State.lines[i].data, State.search_term, --[[from start]] nil, --[[literal]] true)
      if pos then
        State.cursor1 = {line=i, pos=pos}

[13.211]

[12.282]

      local curr_line = State.lines[i].data
      offset = find(curr_line, State.search_term, --[[from start]] nil, --[[literal]] true)
      if offset then
        State.cursor1 = {line=i, pos=utf8.len(curr_line, 1, offset)}

Replacement in search.lua at line 39 [6.48846]
B:BD[6.50075] → [6.50075:50096]
```
  if pos == nil then
```
[6.50075]
[6.50096]
```
  if offset == nil then
```

Replacement in search.lua at line 42 [6.48846]

B:BD[13.368] → [2.230:329]

∅:D[2.329] → [6.50189:50207]

∅:D[12.354] → [6.50189:50207]

∅:D[13.424] → [6.50189:50207]

∅:D[14.82591] → [6.50189:50207]

B:BD[6.50189] → [6.50189:50207]

B:BD[6.50207] → [10.177732:177774]

      pos = find(State.lines[i].data, State.search_term, --[[from start]] nil, --[[literal]] true)
      if pos then
        State.cursor1 = {line=i, pos=pos}

[13.368]

[6.50258]

      local curr_line = State.lines[i].data
      offset = find(curr_line, State.search_term, --[[from start]] nil, --[[literal]] true)
      if offset then
        State.cursor1 = {line=i, pos=utf8.len(curr_line, 1, offset)}

Replacement in search.lua at line 50 [6.48846]
B:BD[6.50296] → [6.50296:50317]
```
  if pos == nil then
```
[6.50296]
[8.793]
```
  if offset == nil then
```

Replacement in search.lua at line 52 [6.48846]

B:BD[8.833] → [2.330:444]

    pos = find(State.lines[State.cursor1.line].data, State.search_term, --[[from start]] nil, --[[literal]] true)

[8.833]

[12.427]

    local curr_line = State.lines[State.cursor1.line].data
    offset = find(curr_line, State.search_term, --[[from start]] nil, --[[literal]] true)
    local pos = utf8.len(curr_line, 1, offset)

Replacement in search.lua at line 59 [6.48846]
B:BD[8.1062] → [8.1062:1083]
```
  if pos == nil then
```
[8.1062]
[13.489]
```
  if offset == nil then
```

Replacement in search.lua at line 74 [6.48846]

B:BD[9.800] → [2.445:563]

∅:D[2.563] → [6.50856:50870]

∅:D[7.849] → [6.50856:50870]

∅:D[13.1169] → [6.50856:50870]

∅:D[14.83452] → [6.50856:50870]

B:BD[6.50856] → [6.50856:50870]

B:BD[6.50870] → [13.1170:1198]

  local pos = rfind(State.lines[State.cursor1.line].data, State.search_term, State.cursor1.pos-1, --[[literal]] true)
  if pos then
    State.cursor1.pos = pos

[9.800]

[6.50892]

  local curr_pos = State.cursor1.pos
  local curr_line = State.lines[State.cursor1.line].data
  local curr_offset = Text.offset(curr_line, curr_pos)
  local offset = rfind(curr_line, State.search_term, curr_offset-1, --[[literal]] true)
  if offset then
    State.cursor1.pos = utf8.len(curr_line, 1, offset)

Replacement in search.lua at line 81 [6.48846]
B:BD[6.50898] → [6.50898:50919]
```
  if pos == nil then
```
[6.50898]
[9.801]
```
  if offset == nil then
```

Replacement in search.lua at line 84 [6.48846]

B:BD[13.1238] → [2.564:662]

∅:D[2.662] → [6.50998:51016]

∅:D[13.1296] → [6.50998:51016]

∅:D[14.83607] → [6.50998:51016]

B:BD[6.50998] → [6.50998:51016]

B:BD[6.51016] → [10.177775:177817]

      pos = rfind(State.lines[i].data, State.search_term, --[[from end]] nil, --[[literal]] true)
      if pos then
        State.cursor1 = {line=i, pos=pos}

[13.1238]

[6.51067]

      local curr_line = State.lines[i].data
      offset = rfind(curr_line, State.search_term, --[[from end]] nil, --[[literal]] true)
      if offset then
        State.cursor1 = {line=i, pos=utf8.len(curr_line, 1, offset)}

Replacement in search.lua at line 92 [6.48846]
B:BD[6.51105] → [6.51105:51126]
```
  if pos == nil then
```
[6.51105]
[6.51126]
```
  if offset == nil then
```

Replacement in search.lua at line 95 [6.48846]

B:BD[13.1411] → [2.663:761]

∅:D[2.761] → [6.51229:51247]

∅:D[13.1469] → [6.51229:51247]

∅:D[14.83822] → [6.51229:51247]

B:BD[6.51229] → [6.51229:51247]

B:BD[6.51247] → [10.177818:177860]

      pos = rfind(State.lines[i].data, State.search_term, --[[from end]] nil, --[[literal]] true)
      if pos then
        State.cursor1 = {line=i, pos=pos}

[13.1411]

[6.51298]

      local curr_line = State.lines[i].data
      offset = rfind(curr_line, State.search_term, --[[from end]] nil, --[[literal]] true)
      if offset then
        State.cursor1 = {line=i, pos=utf8.len(curr_line, 1, offset)}

Replacement in search.lua at line 103 [6.48846]
B:BD[9.849] → [9.849:870]
```
  if pos == nil then
```
[9.849]
[9.870]
```
  if offset == nil then
```

Replacement in search.lua at line 105 [6.48846]

B:BD[9.910] → [2.762:875]

    pos = rfind(State.lines[State.cursor1.line].data, State.search_term, --[[from end]] nil, --[[literal]] true)

[9.910]

[9.983]

    local curr_line = State.lines[State.cursor1.line].data
    offset = rfind(curr_line, State.search_term, --[[from end]] nil, --[[literal]] true)
    local pos = utf8.len(curr_line, 1, offset)

Replacement in search.lua at line 112 [6.48846]
B:BD[6.51336] → [6.51336:51357]
```
  if pos == nil then
```
[6.51336]
[13.1534]
```
  if offset == nil then
```