Add a show_matching highlighter

This commit is contained in:
Maxime Coste 2014-01-20 21:01:26 +00:00
parent f6eaaf1e78
commit 2cbb0bb27f
3 changed files with 57 additions and 1 deletions

View File

@ -566,6 +566,8 @@ existing highlighters are:
* +flag_lines <flag> <option_name>+: add a column in front of text, and display the * +flag_lines <flag> <option_name>+: add a column in front of text, and display the
given flag in it for everly lines contained in the int-list option named given flag in it for everly lines contained in the int-list option named
<option_name>. <option_name>.
* +show_matching+: highlight matching char of the character under the selections
last char using +MatchingChar+ color alias.
Shared Highlighters Shared Highlighters
~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~

View File

@ -49,7 +49,8 @@ ColorRegistry::ColorRegistry()
{ "Error", { Colors::Black, Colors::Red } }, { "Error", { Colors::Black, Colors::Red } },
{ "StatusLine", { Colors::Cyan, Colors::Default } }, { "StatusLine", { Colors::Cyan, Colors::Default } },
{ "StatusCursor", { Colors::Black, Colors::Cyan } }, { "StatusCursor", { Colors::Black, Colors::Cyan } },
{ "Prompt", { Colors::Yellow, Colors::Default} }, { "Prompt", { Colors::Yellow, Colors::Default } },
{ "MatchingChar", { Colors::Default, Colors::Magenta } },
} }
{} {}

View File

@ -393,6 +393,58 @@ void show_line_numbers(const Context& context, HighlightFlags flags, DisplayBuff
} }
} }
void show_matching_char(const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer)
{
auto& colors = get_color("MatchingChar");
using CodepointPair = std::pair<Codepoint, Codepoint>;
constexpr CodepointPair matching_chars[] = { { '(', ')' }, { '{', '}' }, { '[', ']' }, { '<', '>' } };
const auto range = display_buffer.range();
const auto& buffer = context.buffer();
for (auto& sel : context.selections())
{
auto pos = sel.last();
if (pos < range.first or pos >= range.second)
continue;
auto c = buffer.byte_at(pos);
for (auto& pair : matching_chars)
{
int level = 1;
if (c == pair.first)
{
auto it = buffer.iterator_at(pos)+1;
auto end = buffer.iterator_at(range.second);
skip_while(it, end, [&](char c) {
if (c == pair.first)
++level;
else if (c == pair.second and --level == 0)
return false;
return true;
});
if (it != end)
highlight_range(display_buffer, it.coord(), (it+1).coord(), false,
[&](DisplayAtom& atom) { atom.colors = colors; });
break;
}
else if (c == pair.second)
{
auto it = buffer.iterator_at(pos)-1;
auto end = buffer.iterator_at(range.first);
skip_while_reverse(it, end, [&](char c) {
if (c == pair.second)
++level;
else if (c == pair.first and --level == 0)
return false;
return true;
});
if (it != end)
highlight_range(display_buffer, it.coord(), (it+1).coord(), false,
[&](DisplayAtom& atom) { atom.colors = colors; });
break;
}
}
}
}
void highlight_selections(const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer) void highlight_selections(const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer)
{ {
if (flags != HighlightFlags::Highlight) if (flags != HighlightFlags::Highlight)
@ -835,6 +887,7 @@ void register_highlighters()
HighlighterRegistry& registry = HighlighterRegistry::instance(); HighlighterRegistry& registry = HighlighterRegistry::instance();
registry.register_func("number_lines", SimpleHighlighterFactory<show_line_numbers>("number_lines")); registry.register_func("number_lines", SimpleHighlighterFactory<show_line_numbers>("number_lines"));
registry.register_func("show_matching", SimpleHighlighterFactory<show_matching_char>("show_matching"));
registry.register_func("regex", colorize_regex_factory); registry.register_func("regex", colorize_regex_factory);
registry.register_func("regex_option", highlight_regex_option_factory); registry.register_func("regex_option", highlight_regex_option_factory);
registry.register_func("search", highlight_search_factory); registry.register_func("search", highlight_search_factory);