Permalink
Browse files

Scope packages separately in imports

  • Loading branch information...
1 parent 4794843 commit fa5cb9139a40653d409735748c972253c0cfac86 @sellmerfud committed May 30, 2012
Showing with 8 additions and 16 deletions.
  1. +8 −16 Syntaxes/Scala.tmLanguage
View
@@ -541,24 +541,16 @@
<string>#comments</string>
</dict>
<dict>
- <key>captures</key>
- <dict>
- <key>1</key>
- <dict>
- <key>name</key>
- <string>punctuation.definition.import</string>
- </dict>
- </dict>
<key>match</key>
- <string>(?:[^\s{;.]+)\s*(\.)\s*</string>
+ <string>([^\s{;.]+)\s*</string>
<key>name</key>
- <string>variable.package.scala</string>
+ <string>variable.import.scala</string>
</dict>
<dict>
<key>match</key>
- <string>([^\s{;.]+)\s*</string>
+ <string>\.</string>
<key>name</key>
- <string>variable.import.scala</string>
+ <string>punctuation.definition.import</string>
</dict>
<dict>
<key>begin</key>
@@ -606,10 +598,10 @@
</dict>
<key>match</key>
<string>(?x) \s*
- ([^\s.,}]+) \s*
- (=&gt;) \s*
- ([^\s.,}]+) \s*
- </string>
+ ([^\s.,}]+) \s*
+ (=&gt;) \s*
+ ([^\s.,}]+) \s*
+ </string>
</dict>
<dict>
<key>match</key>

0 comments on commit fa5cb91

Please sign in to comment.