From 9db591e868cfd4cae38de1785bb5a07c8b781447 Mon Sep 17 00:00:00 2001 From: Piotr Tomiak Date: Tue, 23 Mar 2021 10:35:30 +0100 Subject: [PATCH] Fix NPE in RngElementDescriptor - post review fix IJ-CR-7490 GitOrigin-RevId: 28812bb0db7dffc1095e291954c1fbff9b618dff --- .../plugins/relaxNG/model/descriptors/RngElementDescriptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngElementDescriptor.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngElementDescriptor.java index 54fdd749370d..63e091678371 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngElementDescriptor.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngElementDescriptor.java @@ -422,7 +422,7 @@ public class RngElementDescriptor implements XmlElementDescriptor { if (prevPrevSibling == null) { LOG.error("Failed to locate type for RNC element - " + myName); } - myKind = "element".equals(doIfNotNull(prevPrevSibling, PsiElement::getText)) ? Kind.ELEMENT : Kind.ATTRIBUTE; + myKind = prevPrevSibling != null && "element".equals(prevPrevSibling.getText()) ? Kind.ELEMENT : Kind.ATTRIBUTE; } @Override