Skip to content
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

fix: Organize-imports can sometimes add unwanted imports #7699

Merged
merged 1 commit into from
Aug 29, 2024
Merged

fix: Organize-imports can sometimes add unwanted imports #7699

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
2 changes: 1 addition & 1 deletion java/java.source.base/src/org/netbeans/api/java/source/GeneratorUtilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,7 +1276,7 @@ private CompilationUnitTree addImports(CompilationUnitTree cut, List<? extends I
// check for possible name clashes originating from adding the package imports
Set<Element> explicitNamedImports = new HashSet<Element>();
for (Element element : elementsToImport) {
if (element.getKind().isClass() || element.getKind().isInterface()) {
if (element.getEnclosingElement() != pkg && (element.getKind().isClass() || element.getKind().isInterface())) {
for (Symbol sym : importScope.getSymbolsByName((com.sun.tools.javac.util.Name)element.getSimpleName())) {
if (sym.getKind().isClass() || sym.getKind().isInterface()) {
if (sym != element) {
Expand Down
12 changes: 12 additions & 0 deletions java/java.source.base/test/unit/src/org/netbeans/api/java/source/GeneratorUtilitiesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,18 @@ public void validate(CompilationInfo info) {
}, false);
}

public void testAddImports14() throws Exception {
performTest("test/Process.java", "package test;\nimport java.util.Collections;\npublic class Process {\npublic static void main(String... args) {\n" +
"Collections.singleton(Process.class).forEach(System.out::println);\n}\n}", "1.5", new AddImportsTask("test.Process"), new Validator() {
public void validate(CompilationInfo info) {
assertEquals(0, info.getDiagnostics().size());
List<? extends ImportTree> imports = info.getCompilationUnit().getImports();
assertEquals(1, imports.size());
assertEquals("java.util.Collections", imports.get(0).getQualifiedIdentifier().toString());
}
}, false);
}

public void testAddImportsIncrementallyWithStatic_JIRA3019() throws Exception {
JavacParser.DISABLE_SOURCE_LEVEL_DOWNGRADE = true;
performTest("package test;\npublic class Test { public static final String CONST = null; }\n", "11", new AddImportsTask(true, "test.Test.CONST", "java.util.List"), new Validator() {
Expand Down
Loading