Organize imports generates duplicate static import statement

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/OrganizeImportsHandler.java

@@ -32,6 +32,7 @@
 import org.eclipse.jdt.core.Signature;
 import org.eclipse.jdt.core.dom.AST;
 import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.IBinding;
 import org.eclipse.jdt.core.dom.Name;
 import org.eclipse.jdt.core.dom.SimpleName;
 import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
@@ -181,21 +182,26 @@ private static boolean areEqual(InsertEdit edit1, InsertEdit edit2) {
 	}
 
 	private static void addImports(CompilationUnit root, ICompilationUnit unit, String[] favourites, ImportRewrite importRewrite, AST ast, ASTRewrite astRewrite, SimpleName node, boolean isMethod) throws JavaModelException {
-		String name = node.getIdentifier();
-		String[] imports = SimilarElementsRequestor.getStaticImportFavorites(unit, name, isMethod, favourites);
-		if (imports.length > 1) {
-			// See https://github.com/redhat-developer/vscode-java/issues/1472
-			return;
-		}
-		for (int i = 0; i < imports.length; i++) {
-			String curr = imports[i];
-			String qualifiedTypeName = Signature.getQualifier(curr);
-			String res = importRewrite.addStaticImport(qualifiedTypeName, name, isMethod, new ContextSensitiveImportRewriteContext(root, node.getStartPosition(), importRewrite));
-			int dot = res.lastIndexOf('.');
-			if (dot != -1) {
-				String usedTypeName = importRewrite.addImport(qualifiedTypeName);
-				Name newName = ast.newQualifiedName(ast.newName(usedTypeName), ast.newSimpleName(name));
-				astRewrite.replace(node, newName, null);
+		IBinding binding = node.resolveBinding();
+		if (binding != null) {
+			importRewrite.addStaticImport(binding);
+		} else {
+			String name = node.getIdentifier();
+			String[] imports = SimilarElementsRequestor.getStaticImportFavorites(unit, name, isMethod, favourites);
+			if (imports.length > 1) {
+				// See https://github.com/redhat-developer/vscode-java/issues/1472
+				return;
+			}
+			for (int i = 0; i < imports.length; i++) {
+				String curr = imports[i];
+				String qualifiedTypeName = Signature.getQualifier(curr);
+				String res = importRewrite.addStaticImport(qualifiedTypeName, name, isMethod, new ContextSensitiveImportRewriteContext(root, node.getStartPosition(), importRewrite));
+				int dot = res.lastIndexOf('.');
+				if (dot != -1) {
+					String usedTypeName = importRewrite.addImport(qualifiedTypeName);
+					Name newName = ast.newQualifiedName(ast.newName(usedTypeName), ast.newSimpleName(name));
+					astRewrite.replace(node, newName, null);
+				}
 			}
 		}
 	}

org.eclipse.jdt.ls.tests/projects/maven/salut6/pom.xml

@@ -0,0 +1,28 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>foo.bar</groupId>
+	<artifactId>salut6</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.11</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<!-- use 2.9.1 for Java 7 projects -->
+			<version>3.20.2</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>

org.eclipse.jdt.ls.tests/projects/maven/salut6/src/test/java/org/sample/MyTest.java

@@ -0,0 +1,12 @@
+package org.sample;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.junit.Test;
+
+public class MyTest {
+    @Test
+    public void test() {
+        assertThat("test", true);
+    }
+}

org.eclipse.jdt.ls.tests/projects/maven/salut6/src/test/java/org/sample/MyTest2.java

@@ -0,0 +1,12 @@
+package org.sample;
+
+import static org.hamcrest.MatcherAssert.*;
+
+import org.junit.Test;
+
+public class MyTest2 {
+    @Test
+    public void test() {
+        assertThat("test", true);
+    }
+}

org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/handlers/AdvancedOrganizeImportsHandlerTest.java

@@ -15,17 +15,21 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IImportDeclaration;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.IType;
@@ -188,4 +192,38 @@ public void testAmbiguousStaticImports() throws Exception {
 			JavaLanguageServerPlugin.getPreferencesManager().getPreferences().setJavaCompletionFavoriteMembers(Arrays.asList(favourites));
 		}
 	}
+
+	// https://github.com/redhat-developer/vscode-java/issues/2012
+	@Test
+	public void testDuplicateStaticImports() throws Exception {
+		importProjects("maven/salut6");
+		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("salut6");
+		assertTrue(BuildSupportManager.find("Maven").get().applies(project));
+		String[] favourites = JavaLanguageServerPlugin.getPreferencesManager().getPreferences().getJavaCompletionFavoriteMembers();
+		try {
+			List<String> list = new ArrayList<>();
+			list.add("org.assertj.core.api.Assertions.*");
+			JavaLanguageServerPlugin.getPreferencesManager().getPreferences().setJavaCompletionFavoriteMembers(list);
+			IJavaProject javaProject = JavaCore.create(project);
+			IType type = javaProject.findType("org.sample.MyTest");
+			ICompilationUnit unit = type.getCompilationUnit();
+			TextEdit edit = OrganizeImportsHandler.organizeImports(unit, (selections) -> {
+				return new ImportCandidate[0];
+			});
+			assertNull(edit);
+			type = javaProject.findType("org.sample.MyTest2");
+			unit = type.getCompilationUnit();
+			edit = OrganizeImportsHandler.organizeImports(unit, (selections) -> {
+				return new ImportCandidate[0];
+			});
+			assertNotNull(edit);
+			JavaModelUtil.applyEdit(unit, edit, true, null);
+			IImportDeclaration[] imports = unit.getImports();
+			assertEquals(2, imports.length);
+			Optional<IImportDeclaration> el = Stream.of(imports).filter(p -> p.getElementName().equals("org.hamcrest.MatcherAssert.assertThat")).findFirst();
+			assertNotNull(el.get());
+		} finally {
+			JavaLanguageServerPlugin.getPreferencesManager().getPreferences().setJavaCompletionFavoriteMembers(Arrays.asList(favourites));
+		}
+	}
 }