Removed namespaces from descriptor visitor.
This commit is contained in:
@@ -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());
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user