From a3aeecc8b672163e46327718ef13a49eaf755f2e Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Thu, 12 Feb 2015 09:52:09 -0800 Subject: [PATCH] accept baseline changes --- .../baselines/reference/APISample_compile.js | 5 ++++- .../reference/APISample_compile.types | 11 ++++++++-- tests/baselines/reference/APISample_linter.js | 5 ++++- .../reference/APISample_linter.types | 11 ++++++++-- .../reference/APISample_transform.js | 5 ++++- .../reference/APISample_transform.types | 11 ++++++++-- .../baselines/reference/APISample_watcher.js | 5 ++++- .../reference/APISample_watcher.types | 11 ++++++++-- .../amdDependencyCommentName1.errors.txt | 18 +++++++-------- .../reference/amdDependencyCommentName1.js | 14 ++++++------ .../amdDependencyCommentName2.errors.txt | 18 +++++++-------- .../reference/amdDependencyCommentName2.js | 16 +++++++------- .../amdDependencyCommentName3.errors.txt | 22 +++++++++---------- .../reference/amdDependencyCommentName3.js | 20 ++++++++--------- 14 files changed, 106 insertions(+), 66 deletions(-) diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js index 7d89d88b5b3..9a44ae12df0 100644 --- a/tests/baselines/reference/APISample_compile.js +++ b/tests/baselines/reference/APISample_compile.js @@ -723,7 +723,10 @@ declare module "typescript" { endOfFileToken: Node; fileName: string; text: string; - amdDependencies: string[]; + amdDependencies: { + path: string; + name: string; + }[]; amdModuleName: string; referencedFiles: FileReference[]; hasNoDefaultLib: boolean; diff --git a/tests/baselines/reference/APISample_compile.types b/tests/baselines/reference/APISample_compile.types index 8cf789bf20f..69458320236 100644 --- a/tests/baselines/reference/APISample_compile.types +++ b/tests/baselines/reference/APISample_compile.types @@ -2195,9 +2195,16 @@ declare module "typescript" { text: string; >text : string - amdDependencies: string[]; ->amdDependencies : string[] + amdDependencies: { +>amdDependencies : { path: string; name: string; }[] + path: string; +>path : string + + name: string; +>name : string + + }[]; amdModuleName: string; >amdModuleName : string diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js index 0ce5a277968..5413cdb8a78 100644 --- a/tests/baselines/reference/APISample_linter.js +++ b/tests/baselines/reference/APISample_linter.js @@ -754,7 +754,10 @@ declare module "typescript" { endOfFileToken: Node; fileName: string; text: string; - amdDependencies: string[]; + amdDependencies: { + path: string; + name: string; + }[]; amdModuleName: string; referencedFiles: FileReference[]; hasNoDefaultLib: boolean; diff --git a/tests/baselines/reference/APISample_linter.types b/tests/baselines/reference/APISample_linter.types index 115a0f5a16b..55613f8d3e3 100644 --- a/tests/baselines/reference/APISample_linter.types +++ b/tests/baselines/reference/APISample_linter.types @@ -2339,9 +2339,16 @@ declare module "typescript" { text: string; >text : string - amdDependencies: string[]; ->amdDependencies : string[] + amdDependencies: { +>amdDependencies : { path: string; name: string; }[] + path: string; +>path : string + + name: string; +>name : string + + }[]; amdModuleName: string; >amdModuleName : string diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js index 6ecf4e7c395..13ec31cd7d2 100644 --- a/tests/baselines/reference/APISample_transform.js +++ b/tests/baselines/reference/APISample_transform.js @@ -755,7 +755,10 @@ declare module "typescript" { endOfFileToken: Node; fileName: string; text: string; - amdDependencies: string[]; + amdDependencies: { + path: string; + name: string; + }[]; amdModuleName: string; referencedFiles: FileReference[]; hasNoDefaultLib: boolean; diff --git a/tests/baselines/reference/APISample_transform.types b/tests/baselines/reference/APISample_transform.types index e2797fe5267..a8ba6e9f521 100644 --- a/tests/baselines/reference/APISample_transform.types +++ b/tests/baselines/reference/APISample_transform.types @@ -2291,9 +2291,16 @@ declare module "typescript" { text: string; >text : string - amdDependencies: string[]; ->amdDependencies : string[] + amdDependencies: { +>amdDependencies : { path: string; name: string; }[] + path: string; +>path : string + + name: string; +>name : string + + }[]; amdModuleName: string; >amdModuleName : string diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js index eb141f20672..5c3f944faf1 100644 --- a/tests/baselines/reference/APISample_watcher.js +++ b/tests/baselines/reference/APISample_watcher.js @@ -792,7 +792,10 @@ declare module "typescript" { endOfFileToken: Node; fileName: string; text: string; - amdDependencies: string[]; + amdDependencies: { + path: string; + name: string; + }[]; amdModuleName: string; referencedFiles: FileReference[]; hasNoDefaultLib: boolean; diff --git a/tests/baselines/reference/APISample_watcher.types b/tests/baselines/reference/APISample_watcher.types index 692e07f317a..54304c2e1b9 100644 --- a/tests/baselines/reference/APISample_watcher.types +++ b/tests/baselines/reference/APISample_watcher.types @@ -2464,9 +2464,16 @@ declare module "typescript" { text: string; >text : string - amdDependencies: string[]; ->amdDependencies : string[] + amdDependencies: { +>amdDependencies : { path: string; name: string; }[] + path: string; +>path : string + + name: string; +>name : string + + }[]; amdModuleName: string; >amdModuleName : string diff --git a/tests/baselines/reference/amdDependencyCommentName1.errors.txt b/tests/baselines/reference/amdDependencyCommentName1.errors.txt index 081c86b25e9..6ba879abc72 100644 --- a/tests/baselines/reference/amdDependencyCommentName1.errors.txt +++ b/tests/baselines/reference/amdDependencyCommentName1.errors.txt @@ -1,10 +1,10 @@ -tests/cases/compiler/amdDependencyCommentName1.ts(3,21): error TS2307: Cannot find external module 'm2'. - - -==== tests/cases/compiler/amdDependencyCommentName1.ts (1 errors) ==== - /// - - import m1 = require("m2") - ~~~~ -!!! error TS2307: Cannot find external module 'm2'. +tests/cases/compiler/amdDependencyCommentName1.ts(3,21): error TS2307: Cannot find external module 'm2'. + + +==== tests/cases/compiler/amdDependencyCommentName1.ts (1 errors) ==== + /// + + import m1 = require("m2") + ~~~~ +!!! error TS2307: Cannot find external module 'm2'. m1.f(); \ No newline at end of file diff --git a/tests/baselines/reference/amdDependencyCommentName1.js b/tests/baselines/reference/amdDependencyCommentName1.js index 03336536378..b74e58b8538 100644 --- a/tests/baselines/reference/amdDependencyCommentName1.js +++ b/tests/baselines/reference/amdDependencyCommentName1.js @@ -1,10 +1,10 @@ -//// [amdDependencyCommentName1.ts] +//// [amdDependencyCommentName1.ts] /// import m1 = require("m2") -m1.f(); - -//// [amdDependencyCommentName1.js] -/// -var m1 = require("m2"); -m1.f(); +m1.f(); + +//// [amdDependencyCommentName1.js] +/// +var m1 = require("m2"); +m1.f(); diff --git a/tests/baselines/reference/amdDependencyCommentName2.errors.txt b/tests/baselines/reference/amdDependencyCommentName2.errors.txt index 137f9335ff7..e3d6b8d16ec 100644 --- a/tests/baselines/reference/amdDependencyCommentName2.errors.txt +++ b/tests/baselines/reference/amdDependencyCommentName2.errors.txt @@ -1,10 +1,10 @@ -tests/cases/compiler/amdDependencyCommentName2.ts(3,21): error TS2307: Cannot find external module 'm2'. - - -==== tests/cases/compiler/amdDependencyCommentName2.ts (1 errors) ==== - /// - - import m1 = require("m2") - ~~~~ -!!! error TS2307: Cannot find external module 'm2'. +tests/cases/compiler/amdDependencyCommentName2.ts(3,21): error TS2307: Cannot find external module 'm2'. + + +==== tests/cases/compiler/amdDependencyCommentName2.ts (1 errors) ==== + /// + + import m1 = require("m2") + ~~~~ +!!! error TS2307: Cannot find external module 'm2'. m1.f(); \ No newline at end of file diff --git a/tests/baselines/reference/amdDependencyCommentName2.js b/tests/baselines/reference/amdDependencyCommentName2.js index d923df80195..4f54c548580 100644 --- a/tests/baselines/reference/amdDependencyCommentName2.js +++ b/tests/baselines/reference/amdDependencyCommentName2.js @@ -1,11 +1,11 @@ -//// [amdDependencyCommentName2.ts] +//// [amdDependencyCommentName2.ts] /// import m1 = require("m2") -m1.f(); - -//// [amdDependencyCommentName2.js] -/// -define(["require", "exports", "m2", "bar"], function (require, exports, m1, b) { - m1.f(); -}); +m1.f(); + +//// [amdDependencyCommentName2.js] +/// +define(["require", "exports", "m2", "bar"], function (require, exports, m1, b) { + m1.f(); +}); diff --git a/tests/baselines/reference/amdDependencyCommentName3.errors.txt b/tests/baselines/reference/amdDependencyCommentName3.errors.txt index 1fa997b9c99..a9342218c2c 100644 --- a/tests/baselines/reference/amdDependencyCommentName3.errors.txt +++ b/tests/baselines/reference/amdDependencyCommentName3.errors.txt @@ -1,12 +1,12 @@ -tests/cases/compiler/amdDependencyCommentName3.ts(5,21): error TS2307: Cannot find external module 'm2'. - - -==== tests/cases/compiler/amdDependencyCommentName3.ts (1 errors) ==== - /// - /// - /// - - import m1 = require("m2") - ~~~~ -!!! error TS2307: Cannot find external module 'm2'. +tests/cases/compiler/amdDependencyCommentName3.ts(5,21): error TS2307: Cannot find external module 'm2'. + + +==== tests/cases/compiler/amdDependencyCommentName3.ts (1 errors) ==== + /// + /// + /// + + import m1 = require("m2") + ~~~~ +!!! error TS2307: Cannot find external module 'm2'. m1.f(); \ No newline at end of file diff --git a/tests/baselines/reference/amdDependencyCommentName3.js b/tests/baselines/reference/amdDependencyCommentName3.js index 76e00e1e0cc..ca6b1280585 100644 --- a/tests/baselines/reference/amdDependencyCommentName3.js +++ b/tests/baselines/reference/amdDependencyCommentName3.js @@ -1,15 +1,15 @@ -//// [amdDependencyCommentName3.ts] +//// [amdDependencyCommentName3.ts] /// /// /// import m1 = require("m2") -m1.f(); - -//// [amdDependencyCommentName3.js] -/// -/// -/// -define(["require", "exports", "m2", "bar", "goo", "foo"], function (require, exports, m1, b, c) { - m1.f(); -}); +m1.f(); + +//// [amdDependencyCommentName3.js] +/// +/// +/// +define(["require", "exports", "m2", "bar", "goo", "foo"], function (require, exports, m1, b, c) { + m1.f(); +});