Skip to content

Commit a9ad6eb

Browse files
sheetalkamatsheetalkamat
committed
Match template strings while matching strings
Fixes #661
1 parent 67d50d2 commit a9ad6eb

File tree

5 files changed

+232
-43
lines changed

5 files changed

+232
-43
lines changed

‎TypeScript.YAML-tmLanguage‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ variables:
1212
propertyAccessPreIdentifier: \??\.\s*
1313
identifier: '[_$[:alpha:]][_$[:alnum:]]*'
1414
constantIdentifier: '[[:upper:]][_$[:digit:][:upper:]]*'
15-
quotedStrings: (\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")
15+
quotedStrings: (\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)
1616
nonIdentifierPropertyName: '{{quotedStrings}}|(\[([^\[\]]|\[[^\[\]]*\])+\])'
1717
label: ({{identifier}})\s*(:)
1818
hexNumber: \b(?<!\$)0(x|X)[0-9a-fA-F][0-9a-fA-F_]*\b(?!\$)
@@ -136,7 +136,6 @@ repository:
136136
statements:
137137
patterns:
138138
- include: '#string'
139-
- include: '#template'
140139
- include: '#comment'
141140
- include: '#declaration'
142141
- include: '#control-statement'
@@ -212,7 +211,6 @@ repository:
212211
patterns:
213212
- include: '#string'
214213
- include: '#regex'
215-
- include: '#template'
216214
- include: '#comment'
217215
- include: '#function-expression'
218216
- include: '#class-expression'
@@ -2321,6 +2319,7 @@ repository:
23212319
patterns:
23222320
- include: '#qstring-single'
23232321
- include: '#qstring-double'
2322+
- include: '#template'
23242323

23252324
qstring-double:
23262325
name: string.quoted.double.ts

‎TypeScript.tmLanguage‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@
4747
<key>include</key>
4848
<string>#string</string>
4949
</dict>
50-
<dict>
51-
<key>include</key>
52-
<string>#template</string>
53-
</dict>
5450
<dict>
5551
<key>include</key>
5652
<string>#comment</string>
@@ -299,10 +295,6 @@
299295
<key>include</key>
300296
<string>#regex</string>
301297
</dict>
302-
<dict>
303-
<key>include</key>
304-
<string>#template</string>
305-
</dict>
306298
<dict>
307299
<key>include</key>
308300
<string>#comment</string>
@@ -1023,7 +1015,7 @@
10231015
(?:\b[0-9][0-9_]*(\.)\B)| # 1.
10241016
(?:\B(\.)[0-9][0-9_]*\b)| # .1
10251017
(?:\b[0-9][0-9_]*\b(?!\.)) # 1
1026-
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))</string>
1018+
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))</string>
10271019
<key>end</key>
10281020
<string>(?=,|\})</string>
10291021
<key>patterns</key>
@@ -1075,7 +1067,7 @@
10751067
(?:\b[0-9][0-9_]*(\.)\B)| # 1.
10761068
(?:\B(\.)[0-9][0-9_]*\b)| # .1
10771069
(?:\b[0-9][0-9_]*\b(?!\.)) # 1
1078-
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))</string>
1070+
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))</string>
10791071
<key>end</key>
10801072
<string>(?=,|\})</string>
10811073
<key>patterns</key>
@@ -1120,7 +1112,7 @@
11201112
(?:\b[0-9][0-9_]*(\.)\B)| # 1.
11211113
(?:\B(\.)[0-9][0-9_]*\b)| # .1
11221114
(?:\b[0-9][0-9_]*\b(?!\.)) # 1
1123-
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))</string>
1115+
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))</string>
11241116
<key>end</key>
11251117
<string>(:)</string>
11261118
<key>endCaptures</key>
@@ -1652,7 +1644,7 @@
16521644
(?:\b[0-9][0-9_]*(\.)\B)| # 1.
16531645
(?:\B(\.)[0-9][0-9_]*\b)| # .1
16541646
(?:\b[0-9][0-9_]*\b(?!\.)) # 1
1655-
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))</string>
1647+
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))</string>
16561648
<key>end</key>
16571649
<string>(?=,|\})</string>
16581650
<key>patterns</key>
@@ -1821,7 +1813,7 @@
18211813
(?:\b[0-9][0-9_]*(\.)\B)| # 1.
18221814
(?:\B(\.)[0-9][0-9_]*\b)| # .1
18231815
(?:\b[0-9][0-9_]*\b(?!\.)) # 1
1824-
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\?\s*)?(=|:|;|,|$))</string>
1816+
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\?\s*)?(=|:|;|,|$))</string>
18251817
<key>beginCaptures</key>
18261818
<dict>
18271819
<key>1</key>
@@ -1840,7 +1832,7 @@
18401832
(?:\b[0-9][0-9_]*(\.)\B)| # 1.
18411833
(?:\B(\.)[0-9][0-9_]*\b)| # .1
18421834
(?:\b[0-9][0-9_]*\b(?!\.)) # 1
1843-
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\?\s*)?(=|:|;|,|$))))|(?&lt;=\})</string>
1835+
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\?\s*)?(=|:|;|,|$))))|(?&lt;=\})</string>
18441836
<key>patterns</key>
18451837
<array>
18461838
<dict>
@@ -2263,7 +2255,7 @@
22632255
(?:\b[0-9][0-9_]*(\.)\B)| # 1.
22642256
(?:\B(\.)[0-9][0-9_]*\b)| # .1
22652257
(?:\b[0-9][0-9_]*\b(?!\.)) # 1
2266-
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*[\(\&lt;])</string>
2258+
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*[\(\&lt;])</string>
22672259
<key>beginCaptures</key>
22682260
<dict>
22692261
<key>1</key>
@@ -2322,7 +2314,7 @@
23222314
(?:\b[0-9][0-9_]*(\.)\B)| # 1.
23232315
(?:\B(\.)[0-9][0-9_]*\b)| # .1
23242316
(?:\b[0-9][0-9_]*\b(?!\.)) # 1
2325-
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*[\(\&lt;])</string>
2317+
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*[\(\&lt;])</string>
23262318
<key>beginCaptures</key>
23272319
<dict>
23282320
<key>1</key>
@@ -2364,7 +2356,7 @@
23642356
(?:\b[0-9][0-9_]*(\.)\B)| # 1.
23652357
(?:\B(\.)[0-9][0-9_]*\b)| # .1
23662358
(?:\b[0-9][0-9_]*\b(?!\.)) # 1
2367-
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*[\(\&lt;])</string>
2359+
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*[\(\&lt;])</string>
23682360
<key>beginCaptures</key>
23692361
<dict>
23702362
<key>1</key>
@@ -2407,7 +2399,7 @@
24072399
(?:\b[0-9][0-9_]*(\.)\B)| # 1.
24082400
(?:\B(\.)[0-9][0-9_]*\b)| # .1
24092401
(?:\b[0-9][0-9_]*\b(?!\.)) # 1
2410-
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??)\s*[\(\&lt;])</string>
2402+
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??)\s*[\(\&lt;])</string>
24112403
<key>end</key>
24122404
<string>(?=\(|\&lt;)</string>
24132405
<key>patterns</key>
@@ -3165,7 +3157,7 @@
31653157
</dict>
31663158
<dict>
31673159
<key>begin</key>
3168-
<string>(?=((\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\])))</string>
3160+
<string>(?=((\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\])))</string>
31693161
<key>end</key>
31703162
<string>(?=,|\}|$)</string>
31713163
<key>patterns</key>
@@ -6841,6 +6833,10 @@
68416833
<key>include</key>
68426834
<string>#qstring-double</string>
68436835
</dict>
6836+
<dict>
6837+
<key>include</key>
6838+
<string>#template</string>
6839+
</dict>
68446840
</array>
68456841
</dict>
68466842
<key>qstring-double</key>
@@ -7501,7 +7497,7 @@
75017497
<key>name</key>
75027498
<string>comment.line.triple-slash.directive.ts</string>
75037499
<key>begin</key>
7504-
<string>^(///)\s*(?=&lt;(reference|amd-dependency|amd-module)(\s+(path|types|no-default-lib|lib|name)\s*=\s*((\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")))+\s*/&gt;\s*$)</string>
7500+
<string>^(///)\s*(?=&lt;(reference|amd-dependency|amd-module)(\s+(path|types|no-default-lib|lib|name)\s*=\s*((\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)))+\s*/&gt;\s*$)</string>
75057501
<key>beginCaptures</key>
75067502
<dict>
75077503
<key>1</key>

‎TypeScriptReact.tmLanguage‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@
4747
<key>include</key>
4848
<string>#string</string>
4949
</dict>
50-
<dict>
51-
<key>include</key>
52-
<string>#template</string>
53-
</dict>
5450
<dict>
5551
<key>include</key>
5652
<string>#comment</string>
@@ -303,10 +299,6 @@
303299
<key>include</key>
304300
<string>#regex</string>
305301
</dict>
306-
<dict>
307-
<key>include</key>
308-
<string>#template</string>
309-
</dict>
310302
<dict>
311303
<key>include</key>
312304
<string>#comment</string>
@@ -1027,7 +1019,7 @@
10271019
(?:\b[0-9][0-9_]*(\.)\B)| # 1.
10281020
(?:\B(\.)[0-9][0-9_]*\b)| # .1
10291021
(?:\b[0-9][0-9_]*\b(?!\.)) # 1
1030-
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))</string>
1022+
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))</string>
10311023
<key>end</key>
10321024
<string>(?=,|\})</string>
10331025
<key>patterns</key>
@@ -1079,7 +1071,7 @@
10791071
(?:\b[0-9][0-9_]*(\.)\B)| # 1.
10801072
(?:\B(\.)[0-9][0-9_]*\b)| # .1
10811073
(?:\b[0-9][0-9_]*\b(?!\.)) # 1
1082-
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))</string>
1074+
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))</string>
10831075
<key>end</key>
10841076
<string>(?=,|\})</string>
10851077
<key>patterns</key>
@@ -1124,7 +1116,7 @@
11241116
(?:\b[0-9][0-9_]*(\.)\B)| # 1.
11251117
(?:\B(\.)[0-9][0-9_]*\b)| # .1
11261118
(?:\b[0-9][0-9_]*\b(?!\.)) # 1
1127-
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))</string>
1119+
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))</string>
11281120
<key>end</key>
11291121
<string>(:)</string>
11301122
<key>endCaptures</key>
@@ -1656,7 +1648,7 @@
16561648
(?:\b[0-9][0-9_]*(\.)\B)| # 1.
16571649
(?:\B(\.)[0-9][0-9_]*\b)| # .1
16581650
(?:\b[0-9][0-9_]*\b(?!\.)) # 1
1659-
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))</string>
1651+
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(:))</string>
16601652
<key>end</key>
16611653
<string>(?=,|\})</string>
16621654
<key>patterns</key>
@@ -1825,7 +1817,7 @@
18251817
(?:\b[0-9][0-9_]*(\.)\B)| # 1.
18261818
(?:\B(\.)[0-9][0-9_]*\b)| # .1
18271819
(?:\b[0-9][0-9_]*\b(?!\.)) # 1
1828-
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\?\s*)?(=|:|;|,|$))</string>
1820+
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\?\s*)?(=|:|;|,|$))</string>
18291821
<key>beginCaptures</key>
18301822
<dict>
18311823
<key>1</key>
@@ -1844,7 +1836,7 @@
18441836
(?:\b[0-9][0-9_]*(\.)\B)| # 1.
18451837
(?:\B(\.)[0-9][0-9_]*\b)| # .1
18461838
(?:\b[0-9][0-9_]*\b(?!\.)) # 1
1847-
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\?\s*)?(=|:|;|,|$))))|(?&lt;=\})</string>
1839+
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\?\s*)?(=|:|;|,|$))))|(?&lt;=\})</string>
18481840
<key>patterns</key>
18491841
<array>
18501842
<dict>
@@ -2267,7 +2259,7 @@
22672259
(?:\b[0-9][0-9_]*(\.)\B)| # 1.
22682260
(?:\B(\.)[0-9][0-9_]*\b)| # .1
22692261
(?:\b[0-9][0-9_]*\b(?!\.)) # 1
2270-
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*[\(\&lt;])</string>
2262+
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*[\(\&lt;])</string>
22712263
<key>beginCaptures</key>
22722264
<dict>
22732265
<key>1</key>
@@ -2326,7 +2318,7 @@
23262318
(?:\b[0-9][0-9_]*(\.)\B)| # 1.
23272319
(?:\B(\.)[0-9][0-9_]*\b)| # .1
23282320
(?:\b[0-9][0-9_]*\b(?!\.)) # 1
2329-
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*[\(\&lt;])</string>
2321+
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*[\(\&lt;])</string>
23302322
<key>beginCaptures</key>
23312323
<dict>
23322324
<key>1</key>
@@ -2368,7 +2360,7 @@
23682360
(?:\b[0-9][0-9_]*(\.)\B)| # 1.
23692361
(?:\B(\.)[0-9][0-9_]*\b)| # .1
23702362
(?:\b[0-9][0-9_]*\b(?!\.)) # 1
2371-
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*[\(\&lt;])</string>
2363+
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??))\s*[\(\&lt;])</string>
23722364
<key>beginCaptures</key>
23732365
<dict>
23742366
<key>1</key>
@@ -2411,7 +2403,7 @@
24112403
(?:\b[0-9][0-9_]*(\.)\B)| # 1.
24122404
(?:\B(\.)[0-9][0-9_]*\b)| # .1
24132405
(?:\b[0-9][0-9_]*\b(?!\.)) # 1
2414-
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??)\s*[\(\&lt;])</string>
2406+
)(?!\$))|([_$[:alpha:]][_$[:alnum:]]*)|(\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\]))\s*(\??)\s*[\(\&lt;])</string>
24152407
<key>end</key>
24162408
<string>(?=\(|\&lt;)</string>
24172409
<key>patterns</key>
@@ -3169,7 +3161,7 @@
31693161
</dict>
31703162
<dict>
31713163
<key>begin</key>
3172-
<string>(?=((\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\[([^\[\]]|\[[^\[\]]*\])+\])))</string>
3164+
<string>(?=((\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)|(\[([^\[\]]|\[[^\[\]]*\])+\])))</string>
31733165
<key>end</key>
31743166
<string>(?=,|\}|$)</string>
31753167
<key>patterns</key>
@@ -6787,6 +6779,10 @@
67876779
<key>include</key>
67886780
<string>#qstring-double</string>
67896781
</dict>
6782+
<dict>
6783+
<key>include</key>
6784+
<string>#template</string>
6785+
</dict>
67906786
</array>
67916787
</dict>
67926788
<key>qstring-double</key>
@@ -7447,7 +7443,7 @@
74477443
<key>name</key>
74487444
<string>comment.line.triple-slash.directive.tsx</string>
74497445
<key>begin</key>
7450-
<string>^(///)\s*(?=&lt;(reference|amd-dependency|amd-module)(\s+(path|types|no-default-lib|lib|name)\s*=\s*((\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")))+\s*/&gt;\s*$)</string>
7446+
<string>^(///)\s*(?=&lt;(reference|amd-dependency|amd-module)(\s+(path|types|no-default-lib|lib|name)\s*=\s*((\'([^\'\\]|\\\'|\\)*\')|(\"([^\"\\]|\\\"|\\)*\")|(\`([^\`\\]|\\\`|\\)*\`)))+\s*/&gt;\s*$)</string>
74517447
<key>beginCaptures</key>
74527448
<dict>
74537449
<key>1</key>

0 commit comments

Comments
 (0)