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

Fix name clash in JS implementation of multiplatform extension property

Browse Source 
See KT-18756
This commit is contained in:
Alexey Andreev
2017-09-14 18:10:07 +03:00
parent 1c7d66c803
commit a66cd8b309
5 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsNameClashChecker.kt
+2 -2
View File
@@ -110,10 +110,10 @@ class JsNameClashChecker : SimpleDeclarationChecker {
}
private val DeclarationDescriptor.isActual: Boolean
get() = this is MemberDescriptor && this.isActual
get() = this is MemberDescriptor && this.isActual || this is PropertyAccessorDescriptor && this.correspondingProperty.isActual
private val DeclarationDescriptor.isExpect: Boolean
get() = this is MemberDescriptor && this.isExpect
get() = this is MemberDescriptor && this.isExpect || this is PropertyAccessorDescriptor && this.correspondingProperty.isExpect
private fun isFakeOverridingNative(descriptor: CallableMemberDescriptor): Boolean {
return descriptor.kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE &&