From 4fcb21bd709adc1db2c704627ebd3e00a082f883 Mon Sep 17 00:00:00 2001
From: Max Medvedev <maxim.medvedev@jetbrains.com>
Date: Thu, 11 Oct 2012 17:33:58 +0300
Subject: [PATCH] cleanup

---
 .../lang/psi/impl/auxiliary/GrListOrMapImpl.java      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/GrListOrMapImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/GrListOrMapImpl.java
index 042466d4bfbf..d3e04c46d265 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/GrListOrMapImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/GrListOrMapImpl.java
@@ -37,7 +37,9 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrNamedArg
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression;
 import org.jetbrains.plugins.groovy.lang.psi.api.types.GrTypeElement;
 import org.jetbrains.plugins.groovy.lang.psi.dataFlow.types.TypeInferenceHelper;
-import org.jetbrains.plugins.groovy.lang.psi.impl.*;
+import org.jetbrains.plugins.groovy.lang.psi.impl.GrMapType;
+import org.jetbrains.plugins.groovy.lang.psi.impl.GrTupleType;
+import org.jetbrains.plugins.groovy.lang.psi.impl.PsiImplUtil;
 import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.GrExpressionImpl;
 import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.TypesUtil;
 import org.jetbrains.plugins.groovy.lang.psi.util.GroovyCommonClassNames;
@@ -83,10 +85,10 @@ public class GrListOrMapImpl extends GrExpressionImpl implements GrListOrMap {
     if (psi instanceof GrExpression || psi instanceof GrNamedArgument) {
       PsiElement prev = PsiUtil.getPrevNonSpace(psi);
       PsiElement next = PsiUtil.getNextNonSpace(psi);
-      if (prev != null && prev.getNode() != null && prev.getNode().getElementType() == GroovyTokenTypes.mCOMMA) {
+      if (prev != null && prev.getNode() != null && prev.getNode().getElementType() == mCOMMA) {
         super.deleteChildInternal(prev.getNode());
       }
-      else if (next instanceof LeafPsiElement && next.getNode() != null && next.getNode().getElementType() == GroovyTokenTypes.mCOMMA) {
+      else if (next instanceof LeafPsiElement && next.getNode() != null && next.getNode().getElementType() == mCOMMA) {
         super.deleteChildInternal(next.getNode());
       }
     }
@@ -149,7 +151,8 @@ public class GrListOrMapImpl extends GrExpressionImpl implements GrListOrMap {
     public PsiType fun(GrListOrMapImpl listOrMap) {
       final GlobalSearchScope scope = listOrMap.getResolveScope();
       if (listOrMap.isMap()) {
-        return inferMapInitializerType(listOrMap, JavaPsiFacade.getInstance(listOrMap.getProject()), scope);
+        JavaPsiFacade facade = JavaPsiFacade.getInstance(listOrMap.getProject());
+        return inferMapInitializerType(listOrMap, facade, scope);
       }
 
       PsiElement parent = listOrMap.getParent();