From 70c9a795e472ae63749088d3abb9f2532e06ae91 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Tue, 6 Sep 2016 16:05:51 +0700 Subject: [PATCH] IDEA-CR-13572 revert to using XmlText.EMPTY_ARRAY on zero length --- .../src/com/intellij/psi/impl/source/xml/XmlTagValueImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagValueImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagValueImpl.java index 45c5373a225c..b82c55b49d93 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagValueImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagValueImpl.java @@ -57,10 +57,10 @@ public class XmlTagValueImpl implements XmlTagValue{ public XmlText[] getTextElements() { XmlText[] textElements = myTextElements; if(textElements != null) return textElements; - myTextElements = Arrays.stream(myElements) + textElements = Arrays.stream(myElements) .filter(element -> element instanceof XmlText) .map(element -> (XmlText)element).toArray(XmlText[]::new); - return myTextElements; + return myTextElements = textElements.length == 0 ? XmlText.EMPTY_ARRAY : textElements; } @Override