Fix remove unnecessary array creation clean-up with non-element non-nls (eclipse-jdt#2204)

- fix UnwrapNewArrayOperation.rewriteAST() to properly set the
  tagged flag to true when non-nls markers exist on the line of
  an operand (i.e. not just the operand itself)
- add new test to CleanUpTest1d5
= fixes eclipse-jdt#2202

Author: jjohnstn

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019, 2024 Red Hat Inc. and others.
+ * Copyright (c) 2019, 2025 Red Hat Inc. and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -35,7 +35,7 @@
 import org.eclipse.jdt.internal.corext.fix.CompilationUnitRewriteOperationsFixCore.CompilationUnitRewriteOperation;
 import org.eclipse.jdt.internal.corext.refactoring.nls.NLSElement;
 import org.eclipse.jdt.internal.corext.refactoring.nls.NLSLine;
-import org.eclipse.jdt.internal.corext.refactoring.nls.NLSUtil;
+import org.eclipse.jdt.internal.corext.refactoring.nls.NLSScanner;
 import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite;
 
 /**
@@ -55,23 +55,30 @@ 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;
-		boolean isTagged[]= new boolean[expressionsInArray.size()];
 		ICompilationUnit cu= cuRewrite.getCu();
+		CompilationUnit root= cuRewrite.getRoot();
 
 		boolean tagged= false;
-		for (int i= 0; i < expressionsInArray.size(); ++i) {
-			Expression operand= expressionsInArray.get(i);
-			NLSLine nlsLine= NLSUtil.scanCurrentLine(cu, operand.getStartPosition());
-			if (nlsLine != null) {
-				for (NLSElement element : nlsLine.getElements()) {
-					if (element.getPosition().getOffset() == operand.getStartPosition()) {
-						if (element.hasTag()) {
-							tagged= true;
-							isTagged[i]= true;
+		try {
+			for (int i= 0; i < expressionsInArray.size(); ++i) {
+				Expression operand= expressionsInArray.get(i);
+				int lineNo= root.getLineNumber(operand.getStartPosition());
+				for (NLSLine nlsLine : NLSScanner.scan(cu)) {
+					if (nlsLine.getLineNumber() == lineNo - 1) {
+						for (NLSElement element : nlsLine.getElements()) {
+							if (element.hasTag()) {
+								tagged= true;
+								break;
+							}
 						}
 					}
+					if (tagged) {
+						break;
+					}
 				}
 			}
+		} catch (Exception e) {
+			// do nothing
 		}
 
 		TextEditGroup group= createTextEditGroup(FixMessages.UnusedCodeFix_RemoveUnnecessaryArrayCreation_description, cuRewrite);

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019, 2024 IBM Corporation and others.
+ * Copyright (c) 2019, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -3912,6 +3912,63 @@ public void foo() {
 				new HashSet<>(Arrays.asList(FixMessages.UnusedCodeFix_RemoveUnnecessaryArrayCreation_description)));
 	}
 
+	@Test
+	public void testUnnecessaryArrayIssue2202() throws Exception {
+		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);
+		String sample= """
+			package test1;
+
+			import java.util.Arrays;
+			import java.util.List;
+
+			public class A {
+
+				public void foo1(String x, List<Object> y) {
+					// do nothing
+				}
+
+				public void foo() {
+					String a = "abc";
+					Integer b = 0;
+					Double c = 1.4;
+					foo1("abc", Arrays.asList(new Object[] {a, //$NON-NLS-1$
+							b, c}));
+				}
+
+			}
+			""";
+		ICompilationUnit cu1= pack1.createCompilationUnit("A.java", sample, false, null);
+
+		enable(CleanUpConstants.REMOVE_UNNECESSARY_ARRAY_CREATION);
+
+		sample= """
+			package test1;
+
+			import java.util.Arrays;
+			import java.util.List;
+
+			public class A {
+
+				public void foo1(String x, List<Object> y) {
+					// do nothing
+				}
+
+				public void foo() {
+					String a = "abc";
+					Integer b = 0;
+					Double c = 1.4;
+					foo1("abc", Arrays.asList(a, //$NON-NLS-1$
+			        				b, c));
+				}
+
+			}
+			""";
+		String expected= sample;
+
+		assertRefactoringResultAsExpected(new ICompilationUnit[] { cu1 }, new String[] { expected },
+				new HashSet<>(Arrays.asList(FixMessages.UnusedCodeFix_RemoveUnnecessaryArrayCreation_description)));
+	}
+
 	@Test
 	public void testKeepArrayWithSingleArrayElement() throws Exception {
 		IPackageFragment pack1= fSourceFolder.createPackageFragment("test1", false, null);