diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ScriptSupport.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ScriptSupport.java index f161dabd08d5..5d47e6f25cf2 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ScriptSupport.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/ScriptSupport.java @@ -41,7 +41,7 @@ public class ScriptSupport { File scriptFile = new File(text); GroovyShell shell = new GroovyShell(); try { - script = scriptFile.exists() ? shell.parse(scriptFile) : shell.parse(text, name); + script = scriptFile.exists() ? shell.parse(scriptFile) : shell.parse(text, name + "_script.groovy"); } catch (Exception ex) { Logger.getInstance(getClass().getName()).error(ex); throw new RuntimeException(ex); diff --git a/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java b/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java index 173ba71d8d66..29354eee41ee 100644 --- a/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java +++ b/platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java @@ -1186,6 +1186,7 @@ public class StructuralSearchTest extends StructuralSearchTestCase { findMatchesCount(source2, "[script(\"" + "import com.intellij.psi.*\n" + + "__context__ instanceof PsiElement &&" + "a instanceof PsiClass &&" + "b instanceof PsiTypeElement &&" + "c instanceof PsiField &&" + @@ -1195,8 +1196,8 @@ public class StructuralSearchTest extends StructuralSearchTestCase { "g instanceof PsiTypeElement &&" + "h instanceof PsiLocalVariable &&" + "i instanceof PsiPolyadicExpression &&" + - "j instanceof PsiReferenceExpression" + - "\n\")]" + + "j instanceof PsiReferenceExpression\n" + + "\")]" + "class '_a {" + " '_b '_c = '_d;" + " '_e '_f() {" +