From 4de66e4d05ca898ba70a5a0d5266ba8cec0e56d3 Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Mon, 21 Jun 2010 22:25:38 +0400
Subject: [PATCH] added surround with {{ }} in django templates

---
 python/python.iml                            | 1 +
 python/src/META-INF/python-plugin-common.xml | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/python/python.iml b/python/python.iml
index 85eba30f20b6..eed4135fe38b 100644
--- a/python/python.iml
+++ b/python/python.iml
@@ -38,6 +38,7 @@
     <orderEntry type="module" module-name="yaml" />
     <orderEntry type="library" name="microba" level="project" />
     <orderEntry type="library" name="XmlRPC" level="project" />
+    <orderEntry type="library" name="commons-lang" level="project" />
   </component>
   <component name="copyright">
     <Base>
diff --git a/python/src/META-INF/python-plugin-common.xml b/python/src/META-INF/python-plugin-common.xml
index 64adafd7c20d..ed802931dc83 100644
--- a/python/src/META-INF/python-plugin-common.xml
+++ b/python/src/META-INF/python-plugin-common.xml
@@ -219,10 +219,12 @@
 
     <lang.refactoringSupport language="DjangoTemplate" implementationClass="com.jetbrains.django.refactoring.DjangoRefactoringProvider"/>
 
-    <lang.surroundDescriptor language="DjangoTemplate" implementationClass="com.jetbrains.django.surround.DjangoTemplateSurroundDescriptor"
+    <lang.surroundDescriptor language="DjangoTemplate" implementationClass="com.jetbrains.django.surround.DjangoTemplateTagSurroundDescriptor"
                              order="first"/>
-    <lang.surroundDescriptor language="HTML" implementationClass="com.jetbrains.django.surround.DjangoXmlSurroundDescriptor" order="first"/>
-    <lang.surroundDescriptor language="XML" implementationClass="com.jetbrains.django.surround.DjangoXmlSurroundDescriptor" order="first"/>
+    <lang.surroundDescriptor language="HTML" implementationClass="com.jetbrains.django.surround.DjangoXmlSurroundDescriptor" order="after djangoHtmlSurround"/>
+    <lang.surroundDescriptor language="XML" implementationClass="com.jetbrains.django.surround.DjangoXmlSurroundDescriptor" order="after djangoXmlSurround"/>
+    <lang.surroundDescriptor language="HTML" implementationClass="com.jetbrains.django.surround.DjangoTemplateVariableSurroundDescriptor" order="first" id="djangoHtmlSurround"/>
+    <lang.surroundDescriptor language="XML" implementationClass="com.jetbrains.django.surround.DjangoTemplateVariableSurroundDescriptor" order="first" id="djangoXmlSurround"/>
 
     <lang.elementManipulator forClass="com.jetbrains.django.lang.template.psi.impl.DjangoStringLiteralImpl"
                              implementationClass="com.jetbrains.django.lang.template.ref.DjangoStringLiteralManipulator"/>