From 620c90b10d67f981b0109cb830b5b3e778f267b0 Mon Sep 17 00:00:00 2001
From: Max Medvedev <maxim.medvedev@jetbrains.com>
Date: Fri, 7 Sep 2012 10:11:33 +0400
Subject: [PATCH] IDEA-90781 don't resolve variable in it's initializer

---
 .../api/statements/GrVariableDeclaration.java |  2 +
 .../statements/GrVariableDeclarationBase.java | 45 ++++++++++++++-----
 .../groovy/lang/GroovyHighlightingTest.groovy |  4 ++
 3 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrVariableDeclaration.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrVariableDeclaration.java
index a684d86c6921..4819a55e7ee8 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrVariableDeclaration.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrVariableDeclaration.java
@@ -24,6 +24,7 @@ public interface GrVariableDeclaration extends GrStatement, GrMembersDeclaration
   @Nullable
   GrTypeElement getTypeElementGroovy();
 
+  @NotNull
   GrVariable[] getVariables();
 
   void setType(@Nullable PsiType type);
@@ -33,6 +34,7 @@ public interface GrVariableDeclaration extends GrStatement, GrMembersDeclaration
   @Nullable
   GrTypeElement getTypeElementGroovyForVariable(GrVariable var);
 
+  @Nullable
   GrTupleDeclaration getTupleDeclaration();
 
   @Override
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableDeclarationBase.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableDeclarationBase.java
index 3b6bfae7cf7f..80b8b5b91c99 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableDeclarationBase.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableDeclarationBase.java
@@ -59,16 +59,6 @@ public abstract class GrVariableDeclarationBase extends GrStubElementBase<EmptyS
     GroovyPsiElementImpl.removeStatement(this);
   }
 
-  public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent, @NotNull PsiElement place) {
-    for (final GrVariable variable : getVariables()) {
-      if (lastParent == variable) break;
-      if (lastParent instanceof GrMethod && !(variable instanceof GrField)) break;
-      if (!ResolveUtil.processElement(processor, variable, state)) return false;
-    }
-
-    return true;
-  }
-
   @NotNull
   public GrModifierList getModifierList() {
     return (GrModifierList)findNotNullChildByType(GroovyElementTypes.MODIFIERS);
@@ -116,6 +106,7 @@ public abstract class GrVariableDeclarationBase extends GrStubElementBase<EmptyS
     return getTupleDeclaration() != null;
   }
 
+  @Nullable
   public GrTupleDeclaration getTupleDeclaration() {
     return findChildByClass(GrTupleDeclaration.class);
   }
@@ -156,6 +147,7 @@ public abstract class GrVariableDeclarationBase extends GrStubElementBase<EmptyS
       return "Variable definitions";
     }
 
+    @NotNull
     public GrVariable[] getVariables() {
       return getStubOrPsiChildren(GroovyElementTypes.VARIABLES, GrVariable.ARRAY_FACTORY);
     }
@@ -164,6 +156,18 @@ public abstract class GrVariableDeclarationBase extends GrStubElementBase<EmptyS
       return findChildrenByClass(GrMember.class);
     }
 
+    public boolean processDeclarations(@NotNull PsiScopeProcessor processor,
+                                       @NotNull ResolveState state,
+                                       PsiElement lastParent,
+                                       @NotNull PsiElement place) {
+      for (final GrVariable variable : getVariables()) {
+        if (lastParent == variable) break;
+        if (lastParent instanceof GrMethod && !(variable instanceof GrField)) break;
+        if (!ResolveUtil.processElement(processor, variable, state)) return false;
+      }
+
+      return true;
+    }
   }
 
   public static class GrMultipleVariables extends GrVariableDeclarationBase {
@@ -176,16 +180,33 @@ public abstract class GrVariableDeclarationBase extends GrStubElementBase<EmptyS
     }
 
     @Nullable
-    public GrExpression getInitializerGroovy(){
+    public GrExpression getInitializerGroovy() {
       return findChildByClass(GrExpression.class);
     }
 
+    @NotNull
     public GrVariable[] getVariables() {
-      return getTupleDeclaration().getVariables();
+      GrTupleDeclaration declaration = getTupleDeclaration();
+      assert declaration != null;
+      return declaration.getVariables();
     }
 
     public GrMember[] getMembers() {
       return GrMember.EMPTY_ARRAY;
     }
+
+    public boolean processDeclarations(@NotNull PsiScopeProcessor processor,
+                                       @NotNull ResolveState state,
+                                       PsiElement lastParent,
+                                       @NotNull PsiElement place) {
+      if (lastParent == getInitializerGroovy()) return true;
+
+      for (final GrVariable variable : getVariables()) {
+        if (lastParent instanceof GrMethod && !(variable instanceof GrField)) break;
+        if (!ResolveUtil.processElement(processor, variable, state)) return false;
+      }
+
+      return true;
+    }
   }
 }
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyHighlightingTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyHighlightingTest.groovy
index 9fe6df6ece9a..0b17ef7b0f0e 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyHighlightingTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyHighlightingTest.groovy
@@ -1415,4 +1415,8 @@ class X {
 ''')
   }
 
+  void testTupleVariableDeclarationWithRecursion() {
+    testHighlighting('''\
+def (a, b) = [a, a]''')
+  }
 }
\ No newline at end of file