From c37bb00a16c9048db56e664de3f5a4b33bafd9ff Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Mon, 7 Nov 2016 21:00:20 +0300 Subject: [PATCH] cleanup --- .../com/intellij/execution/console/RunIdeConsoleAction.java | 4 ++-- ...{IdeScriptBindings.java => IdeConsoleScriptBindings.java} | 5 +++-- .../src/com/intellij/ide/script/IdeStartupScripts.java | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) rename platform/lang-impl/src/com/intellij/ide/script/{IdeScriptBindings.java => IdeConsoleScriptBindings.java} (95%) diff --git a/platform/lang-impl/src/com/intellij/execution/console/RunIdeConsoleAction.java b/platform/lang-impl/src/com/intellij/execution/console/RunIdeConsoleAction.java index ff4d57f7d210..7b2dd351dd20 100644 --- a/platform/lang-impl/src/com/intellij/execution/console/RunIdeConsoleAction.java +++ b/platform/lang-impl/src/com/intellij/execution/console/RunIdeConsoleAction.java @@ -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); } diff --git a/platform/lang-impl/src/com/intellij/ide/script/IdeScriptBindings.java b/platform/lang-impl/src/com/intellij/ide/script/IdeConsoleScriptBindings.java similarity index 95% rename from platform/lang-impl/src/com/intellij/ide/script/IdeScriptBindings.java rename to platform/lang-impl/src/com/intellij/ide/script/IdeConsoleScriptBindings.java index 37220700be6b..f99efb1f0745 100644 --- a/platform/lang-impl/src/com/intellij/ide/script/IdeScriptBindings.java +++ b/platform/lang-impl/src/com/intellij/ide/script/IdeConsoleScriptBindings.java @@ -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 = 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 { diff --git a/platform/lang-impl/src/com/intellij/ide/script/IdeStartupScripts.java b/platform/lang-impl/src/com/intellij/ide/script/IdeStartupScripts.java index 185b9625ab2e..8284fb5c840a 100644 --- a/platform/lang-impl/src/com/intellij/ide/script/IdeStartupScripts.java +++ b/platform/lang-impl/src/com/intellij/ide/script/IdeStartupScripts.java @@ -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();