fix(multiparser): respect 0-indent markdown-in-js by ikatyang · Pull Request #3676 · prettier/prettier

ikatyang · 2018-01-08T18:25:36Z

playground

Input:

md`
This line shouldn't be indented at all in the resulting output, but it is.
`

md(`
Prettier does the right thing on this line and preserves the indentation level.
`)

Output:

md`
This line shouldn't be indented at all in the resulting output, but it is.
`;

md(`
Prettier does the right thing on this line and preserves the indentation level.
`);

Fixes #3740

playground

Prettier pr-3676
Playground link

--parser markdown

Input:

- 1
  - 2
    - 3
      ```js
      something`
      asd

      asd

      asd
      `
      ```

Output:

* 1

  * 2

    * 3

      ```js
      something`
      asd
      
      asd
      
      asd
      `;
      ```

duailibe · 2018-01-08T18:50:12Z

-          indent(
+          (hasIndent ? indent : identity)(
            concat([
              softline,


I think you need to change this to literalline if no indent, see playground link

duailibe · 2018-01-08T19:03:15Z

+  text2
+
+  text3
+  \`;


I was just gonna comment this too :)

I think we need to split and join with literallines, like in

prettier/src/language-js/printer-estree.js

Lines 1917 to 1918 in dc4e449

case "TemplateElement":

return join(literalline, n.value.raw.split(/\r?\n/g));

Do we have literal-line or literal-softline? The linebreaks in markdown are not static. 🤔

I've made a zeroIndent primitive to print zero-indented docs. Do you want me to open a separate PR or push here?

I'll open a PR refactoring the template literal printing

duailibe · 2018-01-10T14:38:56Z

            concat([
-              softline,
-              docUtils.stripTrailingHardline(escapeBackticks(doc))
+              hasIndent ? softline : literalline,


I think all of these ternaries would be better replaced as an if (hasIndent)

j-f1 · 2018-01-10T14:40:53Z

+
+function literalify(doc) {
+  return align(-Infinity, doc);
+}


Could you make this a “primitive” (like how conditionalGroup is actually a group) in the doc file?

Not sure how should we name it, rootIndent?

Sure. Or maybe dedentToRoot?

ikatyang · 2018-01-10T14:56:38Z

I'd like to also fix that edge case in this PR, still WIP.

wip

ikatyang · 2018-01-16T04:22:42Z

Ready for review.

duailibe

Nice job!

* fix(multiparser): respect 0-indent markdown-in-js * fix: use literalline for 0-indent * test: add unexpected case * fix: 0-indent * test: add failing test * refactor: simplify * fix(doc): literallines respect `ind.root` * docs: update commands * fix: what a magic...

chrislloyd · 2018-01-18T23:31:09Z

This is great, thank you very much! Would it be possible to get a point release cut with this commit?

christianvuerings · 2018-01-23T22:32:07Z

@duailibe @azz Do you know when we might get a next release which includes this fix?

btraut · 2018-02-09T18:36:28Z

@duailibe @azz @ikatyang Checking up on this again. Is there any chance we could get a fresh point release published? Thanks!

lydell · 2018-02-09T18:38:39Z

@btraut 1.11 has started to form: #3931

fix(multiparser): respect 0-indent markdown-in-js

e1359b4

duailibe reviewed Jan 8, 2018

View reviewed changes

ikatyang added 2 commits January 9, 2018 02:57

fix: use literalline for 0-indent

a2a1318

test: add unexpected case

ddb585b

duailibe reviewed Jan 8, 2018

View reviewed changes

duailibe mentioned this pull request Jan 8, 2018

Add reset indent primitive #3677

Closed

ikatyang added the status:wip Pull requests that are a work in progress and should not be merged label Jan 9, 2018

ikatyang added 2 commits January 10, 2018 22:29

fix: 0-indent

2c3d1fc

test: add failing test

276f919

duailibe reviewed Jan 10, 2018

View reviewed changes

j-f1 reviewed Jan 10, 2018

View reviewed changes

refactor: simplify

a03e833

duailibe previously approved these changes Jan 10, 2018

View reviewed changes

ikatyang added 2 commits January 13, 2018 23:45

fix(doc): literallines respect ind.root

ee31d0c

docs: update commands

3aae520

ikatyang removed the status:wip Pull requests that are a work in progress and should not be merged label Jan 13, 2018

ikatyang mentioned this pull request Jan 16, 2018

fix(javascript): ternary with --use-tabs #3745

Merged

Merge branch 'master' into fix/markdown-in-js-0-indent

c8c7c8e

duailibe approved these changes Jan 16, 2018

View reviewed changes

fix: what a magic...

76ef4ae

ikatyang merged commit de6bc44 into prettier:master Jan 17, 2018

ikatyang deleted the fix/markdown-in-js-0-indent branch January 17, 2018 04:52

lock Bot added the locked-due-to-inactivity Please open a new issue and fill out the template instead of commenting. label Jan 18, 2019

lock Bot locked as resolved and limited conversation to collaborators Jan 18, 2019

+                text2
+                text3
+                \`;

	case "TemplateElement":
	return join(literalline, n.value.raw.split(/\r?\n/g));

Uh oh!

Conversation

ikatyang commented Jan 8, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ikatyang Jan 8, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ikatyang commented Jan 10, 2018

Uh oh!

ikatyang commented Jan 16, 2018

Uh oh!

duailibe left a comment

Choose a reason for hiding this comment

Uh oh!

chrislloyd commented Jan 18, 2018

Uh oh!

christianvuerings commented Jan 23, 2018

Uh oh!

btraut commented Feb 9, 2018

Uh oh!

lydell commented Feb 9, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

ikatyang commented Jan 8, 2018 •

edited

Loading

ikatyang Jan 8, 2018 •

edited

Loading