Skip to content

Fixed bug https://github.com/apache/netbeans/issues/8772 #8773

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed bug https://github.com/apache/netbeans/issues/8772 #8773

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
43 changes: 40 additions & 3 deletions ide/spi.editor.hints/src/org/netbeans/modules/editor/hints/AnnotationHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,24 +74,25 @@
import org.netbeans.spi.editor.highlighting.support.OffsetsBag;
import org.netbeans.spi.editor.hints.ErrorDescription;
import org.netbeans.spi.editor.hints.ErrorDescriptionFactory;
import org.netbeans.spi.editor.hints.Fix;
import org.netbeans.spi.editor.hints.LazyFixList;
import org.netbeans.spi.editor.hints.Severity;
import org.openide.cookies.EditorCookie;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.loaders.DataObject;
import org.openide.text.Annotation;
import org.openide.text.NbDocument;
import org.openide.util.RequestProcessor;
import org.openide.util.WeakListeners;
import org.openide.filesystems.FileUtil;
import org.openide.text.PositionBounds;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.LookupEvent;
import org.openide.util.LookupListener;
import org.openide.util.NbBundle;
import org.openide.util.Pair;
import org.openide.util.RequestProcessor;
import org.openide.util.RequestProcessor.Task;
import org.openide.util.WeakListeners;

/**
*
Expand Down Expand Up @@ -1394,6 +1395,42 @@ public void run() {
return result[0];
}

public synchronized void removeErrorForFixOnLine(Fix fix, int line) throws IOException, BadLocationException {
Position pos = getPosition(line, false);
List<ErrorDescription> errs = getErrorsForLine(pos, false);

List<ErrorDescription> errsToRemove = new ArrayList<>(); // Should be 1, but uses List just in case
for (ErrorDescription err : errs) {
if (err.getFixes().getFixes().contains(fix)) {
errsToRemove.add(err);
}
}

Map<String, List<ErrorDescription>> layers = new HashMap<>();
for (ErrorDescription ed : errsToRemove) {
for (Entry<String, List<ErrorDescription>> layer : layer2Errors.entrySet()) {
String key = layer.getKey();
List<ErrorDescription> val = layer.getValue();
for (ErrorDescription err : val) {
if (!ed.equals(err)) {
continue;
}
if (!layers.containsKey(key)) {
layers.put(key, new ArrayList<>(val));
}
layers.get(key).remove(ed);
}
}
}

for (Entry<String, List<ErrorDescription>> entry : layers.entrySet()) {
String key = entry.getKey();
List<ErrorDescription> val = entry.getValue();
setErrorDescriptions(key, val, false);
}
}


private static final boolean ENABLE_ASSERTS = Boolean.getBoolean(AnnotationHolder.class.getName() + ".enableAsserts200469");

private static class PositionComparator implements Comparator<Object> {
Expand Down
8 changes: 6 additions & 2 deletions ide/spi.editor.hints/src/org/netbeans/modules/editor/hints/HintsUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@
import javax.swing.text.JTextComponent;
import javax.swing.text.Position;
import org.netbeans.api.editor.EditorRegistry;
import org.netbeans.api.editor.document.LineDocument;
import org.netbeans.api.editor.document.LineDocumentUtils;
import org.netbeans.api.editor.mimelookup.MimeLookup;
import org.netbeans.api.editor.settings.EditorStyleConstants;
import org.netbeans.editor.AnnotationDesc;
Expand Down Expand Up @@ -350,7 +352,7 @@ public void showPopup(FixData hints) {
}
}

public void showPopup(FixData fixes, String description, JTextComponent component, Point position) {
public void showPopup(FixData fixes, String description, JTextComponent component, Point position) {
removeHints();
setComponent(component);
JTextComponent comp = getComponent();
Expand Down Expand Up @@ -630,7 +632,6 @@ boolean invokeDefaultAction(boolean onlyActive) {
String description;

if (!onlyActive) {
refresh(doc, comp.getCaretPosition());
AnnotationHolder holder = getAnnotationHolder(doc);
Pair<FixData, String> fixData = holder != null ? holder.buildUpFixDataForLine(line) : null;

Expand Down Expand Up @@ -807,6 +808,9 @@ private void invokeHint (final Fix f) {
t = RequestProcessor.getDefault().post(new Runnable() {
public void run() {
try {
int line = LineDocumentUtils.getLineIndex((LineDocument) component.getDocument(), component.getCaretPosition());
AnnotationHolder holder = getAnnotationHolder(component.getDocument());
holder.removeErrorForFixOnLine(f, line);
changes = f.implement();
} catch (GuardedException ge) {
reportGuardedException(component, ge);
Expand Down