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

add regex_option highlighter, which takes a regex option name and highlight all its matches

Browse Source
This commit is contained in:
Maxime Coste 2013-03-26 14:26:59 +01:00
parent 996e5999ed
commit c6a1fed6b4
1 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/highlighters.cc
View File

@ -153,32 +153,31 @@ HighlighterAndId colorize_regex_factory(const HighlighterParameters params, cons
} }
} }
class SearchHighlighter template<typename RegexGetter>
class DynamicRegexHighlighter
{ {
public: public:
SearchHighlighter(const ColorSpec& colors) DynamicRegexHighlighter(const ColorSpec& colors, RegexGetter getter)
: m_colors(colors), m_colorizer(Regex(), m_colors) {} : m_regex_getter(getter), m_colors(colors), m_colorizer(Regex(), m_colors) {}
void operator()(DisplayBuffer& display_buffer) void operator()(DisplayBuffer& display_buffer)
{ {
memoryview<String> searches = RegisterManager::instance()['/'].values(Context{}); Regex regex = m_regex_getter();
if (searches.empty()) if (regex != m_last_regex)
return;
const String& search = searches[0];
if (search != m_last_search)
{ {
m_last_search = search; m_last_regex = regex;
if (not m_last_search.empty()) if (not m_last_regex.empty())
m_colorizer = RegexColorizer{Regex{m_last_search.begin(), m_last_search.end()}, m_colors}; m_colorizer = RegexColorizer{m_last_regex, m_colors};
} }
if (not m_last_search.empty()) if (not m_last_regex.empty())
m_colorizer(display_buffer); m_colorizer(display_buffer);
} }
private: private:
String m_last_search; Regex m_last_regex;
ColorSpec m_colors; ColorSpec m_colors;
RegexColorizer m_colorizer; RegexColorizer m_colorizer;
RegexGetter m_regex_getter;
}; };
HighlighterAndId highlight_search_factory(const HighlighterParameters params, const Window&) HighlighterAndId highlight_search_factory(const HighlighterParameters params, const Window&)
@ -187,9 +186,12 @@ HighlighterAndId highlight_search_factory(const HighlighterParameters params, co
throw runtime_error("wrong parameter count"); throw runtime_error("wrong parameter count");
try try
{ {
ColorSpec colors; ColorSpec colors { { 0, &ColorRegistry::instance()[params[0]] } };
colors[0] = &ColorRegistry::instance()[params[0]]; auto get_regex = []{
return {"hlsearch", SearchHighlighter{colors}}; auto s = RegisterManager::instance()['/'].values(Context{});
return s.empty() ? Regex{} : Regex{s[0].begin(), s[0].end()};
};
return {"hlsearch", DynamicRegexHighlighter<decltype(get_regex)>{colors, get_regex}};
} }
catch (boost::regex_error& err) catch (boost::regex_error& err)
{ {
@ -197,6 +199,21 @@ HighlighterAndId highlight_search_factory(const HighlighterParameters params, co
} }
}; };
HighlighterAndId highlight_regex_option_factory(const HighlighterParameters params, const Window& window)
{
if (params.size() != 2)
throw runtime_error("wrong parameter count");
ColorSpec colors { { 0, &ColorRegistry::instance()[params[1]] } };
String option_name = params[0];
const OptionManager& options = window.options();
// verify option type now
options[option_name].get<Regex>();
auto get_regex = [option_name, &options]{ return options[option_name].get<Regex>(); };
return {"hloption_" + option_name, DynamicRegexHighlighter<decltype(get_regex)>{colors, get_regex}};
};
void expand_tabulations(const OptionManager& options, DisplayBuffer& display_buffer) void expand_tabulations(const OptionManager& options, DisplayBuffer& display_buffer)
{ {
const int tabstop = options["tabstop"].get<int>(); const int tabstop = options["tabstop"].get<int>();
@ -386,6 +403,7 @@ void register_highlighters()
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("regex", colorize_regex_factory); registry.register_func("regex", colorize_regex_factory);
registry.register_func("regex_option", highlight_regex_option_factory);
registry.register_func("search", highlight_search_factory); registry.register_func("search", highlight_search_factory);
registry.register_func("group", highlighter_group_factory); registry.register_func("group", highlighter_group_factory);
registry.register_func("flag_lines", flag_lines_factory); registry.register_func("flag_lines", flag_lines_factory);