Skip to content

🤖 Pick PR #38395 (Exclude arrays and tuples from full...) into release-3.9 #38402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 8, 2020
Merged

🤖 Pick PR #38395 (Exclude arrays and tuples from full...) into release-3.9 #38402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15816,7 +15816,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;
Expand Down
5 changes: 5 additions & 0 deletions tests/baselines/reference/intersectionsAndOptionalProperties.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 8 additions & 0 deletions tests/baselines/reference/intersectionsAndOptionalProperties.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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 changes: 9 additions & 0 deletions tests/baselines/reference/intersectionsAndOptionalProperties.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 11 additions & 0 deletions tests/baselines/reference/intersectionsAndOptionalProperties.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 5 additions & 0 deletions tests/cases/compiler/intersectionsAndOptionalProperties.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;