MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 04:51:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-inspections] WrapExpressionFix: suggest Arrays.toString if expected type is string and actual is array

Browse Source 
GitOrigin-RevId: 4c838da8dbb068de751bfb71ef98448bc475bf90
This commit is contained in:
Tagir Valeev
2022-08-11 18:27:51 +02:00
committed by intellij-monorepo-bot
parent 2c9ebb57da
commit ed136d9dbf
5 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/WrapExpressionFix.java
View File

@@ -76,7 +76,7 @@ public class WrapExpressionFix implements IntentionAction {
private static String getMethodPresentation(PsiExpression expression, PsiClassType expectedType, boolean primitiveExpected) {
PsiType type = expression.getType();
if (expectedType != null && type != null) {
final PsiMethod wrapper = findWrapper(type, expectedType, primitiveExpected);
final PsiMethod wrapper = findWrapper(type, expectedType, primitiveExpected, expression);
if (wrapper != null) {
final PsiClass containingClass = wrapper.getContainingClass();
if (containingClass != null) {
@@ -88,13 +88,19 @@ public class WrapExpressionFix implements IntentionAction {
}
@Nullable
private static PsiMethod findWrapper(@NotNull PsiType type, @NotNull PsiClassType expectedType, boolean primitiveExpected) {
private static PsiMethod findWrapper(@NotNull PsiType type, @NotNull PsiClassType expectedType,
boolean primitiveExpected, @NotNull PsiElement context) {
PsiClass aClass = expectedType.resolve();
if (aClass != null) {
PsiType expectedReturnType = expectedType;
if (primitiveExpected) {
expectedReturnType = PsiPrimitiveType.getUnboxedType(expectedType);
}
boolean isString = CommonClassNames.JAVA_LANG_STRING.equals(aClass.getQualifiedName());
if (type instanceof PsiArrayType && isString) {
aClass = PsiResolveHelper.getInstance(aClass.getProject()).resolveReferencedClass(CommonClassNames.JAVA_UTIL_ARRAYS, aClass);
if (aClass == null) return null;
}
if (expectedReturnType == null) return null;
PsiMethod[] methods = aClass.getMethods();
final Set<PsiMethod> wrapperMethods = new LinkedHashSet<>();
@@ -105,7 +111,7 @@ public class WrapExpressionFix implements IntentionAction {
&& method.getReturnType() != null
&& expectedReturnType.equals(method.getReturnType())) {
final String methodName = method.getName();
if (methodName.startsWith("parse") || methodName.equals("valueOf")) {
if (methodName.startsWith("parse") || methodName.equals("valueOf") || (isString && methodName.equals("toString"))) {
return method;
}
wrapperMethods.add(method);
@@ -132,7 +138,7 @@ public class WrapExpressionFix implements IntentionAction {
&& myExpectedType != null
&& myExpectedType.isValid()
&& myExpression.getType() != null
&& findWrapper(myExpression.getType(), myExpectedType, myPrimitiveExpected) != null;
&& findWrapper(myExpression.getType(), myExpectedType, myPrimitiveExpected, myExpression) != null;
}
@Override
@@ -142,7 +148,7 @@ public class WrapExpressionFix implements IntentionAction {
LOG.error("Expression type is null");
return;
}
PsiMethod wrapper = findWrapper(type, myExpectedType, myPrimitiveExpected);
PsiMethod wrapper = findWrapper(type, myExpectedType, myPrimitiveExpected, myExpression);
if (wrapper == null) {
LOG.error("Wrapper not found; expectedType = " + myExpectedType.getCanonicalText() + "; primitiveExpected = " + myPrimitiveExpected);
return;
@@ -190,7 +196,8 @@ public class WrapExpressionFix implements IntentionAction {
paramType = substitutor.substitute(paramType);
if (paramType.isAssignableFrom(exprType)) continue;
final PsiClassType classType = getClassType(paramType, expression);
if (expectedType == null && classType != null && findWrapper(exprType, classType, paramType instanceof PsiPrimitiveType) != null) {
if (expectedType == null && classType != null && findWrapper(exprType, classType, paramType instanceof PsiPrimitiveType,
expression) != null) {
expectedType = paramType;
expr = expression;
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/wrapExpression/afterValueofArray.java Normal file
View File

@@ -0,0 +1,10 @@
import java.util.Arrays;
// "Wrap using 'Arrays.toString()'" "true-preview"
public class Test {
void ba() {
fa(Arrays.toString(new int[10]));
}
void fa(String s){}
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/wrapExpression/afterValueofArray2.java Normal file
View File

@@ -0,0 +1,10 @@
import java.util.Arrays;
// "Wrap using 'Arrays.toString()'" "true-preview"
public class Test {
void ba() {
fa(Arrays.toString(new Object[] {1,2,3}));
}
void fa(String s){}
}

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/wrapExpression/beforeValueofArray.java Normal file
View File

@@ -0,0 +1,8 @@
// "Wrap using 'Arrays.toString()'" "true-preview"
public class Test {
void ba() {
fa(new int<caret>[10]);
}
void fa(String s){}
}

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/wrapExpression/beforeValueofArray2.java Normal file
View File

@@ -0,0 +1,8 @@
// "Wrap using 'Arrays.toString()'" "true-preview"
public class Test {
void ba() {
fa(new Object<caret>[] {1,2,3});
}
void fa(String s){}
}