Permalink
Browse files

Merge pull request #5 from jarhart/master

I fixed some problems and made some enhancements to the tmLanguage file
  • Loading branch information...
2 parents d8a2ccf + 235dfaf commit 901d5ad27adb9bbbefa079e70f4ec3bab6b3392e Greg Williams committed Feb 13, 2012
Showing with 14 additions and 10 deletions.
  1. +14 −10 RSpec.tmLanguage
View
@@ -50,7 +50,7 @@
<array>
<dict>
<key>match</key>
- <string>(?&lt;!\.)\b(before|after)\b(?![?!])</string>
+ <string>(?&lt;!\.)\b(before|after|subject|let)\b(?![?!])</string>
<key>name</key>
<string>keyword.other.rspec</string>
</dict>
@@ -90,7 +90,7 @@
</dict>
</dict>
<key>end</key>
- <string>\b(do)\s*$</string>
+ <string>\b(do(?=\s*$))|{</string>
<key>endCaptures</key>
<dict>
<key>1</key>
@@ -122,7 +122,7 @@
</dict>
</dict>
<key>end</key>
- <string>\b(do)\s*$</string>
+ <string>\b(do(?=\s*$))|{</string>
<key>endCaptures</key>
<dict>
<key>1</key>
@@ -143,21 +143,25 @@
</dict>
<key>pending</key>
<dict>
- <key>captures</key>
+ <key>begin</key>
+ <string>^\s*(it|specify)\b(?=((?!do|{).)*$)</string>
+ <key>end</key>
+ <string>$</string>
+ <key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>keyword.other.rspec.pending</string>
</dict>
- <key>2</key>
+ </dict>
+ <key>patterns</key>
+ <array>
<dict>
- <key>name</key>
- <string>string.ruby</string>
+ <key>include</key>
+ <string>source.ruby</string>
</dict>
- </dict>
- <key>match</key>
- <string>^\s*(it|specify)\s+(.*[^do])\s*$</string>
+ </array>
<key>name</key>
<string>meta.rspec.pending</string>
</dict>

0 comments on commit 901d5ad

Please sign in to comment.