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

Lint: Fix EA-81466

Browse Source
This commit is contained in:
Yan Zhulanow
2016-04-15 17:25:34 +03:00
parent 64dbba8e2c
commit aa06cd8f7d
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-common/src/org/jetbrains/uast/UastUtils.kt
+18 -11
View File
@@ -152,12 +152,17 @@ tailrec fun UQualifiedExpression.getCallElementFromQualified(): UCallExpression?
} }
fun UCallExpression.getQualifiedCallElement(): UExpression { fun UCallExpression.getQualifiedCallElement(): UExpression {
fun findParent(element: UExpression?): UExpression? = when (element) { fun findParent(parent: UExpression?, current: UExpression): UExpression? = when (parent) {
is UQualifiedExpression -> findParent(element.parent as? UExpression) ?: element is UQualifiedExpression -> {
if (parent.selector == current)
findParent(parent.parent as? UExpression, parent) ?: parent
else
current
}
else -> null else -> null
} }
return findParent(parent as? UExpression) ?: this return findParent(parent as? UExpression, this) ?: this
} }
inline fun <reified T: UElement> UElement.getParentOfType(): T? = getParentOfType(T::class.java) inline fun <reified T: UElement> UElement.getParentOfType(): T? = getParentOfType(T::class.java)
@@ -210,7 +215,7 @@ fun UExpression.asQualifiedIdentifiers(): List<String>? {
} }
when (this) { when (this) {
is UQualifiedExpression -> addIdentifiers(this) is UQualifiedExpression -> addIdentifiers(this)
is USimpleReferenceExpression -> listOf(identifier) is USimpleReferenceExpression -> list += identifier
else -> return null else -> return null
} }
return if (error) null else list return if (error) null else list
@@ -224,18 +229,20 @@ fun UExpression.matchesQualified(fqName: String): Boolean {
fun UExpression.startsWithQualified(fqName: String): Boolean { fun UExpression.startsWithQualified(fqName: String): Boolean {
val identifiers = this.asQualifiedIdentifiers() ?: return false val identifiers = this.asQualifiedIdentifiers() ?: return false
val passedIdentifiers = fqName.split('.') val passedIdentifiers = fqName.trim('.').split('.')
identifiers.forEachIndexed { i, identifier -> if (identifiers.size < passedIdentifiers.size) return false
if (identifier != passedIdentifiers[i]) return false passedIdentifiers.forEachIndexed { i, passedIdentifier ->
if (passedIdentifier != identifiers[i]) return false
} }
return true return true
} }
fun UExpression.endsWithQualified(fqName: String): Boolean { fun UExpression.endsWithQualified(fqName: String): Boolean {
val identifiers = this.asQualifiedIdentifiers() ?: return false val identifiers = this.asQualifiedIdentifiers()?.asReversed() ?: return false
val passedIdentifiers = fqName.split('.') val passedIdentifiers = fqName.trim('.').split('.').asReversed()
identifiers.forEachIndexed { i, identifier -> if (identifiers.size < passedIdentifiers.size) return false
if (identifier != passedIdentifiers[i]) return false passedIdentifiers.forEachIndexed { i, passedIdentifier ->
if (passedIdentifier != identifiers[i]) return false
} }
return true return true
} }