Skip to content

fix: shell resource leak when opening color dialog #1350

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
sebthom merged 1 commit into from
Oct 23, 2025
Merged

fix: shell resource leak when opening color dialog #1350

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
47 changes: 26 additions & 21 deletions org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/color/ColorInformationMining.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,32 +71,37 @@ public UpdateColorWithDialog(TextDocumentIdentifier textDocumentIdentifier, Colo
public void accept(MouseEvent event) {
final var styledText = (StyledText) event.widget;
final var shell = new Shell(styledText.getDisplay());
Rectangle location = Geometry.toDisplay(styledText, new Rectangle(event.x, event.y, 1, 1));
shell.setLocation(location.x, location.y);
// Open color dialog
final var dialog = new ColorDialog(shell);
dialog.setRGB(LSPEclipseUtils.toRGBA(colorInformation.getColor()).rgb);
RGB rgb = dialog.open();
if (rgb != null) {
// get LSP color presentation list for the picked color
final var params = new ColorPresentationParams(textDocumentIdentifier,
LSPEclipseUtils.toColor(rgb), colorInformation.getRange());
this.languageServerWrapper.execute(ls -> ls.getTextDocumentService().colorPresentation(params))
.thenAcceptAsync(presentations -> {
if (presentations == null || presentations.isEmpty()) {
return;
}
// As ColorDialog cannot be customized (to choose the color presentation (rgb,
// hexa, ....) we pick the first color presentation.
TextEdit textEdit = presentations.get(0).getTextEdit();
try {
Rectangle location = Geometry.toDisplay(styledText, new Rectangle(event.x, event.y, 1, 1));
shell.setLocation(location.x, location.y);
// Open color dialog
final var dialog = new ColorDialog(shell);
dialog.setRGB(LSPEclipseUtils.toRGBA(colorInformation.getColor()).rgb);
RGB rgb = dialog.open();
if (rgb != null) {
// get LSP color presentation list for the picked color
final var params = new ColorPresentationParams(textDocumentIdentifier, LSPEclipseUtils.toColor(rgb),
colorInformation.getRange());
this.languageServerWrapper.execute(ls -> ls.getTextDocumentService() //
.colorPresentation(params)) //
.thenAcceptAsync(presentations -> {
if (presentations == null || presentations.isEmpty()) {
return;
}
// As ColorDialog cannot be customized (to choose the color presentation (rgb,
// hexa, ....) we pick the first color presentation.
TextEdit textEdit = presentations.get(0).getTextEdit();
try {
// TODO: Should consider using optimistic locking for this in case document changes while
// request being processed
// TODO: Should consider using optimistic locking for this in case document
// changes while request being processed
LSPEclipseUtils.applyEdit(textEdit, document);
} catch (BadLocationException e) {
LanguageServerPlugin.logError(e);
}
}, styledText.getDisplay());
}, styledText.getDisplay());
}
} finally {
shell.dispose();
}
}
}
Expand Down
Loading