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

consolidate SignatureParts

Browse Source
This commit is contained in:
Arthur Ozga
2017-03-16 16:59:01 -07:00
parent 41e511efd2
commit a88be7c6f9
3 changed files with 15 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/compiler/checker.ts
View File

@@ -107,9 +107,8 @@ namespace ts {
getReturnTypeOfSignature,
getNonNullableType,
createTypeNode,
createTypeParameterDeclarationFromType,
createIndexSignatureFromIndexInfo,
createParameterDeclarationFromSymbol,
createSignatureParts,
getSymbolsInScope: (location, meaning) => {
location = getParseTreeNode(location);
return location ? getSymbolsInScope(location, meaning) : [];
@@ -2222,13 +2221,6 @@ namespace ts {
return parameterNode;
}
/* @internal */
type SignatureParts = {
typeParameters: TypeParameterDeclaration[] | undefined;
parameters: ParameterDeclaration[];
type: TypeNode;
}
// TODO: expose this, remove copy from helper, possibly don't expose createParameter/TypeParameter?
function createSignatureParts(signature: Signature): SignatureParts {
return {

18
src/compiler/types.ts
View File

@@ -2468,14 +2468,12 @@ namespace ts {
/* @internal */ getParameterType(signature: Signature, parameterIndex: number): Type;
getNonNullableType(type: Type): Type;
/** Note that the resulting type node cannot be checked. */
/** Note that the resulting nodes cannot be checked. */
createTypeNode(type: Type): TypeNode;
/** Note that the resulting type node cannot be checked. */
createTypeParameterDeclarationFromType(type: Type): TypeParameterDeclaration;
/** Note that the resulting type node cannot be checked. */
createIndexSignatureFromIndexInfo(indexInfo: IndexInfo, kind: IndexKind): IndexSignatureDeclaration
/** Note that the resulting type node cannot be checked. */
createParameterDeclarationFromSymbol(parameterSymbol: Symbol): ParameterDeclaration;
/** Note that the resulting nodes cannot be checked. */
createIndexSignatureFromIndexInfo(indexInfo: IndexInfo, kind: IndexKind): IndexSignatureDeclaration;
/** Note that the resulting nodes cannot be checked. */
createSignatureParts(signature: Signature): SignatureParts;
getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
getSymbolAtLocation(node: Node): Symbol;
@@ -3230,6 +3228,12 @@ namespace ts {
declaration?: SignatureDeclaration;
}
export interface SignatureParts {
typeParameters: TypeParameterDeclaration[] | undefined;
parameters: ParameterDeclaration[];
type: TypeNode;
}
/* @internal */
export interface TypeMapper {
(t: TypeParameter): Type;

25
src/services/codefixes/helpers.ts
View File

@@ -93,7 +93,7 @@ namespace ts.codefix {
// TODO: get parameters working.
// TODO: add support for type parameters.
const signature = signatures[0];
const signatureParts = getSignatureParts(signature);
const signatureParts = checker.createSignatureParts(signature);
return createStubbedMethod(modifiers, name, optional, signatureParts.typeParameters, signatureParts.parameters, signatureParts.type);
}
@@ -101,7 +101,7 @@ namespace ts.codefix {
for (let i = 0; i < signatures.length; i++) {
// TODO: make signatures instead of methods
const signature = signatures[i];
const signatureParts = getSignatureParts(signature);
const signatureParts = checker.createSignatureParts(signature);
signatureDeclarations.push(createMethod(
/*decorators*/ undefined
, modifiers
@@ -116,7 +116,7 @@ namespace ts.codefix {
if (declarations.length > signatures.length) {
let signature = checker.getSignatureFromDeclaration(declarations[declarations.length - 1] as SignatureDeclaration);
const signatureParts = getSignatureParts(signature);
const signatureParts = checker.createSignatureParts(signature);
signatureDeclarations.push(createStubbedMethod(modifiers, name, optional, signatureParts.typeParameters, signatureParts.parameters, signatureParts.type));
}
else {
@@ -128,20 +128,6 @@ namespace ts.codefix {
default:
return undefined;
}
type SignatureParts = {
typeParameters: TypeParameterDeclaration[];
parameters: ParameterDeclaration[];
type: TypeNode;
}
function getSignatureParts(signature: Signature): SignatureParts {
return {
typeParameters: signature.typeParameters && signature.typeParameters.map(checker.createTypeParameterDeclarationFromType),
parameters: signature.getParameters().map(symbol => checker.createParameterDeclarationFromSymbol(symbol)),
type: createTypeNodeExceptAny(checker.getReturnTypeOfSignature(signature), checker)
}
}
}
function createMethodImplementingSignatures(signatures: Signature[], name: PropertyName, optional: boolean, modifiers: Modifier[] | undefined): MethodDeclaration {
@@ -234,9 +220,4 @@ namespace ts.codefix {
}
return undefined;
}
function createTypeNodeExceptAny(type: Type, checker: TypeChecker) {
const typeNode = checker.createTypeNode(type);
return typeNode && typeNode.kind !== SyntaxKind.AnyKeyword ? typeNode : undefined;
}
}