From 88375e7d3935be8dd692b48c33de1130b04044b7 Mon Sep 17 00:00:00 2001
From: Maxim Medvedev <maxim.medvedev@jetbrains.com>
Date: Tue, 29 Mar 2011 12:09:34 +0400
Subject: [PATCH] replace app statements with method calls in introduce
 refactorings only in old Groovy versions

---
 .../lang/psi/impl/GroovyPsiElementFactoryImpl.java  | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiElementFactoryImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiElementFactoryImpl.java
index 1a3d44e8d6b3..412c5cad4465 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiElementFactoryImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiElementFactoryImpl.java
@@ -29,6 +29,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.groovy.GroovyFileType;
 import org.jetbrains.plugins.groovy.annotator.intentions.QuickfixUtil;
+import org.jetbrains.plugins.groovy.config.GroovyConfigUtils;
 import org.jetbrains.plugins.groovy.lang.groovydoc.psi.api.GrDocComment;
 import org.jetbrains.plugins.groovy.lang.groovydoc.psi.api.GrDocMemberReference;
 import org.jetbrains.plugins.groovy.lang.groovydoc.psi.api.GrDocReferenceElement;
@@ -176,16 +177,12 @@ public class GroovyPsiElementFactoryImpl extends GroovyPsiElementFactory {
       text.append(')');
     }
 
-    GrExpression expr;
-
     if (initializer != null) {
-      if (initializer instanceof GrApplicationStatement) {
-        expr = createMethodCallByAppCall(((GrApplicationStatement)initializer));
+      if (initializer instanceof GrApplicationStatement &&
+          !GroovyConfigUtils.getInstance().isVersionAtLeast(initializer, GroovyConfigUtils.GROOVY1_8)) {
+        initializer = createMethodCallByAppCall((GrApplicationStatement)initializer);
       }
-      else {
-        expr = initializer;
-      }
-      text.append(" = ").append(expr.getText());
+      text.append(" = ").append(initializer.getText());
     }
 
     PsiFile file = createGroovyFile(text.toString());