Permalink
Browse files

Updates from jayallen: fix for 'Else' tags with foldings, improved su…

…pport for Ignore comment tags.

git-svn-id: http://svn.textmate.org/trunk/Bundles/Movable Type.tmbundle@11007 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
  • Loading branch information...
bradchoate committed Dec 12, 2008
1 parent b4de124 commit 5affbe99b3b19380bee8ac8619096e0504a42d2f
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>name</key>
+ <string>Comments</string>
+ <key>scope</key>
+ <string>text.html.mt.pure</string>
+ <key>settings</key>
+ <dict>
+ <key>shellVariables</key>
+ <array>
+ <dict>
+ <key>name</key>
+ <string>TM_COMMENT_START</string>
+ <key>value</key>
+ <string>&lt;mt:Ignore&gt;</string>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>TM_COMMENT_END</string>
+ <key>value</key>
+ <string>&lt;/mt:Ignore&gt;</string>
+ </dict>
+ <dict>
+ <key>name</key>
+ <string>TM_COMMENT_DISABLE_INDENT_2</string>
+ <key>value</key>
+ <string>yes</string>
+ </dict>
+ </array>
+ </dict>
+ <key>uuid</key>
+ <string>34906968-4D08-4AD4-8652-22BC3A5713AA</string>
+</dict>
+</plist>
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>content</key>
- <string>&lt;mt:Ignore&gt;$1&lt;/mt:Ignore&gt;</string>
+ <string>&lt;mt:Ignore&gt;${1:$TM_SELECTED_TEXT}&lt;/mt:Ignore&gt;</string>
<key>name</key>
<string>Ignore</string>
<key>scope</key>
@@ -11,7 +11,7 @@
<key>foldingStartMarker</key>
<string>(?x)
(&lt;(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl)\b.*?&gt;
- |&lt;[Mm][Tt]:?(\w+:)?\w+\b.*?&gt;
+ |&lt;(?i:MT:?(?!Else))(\w+:)?\w+\b.*?&gt;
|&lt;!--(?!.*--\s*&gt;)
|^&lt;!--\ \#tminclude\ (?&gt;.*?--&gt;)$
|&lt;\?(?:php)?.*\b(if|for(each)?|while)\b.+:
@@ -21,7 +21,7 @@
<key>foldingStopMarker</key>
<string>(?x)
(&lt;/(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl)&gt;
- |&lt;\/[Mm][Tt]:?(\w+:)?\w+\b.*?&gt;
+ |&lt;\/(?i:MT:?(?!Else))(\w+:)?\w+\b.*?&gt;
|^(?!.*?&lt;!--).*?--\s*&gt;
|^&lt;!--\ end\ tminclude\ --&gt;$
|&lt;\?(?:php)?.*\bend(if|for(each)?|while)\b
@@ -533,7 +533,7 @@
</dict>
</dict>
<key>scopeName</key>
- <string>text.html.mt</string>
+ <string>text.html.mt.pure</string>
<key>uuid</key>
<string>AC9320E4-DE28-4D36-905D-AFBE099F7466</string>
</dict>
@@ -11,7 +11,7 @@
<key>foldingStartMarker</key>
<string>(?x)
(&lt;(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl)\b.*?&gt;
- |&lt;[Mm][Tt]:?(\w+:)?\w+\b.*?&gt;
+ |&lt;(?i:MT:?(?!Else))(\w+:)?\w+\b.*?&gt;
|&lt;!--(?!.*--\s*&gt;)
|^&lt;!--\ \#tminclude\ (?&gt;.*?--&gt;)$
|&lt;\?(?:php)?.*\b(if|for(each)?|while)\b.+:
@@ -21,7 +21,7 @@
<key>foldingStopMarker</key>
<string>(?x)
(&lt;/(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl)&gt;
- |&lt;\/[Mm][Tt]:?(\w+:)?\w+\b.*?&gt;
+ |&lt;\/(?i:MT:?(?!Else))(\w+:)?\w+\b.*?&gt;
|^(?!.*?&lt;!--).*?--\s*&gt;
|^&lt;!--\ end\ tminclude\ --&gt;$
|&lt;\?(?:php)?.*\bend(if|for(each)?|while)\b
View
@@ -266,6 +266,7 @@
<string>7071B5CA-849A-4D88-A96E-DD725ED622BF</string>
<string>AC9320E4-DE28-4D36-905D-AFBE099F7466</string>
<string>52B12AFE-F559-40D2-943B-0F70F702B4AC</string>
+ <string>34906968-4D08-4AD4-8652-22BC3A5713AA</string>
<string>DD648860-34B2-4350-8684-E1C13C54DEEC</string>
<string>23367101-9398-4601-8521-D6C2C6FEBDBE</string>
<string>F4D7DA0F-B824-4DA6-8409-6D3E0A6F33D5</string>

0 comments on commit 5affbe9

Please sign in to comment.