Merge pull request #29 from Rich-Harris/gh-28

prevent syntax errors when combining comments

src/print/handlers.ts

@@ -273,11 +273,17 @@ const handle_body = (nodes: Node[], state: State) => {
 			indent: state.indent
 		});
 
+		let add_newline = false;
+
 		while (state.comments.length) {
 			const comment = state.comments.shift();
+			const prefix = add_newline ? `\n${state.indent}` : ` `;
+
 			chunks.push(c(comment.type === 'Block'
-			? ` /*${comment.value}*/`
-			: ` //${comment.value}`));
+				? `${prefix}/*${comment.value}*/`
+				: `${prefix}//${comment.value}`));
+
+			add_newline = (comment.type === 'Line');
 		}
 
 		return chunks;

test/samples/comment-mixed-trailing/expected.js

@@ -0,0 +1,6 @@
+function foo() {
+
+} // hey1
+/*
+hey2
+*/

test/samples/comment-mixed-trailing/input.js

@@ -0,0 +1,8 @@
+module.exports = ({ b }) => b`
+	function foo() {
+		// hey1
+		/*
+		hey2
+		*/
+	}
+`;

test/test.ts

@@ -441,7 +441,7 @@ describe('codered', () => {
 				fs.writeFileSync(`test/samples/${dir}/_actual.js`, actual.code);
 				fs.writeFileSync(`test/samples/${dir}/_actual.js.map`, actual.map.toString());
 
-				assert.equal(actual.code, expected.code);
+				assert.equal(actual.code.replace(/\t+$/gm, ''), expected.code.replace(/\t+$/gm, ''));
 				assert.deepEqual(actual.map, expected.map);
 			});
 		});