xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix infinite loop with longer than width words in word wrap mode

Browse Source
This commit is contained in:
Maxime Coste 2017-05-07 14:02:31 +01:00
parent 4e9193a975
commit e63156bcfb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/highlighters.cc
View File

@ -792,11 +792,12 @@ struct WrapHighlighter : Highlighter
if (m_word_wrap) if (m_word_wrap)
{ {
StringView line = buffer[coord.line]; StringView line = buffer[coord.line];
utf8::iterator<const char*> it{line.data() + (size_t)col, line}; utf8::iterator<const char*> it{&line[col], line};
while (it != line.end() and it != line.begin() and is_word(*it)) while (it != line.end() and it != line.begin() and is_word(*it))
--it; --it;
if (it != line.begin() and it != line.data() + (size_t)col) if (it != line.begin() and it != &line[col] and
(it+1) > &line[coord.column])
split_coord.column = (it+1).base() - line.begin(); split_coord.column = (it+1).base() - line.begin();
} }
return split_coord; return split_coord;