From 58ac3b0c15250e9f861f1e3a8bf5c993f4a9abf2 Mon Sep 17 00:00:00 2001
From: Georgii Dolzhykov <thorn.mailbox@gmail.com>
Date: Mon, 23 Mar 2020 22:47:36 +0200
Subject: [PATCH] Revert "markdown: fix redundant leading spaces in markdown
 list" (#7847)

---
 src/language-markdown/printer-markdown.js     |  11 -
 .../__snapshots__/jsfmt.spec.js.snap          | 378 +++++++-----------
 tests/markdown_list/issue-7846.md             |  11 +
 .../markdown_list/redundant-leading-spaces.md |  23 --
 website/blog/2020-03-21-2.0.0.md              |  80 ----
 5 files changed, 150 insertions(+), 353 deletions(-)
 create mode 100644 tests/markdown_list/issue-7846.md
 delete mode 100644 tests/markdown_list/redundant-leading-spaces.md

diff --git a/src/language-markdown/printer-markdown.js b/src/language-markdown/printer-markdown.js
index ef61e8e1ecee..f917c4dab112 100644
--- a/src/language-markdown/printer-markdown.js
+++ b/src/language-markdown/printer-markdown.js
@@ -509,17 +509,6 @@ function getAncestorNode(path, typeOrTypes) {
 }
 
 function printLine(path, value, options) {
-  const greatGrandParentNode = path.getParentNode(2);
-  if (greatGrandParentNode && greatGrandParentNode.type === "listItem") {
-    const parentNode = path.getParentNode();
-    const grandParentNode = path.getParentNode(1);
-    const index = grandParentNode.children.indexOf(parentNode);
-    const prevGrandParentNode = grandParentNode.children[index - 1];
-    if (prevGrandParentNode && prevGrandParentNode.type === "break") {
-      return "";
-    }
-  }
-
   if (options.proseWrap === "preserve" && value === "\n") {
     return hardline;
   }
diff --git a/tests/markdown_list/__snapshots__/jsfmt.spec.js.snap b/tests/markdown_list/__snapshots__/jsfmt.spec.js.snap
index 61291fbf2341..d9eeb0c0eec5 100644
--- a/tests/markdown_list/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/markdown_list/__snapshots__/jsfmt.spec.js.snap
@@ -1651,6 +1651,145 @@ tabWidth: 0
 ================================================================================
 `;
 
+exports[`issue-7846.md 1`] = `
+====================================options=====================================
+parsers: ["markdown"]
+printWidth: 80
+proseWrap: "always"
+                                                                                | printWidth
+=====================================input======================================
+- a a  
+   b b  
+    c c  
+   d d  
+  e e
+
+1.  a a a  
+   b b b  
+  c c c  
+   d d d  
+    e e e
+=====================================output=====================================
+- a a  
+   b b  
+   c c  
+   d d  
+  e e
+
+1.  a a a  
+     b b b  
+    c c c  
+     d d d  
+     e e e
+
+================================================================================
+`;
+
+exports[`issue-7846.md 2`] = `
+====================================options=====================================
+parsers: ["markdown"]
+printWidth: 80
+proseWrap: "always"
+tabWidth: 4
+                                                                                | printWidth
+=====================================input======================================
+- a a  
+   b b  
+    c c  
+   d d  
+  e e
+
+1.  a a a  
+   b b b  
+  c c c  
+   d d d  
+    e e e
+=====================================output=====================================
+-   a a  
+     b b  
+     c c  
+     d d  
+    e e
+
+1.  a a a  
+     b b b  
+    c c c  
+     d d d  
+     e e e
+
+================================================================================
+`;
+
+exports[`issue-7846.md 3`] = `
+====================================options=====================================
+parsers: ["markdown"]
+printWidth: 80
+proseWrap: "always"
+tabWidth: 999
+                                                                                | printWidth
+=====================================input======================================
+- a a  
+   b b  
+    c c  
+   d d  
+  e e
+
+1.  a a a  
+   b b b  
+  c c c  
+   d d d  
+    e e e
+=====================================output=====================================
+- a a  
+   b b  
+   c c  
+   d d  
+  e e
+
+1. a a a  
+    b b b  
+   c c c  
+    d d d  
+    e e e
+
+================================================================================
+`;
+
+exports[`issue-7846.md 4`] = `
+====================================options=====================================
+parsers: ["markdown"]
+printWidth: 80
+proseWrap: "always"
+tabWidth: 0
+                                                                                | printWidth
+=====================================input======================================
+- a a  
+   b b  
+    c c  
+   d d  
+  e e
+
+1.  a a a  
+   b b b  
+  c c c  
+   d d d  
+    e e e
+=====================================output=====================================
+- a a  
+   b b  
+   c c  
+   d d  
+  e e
+
+1. a a a  
+    b b b  
+   c c c  
+    d d d  
+    e e e
+
+================================================================================
+`;
+
 exports[`long-paragraph.md 1`] = `
 ====================================options=====================================
 parsers: ["markdown"]
@@ -2257,245 +2396,6 @@ tabWidth: 0
 ================================================================================
 `;
 
-exports[`redundant-leading-spaces.md 1`] = `
-====================================options=====================================
-parsers: ["markdown"]
-printWidth: 80
-proseWrap: "always"
-                                                                                | printWidth
-=====================================input======================================
-- a  
-   b  
-    c  
-   d  
-  e
-
--   a  
-   b  
-  c  
-   d  
-    e
-
-1. a  
-   b  
-    c  
-   d  
-  e
-
-1.  a  
-   b  
-  c  
-   d  
-    e
-
-=====================================output=====================================
-- a  
-  b  
-  c  
-  d  
-  e
-
-- a  
-  b  
-  c  
-  d  
-  e
-
-1. a  
-   b  
-   c  
-   d  
-   e
-
-1. a  
-   b  
-   c  
-   d  
-   e
-
-================================================================================
-`;
-
-exports[`redundant-leading-spaces.md 2`] = `
-====================================options=====================================
-parsers: ["markdown"]
-printWidth: 80
-proseWrap: "always"
-tabWidth: 4
-                                                                                | printWidth
-=====================================input======================================
-- a  
-   b  
-    c  
-   d  
-  e
-
--   a  
-   b  
-  c  
-   d  
-    e
-
-1. a  
-   b  
-    c  
-   d  
-  e
-
-1.  a  
-   b  
-  c  
-   d  
-    e
-
-=====================================output=====================================
--   a  
-    b  
-    c  
-    d  
-    e
-
--   a  
-    b  
-    c  
-    d  
-    e
-
-1. a  
-   b  
-   c  
-   d  
-   e
-
-1. a  
-   b  
-   c  
-   d  
-   e
-
-================================================================================
-`;
-
-exports[`redundant-leading-spaces.md 3`] = `
-====================================options=====================================
-parsers: ["markdown"]
-printWidth: 80
-proseWrap: "always"
-tabWidth: 999
-                                                                                | printWidth
-=====================================input======================================
-- a  
-   b  
-    c  
-   d  
-  e
-
--   a  
-   b  
-  c  
-   d  
-    e
-
-1. a  
-   b  
-    c  
-   d  
-  e
-
-1.  a  
-   b  
-  c  
-   d  
-    e
-
-=====================================output=====================================
-- a  
-  b  
-  c  
-  d  
-  e
-
-- a  
-  b  
-  c  
-  d  
-  e
-
-1. a  
-   b  
-   c  
-   d  
-   e
-
-1. a  
-   b  
-   c  
-   d  
-   e
-
-================================================================================
-`;
-
-exports[`redundant-leading-spaces.md 4`] = `
-====================================options=====================================
-parsers: ["markdown"]
-printWidth: 80
-proseWrap: "always"
-tabWidth: 0
-                                                                                | printWidth
-=====================================input======================================
-- a  
-   b  
-    c  
-   d  
-  e
-
--   a  
-   b  
-  c  
-   d  
-    e
-
-1. a  
-   b  
-    c  
-   d  
-  e
-
-1.  a  
-   b  
-  c  
-   d  
-    e
-
-=====================================output=====================================
-- a  
-  b  
-  c  
-  d  
-  e
-
-- a  
-  b  
-  c  
-  d  
-  e
-
-1. a  
-   b  
-   c  
-   d  
-   e
-
-1. a  
-   b  
-   c  
-   d  
-   e
-
-================================================================================
-`;
-
 exports[`separate.md 1`] = `
 ====================================options=====================================
 parsers: ["markdown"]
diff --git a/tests/markdown_list/issue-7846.md b/tests/markdown_list/issue-7846.md
new file mode 100644
index 000000000000..b17717a8c6c8
--- /dev/null
+++ b/tests/markdown_list/issue-7846.md
@@ -0,0 +1,11 @@
+- a a  
+   b b  
+    c c  
+   d d  
+  e e
+
+1.  a a a  
+   b b b  
+  c c c  
+   d d d  
+    e e e
\ No newline at end of file
diff --git a/tests/markdown_list/redundant-leading-spaces.md b/tests/markdown_list/redundant-leading-spaces.md
deleted file mode 100644
index 5463a370dfd4..000000000000
--- a/tests/markdown_list/redundant-leading-spaces.md
+++ /dev/null
@@ -1,23 +0,0 @@
-- a  
-   b  
-    c  
-   d  
-  e
-
--   a  
-   b  
-  c  
-   d  
-    e
-
-1. a  
-   b  
-    c  
-   d  
-  e
-
-1.  a  
-   b  
-  c  
-   d  
-    e
diff --git a/website/blog/2020-03-21-2.0.0.md b/website/blog/2020-03-21-2.0.0.md
index 266f27469033..173975f28171 100644
--- a/website/blog/2020-03-21-2.0.0.md
+++ b/website/blog/2020-03-21-2.0.0.md
@@ -1699,86 +1699,6 @@ type Type2 implements A, B & C {
 2. List
 ```
 
-#### Fix redundant leading spaces in lists ([#7178](https://github.com/prettier/prettier/pull/7178) by [@sasurau4](https://github.com/sasurau4))
-
-<!-- prettier-ignore -->
-```md
-<!-- Input -->
-- a  
-   b  
-    c  
-   d  
-  e
-
--   a  
-   b  
-  c  
-   d  
-    e
-
-1. a  
-   b  
-    c  
-   d  
-  e
-
-1.  a  
-   b  
-  c  
-   d  
-    e
-
-<!-- Prettier 1.19 -->
-- a  
-   b  
-   c  
-   d  
-  e
-
-- a  
-   b  
-  c  
-   d  
-   e
-
-1. a  
-    b  
-    c  
-    d  
-   e
-
-1. a  
-    b  
-   c  
-    d  
-    e
-
-<!-- Prettier 2.0 -->
-- a  
-  b  
-  c  
-  d  
-  e
-
-- a  
-  b  
-  c  
-  d  
-  e
-
-1. a  
-   b  
-   c  
-   d  
-   e
-
-1. a  
-   b  
-   c  
-   d  
-   e
-```
-
 #### Fix HTML formatting broken if the beginning tag starts after a list item ([#7181](https://github.com/prettier/prettier/pull/7181) and [#7220](https://github.com/prettier/prettier/pull/7220) by [@sasurau4](https://github.com/sasurau4))
 
 Previously, when Prettier formatted an HTML tag placed just after a list item, it would insert indent and break the relationship of open and close tag. Now, Prettier no longer changes anything.