completion filtering and sorting - #235

src/dlangide/tools/d/dcdinterface.d

@@ -30,9 +30,14 @@ enum DCDResult : int {
     FAIL,
 }
 
+struct CompletionSymbol {
+    dstring name;
+    char kind;
+}
+
 alias DocCommentsResultSet = Tuple!(DCDResult, "result", string[], "docComments");
 alias FindDeclarationResultSet = Tuple!(DCDResult, "result", string, "fileName", ulong, "offset");
-alias CompletionResultSet = Tuple!(DCDResult, "result", dstring[], "output", char[], "completionKinds");
+alias CompletionResultSet = Tuple!(DCDResult, "result", CompletionSymbol[], "output");
 
 
 class DCDTask {
@@ -301,16 +306,17 @@ class DCDInterface : Thread {
 
             result.result = DCDResult.SUCCESS;
             result.output.length = response.completions.length;
-            result.completionKinds.length = response.completions.length;
             int i=0;
             foreach(s;response.completions) {
                 char type = 0;
                 if (i < response.completionKinds.length)
                     type = response.completionKinds[i];
-                result.completionKinds[i] = type;
-                result.output[i++] = to!dstring(s);
+                result.output[i].kind = type;
+                result.output[i].name = to!dstring(s);
+                i++;
             }
-            debug(DCD) Log.d("DCD output:\n", response.completions);
+            postProcessCompletions(result.output);
+            debug(DCD) Log.d("DCD response:\n", response, "\nCompletion result:\n", result.output);
         }
         override void postResults() {
             _callback(result);
@@ -327,6 +333,87 @@ class DCDInterface : Thread {
 
 }
 
+int completionTypePriority(char t) {
+    switch(t) {
+        case 'c': // - class name
+            return 10;
+        case 'i': // - interface name
+            return 10;
+        case 's': // - struct name
+            return 10;
+        case 'u': // - union name
+            return 10;
+        case 'v': // - variable name
+            return 5;
+        case 'm': // - member variable name
+            return 3;
+        case 'k': // - keyword, built-in version, scope statement
+            return 20;
+        case 'f': // - function or method
+            return 2;
+        case 'g': // - enum name
+            return 9;
+        case 'e': // - enum member
+            return 8;
+        case 'P': // - package name
+            return 30;
+        case 'M': // - module name
+            return 20;
+        case 'a': // - array
+            return 15;
+        case 'A': // - associative array
+            return 15;
+        case 'l': // - alias name
+            return 15;
+        case 't': // - template name
+            return 14;
+        case 'T': // - mixin template name
+            return 14;
+        default:
+            return 50;
+    }
+}
+
+int compareCompletionSymbol(ref CompletionSymbol v1, ref CompletionSymbol v2) {
+    import std.algorithm : cmp;
+    int p1 = v1.kind.completionTypePriority;
+    int p2 = v2.kind.completionTypePriority;
+    if (p1 < p2)
+        return -1;
+    if (p1 > p2)
+        return 1;
+    return v1.name.cmp(v2.name);
+}
+
+bool lessCompletionSymbol(ref CompletionSymbol v1, ref CompletionSymbol v2) {
+    return compareCompletionSymbol(v1, v2) < 0;
+}
+
+void postProcessCompletions(ref CompletionSymbol[] completions) {
+    import std.algorithm.sorting : sort;
+    completions.sort!(lessCompletionSymbol);
+    CompletionSymbol[] res;
+    bool hasKeywords = false;
+    bool hasNonKeywords = false;
+    bool[dstring] found;
+    foreach(s; completions) {
+        if (s.kind == 'k')
+            hasKeywords = true;
+        else
+            hasNonKeywords = true;
+    }
+    // remove duplicates; remove keywords if non-keyword items are found
+    foreach(s; completions) {
+        if (!(s.name in found)) {
+            found[s.name] = true;
+            if (s.kind != 'k' || !hasNonKeywords) {
+                res ~= s;
+            }
+        }
+    }
+    completions = res;
+}
+
 
 /// to test broken DCD after DUB invocation
 /// run it after DCD ModuleCache is instantiated

src/dlangide/tools/d/deditortool.d

@@ -138,7 +138,7 @@ class DEditorTool : EditorTool
             dstring[] labels;
             foreach(index, label; output.output) {
                 string iconId;
-                char ch = index < output.completionKinds.length ? output.completionKinds[index] : 0;
+                char ch = label.kind;
                 switch(ch) {
                     case 'c': // - class name
                         iconId = "symbol-class";
@@ -192,12 +192,11 @@ class DEditorTool : EditorTool
                         iconId = "symbol-mixintemplate";
                         break;
                     default:
+                        iconId = "symbol-other";
                         break;
                 }
-                if (!iconId)
-                    iconId = "symbol-other";
                 icons ~= iconId;
-                labels ~= label;
+                labels ~= label.name;
             }
             callback(labels, icons);
             _getCompletionsTask = null;