LanguageConsoleImpl is not intended to be extended

This commit is contained in:
Vladimir Krivosheev
2014-02-20 20:42:57 +01:00
parent 0b90dc8e74
commit 00f817a83f
2 changed files with 9 additions and 8 deletions
@@ -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);
}
};
});
}
}
@@ -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);
}