diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2023-05-06 08:54:29 -0700 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2023-05-06 08:56:44 -0700 |
| commit | 6a1d8e5164a9bb21c654f4cfa7bc8ff4c43e6c95 (patch) | |
| tree | 24701fdae36664a9425a9499c2fa90760be69282 | |
| parent | ac27d36dd0d6ad8130c5ea47a08dae052226f23b (diff) | |
| download | lines.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
| -rw-r--r-- | Manual_tests.md | 3 | ||||
| -rw-r--r-- | source_text.lua | 4 | ||||
| -rw-r--r-- | text.lua | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/Manual_tests.md b/Manual_tests.md index 8219c14..4318496 100644 --- a/Manual_tests.md +++ b/Manual_tests.md @@ -28,8 +28,7 @@ Lua is dynamically typed. Tests can't patch over lack of type-checking. * All strings are UTF-8. Bytes within them are not characters. I try to label byte offsets with the suffix `_offset`, and character positions as `_pos`. - For example, `string.sub` should never use a `_pos` to substring, only an - `_offset`. + For example, `string.sub` should never use a `_pos`, only an `_offset`. * Some ADT/interface support would be helpful in keeping per-line state in sync. Any change to line data should clear line `fragments` and diff --git a/source_text.lua b/source_text.lua index e00a3fe..30f4bd4 100644 --- a/source_text.lua +++ b/source_text.lua @@ -55,7 +55,9 @@ function Text.draw(State, line_index, y, startpos, hide_cursor) if not hide_cursor and 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) 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) |