Skip to content

When fixing member deprecation, copy deprecation parms from type #2767

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

Merged
jjohnstn merged 5 commits into from
Jan 29, 2026
Merged

When fixing member deprecation, copy deprecation parms from type #2767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fcae0ec
When fixing member deprecation, copy deprecation parms from type
jjohnstn Jan 29, 2026
6803f5c
Remove extraneous problem id check
jjohnstn Jan 29, 2026
1f5b731
Try changing how new test sets options
jjohnstn Jan 29, 2026
665ba33
Remove extraneous method parameter
jjohnstn Jan 29, 2026
e4f2483
Change project used for new test
jjohnstn Jan 29, 2026
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
63 changes: 55 additions & 8 deletions ...t.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/Java50FixCore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.eclipse.jdt.core.compiler.IProblem;
import org.eclipse.jdt.core.dom.AST;
import org.eclipse.jdt.core.dom.ASTNode;
import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
import org.eclipse.jdt.core.dom.Annotation;
import org.eclipse.jdt.core.dom.ArrayType;
import org.eclipse.jdt.core.dom.BodyDeclaration;
Expand All @@ -34,6 +35,7 @@
import org.eclipse.jdt.core.dom.EnumConstantDeclaration;
import org.eclipse.jdt.core.dom.Expression;
import org.eclipse.jdt.core.dom.FieldDeclaration;
import org.eclipse.jdt.core.dom.IExtendedModifier;
import org.eclipse.jdt.core.dom.ITypeBinding;
import org.eclipse.jdt.core.dom.MethodDeclaration;
import org.eclipse.jdt.core.dom.MethodInvocation;
Expand All @@ -53,6 +55,7 @@

import org.eclipse.jdt.internal.core.manipulation.JavaManipulationPlugin;
import org.eclipse.jdt.internal.core.manipulation.util.BasicElementLabels;
import org.eclipse.jdt.internal.corext.dom.ASTNodes;
import org.eclipse.jdt.internal.corext.dom.LinkedNodeFinder;
import org.eclipse.jdt.internal.corext.refactoring.generics.InferTypeArgumentsConstraintCreator;
import org.eclipse.jdt.internal.corext.refactoring.generics.InferTypeArgumentsConstraintsSolver;
Expand Down Expand Up @@ -84,17 +87,28 @@ private static class AnnotationRewriteOperation extends CompilationUnitRewriteOp
private final BodyDeclaration fBodyDeclaration;
private final String fAnnotation;

private final Annotation fCopyAnnotation;

public AnnotationRewriteOperation(BodyDeclaration bodyDeclaration, String annotation) {
this(bodyDeclaration, annotation, null);
}
public AnnotationRewriteOperation(BodyDeclaration bodyDeclaration, String annotation, Annotation copyAnnotation) {
fBodyDeclaration= bodyDeclaration;
fAnnotation= annotation;
fCopyAnnotation= copyAnnotation;
}

@Override
public void rewriteAST(CompilationUnitRewrite cuRewrite, LinkedProposalModelCore model) throws CoreException {
AST ast= cuRewrite.getRoot().getAST();
ListRewrite listRewrite= cuRewrite.getASTRewrite().getListRewrite(fBodyDeclaration, fBodyDeclaration.getModifiersProperty());
Annotation newAnnotation= ast.newMarkerAnnotation();
newAnnotation.setTypeName(ast.newSimpleName(fAnnotation));
Annotation newAnnotation= null;
if (fCopyAnnotation != null) {
newAnnotation= (Annotation) cuRewrite.getASTRewrite().createCopyTarget(fCopyAnnotation);
} else {
newAnnotation= ast.newMarkerAnnotation();
newAnnotation.setTypeName(ast.newSimpleName(fAnnotation));
}
TextEditGroup group= createTextEditGroup(Messages.format(FixMessages.Java50Fix_AddMissingAnnotation_description, BasicElementLabels.getJavaElementName(fAnnotation)), cuRewrite);
listRewrite.insertFirst(newAnnotation, group);
}
Expand Down Expand Up @@ -148,7 +162,7 @@ public static Java50FixCore createAddOverrideAnnotationFix(CompilationUnit compi
if (!isMissingOverrideAnnotationProblem(problem.getProblemId()))
return null;

return createFix(compilationUnit, problem, OVERRIDE, FixMessages.Java50Fix_AddOverride_description);
return createFix(compilationUnit, problem, OVERRIDE, null, FixMessages.Java50Fix_AddOverride_description);
}

public static boolean isMissingOverrideAnnotationInterfaceProblem(int id) {
Expand All @@ -163,7 +177,20 @@ public static Java50FixCore createAddDeprectatedAnnotation(CompilationUnit compi
if (!isMissingDeprecationProblem(problem.getProblemId()))
return null;

return createFix(compilationUnit, problem, DEPRECATED, FixMessages.Java50Fix_AddDeprecated_description);
ASTNode selectedNode= problem.getCoveringNode(compilationUnit);
if (selectedNode == null)
return null;

ASTNode declaringNode= getDeclaringNode(selectedNode);
if (!(declaringNode instanceof BodyDeclaration))
return null;

Annotation copyAnnotation= null;
if (problem.getProblemId() == IProblem.MemberOfDeprecatedTypeNotDeprecated) {
copyAnnotation= getCopyAnnotation(declaringNode, DEPRECATED);
}

return createFix(compilationUnit, problem, DEPRECATED, copyAnnotation, FixMessages.Java50Fix_AddDeprecated_description);
}

public static boolean isMissingDeprecationProblem(int id) {
Expand All @@ -174,7 +201,7 @@ public static boolean isMissingDeprecationProblem(int id) {
};
}

private static Java50FixCore createFix(CompilationUnit compilationUnit, IProblemLocation problem, String annotation, String label) {
private static Java50FixCore createFix(CompilationUnit compilationUnit, IProblemLocation problem, String annotation, Annotation copyAnnotation, String label) {
ASTNode selectedNode= problem.getCoveringNode(compilationUnit);
if (selectedNode == null)
return null;
Expand All @@ -184,8 +211,7 @@ private static Java50FixCore createFix(CompilationUnit compilationUnit, IProblem
return null;

BodyDeclaration declaration= (BodyDeclaration) declaringNode;

AnnotationRewriteOperation operation= new AnnotationRewriteOperation(declaration, annotation);
AnnotationRewriteOperation operation= new AnnotationRewriteOperation(declaration, annotation, copyAnnotation);

return new Java50FixCore(label, compilationUnit, new CompilationUnitRewriteOperation[] {operation});
}
Expand Down Expand Up @@ -276,14 +302,35 @@ private static void createAddDeprecatedAnnotationOperations(CompilationUnit comp
ASTNode declaringNode= getDeclaringNode(selectedNode);
if (declaringNode instanceof BodyDeclaration) {
BodyDeclaration declaration= (BodyDeclaration) declaringNode;
AnnotationRewriteOperation operation= new AnnotationRewriteOperation(declaration, DEPRECATED);
Annotation copyAnnotation= null;
if (problem.getProblemId() == IProblem.MemberOfDeprecatedTypeNotDeprecated) {
copyAnnotation= getCopyAnnotation(declaringNode, DEPRECATED);
}
AnnotationRewriteOperation operation= new AnnotationRewriteOperation(declaration, DEPRECATED, copyAnnotation);
result.add(operation);
}
}
}
}
}

private static Annotation getCopyAnnotation(ASTNode declaringNode, String annotation) {
Annotation copyAnnotation= null;

AbstractTypeDeclaration typeDecl= ASTNodes.getFirstAncestorOrNull(declaringNode, AbstractTypeDeclaration.class);
if (typeDecl != null) {
List<IExtendedModifier> modifiers= typeDecl.modifiers();
for (IExtendedModifier modifier : modifiers) {
if (modifier instanceof Annotation annotation2
&& annotation2.getTypeName().getFullyQualifiedName().equals(annotation)
&& !annotation2.isMarkerAnnotation()) {
copyAnnotation= annotation2;
}
}
}
return copyAnnotation;
}

private static void createAddOverrideAnnotationOperations(CompilationUnit compilationUnit, boolean addOverrideInterfaceAnnotation, IProblemLocation[] locations, List<CompilationUnitRewriteOperation> result) {
for (IProblemLocation problem : locations) {
int problemId= problem.getProblemId();
Expand Down
Loading
Loading