Merge branch 'master' of git.sr.ht:~rbdr/api-notation.tmLanguage

[rbdr/api-notation.tmLanguage] / api-notation.YAML-tmLanguage

diff --git a/api-notation.YAML-tmLanguage b/api-notation.YAML-tmLanguage
index e1f84624d569143a9b7ce39a5eb85b8312e3e35e..d7312523e0c47a1f0f41304a81a0814127cb6512 100644 (file)
--- a/api-notation.YAML-tmLanguage
+++ b/api-notation.YAML-tmLanguage
@@ -5,13 +5,16 @@ scopeName: source.api-notation
 fileTypes: ['api']
 uuid: fc8dc5cf-b7aa-4b64-a665-80e8dc1b2553
 patterns:
-  - begin: '^([a-zA-Z0-9_.]+)'
+  - begin: '([a-zA-Z0-9_.]+)'
     end: '\n'
     name: constant.language
     patterns:
       - include: '#dataTypes'
       - include: '#comment'
-  - begin: '[ \t]*'
+  - begin: '^//.*'
+    end: '\n'
+    name: 'comment.line'
+  - begin: '[ \t]+'
     end: '\n'
     patterns:
       - include: '#apiMember'
@@ -26,15 +29,15 @@ patterns:
       - include: '#comment'
 repository:
   dataTypes:
-    begin: '\\<'
-    end: '\\>'
+    begin: '\<'
+    end: '\>'
     name: 'keyword.operator'
     patterns:
       - include: '#dataType'
       - include: '#separators'
   parameterList:
-    begin: '\\('
-    end: '\\)'
+    begin: '\('
+    end: '\)'
     name: 'keyword.operator'
     patterns:
       - 'include': '#parameters'
@@ -48,18 +51,18 @@ repository:
     match: '[a-zA-Z0-9_.]+'
     name: 'string.other'
   optionalParameters:
-    begin: '\\['
-    end: '\\]'
+    begin: '\['
+    end: '\]'
     patterns:
       - 'include': '#optionalParameter'
   optionalParameter:
     match: '[a-zA-Z0-9_.]+'
-    name: 'meta.separator'
+    name: 'comment.line'
   separators:
-    match: '\\||,'
+    match: '\||,'
     name: 'comment.line'
   apiMember:
-    match: '((?:<\\+)|(?:<\\~)|(?:<\\-)|(?:\\+>)|(?:\\~>)|(?:\\->)|\\-|\\+|(?:::)|#)([a-zA-z0-9_]+)'
+    match: '((?:<\+)|(?:<\~)|(?:<\-)|(?:\+>)|(?:\~>)|(?:\->)|\-|\+|(?:::)|#)([a-zA-z0-9_]+)'
     captures:
       '1':
         name: 'keyword.control'
@@ -69,5 +72,5 @@ repository:
     match: '[ \t]*//[ \t]*.*'
     name: 'comment.line'
   operators:
-    match: '(?:\\->)|(?:\\=>)'
+    match: '(?:\->)|(?:\=>)'
     name: 'keyword.control'
\ No newline at end of file