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

Root namespace behavior fixed

Browse Source
This commit is contained in:
Andrey Breslav
2012-05-31 16:35:56 +04:00
parent c1e6961d50
commit ca0f2fce8c
2 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java
+3 -11
View File
@@ -74,21 +74,13 @@ public class ResolveSession {
@Nullable
public NamespaceDescriptor getPackageDescriptor(@NotNull Name shortName) {
return rootPackage.getMemberScope().getNamespace(shortName);
//NamespaceDescriptor namespaceDescriptor = packageDescriptors.get(shortName);
//if (namespaceDescriptor == null) {
// DeclarationProvider declarationProvider = declarationProviderFactory.getPackageMemberDeclarationProvider(
// FqName.topLevel(shortName));
// if (declarationProvider == null) return null;
//
// namespaceDescriptor = new LazyPackageDescriptor(module.getRootNs(), shortName, this, declarationProvider);
//
// packageDescriptors.put(shortName, namespaceDescriptor);
//}
//return namespaceDescriptor;
}
@Nullable
public NamespaceDescriptor getPackageDescriptorByFqName(FqName fqName) {
if (fqName.isRoot()) {
return rootPackage;
}
List<Name> names = fqName.pathSegments();
NamespaceDescriptor current = getPackageDescriptor(names.get(0));
if (current == null) return null;