Skip to content

Stable ordering for legacy hint items in popup #9676

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
mbien wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Stable ordering for legacy hint items in popup #9676

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
19 changes: 8 additions & 11 deletions ide/spi.editor.hints/src/org/netbeans/modules/editor/hints/FixData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
package org.netbeans.modules.editor.hints;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.LinkedHashSet;
Expand All @@ -38,35 +37,33 @@
public class FixData extends CompoundLazyFixList {

public FixData(LazyFixList errorFixes, LazyFixList otherFixes) {
super(Arrays.asList(errorFixes, otherFixes));
super(List.of(errorFixes, otherFixes));
}

public List<Fix> getSortedFixes() {
LazyFixList errorFixes = delegates.get(0);
LazyFixList otherFixes = delegates.get(1);
List<Fix> result = new LinkedList<Fix>();
List<Fix> result = new LinkedList<>();

result.addAll(sortFixes(new LinkedHashSet<Fix>(errorFixes.getFixes())));
result.addAll(sortFixes(new LinkedHashSet<Fix>(otherFixes.getFixes())));
result.addAll(sortFixes(new LinkedHashSet<>(errorFixes.getFixes())));
result.addAll(sortFixes(new LinkedHashSet<>(otherFixes.getFixes())));

return result;
}

private List<Fix> sortFixes(Collection<Fix> fixes) {
List<Fix> result = new ArrayList<Fix>(fixes);

List<Fix> result = new ArrayList<>(fixes);
result.sort(new FixComparator());

return result;
}

private static final String DEFAULT_SORT_TEXT = "\uFFFF";

private static CharSequence getSortText(Fix f) {
if (f instanceof EnhancedFix) {
return ((EnhancedFix) f).getSortText();
if (f instanceof EnhancedFix ef) {
return ef.getSortText();
} else {
return DEFAULT_SORT_TEXT;
return DEFAULT_SORT_TEXT + f.getText();
}
}
private static final class FixComparator implements Comparator<Fix> {
Expand Down
66 changes: 12 additions & 54 deletions .../maven.hints/src/org/netbeans/modules/maven/hints/errors/SearchClassDependencyInRepo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -94,12 +93,13 @@ public SearchClassDependencyInRepo() {

@Override
public Set<String> getCodes() {
return new HashSet<String>(Arrays.asList(
MODULE_DOES_NOT_READ,
"compiler.err.cant.resolve",//NOI18N
"compiler.err.cant.resolve.location",//NOI18N
"compiler.err.doesnt.exist",//NOI18N
"compiler.err.not.stmt"));//NOI18N
return Set.of(
MODULE_DOES_NOT_READ,
"compiler.err.cant.resolve", //NOI18N
"compiler.err.cant.resolve.location", //NOI18N
"compiler.err.doesnt.exist", //NOI18N
"compiler.err.not.stmt" //NOI18N
);

}

Expand Down Expand Up @@ -445,17 +445,7 @@ public void cancel() {
cancel.set(true);
}

static final class MavenFixImport implements EnhancedFix {

private final Project mavProj;
private final NBVersionInfo nbvi;
private final boolean test;

public MavenFixImport(Project mavProj, NBVersionInfo nbvi, boolean test) {
this.mavProj = mavProj;
this.nbvi = nbvi;
this.test = test;
}
static record MavenFixImport(Project mavProj, NBVersionInfo nbvi, boolean test) implements EnhancedFix {

@Override
public CharSequence getSortText() {
Expand All @@ -476,28 +466,12 @@ public ChangeInfo implement() throws Exception {
ModelUtils.addDependency(mavProj.getProjectDirectory().getFileObject("pom.xml"), nbvi.getGroupId(), nbvi.getArtifactId(),
nbvi.getVersion(), nbvi.getType(), test ? "test" : null, null, true);//NOI18N

RequestProcessor.getDefault().post(new Runnable() {

@Override
public void run() {
mavProj.getLookup().lookup(NbMavenProject.class).triggerDependencyDownload();
}
});
RequestProcessor.getDefault().post(mavProj.getLookup().lookup(NbMavenProject.class)::triggerDependencyDownload);
return null;
}
}

static final class MavenSearchFix implements EnhancedFix {

private final Project mavProj;
private final String clazz;
private final boolean test;

public MavenSearchFix(Project mavProj, String clazz, boolean test) {
this.mavProj = mavProj;
this.clazz = clazz;
this.test = test;
}
static record MavenSearchFix(Project mavProj, String clazz, boolean test) implements EnhancedFix {

@Override
public CharSequence getSortText() {
Expand Down Expand Up @@ -540,13 +514,7 @@ public void run() {
ModelUtils.addDependency(mavProj.getProjectDirectory().getFileObject("pom.xml"), nbvi.getGroupId(), nbvi.getArtifactId(),
nbvi.getVersion(), nbvi.getType(), test ? "test" : null, null, true);//NOI18N

RequestProcessor.getDefault().post(new Runnable() {

@Override
public void run() {
mavProj.getLookup().lookup(NbMavenProject.class).triggerDependencyDownload();
}
});
RequestProcessor.getDefault().post(mavProj.getLookup().lookup(NbMavenProject.class)::triggerDependencyDownload);
}
}
};
Expand All @@ -559,17 +527,7 @@ public void run() {
}
}

static final class AddRequiresFix implements EnhancedFix {

private final NbMavenProject prj;
private final String moduleName;
private final Artifact artifact;

public AddRequiresFix(NbMavenProject prj, String moduleName, Artifact artifact) {
this.prj = prj;
this.moduleName = moduleName;
this.artifact = artifact;
}
static record AddRequiresFix(NbMavenProject prj, String moduleName, Artifact artifact) implements EnhancedFix {

@Override
public CharSequence getSortText() {
Expand Down
Loading