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

Spreads w/a single type parameter assignable to that type parameter

Browse Source
This commit is contained in:
Nathan Shively-Sanders
2016-09-27 16:15:52 -07:00
parent 78420adfcd
commit 7e7a26a358
1 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/compiler/checker.ts
View File

@@ -2321,8 +2321,6 @@ namespace ts {
printFollowingPunctuation = true;
}
}
// TODO: Only print if this is directly on the type -- not on the subtype somewhere.
// (This is not crucial, though, since the extra info *might* be nice.)
const resolved = resolveStructuredTypeMembers(type);
writeIndexSignature(resolved.stringIndexInfo, SyntaxKind.StringKeyword);
writeIndexSignature(resolved.numberIndexInfo, SyntaxKind.NumberKeyword);
@@ -6656,23 +6654,42 @@ namespace ts {
}
}
if (source.flags & TypeFlags.Spread && target.flags & TypeFlags.Spread) {
const sourceParameters = filter((source as SpreadType).types, t => !!(t.flags & TypeFlags.TypeParameter));
const targetParameters = filter((target as SpreadType).types, t => !!(t.flags & TypeFlags.TypeParameter));
if (sourceParameters.length !== targetParameters.length) {
reportRelationError(headMessage, source, target);
return Ternary.False;
if (source.flags & TypeFlags.Spread) {
if (target.flags & TypeFlags.TypeParameter) {
let hasTypeParameter = false;
let typeParametersAreEqual = true;
for (const t of (source as SpreadType).types) {
if (t.flags & TypeFlags.TypeParameter) {
hasTypeParameter = true;
if (t !== target) {
typeParametersAreEqual = false;
break;
}
}
}
if (hasTypeParameter && typeParametersAreEqual) {
errorInfo = saveErrorInfo;
return Ternary.True;
}
}
for (let i = 0; i < sourceParameters.length; i++) {
if (sourceParameters[i].symbol !== targetParameters[i].symbol) {
else if (target.flags & TypeFlags.Spread) {
const sourceParameters = filter((source as SpreadType).types, t => !!(t.flags & TypeFlags.TypeParameter));
const targetParameters = filter((target as SpreadType).types, t => !!(t.flags & TypeFlags.TypeParameter));
if (sourceParameters.length !== targetParameters.length) {
reportRelationError(headMessage, source, target);
return Ternary.False;
}
}
const reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo;
if (result = objectTypeRelatedTo(source, source, target, reportStructuralErrors)) {
errorInfo = saveErrorInfo;
return result;
for (let i = 0; i < sourceParameters.length; i++) {
if (sourceParameters[i].symbol !== targetParameters[i].symbol) {
reportRelationError(headMessage, source, target);
return Ternary.False;
}
}
const reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo;
if (result = objectTypeRelatedTo(source, source, target, reportStructuralErrors)) {
errorInfo = saveErrorInfo;
return result;
}
}
}