Moved error checking of built-ins to more direct place.

This commit is contained in:
Evgeny Gerashchenko
2013-01-27 00:12:03 +04:00
parent 18d1d31042
commit 111dd13d39
2 changed files with 3 additions and 6 deletions
@@ -37,10 +37,7 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetImportDirective;
import org.jetbrains.jet.lang.psi.JetPsiFactory;
import org.jetbrains.jet.lang.resolve.BindingTrace;
import org.jetbrains.jet.lang.resolve.BindingTraceContext;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.ImportPath;
import org.jetbrains.jet.lang.resolve.*;
import org.jetbrains.jet.lang.resolve.lazy.FileBasedDeclarationProviderFactory;
import org.jetbrains.jet.lang.resolve.lazy.ResolveSession;
import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -217,6 +214,8 @@ public class KotlinBuiltIns {
nonPhysicalClasses = computeNonPhysicalClasses();
resolveSession.forceResolveAll();
AnalyzingUtils.throwExceptionOnErrors(resolveSession.getBindingContext());
}
@NotNull
@@ -107,8 +107,6 @@ public class BuiltInsReferenceResolver extends AbstractProjectComponent {
TopDownAnalyzer.processStandardLibraryNamespace(myProject, context, scope, jetNamespace,
getJetFiles("jet", Predicates.not(jetFilesIndependentOfUnit)));
AnalyzingUtils.throwExceptionOnErrors(context.getBindingContext());
bindingContext = context.getBindingContext();
}