From 815bba3d7e5bb02b40a4bdff03938e82e697e118 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Thu, 20 Feb 2014 20:39:43 +0100
Subject: [PATCH] pass project to psi file factory

---
 .../execution/console/LanguageConsoleBuilder.java         | 8 ++++----
 .../intellij/execution/console/LanguageConsoleImpl.java   | 8 ++++----
 .../plugins/groovy/console/GroovyConsoleAction.java       | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java
index 4b2651ed97be..70939f3a4f12 100644
--- a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java
@@ -28,7 +28,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
 import com.intellij.ui.components.JBLayeredPane;
 import com.intellij.util.Consumer;
-import com.intellij.util.NotNullFunction;
+import com.intellij.util.PairFunction;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -42,7 +42,7 @@ public final class LanguageConsoleBuilder {
   private Condition<LanguageConsoleImpl> executionEnabled = Conditions.alwaysTrue();
 
   @Nullable
-  private NotNullFunction<VirtualFile, PsiFile> psiFileFactory;
+  private PairFunction<VirtualFile, Project, PsiFile> psiFileFactory;
   @Nullable
   private BaseConsoleExecuteActionHandler executeActionHandler;
   @Nullable
@@ -70,7 +70,7 @@ public final class LanguageConsoleBuilder {
     return this;
   }
 
-  public LanguageConsoleBuilder psiFileFactory(@NotNull NotNullFunction<VirtualFile, PsiFile> value) {
+  public LanguageConsoleBuilder psiFileFactory(@NotNull PairFunction<VirtualFile, Project, PsiFile> value) {
     psiFileFactory = value;
     return this;
   }
@@ -157,7 +157,7 @@ public final class LanguageConsoleBuilder {
     public GutteredLanguageConsole(@NotNull Project project,
                                    @NotNull Language language,
                                    @Nullable GutterContentProvider gutterContentProvider,
-                                   @Nullable NotNullFunction<VirtualFile, PsiFile> psiFileFactory) {
+                                   @Nullable PairFunction<VirtualFile, Project, PsiFile> psiFileFactory) {
       super(project, language.getDisplayName() + " Console", language, psiFileFactory);
 
       setShowSeparatorLine(false);
diff --git a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
index 24a2b764f81a..79373dc75ff8 100644
--- a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
@@ -112,7 +112,7 @@ public class LanguageConsoleImpl implements Disposable, TypeSafeDataProvider {
     }
   };
 
-  private final NotNullFunction<VirtualFile, PsiFile> myPsiFileFactory;
+  private final PairFunction<VirtualFile, Project, PsiFile> myPsiFileFactory;
 
   public LanguageConsoleImpl(@NotNull Project project, @NotNull String title, @NotNull Language language) {
     this(project, title, language, true);
@@ -122,7 +122,7 @@ public class LanguageConsoleImpl implements Disposable, TypeSafeDataProvider {
     this(project, title, new LightVirtualFile(title, language, ""), initComponents);
   }
 
-  public LanguageConsoleImpl(@NotNull Project project, @NotNull String title, @NotNull Language language, @Nullable NotNullFunction<VirtualFile, PsiFile> psiFileFactory) {
+  public LanguageConsoleImpl(@NotNull Project project, @NotNull String title, @NotNull Language language, @Nullable PairFunction<VirtualFile, Project, PsiFile> psiFileFactory) {
     this(project, title, new LightVirtualFile(title, language, ""), false, psiFileFactory);
   }
 
@@ -134,7 +134,7 @@ public class LanguageConsoleImpl implements Disposable, TypeSafeDataProvider {
                              @NotNull String title,
                              @NotNull LightVirtualFile lightFile,
                              boolean initComponents,
-                             @Nullable NotNullFunction<VirtualFile, PsiFile> psiFileFactory) {
+                             @Nullable PairFunction<VirtualFile, Project, PsiFile> psiFileFactory) {
     myProject = project;
     myTitle = title;
     myVirtualFile = lightFile;
@@ -695,7 +695,7 @@ public class LanguageConsoleImpl implements Disposable, TypeSafeDataProvider {
       return ObjectUtils.assertNotNull(PsiManager.getInstance(project).findFile(virtualFile));
     }
     else {
-      return myPsiFileFactory.fun(virtualFile);
+      return myPsiFileFactory.fun(virtualFile, project);
     }
   }
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyConsoleAction.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyConsoleAction.java
index 15d85be24298..9f725754c5bc 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyConsoleAction.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyConsoleAction.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
-import com.intellij.util.NotNullFunction;
+import com.intellij.util.PairFunction;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.groovy.GroovyFileType;
 import org.jetbrains.plugins.groovy.debugger.fragments.GroovyCodeFragment;
@@ -40,11 +40,11 @@ public class GroovyConsoleAction extends GroovyShellActionBase {
   }
 
   @Override
-  protected LanguageConsoleImpl createConsole(final @NotNull Project project, String title) {
-    return new LanguageConsoleImpl(project, title, GroovyFileType.GROOVY_LANGUAGE, new NotNullFunction<VirtualFile, PsiFile>() {
+  protected LanguageConsoleImpl createConsole(@NotNull Project project, String title) {
+    return new LanguageConsoleImpl(project, title, GroovyFileType.GROOVY_LANGUAGE, new PairFunction<VirtualFile, Project, PsiFile>() {
       @NotNull
       @Override
-      public PsiFile fun(VirtualFile file) {
+      public PsiFile fun(@NotNull VirtualFile file, @NotNull Project project) {
         return new GroovyCodeFragment(project, file);
       }
     });