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

Use symbolToName instead of copying

Browse Source
This commit is contained in:
Arthur Ozga
2017-05-05 13:47:51 -07:00
parent d2bda47e80
commit a5bef216ae
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/compiler/checker.ts
View File

@@ -2287,7 +2287,7 @@ namespace ts {
interface NodeBuilderContext {
readonly enclosingDeclaration: Node | undefined;
readonly flags: NodeBuilderFlags | undefined;
// State
encounteredError: boolean;
inObjectTypeLiteral: boolean;
@@ -2564,7 +2564,6 @@ namespace ts {
return createTypeLiteralNode(members);
}
function shouldAddParenthesisAroundFunctionType(callSignature: Signature, context: NodeBuilderContext) {
if (InElementType) {
return true;
@@ -2670,13 +2669,10 @@ namespace ts {
return typeElements;
}
// TODO: make logic mirror that of writeObjectLiteralType
for (const propertySymbol of properties) {
const propertyType = getTypeOfSymbol(propertySymbol);
const oldDeclaration = propertySymbol.declarations && propertySymbol.declarations[0] as TypeElement;
if (!oldDeclaration) {
return;
}
const propertyName = getDeepSynthesizedClone(oldDeclaration.name);
const propertyName = symbolToName(propertySymbol, /*expectsIdentifier*/ true, context);
const optionalToken = propertySymbol.flags & SymbolFlags.Optional ? createToken(SyntaxKind.QuestionToken) : undefined;
if (propertySymbol.flags & (SymbolFlags.Function | SymbolFlags.Method) && !getPropertiesOfObjectType(propertyType).length) {
const signatures = getSignaturesOfType(propertyType, SignatureKind.Call);
@@ -2697,7 +2693,7 @@ namespace ts {
propertyName,
optionalToken,
propertyTypeNode,
/*initializer*/undefined);
/*initializer*/ undefined);
typeElements.push(propertySignature);
}
}
@@ -2744,8 +2740,8 @@ namespace ts {
const returnType = getReturnTypeOfSignature(signature);
returnTypeNode = returnType && typeToTypeNodeHelper(returnType, context);
}
if(context.flags & NodeBuilderFlags.SuppressAnyReturnType) {
if(returnTypeNode && returnTypeNode.kind === SyntaxKind.AnyKeyword) {
if (context.flags & NodeBuilderFlags.SuppressAnyReturnType) {
if (returnTypeNode && returnTypeNode.kind === SyntaxKind.AnyKeyword) {
returnTypeNode = undefined;
}
}