diff --git a/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java
index 40aaa10fd1c0..a9374d068c6b 100644
--- a/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java
+++ b/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java
@@ -416,9 +416,8 @@ public class JavaStructuralSearchProfile extends StructuralSearchProfile {
 
   @NotNull
   @Override
-  public PsiCodeFragment createCodeFragment(Project project, String text, PsiElement context) {
-    final JavaCodeFragmentFactory factory = JavaCodeFragmentFactory.getInstance(project);
-    return factory.createCodeBlockCodeFragment(text, context, true);
+  public PsiCodeFragment createCodeFragment(Project project, String text) {
+    return JavaCodeFragmentFactory.getInstance(project).createCodeBlockCodeFragment(text, null, true);
   }
 
   @Override
diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfile.java b/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfile.java
index fa24102562a6..50ddff33fc96 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfile.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfile.java
@@ -90,7 +90,7 @@ public abstract class StructuralSearchProfile {
   }
 
   @Nullable
-  public PsiCodeFragment createCodeFragment(Project project, String text, @Nullable PsiElement context) {
+  public PsiCodeFragment createCodeFragment(Project project, String text) {
     return null;
   }
 
diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplacementPreviewDialog.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplacementPreviewDialog.java
index 1c5b52169341..9f154686ee3d 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplacementPreviewDialog.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/ui/ReplacementPreviewDialog.java
@@ -99,7 +99,7 @@ public final class ReplacementPreviewDialog extends DialogWrapper {
     PsiFile file = null;
     final StructuralSearchProfile profile = StructuralSearchUtil.getProfileByFileType(myFileType);
     if (profile != null) {
-      file = profile.createCodeFragment(project, "", null);
+      file = profile.createCodeFragment(project, "");
     }
 
     if (file != null) {
diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/EditVarConstraintsDialog.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/EditVarConstraintsDialog.java
index 9d899c55e847..1ef072cd4a4a 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/EditVarConstraintsDialog.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/EditVarConstraintsDialog.java
@@ -567,14 +567,14 @@ class EditVarConstraintsDialog extends DialogWrapper {
   }
 
   Editor createEditor(final Project project, final String text, final String fileName) {
-    Language groovy = Language.findLanguageByID("Groovy");
+    final Language groovy = Language.findLanguageByID("Groovy");
     Document doc = null;
     final FileType fileType = getFileType(fileName);
     if (groovy != null) {
       // there is no right way to create a code fragment for generic language, so we use this hole since we need extend resolve scope
       for (StructuralSearchProfile profile : StructuralSearchProfile.EP_NAME.getExtensions()) {
         if (profile.isMyLanguage(groovy)) {
-          PsiCodeFragment fragment = Objects.requireNonNull(profile.createCodeFragment(project, text, null));
+          final PsiCodeFragment fragment = Objects.requireNonNull(profile.createCodeFragment(project, text));
           fragment.forceResolveScope(new StructuralSearchScriptScope(myProject));
           doc = PsiDocumentManager.getInstance(project).getDocument(fragment);
           break;
diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UIUtil.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UIUtil.java
index b00d3c9397eb..6e283aa26d7d 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UIUtil.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UIUtil.java
@@ -285,7 +285,7 @@ public class UIUtil {
   @NotNull
   public static Document createDocument(@NotNull Project project, @NotNull LanguageFileType fileType, Language dialect, @NotNull String text,
                                         @NotNull StructuralSearchProfile profile) {
-    PsiFile codeFragment = profile.createCodeFragment(project, text, null);
+    PsiFile codeFragment = profile.createCodeFragment(project, text);
     if (codeFragment == null) {
       codeFragment = createFileFragment(project, fileType, dialect, text);
     }
@@ -302,7 +302,7 @@ public class UIUtil {
   @NotNull
   public static Editor createEditor(@NotNull Project project, @NotNull LanguageFileType fileType, Language dialect, @NotNull String text,
                                     @NotNull StructuralSearchProfile profile) {
-    PsiFile codeFragment = profile.createCodeFragment(project, text, null);
+    PsiFile codeFragment = profile.createCodeFragment(project, text);
     if (codeFragment == null) {
       codeFragment = createFileFragment(project, fileType, dialect, text);
     }
diff --git a/plugins/groovy/structuralsearch-groovy/src/com/intellij/structuralsearch/GroovyStructuralSearchProfile.java b/plugins/groovy/structuralsearch-groovy/src/com/intellij/structuralsearch/GroovyStructuralSearchProfile.java
index 89578b30be41..58634ba06022 100644
--- a/plugins/groovy/structuralsearch-groovy/src/com/intellij/structuralsearch/GroovyStructuralSearchProfile.java
+++ b/plugins/groovy/structuralsearch-groovy/src/com/intellij/structuralsearch/GroovyStructuralSearchProfile.java
@@ -48,10 +48,8 @@ public class GroovyStructuralSearchProfile extends StructuralSearchProfileBase {
   }
 
   @Override
-  public PsiCodeFragment createCodeFragment(Project project, String text, @Nullable PsiElement context) {
-    final GroovyCodeFragment result = new GroovyCodeFragment(project, text);
-    result.setContext(context);
-    return result;
+  public PsiCodeFragment createCodeFragment(Project project, String text) {
+    return new GroovyCodeFragment(project, text);
   }
 
   @NotNull