From 09281b34e49389b31b648478a8ff3d3f7688b3ac Mon Sep 17 00:00:00 2001
From: Danila Ponomarenko <Danila.Ponomarenko@jetbrains.com>
Date: Fri, 8 Jun 2012 19:16:51 +0400
Subject: [PATCH] IntroduceVariable scope fixed

---
 .../intention/impl/IntroduceVariableAction.java  | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/IntroduceVariableAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/IntroduceVariableAction.java
index 4ac04eaed610..f629c1bfc21c 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/IntroduceVariableAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/IntroduceVariableAction.java
@@ -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;