Rework regions highlighter, refactor and extract line tracking

src/highlighters.cc

@@ -9,6 +9,7 @@
 #include "string.hh"
 #include "utf8.hh"
 #include "utf8_iterator.hh"
+#include "line_change_watcher.hh"
 
 #include <sstream>
 #include <locale>
@@ -636,78 +637,17 @@ private:
                                       : lhs.begin < rhs.begin;
     }
 
-    struct LineChange
+    struct Cache : public LineChangeWatcher
     {
-        LineCount pos;
+        Cache(const Buffer& buffer) : LineChangeWatcher(buffer) {}
-        LineCount num;
-    };
-
-    struct Cache : public BufferChangeListener_AutoRegister
-    {
-        Cache(const Buffer& buffer)
-            : BufferChangeListener_AutoRegister(const_cast<Buffer&>(buffer))
-        {}
-
-        void on_insert(const Buffer& buffer, BufferCoord begin, BufferCoord end) override
-        {
-            changes.push_back({begin.line, end.line - begin.line});
-        }
-
-        void on_erase(const Buffer& buffer, BufferCoord begin, BufferCoord end) override
-        {
-            changes.push_back({begin.line, begin.line - end.line});
-        }
 
         size_t timestamp = 0;
         MatchList begin_matches;
         MatchList end_matches;
         RegionList regions;
-        std::vector<LineChange> changes;
     };
     BufferSideCache<Cache> m_cache;
 
-    static std::vector<LineCount> compute_lines_to_update(const std::vector<LineChange>& changes)
-    {
-        std::vector<LineCount> res;
-        for (auto& change : changes)
-        {
-            if (change.num == 0)
-                res.push_back(change.pos);
-            else if (change.num > 0)
-            {
-                for (auto& l : res)
-                {
-                    if (l > change.pos)
-                        l += change.num;
-                }
-                for (LineCount i = 0; i <= change.num; ++i)
-                    res.push_back(change.pos + i);
-            }
-            else
-            {
-                for (auto it = res.begin(); it != res.end(); )
-                {
-                    auto& line = *it;
-                    if (line > change.pos)
-                    {
-                        line += change.num;
-                        if (line < change.pos)
-                        {
-                            std::swap(line, res.back());
-                            res.pop_back();
-                            continue;
-                        }
-                    }
-                    ++it;
-                }
-                res.push_back(change.pos);
-            }
-        }
-        std::sort(res.begin(), res.end());
-        res.erase(std::unique(res.begin(), res.end()), res.end());
-        return res;
-    }
-
     const RegionList& update_cache_ifn(const Buffer& buffer)
     {
         Cache& cache = m_cache.get(buffer);
@@ -722,15 +662,9 @@ private:
         }
         else
         {
-            auto to_update = compute_lines_to_update(cache.changes);
+            auto modifs = cache.compute_modifications();
-            std::sort(cache.changes.begin(), cache.changes.end(),
+            update_matches(buffer, modifs, cache.begin_matches, m_begin);
-                      [](const LineChange& lhs, const LineChange& rhs)
+            update_matches(buffer, modifs, cache.end_matches, m_end);
-                      { return lhs.pos < rhs.pos; });
-            for (size_t i = 1; i < cache.changes.size(); ++i)
-                cache.changes[i].num += cache.changes[i-1].num;
-            update_matches(buffer, cache, to_update, cache.begin_matches, m_begin);
-            update_matches(buffer, cache, to_update, cache.end_matches, m_end);
-            cache.changes.clear();
         }
 
         cache.regions.clear();
@@ -769,21 +703,22 @@ private:
         }
     }
 
-    void update_matches(const Buffer& buffer, const Cache& cache, memoryview<LineCount> to_update, MatchList& matches, const Regex& regex)
+    void update_matches(const Buffer& buffer, memoryview<LineModification> modifs, MatchList& matches, const Regex& regex)
     {
         const size_t buf_timestamp = buffer.timestamp();
         // remove out of date matches and update line for others
         auto ins_pos = matches.begin();
         for (auto it = ins_pos; it != matches.end(); ++it)
         {
-            auto change_it = std::lower_bound(cache.changes.begin(), cache.changes.end(), it->line,
+            auto modif_it = std::lower_bound(modifs.begin(), modifs.end(), it->line,
-                                              [](const LineChange& c, const LineCount& l)
+                                              [](const LineModification& c, const LineCount& l)
-                                              { return c.pos < l; });
+                                              { return c.old_line < l; });
             bool erase = false;
-            if (change_it != cache.changes.begin())
+            if (modif_it != modifs.begin())
             {
-                it->line += (change_it-1)->num;
+                auto& prev = *(modif_it-1);
-                erase = it->line <= (change_it-1)->pos;
+                erase = it->line <= prev.old_line + prev.num_removed;
+                it->line += prev.diff();
             }
             erase = erase or (it->line >= buffer.line_count() or
                               it->timestamp < buffer.line_timestamp(it->line));
@@ -805,15 +740,18 @@ private:
         size_t pivot = matches.size();
 
         // try to find new matches in each updated lines
-        for (auto line : to_update)
+        for (auto& modif : modifs)
         {
-            kak_assert(buffer.line_timestamp(line) > cache.timestamp);
+            for (auto line = modif.new_line; line < modif.new_line + modif.num_added+1; ++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());
+                kak_assert(line < buffer.line_count());
-                ByteCount e = (int)((*it)[0].second - l.begin());
+                auto& l = buffer[line];
-                matches.push_back({ buf_timestamp, line, b, e });
+                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 });
+                }
             }
         }
         std::inplace_merge(matches.begin(), matches.begin() + pivot, matches.end(),

src/line_change_watcher.cc

@@ -0,0 +1,77 @@
+#include "line_change_watcher.hh"
+
+namespace Kakoune
+{
+
+std::vector<LineModification> LineChangeWatcher::compute_modifications()
+{
+    std::vector<LineModification> res;
+    for (auto& change : m_changes)
+    {
+        auto pos = std::upper_bound(res.begin(), res.end(), change.pos,
+                                    [](const LineCount& l, const LineModification& c)
+                                    { return l < c.new_line; });
+
+        if (pos != res.begin())
+        {
+            auto& prev = *(pos-1);
+            if (change.pos <= prev.new_line + prev.num_added)
+                --pos;
+            else
+                pos = res.insert(pos, {change.pos - prev.diff(), change.pos, 0, 0});
+        }
+        else
+            pos = res.insert(pos, {change.pos, change.pos, 0, 0});
+
+        auto& modif = *pos;
+        auto next = pos + 1;
+        if (change.num > 0)
+        {
+            modif.num_added += change.num;
+            for (auto it = next; it != res.end(); ++it)
+                it->new_line += change.num;
+        }
+        if (change.num < 0)
+        {
+            const LineCount num_removed = -change.num;
+
+            auto delend = std::upper_bound(next, res.end(), change.pos + num_removed,
+                                           [](const LineCount& l, const LineModification& c)
+                                           { return l < c.new_line; });
+
+            for (auto it = next; it != delend; ++it)
+            {
+                LineCount removed_from_it = (change.pos + num_removed - it->new_line);
+                modif.num_removed += it->num_removed - std::min(removed_from_it, it->num_added);
+                modif.num_added += std::max(0_line, it->num_added - removed_from_it);
+            }
+            next = res.erase(next, delend);
+
+            const LineCount num_removed_from_added = std::min(num_removed, modif.new_line + modif.num_added - change.pos);
+            modif.num_added -= num_removed_from_added;
+            modif.num_removed += num_removed - num_removed_from_added;
+
+            for (auto it = next; it != res.end(); ++it)
+                it->new_line -= num_removed;
+        }
+    }
+    m_changes.clear();
+    return res;
+}
+
+void LineChangeWatcher::on_insert(const Buffer& buffer, BufferCoord begin, BufferCoord end)
+{
+    m_changes.push_back({begin.line, end.line - begin.line});
+}
+
+void LineChangeWatcher::on_erase(const Buffer& buffer, BufferCoord begin, BufferCoord end)
+{
+    if (begin.line == buffer.line_count())
+    {
+        kak_assert(begin.column == 0);
+        --begin.line;
+    }
+    m_changes.push_back({begin.line, begin.line - end.line});
+}
+
+}

src/line_change_watcher.hh

@@ -0,0 +1,40 @@
+#ifndef line_change_watcher_hh_INCLUDED
+#define line_change_watcher_hh_INCLUDED
+
+#include "buffer.hh"
+
+namespace Kakoune
+{
+
+struct LineModification
+{
+    LineCount old_line; // line position in the old buffer
+    LineCount new_line; // new line position
+    LineCount num_removed; // number of lines removed after this one
+    LineCount num_added; // number of lines added after this one
+
+    LineCount diff() const { return new_line - old_line + num_added - num_removed; }
+};
+
+class LineChangeWatcher : public BufferChangeListener_AutoRegister
+{
+public:
+    LineChangeWatcher (const Buffer& buffer)
+        : BufferChangeListener_AutoRegister(const_cast<Buffer&>(buffer)) {}
+
+    std::vector<LineModification> compute_modifications();
+private:
+    void on_insert(const Buffer& buffer, BufferCoord begin, BufferCoord end) override;
+    void on_erase(const Buffer& buffer, BufferCoord begin, BufferCoord end) override;
+
+    struct Change
+    {
+        LineCount pos;
+        LineCount num;
+    };
+    std::vector<Change> m_changes;
+};
+
+}
+
+#endif // line_change_watcher_hh_INCLUDED