MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-76495 (IOE: PsiJavaParserFacadeImpl.createStatementFromText)

Browse Source
This commit is contained in:
Bas Leijdekkers
2015-11-30 16:58:06 +01:00
parent f57ea0cad6
commit 9d49239ff4
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertSwitchToIfIntention.java
View File

@@ -24,6 +24,7 @@ import com.intellij.psi.controlFlow.*;
import com.intellij.psi.search.LocalSearchScope;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.util.PsiUtil;
import com.intellij.refactoring.util.RefactoringUtil;
import com.intellij.util.IncorrectOperationException;
import com.siyeh.ig.psiutils.ParenthesesUtils;
import org.jetbrains.annotations.NonNls;
@@ -80,7 +81,7 @@ public class ConvertSwitchToIfIntention implements IntentionAction {
if (switchExpression == null) {
return;
}
final PsiType switchExpressionType = switchExpression.getType();
final PsiType switchExpressionType = RefactoringUtil.getTypeByExpressionWithExpectedType(switchExpression);
if (switchExpressionType == null) {
return;
}
@@ -110,10 +111,7 @@ public class ConvertSwitchToIfIntention implements IntentionAction {
"i", switchExpression, true);
}
expressionText = variableName;
declarationString =
switchExpressionType.getPresentableText() + ' ' +
variableName + " = " +
switchExpression.getText() + ';';
declarationString = switchExpressionType.getCanonicalText() + ' ' + variableName + " = " + switchExpression.getText() + ';';
}
else {
hadSideEffects = false;
@@ -334,7 +332,7 @@ public class ConvertSwitchToIfIntention implements IntentionAction {
for (PsiLocalVariable variable : variables) {
if (ReferencesSearch.search(variable, new LocalSearchScope(bodyStatements.toArray(new PsiElement[bodyStatements.size()]))).findFirst() != null) {
final PsiType varType = variable.getType();
ifStatementString.append(varType.getPresentableText());
ifStatementString.append(varType.getCanonicalText());
ifStatementString.append(' ');
ifStatementString.append(variable.getName());
ifStatementString.append(';');

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/after5.java Normal file
View File

@@ -0,0 +1,9 @@
// "Replace 'switch' with 'if'" "true"
class Test {
void foo(Object e) {
Class<?> i = e.getClass();
if (i.equals(RuntimeException.class)) {
} else if (i.equals(IOException.class)) {
}
}
}

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertSwitchToIf/before5.java Normal file
View File

@@ -0,0 +1,11 @@
// "Replace 'switch' with 'if'" "true"
class Test {
void foo(Object e) {
<caret>switch(e.getClass()) {
case RuntimeException.class:
break;
case IOException.class:
break;
}
}
}