Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't implement by default custom language client API #399

Merged
merged 1 commit into from
May 23, 2023
Merged

Don't implement by default custom language client API #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ...lsp4mp.ls/src/main/java/org/eclipse/lsp4mp/ls/api/MicroProfileJavaCodeActionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
public interface MicroProfileJavaCodeActionProvider {

@JsonRequest("microprofile/java/codeAction")
default CompletableFuture<List<CodeAction>> getJavaCodeAction(MicroProfileJavaCodeActionParams javaParams) {
return CompletableFuture.completedFuture(null);
}
CompletableFuture<List<CodeAction>> getJavaCodeAction(MicroProfileJavaCodeActionParams javaParams);

}
4 changes: 1 addition & 3 deletions ...ls/src/main/java/org/eclipse/lsp4mp/ls/api/MicroProfileJavaCodeActionResolveProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
public interface MicroProfileJavaCodeActionResolveProvider {

@JsonRequest("microprofile/java/codeActionResolve")
default CompletableFuture<CodeAction> resolveCodeAction(CodeAction unresolved) {
return CompletableFuture.completedFuture(null);
}
CompletableFuture<CodeAction> resolveCodeAction(CodeAction unresolved);

}
4 changes: 1 addition & 3 deletions ...e.lsp4mp.ls/src/main/java/org/eclipse/lsp4mp/ls/api/MicroProfileJavaCodeLensProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
public interface MicroProfileJavaCodeLensProvider {

@JsonRequest("microprofile/java/codeLens")
default CompletableFuture<List<? extends CodeLens>> getJavaCodelens(MicroProfileJavaCodeLensParams javaParams) {
return CompletableFuture.completedFuture(null);
}
CompletableFuture<List<? extends CodeLens>> getJavaCodelens(MicroProfileJavaCodeLensParams javaParams);

}
4 changes: 1 addition & 3 deletions ...lsp4mp.ls/src/main/java/org/eclipse/lsp4mp/ls/api/MicroProfileJavaCompletionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
public interface MicroProfileJavaCompletionProvider {

@JsonRequest("microprofile/java/completion")
default CompletableFuture<MicroProfileJavaCompletionResult> getJavaCompletion(MicroProfileJavaCompletionParams javaParams) {
return CompletableFuture.completedFuture(null);
}
CompletableFuture<MicroProfileJavaCompletionResult> getJavaCompletion(MicroProfileJavaCompletionParams javaParams);

}
8 changes: 3 additions & 5 deletions ...4mp.ls/src/main/java/org/eclipse/lsp4mp/ls/api/MicroProfileJavaCursorContextProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,14 @@
import org.eclipse.lsp4mp.commons.MicroProfileJavaCompletionParams;

/**
* Returns context related to the cursor location in the given document,
* or null if the client doesn't yet support this.
* Returns context related to the cursor location in the given document, or null
* if the client doesn't yet support this.
*
* @see JavaCursorContextResult
*/
public interface MicroProfileJavaCursorContextProvider {

@JsonRequest("microprofile/java/javaCursorContext")
default CompletableFuture<JavaCursorContextResult> getJavaCursorContext(MicroProfileJavaCompletionParams context) {
return CompletableFuture.completedFuture(null);
}
CompletableFuture<JavaCursorContextResult> getJavaCursorContext(MicroProfileJavaCompletionParams context);

}
5 changes: 1 addition & 4 deletions ...lsp4mp.ls/src/main/java/org/eclipse/lsp4mp/ls/api/MicroProfileJavaDefinitionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@
public interface MicroProfileJavaDefinitionProvider {

@JsonRequest("microprofile/java/definition")
default CompletableFuture<List<MicroProfileDefinition>> getJavaDefinition(
MicroProfileJavaDefinitionParams javaParams) {
return CompletableFuture.completedFuture(null);
}
CompletableFuture<List<MicroProfileDefinition>> getJavaDefinition(MicroProfileJavaDefinitionParams javaParams);

}
5 changes: 1 addition & 4 deletions ...sp4mp.ls/src/main/java/org/eclipse/lsp4mp/ls/api/MicroProfileJavaDiagnosticsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@
public interface MicroProfileJavaDiagnosticsProvider {

@JsonRequest("microprofile/java/diagnostics")
default CompletableFuture<List<PublishDiagnosticsParams>> getJavaDiagnostics(
MicroProfileJavaDiagnosticsParams javaParams) {
return CompletableFuture.completedFuture(null);
}
CompletableFuture<List<PublishDiagnosticsParams>> getJavaDiagnostics(MicroProfileJavaDiagnosticsParams javaParams);

}
4 changes: 1 addition & 3 deletions ...e.lsp4mp.ls/src/main/java/org/eclipse/lsp4mp/ls/api/MicroProfileJavaFileInfoProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
public interface MicroProfileJavaFileInfoProvider {

@JsonRequest("microprofile/java/fileInfo")
default CompletableFuture<JavaFileInfo> getJavaFileInfo(MicroProfileJavaFileInfoParams javaParams) {
return CompletableFuture.completedFuture(null);
}
CompletableFuture<JavaFileInfo> getJavaFileInfo(MicroProfileJavaFileInfoParams javaParams);

}
4 changes: 1 addition & 3 deletions ...ipse.lsp4mp.ls/src/main/java/org/eclipse/lsp4mp/ls/api/MicroProfileJavaHoverProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
public interface MicroProfileJavaHoverProvider {

@JsonRequest("microprofile/java/hover")
default CompletableFuture<Hover> getJavaHover(MicroProfileJavaHoverParams javaParams) {
return CompletableFuture.completedFuture(null);
}
CompletableFuture<Hover> getJavaHover(MicroProfileJavaHoverParams javaParams);

}
9 changes: 2 additions & 7 deletions ...4mp.ls/src/main/java/org/eclipse/lsp4mp/ls/api/MicroProfileJavaProjectLabelsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,9 @@
public interface MicroProfileJavaProjectLabelsProvider {

@JsonRequest("microprofile/java/projectLabels")
default CompletableFuture<ProjectLabelInfoEntry> getJavaProjectLabels(
MicroProfileJavaProjectLabelsParams javaParams) {
return CompletableFuture.completedFuture(null);
}
CompletableFuture<ProjectLabelInfoEntry> getJavaProjectLabels(MicroProfileJavaProjectLabelsParams javaParams);

@JsonRequest("microprofile/java/workspaceLabels")
default CompletableFuture<List<ProjectLabelInfoEntry>> getAllJavaProjectLabels() {
return CompletableFuture.completedFuture(null);
}
CompletableFuture<List<ProjectLabelInfoEntry>> getAllJavaProjectLabels();

}
4 changes: 1 addition & 3 deletions ....ls/src/main/java/org/eclipse/lsp4mp/ls/api/MicroProfileJavaWorkspaceSymbolsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
public interface MicroProfileJavaWorkspaceSymbolsProvider {

@JsonRequest("microprofile/java/workspaceSymbols")
default CompletableFuture<List<SymbolInformation>> getJavaWorkspaceSymbols(String projectUri) {
return CompletableFuture.completedFuture(null);
}
CompletableFuture<List<SymbolInformation>> getJavaWorkspaceSymbols(String projectUri);

}
4 changes: 1 addition & 3 deletions ...mp.ls/src/main/java/org/eclipse/lsp4mp/ls/api/MicroProfilePropertyDefinitionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
public interface MicroProfilePropertyDefinitionProvider {

@JsonRequest("microprofile/propertyDefinition")
default CompletableFuture<Location> getPropertyDefinition(MicroProfilePropertyDefinitionParams params) {
return CompletableFuture.completedFuture(null);
}
CompletableFuture<Location> getPropertyDefinition(MicroProfilePropertyDefinitionParams params);

}
4 changes: 1 addition & 3 deletions ...ls/src/main/java/org/eclipse/lsp4mp/ls/api/MicroProfilePropertyDocumentationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
public interface MicroProfilePropertyDocumentationProvider {

@JsonRequest("microprofile/propertyDocumentation")
default CompletableFuture<String> getPropertyDocumentation(MicroProfilePropertyDocumentationParams params) {
return CompletableFuture.completedFuture(null);
}
CompletableFuture<String> getPropertyDocumentation(MicroProfilePropertyDocumentationParams params);

}
89 changes: 88 additions & 1 deletion ...eclipse.lsp4mp.ls/src/test/java/org/eclipse/lsp4mp/ls/MockMicroProfileLanguageClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,34 @@
import java.util.Map;
import java.util.concurrent.CompletableFuture;

import org.eclipse.lsp4j.CodeAction;
import org.eclipse.lsp4j.CodeLens;
import org.eclipse.lsp4j.Hover;
import org.eclipse.lsp4j.Location;
import org.eclipse.lsp4j.MessageActionItem;
import org.eclipse.lsp4j.MessageParams;
import org.eclipse.lsp4j.PublishDiagnosticsParams;
import org.eclipse.lsp4j.ShowMessageRequestParams;
import org.eclipse.lsp4j.SymbolInformation;
import org.eclipse.lsp4mp.commons.JavaCursorContextResult;
import org.eclipse.lsp4mp.commons.JavaFileInfo;
import org.eclipse.lsp4mp.commons.MicroProfileDefinition;
import org.eclipse.lsp4mp.commons.MicroProfileJavaCodeActionParams;
import org.eclipse.lsp4mp.commons.MicroProfileJavaCodeLensParams;
import org.eclipse.lsp4mp.commons.MicroProfileJavaCompletionParams;
import org.eclipse.lsp4mp.commons.MicroProfileJavaCompletionResult;
import org.eclipse.lsp4mp.commons.MicroProfileJavaDefinitionParams;
import org.eclipse.lsp4mp.commons.MicroProfileJavaDiagnosticsParams;
import org.eclipse.lsp4mp.commons.MicroProfileJavaFileInfoParams;
import org.eclipse.lsp4mp.commons.MicroProfileJavaHoverParams;
import org.eclipse.lsp4mp.commons.MicroProfileJavaProjectLabelsParams;
import org.eclipse.lsp4mp.commons.MicroProfileProjectInfo;
import org.eclipse.lsp4mp.commons.MicroProfileProjectInfoParams;
import org.eclipse.lsp4mp.commons.MicroProfilePropertiesChangeEvent;
import org.eclipse.lsp4mp.commons.MicroProfilePropertiesScope;
import org.eclipse.lsp4mp.commons.MicroProfilePropertyDefinitionParams;
import org.eclipse.lsp4mp.commons.MicroProfilePropertyDocumentationParams;
import org.eclipse.lsp4mp.commons.ProjectLabelInfoEntry;
import org.eclipse.lsp4mp.commons.metadata.ItemBase;
import org.eclipse.lsp4mp.commons.metadata.ItemHint;
import org.eclipse.lsp4mp.commons.metadata.ItemMetadata;
Expand Down Expand Up @@ -73,7 +91,7 @@ public void showMessage(MessageParams messageParams) {

@Override
public CompletableFuture<MessageActionItem> showMessageRequest(ShowMessageRequestParams requestParams) {
return null;
return CompletableFuture.completedFuture(null);
}

@Override
Expand Down Expand Up @@ -220,4 +238,73 @@ public List<PublishDiagnosticsParams> getPublishDiagnostics() {
return publishDiagnostics;
}

@Override
public CompletableFuture<String> getPropertyDocumentation(MicroProfilePropertyDocumentationParams params) {
return CompletableFuture.completedFuture(null);
}

@Override
public CompletableFuture<List<CodeAction>> getJavaCodeAction(MicroProfileJavaCodeActionParams javaParams) {
return CompletableFuture.completedFuture(null);
}

@Override
public CompletableFuture<List<? extends CodeLens>> getJavaCodelens(MicroProfileJavaCodeLensParams javaParams) {
return CompletableFuture.completedFuture(null);
}

@Override
public CompletableFuture<MicroProfileJavaCompletionResult> getJavaCompletion(
MicroProfileJavaCompletionParams javaParams) {
return CompletableFuture.completedFuture(null);
}

@Override
public CompletableFuture<List<PublishDiagnosticsParams>> getJavaDiagnostics(
MicroProfileJavaDiagnosticsParams javaParams) {
return CompletableFuture.completedFuture(null);
}

@Override
public CompletableFuture<List<MicroProfileDefinition>> getJavaDefinition(
MicroProfileJavaDefinitionParams javaParams) {
return CompletableFuture.completedFuture(null);
}

@Override
public CompletableFuture<Hover> getJavaHover(MicroProfileJavaHoverParams javaParams) {
return CompletableFuture.completedFuture(null);
}

@Override
public CompletableFuture<ProjectLabelInfoEntry> getJavaProjectLabels(
MicroProfileJavaProjectLabelsParams javaParams) {
return CompletableFuture.completedFuture(null);
}

@Override
public CompletableFuture<List<ProjectLabelInfoEntry>> getAllJavaProjectLabels() {
return CompletableFuture.completedFuture(null);
}

@Override
public CompletableFuture<JavaFileInfo> getJavaFileInfo(MicroProfileJavaFileInfoParams javaParams) {
return CompletableFuture.completedFuture(null);
}

@Override
public CompletableFuture<CodeAction> resolveCodeAction(CodeAction unresolved) {
return CompletableFuture.completedFuture(null);
}

@Override
public CompletableFuture<JavaCursorContextResult> getJavaCursorContext(MicroProfileJavaCompletionParams context) {
return CompletableFuture.completedFuture(null);
}

@Override
public CompletableFuture<List<SymbolInformation>> getJavaWorkspaceSymbols(String projectUri) {
return CompletableFuture.completedFuture(null);
}

}
33 changes: 17 additions & 16 deletions .../src/test/java/org/eclipse/lsp4mp/ls/deadlock/MicroProfileLanguageServerDeadlockTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,20 @@
******************************************************************************/
package org.eclipse.lsp4mp.ls.deadlock;

import static org.junit.Assert.assertTrue;

import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;

import org.eclipse.lsp4j.DidOpenTextDocumentParams;
import org.eclipse.lsp4j.MessageActionItem;
import org.eclipse.lsp4j.MessageParams;
Expand All @@ -22,32 +36,19 @@
import org.eclipse.lsp4mp.commons.MicroProfileProjectInfoParams;
import org.eclipse.lsp4mp.commons.ProjectLabelInfoEntry;
import org.eclipse.lsp4mp.ls.MicroProfileServerLauncher;
import org.eclipse.lsp4mp.ls.api.MicroProfileLanguageClientAPI;
import org.eclipse.lsp4mp.ls.MockMicroProfileLanguageClient;
import org.eclipse.lsp4mp.ls.api.MicroProfileLanguageServerAPI;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;

import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;

import static org.junit.Assert.assertTrue;

public class MicroProfileLanguageServerDeadlockTest {
private static class MyLanguageClient implements MicroProfileLanguageClientAPI {
private static class MyLanguageClient extends MockMicroProfileLanguageClient {

private final CountDownLatch latch;

private MyLanguageClient(CountDownLatch latch) {
super(null);
this.latch = latch;
}

Expand Down
5 changes: 5 additions & 0 deletions ...org.eclipse.lsp4mp.ls/src/test/java/org/eclipse/lsp4mp/ls/java/JavaTextDocumentsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ public CompletableFuture<ProjectLabelInfoEntry> getJavaProjectLabels(
ProjectLabelInfoEntry projectInfo = new ProjectLabelInfoEntry(uri, "", labels);
return CompletableFuture.completedFuture(projectInfo);
}

@Override
public CompletableFuture<List<ProjectLabelInfoEntry>> getAllJavaProjectLabels() {
return CompletableFuture.completedFuture(null);
}
};

@Test
Expand Down
Loading