diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java index 0f56519e72e..57112c3879c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java @@ -28,7 +28,6 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetScript; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; @@ -99,7 +98,7 @@ public class ScriptHeaderResolver { return new ValueParameterDescriptorImpl(script, null, index, Annotations.EMPTY, scriptParameter.getName(), type, false, null); } - public void processScriptHierarchy(@NotNull TopDownAnalysisContext c, @NotNull JetScript script, @NotNull JetScope outerScope) { + public void processScriptHierarchy(@NotNull TopDownAnalysisContext c, @NotNull JetScript script, @NotNull WritableScope outerScope) { JetFile file = (JetFile) script.getContainingFile(); FqName fqName = file.getPackageFqName(); PackageFragmentDescriptor ns = packageFragmentProvider.getOrCreateFragment(fqName); @@ -123,7 +122,7 @@ public class ScriptHeaderResolver { trace.record(BindingContext.SCRIPT, script, scriptDescriptor); - ((WritableScope)outerScope).addClassifierDescriptor(scriptDescriptor.getClassDescriptor()); + outerScope.addClassifierDescriptor(scriptDescriptor.getClassDescriptor()); } public void resolveScriptDeclarations(@NotNull TopDownAnalysisContext c) { 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 b88a8805b61..fd6122cdba5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java @@ -187,7 +187,11 @@ public class TopDownAnalyzer { if (file.isScript()) { JetScript script = file.getScript(); assert script != null; - scriptHeaderResolver.processScriptHierarchy(c, script, resolveSession.getScopeProvider().getFileScope(file)); + scriptHeaderResolver.processScriptHierarchy( + c, + script, + (WritableScope) resolveSession.getScopeProvider().getFileScope(file) + ); } else { JetPackageDirective packageDirective = file.getPackageDirective();