Merge pull request #1478 from rollup/gh-1462

fix catch clause scopes

src/ast/nodes/CatchClause.js

@@ -0,0 +1,10 @@
+import Node from '../Node.js';
+
+export default class CatchClause extends Node {
+	initialise ( scope ) {
+		this.body.createScope( scope );
+		this.scope = this.body.scope;
+
+		this.body.initialise( this.scope );
+	}
+}

src/ast/nodes/index.js

@@ -4,6 +4,7 @@ import AssignmentExpression from './AssignmentExpression.js';
 import BinaryExpression from './BinaryExpression.js';
 import BlockStatement from './BlockStatement.js';
 import CallExpression from './CallExpression.js';
+import CatchClause from './CatchClause.js';
 import ClassDeclaration from './ClassDeclaration.js';
 import ClassExpression from './ClassExpression.js';
 import ConditionalExpression from './ConditionalExpression.js';
@@ -42,6 +43,7 @@ export default {
 	BinaryExpression,
 	BlockStatement,
 	CallExpression,
+	CatchClause,
 	ClassDeclaration,
 	ClassExpression,
 	ConditionalExpression,

test/function/preserves-catch-argument/_config.js

@@ -0,0 +1,6 @@
+module.exports = {
+	description: 'does not replace argument to catch block (#1462)',
+	options: {
+		external: ['path']
+	}
+};

test/function/preserves-catch-argument/main.js

@@ -0,0 +1,12 @@
+import { dirname as i } from 'path';
+
+function foo (path) {
+	const dir = i(path);
+	try {
+		throw new Error('something went wrong');
+	} catch (i) {
+		assert.equal(i.message, 'something went wrong');
+	}
+}
+
+foo('');