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"
|
2012-09-17 19:01:13 +02:00
|
|
|
#include "color_registry.hh"
|
2012-12-31 14:28:32 +01:00
|
|
|
#include "context.hh"
|
2013-12-17 00:24:08 +01:00
|
|
|
#include "display_buffer.hh"
|
2013-04-09 19:39:03 +02:00
|
|
|
#include "option_types.hh"
|
|
|
|
#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"
|
2014-01-23 20:54:32 +01:00
|
|
|
#include "line_change_watcher.hh"
|
2013-03-26 00:14:38 +01:00
|
|
|
|
2013-02-26 14:12:21 +01:00
|
|
|
#include <sstream>
|
|
|
|
#include <locale>
|
2011-11-08 15:28:01 +01:00
|
|
|
|
2011-09-30 21:16:23 +02:00
|
|
|
namespace Kakoune
|
|
|
|
{
|
|
|
|
|
2012-04-03 15:39:20 +02:00
|
|
|
using namespace std::placeholders;
|
|
|
|
|
2014-05-01 20:03:13 +02:00
|
|
|
using RegexIterator = boost::regex_iterator<BufferIterator>;
|
2012-05-03 09:25:13 +02:00
|
|
|
|
2012-07-12 23:19:10 +02:00
|
|
|
template<typename T>
|
|
|
|
void highlight_range(DisplayBuffer& display_buffer,
|
2014-05-07 20:51:01 +02:00
|
|
|
ByteCoord begin, ByteCoord end,
|
2012-07-12 23:19:10 +02:00
|
|
|
bool skip_replaced, T func)
|
2011-09-30 21:16:23 +02:00
|
|
|
{
|
2012-08-10 14:20:15 +02:00
|
|
|
if (begin == end or end <= display_buffer.range().first
|
|
|
|
or begin >= display_buffer.range().second)
|
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();
|
|
|
|
if (range.second <= begin or end < range.first)
|
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
|
|
|
{
|
2013-07-24 14:55:57 +02:00
|
|
|
bool is_replaced = atom_it->type() == DisplayAtom::ReplacedBufferRange;
|
2011-11-14 15:23:02 +01:00
|
|
|
|
2013-07-24 14:55:57 +02:00
|
|
|
if (not atom_it->has_buffer_range() or
|
2012-12-12 19:33:29 +01:00
|
|
|
(skip_replaced and is_replaced))
|
|
|
|
continue;
|
2011-09-30 21:16:23 +02:00
|
|
|
|
2013-07-24 14:55:57 +02:00
|
|
|
if (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
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-11 22:38:43 +01:00
|
|
|
template<typename T>
|
2013-12-17 00:24:08 +01:00
|
|
|
void apply_highlighter(const Context& context,
|
2014-01-18 02:56:51 +01:00
|
|
|
HighlightFlags flags,
|
2013-12-11 22:38:43 +01:00
|
|
|
DisplayBuffer& display_buffer,
|
2014-05-07 20:51:01 +02:00
|
|
|
ByteCoord begin, ByteCoord end,
|
2013-12-11 22:38:43 +01:00
|
|
|
T&& highlighter)
|
|
|
|
{
|
|
|
|
using LineIterator = DisplayBuffer::LineList::iterator;
|
|
|
|
LineIterator first_line;
|
|
|
|
std::vector<DisplayLine::iterator> insert_pos;
|
|
|
|
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();
|
|
|
|
if (range.second <= begin or end < range.first)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (region_lines.empty())
|
|
|
|
first_line = line_it;
|
|
|
|
region_lines.emplace_back();
|
|
|
|
insert_pos.emplace_back();
|
|
|
|
|
|
|
|
if (range.first < begin or range.second > end)
|
|
|
|
{
|
|
|
|
size_t beg_idx = 0;
|
|
|
|
size_t end_idx = line.atoms().size();
|
|
|
|
|
|
|
|
for (auto atom_it = line.begin(); atom_it != line.end(); ++atom_it)
|
|
|
|
{
|
|
|
|
if (not atom_it->has_buffer_range() or end <= atom_it->begin() or begin >= atom_it->end())
|
|
|
|
continue;
|
|
|
|
|
|
|
|
bool is_replaced = atom_it->type() == DisplayAtom::ReplacedBufferRange;
|
|
|
|
if (atom_it->begin() <= begin)
|
|
|
|
{
|
|
|
|
if (is_replaced or atom_it->begin() == begin)
|
|
|
|
beg_idx = atom_it - line.begin();
|
|
|
|
else
|
|
|
|
{
|
|
|
|
atom_it = ++line.split(atom_it, begin);
|
|
|
|
beg_idx = atom_it - line.begin();
|
|
|
|
++end_idx;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (atom_it->end() >= end)
|
|
|
|
{
|
|
|
|
if (is_replaced or atom_it->end() == end)
|
|
|
|
beg_idx = atom_it - line.begin();
|
|
|
|
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();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
region_display.compute_range();
|
2014-01-18 02:56:51 +01:00
|
|
|
highlighter(context, flags, region_display);
|
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-05-01 20:03:13 +02:00
|
|
|
using ColorSpec = std::unordered_map<size_t, const ColorPair*>;
|
2012-08-15 17:08:48 +02:00
|
|
|
|
2014-01-09 23:51:23 +01:00
|
|
|
template<typename T>
|
|
|
|
struct BufferSideCache
|
|
|
|
{
|
|
|
|
BufferSideCache() : m_id{ValueId::get_free_id()} {}
|
|
|
|
|
|
|
|
T& get(const Buffer& buffer)
|
|
|
|
{
|
|
|
|
Value& cache_val = buffer.values()[m_id];
|
|
|
|
if (not cache_val)
|
2014-01-12 17:28:11 +01:00
|
|
|
cache_val = Value(T{buffer});
|
2014-01-09 23:51:23 +01:00
|
|
|
return cache_val.as<T>();
|
|
|
|
}
|
|
|
|
private:
|
|
|
|
ValueId m_id;
|
|
|
|
};
|
|
|
|
|
2012-08-15 17:08:48 +02:00
|
|
|
class RegexColorizer
|
2011-11-24 20:11:58 +01:00
|
|
|
{
|
2012-08-15 17:08:48 +02:00
|
|
|
public:
|
|
|
|
RegexColorizer(Regex regex, ColorSpec colors)
|
2014-01-09 23:51:23 +01:00
|
|
|
: m_regex{std::move(regex)}, m_colors{std::move(colors)}
|
2012-08-15 17:08:48 +02:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2014-01-18 02:56:51 +01:00
|
|
|
void operator()(const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer)
|
2012-07-12 23:19:10 +02:00
|
|
|
{
|
2014-01-18 02:56:51 +01:00
|
|
|
if (flags != HighlightFlags::Highlight)
|
|
|
|
return;
|
2013-12-17 00:24:08 +01:00
|
|
|
auto& cache = update_cache_ifn(context.buffer(), display_buffer.range());
|
2013-12-04 19:52:16 +01:00
|
|
|
for (auto& match : cache.m_matches)
|
2012-08-07 00:13:54 +02:00
|
|
|
{
|
2012-08-15 17:08:48 +02:00
|
|
|
for (size_t n = 0; n < match.size(); ++n)
|
|
|
|
{
|
|
|
|
auto col_it = m_colors.find(n);
|
|
|
|
if (col_it == m_colors.end())
|
|
|
|
continue;
|
|
|
|
|
2013-11-19 00:17:06 +01:00
|
|
|
highlight_range(display_buffer, match[n].first, match[n].second, true,
|
2013-03-06 20:25:23 +01:00
|
|
|
[&](DisplayAtom& atom) { atom.colors = *col_it->second; });
|
2012-08-15 17:08:48 +02:00
|
|
|
}
|
2012-08-07 00:13:54 +02:00
|
|
|
}
|
2012-07-12 23:19:10 +02:00
|
|
|
}
|
2012-08-15 17:08:48 +02:00
|
|
|
|
|
|
|
private:
|
2014-01-12 22:24:59 +01:00
|
|
|
struct Cache
|
2013-11-19 00:17:06 +01:00
|
|
|
{
|
2014-01-12 22:24:59 +01:00
|
|
|
Cache(const Buffer&){}
|
2013-11-19 00:17:06 +01:00
|
|
|
BufferRange m_range;
|
2014-01-09 22:57:37 +01:00
|
|
|
size_t m_timestamp = 0;
|
2014-05-07 20:51:01 +02:00
|
|
|
std::vector<std::vector<std::pair<ByteCoord, ByteCoord>>> 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;
|
|
|
|
ColorSpec m_colors;
|
|
|
|
|
2014-01-12 22:24:59 +01:00
|
|
|
Cache& update_cache_ifn(const Buffer& buffer, const BufferRange& range)
|
2012-08-15 17:08:48 +02:00
|
|
|
{
|
2014-01-12 22:24:59 +01:00
|
|
|
Cache& cache = m_cache.get(buffer);
|
2013-11-19 00:17:06 +01:00
|
|
|
|
|
|
|
if (buffer.timestamp() == cache.m_timestamp and
|
|
|
|
range.first >= cache.m_range.first and
|
|
|
|
range.second <= cache.m_range.second)
|
2013-12-04 19:52:16 +01:00
|
|
|
return cache;
|
2012-08-15 17:08:48 +02:00
|
|
|
|
2013-11-19 00:17:06 +01:00
|
|
|
cache.m_range.first = buffer.clamp({range.first.line - 10, 0});
|
|
|
|
cache.m_range.second = buffer.next(buffer.clamp({range.second.line + 10, INT_MAX}));
|
|
|
|
cache.m_timestamp = buffer.timestamp();
|
2012-08-15 17:08:48 +02:00
|
|
|
|
2013-11-19 00:17:06 +01:00
|
|
|
cache.m_matches.clear();
|
|
|
|
RegexIterator re_it{buffer.iterator_at(cache.m_range.first),
|
|
|
|
buffer.iterator_at(cache.m_range.second), m_regex};
|
2012-08-15 17:08:48 +02:00
|
|
|
RegexIterator re_end;
|
|
|
|
for (; re_it != re_end; ++re_it)
|
2013-11-19 00:17:06 +01:00
|
|
|
{
|
|
|
|
cache.m_matches.emplace_back();
|
|
|
|
auto& match = cache.m_matches.back();
|
|
|
|
for (auto& sub : *re_it)
|
|
|
|
match.emplace_back(sub.first.coord(), sub.second.coord());
|
|
|
|
}
|
2013-12-04 19:52:16 +01:00
|
|
|
return cache;
|
2012-08-15 17:08:48 +02:00
|
|
|
}
|
|
|
|
};
|
2011-11-24 20:11:58 +01:00
|
|
|
|
2013-11-19 00:19:48 +01:00
|
|
|
HighlighterAndId colorize_regex_factory(HighlighterParameters params)
|
2011-11-10 15:28:38 +01:00
|
|
|
{
|
2012-08-07 00:13:54 +02:00
|
|
|
if (params.size() < 2)
|
2011-11-10 15:28:38 +01:00
|
|
|
throw runtime_error("wrong parameter count");
|
|
|
|
|
2012-08-07 00:32:21 +02:00
|
|
|
try
|
2012-08-07 00:13:54 +02:00
|
|
|
{
|
2012-10-01 20:20:08 +02:00
|
|
|
static Regex color_spec_ex(R"((\d+):(\w+(,\w+)?))");
|
2012-08-07 00:32:21 +02:00
|
|
|
ColorSpec colors;
|
|
|
|
for (auto it = params.begin() + 1; it != params.end(); ++it)
|
|
|
|
{
|
2013-03-29 14:21:55 +01:00
|
|
|
boost::smatch res;
|
2012-08-07 00:32:21 +02:00
|
|
|
if (not boost::regex_match(it->begin(), it->end(), res, color_spec_ex))
|
|
|
|
throw runtime_error("wrong colorspec: '" + *it +
|
|
|
|
"' expected <capture>:<fgcolor>[,<bgcolor>]");
|
|
|
|
|
2013-05-17 14:09:42 +02:00
|
|
|
int capture = str_to_int(res[1].str());
|
2012-09-17 21:02:08 +02:00
|
|
|
const ColorPair*& color = colors[capture];
|
2013-05-13 14:23:07 +02:00
|
|
|
color = &get_color(res[2].str());
|
2012-08-07 00:32:21 +02:00
|
|
|
}
|
2011-11-10 15:28:38 +01:00
|
|
|
|
2012-08-07 00:32:21 +02:00
|
|
|
String id = "colre'" + params[0] + "'";
|
2011-11-15 15:28:03 +01:00
|
|
|
|
2014-01-10 14:36:40 +01:00
|
|
|
Regex ex{params[0].begin(), params[0].end(), Regex::optimize};
|
2012-08-07 00:32:21 +02:00
|
|
|
|
2012-08-15 17:08:48 +02:00
|
|
|
return HighlighterAndId(id, RegexColorizer(std::move(ex),
|
|
|
|
std::move(colors)));
|
2012-08-08 19:02:36 +02:00
|
|
|
}
|
2012-08-07 00:32:21 +02:00
|
|
|
catch (boost::regex_error& err)
|
|
|
|
{
|
|
|
|
throw runtime_error(String("regex error: ") + err.what());
|
|
|
|
}
|
2011-11-10 15:28:38 +01:00
|
|
|
}
|
|
|
|
|
2013-03-26 14:26:59 +01:00
|
|
|
template<typename RegexGetter>
|
|
|
|
class DynamicRegexHighlighter
|
2012-12-31 14:28:32 +01:00
|
|
|
{
|
|
|
|
public:
|
2013-03-26 14:26:59 +01:00
|
|
|
DynamicRegexHighlighter(const ColorSpec& colors, RegexGetter getter)
|
|
|
|
: m_regex_getter(getter), m_colors(colors), m_colorizer(Regex(), m_colors) {}
|
2012-12-31 14:28:32 +01:00
|
|
|
|
2014-01-18 02:56:51 +01:00
|
|
|
void operator()(const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer)
|
2012-12-31 14:28:32 +01:00
|
|
|
{
|
2014-01-18 02:56:51 +01:00
|
|
|
if (flags != HighlightFlags::Highlight)
|
|
|
|
return;
|
|
|
|
|
2013-12-17 00:24:08 +01:00
|
|
|
Regex regex = m_regex_getter(context);
|
2013-03-26 14:26:59 +01:00
|
|
|
if (regex != m_last_regex)
|
2012-12-31 14:28:32 +01:00
|
|
|
{
|
2013-03-26 14:26:59 +01:00
|
|
|
m_last_regex = regex;
|
|
|
|
if (not m_last_regex.empty())
|
|
|
|
m_colorizer = RegexColorizer{m_last_regex, m_colors};
|
2012-12-31 14:28:32 +01:00
|
|
|
}
|
2013-03-26 14:26:59 +01:00
|
|
|
if (not m_last_regex.empty())
|
2014-01-18 02:56:51 +01:00
|
|
|
m_colorizer(context, flags, display_buffer);
|
2012-12-31 14:28:32 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
2013-03-26 14:26:59 +01:00
|
|
|
Regex m_last_regex;
|
2013-01-04 18:39:13 +01:00
|
|
|
ColorSpec m_colors;
|
|
|
|
RegexColorizer m_colorizer;
|
2013-03-26 14:26:59 +01:00
|
|
|
RegexGetter m_regex_getter;
|
2012-12-31 14:28:32 +01:00
|
|
|
};
|
|
|
|
|
2013-11-19 00:19:48 +01:00
|
|
|
HighlighterAndId highlight_search_factory(HighlighterParameters params)
|
2012-12-31 14:28:32 +01:00
|
|
|
{
|
|
|
|
if (params.size() != 1)
|
|
|
|
throw runtime_error("wrong parameter count");
|
|
|
|
try
|
|
|
|
{
|
2013-04-04 18:47:34 +02:00
|
|
|
ColorSpec colors { { 0, &get_color(params[0]) } };
|
2013-12-17 00:24:08 +01:00
|
|
|
auto get_regex = [](const Context&){
|
2013-03-26 14:26:59 +01:00
|
|
|
auto s = RegisterManager::instance()['/'].values(Context{});
|
|
|
|
return s.empty() ? Regex{} : Regex{s[0].begin(), s[0].end()};
|
|
|
|
};
|
|
|
|
return {"hlsearch", DynamicRegexHighlighter<decltype(get_regex)>{colors, get_regex}};
|
2012-12-31 14:28:32 +01:00
|
|
|
}
|
|
|
|
catch (boost::regex_error& err)
|
|
|
|
{
|
|
|
|
throw runtime_error(String("regex error: ") + err.what());
|
|
|
|
}
|
2013-04-03 19:20:38 +02:00
|
|
|
}
|
2012-12-31 14:28:32 +01:00
|
|
|
|
2013-11-19 00:19:48 +01:00
|
|
|
HighlighterAndId highlight_regex_option_factory(HighlighterParameters params)
|
2013-03-26 14:26:59 +01:00
|
|
|
{
|
|
|
|
if (params.size() != 2)
|
|
|
|
throw runtime_error("wrong parameter count");
|
|
|
|
|
2013-04-04 18:47:34 +02:00
|
|
|
ColorSpec colors { { 0, &get_color(params[1]) } };
|
2013-03-26 14:26:59 +01:00
|
|
|
String option_name = params[0];
|
|
|
|
// verify option type now
|
2013-11-01 20:22:34 +01:00
|
|
|
GlobalOptions::instance()[option_name].get<Regex>();
|
2013-03-26 14:26:59 +01:00
|
|
|
|
2013-12-17 00:24:08 +01:00
|
|
|
auto get_regex = [option_name](const Context& context){ return context.options()[option_name].get<Regex>(); };
|
2013-03-26 14:26:59 +01:00
|
|
|
return {"hloption_" + option_name, DynamicRegexHighlighter<decltype(get_regex)>{colors, get_regex}};
|
2013-04-03 19:20:38 +02:00
|
|
|
}
|
2013-03-26 14:26:59 +01:00
|
|
|
|
2014-01-18 02:56:51 +01:00
|
|
|
void expand_tabulations(const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer)
|
2011-10-12 20:52:22 +02:00
|
|
|
{
|
2013-12-17 00:24:08 +01:00
|
|
|
const int tabstop = context.options()["tabstop"].get<int>();
|
|
|
|
auto& buffer = context.buffer();
|
2012-07-12 23:19:10 +02:00
|
|
|
for (auto& line : display_buffer.lines())
|
2011-10-12 20:52:22 +02:00
|
|
|
{
|
2012-07-12 23:19:10 +02:00
|
|
|
for (auto atom_it = line.begin(); atom_it != line.end(); ++atom_it)
|
2011-10-12 20:52:22 +02:00
|
|
|
{
|
2013-07-24 14:55:57 +02:00
|
|
|
if (atom_it->type() != DisplayAtom::BufferRange)
|
2012-07-12 23:19:10 +02:00
|
|
|
continue;
|
2011-10-17 21:01:36 +02:00
|
|
|
|
2013-07-24 14:55:57 +02:00
|
|
|
auto begin = buffer.iterator_at(atom_it->begin());
|
|
|
|
auto end = buffer.iterator_at(atom_it->end());
|
2012-07-12 23:19:10 +02:00
|
|
|
for (BufferIterator it = begin; it != end; ++it)
|
|
|
|
{
|
|
|
|
if (*it == '\t')
|
2011-10-15 06:45:49 +02:00
|
|
|
{
|
2012-07-12 23:19:10 +02:00
|
|
|
if (it != begin)
|
2013-05-23 13:59:33 +02:00
|
|
|
atom_it = ++line.split(atom_it, it.coord());
|
2012-07-12 23:19:10 +02:00
|
|
|
if (it+1 != end)
|
2013-05-23 13:59:33 +02:00
|
|
|
atom_it = line.split(atom_it, (it+1).coord());
|
2012-07-12 23:19:10 +02:00
|
|
|
|
|
|
|
int column = 0;
|
2013-07-23 20:11:26 +02:00
|
|
|
for (auto line_it = buffer.iterator_at(it.coord().line);
|
2012-07-12 23:19:10 +02:00
|
|
|
line_it != it; ++line_it)
|
|
|
|
{
|
2013-04-09 20:04:11 +02:00
|
|
|
kak_assert(*line_it != '\n');
|
2012-07-12 23:19:10 +02:00
|
|
|
if (*line_it == '\t')
|
|
|
|
column += tabstop - (column % tabstop);
|
|
|
|
else
|
|
|
|
++column;
|
|
|
|
}
|
|
|
|
|
|
|
|
int count = tabstop - (column % tabstop);
|
|
|
|
String padding;
|
|
|
|
for (int i = 0; i < count; ++i)
|
|
|
|
padding += ' ';
|
2013-07-24 14:55:57 +02:00
|
|
|
atom_it->replace(padding);
|
2012-07-12 23:19:10 +02:00
|
|
|
break;
|
2011-10-15 06:45:49 +02:00
|
|
|
}
|
2011-10-12 20:52:22 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-18 02:56:51 +01:00
|
|
|
void show_line_numbers(const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer)
|
2011-10-17 21:01:36 +02:00
|
|
|
{
|
2013-12-17 00:24:08 +01:00
|
|
|
LineCount last_line = context.buffer().line_count();
|
2012-02-22 21:43:59 +01:00
|
|
|
int digit_count = 0;
|
2012-08-22 23:33:52 +02:00
|
|
|
for (LineCount c = last_line; c > 0; c /= 10)
|
2012-02-22 21:43:59 +01:00
|
|
|
++digit_count;
|
|
|
|
|
2013-05-24 18:39:03 +02:00
|
|
|
char format[] = "%?d│";
|
2012-02-22 21:43:59 +01:00
|
|
|
format[1] = '0' + digit_count;
|
2013-04-04 18:47:34 +02:00
|
|
|
auto& colors = get_color("LineNumbers");
|
2012-07-12 23:19:10 +02:00
|
|
|
for (auto& line : display_buffer.lines())
|
2011-10-17 21:01:36 +02:00
|
|
|
{
|
2012-07-12 23:19:10 +02:00
|
|
|
char buffer[10];
|
2013-07-23 20:11:26 +02:00
|
|
|
snprintf(buffer, 10, format, (int)line.range().first.line + 1);
|
2013-07-24 14:55:57 +02:00
|
|
|
DisplayAtom atom{buffer};
|
2013-03-06 20:31:07 +01:00
|
|
|
atom.colors = colors;
|
2012-07-12 23:19:10 +02:00
|
|
|
line.insert(line.begin(), std::move(atom));
|
2011-10-17 21:01:36 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-20 22:01:26 +01:00
|
|
|
void show_matching_char(const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer)
|
|
|
|
{
|
|
|
|
auto& colors = get_color("MatchingChar");
|
|
|
|
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();
|
|
|
|
const auto& buffer = context.buffer();
|
|
|
|
for (auto& sel : context.selections())
|
|
|
|
{
|
2014-01-28 20:05:49 +01:00
|
|
|
auto pos = sel.cursor();
|
2014-01-20 22:01:26 +01:00
|
|
|
if (pos < range.first or pos >= range.second)
|
|
|
|
continue;
|
|
|
|
auto c = buffer.byte_at(pos);
|
|
|
|
for (auto& pair : matching_chars)
|
|
|
|
{
|
|
|
|
int level = 1;
|
|
|
|
if (c == pair.first)
|
|
|
|
{
|
|
|
|
auto it = buffer.iterator_at(pos)+1;
|
|
|
|
auto end = buffer.iterator_at(range.second);
|
|
|
|
skip_while(it, end, [&](char c) {
|
|
|
|
if (c == pair.first)
|
|
|
|
++level;
|
|
|
|
else if (c == pair.second and --level == 0)
|
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
});
|
|
|
|
if (it != end)
|
|
|
|
highlight_range(display_buffer, it.coord(), (it+1).coord(), false,
|
|
|
|
[&](DisplayAtom& atom) { atom.colors = colors; });
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else if (c == pair.second)
|
|
|
|
{
|
|
|
|
auto it = buffer.iterator_at(pos)-1;
|
|
|
|
auto end = buffer.iterator_at(range.first);
|
|
|
|
skip_while_reverse(it, end, [&](char c) {
|
|
|
|
if (c == pair.second)
|
|
|
|
++level;
|
|
|
|
else if (c == pair.first and --level == 0)
|
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
});
|
|
|
|
if (it != end)
|
|
|
|
highlight_range(display_buffer, it.coord(), (it+1).coord(), false,
|
|
|
|
[&](DisplayAtom& atom) { atom.colors = colors; });
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-18 02:56:51 +01:00
|
|
|
void highlight_selections(const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer)
|
2012-04-03 15:22:07 +02:00
|
|
|
{
|
2014-01-18 02:56:51 +01:00
|
|
|
if (flags != HighlightFlags::Highlight)
|
|
|
|
return;
|
2013-12-17 00:24:08 +01:00
|
|
|
const auto& buffer = context.buffer();
|
|
|
|
for (size_t i = 0; i < context.selections().size(); ++i)
|
2012-04-03 15:22:07 +02:00
|
|
|
{
|
2013-12-17 00:24:08 +01:00
|
|
|
auto& sel = context.selections()[i];
|
2014-01-28 20:05:49 +01:00
|
|
|
const bool forward = sel.anchor() <= sel.cursor();
|
2014-05-07 20:51:01 +02:00
|
|
|
ByteCoord begin = forward ? sel.anchor() : buffer.char_next(sel.cursor());
|
|
|
|
ByteCoord end = forward ? sel.cursor() : buffer.char_next(sel.anchor());
|
2013-03-01 19:21:06 +01:00
|
|
|
|
2013-12-17 00:24:08 +01:00
|
|
|
const bool primary = (i == context.selections().main_index());
|
2013-12-15 15:57:55 +01:00
|
|
|
ColorPair sel_colors = get_color(primary ? "PrimarySelection" : "SecondarySelection");
|
|
|
|
highlight_range(display_buffer, begin, end, false,
|
|
|
|
[&](DisplayAtom& atom) { atom.colors = sel_colors; });
|
2013-04-04 18:47:34 +02:00
|
|
|
ColorPair cur_colors = get_color(primary ? "PrimaryCursor" : "SecondaryCursor");
|
2014-01-28 20:05:49 +01:00
|
|
|
highlight_range(display_buffer, sel.cursor(), buffer.char_next(sel.cursor()), false,
|
2013-03-06 20:31:07 +01:00
|
|
|
[&](DisplayAtom& atom) { atom.colors = cur_colors; });
|
2012-04-03 15:22:07 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-18 02:56:51 +01:00
|
|
|
void expand_unprintable(const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer)
|
2013-02-26 14:12:21 +01:00
|
|
|
{
|
2013-12-17 00:24:08 +01:00
|
|
|
auto& buffer = context.buffer();
|
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
|
|
|
{
|
2013-07-24 14:55:57 +02:00
|
|
|
if (atom_it->type() == DisplayAtom::BufferRange)
|
2013-02-26 14:12:21 +01:00
|
|
|
{
|
2013-03-18 23:35:23 +01:00
|
|
|
using Utf8It = utf8::utf8_iterator<BufferIterator, utf8::InvalidBytePolicy::Pass>;
|
2013-07-24 14:55:57 +02:00
|
|
|
for (Utf8It it = buffer.iterator_at(atom_it->begin()),
|
|
|
|
end = buffer.iterator_at(atom_it->end()); it != end; ++it)
|
2013-02-26 14:12:21 +01:00
|
|
|
{
|
|
|
|
Codepoint cp = *it;
|
2014-01-05 16:14:58 +01:00
|
|
|
if (cp != '\n' and not iswprint(cp))
|
2013-02-26 14:12:21 +01:00
|
|
|
{
|
|
|
|
std::ostringstream oss;
|
|
|
|
oss << "U+" << std::hex << cp;
|
|
|
|
String str = oss.str();
|
2013-07-24 14:55:57 +02:00
|
|
|
if (it.base().coord() != atom_it->begin())
|
2013-06-05 19:19:35 +02:00
|
|
|
atom_it = ++line.split(atom_it, it.base().coord());
|
2013-07-24 14:55:57 +02:00
|
|
|
if ((it+1).base().coord() != atom_it->end())
|
2013-06-05 19:19:35 +02:00
|
|
|
atom_it = line.split(atom_it, (it+1).base().coord());
|
2013-07-24 14:55:57 +02:00
|
|
|
atom_it->replace(str);
|
2013-05-07 18:52:23 +02:00
|
|
|
atom_it->colors = { Colors::Red, Colors::Black };
|
2013-03-18 23:35:23 +01:00
|
|
|
break;
|
2013-02-26 14:12:21 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-19 00:19:48 +01:00
|
|
|
HighlighterAndId flag_lines_factory(HighlighterParameters params)
|
2013-03-06 14:24:47 +01:00
|
|
|
{
|
|
|
|
if (params.size() != 2)
|
|
|
|
throw runtime_error("wrong parameter count");
|
|
|
|
|
2013-11-18 23:44:01 +01:00
|
|
|
const String& option_name = params[1];
|
|
|
|
Color bg = str_to_color(params[0]);
|
|
|
|
|
|
|
|
// throw if wrong option type
|
|
|
|
GlobalOptions::instance()[option_name].get<std::vector<LineAndFlag>>();
|
|
|
|
|
|
|
|
return {"hlflags_" + params[1],
|
2014-01-18 02:56:51 +01:00
|
|
|
[=](const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer)
|
2013-11-18 23:44:01 +01:00
|
|
|
{
|
2013-12-17 00:24:08 +01:00
|
|
|
auto& lines_opt = context.options()[option_name];
|
2013-11-18 23:44:01 +01:00
|
|
|
auto& lines = lines_opt.get<std::vector<LineAndFlag>>();
|
|
|
|
|
|
|
|
CharCount width = 0;
|
|
|
|
for (auto& l : lines)
|
|
|
|
width = std::max(width, std::get<2>(l).char_length());
|
|
|
|
const String empty{' ', width};
|
|
|
|
for (auto& line : display_buffer.lines())
|
|
|
|
{
|
|
|
|
int line_num = (int)line.range().first.line + 1;
|
|
|
|
auto it = find_if(lines,
|
|
|
|
[&](const LineAndFlag& l)
|
|
|
|
{ return std::get<0>(l) == line_num; });
|
|
|
|
String content = it != lines.end() ? std::get<2>(*it) : empty;
|
|
|
|
content += String(' ', width - content.char_length());
|
|
|
|
DisplayAtom atom{std::move(content)};
|
|
|
|
atom.colors = { it != lines.end() ? std::get<1>(*it) : Colors::Default , bg };
|
|
|
|
line.insert(line.begin(), std::move(atom));
|
|
|
|
}
|
|
|
|
}};
|
2013-03-06 14:24:47 +01:00
|
|
|
}
|
|
|
|
|
2014-01-18 02:56:51 +01:00
|
|
|
template<void (*highlighter_func)(const Context&, HighlightFlags, DisplayBuffer&)>
|
2011-11-29 23:37:20 +01:00
|
|
|
class SimpleHighlighterFactory
|
2011-11-08 15:28:01 +01:00
|
|
|
{
|
|
|
|
public:
|
2012-04-14 03:17:09 +02:00
|
|
|
SimpleHighlighterFactory(const String& id) : m_id(id) {}
|
2011-11-08 15:28:01 +01:00
|
|
|
|
2013-11-19 00:19:48 +01:00
|
|
|
HighlighterAndId operator()(HighlighterParameters params) const
|
2011-11-08 15:28:01 +01:00
|
|
|
{
|
2011-11-29 23:37:20 +01:00
|
|
|
return HighlighterAndId(m_id, HighlighterFunc(highlighter_func));
|
2011-11-08 15:28:01 +01:00
|
|
|
}
|
|
|
|
private:
|
2012-04-14 03:17:09 +02:00
|
|
|
String m_id;
|
2011-11-08 15:28:01 +01:00
|
|
|
};
|
|
|
|
|
2013-11-19 00:19:48 +01:00
|
|
|
HighlighterAndId highlighter_group_factory(HighlighterParameters params)
|
2012-01-15 14:45:18 +01:00
|
|
|
{
|
|
|
|
if (params.size() != 1)
|
|
|
|
throw runtime_error("wrong parameter count");
|
|
|
|
|
|
|
|
return HighlighterAndId(params[0], HighlighterGroup());
|
|
|
|
}
|
|
|
|
|
2013-12-03 23:03:10 +01:00
|
|
|
HighlighterAndId reference_factory(HighlighterParameters params)
|
|
|
|
{
|
|
|
|
if (params.size() != 1)
|
|
|
|
throw runtime_error("wrong parameter count");
|
|
|
|
|
|
|
|
const String& name = params[0];
|
|
|
|
|
|
|
|
// throw if not found
|
|
|
|
DefinedHighlighters::instance().get_group(name, '/');
|
|
|
|
|
|
|
|
return HighlighterAndId(name,
|
2014-01-18 02:56:51 +01:00
|
|
|
[name](const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer)
|
|
|
|
{ DefinedHighlighters::instance().get_group(name, '/')(context, flags, display_buffer); });
|
2013-12-03 23:03:10 +01:00
|
|
|
}
|
|
|
|
|
2013-12-11 22:38:43 +01:00
|
|
|
template<typename HighlightFunc>
|
2013-12-04 01:48:46 +01:00
|
|
|
struct RegionHighlighter
|
|
|
|
{
|
|
|
|
public:
|
2013-12-12 22:01:40 +01:00
|
|
|
RegionHighlighter(Regex begin, Regex end, HighlightFunc func)
|
2013-12-04 01:48:46 +01:00
|
|
|
: m_begin(std::move(begin)),
|
|
|
|
m_end(std::move(end)),
|
2014-01-09 23:51:23 +01:00
|
|
|
m_func(std::move(func))
|
2013-12-04 01:48:46 +01:00
|
|
|
{}
|
|
|
|
|
2014-01-18 02:56:51 +01:00
|
|
|
void operator()(const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer)
|
2013-12-04 01:48:46 +01:00
|
|
|
{
|
2014-01-18 02:56:51 +01:00
|
|
|
if (flags != HighlightFlags::Highlight)
|
|
|
|
return;
|
2014-01-18 00:39:01 +01:00
|
|
|
auto range = display_buffer.range();
|
2014-01-18 11:52:26 +01:00
|
|
|
const auto& buffer = context.buffer();
|
|
|
|
auto& regions = update_cache_ifn(buffer);
|
2014-01-18 00:39:01 +01:00
|
|
|
auto begin = std::lower_bound(regions.begin(), regions.end(), range.first,
|
2014-05-07 20:51:01 +02:00
|
|
|
[](const Region& r, const ByteCoord& c) { return r.end < c; });
|
2014-01-18 00:39:01 +01:00
|
|
|
auto end = std::lower_bound(begin, regions.end(), range.second,
|
2014-05-07 20:51:01 +02:00
|
|
|
[](const Region& r, const ByteCoord& c) { return r.begin < c; });
|
|
|
|
auto correct = [&](const ByteCoord& c) -> ByteCoord {
|
2014-01-18 11:52:26 +01:00
|
|
|
if (buffer[c.line].length() == c.column)
|
2014-01-27 21:28:38 +01:00
|
|
|
return {c.line+1, 0};
|
2014-01-18 11:52:26 +01:00
|
|
|
return c;
|
|
|
|
};
|
2014-01-18 00:39:01 +01:00
|
|
|
for (; begin != end; ++begin)
|
2014-01-18 11:52:26 +01:00
|
|
|
m_func(context, flags, display_buffer,
|
|
|
|
correct(begin->begin), correct(begin->end));
|
2013-12-04 19:52:16 +01:00
|
|
|
}
|
|
|
|
private:
|
2013-12-12 22:01:40 +01:00
|
|
|
Regex m_begin;
|
|
|
|
Regex m_end;
|
2013-12-11 22:38:43 +01:00
|
|
|
HighlightFunc m_func;
|
2013-12-04 19:52:16 +01:00
|
|
|
|
2014-01-06 22:04:55 +01:00
|
|
|
struct Region
|
|
|
|
{
|
2014-05-07 20:51:01 +02:00
|
|
|
ByteCoord begin;
|
|
|
|
ByteCoord end;
|
2014-01-06 22:04:55 +01:00
|
|
|
};
|
|
|
|
using RegionList = std::vector<Region>;
|
|
|
|
|
|
|
|
struct Match
|
|
|
|
{
|
|
|
|
size_t timestamp;
|
2014-01-12 17:28:11 +01:00
|
|
|
LineCount line;
|
|
|
|
ByteCount begin;
|
|
|
|
ByteCount end;
|
2014-01-06 22:04:55 +01:00
|
|
|
};
|
|
|
|
using MatchList = std::vector<Match>;
|
|
|
|
|
2014-01-13 21:11:05 +01:00
|
|
|
static bool compare_matches_end(const Match& lhs, const Match& rhs)
|
|
|
|
{
|
|
|
|
return (lhs.line != rhs.line) ? lhs.line < rhs.line
|
|
|
|
: lhs.end < rhs.end;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool compare_matches_begin(const Match& lhs, const Match& rhs)
|
|
|
|
{
|
|
|
|
return (lhs.line != rhs.line) ? lhs.line < rhs.line
|
|
|
|
: lhs.begin < rhs.begin;
|
|
|
|
}
|
|
|
|
|
2014-01-23 20:54:32 +01:00
|
|
|
struct Cache : public LineChangeWatcher
|
2014-01-12 17:28:11 +01:00
|
|
|
{
|
2014-01-23 20:54:32 +01:00
|
|
|
Cache(const Buffer& buffer) : LineChangeWatcher(buffer) {}
|
2014-01-12 17:28:11 +01:00
|
|
|
|
2014-01-06 22:04:55 +01:00
|
|
|
size_t timestamp = 0;
|
|
|
|
MatchList begin_matches;
|
|
|
|
MatchList end_matches;
|
|
|
|
RegionList regions;
|
2013-12-04 19:52:16 +01:00
|
|
|
};
|
2014-01-12 17:28:11 +01:00
|
|
|
BufferSideCache<Cache> m_cache;
|
2013-12-04 19:52:16 +01:00
|
|
|
|
2014-01-06 22:04:55 +01:00
|
|
|
const RegionList& update_cache_ifn(const Buffer& buffer)
|
2013-12-04 19:52:16 +01:00
|
|
|
{
|
2014-01-12 17:28:11 +01:00
|
|
|
Cache& cache = m_cache.get(buffer);
|
2014-01-06 22:04:55 +01:00
|
|
|
const size_t buf_timestamp = buffer.timestamp();
|
|
|
|
if (cache.timestamp == buf_timestamp)
|
|
|
|
return cache.regions;
|
2014-01-09 22:57:37 +01:00
|
|
|
|
2014-01-15 21:28:58 +01:00
|
|
|
if (cache.timestamp == 0)
|
|
|
|
{
|
|
|
|
find_matches(buffer, cache.begin_matches, m_begin);
|
|
|
|
find_matches(buffer, cache.end_matches, m_end);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2014-01-23 20:54:32 +01:00
|
|
|
auto modifs = cache.compute_modifications();
|
|
|
|
update_matches(buffer, modifs, cache.begin_matches, m_begin);
|
|
|
|
update_matches(buffer, modifs, cache.end_matches, m_end);
|
2014-01-15 21:28:58 +01:00
|
|
|
}
|
2013-12-04 19:52:16 +01:00
|
|
|
|
|
|
|
cache.regions.clear();
|
2014-01-06 22:04:55 +01:00
|
|
|
for (auto beg_it = cache.begin_matches.begin(), end_it = cache.end_matches.begin();
|
|
|
|
beg_it != cache.begin_matches.end(); )
|
2013-12-04 01:48:46 +01:00
|
|
|
{
|
2014-01-06 22:04:55 +01:00
|
|
|
end_it = std::upper_bound(end_it, cache.end_matches.end(),
|
2014-01-13 21:11:05 +01:00
|
|
|
*beg_it, compare_matches_end);
|
2014-01-06 22:04:55 +01:00
|
|
|
if (end_it == cache.end_matches.end())
|
2013-12-04 01:48:46 +01:00
|
|
|
{
|
2014-01-13 21:11:05 +01:00
|
|
|
cache.regions.push_back({ {beg_it->line, beg_it->begin},
|
|
|
|
buffer.end_coord() });
|
2014-01-06 22:04:55 +01:00
|
|
|
break;
|
2013-12-04 01:48:46 +01:00
|
|
|
}
|
2014-01-13 21:11:05 +01:00
|
|
|
cache.regions.push_back({ {beg_it->line, beg_it->begin},
|
|
|
|
{end_it->line, end_it->end} });
|
|
|
|
beg_it = std::upper_bound(beg_it, cache.begin_matches.end(),
|
|
|
|
*end_it, compare_matches_end);
|
2013-12-04 01:48:46 +01:00
|
|
|
}
|
2013-12-04 19:52:16 +01:00
|
|
|
cache.timestamp = buffer.timestamp();
|
2014-01-06 22:04:55 +01:00
|
|
|
return cache.regions;
|
|
|
|
}
|
|
|
|
|
2014-01-15 21:28:58 +01:00
|
|
|
void find_matches(const Buffer& buffer, MatchList& matches, const Regex& regex)
|
|
|
|
{
|
|
|
|
const size_t buf_timestamp = buffer.timestamp();
|
|
|
|
for (auto line = 0_line, end = buffer.line_count(); line < end; ++line)
|
|
|
|
{
|
|
|
|
auto& l = buffer[line];
|
|
|
|
for (boost::regex_iterator<String::const_iterator> it{l.begin(), l.end(), regex}, end{}; it != end; ++it)
|
|
|
|
{
|
|
|
|
ByteCount b = (int)((*it)[0].first - l.begin());
|
|
|
|
ByteCount e = (int)((*it)[0].second - l.begin());
|
|
|
|
matches.push_back({ buf_timestamp, line, b, e });
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-23 20:54:32 +01:00
|
|
|
void update_matches(const Buffer& buffer, memoryview<LineModification> modifs, MatchList& matches, const Regex& regex)
|
2014-01-06 22:04:55 +01:00
|
|
|
{
|
|
|
|
const size_t buf_timestamp = buffer.timestamp();
|
2014-01-12 17:28:11 +01:00
|
|
|
// remove out of date matches and update line for others
|
2014-01-14 20:42:57 +01:00
|
|
|
auto ins_pos = matches.begin();
|
|
|
|
for (auto it = ins_pos; it != matches.end(); ++it)
|
2014-01-06 22:04:55 +01:00
|
|
|
{
|
2014-01-23 20:54:32 +01:00
|
|
|
auto modif_it = std::lower_bound(modifs.begin(), modifs.end(), it->line,
|
2014-04-27 13:23:46 +02:00
|
|
|
[](const LineModification& c, const LineCount& l)
|
|
|
|
{ return c.old_line < l; });
|
2014-01-14 20:42:57 +01:00
|
|
|
bool erase = false;
|
2014-01-23 20:54:32 +01:00
|
|
|
if (modif_it != modifs.begin())
|
2014-01-12 17:28:11 +01:00
|
|
|
{
|
2014-01-23 20:54:32 +01:00
|
|
|
auto& prev = *(modif_it-1);
|
|
|
|
erase = it->line <= prev.old_line + prev.num_removed;
|
|
|
|
it->line += prev.diff();
|
2014-01-13 21:11:05 +01:00
|
|
|
}
|
2014-01-14 20:42:57 +01:00
|
|
|
erase = erase or (it->line >= buffer.line_count() or
|
|
|
|
it->timestamp < buffer.line_timestamp(it->line));
|
|
|
|
|
|
|
|
if (not erase)
|
2014-01-12 17:28:11 +01:00
|
|
|
{
|
|
|
|
it->timestamp = buf_timestamp;
|
2014-01-18 11:52:26 +01:00
|
|
|
kak_assert(buffer.is_valid({it->line, it->begin}) or
|
|
|
|
buffer[it->line].length() == it->begin);
|
|
|
|
kak_assert(buffer.is_valid({it->line, it->end}) or
|
|
|
|
buffer[it->line].length() == it->end);
|
2014-01-14 20:42:57 +01:00
|
|
|
|
|
|
|
if (ins_pos != it)
|
|
|
|
*ins_pos = std::move(*it);
|
|
|
|
++ins_pos;
|
2014-01-12 17:28:11 +01:00
|
|
|
}
|
2014-01-06 22:04:55 +01:00
|
|
|
}
|
2014-01-14 20:42:57 +01:00
|
|
|
matches.erase(ins_pos, matches.end());
|
|
|
|
size_t pivot = matches.size();
|
|
|
|
|
2014-01-06 22:04:55 +01:00
|
|
|
// try to find new matches in each updated lines
|
2014-01-23 20:54:32 +01:00
|
|
|
for (auto& modif : modifs)
|
2014-01-06 22:04:55 +01:00
|
|
|
{
|
2014-01-23 20:54:32 +01:00
|
|
|
for (auto line = modif.new_line; line < modif.new_line + modif.num_added+1; ++line)
|
2014-01-06 22:04:55 +01:00
|
|
|
{
|
2014-01-23 20:54:32 +01:00
|
|
|
kak_assert(line < buffer.line_count());
|
|
|
|
auto& l = buffer[line];
|
|
|
|
for (boost::regex_iterator<String::const_iterator> it{l.begin(), l.end(), regex}, end{}; it != end; ++it)
|
|
|
|
{
|
|
|
|
ByteCount b = (int)((*it)[0].first - l.begin());
|
|
|
|
ByteCount e = (int)((*it)[0].second - l.begin());
|
|
|
|
matches.push_back({ buf_timestamp, line, b, e });
|
|
|
|
}
|
2014-01-06 22:04:55 +01:00
|
|
|
}
|
|
|
|
}
|
2014-01-14 20:42:57 +01:00
|
|
|
std::inplace_merge(matches.begin(), matches.begin() + pivot, matches.end(),
|
|
|
|
compare_matches_begin);
|
2013-12-04 01:48:46 +01:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2013-12-11 22:38:43 +01:00
|
|
|
template<typename HighlightFunc>
|
|
|
|
RegionHighlighter<HighlightFunc>
|
2013-12-12 22:01:40 +01:00
|
|
|
make_region_highlighter(Regex begin, Regex end, HighlightFunc func)
|
2013-12-11 22:38:43 +01:00
|
|
|
{
|
2013-12-12 22:01:40 +01:00
|
|
|
return RegionHighlighter<HighlightFunc>(std::move(begin), std::move(end), std::move(func));
|
2013-12-11 22:38:43 +01:00
|
|
|
}
|
|
|
|
|
2013-12-04 01:48:46 +01:00
|
|
|
HighlighterAndId region_factory(HighlighterParameters params)
|
|
|
|
{
|
2013-12-12 22:01:40 +01:00
|
|
|
try
|
|
|
|
{
|
|
|
|
if (params.size() != 3)
|
|
|
|
throw runtime_error("wrong parameter count");
|
2013-12-04 01:48:46 +01:00
|
|
|
|
2014-01-10 14:36:40 +01:00
|
|
|
Regex begin{params[0], Regex::nosubs | Regex::optimize };
|
|
|
|
Regex end{params[1], Regex::nosubs | Regex::optimize };
|
2013-12-12 22:01:40 +01:00
|
|
|
const ColorPair colors = get_color(params[2]);
|
2013-12-04 01:48:46 +01:00
|
|
|
|
2014-01-18 02:56:51 +01:00
|
|
|
auto func = [colors](const Context&, HighlightFlags flags, DisplayBuffer& display_buffer,
|
2014-05-07 20:51:01 +02:00
|
|
|
ByteCoord begin, ByteCoord end)
|
2013-12-12 22:01:40 +01:00
|
|
|
{
|
|
|
|
highlight_range(display_buffer, begin, end, true,
|
|
|
|
[&colors](DisplayAtom& atom) { atom.colors = colors; });
|
|
|
|
};
|
2013-12-11 22:38:43 +01:00
|
|
|
|
2013-12-12 22:01:40 +01:00
|
|
|
return HighlighterAndId("region(" + params[0] + "," + params[1] + ")",
|
|
|
|
make_region_highlighter(std::move(begin), std::move(end), func));
|
|
|
|
}
|
|
|
|
catch (boost::regex_error& err)
|
|
|
|
{
|
|
|
|
throw runtime_error(String("regex error: ") + err.what());
|
|
|
|
}
|
2013-12-04 01:48:46 +01:00
|
|
|
}
|
|
|
|
|
2013-12-11 22:38:43 +01:00
|
|
|
HighlighterAndId region_ref_factory(HighlighterParameters params)
|
|
|
|
{
|
2013-12-12 22:01:40 +01:00
|
|
|
try
|
|
|
|
{
|
|
|
|
if (params.size() != 3 and params.size() != 4)
|
|
|
|
throw runtime_error("wrong parameter count");
|
2013-12-11 22:38:43 +01:00
|
|
|
|
2014-01-10 14:36:40 +01:00
|
|
|
Regex begin{params[0], Regex::nosubs | Regex::optimize };
|
|
|
|
Regex end{params[1], Regex::nosubs | Regex::optimize };
|
2013-12-12 22:01:40 +01:00
|
|
|
const String& name = params[2];
|
2013-12-11 22:38:43 +01:00
|
|
|
|
2014-01-18 02:56:51 +01:00
|
|
|
auto func = [name](const Context& context, HighlightFlags flags, DisplayBuffer& display_buffer,
|
2014-05-07 20:51:01 +02:00
|
|
|
ByteCoord begin, ByteCoord end)
|
2013-12-12 22:01:40 +01:00
|
|
|
{
|
2014-02-25 01:18:16 +01:00
|
|
|
try
|
|
|
|
{
|
|
|
|
HighlighterGroup& ref = DefinedHighlighters::instance().get_group(name, '/');
|
|
|
|
apply_highlighter(context, flags, display_buffer, begin, end, ref);
|
|
|
|
}
|
|
|
|
catch (group_not_found&) {}
|
2013-12-12 22:01:40 +01:00
|
|
|
};
|
2013-12-11 22:38:43 +01:00
|
|
|
|
2013-12-12 22:01:40 +01:00
|
|
|
return HighlighterAndId("regionref(" + params[0] + "," + params[1] + "," + name + ")",
|
|
|
|
make_region_highlighter(std::move(begin), std::move(end), func));
|
|
|
|
}
|
|
|
|
catch (boost::regex_error& err)
|
|
|
|
{
|
|
|
|
throw runtime_error(String("regex error: ") + err.what());
|
|
|
|
}
|
2013-12-11 22:38:43 +01:00
|
|
|
}
|
2013-12-04 01:48:46 +01: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
|
|
|
|
2013-03-01 14:30:30 +01:00
|
|
|
registry.register_func("number_lines", SimpleHighlighterFactory<show_line_numbers>("number_lines"));
|
2014-01-20 22:01:26 +01:00
|
|
|
registry.register_func("show_matching", SimpleHighlighterFactory<show_matching_char>("show_matching"));
|
2012-11-23 13:40:20 +01:00
|
|
|
registry.register_func("regex", colorize_regex_factory);
|
2013-03-26 14:26:59 +01:00
|
|
|
registry.register_func("regex_option", highlight_regex_option_factory);
|
2012-12-31 14:28:32 +01:00
|
|
|
registry.register_func("search", highlight_search_factory);
|
2012-11-23 13:40:20 +01:00
|
|
|
registry.register_func("group", highlighter_group_factory);
|
2013-03-06 14:24:47 +01:00
|
|
|
registry.register_func("flag_lines", flag_lines_factory);
|
2013-12-03 23:03:10 +01:00
|
|
|
registry.register_func("ref", reference_factory);
|
2013-12-04 01:48:46 +01:00
|
|
|
registry.register_func("region", region_factory);
|
2013-12-11 22:38:43 +01:00
|
|
|
registry.register_func("region_ref", region_ref_factory);
|
2011-11-08 15:28:01 +01:00
|
|
|
}
|
|
|
|
|
2011-09-30 21:16:23 +02:00
|
|
|
}
|