Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,15 @@ public static void removeWrapper(LanguageServerWrapper wrapper) {
extToLanguageWrapper.remove(extProjectPair);
extToServerDefinition.remove(extProjectPair);
}
// Also remove from projectToLanguageWrappers to prevent memory leaks
String projectUri = FileUtils.pathToUri(new File(wrapper.getProjectRootPath()).getAbsolutePath());
Set<LanguageServerWrapper> wrappers = projectToLanguageWrappers.get(projectUri);
if (wrappers != null) {
wrappers.remove(wrapper);
if (wrappers.isEmpty()) {
projectToLanguageWrappers.remove(projectUri);
}
}
} else {
LOG.error("No attached projects found for wrapper");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -696,6 +696,14 @@ public void removeWidget() {
getWidget().ifPresent(LSPServerStatusWidget::dispose);
}

/**
* Cleanup when the project is disposed. This removes the project from static maps
* to prevent memory leaks.
*/
public void dispose() {
projectToLanguageServerWrapper.remove(project);
}

/**
* Disconnects an editor from the LanguageServer
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ public void projectClosing(@NotNull Project project) {
return;
}
languageServerWrappers.forEach(wrapper -> {
wrapper.stop(true);
wrapper.removeWidget();
wrapper.dispose();
IntellijLanguageClient.removeWrapper(wrapper);
});
}
Expand Down