Remove usages of parentOfType (unavailable in Java-agnostic IDEs, suc…

…h as WS)
interfaced · Mar 6, 2019 · bcee0e0 · bcee0e0
1 parent 3f02c6a
commit bcee0e0
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/kotlin/com/interfaced/brs/lang/psi/BrsUtil.kt b/src/main/kotlin/com/interfaced/brs/lang/psi/BrsUtil.kt
@@ -9,14 +9,16 @@ import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.util.indexing.FileBasedIndex
 import com.interfaced.brs.lang.BrsFileType
 import com.intellij.psi.util.PsiTreeUtil
-import com.intellij.psi.util.parentOfType
 
 class BrsUtil {
     companion object {
         private inline fun <reified T : PsiElement> getChildrenFromFiles(files: List<PsiFile>): List<Array<T>> {
             return files.mapNotNull { PsiTreeUtil.getChildrenOfType(it, T::class.java) }
         }
 
+        private inline fun <reified T : PsiElement> PsiElement.ancestorOfType(): T? =
+                PsiTreeUtil.getParentOfType(this, T::class.java, /* strict */ false)
+
         fun isPropertyIdentifier(element: PsiElement): Boolean {
             val prevSibling = element.prevSibling
 
@@ -51,11 +53,11 @@ class BrsUtil {
         }
 
         fun getOwnedFunction(element: PsiElement): BrsFunctionStmt? {
-            return element.parentOfType()
+            return element.ancestorOfType()
         }
 
         fun getOwnedSub(element: PsiElement): BrsSubStmt? {
-            return element.parentOfType()
+            return element.ancestorOfType()
         }
     }
 }