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

IntroduceVariable scope fixed

Browse Source
This commit is contained in:
Danila Ponomarenko
2012-06-08 19:16:51 +04:00
parent c4950c8dd5
commit 09281b34e4
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/intention/impl/IntroduceVariableAction.java
+11 -5
View File
@@ -43,18 +43,24 @@ public class IntroduceVariableAction extends BaseRunRefactoringAction<IntroduceV
if (element == null) {
return false;
}
final PsiStatement statement = PsiTreeUtil.getParentOfType(element, PsiStatement.class, false);
if (statement == null || !(statement instanceof PsiExpressionStatement)) {
final PsiExpression expression = getExpression(element);
if (expression == null || !(expression.getParent() instanceof PsiExpressionStatement)) {
return false;
}
final PsiExpressionStatement expressionStatement = (PsiExpressionStatement)statement;
final PsiExpression expression = expressionStatement.getExpression();
return expression.getType() != PsiType.VOID && !(expression instanceof PsiAssignmentExpression);
}
@Nullable
private static PsiExpression getExpression(@NotNull PsiElement element) {
PsiExpression expression = PsiTreeUtil.getParentOfType(element, PsiExpression.class, false);
while (expression != null && expression instanceof PsiReferenceExpression) {
expression = PsiTreeUtil.getParentOfType(expression, PsiExpression.class, true);
}
return expression;
}
@Nullable
protected static PsiElement getElement(Editor editor, @NotNull PsiFile file) {
if (!file.getManager().isInProject(file)) return null;