From 21b6d35e83ec04f7e7ae98a6f681ff852538ccc5 Mon Sep 17 00:00:00 2001 From: Andrey Starovoyt Date: Thu, 17 Sep 2015 12:15:03 +0300 Subject: [PATCH] flow & tsx: tag synchronizer --- .../editorActions/XmlTagNameSynchronizer.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlTagNameSynchronizer.java b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlTagNameSynchronizer.java index 6de6d822e2a3..0795a7e50632 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlTagNameSynchronizer.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlTagNameSynchronizer.java @@ -57,6 +57,7 @@ import com.intellij.psi.xml.XmlTokenType; import com.intellij.util.Function; import com.intellij.util.SmartList; import com.intellij.util.containers.ContainerUtil; +import com.intellij.xml.util.HtmlUtil; import com.intellij.xml.util.XmlUtil; import org.jetbrains.annotations.NotNull; @@ -70,11 +71,7 @@ public class XmlTagNameSynchronizer extends CommandAdapter implements NamedCompo private static final Logger LOG = Logger.getInstance(XmlTagNameSynchronizer.class); private static final Set SUPPORTED_LANGUAGES = ContainerUtil.set(HTMLLanguage.INSTANCE.getID(), XMLLanguage.INSTANCE.getID(), - XHTMLLanguage.INSTANCE.getID(), - "JavaScript", - "JSX Harmony", - "TypeScript JSX", - "ECMA Script Level 4"); + XHTMLLanguage.INSTANCE.getID()); private static final Key SYNCHRONIZER_KEY = Key.create("tag_name_synchronizer"); private final FileDocumentManager myFileDocumentManager; @@ -104,7 +101,8 @@ public class XmlTagNameSynchronizer extends CommandAdapter implements NamedCompo final PsiFile psiFile = file != null && file.isValid() ? PsiManager.getInstance(project).findFile(file) : null; if (psiFile != null) { for (Language language : psiFile.getViewProvider().getLanguages()) { - if (SUPPORTED_LANGUAGES.contains(language.getID())) return language; + if ( SUPPORTED_LANGUAGES.contains(language.getID()) || + HtmlUtil.supportsXmlTypedHandlers(psiFile)) return language; } } return null;