From 5af301abb89dbd3ec52742c8bd09f861953f0dc2 Mon Sep 17 00:00:00 2001
From: Richard Harris <richard.a.harris@gmail.com>
Date: Sun, 17 Feb 2019 16:46:52 -0500
Subject: [PATCH] pedantic code generation stuff

---
 package.json          |  1 +
 src/utils/__test__.ts | 39 +++++++++++++++++++++++++++++++++++++++
 src/utils/deindent.ts |  2 +-
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 21885c6ad5..9bd16c1b10 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
   ],
   "scripts": {
     "test": "mocha --opts mocha.opts",
+    "test:unit": "mocha --require sucrase/register --recursive ./**/__test__.ts",
     "quicktest": "mocha --opts mocha.opts",
     "precoverage": "c8 mocha --opts mocha.coverage.opts",
     "coverage": "c8 report --reporter=text-lcov > coverage.lcov && c8 report --reporter=html",
diff --git a/src/utils/__test__.ts b/src/utils/__test__.ts
index 9e7c9f9937..aac99992a1 100644
--- a/src/utils/__test__.ts
+++ b/src/utils/__test__.ts
@@ -34,6 +34,45 @@ describe('deindent', () => {
 
 		assert.equal(deindented, `before\n\tline one\n\tline two\nafter`);
 	});
+
+	it('removes newlines before an empty expression', () => {
+		const deindented = deindent`
+			{
+				some text
+
+				${null}
+			}`;
+
+		assert.equal(deindented, `{\n\tsome text\n}`);
+	});
+
+	it('removes newlines after an empty expression', () => {
+		const deindented = deindent`
+			{
+				${null}
+
+				some text
+			}`;
+
+		assert.equal(deindented, `{\n\tsome text\n}`);
+	});
+
+	it('removes newlines around empty expressions', () => {
+		const deindented = deindent`
+			{
+				${null}
+
+				some text
+
+				${null}
+
+				some text
+
+				${null}
+			}`;
+
+		assert.equal(deindented, `{\n\tsome text\n\n\tsome text\n}`);
+	});
 });
 
 describe('CodeBuilder', () => {
diff --git a/src/utils/deindent.ts b/src/utils/deindent.ts
index 665f9c3dc1..8c0d596491 100644
--- a/src/utils/deindent.ts
+++ b/src/utils/deindent.ts
@@ -39,7 +39,7 @@ export default function deindent(
 		current_indentation = get_current_indentation(result);
 	}
 
-	return result.trim().replace(/\t+$/gm, '');
+	return result.trim().replace(/\t+$/gm, '').replace(/{\n\n/gm, '{\n');
 }
 
 function get_current_indentation(str: string) {