MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

UAST: Fix getUastParentOfType, skip psi parents without UElement

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2017-08-01 22:45:57 +03:00
parent c3679a2293
commit 75a511fb48
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
uast/uast-common/src/org/jetbrains/uast/UastContext.kt
+5 -7
View File
@@ -130,15 +130,13 @@ fun <T : UElement> PsiFile.findUElementAt(offset: Int, cls: Class<out T>): T? {
* Finds an UAST element of the given type among the parents of the given PSI element.
*/
@JvmOverloads
fun <T : UElement> PsiElement?.getUastParentOfType(cls: Class<out T>, strict: Boolean = false): T? {
val uElement = this.toUElement() ?: return null
val sequence = if (strict)
(uElement.uastParent?.withContainingElements ?: emptySequence())
else
uElement.withContainingElements
fun <T : UElement> PsiElement?.getUastParentOfType(cls: Class<out T>, strict: Boolean = false): T? = this?.run {
val startingElement = if (strict) this.parent else this
val parentSequence = generateSequence(startingElement, PsiElement::getParent)
val firstUElement = parentSequence.mapNotNull { it.toUElement() }.firstOrNull() ?: return null
@Suppress("UNCHECKED_CAST")
return sequence.firstOrNull { cls.isInstance(it) } as T?
return firstUElement.withContainingElements.firstOrNull { cls.isInstance(it) } as T?
}
inline fun <reified T : UElement> PsiElement?.getUastParentOfType(strict: Boolean = false): T? = getUastParentOfType(T::class.java, strict)