Skip to content

Commit f38111f

Browse files
authored
markdown: Preserve inline code line breaks if --prose-wrap=preserve (#11373)
1 parent bfb09bf commit f38111f

5 files changed

Lines changed: 51 additions & 3 deletions

File tree

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#### Preserve inline code line breaks if `--prose-wrap=preserve` (#11373 by @andersk)
2+
3+
<!-- prettier-ignore -->
4+
```markdown
5+
<!-- Input -->
6+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod `tempor
7+
incididunt` ut labore et dolore magna aliqua.
8+
9+
<!-- Prettier stable -->
10+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod `tempor incididunt` ut labore et dolore magna aliqua.
11+
12+
<!-- Prettier main -->
13+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod `tempor
14+
incididunt` ut labore et dolore magna aliqua.
15+
```

src/language-markdown/print-preprocess.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const isSingleCharRegex = /^.$/su;
99
function preprocess(ast, options) {
1010
ast = restoreUnescapedCharacter(ast, options);
1111
ast = mergeContinuousTexts(ast);
12-
ast = transformInlineCode(ast);
12+
ast = transformInlineCode(ast, options);
1313
ast = transformIndentedCodeblockAndMarkItsParentList(ast, options);
1414
ast = markAlignedList(ast, options);
1515
ast = splitTextIntoSentences(ast, options);
@@ -28,9 +28,9 @@ function transformImportExport(ast) {
2828
});
2929
}
3030

31-
function transformInlineCode(ast) {
31+
function transformInlineCode(ast, options) {
3232
return mapAst(ast, (node) => {
33-
if (node.type !== "inlineCode") {
33+
if (node.type !== "inlineCode" || options.proseWrap === "preserve") {
3434
return node;
3535
}
3636

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Jest Snapshot v1, https://goo.gl/fbAQLP
2+
3+
exports[`inline-code-newline.md - {"proseWrap":"preserve"} format 1`] = `
4+
====================================options=====================================
5+
parsers: ["markdown"]
6+
printWidth: 80
7+
proseWrap: "preserve"
8+
| printWidth
9+
=====================================input======================================
10+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod \`tempor
11+
incididunt\` ut labore et dolore magna aliqua. Ut enim ad minim veniam, \`quis
12+
nostrud\` exercitation ullamco laboris nisi ut aliquip ex ea commodo \`consequat.
13+
Duis\` aute irure dolor in reprehenderit in voluptate velit esse cillum dolore \`eu
14+
fugiat\` nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
15+
culpa qui officia deserunt mollit anim id est laborum.
16+
17+
=====================================output=====================================
18+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod \`tempor
19+
incididunt\` ut labore et dolore magna aliqua. Ut enim ad minim veniam, \`quis
20+
nostrud\` exercitation ullamco laboris nisi ut aliquip ex ea commodo \`consequat.
21+
Duis\` aute irure dolor in reprehenderit in voluptate velit esse cillum dolore \`eu
22+
fugiat\` nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
23+
culpa qui officia deserunt mollit anim id est laborum.
24+
25+
================================================================================
26+
`;
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod `tempor
2+
incididunt` ut labore et dolore magna aliqua. Ut enim ad minim veniam, `quis
3+
nostrud` exercitation ullamco laboris nisi ut aliquip ex ea commodo `consequat.
4+
Duis` aute irure dolor in reprehenderit in voluptate velit esse cillum dolore `eu
5+
fugiat` nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
6+
culpa qui officia deserunt mollit anim id est laborum.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
run_spec(__dirname, ["markdown"], { proseWrap: "preserve" });

0 commit comments

Comments
 (0)