Small tweaks to use classic-style tokens

This commit is contained in:
Alex Dima 2016-12-12 09:18:15 +01:00
parent b15a5d4b98
commit 03eaf41470
6 changed files with 46 additions and 52 deletions

View file

@ -69,8 +69,8 @@ export var language = <ILanguage> {
[/[{}()\[\]]/, '@brackets'],
[/[<>](?!@symbols)/, '@brackets'],
[/[.]/, 'delimiter'],
[/@operators/, 'keyword.operator'],
[/@symbols/, 'keyword.operator']
[/@operators/, 'operator'],
[/@symbols/, 'operator']
],
@ -106,7 +106,7 @@ export var language = <ILanguage> {
],
stringlit: [
[ /\\\(/, { token: 'keyword.operator', bracket: '@open', next: '@interpolatedexpression' } ],
[ /\\\(/, { token: 'operator', bracket: '@open', next: '@interpolatedexpression' } ],
[ /@escapes/, 'string' ],
[ /\\./, 'string.escape.invalid' ],
[ /"/, { token: 'string.quote', bracket: '@close', next: '@pop' } ],
@ -114,26 +114,26 @@ export var language = <ILanguage> {
],
interpolatedexpression: [
[ /\(/, { token: 'keyword.operator', bracket: '@open', next: '@interpolatedexpression' } ],
[ /\)/, { token: 'keyword.operator', bracket: '@close', next: '@pop' } ],
[ /\(/, { token: 'operator', bracket: '@open', next: '@interpolatedexpression' } ],
[ /\)/, { token: 'operator', bracket: '@close', next: '@pop' } ],
{ include: '@literal' },
{ include: '@keyword' },
{ include: '@symbol' }
],
keyword: [
[ /`/, { token: 'keyword.operator', bracket: '@open', next: '@escapedkeyword' } ],
[ /`/, { token: 'operator', bracket: '@open', next: '@escapedkeyword' } ],
[ /@identifier/, { cases: { '@keywords': 'keyword', '[A-Z][\a-zA-Z0-9$]*': 'type.identifier', '@default': 'identifier' } }]
],
escapedkeyword: [
[ /`/, { token: 'keyword.operator', bracket: '@close', next: '@pop' } ],
[ /`/, { token: 'operator', bracket: '@close', next: '@pop' } ],
[ /./, 'identifier' ]
],
// symbol: [
// [ /@symbols/, 'keyword.operator' ],
// [ /@operators/, 'keyword.operator' ]
// [ /@symbols/, 'operator' ],
// [ /@operators/, 'operator' ]
// ],
invokedmethod: [