Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleaned up the bundle #2

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Cleaned up the bundle #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a2345ca
Updated the Validate Syntax command for Jinja2.
sorin-ionescu Dec 14, 2011
e394424
Renamed Jinja Templates to Jinja2.
sorin-ionescu Dec 14, 2011
279553b
Renamed all instances of jinja to jinja2.
sorin-ionescu Dec 14, 2011
c64a521
Added file type extensions.
sorin-ionescu Dec 14, 2011
ee351d1
Removed the non-existent Filters menu entry.
sorin-ionescu Dec 14, 2011
d7c727c
Organized the menu entries.
sorin-ionescu Dec 14, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Commands/Help.tmCommand
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<string>nop</string>
<key>command</key>
<string>. "$TM_SUPPORT_PATH/lib/webpreview.sh"
html_header "Jinja Help" "Jinja Templates"
html_header "Jinja2 Help" "Jinja2"

Markdown.pl &lt;&lt;'EOF'

This document describes the commands of the TextMate Jinja Templates bundle and how you can use it. For general Jinja help you should read the documentation on the [Jinja website](http:/jinja.pocoo.org/ "Jinja Webpage").
This document describes the commands of the TextMate Jinja2 bundle and how you can use it. For general Jinja2 help you should read the documentation on the [Jinja2 Website](http:/jinja.pocoo.org/ "Jinja2 Website").

This bundle supports Jinja1 and Jinja2.
This bundle supports Jinja2.

EOF

Expand All @@ -24,7 +24,7 @@ html_footer</string>
<key>output</key>
<string>showAsHTML</string>
<key>scope</key>
<string>source.jinja, text.html.jinja</string>
<string>source.jinja2, text.html.jinja2</string>
<key>uuid</key>
<string>44B1526F-5825-40A5-AB42-6433F1DD02D9</string>
</dict>
Expand Down
14 changes: 7 additions & 7 deletions Commands/Validate Syntax.tmCommand
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
<string>nop</string>
<key>command</key>
<string>. "$TM_SUPPORT_PATH/lib/webpreview.sh"
html_header "Jinja Syntax Validation" "Jinja Templates"
html_header "Jinja2 Syntax Validation" "Jinja2"

export TMPFILE="$(mktemp -t tm_jinja_test__)"
cat /dev/stdin &gt; $TMPFILE

python &lt;&lt;'END'
try:
from jinja import Environment
from jinja.exceptions import TemplateSyntaxError
e = Environment()
from jinja2 import environment
from jinja2.exceptions import TemplateSyntaxError
e = environment.Environment()
except ImportError, e:
print "&lt;h2&gt;Error&lt;/h2&gt;"
print "&lt;p&gt;Jinja is not installed on this system, cannot perform syntax check.&lt;/p&gt;"
print "&lt;p&gt;Jinja2 is not installed on this system, cannot perform syntax check.&lt;/p&gt;"
else:
import sys, os
from cgi import escape
Expand All @@ -34,7 +34,7 @@ else:
print e.from_string('''
&lt;h2&gt;Syntax Error in Line {{ err.lineno or '?' }}&lt;/h2&gt;
&lt;p&gt;{{ err.message|e }}&lt;/p&gt;
&lt;p&gt;&lt;a href="txmt://open/?url=file://{{ err.filename|urlencode }}&amp;line={{ err.lineno }}"&gt;Go To Line&lt;/a&gt;&lt;/p&gt;
&lt;p&gt;&lt;a href="txmt://open/?url=file://{{ err.filename|urlize }}&amp;line={{ err.lineno }}"&gt;Go To Line&lt;/a&gt;&lt;/p&gt;
''').render(err=err)
else:
print '&lt;h2&gt;Success&lt;/h2&gt;'
Expand All @@ -52,7 +52,7 @@ rm $TMPFILE</string>
<key>output</key>
<string>showAsHTML</string>
<key>scope</key>
<string>source.jinja, text.html.jinja</string>
<string>source.jinja2, text.html.jinja2</string>
<key>uuid</key>
<string>07198D95-F344-47EB-B1F2-69F2DC10BA1F</string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion Commands/Wrap in Tag.tmCommand
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ sys.stdout.write("{% ${1:%s}$2 %}$3" % sys.stdin.read().replace('}', '\\}'))</st
<key>output</key>
<string>insertAsSnippet</string>
<key>scope</key>
<string>source.jinja, text.html.jinja</string>
<string>source.jinja2, text.html.jinja2</string>
<key>uuid</key>
<string>04309583-742D-4470-8FA7-A12EF5536215</string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion Commands/Wrap in Variable Tag.tmCommand
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ sys.stdout.write("{{ ${1:%s}$2 }}$3" % sys.stdin.read().replace('}', '\\}'))</st
<key>output</key>
<string>insertAsSnippet</string>
<key>scope</key>
<string>source.jinja, text.html.jinja</string>
<string>source.jinja2, text.html.jinja2</string>
<key>uuid</key>
<string>BD126F84-B849-407F-BE62-EF984946EB82</string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion Macros/No automatic Completion for {.tmMacro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<key>name</key>
<string>No automatic Completion for {</string>
<key>scope</key>
<string>source.jinja, text.html.jinja</string>
<string>source.jinja2, text.html.jinja2</string>
<key>uuid</key>
<string>31E30D4A-5CA5-4E4A-9C13-AB8ED6C1EB94</string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion Preferences/Symbol List: Blocks.tmPreferences
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>name</key>
<string>Symbol List: Blocks</string>
<key>scope</key>
<string>meta.scope.jinja.tag variable.other.jinja.block</string>
<string>meta.scope.jinja2.tag variable.other.jinja2.block</string>
<key>settings</key>
<dict>
<key>showInSymbolList</key>
Expand Down
2 changes: 1 addition & 1 deletion Snippets/Block.tmSnippet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>name</key>
<string>Block</string>
<key>scope</key>
<string>source.jinja, text.html.jinja</string>
<string>source.jinja2, text.html.jinja2</string>
<key>tabTrigger</key>
<string>block</string>
<key>uuid</key>
Expand Down
2 changes: 1 addition & 1 deletion Snippets/Complete Block.tmSnippet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>name</key>
<string>Complete Block</string>
<key>scope</key>
<string>source.jinja, text.html.jinja</string>
<string>source.jinja2, text.html.jinja2</string>
<key>tabTrigger</key>
<string>{%</string>
<key>uuid</key>
Expand Down
2 changes: 1 addition & 1 deletion Snippets/Complete Variable.tmSnippet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>name</key>
<string>Complete Variable</string>
<key>scope</key>
<string>source.jinja, text.html.jinja</string>
<string>source.jinja2, text.html.jinja2</string>
<key>tabTrigger</key>
<string>{{</string>
<key>uuid</key>
Expand Down
2 changes: 1 addition & 1 deletion Snippets/Extends.tmSnippet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>name</key>
<string>Extends</string>
<key>scope</key>
<string>source.jinja, text.html.jinja</string>
<string>source.jinja2, text.html.jinja2</string>
<key>tabTrigger</key>
<string>extends</string>
<key>uuid</key>
Expand Down
2 changes: 1 addition & 1 deletion Snippets/Filter.tmSnippet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>name</key>
<string>Filter</string>
<key>scope</key>
<string>source.jinja, text.html.jinja</string>
<string>source.jinja2, text.html.jinja2</string>
<key>tabTrigger</key>
<string>filter</string>
<key>uuid</key>
Expand Down
2 changes: 1 addition & 1 deletion Snippets/For.tmSnippet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>name</key>
<string>For</string>
<key>scope</key>
<string>source.jinja, text.html.jinja</string>
<string>source.jinja2, text.html.jinja2</string>
<key>tabTrigger</key>
<string>for</string>
<key>uuid</key>
Expand Down
2 changes: 1 addition & 1 deletion Snippets/If.tmSnippet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>name</key>
<string>If</string>
<key>scope</key>
<string>source.jinja, text.html.jinja</string>
<string>source.jinja2, text.html.jinja2</string>
<key>tabTrigger</key>
<string>if</string>
<key>uuid</key>
Expand Down
2 changes: 1 addition & 1 deletion Snippets/Macro.tmSnippet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>name</key>
<string>Macro</string>
<key>scope</key>
<string>source.jinja, text.html.jinja</string>
<string>source.jinja2, text.html.jinja2</string>
<key>tabTrigger</key>
<string>macro</string>
<key>uuid</key>
Expand Down
13 changes: 9 additions & 4 deletions Syntaxes/HTML (Jinja Templates).tmLanguage → Syntaxes/HTML (Jinja2).tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,33 @@
<plist version="1.0">
<dict>
<key>fileTypes</key>
<array/>
<array>
<string>htm.j2</string>
<string>html.j2</string>
<string>xhtml.j2</string>
<string>xml.j2</string>
</array>
<key>firstLineMatch</key>
<string>^{% extends ["'][^"']+["'] %}</string>
<key>foldingStartMarker</key>
<string>(&lt;(?i:(head|table|tr|div|style|script|ul|ol|form|dl))\b.*?&gt;|{%\s*(block|filter|for|if|macro|raw))</string>
<key>foldingStopMarker</key>
<string>(&lt;/(?i:(head|table|tr|div|style|script|ul|ol|form|dl))\b.*?&gt;|{%\s*(endblock|endfilter|endfor|endif|endmacro|endraw)\s*%})</string>
<key>name</key>
<string>HTML (Jinja Templates)</string>
<string>HTML (Jinja2)</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>source.jinja</string>
<string>source.jinja2</string>
</dict>
<dict>
<key>include</key>
<string>text.html.basic</string>
</dict>
</array>
<key>scopeName</key>
<string>text.html.jinja</string>
<string>text.html.jinja2</string>
<key>uuid</key>
<string>488399C0-5D29-4704-BE85-E03A461C34E7</string>
</dict>
Expand Down
Loading