prettier#15970 markdown: format correctly table when columns are missing

iuliaaai · Apr 23, 2024 · c6fe8ae · c6fe8ae
1 parent 1264a4c
commit c6fe8ae
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 2 deletions.
diff --git a/src/language-markdown/print/table.js b/src/language-markdown/print/table.js
@@ -12,10 +12,15 @@ function printTable(path, options, print) {
   const { node } = path;
 
   const columnMaxWidths = [];
+  let columnMaxIndex = 0;
+
   // { [rowIndex: number]: { [columnIndex: number]: {text: string, width: number} } }
   const contents = path.map(
     () =>
       path.map(({ index: columnIndex }) => {
+        if (columnIndex > columnMaxIndex) {
+          columnMaxIndex = columnIndex;
+        }
         const text = printDocToString(print(), options).formatted;
         const width = getStringWidth(text);
         columnMaxWidths[columnIndex] = Math.max(
@@ -27,6 +32,13 @@ function printTable(path, options, print) {
     "children",
   );
 
+  // All rows in the table should have the same amount of columns
+  for (let i = 0; i < contents.length; i++) {
+    while ((contents[i].length-1) < columnMaxIndex) {
+      contents[i].push({text: "", width: 0})
+    }
+  }
+
   const alignedTable = printTableContents(/* isCompact */ false);
   if (options.proseWrap !== "never") {
     return [breakParent, alignedTable];

diff --git a/tests/format/markdown/table/__snapshots__/jsfmt.spec.js.snap b/tests/format/markdown/table/__snapshots__/jsfmt.spec.js.snap
@@ -72,8 +72,8 @@ Y   |
 =====================================output=====================================
 | Foo | Bar |
 | --- | --- |
-| X   |
-| Y   |
+| X   |     |
+| Y   |     |
 
 ================================================================================
 `;
@@ -184,3 +184,28 @@ proseWrap: "always"
 
 ================================================================================
 `;
+
+exports[`missing-columns.md - {"proseWrap":"always"} format 1`] = `
+====================================options=====================================
+parsers: ["markdown"]
+printWidth: 80
+proseWrap: "always"
+                                                                                | printWidth
+=====================================input======================================
+a | b
+:-- | :-- | :--
+a | b | c
+a || c
+a | b
+a |
+
+=====================================output=====================================
+| a   | b   |     |
+| :-- | :-- | :-- |
+| a   | b   | c   |
+| a   |     | c   |
+| a   | b   |     |
+| a   |     |     |
+
+================================================================================
+`;
diff --git a/tests/format/markdown/table/missing-columns.md b/tests/format/markdown/table/missing-columns.md
@@ -0,0 +1,6 @@
+a | b
+:-- | :-- | :--
+a | b | c
+a || c
+a | b
+a |