Use LSP4J 0.15

eclipse · Aug 5, 2022 · 8cacdfd · 8cacdfd
1 parent c22840b
commit 8cacdfd
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 37 deletions.
diff --git a/org.eclipse.lsp4e.debug/META-INF/MANIFEST.MF b/org.eclipse.lsp4e.debug/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Debug Adapter client for Eclipse IDE (Incubation)
 Bundle-SymbolicName: org.eclipse.lsp4e.debug;singleton:=true
-Bundle-Version: 0.13.5.qualifier
+Bundle-Version: 0.14.0.qualifier
 Bundle-Activator: org.eclipse.lsp4e.debug.DSPPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.debug.core,
  org.eclipse.debug.ui,
  org.eclipse.jface,
- org.eclipse.lsp4j.jsonrpc;bundle-version="[0.14.0,0.15.0)",
- org.eclipse.lsp4j.jsonrpc.debug;bundle-version="[0.14.0,0.15.0)",
- org.eclipse.lsp4j.debug;bundle-version="[0.14.0,0.15.0)",
+ org.eclipse.lsp4j.jsonrpc;bundle-version="[0.15.0,0.16.0)",
+ org.eclipse.lsp4j.jsonrpc.debug;bundle-version="[0.15.0,0.16.0)",
+ org.eclipse.lsp4j.debug;bundle-version="[0.15.0,0.16.0)",
  org.eclipse.ui.editors,
  org.eclipse.core.filesystem,
  org.eclipse.ui.ide;bundle-version="[3.16.0,4.0.0)",

diff --git a/org.eclipse.lsp4e.test/META-INF/MANIFEST.MF b/org.eclipse.lsp4e.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for language server bundle (Incubation)
 Bundle-SymbolicName: org.eclipse.lsp4e.test;singleton:=true
-Bundle-Version: 0.13.13.qualifier
+Bundle-Version: 0.14.0.qualifier
 Fragment-Host: org.eclipse.lsp4e
 Bundle-Vendor: Eclipse.org
 Bundle-RequiredExecutionEnvironment: JavaSE-11

diff --git a/org.eclipse.lsp4e.test/pom.xml b/org.eclipse.lsp4e.test/pom.xml
@@ -8,7 +8,7 @@
 	</parent>
 	<artifactId>org.eclipse.lsp4e.test</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
-	<version>0.13.13-SNAPSHOT</version>
+	<version>0.14.0-SNAPSHOT</version>
 
 	<properties>
 		<os-jvm-flags /> <!-- for the default case -->

diff --git a/org.eclipse.lsp4e.tests.mock/META-INF/MANIFEST.MF b/org.eclipse.lsp4e.tests.mock/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mock Language Server to test LSP4E
 Bundle-SymbolicName: org.eclipse.lsp4e.tests.mock
-Bundle-Version: 0.14.5.qualifier
+Bundle-Version: 0.15.0.qualifier
 Bundle-Vendor: Eclipse LSP4E
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.lsp4j;bundle-version="[0.14.0,0.15.0)",
- org.eclipse.lsp4j.jsonrpc;bundle-version="[0.14.0,0.15.0)"
+Require-Bundle: org.eclipse.lsp4j;bundle-version="[0.15.0,0.16.0)",
+ org.eclipse.lsp4j.jsonrpc;bundle-version="[0.15.0,0.16.0)"
 Export-Package: org.eclipse.lsp4e.tests.mock
 Automatic-Module-Name: org.eclipse.lsp4e.tests.mock
diff --git a/org.eclipse.lsp4e.tests.mock/src/org/eclipse/lsp4e/tests/mock/MockLanguageServer.java b/org.eclipse.lsp4e.tests.mock/src/org/eclipse/lsp4e/tests/mock/MockLanguageServer.java
@@ -62,6 +62,7 @@
 import org.eclipse.lsp4j.launch.LSPLauncher;
 import org.eclipse.lsp4j.services.LanguageClient;
 import org.eclipse.lsp4j.services.LanguageServer;
+import org.eclipse.lsp4j.services.NotebookDocumentService;
 
 public final class MockLanguageServer implements LanguageServer {
 
@@ -304,4 +305,9 @@ public void setDocumentSymbols(DocumentSymbol... documentSymbols) {
 		this.textDocumentService.setDocumentSymbols(Arrays.asList(documentSymbols));
 	}
 
+	@Override
+	public NotebookDocumentService getNotebookDocumentService() {
+		return null;
+	}
+
 }
diff --git a/...lsp4e.tests.mock/src/org/eclipse/lsp4e/tests/mock/MockLanguageServerMultiRootFolders.java b/...lsp4e.tests.mock/src/org/eclipse/lsp4e/tests/mock/MockLanguageServerMultiRootFolders.java
@@ -53,6 +53,7 @@
 import org.eclipse.lsp4j.launch.LSPLauncher;
 import org.eclipse.lsp4j.services.LanguageClient;
 import org.eclipse.lsp4j.services.LanguageServer;
+import org.eclipse.lsp4j.services.NotebookDocumentService;
 import org.eclipse.lsp4j.services.WorkspaceService;
 
 public final class MockLanguageServerMultiRootFolders implements LanguageServer {
@@ -242,4 +243,8 @@ public boolean isRunning() {
 		return this.started;
 	}
 
+	@Override
+	public NotebookDocumentService getNotebookDocumentService() {
+		return null;
+	}
 }
diff --git a/org.eclipse.lsp4e.tests.mock/src/org/eclipse/lsp4e/tests/mock/MockTextDocumentService.java b/org.eclipse.lsp4e.tests.mock/src/org/eclipse/lsp4e/tests/mock/MockTextDocumentService.java
@@ -57,6 +57,7 @@
 import org.eclipse.lsp4j.Location;
 import org.eclipse.lsp4j.LocationLink;
 import org.eclipse.lsp4j.Position;
+import org.eclipse.lsp4j.PrepareRenameDefaultBehavior;
 import org.eclipse.lsp4j.PrepareRenameParams;
 import org.eclipse.lsp4j.PrepareRenameResult;
 import org.eclipse.lsp4j.PublishDiagnosticsParams;
@@ -71,6 +72,7 @@
 import org.eclipse.lsp4j.WillSaveTextDocumentParams;
 import org.eclipse.lsp4j.WorkspaceEdit;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
+import org.eclipse.lsp4j.jsonrpc.messages.Either3;
 import org.eclipse.lsp4j.services.LanguageClient;
 import org.eclipse.lsp4j.services.TextDocumentService;
 
@@ -100,7 +102,7 @@ public class MockTextDocumentService implements TextDocumentService {
 	private List<Either<Command, CodeAction>> mockCodeActions;
 	private List<ColorInformation> mockDocumentColors;
 	private WorkspaceEdit mockRenameEdit;
-	private Either<Range, PrepareRenameResult> mockPrepareRenameResult;
+	private Either3<Range, PrepareRenameResult, PrepareRenameDefaultBehavior> mockPrepareRenameResult;
 	private List<DocumentSymbol> documentSymbols;
 
 	public <U> MockTextDocumentService(Function<U, CompletableFuture<U>> futureFactory) {
@@ -110,7 +112,8 @@ public <U> MockTextDocumentService(Function<U, CompletableFuture<U>> futureFacto
 		item.setLabel("Mock completion item");
 		mockCompletionList = new CompletionList(false, Collections.singletonList(item));
 		mockHover = new Hover(Collections.singletonList(Either.forLeft("Mock hover")), null);
-		mockPrepareRenameResult = Either.forRight(new PrepareRenameResult(new Range(new Position(0,0), new Position(0,0)), "placeholder"));
+		mockPrepareRenameResult = Either3
+				.forSecond(new PrepareRenameResult(new Range(new Position(0, 0), new Position(0, 0)), "placeholder"));
 		this.remoteProxies = new ArrayList<>();
 		this.documentSymbols = Collections.emptyList();
 	}
@@ -219,12 +222,9 @@ public CompletableFuture<WorkspaceEdit> rename(RenameParams params) {
 	}
 
 	@Override
-	public CompletableFuture<Either<Range, PrepareRenameResult>> prepareRename(PrepareRenameParams params) {
-		if (this.mockPrepareRenameResult == null) {
-			return CompletableFuture.completedFuture(null);
-		} else {
-			return CompletableFuture.completedFuture(this.mockPrepareRenameResult);
-		}
+	public CompletableFuture<Either3<Range, PrepareRenameResult, PrepareRenameDefaultBehavior>> prepareRename(
+			PrepareRenameParams params) {
+		return CompletableFuture.completedFuture(this.mockPrepareRenameResult);
 	}
 
 	@Override
@@ -307,7 +307,7 @@ public void setMockHover(Hover hover) {
 	}
 
 	public void setPrepareRenameResult(Either<Range, PrepareRenameResult> result) {
-		this.mockPrepareRenameResult = result;
+		this.mockPrepareRenameResult = result == null ? null : result.map(Either3::forFirst, Either3::forSecond);
 	}
 
 	public void setMockCodeLenses(List<CodeLens> codeLenses) {

diff --git a/org.eclipse.lsp4e/META-INF/MANIFEST.MF b/org.eclipse.lsp4e/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language Server Protocol client for Eclipse IDE (Incubation)
 Bundle-SymbolicName: org.eclipse.lsp4e;singleton:=true
-Bundle-Version: 0.13.13.qualifier
+Bundle-Version: 0.14.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
  org.eclipse.equinox.common;bundle-version="3.8.0",
@@ -27,8 +27,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
  org.eclipse.jdt.annotation;bundle-version="2.1.0";resolution:=optional,
  org.eclipse.ui.editors,
  org.eclipse.ui.navigator;bundle-version="3.6.100",
- org.eclipse.lsp4j;bundle-version="[0.14.0,0.15.0)",
- org.eclipse.lsp4j.jsonrpc;bundle-version="[0.14.0,0.15.0)",
+ org.eclipse.lsp4j;bundle-version="[0.15.0,0.16.0)",
+ org.eclipse.lsp4j.jsonrpc;bundle-version="[0.15.0,0.16.0)",
  org.eclipse.mylyn.wikitext;bundle-version="3.0.40",
  org.eclipse.mylyn.wikitext.markdown;bundle-version="3.0.40",
  org.eclipse.ui.console,

diff --git a/org.eclipse.lsp4e/pom.xml b/org.eclipse.lsp4e/pom.xml
@@ -7,7 +7,7 @@
 	</parent>
 	<artifactId>org.eclipse.lsp4e</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>0.13.13-SNAPSHOT</version>
+	<version>0.14.0-SNAPSHOT</version>
 
 	<build>
 		<plugins>

diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LSPEclipseUtils.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LSPEclipseUtils.java
@@ -179,7 +179,6 @@ public static CompletionParams toCompletionParams(URI fileUri, int offset, IDocu
 		Position start = toPosition(offset, document);
 		CompletionParams param = new CompletionParams();
 		param.setPosition(start);
-		param.setUri(fileUri.toString());
 		TextDocumentIdentifier id = new TextDocumentIdentifier();
 		id.setUri(fileUri.toString());
 		param.setTextDocument(id);
@@ -201,7 +200,6 @@ public static TextDocumentPositionParams toTextDocumentPosistionParams(URI fileU
 		Position start = toPosition(offset, document);
 		TextDocumentPositionParams param = new TextDocumentPositionParams();
 		param.setPosition(start);
-		param.setUri(fileUri.toString());
 		TextDocumentIdentifier id = new TextDocumentIdentifier();
 		id.setUri(fileUri.toString());
 		param.setTextDocument(id);
@@ -215,7 +213,6 @@ private static <T extends TextDocumentPositionParams> T toTextDocumentPositionPa
 		param.setPosition(start);
 		TextDocumentIdentifier id = new TextDocumentIdentifier();
 		if (uri != null) {
-			param.setUri(uri.toString());
 			id.setUri(uri.toString());
 		}
 		param.setTextDocument(id);
@@ -260,9 +257,6 @@ private static <T extends TextDocumentPositionParams> T toTextDocumentPositionPa
 		if (genericParams.getTextDocument() != null) {
 			specificParams.setTextDocument(genericParams.getTextDocument());
 		}
-		if (genericParams.getUri() != null) {
-			specificParams.setUri(genericParams.getUri());
-		}
 		return specificParams;
 	}
 

diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LanguageServerWrapper.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/LanguageServerWrapper.java
@@ -350,7 +350,6 @@ public synchronized void start() throws IOException {
 						textDocumentClientCapabilities,
 						windowClientCapabilities,
 						lspStreamProvider.getExperimentalFeaturesPOJO()));
-				initParams.setClientName(name);
 				initParams.setClientInfo(getClientInfo(name));
 				initParams.setTrace(this.lspStreamProvider.getTrace(rootURI));
 

diff --git a/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/rename/LSPRenameProcessor.java b/org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/rename/LSPRenameProcessor.java
@@ -30,6 +30,7 @@
 import org.eclipse.lsp4e.LanguageServerPlugin;
 import org.eclipse.lsp4e.LanguageServiceAccessor;
 import org.eclipse.lsp4e.ui.Messages;
+import org.eclipse.lsp4j.PrepareRenameDefaultBehavior;
 import org.eclipse.lsp4j.PrepareRenameParams;
 import org.eclipse.lsp4j.PrepareRenameResult;
 import org.eclipse.lsp4j.Range;
@@ -40,6 +41,7 @@
 import org.eclipse.lsp4j.WorkspaceEdit;
 import org.eclipse.lsp4j.jsonrpc.ResponseErrorException;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
+import org.eclipse.lsp4j.jsonrpc.messages.Either3;
 import org.eclipse.lsp4j.jsonrpc.messages.ResponseError;
 import org.eclipse.lsp4j.services.LanguageServer;
 import org.eclipse.ltk.core.refactoring.Change;
@@ -64,7 +66,7 @@ public class LSPRenameProcessor extends RefactoringProcessor {
 	private String newName;
 
 	private WorkspaceEdit rename;
-	private Either<Range, PrepareRenameResult> prepareRenameResult;
+	private Either3<Range, PrepareRenameResult, PrepareRenameDefaultBehavior> prepareRenameResult;
 
 	public LSPRenameProcessor(@NonNull IDocument document, LanguageServer languageServer, int offset) {
 		this.document = document;
@@ -123,21 +125,21 @@ public RefactoringStatus checkInitialConditions(IProgressMonitor pm)
 	}
 
 	public String getPlaceholder() {
+		String placeholder = null;
 		if (prepareRenameResult != null) {
-			if (prepareRenameResult.isRight()) {
-				return prepareRenameResult.getRight().getPlaceholder();
-			} else {
-				Range range = prepareRenameResult.getLeft();
+			placeholder = prepareRenameResult.map(range -> {
 				try {
 					int startOffset = LSPEclipseUtils.toOffset(range.getStart(), document);
 					int endOffset = LSPEclipseUtils.toOffset(range.getEnd(), document);
 					return document.get(startOffset, endOffset - startOffset);
 				} catch (BadLocationException e) {
 					LanguageServerPlugin.logError(e);
+					return null;
 				}
-			}
+			}, result -> result.getPlaceholder(),
+			options -> null);
 		}
-		return "newName"; //$NON-NLS-1$
+		return placeholder != null && !placeholder.isBlank() ? placeholder :"newName"; //$NON-NLS-1$
 	}
 
 	public static boolean isPrepareRenameProvider(ServerCapabilities serverCapabilities) {

diff --git a/target-platforms/target-platform-latest/target-platform-latest.target b/target-platforms/target-platform-latest/target-platform-latest.target
@@ -13,7 +13,7 @@
 			<unit id="org.eclipse.lsp4j.jsonrpc" version="0.0.0"/>
 			<unit id="org.eclipse.lsp4j.debug" version="0.0.0"/>
 			<unit id="org.eclipse.lsp4j.jsonrpc.debug" version="0.0.0"/>
-			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.14.0/"/>
+			<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.15.0/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>