Rename isHeader to isExpect in descriptors
This commit is contained in:
committed by
Mikhail Glukhikh
parent
fd6eab38e5
commit
c8ee424f67
+3
-3
@@ -69,7 +69,7 @@ class JsNameClashChecker : SimpleDeclarationChecker {
|
||||
if (existing != null &&
|
||||
existing != descriptor &&
|
||||
existing.isImpl == descriptor.isImpl &&
|
||||
existing.isHeader == descriptor.isHeader &&
|
||||
existing.isExpect == descriptor.isExpect &&
|
||||
!bindingContext.isCommonDiagnosticReported(declaration)
|
||||
) {
|
||||
diagnosticHolder.report(ErrorsJs.JS_NAME_CLASH.on(declaration, name, existing))
|
||||
@@ -112,8 +112,8 @@ class JsNameClashChecker : SimpleDeclarationChecker {
|
||||
private val DeclarationDescriptor.isImpl: Boolean
|
||||
get() = this is MemberDescriptor && this.isImpl
|
||||
|
||||
private val DeclarationDescriptor.isHeader: Boolean
|
||||
get() = this is MemberDescriptor && this.isHeader
|
||||
private val DeclarationDescriptor.isExpect: Boolean
|
||||
get() = this is MemberDescriptor && this.isExpect
|
||||
|
||||
private fun isFakeOverridingNative(descriptor: CallableMemberDescriptor): Boolean {
|
||||
return descriptor.kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE &&
|
||||
|
||||
@@ -163,7 +163,7 @@ public final class AnnotationsUtils {
|
||||
}
|
||||
|
||||
public static boolean isPredefinedObject(@NotNull DeclarationDescriptor descriptor) {
|
||||
if (descriptor instanceof MemberDescriptor && ((MemberDescriptor) descriptor).isHeader()) return true;
|
||||
if (descriptor instanceof MemberDescriptor && ((MemberDescriptor) descriptor).isExpect()) return true;
|
||||
if (isEffectivelyExternalMember(descriptor)) return true;
|
||||
|
||||
for (PredefinedAnnotation annotation : PredefinedAnnotation.values()) {
|
||||
|
||||
Reference in New Issue
Block a user