From 92ea9ea289e8d077ecd020259f87619e0c595b94 Mon Sep 17 00:00:00 2001 From: Andrey Starovoyt Date: Wed, 23 Sep 2015 16:21:55 +0300 Subject: [PATCH] javascript: enable 'between xml tags handler' for jsx & tsx --- .../codeInsight/editorActions/EnterBetweenXmlTagsHandler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/EnterBetweenXmlTagsHandler.java b/xml/impl/src/com/intellij/codeInsight/editorActions/EnterBetweenXmlTagsHandler.java index a2465be776f2..978662515bc3 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/EnterBetweenXmlTagsHandler.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/EnterBetweenXmlTagsHandler.java @@ -33,6 +33,7 @@ import com.intellij.psi.tree.IElementType; import com.intellij.psi.xml.XmlFile; import com.intellij.psi.xml.XmlTag; import com.intellij.psi.xml.XmlTokenType; +import com.intellij.xml.util.HtmlUtil; import org.jetbrains.annotations.NotNull; public class EnterBetweenXmlTagsHandler extends EnterHandlerDelegateAdapter { @@ -41,7 +42,8 @@ public class EnterBetweenXmlTagsHandler extends EnterHandlerDelegateAdapter { @NotNull final DataContext dataContext, final EditorActionHandler originalHandler) { final Project project = CommonDataKeys.PROJECT.getData(dataContext); - if (file instanceof XmlFile && isBetweenXmlTags(project, editor, file, caretOffset.get().intValue())) { + if ((file instanceof XmlFile || HtmlUtil.supportsXmlTypedHandlers(file)) && + isBetweenXmlTags(project, editor, file, caretOffset.get().intValue())) { editor.getDocument().insertString(caretOffset.get(), "\n"); if (project != null) { CodeStyleManager.getInstance(project).adjustLineIndent(editor.getDocument(), caretOffset.get() + 1);