Merge pull request #1164 from rollup/gh-1113

include blocks containing activated var declarations

src/ast/nodes/VariableDeclarator.js

@@ -48,6 +48,16 @@ export default class VariableDeclarator extends Node {
 		this.activated = true;
 
 		this.run( this.findScope() );
+
+		// if declaration is inside a block, ensure that the block
+		// is marked for inclusion
+		if ( this.parent.kind === 'var' ) {
+			let node = this.parent.parent;
+			while ( /Statement/.test( node.type ) ) {
+				node.shouldInclude = true;
+				node = node.parent;
+			}
+		}
 	}
 
 	hasEffects ( scope ) {

test/function/vars-not-removed-in-if-block/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'preserves var declarations in if blocks (#1113)'
+};

test/function/vars-not-removed-in-if-block/main.js

@@ -0,0 +1,7 @@
+if ( Math.random() <= 1 ) {
+	var x = 1;
+} else {
+	var x = 2;
+}
+
+assert.equal( x, 1 );