Respect client capabilities for type hierarchy.

Signed-off-by: Roland Grunberg <rgrunber@redhat.com>
eclipse-jdtls · Aug 24, 2023 · 8f12703 · 8f12703
1 parent e843c2c
commit 8f12703
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/InitHandler.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/InitHandler.java
@@ -194,6 +194,10 @@ public void registerCapabilities(InitializeResult initializeResult) {
 			capabilities.setInlayHintProvider(Boolean.TRUE);
 		}
 
+		if (!preferenceManager.getClientPreferences().isTypeHierarchyDynamicRegistrationSupported()) {
+			capabilities.setTypeHierarchyProvider(Boolean.TRUE);
+		}
+
 		capabilities.setCallHierarchyProvider(Boolean.TRUE);
 		TextDocumentSyncOptions textDocumentSyncOptions = new TextDocumentSyncOptions();
 		textDocumentSyncOptions.setOpenClose(Boolean.TRUE);
@@ -221,7 +225,6 @@ public void registerCapabilities(InitializeResult initializeResult) {
 		semanticTokensOptions.setDocumentSelector(List.of(new DocumentFilter("java", "file", null), new DocumentFilter("java", "jdt", null)));
 		semanticTokensOptions.setLegend(SemanticTokensHandler.legend());
 		capabilities.setSemanticTokensProvider(semanticTokensOptions);
-		capabilities.setTypeHierarchyProvider(Boolean.TRUE);
 
 		initializeResult.setCapabilities(capabilities);
 	}

diff --git a/...lipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/ClientPreferences.java b/...lipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/ClientPreferences.java
@@ -364,6 +364,10 @@ public boolean isCallHierarchyDynamicRegistered() {
 		return v3supported && isDynamicRegistrationSupported(capabilities.getTextDocument().getCallHierarchy());
 	}
 
+	public boolean isTypeHierarchyDynamicRegistrationSupported() {
+		return v3supported && isDynamicRegistrationSupported(capabilities.getTextDocument().getTypeHierarchy());
+	}
+
 	public boolean isResolveCodeActionSupported() {
 		//@formatter:off
 		return v3supported && capabilities.getTextDocument().getCodeAction() != null