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

Merge pull request #16505 from Microsoft/decl-emit-parenthesize-keyof

Browse Source 
Add parentheses around keyof in declaration emit when needed
This commit is contained in:
Nathan Shively-Sanders 2017-06-13 14:17:49 -07:00 committed by GitHub
commit 57f8648b0f
5 changed files with 68 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/checker.ts
View File

@ -3233,9 +3233,15 @@ namespace ts {
writer.writeStringLiteral(literalTypeToString(<LiteralType>type));
}
else if (type.flags & TypeFlags.Index) {
if (flags & TypeFormatFlags.InElementType) {
writePunctuation(writer, SyntaxKind.OpenParenToken);
}
writer.writeKeyword("keyof");
writeSpace(writer);
writeType((<IndexType>type).type, TypeFormatFlags.InElementType);
if (flags & TypeFormatFlags.InElementType) {
writePunctuation(writer, SyntaxKind.CloseParenToken);
}
}
else if (type.flags & TypeFlags.IndexedAccess) {
writeType((<IndexedAccessType>type).objectType, TypeFormatFlags.InElementType);

25
tests/baselines/reference/declarationEmitIndexTypeArray.js Normal file
View File

@ -0,0 +1,25 @@
//// [declarationEmitIndexTypeArray.ts]
function doSomethingWithKeys<T>(...keys: (keyof T)[]) { }
const utilityFunctions = {
doSomethingWithKeys
};
//// [declarationEmitIndexTypeArray.js]
function doSomethingWithKeys() {
var keys = [];
for (var _i = 0; _i < arguments.length; _i++) {
keys[_i] = arguments[_i];
}
}
var utilityFunctions = {
doSomethingWithKeys: doSomethingWithKeys
};
//// [declarationEmitIndexTypeArray.d.ts]
declare function doSomethingWithKeys<T>(...keys: (keyof T)[]): void;
declare const utilityFunctions: {
doSomethingWithKeys: <T>(...keys: (keyof T)[]) => void;
};

15
tests/baselines/reference/declarationEmitIndexTypeArray.symbols Normal file
View File

@ -0,0 +1,15 @@
=== tests/cases/compiler/declarationEmitIndexTypeArray.ts ===
function doSomethingWithKeys<T>(...keys: (keyof T)[]) { }
>doSomethingWithKeys : Symbol(doSomethingWithKeys, Decl(declarationEmitIndexTypeArray.ts, 0, 0))
>T : Symbol(T, Decl(declarationEmitIndexTypeArray.ts, 0, 29))
>keys : Symbol(keys, Decl(declarationEmitIndexTypeArray.ts, 0, 32))
>T : Symbol(T, Decl(declarationEmitIndexTypeArray.ts, 0, 29))
const utilityFunctions = {
>utilityFunctions : Symbol(utilityFunctions, Decl(declarationEmitIndexTypeArray.ts, 2, 5))
doSomethingWithKeys
>doSomethingWithKeys : Symbol(doSomethingWithKeys, Decl(declarationEmitIndexTypeArray.ts, 2, 26))
};

16
tests/baselines/reference/declarationEmitIndexTypeArray.types Normal file
View File

@ -0,0 +1,16 @@
=== tests/cases/compiler/declarationEmitIndexTypeArray.ts ===
function doSomethingWithKeys<T>(...keys: (keyof T)[]) { }
>doSomethingWithKeys : <T>(...keys: keyof T[]) => void
>T : T
>keys : keyof T[]
>T : T
const utilityFunctions = {
>utilityFunctions : { doSomethingWithKeys: <T>(...keys: keyof T[]) => void; }
>{ doSomethingWithKeys} : { doSomethingWithKeys: <T>(...keys: keyof T[]) => void; }
doSomethingWithKeys
>doSomethingWithKeys : <T>(...keys: keyof T[]) => void
};

6
tests/cases/compiler/declarationEmitIndexTypeArray.ts Normal file
View File

@ -0,0 +1,6 @@
// @declaration: true
function doSomethingWithKeys<T>(...keys: (keyof T)[]) { }
const utilityFunctions = {
doSomethingWithKeys
};