diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java index 8fb36aee328..c023c769543 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java @@ -130,6 +130,11 @@ public class ReplInterpreter { classLoader = new ReplClassLoader(new URLClassLoader(classpath.toArray(new URL[0]))); } + private static void prepareForTheNextReplLine(@NotNull TopDownAnalysisContext c) { + c.getScriptScopes().clear(); + c.getScripts().clear(); + } + public enum LineResultType { SUCCESS, ERROR, @@ -229,7 +234,7 @@ public class ReplInterpreter { return LineResult.error(errorCollector.getString()); } - injector.getTopDownAnalyzer().prepareForTheNextReplLine(topDownAnalysisContext); + prepareForTheNextReplLine(topDownAnalysisContext); trace.clearDiagnostics(); psiFile.getScript().putUserData(ScriptHeaderResolver.PRIORITY_KEY, lineNumber); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java index fd6122cdba5..8716a356922 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java @@ -441,12 +441,6 @@ public class TopDownAnalyzer { } - public void prepareForTheNextReplLine(@NotNull TopDownAnalysisContext c) { - c.getScriptScopes().clear(); - c.getScripts().clear(); - } - - @NotNull public MutablePackageFragmentProvider getPackageFragmentProvider() { return packageFragmentProvider;