Skip to content

Commit b57d6e1

Browse files
a-tarasyuka-tarasyuk
authored
fix(49131): allow type keyword inside functions (microsoft#49134)
1 parent a2b785b commit b57d6e1

7 files changed

+349
-0
lines changed

‎src/harness/fourslashInterfaceImpl.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,6 +1498,7 @@ namespace FourSlashInterface {
14981498
"throw",
14991499
"true",
15001500
"try",
1501+
"type",
15011502
"typeof",
15021503
"var",
15031504
"void",
@@ -1649,6 +1650,7 @@ namespace FourSlashInterface {
16491650
"throw",
16501651
"true",
16511652
"try",
1653+
"type",
16521654
"typeof",
16531655
"var",
16541656
"void",

‎src/services/completions.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3988,6 +3988,7 @@ namespace ts.Completions {
39883988
return kind === SyntaxKind.AsyncKeyword
39893989
|| kind === SyntaxKind.AwaitKeyword
39903990
|| kind === SyntaxKind.AsKeyword
3991+
|| kind === SyntaxKind.TypeKeyword
39913992
|| !isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
39923993
}
39933994

‎tests/baselines/reference/completionsCommentsClassMembers.baseline

Lines changed: 216 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4223,6 +4223,18 @@
42234223
}
42244224
]
42254225
},
4226+
{
4227+
"name": "type",
4228+
"kind": "keyword",
4229+
"kindModifiers": "",
4230+
"sortText": "15",
4231+
"displayParts": [
4232+
{
4233+
"text": "type",
4234+
"kind": "keyword"
4235+
}
4236+
]
4237+
},
42264238
{
42274239
"name": "TypeError",
42284240
"kind": "var",
@@ -11284,6 +11296,18 @@
1128411296
}
1128511297
]
1128611298
},
11299+
{
11300+
"name": "type",
11301+
"kind": "keyword",
11302+
"kindModifiers": "",
11303+
"sortText": "15",
11304+
"displayParts": [
11305+
{
11306+
"text": "type",
11307+
"kind": "keyword"
11308+
}
11309+
]
11310+
},
1128711311
{
1128811312
"name": "TypeError",
1128911313
"kind": "var",
@@ -16098,6 +16122,18 @@
1609816122
}
1609916123
]
1610016124
},
16125+
{
16126+
"name": "type",
16127+
"kind": "keyword",
16128+
"kindModifiers": "",
16129+
"sortText": "15",
16130+
"displayParts": [
16131+
{
16132+
"text": "type",
16133+
"kind": "keyword"
16134+
}
16135+
]
16136+
},
1610116137
{
1610216138
"name": "TypeError",
1610316139
"kind": "var",
@@ -23159,6 +23195,18 @@
2315923195
}
2316023196
]
2316123197
},
23198+
{
23199+
"name": "type",
23200+
"kind": "keyword",
23201+
"kindModifiers": "",
23202+
"sortText": "15",
23203+
"displayParts": [
23204+
{
23205+
"text": "type",
23206+
"kind": "keyword"
23207+
}
23208+
]
23209+
},
2316223210
{
2316323211
"name": "TypeError",
2316423212
"kind": "var",
@@ -27224,6 +27272,18 @@
2722427272
}
2722527273
]
2722627274
},
27275+
{
27276+
"name": "type",
27277+
"kind": "keyword",
27278+
"kindModifiers": "",
27279+
"sortText": "15",
27280+
"displayParts": [
27281+
{
27282+
"text": "type",
27283+
"kind": "keyword"
27284+
}
27285+
]
27286+
},
2722727287
{
2722827288
"name": "TypeError",
2722927289
"kind": "var",
@@ -32445,6 +32505,18 @@
3244532505
}
3244632506
]
3244732507
},
32508+
{
32509+
"name": "type",
32510+
"kind": "keyword",
32511+
"kindModifiers": "",
32512+
"sortText": "15",
32513+
"displayParts": [
32514+
{
32515+
"text": "type",
32516+
"kind": "keyword"
32517+
}
32518+
]
32519+
},
3244832520
{
3244932521
"name": "TypeError",
3245032522
"kind": "var",
@@ -36464,6 +36536,18 @@
3646436536
}
3646536537
]
3646636538
},
36539+
{
36540+
"name": "type",
36541+
"kind": "keyword",
36542+
"kindModifiers": "",
36543+
"sortText": "15",
36544+
"displayParts": [
36545+
{
36546+
"text": "type",
36547+
"kind": "keyword"
36548+
}
36549+
]
36550+
},
3646736551
{
3646836552
"name": "TypeError",
3646936553
"kind": "var",
@@ -41639,6 +41723,18 @@
4163941723
}
4164041724
]
4164141725
},
41726+
{
41727+
"name": "type",
41728+
"kind": "keyword",
41729+
"kindModifiers": "",
41730+
"sortText": "15",
41731+
"displayParts": [
41732+
{
41733+
"text": "type",
41734+
"kind": "keyword"
41735+
}
41736+
]
41737+
},
4164241738
{
4164341739
"name": "TypeError",
4164441740
"kind": "var",
@@ -46860,6 +46956,18 @@
4686046956
}
4686146957
]
4686246958
},
46959+
{
46960+
"name": "type",
46961+
"kind": "keyword",
46962+
"kindModifiers": "",
46963+
"sortText": "15",
46964+
"displayParts": [
46965+
{
46966+
"text": "type",
46967+
"kind": "keyword"
46968+
}
46969+
]
46970+
},
4686346971
{
4686446972
"name": "TypeError",
4686546973
"kind": "var",
@@ -52081,6 +52189,18 @@
5208152189
}
5208252190
]
5208352191
},
52192+
{
52193+
"name": "type",
52194+
"kind": "keyword",
52195+
"kindModifiers": "",
52196+
"sortText": "15",
52197+
"displayParts": [
52198+
{
52199+
"text": "type",
52200+
"kind": "keyword"
52201+
}
52202+
]
52203+
},
5208452204
{
5208552205
"name": "TypeError",
5208652206
"kind": "var",
@@ -57302,6 +57422,18 @@
5730257422
}
5730357423
]
5730457424
},
57425+
{
57426+
"name": "type",
57427+
"kind": "keyword",
57428+
"kindModifiers": "",
57429+
"sortText": "15",
57430+
"displayParts": [
57431+
{
57432+
"text": "type",
57433+
"kind": "keyword"
57434+
}
57435+
]
57436+
},
5730557437
{
5730657438
"name": "TypeError",
5730757439
"kind": "var",
@@ -61362,6 +61494,18 @@
6136261494
}
6136361495
]
6136461496
},
61497+
{
61498+
"name": "type",
61499+
"kind": "keyword",
61500+
"kindModifiers": "",
61501+
"sortText": "15",
61502+
"displayParts": [
61503+
{
61504+
"text": "type",
61505+
"kind": "keyword"
61506+
}
61507+
]
61508+
},
6136561509
{
6136661510
"name": "TypeError",
6136761511
"kind": "var",
@@ -65422,6 +65566,18 @@
6542265566
}
6542365567
]
6542465568
},
65569+
{
65570+
"name": "type",
65571+
"kind": "keyword",
65572+
"kindModifiers": "",
65573+
"sortText": "15",
65574+
"displayParts": [
65575+
{
65576+
"text": "type",
65577+
"kind": "keyword"
65578+
}
65579+
]
65580+
},
6542565581
{
6542665582
"name": "TypeError",
6542765583
"kind": "var",
@@ -69482,6 +69638,18 @@
6948269638
}
6948369639
]
6948469640
},
69641+
{
69642+
"name": "type",
69643+
"kind": "keyword",
69644+
"kindModifiers": "",
69645+
"sortText": "15",
69646+
"displayParts": [
69647+
{
69648+
"text": "type",
69649+
"kind": "keyword"
69650+
}
69651+
]
69652+
},
6948569653
{
6948669654
"name": "TypeError",
6948769655
"kind": "var",
@@ -73542,6 +73710,18 @@
7354273710
}
7354373711
]
7354473712
},
73713+
{
73714+
"name": "type",
73715+
"kind": "keyword",
73716+
"kindModifiers": "",
73717+
"sortText": "15",
73718+
"displayParts": [
73719+
{
73720+
"text": "type",
73721+
"kind": "keyword"
73722+
}
73723+
]
73724+
},
7354573725
{
7354673726
"name": "TypeError",
7354773727
"kind": "var",
@@ -77602,6 +77782,18 @@
7760277782
}
7760377783
]
7760477784
},
77785+
{
77786+
"name": "type",
77787+
"kind": "keyword",
77788+
"kindModifiers": "",
77789+
"sortText": "15",
77790+
"displayParts": [
77791+
{
77792+
"text": "type",
77793+
"kind": "keyword"
77794+
}
77795+
]
77796+
},
7760577797
{
7760677798
"name": "TypeError",
7760777799
"kind": "var",
@@ -81662,6 +81854,18 @@
8166281854
}
8166381855
]
8166481856
},
81857+
{
81858+
"name": "type",
81859+
"kind": "keyword",
81860+
"kindModifiers": "",
81861+
"sortText": "15",
81862+
"displayParts": [
81863+
{
81864+
"text": "type",
81865+
"kind": "keyword"
81866+
}
81867+
]
81868+
},
8166581869
{
8166681870
"name": "TypeError",
8166781871
"kind": "var",
@@ -96035,6 +96239,18 @@
9603596239
}
9603696240
]
9603796241
},
96242+
{
96243+
"name": "type",
96244+
"kind": "keyword",
96245+
"kindModifiers": "",
96246+
"sortText": "15",
96247+
"displayParts": [
96248+
{
96249+
"text": "type",
96250+
"kind": "keyword"
96251+
}
96252+
]
96253+
},
9603896254
{
9603996255
"name": "TypeError",
9604096256
"kind": "var",

0 commit comments

Comments
 (0)