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-refactoring] Disable introducing pattern variable when upcasting

Browse Source 
GitOrigin-RevId: 14ef22642562271ed7f914f6337e4158bd3d43ff
This commit is contained in:
Tagir Valeev
2021-01-26 05:55:45 +00:00
committed by intellij-monorepo-bot
parent b9161cc09c
commit 9ca6912853
4 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/introduceVariable/VariableExtractor.java
+12 -7
View File
@@ -316,13 +316,18 @@ final class VariableExtractor {
PsiExpression firstOccurrence = Collections.min(allOccurrences, Comparator.comparing(e -> e.getTextRange().getStartOffset()));
if (HighlightingFeature.PATTERNS.isAvailable(anchor)) {
PsiTypeCastExpression cast = ObjectUtils.tryCast(PsiUtil.skipParenthesizedExprDown(firstOccurrence), PsiTypeCastExpression.class);
if (cast != null && !(cast.getType() instanceof PsiPrimitiveType) &&
!(PsiUtil.skipParenthesizedExprUp(firstOccurrence.getParent()) instanceof PsiExpressionStatement)) {
PsiInstanceOfExpression candidate = InstanceOfUtils.findPatternCandidate(cast);
if (candidate != null && allOccurrences.stream()
.map(occ -> ObjectUtils.tryCast(PsiUtil.skipParenthesizedExprDown(occ), PsiTypeCastExpression.class))
.allMatch(occ -> occ != null && (occ == firstOccurrence || InstanceOfUtils.findPatternCandidate(occ) == candidate))) {
return candidate;
if (cast != null) {
PsiType castType = cast.getType();
PsiExpression operand = cast.getOperand();
if (castType != null && !(castType instanceof PsiPrimitiveType) && operand != null && operand.getType() != null &&
!(castType.isAssignableFrom(operand.getType())) &&
!(PsiUtil.skipParenthesizedExprUp(firstOccurrence.getParent()) instanceof PsiExpressionStatement)) {
PsiInstanceOfExpression candidate = InstanceOfUtils.findPatternCandidate(cast);
if (candidate != null && allOccurrences.stream()
.map(occ -> ObjectUtils.tryCast(PsiUtil.skipParenthesizedExprDown(occ), PsiTypeCastExpression.class))
.allMatch(occ -> occ != null && (occ == firstOccurrence || InstanceOfUtils.findPatternCandidate(occ) == candidate))) {
return candidate;
}
}
}
}
java/java-tests/testData/refactoring/introduceVariable/PatternVariableDeclarationUpcastJava16.after.java
+10
View File
@@ -0,0 +1,10 @@
class A {
void test(String obj) {
if (obj instanceof String) {
var temp = obj;
if (temp.trim().isEmpty()) {
System.out.println("Found");
}
}
}
}
java/java-tests/testData/refactoring/introduceVariable/PatternVariableDeclarationUpcastJava16.java
+7
View File
@@ -0,0 +1,7 @@
class A {
void test(String obj) {
if (obj instanceof String && <selection>((String)obj)</selection>.trim().isEmpty()) {
System.out.println("Found");
}
}
}
java/java-tests/testSrc/com/intellij/java/refactoring/IntroduceVariableTest.java
+3
View File
@@ -143,6 +143,9 @@ public class IntroduceVariableTest extends LightJavaCodeInsightTestCase {
public void testPatternVariableDeclarationJava15Preview() {
doTestWithVarType(new MockIntroduceVariableHandler("temp", true, false, false, JAVA_LANG_STRING));
}
public void testPatternVariableDeclarationUpcastJava16() {
doTestWithVarType(new MockIntroduceVariableHandler("temp", true, false, false, JAVA_LANG_STRING));
}
public void testPatternVariableDeclarationUsedInLocalJava15Preview() { doTest("temp", true, false, false, JAVA_LANG_STRING);}
public void testPatternVariableDeclarationAfterIfJava15Preview() { doTest("temp", true, false, false, JAVA_LANG_STRING);}
public void testNonPatternVariableDeclarationTwoBlocksJava15Preview() { doTest("temp", true, false, false, JAVA_LANG_STRING);}