Skip to content

Commit

Permalink
fixed bug with null pointer when server invokes shutdown() method
Browse files Browse the repository at this point in the history
  • Loading branch information
D0zee committed Jul 20, 2023
1 parent 1b90aa1 commit d4f6563
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 40 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,55 +30,55 @@
*/
public class GradlePropertiesLanguageServer implements LanguageServer, LanguageClientAware {

private final TextDocumentService textDocumentService;
private final GradlePropertiesTextDocumentService gradleTextDocumentService;
private final WorkspaceService workspaceService;
private LanguageClient languageClient;
private final TextDocumentService textDocumentService;
private final GradlePropertiesTextDocumentService gradleTextDocumentService;
private final WorkspaceService workspaceService;
private LanguageClient languageClient;

public GradlePropertiesLanguageServer() {
gradleTextDocumentService = new GradlePropertiesTextDocumentService();
this.textDocumentService = gradleTextDocumentService;
this.workspaceService = new GradlePropertiesWorkSpaceService();
}
public GradlePropertiesLanguageServer() {
gradleTextDocumentService = new GradlePropertiesTextDocumentService();
this.textDocumentService = gradleTextDocumentService;
this.workspaceService = new GradlePropertiesWorkSpaceService();
}

@Override
public void connect(LanguageClient client) {
languageClient = client;
gradleTextDocumentService.connect(client);
}
@Override
public void connect(LanguageClient client) {
languageClient = client;
gradleTextDocumentService.connect(client);
}

@Override
public CompletableFuture<InitializeResult> initialize(InitializeParams initializeParams) {
ServerCapabilities capabilities = new ServerCapabilities();
capabilities.setTextDocumentSync(TextDocumentSyncKind.Full);
@Override
public CompletableFuture<InitializeResult> initialize(InitializeParams initializeParams) {
ServerCapabilities capabilities = new ServerCapabilities();
capabilities.setTextDocumentSync(TextDocumentSyncKind.Full);

List<String> triggerCharacters = new ArrayList<String>();
triggerCharacters.add(".");
triggerCharacters.add("=");
List<String> triggerCharacters = new ArrayList<String>();
triggerCharacters.add(".");
triggerCharacters.add("=");

CompletionOptions options = new CompletionOptions(false, triggerCharacters);
capabilities.setCompletionProvider(options);
CompletionOptions options = new CompletionOptions(false, triggerCharacters);
capabilities.setCompletionProvider(options);

return CompletableFuture.supplyAsync(() -> new InitializeResult(capabilities));
}
return CompletableFuture.supplyAsync(() -> new InitializeResult(capabilities));
}

@Override
public CompletableFuture<Object> shutdown() {
return CompletableFuture.supplyAsync(null);
}
@Override
public CompletableFuture<Object> shutdown() {
return CompletableFuture.supplyAsync(Object::new);
}

@Override
public void exit() {
}
@Override
public void exit() {
}

@Override
public TextDocumentService getTextDocumentService() {
return textDocumentService;
}
@Override
public TextDocumentService getTextDocumentService() {
return textDocumentService;
}

@Override
public WorkspaceService getWorkspaceService() {
return workspaceService;
}
@Override
public WorkspaceService getWorkspaceService() {
return workspaceService;
}

}
Binary file modified org.eclipse.buildship.gradleprop.provider/libs/language-server.jar
Binary file not shown.

0 comments on commit d4f6563

Please sign in to comment.