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

Avoid repeated calls to context.selections() in highlight_selections

Browse Source
This commit is contained in:
Maxime Coste 2016-07-27 09:03:01 +01:00
parent 0d2c5072b0
commit a09b094f2b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/highlighters.cc
View File

@ -850,21 +850,22 @@ void highlight_selections(const Context& context, HighlightFlags flags, DisplayB
const Face primary_cursor_face = get_face("PrimaryCursor"); const Face primary_cursor_face = get_face("PrimaryCursor");
const Face secondary_cursor_face = get_face("SecondaryCursor"); const Face secondary_cursor_face = get_face("SecondaryCursor");
for (size_t i = 0; i < context.selections().size(); ++i) const auto& selections = context.selections();
for (size_t i = 0; i < selections.size(); ++i)
{ {
auto& sel = context.selections()[i]; auto& sel = selections[i];
const bool forward = sel.anchor() <= sel.cursor(); const bool forward = sel.anchor() <= sel.cursor();
ByteCoord begin = forward ? sel.anchor() : buffer.char_next(sel.cursor()); ByteCoord begin = forward ? sel.anchor() : buffer.char_next(sel.cursor());
ByteCoord end = forward ? (ByteCoord)sel.cursor() : buffer.char_next(sel.anchor()); ByteCoord end = forward ? (ByteCoord)sel.cursor() : buffer.char_next(sel.anchor());
const bool primary = (i == context.selections().main_index()); const bool primary = (i == selections.main_index());
highlight_range(display_buffer, begin, end, false, highlight_range(display_buffer, begin, end, false,
apply_face(primary ? primary_face : secondary_face)); apply_face(primary ? primary_face : secondary_face));
} }
for (size_t i = 0; i < context.selections().size(); ++i) for (size_t i = 0; i < selections.size(); ++i)
{ {
auto& sel = context.selections()[i]; auto& sel = selections[i];
const bool primary = (i == context.selections().main_index()); const bool primary = (i == selections.main_index());
highlight_range(display_buffer, sel.cursor(), buffer.char_next(sel.cursor()), false, highlight_range(display_buffer, sel.cursor(), buffer.char_next(sel.cursor()), false,
apply_face(primary ? primary_cursor_face : secondary_cursor_face)); apply_face(primary ? primary_cursor_face : secondary_cursor_face));
} }