Don't add final empty line if file has no contents

Fix prettier#60. Use same logic as prettier's printer-estree.js "Program" case.
ryanashcraft · Mar 4, 2018 · 8f63f70 · 8f63f70
1 parent d6499b9
commit 8f63f70
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 1 deletion.
diff --git a/src/printer/index.js b/src/printer/index.js
@@ -472,7 +472,14 @@ function genericPrint(path, options, print) {
 
   switch (n.ast_type) {
     case "Module": {
-      return concat([printBody(path, print, true /*isTopLevel*/), hardline]);
+      const parts = [printBody(path, print, true /*isTopLevel*/)];
+
+      // Only force a trailing newline if there were any contents.
+      if (n.body.length || n.comments) {
+        parts.push(hardline);
+      }
+
+      return concat(parts);
     }
 
     case "AsyncFunctionDef":

diff --git a/tests/python_empty/__snapshots__/jsfmt.spec.js.snap b/tests/python_empty/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,21 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`empty_file.py 1`] = `
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+`;
+
+exports[`empty_file.py 2`] = `
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+`;
+
+exports[`single_space.py 1`] = `
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+`;
+
+exports[`single_space.py 2`] = `
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+`;
diff --git a/tests/python_empty/empty_file.py b/tests/python_empty/empty_file.py
diff --git a/tests/python_empty/jsfmt.spec.js b/tests/python_empty/jsfmt.spec.js
@@ -0,0 +1,2 @@
+run_spec(__dirname, ["python"], { pythonVersion: "2" });
+run_spec(__dirname, ["python"], { pythonVersion: "3" });
diff --git a/tests/python_empty/single_space.py b/tests/python_empty/single_space.py
@@ -0,0 +1 @@
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		run_spec(__dirname, ["python"], { pythonVersion: "2" });
		run_spec(__dirname, ["python"], { pythonVersion: "3" });