textDocument/definition should not send 'null' result

See: #309
spring-projects · Jun 28, 2019 · 564e176 · 564e176
1 parent cf7cadf
commit 564e176
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java b/...org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java
@@ -352,7 +352,11 @@ public CompletableFuture<Either<List<? extends Location>, List<? extends Locatio
  if (h != null) {
  return async.invoke(() -> {
  List<Location> locations = h.handle(position);
- return Either.<List<? extends Location>, List<? extends LocationLink>>forLeft(locations);
+ if (locations==null) {
+ // vscode client does not like to recieve null result. See: https:/spring-projects/sts4/issues/309
+ locations = ImmutableList.of();
+ }
+ return Either.forLeft(locations);
  });
  }
  return CompletableFuture.completedFuture(Either.forLeft(ImmutableList.of()));