Merge pull request #7 from tpoisot/master

roxygen docstring tags

Author: lee-dohm

grammars/r.cson

@@ -17,6 +17,24 @@
     'match': '^(#pragma[ \\t]+mark)[ \\t](.*)'
     'name': 'comment.line.pragma-mark.r'
   }
+  {
+    'begin': '#\'[ ]?(@[a-zA-Z0-9]+)'
+    'beginCaptures':
+      '0':
+        'name': 'punctuation.definition.comment.roxygen.r'
+      '1':
+        'name': 'keyword.roxygen.r'
+    'end': '\\n'
+    'name': 'comment.line.number-sign.roxygen.r'
+  }
+  {
+    'begin': '#\''
+    'beginCaptures':
+      '0':
+        'name': 'punctuation.definition.comment.roxygen.r'
+    'end': '\\n'
+    'name': 'comment.line.number-sign.roxygen.r'
+  }
   {
     'begin': '#'
     'beginCaptures':