MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Java: Intention that wraps list/set/map with Collections.unmodifiable - handle ternary 'if' (IDEA-93154)

Browse Source
This commit is contained in:
Pavel Dolgov
2019-02-21 18:03:24 +03:00
parent 96b9ab4f80
commit 8ce43b883c
4 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/intention/impl/WrapWithUnmodifiableAction.java
+13 -4
View File
@@ -13,6 +13,7 @@ import com.intellij.psi.util.PsiTypesUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.IncorrectOperationException;
import com.siyeh.ig.psiutils.CommentTracker;
import com.siyeh.ig.psiutils.ExpressionUtils;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -37,7 +38,7 @@ public class WrapWithUnmodifiableAction extends BaseIntentionAction {
PsiClass psiClass = PsiUtil.resolveClassInClassTypeOnly(expression.getType());
if (psiClass != null) {
PsiClass expectedClass = PsiUtil.resolveClassInClassTypeOnly(PsiTypesUtil.getExpectedTypeByParent(expression));
PsiClass expectedClass = PsiUtil.resolveClassInClassTypeOnly(getExpectedType(expression));
if (expectedClass != null) {
GlobalSearchScope scope = psiClass.getResolveScope();
@@ -97,7 +98,7 @@ public class WrapWithUnmodifiableAction extends BaseIntentionAction {
}
PsiClass psiClass = PsiUtil.resolveClassInClassTypeOnly(expression.getType());
if (psiClass != null) {
PsiClass expectedClass = PsiUtil.resolveClassInClassTypeOnly(PsiTypesUtil.getExpectedTypeByParent(expression));
PsiClass expectedClass = PsiUtil.resolveClassInClassTypeOnly(getExpectedType(expression));
if (expectedClass != null) {
GlobalSearchScope scope = psiClass.getResolveScope();
@@ -122,6 +123,14 @@ public class WrapWithUnmodifiableAction extends BaseIntentionAction {
return false;
}
private static PsiType getExpectedType(@NotNull PsiExpression expression) {
final PsiElement parent = PsiUtil.skipParenthesizedExprUp(expression.getParent());
if (parent instanceof PsiConditionalExpression) {
return getExpectedType((PsiConditionalExpression)parent);
}
return PsiTypesUtil.getExpectedTypeByParent(expression);
}
private static boolean isInheritorChain(PsiClass psiClass,
String collectionClassName,
PsiClass expectedClass,
@@ -133,13 +142,13 @@ public class WrapWithUnmodifiableAction extends BaseIntentionAction {
InheritanceUtil.isInheritorOrSelf(collectionClass, expectedClass, true);
}
private static boolean isUnmodifiable(PsiExpression expression) {
private static boolean isUnmodifiable(@NotNull PsiExpression expression) {
PsiMethodCallExpression methodCall = tryCast(expression, PsiMethodCallExpression.class);
if (isUnmodifiableCall(methodCall)) {
return true;
}
PsiExpressionList expressionList = tryCast(PsiUtil.skipParenthesizedExprUp(expression.getParent()), PsiExpressionList.class);
PsiExpressionList expressionList = tryCast(ExpressionUtils.getPassThroughParent(expression), PsiExpressionList.class);
if (expressionList != null && expressionList.getExpressionCount() == 1) {
methodCall = tryCast(expressionList.getParent(), PsiMethodCallExpression.class);
if (isUnmodifiableCall(methodCall)) {
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/wrapWithUnmodifiable/afterListTernaryIf.java
+12
View File
@@ -0,0 +1,12 @@
// "Wrap with unmodifiable list" "true"
import java.util.Collections;
import java.util.List;
import java.util.ArrayList;
class C {
List<String> test(boolean b) {
List<String> result1 = new ArrayList<>();
List<String> result2 = new ArrayList<>();
return b ? Collections.unmodifiableList(result1) : result2;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/wrapWithUnmodifiable/beforeListTernaryIf.java
+12
View File
@@ -0,0 +1,12 @@
// "Wrap with unmodifiable list" "true"
import java.util.Collections;
import java.util.List;
import java.util.ArrayList;
class C {
List<String> test(boolean b) {
List<String> result1 = new ArrayList<>();
List<String> result2 = new ArrayList<>();
return b ? <caret>result1 : result2;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/wrapWithUnmodifiable/beforeUnmodifiedListTernaryIf.java
+12
View File
@@ -0,0 +1,12 @@
// "Wrap with unmodifiable list" "false"
import java.util.Collections;
import java.util.List;
import java.util.ArrayList;
class C {
List<String> test(boolean b) {
List<String> result1 = new ArrayList<>();
List<String> result2 = new ArrayList<>();
return Collections.unmodifiableList(b ? <caret>result1 : result2);
}
}