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;
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/BasicLazyResolveTest.java
+21
View File
@@ -23,16 +23,21 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.psi.JetPsiFactory;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.TypeConstructor;
import org.jetbrains.jet.lang.types.lang.JetStandardClasses;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import static org.junit.Assert.*;
import static org.junit.Assert.assertNotNull;
/**
* @author abreslav
@@ -47,6 +52,11 @@ public class BasicLazyResolveTest {
}
};
@Before
public void setUp() throws Exception {
System.setProperty("java.awt.headless", "true");
}
@After
public void tearDown() throws Exception {
Disposer.dispose(rootDisposable);
@@ -62,6 +72,7 @@ public class BasicLazyResolveTest {
Project project = jetCoreEnvironment.getProject();
ResolveSession session = new ResolveSession(project, root, new FileBasedDeclarationProviderFactory(Arrays.asList(
JetPsiFactory.createFile(project, "class A {}"),
JetPsiFactory.createFile(project, "package p; class C {fun f() {}}"),
JetPsiFactory.createFile(project, "package p; open class G<T> {open fun f(): T {} fun a() {}}"),
JetPsiFactory.createFile(project, "package p; class G2<E> : G<E> { fun g() : E {} override fun f() : T {}}"),
@@ -69,6 +80,10 @@ public class BasicLazyResolveTest {
JetPsiFactory.createFile(project, "package p; fun foo(a: C) {}")
)));
NamespaceDescriptor rootPackage = session.getPackageDescriptorByFqName(new FqName(""));
assertNotNull(rootPackage);
assertNotNull(rootPackage.getMemberScope().getClassifier(Name.identifier("A")));
NamespaceDescriptor packageDescriptor = session.getPackageDescriptor(Name.identifier("p"));
assertNotNull(packageDescriptor);
assertEquals(Name.identifier("p"), packageDescriptor.getName());
@@ -87,6 +102,12 @@ public class BasicLazyResolveTest {
assertEquals("[Any]", typeConstructor.getSupertypes().toString());
List<FunctionDescriptor> fooFunctions = Lists.newArrayList(packageDescriptor.getMemberScope().getFunctions(FOO));
Collections.sort(fooFunctions, new Comparator<FunctionDescriptor>() {
@Override
public int compare(FunctionDescriptor o1, FunctionDescriptor o2) {
return o1.getValueParameters().size() - o2.getValueParameters().size();
}
});
assertEquals(2, fooFunctions.size());
FunctionDescriptor foo1 = fooFunctions.get(0);
assertEquals(FOO, foo1.getName());