Use computeModelAsyncCompose from quarkus-ls

This method makes it easier to implement go to definition in properties
files.
Includes the recent bug fix to the method (see redhat-developer/quarkus-ls#679)

Closes #257

Signed-off-by: David Thompson <davthomp@redhat.com>

Author: datho7561

microprofile.ls/org.eclipse.lsp4mp.ls/src/main/java/org/eclipse/lsp4mp/ls/commons/ModelTextDocuments.java

@@ -15,11 +15,13 @@
 
 import java.util.concurrent.CompletableFuture;
 import java.util.function.BiFunction;
+import java.util.function.Function;
 
 import org.eclipse.lsp4j.TextDocumentIdentifier;
 import org.eclipse.lsp4j.TextDocumentItem;
 import org.eclipse.lsp4j.jsonrpc.CancelChecker;
 import org.eclipse.lsp4j.jsonrpc.CompletableFutures;
+import org.eclipse.lsp4j.jsonrpc.CompletableFutures.FutureCancelChecker;
 
 /**
  * The cache of {@link TextDocument} linked to a model.
@@ -94,16 +96,16 @@ public T getModel(String uri) {
 		}
 		return null;
 	}
-
+	
 	/**
 	 * Get or parse the model and apply the code function which expects the model.
 	 *
 	 * @param <R>
-	 * @param documentIdentifier the document indentifier.
-	 * @param code               a bi function that accepts the parsedmodel and
+	 * @param documentIdentifier the document identifier.
+	 * @param code               a bi function that accepts the parsed model and
 	 *                           {@link CancelChecker} and returns the to be
 	 *                           computed value
-	 * @return the DOM Document for a given uri in a future and then apply the given
+	 * @return the model for a given uri in a future and then apply the given
 	 *         function.
 	 */
 	public <R> CompletableFuture<R> computeModelAsync(TextDocumentIdentifier documentIdentifier,
@@ -119,4 +121,36 @@ public <R> CompletableFuture<R> computeModelAsync(TextDocumentIdentifier documen
 			return code.apply(model, cancelChecker);
 		});
 	}
+
+	/**
+	 * Get or parse the model and apply the code function which expects the model.
+	 *
+	 * @param <R>
+	 * @param documentIdentifier the document identifier.
+	 * @param code               a bi function that accepts the parsed model and
+	 *                           {@link CancelChecker} and returns as future the to
+	 *                           be computed value
+	 * @return the model for a given uri in a future and then apply the given
+	 *         function.
+	 */
+	public <R> CompletableFuture<R> computeModelAsyncCompose(TextDocumentIdentifier documentIdentifier,
+			BiFunction<T, CancelChecker, CompletableFuture<R>> code) {
+		return computeAsyncCompose(cancelChecker -> {
+			// Get or parse the model.
+			T model = getModel(documentIdentifier);
+			if (model == null) {
+				return null;
+			}
+			cancelChecker.checkCanceled();
+			// Apply the function code by using the parsed model.{
+			return code.apply(model, cancelChecker);
+		});
+	}
+
+	private static <R> CompletableFuture<R> computeAsyncCompose(Function<CancelChecker, CompletableFuture<R>> code) {
+		CompletableFuture<CancelChecker> start = new CompletableFuture<>();
+		CompletableFuture<R> result = start.thenComposeAsync(code);
+		start.complete(new FutureCancelChecker(result));
+		return result;
+	}
 }

microprofile.ls/org.eclipse.lsp4mp.ls/src/main/java/org/eclipse/lsp4mp/ls/java/JavaTextDocuments.java

@@ -19,12 +19,14 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiFunction;
+import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.eclipse.lsp4j.TextDocumentItem;
 import org.eclipse.lsp4j.jsonrpc.CancelChecker;
 import org.eclipse.lsp4j.jsonrpc.CompletableFutures;
+import org.eclipse.lsp4j.jsonrpc.CompletableFutures.FutureCancelChecker;
 import org.eclipse.lsp4j.jsonrpc.messages.Tuple;
 import org.eclipse.lsp4mp.commons.JavaFileInfo;
 import org.eclipse.lsp4mp.commons.MicroProfileJavaFileInfoParams;
@@ -126,13 +128,9 @@ public void setProjectURI(String projectURI) {
 		 *         project.
 		 */
 		public <T> CompletableFuture<T> executeIfInMicroProfileProject(
-				BiFunction<ProjectLabelInfoEntry, CancelChecker, CompletableFuture<T>> code, T defaultValue) {
-			return CompletableFutures.computeAsync((cancelChecker) -> {
+				BiFunction<ProjectLabelInfoEntry, CancelChecker, CompletableFuture<T>> code, T defaultValue) {			
+			return computeAsyncCompose(cancelChecker -> {
 				ProjectLabelInfoEntry projectInfo = getProjectInfo(this).getNow(null);
-				return Tuple.two(projectInfo, cancelChecker);
-			}).thenCompose((tuple) -> {
-				ProjectLabelInfoEntry projectInfo = tuple.getFirst();
-				CancelChecker cancelChecker = tuple.getSecond();
 				cancelChecker.checkCanceled();
 				if (projectInfo == null || !isMicroProfileProject(projectInfo)) {
 					return CompletableFuture.completedFuture(defaultValue);
@@ -261,4 +259,11 @@ public JavaTextDocumentSnippetRegistry getSnippetRegistry() {
 		}
 		return snippetRegistry;
 	}
+	
+	private static <R> CompletableFuture<R> computeAsyncCompose(Function<CancelChecker, CompletableFuture<R>> code) {
+		CompletableFuture<CancelChecker> start = new CompletableFuture<>();
+		CompletableFuture<R> result = start.thenComposeAsync(code);
+		start.complete(new FutureCancelChecker(result));
+		return result;
+	}
 }

microprofile.ls/org.eclipse.lsp4mp.ls/src/main/java/org/eclipse/lsp4mp/ls/properties/PropertiesFileTextDocumentService.java

@@ -186,19 +186,14 @@ public CompletableFuture<List<Either<SymbolInformation, DocumentSymbol>>> docume
 	@Override
 	public CompletableFuture<Either<List<? extends Location>, List<? extends LocationLink>>> definition(
 			DefinitionParams params) {
-		return getPropertiesModel(params.getTextDocument(), (document, cancelChecker) -> {
+		return getPropertiesModelCompose(params.getTextDocument(), (document, cancelChecker) -> {
 			MicroProfileProjectInfoParams projectInfoParams = createProjectInfoParams(params.getTextDocument());
 			MicroProfileProjectInfo projectInfo = getProjectInfoCache().getProjectInfo(projectInfoParams).getNow(null);
 			if (projectInfo == null || projectInfo.getProperties().isEmpty()) {
 				return null;
 			}
-			return Tuple.two(Tuple.two(document, projectInfo), cancelChecker);
-		}).thenCompose((modelAndProjectInfoAndCancelChecker) -> {
-			return getPropertiesFileLanguageService().findDefinition(
-					modelAndProjectInfoAndCancelChecker.getFirst().getFirst(),
-					params.getPosition(), modelAndProjectInfoAndCancelChecker.getFirst().getSecond(),
-					microprofileLanguageServer.getLanguageClient(), isDefinitionLinkSupport(),
-					modelAndProjectInfoAndCancelChecker.getSecond());
+			return getPropertiesFileLanguageService().findDefinition(document, params.getPosition(), projectInfo,
+					microprofileLanguageServer.getLanguageClient(), isDefinitionLinkSupport(), cancelChecker);
 		});
 	}
 
@@ -230,7 +225,8 @@ public CompletableFuture<List<Either<Command, CodeAction>>> codeAction(CodeActio
 			}
 			return getPropertiesFileLanguageService()
 					.doCodeActions(params.getContext(), params.getRange(), document, projectInfo,
-							sharedSettings.getFormattingSettings(), sharedSettings.getCommandCapabilities(), cancelChecker) //
+							sharedSettings.getFormattingSettings(), sharedSettings.getCommandCapabilities(),
+							cancelChecker) //
 					.stream() //
 					.map(ca -> {
 						Either<Command, CodeAction> e = Either.forRight(ca);
@@ -243,7 +239,8 @@ public CompletableFuture<List<Either<Command, CodeAction>>> codeAction(CodeActio
 	@Override
 	public CompletableFuture<List<? extends DocumentHighlight>> documentHighlight(DocumentHighlightParams params) {
 		return getPropertiesModel(params.getTextDocument(), (document, cancelChecker) -> {
-			return getPropertiesFileLanguageService().findDocumentHighlight(document, params.getPosition(), cancelChecker);
+			return getPropertiesFileLanguageService().findDocumentHighlight(document, params.getPosition(),
+					cancelChecker);
 		});
 	}
 
@@ -405,4 +402,9 @@ public PropertiesModel getPropertiesModel(String documentURI) {
 		return null;
 	}
 
+	public <R> CompletableFuture<R> getPropertiesModelCompose(TextDocumentIdentifier documentIdentifier,
+			BiFunction<PropertiesModel, CancelChecker, CompletableFuture<R>> code) {
+		return documents.computeModelAsyncCompose(documentIdentifier, code);
+	}
+
 }