mawww/kakoune
1
1
Fork 0
mirror of https://github.com/mawww/kakoune.git synced 2024-11-27 02:23:26 +03:00
Code Issues Projects Releases Wiki Activity

Fallback to wrapping in between 'word' when 'WORD' fails

Browse Source 
First try to break at a whitespace, if that fails (likely because
that last WORD is too long for the wrapping width), then try to
wrap at a 'word' boundary (on a non alphanumeric character).

Fixes #3048
This commit is contained in:
Maxime Coste 2019-08-12 18:40:56 +10:00
parent 0e4a4acf61
commit f1047181cb
5 changed files with 47 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/highlighters.cc
View File

@ -833,7 +833,17 @@ struct WrapHighlighter : Highlighter
StringView content = buffer[line];
SplitPos pos = current;
SplitPos last_boundary = {0, 0};
SplitPos last_word_boundary = {0, 0};
SplitPos last_WORD_boundary = {0, 0};
auto update_boundaries = [&](Codepoint cp) {
if (not m_word_wrap)
return;
if (!is_word<Word>(cp))
last_word_boundary = pos;
if (!is_word<WORD>(cp))
last_WORD_boundary = pos;
};
while (pos.byte < content.length() and pos.column < target_column)
{
@ -844,7 +854,7 @@ struct WrapHighlighter : Highlighter
break;
pos.column = next_column;
++pos.byte;
last_boundary = pos;
last_word_boundary = last_WORD_boundary = pos;
}
else
{
@ -853,29 +863,39 @@ struct WrapHighlighter : Highlighter
const ColumnCount width = codepoint_width(cp);
if (pos.column + width > target_column and pos.byte != current.byte) // the target column was in the char
{
if (!is_word<WORD>(cp))
last_boundary = pos;
update_boundaries(cp);
break;
}
pos.column += width;
pos.byte = (int)(it - content.begin());
if (!is_word<WORD>(cp))
last_boundary = pos;
update_boundaries(cp);
}
}
if (m_word_wrap and pos.byte < content.length() and last_boundary.byte > 0)
if (m_word_wrap and pos.byte < content.length())
{
// split at last word boundary if the word is shorter than our wrapping width
ColumnCount word_length = pos.column - last_boundary.column;
const char* it = &content[pos.byte];
while (it != content.end() and word_length < (wrap_column - prefix_len))
{
const Codepoint cp = utf8::read_codepoint(it, content.end());
if (not is_word<WORD>(cp))
return last_boundary;
word_length += codepoint_width(cp);
}
auto find_split_pos = [&](SplitPos start_pos, auto is_word) -> Optional<SplitPos> {
if (start_pos.byte == 0)
return {};
const char* it = &content[pos.byte];
// split at current position if is a word boundary
if (not is_word(utf8::codepoint(it, content.end()), {'_'}))
return pos;
// split at last word boundary if the word is shorter than our wrapping width
ColumnCount word_length = pos.column - start_pos.column;
while (it != content.end() and word_length <= (wrap_column - prefix_len))
{
const Codepoint cp = utf8::read_codepoint(it, content.end());
if (not is_word(cp, {'_'}))
return start_pos;
word_length += codepoint_width(cp);
}
return {};
};
if (auto split = find_split_pos(last_WORD_boundary, is_word<WORD>))
return *split;
if (auto split = find_split_pos(last_word_boundary, is_word<Word>))
return *split;
}
return pos;

1
test/regression/3048-word-wrapping-broken/cmd Normal file
View File

@ -0,0 +1 @@

1
test/regression/3048-word-wrapping-broken/in Normal file
View File

@ -0,0 +1 @@
[ab

1
test/regression/3048-word-wrapping-broken/rc Normal file
View File

@ -0,0 +1 @@
add-highlighter global/ wrap -word -width 2

7
test/regression/3048-word-wrapping-broken/ui-out Normal file
View File

@ -0,0 +1,7 @@
{ "jsonrpc": "2.0", "method": "set_ui_options", "params": [{}] }
{ "jsonrpc": "2.0", "method": "draw", "params": [[[{ "face": { "fg": "black", "bg": "white", "attributes": [] }, "contents": "[" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "ab" }], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "\u000a" }]], { "fg": "default", "bg": "default", "attributes": [] }, { "fg": "blue", "bg": "default", "attributes": [] }] }
{ "jsonrpc": "2.0", "method": "menu_hide", "params": [] }
{ "jsonrpc": "2.0", "method": "info_hide", "params": [] }
{ "jsonrpc": "2.0", "method": "draw_status", "params": [[], [{ "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": "out 1:1 " }, { "face": { "fg": "black", "bg": "yellow", "attributes": [] }, "contents": "" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " " }, { "face": { "fg": "blue", "bg": "default", "attributes": [] }, "contents": "1 sel" }, { "face": { "fg": "default", "bg": "default", "attributes": [] }, "contents": " - client0@[kak-tests]" }], { "fg": "cyan", "bg": "default", "attributes": [] }] }
{ "jsonrpc": "2.0", "method": "set_cursor", "params": ["buffer", { "line": 0, "column": 0 }] }
{ "jsonrpc": "2.0", "method": "refresh", "params": [true] }