return empty list if visit failed

microsoft · Sep 2, 2021 · abae73d · abae73d
1 parent add875a
commit abae73d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/gradle-language-server/src/main/java/com/microsoft/gradle/GradleServices.java b/gradle-language-server/src/main/java/com/microsoft/gradle/GradleServices.java
@@ -211,10 +211,9 @@ public CompletableFuture<List<Either<SymbolInformation, DocumentSymbol>>> docume
   public CompletableFuture<Either<List<CompletionItem>, CompletionList>> completion(CompletionParams params) {
     URI uri = URI.create(params.getTextDocument().getUri());
     GradleCompilationUnit unit = this.gradleFilesManager.getCompilationUnit(uri);
-    if (unit == null) {
+    if (unit == null || !this.completionVisitor.visitCompilationUnit(uri, unit)) {
       return CompletableFuture.completedFuture(Either.forLeft(Collections.emptyList()));
     }
-    this.completionVisitor.visitCompilationUnit(uri, unit);
     List<DependencyItem> dependencies = this.completionVisitor.getDependencies(uri);
     for (DependencyItem dependency : dependencies) {
       if (Ranges.containsPosition(dependency.getRange(), params.getPosition())) {
@@ -224,12 +223,11 @@ public CompletableFuture<Either<List<CompletionItem>, CompletionList>> completio
       }
     }
     // should return empty if in constants
-    List<Expression> constants = this.completionVisitor.getConstants(uri); {
-      for (Expression constant : constants) {
-        Range range = LSPUtils.toRange(constant);
-        if (Ranges.containsPosition(range, params.getPosition())) {
-          return CompletableFuture.completedFuture(Either.forLeft(Collections.emptyList()));
-        }
+    List<Expression> constants = this.completionVisitor.getConstants(uri);
+    for (Expression constant : constants) {
+      Range range = LSPUtils.toRange(constant);
+      if (Ranges.containsPosition(range, params.getPosition())) {
+        return CompletableFuture.completedFuture(Either.forLeft(Collections.emptyList()));
       }
     }
     Set<MethodCallExpression> methodCalls = this.completionVisitor.getMethodCalls(uri);

diff --git a/gradle-language-server/src/main/java/com/microsoft/gradle/compile/CompletionVisitor.java b/gradle-language-server/src/main/java/com/microsoft/gradle/compile/CompletionVisitor.java
@@ -56,6 +56,7 @@ public Range getRange() {
   }
 
   private URI currentUri;
+  private boolean currentUriVisited = false;
   private Map<URI, List<DependencyItem>> dependencies = new HashMap<>();
   private Map<URI, Set<MethodCallExpression>> methodCalls = new HashMap<>();
   private Map<URI, List<Statement>> statements = new HashMap<>();
@@ -77,9 +78,11 @@ public List<Expression> getConstants(URI uri) {
     return this.constants.get(uri);
   }
 
-  public void visitCompilationUnit(URI uri, GradleCompilationUnit compilationUnit) {
+  public boolean visitCompilationUnit(URI uri, GradleCompilationUnit compilationUnit) {
+    this.currentUriVisited = false;
     this.currentUri = uri;
     compilationUnit.iterator().forEachRemaining(unit -> visitSourceUnit(uri, unit));
+    return this.currentUriVisited;
   }
 
   public void visitSourceUnit(URI uri, SourceUnit unit) {
@@ -90,6 +93,7 @@ public void visitSourceUnit(URI uri, SourceUnit unit) {
       this.statements.put(uri, new ArrayList<>());
       this.constants.put(uri, new ArrayList<>());
       visitModule(moduleNode);
+      this.currentUriVisited = true;
     }
   }