Skip to content

Commit 16f4d0c

Browse files
committed
GH-1380: return null instead of empty list when there are no document hightlights found to avoid confusion on the client side
1 parent 9b1052b commit 16f4d0c

File tree

1 file changed

+3
-2
lines changed
  • headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util

1 file changed

+3
-2
lines changed

headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleTextDocumentService.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -654,12 +654,13 @@ public CompletableFuture<List<? extends DocumentHighlight>> documentHighlight(Do
654654
DocumentHighlightHandler handler = this.documentHighlightHandler;
655655
if (handler != null) {
656656
return CompletableFutures.computeAsync(messageWorkerThreadPool, cancelToken -> {
657-
return handler.handle(cancelToken, highlightParams);
657+
List<? extends DocumentHighlight> result = handler.handle(cancelToken, highlightParams);
658+
return result != null && result.size() > 0 ? result : null;
658659

659660
});
660661
}
661662
else {
662-
return CompletableFuture.completedFuture(Collections.emptyList());
663+
return CompletableFuture.completedFuture(null);
663664
}
664665
}
665666

0 commit comments

Comments
 (0)