Skip to content

refactor: remove useless return value in documentClosed #1397

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

Merged
rubenporras merged 1 commit into from
Nov 14, 2025
Merged

refactor: remove useless return value in documentClosed #1397

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
3 changes: 1 addition & 2 deletions org.eclipse.lsp4e/src/org/eclipse/lsp4e/DocumentContentSynchronizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ public void documentSaved(IFileBuffer buffer) {

}

public CompletableFuture<@Nullable Void> documentClosed() {
public void documentClosed() {
final var identifier = LSPEclipseUtils.toTextDocumentIdentifier(fileUri);
WILL_SAVE_WAIT_UNTIL_TIMEOUT_MAP.remove(identifier.getUri());
// When LS is shut down all documents are being disconnected. No need to send
Expand All @@ -365,7 +365,6 @@ public void documentSaved(IFileBuffer buffer) {
final var params = new DidCloseTextDocumentParams(identifier);
languageServerWrapper.sendNotification(ls -> ls.getTextDocumentService().didClose(params));
}
return CompletableFuture.completedFuture(null);
Copy link
Copy Markdown
Member

@sebthom sebthom Nov 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we could probably also have returned the future of languageServerWrapper.sendNotification(..) but I dont think this would add any value.

}

/**
Expand Down
5 changes: 2 additions & 3 deletions org.eclipse.lsp4e/src/org/eclipse/lsp4e/LanguageServerWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,10 +876,9 @@ private boolean supportsWorkspaceFolderCapability() {
*/
public @Nullable CompletableFuture<@Nullable Void> disconnect(URI uri) {
DocumentContentSynchronizer documentListener = this.connectedDocuments.remove(uri);
CompletableFuture<@Nullable Void> documentClosedFuture = null;
if (documentListener != null) {
documentListener.getDocument().removePrenotifiedDocumentListener(documentListener);
documentClosedFuture = documentListener.documentClosed();
documentListener.documentClosed();
disconnectTextFileBuffer(uri);
}
if (this.connectedDocuments.isEmpty()) {
Expand All @@ -889,7 +888,7 @@ private boolean supportsWorkspaceFolderCapability() {
stop();
}
}
return documentClosedFuture;
return CompletableFuture.completedFuture(null);
}

private static void disconnectTextFileBuffer(URI uri) {
Expand Down
Loading