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

Merge commit 'krobelus/05-highlight-replace-ranges-crash^'

Browse Source
This commit is contained in:
Maxime Coste 2020-05-30 09:18:35 +10:00
commit ec4980df34
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/highlighters.cc
View File

@ -57,7 +57,7 @@ void highlight_range(DisplayBuffer& display_buffer,
for (auto& line : display_buffer.lines()) for (auto& line : display_buffer.lines())
{ {
auto& range = line.range(); auto& range = line.range();
if (range.end <= begin or end < range.begin) if (range.end <= begin or end < range.begin)
continue; continue;
for (auto atom_it = line.begin(); atom_it != line.end(); ++atom_it) for (auto atom_it = line.begin(); atom_it != line.end(); ++atom_it)
@ -1568,7 +1568,7 @@ private:
static bool is_valid(Buffer& buffer, BufferCoord c) static bool is_valid(Buffer& buffer, BufferCoord c)
{ {
return c.line >= 0 and c.column >= 0 and c.line < buffer.line_count() and c.column <= buffer[c.line].length(); return c.line >= 0 and c.column >= 0 and c.line < buffer.line_count() and c.column <= buffer[c.line].length();
}; }
static bool is_fully_selected(const SelectionList& sels, const InclusiveBufferRange& range) static bool is_fully_selected(const SelectionList& sels, const InclusiveBufferRange& range)
{ {
@ -1576,7 +1576,7 @@ private:
if (it == sels.end()) if (it == sels.end())
return true; return true;
return it->min() > range.last or (it->min() <= range.first and it->max() >= range.last); return it->min() > range.last or (it->min() <= range.first and it->max() >= range.last);
}; }
void do_highlight(HighlightContext context, DisplayBuffer& display_buffer, BufferRange) override void do_highlight(HighlightContext context, DisplayBuffer& display_buffer, BufferRange) override
{ {

2
test/README.asciidoc
View File

@ -47,7 +47,7 @@ and should contain the initial text loaded into the input buffer
for editing by the +cmd+ key sequence. for editing by the +cmd+ key sequence.
+ui-in+ is optional +ui-in+ is optional
and should contain the json-rpc commands sent by the UI at startup. and should contain the json-rpc commands sent to the UI at startup.
+out+ is optional +out+ is optional
and should contain the expected text generated by the +cmd+ key sequence. and should contain the expected text generated by the +cmd+ key sequence.