From 94b3d1a2b535da60b2803a788516197cd97516dc Mon Sep 17 00:00:00 2001 From: Alexander Date: Sat, 8 Dec 2018 11:53:18 +0200 Subject: [PATCH 1/3] Allow trailing comma on tuple types --- src/compiler/checker.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index f76f1b318e9..4573857a003 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -23643,7 +23643,6 @@ namespace ts { break; } } - checkGrammarForDisallowedTrailingComma(node.elementTypes); forEach(node.elementTypes, checkSourceElement); } From a92462db6cebddc0de66701c6892cd3c1428a0d2 Mon Sep 17 00:00:00 2001 From: Alexander Date: Sat, 8 Dec 2018 12:06:37 +0200 Subject: [PATCH 2/3] 28893 - update baseline --- tests/baselines/reference/TupleType5.errors.txt | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 tests/baselines/reference/TupleType5.errors.txt diff --git a/tests/baselines/reference/TupleType5.errors.txt b/tests/baselines/reference/TupleType5.errors.txt deleted file mode 100644 index 1a6ca7f99b3..00000000000 --- a/tests/baselines/reference/TupleType5.errors.txt +++ /dev/null @@ -1,7 +0,0 @@ -tests/cases/conformance/parser/ecmascript5/TupleTypes/TupleType5.ts(1,15): error TS1009: Trailing comma not allowed. - - -==== tests/cases/conformance/parser/ecmascript5/TupleTypes/TupleType5.ts (1 errors) ==== - var v: [number,] - ~ -!!! error TS1009: Trailing comma not allowed. \ No newline at end of file From e219b17ff0dd0dd8cea0ba7cd21eec80556ce070 Mon Sep 17 00:00:00 2001 From: Alexander Date: Sat, 8 Dec 2018 20:50:09 +0200 Subject: [PATCH 3/3] TupleType - add additional tests to handle error on extra comma --- tests/baselines/reference/TupleType6.errors.txt | 7 +++++++ tests/baselines/reference/TupleType6.js | 5 +++++ tests/baselines/reference/TupleType6.symbols | 4 ++++ tests/baselines/reference/TupleType6.types | 4 ++++ .../parser/ecmascript5/TupleTypes/TupleType6.ts | 1 + 5 files changed, 21 insertions(+) create mode 100644 tests/baselines/reference/TupleType6.errors.txt create mode 100644 tests/baselines/reference/TupleType6.js create mode 100644 tests/baselines/reference/TupleType6.symbols create mode 100644 tests/baselines/reference/TupleType6.types create mode 100644 tests/cases/conformance/parser/ecmascript5/TupleTypes/TupleType6.ts diff --git a/tests/baselines/reference/TupleType6.errors.txt b/tests/baselines/reference/TupleType6.errors.txt new file mode 100644 index 00000000000..1c3427b8f38 --- /dev/null +++ b/tests/baselines/reference/TupleType6.errors.txt @@ -0,0 +1,7 @@ +tests/cases/conformance/parser/ecmascript5/TupleTypes/TupleType6.ts(1,16): error TS1110: Type expected. + + +==== tests/cases/conformance/parser/ecmascript5/TupleTypes/TupleType6.ts (1 errors) ==== + var v: [number,,] + ~ +!!! error TS1110: Type expected. \ No newline at end of file diff --git a/tests/baselines/reference/TupleType6.js b/tests/baselines/reference/TupleType6.js new file mode 100644 index 00000000000..828d90a72bf --- /dev/null +++ b/tests/baselines/reference/TupleType6.js @@ -0,0 +1,5 @@ +//// [TupleType6.ts] +var v: [number,,] + +//// [TupleType6.js] +var v; diff --git a/tests/baselines/reference/TupleType6.symbols b/tests/baselines/reference/TupleType6.symbols new file mode 100644 index 00000000000..b02a0d6eb5e --- /dev/null +++ b/tests/baselines/reference/TupleType6.symbols @@ -0,0 +1,4 @@ +=== tests/cases/conformance/parser/ecmascript5/TupleTypes/TupleType6.ts === +var v: [number,,] +>v : Symbol(v, Decl(TupleType6.ts, 0, 3)) + diff --git a/tests/baselines/reference/TupleType6.types b/tests/baselines/reference/TupleType6.types new file mode 100644 index 00000000000..a5f9c5e59eb --- /dev/null +++ b/tests/baselines/reference/TupleType6.types @@ -0,0 +1,4 @@ +=== tests/cases/conformance/parser/ecmascript5/TupleTypes/TupleType6.ts === +var v: [number,,] +>v : [number, any] + diff --git a/tests/cases/conformance/parser/ecmascript5/TupleTypes/TupleType6.ts b/tests/cases/conformance/parser/ecmascript5/TupleTypes/TupleType6.ts new file mode 100644 index 00000000000..50cca65c6dc --- /dev/null +++ b/tests/cases/conformance/parser/ecmascript5/TupleTypes/TupleType6.ts @@ -0,0 +1 @@ +var v: [number,,] \ No newline at end of file