diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/TreeUtil.java b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/TreeUtil.java index 3deeb25a69a2..864edb0baca9 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/TreeUtil.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/TreeUtil.java @@ -73,7 +73,8 @@ public class TreeUtil { } @Nullable - public static ASTNode skipElementsBack(ASTNode element, TokenSet types) { + public static ASTNode skipElementsBack(@Nullable ASTNode element, TokenSet types) { + if (element == null) return null; if (!types.contains(element.getElementType())) return element; ASTNode parent = element.getTreeParent();