Fix check of capability of resolve inlay hint.

Signed-off-by: azerr <azerr@redhat.com>
eclipse · Sep 2, 2022 · 75a9374 · 75a9374
1 parent b7656e7
commit 75a9374
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/inlayhint/LSPLineContentCodeMining.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/inlayhint/LSPLineContentCodeMining.java
@@ -25,6 +25,7 @@
 import org.eclipse.lsp4e.LanguageServiceAccessor;
 import org.eclipse.lsp4j.InlayHint;
 import org.eclipse.lsp4j.InlayHintLabelPart;
+import org.eclipse.lsp4j.InlayHintRegistrationOptions;
 import org.eclipse.lsp4j.Position;
 import org.eclipse.lsp4j.ServerCapabilities;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
@@ -68,7 +69,12 @@ protected CompletableFuture<Void> doResolve(ITextViewer viewer, IProgressMonitor
 	}
 
 	private static boolean canResolveInlayHint(ServerCapabilities capabilities) {
-		return capabilities.getInlayHintProvider().map(Function.identity(), (r) -> r.getResolveProvider());
+		Either<Boolean, InlayHintRegistrationOptions> inlayProvider = capabilities.getInlayHintProvider();
+		if (inlayProvider != null && inlayProvider.isRight()) {
+			InlayHintRegistrationOptions options = inlayProvider.getRight();
+			return options.getResolveProvider() != null && options.getResolveProvider().booleanValue();
+		}
+		return false;
 	}
 
 	/**