From 171b3852375d6d1f6cbb49c01e4e870bf77ac7b7 Mon Sep 17 00:00:00 2001 From: Jason Freeman Date: Fri, 29 May 2015 17:37:54 -0700 Subject: [PATCH] Fix CRLF issue in baselines --- .../inferentialTypingObjectLiteralMethod1.js | 10 +-- ...erentialTypingObjectLiteralMethod1.symbols | 78 ++++++++--------- ...nferentialTypingObjectLiteralMethod1.types | 86 +++++++++---------- .../inferentialTypingObjectLiteralMethod2.js | 10 +-- ...erentialTypingObjectLiteralMethod2.symbols | 78 ++++++++--------- ...nferentialTypingObjectLiteralMethod2.types | 86 +++++++++---------- 6 files changed, 174 insertions(+), 174 deletions(-) diff --git a/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.js b/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.js index ad58c7e22ab..a5cf75ae7f3 100644 --- a/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.js +++ b/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.js @@ -1,9 +1,9 @@ -//// [inferentialTypingObjectLiteralMethod1.ts] +//// [inferentialTypingObjectLiteralMethod1.ts] interface Int { method(x: T): U; } declare function foo(x: T, y: Int, z: Int): T; -foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } }); - -//// [inferentialTypingObjectLiteralMethod1.js] -foo("", { method: function (p1) { return p1.length; } }, { method: function (p2) { return undefined; } }); +foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } }); + +//// [inferentialTypingObjectLiteralMethod1.js] +foo("", { method: function (p1) { return p1.length; } }, { method: function (p2) { return undefined; } }); diff --git a/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.symbols b/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.symbols index 13b69d045a3..3fee48fc837 100644 --- a/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.symbols +++ b/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.symbols @@ -1,39 +1,39 @@ -=== tests/cases/compiler/inferentialTypingObjectLiteralMethod1.ts === -interface Int { ->Int : Symbol(Int, Decl(inferentialTypingObjectLiteralMethod1.ts, 0, 0)) ->T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod1.ts, 0, 14)) ->U : Symbol(U, Decl(inferentialTypingObjectLiteralMethod1.ts, 0, 16)) - - method(x: T): U; ->method : Symbol(method, Decl(inferentialTypingObjectLiteralMethod1.ts, 0, 21)) ->x : Symbol(x, Decl(inferentialTypingObjectLiteralMethod1.ts, 1, 11)) ->T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod1.ts, 0, 14)) ->U : Symbol(U, Decl(inferentialTypingObjectLiteralMethod1.ts, 0, 16)) -} -declare function foo(x: T, y: Int, z: Int): T; ->foo : Symbol(foo, Decl(inferentialTypingObjectLiteralMethod1.ts, 2, 1)) ->T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod1.ts, 3, 21)) ->U : Symbol(U, Decl(inferentialTypingObjectLiteralMethod1.ts, 3, 23)) ->x : Symbol(x, Decl(inferentialTypingObjectLiteralMethod1.ts, 3, 27)) ->T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod1.ts, 3, 21)) ->y : Symbol(y, Decl(inferentialTypingObjectLiteralMethod1.ts, 3, 32)) ->Int : Symbol(Int, Decl(inferentialTypingObjectLiteralMethod1.ts, 0, 0)) ->T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod1.ts, 3, 21)) ->U : Symbol(U, Decl(inferentialTypingObjectLiteralMethod1.ts, 3, 23)) ->z : Symbol(z, Decl(inferentialTypingObjectLiteralMethod1.ts, 3, 46)) ->Int : Symbol(Int, Decl(inferentialTypingObjectLiteralMethod1.ts, 0, 0)) ->U : Symbol(U, Decl(inferentialTypingObjectLiteralMethod1.ts, 3, 23)) ->T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod1.ts, 3, 21)) ->T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod1.ts, 3, 21)) - -foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } }); ->foo : Symbol(foo, Decl(inferentialTypingObjectLiteralMethod1.ts, 2, 1)) ->method : Symbol(method, Decl(inferentialTypingObjectLiteralMethod1.ts, 4, 9)) ->p1 : Symbol(p1, Decl(inferentialTypingObjectLiteralMethod1.ts, 4, 17)) ->p1.length : Symbol(String.length, Decl(lib.d.ts, 414, 19)) ->p1 : Symbol(p1, Decl(inferentialTypingObjectLiteralMethod1.ts, 4, 17)) ->length : Symbol(String.length, Decl(lib.d.ts, 414, 19)) ->method : Symbol(method, Decl(inferentialTypingObjectLiteralMethod1.ts, 4, 46)) ->p2 : Symbol(p2, Decl(inferentialTypingObjectLiteralMethod1.ts, 4, 54)) ->undefined : Symbol(undefined) - +=== tests/cases/compiler/inferentialTypingObjectLiteralMethod1.ts === +interface Int { +>Int : Symbol(Int, Decl(inferentialTypingObjectLiteralMethod1.ts, 0, 0)) +>T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod1.ts, 0, 14)) +>U : Symbol(U, Decl(inferentialTypingObjectLiteralMethod1.ts, 0, 16)) + + method(x: T): U; +>method : Symbol(method, Decl(inferentialTypingObjectLiteralMethod1.ts, 0, 21)) +>x : Symbol(x, Decl(inferentialTypingObjectLiteralMethod1.ts, 1, 11)) +>T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod1.ts, 0, 14)) +>U : Symbol(U, Decl(inferentialTypingObjectLiteralMethod1.ts, 0, 16)) +} +declare function foo(x: T, y: Int, z: Int): T; +>foo : Symbol(foo, Decl(inferentialTypingObjectLiteralMethod1.ts, 2, 1)) +>T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod1.ts, 3, 21)) +>U : Symbol(U, Decl(inferentialTypingObjectLiteralMethod1.ts, 3, 23)) +>x : Symbol(x, Decl(inferentialTypingObjectLiteralMethod1.ts, 3, 27)) +>T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod1.ts, 3, 21)) +>y : Symbol(y, Decl(inferentialTypingObjectLiteralMethod1.ts, 3, 32)) +>Int : Symbol(Int, Decl(inferentialTypingObjectLiteralMethod1.ts, 0, 0)) +>T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod1.ts, 3, 21)) +>U : Symbol(U, Decl(inferentialTypingObjectLiteralMethod1.ts, 3, 23)) +>z : Symbol(z, Decl(inferentialTypingObjectLiteralMethod1.ts, 3, 46)) +>Int : Symbol(Int, Decl(inferentialTypingObjectLiteralMethod1.ts, 0, 0)) +>U : Symbol(U, Decl(inferentialTypingObjectLiteralMethod1.ts, 3, 23)) +>T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod1.ts, 3, 21)) +>T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod1.ts, 3, 21)) + +foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } }); +>foo : Symbol(foo, Decl(inferentialTypingObjectLiteralMethod1.ts, 2, 1)) +>method : Symbol(method, Decl(inferentialTypingObjectLiteralMethod1.ts, 4, 9)) +>p1 : Symbol(p1, Decl(inferentialTypingObjectLiteralMethod1.ts, 4, 17)) +>p1.length : Symbol(String.length, Decl(lib.d.ts, 414, 19)) +>p1 : Symbol(p1, Decl(inferentialTypingObjectLiteralMethod1.ts, 4, 17)) +>length : Symbol(String.length, Decl(lib.d.ts, 414, 19)) +>method : Symbol(method, Decl(inferentialTypingObjectLiteralMethod1.ts, 4, 46)) +>p2 : Symbol(p2, Decl(inferentialTypingObjectLiteralMethod1.ts, 4, 54)) +>undefined : Symbol(undefined) + diff --git a/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.types b/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.types index 13df1f6f662..da2fa24060f 100644 --- a/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.types +++ b/tests/baselines/reference/inferentialTypingObjectLiteralMethod1.types @@ -1,43 +1,43 @@ -=== tests/cases/compiler/inferentialTypingObjectLiteralMethod1.ts === -interface Int { ->Int : Int ->T : T ->U : U - - method(x: T): U; ->method : (x: T) => U ->x : T ->T : T ->U : U -} -declare function foo(x: T, y: Int, z: Int): T; ->foo : (x: T, y: Int, z: Int) => T ->T : T ->U : U ->x : T ->T : T ->y : Int ->Int : Int ->T : T ->U : U ->z : Int ->Int : Int ->U : U ->T : T ->T : T - -foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } }); ->foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } }) : string ->foo : (x: T, y: Int, z: Int) => T ->"" : string ->{ method(p1) { return p1.length } } : { method(p1: string): number; } ->method : (p1: string) => number ->p1 : string ->p1.length : number ->p1 : string ->length : number ->{ method(p2) { return undefined } } : { method(p2: number): any; } ->method : (p2: number) => any ->p2 : number ->undefined : undefined - +=== tests/cases/compiler/inferentialTypingObjectLiteralMethod1.ts === +interface Int { +>Int : Int +>T : T +>U : U + + method(x: T): U; +>method : (x: T) => U +>x : T +>T : T +>U : U +} +declare function foo(x: T, y: Int, z: Int): T; +>foo : (x: T, y: Int, z: Int) => T +>T : T +>U : U +>x : T +>T : T +>y : Int +>Int : Int +>T : T +>U : U +>z : Int +>Int : Int +>U : U +>T : T +>T : T + +foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } }); +>foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } }) : string +>foo : (x: T, y: Int, z: Int) => T +>"" : string +>{ method(p1) { return p1.length } } : { method(p1: string): number; } +>method : (p1: string) => number +>p1 : string +>p1.length : number +>p1 : string +>length : number +>{ method(p2) { return undefined } } : { method(p2: number): any; } +>method : (p2: number) => any +>p2 : number +>undefined : undefined + diff --git a/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.js b/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.js index 2181c954dc0..fe53a619acd 100644 --- a/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.js +++ b/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.js @@ -1,9 +1,9 @@ -//// [inferentialTypingObjectLiteralMethod2.ts] +//// [inferentialTypingObjectLiteralMethod2.ts] interface Int { [s: string]: (x: T) => U; } declare function foo(x: T, y: Int, z: Int): T; -foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } }); - -//// [inferentialTypingObjectLiteralMethod2.js] -foo("", { method: function (p1) { return p1.length; } }, { method: function (p2) { return undefined; } }); +foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } }); + +//// [inferentialTypingObjectLiteralMethod2.js] +foo("", { method: function (p1) { return p1.length; } }, { method: function (p2) { return undefined; } }); diff --git a/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.symbols b/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.symbols index 84c2e8f1820..fc8d39858b6 100644 --- a/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.symbols +++ b/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.symbols @@ -1,39 +1,39 @@ -=== tests/cases/compiler/inferentialTypingObjectLiteralMethod2.ts === -interface Int { ->Int : Symbol(Int, Decl(inferentialTypingObjectLiteralMethod2.ts, 0, 0)) ->T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod2.ts, 0, 14)) ->U : Symbol(U, Decl(inferentialTypingObjectLiteralMethod2.ts, 0, 16)) - - [s: string]: (x: T) => U; ->s : Symbol(s, Decl(inferentialTypingObjectLiteralMethod2.ts, 1, 5)) ->x : Symbol(x, Decl(inferentialTypingObjectLiteralMethod2.ts, 1, 18)) ->T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod2.ts, 0, 14)) ->U : Symbol(U, Decl(inferentialTypingObjectLiteralMethod2.ts, 0, 16)) -} -declare function foo(x: T, y: Int, z: Int): T; ->foo : Symbol(foo, Decl(inferentialTypingObjectLiteralMethod2.ts, 2, 1)) ->T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod2.ts, 3, 21)) ->U : Symbol(U, Decl(inferentialTypingObjectLiteralMethod2.ts, 3, 23)) ->x : Symbol(x, Decl(inferentialTypingObjectLiteralMethod2.ts, 3, 27)) ->T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod2.ts, 3, 21)) ->y : Symbol(y, Decl(inferentialTypingObjectLiteralMethod2.ts, 3, 32)) ->Int : Symbol(Int, Decl(inferentialTypingObjectLiteralMethod2.ts, 0, 0)) ->T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod2.ts, 3, 21)) ->U : Symbol(U, Decl(inferentialTypingObjectLiteralMethod2.ts, 3, 23)) ->z : Symbol(z, Decl(inferentialTypingObjectLiteralMethod2.ts, 3, 46)) ->Int : Symbol(Int, Decl(inferentialTypingObjectLiteralMethod2.ts, 0, 0)) ->U : Symbol(U, Decl(inferentialTypingObjectLiteralMethod2.ts, 3, 23)) ->T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod2.ts, 3, 21)) ->T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod2.ts, 3, 21)) - -foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } }); ->foo : Symbol(foo, Decl(inferentialTypingObjectLiteralMethod2.ts, 2, 1)) ->method : Symbol(method, Decl(inferentialTypingObjectLiteralMethod2.ts, 4, 9)) ->p1 : Symbol(p1, Decl(inferentialTypingObjectLiteralMethod2.ts, 4, 17)) ->p1.length : Symbol(String.length, Decl(lib.d.ts, 414, 19)) ->p1 : Symbol(p1, Decl(inferentialTypingObjectLiteralMethod2.ts, 4, 17)) ->length : Symbol(String.length, Decl(lib.d.ts, 414, 19)) ->method : Symbol(method, Decl(inferentialTypingObjectLiteralMethod2.ts, 4, 46)) ->p2 : Symbol(p2, Decl(inferentialTypingObjectLiteralMethod2.ts, 4, 54)) ->undefined : Symbol(undefined) - +=== tests/cases/compiler/inferentialTypingObjectLiteralMethod2.ts === +interface Int { +>Int : Symbol(Int, Decl(inferentialTypingObjectLiteralMethod2.ts, 0, 0)) +>T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod2.ts, 0, 14)) +>U : Symbol(U, Decl(inferentialTypingObjectLiteralMethod2.ts, 0, 16)) + + [s: string]: (x: T) => U; +>s : Symbol(s, Decl(inferentialTypingObjectLiteralMethod2.ts, 1, 5)) +>x : Symbol(x, Decl(inferentialTypingObjectLiteralMethod2.ts, 1, 18)) +>T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod2.ts, 0, 14)) +>U : Symbol(U, Decl(inferentialTypingObjectLiteralMethod2.ts, 0, 16)) +} +declare function foo(x: T, y: Int, z: Int): T; +>foo : Symbol(foo, Decl(inferentialTypingObjectLiteralMethod2.ts, 2, 1)) +>T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod2.ts, 3, 21)) +>U : Symbol(U, Decl(inferentialTypingObjectLiteralMethod2.ts, 3, 23)) +>x : Symbol(x, Decl(inferentialTypingObjectLiteralMethod2.ts, 3, 27)) +>T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod2.ts, 3, 21)) +>y : Symbol(y, Decl(inferentialTypingObjectLiteralMethod2.ts, 3, 32)) +>Int : Symbol(Int, Decl(inferentialTypingObjectLiteralMethod2.ts, 0, 0)) +>T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod2.ts, 3, 21)) +>U : Symbol(U, Decl(inferentialTypingObjectLiteralMethod2.ts, 3, 23)) +>z : Symbol(z, Decl(inferentialTypingObjectLiteralMethod2.ts, 3, 46)) +>Int : Symbol(Int, Decl(inferentialTypingObjectLiteralMethod2.ts, 0, 0)) +>U : Symbol(U, Decl(inferentialTypingObjectLiteralMethod2.ts, 3, 23)) +>T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod2.ts, 3, 21)) +>T : Symbol(T, Decl(inferentialTypingObjectLiteralMethod2.ts, 3, 21)) + +foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } }); +>foo : Symbol(foo, Decl(inferentialTypingObjectLiteralMethod2.ts, 2, 1)) +>method : Symbol(method, Decl(inferentialTypingObjectLiteralMethod2.ts, 4, 9)) +>p1 : Symbol(p1, Decl(inferentialTypingObjectLiteralMethod2.ts, 4, 17)) +>p1.length : Symbol(String.length, Decl(lib.d.ts, 414, 19)) +>p1 : Symbol(p1, Decl(inferentialTypingObjectLiteralMethod2.ts, 4, 17)) +>length : Symbol(String.length, Decl(lib.d.ts, 414, 19)) +>method : Symbol(method, Decl(inferentialTypingObjectLiteralMethod2.ts, 4, 46)) +>p2 : Symbol(p2, Decl(inferentialTypingObjectLiteralMethod2.ts, 4, 54)) +>undefined : Symbol(undefined) + diff --git a/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.types b/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.types index 99e6968732b..be937410cef 100644 --- a/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.types +++ b/tests/baselines/reference/inferentialTypingObjectLiteralMethod2.types @@ -1,43 +1,43 @@ -=== tests/cases/compiler/inferentialTypingObjectLiteralMethod2.ts === -interface Int { ->Int : Int ->T : T ->U : U - - [s: string]: (x: T) => U; ->s : string ->x : T ->T : T ->U : U -} -declare function foo(x: T, y: Int, z: Int): T; ->foo : (x: T, y: Int, z: Int) => T ->T : T ->U : U ->x : T ->T : T ->y : Int ->Int : Int ->T : T ->U : U ->z : Int ->Int : Int ->U : U ->T : T ->T : T - -foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } }); ->foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } }) : string ->foo : (x: T, y: Int, z: Int) => T ->"" : string ->{ method(p1) { return p1.length } } : { [x: string]: (p1: string) => number; method(p1: string): number; } ->method : (p1: string) => number ->p1 : string ->p1.length : number ->p1 : string ->length : number ->{ method(p2) { return undefined } } : { [x: string]: (p2: number) => any; method(p2: number): any; } ->method : (p2: number) => any ->p2 : number ->undefined : undefined - +=== tests/cases/compiler/inferentialTypingObjectLiteralMethod2.ts === +interface Int { +>Int : Int +>T : T +>U : U + + [s: string]: (x: T) => U; +>s : string +>x : T +>T : T +>U : U +} +declare function foo(x: T, y: Int, z: Int): T; +>foo : (x: T, y: Int, z: Int) => T +>T : T +>U : U +>x : T +>T : T +>y : Int +>Int : Int +>T : T +>U : U +>z : Int +>Int : Int +>U : U +>T : T +>T : T + +foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } }); +>foo("", { method(p1) { return p1.length } }, { method(p2) { return undefined } }) : string +>foo : (x: T, y: Int, z: Int) => T +>"" : string +>{ method(p1) { return p1.length } } : { [x: string]: (p1: string) => number; method(p1: string): number; } +>method : (p1: string) => number +>p1 : string +>p1.length : number +>p1 : string +>length : number +>{ method(p2) { return undefined } } : { [x: string]: (p2: number) => any; method(p2: number): any; } +>method : (p2: number) => any +>p2 : number +>undefined : undefined +