2011-11-30 02:37:20 +04:00
|
|
|
#include "highlighters.hh"
|
2013-04-09 21:39:03 +04:00
|
|
|
|
2011-11-14 18:23:02 +04:00
|
|
|
#include "assert.hh"
|
2014-05-09 16:50:12 +04:00
|
|
|
#include "buffer_utils.hh"
|
2012-12-31 17:28:32 +04:00
|
|
|
#include "context.hh"
|
2014-12-23 16:54:09 +03:00
|
|
|
#include "containers.hh"
|
2013-12-17 03:24:08 +04:00
|
|
|
#include "display_buffer.hh"
|
2014-07-11 03:27:04 +04:00
|
|
|
#include "face_registry.hh"
|
|
|
|
#include "highlighter_group.hh"
|
2014-05-27 00:01:45 +04:00
|
|
|
#include "line_modification.hh"
|
2013-04-09 21:39:03 +04:00
|
|
|
#include "option_types.hh"
|
2014-07-11 03:27:04 +04:00
|
|
|
#include "parameters_parser.hh"
|
2013-04-09 21:39:03 +04:00
|
|
|
#include "register_manager.hh"
|
2012-08-29 23:49:36 +04:00
|
|
|
#include "string.hh"
|
2012-10-08 16:27:43 +04:00
|
|
|
#include "utf8.hh"
|
2013-02-26 17:12:21 +04:00
|
|
|
#include "utf8_iterator.hh"
|
2013-03-26 03:14:38 +04:00
|
|
|
|
2013-02-26 17:12:21 +04:00
|
|
|
#include <sstream>
|
|
|
|
#include <locale>
|
2011-11-08 18:28:01 +04:00
|
|
|
|
2011-09-30 23:16:23 +04:00
|
|
|
namespace Kakoune
|
|
|
|
{
|
|
|
|
|
2012-04-03 17:39:20 +04:00
|
|
|
using namespace std::placeholders;
|
|
|
|
|
2012-07-13 01:19:10 +04:00
|
|
|
template<typename T>
|
|
|
|
void highlight_range(DisplayBuffer& display_buffer,
|
2014-05-07 22:51:01 +04:00
|
|
|
ByteCoord begin, ByteCoord end,
|
2012-07-13 01:19:10 +04:00
|
|
|
bool skip_replaced, T func)
|
2011-09-30 23:16:23 +04:00
|
|
|
{
|
2012-08-10 16:20:15 +04:00
|
|
|
if (begin == end or end <= display_buffer.range().first
|
|
|
|
or begin >= display_buffer.range().second)
|
2012-07-13 01:51:13 +04:00
|
|
|
return;
|
|
|
|
|
2012-07-13 01:19:10 +04:00
|
|
|
for (auto& line : display_buffer.lines())
|
2011-09-30 23:16:23 +04:00
|
|
|
{
|
2013-07-23 22:11:26 +04:00
|
|
|
auto& range = line.range();
|
|
|
|
if (range.second <= begin or end < range.first)
|
2012-12-12 22:33:29 +04:00
|
|
|
continue;
|
|
|
|
|
|
|
|
for (auto atom_it = line.begin(); atom_it != line.end(); ++atom_it)
|
2012-07-04 01:23:07 +04:00
|
|
|
{
|
2013-07-24 16:55:57 +04:00
|
|
|
bool is_replaced = atom_it->type() == DisplayAtom::ReplacedBufferRange;
|
2011-11-14 18:23:02 +04:00
|
|
|
|
2013-07-24 16:55:57 +04:00
|
|
|
if (not atom_it->has_buffer_range() or
|
2012-12-12 22:33:29 +04:00
|
|
|
(skip_replaced and is_replaced))
|
|
|
|
continue;
|
2011-09-30 23:16:23 +04:00
|
|
|
|
2013-07-24 16:55:57 +04:00
|
|
|
if (end <= atom_it->begin() or begin >= atom_it->end())
|
2012-12-12 22:33:29 +04:00
|
|
|
continue;
|
2012-02-23 01:48:14 +04:00
|
|
|
|
2013-07-24 16:55:57 +04:00
|
|
|
if (not is_replaced and begin > atom_it->begin())
|
2012-12-12 22:33:29 +04:00
|
|
|
atom_it = ++line.split(atom_it, begin);
|
2011-11-14 18:23:02 +04:00
|
|
|
|
2013-07-24 16:55:57 +04:00
|
|
|
if (not is_replaced and end < atom_it->end())
|
2012-12-12 22:33:29 +04:00
|
|
|
{
|
|
|
|
atom_it = line.split(atom_it, end);
|
|
|
|
func(*atom_it);
|
|
|
|
++atom_it;
|
2012-07-13 01:19:10 +04:00
|
|
|
}
|
2012-12-12 22:33:29 +04:00
|
|
|
else
|
|
|
|
func(*atom_it);
|
2012-07-13 01:19:10 +04:00
|
|
|
}
|
2011-09-30 23:16:23 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-17 03:24:08 +04:00
|
|
|
void apply_highlighter(const Context& context,
|
2014-01-18 05:56:51 +04:00
|
|
|
HighlightFlags flags,
|
2013-12-12 01:38:43 +04:00
|
|
|
DisplayBuffer& display_buffer,
|
2014-05-07 22:51:01 +04:00
|
|
|
ByteCoord begin, ByteCoord end,
|
2014-10-22 03:20:09 +04:00
|
|
|
Highlighter& highlighter)
|
2013-12-12 01:38:43 +04:00
|
|
|
{
|
2015-02-15 22:42:48 +03:00
|
|
|
if (begin == end)
|
|
|
|
return;
|
|
|
|
|
2013-12-12 01:38:43 +04:00
|
|
|
using LineIterator = DisplayBuffer::LineList::iterator;
|
|
|
|
LineIterator first_line;
|
2015-01-12 16:24:30 +03:00
|
|
|
Vector<DisplayLine::iterator> insert_pos;
|
2013-12-12 01:38:43 +04:00
|
|
|
auto line_end = display_buffer.lines().end();
|
|
|
|
|
|
|
|
DisplayBuffer region_display;
|
|
|
|
auto& region_lines = region_display.lines();
|
|
|
|
for (auto line_it = display_buffer.lines().begin(); line_it != line_end; ++line_it)
|
|
|
|
{
|
|
|
|
auto& line = *line_it;
|
|
|
|
auto& range = line.range();
|
2014-06-16 22:41:07 +04:00
|
|
|
if (range.second <= begin or end <= range.first)
|
2013-12-12 01:38:43 +04:00
|
|
|
continue;
|
|
|
|
|
|
|
|
if (region_lines.empty())
|
|
|
|
first_line = line_it;
|
|
|
|
region_lines.emplace_back();
|
|
|
|
insert_pos.emplace_back();
|
|
|
|
|
|
|
|
if (range.first < begin or range.second > end)
|
|
|
|
{
|
|
|
|
size_t beg_idx = 0;
|
|
|
|
size_t end_idx = line.atoms().size();
|
|
|
|
|
|
|
|
for (auto atom_it = line.begin(); atom_it != line.end(); ++atom_it)
|
|
|
|
{
|
|
|
|
if (not atom_it->has_buffer_range() or end <= atom_it->begin() or begin >= atom_it->end())
|
|
|
|
continue;
|
|
|
|
|
|
|
|
bool is_replaced = atom_it->type() == DisplayAtom::ReplacedBufferRange;
|
|
|
|
if (atom_it->begin() <= begin)
|
|
|
|
{
|
|
|
|
if (is_replaced or atom_it->begin() == begin)
|
|
|
|
beg_idx = atom_it - line.begin();
|
|
|
|
else
|
|
|
|
{
|
|
|
|
atom_it = ++line.split(atom_it, begin);
|
|
|
|
beg_idx = atom_it - line.begin();
|
|
|
|
++end_idx;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (atom_it->end() >= end)
|
|
|
|
{
|
|
|
|
if (is_replaced or atom_it->end() == end)
|
2014-07-15 00:41:29 +04:00
|
|
|
end_idx = atom_it - line.begin() + 1;
|
2013-12-12 01:38:43 +04:00
|
|
|
else
|
|
|
|
{
|
|
|
|
atom_it = ++line.split(atom_it, end);
|
|
|
|
end_idx = atom_it - line.begin();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
std::move(line.begin() + beg_idx, line.begin() + end_idx,
|
|
|
|
std::back_inserter(region_lines.back()));
|
|
|
|
insert_pos.back() = line.erase(line.begin() + beg_idx, line.begin() + end_idx);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
region_lines.back() = std::move(line);
|
|
|
|
insert_pos.back() = line.begin();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-16 16:25:17 +03:00
|
|
|
if (region_display.lines().empty())
|
|
|
|
return;
|
|
|
|
|
2013-12-12 01:38:43 +04:00
|
|
|
region_display.compute_range();
|
2014-12-02 22:56:17 +03:00
|
|
|
highlighter.highlight(context, flags, region_display, {begin, end});
|
2013-12-12 01:38:43 +04:00
|
|
|
|
|
|
|
for (size_t i = 0; i < region_lines.size(); ++i)
|
|
|
|
{
|
|
|
|
auto& line = *(first_line + i);
|
|
|
|
auto pos = insert_pos[i];
|
|
|
|
for (auto& atom : region_lines[i])
|
|
|
|
pos = ++line.insert(pos, std::move(atom));
|
|
|
|
}
|
|
|
|
display_buffer.compute_range();
|
|
|
|
}
|
|
|
|
|
2014-07-11 03:27:04 +04:00
|
|
|
auto apply_face = [](const Face& face)
|
2014-06-18 23:31:49 +04:00
|
|
|
{
|
2014-07-11 03:27:04 +04:00
|
|
|
return [&face](DisplayAtom& atom) {
|
|
|
|
if (face.fg != Colors::Default)
|
|
|
|
atom.face.fg = face.fg;
|
|
|
|
if (face.bg != Colors::Default)
|
|
|
|
atom.face.bg = face.bg;
|
2014-07-15 23:11:47 +04:00
|
|
|
if (face.attributes != Attribute::Normal)
|
2014-07-11 03:27:04 +04:00
|
|
|
atom.face.attributes |= face.attributes;
|
2014-06-18 23:33:23 +04:00
|
|
|
};
|
2014-06-18 23:31:49 +04:00
|
|
|
};
|
|
|
|
|
2014-10-22 03:20:09 +04:00
|
|
|
static HighlighterAndId create_fill_highlighter(HighlighterParameters params)
|
2014-06-11 00:46:16 +04:00
|
|
|
{
|
2014-09-19 16:45:11 +04:00
|
|
|
if (params.size() != 1)
|
|
|
|
throw runtime_error("wrong parameter count");
|
|
|
|
|
|
|
|
const String& facespec = params[0];
|
|
|
|
get_face(facespec); // validate param
|
2014-06-11 00:46:16 +04:00
|
|
|
|
2014-10-22 03:20:09 +04:00
|
|
|
auto func = [=](const Context& context, HighlightFlags flags,
|
2014-12-02 22:56:17 +03:00
|
|
|
DisplayBuffer& display_buffer, BufferRange range)
|
2014-06-11 00:46:16 +04:00
|
|
|
{
|
|
|
|
highlight_range(display_buffer, range.first, range.second, true,
|
2014-09-19 16:45:11 +04:00
|
|
|
apply_face(get_face(facespec)));
|
|
|
|
};
|
2014-10-22 03:20:09 +04:00
|
|
|
return {"fill_" + facespec, make_simple_highlighter(std::move(func))};
|
2014-06-11 00:46:16 +04:00
|
|
|
}
|
|
|
|
|
2014-01-10 02:51:23 +04:00
|
|
|
template<typename T>
|
|
|
|
struct BufferSideCache
|
|
|
|
{
|
|
|
|
BufferSideCache() : m_id{ValueId::get_free_id()} {}
|
|
|
|
|
|
|
|
T& get(const Buffer& buffer)
|
|
|
|
{
|
|
|
|
Value& cache_val = buffer.values()[m_id];
|
|
|
|
if (not cache_val)
|
2014-05-15 00:19:19 +04:00
|
|
|
cache_val = Value(T{});
|
2014-01-10 02:51:23 +04:00
|
|
|
return cache_val.as<T>();
|
|
|
|
}
|
|
|
|
private:
|
|
|
|
ValueId m_id;
|
|
|
|
};
|
|
|
|
|
2015-02-16 16:25:17 +03:00
|
|
|
static bool overlaps(const BufferRange& lhs, const BufferRange& rhs)
|
|
|
|
{
|
|
|
|
return lhs.first < rhs.first ? lhs.second > rhs.first
|
|
|
|
: rhs.second > lhs.first;
|
|
|
|
}
|
|
|
|
|
2015-02-17 16:50:31 +03:00
|
|
|
using FacesSpec = Vector<std::pair<size_t, String>, MemoryDomain::Highlight>;
|
|
|
|
|
2014-10-22 03:20:09 +04:00
|
|
|
class RegexHighlighter : public Highlighter
|
2011-11-24 23:11:58 +04:00
|
|
|
{
|
2012-08-15 19:08:48 +04:00
|
|
|
public:
|
2014-07-12 16:57:16 +04:00
|
|
|
RegexHighlighter(Regex regex, FacesSpec faces)
|
2014-07-11 03:27:04 +04:00
|
|
|
: m_regex{std::move(regex)}, m_faces{std::move(faces)}
|
2012-08-15 19:08:48 +04:00
|
|
|
{
|
2015-02-17 16:50:31 +03:00
|
|
|
ensure_first_face_is_capture_0();
|
2012-08-15 19:08:48 +04:00
|
|
|
}
|
|
|
|
|
2015-02-15 22:42:48 +03:00
|
|
|
void highlight(const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer, BufferRange range) override
|
2012-07-13 01:19:10 +04:00
|
|
|
{
|
2015-02-16 16:25:17 +03:00
|
|
|
if (flags != HighlightFlags::Highlight or not overlaps(display_buffer.range(), range))
|
2014-01-18 05:56:51 +04:00
|
|
|
return;
|
2014-07-12 14:19:35 +04:00
|
|
|
|
2015-02-17 16:50:31 +03:00
|
|
|
Vector<Face> faces(m_faces.size());
|
|
|
|
for (int f = 0; f < m_faces.size(); ++f)
|
2012-08-07 02:13:54 +04:00
|
|
|
{
|
2015-02-17 16:50:31 +03:00
|
|
|
if (not m_faces[f].second.empty())
|
|
|
|
faces[f] = get_face(m_faces[f].second);
|
|
|
|
}
|
2012-08-15 19:08:48 +04:00
|
|
|
|
2015-02-17 16:50:31 +03:00
|
|
|
auto& matches = get_matches(context.buffer(), display_buffer.range(), range);
|
|
|
|
kak_assert(matches.size() % m_faces.size() == 0);
|
|
|
|
for (size_t m = 0; m < matches.size(); ++m)
|
|
|
|
{
|
|
|
|
auto& face = faces[m % faces.size()];
|
|
|
|
if (face == Face{})
|
|
|
|
continue;
|
|
|
|
|
|
|
|
highlight_range(display_buffer,
|
|
|
|
matches[m].first, matches[m].second,
|
|
|
|
true, apply_face(face));
|
2012-08-07 02:13:54 +04:00
|
|
|
}
|
2012-07-13 01:19:10 +04:00
|
|
|
}
|
2012-08-15 19:08:48 +04:00
|
|
|
|
2014-10-22 03:20:09 +04:00
|
|
|
void reset(Regex regex, FacesSpec faces)
|
|
|
|
{
|
|
|
|
m_regex = std::move(regex);
|
|
|
|
m_faces = std::move(faces);
|
2015-02-17 16:50:31 +03:00
|
|
|
ensure_first_face_is_capture_0();
|
2015-02-17 01:43:14 +03:00
|
|
|
++m_regex_version;
|
2014-10-22 03:20:09 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static HighlighterAndId create(HighlighterParameters params)
|
|
|
|
{
|
|
|
|
if (params.size() < 2)
|
|
|
|
throw runtime_error("wrong parameter count");
|
|
|
|
|
|
|
|
try
|
|
|
|
{
|
|
|
|
static Regex face_spec_ex(R"((\d+):(.*))");
|
|
|
|
FacesSpec faces;
|
|
|
|
for (auto it = params.begin() + 1; it != params.end(); ++it)
|
|
|
|
{
|
|
|
|
MatchResults<String::const_iterator> res;
|
|
|
|
if (not regex_match(it->begin(), it->end(), res, face_spec_ex))
|
|
|
|
throw runtime_error("wrong face spec: '" + *it +
|
|
|
|
"' expected <capture>:<facespec>");
|
2015-03-10 22:33:46 +03:00
|
|
|
get_face({res[2].first, res[2].second}); // throw if wrong face spec
|
|
|
|
int capture = str_to_int({res[1].first, res[1].second});
|
|
|
|
faces.emplace_back(capture, String{res[2].first, res[2].second});
|
2014-10-22 03:20:09 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
String id = "hlregex'" + params[0] + "'";
|
|
|
|
|
|
|
|
Regex ex{params[0].begin(), params[0].end(), Regex::optimize};
|
|
|
|
|
|
|
|
return {id, make_unique<RegexHighlighter>(std::move(ex),
|
|
|
|
std::move(faces))};
|
|
|
|
}
|
|
|
|
catch (RegexError& err)
|
|
|
|
{
|
|
|
|
throw runtime_error(String("regex error: ") + err.what());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-08-15 19:08:48 +04:00
|
|
|
private:
|
2015-02-17 16:50:31 +03:00
|
|
|
// stores the range for each highlighted capture of each match
|
|
|
|
using MatchList = Vector<BufferRange, MemoryDomain::Highlight>;
|
2014-01-13 01:24:59 +04:00
|
|
|
struct Cache
|
2013-11-19 03:17:06 +04:00
|
|
|
{
|
2015-02-17 01:43:14 +03:00
|
|
|
size_t m_timestamp = -1;
|
|
|
|
size_t m_regex_version = -1;
|
2015-02-17 16:50:31 +03:00
|
|
|
using RangeAndMatches = std::pair<BufferRange, MatchList>;
|
2015-02-15 22:42:48 +03:00
|
|
|
Vector<RangeAndMatches, MemoryDomain::Highlight> m_matches;
|
2013-11-19 03:17:06 +04:00
|
|
|
};
|
2014-01-13 01:24:59 +04:00
|
|
|
BufferSideCache<Cache> m_cache;
|
2012-08-15 19:08:48 +04:00
|
|
|
|
|
|
|
Regex m_regex;
|
2014-07-12 14:19:35 +04:00
|
|
|
FacesSpec m_faces;
|
2012-08-15 19:08:48 +04:00
|
|
|
|
2015-02-17 01:43:14 +03:00
|
|
|
size_t m_regex_version = 0;
|
2014-10-22 03:20:09 +04:00
|
|
|
|
2015-02-17 16:50:31 +03:00
|
|
|
void ensure_first_face_is_capture_0()
|
|
|
|
{
|
|
|
|
if (m_faces.empty())
|
|
|
|
return;
|
|
|
|
|
|
|
|
std::sort(m_faces.begin(), m_faces.end(),
|
|
|
|
[](const std::pair<size_t, String>& lhs,
|
|
|
|
const std::pair<size_t, String>& rhs)
|
|
|
|
{ return lhs.first < rhs.first; });
|
|
|
|
if (m_faces[0].first != 0)
|
|
|
|
m_faces.emplace(m_faces.begin(), 0, String{});
|
|
|
|
}
|
|
|
|
|
|
|
|
void add_matches(const Buffer& buffer, MatchList& matches,
|
2015-02-16 22:13:55 +03:00
|
|
|
BufferRange range)
|
|
|
|
{
|
2015-02-17 16:50:31 +03:00
|
|
|
kak_assert(matches.size() % m_faces.size() == 0);
|
2015-02-16 22:13:55 +03:00
|
|
|
using RegexIt = RegexIterator<BufferIterator>;
|
|
|
|
RegexIt re_it{buffer.iterator_at(range.first),
|
|
|
|
buffer.iterator_at(range.second), m_regex};
|
|
|
|
RegexIt re_end;
|
|
|
|
for (; re_it != re_end; ++re_it)
|
|
|
|
{
|
2015-02-17 16:50:31 +03:00
|
|
|
for (size_t i = 0; i < m_faces.size(); ++i)
|
|
|
|
{
|
|
|
|
auto& sub = (*re_it)[m_faces[i].first];
|
|
|
|
matches.emplace_back(sub.first.coord(), sub.second.coord());
|
|
|
|
}
|
2015-02-16 22:13:55 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-17 16:50:31 +03:00
|
|
|
MatchList& get_matches(const Buffer& buffer, BufferRange display_range,
|
|
|
|
BufferRange buffer_range)
|
2012-08-15 19:08:48 +04:00
|
|
|
{
|
2014-01-13 01:24:59 +04:00
|
|
|
Cache& cache = m_cache.get(buffer);
|
2015-02-15 22:42:48 +03:00
|
|
|
auto& matches = cache.m_matches;
|
2013-11-19 03:17:06 +04:00
|
|
|
|
2015-02-17 01:43:14 +03:00
|
|
|
if (cache.m_regex_version != m_regex_version or
|
|
|
|
cache.m_timestamp != buffer.timestamp())
|
2015-02-15 22:42:48 +03:00
|
|
|
{
|
|
|
|
matches.clear();
|
|
|
|
cache.m_timestamp = buffer.timestamp();
|
2015-02-17 01:43:14 +03:00
|
|
|
cache.m_regex_version = m_regex_version;
|
2015-02-15 22:42:48 +03:00
|
|
|
}
|
|
|
|
const LineCount line_offset = 3;
|
2015-02-16 16:25:17 +03:00
|
|
|
BufferRange range{std::max<ByteCoord>(buffer_range.first, display_range.first.line - line_offset),
|
|
|
|
std::min<ByteCoord>(buffer_range.second, display_range.second.line + line_offset)};
|
2012-08-15 19:08:48 +04:00
|
|
|
|
2015-02-15 22:42:48 +03:00
|
|
|
auto it = std::upper_bound(matches.begin(), matches.end(), range,
|
|
|
|
[](const BufferRange& lhs, const Cache::RangeAndMatches& rhs)
|
|
|
|
{ return lhs.first < rhs.first.second; });
|
2014-10-22 03:20:09 +04:00
|
|
|
|
2015-02-15 22:42:48 +03:00
|
|
|
if (it == matches.end() or it->first.first > range.second)
|
2015-02-16 22:13:55 +03:00
|
|
|
{
|
2015-02-15 22:42:48 +03:00
|
|
|
it = matches.insert(it, Cache::RangeAndMatches{range, {}});
|
2015-02-16 22:13:55 +03:00
|
|
|
add_matches(buffer, it->second, range);
|
|
|
|
}
|
|
|
|
else if (it->second.empty())
|
2015-02-15 22:42:48 +03:00
|
|
|
{
|
|
|
|
it->first = range;
|
2015-02-16 22:13:55 +03:00
|
|
|
add_matches(buffer, it->second, range);
|
2015-02-15 22:42:48 +03:00
|
|
|
}
|
2015-02-16 22:13:55 +03:00
|
|
|
else
|
2013-11-19 03:17:06 +04:00
|
|
|
{
|
2015-02-16 22:13:55 +03:00
|
|
|
// Here we extend the matches, that is not strictly valid,
|
|
|
|
// but may work nicely with every reasonable regex, and
|
|
|
|
// greatly reduces regex parsing. To change if we encounter
|
|
|
|
// regex that do not work great with that.
|
|
|
|
BufferRange& old_range = it->first;
|
2015-02-17 16:50:31 +03:00
|
|
|
MatchList& matches = it->second;
|
|
|
|
|
|
|
|
// Thanks to the ensure_first_face_is_capture_0 method, we know
|
|
|
|
// these point to the first/last matches capture 0.
|
|
|
|
auto first_end = matches.begin()->second;
|
|
|
|
auto last_begin = (matches.end() - m_faces.size())->first;
|
|
|
|
|
2015-02-16 22:13:55 +03:00
|
|
|
bool remove_last = true;
|
|
|
|
|
|
|
|
// add regex matches from new begin to old first match end
|
|
|
|
if (range.first < old_range.first)
|
|
|
|
{
|
|
|
|
old_range.first = range.first;
|
2015-02-17 16:50:31 +03:00
|
|
|
MatchList new_matches;
|
2015-02-16 22:13:55 +03:00
|
|
|
add_matches(buffer, new_matches, {range.first, first_end});
|
2015-02-17 16:50:31 +03:00
|
|
|
matches.erase(matches.begin(), matches.begin() + m_faces.size());
|
2015-02-16 22:13:55 +03:00
|
|
|
|
2015-02-17 16:50:31 +03:00
|
|
|
// first matches was last matches as well, so
|
|
|
|
// make sure we do not try to remove them again.
|
2015-02-16 22:13:55 +03:00
|
|
|
if (matches.empty())
|
|
|
|
remove_last = false;
|
|
|
|
|
|
|
|
std::copy(std::make_move_iterator(new_matches.begin()),
|
|
|
|
std::make_move_iterator(new_matches.end()),
|
|
|
|
std::inserter(matches, matches.begin()));
|
|
|
|
}
|
|
|
|
// add regex matches from old last match begin to new end
|
|
|
|
if (old_range.second < range.second)
|
|
|
|
{
|
|
|
|
old_range.second = range.second;
|
|
|
|
if (remove_last)
|
2015-02-17 16:50:31 +03:00
|
|
|
matches.erase(matches.end() - m_faces.size(), matches.end());
|
2015-02-16 22:13:55 +03:00
|
|
|
add_matches(buffer, matches, {last_begin, range.second});
|
|
|
|
}
|
2013-11-19 03:17:06 +04:00
|
|
|
}
|
2015-02-16 22:13:55 +03:00
|
|
|
return it->second;
|
2012-08-15 19:08:48 +04:00
|
|
|
}
|
|
|
|
};
|
2011-11-24 23:11:58 +04:00
|
|
|
|
2014-07-11 03:27:04 +04:00
|
|
|
template<typename RegexGetter, typename FaceGetter>
|
2014-10-22 03:20:09 +04:00
|
|
|
class DynamicRegexHighlighter : public Highlighter
|
2012-12-31 17:28:32 +04:00
|
|
|
{
|
|
|
|
public:
|
2014-07-11 03:27:04 +04:00
|
|
|
DynamicRegexHighlighter(RegexGetter regex_getter, FaceGetter face_getter)
|
2014-05-13 22:35:28 +04:00
|
|
|
: m_regex_getter(std::move(regex_getter)),
|
2014-07-11 03:27:04 +04:00
|
|
|
m_face_getter(std::move(face_getter)),
|
2014-07-12 16:57:16 +04:00
|
|
|
m_highlighter(Regex(), FacesSpec{}) {}
|
2012-12-31 17:28:32 +04:00
|
|
|
|
2014-12-02 22:56:17 +03:00
|
|
|
void highlight(const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer, BufferRange range)
|
2012-12-31 17:28:32 +04:00
|
|
|
{
|
2014-01-18 05:56:51 +04:00
|
|
|
if (flags != HighlightFlags::Highlight)
|
|
|
|
return;
|
|
|
|
|
2013-12-17 03:24:08 +04:00
|
|
|
Regex regex = m_regex_getter(context);
|
2014-07-12 14:19:35 +04:00
|
|
|
FacesSpec face = m_face_getter(context);
|
2014-07-11 03:27:04 +04:00
|
|
|
if (regex != m_last_regex or face != m_last_face)
|
2012-12-31 17:28:32 +04:00
|
|
|
{
|
2013-03-26 17:26:59 +04:00
|
|
|
m_last_regex = regex;
|
2014-07-11 03:27:04 +04:00
|
|
|
m_last_face = face;
|
2013-03-26 17:26:59 +04:00
|
|
|
if (not m_last_regex.empty())
|
2014-10-22 03:20:09 +04:00
|
|
|
m_highlighter.reset(m_last_regex, m_last_face);
|
2012-12-31 17:28:32 +04:00
|
|
|
}
|
2014-07-11 03:27:04 +04:00
|
|
|
if (not m_last_regex.empty() and not m_last_face.empty())
|
2014-12-02 22:56:17 +03:00
|
|
|
m_highlighter.highlight(context, flags, display_buffer, range);
|
2012-12-31 17:28:32 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
2014-07-11 03:27:04 +04:00
|
|
|
Regex m_last_regex;
|
|
|
|
RegexGetter m_regex_getter;
|
2014-05-13 22:35:28 +04:00
|
|
|
|
2014-07-12 14:19:35 +04:00
|
|
|
FacesSpec m_last_face;
|
2014-07-11 03:27:04 +04:00
|
|
|
FaceGetter m_face_getter;
|
2014-05-13 22:35:28 +04:00
|
|
|
|
2014-07-12 16:57:16 +04:00
|
|
|
RegexHighlighter m_highlighter;
|
2012-12-31 17:28:32 +04:00
|
|
|
};
|
|
|
|
|
2014-07-11 03:27:04 +04:00
|
|
|
template<typename RegexGetter, typename FaceGetter>
|
2014-10-22 03:20:09 +04:00
|
|
|
std::unique_ptr<DynamicRegexHighlighter<RegexGetter, FaceGetter>>
|
2014-07-11 03:27:04 +04:00
|
|
|
make_dynamic_regex_highlighter(RegexGetter regex_getter, FaceGetter face_getter)
|
2014-05-13 22:35:28 +04:00
|
|
|
{
|
2014-10-22 03:20:09 +04:00
|
|
|
return make_unique<DynamicRegexHighlighter<RegexGetter, FaceGetter>>(
|
2014-07-11 03:27:04 +04:00
|
|
|
std::move(regex_getter), std::move(face_getter));
|
2014-05-13 22:35:28 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-10-22 03:20:09 +04:00
|
|
|
HighlighterAndId create_search_highlighter(HighlighterParameters params)
|
2012-12-31 17:28:32 +04:00
|
|
|
{
|
2014-05-13 22:35:28 +04:00
|
|
|
if (params.size() != 0)
|
2012-12-31 17:28:32 +04:00
|
|
|
throw runtime_error("wrong parameter count");
|
2014-07-11 03:27:04 +04:00
|
|
|
auto get_face = [](const Context& context){
|
2015-02-17 16:50:31 +03:00
|
|
|
return FacesSpec{ { 0, "Search" } };
|
2014-05-13 22:35:28 +04:00
|
|
|
};
|
2013-12-17 03:24:08 +04:00
|
|
|
auto get_regex = [](const Context&){
|
2014-06-21 14:31:08 +04:00
|
|
|
auto s = Context().main_sel_register_value("/");
|
2014-05-13 22:35:28 +04:00
|
|
|
try
|
|
|
|
{
|
2014-06-21 14:31:08 +04:00
|
|
|
return s.empty() ? Regex{} : Regex{s.begin(), s.end()};
|
2014-05-13 22:35:28 +04:00
|
|
|
}
|
2014-10-13 16:12:33 +04:00
|
|
|
catch (RegexError& err)
|
2014-05-13 22:35:28 +04:00
|
|
|
{
|
|
|
|
return Regex{};
|
|
|
|
}
|
2013-03-26 17:26:59 +04:00
|
|
|
};
|
2014-07-11 03:27:04 +04:00
|
|
|
return {"hlsearch", make_dynamic_regex_highlighter(get_regex, get_face)};
|
2013-04-03 21:20:38 +04:00
|
|
|
}
|
2012-12-31 17:28:32 +04:00
|
|
|
|
2014-10-22 03:20:09 +04:00
|
|
|
HighlighterAndId create_regex_option_highlighter(HighlighterParameters params)
|
2013-03-26 17:26:59 +04:00
|
|
|
{
|
|
|
|
if (params.size() != 2)
|
|
|
|
throw runtime_error("wrong parameter count");
|
|
|
|
|
2014-07-12 14:19:35 +04:00
|
|
|
String facespec = params[1];
|
|
|
|
auto get_face = [=](const Context&){
|
2015-02-17 16:50:31 +03:00
|
|
|
return FacesSpec{ { 0, facespec } };
|
2014-05-13 22:35:28 +04:00
|
|
|
};
|
|
|
|
|
2013-03-26 17:26:59 +04:00
|
|
|
String option_name = params[0];
|
|
|
|
// verify option type now
|
2014-10-30 17:00:42 +03:00
|
|
|
GlobalScope::instance().options()[option_name].get<Regex>();
|
2013-03-26 17:26:59 +04:00
|
|
|
|
2014-05-13 22:35:28 +04:00
|
|
|
auto get_regex = [option_name](const Context& context){
|
|
|
|
return context.options()[option_name].get<Regex>();
|
|
|
|
};
|
2014-07-11 03:27:04 +04:00
|
|
|
return {"hloption_" + option_name, make_dynamic_regex_highlighter(get_regex, get_face)};
|
2013-04-03 21:20:38 +04:00
|
|
|
}
|
2013-03-26 17:26:59 +04:00
|
|
|
|
2014-10-22 03:20:09 +04:00
|
|
|
HighlighterAndId create_line_option_highlighter(HighlighterParameters params)
|
2014-06-18 23:50:39 +04:00
|
|
|
{
|
|
|
|
if (params.size() != 2)
|
|
|
|
throw runtime_error("wrong parameter count");
|
|
|
|
|
2014-07-13 19:52:51 +04:00
|
|
|
String facespec = params[1];
|
2014-06-18 23:50:39 +04:00
|
|
|
String option_name = params[0];
|
|
|
|
|
2014-10-22 03:20:09 +04:00
|
|
|
get_face(facespec); // validate facespec
|
2014-10-30 17:00:42 +03:00
|
|
|
GlobalScope::instance().options()[option_name].get<int>(); // verify option type now
|
2014-10-22 03:20:09 +04:00
|
|
|
|
|
|
|
auto func = [=](const Context& context, HighlightFlags flags,
|
2014-12-02 22:56:17 +03:00
|
|
|
DisplayBuffer& display_buffer, BufferRange)
|
2014-06-18 23:50:39 +04:00
|
|
|
{
|
|
|
|
int line = context.options()[option_name].get<int>();
|
|
|
|
highlight_range(display_buffer, {line-1, 0}, {line, 0}, false,
|
2014-07-13 19:52:51 +04:00
|
|
|
apply_face(get_face(facespec)));
|
2014-06-18 23:50:39 +04:00
|
|
|
};
|
|
|
|
|
2014-10-22 03:20:09 +04:00
|
|
|
return {"hlline_" + params[0], make_simple_highlighter(std::move(func))};
|
2014-06-18 23:50:39 +04:00
|
|
|
}
|
|
|
|
|
2014-12-02 22:56:17 +03:00
|
|
|
void expand_tabulations(const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer, BufferRange)
|
2011-10-12 22:52:22 +04:00
|
|
|
{
|
2013-12-17 03:24:08 +04:00
|
|
|
const int tabstop = context.options()["tabstop"].get<int>();
|
|
|
|
auto& buffer = context.buffer();
|
2012-07-13 01:19:10 +04:00
|
|
|
for (auto& line : display_buffer.lines())
|
2011-10-12 22:52:22 +04:00
|
|
|
{
|
2012-07-13 01:19:10 +04:00
|
|
|
for (auto atom_it = line.begin(); atom_it != line.end(); ++atom_it)
|
2011-10-12 22:52:22 +04:00
|
|
|
{
|
2013-07-24 16:55:57 +04:00
|
|
|
if (atom_it->type() != DisplayAtom::BufferRange)
|
2012-07-13 01:19:10 +04:00
|
|
|
continue;
|
2011-10-17 23:01:36 +04:00
|
|
|
|
2013-07-24 16:55:57 +04:00
|
|
|
auto begin = buffer.iterator_at(atom_it->begin());
|
|
|
|
auto end = buffer.iterator_at(atom_it->end());
|
2012-07-13 01:19:10 +04:00
|
|
|
for (BufferIterator it = begin; it != end; ++it)
|
|
|
|
{
|
|
|
|
if (*it == '\t')
|
2011-10-15 08:45:49 +04:00
|
|
|
{
|
2012-07-13 01:19:10 +04:00
|
|
|
if (it != begin)
|
2013-05-23 15:59:33 +04:00
|
|
|
atom_it = ++line.split(atom_it, it.coord());
|
2012-07-13 01:19:10 +04:00
|
|
|
if (it+1 != end)
|
2013-05-23 15:59:33 +04:00
|
|
|
atom_it = line.split(atom_it, (it+1).coord());
|
2012-07-13 01:19:10 +04:00
|
|
|
|
2014-05-09 16:50:12 +04:00
|
|
|
int column = (int)get_column(buffer, tabstop, it.coord());
|
2012-07-13 01:19:10 +04:00
|
|
|
int count = tabstop - (column % tabstop);
|
|
|
|
String padding;
|
|
|
|
for (int i = 0; i < count; ++i)
|
|
|
|
padding += ' ';
|
2013-07-24 16:55:57 +04:00
|
|
|
atom_it->replace(padding);
|
2012-07-13 01:19:10 +04:00
|
|
|
break;
|
2011-10-15 08:45:49 +04:00
|
|
|
}
|
2011-10-12 22:52:22 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-02 22:56:17 +03:00
|
|
|
void show_whitespaces(const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer, BufferRange)
|
2014-05-09 16:50:12 +04:00
|
|
|
{
|
|
|
|
const int tabstop = context.options()["tabstop"].get<int>();
|
|
|
|
auto& buffer = context.buffer();
|
|
|
|
for (auto& line : display_buffer.lines())
|
|
|
|
{
|
|
|
|
for (auto atom_it = line.begin(); atom_it != line.end(); ++atom_it)
|
|
|
|
{
|
|
|
|
if (atom_it->type() != DisplayAtom::BufferRange)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
auto begin = buffer.iterator_at(atom_it->begin());
|
|
|
|
auto end = buffer.iterator_at(atom_it->end());
|
|
|
|
for (BufferIterator it = begin; it != end; ++it)
|
|
|
|
{
|
|
|
|
auto c = *it;
|
|
|
|
if (c == '\t' or c == ' ' or c == '\n')
|
|
|
|
{
|
|
|
|
if (it != begin)
|
|
|
|
atom_it = ++line.split(atom_it, it.coord());
|
|
|
|
if (it+1 != end)
|
|
|
|
atom_it = line.split(atom_it, (it+1).coord());
|
|
|
|
|
|
|
|
if (c == '\t')
|
|
|
|
{
|
|
|
|
int column = (int)get_column(buffer, tabstop, it.coord());
|
|
|
|
int count = tabstop - (column % tabstop);
|
|
|
|
String padding = "→";
|
|
|
|
for (int i = 0; i < count-1; ++i)
|
|
|
|
padding += ' ';
|
|
|
|
atom_it->replace(padding);
|
|
|
|
}
|
|
|
|
else if (c == ' ')
|
|
|
|
atom_it->replace("·");
|
|
|
|
else if (c == '\n')
|
|
|
|
atom_it->replace("¬");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-19 03:31:11 +03:00
|
|
|
template<bool relative, bool hl_cursor_line>
|
|
|
|
void show_line_numbers(const Context& context, HighlightFlags flags,
|
|
|
|
DisplayBuffer& display_buffer, BufferRange)
|
2011-10-17 23:01:36 +04:00
|
|
|
{
|
2015-03-19 00:07:57 +03:00
|
|
|
const Face face = get_face("LineNumbers");
|
2015-03-19 03:31:11 +03:00
|
|
|
const Face face_absolute = get_face("LineNumberCursor");
|
2013-12-17 03:24:08 +04:00
|
|
|
LineCount last_line = context.buffer().line_count();
|
2012-02-23 00:43:59 +04:00
|
|
|
int digit_count = 0;
|
2012-08-23 01:33:52 +04:00
|
|
|
for (LineCount c = last_line; c > 0; c /= 10)
|
2012-02-23 00:43:59 +04:00
|
|
|
++digit_count;
|
|
|
|
|
2013-05-24 20:39:03 +04:00
|
|
|
char format[] = "%?d│";
|
2015-03-19 00:07:57 +03:00
|
|
|
format[1] = '0' + digit_count + (relative ? 1 : 0);
|
|
|
|
int main_selection = (int)context.selections().main().cursor().line + 1;
|
2012-07-13 01:19:10 +04:00
|
|
|
for (auto& line : display_buffer.lines())
|
2011-10-17 23:01:36 +04:00
|
|
|
{
|
2015-03-19 03:31:11 +03:00
|
|
|
const int current_line = (int)line.range().first.line + 1;
|
|
|
|
const bool is_cursor_line = main_selection == current_line;
|
|
|
|
const int line_to_format = (relative and not is_cursor_line) ?
|
|
|
|
current_line - main_selection : current_line;
|
2015-02-03 16:44:42 +03:00
|
|
|
char buffer[16];
|
2015-03-19 03:31:11 +03:00
|
|
|
snprintf(buffer, 16, format, line_to_format);
|
|
|
|
DisplayAtom atom{buffer};
|
|
|
|
atom.face = (hl_cursor_line and is_cursor_line) ? face_absolute : face;
|
|
|
|
line.insert(line.begin(), std::move(atom));
|
2011-10-17 23:01:36 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-19 00:07:57 +03:00
|
|
|
HighlighterAndId number_lines_factory(HighlighterParameters params)
|
|
|
|
{
|
2015-03-19 03:31:11 +03:00
|
|
|
static const ParameterDesc param_desc{
|
|
|
|
{ { "relative", { false, "" } },
|
|
|
|
{ "hlcursor", { false, "" } } },
|
|
|
|
ParameterDesc::Flags::None, 0, 0
|
|
|
|
};
|
|
|
|
ParametersParser parser(params, param_desc);
|
|
|
|
|
|
|
|
constexpr struct {
|
|
|
|
StringView name;
|
|
|
|
void (*func)(const Context&, HighlightFlags, DisplayBuffer&, BufferRange);
|
|
|
|
} funcs[] = {
|
|
|
|
{ "number_lines", show_line_numbers<false, false> },
|
|
|
|
{ "number_lines", show_line_numbers<false, true> },
|
|
|
|
{ "number_lines_relative", show_line_numbers<true, false> },
|
|
|
|
{ "number_lines_relative", show_line_numbers<true, true> },
|
|
|
|
};
|
|
|
|
const int index = (parser.get_switch("relative") ? 1 : 0) * 2 +
|
|
|
|
(parser.get_switch("hlcursor") ? 1 : 0);
|
2015-03-19 00:07:57 +03:00
|
|
|
|
2015-03-19 03:31:11 +03:00
|
|
|
return {funcs[index].name.str(), make_simple_highlighter(funcs[index].func)};
|
2015-03-19 00:07:57 +03:00
|
|
|
}
|
|
|
|
|
2014-12-02 22:56:17 +03:00
|
|
|
void show_matching_char(const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer, BufferRange)
|
2014-01-21 01:01:26 +04:00
|
|
|
{
|
2014-07-12 14:19:35 +04:00
|
|
|
const Face face = get_face("MatchingChar");
|
2014-01-21 01:01:26 +04:00
|
|
|
using CodepointPair = std::pair<Codepoint, Codepoint>;
|
2014-04-03 01:52:00 +04:00
|
|
|
static const CodepointPair matching_chars[] = { { '(', ')' }, { '{', '}' }, { '[', ']' }, { '<', '>' } };
|
2014-01-21 01:01:26 +04:00
|
|
|
const auto range = display_buffer.range();
|
|
|
|
const auto& buffer = context.buffer();
|
|
|
|
for (auto& sel : context.selections())
|
|
|
|
{
|
2014-01-28 23:05:49 +04:00
|
|
|
auto pos = sel.cursor();
|
2014-01-21 01:01:26 +04:00
|
|
|
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,
|
2014-07-11 03:27:04 +04:00
|
|
|
apply_face(face));
|
2014-01-21 01:01:26 +04:00
|
|
|
break;
|
|
|
|
}
|
2014-06-28 00:09:44 +04:00
|
|
|
else if (c == pair.second and pos > range.first)
|
2014-01-21 01:01:26 +04:00
|
|
|
{
|
|
|
|
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;
|
|
|
|
});
|
2014-05-13 22:45:32 +04:00
|
|
|
if (it != end or (*end == pair.first and level == 1))
|
2014-01-21 01:01:26 +04:00
|
|
|
highlight_range(display_buffer, it.coord(), (it+1).coord(), false,
|
2014-07-11 03:27:04 +04:00
|
|
|
apply_face(face));
|
2014-01-21 01:01:26 +04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-02 22:56:17 +03:00
|
|
|
void highlight_selections(const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer, BufferRange)
|
2012-04-03 17:22:07 +04:00
|
|
|
{
|
2014-01-18 05:56:51 +04:00
|
|
|
if (flags != HighlightFlags::Highlight)
|
|
|
|
return;
|
2013-12-17 03:24:08 +04:00
|
|
|
const auto& buffer = context.buffer();
|
|
|
|
for (size_t i = 0; i < context.selections().size(); ++i)
|
2012-04-03 17:22:07 +04:00
|
|
|
{
|
2013-12-17 03:24:08 +04:00
|
|
|
auto& sel = context.selections()[i];
|
2014-01-28 23:05:49 +04:00
|
|
|
const bool forward = sel.anchor() <= sel.cursor();
|
2014-05-07 22:51:01 +04:00
|
|
|
ByteCoord begin = forward ? sel.anchor() : buffer.char_next(sel.cursor());
|
2014-09-09 22:35:54 +04:00
|
|
|
ByteCoord end = forward ? (ByteCoord)sel.cursor() : buffer.char_next(sel.anchor());
|
2013-03-01 22:21:06 +04:00
|
|
|
|
2013-12-17 03:24:08 +04:00
|
|
|
const bool primary = (i == context.selections().main_index());
|
2014-07-11 03:27:04 +04:00
|
|
|
Face sel_face = get_face(primary ? "PrimarySelection" : "SecondarySelection");
|
2013-12-15 18:57:55 +04:00
|
|
|
highlight_range(display_buffer, begin, end, false,
|
2014-07-11 03:27:04 +04:00
|
|
|
apply_face(sel_face));
|
2014-06-16 03:59:05 +04:00
|
|
|
}
|
|
|
|
for (size_t i = 0; i < context.selections().size(); ++i)
|
|
|
|
{
|
|
|
|
auto& sel = context.selections()[i];
|
|
|
|
const bool primary = (i == context.selections().main_index());
|
2014-07-11 03:27:04 +04:00
|
|
|
Face cur_face = get_face(primary ? "PrimaryCursor" : "SecondaryCursor");
|
2014-01-28 23:05:49 +04:00
|
|
|
highlight_range(display_buffer, sel.cursor(), buffer.char_next(sel.cursor()), false,
|
2014-07-11 03:27:04 +04:00
|
|
|
apply_face(cur_face));
|
2012-04-03 17:22:07 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-02 22:56:17 +03:00
|
|
|
void expand_unprintable(const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer, BufferRange)
|
2013-02-26 17:12:21 +04:00
|
|
|
{
|
2013-12-17 03:24:08 +04:00
|
|
|
auto& buffer = context.buffer();
|
2013-02-26 17:12:21 +04:00
|
|
|
for (auto& line : display_buffer.lines())
|
|
|
|
{
|
2013-03-19 02:35:23 +04:00
|
|
|
for (auto atom_it = line.begin(); atom_it != line.end(); ++atom_it)
|
2013-02-26 17:12:21 +04:00
|
|
|
{
|
2013-07-24 16:55:57 +04:00
|
|
|
if (atom_it->type() == DisplayAtom::BufferRange)
|
2013-02-26 17:12:21 +04:00
|
|
|
{
|
2014-05-21 03:24:58 +04:00
|
|
|
for (auto it = buffer.iterator_at(atom_it->begin()),
|
|
|
|
end = buffer.iterator_at(atom_it->end()); it < end;)
|
2013-02-26 17:12:21 +04:00
|
|
|
{
|
2014-07-03 00:14:01 +04:00
|
|
|
Codepoint cp = utf8::codepoint<utf8::InvalidPolicy::Pass>(it, end);
|
|
|
|
auto next = utf8::next(it, end);
|
2014-01-05 19:14:58 +04:00
|
|
|
if (cp != '\n' and not iswprint(cp))
|
2013-02-26 17:12:21 +04:00
|
|
|
{
|
|
|
|
std::ostringstream oss;
|
|
|
|
oss << "U+" << std::hex << cp;
|
2015-03-10 22:33:46 +03:00
|
|
|
const auto& stdstr = oss.str();
|
|
|
|
String str{stdstr.begin(), stdstr.end()};
|
2014-05-21 03:24:58 +04:00
|
|
|
if (it.coord() != atom_it->begin())
|
|
|
|
atom_it = ++line.split(atom_it, it.coord());
|
|
|
|
if (next.coord() < atom_it->end())
|
|
|
|
atom_it = line.split(atom_it, next.coord());
|
2013-07-24 16:55:57 +04:00
|
|
|
atom_it->replace(str);
|
2014-07-11 03:27:04 +04:00
|
|
|
atom_it->face = { Colors::Red, Colors::Black };
|
2013-03-19 02:35:23 +04:00
|
|
|
break;
|
2013-02-26 17:12:21 +04:00
|
|
|
}
|
2014-05-21 03:24:58 +04:00
|
|
|
it = next;
|
2013-02-26 17:12:21 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-10-22 03:20:09 +04:00
|
|
|
HighlighterAndId create_flag_lines_highlighter(HighlighterParameters params)
|
2013-03-06 17:24:47 +04:00
|
|
|
{
|
|
|
|
if (params.size() != 2)
|
|
|
|
throw runtime_error("wrong parameter count");
|
|
|
|
|
2013-11-19 02:44:01 +04:00
|
|
|
const String& option_name = params[1];
|
|
|
|
Color bg = str_to_color(params[0]);
|
|
|
|
|
|
|
|
// throw if wrong option type
|
2015-01-12 22:35:31 +03:00
|
|
|
GlobalScope::instance().options()[option_name].get<Vector<LineAndFlag, MemoryDomain::Options>>();
|
2013-11-19 02:44:01 +04:00
|
|
|
|
2014-10-22 03:20:09 +04:00
|
|
|
auto func = [=](const Context& context, HighlightFlags flags,
|
2014-12-02 22:56:17 +03:00
|
|
|
DisplayBuffer& display_buffer, BufferRange)
|
2011-11-08 18:28:01 +04:00
|
|
|
{
|
2014-10-22 03:20:09 +04:00
|
|
|
auto& lines_opt = context.options()[option_name];
|
2015-01-12 22:35:31 +03:00
|
|
|
auto& lines = lines_opt.get<Vector<LineAndFlag, MemoryDomain::Options>>();
|
2014-10-22 03:20:09 +04:00
|
|
|
|
|
|
|
CharCount width = 0;
|
|
|
|
for (auto& l : lines)
|
|
|
|
width = std::max(width, std::get<2>(l).char_length());
|
|
|
|
const String empty{' ', width};
|
|
|
|
for (auto& line : display_buffer.lines())
|
|
|
|
{
|
|
|
|
int line_num = (int)line.range().first.line + 1;
|
|
|
|
auto it = find_if(lines,
|
|
|
|
[&](const LineAndFlag& l)
|
|
|
|
{ return std::get<0>(l) == line_num; });
|
|
|
|
String content = it != lines.end() ? std::get<2>(*it) : empty;
|
|
|
|
content += String(' ', width - content.char_length());
|
|
|
|
DisplayAtom atom{std::move(content)};
|
|
|
|
atom.face = { it != lines.end() ? std::get<1>(*it) : Colors::Default , bg };
|
|
|
|
line.insert(line.begin(), std::move(atom));
|
|
|
|
}
|
|
|
|
};
|
2011-11-08 18:28:01 +04:00
|
|
|
|
2014-10-22 03:20:09 +04:00
|
|
|
return {"hlflags_" + params[1], make_simple_highlighter(func) };
|
|
|
|
}
|
|
|
|
|
|
|
|
HighlighterAndId create_highlighter_group(HighlighterParameters params)
|
2012-01-15 17:45:18 +04:00
|
|
|
{
|
|
|
|
if (params.size() != 1)
|
|
|
|
throw runtime_error("wrong parameter count");
|
|
|
|
|
2014-10-22 03:20:09 +04:00
|
|
|
return HighlighterAndId(params[0], make_unique<HighlighterGroup>());
|
2012-01-15 17:45:18 +04:00
|
|
|
}
|
|
|
|
|
2014-10-22 03:20:09 +04:00
|
|
|
HighlighterAndId create_reference_highlighter(HighlighterParameters params)
|
2013-12-04 02:03:10 +04:00
|
|
|
{
|
|
|
|
if (params.size() != 1)
|
|
|
|
throw runtime_error("wrong parameter count");
|
|
|
|
|
|
|
|
const String& name = params[0];
|
|
|
|
|
|
|
|
// throw if not found
|
2014-06-11 01:02:08 +04:00
|
|
|
//DefinedHighlighters::instance().get_group(name, '/');
|
2013-12-04 02:03:10 +04:00
|
|
|
|
2014-10-22 03:20:09 +04:00
|
|
|
auto func = [=](const Context& context, HighlightFlags flags,
|
2014-12-02 22:56:17 +03:00
|
|
|
DisplayBuffer& display_buffer, BufferRange range)
|
2014-10-22 03:20:09 +04:00
|
|
|
{
|
|
|
|
try
|
|
|
|
{
|
2014-12-02 22:56:17 +03:00
|
|
|
DefinedHighlighters::instance().get_child(name).highlight(context, flags, display_buffer, range);
|
2014-10-22 03:20:09 +04:00
|
|
|
}
|
|
|
|
catch (child_not_found&)
|
|
|
|
{}
|
|
|
|
};
|
|
|
|
|
|
|
|
return {name, make_simple_highlighter(func)};
|
2013-12-04 02:03:10 +04:00
|
|
|
}
|
|
|
|
|
2014-07-15 00:42:19 +04:00
|
|
|
struct RegexMatch
|
2014-06-12 00:26:01 +04:00
|
|
|
{
|
|
|
|
LineCount line;
|
|
|
|
ByteCount begin;
|
|
|
|
ByteCount end;
|
|
|
|
|
|
|
|
ByteCoord begin_coord() const { return { line, begin }; }
|
|
|
|
ByteCoord end_coord() const { return { line, end }; }
|
|
|
|
};
|
2015-01-12 16:24:30 +03:00
|
|
|
using RegexMatchList = Vector<RegexMatch, MemoryDomain::Highlight>;
|
2014-06-12 00:26:01 +04:00
|
|
|
|
2014-07-15 00:42:19 +04:00
|
|
|
void find_matches(const Buffer& buffer, RegexMatchList& matches, const Regex& regex)
|
2014-06-12 00:26:01 +04:00
|
|
|
{
|
|
|
|
for (auto line = 0_line, end = buffer.line_count(); line < end; ++line)
|
|
|
|
{
|
2014-10-03 16:39:13 +04:00
|
|
|
auto l = buffer[line];
|
2014-10-13 16:12:33 +04:00
|
|
|
for (RegexIterator<const char*> it{l.begin(), l.end(), regex}, end{}; it != end; ++it)
|
2014-06-12 00:26:01 +04:00
|
|
|
{
|
|
|
|
ByteCount b = (int)((*it)[0].first - l.begin());
|
|
|
|
ByteCount e = (int)((*it)[0].second - l.begin());
|
2015-02-17 16:56:26 +03:00
|
|
|
matches.push_back({ line, b, e });
|
2014-06-12 00:26:01 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-09 16:48:41 +03:00
|
|
|
void update_matches(const Buffer& buffer, ConstArrayView<LineModification> modifs,
|
2014-07-15 00:42:19 +04:00
|
|
|
RegexMatchList& matches, const Regex& regex)
|
2014-06-12 00:26:01 +04:00
|
|
|
{
|
|
|
|
// remove out of date matches and update line for others
|
|
|
|
auto ins_pos = matches.begin();
|
|
|
|
for (auto it = ins_pos; it != matches.end(); ++it)
|
|
|
|
{
|
2015-02-02 02:19:07 +03:00
|
|
|
auto modif_it = std::upper_bound(modifs.begin(), modifs.end(), it->line,
|
|
|
|
[](const LineCount& l, const LineModification& c)
|
|
|
|
{ return l < c.old_line; });
|
2014-06-12 00:26:01 +04:00
|
|
|
|
2015-02-02 02:19:07 +03:00
|
|
|
if (modif_it != modifs.begin())
|
2014-06-12 00:26:01 +04:00
|
|
|
{
|
|
|
|
auto& prev = *(modif_it-1);
|
2015-02-02 02:30:58 +03:00
|
|
|
if (it->line < prev.old_line + prev.num_removed)
|
|
|
|
continue; // match removed
|
|
|
|
|
2014-06-12 00:26:01 +04:00
|
|
|
it->line += prev.diff();
|
|
|
|
}
|
|
|
|
|
2015-02-02 02:30:58 +03:00
|
|
|
kak_assert(buffer.is_valid(it->begin_coord()) or
|
|
|
|
buffer[it->line].length() == it->begin);
|
|
|
|
kak_assert(buffer.is_valid(it->end_coord()) or
|
|
|
|
buffer[it->line].length() == it->end);
|
|
|
|
|
|
|
|
if (ins_pos != it)
|
|
|
|
*ins_pos = std::move(*it);
|
|
|
|
++ins_pos;
|
2014-06-12 00:26:01 +04:00
|
|
|
}
|
|
|
|
matches.erase(ins_pos, matches.end());
|
|
|
|
size_t pivot = matches.size();
|
|
|
|
|
|
|
|
// try to find new matches in each updated lines
|
|
|
|
for (auto& modif : modifs)
|
|
|
|
{
|
2015-02-02 02:19:07 +03:00
|
|
|
for (auto line = modif.new_line; line < modif.new_line + modif.num_added; ++line)
|
2014-06-12 00:26:01 +04:00
|
|
|
{
|
2014-10-03 16:39:13 +04:00
|
|
|
auto l = buffer[line];
|
2014-10-13 16:12:33 +04:00
|
|
|
for (RegexIterator<const char*> it{l.begin(), l.end(), regex}, end{}; it != end; ++it)
|
2014-06-12 00:26:01 +04:00
|
|
|
{
|
|
|
|
ByteCount b = (int)((*it)[0].first - l.begin());
|
|
|
|
ByteCount e = (int)((*it)[0].second - l.begin());
|
2015-02-17 16:56:26 +03:00
|
|
|
matches.push_back({ line, b, e });
|
2014-06-12 00:26:01 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
std::inplace_merge(matches.begin(), matches.begin() + pivot, matches.end(),
|
2014-07-15 00:42:19 +04:00
|
|
|
[](const RegexMatch& lhs, const RegexMatch& rhs) {
|
2014-06-12 00:26:01 +04:00
|
|
|
return lhs.begin_coord() < rhs.begin_coord();
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
struct RegionMatches
|
|
|
|
{
|
2014-07-15 00:42:19 +04:00
|
|
|
RegexMatchList begin_matches;
|
|
|
|
RegexMatchList end_matches;
|
|
|
|
RegexMatchList recurse_matches;
|
2014-06-12 00:26:01 +04:00
|
|
|
|
2014-07-15 00:42:19 +04:00
|
|
|
static bool compare_to_begin(const RegexMatch& lhs, ByteCoord rhs)
|
2014-06-12 00:26:01 +04:00
|
|
|
{
|
2014-06-16 22:41:07 +04:00
|
|
|
return lhs.begin_coord() < rhs;
|
2014-06-12 00:26:01 +04:00
|
|
|
}
|
|
|
|
|
2014-07-15 00:42:19 +04:00
|
|
|
RegexMatchList::const_iterator find_next_begin(ByteCoord pos) const
|
2014-06-12 00:26:01 +04:00
|
|
|
{
|
2014-06-16 22:41:07 +04:00
|
|
|
return std::lower_bound(begin_matches.begin(), begin_matches.end(),
|
|
|
|
pos, compare_to_begin);
|
2014-06-12 00:26:01 +04:00
|
|
|
}
|
|
|
|
|
2014-07-15 00:42:19 +04:00
|
|
|
RegexMatchList::const_iterator find_matching_end(ByteCoord beg_pos) const
|
2014-06-12 00:26:01 +04:00
|
|
|
{
|
|
|
|
auto end_it = end_matches.begin();
|
|
|
|
auto rec_it = recurse_matches.begin();
|
|
|
|
int recurse_level = 0;
|
|
|
|
while (true)
|
|
|
|
{
|
2014-06-16 22:41:07 +04:00
|
|
|
end_it = std::lower_bound(end_it, end_matches.end(),
|
|
|
|
beg_pos, compare_to_begin);
|
|
|
|
rec_it = std::lower_bound(rec_it, recurse_matches.end(),
|
|
|
|
beg_pos, compare_to_begin);
|
2014-06-12 00:26:01 +04:00
|
|
|
|
|
|
|
if (end_it == end_matches.end())
|
|
|
|
return end_it;
|
|
|
|
|
|
|
|
while (rec_it != recurse_matches.end() and
|
2015-02-02 16:48:27 +03:00
|
|
|
rec_it->end_coord() <= end_it->begin_coord())
|
2014-06-12 00:26:01 +04:00
|
|
|
{
|
|
|
|
++recurse_level;
|
|
|
|
++rec_it;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (recurse_level == 0)
|
|
|
|
return end_it;
|
|
|
|
|
|
|
|
--recurse_level;
|
2014-06-16 22:41:07 +04:00
|
|
|
beg_pos = end_it->end_coord();
|
2014-06-12 00:26:01 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
struct RegionDesc
|
|
|
|
{
|
|
|
|
Regex m_begin;
|
|
|
|
Regex m_end;
|
|
|
|
Regex m_recurse;
|
|
|
|
|
|
|
|
RegionMatches find_matches(const Buffer& buffer) const
|
|
|
|
{
|
|
|
|
RegionMatches res;
|
2014-07-15 00:42:19 +04:00
|
|
|
Kakoune::find_matches(buffer, res.begin_matches, m_begin);
|
|
|
|
Kakoune::find_matches(buffer, res.end_matches, m_end);
|
2014-06-12 00:26:01 +04:00
|
|
|
if (not m_recurse.empty())
|
2014-07-15 00:42:19 +04:00
|
|
|
Kakoune::find_matches(buffer, res.recurse_matches, m_recurse);
|
2014-06-12 00:26:01 +04:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
void update_matches(const Buffer& buffer,
|
2015-03-09 16:48:41 +03:00
|
|
|
ConstArrayView<LineModification> modifs,
|
2014-06-12 00:26:01 +04:00
|
|
|
RegionMatches& matches) const
|
|
|
|
{
|
2014-07-15 00:42:19 +04:00
|
|
|
Kakoune::update_matches(buffer, modifs, matches.begin_matches, m_begin);
|
|
|
|
Kakoune::update_matches(buffer, modifs, matches.end_matches, m_end);
|
2014-06-12 00:26:01 +04:00
|
|
|
if (not m_recurse.empty())
|
2014-07-15 00:42:19 +04:00
|
|
|
Kakoune::update_matches(buffer, modifs, matches.recurse_matches, m_recurse);
|
2014-01-07 01:04:55 +04:00
|
|
|
}
|
2013-12-04 04:48:46 +04:00
|
|
|
};
|
|
|
|
|
2014-10-22 03:20:09 +04:00
|
|
|
struct RegionsHighlighter : public Highlighter
|
2014-06-12 02:29:23 +04:00
|
|
|
{
|
|
|
|
public:
|
2015-01-12 16:24:30 +03:00
|
|
|
using NamedRegionDescList = Vector<std::pair<String, RegionDesc>, MemoryDomain::Highlight>;
|
2014-06-12 02:29:23 +04:00
|
|
|
|
2014-07-15 00:42:19 +04:00
|
|
|
RegionsHighlighter(NamedRegionDescList regions, String default_group)
|
2014-06-12 02:29:23 +04:00
|
|
|
: m_regions{std::move(regions)}, m_default_group{std::move(default_group)}
|
|
|
|
{
|
|
|
|
if (m_regions.empty())
|
|
|
|
throw runtime_error("at least one region must be defined");
|
|
|
|
|
|
|
|
for (auto& region : m_regions)
|
2014-10-22 03:20:09 +04:00
|
|
|
{
|
|
|
|
m_groups.append({region.first, HighlighterGroup{}});
|
2014-06-12 02:29:23 +04:00
|
|
|
if (region.second.m_begin.empty() or region.second.m_end.empty())
|
|
|
|
throw runtime_error("invalid regex for region highlighter");
|
2014-10-22 03:20:09 +04:00
|
|
|
}
|
|
|
|
if (not m_default_group.empty())
|
|
|
|
m_groups.append({m_default_group, HighlighterGroup{}});
|
2014-06-12 02:29:23 +04:00
|
|
|
}
|
|
|
|
|
2014-12-02 22:56:17 +03:00
|
|
|
void highlight(const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer, BufferRange range)
|
2014-06-12 02:29:23 +04:00
|
|
|
{
|
|
|
|
if (flags != HighlightFlags::Highlight)
|
|
|
|
return;
|
|
|
|
|
2014-12-02 22:56:17 +03:00
|
|
|
auto display_range = display_buffer.range();
|
2014-06-12 02:29:23 +04:00
|
|
|
const auto& buffer = context.buffer();
|
2014-12-02 22:56:17 +03:00
|
|
|
auto& regions = get_regions_for_range(buffer, range);
|
2014-06-12 02:29:23 +04:00
|
|
|
|
2014-12-02 22:56:17 +03:00
|
|
|
auto begin = std::lower_bound(regions.begin(), regions.end(), display_range.first,
|
2014-06-12 02:29:23 +04:00
|
|
|
[](const Region& r, ByteCoord c) { return r.end < c; });
|
2014-12-02 22:56:17 +03:00
|
|
|
auto end = std::lower_bound(begin, regions.end(), display_range.second,
|
2014-06-12 02:29:23 +04:00
|
|
|
[](const Region& r, ByteCoord c) { return r.begin < c; });
|
|
|
|
auto correct = [&](ByteCoord c) -> ByteCoord {
|
|
|
|
if (buffer[c.line].length() == c.column)
|
|
|
|
return {c.line+1, 0};
|
|
|
|
return c;
|
|
|
|
};
|
|
|
|
|
2014-10-22 03:20:09 +04:00
|
|
|
auto default_group_it = m_groups.find(m_default_group);
|
|
|
|
const bool apply_default = default_group_it != m_groups.end();
|
2014-06-12 02:29:23 +04:00
|
|
|
|
2015-02-16 16:25:17 +03:00
|
|
|
auto last_begin = (begin == regions.begin()) ?
|
|
|
|
ByteCoord{0,0} : (begin-1)->end;
|
2014-06-12 02:29:23 +04:00
|
|
|
for (; begin != end; ++begin)
|
|
|
|
{
|
|
|
|
if (apply_default and last_begin < begin->begin)
|
|
|
|
apply_highlighter(context, flags, display_buffer,
|
|
|
|
correct(last_begin), correct(begin->begin),
|
|
|
|
default_group_it->second);
|
|
|
|
|
2014-10-22 03:20:09 +04:00
|
|
|
auto it = m_groups.find(begin->group);
|
|
|
|
if (it == m_groups.end())
|
2014-06-12 02:29:23 +04:00
|
|
|
continue;
|
|
|
|
apply_highlighter(context, flags, display_buffer,
|
|
|
|
correct(begin->begin), correct(begin->end),
|
|
|
|
it->second);
|
|
|
|
last_begin = begin->end;
|
|
|
|
}
|
2014-12-02 22:56:17 +03:00
|
|
|
if (apply_default and last_begin < display_range.second)
|
2014-06-12 02:29:23 +04:00
|
|
|
apply_highlighter(context, flags, display_buffer,
|
|
|
|
correct(last_begin), range.second,
|
|
|
|
default_group_it->second);
|
|
|
|
|
|
|
|
}
|
2014-10-22 03:20:09 +04:00
|
|
|
|
|
|
|
bool has_children() const override { return true; }
|
|
|
|
|
|
|
|
Highlighter& get_child(StringView path) override
|
|
|
|
{
|
|
|
|
auto sep_it = find(path, '/');
|
|
|
|
StringView id(path.begin(), sep_it);
|
|
|
|
auto it = m_groups.find(id);
|
|
|
|
if (it == m_groups.end())
|
|
|
|
throw child_not_found("no such id: "_str + id);
|
|
|
|
if (sep_it == path.end())
|
|
|
|
return it->second;
|
|
|
|
else
|
|
|
|
return it->second.get_child({sep_it+1, path.end()});
|
|
|
|
}
|
|
|
|
|
|
|
|
Completions complete_child(StringView path, ByteCount cursor_pos, bool group) const override
|
|
|
|
{
|
|
|
|
auto sep_it = find(path, '/');
|
|
|
|
if (sep_it != path.end())
|
|
|
|
{
|
|
|
|
ByteCount offset = sep_it+1 - path.begin();
|
|
|
|
Highlighter& hl = const_cast<RegionsHighlighter*>(this)->get_child({path.begin(), sep_it});
|
|
|
|
return offset_pos(hl.complete_child(path.substr(offset), cursor_pos - offset, group), offset);
|
|
|
|
}
|
|
|
|
|
2014-12-24 01:51:00 +03:00
|
|
|
auto container = transformed(m_groups, IdMap<HighlighterGroup>::get_id);
|
2014-12-23 16:54:09 +03:00
|
|
|
return { 0, 0, complete(path, cursor_pos, container) };
|
2014-10-22 03:20:09 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static HighlighterAndId create(HighlighterParameters params)
|
|
|
|
{
|
|
|
|
try
|
|
|
|
{
|
|
|
|
static const ParameterDesc param_desc{
|
2015-03-14 20:30:34 +03:00
|
|
|
{ { "default", { true, "" } } },
|
|
|
|
ParameterDesc::Flags::SwitchesOnlyAtStart, 5
|
|
|
|
};
|
2014-10-22 03:20:09 +04:00
|
|
|
|
|
|
|
ParametersParser parser{params, param_desc};
|
|
|
|
if ((parser.positional_count() % 4) != 1)
|
|
|
|
throw runtime_error("wrong parameter count, expect <id> (<group name> <begin> <end> <recurse>)+");
|
|
|
|
|
|
|
|
RegionsHighlighter::NamedRegionDescList regions;
|
|
|
|
for (size_t i = 1; i < parser.positional_count(); i += 4)
|
|
|
|
{
|
|
|
|
if (parser[i].empty() or parser[i+1].empty() or parser[i+2].empty())
|
|
|
|
throw runtime_error("group id, begin and end must not be empty");
|
|
|
|
|
|
|
|
Regex begin{parser[i+1], Regex::nosubs | Regex::optimize };
|
|
|
|
Regex end{parser[i+2], Regex::nosubs | Regex::optimize };
|
|
|
|
Regex recurse;
|
|
|
|
if (not parser[i+3].empty())
|
|
|
|
recurse = Regex{parser[i+3], Regex::nosubs | Regex::optimize };
|
|
|
|
|
|
|
|
regions.push_back({ parser[i], {std::move(begin), std::move(end), std::move(recurse)} });
|
|
|
|
}
|
|
|
|
|
2015-03-14 22:16:46 +03:00
|
|
|
auto default_group = parser.get_switch("default").value_or(StringView{}).str();
|
|
|
|
return {parser[0], make_unique<RegionsHighlighter>(std::move(regions), default_group)};
|
2014-10-22 03:20:09 +04:00
|
|
|
}
|
|
|
|
catch (RegexError& err)
|
|
|
|
{
|
|
|
|
throw runtime_error(String("regex error: ") + err.what());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-06-12 02:29:23 +04:00
|
|
|
private:
|
|
|
|
const NamedRegionDescList m_regions;
|
|
|
|
const String m_default_group;
|
2015-01-12 16:24:30 +03:00
|
|
|
IdMap<HighlighterGroup, MemoryDomain::Highlight> m_groups;
|
2014-06-12 02:29:23 +04:00
|
|
|
|
|
|
|
struct Region
|
|
|
|
{
|
|
|
|
ByteCoord begin;
|
|
|
|
ByteCoord end;
|
|
|
|
StringView group;
|
|
|
|
};
|
2015-01-12 16:24:30 +03:00
|
|
|
using RegionList = Vector<Region, MemoryDomain::Highlight>;
|
2014-06-12 02:29:23 +04:00
|
|
|
|
|
|
|
struct Cache
|
|
|
|
{
|
|
|
|
size_t timestamp = 0;
|
2015-01-12 16:24:30 +03:00
|
|
|
Vector<RegionMatches, MemoryDomain::Highlight> matches;
|
|
|
|
UnorderedMap<BufferRange, RegionList, MemoryDomain::Highlight> regions;
|
2014-06-12 02:29:23 +04:00
|
|
|
};
|
|
|
|
BufferSideCache<Cache> m_cache;
|
|
|
|
|
2014-07-15 00:42:19 +04:00
|
|
|
using RegionAndMatch = std::pair<size_t, RegexMatchList::const_iterator>;
|
2014-06-12 02:29:23 +04:00
|
|
|
|
|
|
|
// find the begin closest to pos in all matches
|
|
|
|
RegionAndMatch find_next_begin(const Cache& cache, ByteCoord pos) const
|
|
|
|
{
|
|
|
|
RegionAndMatch res{0, cache.matches[0].find_next_begin(pos)};
|
|
|
|
for (size_t i = 1; i < cache.matches.size(); ++i)
|
|
|
|
{
|
|
|
|
const auto& matches = cache.matches[i];
|
|
|
|
auto it = matches.find_next_begin(pos);
|
|
|
|
if (it != matches.begin_matches.end() and
|
|
|
|
(res.second == cache.matches[res.first].begin_matches.end() or
|
|
|
|
it->begin_coord() < res.second->begin_coord()))
|
|
|
|
res = RegionAndMatch{i, it};
|
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2014-12-02 22:56:17 +03:00
|
|
|
const RegionList& get_regions_for_range(const Buffer& buffer, BufferRange range)
|
2014-06-12 02:29:23 +04:00
|
|
|
{
|
|
|
|
Cache& cache = m_cache.get(buffer);
|
|
|
|
const size_t buf_timestamp = buffer.timestamp();
|
2014-12-02 22:56:17 +03:00
|
|
|
if (cache.timestamp != buf_timestamp)
|
2014-06-12 02:29:23 +04:00
|
|
|
{
|
2014-12-02 22:56:17 +03:00
|
|
|
if (cache.timestamp == 0)
|
|
|
|
{
|
|
|
|
cache.matches.resize(m_regions.size());
|
|
|
|
for (size_t i = 0; i < m_regions.size(); ++i)
|
|
|
|
cache.matches[i] = m_regions[i].second.find_matches(buffer);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
auto modifs = compute_line_modifications(buffer, cache.timestamp);
|
|
|
|
for (size_t i = 0; i < m_regions.size(); ++i)
|
|
|
|
m_regions[i].second.update_matches(buffer, modifs, cache.matches[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
cache.regions.clear();
|
2014-06-12 02:29:23 +04:00
|
|
|
}
|
|
|
|
|
2014-12-02 22:56:17 +03:00
|
|
|
auto it = cache.regions.find(range);
|
|
|
|
if (it != cache.regions.end())
|
|
|
|
return it->second;
|
|
|
|
|
|
|
|
RegionList& regions = cache.regions[range];
|
2014-06-12 02:29:23 +04:00
|
|
|
|
2014-12-02 22:56:17 +03:00
|
|
|
for (auto begin = find_next_begin(cache, range.first),
|
2014-06-12 02:29:23 +04:00
|
|
|
end = RegionAndMatch{ 0, cache.matches[0].begin_matches.end() };
|
|
|
|
begin != end; )
|
|
|
|
{
|
|
|
|
const RegionMatches& matches = cache.matches[begin.first];
|
|
|
|
auto& named_region = m_regions[begin.first];
|
|
|
|
auto beg_it = begin.second;
|
2014-06-16 22:41:07 +04:00
|
|
|
auto end_it = matches.find_matching_end(beg_it->end_coord());
|
2014-06-12 02:29:23 +04:00
|
|
|
|
2014-12-02 22:56:17 +03:00
|
|
|
if (end_it == matches.end_matches.end() or end_it->end_coord() >= range.second)
|
2014-06-12 02:29:23 +04:00
|
|
|
{
|
2014-12-02 22:56:17 +03:00
|
|
|
regions.push_back({ {beg_it->line, beg_it->begin},
|
|
|
|
range.second,
|
|
|
|
named_region.first });
|
2014-06-12 02:29:23 +04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2014-12-02 22:56:17 +03:00
|
|
|
regions.push_back({ beg_it->begin_coord(),
|
|
|
|
end_it->end_coord(),
|
|
|
|
named_region.first });
|
2014-07-14 23:46:46 +04:00
|
|
|
auto end_coord = end_it->end_coord();
|
|
|
|
|
|
|
|
// With empty begin and end matches (for example if the regexes
|
|
|
|
// are /"\K/ and /(?=")/), that case can happen, and would
|
|
|
|
// result in an infinite loop.
|
|
|
|
if (end_coord == beg_it->begin_coord())
|
|
|
|
{
|
|
|
|
kak_assert(beg_it->begin_coord() == beg_it->end_coord() and
|
|
|
|
end_it->begin_coord() == end_it->end_coord());
|
|
|
|
++end_coord.column;
|
|
|
|
}
|
|
|
|
begin = find_next_begin(cache, end_coord);
|
2014-06-12 02:29:23 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
cache.timestamp = buf_timestamp;
|
2014-12-02 22:56:17 +03:00
|
|
|
return regions;
|
2014-06-12 02:29:23 +04:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2014-10-22 03:20:09 +04:00
|
|
|
template<typename Func>
|
|
|
|
HighlighterFactory simple_factory(const String id, Func func)
|
2014-06-12 02:29:23 +04:00
|
|
|
{
|
2014-10-22 03:20:09 +04:00
|
|
|
return [=](HighlighterParameters params)
|
2014-06-12 02:29:23 +04:00
|
|
|
{
|
2014-10-22 03:20:09 +04:00
|
|
|
return HighlighterAndId(id, make_simple_highlighter(func));
|
|
|
|
};
|
2014-06-12 02:29:23 +04:00
|
|
|
}
|
|
|
|
|
2011-11-30 02:37:20 +04:00
|
|
|
void register_highlighters()
|
2011-11-08 18:28:01 +04:00
|
|
|
{
|
2011-11-30 02:37:20 +04:00
|
|
|
HighlighterRegistry& registry = HighlighterRegistry::instance();
|
2011-11-15 18:28:03 +04:00
|
|
|
|
2015-02-19 16:54:03 +03:00
|
|
|
registry.append({
|
|
|
|
"number_lines",
|
2015-03-19 00:07:57 +03:00
|
|
|
{ number_lines_factory,
|
|
|
|
"Display line numbers \n"
|
2015-03-19 03:31:11 +03:00
|
|
|
"Parameters: -relative, -hlcursor\n" } });
|
2015-02-19 16:54:03 +03:00
|
|
|
registry.append({
|
|
|
|
"show_matching",
|
|
|
|
{ simple_factory("show_matching", show_matching_char),
|
|
|
|
"Apply the MatchingChar face to the char matching the one under the cursor" } });
|
|
|
|
registry.append({
|
|
|
|
"show_whitespaces",
|
|
|
|
{ simple_factory("show_whitespaces", show_whitespaces),
|
|
|
|
"Display whitespaces using symbols" } });
|
|
|
|
registry.append({
|
|
|
|
"fill",
|
|
|
|
{ create_fill_highlighter,
|
|
|
|
"Fill the whole highlighted range with the given face" } });
|
|
|
|
registry.append({
|
|
|
|
"regex",
|
|
|
|
{ RegexHighlighter::create,
|
|
|
|
"Parameters: <regex> <capture num>:<face> <capture num>:<face>...\n"
|
|
|
|
"Highlights the matches for captures from the regex with the given faces" } });
|
|
|
|
registry.append({
|
|
|
|
"regex_option",
|
|
|
|
{ create_regex_option_highlighter,
|
|
|
|
"Parameters: <option name> <face>\n"
|
|
|
|
"Highlight matches for the regex stored in <option name> with <face>" } });
|
|
|
|
registry.append({
|
|
|
|
"search",
|
|
|
|
{ create_search_highlighter,
|
|
|
|
"Highlight the current search pattern with the Search face" } });
|
|
|
|
registry.append({
|
|
|
|
"group",
|
|
|
|
{ create_highlighter_group,
|
|
|
|
"Parameters: <group name>\n"
|
|
|
|
"Creates a named group that can contain other highlighters" } });
|
|
|
|
registry.append({
|
|
|
|
"flag_lines",
|
|
|
|
{ create_flag_lines_highlighter,
|
|
|
|
"Parameters: <option name> <bg color>\n"
|
|
|
|
"Display flags specified in the line-flag-list option <option name>\n"
|
|
|
|
"A line-flag is written: <line>|<fg color>|<text>, the list is : separated" } });
|
|
|
|
registry.append({
|
|
|
|
"line_option",
|
|
|
|
{ create_line_option_highlighter,
|
|
|
|
"Parameters: <option name> <face>\n"
|
|
|
|
"Highlight the line stored in <option name> with <face>" } });
|
|
|
|
registry.append({
|
|
|
|
"ref",
|
|
|
|
{ create_reference_highlighter,
|
|
|
|
"Parameters: <path>\n"
|
|
|
|
"Reference the highlighter at <path> in shared highglighters" } });
|
|
|
|
registry.append({
|
|
|
|
"regions",
|
|
|
|
{ RegionsHighlighter::create,
|
|
|
|
"Parameters: [-default <default group>] {<name> <begin> <end> <recurse>}..."
|
|
|
|
"Split the highlighting into regions defined by the <begin>, <end> and <recurse> regex\n"
|
|
|
|
"The region <name> starts at <begin> match, end at <end> match that does not\n"
|
|
|
|
"close a <recurse> match. In between region is the <default group>.\n"
|
|
|
|
"Highlighting a region is done by adding highlighters into the different <name> subgroups." } });
|
2011-11-08 18:28:01 +04:00
|
|
|
}
|
|
|
|
|
2011-09-30 23:16:23 +04:00
|
|
|
}
|