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

Removed usages of MemberScope.ownerDescriptor property.

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-11-04 22:30:05 +03:00
parent b8e828e040
commit 22f78b148c
21 changed files with 72 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/test/util/DescriptorValidator.java
+5 -5
View File
@@ -84,7 +84,7 @@ public class DescriptorValidator {
return this;
}
protected void validateScope(@NotNull MemberScope scope, @NotNull DiagnosticCollector collector) {
protected void validateScope(DeclarationDescriptor scopeOwner, @NotNull MemberScope scope, @NotNull DiagnosticCollector collector) {
for (DeclarationDescriptor descriptor : DescriptorUtils.getAllDescriptors(scope)) {
if (recursiveFilter.apply(descriptor)) {
descriptor.accept(new ScopeValidatorVisitor(collector), scope);
@@ -107,7 +107,7 @@ public class DescriptorValidator {
return;
}
validateScope(type.getMemberScope(), collector);
validateScope(descriptor, type.getMemberScope(), collector);
}
private void validateReturnType(CallableDescriptor descriptor, DiagnosticCollector collector) {
@@ -191,7 +191,7 @@ public class DescriptorValidator {
public Boolean visitPackageFragmentDescriptor(
PackageFragmentDescriptor descriptor, DiagnosticCollector collector
) {
validateScope(descriptor.getMemberScope(), collector);
validateScope(descriptor, descriptor.getMemberScope(), collector);
return true;
}
@@ -199,7 +199,7 @@ public class DescriptorValidator {
public Boolean visitPackageViewDescriptor(PackageViewDescriptor descriptor, DiagnosticCollector collector) {
if (!recursiveFilter.apply(descriptor)) return false;
validateScope(descriptor.getMemberScope(), collector);
validateScope(descriptor, descriptor.getMemberScope(), collector);
return true;
}
@@ -245,7 +245,7 @@ public class DescriptorValidator {
validateType(descriptor, descriptor.getDefaultType(), collector);
validateScope(descriptor.getUnsubstitutedInnerClassesScope(), collector);
validateScope(descriptor, descriptor.getUnsubstitutedInnerClassesScope(), collector);
List<ConstructorDescriptor> primary = Lists.newArrayList();
for (ConstructorDescriptor constructorDescriptor : descriptor.getConstructors()) {