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

Removed namespaces from descriptor visitor.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-10-30 12:14:19 +04:00
parent 005b59e783
commit 75e550fe11
10 changed files with 4 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java
+2 -2
View File
@@ -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();
idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java
-6
View File
@@ -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);