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

Rename isImpl to isActual in descriptors

Browse Source
This commit is contained in:
Stanislav Erokhin
2017-09-14 20:54:56 +03:00
committed by Mikhail Glukhikh
parent c8ee424f67
commit e86d2f00ff
38 changed files with 63 additions and 63 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
+3 -3
View File
@@ -68,7 +68,7 @@ class JsNameClashChecker : SimpleDeclarationChecker {
val existing = scope[name]
if (existing != null &&
existing != descriptor &&
existing.isImpl == descriptor.isImpl &&
existing.isActual == descriptor.isActual &&
existing.isExpect == descriptor.isExpect &&
!bindingContext.isCommonDiagnosticReported(declaration)
) {
@@ -109,8 +109,8 @@ class JsNameClashChecker : SimpleDeclarationChecker {
return diagnostics.forElement(declaration).any { it.factory in COMMON_DIAGNOSTICS }
}
private val DeclarationDescriptor.isImpl: Boolean
get() = this is MemberDescriptor && this.isImpl
private val DeclarationDescriptor.isActual: Boolean
get() = this is MemberDescriptor && this.isActual
private val DeclarationDescriptor.isExpect: Boolean
get() = this is MemberDescriptor && this.isExpect