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

Simplify code a bit.

Browse Source
This commit is contained in:
Ryan Cavanaugh
2015-07-27 11:21:27 -07:00
parent 09aa13f5ce
commit 079047c60b
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/compiler/checker.ts
View File

@@ -4363,11 +4363,11 @@ namespace ts {
return getInferredType(context, i);
}
}
return t;
return t;
};
mapper.context = context;
return mapper;
return mapper;
}
function identityMapper(type: Type): Type {
@@ -7324,7 +7324,9 @@ namespace ts {
*/
function getJsxElementInstanceType(node: JsxOpeningLikeElement) {
if (!(getNodeLinks(node).jsxFlags & JsxFlags.ClassElement)) {
// There is no such thing as an instance type for a non-class element
// There is no such thing as an instance type for a non-class element. This
// line shouldn't be hit.
Debug.fail('Should not call getJsxElementInstanceType on non-class Element');
return undefined;
}
@@ -7349,11 +7351,11 @@ namespace ts {
if (signatures.length === 0) {
// We found no signatures at all, which is an error
error(node.tagName, Diagnostics.JSX_element_type_0_does_not_have_any_construct_or_call_signatures, getTextOfNode(node.tagName));
return undefined;
return unknownType;
}
}
let returnType = getUnionType(signatures.map(s => getReturnTypeOfSignature(s)));
let returnType = getUnionType(signatures.map(getReturnTypeOfSignature));
// Issue an error if this return type isn't assignable to JSX.ElementClass
let elemClassType = getJsxGlobalElementClassType();
@@ -7413,7 +7415,7 @@ namespace ts {
if (links.jsxFlags & JsxFlags.ClassElement) {
let elemInstanceType = getJsxElementInstanceType(node);
if (!elemInstanceType || isTypeAny(elemInstanceType)) {
if (isTypeAny(elemInstanceType)) {
return links.resolvedJsxType = anyType;
}