Fix Unnecessary Array cleanup to remove unneeded imports (#2227)

- use ImportRemover in UnwrapNewArrayOperation.java
- add new test to CleanUpTest1d5
- fixes #2222

Author: jjohnstn

org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/UnwrapNewArrayOperation.java

@@ -23,6 +23,7 @@
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.ArrayCreation;
+import org.eclipse.jdt.core.dom.ArrayType;
 import org.eclipse.jdt.core.dom.ClassInstanceCreation;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jdt.core.dom.Expression;
@@ -37,6 +38,7 @@
 import org.eclipse.jdt.internal.corext.refactoring.nls.NLSLine;
 import org.eclipse.jdt.internal.corext.refactoring.nls.NLSScanner;
 import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite;
+import org.eclipse.jdt.internal.corext.refactoring.structure.ImportRemover;
 
 /**
  * Unwrap a new array with initializer used as input for varargs and replace with initializer elements.
@@ -55,8 +57,10 @@ public void rewriteAST(CompilationUnitRewrite cuRewrite, LinkedProposalModelCore
 		ASTRewrite rewrite= cuRewrite.getASTRewrite();
 		List<Expression> expressionsInArray= node != null && node.getInitializer() != null && node.getInitializer().expressions() != null ?
 				node.getInitializer().expressions() : Collections.EMPTY_LIST;
+		ArrayType arrayType= node != null ? node.getType() : null;
 		ICompilationUnit cu= cuRewrite.getCu();
 		CompilationUnit root= cuRewrite.getRoot();
+		ImportRemover remover= cuRewrite.getImportRemover();
 
 		boolean tagged= false;
 		try {
@@ -138,6 +142,9 @@ public void rewriteAST(CompilationUnitRewrite cuRewrite, LinkedProposalModelCore
 
 			rewrite.replace(call, replacementNode, group);
 		}
+		if (arrayType != null) {
+			remover.registerRemovedNode(arrayType);
+		}
 	}
 }
 

org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/CleanUpTest1d5.java

@@ -3969,6 +3969,54 @@ public void foo() {
 				new HashSet<>(Arrays.asList(FixMessages.UnusedCodeFix_RemoveUnnecessaryArrayCreation_description)));
 	}
 
+	@Test
+	public void testUnnecessaryArrayIssue2222() throws Exception {
+		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
+		String sample= """
+			package test1;
+
+			import java.util.ArrayList;
+			import java.util.List;
+
+			public class A {
+				public void foo1(ArrayList<String> x) {
+					B.blah(new List<String>[] { x });
+				}
+			}
+			""";
+		ICompilationUnit cu1= pack1.createCompilationUnit("A.java", sample, false, null);
+
+		String sample2= """
+			package test1;
+
+			import java.util.List;
+
+			public class B {
+				static public void blah(List ... y) {
+				}
+			}
+			""";
+		ICompilationUnit cu2= pack1.createCompilationUnit("B.java", sample2, false, null);
+
+		enable(CleanUpConstants.REMOVE_UNNECESSARY_ARRAY_CREATION);
+
+		sample= """
+			package test1;
+
+			import java.util.ArrayList;
+
+			public class A {
+				public void foo1(ArrayList<String> x) {
+					B.blah(x);
+				}
+			}
+			""";
+		String expected1= sample;
+
+		assertRefactoringResultAsExpected(new ICompilationUnit[] { cu1, cu2 }, new String[] { expected1, sample2 },
+				new HashSet<>(Arrays.asList(FixMessages.UnusedCodeFix_RemoveUnnecessaryArrayCreation_description)));
+	}
+
 	@Test
 	public void testKeepArrayWithSingleArrayElement() throws Exception {
 		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);