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

IDEA-209743 Extracted variable from case label expression should be 'final'

Browse Source
This commit is contained in:
Tagir Valeev
2019-04-04 19:21:51 +07:00
parent 7586b9608f
commit bdcdc4379e
4 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java
+2 -1
View File
@@ -1050,7 +1050,8 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase {
final boolean replaceAll = replaceChoice.isMultiple();
final SuggestedNameInfo suggestedName = getSuggestedName(typeSelectorManager.getDefaultType(), expr, anchor);
final String variableName = suggestedName.names.length > 0 ? suggestedName.names[0] : "";
final boolean declareFinal = replaceAll && declareFinalIfAll || !anyAssignmentLHS && createFinals(anchor.getContainingFile());
final boolean declareFinal = replaceAll && declareFinalIfAll || !anyAssignmentLHS && createFinals(anchor.getContainingFile()) ||
anchor instanceof PsiSwitchLabelStatementBase;
final boolean declareVarType = canBeExtractedWithoutExplicitType(expr) && createVarType();
final boolean replaceWrite = anyAssignmentLHS && replaceChoice.isAll();
return new IntroduceVariableSettings() {
java/java-tests/testData/refactoring/introduceVariable/CaseLabelSingle.after.java
+14
View File
@@ -0,0 +1,14 @@
class A {
private void A() {
final int i = 2;
switch (1) {
case 1:
System.out.println(1);
break;
case i:
System.out.println(3);
break;
}
}
}
java/java-tests/testData/refactoring/introduceVariable/CaseLabelSingle.java
+13
View File
@@ -0,0 +1,13 @@
class A {
private void A() {
switch (1) {
case 1:
System.out.println(1);
break;
case <selection>2</selection>:
System.out.println(3);
break;
}
}
}
java/java-tests/testSrc/com/intellij/java/refactoring/IntroduceVariableTest.java
+5
View File
@@ -12,6 +12,7 @@ import com.intellij.psi.PsiType;
import com.intellij.refactoring.JavaRefactoringSettings;
import com.intellij.refactoring.introduceVariable.InputValidator;
import com.intellij.refactoring.introduceVariable.IntroduceVariableBase;
import com.intellij.refactoring.introduceVariable.IntroduceVariableHandler;
import com.intellij.refactoring.introduceVariable.IntroduceVariableSettings;
import com.intellij.refactoring.ui.TypeSelectorManagerImpl;
import com.intellij.testFramework.LightCodeInsightTestCase;
@@ -221,6 +222,10 @@ public class IntroduceVariableTest extends LightCodeInsightTestCase {
doTest(new MockIntroduceVariableHandler("temp", true, false, false, "int"));
}
public void testCaseLabelSingle() {
doTest(new IntroduceVariableHandler());
}
public void testCaseLabelEnum() {
try {
doTest(new MockIntroduceVariableHandler("temp", true, false, false, ""));