From d93c8387fd4e1dda333638216e9c2585e59bf502 Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Tue, 20 Dec 2011 15:19:58 +0400
Subject: [PATCH] IDEA-79078 Groovy: ClassCastException at
 GroovyPsiElementFactoryImpl.createReferenceExpressionFromText() on Introduce
 Field called from anonymous class

---
 .../introduce/field/GrIntroduceFieldHandler.java    |  6 ++++--
 .../introduce/field/GrIntroduceFieldTest.java       |  4 ++++
 .../introduceField/AnonymousClass.groovy            | 10 ++++++++++
 .../introduceField/AnonymousClass_after.groovy      | 13 +++++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 plugins/groovy/testdata/refactoring/introduceField/AnonymousClass.groovy
 create mode 100644 plugins/groovy/testdata/refactoring/introduceField/AnonymousClass_after.groovy

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrIntroduceFieldHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrIntroduceFieldHandler.java
index 2013139497d6..5c1586c3c06e 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrIntroduceFieldHandler.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrIntroduceFieldHandler.java
@@ -265,12 +265,14 @@ public class GrIntroduceFieldHandler extends GrIntroduceHandlerBase<GrIntroduceF
   private static GrReferenceExpression createRefExpression(GrField field, PsiElement place) {
     final PsiClass containingClass = field.getContainingClass();
     LOG.assertTrue(containingClass != null);
+    final String qname = containingClass.getQualifiedName();
+    final String prefix = qname != null ? qname + "." : "";
     final String refText;
     if (field.hasModifierProperty(PsiModifier.STATIC)) {
-      refText = containingClass.getQualifiedName() + "." + field.getName();
+      refText = prefix + field.getName();
     }
     else {
-      refText = containingClass.getQualifiedName() + ".this." + field.getName();
+      refText = prefix + "this." + field.getName();
     }
     return GroovyPsiElementFactory.getInstance(place.getProject()).createReferenceExpressionFromText(refText, place);
   }
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrIntroduceFieldTest.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrIntroduceFieldTest.java
index fb0b3d2c3b9b..c5fcab270862 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrIntroduceFieldTest.java
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrIntroduceFieldTest.java
@@ -69,6 +69,10 @@ public class GrIntroduceFieldTest extends LightCodeInsightFixtureTestCase {
   public void testReplaceExpressionWithAssignment() {
     doTest(false, false, false, CUR_METHOD, false, null);
   }
+  
+  public void testAnonymousClass() {
+    doTest(false, false, false, CUR_METHOD, false, null);
+  }
 
   private void doTest(final boolean isStatic,
                       final boolean removeLocal,
diff --git a/plugins/groovy/testdata/refactoring/introduceField/AnonymousClass.groovy b/plugins/groovy/testdata/refactoring/introduceField/AnonymousClass.groovy
new file mode 100644
index 000000000000..0dfeba0375ac
--- /dev/null
+++ b/plugins/groovy/testdata/refactoring/introduceField/AnonymousClass.groovy
@@ -0,0 +1,10 @@
+interface A {
+    void m1()
+}
+
+def a = new A() {
+    @Override
+    void m1() {
+        println <selection>123</selection>
+    }
+}
\ No newline at end of file
diff --git a/plugins/groovy/testdata/refactoring/introduceField/AnonymousClass_after.groovy b/plugins/groovy/testdata/refactoring/introduceField/AnonymousClass_after.groovy
new file mode 100644
index 000000000000..fcdcbb9a6f79
--- /dev/null
+++ b/plugins/groovy/testdata/refactoring/introduceField/AnonymousClass_after.groovy
@@ -0,0 +1,13 @@
+interface A {
+    void m1()
+}
+
+def a = new A() {
+    def f
+
+    @Override
+    void m1() {
+        f = 123
+        println <selection>f</selection>
+    }
+}
\ No newline at end of file