Check for invalid psi elements in firstParentOfType, fix #3326

Hannah-Sten · Nov 19, 2024 · cafc3a8 · cafc3a8
1 parent 7b76b37
commit cafc3a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * Don't insert the right brace when in front of text
 
 ### Fixed
+* Fix exceptions #3754 and #3326
 * Fix exceptions in structure view when command parameters are missing
 * Improve error report submitter for long stacktraces
 * Fix a parser issue with bidirectional arrow in TikZ

diff --git a/src/nl/hannahsten/texifyidea/util/parser/Psi.kt b/src/nl/hannahsten/texifyidea/util/parser/Psi.kt
@@ -96,7 +96,7 @@ fun <T : PsiElement> PsiElement.firstParentOfType(clazz: KClass<T>): T? {
         if (clazz.java.isAssignableFrom(current.javaClass)) {
             return current as? T
         }
-        current = current.parent
+        current = current.parent?.let { if (it.isValid) it else null }
     }
     return null
 }
@@ -108,7 +108,7 @@ inline fun <reified T : PsiElement> PsiElement.firstParentOfType(): T? {
         if (current is T) {
             return current
         }
-        current = current.parent
+        current = current.parent?.let { if (it.isValid) it else null }
     }
     return null
 }