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: introduce variable: forbid extracting refExpr which resolves to class/package on explicit selection (IDEA-244925)

Browse Source 
GitOrigin-RevId: 32b84f9b74e508ae83eeaf46f19dfbce78833ae5
This commit is contained in:
Anna Kozlova
2020-07-01 06:48:04 +00:00
committed by intellij-monorepo-bot
parent aa0b5249b3
commit e6c2ee1791
3 changed files with 44 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java
+22 -15
View File
@@ -305,28 +305,35 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase {
while (expression != null) {
if (!expressions.contains(expression) && !(expression instanceof PsiParenthesizedExpression) && !(expression instanceof PsiSuperExpression) &&
(acceptVoid || !PsiType.VOID.equals(expression.getType()))) {
if (expression instanceof PsiMethodReferenceExpression) {
if (isExtractable(expression)) {
expressions.add(expression);
}
else if (!(expression instanceof PsiAssignmentExpression)) {
if (!(expression instanceof PsiReferenceExpression)) {
expressions.add(expression);
}
else {
if (!(expression.getParent() instanceof PsiMethodCallExpression)) {
final PsiElement resolve = ((PsiReferenceExpression)expression).resolve();
if (!(resolve instanceof PsiClass) && !(resolve instanceof PsiPackage)) {
expressions.add(expression);
}
}
}
}
}
expression = PsiTreeUtil.getParentOfType(expression, PsiExpression.class);
}
return expressions;
}
public static boolean isExtractable(PsiExpression expression) {
if (expression instanceof PsiMethodReferenceExpression) {
return true;
}
else if (!(expression instanceof PsiAssignmentExpression)) {
if (!(expression instanceof PsiReferenceExpression)) {
return true;
}
else {
if (!(expression.getParent() instanceof PsiMethodCallExpression)) {
final PsiElement resolve = ((PsiReferenceExpression)expression).resolve();
if (!(resolve instanceof PsiClass) && !(resolve instanceof PsiPackage)) {
return true;
}
}
}
}
return false;
}
public static PsiElement[] findStatementsAtOffset(final Editor editor, final PsiFile file, final int offset) {
final Document document = editor.getDocument();
final int lineNumber = document.getLineNumber(offset);
@@ -369,7 +376,7 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase {
if (tempExpr == null) {
tempExpr = getSelectedExpression(project, file, startOffset, endOffset);
}
return tempExpr;
return isExtractable(tempExpr) ? tempExpr : null;
}
/**
java/java-tests/testData/refactoring/introduceVariable/ClassSelectionInStaticMethodCall.java
+7
View File
@@ -0,0 +1,7 @@
class Foo {
static void foo() {}
{
<selection>Foo</selection>.foo();
}
}
java/java-tests/testSrc/com/intellij/java/refactoring/IntroduceVariableTest.java
+15 -42
View File
@@ -175,14 +175,7 @@ public class IntroduceVariableTest extends LightJavaCodeInsightTestCase {
public void testSubLiteral1() { doTest("str", false, false, false, JAVA_LANG_STRING); }
public void testSubLiteralFailure() {
try {
doTest("str", false, false, false, "int");
}
catch (Exception e) {
assertEquals("Error message:Cannot perform refactoring.\nSelected block should represent an expression", e.getMessage());
return;
}
fail("Should not be able to perform refactoring");
doTestWithFailure("str", "int");
}
public void testSubLiteralFromExpression() { doTest("str", false, false, false, JAVA_LANG_STRING); }
@@ -195,30 +188,20 @@ public class IntroduceVariableTest extends LightJavaCodeInsightTestCase {
public void testFromFinalFieldOnAssignment() { doTest("strings", false, false, false, JAVA_LANG_STRING); }
public void testNoArrayFromVarargs() {
try {
doTest("strings", false, false, false, "java.lang.String[]");
}
catch (Exception e) {
assertEquals("Error message:Cannot perform refactoring.\nSelected block should represent an expression", e.getMessage());
return;
}
fail("Should not be able to perform refactoring");
doTestWithFailure("strings", "java.lang.String[]");
}
public void testNoArrayFromVarargs1() {
try {
doTest("strings", false, false, false, "java.lang.String[]");
}
catch (Exception e) {
assertEquals("Error message:Cannot perform refactoring.\nSelected block should represent an expression", e.getMessage());
return;
}
fail("Should not be able to perform refactoring");
}
doTestWithFailure("strings", "java.lang.String[]");
}
public void testNoArrayFromVarargsUntilComma() {
doTestWithFailure("strings", "java.lang.String[]");
}
public void doTestWithFailure(String newName, String expectedType) {
try {
doTest("strings", false, false, false, "java.lang.String[]");
doTest(newName, false, false, false, expectedType);
}
catch (Exception e) {
assertEquals("Error message:Cannot perform refactoring.\nSelected block should represent an expression", e.getMessage());
@@ -292,25 +275,15 @@ public class IntroduceVariableTest extends LightJavaCodeInsightTestCase {
}
public void testIncorrectExpressionSelected() {
try {
doTest("toString", false, false, false, JAVA_LANG_STRING);
}
catch (Exception e) {
assertEquals("Error message:Cannot perform refactoring.\nSelected block should represent an expression", e.getMessage());
return;
}
fail("Should not be able to perform refactoring");
doTestWithFailure("toString", JAVA_LANG_STRING);
}
public void testIncompatibleTypesForSelectionSubExpression() {
try {
doTest("s", false, false, false, JAVA_LANG_STRING);
}
catch (Exception e) {
assertEquals("Error message:Cannot perform refactoring.\nSelected block should represent an expression", e.getMessage());
return;
}
fail("Should not be able to perform refactoring");
doTestWithFailure("s", JAVA_LANG_STRING);
}
public void testClassSelectionInStaticMethodCall() {
doTestWithFailure("Foo", "Foo");
}
public void testMultiCatchSimple() { doTest("e", true, true, false, "java.lang.Exception", true); }