diff options
| -rw-r--r-- | api-notation.YAML-tmLanguage | 27 | ||||
| -rw-r--r-- | api-notation.tmLanguage | 32 |
2 files changed, 35 insertions, 24 deletions
diff --git a/api-notation.YAML-tmLanguage b/api-notation.YAML-tmLanguage index e1f8462..d731252 100644 --- 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 diff --git a/api-notation.tmLanguage b/api-notation.tmLanguage index a7200de..e546929 100644 --- a/api-notation.tmLanguage +++ b/api-notation.tmLanguage @@ -12,7 +12,7 @@ <array> <dict> <key>begin</key> - <string>^([a-zA-Z0-9_.]+)</string> + <string>([a-zA-Z0-9_.]+)</string> <key>end</key> <string>\n</string> <key>name</key> @@ -31,7 +31,15 @@ </dict> <dict> <key>begin</key> - <string>[ \t]*</string> + <string>^//.*</string> + <key>end</key> + <string>\n</string> + <key>name</key> + <string>comment.line</string> + </dict> + <dict> + <key>begin</key> + <string>[ \t]+</string> <key>end</key> <string>\n</string> <key>patterns</key> @@ -94,7 +102,7 @@ </dict> </dict> <key>match</key> - <string>((?:<\\+)|(?:<\\~)|(?:<\\-)|(?:\\+>)|(?:\\~>)|(?:\\->)|\\-|\\+|(?:::)|#)([a-zA-z0-9_]+)</string> + <string>((?:<\+)|(?:<\~)|(?:<\-)|(?:\+>)|(?:\~>)|(?:\->)|\-|\+|(?:::)|#)([a-zA-z0-9_]+)</string> </dict> <key>comment</key> <dict> @@ -113,9 +121,9 @@ <key>dataTypes</key> <dict> <key>begin</key> - <string>\\<</string> + <string>\<</string> <key>end</key> - <string>\\></string> + <string>\></string> <key>name</key> <string>keyword.operator</string> <key>patterns</key> @@ -133,7 +141,7 @@ <key>operators</key> <dict> <key>match</key> - <string>(?:\\->)|(?:\\=>)</string> + <string>(?:\->)|(?:\=>)</string> <key>name</key> <string>keyword.control</string> </dict> @@ -142,14 +150,14 @@ <key>match</key> <string>[a-zA-Z0-9_.]+</string> <key>name</key> - <string>meta.separator</string> + <string>comment.line</string> </dict> <key>optionalParameters</key> <dict> <key>begin</key> - <string>\\[</string> + <string>\[</string> <key>end</key> - <string>\\]</string> + <string>\]</string> <key>patterns</key> <array> <dict> @@ -161,9 +169,9 @@ <key>parameterList</key> <dict> <key>begin</key> - <string>\\(</string> + <string>\(</string> <key>end</key> - <string>\\)</string> + <string>\)</string> <key>name</key> <string>keyword.operator</string> <key>patterns</key> @@ -196,7 +204,7 @@ <key>separators</key> <dict> <key>match</key> - <string>\\||,</string> + <string>\||,</string> <key>name</key> <string>comment.line</string> </dict> |