Workaround for GCompareDataFunc target issue (#54)

Avoid grabbing an extra reference to Vls.ListSymbols by avoiding the implicit use of GCompareDataFunc in Gee.TreeMap.
elementary · Mar 21, 2020 · 92770ea · 92770ea
1 parent 9a38e6b
commit 92770ea
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/src/find_symbol.vala b/src/find_symbol.vala
@@ -57,7 +57,7 @@ class Vls.FindSymbol : Vala.CodeVisitor {
             return false;       // we only want to find symbols, right?
         }
 
-        if (begin.compare (pos) <= 0 && pos.compare (end) <= 0 && (end_pos == null || end.compare (end_pos) <= 0)) {
+        if (begin.compare_to (pos) <= 0 && pos.compare_to (end) <= 0 && (end_pos == null || end.compare_to (end_pos) <= 0)) {
             debug ("Got node: %s (%s) @ %s", node.type_name, node.to_string (), sr.to_string ());
             return true;
         } else {

diff --git a/src/list_symbols.vala b/src/list_symbols.vala
@@ -16,7 +16,7 @@ class Vls.ListSymbols : Vala.CodeVisitor {
         this.file = file;
         this.top_level_syms = new Gee.LinkedList<DocumentSymbol> ();
         this.containers = new Gee.LinkedList<DocumentSymbol> ();
-        this.syms_flat = new Gee.TreeMap<Range, DocumentSymbol> ((r1, r2) => r1.start.compare (r2.start));
+        this.syms_flat = new Gee.TreeMap<Range, DocumentSymbol> ();
         this.all_syms = new Gee.LinkedList<DocumentSymbol> ();
         this.ns_name_to_dsym = new Gee.HashMap<string, DocumentSymbol> ();
 

diff --git a/src/main.vala b/src/main.vala
@@ -846,7 +846,7 @@ class Vls.Server : Object {
                 var node_begin = new Position.from_libvala (node.source_reference.begin);
                 var node_end = new Position.from_libvala (node.source_reference.end);
 
-                if (best_begin.compare (node_begin) <= 0 && node_end.compare (best_end) <= 0 &&
+                if (best_begin.compare_to (node_begin) <= 0 && node_end.compare_to (best_end) <= 0 &&
                     !(best.source_reference.begin.column == node.source_reference.begin.column &&
                         node.source_reference.end.column == best.source_reference.end.column &&
                         // don't get implicit `this` accesses
@@ -1824,7 +1824,7 @@ class Vls.Server : Object {
                             var sr_begin = new Position () { line = sr.begin.line, character = sr.begin.column - 1 };
 
                             // don't show local variables that are declared ahead of the cursor
-                            if (sr_begin.compare (fs.pos) > 0)
+                            if (sr_begin.compare_to (fs.pos) > 0)
                                 continue;
                             completions.add (new CompletionItem.from_symbol (sym, 
                                 (sym is Vala.Constant) ? CompletionItemKind.Constant : CompletionItemKind.Variable,

diff --git a/src/protocol.vala b/src/protocol.vala
@@ -40,7 +40,7 @@ namespace LanguageServer {
         Hint = 4
     }
 
-    class Position : Object {
+    class Position : Object, Gee.Comparable<Position> {
         /**
          * Line position in a document (zero-based).
          */
@@ -56,7 +56,7 @@ namespace LanguageServer {
          */
         public uint character { get; set; default = -1; }
 
-        public int compare (Position other) {
+        public int compare_to (Position other) {
             return line > other.line ? 1 :
                 (line == other.line ?
                  (character > other.character ? 1 :
@@ -85,7 +85,7 @@ namespace LanguageServer {
         }
     }
 
-    class Range : Object, Gee.Hashable<Range> {
+    class Range : Object, Gee.Hashable<Range>, Gee.Comparable<Range> {
         /**
          * The range's start position.
          */
@@ -110,13 +110,17 @@ namespace LanguageServer {
 
         public bool equal_to (Range other) { return this.to_string () == other.to_string (); }
 
+        public int compare_to (Range other) {
+            return start.compare_to (other.start);
+        }
+
         /**
          * Return a new range that includes `this` and `other`.
          */
         public Range union (Range other) {
             return new Range () {
-                start = start.compare (other.start) < 0 ? start : other.start,
-                end = end.compare (other.end) < 0 ? other.end : end
+                start = start.compare_to (other.start) < 0 ? start : other.start,
+                end = end.compare_to (other.end) < 0 ? other.end : end
             };
         }
     }