Skip to content

Preserve last code minings for non-reconciled viewers and clean up on viewer disposal #2697

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

Closed
tobiasmelcher wants to merge 1 commit into from
Closed

Preserve last code minings for non-reconciled viewers and clean up on viewer disposal #2697

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
52 changes: 51 additions & 1 deletion ...i/ui/org/eclipse/jdt/internal/ui/javaeditor/codemining/JavaElementCodeMiningProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,18 @@

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CompletableFuture;

import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.widgets.Display;

import org.eclipse.core.runtime.IProgressMonitor;

import org.eclipse.jface.text.BadLocationException;
Expand Down Expand Up @@ -66,6 +75,10 @@ public class JavaElementCodeMiningProvider extends AbstractCodeMiningProvider {
private final boolean showImplementations;

private final boolean editorEnabled;

private Map<ITextViewer, List<ICodeMining>> lastCalculatedMiningsByViewer = new HashMap<>();

private final Set<ITextViewer> listenersAdded = Collections.synchronizedSet(new HashSet<>());

public JavaElementCodeMiningProvider() {
editorEnabled= JavaPreferencesPropertyTester.isEnabled(PreferenceConstants.EDITOR_CODEMINING_ENABLED);
Expand All @@ -77,6 +90,42 @@ public JavaElementCodeMiningProvider() {
showImplementations= editorEnabled && JavaPreferencesPropertyTester.isEnabled(PreferenceConstants.EDITOR_JAVA_CODEMINING_SHOW_IMPLEMENTATIONS);
}

private void addToMap(ITextViewer viewer, List<ICodeMining> minings) {
// Synchronize on the viewer to ensure thread-safe listener addition
synchronized (viewer) {
if (!listenersAdded.contains(viewer)) {
StyledText st = viewer.getTextWidget();
if (st != null) {
Display.getDefault().asyncExec(() -> {
// Double-check locking pattern: verify listener wasn't added by another thread
synchronized (viewer) {
if (!listenersAdded.contains(viewer)) {
st.addDisposeListener(new DisposeListener() {
@Override
public void widgetDisposed(DisposeEvent e) {
lastCalculatedMiningsByViewer.remove(viewer);
listenersAdded.remove(viewer);
}
});
listenersAdded.add(viewer);
}
}
});
}
}
}
// Safe to put since HashMap operations are atomic for single put
lastCalculatedMiningsByViewer.put(viewer, minings);
}

private List<ICodeMining> getFromMap(ITextViewer viewer) {
List<ICodeMining> minings = lastCalculatedMiningsByViewer.get(viewer);
if (minings == null) {
return Collections.emptyList();
}
return minings;
}

@Override
public CompletableFuture<List<? extends ICodeMining>> provideCodeMinings(ITextViewer viewer,
IProgressMonitor monitor) {
Expand All @@ -87,7 +136,7 @@ public CompletableFuture<List<? extends ICodeMining>> provideCodeMinings(ITextVi
ISourceViewerExtension5 codeMiningViewer = (ISourceViewerExtension5)viewer;
if (!JavaCodeMiningReconciler.isReconciled(codeMiningViewer)) {
// the provider isn't able to return code minings for non-reconciled viewers
return CompletableFuture.completedFuture(Collections.emptyList());
return CompletableFuture.completedFuture(getFromMap(viewer));
}
}
return CompletableFuture.supplyAsync(() -> {
Expand All @@ -109,6 +158,7 @@ public CompletableFuture<List<? extends ICodeMining>> provideCodeMinings(ITextVi
}
}
monitor.isCanceled();
addToMap(viewer, minings);
return minings;
} catch (JavaModelException e) {
// Should never occur
Expand Down
Loading