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

address code review feedback

Browse Source
This commit is contained in:
Herrington Darkholme
2016-11-26 12:49:55 +08:00
parent b8648fa9f6
commit 2fb51e7112
6 changed files with 89 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/checker.ts
View File

@@ -3089,10 +3089,6 @@ namespace ts {
return type && (type.flags & TypeFlags.Never) !== 0;
}
function isTypeNonPrimitive(type: Type) {
return type === nonPrimitiveType;
}
// Return the type of a binding element parent. We check SymbolLinks first to see if a type has been
// assigned by contextual typing.
function getTypeForBindingElementParent(node: VariableLikeDeclaration) {
@@ -7475,7 +7471,7 @@ namespace ts {
}
}
}
else if (!(source.flags & TypeFlags.Primitive && isTypeNonPrimitive(target))) {
else if (!(source.flags & TypeFlags.Primitive && target === nonPrimitiveType)) {
if (getObjectFlags(source) & ObjectFlags.Reference && getObjectFlags(target) & ObjectFlags.Reference && (<TypeReference>source).target === (<TypeReference>target).target) {
// We have type references to same target type, see if relationship holds for all type arguments
if (result = typeArgumentsRelatedTo(<TypeReference>source, <TypeReference>target, reportErrors)) {