Bracket Colors

Add bracketcolors plugin. Color {}, [], () based on nesting order Closes #1148
geany · Apr 6, 2023 · 48fdf9e · 48fdf9e
1 parent 50ae403
commit 48fdf9e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/bracketcolors/src/BracketMap.cc b/bracketcolors/src/BracketMap.cc
@@ -68,12 +68,13 @@
 
 
 // -----------------------------------------------------------------------------
-    void BracketMap::ComputeOrder()
+    std::set<BracketMap::Index> BracketMap::ComputeOrder()
 /*
 
 ----------------------------------------------------------------------------- */
 {
     std::stack<Index> orderStack;
+    std::set<Index> updatedBrackets;
 
     for (auto &it : mBracketMap) {
 
@@ -105,6 +106,14 @@
             orderStack.push(endPos);
         }
 
-        GetOrder(bracket) = orderStack.size() - 1;
+        Order newOrder = orderStack.size() - 1;
+        Order currOrder = GetOrder(bracket);
+        if (newOrder != currOrder) {
+            updatedBrackets.insert(startIndex);
+        }
+
+        GetOrder(bracket) = newOrder;
     }
+
+    return updatedBrackets;
 }
diff --git a/bracketcolors/src/BracketMap.h b/bracketcolors/src/BracketMap.h
@@ -23,6 +23,7 @@
 
 #include <map>
 #include <tuple>
+#include <set>
 
 #include <glib.h>
 
@@ -41,7 +42,7 @@
     ~BracketMap();
 
     void Update(Index index, Length length);
-    void ComputeOrder();
+    std::set<Index> ComputeOrder();
 
     static const gint UNDEFINED = -1;
 

diff --git a/bracketcolors/src/bracketcolors.cc b/bracketcolors/src/bracketcolors.cc
@@ -758,9 +758,9 @@
         return madeChange;
     }
 
-    for (const auto &it : indiciesToRecompute) {
-        bracketColorsData.recomputeIndicies.insert(it);
-    }
+    bracketColorsData.recomputeIndicies.insert(
+        indiciesToRecompute.begin(), indiciesToRecompute.end()
+    );
 
     for (const auto &it : indiciesToAdjust) {
         bracketMap.mBracketMap.insert(
@@ -1078,7 +1078,8 @@
                     }
                 }
 
-                bracketMap.ComputeOrder();
+                std::set<BracketMap::Index> updatedBrackets = bracketMap.ComputeOrder();
+                data->redrawIndicies.insert(updatedBrackets.begin(), updatedBrackets.end());
             }
 
             position = data->recomputeIndicies.erase(position);