diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/CompilationPhaseHint.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/CompilationPhaseHint.java
index 54dcdeeafb58..567975a33910 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/CompilationPhaseHint.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/CompilationPhaseHint.java
@@ -8,6 +8,8 @@ public interface CompilationPhaseHint {
 
   Key<CompilationPhaseHint> HINT_KEY = Key.create("groovy.compilation.phase");
 
+  CompilationPhaseHint BEFORE_TRANSFORMATION = () -> Phase.TRANSFORMATION;
+
   enum Phase {
     CONVERSION,
     TRANSFORMATION
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/CodeFieldProcessor.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/CodeFieldProcessor.kt
index 8c303291d107..3bb43c6807dd 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/CodeFieldProcessor.kt
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/processors/CodeFieldProcessor.kt
@@ -8,7 +8,6 @@ import com.intellij.psi.scope.ElementClassHint
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrField
 import org.jetbrains.plugins.groovy.lang.resolve.BaseGroovyResolveResult
 import org.jetbrains.plugins.groovy.lang.resolve.CompilationPhaseHint
-import org.jetbrains.plugins.groovy.lang.resolve.CompilationPhaseHint.Phase.TRANSFORMATION
 import org.jetbrains.plugins.groovy.lang.resolve.ElementGroovyResult
 
 class CodeFieldProcessor(name: String, private val place: PsiElement) : FindFirstProcessor<ElementGroovyResult<GrField>>(name) {
@@ -16,7 +15,7 @@ class CodeFieldProcessor(name: String, private val place: PsiElement) : FindFirs
   init {
     hint(ElementClassHint.KEY, ElementClassHint { false })
     hint(GroovyResolveKind.HINT_KEY, GroovyResolveKind.Hint { it == GroovyResolveKind.FIELD })
-    hint(CompilationPhaseHint.HINT_KEY, CompilationPhaseHint { TRANSFORMATION })
+    hint(CompilationPhaseHint.HINT_KEY, CompilationPhaseHint.BEFORE_TRANSFORMATION)
   }
 
   override fun result(element: PsiElement, state: ResolveState): ElementGroovyResult<GrField>? {