提交 22be8ad4 编写于 作者: S Stepan Koltsov

do not include error types in hierarchy

上级 55040150
...@@ -898,6 +898,9 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes ...@@ -898,6 +898,9 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
} }
JetType transform = semanticServices.getTypeTransformer().transformToType(type, JavaTypeTransformer.TypeUsage.SUPERTYPE, typeVariableResolver); JetType transform = semanticServices.getTypeTransformer().transformToType(type, JavaTypeTransformer.TypeUsage.SUPERTYPE, typeVariableResolver);
if (ErrorUtils.isErrorType(transform)) {
continue;
}
result.add(TypeUtils.makeNotNullable(transform)); result.add(TypeUtils.makeNotNullable(transform));
} }
......
...@@ -367,10 +367,6 @@ public class OverrideResolver { ...@@ -367,10 +367,6 @@ public class OverrideResolver {
private void checkOverrideForMember(@NotNull CallableMemberDescriptor declared, private void checkOverrideForMember(@NotNull CallableMemberDescriptor declared,
@NotNull Multimap<CallableDescriptor, CallableDescriptor> invisibleOverriddenDescriptors) { @NotNull Multimap<CallableDescriptor, CallableDescriptor> invisibleOverriddenDescriptors) {
if (ErrorUtils.isError(declared)) {
return;
}
JetNamedDeclaration member = (JetNamedDeclaration) BindingContextUtils.descriptorToDeclaration(trace.getBindingContext(), declared); JetNamedDeclaration member = (JetNamedDeclaration) BindingContextUtils.descriptorToDeclaration(trace.getBindingContext(), declared);
if (member == null) { if (member == null) {
Boolean delegated = trace.get(DELEGATED, declared); Boolean delegated = trace.get(DELEGATED, declared);
...@@ -441,10 +437,6 @@ public class OverrideResolver { ...@@ -441,10 +437,6 @@ public class OverrideResolver {
} }
private void checkOverridesForParameters(CallableMemberDescriptor declared) { private void checkOverridesForParameters(CallableMemberDescriptor declared) {
if (ErrorUtils.isError(declared)) {
return;
}
boolean fakeOverride = declared.getKind() == CallableMemberDescriptor.Kind.FAKE_OVERRIDE; boolean fakeOverride = declared.getKind() == CallableMemberDescriptor.Kind.FAKE_OVERRIDE;
if (!fakeOverride) { if (!fakeOverride) {
// No check if the function is not marked as 'override' // No check if the function is not marked as 'override'
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册