From 43aaefee772a0ca1b17b035148b32c8c08e49e56 Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Thu, 2 Feb 2012 12:09:55 +0400
Subject: [PATCH] IDEA-78821 implicit closure parameter should be in control
 flow

---
 .../psi/controlFlow/impl/ControlFlowBuilder.java     |  2 +-
 .../groovy/testdata/groovy/controlFlow/closure1.test |  9 +++++----
 .../groovy/controlFlow/returnMapFromClosure.test     | 12 ++++++------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ControlFlowBuilder.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ControlFlowBuilder.java
index c74f573f62d6..4a620baaa036 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ControlFlowBuilder.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ControlFlowBuilder.java
@@ -161,7 +161,7 @@ public class ControlFlowBuilder extends GroovyRecursiveElementVisitor {
   }
 
   private void buildFlowForClosure(final GrClosableBlock closure) {
-    for (GrParameter parameter : closure.getParameters()) {
+    for (GrParameter parameter : closure.getAllParameters()) {
       addNode(new ReadWriteVariableInstruction(parameter.getName(), parameter, myInstructionNumber++, true));
     }
 
diff --git a/plugins/groovy/testdata/groovy/controlFlow/closure1.test b/plugins/groovy/testdata/groovy/controlFlow/closure1.test
index 1f01a1ee1ede..8e6c5545a18d 100644
--- a/plugins/groovy/testdata/groovy/controlFlow/closure1.test
+++ b/plugins/groovy/testdata/groovy/controlFlow/closure1.test
@@ -6,7 +6,8 @@ with {
 }
 -----
 0(1) element: null
-1(2) WRITE owner
-2(3) READ e
-3(4) WRITE t
-4() element: null
\ No newline at end of file
+1(2) WRITE it
+2(3) WRITE owner
+3(4) READ e
+4(5) WRITE t
+5() element: null
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/controlFlow/returnMapFromClosure.test b/plugins/groovy/testdata/groovy/controlFlow/returnMapFromClosure.test
index 7bd3f5e69005..0a0d7ac6dcc6 100644
--- a/plugins/groovy/testdata/groovy/controlFlow/returnMapFromClosure.test
+++ b/plugins/groovy/testdata/groovy/controlFlow/returnMapFromClosure.test
@@ -4,9 +4,9 @@ def foo = {
 }
 -----
 0(1) element: null
-1(2) WRITE owner
-2(3) WRITE g
-3(4) READ g
-4(5) element: Generalized list MAYBE_RETURN
-5() element: null
-
+1(2) WRITE it
+2(3) WRITE owner
+3(4) WRITE g
+4(5) READ g
+5(6) element: Generalized list MAYBE_RETURN
+6() element: null
\ No newline at end of file