[js] update grammar

This commit is contained in:
Martin Aeschlimann
2017-12-20 17:20:11 +01:00
parent 3118073c73
commit 7c5c8d59db
3 changed files with 75 additions and 39 deletions

View File

@@ -4,7 +4,7 @@
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/06831946d0a23cb56be0c1ead7cab10be01306cd",
"version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/1d2625adfc812f02e7dd5e7b06a859b9ef2a2de2",
"name": "JavaScript (with React support)",
"scopeName": "source.js",
"fileTypes": [
@@ -143,6 +143,19 @@
]
},
"expression": {
"patterns": [
{
"include": "#expressionWithoutIdentifiers"
},
{
"include": "#identifiers"
},
{
"include": "#expressionPunctuations"
}
]
},
"expressionWithoutIdentifiers": {
"patterns": [
{
"include": "#jsx"
@@ -192,12 +205,13 @@
{
"include": "#support-objects"
},
{
"include": "#identifiers"
},
{
"include": "#paren-expression"
},
}
]
},
"expressionPunctuations": {
"patterns": [
{
"include": "#punctuation-comma"
},
@@ -1250,11 +1264,6 @@
}
},
"end": "(?=\\{)",
"endCaptures": {
"1": {
"name": "punctuation.definition.block.js"
}
},
"patterns": [
{
"include": "#comment"
@@ -1266,7 +1275,10 @@
"include": "#type-parameters"
},
{
"match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\.)(?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s*\\.\\s*[_$[:alpha:]][_$[:alnum:]]*)*\\s*([,<{]|extends|implements|//|/\\*))",
"include": "#expressionWithoutIdentifiers"
},
{
"match": "([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\.)(?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s*\\.\\s*[_$[:alpha:]][_$[:alnum:]]*)*\\s*)",
"captures": {
"1": {
"name": "entity.name.type.module.js"
@@ -1277,7 +1289,7 @@
}
},
{
"match": "([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*([,<{]|extends|implements|//|/\\*))",
"match": "([_$[:alpha:]][_$[:alnum:]]*)",
"captures": {
"1": {
"name": "entity.other.inherited-class.js"
@@ -1285,7 +1297,7 @@
}
},
{
"include": "#expression"
"include": "#expressionPunctuations"
}
]
},