Test and preliminary fix for issue with "USE_VAR" cleanup (#1538)

* Test that shows issue with "USE_VAR" cleanup * Fix issue with vanishing import
eclipse-jdt · Aug 8, 2024 · f1cd1c8 · f1cd1c8
1 parent 627225f
commit f1cd1c8
Show file tree

Hide file tree

Showing 2 changed files with 116 additions and 73 deletions.
diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/VarCleanUpCore.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/VarCleanUpCore.java
@@ -402,7 +402,11 @@ public void rewriteAST(final CompilationUnitRewrite cuRewrite, final LinkedPropo
 
 			SimpleType replacement= ast.newSimpleType(ast.newSimpleName("var")); //$NON-NLS-1$
 			ASTNodes.replaceButKeepComment(rewrite, node, replacement, group);
-			remover.registerRemovedNode(node);
+			if (classInstanceCreation != null) {
+				remover.registerRemovedNode(classInstanceCreation);
+			} else {
+				remover.registerRemovedNode(node);
+			}
 		}
 	}
 }