about summary refs log tree commit diff stats
path: root/text.lua
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2023-05-06 08:54:29 -0700
committerKartik K. Agaram <vc@akkartik.com>2023-05-06 08:56:44 -0700
commit6a1d8e5164a9bb21c654f4cfa7bc8ff4c43e6c95 (patch)
tree24701fdae36664a9425a9499c2fa90760be69282 /text.lua
parentac27d36dd0d6ad8130c5ea47a08dae052226f23b (diff)
downloadview.love-6a1d8e5164a9bb21c654f4cfa7bc8ff4c43e6c95.tar.gz
bugfix: never use utf8 pos in string.sub
This is a violation of an existing rule in Manual_tests.md. The
following command weakly suggests there aren't any others:
  grep ':sub(' *.lua |grep pos
Diffstat (limited to 'text.lua')
-rw-r--r--text.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/text.lua b/text.lua
index 24fba90..eadb7c5 100644
--- a/text.lua
+++ b/text.lua
@@ -33,7 +33,9 @@ function Text.draw(State, line_index, y, startpos)
       if line_index == State.cursor1.line then
         if pos <= State.cursor1.pos and pos + frag_len >= State.cursor1.pos then
           if State.search_term then
-            if State.lines[State.cursor1.line].data:sub(State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term)-1) == State.search_term then
+            local data = State.lines[State.cursor1.line].data
+            local cursor_offset = Text.offset(data, State.cursor1.pos)
+            if data:sub(cursor_offset, cursor_offset+#State.search_term-1) == State.search_term then
               local lo_px = Text.draw_highlight(State, line, State.left,y, pos, State.cursor1.pos, State.cursor1.pos+utf8.len(State.search_term))
               App.color(Text_color)
               love.graphics.print(State.search_term, State.left+lo_px,y)