From c1107a86dd088c5f12bf7cd2f23a4b7634708de3 Mon Sep 17 00:00:00 2001 From: Ika Date: Sat, 24 Feb 2018 16:13:02 +0800 Subject: [PATCH] feat(markdown): respect tabWidth for list items (#3990) * feat(markdown): respect tabWidth for list items * test: ensure no regression for #3459 --- src/language-markdown/printer-markdown.js | 31 +- .../markdown/__snapshots__/jsfmt.spec.js.snap | 32 +- .../__snapshots__/jsfmt.spec.js.snap | 56 ++- tests/markdown_code/indent.md | 10 + .../__snapshots__/jsfmt.spec.js.snap | 320 +++++++++--------- .../__snapshots__/jsfmt.spec.js.snap | 96 +++--- 6 files changed, 297 insertions(+), 248 deletions(-) diff --git a/src/language-markdown/printer-markdown.js b/src/language-markdown/printer-markdown.js index 2072eb2c..1fefaa47 100644 --- a/src/language-markdown/printer-markdown.js +++ b/src/language-markdown/printer-markdown.js @@ -233,12 +233,15 @@ function genericPrint(path, options, print) { return printChildren(path, options, print, { processor: (childPath, index) => { - const prefix = node.ordered - ? (index === 0 - ? node.start - : isGitDiffFriendlyOrderedList ? 1 : node.start + index) + - (nthSiblingIndex % 2 === 0 ? ". " : ") ") - : nthSiblingIndex % 2 === 0 ? "* " : "- "; + const prefix = alignListPrefix( + node.ordered + ? (index === 0 + ? node.start + : isGitDiffFriendlyOrderedList ? 1 : node.start + index) + + (nthSiblingIndex % 2 === 0 ? ". " : ") ") + : nthSiblingIndex % 2 === 0 ? "* " : "- ", + options + ); return concat([ prefix, align( @@ -353,6 +356,22 @@ function printListItem(path, options, print, listPrefix) { ]); } +function alignListPrefix(prefix, options) { + const prefixTrailingSpaces = prefix.match(/ *$/)[0].length; + const additionalSpaces = getAdditionalSpaces(); + return ( + prefix + + " ".repeat( + prefixTrailingSpaces + additionalSpaces >= 4 ? 0 : additionalSpaces // 4+ will cause indented code block + ) + ); + + function getAdditionalSpaces() { + const restSpaces = prefix.length % options.tabWidth; + return restSpaces === 0 ? 0 : options.tabWidth - restSpaces; + } +} + function getNthListSiblingIndex(node, parentNode) { return getNthSiblingIndex( node, diff --git a/tests/markdown/__snapshots__/jsfmt.spec.js.snap b/tests/markdown/__snapshots__/jsfmt.spec.js.snap index 8cc58117..fdd9e52b 100644 --- a/tests/markdown/__snapshots__/jsfmt.spec.js.snap +++ b/tests/markdown/__snapshots__/jsfmt.spec.js.snap @@ -4207,8 +4207,8 @@ This is a paragraph. > ## This is a header. > -> 1. This is the first list item. -> 2. This is the second list item. +> 1. This is the first list item. +> 2. This is the second list item. > > Here's some example code: > @@ -4248,14 +4248,14 @@ This is a paragraph. * Blue \`\`\` -1. Buy flour and salt -1. Mix together with water -1. Bake +1. Buy flour and salt +1. Mix together with water +1. Bake \`\`\`markdown -1. Buy flour and salt -1. Mix together with water -1. Bake +1. Buy flour and salt +1. Mix together with water +1. Bake \`\`\` Paragraph: @@ -4595,8 +4595,8 @@ This is a paragraph. > ## This is a header. > -> 1. This is the first list item. -> 2. This is the second list item. +> 1. This is the first list item. +> 2. This is the second list item. > > Here's some example code: > @@ -4636,14 +4636,14 @@ This is a paragraph. * Blue \`\`\` -1. Buy flour and salt -1. Mix together with water -1. Bake +1. Buy flour and salt +1. Mix together with water +1. Bake \`\`\`markdown -1. Buy flour and salt -1. Mix together with water -1. Bake +1. Buy flour and salt +1. Mix together with water +1. Bake \`\`\` Paragraph: diff --git a/tests/markdown_code/__snapshots__/jsfmt.spec.js.snap b/tests/markdown_code/__snapshots__/jsfmt.spec.js.snap index d4342152..b00c9e1b 100644 --- a/tests/markdown_code/__snapshots__/jsfmt.spec.js.snap +++ b/tests/markdown_code/__snapshots__/jsfmt.spec.js.snap @@ -71,31 +71,31 @@ exports[`additional-space.md 1`] = ` \`\`\`sh yarn --version \`\`\`~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1. Fork the repo and create your branch from \`master\`. +1. Fork the repo and create your branch from \`master\`. - Open terminal (e.g. Terminal, iTerm, Git Bash or Git Shell) and type: + Open terminal (e.g. Terminal, iTerm, Git Bash or Git Shell) and type: - \`\`\`sh - git clone https://github.com//jest - cd jest - git checkout -b my_branch - \`\`\` + \`\`\`sh + git clone https://github.com//jest + cd jest + git checkout -b my_branch + \`\`\` - Note: Replace \`\` with your GitHub username + Note: Replace \`\` with your GitHub username -2. Run \`yarn install\`. On Windows: To install - [Yarn](https://yarnpkg.com/en/docs/install#windows-tab) on Windows you may - need to download either node.js or Chocolatey
+2. Run \`yarn install\`. On Windows: To install + [Yarn](https://yarnpkg.com/en/docs/install#windows-tab) on Windows you may + need to download either node.js or Chocolatey
- \`\`\`sh - yarn install - \`\`\` + \`\`\`sh + yarn install + \`\`\` - To check your version of Yarn and ensure it's installed you can type: + To check your version of Yarn and ensure it's installed you can type: - \`\`\`sh - yarn --version - \`\`\` + \`\`\`sh + yarn --version + \`\`\` `; @@ -147,6 +147,16 @@ exports[`indent.md 1`] = ` Fenced Code Block Fenced Code Block \`\`\` + + + +1. Change to your home directory: + + cd + +2. List the contents: + + ls -l ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Indented Code Block Indented Code Block @@ -162,6 +172,16 @@ exports[`indent.md 1`] = ` Fenced Code Block \`\`\` + + +1. Change to your home directory: + + cd + +2. List the contents: + + ls -l + `; exports[`lang.md 1`] = ` diff --git a/tests/markdown_code/indent.md b/tests/markdown_code/indent.md index 146a43ba..7a1819ac 100644 --- a/tests/markdown_code/indent.md +++ b/tests/markdown_code/indent.md @@ -11,3 +11,13 @@ Fenced Code Block Fenced Code Block ``` + + + +1. Change to your home directory: + + cd + +2. List the contents: + + ls -l diff --git a/tests/markdown_list/__snapshots__/jsfmt.spec.js.snap b/tests/markdown_list/__snapshots__/jsfmt.spec.js.snap index 050b7e3b..2cc2304a 100644 --- a/tests/markdown_list/__snapshots__/jsfmt.spec.js.snap +++ b/tests/markdown_list/__snapshots__/jsfmt.spec.js.snap @@ -15,10 +15,10 @@ exports[`checkbox.md 2`] = ` - [ ] this is a long long long long long long long long long long long long long long paragraph. - [x] this is a long long long long long long long long long long long long long long paragraph. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -* [ ] this is a long long long long long long long long long long long long long - long paragraph. -* [x] this is a long long long long long long long long long long long long long - long paragraph. +* [ ] this is a long long long long long long long long long long long long + long long paragraph. +* [x] this is a long long long long long long long long long long long long + long long paragraph. `; @@ -49,9 +49,9 @@ exports[`git-diff-friendly.md 1`] = ` 1. def 999. ghi ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -5. abc -1. def -1. ghi +5. abc +1. def +1. ghi `; @@ -60,9 +60,9 @@ exports[`git-diff-friendly.md 2`] = ` 1. def 999. ghi ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -5. abc -1. def -1. ghi +5. abc +1. def +1. ghi `; @@ -190,17 +190,17 @@ exports[`indent.md 1`] = ` b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - 1. a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a + 1. a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a - b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b - 1. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a + 1. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a - b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b 12345678) a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a @@ -217,47 +217,47 @@ exports[`indent.md 1`] = ` a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a -1. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a +1. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a - * a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a - - b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - b b b b b b b b b b b b b b - - * [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a - - b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - b b b b b b b b b b b b b b - - 1. a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + * a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - 1. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + * [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - 12345678) a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a + 1. a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a - b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b - 12345678. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a + 1. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a - b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b - a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a + 12345678) a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a + + b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b + + 12345678. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a + + b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b + + a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a 12345678) [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a @@ -277,17 +277,17 @@ exports[`indent.md 1`] = ` b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - 1. a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a + 1. a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a - b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b - 1. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a + 1. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a - b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b 12345678) a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a @@ -393,134 +393,134 @@ exports[`indent.md 2`] = ` a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -* [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a +* [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a - * a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a + * a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - * [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a + * [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - 1. a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a + 1. a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - 1. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a + 1. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - 12345678) a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a + 12345678) a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a - b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b - 12345678. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a + 12345678. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a - b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a -1. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a +1. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a - * a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a + * a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - * [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a + * [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - 1. a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a + 1. a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - 1. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a + 1. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - 12345678) a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a + 12345678) a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a - b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b - 12345678. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a + 12345678. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a - b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a -12345678) [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a +12345678) [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a - b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b - * a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a + * a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a a - b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b - * [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a + * [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a a - b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b - 1. a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a + 1. a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a a - b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b - 1. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a + 1. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a a - b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b - 12345678) a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a + 12345678) a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a a - b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b b - 12345678. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a + 12345678. [ ] a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a a - b b b b b b b b b b b b b b b b b b b b b b b b b b b b b b - b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b b b b b b b b b b b b + b b b b b b b b b b b b b b b b b b - a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a - a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a + a a a a a a a a a a a a a a a a `; @@ -974,7 +974,7 @@ exports[`interrupt.md 2`] = ` * Something ### Some heading ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -* Something +* Something ### Some heading @@ -1011,8 +1011,8 @@ exports[`long-paragraph.md 1`] = ` exports[`long-paragraph.md 2`] = ` - This is a long long long long long long long long long long long long long long paragraph. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -* This is a long long long long long long long long long long long long long - long paragraph. +* This is a long long long long long long long long long long long long long + long paragraph. `; @@ -1072,17 +1072,17 @@ exports[`loose.md 2`] = ` - ghi ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -* 123 +* 123 - * abc + * abc -* 456 +* 456 - * def + * def -* 789 +* 789 - * ghi + * ghi `; @@ -1154,7 +1154,7 @@ exports[`multiline.md 2`] = ` 456 789 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -* 123 456 789 +* 123 456 789 `; @@ -1192,9 +1192,9 @@ exports[`nested.md 2`] = ` - Level 2 - Level 3 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -* Level 1 - * Level 2 - * Level 3 +* Level 1 + * Level 2 + * Level 3 `; @@ -1266,20 +1266,20 @@ exports[`nested-checkbox.md 2`] = ` paragraph paragraph paragraph paragraph paragraph paragraph paragraph paragraph paragraph ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -* parent list item parent list item parent list item parent list item parent - list item parent list item +* parent list item parent list item parent list item parent list item parent + list item parent list item - * child list item child list item child list item child list item child list - item child list item + * child list item child list item child list item child list item child + list item child list item paragraph paragraph paragraph paragraph paragraph paragraph paragraph paragraph paragraph -* [x] parent task list item parent task list item parent task list item parent - task list item +* [x] parent task list item parent task list item parent task list item parent + task list item - * [x] child task list item child task list item child task list item child - task list item + * [x] child task list item child task list item child task list item child + task list item paragraph paragraph paragraph paragraph paragraph paragraph paragraph paragraph paragraph @@ -1357,9 +1357,9 @@ exports[`ordered.md 1`] = ` 1. 456 1. 789 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1. 123 -1. 456 -1. 789 +1. 123 +1. 456 +1. 789 `; @@ -1368,9 +1368,9 @@ exports[`ordered.md 2`] = ` 1. 456 1. 789 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1. 123 -1. 456 -1. 789 +1. 123 +1. 456 +1. 789 `; @@ -1424,13 +1424,13 @@ exports[`separate.md 2`] = ` * 123 * 123 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -* 123 -* 123 -* 123 +* 123 +* 123 +* 123 -- 123 -- 123 -- 123 +- 123 +- 123 +- 123 `; @@ -1488,9 +1488,9 @@ exports[`simple.md 2`] = ` - 456 - 789 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -* 123 -* 456 -* 789 +* 123 +* 456 +* 789 `; @@ -1521,9 +1521,9 @@ exports[`start.md 1`] = ` 6. def 7. ghi ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -5. abc -6. def -7. ghi +5. abc +6. def +7. ghi `; @@ -1532,9 +1532,9 @@ exports[`start.md 2`] = ` 6. def 7. ghi ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -5. abc -6. def -7. ghi +5. abc +6. def +7. ghi `; diff --git a/tests/markdown_spec/__snapshots__/jsfmt.spec.js.snap b/tests/markdown_spec/__snapshots__/jsfmt.spec.js.snap index a81a1cab..b6d41a05 100644 --- a/tests/markdown_spec/__snapshots__/jsfmt.spec.js.snap +++ b/tests/markdown_spec/__snapshots__/jsfmt.spec.js.snap @@ -794,9 +794,9 @@ exports[`example-77.md 1`] = ` - bar ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1. foo +1. foo - * bar + * bar `; @@ -2420,11 +2420,11 @@ exports[`example-214.md 1`] = ` > A block quote. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1. A paragraph with two lines. +1. A paragraph with two lines. - indented code + indented code - > A block quote. + > A block quote. `; @@ -2477,9 +2477,9 @@ exports[`example-219.md 1`] = ` >> >> two ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -> > 1. one +> > 1. one > > -> > two +> > two `; @@ -2569,15 +2569,15 @@ exports[`example-223.md 1`] = ` > bam ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1. foo +1. foo - \`\`\` - bar - \`\`\` + \`\`\` + bar + \`\`\` - baz + baz - > bam + > bam `; @@ -2616,7 +2616,7 @@ exports[`example-225.md 1`] = ` exports[`example-226.md 1`] = ` 123456789. ok ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -123456789. ok +123456789. ok `; @@ -2630,14 +2630,14 @@ exports[`example-227.md 1`] = ` exports[`example-228.md 1`] = ` 0. ok ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -0. ok +0. ok `; exports[`example-229.md 1`] = ` 003. ok ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -3. ok +3. ok `; @@ -2692,11 +2692,11 @@ exports[`example-234.md 1`] = ` more code ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1. indented code +1. indented code - paragraph + paragraph - more code + more code `; @@ -2707,11 +2707,11 @@ exports[`example-235.md 1`] = ` more code ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1. indented code +1. indented code - paragraph + paragraph - more code + more code `; @@ -2786,9 +2786,9 @@ exports[`example-243.md 1`] = ` 2. 3. bar ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1. foo -2. -3. bar +1. foo +2. +3. bar `; @@ -2807,11 +2807,11 @@ exports[`example-245.md 1`] = ` > A block quote. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1. A paragraph with two lines. +1. A paragraph with two lines. - indented code + indented code - > A block quote. + > A block quote. `; @@ -2823,11 +2823,11 @@ exports[`example-246.md 1`] = ` > A block quote. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1. A paragraph with two lines. +1. A paragraph with two lines. - indented code + indented code - > A block quote. + > A block quote. `; @@ -2839,11 +2839,11 @@ exports[`example-247.md 1`] = ` > A block quote. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1. A paragraph with two lines. +1. A paragraph with two lines. - indented code + indented code - > A block quote. + > A block quote. `; @@ -2872,11 +2872,11 @@ with two lines. > A block quote. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1. A paragraph with two lines. +1. A paragraph with two lines. - indented code + indented code - > A block quote. + > A block quote. `; @@ -2884,7 +2884,7 @@ exports[`example-250.md 1`] = ` 1. A paragraph with two lines. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1. A paragraph with two lines. +1. A paragraph with two lines. `; @@ -2892,7 +2892,7 @@ exports[`example-251.md 1`] = ` > 1. > Blockquote continued here. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -> 1. > Blockquote continued here. +> 1. > Blockquote continued here. `; @@ -2900,7 +2900,7 @@ exports[`example-252.md 1`] = ` > 1. > Blockquote > continued here. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -> 1. > Blockquote continued here. +> 1. > Blockquote continued here. `; @@ -2955,7 +2955,7 @@ exports[`example-257.md 1`] = ` exports[`example-258.md 1`] = ` 1. - 2. foo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1. * 2. foo +1. * 2. foo `; @@ -2988,10 +2988,10 @@ exports[`example-261.md 1`] = ` 2. bar 3) baz ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1. foo -2. bar +1. foo +2. bar -3) baz +3) baz `; @@ -3252,11 +3252,11 @@ exports[`example-281.md 1`] = ` bar ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1. \`\`\` - foo - \`\`\` +1. \`\`\` + foo + \`\`\` - bar + bar `;