Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

switched completion handling to use CompletableFuture instead of reactor Mono and added cancel handling

Browse Source
This commit is contained in:
Martin Lippert
2021-02-28 17:18:40 +01:00
parent ad505668c1
commit 89ee243a5c
6 changed files with 73 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/ConcourseLanguageServerInitializer.java
View File

@@ -45,8 +45,6 @@ import org.springframework.stereotype.Component;
import com.google.common.collect.ImmutableList;
import reactor.core.publisher.Mono;
@Component
public class ConcourseLanguageServerInitializer {
@@ -137,21 +135,23 @@ public class ConcourseLanguageServerInitializer {
// }
// });
documents.onCompletion(params -> {
documents.onCompletion((cancelToken, params) -> {
TextDocument doc = documents.getLatestSnapshot(params);
if (doc != null) {
if (LanguageId.CONCOURSE_PIPELINE.equals(doc.getLanguageId())) {
return forPipelines.completionEngine.getCompletions(params);
return forPipelines.completionEngine.getCompletions(cancelToken, params);
} else if (LanguageId.CONCOURSE_TASK.equals(doc.getLanguageId())) {
return forTasks.completionEngine.getCompletions(params);
return forTasks.completionEngine.getCompletions(cancelToken, params);
}
}
return Mono.just(new CompletionList(false, ImmutableList.of()));
return new CompletionList(false, ImmutableList.of());
});
documents.onCompletionResolve(item -> {
server.completionResolver.resolveNow(item);
documents.onCompletionResolve((cancelToken, item) -> {
server.completionResolver.resolveNow(cancelToken, item);
return item;
});
documents.onHover((cancelToken, params) -> {
log.debug("Concourse hover handler starting");
try {