Skip to content

Commit 0d73d11

Browse files
authored
Remove string.template scope from identifier<typeArgruments> of template function call (#962)
Fixes #916
1 parent 0ed86a7 commit 0d73d11

9 files changed

+109
-67
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2675,22 +2675,21 @@ repository:
26752675
template:
26762676
patterns:
26772677
- include: '#template-call'
2678-
- name: string.template.ts
2678+
- contentName: string.template.ts
26792679
begin: '({{identifier}})?(`)'
26802680
beginCaptures:
26812681
'1': { name: entity.name.function.tagged-template.ts }
2682-
'2': { name: punctuation.definition.string.template.begin.ts }
2682+
'2': { name: string.template.ts punctuation.definition.string.template.begin.ts }
26832683
end: '`'
26842684
endCaptures:
2685-
'0': { name: punctuation.definition.string.template.end.ts}
2685+
'0': { name: string.template.ts punctuation.definition.string.template.end.ts}
26862686
patterns:
26872687
- include: '#template-substitution-element'
26882688
- include: '#string-character-escape'
26892689

26902690
template-call:
26912691
patterns:
2692-
- name: string.template.ts
2693-
begin: (?=(({{identifier}}\s*{{propertyAccessPreIdentifier}})*|({{propertyAccessPreIdentifier}})?)({{identifier}})({{typeArguments}}\s*)?`)
2692+
- begin: (?=(({{identifier}}\s*{{propertyAccessPreIdentifier}})*|({{propertyAccessPreIdentifier}})?)({{identifier}})({{typeArguments}}\s*)?`)
26942693
end: (?=`)
26952694
patterns:
26962695
- begin: (?=(({{identifier}}\s*{{propertyAccessPreIdentifier}})*|({{propertyAccessPreIdentifier}})?)({{identifier}}))
@@ -2700,8 +2699,7 @@ repository:
27002699
- name: entity.name.function.tagged-template.ts
27012700
match: ({{identifier}})
27022701
- include: '#type-arguments'
2703-
- name: string.template.ts
2704-
begin: ({{identifier}})?\s*(?=({{typeArguments}}\s*)`)
2702+
- begin: ({{identifier}})?\s*(?=({{typeArguments}}\s*)`)
27052703
beginCaptures:
27062704
'1': { name: entity.name.function.tagged-template.ts }
27072705
end: (?=`)
@@ -2729,14 +2727,14 @@ repository:
27292727
template-type:
27302728
patterns:
27312729
- include: '#template-call'
2732-
- name: string.template.ts
2730+
- contentName: string.template.ts
27332731
begin: '({{identifier}})?(`)'
27342732
beginCaptures:
27352733
'1': { name: entity.name.function.tagged-template.ts }
2736-
'2': { name: punctuation.definition.string.template.begin.ts }
2734+
'2': { name: string.template.ts punctuation.definition.string.template.begin.ts }
27372735
end: '`'
27382736
endCaptures:
2739-
'0': { name: punctuation.definition.string.template.end.ts}
2737+
'0': { name: string.template.ts punctuation.definition.string.template.end.ts}
27402738
patterns:
27412739
- include: '#template-type-substitution-element'
27422740
- include: '#string-character-escape'

TypeScript.tmLanguage

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8119,7 +8119,7 @@
81198119
<string>#template-call</string>
81208120
</dict>
81218121
<dict>
8122-
<key>name</key>
8122+
<key>contentName</key>
81238123
<string>string.template.ts</string>
81248124
<key>begin</key>
81258125
<string>([_$[:alpha:]][_$[:alnum:]]*)?(`)</string>
@@ -8133,7 +8133,7 @@
81338133
<key>2</key>
81348134
<dict>
81358135
<key>name</key>
8136-
<string>punctuation.definition.string.template.begin.ts</string>
8136+
<string>string.template.ts punctuation.definition.string.template.begin.ts</string>
81378137
</dict>
81388138
</dict>
81398139
<key>end</key>
@@ -8143,7 +8143,7 @@
81438143
<key>0</key>
81448144
<dict>
81458145
<key>name</key>
8146-
<string>punctuation.definition.string.template.end.ts</string>
8146+
<string>string.template.ts punctuation.definition.string.template.end.ts</string>
81478147
</dict>
81488148
</dict>
81498149
<key>patterns</key>
@@ -8165,8 +8165,6 @@
81658165
<key>patterns</key>
81668166
<array>
81678167
<dict>
8168-
<key>name</key>
8169-
<string>string.template.ts</string>
81708168
<key>begin</key>
81718169
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*\s*\??\.\s*)*|(\??\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(&lt;\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\&lt;\&gt;\,\.\[]|=&gt;|&amp;(?!&amp;)|\|(?!\|)))))([^&lt;&gt;\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?&lt;==)\&gt;|\&lt;\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\&lt;\&gt;\,\.\[]|=&gt;|&amp;(?!&amp;)|\|(?!\|)))))(([^&lt;&gt;\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?&lt;==)\&gt;|\&lt;\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\&lt;\&gt;\,\.\[]|=&gt;|&amp;(?!&amp;)|\|(?!\|)))))([^&lt;&gt;\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?&lt;==)\&gt;)*(?&lt;!=)\&gt;))*(?&lt;!=)\&gt;)*(?&lt;!=)&gt;\s*)?`)</string>
81728170
<key>end</key>
@@ -8199,8 +8197,6 @@
81998197
</array>
82008198
</dict>
82018199
<dict>
8202-
<key>name</key>
8203-
<string>string.template.ts</string>
82048200
<key>begin</key>
82058201
<string>([_$[:alpha:]][_$[:alnum:]]*)?\s*(?=(&lt;\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\&lt;\&gt;\,\.\[]|=&gt;|&amp;(?!&amp;)|\|(?!\|)))))([^&lt;&gt;\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?&lt;==)\&gt;|\&lt;\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\&lt;\&gt;\,\.\[]|=&gt;|&amp;(?!&amp;)|\|(?!\|)))))(([^&lt;&gt;\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?&lt;==)\&gt;|\&lt;\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\&lt;\&gt;\,\.\[]|=&gt;|&amp;(?!&amp;)|\|(?!\|)))))([^&lt;&gt;\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?&lt;==)\&gt;)*(?&lt;!=)\&gt;))*(?&lt;!=)\&gt;)*(?&lt;!=)&gt;\s*)`)</string>
82068202
<key>beginCaptures</key>
@@ -8284,7 +8280,7 @@
82848280
<string>#template-call</string>
82858281
</dict>
82868282
<dict>
8287-
<key>name</key>
8283+
<key>contentName</key>
82888284
<string>string.template.ts</string>
82898285
<key>begin</key>
82908286
<string>([_$[:alpha:]][_$[:alnum:]]*)?(`)</string>
@@ -8298,7 +8294,7 @@
82988294
<key>2</key>
82998295
<dict>
83008296
<key>name</key>
8301-
<string>punctuation.definition.string.template.begin.ts</string>
8297+
<string>string.template.ts punctuation.definition.string.template.begin.ts</string>
83028298
</dict>
83038299
</dict>
83048300
<key>end</key>
@@ -8308,7 +8304,7 @@
83088304
<key>0</key>
83098305
<dict>
83108306
<key>name</key>
8311-
<string>punctuation.definition.string.template.end.ts</string>
8307+
<string>string.template.ts punctuation.definition.string.template.end.ts</string>
83128308
</dict>
83138309
</dict>
83148310
<key>patterns</key>

TypeScriptReact.tmLanguage

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8067,7 +8067,7 @@
80678067
<string>#template-call</string>
80688068
</dict>
80698069
<dict>
8070-
<key>name</key>
8070+
<key>contentName</key>
80718071
<string>string.template.tsx</string>
80728072
<key>begin</key>
80738073
<string>([_$[:alpha:]][_$[:alnum:]]*)?(`)</string>
@@ -8081,7 +8081,7 @@
80818081
<key>2</key>
80828082
<dict>
80838083
<key>name</key>
8084-
<string>punctuation.definition.string.template.begin.tsx</string>
8084+
<string>string.template.tsx punctuation.definition.string.template.begin.tsx</string>
80858085
</dict>
80868086
</dict>
80878087
<key>end</key>
@@ -8091,7 +8091,7 @@
80918091
<key>0</key>
80928092
<dict>
80938093
<key>name</key>
8094-
<string>punctuation.definition.string.template.end.tsx</string>
8094+
<string>string.template.tsx punctuation.definition.string.template.end.tsx</string>
80958095
</dict>
80968096
</dict>
80978097
<key>patterns</key>
@@ -8113,8 +8113,6 @@
81138113
<key>patterns</key>
81148114
<array>
81158115
<dict>
8116-
<key>name</key>
8117-
<string>string.template.tsx</string>
81188116
<key>begin</key>
81198117
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*\s*\??\.\s*)*|(\??\.\s*)?)([_$[:alpha:]][_$[:alnum:]]*)(&lt;\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\&lt;\&gt;\,\.\[]|=&gt;|&amp;(?!&amp;)|\|(?!\|)))))([^&lt;&gt;\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?&lt;==)\&gt;|\&lt;\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\&lt;\&gt;\,\.\[]|=&gt;|&amp;(?!&amp;)|\|(?!\|)))))(([^&lt;&gt;\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?&lt;==)\&gt;|\&lt;\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\&lt;\&gt;\,\.\[]|=&gt;|&amp;(?!&amp;)|\|(?!\|)))))([^&lt;&gt;\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?&lt;==)\&gt;)*(?&lt;!=)\&gt;))*(?&lt;!=)\&gt;)*(?&lt;!=)&gt;\s*)?`)</string>
81208118
<key>end</key>
@@ -8147,8 +8145,6 @@
81478145
</array>
81488146
</dict>
81498147
<dict>
8150-
<key>name</key>
8151-
<string>string.template.tsx</string>
81528148
<key>begin</key>
81538149
<string>([_$[:alpha:]][_$[:alnum:]]*)?\s*(?=(&lt;\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\&lt;\&gt;\,\.\[]|=&gt;|&amp;(?!&amp;)|\|(?!\|)))))([^&lt;&gt;\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?&lt;==)\&gt;|\&lt;\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\&lt;\&gt;\,\.\[]|=&gt;|&amp;(?!&amp;)|\|(?!\|)))))(([^&lt;&gt;\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?&lt;==)\&gt;|\&lt;\s*(((keyof|infer|typeof|readonly)\s+)|(([_$[:alpha:]][_$[:alnum:]]*|(\{([^\{\}]|(\{([^\{\}]|\{[^\{\}]*\})*\}))*\})|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(\[([^\[\]]|(\[([^\[\]]|\[[^\[\]]*\])*\]))*\])|(\'([^\'\\]|\\.)*\')|(\"([^\"\\]|\\.)*\")|(\`([^\`\\]|\\.)*\`))(?=\s*([\&lt;\&gt;\,\.\[]|=&gt;|&amp;(?!&amp;)|\|(?!\|)))))([^&lt;&gt;\(]|(\(([^\(\)]|(\(([^\(\)]|\([^\(\)]*\))*\)))*\))|(?&lt;==)\&gt;)*(?&lt;!=)\&gt;))*(?&lt;!=)\&gt;)*(?&lt;!=)&gt;\s*)`)</string>
81548150
<key>beginCaptures</key>
@@ -8232,7 +8228,7 @@
82328228
<string>#template-call</string>
82338229
</dict>
82348230
<dict>
8235-
<key>name</key>
8231+
<key>contentName</key>
82368232
<string>string.template.tsx</string>
82378233
<key>begin</key>
82388234
<string>([_$[:alpha:]][_$[:alnum:]]*)?(`)</string>
@@ -8246,7 +8242,7 @@
82468242
<key>2</key>
82478243
<dict>
82488244
<key>name</key>
8249-
<string>punctuation.definition.string.template.begin.tsx</string>
8245+
<string>string.template.tsx punctuation.definition.string.template.begin.tsx</string>
82508246
</dict>
82518247
</dict>
82528248
<key>end</key>
@@ -8256,7 +8252,7 @@
82568252
<key>0</key>
82578253
<dict>
82588254
<key>name</key>
8259-
<string>punctuation.definition.string.template.end.tsx</string>
8255+
<string>string.template.tsx punctuation.definition.string.template.end.tsx</string>
82608256
</dict>
82618257
</dict>
82628258
<key>patterns</key>

tests/baselines/Issue727.baseline.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ Grammar: TypeScript.tmLanguage
77
-----------------------------------
88
>styled.div``
99
^^^^^^
10-
source.ts string.template.ts variable.other.object.ts
10+
source.ts variable.other.object.ts
1111
^
12-
source.ts string.template.ts punctuation.accessor.ts
12+
source.ts punctuation.accessor.ts
1313
^^^
14-
source.ts string.template.ts entity.name.function.tagged-template.ts
14+
source.ts entity.name.function.tagged-template.ts
1515
^
1616
source.ts string.template.ts punctuation.definition.string.template.begin.ts
1717
^

tests/baselines/Issue822.baseline.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,27 @@ Grammar: TypeScript.tmLanguage
3232
^
3333
source.ts meta.var.expr.ts meta.brace.round.ts
3434
^
35-
source.ts meta.var.expr.ts string.template.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
35+
source.ts meta.var.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
3636
^^^^
37-
source.ts meta.var.expr.ts string.template.ts meta.type.parameters.ts entity.name.type.ts
37+
source.ts meta.var.expr.ts meta.type.parameters.ts entity.name.type.ts
3838
^
39-
source.ts meta.var.expr.ts string.template.ts meta.type.parameters.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
39+
source.ts meta.var.expr.ts meta.type.parameters.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
4040
^^^^
41-
source.ts meta.var.expr.ts string.template.ts meta.type.parameters.ts meta.type.parameters.ts support.type.builtin.ts
41+
source.ts meta.var.expr.ts meta.type.parameters.ts meta.type.parameters.ts support.type.builtin.ts
4242
^
43-
source.ts meta.var.expr.ts string.template.ts meta.type.parameters.ts meta.type.parameters.ts punctuation.separator.comma.ts
43+
source.ts meta.var.expr.ts meta.type.parameters.ts meta.type.parameters.ts punctuation.separator.comma.ts
4444
^
45-
source.ts meta.var.expr.ts string.template.ts meta.type.parameters.ts meta.type.parameters.ts
45+
source.ts meta.var.expr.ts meta.type.parameters.ts meta.type.parameters.ts
4646
^
47-
source.ts meta.var.expr.ts string.template.ts meta.type.parameters.ts meta.type.parameters.ts string.quoted.double.ts punctuation.definition.string.begin.ts
47+
source.ts meta.var.expr.ts meta.type.parameters.ts meta.type.parameters.ts string.quoted.double.ts punctuation.definition.string.begin.ts
4848
^
49-
source.ts meta.var.expr.ts string.template.ts meta.type.parameters.ts meta.type.parameters.ts string.quoted.double.ts
49+
source.ts meta.var.expr.ts meta.type.parameters.ts meta.type.parameters.ts string.quoted.double.ts
5050
^
51-
source.ts meta.var.expr.ts string.template.ts meta.type.parameters.ts meta.type.parameters.ts string.quoted.double.ts punctuation.definition.string.end.ts
51+
source.ts meta.var.expr.ts meta.type.parameters.ts meta.type.parameters.ts string.quoted.double.ts punctuation.definition.string.end.ts
5252
^
53-
source.ts meta.var.expr.ts string.template.ts meta.type.parameters.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts
53+
source.ts meta.var.expr.ts meta.type.parameters.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts
5454
^
55-
source.ts meta.var.expr.ts string.template.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts
55+
source.ts meta.var.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts
5656
^
5757
source.ts meta.var.expr.ts string.template.ts punctuation.definition.string.template.begin.ts
5858
>`;

tests/baselines/genericTaggedTemplate.baseline.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,23 @@ Grammar: TypeScript.tmLanguage
1919
^
2020
source.ts meta.var.expr.ts
2121
^^^
22-
source.ts meta.var.expr.ts string.template.ts entity.name.function.tagged-template.ts
22+
source.ts meta.var.expr.ts entity.name.function.tagged-template.ts
2323
^
24-
source.ts meta.var.expr.ts string.template.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
24+
source.ts meta.var.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
2525
^^^^^^
26-
source.ts meta.var.expr.ts string.template.ts meta.type.parameters.ts support.type.primitive.ts
26+
source.ts meta.var.expr.ts meta.type.parameters.ts support.type.primitive.ts
2727
^
28-
source.ts meta.var.expr.ts string.template.ts meta.type.parameters.ts
28+
source.ts meta.var.expr.ts meta.type.parameters.ts
2929
^
30-
source.ts meta.var.expr.ts string.template.ts meta.type.parameters.ts keyword.operator.type.ts
30+
source.ts meta.var.expr.ts meta.type.parameters.ts keyword.operator.type.ts
3131
^
32-
source.ts meta.var.expr.ts string.template.ts meta.type.parameters.ts
32+
source.ts meta.var.expr.ts meta.type.parameters.ts
3333
^^^^^^
34-
source.ts meta.var.expr.ts string.template.ts meta.type.parameters.ts support.type.primitive.ts
34+
source.ts meta.var.expr.ts meta.type.parameters.ts support.type.primitive.ts
3535
^
36-
source.ts meta.var.expr.ts string.template.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts
36+
source.ts meta.var.expr.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts
3737
^
38-
source.ts meta.var.expr.ts string.template.ts
38+
source.ts meta.var.expr.ts
3939
^
4040
source.ts meta.var.expr.ts string.template.ts punctuation.definition.string.template.begin.ts
4141
^^

0 commit comments

Comments
 (0)