Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicated functions

Browse Source
This commit is contained in:
Ryan Cavanaugh
2016-01-12 15:30:19 -08:00
parent 4fe33732cf
commit 120fa190d2
2 changed files with 15 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/checker.ts
+13 -63
View File
@@ -4727,23 +4727,6 @@ namespace ts {
return links.resolvedType;
}
function getTypeFromJSDocFunctionType(node: JSDocFunctionType): Type {
Debug.assert(!!node.symbol);
const links = getNodeLinks(node);
if (!links.resolvedType) {
links.resolvedType = createObjectType(TypeFlags.Anonymous, node.symbol);
}
return links.resolvedType;
}
function getTypeFromJSDocRecordType(node: JSDocRecordType): Type {
const links = getNodeLinks(node);
if (!links.resolvedType) {
links.resolvedType = createObjectType(TypeFlags.Anonymous, node.symbol);
}
return links.resolvedType;
}
function getTypeFromJSDocVariadicType(node: JSDocVariadicType): Type {
const links = getNodeLinks(node);
if (!links.resolvedType) {
@@ -4753,27 +4736,6 @@ namespace ts {
return links.resolvedType;
}
function getTypeFromJSDocTypeReference(node: JSDocTypeReference): Type {
return getTypeFromTypeReference(node);
}
function getTypeFromJSDocArrayType(node: JSDocArrayType): Type {
const links = getNodeLinks(node);
if (!links.resolvedType) {
links.resolvedType = createArrayType(getTypeFromTypeNode(node.elementType));
}
return links.resolvedType;
}
function getTypeFromJSDocUnionType(node: JSDocUnionType): Type {
const links = getNodeLinks(node);
if (!links.resolvedType) {
const types = map(node.types, getTypeFromTypeNode);
links.resolvedType = getUnionType(types, /*noSubtypeReduction*/ true);
}
return links.resolvedType;
}
function getTypeFromJSDocTupleType(node: JSDocTupleType): Type {
const links = getNodeLinks(node);
if (!links.resolvedType) {
@@ -4826,6 +4788,8 @@ namespace ts {
function getTypeFromTypeNode(node: TypeNode): Type {
switch (node.kind) {
case SyntaxKind.AnyKeyword:
case SyntaxKind.JSDocAllType:
case SyntaxKind.JSDocUnknownType:
return anyType;
case SyntaxKind.StringKeyword:
return stringType;
@@ -4842,6 +4806,7 @@ namespace ts {
case SyntaxKind.StringLiteralType:
return getTypeFromStringLiteralTypeNode(<StringLiteralTypeNode>node);
case SyntaxKind.TypeReference:
case SyntaxKind.JSDocTypeReference:
return getTypeFromTypeReference(<TypeReferenceNode>node);
case SyntaxKind.TypePredicate:
return getTypeFromPredicateTypeNode(<TypePredicateNode>node);
@@ -4850,18 +4815,27 @@ namespace ts {
case SyntaxKind.TypeQuery:
return getTypeFromTypeQueryNode(<TypeQueryNode>node);
case SyntaxKind.ArrayType:
case SyntaxKind.JSDocArrayType:
return getTypeFromArrayTypeNode(<ArrayTypeNode>node);
case SyntaxKind.TupleType:
return getTypeFromTupleTypeNode(<TupleTypeNode>node);
case SyntaxKind.UnionType:
case SyntaxKind.JSDocUnionType:
return getTypeFromUnionTypeNode(<UnionTypeNode>node);
case SyntaxKind.IntersectionType:
return getTypeFromIntersectionTypeNode(<IntersectionTypeNode>node);
case SyntaxKind.ParenthesizedType:
return getTypeFromTypeNode((<ParenthesizedTypeNode>node).type);
case SyntaxKind.JSDocNullableType:
case SyntaxKind.JSDocNonNullableType:
case SyntaxKind.JSDocConstructorType:
case SyntaxKind.JSDocThisType:
case SyntaxKind.JSDocOptionalType:
return getTypeFromTypeNode((<ParenthesizedTypeNode | JSDocTypeReferencingNode>node).type);
case SyntaxKind.FunctionType:
case SyntaxKind.ConstructorType:
case SyntaxKind.TypeLiteral:
case SyntaxKind.JSDocFunctionType:
case SyntaxKind.JSDocRecordType:
return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
// This function assumes that an identifier or qualified name is a type expression
// Callers should first ensure this by calling isTypeNode
@@ -4869,34 +4843,10 @@ namespace ts {
case SyntaxKind.QualifiedName:
const symbol = getSymbolAtLocation(node);
return symbol && getDeclaredTypeOfSymbol(symbol);
case SyntaxKind.JSDocAllType:
return anyType;
case SyntaxKind.JSDocUnknownType:
return unknownType;
case SyntaxKind.JSDocArrayType:
return getTypeFromJSDocArrayType(<JSDocArrayType>node);
case SyntaxKind.JSDocTupleType:
return getTypeFromJSDocTupleType(<JSDocTupleType>node);
case SyntaxKind.JSDocUnionType:
return getTypeFromJSDocUnionType(<JSDocUnionType>node);
case SyntaxKind.JSDocNullableType:
return getTypeFromTypeNode((<JSDocNullableType>node).type);
case SyntaxKind.JSDocNonNullableType:
return getTypeFromTypeNode((<JSDocNonNullableType>node).type);
case SyntaxKind.JSDocTypeReference:
return getTypeFromJSDocTypeReference(<JSDocTypeReference>node);
case SyntaxKind.JSDocOptionalType:
return getTypeFromTypeNode((<JSDocOptionalType>node).type);
case SyntaxKind.JSDocFunctionType:
return getTypeFromJSDocFunctionType(<JSDocFunctionType>node);
case SyntaxKind.JSDocVariadicType:
return getTypeFromJSDocVariadicType(<JSDocVariadicType>node);
case SyntaxKind.JSDocConstructorType:
return getTypeFromTypeNode((<JSDocConstructorType>node).type);
case SyntaxKind.JSDocRecordType:
return getTypeFromJSDocRecordType(<JSDocRecordType>node);
case SyntaxKind.JSDocThisType:
return getTypeFromTypeNode((<JSDocThisType>node).type);
default:
return unknownType;
}
src/compiler/types.ts
+2
View File
@@ -1475,6 +1475,8 @@ namespace ts {
type: JSDocType;
}
export type JSDocTypeReferencingNode = JSDocThisType | JSDocConstructorType | JSDocVariadicType | JSDocOptionalType | JSDocNullableType | JSDocNonNullableType;
// @kind(SyntaxKind.JSDocRecordMember)
export interface JSDocRecordMember extends PropertySignature {
name: Identifier | LiteralExpression;