From f8366b6b297a29908a62746082d7ad699a1e4c9e Mon Sep 17 00:00:00 2001 From: york yao Date: Thu, 15 Sep 2016 07:35:36 +0800 Subject: [PATCH] rebase again and fix message code --- ...heckGrammarStaticMemberName_es5.errors.txt | 48 +++++++++---------- ...heckGrammarStaticMemberName_es6.errors.txt | 32 ++++++------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/tests/baselines/reference/checkGrammarStaticMemberName_es5.errors.txt b/tests/baselines/reference/checkGrammarStaticMemberName_es5.errors.txt index 96a52a9fd58d1..ec2d9292600c5 100644 --- a/tests/baselines/reference/checkGrammarStaticMemberName_es5.errors.txt +++ b/tests/baselines/reference/checkGrammarStaticMemberName_es5.errors.txt @@ -1,15 +1,15 @@ -tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(3,5): error TS2695: 'length' is not allowed to be used as a name of a static property or method in a class for target ES5. -tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(4,5): error TS2695: 'name' is not allowed to be used as a name of a static property or method in a class for target ES5. -tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(5,5): error TS2695: 'arguments' is not allowed to be used as a name of a static property or method in a class for target ES5. -tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(6,5): error TS2695: 'caller' is not allowed to be used as a name of a static property or method in a class for target ES5. -tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(8,9): error TS2695: 'length' is not allowed to be used as a name of a static property or method in a class for target ES5. -tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(9,9): error TS2695: 'name' is not allowed to be used as a name of a static property or method in a class for target ES5. -tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(10,9): error TS2695: 'arguments' is not allowed to be used as a name of a static property or method in a class for target ES5. -tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(11,9): error TS2695: 'caller' is not allowed to be used as a name of a static property or method in a class for target ES5. -tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(16,12): error TS2695: 'length' is not allowed to be used as a name of a static property or method in a class for target ES5. -tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(17,12): error TS2695: 'name' is not allowed to be used as a name of a static property or method in a class for target ES5. -tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(18,12): error TS2695: 'arguments' is not allowed to be used as a name of a static property or method in a class for target ES5. -tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(19,12): error TS2695: 'caller' is not allowed to be used as a name of a static property or method in a class for target ES5. +tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(3,5): error TS2696: 'length' is not allowed to be used as a name of a static property or method in a class for target ES5. +tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(4,5): error TS2696: 'name' is not allowed to be used as a name of a static property or method in a class for target ES5. +tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(5,5): error TS2696: 'arguments' is not allowed to be used as a name of a static property or method in a class for target ES5. +tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(6,5): error TS2696: 'caller' is not allowed to be used as a name of a static property or method in a class for target ES5. +tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(8,9): error TS2696: 'length' is not allowed to be used as a name of a static property or method in a class for target ES5. +tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(9,9): error TS2696: 'name' is not allowed to be used as a name of a static property or method in a class for target ES5. +tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(10,9): error TS2696: 'arguments' is not allowed to be used as a name of a static property or method in a class for target ES5. +tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(11,9): error TS2696: 'caller' is not allowed to be used as a name of a static property or method in a class for target ES5. +tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(16,12): error TS2696: 'length' is not allowed to be used as a name of a static property or method in a class for target ES5. +tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(17,12): error TS2696: 'name' is not allowed to be used as a name of a static property or method in a class for target ES5. +tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(18,12): error TS2696: 'arguments' is not allowed to be used as a name of a static property or method in a class for target ES5. +tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(19,12): error TS2696: 'caller' is not allowed to be used as a name of a static property or method in a class for target ES5. ==== tests/cases/compiler/checkGrammarStaticMemberName_es5.ts (12 errors) ==== @@ -17,44 +17,44 @@ tests/cases/compiler/checkGrammarStaticMemberName_es5.ts(19,12): error TS2695: ' class static_property { static length = 1; ~~~~~~~~~~~~~~~~~~ -!!! error TS2695: 'length' is not allowed to be used as a name of a static property or method in a class for target ES5. +!!! error TS2696: 'length' is not allowed to be used as a name of a static property or method in a class for target ES5. static name = 1; ~~~~~~~~~~~~~~~~ -!!! error TS2695: 'name' is not allowed to be used as a name of a static property or method in a class for target ES5. +!!! error TS2696: 'name' is not allowed to be used as a name of a static property or method in a class for target ES5. static arguments = 1; ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2695: 'arguments' is not allowed to be used as a name of a static property or method in a class for target ES5. +!!! error TS2696: 'arguments' is not allowed to be used as a name of a static property or method in a class for target ES5. static caller = 1; ~~~~~~~~~~~~~~~~~~ -!!! error TS2695: 'caller' is not allowed to be used as a name of a static property or method in a class for target ES5. +!!! error TS2696: 'caller' is not allowed to be used as a name of a static property or method in a class for target ES5. static foo = { ["length"]: 1, ~~~~~~~~~~ -!!! error TS2695: 'length' is not allowed to be used as a name of a static property or method in a class for target ES5. +!!! error TS2696: 'length' is not allowed to be used as a name of a static property or method in a class for target ES5. ["name"]: 1, ~~~~~~~~ -!!! error TS2695: 'name' is not allowed to be used as a name of a static property or method in a class for target ES5. +!!! error TS2696: 'name' is not allowed to be used as a name of a static property or method in a class for target ES5. ["arguments"]: 1, ~~~~~~~~~~~~~ -!!! error TS2695: 'arguments' is not allowed to be used as a name of a static property or method in a class for target ES5. +!!! error TS2696: 'arguments' is not allowed to be used as a name of a static property or method in a class for target ES5. ["caller"]: 1, ~~~~~~~~~~ -!!! error TS2695: 'caller' is not allowed to be used as a name of a static property or method in a class for target ES5. +!!! error TS2696: 'caller' is not allowed to be used as a name of a static property or method in a class for target ES5. }; } class static_method { static length() { return 1; } ~~~~~~ -!!! error TS2695: 'length' is not allowed to be used as a name of a static property or method in a class for target ES5. +!!! error TS2696: 'length' is not allowed to be used as a name of a static property or method in a class for target ES5. static name() { return 1; } ~~~~ -!!! error TS2695: 'name' is not allowed to be used as a name of a static property or method in a class for target ES5. +!!! error TS2696: 'name' is not allowed to be used as a name of a static property or method in a class for target ES5. static arguments() { return 1; } ~~~~~~~~~ -!!! error TS2695: 'arguments' is not allowed to be used as a name of a static property or method in a class for target ES5. +!!! error TS2696: 'arguments' is not allowed to be used as a name of a static property or method in a class for target ES5. static caller() { return 1; } ~~~~~~ -!!! error TS2695: 'caller' is not allowed to be used as a name of a static property or method in a class for target ES5. +!!! error TS2696: 'caller' is not allowed to be used as a name of a static property or method in a class for target ES5. } \ No newline at end of file diff --git a/tests/baselines/reference/checkGrammarStaticMemberName_es6.errors.txt b/tests/baselines/reference/checkGrammarStaticMemberName_es6.errors.txt index e34b92dcd7278..0b07dbecee7db 100644 --- a/tests/baselines/reference/checkGrammarStaticMemberName_es6.errors.txt +++ b/tests/baselines/reference/checkGrammarStaticMemberName_es6.errors.txt @@ -1,11 +1,11 @@ -tests/cases/compiler/checkGrammarStaticMemberName_es6.ts(3,5): error TS2695: 'length' is not allowed to be used as a name of a static property in a class for target ES6 and higher. -tests/cases/compiler/checkGrammarStaticMemberName_es6.ts(4,5): error TS2695: 'name' is not allowed to be used as a name of a static property in a class for target ES6 and higher. -tests/cases/compiler/checkGrammarStaticMemberName_es6.ts(5,5): error TS2695: 'arguments' is not allowed to be used as a name of a static property in a class for target ES6 and higher. -tests/cases/compiler/checkGrammarStaticMemberName_es6.ts(6,5): error TS2695: 'caller' is not allowed to be used as a name of a static property in a class for target ES6 and higher. -tests/cases/compiler/checkGrammarStaticMemberName_es6.ts(8,9): error TS2695: 'length' is not allowed to be used as a name of a static property in a class for target ES6 and higher. -tests/cases/compiler/checkGrammarStaticMemberName_es6.ts(9,9): error TS2695: 'name' is not allowed to be used as a name of a static property in a class for target ES6 and higher. -tests/cases/compiler/checkGrammarStaticMemberName_es6.ts(10,9): error TS2695: 'arguments' is not allowed to be used as a name of a static property in a class for target ES6 and higher. -tests/cases/compiler/checkGrammarStaticMemberName_es6.ts(11,9): error TS2695: 'caller' is not allowed to be used as a name of a static property in a class for target ES6 and higher. +tests/cases/compiler/checkGrammarStaticMemberName_es6.ts(3,5): error TS2697: 'length' is not allowed to be used as a name of a static property in a class for target ES6 and higher. +tests/cases/compiler/checkGrammarStaticMemberName_es6.ts(4,5): error TS2697: 'name' is not allowed to be used as a name of a static property in a class for target ES6 and higher. +tests/cases/compiler/checkGrammarStaticMemberName_es6.ts(5,5): error TS2697: 'arguments' is not allowed to be used as a name of a static property in a class for target ES6 and higher. +tests/cases/compiler/checkGrammarStaticMemberName_es6.ts(6,5): error TS2697: 'caller' is not allowed to be used as a name of a static property in a class for target ES6 and higher. +tests/cases/compiler/checkGrammarStaticMemberName_es6.ts(8,9): error TS2697: 'length' is not allowed to be used as a name of a static property in a class for target ES6 and higher. +tests/cases/compiler/checkGrammarStaticMemberName_es6.ts(9,9): error TS2697: 'name' is not allowed to be used as a name of a static property in a class for target ES6 and higher. +tests/cases/compiler/checkGrammarStaticMemberName_es6.ts(10,9): error TS2697: 'arguments' is not allowed to be used as a name of a static property in a class for target ES6 and higher. +tests/cases/compiler/checkGrammarStaticMemberName_es6.ts(11,9): error TS2697: 'caller' is not allowed to be used as a name of a static property in a class for target ES6 and higher. ==== tests/cases/compiler/checkGrammarStaticMemberName_es6.ts (8 errors) ==== @@ -13,29 +13,29 @@ tests/cases/compiler/checkGrammarStaticMemberName_es6.ts(11,9): error TS2695: 'c class static_property { static length = 1; ~~~~~~~~~~~~~~~~~~ -!!! error TS2695: 'length' is not allowed to be used as a name of a static property in a class for target ES6 and higher. +!!! error TS2697: 'length' is not allowed to be used as a name of a static property in a class for target ES6 and higher. static name = 1; ~~~~~~~~~~~~~~~~ -!!! error TS2695: 'name' is not allowed to be used as a name of a static property in a class for target ES6 and higher. +!!! error TS2697: 'name' is not allowed to be used as a name of a static property in a class for target ES6 and higher. static arguments = 1; ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2695: 'arguments' is not allowed to be used as a name of a static property in a class for target ES6 and higher. +!!! error TS2697: 'arguments' is not allowed to be used as a name of a static property in a class for target ES6 and higher. static caller = 1; ~~~~~~~~~~~~~~~~~~ -!!! error TS2695: 'caller' is not allowed to be used as a name of a static property in a class for target ES6 and higher. +!!! error TS2697: 'caller' is not allowed to be used as a name of a static property in a class for target ES6 and higher. static foo = { ["length"]: 1, ~~~~~~~~~~ -!!! error TS2695: 'length' is not allowed to be used as a name of a static property in a class for target ES6 and higher. +!!! error TS2697: 'length' is not allowed to be used as a name of a static property in a class for target ES6 and higher. ["name"]: 1, ~~~~~~~~ -!!! error TS2695: 'name' is not allowed to be used as a name of a static property in a class for target ES6 and higher. +!!! error TS2697: 'name' is not allowed to be used as a name of a static property in a class for target ES6 and higher. ["arguments"]: 1, ~~~~~~~~~~~~~ -!!! error TS2695: 'arguments' is not allowed to be used as a name of a static property in a class for target ES6 and higher. +!!! error TS2697: 'arguments' is not allowed to be used as a name of a static property in a class for target ES6 and higher. ["caller"]: 1, ~~~~~~~~~~ -!!! error TS2695: 'caller' is not allowed to be used as a name of a static property in a class for target ES6 and higher. +!!! error TS2697: 'caller' is not allowed to be used as a name of a static property in a class for target ES6 and higher. }; }