microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-05 08:11:30 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

fix(49131): allow type keyword inside functions (#49134)

Browse Source
This commit is contained in:
Oleksandr T 2022-05-25 01:16:48 +03:00 committed by GitHub
parent a2b785b6cb
commit b57d6e1df4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 349 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/harness/fourslashInterfaceImpl.ts
View File

@ -1498,6 +1498,7 @@ namespace FourSlashInterface {
"throw",
"true",
"try",
"type",
"typeof",
"var",
"void",
@ -1649,6 +1650,7 @@ namespace FourSlashInterface {
"throw",
"true",
"try",
"type",
"typeof",
"var",
"void",

1
src/services/completions.ts
View File

@ -3988,6 +3988,7 @@ namespace ts.Completions {
return kind === SyntaxKind.AsyncKeyword
|| kind === SyntaxKind.AwaitKeyword
|| kind === SyntaxKind.AsKeyword
|| kind === SyntaxKind.TypeKeyword
|| !isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
}

216
tests/baselines/reference/completionsCommentsClassMembers.baseline
View File

@ -4223,6 +4223,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -11284,6 +11296,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -16098,6 +16122,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -23159,6 +23195,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -27224,6 +27272,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -32445,6 +32505,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -36464,6 +36536,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -41639,6 +41723,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -46860,6 +46956,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -52081,6 +52189,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -57302,6 +57422,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -61362,6 +61494,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -65422,6 +65566,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -69482,6 +69638,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -73542,6 +73710,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -77602,6 +77782,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -81662,6 +81854,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -96035,6 +96239,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",

60
tests/baselines/reference/completionsCommentsCommentParsing.baseline
View File

@ -5057,6 +5057,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -11349,6 +11361,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -17125,6 +17149,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -28569,6 +28605,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -34861,6 +34909,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",

36
tests/baselines/reference/completionsCommentsFunctionDeclaration.baseline
View File

@ -3568,6 +3568,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -7197,6 +7209,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -11356,6 +11380,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",

24
tests/baselines/reference/completionsCommentsFunctionExpression.baseline
View File

@ -11647,6 +11647,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",
@ -15990,6 +16002,18 @@
}
]
},
{
"name": "type",
"kind": "keyword",
"kindModifiers": "",
"sortText": "15",
"displayParts": [
{
"text": "type",
"kind": "keyword"
}
]
},
{
"name": "TypeError",
"kind": "var",

10
tests/cases/fourslash/typeKeywordInFunction.ts Normal file
View File

@ -0,0 +1,10 @@
/// <reference path="fourslash.ts" />
////function a() {
//// ty/**/
////}
verify.completions({
marker: "",
includes: [{ name: "type", sortText: completion.SortText.GlobalsOrKeywords }]
});