Skip to content

Commit 0178496

Browse files
sheetalkamatsheetalkamat
committed
Support string literal type
1 parent a883c36 commit 0178496

File tree

6 files changed

+162
-10
lines changed

6 files changed

+162
-10
lines changed

‎TypeScript.YAML-tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -703,12 +703,12 @@ repository:
703703
patterns:
704704
- include: '#expression-operator'
705705
- include: '#type'
706-
- include: '#string'
707706
- include: '#comment'
708707

709708
type:
710709
name: meta.type.ts
711710
patterns:
711+
- include: '#string'
712712
- include: '#type-primitive'
713713
- include: '#type-parameters'
714714
- include: '#type-tuple'

‎TypeScript.tmLanguage

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3396,6 +3396,10 @@
33963396
<string>meta.type.ts</string>
33973397
<key>patterns</key>
33983398
<array>
3399+
<dict>
3400+
<key>include</key>
3401+
<string>#string</string>
3402+
</dict>
33993403
<dict>
34003404
<key>include</key>
34013405
<string>#type-primitive</string>
@@ -3448,10 +3452,6 @@
34483452
<key>include</key>
34493453
<string>#type</string>
34503454
</dict>
3451-
<dict>
3452-
<key>include</key>
3453-
<string>#string</string>
3454-
</dict>
34553455
<dict>
34563456
<key>include</key>
34573457
<string>#comment</string>

‎TypeScriptReact.YAML-tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,12 +707,12 @@ repository:
707707
patterns:
708708
- include: '#expression-operator'
709709
- include: '#type'
710-
- include: '#string'
711710
- include: '#comment'
712711

713712
type:
714713
name: meta.type.tsx
715714
patterns:
715+
- include: '#string'
716716
- include: '#type-primitive'
717717
- include: '#type-parameters'
718718
- include: '#type-tuple'

‎TypeScriptReact.tmLanguage

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3786,6 +3786,10 @@
37863786
<string>meta.type.tsx</string>
37873787
<key>patterns</key>
37883788
<array>
3789+
<dict>
3790+
<key>include</key>
3791+
<string>#string</string>
3792+
</dict>
37893793
<dict>
37903794
<key>include</key>
37913795
<string>#type-primitive</string>
@@ -3838,10 +3842,6 @@
38383842
<key>include</key>
38393843
<string>#type</string>
38403844
</dict>
3841-
<dict>
3842-
<key>include</key>
3843-
<string>#string</string>
3844-
</dict>
38453845
<dict>
38463846
<key>include</key>
38473847
<string>#comment</string>

‎tests/baselines/Issue114.baseline.txt

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
original file
2+
-----------------------------------
3+
export type BreakpointType = 'line' | 'call' | 'return' | 'exception' | 'conditional' | 'watch'
4+
interface Test {
5+
type: 'line' | 'call' | 'return';
6+
}
7+
-----------------------------------
8+
9+
>export type BreakpointType = 'line' | 'call' | 'return' | 'exception' | 'conditional' | 'watch'
10+
^^^^^^
11+
source.ts meta.type.declaration.ts keyword.control.export.ts
12+
^
13+
source.ts meta.type.declaration.ts
14+
^^^^
15+
source.ts meta.type.declaration.ts storage.type.type.ts
16+
^
17+
source.ts meta.type.declaration.ts
18+
^^^^^^^^^^^^^^
19+
source.ts meta.type.declaration.ts entity.name.type.ts
20+
^
21+
source.ts meta.type.declaration.ts
22+
^^
23+
source.ts meta.type.declaration.ts keyword.operator.assignment.ts
24+
^
25+
source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts
26+
^^^^
27+
source.ts meta.type.declaration.ts string.quoted.single.ts
28+
^
29+
source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts
30+
^
31+
source.ts meta.type.declaration.ts
32+
^
33+
source.ts meta.type.declaration.ts keyword.operator.type.ts
34+
^
35+
source.ts meta.type.declaration.ts
36+
^
37+
source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts
38+
^^^^
39+
source.ts meta.type.declaration.ts string.quoted.single.ts
40+
^
41+
source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts
42+
^
43+
source.ts meta.type.declaration.ts
44+
^
45+
source.ts meta.type.declaration.ts keyword.operator.type.ts
46+
^
47+
source.ts meta.type.declaration.ts
48+
^
49+
source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts
50+
^^^^^^
51+
source.ts meta.type.declaration.ts string.quoted.single.ts
52+
^
53+
source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts
54+
^
55+
source.ts meta.type.declaration.ts
56+
^
57+
source.ts meta.type.declaration.ts keyword.operator.type.ts
58+
^
59+
source.ts meta.type.declaration.ts
60+
^
61+
source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts
62+
^^^^^^^^^
63+
source.ts meta.type.declaration.ts string.quoted.single.ts
64+
^
65+
source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts
66+
^
67+
source.ts meta.type.declaration.ts
68+
^
69+
source.ts meta.type.declaration.ts keyword.operator.type.ts
70+
^
71+
source.ts meta.type.declaration.ts
72+
^
73+
source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts
74+
^^^^^^^^^^^
75+
source.ts meta.type.declaration.ts string.quoted.single.ts
76+
^
77+
source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts
78+
^
79+
source.ts meta.type.declaration.ts
80+
^
81+
source.ts meta.type.declaration.ts keyword.operator.type.ts
82+
^
83+
source.ts meta.type.declaration.ts
84+
^
85+
source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.begin.ts
86+
^^^^^
87+
source.ts meta.type.declaration.ts string.quoted.single.ts
88+
^
89+
source.ts meta.type.declaration.ts string.quoted.single.ts punctuation.definition.string.end.ts
90+
^
91+
source.ts meta.type.declaration.ts
92+
>interface Test {
93+
^^^^^^^^^
94+
source.ts meta.declaration.object.ts storage.type.interface.ts
95+
^
96+
source.ts meta.declaration.object.ts
97+
^^^^
98+
source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts
99+
^
100+
source.ts meta.declaration.object.ts
101+
^
102+
source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts
103+
^^
104+
source.ts meta.declaration.object.ts meta.object.body.ts
105+
> type: 'line' | 'call' | 'return';
106+
^^
107+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts
108+
^^^^
109+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts variable.object.property.ts
110+
^
111+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts
112+
^
113+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts
114+
^
115+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts string.quoted.single.ts punctuation.definition.string.begin.ts
116+
^^^^
117+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts string.quoted.single.ts
118+
^
119+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts string.quoted.single.ts punctuation.definition.string.end.ts
120+
^
121+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts
122+
^
123+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.ts
124+
^
125+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts
126+
^
127+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts string.quoted.single.ts punctuation.definition.string.begin.ts
128+
^^^^
129+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts string.quoted.single.ts
130+
^
131+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts string.quoted.single.ts punctuation.definition.string.end.ts
132+
^
133+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts
134+
^
135+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.ts
136+
^
137+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts
138+
^
139+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts string.quoted.single.ts punctuation.definition.string.begin.ts
140+
^^^^^^
141+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts string.quoted.single.ts
142+
^
143+
source.ts meta.declaration.object.ts meta.object.body.ts meta.field.declaration.ts meta.type.annotation.ts string.quoted.single.ts punctuation.definition.string.end.ts
144+
^^^
145+
source.ts meta.declaration.object.ts meta.object.body.ts
146+
>}
147+
^
148+
source.ts meta.declaration.object.ts meta.object.body.ts punctuation.definition.block.ts

‎tests/cases/Issue114.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export type BreakpointType = 'line' | 'call' | 'return' | 'exception' | 'conditional' | 'watch'
2+
interface Test {
3+
type: 'line' | 'call' | 'return';
4+
}

0 commit comments

Comments
 (0)