From 9b8e2526f9960acd95ebf99db6787a8e00a08dcd Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Mon, 9 Nov 2015 09:34:03 +0000 Subject: [PATCH] Merge search hihglighter and regex option highlighter in dynregex --- README.asciidoc | 4 +-- src/face_registry.cc | 1 - src/highlighters.cc | 81 +++++++++++++++++++------------------------- 3 files changed, 37 insertions(+), 49 deletions(-) diff --git a/README.asciidoc b/README.asciidoc index 8dc6d122..f63635a5 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -969,8 +969,8 @@ general highlighters are: For example: `:addhl regex //(\h`TODO:)?[^\n]` 0:cyan 1:yellow,red` will highlight C++ style comments in cyan, with an eventual 'TODO:' in yellow on red background. - * `search`: highlight every match to the current search pattern with the - `Search` face + * `dynregex`: Similar to regex, but expand (like a command paramater would) the + given expression before building a regex from the result. * `flag_lines `: add a column in front of text, and display the given flag in it for everly line contained in the int-list option named . diff --git a/src/face_registry.cc b/src/face_registry.cc index 2f0be21b..1bbd5c4d 100644 --- a/src/face_registry.cc +++ b/src/face_registry.cc @@ -113,7 +113,6 @@ FaceRegistry::FaceRegistry() { "StatusCursor", Face{ Color::Black, Color::Cyan } }, { "Prompt", Face{ Color::Yellow, Color::Default } }, { "MatchingChar", Face{ Color::Default, Color::Default, Attribute::Bold } }, - { "Search", Face{ Color::Default, Color::Default, Attribute::Underline } }, } {} diff --git a/src/highlighters.cc b/src/highlighters.cc index e35fe8fe..e1e4205a 100644 --- a/src/highlighters.cc +++ b/src/highlighters.cc @@ -249,15 +249,15 @@ public: throw runtime_error("wrong parameter count"); FacesSpec faces; - for (auto it = params.begin() + 1; it != params.end(); ++it) + for (auto& spec : params.subrange(1, params.size()-1)) { - auto colon = find(*it, ':'); - if (colon == it->end()) - throw runtime_error("wrong face spec: '" + *it + + auto colon = find(spec, ':'); + if (colon == spec.end()) + throw runtime_error("wrong face spec: '" + spec + "' expected :"); - get_face({colon+1, it->end()}); // throw if wrong face spec - int capture = str_to_int({it->begin(), colon}); - faces.emplace_back(capture, String{colon+1, it->end()}); + get_face({colon+1, spec.end()}); // throw if wrong face spec + int capture = str_to_int({spec.begin(), colon}); + faces.emplace_back(capture, String{colon+1, spec.end()}); } String id = "hlregex'" + params[0] + "'"; @@ -429,46 +429,39 @@ make_dynamic_regex_highlighter(RegexGetter regex_getter, FaceGetter face_getter) std::move(regex_getter), std::move(face_getter)); } -HighlighterAndId create_search_highlighter(HighlighterParameters params) +HighlighterAndId create_dynamic_regex_highlighter(HighlighterParameters params) { - if (params.size() != 0) - throw runtime_error("wrong parameter count"); + if (params.size() < 2) + throw runtime_error("Wrong parameter count"); - auto get_face = [](const Context& context){ - return FacesSpec{ { 0, "Search" } }; - }; - auto get_regex = [](const Context& context){ - auto s = context.main_sel_register_value("/"); + FacesSpec faces; + for (auto& spec : params.subrange(1, params.size()-1)) + { + auto colon = find(spec, ':'); + if (colon == spec.end()) + throw runtime_error("wrong face spec: '" + spec + + "' expected :"); + get_face({colon+1, spec.end()}); // throw if wrong face spec + int capture = str_to_int({spec.begin(), colon}); + faces.emplace_back(capture, String{colon+1, spec.end()}); + } + + auto get_face = [faces](const Context& context){ return faces;; }; + + String expr = params[0]; + auto get_regex = [expr](const Context& context){ try { - return s.empty() ? Regex{} : Regex{s.begin(), s.end()}; + auto re = expand(expr, context); + return re.empty() ? Regex{} : Regex{re}; } - catch (regex_error& err) + catch (runtime_error& err) { + write_to_debug_buffer(format("Error while evaluating dynamic regex expression", err.what())); return Regex{}; } }; - return {"hlsearch", make_dynamic_regex_highlighter(get_regex, get_face)}; -} - -HighlighterAndId create_regex_option_highlighter(HighlighterParameters params) -{ - if (params.size() != 2) - throw runtime_error("wrong parameter count"); - - String facespec = params[1]; - auto get_face = [=](const Context&){ - return FacesSpec{ { 0, facespec } }; - }; - - String option_name = params[0]; - // verify option type now - GlobalScope::instance().options()[option_name].get(); - - auto get_regex = [option_name](const Context& context){ - return context.options()[option_name].get(); - }; - return {"hloption_" + option_name, make_dynamic_regex_highlighter(get_regex, get_face)}; + return {format("dynregex_{}", expr), make_dynamic_regex_highlighter(get_regex, get_face)}; } HighlighterAndId create_line_highlighter(HighlighterParameters params) @@ -1375,14 +1368,10 @@ void register_highlighters() "Parameters: : :...\n" "Highlights the matches for captures from the regex with the given faces" } }); registry.append({ - "regex_option", - { create_regex_option_highlighter, - "Parameters: