From dbdbb05c66d3255e0b13a94a24c5ccb46a71ad08 Mon Sep 17 00:00:00 2001 From: Tingan Ho Date: Tue, 1 Aug 2017 22:23:34 +0200 Subject: [PATCH] Accept baselines --- .../constructorWithIncompleteTypeAnnotation.js | 2 +- .../reference/invalidTryStatements.errors.txt | 10 +--------- tests/baselines/reference/invalidTryStatements.js | 9 --------- tests/baselines/reference/tryStatements.js | 4 ++-- 4 files changed, 4 insertions(+), 21 deletions(-) diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js index 013692a4889..f33c4b6d316 100644 --- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js +++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.js @@ -441,7 +441,7 @@ var BasicFeatures = (function () { var xx = c; retVal += ; try { } - catch (_ignoredCatchParameter) { } + catch (_a) { } Property; retVal += c.Member(); retVal += xx.Foo() ? 0 : 1; diff --git a/tests/baselines/reference/invalidTryStatements.errors.txt b/tests/baselines/reference/invalidTryStatements.errors.txt index 08dc5f1dfa0..a2f8a7bac0c 100644 --- a/tests/baselines/reference/invalidTryStatements.errors.txt +++ b/tests/baselines/reference/invalidTryStatements.errors.txt @@ -1,10 +1,9 @@ tests/cases/conformance/statements/tryStatements/invalidTryStatements.ts(8,23): error TS1196: Catch clause variable cannot have a type annotation. tests/cases/conformance/statements/tryStatements/invalidTryStatements.ts(9,23): error TS1196: Catch clause variable cannot have a type annotation. tests/cases/conformance/statements/tryStatements/invalidTryStatements.ts(10,23): error TS1196: Catch clause variable cannot have a type annotation. -tests/cases/conformance/statements/tryStatements/invalidTryStatements.ts(14,13): error TS2714: Duplicate identifier '_ignoredCatchParameter'. Compiler uses the parameter declaration '_ignoredCatchParameter' to bind ignored catched exceptions. -==== tests/cases/conformance/statements/tryStatements/invalidTryStatements.ts (4 errors) ==== +==== tests/cases/conformance/statements/tryStatements/invalidTryStatements.ts (3 errors) ==== function fn() { try { } catch (x) { @@ -21,13 +20,6 @@ tests/cases/conformance/statements/tryStatements/invalidTryStatements.ts(14,13): try { } catch (y: string) { } ~~~~~~ !!! error TS1196: Catch clause variable cannot have a type annotation. - - - try { } catch { - let _ignoredCatchParameter; // Should error since we downlevel emit this variable. - ~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2714: Duplicate identifier '_ignoredCatchParameter'. Compiler uses the parameter declaration '_ignoredCatchParameter' to bind ignored catched exceptions. - } } \ No newline at end of file diff --git a/tests/baselines/reference/invalidTryStatements.js b/tests/baselines/reference/invalidTryStatements.js index 1436c83ae07..343ad6e0584 100644 --- a/tests/baselines/reference/invalidTryStatements.js +++ b/tests/baselines/reference/invalidTryStatements.js @@ -9,11 +9,6 @@ function fn() { try { } catch (z: any) { } try { } catch (a: number) { } try { } catch (y: string) { } - - - try { } catch { - let _ignoredCatchParameter; // Should error since we downlevel emit this variable. - } } @@ -32,8 +27,4 @@ function fn() { catch (a) { } try { } catch (y) { } - try { } - catch (_ignoredCatchParameter) { - var _ignoredCatchParameter = void 0; // Should error since we downlevel emit this variable. - } } diff --git a/tests/baselines/reference/tryStatements.js b/tests/baselines/reference/tryStatements.js index d99d0f91b35..fa5c9b5c92b 100644 --- a/tests/baselines/reference/tryStatements.js +++ b/tests/baselines/reference/tryStatements.js @@ -14,7 +14,7 @@ function fn() { //// [tryStatements.js] function fn() { try { } - catch (_ignoredCatchParameter) { } + catch (_a) { } try { } catch (x) { var x; @@ -22,7 +22,7 @@ function fn() { try { } finally { } try { } - catch (_ignoredCatchParameter) { } + catch (_b) { } finally { } try { } catch (z) { }