Remove built-in repetitions from completion suggestions

klesun · Nov 30, 2017 · b815e87 · b815e87
1 parent e2c2a0b
commit b815e87
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/src/org/klesun/deep_assoc_completion/completion_providers/DeepKeysPvdr.java b/src/org/klesun/deep_assoc_completion/completion_providers/DeepKeysPvdr.java
@@ -47,6 +47,8 @@ protected void addCompletions(@NotNull CompletionParameters parameters, Processi
         SearchContext search = new SearchContext().setDepth(35);
         IFuncCtx funcCtx = new FuncCtx(search, L());
 
+        L<LookupElement> suggestions = L();
+
         long startTime = System.nanoTime();
         Lang.opt(parameters.getPosition().getParent())
             .thn(literal -> Lang.opt(literal.getParent())
@@ -77,18 +79,29 @@ protected void addCompletions(@NotNull CompletionParameters parameters, Processi
                             }
                             Project project = parameters.getPosition().getProject();
                             LookupElement lookup = makeLookup(keyEntry, project);
-                            result.addElement(PrioritizedLookupElement.withPriority(lookup, 3000 - ++i));
+                            suggestions.add(PrioritizedLookupElement.withPriority(lookup, 3000 - ++i));
                         }
                         L(type.indexTypes).gat(0).flt(t -> type.keys.size() == 0).thn(t -> {
                             for (int k = 0; k < 10; ++k) {
-                                result.addElement(makeLookupBase(k + "", t.briefType.toString()));
+                                suggestions.add(makeLookupBase(k + "", t.briefType.toString()));
                             }
                         });
                     }
                     result.addLookupAdvertisement("Press <Page Down> few times to skip built-in suggestions");
                 })
                 .els(() -> System.out.println("Failed to find declared array keys")));
 
+        result.addAllElements(suggestions);
+        Set<String> suggested = new HashSet<>(suggestions.map(l -> l.getLookupString()));
+
+        result.runRemainingContributors(parameters, otherSourceResult -> {
+            // remove dupe buil-in suggestions
+            LookupElement lookup = otherSourceResult.getLookupElement();
+            if (!suggested.contains(lookup.getLookupString())) {
+                result.addElement(lookup);
+            }
+        });
+
         long elapsed = System.nanoTime() - startTime;
     }
 }