Removed useless method.

This commit is contained in:
Evgeny Gerashchenko
2013-10-08 20:58:07 +04:00
parent b99753dd4f
commit 1b28fb50b9
4 changed files with 3 additions and 22 deletions
@@ -31,9 +31,6 @@ import org.jetbrains.jet.lang.resolve.name.Name;
public interface KotlinCodeAnalyzer {
ModuleDescriptor getRootModuleDescriptor();
@Nullable
NamespaceDescriptor getPackageDescriptor(@NotNull Name shortName);
@Nullable
NamespaceDescriptor getPackageDescriptorByFqName(FqName fqName);
@@ -142,12 +142,6 @@ public class ResolveSession implements KotlinCodeAnalyzer {
return storageManager;
}
@Override
@Nullable
public NamespaceDescriptor getPackageDescriptor(@NotNull Name shortName) {
return rootPackage.getMemberScope().getNamespace(shortName);
}
@Override
@Nullable
public NamespaceDescriptor getPackageDescriptorByFqName(FqName fqName) {
@@ -155,7 +149,7 @@ public class ResolveSession implements KotlinCodeAnalyzer {
return rootPackage;
}
List<Name> names = fqName.pathSegments();
NamespaceDescriptor current = getPackageDescriptor(names.get(0));
NamespaceDescriptor current = rootPackage.getMemberScope().getNamespace(names.get(0));
if (current == null) return null;
for (Name name : names.subList(1, names.size())) {
current = current.getMemberScope().getNamespace(name);
@@ -26,6 +26,7 @@ import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.resolve.ExpectedResolveData;
import org.jetbrains.jet.resolve.JetExpectedResolveDataUtil;
@@ -74,7 +75,7 @@ public abstract class AbstractLazyResolveTest extends JetLiteFixture {
KotlinCodeAnalyzer resolveSession = LazyResolveTestUtil.resolveLazilyWithSession(files, getEnvironment(), true);
NamespaceDescriptor actual = resolveSession.getPackageDescriptor(Name.identifier("test"));
NamespaceDescriptor actual = resolveSession.getPackageDescriptorByFqName(new FqName("test"));
Assert.assertNotNull("Package 'test' was not found", actual);
resolveSession.forceResolveAll();
@@ -78,17 +78,6 @@ public class CancelableResolveSession implements KotlinCodeAnalyzer, Modificatio
});
}
@Nullable
@Override
public NamespaceDescriptor getPackageDescriptor(@NotNull final Name shortName) {
return computableWithProcessingCancel(new Computable<NamespaceDescriptor>() {
@Override
public NamespaceDescriptor compute() {
return resolveSession.getPackageDescriptor(shortName);
}
});
}
@Nullable
@Override
public NamespaceDescriptor getPackageDescriptorByFqName(final FqName fqName) {