fix: Offer completion results from supertypes (#987)

microsoft · Sep 14, 2021 · 8dd2c86 · 8dd2c86
1 parent 786a32d
commit 8dd2c86
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/gradle-language-server/src/main/java/com/microsoft/gradle/handlers/CompletionHandler.java b/gradle-language-server/src/main/java/com/microsoft/gradle/handlers/CompletionHandler.java
@@ -51,16 +51,24 @@ public List<CompletionItem> getCompletionItems(MethodCallExpression containingCa
     if (delegateClass == null) {
       return Collections.emptyList();
     }
-    return getCompletionItemsFromClass(delegateClass);
+    return getCompletionItemsFromClass(delegateClass, resolver, new HashSet<>());
   }
 
-  private List<CompletionItem> getCompletionItemsFromClass(JavaClass javaClass) {
+  private List<CompletionItem> getCompletionItemsFromClass(JavaClass javaClass, GradleLibraryResolver resolver, Set<String> resultSet) {
     if (javaClass == null) {
       return Collections.emptyList();
     }
     List<CompletionItem> results = new ArrayList<>();
+    for (String superInterface : javaClass.getInterfaceNames()) {
+      if (resolver.getGradleLibraries().containsKey(superInterface)) {
+        results.addAll(getCompletionItemsFromClass(resolver.getGradleLibraries().get(superInterface), resolver, resultSet));
+      }
+    }
+    String superClass = javaClass.getSuperclassName();
+    if (resolver.getGradleLibraries().containsKey(superClass)) {
+      results.addAll(getCompletionItemsFromClass(resolver.getGradleLibraries().get(superClass), resolver, resultSet));
+    }
     List<String> methodNames = new ArrayList<>();
-    Set<String> resultSet = new HashSet<>();
     Method[] methods = javaClass.getMethods();
     for (Method method : methods) {
       StringBuilder labelBuilder = new StringBuilder();