From 5505b44e0eddfb57e6da9bf0fc7e725e688c4422 Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Fri, 22 Jan 2016 20:56:47 +0300 Subject: [PATCH] IDEA-60932 Support Groovy expressions in debugger expression evaluation - fix for references resolving --- .../groovy/debugger/GroovyCodeFragmentFactory.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyCodeFragmentFactory.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyCodeFragmentFactory.java index 46724054d5aa..60511259b428 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyCodeFragmentFactory.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyCodeFragmentFactory.java @@ -19,13 +19,13 @@ import com.intellij.debugger.engine.evaluation.CodeFragmentFactory; import com.intellij.debugger.engine.evaluation.TextWithImports; import com.intellij.debugger.engine.evaluation.expression.EvaluatorBuilder; import com.intellij.debugger.engine.evaluation.expression.EvaluatorBuilderImpl; +import com.intellij.lang.java.JavaLanguage; import com.intellij.openapi.fileTypes.LanguageFileType; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; -import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.ClassUtil; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.Function; @@ -248,6 +248,12 @@ public class GroovyCodeFragmentFactory extends CodeFragmentFactory { value = name; } parameters.put(name, value); + return; + } + + if (resolved == null && context.getLanguage().equals(JavaLanguage.INSTANCE)) { + String name = referenceExpression.getReferenceName(); + parameters.put(name, name); } }