From 7b43672ce058b4eacd5c0a7de456c6cca493b972 Mon Sep 17 00:00:00 2001 From: Daniel Rosenwasser Date: Sat, 31 Jan 2015 12:09:22 -0800 Subject: [PATCH] Amend baselines. --- .../differentTypesWithSameName.errors.txt | 46 ++++++++++--------- .../reference/differentTypesWithSameName.js | 46 +++++++++---------- 2 files changed, 47 insertions(+), 45 deletions(-) diff --git a/tests/baselines/reference/differentTypesWithSameName.errors.txt b/tests/baselines/reference/differentTypesWithSameName.errors.txt index c451fcab1f..b0850ee7f4 100644 --- a/tests/baselines/reference/differentTypesWithSameName.errors.txt +++ b/tests/baselines/reference/differentTypesWithSameName.errors.txt @@ -1,22 +1,24 @@ -tests/cases/compiler/differentTypesWithSameName.ts(16,15): error TS2345: Argument of type 'variable' is not assignable to parameter of type 'm.variable'. - - -==== tests/cases/compiler/differentTypesWithSameName.ts (1 errors) ==== - module m { - export class variable{ - s: string; - } - export function doSomething(v: m.variable) { - - } - } - - class variable { - t: number; - } - - - var v: variable = new variable(); - m.doSomething(v); - ~ -!!! error TS2345: Argument of type 'variable' is not assignable to parameter of type 'm.variable'. \ No newline at end of file +tests/cases/compiler/differentTypesWithSameName.ts(16,15): error TS2345: Argument of type 'variable' is not assignable to parameter of type 'm.variable'. + Property 's' is missing in type 'variable'. + + +==== tests/cases/compiler/differentTypesWithSameName.ts (1 errors) ==== + module m { + export class variable{ + s: string; + } + export function doSomething(v: m.variable) { + + } + } + + class variable { + t: number; + } + + + var v: variable = new variable(); + m.doSomething(v); + ~ +!!! error TS2345: Argument of type 'variable' is not assignable to parameter of type 'm.variable'. +!!! error TS2345: Property 's' is missing in type 'variable'. \ No newline at end of file diff --git a/tests/baselines/reference/differentTypesWithSameName.js b/tests/baselines/reference/differentTypesWithSameName.js index 7ee0b6bf02..54a7a0f43b 100644 --- a/tests/baselines/reference/differentTypesWithSameName.js +++ b/tests/baselines/reference/differentTypesWithSameName.js @@ -1,4 +1,4 @@ -//// [differentTypesWithSameName.ts] +//// [differentTypesWithSameName.ts] module m { export class variable{ s: string; @@ -14,25 +14,25 @@ class variable { var v: variable = new variable(); -m.doSomething(v); - -//// [differentTypesWithSameName.js] -var m; -(function (m) { - var variable = (function () { - function variable() { - } - return variable; - })(); - m.variable = variable; - function doSomething(v) { - } - m.doSomething = doSomething; -})(m || (m = {})); -var variable = (function () { - function variable() { - } - return variable; -})(); -var v = new variable(); -m.doSomething(v); +m.doSomething(v); + +//// [differentTypesWithSameName.js] +var m; +(function (m) { + var variable = (function () { + function variable() { + } + return variable; + })(); + m.variable = variable; + function doSomething(v) { + } + m.doSomething = doSomething; +})(m || (m = {})); +var variable = (function () { + function variable() { + } + return variable; +})(); +var v = new variable(); +m.doSomething(v);