preserve semicolon if var decl is body of for loop

src/ast/nodes/VariableDeclaration.js

@@ -95,10 +95,10 @@ export default class VariableDeclaration extends Node {
 		} else {
 			// always include a semi-colon (https://github.com/rollup/rollup/pull/1013),
 			// unless it's a var declaration in a loop head
-			const needsSemicolon = !forStatement.test( this.parent.type );
+			const needsSemicolon = !forStatement.test( this.parent.type ) || this === this.parent.body;
 
 			if ( this.end > c ) {
-				code.overwrite( c, this.end, needsSemicolon ? ';' : '\n' );
+				code.overwrite( c, this.end, needsSemicolon ? ';' : '' );
 			} else if ( needsSemicolon  ) {
 				this.insertSemicolon( code );
 			}

test/form/for-loop-body-var-declaration/_expected/amd.js

@@ -0,0 +1,5 @@
+define(function () { 'use strict';
+
+	for(var x=1;x<2;x++)var d=x|0;console.log(d);
+
+});

test/form/for-loop-body-var-declaration/_expected/cjs.js

@@ -0,0 +1,3 @@
+'use strict';
+
+for(var x=1;x<2;x++)var d=x|0;console.log(d);

test/form/for-loop-body-var-declaration/_expected/iife.js

@@ -0,0 +1,6 @@
+(function () {
+	'use strict';
+
+	for(var x=1;x<2;x++)var d=x|0;console.log(d);
+
+}());

test/form/line-wrap/_expected/umd.js → test/form/for-loop-body-var-declaration/_expected/umd.js

@@ -4,7 +4,6 @@
 	(factory());
 }(this, (function () { 'use strict';
 
-	for(var x=1;x<2;x++)var d=x|0
-	console.log(d);
+	for(var x=1;x<2;x++)var d=x|0;console.log(d);
 
 })));

test/form/for-loop-body-var-declaration/main.js

@@ -0,0 +1 @@
+for(var x=1;x<2;x++)var d=x|0;console.log(d);