azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java
+3 -4
View File
@@ -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.JetFile;
import org.jetbrains.jet.lang.psi.JetImportDirective; import org.jetbrains.jet.lang.psi.JetImportDirective;
import org.jetbrains.jet.lang.psi.JetPsiFactory; import org.jetbrains.jet.lang.psi.JetPsiFactory;
import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.*;
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.lazy.FileBasedDeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.lazy.FileBasedDeclarationProviderFactory;
import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -217,6 +214,8 @@ public class KotlinBuiltIns {
nonPhysicalClasses = computeNonPhysicalClasses(); nonPhysicalClasses = computeNonPhysicalClasses();
resolveSession.forceResolveAll(); resolveSession.forceResolveAll();
AnalyzingUtils.throwExceptionOnErrors(resolveSession.getBindingContext());
} }
@NotNull @NotNull
idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java
-2
View File
@@ -107,8 +107,6 @@ public class BuiltInsReferenceResolver extends AbstractProjectComponent {
TopDownAnalyzer.processStandardLibraryNamespace(myProject, context, scope, jetNamespace, TopDownAnalyzer.processStandardLibraryNamespace(myProject, context, scope, jetNamespace,
getJetFiles("jet", Predicates.not(jetFilesIndependentOfUnit))); getJetFiles("jet", Predicates.not(jetFilesIndependentOfUnit)));
AnalyzingUtils.throwExceptionOnErrors(context.getBindingContext());
bindingContext = context.getBindingContext(); bindingContext = context.getBindingContext();
} }