Skip to content

Commit

Permalink
Lemminx prepareRename/Rename Server Capabilities are not supported by…
Browse files Browse the repository at this point in the history
… LSP4E #1551

Fixes: #1551
  • Loading branch information
vrubezhny authored and angelozerr committed Jun 21, 2023
1 parent 5cea225 commit ee62aa2
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2018 Red Hat, Inc. and others.
* Copyright (c) 2018, 2023 Red Hat, Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
Expand All @@ -16,6 +16,7 @@
import static org.eclipse.lemminx.settings.capabilities.ServerCapabilitiesConstants.DEFAULT_CODELENS_OPTIONS;
import static org.eclipse.lemminx.settings.capabilities.ServerCapabilitiesConstants.DEFAULT_COMPLETION_OPTIONS;
import static org.eclipse.lemminx.settings.capabilities.ServerCapabilitiesConstants.DEFAULT_LINK_OPTIONS;
import static org.eclipse.lemminx.settings.capabilities.ServerCapabilitiesConstants.DEFAULT_RENAME_OPTIONS;

import org.eclipse.lsp4j.ServerCapabilities;
import org.eclipse.lsp4j.TextDocumentSyncKind;
Expand Down Expand Up @@ -53,7 +54,6 @@ public static ServerCapabilities getNonDynamicServerCapabilities(ClientCapabilit
serverCapabilities.setDocumentRangeFormattingProvider(
!clientCapabilities.isRangeFormattingDynamicRegistrationSupported());
serverCapabilities.setHoverProvider(!clientCapabilities.isHoverDynamicRegistered());
serverCapabilities.setRenameProvider(!clientCapabilities.isRenameDynamicRegistrationSupported());
serverCapabilities.setFoldingRangeProvider(!clientCapabilities.isRangeFoldingDynamicRegistrationSupported());
serverCapabilities.setDefinitionProvider(!clientCapabilities.isDefinitionDynamicRegistered());
serverCapabilities.setTypeDefinitionProvider(!clientCapabilities.isTypeDefinitionDynamicRegistered());
Expand All @@ -80,6 +80,9 @@ public static ServerCapabilities getNonDynamicServerCapabilities(ClientCapabilit
if (!clientCapabilities.isCodeActionDynamicRegistered()) {
serverCapabilities.setCodeActionProvider(DEFAULT_CODEACTION_OPTIONS);
}
if (!clientCapabilities.isRenameDynamicRegistrationSupported()) {
serverCapabilities.setRenameProvider(DEFAULT_RENAME_OPTIONS);
}
return serverCapabilities;
}
}
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2018 Red Hat, Inc. and others.
* Copyright (c) 2018, 2023 Red Hat, Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
Expand All @@ -16,6 +16,7 @@
import static org.eclipse.lemminx.settings.capabilities.ServerCapabilitiesConstants.DEFAULT_CODEACTION_OPTIONS;
import static org.eclipse.lemminx.settings.capabilities.ServerCapabilitiesConstants.DEFAULT_COMPLETION_OPTIONS;
import static org.eclipse.lemminx.settings.capabilities.ServerCapabilitiesConstants.DEFAULT_LINK_OPTIONS;
import static org.eclipse.lemminx.settings.capabilities.ServerCapabilitiesConstants.DEFAULT_RENAME_OPTIONS;
import static org.eclipse.lemminx.settings.capabilities.ServerCapabilitiesConstants.DOCUMENT_SYMBOL_ID;
import static org.eclipse.lemminx.settings.capabilities.ServerCapabilitiesConstants.FORMATTING_ID;
import static org.eclipse.lemminx.settings.capabilities.ServerCapabilitiesConstants.FORMATTING_RANGE_ID;
Expand Down Expand Up @@ -91,11 +92,11 @@ public void testAllDynamicCapabilities() {
assertEquals(FALSE, serverCapabilities.getDocumentSymbolProvider());
assertEquals(FALSE, serverCapabilities.getHoverProvider());
assertEquals(FALSE, serverCapabilities.getDocumentHighlightProvider());
assertEquals(FALSE, serverCapabilities.getRenameProvider());
assertEquals(FALSE, serverCapabilities.getFoldingRangeProvider());
assertEquals(null, serverCapabilities.getCodeActionProvider());
assertEquals(null, serverCapabilities.getCompletionProvider());
assertEquals(null, serverCapabilities.getDocumentLinkProvider());
assertEquals(null, serverCapabilities.getRenameProvider());
}

@Test
Expand All @@ -112,11 +113,11 @@ public void testNoDynamicCapabilities() {
assertEquals(TRUE, serverCapabilities.getDocumentSymbolProvider());
assertEquals(TRUE, serverCapabilities.getHoverProvider());
assertEquals(TRUE, serverCapabilities.getDocumentHighlightProvider());
assertEquals(TRUE, serverCapabilities.getRenameProvider());
assertEquals(TRUE, serverCapabilities.getFoldingRangeProvider());
assertEquals(Either.forRight(DEFAULT_CODEACTION_OPTIONS), serverCapabilities.getCodeActionProvider());
assertEquals(DEFAULT_COMPLETION_OPTIONS, serverCapabilities.getCompletionProvider());
assertEquals(DEFAULT_LINK_OPTIONS, serverCapabilities.getDocumentLinkProvider());
assertEquals(Either.forRight(DEFAULT_RENAME_OPTIONS), serverCapabilities.getRenameProvider());
}

@Test
Expand Down Expand Up @@ -155,11 +156,11 @@ public void testBothCapabilityTypes() {
assertEquals(FALSE, serverCapabilities.getDocumentSymbolProvider());
assertEquals(TRUE, serverCapabilities.getHoverProvider());
assertEquals(TRUE, serverCapabilities.getDocumentHighlightProvider());
assertEquals(TRUE, serverCapabilities.getRenameProvider());
assertEquals(TRUE, serverCapabilities.getFoldingRangeProvider());
assertEquals(Either.forRight(DEFAULT_CODEACTION_OPTIONS), serverCapabilities.getCodeActionProvider());
assertEquals(null, serverCapabilities.getCompletionProvider());
assertEquals(DEFAULT_LINK_OPTIONS, serverCapabilities.getDocumentLinkProvider());
assertEquals(Either.forRight(DEFAULT_RENAME_OPTIONS), serverCapabilities.getRenameProvider());
}

@Test
Expand Down

0 comments on commit ee62aa2

Please sign in to comment.