Addresses CR feedback

tinganho · tinganho · commit 81fb3f702a93 · 2017-08-01T22:10:12.000+02:00
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -2924,7 +2924,7 @@ namespace ts {
         if (!node.variableDeclaration) {
             transformFlags |= TransformFlags.AssertESNext;
         }
-        else if (/* node.variableDeclaration && */ isBindingPattern(node.variableDeclaration.name)) {
+        else if (isBindingPattern(node.variableDeclaration.name)) {
             transformFlags |= TransformFlags.AssertES2015;
         }
 
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -20885,17 +20885,6 @@ namespace ts {
                         }
                     }
                 }
-                else if (/* !catchClause.variableDeclaration && */ languageVersion < ScriptTarget.ESNext) {
-                    const blockLocals = catchClause.block.locals;
-                    if (blockLocals) {
-                        forEachKey(blockLocals, caughtName => {
-                            if (caughtName === "_ignoredCatchParameter") {
-                                const localSymbol = blockLocals.get(caughtName);
-                                grammarErrorOnNode(localSymbol.valueDeclaration, Diagnostics.Duplicate_identifier_ignoredCatchParameter_Compiler_uses_the_parameter_declaration_ignoredCatchParameter_to_bind_ignored_catched_exceptions);
-                            }
-                        });
-                    }
-                }
 
                 checkBlock(catchClause.block);
             }
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -2196,10 +2196,6 @@
         "category": "Error",
         "code": 2713
     },
-    "Duplicate identifier '_ignoredCatchParameter'. Compiler uses the parameter declaration '_ignoredCatchParameter' to bind ignored catched exceptions.": {
-        "category": "Error",
-        "code": 2714
-    },
 
     "Import declaration '{0}' is using private name '{1}'.": {
         "category": "Error",
diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
@@ -3173,7 +3173,8 @@ namespace ts {
         function visitCatchClause(node: CatchClause): CatchClause {
             const ancestorFacts = enterSubtree(HierarchyFacts.BlockScopeExcludes, HierarchyFacts.BlockScopeIncludes);
             let updated: CatchClause;
-            if (node.variableDeclaration && isBindingPattern(node.variableDeclaration.name)) {
+            Debug.assert(!!node.variableDeclaration, "Catch clauses should always be present when downleveling ES2015 code.");
+            if (isBindingPattern(node.variableDeclaration.name)) {
                 const temp = createTempVariable(/*recordTempVariable*/ undefined);
                 const newVariableDeclaration = createVariableDeclaration(temp);
                 setTextRange(newVariableDeclaration, node.variableDeclaration);
diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts
@@ -216,7 +216,7 @@ namespace ts {
 
         function visitCatchClause(node: CatchClause): CatchClause {
             if (!node.variableDeclaration) {
-                return updateCatchClause(node, createVariableDeclaration("_ignoredCatchParameter"), node.block);
+                return updateCatchClause(node, createVariableDeclaration(createTempVariable(/*recordTempVariable*/ undefined)), node.block);
             }
             return visitEachChild(node, visitor, context);
         }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -1807,7 +1807,7 @@ namespace ts {
 
     export interface CatchClause extends Node {
         kind: SyntaxKind.CatchClause;
-        parent?: TryStatement; // We parse missing try statements
+        parent?: TryStatement; // We make this optional to parse missing try statements
         variableDeclaration?: VariableDeclaration;
         block: Block;
     }
diff --git a/tests/cases/conformance/statements/tryStatements/invalidTryStatements.ts b/tests/cases/conformance/statements/tryStatements/invalidTryStatements.ts
@@ -8,10 +8,5 @@ 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.
-    }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2924,7 +2924,7 @@ namespace ts {`
`2924`	`2924`	`if (!node.variableDeclaration) {`
`2925`	`2925`	`transformFlags \|= TransformFlags.AssertESNext;`
`2926`	`2926`	`}`
`2927`		`- else if (/* node.variableDeclaration && */ isBindingPattern(node.variableDeclaration.name)) {`
	`2927`	`+ else if (isBindingPattern(node.variableDeclaration.name)) {`
`2928`	`2928`	`transformFlags \|= TransformFlags.AssertES2015;`
`2929`	`2929`	`}`
`2930`	`2930`
Original file line number	Diff line number	Diff line change
`@@ -20885,17 +20885,6 @@ namespace ts {`
`20885`	`20885`	`}`
`20886`	`20886`	`}`
`20887`	`20887`	`}`
`20888`		`- else if (/* !catchClause.variableDeclaration && */ languageVersion < ScriptTarget.ESNext) {`
`20889`		`- const blockLocals = catchClause.block.locals;`
`20890`		`- if (blockLocals) {`
`20891`		`- forEachKey(blockLocals, caughtName => {`
`20892`		`- if (caughtName === "_ignoredCatchParameter") {`
`20893`		`- const localSymbol = blockLocals.get(caughtName);`
`20894`		`- grammarErrorOnNode(localSymbol.valueDeclaration, Diagnostics.Duplicate_identifier_ignoredCatchParameter_Compiler_uses_the_parameter_declaration_ignoredCatchParameter_to_bind_ignored_catched_exceptions);`
`20895`		`- }`
`20896`		`- });`
`20897`		`- }`
`20898`		`- }`
`20899`	`20888`
`20900`	`20889`	`checkBlock(catchClause.block);`
`20901`	`20890`	`}`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ namespace ts {`
`216`	`216`
`217`	`217`	`function visitCatchClause(node: CatchClause): CatchClause {`
`218`	`218`	`if (!node.variableDeclaration) {`
`219`		`- return updateCatchClause(node, createVariableDeclaration("_ignoredCatchParameter"), node.block);`
	`219`	`+ return updateCatchClause(node, createVariableDeclaration(createTempVariable(/recordTempVariable/ undefined)), node.block);`
`220`	`220`	`}`
`221`	`221`	`return visitEachChild(node, visitor, context);`
`222`	`222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1807,7 +1807,7 @@ namespace ts {`
`1807`	`1807`
`1808`	`1808`	`export interface CatchClause extends Node {`
`1809`	`1809`	`kind: SyntaxKind.CatchClause;`
`1810`		`- parent?: TryStatement; // We parse missing try statements`
	`1810`	`+ parent?: TryStatement; // We make this optional to parse missing try statements`
`1811`	`1811`	`variableDeclaration?: VariableDeclaration;`
`1812`	`1812`	`block: Block;`
`1813`	`1813`	`}`