fix(attach): end comments in nested mapping (#70)

prettier · Jul 31, 2018 · efc71fa · efc71fa
1 parent 40d81f3
commit efc71fa
Show file tree

Hide file tree

Showing 9 changed files with 277 additions and 111 deletions.
diff --git a/src/__snapshots__/attach.test.ts.snap b/src/__snapshots__/attach.test.ts.snap
@@ -203,11 +203,11 @@ comment (24:5 ~ 24:11)
     |     ^^^^^^
  25 | ··#·Flow·style¶
  26 | ··Numbers:·!!omap·[·one:·1,·two:·2,·three·:·3·]¶
-mappingItem (26:3 ~ 26:48)
-<mappingItem>
-  <leadingComment value=" Etc.">
-  <leadingComment value=" Flow style">
-</mappingItem>
+sequence (21:5 ~ 23:57)
+<sequence>
+  <shorthandTag handle="!!" suffix="omap" />
+  <endComment value=" Etc.">
+</sequence>
 `;
 
 exports[`"\\n---\\n# Collection Types ################################# 8`] = `
@@ -220,7 +220,6 @@ comment (25:3 ~ 25:15)
  27 | ¶
 mappingItem (26:3 ~ 26:48)
 <mappingItem>
-  <leadingComment value=" Etc.">
   <leadingComment value=" Flow style">
 </mappingItem>
 `;
@@ -1294,6 +1293,91 @@ mappingItem (204:1 ~ 206:14)
 </mappingItem>
 `;
 
+exports[`"\\n---\\n- Mark McGwire\\n- Sammy Sosa\\n- Ken Griffey\\n\\n# Tea 1`] = `
+comment (7:1 ~ 7:15)
+ 5 | -·Ken·Griffey¶
+ 6 | ¶
+ 7 | #·Team·ranking¶
+   | ^^^^^^^^^^^^^^
+ 8 | ---¶
+ 9 | -·Chicago·Cubs¶
+documentBody (3:1 ~ 7:15)
+<documentBody>
+
+</documentBody>
+`;
+
+exports[`"\\n---\\n- Mark McGwire\\n- Sammy Sosa\\n- Ken Griffey\\n\\n# Tea 2`] = `
+comment (7:1 ~ 7:15)
+ 5 | -·Ken·Griffey¶
+ 6 | ¶
+ 7 | #·Team·ranking¶
+   | ^^^^^^^^^^^^^^
+ 8 | ...¶
+ 9 | -·Chicago·Cubs¶
+documentBody (3:1 ~ 8:4)
+<documentBody>
+
+</documentBody>
+`;
+
+exports[`"\\na:\\n  b:\\n   #b\\n #a\\n\\nA:\\n  B:\\n #A\\n   #A\\n" 1`] = `
+comment (4:4 ~ 4:6)
+ 2 | a:¶
+ 3 | ··b:¶
+ 4 | ···#b¶
+   |    ^^
+ 5 | ·#a¶
+ 6 | ¶
+mappingValue (3:4 ~ 3:5)
+<mappingValue>
+  <endComment value="b">
+</mappingValue>
+`;
+
+exports[`"\\na:\\n  b:\\n   #b\\n #a\\n\\nA:\\n  B:\\n #A\\n   #A\\n" 2`] = `
+comment (5:2 ~ 5:4)
+ 3 | ··b:¶
+ 4 | ···#b¶
+ 5 | ·#a¶
+   |  ^^
+ 6 | ¶
+ 7 | A:¶
+mappingValue (2:2 ~ 4:6)
+<mappingValue>
+  <endComment value="a">
+</mappingValue>
+`;
+
+exports[`"\\na:\\n  b:\\n   #b\\n #a\\n\\nA:\\n  B:\\n #A\\n   #A\\n" 3`] = `
+comment (9:2 ~ 9:4)
+ 7 | A:¶
+ 8 | ··B:¶
+ 9 | ·#A¶
+   |  ^^
+10 | ···#A¶
+11 | ¶
+mappingValue (7:2 ~ 8:5)
+<mappingValue>
+  <endComment value="A">
+  <endComment value="A">
+</mappingValue>
+`;
+
+exports[`"\\na:\\n  b:\\n   #b\\n #a\\n\\nA:\\n  B:\\n #A\\n   #A\\n" 4`] = `
+comment (10:4 ~ 10:6)
+ 8 | ··B:¶
+ 9 | ·#A¶
+10 | ···#A¶
+   |    ^^
+11 | ¶
+mappingValue (7:2 ~ 8:5)
+<mappingValue>
+  <endComment value="A">
+  <endComment value="A">
+</mappingValue>
+`;
+
 exports[`"\\naaa\\n# 123\\n---\\n# 789\\nbbb\\n" 1`] = `
 comment (3:1 ~ 3:6)
 1 | ¶
@@ -1419,6 +1503,19 @@ sequenceItem (3:3 ~ 3:8)
 </sequenceItem>
 `;
 
+exports[`"\\nparent:\\n  one: 1\\n  # two: 2\\n" 1`] = `
+comment (4:3 ~ 4:11)
+2 | parent:¶
+3 | ··one:·1¶
+4 | ··#·two:·2¶
+  |   ^^^^^^^^
+5 | ¶
+mappingValue (2:7 ~ 3:9)
+<mappingValue>
+  <endComment value=" two: 2">
+</mappingValue>
+`;
+
 exports[`"a:\\n  123\\n  # impicitMappginValue\\n" 1`] = `
 comment (3:3 ~ 3:24)
 1 | a:¶

diff --git a/src/attach.test.ts b/src/attach.test.ts
@@ -266,6 +266,44 @@ d:
     # 3
   # 4
 # 5
+`,
+  `
+parent:
+  one: 1
+  # two: 2
+`,
+  `
+a:
+  b:
+   #b
+ #a
+
+A:
+  B:
+ #A
+   #A
+`,
+  `
+---
+- Mark McGwire
+- Sammy Sosa
+- Ken Griffey
+
+# Team ranking
+---
+- Chicago Cubs
+- St Louis Cardinals
+`,
+  `
+---
+- Mark McGwire
+- Sammy Sosa
+- Ken Griffey
+
+# Team ranking
+...
+- Chicago Cubs
+- St Louis Cardinals
 `,
 ];