Permalink
Browse files

• merged pull request to improve indentation [Thanks to Jon Claydon]

• added "#pragma mark" support (known from C) to improve structuring the Symbol List
• fixed scope for displaying functions and generic stuff in Symbol List
  • Loading branch information...
1 parent 6c33e27 commit 6555bd64e906a867e8442cecad947915f1341942 Bibiko committed with infininight Jan 12, 2012
@@ -5,7 +5,7 @@
<key>name</key>
<string>Symbol List: Method</string>
<key>scope</key>
- <string>meta.method.declaration.r</string>
+ <string>entity.name.function entity.name.tag</string>
<key>settings</key>
<dict>
<key>showInSymbolList</key>
@@ -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: Pragma</string>
+ <key>scope</key>
+ <string>comment.line.pragma-mark</string>
+ <key>settings</key>
+ <dict>
+ <key>showInSymbolList</key>
+ <integer>1</integer>
+ <key>symbolTransformation</key>
+ <string>s/^.*?mark\s+\-+\s*/-/;s/^.*?mark\s+([^\-].+?)/# $1/;s/\s+$//;</string>
+ </dict>
+ <key>uuid</key>
+ <string>E4D3F9E2-CE92-4142-B164-0CE1EB1AD453</string>
+</dict>
+</plist>
View
@@ -16,5 +16,3 @@ If not otherwise specified (see below), files in this repository fall under the
software is granted. This software is provided "as is" without
express or implied warranty, and with no claim as to its
suitability for any purpose.
-
-An exception is made for files in readable text which contain their own license information, or files where an accompanying file exists (in the same directory) with a “-license” suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example “tidy” is accompanied by “tidy-license.txt”.
@@ -237,8 +237,8 @@ In addition there is the bundle "R Console (R.app)" available. This bundle allow
***Date: Jan 12 2012***
<pre>
-- Charilaos Skiadas&nbsp;<a href="mailto:cskiadas@gmail.com">cskiadas@gmail.com</a>
- Hans-Jörg Bibiko&nbsp;&nbsp;<a href="mailto:bibiko@eva.mpg.de">bibiko@eva.mpg.de</a>
+- Charilaos Skiadas&nbsp;<a href="mailto:cskiadas@gmail.com">cskiadas@gmail.com</a>
</pre>
## Credits
@@ -247,6 +247,8 @@ Many thanks to
<pre>
- John Purnell
- Balthasar Bickel
+- Jon Claydon
+- Bernd Hasselman
</pre>
for all the valuable suggestions and the exhausting tests.
View
@@ -16,6 +16,25 @@
<string>R</string>
<key>patterns</key>
<array>
+ <dict>
+ <key>captures</key>
+ <dict>
+ <key>1</key>
+ <dict>
+ <key>name</key>
+ <string>comment.line.pragma.r</string>
+ </dict>
+ <key>2</key>
+ <dict>
+ <key>name</key>
+ <string>entity.name.pragma.name.r</string>
+ </dict>
+ </dict>
+ <key>match</key>
+ <string>^(#pragma[ \t]+mark)[ \t](.*)</string>
+ <key>name</key>
+ <string>comment.line.pragma-mark.r</string>
+ </dict>
<dict>
<key>begin</key>
<string>(^[ \t]+)?(?=#)</string>

0 comments on commit 6555bd6

Please sign in to comment.