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

Parenthesize function types

Browse Source
This commit is contained in:
Arthur Ozga 2017-05-09 12:57:22 -07:00
parent ac68e8d6f1
commit e0438db63e
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/compiler/checker.ts
View File

@ -2359,6 +2359,8 @@ namespace ts {
context.InElementType = false;
const inTypeAlias = context.InTypeAlias;
context.InTypeAlias = false;
const inFirstTypeArgument = context.InFirstTypeArgument;
context.InFirstTypeArgument = false;
// TODO: should be assert?
if (!type) {
@ -2367,8 +2369,6 @@ namespace ts {
return undefined;
}
if (type.flags & TypeFlags.Any) {
return createKeywordTypeNode(SyntaxKind.AnyKeyword);
}
@ -2586,15 +2586,18 @@ namespace ts {
if (resolved.callSignatures.length === 1 && !resolved.constructSignatures.length) {
const signature = resolved.callSignatures[0];
const functionTypeNode = <FunctionTypeNode>signatureToSignatureDeclarationHelper(signature, SyntaxKind.FunctionType, context);
const signatureNode = <FunctionTypeNode>signatureToSignatureDeclarationHelper(signature, SyntaxKind.FunctionType, context);
return shouldAddParenthesisAroundFunctionType(signature, context) ?
createParenthesizedTypeNode(functionTypeNode) :
functionTypeNode;
createParenthesizedTypeNode(signatureNode) :
signatureNode;
}
if (resolved.constructSignatures.length === 1 && !resolved.callSignatures.length) {
const signature = resolved.constructSignatures[0];
return <ConstructorTypeNode>signatureToSignatureDeclarationHelper(signature, SyntaxKind.ConstructorType, context);
const signatureNode = <ConstructorTypeNode>signatureToSignatureDeclarationHelper(signature, SyntaxKind.ConstructorType, context);
return shouldAddParenthesisAroundFunctionType(signature, context) ?
createParenthesizedTypeNode(signatureNode) :
signatureNode;
}
}
@ -2610,7 +2613,7 @@ namespace ts {
if (InElementType) {
return true;
}
else if (context.InFirstTypeArgument) {
else if (inFirstTypeArgument) {
// Add parenthesis around function type for the first type argument to avoid ambiguity
const typeParameters = callSignature.target && (context.flags & NodeBuilderFlags.WriteTypeArgumentsOfSignature) ?
callSignature.target.typeParameters : callSignature.typeParameters;
@ -2690,7 +2693,14 @@ namespace ts {
entityName = nameIdentifier;
}
const typeParameterCount = (type.target.typeParameters || emptyArray).length;
const typeArgumentNodes = some(typeArguments) ? mapToTypeNodeArray(typeArguments.slice(i, typeParameterCount - i), /*addInElementTypeFlag*/ false) : undefined;
let typeArgumentNodes: TypeNode[] | undefined;
if (some(typeArguments)) {
const slice = typeArguments.slice(i, typeParameterCount - i);
context.InFirstTypeArgument = true;
typeArgumentNodes = mapToTypeNodeArray(slice, /*addInElementTypeFlag*/ false);
}
return createTypeReferenceNode(entityName, typeArgumentNodes);
}
}
@ -2851,7 +2861,6 @@ namespace ts {
}
}
// TODO: add meaning: SymbolFlags argument.
// TODO: add SymbolFormatFlags?? Yes to add outer type parameters. Defer UseOnlyExternalAliasing until a separate symbolbuilder PR.
function symbolToName(symbol: Symbol, expectsIdentifier: true, meaning: SymbolFlags, context: NodeBuilderContext): Identifier;
function symbolToName(symbol: Symbol, expectsIdentifier: false, meaning: SymbolFlags, context: NodeBuilderContext): EntityName;