github/coffeescript
1
1
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2026-05-03 03:00:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tm_highlighting' of git://github.com/cehoffman/coffee-script

Browse Source
This commit is contained in:
Jeremy Ashkenas
2010-03-08 19:14:34 -05:00
parent e19cb48d3d f755580b11
commit ff20732dd7
5 changed files with 50 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
extras/CoffeeScript.tmbundle/CoffeeScript.tmPreferences
View File

@@ -1,24 +0,0 @@
<?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>source.coffee</string>
<key>settings</key>
<dict>
<key>shellVariables</key>
<array>
<dict>
<key>name</key>
<string>TM_COMMENT_START</string>
<key>value</key>
<string># </string>
</dict>
</array>
</dict>
<key>uuid</key>
<string>0A92C6F6-4D73-4859-B38C-4CC19CBC191F</string>
</dict>
</plist>

26
extras/CoffeeScript.tmbundle/Preferences/Indent.tmPreferences Normal file
View File

@@ -0,0 +1,26 @@
<?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>Indent</string>
<key>scope</key>
<string>source.coffee</string>
<key>settings</key>
<dict>
<key>decreaseIndentPattern</key>
<string>^\s*(\}|\])$</string>
<key>increaseIndentPattern</key>
<string>(?x)
^\s*
(.*class
|[a-zA-Z\$_](\w|\$|:|\.)*\s*(?=\:(\s*\(.*\))?\s*((=|-)&gt;\s*$)) # function that is not one line
|[a-zA-Z\$_](\w|\$|\.)*\s*(?=(?!\::)\:(?!(\s*\(.*\))?\s*((=|-)&gt;))):\s*((if|while)(?!.*?then)|for|$) # assignment using multiline if/while/for
|(if|while)(?!.*?then)|for
|.*\{$
|.*\[$)</string>
</dict>
<key>uuid</key>
<string>C5D6C716-12FE-4CE8-A916-6CABEDE8AFE7</string>
</dict>
</plist>

19
extras/CoffeeScript.tmbundle/Preferences/Symbol List: Method 2.tmPreferences Normal file
View File

@@ -0,0 +1,19 @@
<?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>Symbol List: Method</string>
<key>scope</key>
<string>source.coffee meta.function</string>
<key>settings</key>
<dict>
<key>showInSymbolList</key>
<integer>1</integer>
<key>symbolTransformation</key>
<string>s/^(\s*)([a-zA-Z\$_](\w|\$|:|\.))*\s*:/$1$2/</string>
</dict>
<key>uuid</key>
<string>419D24D8-0DD6-4D9A-8CA0-6D9CD740BEEC</string>
</dict>
</plist>

2
extras/CoffeeScript.tmbundle/Symbol List: Method.tmPreferences → extras/CoffeeScript.tmbundle/Preferences/Symbol List: Method.tmPreferences
View File

@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>name</key>
<string>Symbol List: Method</string>
<string>Symbol List: Method Instance</string>
<key>scope</key>
<string>source.coffee entity.name.type.instance</string>
<key>settings</key>

8
extras/CoffeeScript.tmbundle/Syntaxes/CoffeeScript.tmLanguage
View File

@@ -140,7 +140,7 @@
</dict>
<dict>
<key>begin</key>
<string>(?&lt;=[=(:]|^|return)\s*(/)(?![/*+{}?])</string>
<string>(?&lt;=[=(:\s]|^|return)\s*(/)(?![\s/*+{}?])</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@@ -193,7 +193,7 @@
</dict>
<dict>
<key>begin</key>
<string>(\[)(?=.*?\]\s*:)</string>
<string>(?&lt;=\s|^)(\[)(?=.*?\]\s*:)</string>
<key>beginCaptures</key>
<dict>
<key>0</key>
@@ -241,14 +241,14 @@
<dict>
<key>captures</key>
<dict>
<key>1</key>
<key>2</key>
<dict>
<key>name</key>
<string>entity.name.function.coffee</string>
</dict>
</dict>
<key>match</key>
<string>(?=[a-zA-Z\$_])([a-zA-Z\$_](\w|\$|:|\.)*\s*(?=\:(\s*\(.*\))?\s*((=|-)&gt;)))</string>
<string>(\s*)(?=[a-zA-Z\$_])([a-zA-Z\$_](\w|\$|:|\.)*\s*(?=\:(\s*\(.*\))?\s*((=|-)&gt;)))</string>
<key>name</key>
<string>meta.function.coffee</string>
</dict>