2011-11-29 23:37:20 +01:00
|
|
|
|
#include "highlighters.hh"
|
2013-04-09 19:39:03 +02:00
|
|
|
|
|
2011-11-14 15:23:02 +01:00
|
|
|
|
#include "assert.hh"
|
2014-05-09 14:50:12 +02:00
|
|
|
|
#include "buffer_utils.hh"
|
2017-01-13 14:45:46 +01:00
|
|
|
|
#include "changes.hh"
|
2015-05-04 18:12:51 +02:00
|
|
|
|
#include "command_manager.hh"
|
2017-08-29 10:23:03 +02:00
|
|
|
|
#include "context.hh"
|
2013-12-17 00:24:08 +01:00
|
|
|
|
#include "display_buffer.hh"
|
2014-07-11 01:27:04 +02:00
|
|
|
|
#include "face_registry.hh"
|
|
|
|
|
#include "highlighter_group.hh"
|
2014-05-26 22:01:45 +02:00
|
|
|
|
#include "line_modification.hh"
|
2017-03-16 10:57:39 +01:00
|
|
|
|
#include "option.hh"
|
2018-05-26 02:01:26 +02:00
|
|
|
|
#include "option_types.hh"
|
2014-07-11 01:27:04 +02:00
|
|
|
|
#include "parameters_parser.hh"
|
2017-08-29 10:23:03 +02:00
|
|
|
|
#include "ranges.hh"
|
2016-03-14 10:31:13 +01:00
|
|
|
|
#include "regex.hh"
|
2017-08-29 10:23:03 +02:00
|
|
|
|
#include "register_manager.hh"
|
2012-08-29 21:49:36 +02:00
|
|
|
|
#include "string.hh"
|
2012-10-08 14:27:43 +02:00
|
|
|
|
#include "utf8.hh"
|
2013-02-26 14:12:21 +01:00
|
|
|
|
#include "utf8_iterator.hh"
|
2017-08-29 10:23:03 +02:00
|
|
|
|
#include "window.hh"
|
2013-03-26 00:14:38 +01:00
|
|
|
|
|
2013-02-26 14:12:21 +01:00
|
|
|
|
#include <locale>
|
2015-11-26 23:51:39 +01:00
|
|
|
|
#include <cstdio>
|
2011-11-08 15:28:01 +01:00
|
|
|
|
|
2011-09-30 21:16:23 +02:00
|
|
|
|
namespace Kakoune
|
|
|
|
|
{
|
|
|
|
|
|
2017-05-08 12:29:23 +02:00
|
|
|
|
template<typename Func>
|
|
|
|
|
std::unique_ptr<Highlighter> make_highlighter(Func func, HighlightPass pass = HighlightPass::Colorize)
|
|
|
|
|
{
|
|
|
|
|
struct SimpleHighlighter : public Highlighter
|
|
|
|
|
{
|
|
|
|
|
SimpleHighlighter(Func func, HighlightPass pass)
|
|
|
|
|
: Highlighter{pass}, m_func{std::move(func)} {}
|
|
|
|
|
|
|
|
|
|
private:
|
2017-11-25 05:53:33 +01:00
|
|
|
|
void do_highlight(HighlightContext context, DisplayBuffer& display_buffer, BufferRange range) override
|
2017-05-08 12:29:23 +02:00
|
|
|
|
{
|
2017-11-25 05:53:33 +01:00
|
|
|
|
m_func(context, display_buffer, range);
|
2017-05-08 12:29:23 +02:00
|
|
|
|
}
|
|
|
|
|
Func m_func;
|
|
|
|
|
};
|
2016-03-12 16:27:54 +01:00
|
|
|
|
return std::make_unique<SimpleHighlighter>(std::move(func), pass);
|
2017-05-08 12:29:23 +02:00
|
|
|
|
}
|
|
|
|
|
|
2012-07-12 23:19:10 +02:00
|
|
|
|
template<typename T>
|
|
|
|
|
void highlight_range(DisplayBuffer& display_buffer,
|
2016-09-22 21:36:26 +02:00
|
|
|
|
BufferCoord begin, BufferCoord end,
|
2012-07-12 23:19:10 +02:00
|
|
|
|
bool skip_replaced, T func)
|
2011-09-30 21:16:23 +02:00
|
|
|
|
{
|
2017-05-27 22:37:25 +02:00
|
|
|
|
// tolerate begin > end as that can be triggered by wrong encodings
|
2017-03-10 00:40:34 +01:00
|
|
|
|
if (begin >= end or end <= display_buffer.range().begin
|
2015-04-23 22:38:45 +02:00
|
|
|
|
or begin >= display_buffer.range().end)
|
2012-07-12 23:51:13 +02:00
|
|
|
|
return;
|
|
|
|
|
|
2012-07-12 23:19:10 +02:00
|
|
|
|
for (auto& line : display_buffer.lines())
|
2011-09-30 21:16:23 +02:00
|
|
|
|
{
|
2013-07-23 20:11:26 +02:00
|
|
|
|
auto& range = line.range();
|
2015-04-23 22:38:45 +02:00
|
|
|
|
if (range.end <= begin or end < range.begin)
|
2012-12-12 19:33:29 +01:00
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
for (auto atom_it = line.begin(); atom_it != line.end(); ++atom_it)
|
2012-07-03 23:23:07 +02:00
|
|
|
|
{
|
2016-10-13 20:55:15 +02:00
|
|
|
|
bool is_replaced = atom_it->type() == DisplayAtom::ReplacedRange;
|
2011-11-14 15:23:02 +01:00
|
|
|
|
|
2013-07-24 14:55:57 +02:00
|
|
|
|
if (not atom_it->has_buffer_range() or
|
2017-05-09 11:53:27 +02:00
|
|
|
|
(skip_replaced and is_replaced) or
|
|
|
|
|
end <= atom_it->begin() or begin >= atom_it->end())
|
2012-12-12 19:33:29 +01:00
|
|
|
|
continue;
|
2012-02-22 22:48:14 +01:00
|
|
|
|
|
2013-07-24 14:55:57 +02:00
|
|
|
|
if (not is_replaced and begin > atom_it->begin())
|
2012-12-12 19:33:29 +01:00
|
|
|
|
atom_it = ++line.split(atom_it, begin);
|
2011-11-14 15:23:02 +01:00
|
|
|
|
|
2013-07-24 14:55:57 +02:00
|
|
|
|
if (not is_replaced and end < atom_it->end())
|
2012-12-12 19:33:29 +01:00
|
|
|
|
{
|
|
|
|
|
atom_it = line.split(atom_it, end);
|
|
|
|
|
func(*atom_it);
|
|
|
|
|
++atom_it;
|
2012-07-12 23:19:10 +02:00
|
|
|
|
}
|
2012-12-12 19:33:29 +01:00
|
|
|
|
else
|
|
|
|
|
func(*atom_it);
|
2012-07-12 23:19:10 +02:00
|
|
|
|
}
|
2011-09-30 21:16:23 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-05-09 11:53:27 +02:00
|
|
|
|
template<typename T>
|
|
|
|
|
void replace_range(DisplayBuffer& display_buffer,
|
|
|
|
|
BufferCoord begin, BufferCoord end, T func)
|
|
|
|
|
{
|
2017-05-27 22:37:25 +02:00
|
|
|
|
// tolerate begin > end as that can be triggered by wrong encodings
|
2017-05-09 11:53:27 +02:00
|
|
|
|
if (begin >= end or end <= display_buffer.range().begin
|
|
|
|
|
or begin >= display_buffer.range().end)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
for (auto& line : display_buffer.lines())
|
|
|
|
|
{
|
|
|
|
|
auto& range = line.range();
|
|
|
|
|
if (range.end <= begin or end < range.begin)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
int beg_idx = -1, end_idx = -1;
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
|
|
if (begin >= atom_it->begin())
|
|
|
|
|
{
|
|
|
|
|
if (begin > atom_it->begin())
|
|
|
|
|
atom_it = ++line.split(atom_it, begin);
|
|
|
|
|
beg_idx = atom_it - line.begin();
|
|
|
|
|
}
|
|
|
|
|
if (end <= atom_it->end())
|
|
|
|
|
{
|
|
|
|
|
if (end < atom_it->end())
|
|
|
|
|
atom_it = line.split(atom_it, end);
|
|
|
|
|
end_idx = (atom_it - line.begin()) + 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (beg_idx != -1 and end_idx != -1)
|
|
|
|
|
func(line, beg_idx, end_idx);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-11-25 05:53:33 +01:00
|
|
|
|
void apply_highlighter(HighlightContext context,
|
2013-12-11 22:38:43 +01:00
|
|
|
|
DisplayBuffer& display_buffer,
|
2016-09-22 21:36:26 +02:00
|
|
|
|
BufferCoord begin, BufferCoord end,
|
2014-10-22 01:20:09 +02:00
|
|
|
|
Highlighter& highlighter)
|
2013-12-11 22:38:43 +01:00
|
|
|
|
{
|
2015-02-15 20:42:48 +01:00
|
|
|
|
if (begin == end)
|
|
|
|
|
return;
|
|
|
|
|
|
2013-12-11 22:38:43 +01:00
|
|
|
|
using LineIterator = DisplayBuffer::LineList::iterator;
|
|
|
|
|
LineIterator first_line;
|
2015-01-12 14:24:30 +01:00
|
|
|
|
Vector<DisplayLine::iterator> insert_pos;
|
2013-12-11 22:38:43 +01: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();
|
2015-04-23 22:38:45 +02:00
|
|
|
|
if (range.end <= begin or end <= range.begin)
|
2013-12-11 22:38:43 +01:00
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
if (region_lines.empty())
|
|
|
|
|
first_line = line_it;
|
|
|
|
|
region_lines.emplace_back();
|
|
|
|
|
insert_pos.emplace_back();
|
|
|
|
|
|
2015-04-23 22:38:45 +02:00
|
|
|
|
if (range.begin < begin or range.end > end)
|
2013-12-11 22:38:43 +01:00
|
|
|
|
{
|
|
|
|
|
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;
|
|
|
|
|
|
2016-10-13 20:55:15 +02:00
|
|
|
|
bool is_replaced = atom_it->type() == DisplayAtom::ReplacedRange;
|
2013-12-11 22:38:43 +01:00
|
|
|
|
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-14 22:41:29 +02:00
|
|
|
|
end_idx = atom_it - line.begin() + 1;
|
2013-12-11 22:38:43 +01: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 14:25:17 +01:00
|
|
|
|
if (region_display.lines().empty())
|
|
|
|
|
return;
|
|
|
|
|
|
2013-12-11 22:38:43 +01:00
|
|
|
|
region_display.compute_range();
|
2017-11-25 05:53:33 +01:00
|
|
|
|
highlighter.highlight(context, region_display, {begin, end});
|
2013-12-11 22:38:43 +01: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 01:27:04 +02:00
|
|
|
|
auto apply_face = [](const Face& face)
|
2014-06-18 21:31:49 +02:00
|
|
|
|
{
|
2014-07-11 01:27:04 +02:00
|
|
|
|
return [&face](DisplayAtom& atom) {
|
2015-08-23 13:13:14 +02:00
|
|
|
|
atom.face = merge_faces(atom.face, face);
|
2014-06-18 21:33:23 +02:00
|
|
|
|
};
|
2014-06-18 21:31:49 +02:00
|
|
|
|
};
|
|
|
|
|
|
2018-06-28 14:23:48 +02:00
|
|
|
|
static std::unique_ptr<Highlighter> create_fill_highlighter(HighlighterParameters params, Highlighter*)
|
2014-06-10 22:46:16 +02:00
|
|
|
|
{
|
2014-09-19 14:45:11 +02:00
|
|
|
|
if (params.size() != 1)
|
|
|
|
|
throw runtime_error("wrong parameter count");
|
|
|
|
|
|
|
|
|
|
const String& facespec = params[0];
|
2018-04-07 07:36:39 +02:00
|
|
|
|
auto func = [facespec](HighlightContext context, DisplayBuffer& display_buffer, BufferRange range)
|
2014-06-10 22:46:16 +02:00
|
|
|
|
{
|
2017-12-21 01:25:23 +01:00
|
|
|
|
highlight_range(display_buffer, range.begin, range.end, false,
|
2018-04-07 07:36:39 +02:00
|
|
|
|
apply_face(context.context.faces()[facespec]));
|
2014-09-19 14:45:11 +02:00
|
|
|
|
};
|
2018-06-25 14:04:33 +02:00
|
|
|
|
return make_highlighter(std::move(func));
|
2014-06-10 22:46:16 +02:00
|
|
|
|
}
|
|
|
|
|
|
2014-01-09 23:51:23 +01:00
|
|
|
|
template<typename T>
|
|
|
|
|
struct BufferSideCache
|
|
|
|
|
{
|
2016-12-03 14:17:42 +01:00
|
|
|
|
BufferSideCache() : m_id{get_free_value_id()} {}
|
2014-01-09 23:51:23 +01:00
|
|
|
|
|
|
|
|
|
T& get(const Buffer& buffer)
|
|
|
|
|
{
|
|
|
|
|
Value& cache_val = buffer.values()[m_id];
|
|
|
|
|
if (not cache_val)
|
2014-05-14 22:19:19 +02:00
|
|
|
|
cache_val = Value(T{});
|
2014-01-09 23:51:23 +01:00
|
|
|
|
return cache_val.as<T>();
|
|
|
|
|
}
|
|
|
|
|
private:
|
|
|
|
|
ValueId m_id;
|
|
|
|
|
};
|
|
|
|
|
|
2015-02-17 14:50:31 +01:00
|
|
|
|
using FacesSpec = Vector<std::pair<size_t, String>, MemoryDomain::Highlight>;
|
|
|
|
|
|
2014-10-22 01:20:09 +02:00
|
|
|
|
class RegexHighlighter : public Highlighter
|
2011-11-24 20:11:58 +01:00
|
|
|
|
{
|
2012-08-15 17:08:48 +02:00
|
|
|
|
public:
|
2014-07-12 14:57:16 +02:00
|
|
|
|
RegexHighlighter(Regex regex, FacesSpec faces)
|
2017-05-03 20:41:37 +02:00
|
|
|
|
: Highlighter{HighlightPass::Colorize},
|
|
|
|
|
m_regex{std::move(regex)},
|
|
|
|
|
m_faces{std::move(faces)}
|
2012-08-15 17:08:48 +02:00
|
|
|
|
{
|
2015-02-17 14:50:31 +01:00
|
|
|
|
ensure_first_face_is_capture_0();
|
2012-08-15 17:08:48 +02:00
|
|
|
|
}
|
|
|
|
|
|
2017-11-25 05:53:33 +01:00
|
|
|
|
void do_highlight(HighlightContext context, DisplayBuffer& display_buffer, BufferRange range) override
|
2012-07-12 23:19:10 +02:00
|
|
|
|
{
|
2015-11-27 01:04:33 +01:00
|
|
|
|
auto overlaps = [](const BufferRange& lhs, const BufferRange& rhs) {
|
|
|
|
|
return lhs.begin < rhs.begin ? lhs.end > rhs.begin
|
|
|
|
|
: rhs.end > lhs.begin;
|
|
|
|
|
};
|
|
|
|
|
|
2017-05-03 20:41:37 +02:00
|
|
|
|
if (not overlaps(display_buffer.range(), range))
|
2014-01-18 02:56:51 +01:00
|
|
|
|
return;
|
2014-07-12 12:19:35 +02:00
|
|
|
|
|
2018-07-26 13:04:02 +02:00
|
|
|
|
const auto faces = m_faces | transform([&faces = context.context.faces()](auto&& spec) {
|
|
|
|
|
return spec.second.empty() ? Face{} : faces[spec.second];
|
|
|
|
|
}) | gather<Vector<Face>>();
|
2012-08-15 17:08:48 +02:00
|
|
|
|
|
2017-11-25 05:53:33 +01:00
|
|
|
|
auto& matches = get_matches(context.context.buffer(), display_buffer.range(), range);
|
2015-02-17 14:50:31 +01:00
|
|
|
|
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,
|
2015-04-23 22:38:45 +02:00
|
|
|
|
matches[m].begin, matches[m].end,
|
2017-12-21 01:25:23 +01:00
|
|
|
|
false, apply_face(face));
|
2012-08-07 00:13:54 +02:00
|
|
|
|
}
|
2012-07-12 23:19:10 +02:00
|
|
|
|
}
|
2012-08-15 17:08:48 +02:00
|
|
|
|
|
2014-10-22 01:20:09 +02:00
|
|
|
|
void reset(Regex regex, FacesSpec faces)
|
|
|
|
|
{
|
|
|
|
|
m_regex = std::move(regex);
|
|
|
|
|
m_faces = std::move(faces);
|
2015-02-17 14:50:31 +01:00
|
|
|
|
ensure_first_face_is_capture_0();
|
2015-02-16 23:43:14 +01:00
|
|
|
|
++m_regex_version;
|
2014-10-22 01:20:09 +02:00
|
|
|
|
}
|
|
|
|
|
|
2018-06-28 14:23:48 +02:00
|
|
|
|
static std::unique_ptr<Highlighter> create(HighlighterParameters params, Highlighter*)
|
2014-10-22 01:20:09 +02:00
|
|
|
|
{
|
|
|
|
|
if (params.size() < 2)
|
|
|
|
|
throw runtime_error("wrong parameter count");
|
|
|
|
|
|
2015-07-14 22:06:41 +02:00
|
|
|
|
FacesSpec faces;
|
2016-11-20 12:15:15 +01:00
|
|
|
|
for (auto& spec : params.subrange(1))
|
2014-10-22 01:20:09 +02:00
|
|
|
|
{
|
2015-11-09 10:34:03 +01:00
|
|
|
|
auto colon = find(spec, ':');
|
|
|
|
|
if (colon == spec.end())
|
2016-12-07 14:57:16 +01:00
|
|
|
|
throw runtime_error(format("wrong face spec: '{}' expected <capture>:<facespec>", spec));
|
2015-11-09 10:34:03 +01:00
|
|
|
|
int capture = str_to_int({spec.begin(), colon});
|
|
|
|
|
faces.emplace_back(capture, String{colon+1, spec.end()});
|
2015-07-14 22:06:41 +02:00
|
|
|
|
}
|
2014-10-22 01:20:09 +02:00
|
|
|
|
|
2017-10-09 08:04:14 +02:00
|
|
|
|
Regex ex{params[0], RegexCompileFlags::Optimize};
|
2014-10-22 01:20:09 +02:00
|
|
|
|
|
2018-06-25 14:04:33 +02:00
|
|
|
|
return std::make_unique<RegexHighlighter>(std::move(ex), std::move(faces));
|
2014-10-22 01:20:09 +02:00
|
|
|
|
}
|
|
|
|
|
|
2012-08-15 17:08:48 +02:00
|
|
|
|
private:
|
2015-02-17 14:50:31 +01:00
|
|
|
|
// stores the range for each highlighted capture of each match
|
|
|
|
|
using MatchList = Vector<BufferRange, MemoryDomain::Highlight>;
|
2014-01-12 22:24:59 +01:00
|
|
|
|
struct Cache
|
2013-11-19 00:17:06 +01:00
|
|
|
|
{
|
2015-02-16 23:43:14 +01:00
|
|
|
|
size_t m_timestamp = -1;
|
|
|
|
|
size_t m_regex_version = -1;
|
2015-04-23 22:44:20 +02:00
|
|
|
|
struct RangeAndMatches { BufferRange range; MatchList matches; };
|
2015-02-15 20:42:48 +01:00
|
|
|
|
Vector<RangeAndMatches, MemoryDomain::Highlight> m_matches;
|
2013-11-19 00:17:06 +01:00
|
|
|
|
};
|
2014-01-12 22:24:59 +01:00
|
|
|
|
BufferSideCache<Cache> m_cache;
|
2012-08-15 17:08:48 +02:00
|
|
|
|
|
|
|
|
|
Regex m_regex;
|
2014-07-12 12:19:35 +02:00
|
|
|
|
FacesSpec m_faces;
|
2012-08-15 17:08:48 +02:00
|
|
|
|
|
2015-02-16 23:43:14 +01:00
|
|
|
|
size_t m_regex_version = 0;
|
2014-10-22 01:20:09 +02:00
|
|
|
|
|
2015-02-17 14:50:31 +01: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 20:13:55 +01:00
|
|
|
|
BufferRange range)
|
|
|
|
|
{
|
2015-02-17 14:50:31 +01:00
|
|
|
|
kak_assert(matches.size() % m_faces.size() == 0);
|
2015-02-16 20:13:55 +01:00
|
|
|
|
using RegexIt = RegexIterator<BufferIterator>;
|
2017-06-15 18:43:18 +02:00
|
|
|
|
RegexIt re_it{get_iterator(buffer, range.begin),
|
2018-03-04 19:48:10 +01:00
|
|
|
|
get_iterator(buffer, range.end),
|
|
|
|
|
buffer.begin(), buffer.end(), m_regex,
|
2015-12-23 22:43:07 +01:00
|
|
|
|
match_flags(is_bol(range.begin),
|
|
|
|
|
is_eol(buffer, range.end),
|
2016-05-10 10:12:30 +02:00
|
|
|
|
is_bow(buffer, range.begin),
|
2018-03-04 19:48:10 +01:00
|
|
|
|
is_eow(buffer, range.end))};
|
2015-02-16 20:13:55 +01:00
|
|
|
|
RegexIt re_end;
|
|
|
|
|
for (; re_it != re_end; ++re_it)
|
|
|
|
|
{
|
2017-03-17 00:08:10 +01:00
|
|
|
|
for (auto& face : m_faces)
|
2015-02-17 14:50:31 +01:00
|
|
|
|
{
|
2017-03-17 00:08:10 +01:00
|
|
|
|
const auto& sub = (*re_it)[face.first];
|
2015-04-23 22:38:45 +02:00
|
|
|
|
matches.push_back({sub.first.coord(), sub.second.coord()});
|
2015-02-17 14:50:31 +01:00
|
|
|
|
}
|
2015-02-16 20:13:55 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-17 14:50:31 +01:00
|
|
|
|
MatchList& get_matches(const Buffer& buffer, BufferRange display_range,
|
|
|
|
|
BufferRange buffer_range)
|
2012-08-15 17:08:48 +02:00
|
|
|
|
{
|
2014-01-12 22:24:59 +01:00
|
|
|
|
Cache& cache = m_cache.get(buffer);
|
2015-02-15 20:42:48 +01:00
|
|
|
|
auto& matches = cache.m_matches;
|
2013-11-19 00:17:06 +01:00
|
|
|
|
|
2015-02-16 23:43:14 +01:00
|
|
|
|
if (cache.m_regex_version != m_regex_version or
|
|
|
|
|
cache.m_timestamp != buffer.timestamp())
|
2015-02-15 20:42:48 +01:00
|
|
|
|
{
|
|
|
|
|
matches.clear();
|
|
|
|
|
cache.m_timestamp = buffer.timestamp();
|
2015-02-16 23:43:14 +01:00
|
|
|
|
cache.m_regex_version = m_regex_version;
|
2015-02-15 20:42:48 +01:00
|
|
|
|
}
|
|
|
|
|
const LineCount line_offset = 3;
|
2016-09-22 21:36:26 +02:00
|
|
|
|
BufferRange range{std::max<BufferCoord>(buffer_range.begin, display_range.begin.line - line_offset),
|
|
|
|
|
std::min<BufferCoord>(buffer_range.end, display_range.end.line + line_offset)};
|
2012-08-15 17:08:48 +02:00
|
|
|
|
|
2015-02-15 20:42:48 +01:00
|
|
|
|
auto it = std::upper_bound(matches.begin(), matches.end(), range,
|
|
|
|
|
[](const BufferRange& lhs, const Cache::RangeAndMatches& rhs)
|
2015-04-23 22:44:20 +02:00
|
|
|
|
{ return lhs.begin < rhs.range.end; });
|
2014-10-22 01:20:09 +02:00
|
|
|
|
|
2015-04-23 22:44:20 +02:00
|
|
|
|
if (it == matches.end() or it->range.begin > range.end)
|
2015-02-16 20:13:55 +01:00
|
|
|
|
{
|
2015-02-15 20:42:48 +01:00
|
|
|
|
it = matches.insert(it, Cache::RangeAndMatches{range, {}});
|
2015-04-23 22:44:20 +02:00
|
|
|
|
add_matches(buffer, it->matches, range);
|
2015-02-16 20:13:55 +01:00
|
|
|
|
}
|
2015-04-23 22:44:20 +02:00
|
|
|
|
else if (it->matches.empty())
|
2015-02-15 20:42:48 +01:00
|
|
|
|
{
|
2015-04-23 22:44:20 +02:00
|
|
|
|
it->range = range;
|
|
|
|
|
add_matches(buffer, it->matches, range);
|
2015-02-15 20:42:48 +01:00
|
|
|
|
}
|
2015-02-16 20:13:55 +01:00
|
|
|
|
else
|
2013-11-19 00:17:06 +01:00
|
|
|
|
{
|
2015-02-16 20:13:55 +01: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.
|
2015-04-23 22:44:20 +02:00
|
|
|
|
BufferRange& old_range = it->range;
|
|
|
|
|
MatchList& matches = it->matches;
|
2015-02-17 14:50:31 +01:00
|
|
|
|
|
|
|
|
|
// Thanks to the ensure_first_face_is_capture_0 method, we know
|
|
|
|
|
// these point to the first/last matches capture 0.
|
2015-04-23 22:38:45 +02:00
|
|
|
|
auto first_end = matches.begin()->end;
|
2015-10-18 12:37:04 +02:00
|
|
|
|
auto last_end = (matches.end() - m_faces.size())->end;
|
2015-02-16 20:13:55 +01:00
|
|
|
|
|
|
|
|
|
// add regex matches from new begin to old first match end
|
2015-04-23 22:38:45 +02:00
|
|
|
|
if (range.begin < old_range.begin)
|
2015-02-16 20:13:55 +01:00
|
|
|
|
{
|
2015-04-23 22:38:45 +02:00
|
|
|
|
old_range.begin = range.begin;
|
2015-02-17 14:50:31 +01:00
|
|
|
|
MatchList new_matches;
|
2015-04-23 22:38:45 +02:00
|
|
|
|
add_matches(buffer, new_matches, {range.begin, first_end});
|
2015-02-17 14:50:31 +01:00
|
|
|
|
matches.erase(matches.begin(), matches.begin() + m_faces.size());
|
2015-02-16 20:13:55 +01:00
|
|
|
|
|
|
|
|
|
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
|
2015-04-23 22:38:45 +02:00
|
|
|
|
if (old_range.end < range.end)
|
2015-02-16 20:13:55 +01:00
|
|
|
|
{
|
2015-04-23 22:38:45 +02:00
|
|
|
|
old_range.end = range.end;
|
2015-10-18 12:37:04 +02:00
|
|
|
|
add_matches(buffer, matches, {last_end, range.end});
|
2015-02-16 20:13:55 +01:00
|
|
|
|
}
|
2013-11-19 00:17:06 +01:00
|
|
|
|
}
|
2015-04-23 22:44:20 +02:00
|
|
|
|
return it->matches;
|
2012-08-15 17:08:48 +02:00
|
|
|
|
}
|
|
|
|
|
};
|
2011-11-24 20:11:58 +01:00
|
|
|
|
|
2014-07-11 01:27:04 +02:00
|
|
|
|
template<typename RegexGetter, typename FaceGetter>
|
2014-10-22 01:20:09 +02:00
|
|
|
|
class DynamicRegexHighlighter : public Highlighter
|
2012-12-31 14:28:32 +01:00
|
|
|
|
{
|
|
|
|
|
public:
|
2014-07-11 01:27:04 +02:00
|
|
|
|
DynamicRegexHighlighter(RegexGetter regex_getter, FaceGetter face_getter)
|
2017-05-03 20:41:37 +02:00
|
|
|
|
: Highlighter{HighlightPass::Colorize},
|
|
|
|
|
m_regex_getter(std::move(regex_getter)),
|
|
|
|
|
m_face_getter(std::move(face_getter)),
|
|
|
|
|
m_highlighter(Regex{}, FacesSpec{}) {}
|
2012-12-31 14:28:32 +01:00
|
|
|
|
|
2017-11-25 05:53:33 +01:00
|
|
|
|
void do_highlight(HighlightContext context, DisplayBuffer& display_buffer, BufferRange range) override
|
2012-12-31 14:28:32 +01:00
|
|
|
|
{
|
2017-11-25 05:53:33 +01:00
|
|
|
|
Regex regex = m_regex_getter(context.context);
|
|
|
|
|
FacesSpec face = m_face_getter(context.context);
|
2014-07-11 01:27:04 +02:00
|
|
|
|
if (regex != m_last_regex or face != m_last_face)
|
2012-12-31 14:28:32 +01:00
|
|
|
|
{
|
2015-11-09 09:50:17 +01:00
|
|
|
|
m_last_regex = std::move(regex);
|
2014-07-11 01:27:04 +02:00
|
|
|
|
m_last_face = face;
|
2013-03-26 14:26:59 +01:00
|
|
|
|
if (not m_last_regex.empty())
|
2014-10-22 01:20:09 +02:00
|
|
|
|
m_highlighter.reset(m_last_regex, m_last_face);
|
2012-12-31 14:28:32 +01:00
|
|
|
|
}
|
2014-07-11 01:27:04 +02:00
|
|
|
|
if (not m_last_regex.empty() and not m_last_face.empty())
|
2017-11-25 05:53:33 +01:00
|
|
|
|
m_highlighter.highlight(context, display_buffer, range);
|
2012-12-31 14:28:32 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private:
|
2014-07-11 01:27:04 +02:00
|
|
|
|
Regex m_last_regex;
|
|
|
|
|
RegexGetter m_regex_getter;
|
2014-05-13 20:35:28 +02:00
|
|
|
|
|
2014-07-12 12:19:35 +02:00
|
|
|
|
FacesSpec m_last_face;
|
2014-07-11 01:27:04 +02:00
|
|
|
|
FaceGetter m_face_getter;
|
2014-05-13 20:35:28 +02:00
|
|
|
|
|
2014-07-12 14:57:16 +02:00
|
|
|
|
RegexHighlighter m_highlighter;
|
2012-12-31 14:28:32 +01:00
|
|
|
|
};
|
|
|
|
|
|
2018-06-28 14:23:48 +02:00
|
|
|
|
std::unique_ptr<Highlighter> create_dynamic_regex_highlighter(HighlighterParameters params, Highlighter*)
|
2012-12-31 14:28:32 +01:00
|
|
|
|
{
|
2015-11-09 10:34:03 +01:00
|
|
|
|
if (params.size() < 2)
|
2018-04-06 16:56:53 +02:00
|
|
|
|
throw runtime_error("wrong parameter count");
|
2015-07-09 14:53:21 +02:00
|
|
|
|
|
2015-11-09 10:34:03 +01:00
|
|
|
|
FacesSpec faces;
|
2016-11-20 12:15:15 +01:00
|
|
|
|
for (auto& spec : params.subrange(1))
|
2015-11-09 10:34:03 +01:00
|
|
|
|
{
|
|
|
|
|
auto colon = find(spec, ':');
|
|
|
|
|
if (colon == spec.end())
|
|
|
|
|
throw runtime_error("wrong face spec: '" + spec +
|
|
|
|
|
"' expected <capture>:<facespec>");
|
|
|
|
|
int capture = str_to_int({spec.begin(), colon});
|
|
|
|
|
faces.emplace_back(capture, String{colon+1, spec.end()});
|
|
|
|
|
}
|
|
|
|
|
|
2017-11-22 08:57:59 +01:00
|
|
|
|
|
|
|
|
|
auto make_hl = [](auto& regex_getter, auto& face_getter) {
|
|
|
|
|
return std::make_unique<DynamicRegexHighlighter<std::decay_t<decltype(regex_getter)>,
|
|
|
|
|
std::decay_t<decltype(face_getter)>>>(
|
|
|
|
|
std::move(regex_getter), std::move(face_getter));
|
|
|
|
|
};
|
2018-07-26 13:56:34 +02:00
|
|
|
|
auto get_face = [faces](const Context& context){ return faces; };
|
2015-11-09 10:34:03 +01:00
|
|
|
|
|
2018-02-15 11:23:12 +01:00
|
|
|
|
CommandParser parser{params[0]};
|
|
|
|
|
auto token = parser.read_token(true);
|
|
|
|
|
if (token and parser.done() and token->type == Token::Type::OptionExpand and
|
|
|
|
|
GlobalScope::instance().options()[token->content].is_of_type<Regex>())
|
2015-12-12 07:50:58 +01:00
|
|
|
|
{
|
2018-02-15 11:23:12 +01:00
|
|
|
|
auto get_regex = [option_name = token->content](const Context& context) {
|
2015-12-12 07:50:58 +01:00
|
|
|
|
return context.options()[option_name].get<Regex>();
|
|
|
|
|
};
|
2018-06-25 14:04:33 +02:00
|
|
|
|
return make_hl(get_regex, get_face);
|
2015-12-12 07:50:58 +01:00
|
|
|
|
}
|
|
|
|
|
|
2018-02-15 11:23:12 +01:00
|
|
|
|
auto get_regex = [expr = params[0]](const Context& context){
|
2015-07-09 14:53:21 +02:00
|
|
|
|
try
|
|
|
|
|
{
|
2015-11-09 10:34:03 +01:00
|
|
|
|
auto re = expand(expr, context);
|
|
|
|
|
return re.empty() ? Regex{} : Regex{re};
|
2015-07-09 14:53:21 +02:00
|
|
|
|
}
|
2015-11-09 10:34:03 +01:00
|
|
|
|
catch (runtime_error& err)
|
2015-07-09 14:53:21 +02:00
|
|
|
|
{
|
2017-05-01 23:05:03 +02:00
|
|
|
|
write_to_debug_buffer(format("Error while evaluating dynamic regex expression: {}", err.what()));
|
2015-07-09 14:53:21 +02:00
|
|
|
|
return Regex{};
|
|
|
|
|
}
|
|
|
|
|
};
|
2018-06-25 14:04:33 +02:00
|
|
|
|
return make_hl(get_regex, get_face);
|
2013-04-03 19:20:38 +02:00
|
|
|
|
}
|
2013-03-26 14:26:59 +01:00
|
|
|
|
|
2018-06-28 14:23:48 +02:00
|
|
|
|
std::unique_ptr<Highlighter> create_line_highlighter(HighlighterParameters params, Highlighter*)
|
2014-06-18 21:50:39 +02:00
|
|
|
|
{
|
|
|
|
|
if (params.size() != 2)
|
|
|
|
|
throw runtime_error("wrong parameter count");
|
|
|
|
|
|
2018-04-07 07:36:39 +02:00
|
|
|
|
auto func = [line_expr=params[0], facespec=params[1]]
|
|
|
|
|
(HighlightContext context, DisplayBuffer& display_buffer, BufferRange)
|
2014-06-18 21:50:39 +02:00
|
|
|
|
{
|
2015-11-09 09:42:40 +01:00
|
|
|
|
LineCount line = -1;
|
|
|
|
|
try
|
|
|
|
|
{
|
2017-11-25 05:53:33 +01:00
|
|
|
|
line = str_to_int_ifp(expand(line_expr, context.context)).value_or(0) - 1;
|
2015-11-09 09:42:40 +01:00
|
|
|
|
}
|
|
|
|
|
catch (runtime_error& err)
|
|
|
|
|
{
|
|
|
|
|
write_to_debug_buffer(
|
|
|
|
|
format("Error evaluating highlight line expression: {}", err.what()));
|
|
|
|
|
}
|
|
|
|
|
|
2015-05-05 21:21:17 +02:00
|
|
|
|
if (line < 0)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
auto it = find_if(display_buffer.lines(),
|
|
|
|
|
[line](const DisplayLine& l)
|
|
|
|
|
{ return l.range().begin.line == line; });
|
|
|
|
|
if (it == display_buffer.lines().end())
|
|
|
|
|
return;
|
|
|
|
|
|
2018-04-07 07:36:39 +02:00
|
|
|
|
auto face = context.context.faces()[facespec];
|
2016-09-22 21:36:26 +02:00
|
|
|
|
ColumnCount column = 0;
|
2017-03-17 00:08:10 +01:00
|
|
|
|
for (auto& atom : *it)
|
2015-05-05 21:21:17 +02:00
|
|
|
|
{
|
2017-03-17 00:08:10 +01:00
|
|
|
|
column += atom.length();
|
|
|
|
|
if (!atom.has_buffer_range())
|
2015-05-05 21:21:17 +02:00
|
|
|
|
continue;
|
|
|
|
|
|
2017-03-17 00:08:10 +01:00
|
|
|
|
kak_assert(atom.begin().line == line);
|
|
|
|
|
apply_face(face)(atom);
|
2015-05-05 21:21:17 +02:00
|
|
|
|
}
|
2017-11-25 05:53:33 +01:00
|
|
|
|
const ColumnCount remaining = context.context.window().dimensions().column - column;
|
2015-05-05 21:21:17 +02:00
|
|
|
|
if (remaining > 0)
|
|
|
|
|
it->push_back({ String{' ', remaining}, face });
|
2014-06-18 21:50:39 +02:00
|
|
|
|
};
|
|
|
|
|
|
2018-06-25 14:04:33 +02:00
|
|
|
|
return make_highlighter(std::move(func));
|
2014-06-18 21:50:39 +02:00
|
|
|
|
}
|
|
|
|
|
|
2018-06-28 14:23:48 +02:00
|
|
|
|
std::unique_ptr<Highlighter> create_column_highlighter(HighlighterParameters params, Highlighter*)
|
2015-04-30 00:08:16 +02:00
|
|
|
|
{
|
|
|
|
|
if (params.size() != 2)
|
|
|
|
|
throw runtime_error("wrong parameter count");
|
|
|
|
|
|
2018-04-07 07:36:39 +02:00
|
|
|
|
auto func = [col_expr=params[0], facespec=params[1]]
|
|
|
|
|
(HighlightContext context, DisplayBuffer& display_buffer, BufferRange)
|
2015-04-30 00:08:16 +02:00
|
|
|
|
{
|
2016-09-22 21:36:26 +02:00
|
|
|
|
ColumnCount column = -1;
|
2015-11-09 09:42:40 +01:00
|
|
|
|
try
|
|
|
|
|
{
|
2017-11-25 05:53:33 +01:00
|
|
|
|
column = str_to_int_ifp(expand(col_expr, context.context)).value_or(0) - 1;
|
2015-11-09 09:42:40 +01:00
|
|
|
|
}
|
|
|
|
|
catch (runtime_error& err)
|
|
|
|
|
{
|
|
|
|
|
write_to_debug_buffer(
|
|
|
|
|
format("Error evaluating highlight column expression: {}", err.what()));
|
|
|
|
|
}
|
|
|
|
|
|
2015-04-30 00:08:16 +02:00
|
|
|
|
if (column < 0)
|
|
|
|
|
return;
|
|
|
|
|
|
2018-04-07 07:36:39 +02:00
|
|
|
|
auto face = context.context.faces()[facespec];
|
2018-06-11 07:10:05 +02:00
|
|
|
|
auto win_column = context.setup.window_pos.column;
|
2015-04-30 00:08:16 +02:00
|
|
|
|
for (auto& line : display_buffer.lines())
|
|
|
|
|
{
|
2017-11-01 18:27:04 +01:00
|
|
|
|
auto target_col = column - win_column;
|
2017-10-12 08:38:19 +02:00
|
|
|
|
if (target_col < 0)
|
|
|
|
|
return;
|
|
|
|
|
|
2015-04-30 00:08:16 +02:00
|
|
|
|
bool found = false;
|
2017-10-12 08:38:19 +02:00
|
|
|
|
auto first_buf = find_if(line, [](auto& atom) { return atom.has_buffer_range(); });
|
|
|
|
|
for (auto atom_it = first_buf; atom_it != line.end(); ++atom_it)
|
2015-04-30 00:08:16 +02:00
|
|
|
|
{
|
2017-10-12 08:38:19 +02:00
|
|
|
|
const auto atom_len = atom_it->length();
|
|
|
|
|
if (target_col < atom_len)
|
2015-04-30 00:08:16 +02:00
|
|
|
|
{
|
2017-10-12 08:38:19 +02:00
|
|
|
|
if (target_col > 0)
|
|
|
|
|
atom_it = ++line.split(atom_it, target_col);
|
|
|
|
|
if (atom_it->length() > 1)
|
|
|
|
|
atom_it = line.split(atom_it, 1_col);
|
|
|
|
|
atom_it->face = merge_faces(atom_it->face, face);
|
|
|
|
|
found = true;
|
|
|
|
|
break;
|
2015-04-30 00:08:16 +02:00
|
|
|
|
}
|
2017-10-12 08:38:19 +02:00
|
|
|
|
target_col -= atom_len;
|
2015-04-30 00:08:16 +02:00
|
|
|
|
}
|
2017-10-12 08:38:19 +02:00
|
|
|
|
if (found)
|
|
|
|
|
continue;
|
2015-07-23 14:58:23 +02:00
|
|
|
|
|
2017-10-12 08:38:19 +02:00
|
|
|
|
if (target_col > 0)
|
2018-04-29 12:33:47 +02:00
|
|
|
|
line.push_back({String{' ', target_col}, {}});
|
2017-10-12 08:38:19 +02:00
|
|
|
|
line.push_back({" ", face});
|
2015-04-30 00:08:16 +02:00
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
2018-06-25 14:04:33 +02:00
|
|
|
|
return make_highlighter(std::move(func));
|
2015-04-30 00:08:16 +02:00
|
|
|
|
}
|
|
|
|
|
|
2017-04-27 20:27:28 +02:00
|
|
|
|
struct WrapHighlighter : Highlighter
|
2016-01-24 07:34:51 +01:00
|
|
|
|
{
|
2018-05-26 14:22:00 +02:00
|
|
|
|
WrapHighlighter(ColumnCount max_width, bool word_wrap, bool preserve_indent, String marker)
|
2017-11-01 18:26:00 +01:00
|
|
|
|
: Highlighter{HighlightPass::Wrap}, m_max_width{max_width},
|
2018-05-26 14:22:00 +02:00
|
|
|
|
m_word_wrap{word_wrap}, m_preserve_indent{preserve_indent},
|
|
|
|
|
m_marker{std::move(marker)} {}
|
2016-01-24 07:34:51 +01:00
|
|
|
|
|
2017-11-25 05:53:33 +01:00
|
|
|
|
static constexpr StringView ms_id = "wrap";
|
|
|
|
|
|
2018-07-08 10:51:11 +02:00
|
|
|
|
struct SplitPos{ ByteCount byte; ColumnCount column; };
|
|
|
|
|
|
2017-11-25 05:53:33 +01:00
|
|
|
|
void do_highlight(HighlightContext context, DisplayBuffer& display_buffer, BufferRange) override
|
2017-05-03 20:41:37 +02:00
|
|
|
|
{
|
2017-11-25 05:53:33 +01:00
|
|
|
|
if (contains(context.disabled_ids, ms_id))
|
|
|
|
|
return;
|
|
|
|
|
|
2018-06-11 07:10:05 +02:00
|
|
|
|
const ColumnCount wrap_column = std::min(m_max_width, context.setup.window_range.column);
|
2017-05-06 17:17:33 +02:00
|
|
|
|
if (wrap_column <= 0)
|
2016-01-24 07:34:51 +01:00
|
|
|
|
return;
|
|
|
|
|
|
2017-11-25 05:53:33 +01:00
|
|
|
|
const Buffer& buffer = context.context.buffer();
|
|
|
|
|
const auto& cursor = context.context.selections().main().cursor();
|
|
|
|
|
const int tabstop = context.context.options()["tabstop"].get<int>();
|
|
|
|
|
const LineCount win_height = context.context.window().dimensions().line;
|
2018-05-26 14:22:00 +02:00
|
|
|
|
const ColumnCount marker_len = m_marker.column_length();
|
|
|
|
|
const Face face_marker = context.context.faces()["StatusLineInfo"];
|
2016-01-24 07:34:51 +01:00
|
|
|
|
for (auto it = display_buffer.lines().begin();
|
|
|
|
|
it != display_buffer.lines().end(); ++it)
|
|
|
|
|
{
|
|
|
|
|
const LineCount buf_line = it->range().begin.line;
|
|
|
|
|
const ByteCount line_length = buffer[buf_line].length();
|
2018-05-26 14:22:00 +02:00
|
|
|
|
const ColumnCount indent = m_preserve_indent ? line_indent(buffer, tabstop, buf_line) : 0_col;
|
2016-01-24 07:34:51 +01:00
|
|
|
|
|
2018-07-08 10:51:11 +02:00
|
|
|
|
auto pos = next_split_pos(buffer, wrap_column, tabstop, buf_line, {0, 0});
|
|
|
|
|
if (pos.byte == line_length)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
for (auto atom_it = it->begin();
|
|
|
|
|
pos.byte != line_length and atom_it != it->end(); )
|
2016-01-24 07:34:51 +01:00
|
|
|
|
{
|
2018-07-08 10:51:11 +02:00
|
|
|
|
const BufferCoord coord{buf_line, pos.byte};
|
|
|
|
|
if (!atom_it->has_buffer_range() or
|
|
|
|
|
coord < atom_it->begin() or coord >= atom_it->end())
|
2016-01-24 07:34:51 +01:00
|
|
|
|
{
|
2018-07-08 10:51:11 +02:00
|
|
|
|
++atom_it;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2016-01-24 07:34:51 +01:00
|
|
|
|
|
2018-07-08 10:51:11 +02:00
|
|
|
|
auto& line = *it;
|
2016-01-24 07:34:51 +01:00
|
|
|
|
|
2018-07-08 10:51:11 +02:00
|
|
|
|
if (coord > atom_it->begin())
|
|
|
|
|
atom_it = ++line.split(atom_it, coord);
|
2016-01-24 07:34:51 +01:00
|
|
|
|
|
2018-07-08 10:51:11 +02:00
|
|
|
|
DisplayLine new_line{ AtomList{ atom_it, line.end() } };
|
|
|
|
|
line.erase(atom_it, line.end());
|
2017-04-27 20:27:28 +02:00
|
|
|
|
|
2018-07-08 10:51:11 +02:00
|
|
|
|
ColumnCount prefix_len = 0;
|
|
|
|
|
if (marker_len != 0 and marker_len < wrap_column)
|
|
|
|
|
{
|
|
|
|
|
new_line.insert(new_line.begin(), {m_marker, face_marker});
|
|
|
|
|
prefix_len = marker_len;
|
|
|
|
|
}
|
|
|
|
|
if (indent > marker_len and indent < wrap_column)
|
|
|
|
|
{
|
|
|
|
|
auto it = new_line.insert(new_line.begin() + (marker_len > 0), {buffer, coord, coord});
|
|
|
|
|
it->replace(String{' ', indent - marker_len});
|
|
|
|
|
prefix_len = indent;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (it+1 - display_buffer.lines().begin() == win_height)
|
|
|
|
|
{
|
|
|
|
|
if (cursor >= new_line.range().begin) // strip first lines if cursor is not visible
|
2018-05-26 14:22:00 +02:00
|
|
|
|
{
|
2018-07-08 10:51:11 +02:00
|
|
|
|
display_buffer.lines().erase(display_buffer.lines().begin(), display_buffer.lines().begin()+1);
|
|
|
|
|
--it;
|
2017-11-02 04:08:03 +01:00
|
|
|
|
}
|
2018-07-08 10:51:11 +02:00
|
|
|
|
else
|
2017-04-27 20:27:28 +02:00
|
|
|
|
{
|
2018-07-08 10:51:11 +02:00
|
|
|
|
display_buffer.lines().erase(it+1, display_buffer.lines().end());
|
|
|
|
|
return;
|
2017-04-27 20:27:28 +02:00
|
|
|
|
}
|
2016-01-24 07:34:51 +01:00
|
|
|
|
}
|
2018-07-08 10:51:11 +02:00
|
|
|
|
it = display_buffer.lines().insert(it+1, new_line);
|
|
|
|
|
|
|
|
|
|
pos = next_split_pos(buffer, wrap_column - prefix_len, tabstop, buf_line, pos);
|
|
|
|
|
atom_it = it->begin();
|
2016-01-24 07:34:51 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
2017-04-27 20:27:28 +02:00
|
|
|
|
}
|
2016-01-24 07:34:51 +01:00
|
|
|
|
|
2018-04-06 01:12:17 +02:00
|
|
|
|
void do_compute_display_setup(HighlightContext context, DisplaySetup& setup) const override
|
2017-04-27 20:27:28 +02:00
|
|
|
|
{
|
2017-11-25 05:53:33 +01:00
|
|
|
|
if (contains(context.disabled_ids, ms_id))
|
|
|
|
|
return;
|
|
|
|
|
|
2017-06-08 11:37:48 +02:00
|
|
|
|
const ColumnCount wrap_column = std::min(setup.window_range.column, m_max_width);
|
2017-05-06 17:17:33 +02:00
|
|
|
|
if (wrap_column <= 0)
|
2017-04-27 20:27:28 +02:00
|
|
|
|
return;
|
|
|
|
|
|
2017-11-25 05:53:33 +01:00
|
|
|
|
const Buffer& buffer = context.context.buffer();
|
|
|
|
|
const auto& cursor = context.context.selections().main().cursor();
|
|
|
|
|
const int tabstop = context.context.options()["tabstop"].get<int>();
|
2017-04-27 20:27:28 +02:00
|
|
|
|
|
2017-11-01 18:26:00 +01:00
|
|
|
|
auto line_wrap_count = [&](LineCount line, ColumnCount indent) {
|
2017-05-06 17:14:28 +02:00
|
|
|
|
LineCount count = 0;
|
|
|
|
|
const ByteCount line_length = buffer[line].length();
|
2018-07-08 10:51:11 +02:00
|
|
|
|
SplitPos pos{0, 0};
|
2017-05-06 17:14:28 +02:00
|
|
|
|
while (true)
|
|
|
|
|
{
|
2018-07-08 10:51:11 +02:00
|
|
|
|
pos = next_split_pos(buffer, wrap_column - (pos.byte == 0 ? 0_col : indent),
|
|
|
|
|
tabstop, line, pos);
|
|
|
|
|
if (pos.byte == line_length)
|
2017-05-06 17:14:28 +02:00
|
|
|
|
break;
|
|
|
|
|
++count;
|
|
|
|
|
}
|
|
|
|
|
return count;
|
2017-04-27 20:27:28 +02:00
|
|
|
|
};
|
|
|
|
|
|
2017-11-25 05:53:33 +01:00
|
|
|
|
const auto win_height = context.context.window().dimensions().line;
|
2017-11-21 06:01:02 +01:00
|
|
|
|
|
2017-05-11 10:23:20 +02:00
|
|
|
|
// Disable horizontal scrolling when using a WrapHighlighter
|
2017-05-01 22:32:38 +02:00
|
|
|
|
setup.window_pos.column = 0;
|
2017-11-28 12:04:21 +01:00
|
|
|
|
setup.window_range.line = 0;
|
2017-05-11 10:23:20 +02:00
|
|
|
|
setup.scroll_offset.column = 0;
|
2017-06-09 17:00:22 +02:00
|
|
|
|
setup.full_lines = true;
|
2017-05-01 22:32:38 +02:00
|
|
|
|
|
2018-05-26 14:22:00 +02:00
|
|
|
|
const ColumnCount marker_len = m_marker.column_length();
|
|
|
|
|
|
2017-11-21 06:01:02 +01:00
|
|
|
|
for (auto buf_line = setup.window_pos.line, win_line = 0_line;
|
2017-11-28 12:04:21 +01:00
|
|
|
|
win_line < win_height or buf_line <= cursor.line;
|
|
|
|
|
++buf_line, ++setup.window_range.line)
|
2017-04-27 20:27:28 +02:00
|
|
|
|
{
|
|
|
|
|
if (buf_line >= buffer.line_count())
|
|
|
|
|
break;
|
|
|
|
|
|
2018-05-26 14:22:00 +02:00
|
|
|
|
const ColumnCount indent = m_preserve_indent ? line_indent(buffer, tabstop, buf_line) : 0_col;
|
|
|
|
|
|
|
|
|
|
ColumnCount prefix_len = 0;
|
|
|
|
|
if (marker_len < wrap_column)
|
|
|
|
|
prefix_len = marker_len;
|
|
|
|
|
if (indent > marker_len and indent < wrap_column)
|
|
|
|
|
prefix_len = indent;
|
2017-11-01 18:26:00 +01:00
|
|
|
|
|
2017-11-03 12:30:31 +01:00
|
|
|
|
if (buf_line == cursor.line)
|
2017-05-06 17:14:28 +02:00
|
|
|
|
{
|
2018-07-08 10:51:11 +02:00
|
|
|
|
SplitPos pos{0, 0};
|
2017-11-03 12:30:31 +01:00
|
|
|
|
for (LineCount count = 0; true; ++count)
|
2017-05-06 17:14:28 +02:00
|
|
|
|
{
|
2018-07-08 10:51:11 +02:00
|
|
|
|
auto next_pos = next_split_pos(buffer, wrap_column - (pos.byte != 0 ? prefix_len : 0_col),
|
|
|
|
|
tabstop, buf_line, pos);
|
|
|
|
|
if (next_pos.byte > cursor.column)
|
2017-05-06 17:14:28 +02:00
|
|
|
|
{
|
2017-11-03 12:30:31 +01:00
|
|
|
|
setup.cursor_pos = DisplayCoord{
|
|
|
|
|
win_line + count,
|
|
|
|
|
get_column(buffer, tabstop, cursor) -
|
2018-07-08 10:51:11 +02:00
|
|
|
|
pos.column + (pos.byte != 0 ? indent : 0_col)
|
2017-11-03 12:30:31 +01:00
|
|
|
|
};
|
2017-05-06 17:14:28 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
2018-07-08 10:51:11 +02:00
|
|
|
|
pos = next_pos;
|
2017-05-06 17:14:28 +02:00
|
|
|
|
}
|
|
|
|
|
kak_assert(setup.cursor_pos.column >= 0 and setup.cursor_pos.column < setup.window_range.column);
|
|
|
|
|
}
|
2018-05-26 14:22:00 +02:00
|
|
|
|
const auto wrap_count = line_wrap_count(buf_line, prefix_len);
|
2017-04-27 20:27:28 +02:00
|
|
|
|
win_line += wrap_count + 1;
|
|
|
|
|
|
|
|
|
|
// scroll window to keep cursor visible, and update range as lines gets removed
|
2017-11-10 14:17:05 +01:00
|
|
|
|
while (buf_line >= cursor.line and setup.window_pos.line < cursor.line and
|
2017-11-28 12:04:21 +01:00
|
|
|
|
setup.cursor_pos.line + setup.scroll_offset.line >= win_height)
|
2017-04-27 20:27:28 +02:00
|
|
|
|
{
|
2017-11-21 06:01:02 +01:00
|
|
|
|
auto remove_count = std::min(win_height, 1 + line_wrap_count(setup.window_pos.line, indent));
|
|
|
|
|
++setup.window_pos.line;
|
2017-11-28 12:04:21 +01:00
|
|
|
|
--setup.window_range.line;
|
2017-11-21 06:01:02 +01:00
|
|
|
|
setup.cursor_pos.line -= remove_count;
|
|
|
|
|
win_line -= remove_count;
|
2017-05-07 14:15:34 +02:00
|
|
|
|
kak_assert(setup.cursor_pos.line >= 0);
|
2017-04-27 20:27:28 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-11-25 05:53:33 +01:00
|
|
|
|
void fill_unique_ids(Vector<StringView>& unique_ids) const override
|
|
|
|
|
{
|
|
|
|
|
unique_ids.push_back(ms_id);
|
|
|
|
|
}
|
|
|
|
|
|
2018-07-08 10:51:11 +02:00
|
|
|
|
SplitPos next_split_pos(const Buffer& buffer, ColumnCount wrap_column, int tabstop, LineCount line, SplitPos current) const
|
2017-05-06 17:14:28 +02:00
|
|
|
|
{
|
2018-07-08 10:51:11 +02:00
|
|
|
|
const ColumnCount target_column = current.column + wrap_column;
|
|
|
|
|
StringView content = buffer[line];
|
2017-11-01 18:26:00 +01:00
|
|
|
|
|
2018-07-08 10:51:11 +02:00
|
|
|
|
SplitPos pos = current;
|
2018-08-28 09:34:18 +02:00
|
|
|
|
SplitPos last_boundary = {0, 0};
|
|
|
|
|
|
2018-07-08 10:51:11 +02:00
|
|
|
|
while (pos.byte < content.length() and pos.column < target_column)
|
|
|
|
|
{
|
|
|
|
|
if (content[pos.byte] == '\t')
|
|
|
|
|
{
|
|
|
|
|
const ColumnCount next_column = (pos.column / tabstop + 1) * tabstop;
|
|
|
|
|
if (next_column > target_column and pos.byte != current.byte) // the target column was in the tab
|
|
|
|
|
break;
|
|
|
|
|
pos.column = next_column;
|
|
|
|
|
++pos.byte;
|
2018-08-28 09:34:18 +02:00
|
|
|
|
last_boundary = pos;
|
2018-07-08 10:51:11 +02:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
const char* it = &content[pos.byte];
|
2018-08-28 09:34:18 +02:00
|
|
|
|
const Codepoint cp = utf8::read_codepoint(it, content.end());
|
|
|
|
|
const ColumnCount width = codepoint_width(cp);
|
2018-07-08 10:51:11 +02:00
|
|
|
|
if (pos.column + width > target_column and pos.byte != current.byte) // the target column was in the char
|
2018-08-28 09:34:18 +02:00
|
|
|
|
{
|
|
|
|
|
if (!is_word<WORD>(cp))
|
|
|
|
|
last_boundary = pos;
|
2018-07-08 10:51:11 +02:00
|
|
|
|
break;
|
2018-08-28 09:34:18 +02:00
|
|
|
|
}
|
2018-07-08 10:51:11 +02:00
|
|
|
|
pos.column += width;
|
|
|
|
|
pos.byte = (int)(it - content.begin());
|
2018-08-28 09:34:18 +02:00
|
|
|
|
if (!is_word<WORD>(cp))
|
|
|
|
|
last_boundary = pos;
|
2018-07-08 10:51:11 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
2017-05-06 17:14:28 +02:00
|
|
|
|
|
2018-07-08 10:51:11 +02:00
|
|
|
|
if (m_word_wrap and pos.byte < content.length()) // find a word boundary before current position
|
2018-08-28 09:34:18 +02:00
|
|
|
|
if (last_boundary.byte > 0)
|
|
|
|
|
pos = last_boundary;
|
2017-05-06 17:14:28 +02:00
|
|
|
|
|
2018-07-08 10:51:11 +02:00
|
|
|
|
return pos;
|
2017-05-06 17:14:28 +02:00
|
|
|
|
};
|
|
|
|
|
|
2017-11-01 18:26:00 +01:00
|
|
|
|
ColumnCount line_indent(const Buffer& buffer, int tabstop, LineCount line) const
|
|
|
|
|
{
|
|
|
|
|
StringView l = buffer[line];
|
|
|
|
|
auto col = 0_byte;
|
|
|
|
|
while (is_horizontal_blank(l[col]))
|
|
|
|
|
++col;
|
|
|
|
|
return get_column(buffer, tabstop, {line, col});
|
|
|
|
|
}
|
|
|
|
|
|
2018-06-28 14:23:48 +02:00
|
|
|
|
static std::unique_ptr<Highlighter> create(HighlighterParameters params, Highlighter*)
|
2017-04-27 20:27:28 +02:00
|
|
|
|
{
|
2017-05-06 17:14:28 +02:00
|
|
|
|
static const ParameterDesc param_desc{
|
2017-06-08 08:05:44 +02:00
|
|
|
|
{ { "word", { false, "" } },
|
2017-11-01 18:26:00 +01:00
|
|
|
|
{ "indent", { false, "" } },
|
2018-05-26 14:22:00 +02:00
|
|
|
|
{ "width", { true, "" } },
|
|
|
|
|
{ "marker", { true, "" } } },
|
2017-05-06 17:14:28 +02:00
|
|
|
|
ParameterDesc::Flags::None, 0, 0
|
|
|
|
|
};
|
|
|
|
|
ParametersParser parser(params, param_desc);
|
2017-04-27 20:27:28 +02:00
|
|
|
|
|
2017-06-08 08:05:44 +02:00
|
|
|
|
ColumnCount max_width{std::numeric_limits<int>::max()};
|
|
|
|
|
if (auto width = parser.get_switch("width"))
|
|
|
|
|
max_width = str_to_int(*width);
|
|
|
|
|
|
2018-06-25 14:04:33 +02:00
|
|
|
|
return std::make_unique<WrapHighlighter>(max_width, (bool)parser.get_switch("word"),
|
|
|
|
|
(bool)parser.get_switch("indent"),
|
|
|
|
|
parser.get_switch("marker").value_or("").str());
|
2017-04-27 20:27:28 +02:00
|
|
|
|
}
|
2017-05-06 17:14:28 +02:00
|
|
|
|
|
|
|
|
|
const bool m_word_wrap;
|
2017-11-01 18:26:00 +01:00
|
|
|
|
const bool m_preserve_indent;
|
2017-06-08 11:37:48 +02:00
|
|
|
|
const ColumnCount m_max_width;
|
2018-05-26 14:22:00 +02:00
|
|
|
|
const String m_marker;
|
2017-04-27 20:27:28 +02:00
|
|
|
|
};
|
|
|
|
|
|
2017-11-25 05:53:33 +01:00
|
|
|
|
constexpr StringView WrapHighlighter::ms_id;
|
|
|
|
|
|
2017-06-09 14:22:32 +02:00
|
|
|
|
struct TabulationHighlighter : Highlighter
|
2011-10-12 20:52:22 +02:00
|
|
|
|
{
|
2017-06-09 14:22:32 +02:00
|
|
|
|
TabulationHighlighter() : Highlighter{HighlightPass::Move} {}
|
|
|
|
|
|
2017-11-25 05:53:33 +01:00
|
|
|
|
void do_highlight(HighlightContext context, DisplayBuffer& display_buffer, BufferRange) override
|
2011-10-12 20:52:22 +02:00
|
|
|
|
{
|
2017-11-25 05:53:33 +01:00
|
|
|
|
const ColumnCount tabstop = context.context.options()["tabstop"].get<int>();
|
|
|
|
|
auto& buffer = context.context.buffer();
|
2018-06-11 07:10:05 +02:00
|
|
|
|
auto win_column = context.setup.window_pos.column;
|
2017-06-09 14:22:32 +02:00
|
|
|
|
for (auto& line : display_buffer.lines())
|
2011-10-12 20:52:22 +02:00
|
|
|
|
{
|
2017-06-09 14:22:32 +02:00
|
|
|
|
for (auto atom_it = line.begin(); atom_it != line.end(); ++atom_it)
|
2012-07-12 23:19:10 +02:00
|
|
|
|
{
|
2017-06-09 14:22:32 +02:00
|
|
|
|
if (atom_it->type() != DisplayAtom::Range)
|
|
|
|
|
continue;
|
|
|
|
|
|
2017-06-15 18:43:18 +02:00
|
|
|
|
auto begin = get_iterator(buffer, atom_it->begin());
|
|
|
|
|
auto end = get_iterator(buffer, atom_it->end());
|
2017-06-09 14:22:32 +02:00
|
|
|
|
for (BufferIterator it = begin; it != end; ++it)
|
2011-10-15 06:45:49 +02:00
|
|
|
|
{
|
2017-06-09 14:22:32 +02:00
|
|
|
|
if (*it == '\t')
|
|
|
|
|
{
|
|
|
|
|
if (it != begin)
|
|
|
|
|
atom_it = ++line.split(atom_it, it.coord());
|
|
|
|
|
if (it+1 != end)
|
|
|
|
|
atom_it = line.split(atom_it, (it+1).coord());
|
|
|
|
|
|
|
|
|
|
const ColumnCount column = get_column(buffer, tabstop, it.coord());
|
|
|
|
|
const ColumnCount count = tabstop - (column % tabstop) -
|
|
|
|
|
std::max(win_column - column, 0_col);
|
|
|
|
|
atom_it->replace(String{' ', count});
|
|
|
|
|
break;
|
|
|
|
|
}
|
2011-10-15 06:45:49 +02:00
|
|
|
|
}
|
2011-10-12 20:52:22 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2017-06-09 14:22:32 +02:00
|
|
|
|
|
2018-04-06 01:12:17 +02:00
|
|
|
|
void do_compute_display_setup(HighlightContext context, DisplaySetup& setup) const override
|
2017-06-09 14:22:32 +02:00
|
|
|
|
{
|
2017-11-25 05:53:33 +01:00
|
|
|
|
auto& buffer = context.context.buffer();
|
2017-06-09 14:22:32 +02:00
|
|
|
|
// Ensure that a cursor on a tab character makes the full tab character visible
|
2017-11-25 05:53:33 +01:00
|
|
|
|
auto cursor = context.context.selections().main().cursor();
|
2017-06-09 14:22:32 +02:00
|
|
|
|
if (buffer.byte_at(cursor) != '\t')
|
|
|
|
|
return;
|
|
|
|
|
|
2017-11-25 05:53:33 +01:00
|
|
|
|
const ColumnCount tabstop = context.context.options()["tabstop"].get<int>();
|
2017-06-09 14:22:32 +02:00
|
|
|
|
const ColumnCount column = get_column(buffer, tabstop, cursor);
|
|
|
|
|
const ColumnCount width = tabstop - (column % tabstop);
|
|
|
|
|
const ColumnCount win_end = setup.window_pos.column + setup.window_range.column;
|
|
|
|
|
const ColumnCount offset = std::max(column + width - win_end, 0_col);
|
|
|
|
|
|
|
|
|
|
setup.window_pos.column += offset;
|
|
|
|
|
setup.cursor_pos.column -= offset;
|
|
|
|
|
}
|
|
|
|
|
};
|
2011-10-12 20:52:22 +02:00
|
|
|
|
|
2018-08-27 00:05:00 +02:00
|
|
|
|
struct ShowWhitespacesHighlighter : Highlighter
|
2014-05-09 14:50:12 +02:00
|
|
|
|
{
|
2018-08-27 00:05:00 +02:00
|
|
|
|
ShowWhitespacesHighlighter(String tab, String tabpad, String spc, String lf, String nbsp)
|
|
|
|
|
: Highlighter{HighlightPass::Move}, m_tab{std::move(tab)}, m_tabpad{std::move(tabpad)},
|
|
|
|
|
m_spc{std::move(spc)}, m_lf{std::move(lf)}, m_nbsp{std::move(nbsp)}
|
|
|
|
|
{}
|
|
|
|
|
|
|
|
|
|
static std::unique_ptr<Highlighter> create(HighlighterParameters params, Highlighter*)
|
2014-05-09 14:50:12 +02:00
|
|
|
|
{
|
2018-08-27 00:05:00 +02:00
|
|
|
|
static const ParameterDesc param_desc{
|
|
|
|
|
{ { "tab", { true, "" } },
|
|
|
|
|
{ "tabpad", { true, "" } },
|
|
|
|
|
{ "spc", { true, "" } },
|
|
|
|
|
{ "lf", { true, "" } },
|
|
|
|
|
{ "nbsp", { true, "" } } },
|
|
|
|
|
ParameterDesc::Flags::None, 0, 0
|
|
|
|
|
};
|
|
|
|
|
ParametersParser parser(params, param_desc);
|
|
|
|
|
|
|
|
|
|
auto get_param = [&](StringView param, StringView fallback) {
|
|
|
|
|
StringView value = parser.get_switch(param).value_or(fallback);
|
|
|
|
|
if (value.char_length() != 1)
|
|
|
|
|
throw runtime_error{format("-{} expects a single character parameter", param)};
|
|
|
|
|
return value.str();
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
return std::make_unique<ShowWhitespacesHighlighter>(
|
|
|
|
|
get_param("tab", "→"), get_param("tabpad", " "), get_param("spc", "·"),
|
|
|
|
|
get_param("lf", "¬"), get_param("nbsp", "⍽"));
|
|
|
|
|
}
|
2014-05-09 14:50:12 +02:00
|
|
|
|
|
2018-08-27 00:05:00 +02:00
|
|
|
|
private:
|
|
|
|
|
void do_highlight(HighlightContext context, DisplayBuffer& display_buffer, BufferRange)
|
|
|
|
|
{
|
|
|
|
|
const int tabstop = context.context.options()["tabstop"].get<int>();
|
|
|
|
|
auto whitespaceface = context.context.faces()["Whitespace"];
|
|
|
|
|
auto& buffer = context.context.buffer();
|
|
|
|
|
auto win_column = context.setup.window_pos.column;
|
|
|
|
|
for (auto& line : display_buffer.lines())
|
|
|
|
|
{
|
|
|
|
|
for (auto atom_it = line.begin(); atom_it != line.end(); ++atom_it)
|
2014-05-09 14:50:12 +02:00
|
|
|
|
{
|
2018-08-27 00:05:00 +02:00
|
|
|
|
if (atom_it->type() != DisplayAtom::Range)
|
|
|
|
|
continue;
|
2014-05-09 14:50:12 +02:00
|
|
|
|
|
2018-08-27 00:05:00 +02:00
|
|
|
|
auto begin = get_iterator(buffer, atom_it->begin());
|
|
|
|
|
auto end = get_iterator(buffer, atom_it->end());
|
|
|
|
|
for (BufferIterator it = begin; it != end; )
|
|
|
|
|
{
|
|
|
|
|
auto coord = it.coord();
|
|
|
|
|
Codepoint cp = utf8::read_codepoint(it, end);
|
|
|
|
|
if (cp == '\t' or cp == ' ' or cp == '\n' or cp == 0xA0)
|
2014-05-09 14:50:12 +02:00
|
|
|
|
{
|
2018-08-27 00:05:00 +02:00
|
|
|
|
if (coord != begin.coord())
|
|
|
|
|
atom_it = ++line.split(atom_it, coord);
|
|
|
|
|
if (it != end)
|
|
|
|
|
atom_it = line.split(atom_it, it.coord());
|
|
|
|
|
|
|
|
|
|
if (cp == '\t')
|
|
|
|
|
{
|
|
|
|
|
const ColumnCount column = get_column(buffer, tabstop, coord);
|
|
|
|
|
const ColumnCount count = tabstop - (column % tabstop) -
|
|
|
|
|
std::max(win_column - column, 0_col);
|
|
|
|
|
atom_it->replace(m_tab + String(m_tabpad[(CharCount)0], count - m_tab.column_length()));
|
|
|
|
|
}
|
|
|
|
|
else if (cp == ' ')
|
|
|
|
|
atom_it->replace(m_spc);
|
|
|
|
|
else if (cp == '\n')
|
|
|
|
|
atom_it->replace(m_lf);
|
|
|
|
|
else if (cp == 0xA0)
|
|
|
|
|
atom_it->replace(m_nbsp);
|
|
|
|
|
atom_it->face = merge_faces(atom_it->face, whitespaceface);
|
|
|
|
|
break;
|
2014-05-09 14:50:12 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2017-02-04 08:10:14 +01:00
|
|
|
|
|
2018-08-27 00:05:00 +02:00
|
|
|
|
const String m_tab, m_tabpad, m_spc, m_lf, m_nbsp;
|
|
|
|
|
};
|
2015-04-23 21:27:42 +02:00
|
|
|
|
|
2017-04-27 20:27:28 +02:00
|
|
|
|
struct LineNumbersHighlighter : Highlighter
|
2011-10-17 21:01:36 +02:00
|
|
|
|
{
|
2017-04-27 20:27:28 +02:00
|
|
|
|
LineNumbersHighlighter(bool relative, bool hl_cursor_line, String separator)
|
2017-05-03 20:41:37 +02:00
|
|
|
|
: Highlighter{HighlightPass::Move},
|
|
|
|
|
m_relative{relative},
|
2017-04-27 20:27:28 +02:00
|
|
|
|
m_hl_cursor_line{hl_cursor_line},
|
|
|
|
|
m_separator{std::move(separator)} {}
|
|
|
|
|
|
2018-06-28 14:23:48 +02:00
|
|
|
|
static std::unique_ptr<Highlighter> create(HighlighterParameters params, Highlighter*)
|
2011-10-17 21:01:36 +02:00
|
|
|
|
{
|
2017-05-03 20:41:37 +02:00
|
|
|
|
static const ParameterDesc param_desc{
|
|
|
|
|
{ { "relative", { false, "" } },
|
|
|
|
|
{ "separator", { true, "" } },
|
|
|
|
|
{ "hlcursor", { false, "" } } },
|
|
|
|
|
ParameterDesc::Flags::None, 0, 0
|
|
|
|
|
};
|
|
|
|
|
ParametersParser parser(params, param_desc);
|
2017-04-27 20:27:28 +02:00
|
|
|
|
|
2017-05-03 20:41:37 +02:00
|
|
|
|
StringView separator = parser.get_switch("separator").value_or("│");
|
|
|
|
|
if (separator.length() > 10)
|
2018-04-06 16:56:53 +02:00
|
|
|
|
throw runtime_error("separator length is limited to 10 bytes");
|
2017-05-03 20:41:37 +02:00
|
|
|
|
|
2018-06-25 14:04:33 +02:00
|
|
|
|
return std::make_unique<LineNumbersHighlighter>((bool)parser.get_switch("relative"), (bool)parser.get_switch("hlcursor"), separator.str());
|
2017-05-03 20:41:37 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private:
|
2018-07-08 11:11:04 +02:00
|
|
|
|
static constexpr StringView ms_id = "line-numbers";
|
2017-11-25 05:53:33 +01:00
|
|
|
|
|
|
|
|
|
void do_highlight(HighlightContext context, DisplayBuffer& display_buffer, BufferRange) override
|
2017-05-03 20:41:37 +02:00
|
|
|
|
{
|
2017-11-25 05:53:33 +01:00
|
|
|
|
if (contains(context.disabled_ids, ms_id))
|
|
|
|
|
return;
|
|
|
|
|
|
2018-04-07 07:36:39 +02:00
|
|
|
|
auto& faces = context.context.faces();
|
|
|
|
|
const Face face = faces["LineNumbers"];
|
|
|
|
|
const Face face_wrapped = faces["LineNumbersWrapped"];
|
|
|
|
|
const Face face_absolute = faces["LineNumberCursor"];
|
2017-11-25 05:53:33 +01:00
|
|
|
|
int digit_count = compute_digit_count(context.context);
|
2017-04-27 20:27:28 +02:00
|
|
|
|
|
|
|
|
|
char format[16];
|
2017-06-26 14:45:56 +02:00
|
|
|
|
format_to(format, "%{}d", digit_count);
|
2017-11-25 05:53:33 +01:00
|
|
|
|
const int main_line = (int)context.context.selections().main().cursor().line + 1;
|
2017-05-01 22:26:50 +02:00
|
|
|
|
int last_line = -1;
|
2017-04-27 20:27:28 +02:00
|
|
|
|
for (auto& line : display_buffer.lines())
|
|
|
|
|
{
|
|
|
|
|
const int current_line = (int)line.range().begin.line + 1;
|
|
|
|
|
const bool is_cursor_line = main_line == current_line;
|
|
|
|
|
const int line_to_format = (m_relative and not is_cursor_line) ?
|
|
|
|
|
current_line - main_line : current_line;
|
|
|
|
|
char buffer[16];
|
|
|
|
|
snprintf(buffer, 16, format, std::abs(line_to_format));
|
2017-06-26 14:45:56 +02:00
|
|
|
|
const auto atom_face = last_line == current_line ? face_wrapped :
|
2017-05-01 22:26:50 +02:00
|
|
|
|
((m_hl_cursor_line and is_cursor_line) ? face_absolute : face);
|
2017-06-26 14:45:56 +02:00
|
|
|
|
line.insert(line.begin(), {buffer, atom_face});
|
|
|
|
|
line.insert(line.begin() + 1, {m_separator, face});
|
|
|
|
|
|
2017-05-01 22:26:50 +02:00
|
|
|
|
last_line = current_line;
|
2017-04-27 20:27:28 +02:00
|
|
|
|
}
|
2011-10-17 21:01:36 +02:00
|
|
|
|
}
|
|
|
|
|
|
2018-04-06 01:12:17 +02:00
|
|
|
|
void do_compute_display_setup(HighlightContext context, DisplaySetup& setup) const override
|
2017-04-27 20:27:28 +02:00
|
|
|
|
{
|
2017-11-25 05:53:33 +01:00
|
|
|
|
if (contains(context.disabled_ids, ms_id))
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
ColumnCount width = compute_digit_count(context.context) + m_separator.column_length();
|
2018-05-19 02:46:23 +02:00
|
|
|
|
setup.window_range.column -= std::min(width, setup.window_range.column);
|
2017-04-27 20:27:28 +02:00
|
|
|
|
}
|
2015-03-18 22:07:57 +01:00
|
|
|
|
|
2017-11-25 05:53:33 +01:00
|
|
|
|
void fill_unique_ids(Vector<StringView>& unique_ids) const override
|
|
|
|
|
{
|
|
|
|
|
unique_ids.push_back(ms_id);
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-06 01:12:17 +02:00
|
|
|
|
int compute_digit_count(const Context& context) const
|
2017-04-27 20:27:28 +02:00
|
|
|
|
{
|
|
|
|
|
int digit_count = 0;
|
|
|
|
|
LineCount last_line = context.buffer().line_count();
|
|
|
|
|
for (LineCount c = last_line; c > 0; c /= 10)
|
|
|
|
|
++digit_count;
|
|
|
|
|
return digit_count;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const bool m_relative;
|
|
|
|
|
const bool m_hl_cursor_line;
|
|
|
|
|
const String m_separator;
|
|
|
|
|
};
|
2015-03-18 22:07:57 +01:00
|
|
|
|
|
2017-11-25 05:53:33 +01:00
|
|
|
|
constexpr StringView LineNumbersHighlighter::ms_id;
|
|
|
|
|
|
2017-04-27 20:27:28 +02:00
|
|
|
|
|
2017-11-25 05:53:33 +01:00
|
|
|
|
void show_matching_char(HighlightContext context, DisplayBuffer& display_buffer, BufferRange)
|
2014-01-20 22:01:26 +01:00
|
|
|
|
{
|
2018-04-07 07:36:39 +02:00
|
|
|
|
const Face face = context.context.faces()["MatchingChar"];
|
2014-01-20 22:01:26 +01:00
|
|
|
|
using CodepointPair = std::pair<Codepoint, Codepoint>;
|
2014-04-02 23:52:00 +02:00
|
|
|
|
static const CodepointPair matching_chars[] = { { '(', ')' }, { '{', '}' }, { '[', ']' }, { '<', '>' } };
|
2014-01-20 22:01:26 +01:00
|
|
|
|
const auto range = display_buffer.range();
|
2017-11-25 05:53:33 +01:00
|
|
|
|
const auto& buffer = context.context.buffer();
|
|
|
|
|
for (auto& sel : context.context.selections())
|
2014-01-20 22:01:26 +01:00
|
|
|
|
{
|
2014-01-28 20:05:49 +01:00
|
|
|
|
auto pos = sel.cursor();
|
2015-04-23 22:38:45 +02:00
|
|
|
|
if (pos < range.begin or pos >= range.end)
|
2014-01-20 22:01:26 +01:00
|
|
|
|
continue;
|
|
|
|
|
auto c = buffer.byte_at(pos);
|
|
|
|
|
for (auto& pair : matching_chars)
|
|
|
|
|
{
|
|
|
|
|
int level = 1;
|
|
|
|
|
if (c == pair.first)
|
|
|
|
|
{
|
2017-06-15 18:43:18 +02:00
|
|
|
|
for (auto it = get_iterator(buffer, pos)+1,
|
|
|
|
|
end = get_iterator(buffer, range.end); it != end; ++it)
|
2015-03-27 14:18:06 +01:00
|
|
|
|
{
|
|
|
|
|
char c = *it;
|
2014-01-20 22:01:26 +01:00
|
|
|
|
if (c == pair.first)
|
|
|
|
|
++level;
|
|
|
|
|
else if (c == pair.second and --level == 0)
|
2015-03-27 14:18:06 +01:00
|
|
|
|
{
|
|
|
|
|
highlight_range(display_buffer, it.coord(), (it+1).coord(), false,
|
|
|
|
|
apply_face(face));
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2014-01-20 22:01:26 +01:00
|
|
|
|
}
|
2015-04-23 22:38:45 +02:00
|
|
|
|
else if (c == pair.second and pos > range.begin)
|
2014-01-20 22:01:26 +01:00
|
|
|
|
{
|
2017-06-15 18:43:18 +02:00
|
|
|
|
for (auto it = get_iterator(buffer, pos)-1,
|
|
|
|
|
end = get_iterator(buffer, range.begin); true; --it)
|
2015-03-27 14:18:06 +01:00
|
|
|
|
{
|
|
|
|
|
char c = *it;
|
2014-01-20 22:01:26 +01:00
|
|
|
|
if (c == pair.second)
|
|
|
|
|
++level;
|
|
|
|
|
else if (c == pair.first and --level == 0)
|
2015-03-27 14:18:06 +01:00
|
|
|
|
{
|
|
|
|
|
highlight_range(display_buffer, it.coord(), (it+1).coord(), false,
|
|
|
|
|
apply_face(face));
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (it == end)
|
|
|
|
|
break;
|
|
|
|
|
}
|
2014-01-20 22:01:26 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-06-28 14:23:48 +02:00
|
|
|
|
std::unique_ptr<Highlighter> create_matching_char_highlighter(HighlighterParameters params, Highlighter*)
|
2015-04-23 21:27:42 +02:00
|
|
|
|
{
|
2018-06-25 14:04:33 +02:00
|
|
|
|
return make_highlighter(show_matching_char);
|
2015-04-23 21:27:42 +02:00
|
|
|
|
}
|
|
|
|
|
|
2017-11-25 05:53:33 +01:00
|
|
|
|
void highlight_selections(HighlightContext context, DisplayBuffer& display_buffer, BufferRange)
|
2012-04-03 15:22:07 +02:00
|
|
|
|
{
|
2017-11-25 05:53:33 +01:00
|
|
|
|
const auto& buffer = context.context.buffer();
|
2018-04-07 07:36:39 +02:00
|
|
|
|
const auto& faces = context.context.faces();
|
|
|
|
|
const Face sel_faces[6] = {
|
|
|
|
|
faces["PrimarySelection"], faces["SecondarySelection"],
|
|
|
|
|
faces["PrimaryCursor"], faces["SecondaryCursor"],
|
|
|
|
|
faces["PrimaryCursorEol"], faces["SecondaryCursorEol"],
|
2018-02-24 11:24:06 +01:00
|
|
|
|
};
|
2015-09-24 14:55:06 +02:00
|
|
|
|
|
2017-11-25 05:53:33 +01:00
|
|
|
|
const auto& selections = context.context.selections();
|
2016-07-27 10:03:01 +02:00
|
|
|
|
for (size_t i = 0; i < selections.size(); ++i)
|
2012-04-03 15:22:07 +02:00
|
|
|
|
{
|
2016-07-27 10:03:01 +02:00
|
|
|
|
auto& sel = selections[i];
|
2014-01-28 20:05:49 +01:00
|
|
|
|
const bool forward = sel.anchor() <= sel.cursor();
|
2016-09-22 21:36:26 +02:00
|
|
|
|
BufferCoord begin = forward ? sel.anchor() : buffer.char_next(sel.cursor());
|
|
|
|
|
BufferCoord end = forward ? (BufferCoord)sel.cursor() : buffer.char_next(sel.anchor());
|
2013-03-01 19:21:06 +01:00
|
|
|
|
|
2016-07-27 10:03:01 +02:00
|
|
|
|
const bool primary = (i == selections.main_index());
|
2013-12-15 15:57:55 +01:00
|
|
|
|
highlight_range(display_buffer, begin, end, false,
|
2018-04-07 07:36:39 +02:00
|
|
|
|
apply_face(sel_faces[primary ? 0 : 1]));
|
2014-06-16 01:59:05 +02:00
|
|
|
|
}
|
2016-07-27 10:03:01 +02:00
|
|
|
|
for (size_t i = 0; i < selections.size(); ++i)
|
2014-06-16 01:59:05 +02:00
|
|
|
|
{
|
2016-07-27 10:03:01 +02:00
|
|
|
|
auto& sel = selections[i];
|
2018-02-24 11:24:06 +01:00
|
|
|
|
const BufferCoord coord = sel.cursor();
|
2016-07-27 10:03:01 +02:00
|
|
|
|
const bool primary = (i == selections.main_index());
|
2018-02-24 11:24:06 +01:00
|
|
|
|
const bool eol = buffer[coord.line].length() - 1 == coord.column;
|
|
|
|
|
highlight_range(display_buffer, coord, buffer.char_next(coord), false,
|
2018-04-07 07:36:39 +02:00
|
|
|
|
apply_face(sel_faces[2 + (eol ? 2 : 0) + (primary ? 0 : 1)]));
|
2012-04-03 15:22:07 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-11-25 05:53:33 +01:00
|
|
|
|
void expand_unprintable(HighlightContext context, DisplayBuffer& display_buffer, BufferRange)
|
2013-02-26 14:12:21 +01:00
|
|
|
|
{
|
2017-11-25 05:53:33 +01:00
|
|
|
|
auto& buffer = context.context.buffer();
|
2018-04-07 07:36:39 +02:00
|
|
|
|
auto error = context.context.faces()["Error"];
|
2013-02-26 14:12:21 +01:00
|
|
|
|
for (auto& line : display_buffer.lines())
|
|
|
|
|
{
|
2013-03-18 23:35:23 +01:00
|
|
|
|
for (auto atom_it = line.begin(); atom_it != line.end(); ++atom_it)
|
2013-02-26 14:12:21 +01:00
|
|
|
|
{
|
2016-10-13 20:55:15 +02:00
|
|
|
|
if (atom_it->type() == DisplayAtom::Range)
|
2013-02-26 14:12:21 +01:00
|
|
|
|
{
|
2017-06-15 18:43:18 +02:00
|
|
|
|
for (auto it = get_iterator(buffer, atom_it->begin()),
|
|
|
|
|
end = get_iterator(buffer, atom_it->end()); it < end;)
|
2013-02-26 14:12:21 +01:00
|
|
|
|
{
|
2015-09-25 00:00:47 +02:00
|
|
|
|
auto coord = it.coord();
|
2018-02-11 07:39:19 +01:00
|
|
|
|
Codepoint cp = utf8::read_codepoint(it, end);
|
2016-05-19 22:45:23 +02:00
|
|
|
|
if (cp != '\n' and not iswprint((wchar_t)cp))
|
2013-02-26 14:12:21 +01:00
|
|
|
|
{
|
2015-09-25 00:00:47 +02:00
|
|
|
|
if (coord != atom_it->begin())
|
|
|
|
|
atom_it = ++line.split(atom_it, coord);
|
|
|
|
|
if (it.coord() < atom_it->end())
|
|
|
|
|
atom_it = line.split(atom_it, it.coord());
|
2015-06-22 14:56:00 +02:00
|
|
|
|
|
2017-09-12 06:34:13 +02:00
|
|
|
|
atom_it->replace("<EFBFBD>");
|
|
|
|
|
atom_it->face = error;
|
2013-03-18 23:35:23 +01:00
|
|
|
|
break;
|
2013-02-26 14:12:21 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-05-25 09:38:11 +02:00
|
|
|
|
static void update_line_specs_ifn(const Buffer& buffer, LineAndSpecList& line_flags)
|
|
|
|
|
{
|
|
|
|
|
if (line_flags.prefix == buffer.timestamp())
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
auto& lines = line_flags.list;
|
|
|
|
|
|
|
|
|
|
auto modifs = compute_line_modifications(buffer, line_flags.prefix);
|
|
|
|
|
auto ins_pos = lines.begin();
|
|
|
|
|
for (auto it = lines.begin(); it != lines.end(); ++it)
|
|
|
|
|
{
|
|
|
|
|
auto& line = std::get<0>(*it); // that line is 1 based as it comes from user side
|
|
|
|
|
auto modif_it = std::upper_bound(modifs.begin(), modifs.end(), line-1,
|
|
|
|
|
[](const LineCount& l, const LineModification& c)
|
|
|
|
|
{ return l < c.old_line; });
|
|
|
|
|
if (modif_it != modifs.begin())
|
|
|
|
|
{
|
|
|
|
|
auto& prev = *(modif_it-1);
|
|
|
|
|
if (line-1 < prev.old_line + prev.num_removed)
|
|
|
|
|
continue; // line removed
|
|
|
|
|
|
|
|
|
|
line += prev.diff();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ins_pos != it)
|
|
|
|
|
*ins_pos = std::move(*it);
|
|
|
|
|
++ins_pos;
|
|
|
|
|
}
|
|
|
|
|
lines.erase(ins_pos, lines.end());
|
|
|
|
|
line_flags.prefix = buffer.timestamp();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void option_update(LineAndSpecList& opt, const Context& context)
|
|
|
|
|
{
|
|
|
|
|
update_line_specs_ifn(context.buffer(), opt);
|
|
|
|
|
}
|
|
|
|
|
|
2017-11-02 02:51:15 +01:00
|
|
|
|
void option_list_postprocess(Vector<LineAndSpec, MemoryDomain::Options>& opt)
|
|
|
|
|
{
|
|
|
|
|
std::sort(opt.begin(), opt.end(),
|
|
|
|
|
[](auto& lhs, auto& rhs)
|
|
|
|
|
{ return std::get<0>(lhs) < std::get<0>(rhs); });
|
|
|
|
|
}
|
|
|
|
|
|
2017-04-27 20:27:28 +02:00
|
|
|
|
struct FlagLinesHighlighter : Highlighter
|
2013-03-06 14:24:47 +01:00
|
|
|
|
{
|
2017-04-27 20:27:28 +02:00
|
|
|
|
FlagLinesHighlighter(String option_name, String default_face)
|
2017-05-03 20:41:37 +02:00
|
|
|
|
: Highlighter{HighlightPass::Move},
|
|
|
|
|
m_option_name{std::move(option_name)},
|
2017-04-27 20:27:28 +02:00
|
|
|
|
m_default_face{std::move(default_face)} {}
|
2013-11-18 23:44:01 +01:00
|
|
|
|
|
2018-06-28 14:23:48 +02:00
|
|
|
|
static std::unique_ptr<Highlighter> create(HighlighterParameters params, Highlighter*)
|
2011-11-08 15:28:01 +01:00
|
|
|
|
{
|
2017-05-03 20:41:37 +02:00
|
|
|
|
if (params.size() != 2)
|
|
|
|
|
throw runtime_error("wrong parameter count");
|
2015-12-12 12:45:45 +01:00
|
|
|
|
|
2017-05-03 20:41:37 +02:00
|
|
|
|
const String& option_name = params[1];
|
|
|
|
|
const String& default_face = params[0];
|
|
|
|
|
|
|
|
|
|
// throw if wrong option type
|
2017-05-24 16:41:43 +02:00
|
|
|
|
GlobalScope::instance().options()[option_name].get<LineAndSpecList>();
|
2017-05-03 20:41:37 +02:00
|
|
|
|
|
2018-06-25 14:04:33 +02:00
|
|
|
|
return std::make_unique<FlagLinesHighlighter>(option_name, default_face);
|
2017-05-03 20:41:37 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private:
|
2017-11-25 05:53:33 +01:00
|
|
|
|
void do_highlight(HighlightContext context, DisplayBuffer& display_buffer, BufferRange) override
|
2017-05-03 20:41:37 +02:00
|
|
|
|
{
|
2017-11-25 05:53:33 +01:00
|
|
|
|
auto& line_flags = context.context.options()[m_option_name].get_mutable<LineAndSpecList>();
|
|
|
|
|
auto& buffer = context.context.buffer();
|
2017-05-25 09:38:11 +02:00
|
|
|
|
update_line_specs_ifn(buffer, line_flags);
|
2014-10-22 01:20:09 +02:00
|
|
|
|
|
2018-04-07 07:36:39 +02:00
|
|
|
|
auto def_face = context.context.faces()[m_default_face];
|
2015-12-13 00:16:07 +01:00
|
|
|
|
Vector<DisplayLine> display_lines;
|
2017-04-27 20:27:28 +02:00
|
|
|
|
auto& lines = line_flags.list;
|
2017-05-01 23:05:03 +02:00
|
|
|
|
try
|
2015-12-13 00:16:07 +01:00
|
|
|
|
{
|
2017-05-01 23:05:03 +02:00
|
|
|
|
for (auto& line : lines)
|
|
|
|
|
{
|
2018-04-07 07:36:39 +02:00
|
|
|
|
display_lines.push_back(parse_display_line(std::get<1>(line), context.context.faces()));
|
2017-05-01 23:05:03 +02:00
|
|
|
|
for (auto& atom : display_lines.back())
|
|
|
|
|
atom.face = merge_faces(def_face, atom.face);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
catch (runtime_error& err)
|
|
|
|
|
{
|
|
|
|
|
write_to_debug_buffer(format("Error while evaluating line flag: {}", err.what()));
|
|
|
|
|
return;
|
2015-12-13 00:16:07 +01:00
|
|
|
|
}
|
2015-08-23 13:13:14 +02:00
|
|
|
|
|
2016-09-22 21:36:26 +02:00
|
|
|
|
ColumnCount width = 0;
|
2015-12-13 00:16:07 +01:00
|
|
|
|
for (auto& l : display_lines)
|
|
|
|
|
width = std::max(width, l.length());
|
|
|
|
|
const DisplayAtom empty{String{' ', width}, def_face};
|
2014-10-22 01:20:09 +02:00
|
|
|
|
for (auto& line : display_buffer.lines())
|
|
|
|
|
{
|
2015-04-23 22:38:45 +02:00
|
|
|
|
int line_num = (int)line.range().begin.line + 1;
|
2014-10-22 01:20:09 +02:00
|
|
|
|
auto it = find_if(lines,
|
2017-05-24 16:41:43 +02:00
|
|
|
|
[&](const LineAndSpec& l)
|
2014-10-22 01:20:09 +02:00
|
|
|
|
{ return std::get<0>(l) == line_num; });
|
2015-12-13 00:16:07 +01:00
|
|
|
|
if (it == lines.end())
|
|
|
|
|
line.insert(line.begin(), empty);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
DisplayLine& display_line = display_lines[it - lines.begin()];
|
|
|
|
|
DisplayAtom padding_atom{String(' ', width - display_line.length()), def_face};
|
|
|
|
|
auto it = std::copy(std::make_move_iterator(display_line.begin()),
|
|
|
|
|
std::make_move_iterator(display_line.end()),
|
|
|
|
|
std::inserter(line, line.begin()));
|
|
|
|
|
|
|
|
|
|
if (padding_atom.length() != 0)
|
|
|
|
|
*it++ = std::move(padding_atom);
|
|
|
|
|
}
|
2014-10-22 01:20:09 +02:00
|
|
|
|
}
|
2017-04-27 20:27:28 +02:00
|
|
|
|
}
|
|
|
|
|
|
2018-04-06 01:12:17 +02:00
|
|
|
|
void do_compute_display_setup(HighlightContext context, DisplaySetup& setup) const override
|
2017-04-27 20:27:28 +02:00
|
|
|
|
{
|
2017-11-25 05:53:33 +01:00
|
|
|
|
auto& line_flags = context.context.options()[m_option_name].get_mutable<LineAndSpecList>();
|
|
|
|
|
auto& buffer = context.context.buffer();
|
2017-05-25 09:38:11 +02:00
|
|
|
|
update_line_specs_ifn(buffer, line_flags);
|
2017-04-27 20:27:28 +02:00
|
|
|
|
|
|
|
|
|
ColumnCount width = 0;
|
2017-11-01 18:27:04 +01:00
|
|
|
|
try
|
2017-05-01 23:05:03 +02:00
|
|
|
|
{
|
|
|
|
|
for (auto& line : line_flags.list)
|
2018-04-07 07:36:39 +02:00
|
|
|
|
width = std::max(parse_display_line(std::get<1>(line), context.context.faces()).length(), width);
|
2017-05-01 23:05:03 +02:00
|
|
|
|
}
|
|
|
|
|
catch (runtime_error& err)
|
|
|
|
|
{
|
|
|
|
|
write_to_debug_buffer(format("Error while evaluating line flag: {}", err.what()));
|
|
|
|
|
return;
|
|
|
|
|
}
|
2017-04-27 20:27:28 +02:00
|
|
|
|
|
2018-05-19 02:46:23 +02:00
|
|
|
|
setup.window_range.column -= std::min(width, setup.window_range.column);
|
2017-04-27 20:27:28 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
String m_option_name;
|
|
|
|
|
String m_default_face;
|
|
|
|
|
};
|
2011-11-08 15:28:01 +01:00
|
|
|
|
|
2017-05-08 13:34:57 +02:00
|
|
|
|
String option_to_string(InclusiveBufferRange range)
|
|
|
|
|
{
|
|
|
|
|
return format("{}.{},{}.{}",
|
|
|
|
|
range.first.line+1, range.first.column+1,
|
|
|
|
|
range.last.line+1, range.last.column+1);
|
|
|
|
|
}
|
|
|
|
|
|
2018-05-27 05:00:04 +02:00
|
|
|
|
InclusiveBufferRange option_from_string(Meta::Type<InclusiveBufferRange>, StringView str)
|
2017-05-08 13:34:57 +02:00
|
|
|
|
{
|
|
|
|
|
auto sep = find_if(str, [](char c){ return c == ',' or c == '+'; });
|
|
|
|
|
auto dot_beg = find(StringView{str.begin(), sep}, '.');
|
|
|
|
|
auto dot_end = find(StringView{sep, str.end()}, '.');
|
|
|
|
|
|
|
|
|
|
if (sep == str.end() or dot_beg == sep or
|
|
|
|
|
(*sep == ',' and dot_end == str.end()))
|
|
|
|
|
throw runtime_error(format("'{}' does not follow <line>.<column>,<line>.<column> or <line>.<column>+<len> format", str));
|
|
|
|
|
|
|
|
|
|
const BufferCoord first{str_to_int({str.begin(), dot_beg}) - 1,
|
|
|
|
|
str_to_int({dot_beg+1, sep}) - 1};
|
|
|
|
|
|
|
|
|
|
const bool len = (*sep == '+');
|
|
|
|
|
const BufferCoord last{len ? first.line : str_to_int({sep+1, dot_end}) - 1,
|
|
|
|
|
len ? first.column + str_to_int({sep+1, str.end()}) - 1
|
|
|
|
|
: str_to_int({dot_end+1, str.end()}) - 1 };
|
|
|
|
|
|
|
|
|
|
if (first.line < 0 or first.column < 0 or last.line < 0 or last.column < 0)
|
|
|
|
|
throw runtime_error("coordinates elements should be >= 1");
|
|
|
|
|
|
2018-05-27 05:00:04 +02:00
|
|
|
|
return { std::min(first, last), std::max(first, last) };
|
2017-05-08 13:34:57 +02:00
|
|
|
|
}
|
2014-10-22 01:20:09 +02:00
|
|
|
|
|
2017-05-17 20:35:54 +02:00
|
|
|
|
BufferCoord& get_first(RangeAndString& r) { return std::get<0>(r).first; }
|
|
|
|
|
BufferCoord& get_last(RangeAndString& r) { return std::get<0>(r).last; }
|
2017-01-13 14:45:46 +01:00
|
|
|
|
|
2017-11-02 02:51:15 +01:00
|
|
|
|
void option_list_postprocess(Vector<RangeAndString, MemoryDomain::Options>& opt)
|
|
|
|
|
{
|
|
|
|
|
std::sort(opt.begin(), opt.end(),
|
|
|
|
|
[](auto& lhs, auto& rhs) {
|
|
|
|
|
return std::get<0>(lhs).first == std::get<0>(rhs).first ?
|
|
|
|
|
std::get<0>(lhs).last < std::get<0>(rhs).last
|
|
|
|
|
: std::get<0>(lhs).first < std::get<0>(rhs).first;
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
2017-05-25 09:38:11 +02:00
|
|
|
|
void option_update(RangeAndStringList& opt, const Context& context)
|
|
|
|
|
{
|
2018-06-11 05:33:26 +02:00
|
|
|
|
update_ranges(context.buffer(), opt.prefix, opt.list);
|
2017-05-25 09:38:11 +02:00
|
|
|
|
}
|
|
|
|
|
|
2017-05-08 13:05:45 +02:00
|
|
|
|
struct RangesHighlighter : Highlighter
|
2015-12-17 05:07:09 +01:00
|
|
|
|
{
|
2017-05-08 13:05:45 +02:00
|
|
|
|
RangesHighlighter(String option_name)
|
|
|
|
|
: Highlighter{HighlightPass::Colorize}
|
|
|
|
|
, m_option_name{std::move(option_name)} {}
|
2015-12-17 05:07:09 +01:00
|
|
|
|
|
2018-06-28 14:23:48 +02:00
|
|
|
|
static std::unique_ptr<Highlighter> create(HighlighterParameters params, Highlighter*)
|
2017-05-08 13:05:45 +02:00
|
|
|
|
{
|
|
|
|
|
if (params.size() != 1)
|
|
|
|
|
throw runtime_error("wrong parameter count");
|
2015-12-17 05:07:09 +01:00
|
|
|
|
|
2017-05-08 13:05:45 +02:00
|
|
|
|
const String& option_name = params[0];
|
|
|
|
|
// throw if wrong option type
|
2017-05-25 09:38:11 +02:00
|
|
|
|
GlobalScope::instance().options()[option_name].get<RangeAndStringList>();
|
2015-12-17 05:07:09 +01:00
|
|
|
|
|
2018-06-25 14:04:33 +02:00
|
|
|
|
return std::make_unique<RangesHighlighter>(option_name);
|
2017-05-08 13:05:45 +02:00
|
|
|
|
}
|
2015-12-17 05:07:09 +01:00
|
|
|
|
|
2017-05-08 13:05:45 +02:00
|
|
|
|
private:
|
2017-11-25 05:53:33 +01:00
|
|
|
|
void do_highlight(HighlightContext context, DisplayBuffer& display_buffer, BufferRange) override
|
2017-05-08 13:05:45 +02:00
|
|
|
|
{
|
2017-11-25 05:53:33 +01:00
|
|
|
|
auto& buffer = context.context.buffer();
|
|
|
|
|
auto& range_and_faces = context.context.options()[m_option_name].get_mutable<RangeAndStringList>();
|
2018-06-11 05:33:26 +02:00
|
|
|
|
update_ranges(buffer, range_and_faces.prefix, range_and_faces.list);
|
2015-12-17 05:07:09 +01:00
|
|
|
|
|
2017-05-08 13:05:45 +02:00
|
|
|
|
for (auto& range : range_and_faces.list)
|
2015-12-17 05:07:09 +01:00
|
|
|
|
{
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
auto& r = std::get<0>(range);
|
2018-03-16 13:25:37 +01:00
|
|
|
|
if (buffer.is_valid(r.first) and (buffer.is_valid(r.last) and not buffer.is_end(r.last)))
|
2017-12-21 01:25:23 +01:00
|
|
|
|
highlight_range(display_buffer, r.first, buffer.char_next(r.last), false,
|
2018-04-07 07:36:39 +02:00
|
|
|
|
apply_face(context.context.faces()[std::get<1>(range)]));
|
2015-12-17 05:07:09 +01:00
|
|
|
|
}
|
|
|
|
|
catch (runtime_error&)
|
|
|
|
|
{}
|
|
|
|
|
}
|
2017-05-08 13:05:45 +02:00
|
|
|
|
}
|
2015-12-17 05:07:09 +01:00
|
|
|
|
|
2017-05-09 11:53:27 +02:00
|
|
|
|
const String m_option_name;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct ReplaceRangesHighlighter : Highlighter
|
|
|
|
|
{
|
|
|
|
|
ReplaceRangesHighlighter(String option_name)
|
|
|
|
|
: Highlighter{HighlightPass::Colorize}
|
|
|
|
|
, m_option_name{std::move(option_name)} {}
|
|
|
|
|
|
2018-06-28 14:23:48 +02:00
|
|
|
|
static std::unique_ptr<Highlighter> create(HighlighterParameters params, Highlighter*)
|
2017-05-08 13:05:45 +02:00
|
|
|
|
{
|
2017-05-09 11:53:27 +02:00
|
|
|
|
if (params.size() != 1)
|
|
|
|
|
throw runtime_error("wrong parameter count");
|
2017-05-08 13:05:45 +02:00
|
|
|
|
|
2017-05-09 11:53:27 +02:00
|
|
|
|
const String& option_name = params[0];
|
|
|
|
|
// throw if wrong option type
|
2017-05-25 09:38:11 +02:00
|
|
|
|
GlobalScope::instance().options()[option_name].get<RangeAndStringList>();
|
2017-05-08 13:05:45 +02:00
|
|
|
|
|
2018-06-25 14:04:33 +02:00
|
|
|
|
return std::make_unique<ReplaceRangesHighlighter>(option_name);
|
2017-05-09 11:53:27 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private:
|
2017-11-25 05:53:33 +01:00
|
|
|
|
void do_highlight(HighlightContext context, DisplayBuffer& display_buffer, BufferRange) override
|
2017-05-09 11:53:27 +02:00
|
|
|
|
{
|
2017-11-25 05:53:33 +01:00
|
|
|
|
auto& buffer = context.context.buffer();
|
|
|
|
|
auto& range_and_faces = context.context.options()[m_option_name].get_mutable<RangeAndStringList>();
|
2018-06-11 05:33:26 +02:00
|
|
|
|
update_ranges(buffer, range_and_faces.prefix, range_and_faces.list);
|
2017-05-09 11:53:27 +02:00
|
|
|
|
|
|
|
|
|
for (auto& range : range_and_faces.list)
|
|
|
|
|
{
|
|
|
|
|
try
|
2017-05-08 13:05:45 +02:00
|
|
|
|
{
|
2017-05-09 11:53:27 +02:00
|
|
|
|
auto& r = std::get<0>(range);
|
|
|
|
|
if (buffer.is_valid(r.first) and buffer.is_valid(r.last))
|
|
|
|
|
{
|
2018-04-07 07:36:39 +02:00
|
|
|
|
auto replacement = parse_display_line(std::get<1>(range), context.context.faces());
|
2017-05-09 11:53:27 +02:00
|
|
|
|
replace_range(display_buffer, r.first, buffer.char_next(r.last),
|
|
|
|
|
[&](DisplayLine& line, int beg_idx, int end_idx){
|
|
|
|
|
auto it = line.erase(line.begin() + beg_idx, line.begin() + end_idx);
|
|
|
|
|
for (auto& atom : replacement)
|
|
|
|
|
it = ++line.insert(it, std::move(atom));
|
|
|
|
|
});
|
|
|
|
|
}
|
2017-05-08 13:05:45 +02:00
|
|
|
|
}
|
2017-05-09 11:53:27 +02:00
|
|
|
|
catch (runtime_error&)
|
|
|
|
|
{}
|
2017-05-08 13:05:45 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const String m_option_name;
|
|
|
|
|
};
|
2015-12-17 05:07:09 +01:00
|
|
|
|
|
2017-05-10 11:31:34 +02:00
|
|
|
|
HighlightPass parse_passes(StringView str)
|
|
|
|
|
{
|
|
|
|
|
HighlightPass passes{};
|
|
|
|
|
for (auto pass : str | split<StringView>('|'))
|
|
|
|
|
{
|
|
|
|
|
if (pass == "colorize")
|
|
|
|
|
passes |= HighlightPass::Colorize;
|
|
|
|
|
else if (pass == "move")
|
|
|
|
|
passes |= HighlightPass::Move;
|
|
|
|
|
else if (pass == "wrap")
|
|
|
|
|
passes |= HighlightPass::Wrap;
|
|
|
|
|
else
|
|
|
|
|
throw runtime_error{format("invalid highlight pass: {}", pass)};
|
|
|
|
|
}
|
|
|
|
|
if (passes == HighlightPass{})
|
|
|
|
|
throw runtime_error{"no passes specified"};
|
|
|
|
|
|
|
|
|
|
return passes;
|
|
|
|
|
}
|
|
|
|
|
|
2018-06-28 14:23:48 +02:00
|
|
|
|
std::unique_ptr<Highlighter> create_highlighter_group(HighlighterParameters params, Highlighter*)
|
2012-01-15 14:45:18 +01:00
|
|
|
|
{
|
2017-05-04 13:16:38 +02:00
|
|
|
|
static const ParameterDesc param_desc{
|
|
|
|
|
{ { "passes", { true, "" } } },
|
2018-06-25 14:04:33 +02:00
|
|
|
|
ParameterDesc::Flags::SwitchesOnlyAtStart, 0, 0
|
2017-05-04 13:16:38 +02:00
|
|
|
|
};
|
|
|
|
|
ParametersParser parser{params, param_desc};
|
|
|
|
|
HighlightPass passes = parse_passes(parser.get_switch("passes").value_or("colorize"));
|
2012-01-15 14:45:18 +01:00
|
|
|
|
|
2018-06-25 14:04:33 +02:00
|
|
|
|
return std::make_unique<HighlighterGroup>(passes);
|
2012-01-15 14:45:18 +01:00
|
|
|
|
}
|
|
|
|
|
|
2017-06-26 17:50:12 +02:00
|
|
|
|
struct ReferenceHighlighter : Highlighter
|
2013-12-03 23:03:10 +01:00
|
|
|
|
{
|
2017-06-26 17:50:12 +02:00
|
|
|
|
ReferenceHighlighter(HighlightPass passes, String name)
|
|
|
|
|
: Highlighter{passes}, m_name{std::move(name)} {}
|
|
|
|
|
|
2018-06-28 14:23:48 +02:00
|
|
|
|
static std::unique_ptr<Highlighter> create(HighlighterParameters params, Highlighter*)
|
2017-06-26 17:50:12 +02:00
|
|
|
|
{
|
|
|
|
|
static const ParameterDesc param_desc{
|
|
|
|
|
{ { "passes", { true, "" } } },
|
|
|
|
|
ParameterDesc::Flags::SwitchesOnlyAtStart, 1, 1
|
|
|
|
|
};
|
|
|
|
|
ParametersParser parser{params, param_desc};
|
|
|
|
|
HighlightPass passes = parse_passes(parser.get_switch("passes").value_or("colorize"));
|
2018-06-25 14:04:33 +02:00
|
|
|
|
return std::make_unique<ReferenceHighlighter>(passes, parser[0]);
|
2017-06-26 17:50:12 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private:
|
2017-11-25 05:53:33 +01:00
|
|
|
|
void do_highlight(HighlightContext context, DisplayBuffer& display_buffer, BufferRange range) override
|
2017-06-26 17:50:12 +02:00
|
|
|
|
{
|
2018-03-11 01:40:26 +01:00
|
|
|
|
static Vector<std::pair<StringView, BufferRange>> running_refs;
|
|
|
|
|
const std::pair<StringView, BufferRange> desc{m_name, range};
|
|
|
|
|
if (contains(running_refs, desc))
|
|
|
|
|
return write_to_debug_buffer(format("highlighting recursion detected with ref to {}", m_name));
|
|
|
|
|
|
|
|
|
|
running_refs.push_back(desc);
|
|
|
|
|
auto pop_desc = on_scope_end([] { running_refs.pop_back(); });
|
|
|
|
|
|
2017-06-26 17:50:12 +02:00
|
|
|
|
try
|
|
|
|
|
{
|
2017-11-25 05:53:33 +01:00
|
|
|
|
DefinedHighlighters::instance().get_child(m_name).highlight(context, display_buffer, range);
|
2017-06-26 17:50:12 +02:00
|
|
|
|
}
|
|
|
|
|
catch (child_not_found&)
|
|
|
|
|
{}
|
|
|
|
|
}
|
2013-12-03 23:03:10 +01:00
|
|
|
|
|
2018-04-06 01:12:17 +02:00
|
|
|
|
void do_compute_display_setup(HighlightContext context, DisplaySetup& setup) const override
|
2014-10-22 01:20:09 +02:00
|
|
|
|
{
|
|
|
|
|
try
|
|
|
|
|
{
|
2017-11-25 05:53:33 +01:00
|
|
|
|
DefinedHighlighters::instance().get_child(m_name).compute_display_setup(context, setup);
|
2014-10-22 01:20:09 +02:00
|
|
|
|
}
|
|
|
|
|
catch (child_not_found&)
|
|
|
|
|
{}
|
2017-06-26 17:50:12 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const String m_name;
|
|
|
|
|
};
|
2013-12-03 23:03:10 +01:00
|
|
|
|
|
2014-07-14 22:42:19 +02:00
|
|
|
|
struct RegexMatch
|
2014-06-11 22:26:01 +02:00
|
|
|
|
{
|
|
|
|
|
LineCount line;
|
|
|
|
|
ByteCount begin;
|
|
|
|
|
ByteCount end;
|
2017-02-07 00:00:13 +01:00
|
|
|
|
StringView capture;
|
2014-06-11 22:26:01 +02:00
|
|
|
|
|
2016-09-22 21:36:26 +02:00
|
|
|
|
BufferCoord begin_coord() const { return { line, begin }; }
|
|
|
|
|
BufferCoord end_coord() const { return { line, end }; }
|
2014-06-11 22:26:01 +02:00
|
|
|
|
};
|
2015-01-12 14:24:30 +01:00
|
|
|
|
using RegexMatchList = Vector<RegexMatch, MemoryDomain::Highlight>;
|
2014-06-11 22:26:01 +02:00
|
|
|
|
|
2017-02-07 00:00:13 +01:00
|
|
|
|
void find_matches(const Buffer& buffer, RegexMatchList& matches, const Regex& regex, bool capture)
|
2014-06-11 22:26:01 +02:00
|
|
|
|
{
|
2017-02-07 00:00:13 +01:00
|
|
|
|
capture = capture and regex.mark_count() > 0;
|
2014-06-11 22:26:01 +02:00
|
|
|
|
for (auto line = 0_line, end = buffer.line_count(); line < end; ++line)
|
|
|
|
|
{
|
2014-10-03 14:39:13 +02:00
|
|
|
|
auto l = buffer[line];
|
2014-10-13 14:12:33 +02:00
|
|
|
|
for (RegexIterator<const char*> it{l.begin(), l.end(), regex}, end{}; it != end; ++it)
|
2014-06-11 22:26:01 +02:00
|
|
|
|
{
|
2017-02-07 00:00:13 +01:00
|
|
|
|
auto& m = *it;
|
|
|
|
|
ByteCount b = (int)(m[0].first - l.begin());
|
|
|
|
|
ByteCount e = (int)(m[0].second - l.begin());
|
|
|
|
|
auto cap = (capture and m[1].matched) ? StringView{m[1].first, m[1].second} : StringView{};
|
|
|
|
|
matches.push_back({ line, b, e, cap });
|
2014-06-11 22:26:01 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-09 14:48:41 +01:00
|
|
|
|
void update_matches(const Buffer& buffer, ConstArrayView<LineModification> modifs,
|
2017-02-07 00:00:13 +01:00
|
|
|
|
RegexMatchList& matches, const Regex& regex, bool capture)
|
2014-06-11 22:26:01 +02: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 00:19:07 +01: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-11 22:26:01 +02:00
|
|
|
|
|
2015-02-02 00:19:07 +01:00
|
|
|
|
if (modif_it != modifs.begin())
|
2014-06-11 22:26:01 +02:00
|
|
|
|
{
|
|
|
|
|
auto& prev = *(modif_it-1);
|
2015-02-02 00:30:58 +01:00
|
|
|
|
if (it->line < prev.old_line + prev.num_removed)
|
|
|
|
|
continue; // match removed
|
|
|
|
|
|
2014-06-11 22:26:01 +02:00
|
|
|
|
it->line += prev.diff();
|
|
|
|
|
}
|
|
|
|
|
|
2015-02-02 00:30:58 +01: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-11 22:26:01 +02:00
|
|
|
|
}
|
|
|
|
|
matches.erase(ins_pos, matches.end());
|
|
|
|
|
size_t pivot = matches.size();
|
|
|
|
|
|
|
|
|
|
// try to find new matches in each updated lines
|
2017-02-07 00:00:13 +01:00
|
|
|
|
capture = capture and regex.mark_count() > 0;
|
2014-06-11 22:26:01 +02:00
|
|
|
|
for (auto& modif : modifs)
|
|
|
|
|
{
|
2015-02-02 00:19:07 +01:00
|
|
|
|
for (auto line = modif.new_line; line < modif.new_line + modif.num_added; ++line)
|
2014-06-11 22:26:01 +02:00
|
|
|
|
{
|
2014-10-03 14:39:13 +02:00
|
|
|
|
auto l = buffer[line];
|
2014-10-13 14:12:33 +02:00
|
|
|
|
for (RegexIterator<const char*> it{l.begin(), l.end(), regex}, end{}; it != end; ++it)
|
2014-06-11 22:26:01 +02:00
|
|
|
|
{
|
2017-02-07 00:00:13 +01:00
|
|
|
|
auto& m = *it;
|
|
|
|
|
ByteCount b = (int)(m[0].first - l.begin());
|
|
|
|
|
ByteCount e = (int)(m[0].second - l.begin());
|
|
|
|
|
auto cap = (capture and m[1].matched) ? StringView{m[1].first, m[1].second} : StringView{};
|
|
|
|
|
matches.push_back({ line, b, e, cap });
|
2014-06-11 22:26:01 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
std::inplace_merge(matches.begin(), matches.begin() + pivot, matches.end(),
|
2014-07-14 22:42:19 +02:00
|
|
|
|
[](const RegexMatch& lhs, const RegexMatch& rhs) {
|
2014-06-11 22:26:01 +02:00
|
|
|
|
return lhs.begin_coord() < rhs.begin_coord();
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct RegionMatches
|
|
|
|
|
{
|
2014-07-14 22:42:19 +02:00
|
|
|
|
RegexMatchList begin_matches;
|
|
|
|
|
RegexMatchList end_matches;
|
|
|
|
|
RegexMatchList recurse_matches;
|
2014-06-11 22:26:01 +02:00
|
|
|
|
|
2016-09-22 21:36:26 +02:00
|
|
|
|
static bool compare_to_begin(const RegexMatch& lhs, BufferCoord rhs)
|
2014-06-11 22:26:01 +02:00
|
|
|
|
{
|
2014-06-16 20:41:07 +02:00
|
|
|
|
return lhs.begin_coord() < rhs;
|
2014-06-11 22:26:01 +02:00
|
|
|
|
}
|
|
|
|
|
|
2016-09-22 21:36:26 +02:00
|
|
|
|
RegexMatchList::const_iterator find_next_begin(BufferCoord pos) const
|
2014-06-11 22:26:01 +02:00
|
|
|
|
{
|
2014-06-16 20:41:07 +02:00
|
|
|
|
return std::lower_bound(begin_matches.begin(), begin_matches.end(),
|
|
|
|
|
pos, compare_to_begin);
|
2014-06-11 22:26:01 +02:00
|
|
|
|
}
|
|
|
|
|
|
2017-02-07 00:00:13 +01:00
|
|
|
|
RegexMatchList::const_iterator find_matching_end(BufferCoord beg_pos, Optional<StringView> capture) const
|
2014-06-11 22:26:01 +02:00
|
|
|
|
{
|
|
|
|
|
auto end_it = end_matches.begin();
|
|
|
|
|
auto rec_it = recurse_matches.begin();
|
|
|
|
|
int recurse_level = 0;
|
|
|
|
|
while (true)
|
|
|
|
|
{
|
2017-02-07 00:00:13 +01: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-11 22:26:01 +02:00
|
|
|
|
|
|
|
|
|
if (end_it == end_matches.end())
|
|
|
|
|
return end_it;
|
|
|
|
|
|
|
|
|
|
while (rec_it != recurse_matches.end() and
|
2018-06-17 03:06:20 +02:00
|
|
|
|
rec_it->end_coord() <= end_it->end_coord())
|
2014-06-11 22:26:01 +02:00
|
|
|
|
{
|
2017-02-07 00:00:13 +01:00
|
|
|
|
if (not capture or rec_it->capture == *capture)
|
|
|
|
|
++recurse_level;
|
2014-06-11 22:26:01 +02:00
|
|
|
|
++rec_it;
|
|
|
|
|
}
|
|
|
|
|
|
2017-02-07 00:00:13 +01:00
|
|
|
|
if (not capture or *capture == end_it->capture)
|
|
|
|
|
{
|
|
|
|
|
if (recurse_level == 0)
|
|
|
|
|
return end_it;
|
|
|
|
|
--recurse_level;
|
|
|
|
|
}
|
2014-06-11 22:26:01 +02:00
|
|
|
|
|
2017-10-08 05:48:58 +02:00
|
|
|
|
if (beg_pos != end_it->end_coord())
|
|
|
|
|
beg_pos = end_it->end_coord();
|
2018-07-02 09:42:19 +02:00
|
|
|
|
++end_it;
|
2014-06-11 22:26:01 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
2014-10-22 01:20:09 +02:00
|
|
|
|
struct RegionsHighlighter : public Highlighter
|
2014-06-12 00:29:23 +02:00
|
|
|
|
{
|
|
|
|
|
public:
|
2018-06-28 11:50:23 +02:00
|
|
|
|
RegionsHighlighter()
|
|
|
|
|
: Highlighter{HighlightPass::Colorize} {}
|
2014-06-12 00:29:23 +02:00
|
|
|
|
|
2018-06-28 11:50:23 +02:00
|
|
|
|
void do_highlight(HighlightContext context, DisplayBuffer& display_buffer, BufferRange range) override
|
2014-06-12 00:29:23 +02:00
|
|
|
|
{
|
|
|
|
|
if (m_regions.empty())
|
2018-06-28 11:50:23 +02:00
|
|
|
|
return;
|
2014-06-12 00:29:23 +02:00
|
|
|
|
|
2014-12-02 20:56:17 +01:00
|
|
|
|
auto display_range = display_buffer.range();
|
2017-11-25 05:53:33 +01:00
|
|
|
|
const auto& buffer = context.context.buffer();
|
2014-12-02 20:56:17 +01:00
|
|
|
|
auto& regions = get_regions_for_range(buffer, range);
|
2014-06-12 00:29:23 +02:00
|
|
|
|
|
2015-04-23 22:38:45 +02:00
|
|
|
|
auto begin = std::lower_bound(regions.begin(), regions.end(), display_range.begin,
|
2016-09-22 21:36:26 +02:00
|
|
|
|
[](const Region& r, BufferCoord c) { return r.end < c; });
|
2015-04-23 22:38:45 +02:00
|
|
|
|
auto end = std::lower_bound(begin, regions.end(), display_range.end,
|
2016-09-22 21:36:26 +02:00
|
|
|
|
[](const Region& r, BufferCoord c) { return r.begin < c; });
|
|
|
|
|
auto correct = [&](BufferCoord c) -> BufferCoord {
|
2015-03-23 20:18:56 +01:00
|
|
|
|
if (not buffer.is_end(c) and buffer[c.line].length() == c.column)
|
2014-06-12 00:29:23 +02:00
|
|
|
|
return {c.line+1, 0};
|
|
|
|
|
return c;
|
|
|
|
|
};
|
|
|
|
|
|
2018-06-28 11:50:23 +02:00
|
|
|
|
auto default_region_it = m_regions.find(m_default_region);
|
|
|
|
|
const bool apply_default = default_region_it != m_regions.end();
|
2014-06-12 00:29:23 +02:00
|
|
|
|
|
2015-02-16 14:25:17 +01:00
|
|
|
|
auto last_begin = (begin == regions.begin()) ?
|
2016-09-22 21:36:26 +02:00
|
|
|
|
BufferCoord{0,0} : (begin-1)->end;
|
2016-07-15 21:26:58 +02:00
|
|
|
|
kak_assert(begin <= end);
|
2014-06-12 00:29:23 +02:00
|
|
|
|
for (; begin != end; ++begin)
|
|
|
|
|
{
|
|
|
|
|
if (apply_default and last_begin < begin->begin)
|
2017-11-25 05:53:33 +01:00
|
|
|
|
apply_highlighter(context, display_buffer,
|
2014-06-12 00:29:23 +02:00
|
|
|
|
correct(last_begin), correct(begin->begin),
|
2018-06-28 11:50:23 +02:00
|
|
|
|
*default_region_it->value);
|
2014-06-12 00:29:23 +02:00
|
|
|
|
|
2018-06-28 11:50:23 +02:00
|
|
|
|
auto it = m_regions.find(begin->region);
|
|
|
|
|
if (it == m_regions.end())
|
2014-06-12 00:29:23 +02:00
|
|
|
|
continue;
|
2017-11-25 05:53:33 +01:00
|
|
|
|
apply_highlighter(context, display_buffer,
|
2014-06-12 00:29:23 +02:00
|
|
|
|
correct(begin->begin), correct(begin->end),
|
2018-06-28 11:50:23 +02:00
|
|
|
|
*it->value);
|
2014-06-12 00:29:23 +02:00
|
|
|
|
last_begin = begin->end;
|
|
|
|
|
}
|
2015-04-23 22:38:45 +02:00
|
|
|
|
if (apply_default and last_begin < display_range.end)
|
2017-11-25 05:53:33 +01:00
|
|
|
|
apply_highlighter(context, display_buffer,
|
2015-04-23 22:38:45 +02:00
|
|
|
|
correct(last_begin), range.end,
|
2018-06-28 11:50:23 +02:00
|
|
|
|
*default_region_it->value);
|
2014-06-12 00:29:23 +02:00
|
|
|
|
}
|
2014-10-22 01:20:09 +02: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);
|
2018-06-28 11:50:23 +02:00
|
|
|
|
auto it = m_regions.find(id);
|
|
|
|
|
if (it == m_regions.end())
|
2015-06-01 20:06:35 +02:00
|
|
|
|
throw child_not_found(format("no such id: {}", id));
|
2014-10-22 01:20:09 +02:00
|
|
|
|
if (sep_it == path.end())
|
2018-06-28 11:50:23 +02:00
|
|
|
|
return *it->value;
|
2014-10-22 01:20:09 +02:00
|
|
|
|
else
|
2018-06-28 11:50:23 +02:00
|
|
|
|
return it->value->get_child({sep_it+1, path.end()});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void add_child(String name, std::unique_ptr<Highlighter>&& hl) override
|
|
|
|
|
{
|
|
|
|
|
if (not dynamic_cast<RegionHighlighter*>(hl.get()))
|
|
|
|
|
throw runtime_error{"only region highlighter can be added as child of a regions highlighter"};
|
|
|
|
|
if (m_regions.contains(name))
|
|
|
|
|
throw runtime_error{format("duplicate id: '{}'", name)};
|
|
|
|
|
|
|
|
|
|
std::unique_ptr<RegionHighlighter> region_hl{dynamic_cast<RegionHighlighter*>(hl.release())};
|
|
|
|
|
if (region_hl->is_default())
|
|
|
|
|
{
|
|
|
|
|
if (not m_default_region.empty())
|
|
|
|
|
throw runtime_error{"default region already defined"};
|
|
|
|
|
m_default_region = name;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
m_regions.insert({std::move(name), std::move(region_hl)});
|
2018-06-28 13:32:46 +02:00
|
|
|
|
++m_regions_timestamp;
|
2014-10-22 01:20:09 +02:00
|
|
|
|
}
|
|
|
|
|
|
2018-07-26 12:16:48 +02:00
|
|
|
|
void remove_child(StringView id) override
|
2018-06-28 14:19:02 +02:00
|
|
|
|
{
|
|
|
|
|
if (id == m_default_region)
|
|
|
|
|
m_default_region = String{};
|
|
|
|
|
|
|
|
|
|
m_regions.remove(id);
|
|
|
|
|
++m_regions_timestamp;
|
|
|
|
|
}
|
|
|
|
|
|
2014-10-22 01:20:09 +02:00
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
|
2018-06-28 11:50:23 +02:00
|
|
|
|
auto container = m_regions | transform(&decltype(m_regions)::Item::key);
|
2014-12-23 14:54:09 +01:00
|
|
|
|
return { 0, 0, complete(path, cursor_pos, container) };
|
2014-10-22 01:20:09 +02:00
|
|
|
|
}
|
|
|
|
|
|
2018-06-28 14:23:48 +02:00
|
|
|
|
static std::unique_ptr<Highlighter> create(HighlighterParameters params, Highlighter*)
|
2018-06-28 11:50:23 +02:00
|
|
|
|
{
|
|
|
|
|
if (not params.empty())
|
|
|
|
|
throw runtime_error{"unexpected parameters"};
|
|
|
|
|
return std::make_unique<RegionsHighlighter>();
|
|
|
|
|
}
|
|
|
|
|
|
2018-06-28 14:23:48 +02:00
|
|
|
|
static bool is_regions(Highlighter* parent)
|
2014-10-22 01:20:09 +02:00
|
|
|
|
{
|
2018-06-28 14:23:48 +02:00
|
|
|
|
if (dynamic_cast<RegionsHighlighter*>(parent))
|
|
|
|
|
return true;
|
|
|
|
|
if (auto* region = dynamic_cast<RegionHighlighter*>(parent))
|
|
|
|
|
return is_regions(®ion->delegate());
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static std::unique_ptr<Highlighter> create_region(HighlighterParameters params, Highlighter* parent)
|
|
|
|
|
{
|
|
|
|
|
if (not is_regions(parent))
|
|
|
|
|
throw runtime_error{"region highlighter can only be added to a regions parent"};
|
|
|
|
|
|
2015-07-14 22:06:41 +02:00
|
|
|
|
static const ParameterDesc param_desc{
|
2018-07-02 12:59:12 +02:00
|
|
|
|
{ { "match-capture", { false, "" } }, { "recurse", { true, "" } } },
|
2018-06-29 00:36:06 +02:00
|
|
|
|
ParameterDesc::Flags::SwitchesOnlyAtStart | ParameterDesc::Flags::IgnoreUnknownSwitches,
|
2018-07-02 12:59:12 +02:00
|
|
|
|
3
|
2015-07-14 22:06:41 +02:00
|
|
|
|
};
|
2014-10-22 01:20:09 +02:00
|
|
|
|
|
2015-07-14 22:06:41 +02:00
|
|
|
|
ParametersParser parser{params, param_desc};
|
2014-10-22 01:20:09 +02:00
|
|
|
|
|
2017-02-07 00:00:13 +01:00
|
|
|
|
const bool match_capture = (bool)parser.get_switch("match-capture");
|
2018-06-28 11:50:23 +02:00
|
|
|
|
if (parser[0].empty() or parser[1].empty())
|
|
|
|
|
throw runtime_error("begin and end must not be empty");
|
2014-10-22 01:20:09 +02:00
|
|
|
|
|
2018-06-28 11:50:23 +02:00
|
|
|
|
const RegexCompileFlags flags = match_capture ?
|
|
|
|
|
RegexCompileFlags::Optimize : RegexCompileFlags::NoSubs | RegexCompileFlags::Optimize;
|
2014-10-22 01:20:09 +02:00
|
|
|
|
|
2018-07-02 12:59:12 +02:00
|
|
|
|
const auto& type = parser[2];
|
2018-07-01 11:53:14 +02:00
|
|
|
|
auto& registry = HighlighterRegistry::instance();
|
|
|
|
|
auto it = registry.find(type);
|
|
|
|
|
if (it == registry.end())
|
|
|
|
|
throw runtime_error(format("no such highlighter type: '{}'", type));
|
|
|
|
|
|
2018-07-02 12:59:12 +02:00
|
|
|
|
Regex recurse;
|
|
|
|
|
if (auto recurse_switch = parser.get_switch("recurse"))
|
|
|
|
|
recurse = Regex{*recurse_switch, flags};
|
|
|
|
|
|
|
|
|
|
auto delegate = it->value.factory(parser.positionals_from(3), nullptr);
|
|
|
|
|
return std::make_unique<RegionHighlighter>(std::move(delegate), Regex{parser[0], flags}, Regex{parser[1], flags}, recurse, match_capture);
|
2018-06-28 11:50:23 +02:00
|
|
|
|
}
|
2015-07-14 22:06:41 +02:00
|
|
|
|
|
2018-06-28 14:23:48 +02:00
|
|
|
|
static std::unique_ptr<Highlighter> create_default_region(HighlighterParameters params, Highlighter* parent)
|
2018-06-28 11:50:23 +02:00
|
|
|
|
{
|
2018-06-28 14:23:48 +02:00
|
|
|
|
if (not is_regions(parent))
|
|
|
|
|
throw runtime_error{"default-region highlighter can only be added to a regions parent"};
|
|
|
|
|
|
2018-06-28 11:50:23 +02:00
|
|
|
|
static const ParameterDesc param_desc{ {}, ParameterDesc::Flags::SwitchesOnlyAtStart, 1 };
|
|
|
|
|
ParametersParser parser{params, param_desc};
|
|
|
|
|
|
2018-06-28 14:23:48 +02:00
|
|
|
|
auto delegate = HighlighterRegistry::instance()[parser[0]].factory(parser.positionals_from(1), nullptr);
|
2018-06-28 11:50:23 +02:00
|
|
|
|
return std::make_unique<RegionHighlighter>(std::move(delegate));
|
2014-10-22 01:20:09 +02:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-12 00:29:23 +02:00
|
|
|
|
private:
|
|
|
|
|
struct Region
|
|
|
|
|
{
|
2016-09-22 21:36:26 +02:00
|
|
|
|
BufferCoord begin;
|
|
|
|
|
BufferCoord end;
|
2018-06-28 11:50:23 +02:00
|
|
|
|
StringView region;
|
2014-06-12 00:29:23 +02:00
|
|
|
|
};
|
2015-01-12 14:24:30 +01:00
|
|
|
|
using RegionList = Vector<Region, MemoryDomain::Highlight>;
|
2014-06-12 00:29:23 +02:00
|
|
|
|
|
|
|
|
|
struct Cache
|
|
|
|
|
{
|
|
|
|
|
size_t timestamp = 0;
|
2018-06-28 13:32:46 +02:00
|
|
|
|
size_t regions_timestamp = 0;
|
2015-01-12 14:24:30 +01:00
|
|
|
|
Vector<RegionMatches, MemoryDomain::Highlight> matches;
|
2017-03-07 01:30:54 +01:00
|
|
|
|
HashMap<BufferRange, RegionList, MemoryDomain::Highlight> regions;
|
2014-06-12 00:29:23 +02:00
|
|
|
|
};
|
|
|
|
|
|
2014-07-14 22:42:19 +02:00
|
|
|
|
using RegionAndMatch = std::pair<size_t, RegexMatchList::const_iterator>;
|
2014-06-12 00:29:23 +02:00
|
|
|
|
|
|
|
|
|
// find the begin closest to pos in all matches
|
2016-09-22 21:36:26 +02:00
|
|
|
|
RegionAndMatch find_next_begin(const Cache& cache, BufferCoord pos) const
|
2014-06-12 00:29:23 +02:00
|
|
|
|
{
|
|
|
|
|
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 20:56:17 +01:00
|
|
|
|
const RegionList& get_regions_for_range(const Buffer& buffer, BufferRange range)
|
2014-06-12 00:29:23 +02:00
|
|
|
|
{
|
|
|
|
|
Cache& cache = m_cache.get(buffer);
|
|
|
|
|
const size_t buf_timestamp = buffer.timestamp();
|
2018-06-28 13:32:46 +02:00
|
|
|
|
if (cache.timestamp != buf_timestamp or cache.regions_timestamp != m_regions_timestamp)
|
2014-06-12 00:29:23 +02:00
|
|
|
|
{
|
2018-06-28 13:32:46 +02:00
|
|
|
|
if (cache.timestamp == 0 or cache.regions_timestamp != m_regions_timestamp)
|
2014-12-02 20:56:17 +01:00
|
|
|
|
{
|
|
|
|
|
cache.matches.resize(m_regions.size());
|
|
|
|
|
for (size_t i = 0; i < m_regions.size(); ++i)
|
2018-06-28 11:50:23 +02:00
|
|
|
|
cache.matches[i] = m_regions.item(i).value->find_matches(buffer);
|
2014-12-02 20:56:17 +01:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
auto modifs = compute_line_modifications(buffer, cache.timestamp);
|
|
|
|
|
for (size_t i = 0; i < m_regions.size(); ++i)
|
2018-06-28 11:50:23 +02:00
|
|
|
|
m_regions.item(i).value->update_matches(buffer, modifs, cache.matches[i]);
|
2014-12-02 20:56:17 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
cache.regions.clear();
|
2014-06-12 00:29:23 +02:00
|
|
|
|
}
|
|
|
|
|
|
2014-12-02 20:56:17 +01:00
|
|
|
|
auto it = cache.regions.find(range);
|
|
|
|
|
if (it != cache.regions.end())
|
2017-03-07 01:30:54 +01:00
|
|
|
|
return it->value;
|
2014-12-02 20:56:17 +01:00
|
|
|
|
|
|
|
|
|
RegionList& regions = cache.regions[range];
|
2014-06-12 00:29:23 +02:00
|
|
|
|
|
2015-04-23 22:38:45 +02:00
|
|
|
|
for (auto begin = find_next_begin(cache, range.begin),
|
2014-06-12 00:29:23 +02:00
|
|
|
|
end = RegionAndMatch{ 0, cache.matches[0].begin_matches.end() };
|
|
|
|
|
begin != end; )
|
|
|
|
|
{
|
|
|
|
|
const RegionMatches& matches = cache.matches[begin.first];
|
2018-06-28 11:50:23 +02:00
|
|
|
|
auto& region = m_regions.item(begin.first);
|
2014-06-12 00:29:23 +02:00
|
|
|
|
auto beg_it = begin.second;
|
2017-02-07 00:00:13 +01:00
|
|
|
|
auto end_it = matches.find_matching_end(beg_it->end_coord(),
|
2018-06-28 11:50:23 +02:00
|
|
|
|
region.value->match_capture() ? beg_it->capture : Optional<StringView>{});
|
2014-06-12 00:29:23 +02:00
|
|
|
|
|
2015-04-23 22:38:45 +02:00
|
|
|
|
if (end_it == matches.end_matches.end() or end_it->end_coord() >= range.end)
|
2014-06-12 00:29:23 +02:00
|
|
|
|
{
|
2014-12-02 20:56:17 +01:00
|
|
|
|
regions.push_back({ {beg_it->line, beg_it->begin},
|
2015-04-23 22:38:45 +02:00
|
|
|
|
range.end,
|
2018-06-28 11:50:23 +02:00
|
|
|
|
region.key });
|
2014-06-12 00:29:23 +02:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2014-12-02 20:56:17 +01:00
|
|
|
|
regions.push_back({ beg_it->begin_coord(),
|
|
|
|
|
end_it->end_coord(),
|
2018-06-28 11:50:23 +02:00
|
|
|
|
region.key });
|
2014-07-14 21:46:46 +02: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 00:29:23 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
cache.timestamp = buf_timestamp;
|
2018-06-28 13:32:46 +02:00
|
|
|
|
cache.regions_timestamp = m_regions_timestamp;
|
2014-12-02 20:56:17 +01:00
|
|
|
|
return regions;
|
2014-06-12 00:29:23 +02:00
|
|
|
|
}
|
2018-06-28 13:32:46 +02:00
|
|
|
|
|
|
|
|
|
struct RegionHighlighter : public Highlighter
|
|
|
|
|
{
|
|
|
|
|
RegionHighlighter(std::unique_ptr<Highlighter>&& delegate,
|
|
|
|
|
Regex begin, Regex end, Regex recurse,
|
|
|
|
|
bool match_capture)
|
|
|
|
|
: Highlighter{delegate->passes()},
|
|
|
|
|
m_delegate{std::move(delegate)},
|
|
|
|
|
m_begin{std::move(begin)}, m_end{std::move(end)}, m_recurse{std::move(recurse)},
|
|
|
|
|
m_match_capture{match_capture}
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
RegionHighlighter(std::unique_ptr<Highlighter>&& delegate)
|
|
|
|
|
: Highlighter{delegate->passes()}, m_delegate{std::move(delegate)}, m_default{true}
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool has_children() const override
|
|
|
|
|
{
|
|
|
|
|
return m_delegate->has_children();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Highlighter& get_child(StringView path) override
|
|
|
|
|
{
|
|
|
|
|
return m_delegate->get_child(path);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void add_child(String name, std::unique_ptr<Highlighter>&& hl) override
|
|
|
|
|
{
|
|
|
|
|
return m_delegate->add_child(name, std::move(hl));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void remove_child(StringView id) override
|
|
|
|
|
{
|
|
|
|
|
return m_delegate->remove_child(id);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Completions complete_child(StringView path, ByteCount cursor_pos, bool group) const override
|
|
|
|
|
{
|
|
|
|
|
return m_delegate->complete_child(path, cursor_pos, group);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void fill_unique_ids(Vector<StringView>& unique_ids) const override
|
|
|
|
|
{
|
|
|
|
|
return m_delegate->fill_unique_ids(unique_ids);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void do_highlight(HighlightContext context, DisplayBuffer& display_buffer, BufferRange range) override
|
|
|
|
|
{
|
|
|
|
|
return m_delegate->highlight(context, display_buffer, range);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
RegionMatches find_matches(const Buffer& buffer) const
|
|
|
|
|
{
|
|
|
|
|
RegionMatches res;
|
|
|
|
|
if (m_default)
|
|
|
|
|
return res;
|
|
|
|
|
|
|
|
|
|
Kakoune::find_matches(buffer, res.begin_matches, m_begin, m_match_capture);
|
|
|
|
|
Kakoune::find_matches(buffer, res.end_matches, m_end, m_match_capture);
|
|
|
|
|
if (not m_recurse.empty())
|
|
|
|
|
Kakoune::find_matches(buffer, res.recurse_matches, m_recurse, m_match_capture);
|
|
|
|
|
return res;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void update_matches(const Buffer& buffer,
|
|
|
|
|
ConstArrayView<LineModification> modifs,
|
|
|
|
|
RegionMatches& matches) const
|
|
|
|
|
{
|
|
|
|
|
if (m_default)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
Kakoune::update_matches(buffer, modifs, matches.begin_matches, m_begin, m_match_capture);
|
|
|
|
|
Kakoune::update_matches(buffer, modifs, matches.end_matches, m_end, m_match_capture);
|
|
|
|
|
if (not m_recurse.empty())
|
|
|
|
|
Kakoune::update_matches(buffer, modifs, matches.recurse_matches, m_recurse, m_match_capture);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool match_capture() const { return m_match_capture; }
|
|
|
|
|
bool is_default() const { return m_default; }
|
|
|
|
|
|
2018-06-28 14:23:48 +02:00
|
|
|
|
Highlighter& delegate() { return *m_delegate; }
|
|
|
|
|
|
2018-06-28 13:32:46 +02:00
|
|
|
|
private:
|
|
|
|
|
std::unique_ptr<Highlighter> m_delegate;
|
|
|
|
|
|
|
|
|
|
Regex m_begin;
|
|
|
|
|
Regex m_end;
|
|
|
|
|
Regex m_recurse;
|
|
|
|
|
bool m_match_capture = false;
|
|
|
|
|
bool m_default = false;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
HashMap<String, std::unique_ptr<RegionHighlighter>, MemoryDomain::Highlight> m_regions;
|
|
|
|
|
String m_default_region;
|
|
|
|
|
|
|
|
|
|
size_t m_regions_timestamp = 0;
|
|
|
|
|
BufferSideCache<Cache> m_cache;
|
2014-06-12 00:29:23 +02:00
|
|
|
|
};
|
|
|
|
|
|
2017-05-08 12:29:23 +02:00
|
|
|
|
void setup_builtin_highlighters(HighlighterGroup& group)
|
|
|
|
|
{
|
2018-06-25 14:04:33 +02:00
|
|
|
|
group.add_child("tabulations"_str, std::make_unique<TabulationHighlighter>());
|
|
|
|
|
group.add_child("unprintable"_str, make_highlighter(expand_unprintable));
|
|
|
|
|
group.add_child("selections"_str, make_highlighter(highlight_selections));
|
2017-05-08 12:29:23 +02:00
|
|
|
|
}
|
|
|
|
|
|
2011-11-29 23:37:20 +01:00
|
|
|
|
void register_highlighters()
|
2011-11-08 15:28:01 +01:00
|
|
|
|
{
|
2011-11-29 23:37:20 +01:00
|
|
|
|
HighlighterRegistry& registry = HighlighterRegistry::instance();
|
2011-11-15 15:28:03 +01:00
|
|
|
|
|
2017-03-07 02:12:37 +01:00
|
|
|
|
registry.insert({
|
2018-07-08 11:11:04 +02:00
|
|
|
|
"number-lines",
|
2017-04-27 20:27:28 +02:00
|
|
|
|
{ LineNumbersHighlighter::create,
|
2015-03-18 22:07:57 +01:00
|
|
|
|
"Display line numbers \n"
|
2015-09-25 14:47:57 +02:00
|
|
|
|
"Parameters: -relative, -hlcursor, -separator <separator text>\n" } });
|
2017-03-07 02:12:37 +01:00
|
|
|
|
registry.insert({
|
2018-07-08 11:11:04 +02:00
|
|
|
|
"show-matching",
|
2015-04-23 21:27:42 +02:00
|
|
|
|
{ create_matching_char_highlighter,
|
2015-02-19 14:54:03 +01:00
|
|
|
|
"Apply the MatchingChar face to the char matching the one under the cursor" } });
|
2017-03-07 02:12:37 +01:00
|
|
|
|
registry.insert({
|
2018-07-08 11:11:04 +02:00
|
|
|
|
"show-whitespaces",
|
2018-08-27 00:05:00 +02:00
|
|
|
|
{ ShowWhitespacesHighlighter::create,
|
2017-02-04 08:10:14 +01:00
|
|
|
|
"Display whitespaces using symbols \n"
|
|
|
|
|
"Parameters: -tab <separator> -tabpad <separator> -lf <separator> -spc <separator> -nbsp <separator>\n" } });
|
2017-03-07 02:12:37 +01:00
|
|
|
|
registry.insert({
|
2015-02-19 14:54:03 +01:00
|
|
|
|
"fill",
|
|
|
|
|
{ create_fill_highlighter,
|
|
|
|
|
"Fill the whole highlighted range with the given face" } });
|
2017-03-07 02:12:37 +01:00
|
|
|
|
registry.insert({
|
2015-02-19 14:54:03 +01:00
|
|
|
|
"regex",
|
|
|
|
|
{ RegexHighlighter::create,
|
|
|
|
|
"Parameters: <regex> <capture num>:<face> <capture num>:<face>...\n"
|
|
|
|
|
"Highlights the matches for captures from the regex with the given faces" } });
|
2017-03-07 02:12:37 +01:00
|
|
|
|
registry.insert({
|
2015-11-09 10:34:03 +01:00
|
|
|
|
"dynregex",
|
|
|
|
|
{ create_dynamic_regex_highlighter,
|
|
|
|
|
"Parameters: <expr> <capture num>:<face> <capture num>:<face>...\n"
|
|
|
|
|
"Evaluate expression at every redraw to gather a regex" } });
|
2017-03-07 02:12:37 +01:00
|
|
|
|
registry.insert({
|
2015-02-19 14:54:03 +01:00
|
|
|
|
"group",
|
|
|
|
|
{ create_highlighter_group,
|
2018-06-28 11:50:23 +02:00
|
|
|
|
"Parameters: [-passes <passes>]\n"
|
|
|
|
|
"Creates a group that can contain other highlighters,\n"
|
2017-05-09 11:02:01 +02:00
|
|
|
|
"<passes> is a flags(colorize|move|wrap) defaulting to colorize\n"
|
|
|
|
|
"which specify what kind of highlighters can be put in the group" } });
|
2017-03-07 02:12:37 +01:00
|
|
|
|
registry.insert({
|
2018-07-08 11:11:04 +02:00
|
|
|
|
"flag-lines",
|
2017-04-27 20:27:28 +02:00
|
|
|
|
{ FlagLinesHighlighter::create,
|
2017-05-11 20:40:17 +02:00
|
|
|
|
"Parameters: <face> <option name>\n"
|
2017-05-24 16:41:43 +02:00
|
|
|
|
"Display flags specified in the line-spec option <option name> with <face>"} });
|
2017-03-07 02:12:37 +01:00
|
|
|
|
registry.insert({
|
2015-12-17 05:07:09 +01:00
|
|
|
|
"ranges",
|
2017-05-08 13:05:45 +02:00
|
|
|
|
{ RangesHighlighter::create,
|
2015-12-17 05:07:09 +01:00
|
|
|
|
"Parameters: <option name>\n"
|
2017-05-17 20:35:54 +02:00
|
|
|
|
"Use the range-specs option given as parameter to highlight buffer\n"
|
|
|
|
|
"each spec is interpreted as a face to apply to the range\n" } });
|
2017-05-09 11:53:27 +02:00
|
|
|
|
registry.insert({
|
|
|
|
|
"replace-ranges",
|
|
|
|
|
{ ReplaceRangesHighlighter::create,
|
|
|
|
|
"Parameters: <option name>\n"
|
2017-05-17 20:35:54 +02:00
|
|
|
|
"Use the range-specs option given as parameter to highlight buffer\n"
|
|
|
|
|
"each spec is interpreted as a display line to display in place of the range\n" } });
|
2017-03-07 02:12:37 +01:00
|
|
|
|
registry.insert({
|
2015-05-04 18:12:51 +02:00
|
|
|
|
"line",
|
|
|
|
|
{ create_line_highlighter,
|
|
|
|
|
"Parameters: <value string> <face>\n"
|
|
|
|
|
"Highlight the line given by evaluating <value string> with <face>" } });
|
2017-03-07 02:12:37 +01:00
|
|
|
|
registry.insert({
|
2015-05-04 18:12:51 +02:00
|
|
|
|
"column",
|
|
|
|
|
{ create_column_highlighter,
|
|
|
|
|
"Parameters: <value string> <face>\n"
|
|
|
|
|
"Highlight the column given by evaluating <value string> with <face>" } });
|
2016-01-24 07:34:51 +01:00
|
|
|
|
registry.insert({
|
|
|
|
|
"wrap",
|
2017-04-27 20:27:28 +02:00
|
|
|
|
{ WrapHighlighter::create,
|
2018-05-30 18:11:19 +02:00
|
|
|
|
"Parameters: [-word] [-indent] [-width <max_width>] [-marker <marker_text>]\n"
|
2017-06-08 08:05:44 +02:00
|
|
|
|
"Wrap lines to window width, or max_width if given and window is wider,\n"
|
2017-11-02 04:04:15 +01:00
|
|
|
|
"wrap at word boundaries instead of codepoint boundaries if -word is given\n"
|
2018-05-26 14:22:00 +02:00
|
|
|
|
"insert marker_text at start of wrapped lines if given\n"
|
2017-11-02 04:04:15 +01:00
|
|
|
|
"preserve line indent in wrapped parts if -indent is given\n"} });
|
2017-03-07 02:12:37 +01:00
|
|
|
|
registry.insert({
|
2015-02-19 14:54:03 +01:00
|
|
|
|
"ref",
|
2017-06-26 17:50:12 +02:00
|
|
|
|
{ ReferenceHighlighter::create,
|
2017-05-10 11:31:34 +02:00
|
|
|
|
"Parameters: [-passes <passes>] <path>\n"
|
2017-05-27 22:37:25 +02:00
|
|
|
|
"Reference the highlighter at <path> in shared highlighters\n"
|
2017-05-10 11:31:34 +02:00
|
|
|
|
"<passes> is a flags(colorize|move|wrap) defaulting to colorize\n"
|
|
|
|
|
"which specify what kind of highlighters can be referenced" } });
|
2017-03-07 02:12:37 +01:00
|
|
|
|
registry.insert({
|
2015-02-19 14:54:03 +01:00
|
|
|
|
"regions",
|
|
|
|
|
{ RegionsHighlighter::create,
|
2018-06-28 11:50:23 +02:00
|
|
|
|
"Parameters: None"
|
|
|
|
|
"Holds child region highlighters and segments the buffer in ranges based on those regions\n"
|
|
|
|
|
"definitions. The regions highlighter finds the next region to start by finding which\n"
|
|
|
|
|
"of its child region has the leftmost starting point from current position. In between\n"
|
|
|
|
|
"regions, the default-region child highlighter is applied (if such a child exists)" } });
|
|
|
|
|
registry.insert({
|
|
|
|
|
"region",
|
|
|
|
|
{ RegionsHighlighter::create_region,
|
2018-09-16 19:38:18 +02:00
|
|
|
|
"Parameters: [-match-capture] [-recurse <recurse>] <opening> <closing> <type> <params>..."
|
2018-06-28 11:50:23 +02:00
|
|
|
|
"Define a region for a regions highlighter, and apply the given delegate\n"
|
|
|
|
|
"highlighter as defined by <type> and eventual <params>...\n"
|
2018-09-16 19:38:18 +02:00
|
|
|
|
"The region starts at <begin> match and ends at the first <end>\n"
|
|
|
|
|
"If -recurse is specified, then the region ends at the first <end> that\n"
|
2018-06-28 11:50:23 +02:00
|
|
|
|
"does not close a <recurse> match.\n"
|
|
|
|
|
"If -match-capture is specified, then regions end/recurse matches must have\n"
|
|
|
|
|
"the same \\1 capture content as the begin match to be considered"} });
|
|
|
|
|
registry.insert({
|
|
|
|
|
"default-region",
|
|
|
|
|
{ RegionsHighlighter::create_default_region,
|
|
|
|
|
"Parameters: <delegate_type> <delegate_params>...\n"
|
|
|
|
|
"Define the default region of a regions highlighter" } });
|
2011-11-08 15:28:01 +01:00
|
|
|
|
}
|
|
|
|
|
|
2011-09-30 21:16:23 +02:00
|
|
|
|
}
|