|
4 | 4 | "If you want to provide a fix or improvement, please create a pull request against the original repository.", |
5 | 5 | "Once accepted there, we are happy to receive an update request." |
6 | 6 | ], |
7 | | - "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/8e4e371fe8dd57560b16a44474f8cf8ca981e715", |
| 7 | + "version": "https://github.com/microsoft/TypeScript-TmLanguage/commit/d1a9c200322c3dc3fb8a9d0e0912b478cdf973ff", |
8 | 8 | "name": "JavaScript (with React support)", |
9 | 9 | "scopeName": "source.js", |
10 | 10 | "patterns": [ |
|
134 | 134 | "name": "keyword.control.flow.js" |
135 | 135 | } |
136 | 136 | }, |
137 | | - "end": "(?=[;}]|$|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))", |
| 137 | + "end": "(?=[;}]|$|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", |
138 | 138 | "patterns": [ |
139 | 139 | { |
140 | 140 | "include": "#expression" |
|
299 | 299 | { |
300 | 300 | "name": "meta.var.expr.js", |
301 | 301 | "begin": "(?=(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))", |
302 | | - "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))|((?<!^let|[^\\._$[:alnum:]]let|^var|[^\\._$[:alnum:]]var)(?=\\s*$)))", |
| 302 | + "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))|((?<!^let|[^\\._$[:alnum:]]let|^var|[^\\._$[:alnum:]]var)(?=\\s*$)))", |
303 | 303 | "patterns": [ |
304 | 304 | { |
305 | 305 | "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(var|let)(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*", |
|
373 | 373 | "name": "storage.type.js" |
374 | 374 | } |
375 | 375 | }, |
376 | | - "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))|((?<!^const|[^\\._$[:alnum:]]const)(?=\\s*$)))", |
| 376 | + "end": "(?!(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.)))((?=;|}|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+)|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))|((?<!^const|[^\\._$[:alnum:]]const)(?=\\s*$)))", |
377 | 377 | "patterns": [ |
378 | 378 | { |
379 | 379 | "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(?:(\\bexport)\\s+)?(?:(\\bdeclare)\\s+)?\\b(const(?!\\s+enum\\b))(?![_$[:alnum:]])(?:(?=\\.\\.\\.)|(?!\\.))\\s*", |
|
448 | 448 | "name": "keyword.operator.definiteassignment.js" |
449 | 449 | } |
450 | 450 | }, |
451 | | - "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))", |
| 451 | + "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))|(;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", |
452 | 452 | "patterns": [ |
453 | 453 | { |
454 | 454 | "include": "#var-single-variable-type-annotation" |
|
466 | 466 | "name": "keyword.operator.definiteassignment.js" |
467 | 467 | } |
468 | 468 | }, |
469 | | - "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))", |
| 469 | + "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))|(;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", |
470 | 470 | "patterns": [ |
471 | 471 | { |
472 | 472 | "include": "#var-single-variable-type-annotation" |
|
484 | 484 | "name": "keyword.operator.definiteassignment.js" |
485 | 485 | } |
486 | 486 | }, |
487 | | - "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))", |
| 487 | + "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))|(;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", |
488 | 488 | "patterns": [ |
489 | 489 | { |
490 | 490 | "include": "#var-single-variable-type-annotation" |
|
503 | 503 | "name": "meta.definition.variable.js variable.other.constant.js entity.name.function.js" |
504 | 504 | } |
505 | 505 | }, |
506 | | - "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))", |
| 506 | + "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))|(;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", |
507 | 507 | "patterns": [ |
508 | 508 | { |
509 | 509 | "include": "#var-single-variable-type-annotation" |
|
518 | 518 | "name": "meta.definition.variable.js variable.other.constant.js" |
519 | 519 | } |
520 | 520 | }, |
521 | | - "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))", |
| 521 | + "end": "(?=$|^|[;,=}]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))|(;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", |
522 | 522 | "patterns": [ |
523 | 523 | { |
524 | 524 | "include": "#var-single-variable-type-annotation" |
|
989 | 989 | }, |
990 | 990 | { |
991 | 991 | "include": "#parameter-binding-element" |
| 992 | + }, |
| 993 | + { |
| 994 | + "include": "#paren-expression" |
992 | 995 | } |
993 | 996 | ] |
994 | 997 | }, |
|
1171 | 1174 | "name": "keyword.operator.assignment.js" |
1172 | 1175 | } |
1173 | 1176 | }, |
1174 | | - "end": "(?=[,);}\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))|(?=^\\s*$)|(?<=\\S)(?<!=)(?=\\s*$)", |
| 1177 | + "end": "(?=[,);}\\]]|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(of|in)\\s+))|(?=^\\s*$)|(?<![\\|\\&\\+\\-\\*\\/])(?<=\\S)(?<!=)(?=\\s*$)", |
1175 | 1178 | "patterns": [ |
1176 | 1179 | { |
1177 | 1180 | "include": "#expression" |
|
1203 | 1206 | "name": "meta.definition.function.js entity.name.function.js" |
1204 | 1207 | } |
1205 | 1208 | }, |
1206 | | - "end": "(?=;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))|(?<=\\})", |
| 1209 | + "end": "(?=;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))|(?<=\\})", |
1207 | 1210 | "patterns": [ |
1208 | 1211 | { |
1209 | 1212 | "include": "#function-name" |
|
1805 | 1808 | }, |
1806 | 1809 | { |
1807 | 1810 | "begin": "(?<=:)\\s*", |
1808 | | - "end": "(?=\\s|[;),}\\]:\\-\\+]|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))", |
| 1811 | + "end": "(?=\\s|[;),}\\]:\\-\\+]|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", |
1809 | 1812 | "patterns": [ |
1810 | 1813 | { |
1811 | 1814 | "include": "#expression" |
|
1966 | 1969 | "name": "storage.type.namespace.js" |
1967 | 1970 | } |
1968 | 1971 | }, |
1969 | | - "end": "(?<=\\})|(?=;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))", |
| 1972 | + "end": "(?<=\\})|(?=;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", |
1970 | 1973 | "patterns": [ |
1971 | 1974 | { |
1972 | 1975 | "include": "#comment" |
|
2003 | 2006 | "name": "entity.name.type.alias.js" |
2004 | 2007 | } |
2005 | 2008 | }, |
2006 | | - "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))", |
| 2009 | + "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", |
2007 | 2010 | "patterns": [ |
2008 | 2011 | { |
2009 | 2012 | "include": "#comment" |
|
2021 | 2024 | "name": "keyword.control.intrinsic.js" |
2022 | 2025 | } |
2023 | 2026 | }, |
2024 | | - "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))", |
| 2027 | + "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", |
2025 | 2028 | "patterns": [ |
2026 | 2029 | { |
2027 | 2030 | "include": "#type" |
|
2035 | 2038 | "name": "keyword.operator.assignment.js" |
2036 | 2039 | } |
2037 | 2040 | }, |
2038 | | - "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))", |
| 2041 | + "end": "(?=\\}|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", |
2039 | 2042 | "patterns": [ |
2040 | 2043 | { |
2041 | 2044 | "include": "#type" |
|
2226 | 2229 | "name": "keyword.control.default.js" |
2227 | 2230 | } |
2228 | 2231 | }, |
2229 | | - "end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))", |
| 2232 | + "end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", |
2230 | 2233 | "patterns": [ |
2231 | 2234 | { |
2232 | 2235 | "include": "#interface-declaration" |
|
2238 | 2241 | }, |
2239 | 2242 | { |
2240 | 2243 | "name": "meta.export.js", |
2241 | | - "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?\\b(?!(\\$)|(\\s*:))((?=\\s*[\\{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s|,))(?!\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b)))", |
| 2244 | + "begin": "(?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(export)(?:\\s+(type))?\\b(?!(\\$)|(\\s*:))((?=\\s*[\\{*])|((?=\\s*[_$[:alpha:]][_$[:alnum:]]*(\\s|,))(?!\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b)))", |
2242 | 2245 | "beginCaptures": { |
2243 | 2246 | "1": { |
2244 | 2247 | "name": "keyword.control.export.js" |
|
2247 | 2250 | "name": "keyword.control.type.js" |
2248 | 2251 | } |
2249 | 2252 | }, |
2250 | | - "end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))", |
| 2253 | + "end": "(?=$|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", |
2251 | 2254 | "patterns": [ |
2252 | 2255 | { |
2253 | 2256 | "include": "#import-export-declaration" |
|
2912 | 2915 | }, |
2913 | 2916 | { |
2914 | 2917 | "include": "#punctuation-comma" |
| 2918 | + }, |
| 2919 | + { |
| 2920 | + "include": "#decl-block" |
2915 | 2921 | } |
2916 | 2922 | ] |
2917 | 2923 | }, |
|
3317 | 3323 | "name": "keyword.control.satisfies.js" |
3318 | 3324 | } |
3319 | 3325 | }, |
3320 | | - "end": "(?=^|[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisifies)\\s+)|(\\s+\\<))", |
| 3326 | + "end": "(?=^|[;),}\\]:?\\-\\+\\>]|\\|\\||\\&\\&|\\!\\=\\=|$|((?<![_$[:alnum:]])(?:(?<=\\.\\.\\.)|(?<!\\.))(as|satisfies)\\s+)|(\\s+\\<))", |
3321 | 3327 | "patterns": [ |
3322 | 3328 | { |
3323 | 3329 | "include": "#type" |
|
3423 | 3429 | "name": "keyword.operator.expression.typeof.js" |
3424 | 3430 | } |
3425 | 3431 | }, |
3426 | | - "end": "(?=[,);}\\]=>:&|{\\?]|$|;|^\\s*$|(?:^\\s*(?:abstract|async|class|const|declare|enum|export|function|import|interface|let|module|namespace|return|type|var)\\b))", |
| 3432 | + "end": "(?=[,);}\\]=>:&|{\\?]|(extends\\s+)|$|;|^\\s*$|(?:^\\s*(?:abstract|async|break|case|catch|class|const|continue|declare|do|else|enum|export|finally|function|for|goto|if|import|interface|let|module|namespace|switch|return|throw|try|type|var|while)\\b))", |
3427 | 3433 | "patterns": [ |
| 3434 | + { |
| 3435 | + "include": "#type-arguments" |
| 3436 | + }, |
3428 | 3437 | { |
3429 | 3438 | "include": "#expression" |
3430 | 3439 | } |
|
3788 | 3797 | "name": "keyword.operator.type.annotation.js" |
3789 | 3798 | } |
3790 | 3799 | }, |
3791 | | - "end": "(?<![:|&])((?=$|^|[,);\\}\\]]|//)|(?==[^>])|((?<=[\\}>\\]\\)]|[_$[:alpha:]])\\s*(?=\\{)))", |
| 3800 | + "end": "(?<![:|&])(?!\\s*[|&]\\s+)((?=^|[,);\\}\\]]|//)|(?==[^>])|((?<=[\\}>\\]\\)]|[_$[:alpha:]])\\s*(?=\\{)))", |
3792 | 3801 | "patterns": [ |
3793 | 3802 | { |
3794 | 3803 | "include": "#type" |
|
3803 | 3812 | "name": "keyword.operator.type.annotation.js" |
3804 | 3813 | } |
3805 | 3814 | }, |
3806 | | - "end": "(?<![:|&])((?=[,);\\}\\]]|//)|(?==[^>])|(?=^\\s*$)|((?<=\\S)(?=\\s*$))|((?<=[\\}>\\]\\)]|[_$[:alpha:]])\\s*(?=\\{)))", |
| 3815 | + "end": "(?<![:|&])((?=[,);\\}\\]]|\\/\\/)|(?==[^>])|(?=^\\s*$)|((?<=[\\}>\\]\\)]|[_$[:alpha:]])\\s*(?=\\{)))", |
3807 | 3816 | "patterns": [ |
3808 | 3817 | { |
3809 | 3818 | "include": "#type" |
|
4650 | 4659 | "include": "#template-call" |
4651 | 4660 | }, |
4652 | 4661 | { |
4653 | | - "name": "string.template.js", |
| 4662 | + "contentName": "string.template.js", |
4654 | 4663 | "begin": "([_$[:alpha:]][_$[:alnum:]]*)?(`)", |
4655 | 4664 | "beginCaptures": { |
4656 | 4665 | "1": { |
4657 | 4666 | "name": "entity.name.function.tagged-template.js" |
4658 | 4667 | }, |
4659 | 4668 | "2": { |
4660 | | - "name": "punctuation.definition.string.template.begin.js" |
| 4669 | + "name": "string.template.js punctuation.definition.string.template.begin.js" |
4661 | 4670 | } |
4662 | 4671 | }, |
4663 | 4672 | "end": "`", |
4664 | 4673 | "endCaptures": { |
4665 | 4674 | "0": { |
4666 | | - "name": "punctuation.definition.string.template.end.js" |
| 4675 | + "name": "string.template.js punctuation.definition.string.template.end.js" |
4667 | 4676 | } |
4668 | 4677 | }, |
4669 | 4678 | "patterns": [ |
|
4680 | 4689 | "template-call": { |
4681 | 4690 | "patterns": [ |
4682 | 4691 | { |
4683 | | - "name": "string.template.js", |
4684 | 4692 | "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)?`)", |
4685 | 4693 | "end": "(?=`)", |
4686 | 4694 | "patterns": [ |
|
4703 | 4711 | ] |
4704 | 4712 | }, |
4705 | 4713 | { |
4706 | | - "name": "string.template.js", |
4707 | 4714 | "begin": "([_$[:alpha:]][_$[:alnum:]]*)?\\s*(?=(<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))(([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>|\\<\\s*(((keyof|infer|typeof|readonly)\\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\\{([^\\{\\}]|(\\{([^\\{\\}]|\\{[^\\{\\}]*\\})*\\}))*\\})|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(\\[([^\\[\\]]|(\\[([^\\[\\]]|\\[[^\\[\\]]*\\])*\\]))*\\])|(\\'([^\\'\\\\]|\\\\.)*\\')|(\\\"([^\\\"\\\\]|\\\\.)*\\\")|(\\`([^\\`\\\\]|\\\\.)*\\`))(?=\\s*([\\<\\>\\,\\.\\[]|=>|&(?!&)|\\|(?!\\|)))))([^<>\\(]|(\\(([^\\(\\)]|(\\(([^\\(\\)]|\\([^\\(\\)]*\\))*\\)))*\\))|(?<==)\\>)*(?<!=)\\>))*(?<!=)\\>)*(?<!=)>\\s*)`)", |
4708 | 4715 | "beginCaptures": { |
4709 | 4716 | "1": { |
|
4759 | 4766 | "include": "#template-call" |
4760 | 4767 | }, |
4761 | 4768 | { |
4762 | | - "name": "string.template.js", |
| 4769 | + "contentName": "string.template.js", |
4763 | 4770 | "begin": "([_$[:alpha:]][_$[:alnum:]]*)?(`)", |
4764 | 4771 | "beginCaptures": { |
4765 | 4772 | "1": { |
4766 | 4773 | "name": "entity.name.function.tagged-template.js" |
4767 | 4774 | }, |
4768 | 4775 | "2": { |
4769 | | - "name": "punctuation.definition.string.template.begin.js" |
| 4776 | + "name": "string.template.js punctuation.definition.string.template.begin.js" |
4770 | 4777 | } |
4771 | 4778 | }, |
4772 | 4779 | "end": "`", |
4773 | 4780 | "endCaptures": { |
4774 | 4781 | "0": { |
4775 | | - "name": "punctuation.definition.string.template.end.js" |
| 4782 | + "name": "string.template.js punctuation.definition.string.template.end.js" |
4776 | 4783 | } |
4777 | 4784 | }, |
4778 | 4785 | "patterns": [ |
|
0 commit comments