microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-13 16:34:39 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Replacement -> Base

Browse Source
This commit is contained in:
Daniel Rosenwasser 2017-05-12 01:18:17 -07:00
parent 8168c8e3bf
commit 68651ad3ab
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/compiler/checker.ts
View File

@ -8577,29 +8577,29 @@ namespace ts {
// and noise for experienced users. Here we can do an extra check in the error case to
// see whether or not substituting in the base types could simplify what we display to the user.
replaceLiterals: {
let sourceReplacement;
let targetReplacement;
let sourceBase;
let targetBase;
if (isTypeOfKind(source, TypeFlags.Literal)) {
sourceReplacement = getBaseTypeOfLiteralType(source);
sourceBase = getBaseTypeOfLiteralType(source);
}
if (isTypeOfKind(target, TypeFlags.Literal)) {
targetReplacement = getBaseTypeOfLiteralType(target);
targetBase = getBaseTypeOfLiteralType(target);
}
// If they both have the same base type, it's probably useful to report the literal type.
if (sourceReplacement === targetReplacement) {
if (sourceBase === targetBase) {
break replaceLiterals;
}
// We substitute the source with the base type *only* if
// the relation with the target remains the same.
if (sourceReplacement && !isTypeRelatedTo(sourceReplacement, target, relation)) {
source = sourceReplacement;
if (sourceBase && !isTypeRelatedTo(sourceBase, target, relation)) {
source = sourceBase;
}
// Likewise, only substitue the target if the relation with the source
// (or potentially the base-type of the source!) remains the same.
if (targetReplacement && !isTypeRelatedTo(source, targetReplacement, relation)) {
target = targetReplacement;
if (targetBase && !isTypeRelatedTo(source, targetBase, relation)) {
target = targetBase;
}
}