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

Update object spread scenarios test

Browse Source
This commit is contained in:
Nathan Shively-Sanders
2016-10-03 15:18:04 -07:00
parent 05ef9dd608
commit b9af986df1
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/baselines/reference/objectSpreadScenarios.js
View File

@@ -1,7 +1,7 @@
//// [objectSpreadScenarios.ts]
interface A1 { a: boolean }
interface B1 { b: number };
function override<U>(initial: U, override: U): U {
function override<U>(initial: U, override: U): { ...U, ...U } {
return { ...initial, ...override };
}
function update<U>(this: { u: U }, override: U): void {

3
tests/baselines/reference/objectSpreadScenarios.symbols
View File

@@ -7,13 +7,14 @@ interface B1 { b: number };
>B1 : Symbol(B1, Decl(objectSpreadScenarios.ts, 0, 27))
>b : Symbol(B1.b, Decl(objectSpreadScenarios.ts, 1, 14))
function override<U>(initial: U, override: U): U {
function override<U>(initial: U, override: U): { ...U, ...U } {
>override : Symbol(override, Decl(objectSpreadScenarios.ts, 1, 27))
>U : Symbol(U, Decl(objectSpreadScenarios.ts, 2, 18))
>initial : Symbol(initial, Decl(objectSpreadScenarios.ts, 2, 21))
>U : Symbol(U, Decl(objectSpreadScenarios.ts, 2, 18))
>override : Symbol(override, Decl(objectSpreadScenarios.ts, 2, 32))
>U : Symbol(U, Decl(objectSpreadScenarios.ts, 2, 18))
>U : Symbol(U, Decl(objectSpreadScenarios.ts, 2, 18))
>U : Symbol(U, Decl(objectSpreadScenarios.ts, 2, 18))
return { ...initial, ...override };

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

@@ -7,13 +7,14 @@ interface B1 { b: number };
>B1 : B1
>b : number
function override<U>(initial: U, override: U): U {
>override : <U>(initial: U, override: U) => U
function override<U>(initial: U, override: U): { ...U, ...U } {
>override : <U>(initial: U, override: U) => { ...U; ...U }
>U : U
>initial : U
>U : U
>override : U
>U : U
>U : U
>U : U
return { ...initial, ...override };
@@ -72,10 +73,10 @@ let b1: B1 = { b: 101 };
>101 : 101
a1 = override(a1, { a: false });
>a1 = override(a1, { a: false }) : A1
>a1 = override(a1, { a: false }) : { ...A1; ...A1 }
>a1 : A1
>override(a1, { a: false }) : A1
>override : <U>(initial: U, override: U) => U
>override(a1, { a: false }) : { ...A1; ...A1 }
>override : <U>(initial: U, override: U) => { ...U; ...U }
>a1 : A1
>{ a: false } : { a: false; }
>a : boolean

2
tests/cases/conformance/types/spread/objectSpreadScenarios.ts
View File

@@ -1,6 +1,6 @@
interface A1 { a: boolean }
interface B1 { b: number };
function override<U>(initial: U, override: U): U {
function override<U>(initial: U, override: U): { ...U, ...U } {
return { ...initial, ...override };
}
function update<U>(this: { u: U }, override: U): void {