Skip to content
Browse files

Simplified the scoping of functions; updated the menu for the previou…

…sly added snippet (I always forget about the damn menu\!).

git-svn-id: http://svn.textmate.org/trunk/Bundles/Erlang.tmbundle@4999 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
  • Loading branch information...
1 parent 1677791 commit b19bcf909ad2304e568a57c3db8c7c84e2482b33 @mietek mietek committed Aug 28, 2006
Showing with 35 additions and 33 deletions.
  1. +32 −32 Syntaxes/Erlang.plist
  2. +3 −1 info.plist
View
64 Syntaxes/Erlang.plist
@@ -193,7 +193,7 @@
<array>
<dict>
<key>begin</key>
- <string>^\s*+(-)\s*+(define)\s*+(\()\s*+([a-zA-Z\d@_]++)\s*+(?=\()</string>
+ <string>^\s*+(-)\s*+(define)\s*+(\()\s*+([a-zA-Z\d@_]++)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@@ -851,7 +851,7 @@
<array>
<dict>
<key>begin</key>
- <string>^\s*+(-)\s*+(import)\s*+(\()\s*+([a-z][a-zA-Z\d@_]*+)\s*+(,)\s*+(?=\[)</string>
+ <string>^\s*+(-)\s*+(import)\s*+(\()\s*+([a-z][a-zA-Z\d@_]*+)\s*+(,)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@@ -907,7 +907,7 @@
</dict>
<dict>
<key>begin</key>
- <string>^\s*+(-)\s*+(export)\s*+(\()\s*+(?=\[)</string>
+ <string>^\s*+(-)\s*+(export)\s*+(\()</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@@ -1403,14 +1403,14 @@
<key>name</key>
<string>variable.other.field.erlang</string>
</dict>
- <key>3</key>
+ <key>2</key>
<dict>
<key>name</key>
<string>keyword.operator.punctuation.erlang</string>
</dict>
</dict>
<key>match</key>
- <string>([a-z][a-zA-Z\d@_]*+)\s*+((,)|(?=\}))</string>
+ <string>([a-z][a-zA-Z\d@_]*+)\s*+(,)?</string>
</dict>
<dict>
<key>include</key>
@@ -2250,7 +2250,7 @@
<key>record-directive</key>
<dict>
<key>begin</key>
- <string>^\s*+(-)\s*+(record)\s*+(\()\s*+([a-z][a-zA-Z\d@_]*+)\s*+(,)\s*+(?=\{)</string>
+ <string>^\s*+(-)\s*+(record)\s*+(\()\s*+([a-z][a-zA-Z\d@_]*+)\s*+(,)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
@@ -2319,9 +2319,7 @@
<key>patterns</key>
<array>
<dict>
- <key>begin</key>
- <string>(#)\s*+([a-z][a-zA-Z\d@_]*+)\s*+(?=\{)</string>
- <key>beginCaptures</key>
+ <key>captures</key>
<dict>
<key>1</key>
<dict>
@@ -2333,34 +2331,26 @@
<key>name</key>
<string>entity.name.type.class.record.erlang</string>
</dict>
- </dict>
- <key>end</key>
- <string>((\}))</string>
- <key>endCaptures</key>
- <dict>
- <key>1</key>
+ <key>3</key>
<dict>
<key>name</key>
- <string>meta.structure.record.erlang</string>
+ <string>keyword.operator.punctuation.erlang</string>
</dict>
- <key>2</key>
+ <key>4</key>
<dict>
<key>name</key>
- <string>keyword.operator.punctuation.erlang</string>
+ <string>variable.other.field.erlang</string>
</dict>
</dict>
+ <key>match</key>
+ <string>(#)\s*+([a-z][a-zA-Z\d@_]*+)\s*+(\.)\s*+([a-z][a-zA-Z\d@_]*+)</string>
<key>name</key>
<string>meta.record-usage.erlang</string>
- <key>patterns</key>
- <array>
- <dict>
- <key>include</key>
- <string>#internal-record-body</string>
- </dict>
- </array>
</dict>
<dict>
- <key>captures</key>
+ <key>begin</key>
+ <string>(#)\s*+([a-z][a-zA-Z\d@_]*+)</string>
+ <key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
@@ -2372,21 +2362,31 @@
<key>name</key>
<string>entity.name.type.class.record.erlang</string>
</dict>
- <key>3</key>
+ </dict>
+ <key>end</key>
+ <string>((\}))</string>
+ <key>endCaptures</key>
+ <dict>
+ <key>1</key>
<dict>
<key>name</key>
- <string>keyword.operator.punctuation.erlang</string>
+ <string>meta.structure.record.erlang</string>
</dict>
- <key>4</key>
+ <key>2</key>
<dict>
<key>name</key>
- <string>variable.other.field.erlang</string>
+ <string>keyword.operator.punctuation.erlang</string>
</dict>
</dict>
- <key>match</key>
- <string>(#)\s*+([a-z][a-zA-Z\d@_]*+)\s*+(\.)\s*+([a-z][a-zA-Z\d@_]*+)</string>
<key>name</key>
<string>meta.record-usage.erlang</string>
+ <key>patterns</key>
+ <array>
+ <dict>
+ <key>include</key>
+ <string>#internal-record-body</string>
+ </dict>
+ </array>
</dict>
</array>
</dict>
View
4 info.plist
@@ -41,6 +41,9 @@
<string>A3AF4B3B-A3F0-4501-B7A2-9F22AE51DAC5</string>
<string>BF4EBA8B-65B6-40A5-B8BA-64B7EC13F40B</string>
<string>------------------------------------</string>
+ <string>30CF71AF-5DB6-4DFA-934D-0E1747657644</string>
+ <string>6882D307-5022-459D-BDA3-EA33BD8AF947</string>
+ <string>------------------------------------</string>
<string>43C66E91-F2C4-4E42-AF8E-21C1DB6401A2</string>
<string>2842C13E-C4F3-4DD4-86CE-C008A0AA461D</string>
<string>------------------------------------</string>
@@ -51,7 +54,6 @@
<string>13BB91B4-FF8A-49E1-8960-3EC352613482</string>
<string>A30E3888-8EA6-4DD9-BE1C-97BDBF5E09A5</string>
<string>------------------------------------</string>
- <string>30CF71AF-5DB6-4DFA-934D-0E1747657644</string>
</array>
<key>name</key>
<string>Directives</string>

0 comments on commit b19bcf9

Please sign in to comment.
Something went wrong with that request. Please try again.