From e16771fa93dc0d0ed7d3445870119ab4d5847e79 Mon Sep 17 00:00:00 2001 From: Andrey Vokin Date: Tue, 12 Jun 2018 12:59:11 +0200 Subject: [PATCH] AbstractXmlBlock#createSimpleChild should return Block (not XmlBlock) In case of CoffeeScript for JSX XML tag could contain CoffeeScript block with statement, which should be handled as CoffeeScriptBlock --- .../com/intellij/xml/template/formatter/TemplateXmlBlock.java | 2 +- .../intellij/xml/template/formatter/TemplateXmlTagBlock.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xml/impl/src/com/intellij/xml/template/formatter/TemplateXmlBlock.java b/xml/impl/src/com/intellij/xml/template/formatter/TemplateXmlBlock.java index 4b2537952b35..dd32ab083727 100644 --- a/xml/impl/src/com/intellij/xml/template/formatter/TemplateXmlBlock.java +++ b/xml/impl/src/com/intellij/xml/template/formatter/TemplateXmlBlock.java @@ -45,7 +45,7 @@ public class TemplateXmlBlock extends XmlBlock implements IndentInheritingBlock } @Override - protected XmlBlock createSimpleChild(ASTNode child, Indent indent, Wrap wrap, Alignment alignment) { + protected Block createSimpleChild(ASTNode child, Indent indent, Wrap wrap, Alignment alignment) { return myBuilder.createXmlBlock(child, wrap, alignment, myXmlFormattingPolicy,indent, child.getTextRange()); } diff --git a/xml/impl/src/com/intellij/xml/template/formatter/TemplateXmlTagBlock.java b/xml/impl/src/com/intellij/xml/template/formatter/TemplateXmlTagBlock.java index 955bbe713391..c057160dd4a7 100644 --- a/xml/impl/src/com/intellij/xml/template/formatter/TemplateXmlTagBlock.java +++ b/xml/impl/src/com/intellij/xml/template/formatter/TemplateXmlTagBlock.java @@ -20,7 +20,6 @@ import com.intellij.formatting.Block; import com.intellij.formatting.Indent; import com.intellij.formatting.Wrap; import com.intellij.lang.ASTNode; -import com.intellij.psi.formatter.xml.XmlBlock; import com.intellij.psi.formatter.xml.XmlFormattingPolicy; import com.intellij.psi.formatter.xml.XmlTagBlock; import com.intellij.xml.util.HtmlUtil; @@ -60,7 +59,7 @@ public class TemplateXmlTagBlock extends XmlTagBlock implements IndentInheriting @Override - protected XmlBlock createSimpleChild(ASTNode child, Indent indent, Wrap wrap, Alignment alignment) { + protected Block createSimpleChild(ASTNode child, Indent indent, Wrap wrap, Alignment alignment) { return myBuilder.createXmlBlock(child, wrap, alignment, myXmlFormattingPolicy, indent, null); }