Fragment providers added on higher level.

This commit is contained in:
Evgeny Gerashchenko
2013-11-28 18:23:01 +04:00
parent 3f790f5f0c
commit 73114d7e9c
24 changed files with 122 additions and 65 deletions
@@ -120,8 +120,6 @@ public class ResolveSession implements KotlinCodeAnalyzer {
this.trace = storageManager.createSafeTrace(delegationTrace);
this.injector = new InjectorForLazyResolve(project, this, rootDescriptor);
this.module = rootDescriptor;
PackageMemberDeclarationProvider provider = declarationProviderFactory.getPackageMemberDeclarationProvider(FqName.ROOT);
assert provider != null : "No declaration provider for root package in " + rootDescriptor;
this.packages = storageManager.createMemoizedFunctionWithNullableValues(new MemoizedFunctionToNullable<FqName, LazyPackageDescriptor>() {
@Nullable
@@ -133,8 +131,6 @@ public class ResolveSession implements KotlinCodeAnalyzer {
this.declarationProviderFactory = declarationProviderFactory;
rootDescriptor.addFragmentProvider(KotlinBuiltIns.getInstance().getBuiltInsModule().getPackageFragmentProvider());
this.packageFragmentProvider = new PackageFragmentProvider() {
@NotNull
@Override