Add null check for data field in completionItem/resolve request

Signed-off-by: Jessica He <[email protected]>
eclipse · Jul 18, 2023 · 6a9eff5 · 6a9eff5
1 parent 3dc0325
commit 6a9eff5
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/...clipse.lsp4mp.ls/src/main/java/org/eclipse/lsp4mp/ls/MicroProfileTextDocumentService.java b/...clipse.lsp4mp.ls/src/main/java/org/eclipse/lsp4mp/ls/MicroProfileTextDocumentService.java
@@ -153,10 +153,13 @@ public CompletableFuture<Either<List<CompletionItem>, CompletionList>> completio
 
 	@Override
 	public CompletableFuture<CompletionItem> resolveCompletionItem(CompletionItem unresolved) {
-		String uri = CompletionData.getCompletionData(unresolved).getUri();
-		TextDocumentService service = getTextDocumentService(new TextDocumentIdentifier(uri));
-		if (service != null) {
-			return service.resolveCompletionItem(unresolved);
+		CompletionData data = CompletionData.getCompletionData(unresolved);
+		if (data != null) {
+			String uri = data.getUri();
+			TextDocumentService service = getTextDocumentService(new TextDocumentIdentifier(uri));
+			if (service != null) {
+				return service.resolveCompletionItem(unresolved);
+			}
 		}
 		return CompletableFuture.completedFuture(null);
 	}