From 48c3abd445223bda0ab83ccd5766918c9384bd12 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Fri, 15 Aug 2014 13:30:26 -0700 Subject: [PATCH] Test cases for trailing comments of object literal --- .../commentsOnObjectLiteral2.errors.txt | 2 +- .../reference/commentsOnObjectLiteral2.js | 4 +- .../commentsOnObjectLiteral3.errors.txt | 24 ----------- .../reference/commentsOnObjectLiteral3.js | 42 +++++++++++++++++++ .../commentsOnObjectLiteral4.errors.txt | 12 ------ .../reference/commentsOnObjectLiteral4.js | 20 +++++++++ .../compiler/commentsOnObjectLiteral2.ts | 2 +- .../compiler/commentsOnObjectLiteral3.ts | 7 ++-- .../compiler/commentsOnObjectLiteral4.ts | 1 + 9 files changed, 71 insertions(+), 43 deletions(-) delete mode 100644 tests/baselines/reference/commentsOnObjectLiteral3.errors.txt create mode 100644 tests/baselines/reference/commentsOnObjectLiteral3.js delete mode 100644 tests/baselines/reference/commentsOnObjectLiteral4.errors.txt create mode 100644 tests/baselines/reference/commentsOnObjectLiteral4.js diff --git a/tests/baselines/reference/commentsOnObjectLiteral2.errors.txt b/tests/baselines/reference/commentsOnObjectLiteral2.errors.txt index 37c312a18e0..aa338e31db4 100644 --- a/tests/baselines/reference/commentsOnObjectLiteral2.errors.txt +++ b/tests/baselines/reference/commentsOnObjectLiteral2.errors.txt @@ -10,6 +10,6 @@ */ initialize: function(name) { this.name = name; - }, + } /* trailing comment 1*/, } ); \ No newline at end of file diff --git a/tests/baselines/reference/commentsOnObjectLiteral2.js b/tests/baselines/reference/commentsOnObjectLiteral2.js index 028a17652fa..625e0769af5 100644 --- a/tests/baselines/reference/commentsOnObjectLiteral2.js +++ b/tests/baselines/reference/commentsOnObjectLiteral2.js @@ -8,7 +8,7 @@ var Person = makeClass( */ initialize: function(name) { this.name = name; - }, + } /* trailing comment 1*/, } ); @@ -21,5 +21,5 @@ var Person = makeClass({ */ initialize: function (name) { this.name = name; - } + } /* trailing comment 1*/ }); diff --git a/tests/baselines/reference/commentsOnObjectLiteral3.errors.txt b/tests/baselines/reference/commentsOnObjectLiteral3.errors.txt deleted file mode 100644 index d9a276615f4..00000000000 --- a/tests/baselines/reference/commentsOnObjectLiteral3.errors.txt +++ /dev/null @@ -1,24 +0,0 @@ -==== tests/cases/compiler/commentsOnObjectLiteral3.ts (2 errors) ==== - - var v = { - //property - prop: 1, - //property - func: function () { - }, - //PropertyName + CallSignature - func1() { }, - //getter - get a() { - ~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return this.prop; - }, - //setter - set a(value) { - ~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - this.prop = value; - } - }; - \ No newline at end of file diff --git a/tests/baselines/reference/commentsOnObjectLiteral3.js b/tests/baselines/reference/commentsOnObjectLiteral3.js new file mode 100644 index 00000000000..4bf3c45d342 --- /dev/null +++ b/tests/baselines/reference/commentsOnObjectLiteral3.js @@ -0,0 +1,42 @@ +//// [commentsOnObjectLiteral3.ts] + +var v = { + //property + prop: 1 /* multiple trailing comments */ /*trailing comments*/, + //property + func: function () { + }, + //PropertyName + CallSignature + func1() { }, + //getter + get a() { + return this.prop; + } /*trailing 1*/, + //setter + set a(value) { + this.prop = value; + } // trailing 2 +}; + + +//// [commentsOnObjectLiteral3.js] +var v = { + //property + prop: 1 /* multiple trailing comments */ /*trailing comments*/ , + //property + func: function () { + }, + //PropertyName + CallSignature + func1: + //PropertyName + CallSignature + function () { + }, + //getter + get a() { + return this.prop; + } /*trailing 1*/ , + //setter + set a(value) { + this.prop = value; + } // trailing 2 +}; diff --git a/tests/baselines/reference/commentsOnObjectLiteral4.errors.txt b/tests/baselines/reference/commentsOnObjectLiteral4.errors.txt deleted file mode 100644 index 91cf41d82a3..00000000000 --- a/tests/baselines/reference/commentsOnObjectLiteral4.errors.txt +++ /dev/null @@ -1,12 +0,0 @@ -==== tests/cases/compiler/commentsOnObjectLiteral4.ts (1 errors) ==== - - var v = { - /** - * @type {number} - */ - get bar(): number { - ~~~ -!!! Accessors are only available when targeting ECMAScript 5 and higher. - return this._bar; - } - } \ No newline at end of file diff --git a/tests/baselines/reference/commentsOnObjectLiteral4.js b/tests/baselines/reference/commentsOnObjectLiteral4.js new file mode 100644 index 00000000000..65fe1ee9a04 --- /dev/null +++ b/tests/baselines/reference/commentsOnObjectLiteral4.js @@ -0,0 +1,20 @@ +//// [commentsOnObjectLiteral4.ts] + +var v = { + /** + * @type {number} + */ + get bar(): number { + return this._bar; + } +} + +//// [commentsOnObjectLiteral4.js] +var v = { + /** + * @type {number} + */ + get bar() { + return this._bar; + } +}; diff --git a/tests/cases/compiler/commentsOnObjectLiteral2.ts b/tests/cases/compiler/commentsOnObjectLiteral2.ts index b9d2c2ac9ee..da2ee14b730 100644 --- a/tests/cases/compiler/commentsOnObjectLiteral2.ts +++ b/tests/cases/compiler/commentsOnObjectLiteral2.ts @@ -8,6 +8,6 @@ var Person = makeClass( */ initialize: function(name) { this.name = name; - }, + } /* trailing comment 1*/, } ); \ No newline at end of file diff --git a/tests/cases/compiler/commentsOnObjectLiteral3.ts b/tests/cases/compiler/commentsOnObjectLiteral3.ts index 23993b84bb2..6650b21e167 100644 --- a/tests/cases/compiler/commentsOnObjectLiteral3.ts +++ b/tests/cases/compiler/commentsOnObjectLiteral3.ts @@ -1,8 +1,9 @@ // @comments: true +// @target: ES5 var v = { //property - prop: 1, + prop: 1 /* multiple trailing comments */ /*trailing comments*/, //property func: function () { }, @@ -11,9 +12,9 @@ var v = { //getter get a() { return this.prop; - }, + } /*trailing 1*/, //setter set a(value) { this.prop = value; - } + } // trailing 2 }; diff --git a/tests/cases/compiler/commentsOnObjectLiteral4.ts b/tests/cases/compiler/commentsOnObjectLiteral4.ts index 360ce0bb6d7..e13668530c7 100644 --- a/tests/cases/compiler/commentsOnObjectLiteral4.ts +++ b/tests/cases/compiler/commentsOnObjectLiteral4.ts @@ -1,4 +1,5 @@ // @comments: true +// @target: ES5 var v = { /**