prevent Emmet from overriding surround template expansion by Tab (IDEA-110404)

platform/lang-impl/src/com/intellij/codeInsight/template/CustomTemplateCallback.java

@@ -130,7 +130,7 @@ public class CustomTemplateCallback {
     TemplateSettings settings = TemplateSettings.getInstance();
     List<TemplateImpl> candidates = new ArrayList<TemplateImpl>();
     for (TemplateImpl template : settings.getTemplates(templateKey)) {
-      if (!template.isDeactivated() && !template.isSelectionTemplate()) {
+      if (!template.isDeactivated()) {
         candidates.add(template);
       }
     }

xml/tests/src/com/intellij/codeInsight/template/XmlLiveTemplateTest.groovy

@@ -52,5 +52,13 @@ public class XmlLiveTemplateTest extends LightCodeInsightFixtureTestCase {
     manager.startTemplate(myFixture.getEditor(), template);
     myFixture.checkResult '<tag><selection><</selection><caret></tag>'
   }
+
+  public void "test insert CDATA by CD and tab"() {
+    myFixture.configureByText 'a.xml', '<tag><caret></tag>'
+    myFixture.type('CD\t')
+    myFixture.checkResult '''<tag><![CDATA[
+
+]]></tag>'''
+  }
   
 }