From 00f817a83f925b6cb5e5c7a94da98f7dc13e243b Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Thu, 20 Feb 2014 20:36:45 +0100
Subject: [PATCH] LanguageConsoleImpl is not intended to be extended

---
 .../groovy/console/GroovyConsoleAction.java        | 14 +++++++-------
 .../debugger/fragments/GroovyCodeFragment.java     |  3 ++-
 2 files changed, 9 insertions(+), 8 deletions(-)

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 308f932ddd18..15d85be24298 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyConsoleAction.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyConsoleAction.java
@@ -16,11 +16,11 @@
 package org.jetbrains.plugins.groovy.console;
 
 import com.intellij.execution.console.LanguageConsoleImpl;
-import com.intellij.openapi.editor.Document;
 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.testFramework.LightVirtualFile;
+import com.intellij.util.NotNullFunction;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.groovy.GroovyFileType;
 import org.jetbrains.plugins.groovy.debugger.fragments.GroovyCodeFragment;
@@ -40,13 +40,13 @@ public class GroovyConsoleAction extends GroovyShellActionBase {
   }
 
   @Override
-  protected LanguageConsoleImpl createConsole(Project project, String title) {
-    return new LanguageConsoleImpl(project, title, GroovyFileType.GROOVY_LANGUAGE) {
+  protected LanguageConsoleImpl createConsole(final @NotNull Project project, String title) {
+    return new LanguageConsoleImpl(project, title, GroovyFileType.GROOVY_LANGUAGE, new NotNullFunction<VirtualFile, PsiFile>() {
       @NotNull
       @Override
-      protected PsiFile createFile(@NotNull LightVirtualFile virtualFile, @NotNull Document document, @NotNull Project project) {
-        return new GroovyCodeFragment(getProject(), virtualFile);
+      public PsiFile fun(VirtualFile file) {
+        return new GroovyCodeFragment(project, file);
       }
-    };
+    });
   }
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/fragments/GroovyCodeFragment.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/fragments/GroovyCodeFragment.java
index 5818cd95777b..5a75a0d13db9 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/fragments/GroovyCodeFragment.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/fragments/GroovyCodeFragment.java
@@ -16,6 +16,7 @@
 package org.jetbrains.plugins.groovy.debugger.fragments;
 
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.PsiManagerEx;
 import com.intellij.psi.impl.file.impl.FileManager;
@@ -59,7 +60,7 @@ public class GroovyCodeFragment extends GroovyFileImpl implements JavaCodeFragme
     this(project, new LightVirtualFile("Dummy.groovy", GroovyFileType.GROOVY_FILE_TYPE, text));
   }
 
-  public GroovyCodeFragment(Project project, LightVirtualFile virtualFile) {
+  public GroovyCodeFragment(Project project, VirtualFile virtualFile) {
     super(new SingleRootFileViewProvider(PsiManager.getInstance(project), virtualFile, true));
     ((SingleRootFileViewProvider)getViewProvider()).forceCachedPsi(this);
   }