Permalink
Browse files

Thrift: Fix a few issues raised in the review

- Comment on the /$ ^/ pattern to explain it should never end
- comment.line scopes should include trailing newline
- Fix the #field repository item to work properly in some cases

git-svn-id: http://svn.textmate.org/trunk/Review/Bundles/Thrift.tmbundle@10125 dfb7d73b-c2ec-0310-8fea-fb051d288c6d
  • Loading branch information...
1 parent e17601d commit 850c906ef990d9616ccd93c59702e36c74a56f53 @kballard kballard committed Jul 3, 2008
Showing with 6 additions and 6 deletions.
  1. +6 −6 Syntaxes/Thrift.tmLanguage
View
12 Syntaxes/Thrift.tmLanguage
@@ -144,7 +144,7 @@
<key>comment</key>
<string>begin the definition list</string>
<key>end</key>
- <string>$ ^</string>
+ <string>(?x)$.^ # this regex should never end</string>
<key>patterns</key>
<array>
<dict>
@@ -686,7 +686,7 @@
</dict>
</dict>
<key>match</key>
- <string>(#).*</string>
+ <string>#.*\n?</string>
<key>name</key>
<string>comment.line.number-sign.thrift</string>
</dict>
@@ -700,7 +700,7 @@
</dict>
</dict>
<key>match</key>
- <string>(//).*</string>
+ <string>//.*\n?</string>
<key>name</key>
<string>comment.line.double-slash.thrift</string>
</dict>
@@ -777,7 +777,7 @@
</dict>
</dict>
<key>end</key>
- <string>[,;]|$</string>
+ <string>[,;]|(?=\))|$</string>
<key>endCaptures</key>
<dict>
<key>0</key>
@@ -820,14 +820,14 @@
</dict>
</dict>
<key>end</key>
- <string>(?=[,;])|$</string>
+ <string>(?=[,;]|\))|$</string>
<key>patterns</key>
<array>
<dict>
<key>begin</key>
<string>=</string>
<key>end</key>
- <string>[,;]|$</string>
+ <string>(?=[,;]|\))|$</string>
<key>patterns</key>
<array>
<dict>

0 comments on commit 850c906

Please sign in to comment.