Skip to content
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

Disable code that determines if method cast is required #1566

Merged
merged 2 commits into from
Aug 3, 2024
Merged

Disable code that determines if method cast is required #1566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16ad9cd
Disable code that determines if method cast is required
jjohnstn Aug 2, 2024
9934fef
Fix code warnings
jjohnstn Aug 3, 2024
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
56 changes: 27 additions & 29 deletions ...extension/org/eclipse/jdt/internal/corext/refactoring/code/InlineConstantRefactoring.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
import org.eclipse.jdt.core.dom.ArrayCreation;
import org.eclipse.jdt.core.dom.ArrayInitializer;
import org.eclipse.jdt.core.dom.ArrayType;
import org.eclipse.jdt.core.dom.Assignment;
import org.eclipse.jdt.core.dom.BodyDeclaration;
import org.eclipse.jdt.core.dom.CastExpression;
import org.eclipse.jdt.core.dom.CompilationUnit;
Expand All @@ -81,7 +80,6 @@
import org.eclipse.jdt.core.dom.ParenthesizedExpression;
import org.eclipse.jdt.core.dom.QualifiedName;
import org.eclipse.jdt.core.dom.SimpleName;
import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
import org.eclipse.jdt.core.dom.StructuralPropertyDescriptor;
import org.eclipse.jdt.core.dom.SuperMethodReference;
import org.eclipse.jdt.core.dom.Type;
Expand All @@ -92,7 +90,6 @@
import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
import org.eclipse.jdt.core.dom.rewrite.ImportRewrite.ImportRewriteContext;
import org.eclipse.jdt.core.dom.rewrite.ImportRewrite.TypeLocation;
import org.eclipse.jdt.core.dom.rewrite.ListRewrite;
import org.eclipse.jdt.core.manipulation.ImportReferencesCollector;
import org.eclipse.jdt.core.refactoring.CompilationUnitChange;
import org.eclipse.jdt.core.refactoring.IJavaRefactorings;
Expand Down Expand Up @@ -284,32 +281,33 @@ private void perform(Expression initializer) {
addExplicitTypeArgumentsIfNecessary(initializer);
}

private void addExplicitTypeArgumentsIfNecessary(Expression invocation) {
if (Invocations.isResolvedTypeInferredFromExpectedType(invocation)) {
ASTNode referenceContext= fNewLocation.getParent();
if (!(referenceContext instanceof VariableDeclarationFragment)
&& !(referenceContext instanceof SingleVariableDeclaration)
&& !(referenceContext instanceof Assignment)) {
ListRewrite typeArgsRewrite= Invocations.getInferredTypeArgumentsRewrite(fInitializerRewrite, invocation);
for (ITypeBinding typeArgument2 : Invocations.getInferredTypeArguments(invocation)) {
Type typeArgument= fNewLocationCuRewrite.getImportRewrite().addImport(typeArgument2, fNewLocationCuRewrite.getAST(), fNewLocationContext, TypeLocation.TYPE_ARGUMENT);
fNewLocationCuRewrite.getImportRemover().registerAddedImports(typeArgument);
typeArgsRewrite.insertLast(typeArgument, null);
}

if (invocation instanceof MethodInvocation) {
MethodInvocation methodInvocation= (MethodInvocation) invocation;
Expression expression= methodInvocation.getExpression();
if (expression == null) {
IMethodBinding methodBinding= methodInvocation.resolveMethodBinding();
if (methodBinding != null) {
expression= fNewLocationCuRewrite.getAST().newName(fNewLocationCuRewrite.getImportRewrite().addImport(methodBinding.getDeclaringClass().getTypeDeclaration(), fNewLocationContext));
fInitializerRewrite.set(invocation, MethodInvocation.EXPRESSION_PROPERTY, expression, null);
}
}
}
}
}
private void addExplicitTypeArgumentsIfNecessary(@SuppressWarnings("unused") Expression invocation) {
// TODO: this requires additional logic, for example, mark these locations and recompile new source
// if (Invocations.isResolvedTypeInferredFromExpectedType(invocation)) {
// ASTNode referenceContext= fNewLocation.getParent();
// if (!(referenceContext instanceof VariableDeclarationFragment)
// && !(referenceContext instanceof SingleVariableDeclaration)
// && !(referenceContext instanceof Assignment)) {
// ListRewrite typeArgsRewrite= Invocations.getInferredTypeArgumentsRewrite(fInitializerRewrite, invocation);
// for (ITypeBinding typeArgument2 : Invocations.getInferredTypeArguments(invocation)) {
// Type typeArgument= fNewLocationCuRewrite.getImportRewrite().addImport(typeArgument2, fNewLocationCuRewrite.getAST(), fNewLocationContext, TypeLocation.TYPE_ARGUMENT);
// fNewLocationCuRewrite.getImportRemover().registerAddedImports(typeArgument);
// typeArgsRewrite.insertLast(typeArgument, null);
// }
//
// if (invocation instanceof MethodInvocation) {
// MethodInvocation methodInvocation= (MethodInvocation) invocation;
// Expression expression= methodInvocation.getExpression();
// if (expression == null) {
// IMethodBinding methodBinding= methodInvocation.resolveMethodBinding();
// if (methodBinding != null) {
// expression= fNewLocationCuRewrite.getAST().newName(fNewLocationCuRewrite.getImportRewrite().addImport(methodBinding.getDeclaringClass().getTypeDeclaration(), fNewLocationContext));
// fInitializerRewrite.set(invocation, MethodInvocation.EXPRESSION_PROPERTY, expression, null);
// }
// }
// }
// }
// }
}

@Override
Expand Down
30 changes: 15 additions & 15 deletions ...ore extension/org/eclipse/jdt/internal/corext/refactoring/code/InlineTempRefactoring.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
import org.eclipse.jdt.core.dom.ArrayCreation;
import org.eclipse.jdt.core.dom.ArrayInitializer;
import org.eclipse.jdt.core.dom.ArrayType;
import org.eclipse.jdt.core.dom.Assignment;
import org.eclipse.jdt.core.dom.CastExpression;
import org.eclipse.jdt.core.dom.CatchClause;
import org.eclipse.jdt.core.dom.CompilationUnit;
Expand All @@ -82,13 +81,11 @@
import org.eclipse.jdt.core.dom.ParenthesizedExpression;
import org.eclipse.jdt.core.dom.QualifiedName;
import org.eclipse.jdt.core.dom.SimpleName;
import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
import org.eclipse.jdt.core.dom.TryStatement;
import org.eclipse.jdt.core.dom.Type;
import org.eclipse.jdt.core.dom.TypeDeclaration;
import org.eclipse.jdt.core.dom.VariableDeclaration;
import org.eclipse.jdt.core.dom.VariableDeclarationExpression;
import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
import org.eclipse.jdt.core.dom.VariableDeclarationStatement;
import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
import org.eclipse.jdt.core.dom.rewrite.ImportRewrite.ImportRewriteContext;
Expand Down Expand Up @@ -417,6 +414,7 @@ private Expression getInitializerSource(CompilationUnitRewrite rewrite, SimpleNa
return copy;
}

@SuppressWarnings("unused")
private Expression getModifiedInitializerSource(CompilationUnitRewrite rewrite, SimpleName reference, TextEditGroup groupDesc) throws JavaModelException {
VariableDeclaration varDecl= getVariableDeclaration();
Expression initializer= varDecl.getInitializer();
Expand All @@ -427,18 +425,19 @@ private Expression getModifiedInitializerSource(CompilationUnitRewrite rewrite,
return replaceClashingNames(rewrite, groupDesc, initializer, replacements);
}
}
ASTNode referenceContext= reference.getParent();
if (Invocations.isResolvedTypeInferredFromExpectedType(initializer)) {
if (!(referenceContext instanceof VariableDeclarationFragment)
&& !(referenceContext instanceof SingleVariableDeclaration)
&& !(referenceContext instanceof Assignment)) {
ITypeBinding[] typeArguments= Invocations.getInferredTypeArguments(initializer);
if (typeArguments != null) {
String newSource= createParameterizedInvocation(initializer, typeArguments, rewrite);
return (Expression) rewrite.getASTRewrite().createStringPlaceholder(newSource, initializer.getNodeType());
}
}
}
// TODO: rework casting logic to mark the location and do casting after testing new source for failure
// ASTNode referenceContext= reference.getParent();
// if (Invocations.isResolvedTypeInferredFromExpectedType(initializer)) {
// if (!(referenceContext instanceof VariableDeclarationFragment)
// && !(referenceContext instanceof SingleVariableDeclaration)
// && !(referenceContext instanceof Assignment)) {
// ITypeBinding[] typeArguments= Invocations.getInferredTypeArguments(initializer);
// if (typeArguments != null) {
// String newSource= createParameterizedInvocation(initializer, typeArguments, rewrite);
// return (Expression) rewrite.getASTRewrite().createStringPlaceholder(newSource, initializer.getNodeType());
// }
// }
// }

Expression copy= (Expression) rewrite.getASTRewrite().createCopyTarget(initializer);
AST ast= rewrite.getAST();
Expand Down Expand Up @@ -706,6 +705,7 @@ private Name createFullyQualifiedName(SimpleName simpleName, ITypeBinding declar
return ast.newName(qualifiedName.toString());
}

@SuppressWarnings("unused")
private String createParameterizedInvocation(Expression invocation, ITypeBinding[] typeArguments, CompilationUnitRewrite cuRewrite) throws JavaModelException {
ASTRewrite rewrite= ASTRewrite.create(invocation.getAST());
ListRewrite typeArgsRewrite= Invocations.getInferredTypeArgumentsRewrite(rewrite, invocation);
Expand Down
1 change: 1 addition & 0 deletions ...ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineTempTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ public void test30() throws Exception{
}

@Test
@Ignore //https://github.com/eclipse-jdt/eclipse.jdt.ui/issues/1565
public void test31() throws Exception{
helper1(8, 30, 8, 30);
}
Expand Down
71 changes: 35 additions & 36 deletions ...e.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/AdvancedQuickAssistProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
import org.eclipse.jdt.core.dom.CastExpression;
import org.eclipse.jdt.core.dom.ChildListPropertyDescriptor;
import org.eclipse.jdt.core.dom.ClassInstanceCreation;
import org.eclipse.jdt.core.dom.CompilationUnit;
import org.eclipse.jdt.core.dom.ConditionalExpression;
import org.eclipse.jdt.core.dom.ConstructorInvocation;
import org.eclipse.jdt.core.dom.ContinueStatement;
Expand All @@ -73,7 +72,6 @@
import org.eclipse.jdt.core.dom.LambdaExpression;
import org.eclipse.jdt.core.dom.MethodDeclaration;
import org.eclipse.jdt.core.dom.MethodInvocation;
import org.eclipse.jdt.core.dom.Modifier;
import org.eclipse.jdt.core.dom.Name;
import org.eclipse.jdt.core.dom.ParenthesizedExpression;
import org.eclipse.jdt.core.dom.PrefixExpression;
Expand Down Expand Up @@ -115,7 +113,6 @@
import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
import org.eclipse.jdt.internal.corext.fix.ExpressionsFix;
import org.eclipse.jdt.internal.corext.fix.IProposableFix;
import org.eclipse.jdt.internal.corext.refactoring.code.Invocations;
import org.eclipse.jdt.internal.corext.refactoring.util.NoCommentSourceRangeComputer;
import org.eclipse.jdt.internal.corext.refactoring.util.TightSourceRangeComputer;
import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
Expand Down Expand Up @@ -1950,40 +1947,42 @@ private static boolean getReplaceIfElseWithConditionalProposals(IInvocationConte
return true;
}

@SuppressWarnings("unused")
private static void addExplicitTypeArgumentsIfNecessary(ASTRewrite rewrite, ASTRewriteCorrectionProposal proposal, Expression invocation) {
if (Invocations.isResolvedTypeInferredFromExpectedType(invocation)) {
ITypeBinding[] typeArguments= Invocations.getInferredTypeArguments(invocation);
if (typeArguments == null)
return;

ImportRewrite importRewrite= proposal.getImportRewrite();
if (importRewrite == null) {
importRewrite= proposal.createImportRewrite((CompilationUnit) invocation.getRoot());
}
ImportRewriteContext importRewriteContext= new ContextSensitiveImportRewriteContext(invocation, importRewrite);

AST ast= invocation.getAST();
ListRewrite typeArgsRewrite= Invocations.getInferredTypeArgumentsRewrite(rewrite, invocation);

for (ITypeBinding typeArgument : typeArguments) {
Type typeArgumentNode= importRewrite.addImport(typeArgument, ast, importRewriteContext, TypeLocation.TYPE_ARGUMENT);
typeArgsRewrite.insertLast(typeArgumentNode, null);
}

if (invocation instanceof MethodInvocation) {
MethodInvocation methodInvocation= (MethodInvocation) invocation;
Expression expression= methodInvocation.getExpression();
if (expression == null) {
IMethodBinding methodBinding= methodInvocation.resolveMethodBinding();
if (methodBinding != null && Modifier.isStatic(methodBinding.getModifiers())) {
expression= ast.newName(importRewrite.addImport(methodBinding.getDeclaringClass().getTypeDeclaration(), importRewriteContext));
} else {
expression= ast.newThisExpression();
}
rewrite.set(invocation, MethodInvocation.EXPRESSION_PROPERTY, expression, null);
}
}
}
// TODO: figure out if cast is needed with more than flag below (e.g. recompiling without and adding back for error lines)
// if (Invocations.isResolvedTypeInferredFromExpectedType(invocation)) {
// ITypeBinding[] typeArguments= Invocations.getInferredTypeArguments(invocation);
// if (typeArguments == null)
// return;
//
// ImportRewrite importRewrite= proposal.getImportRewrite();
// if (importRewrite == null) {
// importRewrite= proposal.createImportRewrite((CompilationUnit) invocation.getRoot());
// }
// ImportRewriteContext importRewriteContext= new ContextSensitiveImportRewriteContext(invocation, importRewrite);
//
// AST ast= invocation.getAST();
// ListRewrite typeArgsRewrite= Invocations.getInferredTypeArgumentsRewrite(rewrite, invocation);
//
// for (ITypeBinding typeArgument : typeArguments) {
// Type typeArgumentNode= importRewrite.addImport(typeArgument, ast, importRewriteContext, TypeLocation.TYPE_ARGUMENT);
// typeArgsRewrite.insertLast(typeArgumentNode, null);
// }
//
// if (invocation instanceof MethodInvocation) {
// MethodInvocation methodInvocation= (MethodInvocation) invocation;
// Expression expression= methodInvocation.getExpression();
// if (expression == null) {
// IMethodBinding methodBinding= methodInvocation.resolveMethodBinding();
// if (methodBinding != null && Modifier.isStatic(methodBinding.getModifiers())) {
// expression= ast.newName(importRewrite.addImport(methodBinding.getDeclaringClass().getTypeDeclaration(), importRewriteContext));
// } else {
// expression= ast.newThisExpression();
// }
// rewrite.set(invocation, MethodInvocation.EXPRESSION_PROPERTY, expression, null);
// }
// }
// }
}

private static ReturnStatement createReturnExpression(ASTRewrite rewrite, Expression expression) {
Expand Down
Loading