Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Glimmer] Improve glimmer comments #6206

Merged
merged 1 commit into from
Jun 19, 2019

Conversation

GavinJoyce
Copy link
Contributor

@GavinJoyce GavinJoyce commented Jun 10, 2019

With the following input:

<div>
  {{!-- Foo --}}
  {{#if @foo}}
    Foo
  {{/if}}

  {{!-- Bar --}}
  {{#if @bar}}
    Bar
  {{/if}}
</div>

We currently get the following incorrect output:

<div>
  {{! Foo }}
  {{#if @foo}}
    Foo
  {{/if}}{{! Bar }}{{#if @bar}}
    Bar
  {{/if}}
</div>

This PR will change this output to:

<div>
  {{! Foo }}
  {{#if @foo}}
    Foo
  {{/if}}
  {{! Bar }}
  {{#if @bar}}
    Bar
  {{/if}}
</div>
  • Rebase once [Glimmer] improve text/mustache formatting #6186 lands
  • I’ve added tests to confirm my change works.
  • (If changing the API or CLI) I’ve documented the changes I’ve made (in the docs/ directory)
  • (If the change is user-facing) I’ve added my changes to the CHANGELOG.unreleased.md file following the template.
  • I’ve read the contributing guidelines.

Try the playground for this PR

@GavinJoyce
Copy link
Contributor Author

This looks 🍏. I'll rebase and add the change log once #6186 has been merged

@GavinJoyce GavinJoyce force-pushed the gj/glimmer-comments branch 2 times, most recently from 388648d to 4b74a21 Compare June 18, 2019 08:37
@GavinJoyce GavinJoyce changed the title [WIP][Glimmer] Improve glimmer comments [Glimmer] Improve glimmer comments Jun 18, 2019
@GavinJoyce
Copy link
Contributor Author

This is ready for review

@duailibe duailibe merged commit e8037ff into prettier:master Jun 19, 2019
@GavinJoyce GavinJoyce deleted the gj/glimmer-comments branch June 19, 2019 19:56
@lock lock bot added the locked-due-to-inactivity Please open a new issue and fill out the template instead of commenting. label Sep 17, 2019
@lock lock bot locked as resolved and limited conversation to collaborators Sep 17, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
locked-due-to-inactivity Please open a new issue and fill out the template instead of commenting.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants