diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/KotlinCodeAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/KotlinCodeAnalyzer.java index d7e8b81ecaa..859e378d709 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/KotlinCodeAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/KotlinCodeAnalyzer.java @@ -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); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java index 4f0dadea85d..4b6d20162d0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java @@ -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 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); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java index e72dafb7e0f..ac3aa666b92 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveTest.java @@ -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(); diff --git a/idea/src/org/jetbrains/jet/plugin/project/CancelableResolveSession.java b/idea/src/org/jetbrains/jet/plugin/project/CancelableResolveSession.java index e752b807f32..9d2a8e51f1d 100644 --- a/idea/src/org/jetbrains/jet/plugin/project/CancelableResolveSession.java +++ b/idea/src/org/jetbrains/jet/plugin/project/CancelableResolveSession.java @@ -78,17 +78,6 @@ public class CancelableResolveSession implements KotlinCodeAnalyzer, Modificatio }); } - @Nullable - @Override - public NamespaceDescriptor getPackageDescriptor(@NotNull final Name shortName) { - return computableWithProcessingCancel(new Computable() { - @Override - public NamespaceDescriptor compute() { - return resolveSession.getPackageDescriptor(shortName); - } - }); - } - @Nullable @Override public NamespaceDescriptor getPackageDescriptorByFqName(final FqName fqName) {