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

Cherry-pick PR #38395 into release-3.9 (#38402)

Browse Source 
Component commits:
6fe4be21e4 Exclude arrays and tuples from full intersection property check

9019e399e5 Add regression test

Co-authored-by: Anders Hejlsberg <andersh@microsoft.com>
This commit is contained in:
Daniel Rosenwasser
2020-05-07 23:56:33 -07:00
committed by GitHub
parent ef028bcd08 9d6f126c78
commit 9edf9ecc4b
6 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/checker.ts
View File

@@ -15827,7 +15827,7 @@ namespace ts {
// recursive intersections that are structurally similar but not exactly identical. See #37854.
if (result && !inPropertyCheck && (
target.flags & TypeFlags.Intersection && (isPerformingExcessPropertyChecks || isPerformingCommonPropertyChecks) ||
isNonGenericObjectType(target) && source.flags & TypeFlags.Intersection && getApparentType(source).flags & TypeFlags.StructuredType && !some((<IntersectionType>source).types, t => !!(getObjectFlags(t) & ObjectFlags.NonInferrableType)))) {
isNonGenericObjectType(target) && !isArrayType(target) && !isTupleType(target) && source.flags & TypeFlags.Intersection && getApparentType(source).flags & TypeFlags.StructuredType && !some((<IntersectionType>source).types, t => !!(getObjectFlags(t) & ObjectFlags.NonInferrableType)))) {
inPropertyCheck = true;
result &= recursiveTypeRelatedTo(source, target, reportErrors, IntersectionState.PropertyCheck);
inPropertyCheck = false;

5
tests/baselines/reference/intersectionsAndOptionalProperties.errors.txt
View File

@@ -46,4 +46,9 @@ tests/cases/compiler/intersectionsAndOptionalProperties.ts(20,5): error TS2322:
~~~~~~~
!!! error TS2322: Type 'null' is not assignable to type 'number | undefined'.
}
// Repro from #38348
const yy: number[] & [number, ...number[]] = [1];
const xx: [number, ...number[]] = yy;

8
tests/baselines/reference/intersectionsAndOptionalProperties.js
View File

@@ -20,6 +20,11 @@ function foo(v: From) {
x = v; // Error
x.field = v.field; // Error
}
// Repro from #38348
const yy: number[] & [number, ...number[]] = [1];
const xx: [number, ...number[]] = yy;
//// [intersectionsAndOptionalProperties.js]
@@ -31,3 +36,6 @@ function foo(v) {
x = v; // Error
x.field = v.field; // Error
}
// Repro from #38348
var yy = [1];
var xx = yy;

9
tests/baselines/reference/intersectionsAndOptionalProperties.symbols
View File

@@ -62,3 +62,12 @@ function foo(v: From) {
>field : Symbol(field, Decl(intersectionsAndOptionalProperties.ts, 14, 14))
}
// Repro from #38348
const yy: number[] & [number, ...number[]] = [1];
>yy : Symbol(yy, Decl(intersectionsAndOptionalProperties.ts, 24, 5))
const xx: [number, ...number[]] = yy;
>xx : Symbol(xx, Decl(intersectionsAndOptionalProperties.ts, 25, 5))
>yy : Symbol(yy, Decl(intersectionsAndOptionalProperties.ts, 24, 5))

11
tests/baselines/reference/intersectionsAndOptionalProperties.types
View File

@@ -63,3 +63,14 @@ function foo(v: From) {
>field : null
}
// Repro from #38348
const yy: number[] & [number, ...number[]] = [1];
>yy : number[] & [number, ...number[]]
>[1] : [number]
>1 : 1
const xx: [number, ...number[]] = yy;
>xx : [number, ...number[]]
>yy : number[] & [number, ...number[]]

5
tests/cases/compiler/intersectionsAndOptionalProperties.ts
View File

@@ -21,3 +21,8 @@ function foo(v: From) {
x = v; // Error
x.field = v.field; // Error
}
// Repro from #38348
const yy: number[] & [number, ...number[]] = [1];
const xx: [number, ...number[]] = yy;