From 3df14cda7271011f0edd2ec083b3c2700838346c Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 27 Aug 2013 18:44:36 +0200
Subject: [PATCH] separate Python and Django live template providers

---
 python/src/META-INF/python-plugin-common.xml                  | 4 +++-
 .../liveTemplates/PyDefaultLiveTemplatesProvider.java         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/python/src/META-INF/python-plugin-common.xml b/python/src/META-INF/python-plugin-common.xml
index 342fc100898a..284788289fbe 100644
--- a/python/src/META-INF/python-plugin-common.xml
+++ b/python/src/META-INF/python-plugin-common.xml
@@ -684,6 +684,8 @@
     <findUsagesHandlerFactory implementation="com.jetbrains.django.refactoring.DjangoFindUsagesHandlerFactory"/>
     <referencesSearch implementation="com.jetbrains.django.refactoring.DjangoParameterReferenceSearcher"/>
 
+    <defaultLiveTemplatesProvider implementation="com.jetbrains.django.DjangoDefaultLiveTemplatesProvider"/>
+  </
     <!-- App Engine -->
     <facetType implementation="com.jetbrains.appengine.facet.AppEngineFacetType"/>
     <framework.detector implementation="com.jetbrains.appengine.facet.AppEngineFrameworkDetector"/>
@@ -875,7 +877,7 @@
     <highlightRangeExtension implementation="com.jetbrains.pyramid.templates.highlighting.ChameleonAnnotatingVisitor"/>
     <annotator language="Chameleon" implementationClass="com.jetbrains.pyramid.templates.highlighting.ChameleonAnnotatingVisitor"/>
     <xml.xmlExtension implementation="com.jetbrains.pyramid.templates.highlighting.ChameleonXmlExtension" order="first"/>
-  </extensions>
+    extensions>
 
   <extensionPoints>
     <extensionPoint qualifiedName="Pythonid.importResolver" interface="com.jetbrains.python.psi.impl.PyImportResolver"/>
diff --git a/python/src/com/jetbrains/python/codeInsight/liveTemplates/PyDefaultLiveTemplatesProvider.java b/python/src/com/jetbrains/python/codeInsight/liveTemplates/PyDefaultLiveTemplatesProvider.java
index 34826e7e1144..31b7ec2c15cf 100644
--- a/python/src/com/jetbrains/python/codeInsight/liveTemplates/PyDefaultLiveTemplatesProvider.java
+++ b/python/src/com/jetbrains/python/codeInsight/liveTemplates/PyDefaultLiveTemplatesProvider.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NonNls;
  */
 public class PyDefaultLiveTemplatesProvider implements DefaultLiveTemplatesProvider {
   private static final @NonNls String[] DEFAULT_TEMPLATES = new String[]{
-    "/liveTemplates/Django", "/liveTemplates/Python"
+    "/liveTemplates/Python"
   };
 
   public String[] getDefaultLiveTemplateFiles() {