Skip to content

Commit

Permalink
Reverted to r7382 to maintain history again.
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.textmate.org/trunk/Bundles/ColdFusion.tmbundle@7528 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
  • Loading branch information
@infininight
infininight committed Jun 14, 2007
2 parents 15850d2 + 6116a62 commit 3cd53f6
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 320 deletions.
2 changes: 1 addition & 1 deletion Preferences/Smart Typing Pairs.tmPreferences
View file
Expand Up @@ -5,7 +5,7 @@
<key>name</key>
<string>Smart Typing Pairs</string>
<key>scope</key>
<string>meta.scope.output.cfml, string.quoted.double.cfml</string>
<string>meta.scope.output.cfm, string.quoted.double.cfm</string>
<key>settings</key>
<dict>
<key>smartTypingPairs</key>
Expand Down
2 changes: 1 addition & 1 deletion Preferences/comment.tmPreferences
View file
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>name</key>
<string>comment</string>
<string>Comments</string>
<key>scope</key>
<string>text.html.cfm</string>
<key>settings</key>
Expand Down
2 changes: 1 addition & 1 deletion Snippets/cfset.tmSnippet
View file
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>content</key>
<string>&lt;cfset $1 = $2&gt;$0</string>
<string>&lt;cfset $1 = $0${TM_XHTML}&gt;</string>
<key>name</key>
<string>cfset</string>
<key>scope</key>
Expand Down
2 changes: 2 additions & 0 deletions Snippets/dollarformat.tmSnippet
View file
Expand Up @@ -6,6 +6,8 @@
<string>DollarFormat(${1:number})$0</string>
<key>name</key>
<string>dollarformat</string>
<key>scope</key>
<string>text.html.cfm</string>
<key>tabTrigger</key>
<string>dollarformat</string>
<key>uuid</key>
Expand Down
2 changes: 2 additions & 0 deletions Snippets/htmleditformat.tmSnippet
View file
Expand Up @@ -6,6 +6,8 @@
<string>HTMLEditFormat(${1:string} ${2:[, version ]})$0</string>
<key>name</key>
<string>htmleditformat</string>
<key>scope</key>
<string>text.html.cfm</string>
<key>tabTrigger</key>
<string>htmleditformat</string>
<key>uuid</key>
Expand Down
40 changes: 19 additions & 21 deletions Syntaxes/ColdFusion.tmLanguage
View file
Expand Up @@ -2,8 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>bundleUUID</key>
<string>1A09BE0B-E81A-4CB7-AF69-AFC845162D1F</string>
<key>fileTypes</key>
<array>
<string>cfm</string>
Expand All @@ -21,7 +19,7 @@
|^(?!.*?&lt;!---).*?---\s*&gt;
)</string>
<key>keyEquivalent</key>
<string>^~@c</string>
<string>^~C</string>
<key>name</key>
<string>ColdFusion</string>
<key>patterns</key>
Expand All @@ -34,13 +32,13 @@
<key>1</key>
<dict>
<key>name</key>
<string>entity.name.tag.cfoutput.cfml</string>
<string>entity.name.tag.cfoutput.cfm</string>
</dict>
</dict>
<key>end</key>
<string>&lt;/((?i:cfoutput))&gt;(?:\s*\n)?</string>
<key>name</key>
<string>meta.tag.cfoutput.cfml</string>
<string>meta.tag.cfoutput.cfm</string>
<key>patterns</key>
<array>
<dict>
Expand All @@ -49,11 +47,11 @@
</dict>
<dict>
<key>begin</key>
<string>(?&lt;=&gt;)</string>
<string>&gt;</string>
<key>contentName</key>
<string>meta.scope.output.cfm</string>
<key>end</key>
<string>(?=&lt;/(?i:cfoutput))</string>
<key>name</key>
<string>meta.scope.output.cfml</string>
<key>patterns</key>
<array>
<dict>
Expand All @@ -72,13 +70,13 @@
<key>1</key>
<dict>
<key>name</key>
<string>entity.name.tag.cfquery.cfml</string>
<string>entity.name.tag.cfquery.cfm</string>
</dict>
</dict>
<key>end</key>
<string>&lt;/((?i:cfquery))&gt;(?:\s*\n)?</string>
<key>name</key>
<string>meta.tag.cfquery.cfml</string>
<string>meta.tag.cfquery.cfm</string>
<key>patterns</key>
<array>
<dict>
Expand Down Expand Up @@ -110,13 +108,13 @@
<key>1</key>
<dict>
<key>name</key>
<string>entity.name.tag.cfml</string>
<string>entity.name.tag.cfm</string>
</dict>
</dict>
<key>end</key>
<string>&gt;</string>
<key>name</key>
<string>meta.tag.any.cfml</string>
<string>meta.tag.any.cfm</string>
<key>patterns</key>
<array>
<dict>
Expand All @@ -143,7 +141,7 @@
<key>end</key>
<string>---&gt;</string>
<key>name</key>
<string>comment.block.cfml</string>
<string>comment.block.cfm</string>
<key>patterns</key>
<array>
<dict>
Expand Down Expand Up @@ -182,7 +180,7 @@
<key>end</key>
<string>"</string>
<key>name</key>
<string>string.quoted.double.cfml</string>
<string>string.quoted.double.cfm</string>
<key>patterns</key>
<array>
<dict>
Expand All @@ -202,7 +200,7 @@
<key>end</key>
<string>'</string>
<key>name</key>
<string>string.quoted.single.cfml</string>
<string>string.quoted.single.cfm</string>
<key>patterns</key>
<array>
<dict>
Expand All @@ -220,7 +218,7 @@
<key>match</key>
<string>\b([a-zA-Z\-:]+)</string>
<key>name</key>
<string>entity.other.attribute-name.cfml</string>
<string>entity.other.attribute-name.cfm</string>
</dict>
<key>tag-id-attribute</key>
<dict>
Expand All @@ -237,18 +235,18 @@
<key>end</key>
<string>(?&lt;='|")</string>
<key>name</key>
<string>meta.attribute-with-value.id.cfml</string>
<string>meta.attribute-with-value.id.cfm</string>
<key>patterns</key>
<array>
<dict>
<key>begin</key>
<string>"</string>
<key>contentName</key>
<string>meta.toc-list.id.cfml</string>
<string>meta.toc-list.id.cfm</string>
<key>end</key>
<string>"</string>
<key>name</key>
<string>string.quoted.double.cfml</string>
<string>string.quoted.double.cfm</string>
<key>patterns</key>
<array>
<dict>
Expand All @@ -265,11 +263,11 @@
<key>begin</key>
<string>'</string>
<key>contentName</key>
<string>meta.toc-list.id.cfml</string>
<string>meta.toc-list.id.cfm</string>
<key>end</key>
<string>'</string>
<key>name</key>
<string>string.quoted.single.cfml</string>
<string>string.quoted.single.cfm</string>
<key>patterns</key>
<array>
<dict>
Expand Down

0 comments on commit 3cd53f6

Please sign in to comment.