Get rid of poorly named NotInferredVisibilitySink

Also make TraceBasedErrorReporter invoke OverrideResolver to report "cannot
infer visibility", because there's some additional logic there
This commit is contained in:
Alexander Udalov
2014-04-15 20:37:52 +04:00
parent 5ae339d940
commit 4c973b79ee
7 changed files with 51 additions and 45 deletions
@@ -16,6 +16,8 @@
package org.jetbrains.jet.lang.resolve.java.resolver;
import kotlin.Function1;
import kotlin.Unit;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.*;
@@ -56,10 +58,11 @@ public final class DescriptorResolverUtils {
@Override
@SuppressWarnings("unchecked")
public void addToScope(@NotNull CallableMemberDescriptor fakeOverride) {
OverridingUtil.resolveUnknownVisibilityForMember(fakeOverride, new OverridingUtil.NotInferredVisibilitySink() {
OverridingUtil.resolveUnknownVisibilityForMember(fakeOverride, new Function1<CallableMemberDescriptor, Unit>() {
@Override
public void cannotInferVisibility(@NotNull CallableMemberDescriptor descriptor) {
public Unit invoke(@NotNull CallableMemberDescriptor descriptor) {
errorReporter.reportCannotInferVisibility(descriptor);
return Unit.VALUE;
}
});
result.add((D) fakeOverride);