Merged flipmoes django sugar

atg · Dec 22, 2009 · 8badabc · 8badabc
1 parent e33baaf
commit 8badabc
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/Languages.xml b/Languages.xml
@@ -17,11 +17,22 @@
 		<root-zone>sourcecode.django</root-zone>
 		<name>Django</name>
 		<detectors>
-			<extension casesensitive="false">py</extension>
-			<match-content lines="10">^(from|import)\s*django</match-content>
+			<combo>
+				<extension casesensitive="false">py</extension>
+				<match-content lines="10">^(from|import)\s*django</match-content>
+			</combo>
 		</detectors>
 	</language>
-
+
+	<language id="net.fileability.sugars.django-template">
+		<syntax-zone>sourcecode.django-template</syntax-zone>
+		<root-zone>sourcecode.django-template</root-zone>
+		<name>Django Template</name>
+		<detectors>
+			<match-content lines="10">(\{\{|\{\%|\{\#)</match-content>
+		</detectors>
+	</language>
+
 	<meta>
 		<name>Python</name>
 		<description>A sugar for doing development in the Python programming language.</description>

diff --git a/Syntaxes/Django.xml b/Syntaxes/Django.xml
@@ -3,9 +3,21 @@
 	<zones>
 		<include syntax="sourcecode.python"/>
 
-		<zone name="keyword.other">
-			<expression>\b(HttpResponse)\b</expression>
-		</zone>
+		<zone name="support.type.django.model">
+            <expression>(meta|models)\.(Admin|AutoField|BooleanField|CharField|CommaSeparatedIntegerField|DateField|DateTimeField|DecimalField|EmailField|FileField|FilePathField|FloatField|ForeignKey|ImageField|IntegerField|IPAddressField|ManyToManyField|NullBooleanField|OneToOneField|PhoneNumberField|PositiveIntegerField|PositiveSmallIntegerField|SlugField|SmallIntegerField|TextField|TimeField|URLField|USStateField|XMLField)</expression>
+        </zone>
+        <zone name="support.other.django.module">
+            <expression>django(\.[a-z]+){1,} </expression>
+        </zone>
+        <zone name="variable.other.django.settings">
+            <expression>(ABSOLUTE_URL_OVERRIDES|ADMIN_FOR|ADMIN_MEDIA_PREFIX|ADMINS|ALLOWED_INCLUDE_ROOTS|APPEND_SLASH|AUTHENTICATION_BACKENDS|AUTH_PROFILE_MODULE|CACHE_BACKEND|CACHE_MIDDLEWARE_KEY_PREFIX|CACHE_MIDDLEWARE_SECONDS|DATABASE_ENGINE|DATABASE_HOST|DATABASE_NAME|DATABASE_OPTIONS|DATABASE_PASSWORD|DATABASE_PORT|DATABASE_USER|DATE_FORMAT|DATETIME_FORMAT|DEBUG|DEFAULT_CHARSET|DEFAULT_CONTENT_TYPE|DEFAULT_FROM_EMAIL|DEFAULT_TABLESPACE|DEFAULT_INDEX_TABLESPACE|DISALLOWED_USER_AGENTS|EMAIL_HOST_PASSWORD|EMAIL_HOST_USER|EMAIL_HOST|EMAIL_PORT|EMAIL_SUBJECT_PREFIX|EMAIL_USE_TLS|FILE_CHARSET|FIXTURE_DIRS|IGNORABLE_404_ENDS|IGNORABLE_404_STARTS|INSTALLED_APPS|INTERNAL_IPS|JING_PATH|LANGUAGE_CODE|LANGUAGE_COOKIE_NAME|LANGUAGES|LOCALE_PATHS|LOGIN_REDIRECT_URL|LOGIN_URL|LOGOUT_URL|MANAGERS|MEDIA_ROOT|MEDIA_URL|MIDDLEWARE_CLASSES|MONTH_DAY_FORMAT|PREPEND_WWW|PROFANITIES_LIST|ROOT_URLCONF|SECRET_KEY|SEND_BROKEN_LINK_EMAILS|SERIALIZATION_MODULES|SERVER_EMAIL|SESSION_ENGINE|SESSION_COOKIE_AGE|SESSION_COOKIE_DOMAIN|SESSION_COOKIE_NAME|SESSION_COOKIE_PATH|SESSION_COOKIE_SECURE|SESSION_EXPIRE_AT_BROWSER_CLOSE|SESSION_FILE_PATH|SESSION_SAVE_EVERY_REQUEST|SITE_ID|TEMPLATE_CONTEXT_PROCESSORS|TEMPLATE_DEBUG|TEMPLATE_DIRS|TEMPLATE_LOADERS|TEMPLATE_STRING_IF_INVALID|TEST_DATABASE_CHARSET|TEST_DATABASE_COLLATION|TEST_DATABASE_NAME|TEST_RUNNER|TIME_FORMAT|TIME_ZONE|URL_VALIDATOR_USER_AGENT|USE_ETAGS|USE_I18N|YEAR_MONTH_FORMAT)</expression>
+        </zone>
+        <zone name="support.function.django.view">
+            <expression>(get_list_or_404|get_object_or_404|load_and_render|loader|render_to_response)</expression>
+        </zone>
+        <zone name="support.function.django.model">
+            <expression>[a-z_]+\.get_(object|list|iterator|count|values|values_iterator|in_bulk)</expression>
+        </zone>
 	</zones>
 
 	<library>

diff --git a/Syntaxes/DjangoTemplate.xml b/Syntaxes/DjangoTemplate.xml
@@ -0,0 +1 @@
+<?xml version="1.0"?><syntax name="sourcecode.django-template">    <zones>        <zone name="metadata.comment.block">            <starts-with>                <expression>{% comment %}</expression>            </starts-with>            <ends-with>                <expression>{% endcomment %}</expression>            </ends-with>        </zone>        <zone name="metadata.comment.line">            <starts-with>                <expression>{#</expression>            </starts-with>            <ends-with>                <expression>#}</expression>            </ends-with>        </zone>        <zone name="identifier.variable">            <starts-with>                <expression>{{</expression>            </starts-with>            <ends-with>                <expression>}}</expression>            </ends-with>        </zone>        <zone name="container.expression.tag">            <starts-with>                <expression>({%)</expression>                <capture number="1" name="delimiter.balanced.bracket.tag.begin"/>            </starts-with>            <ends-with>                <expression>(%})</expression>                <capture number="1" name="delimiter.balanced.bracket.tag.end"/>            </ends-with>            <subzones>                <zone name="keyword.control">                    <expression>\b(autoescape|endautoescape|block|endblock|blocktrans|endblocktrans|plural|debug|extends|filter|firstof|for|endfor|if|include|else|endif|ifchanged|endifchanged|ifequal|endifequal|ifnotequal|endifnotequal|load|now|regroup|ssi|spaceless|templatetag|widthratio)\b</expression>                </zone>                <zone name="operator.logical">                    <expression>\b(and|or|not|in|by|as)\b</expression>                </zone>                <zone name="container.function.filter">                    <expression>\|(add|addslashes|capfirst|center|cut|date|default|default_if_none|dictsort|dictsortreversed|divisibleby|escape|filesizeformat|first|fix_ampersands|floatformat|get_digit|join|length|length_is|linebreaks|linebreaksbr|linenumbers|ljust|lower|make_list|phone2numeric|pluralize|pprint|random|removetags|rjust|safe|slice|slugify|stringformat|striptags|time|timesince|title|truncatewords|unordered_list|upper|urlencode|urlize|urlizetrunc|wordcount|wordwrap|yesno)\b</expression>                </zone>                <zone name="literal.string">                    <starts-with>                        <expression>'|"</expression>                    </starts-with>                    <ends-with>                        <expression>'|"</expression>                    </ends-with>                </zone>                <zone name="literal.string">                    <expression>[a-zA-Z_]+</expression>                </zone>            </subzones>        </zone>    </zones></syntax>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<?xml version="1.0"?><syntax name="sourcecode.django-template"> <zones> <zone name="metadata.comment.block"> <starts-with> <expression>{% comment %}</expression> </starts-with> <ends-with> <expression>{% endcomment %}</expression> </ends-with> </zone> <zone name="metadata.comment.line"> <starts-with> <expression>{#</expression> </starts-with> <ends-with> <expression>#}</expression> </ends-with> </zone> <zone name="identifier.variable"> <starts-with> <expression>{{</expression> </starts-with> <ends-with> <expression>}}</expression> </ends-with> </zone> <zone name="container.expression.tag"> <starts-with> <expression>({%)</expression> <capture number="1" name="delimiter.balanced.bracket.tag.begin"/> </starts-with> <ends-with> <expression>(%})</expression> <capture number="1" name="delimiter.balanced.bracket.tag.end"/> </ends-with> <subzones> <zone name="keyword.control"> <expression>\b(autoescape\|endautoescape\|block\|endblock\|blocktrans\|endblocktrans\|plural\|debug\|extends\|filter\|firstof\|for\|endfor\|if\|include\|else\|endif\|ifchanged\|endifchanged\|ifequal\|endifequal\|ifnotequal\|endifnotequal\|load\|now\|regroup\|ssi\|spaceless\|templatetag\|widthratio)\b</expression> </zone> <zone name="operator.logical"> <expression>\b(and\|or\|not\|in\|by\|as)\b</expression> </zone> <zone name="container.function.filter"> <expression>\\|(add\|addslashes\|capfirst\|center\|cut\|date\|default\|default_if_none\|dictsort\|dictsortreversed\|divisibleby\|escape\|filesizeformat\|first\|fix_ampersands\|floatformat\|get_digit\|join\|length\|length_is\|linebreaks\|linebreaksbr\|linenumbers\|ljust\|lower\|make_list\|phone2numeric\|pluralize\|pprint\|random\|removetags\|rjust\|safe\|slice\|slugify\|stringformat\|striptags\|time\|timesince\|title\|truncatewords\|unordered_list\|upper\|urlencode\|urlize\|urlizetrunc\|wordcount\|wordwrap\|yesno)\b</expression> </zone> <zone name="literal.string"> <starts-with> <expression>'\|"</expression> </starts-with> <ends-with> <expression>'\|"</expression> </ends-with> </zone> <zone name="literal.string"> <expression>[a-zA-Z_]+</expression> </zone> </subzones> </zone> </zones></syntax>
Expand Down