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
This commit is contained in:
parent
ac27d36dd0
commit
6a1d8e5164
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
4
text.lua
4
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)
|
||||
|
|
Loading…
Reference in New Issue