This commit is contained in:
Gregory.Shrago
2016-11-09 01:29:25 +03:00
parent a23225aded
commit c37bb00a16
3 changed files with 6 additions and 5 deletions
@@ -25,7 +25,7 @@ import com.intellij.execution.ui.ConsoleViewContentType;
import com.intellij.execution.ui.RunContentDescriptor;
import com.intellij.execution.ui.actions.CloseAction;
import com.intellij.ide.scratch.ScratchFileService;
import com.intellij.ide.script.IdeScriptBindings;
import com.intellij.ide.script.IdeConsoleScriptBindings;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
@@ -156,7 +156,7 @@ public class RunIdeConsoleAction extends DumbAwareAction {
}
private static void prepareEngine(@NotNull Project project, @NotNull IdeScriptEngine engine, @NotNull RunContentDescriptor descriptor) {
IdeScriptBindings.ensureIdeIsBound(project, engine);
IdeConsoleScriptBindings.ensureIdeIsBound(project, engine);
ensureOutputIsRedirected(engine, descriptor);
}
@@ -21,7 +21,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.ide.script.IdeScriptEngine;
public class IdeScriptBindings {
public class IdeConsoleScriptBindings {
public static final Binding<IDE> IDE = Binding.create("IDE", IDE.class);
public static void ensureIdeIsBound(@Nullable Project project, @NotNull IdeScriptEngine engine) {
@@ -31,7 +32,7 @@ public class IdeScriptBindings {
}
}
private IdeScriptBindings() {
private IdeConsoleScriptBindings() {
}
public static class Binding<T> {
@@ -130,7 +130,7 @@ class IdeStartupScripts extends ApplicationComponent.Adapter {
@NotNull VirtualFile script,
@NotNull IdeScriptEngine engine) throws ExecutionException, IOException, IdeScriptException {
String scriptText = VfsUtilCore.loadText(script);
IdeScriptBindings.ensureIdeIsBound(project, engine);
IdeConsoleScriptBindings.ensureIdeIsBound(project, engine);
LOG.info(script.getPath());
long start = System.currentTimeMillis();