From 75e550fe11fb6d42bbc35b5bafb6dc021fb31e88 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 30 Oct 2013 12:14:19 +0400 Subject: [PATCH] Removed namespaces from descriptor visitor. --- .../jvm/compiler/JdkAnnotationsValidityTest.java | 7 +------ .../jet/test/util/DescriptorValidator.java | 15 --------------- .../test/util/RecursiveDescriptorProcessor.java | 6 ------ .../util/RecursiveDescriptorProcessorTest.java | 6 ------ .../descriptors/DeclarationDescriptorVisitor.java | 2 -- .../impl/AbstractNamespaceDescriptorImpl.java | 2 +- .../DeclarationDescriptorVisitorEmptyBodies.java | 5 ----- .../jet/renderer/DescriptorRendererImpl.java | 5 ----- .../libraries/DecompiledNavigationUtils.java | 4 ++-- .../references/BuiltInsReferenceResolverTest.java | 6 ------ 10 files changed, 4 insertions(+), 54 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java index 89b0698b770..42355eb878f 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java @@ -105,7 +105,7 @@ public class JdkAnnotationsValidityTest extends UsefulTestCase { int chunkStart = chunkIndex * CLASSES_IN_CHUNK; for (FqName javaClass : affectedClasses.subList(chunkStart, Math.min(chunkStart + CLASSES_IN_CHUNK, affectedClasses.size()))) { ClassDescriptor topLevelClass = javaDescriptorResolver.resolveClass(javaClass, IGNORE_KOTLIN_SOURCES); - PackageViewDescriptor topLevelPackage = javaDescriptorResolver.getPackageFragmentProvider().getModule().getPackage(javaClass); + PackageViewDescriptor topLevelPackage = injector.getModule().getPackage(javaClass); if (topLevelClass == null) { continue; } @@ -178,11 +178,6 @@ public class JdkAnnotationsValidityTest extends UsefulTestCase { this.errors = errors; } - @Override - public Void visitNamespaceDescriptor(NamespaceDescriptor descriptor, Void data) { - return visitDeclarationRecursively(descriptor, descriptor.getMemberScope()); - } - @Override public Void visitPackageViewDescriptor(PackageViewDescriptor descriptor, Void data) { return visitDeclarationRecursively(descriptor, descriptor.getMemberScope()); diff --git a/compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java b/compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java index 3a24eaf808c..324024da5b4 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java +++ b/compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java @@ -174,14 +174,6 @@ public class DescriptorValidator { assertEquals(accessor, collector, "corresponding property", descriptor, accessor.getCorrespondingProperty()); } - @Override - public Boolean visitNamespaceDescriptor( - NamespaceDescriptor descriptor, DiagnosticCollector collector - ) { - validateScope(descriptor.getMemberScope(), collector); - return true; - } - @Override public Boolean visitPackageFragmentDescriptor( PackageFragmentDescriptor descriptor, DiagnosticCollector collector @@ -377,13 +369,6 @@ public class DescriptorValidator { } } - @Override - public Void visitNamespaceDescriptor( - NamespaceDescriptor descriptor, JetScope scope - ) { - throw new IllegalStateException("namespace don't exist"); - } - @Override public Void visitPackageFragmentDescriptor( PackageFragmentDescriptor descriptor, JetScope scope diff --git a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessor.java b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessor.java index ff0e1114e3c..dbebc3f3402 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessor.java +++ b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessor.java @@ -77,12 +77,6 @@ public class RecursiveDescriptorProcessor { && visitChildren(descriptor.getMemberScope().getAllDescriptors(), data); } - @Override - public Boolean visitNamespaceDescriptor(NamespaceDescriptor descriptor, D data) { - return applyWorker(descriptor, data) - && visitChildren(descriptor.getMemberScope().getAllDescriptors(), data); - } - @Override public Boolean visitVariableDescriptor(VariableDescriptor descriptor, D data) { return processCallable(descriptor, data); diff --git a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java index a1493a684bb..15e72c3c27f 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java +++ b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java @@ -91,12 +91,6 @@ public class RecursiveDescriptorProcessorTest extends KotlinTestWithEnvironment add(prefix + descriptor.getContainingDeclaration().getName() + "." + descriptor.getName(), descriptor); } - @Override - public Boolean visitNamespaceDescriptor(NamespaceDescriptor descriptor, Void data) { - add(descriptor); - return true; - } - @Override public Boolean visitPackageFragmentDescriptor(PackageFragmentDescriptor descriptor, Void data) { add(descriptor); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorVisitor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorVisitor.java index 013b7939d8f..64a979bf371 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorVisitor.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorVisitor.java @@ -17,8 +17,6 @@ package org.jetbrains.jet.lang.descriptors; public interface DeclarationDescriptorVisitor { - @Deprecated - R visitNamespaceDescriptor(NamespaceDescriptor descriptor, D data); R visitPackageFragmentDescriptor(PackageFragmentDescriptor descriptor, D data); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractNamespaceDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractNamespaceDescriptorImpl.java index 3abadaf17ae..d2595fdb558 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractNamespaceDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractNamespaceDescriptorImpl.java @@ -54,6 +54,6 @@ public abstract class AbstractNamespaceDescriptorImpl extends DeclarationDescrip @Override public R accept(DeclarationDescriptorVisitor visitor, D data) { - return visitor.visitNamespaceDescriptor(this, data); + throw new UnsupportedOperationException("namespaces are retired"); } } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorVisitorEmptyBodies.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorVisitorEmptyBodies.java index 0eeb407ef52..4fac770d5fc 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorVisitorEmptyBodies.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorVisitorEmptyBodies.java @@ -38,11 +38,6 @@ public class DeclarationDescriptorVisitorEmptyBodies implements Declaratio return visitDeclarationDescriptor(descriptor, data); } - @Override - public R visitNamespaceDescriptor(NamespaceDescriptor descriptor, D data) { - return visitDeclarationDescriptor(descriptor, data); - } - @Override public R visitPackageFragmentDescriptor(PackageFragmentDescriptor descriptor, D data) { return visitDeclarationDescriptor(descriptor, data); diff --git a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java index 9ec2f821f26..f2d3d8c602c 100644 --- a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java @@ -744,11 +744,6 @@ public class DescriptorRendererImpl implements DescriptorRenderer { return null; } - @Override - public Void visitNamespaceDescriptor(NamespaceDescriptor namespaceDescriptor, StringBuilder builder) { - return null; - } - @Override public Void visitPackageFragmentDescriptor( PackageFragmentDescriptor descriptor, StringBuilder builder diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java index a5b73e50887..2e09bc14f92 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java @@ -112,8 +112,8 @@ public final class DecompiledNavigationUtils { private static FqName getContainerFqName(@NotNull DeclarationDescriptor referencedDescriptor) { ClassOrNamespaceDescriptor containerDescriptor = DescriptorUtils.getParentOfType(referencedDescriptor, ClassOrNamespaceDescriptor.class, false); - if (containerDescriptor instanceof NamespaceDescriptor) { - return PackageClassUtils.getPackageClassFqName(getFQName(containerDescriptor).toSafe()); + if (containerDescriptor instanceof PackageFragmentDescriptor) { + return PackageClassUtils.getPackageClassFqName(((PackageFragmentDescriptor) containerDescriptor).getFqName()); } if (containerDescriptor instanceof ClassDescriptor) { ClassKind classKind = ((ClassDescriptor) containerDescriptor).getKind(); diff --git a/idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java b/idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java index 8fe676ffc00..9c33bfb7746 100644 --- a/idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java @@ -96,12 +96,6 @@ public class BuiltInsReferenceResolverTest extends ResolveTestCase { return visitDescriptors(descriptor.getDefaultType().getMemberScope().getAllDescriptors()); } - @Override - public Void visitNamespaceDescriptor(NamespaceDescriptor descriptor, Void data) { - descriptors.add(descriptor); - return visitDescriptors(descriptor.getMemberScope().getAllDescriptors()); - } - @Override public Void visitPackageViewDescriptor(PackageViewDescriptor descriptor, Void data) { descriptors.add(descriptor);