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

fix(glimmer): {{else}}{{#if}} into {{else if}} merging #6080

Merged
merged 4 commits into from May 2, 2019

Conversation

@dcyriller
Copy link
Contributor

commented Apr 25, 2019

Description

The first commit highlights the issue. The second fixes it.

The following code should be left untouched:

{{#if a}}
  a
{{else}}
  {{#if c}}
    c
  {{/if}}
  e
{{/if}}

Instead, it was turned into:

{{#if a}}
  a
{{else if c}}
  c
e
{{/if}}

Checks

  • I’ve added tests to confirm my change works.
  • (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.

Playground

Try the playground for this PR

@dcyriller dcyriller referenced this pull request Apr 25, 2019
@dcyriller dcyriller force-pushed the dcyriller:fix-nested-if branch from 49bf6bd to 9a3ee3d Apr 25, 2019
Copy link

left a comment

awesome!! 👍

@dcyriller dcyriller force-pushed the dcyriller:fix-nested-if branch from 9a3ee3d to 6df3a03 Apr 25, 2019
Copy link
Member

left a comment

Thanks!

Need add note in changelog

@dcyriller

This comment has been minimized.

Copy link
Contributor Author

commented Apr 25, 2019

@evilebottnawi done, sorry for that

@dcyriller dcyriller force-pushed the dcyriller:fix-nested-if branch 2 times, most recently from ea48afb to 26e6d8e Apr 25, 2019
@dcyriller dcyriller changed the title Fix {{else}}{{#if}} into {{else if}} merging fix(glimmer): {{else}}{{#if}} into {{else if}} merging Apr 29, 2019
dcyriller added 2 commits Apr 25, 2019
```
{{#if a}}
  a
{{else}}
  {{#if c}}
    c
  {{/if}}
  e
{{/if}}
```
should be left untouched. Instead, it is turned into:
```
{{#if a}}
  a
{{else if c}}
  c
e
{{/if}}
```
@dcyriller dcyriller force-pushed the dcyriller:fix-nested-if branch from 26e6d8e to 107147b May 1, 2019
@dcyriller

This comment has been minimized.

Copy link
Contributor Author

commented May 1, 2019

@evilebottnawi CHANGELOG.unreleased.md is up to date.

@evilebottnawi

This comment has been minimized.

Copy link
Member

commented May 1, 2019

@dcyriller Thanks, can you fix CI?

@dcyriller dcyriller force-pushed the dcyriller:fix-nested-if branch from 107147b to b407ef4 May 1, 2019
@dcyriller

This comment has been minimized.

Copy link
Contributor Author

commented May 1, 2019

@evilebottnawi CI is now 🍏

I see that you squash the commits, so I don't bother to remove the last one (that was empty).

@evilebottnawi

This comment has been minimized.

Copy link
Member

commented May 1, 2019

/cc @prettier/core we need rule about merging (minimum 2 approve from core as example)

@lipis
lipis approved these changes May 1, 2019
@suchipi
suchipi approved these changes May 1, 2019
@evilebottnawi evilebottnawi merged commit 84cc273 into prettier:master May 2, 2019
16 of 18 checks passed
16 of 18 checks passed
Header rules No header rules processed
Details
Pages changed All files already uploaded
Details
Mixed content No mixed content detected
Details
Redirect rules 4 redirect rules processed
Details
codecov/patch Coverage not affected when comparing 157b020...32e7493
Details
codecov/project 94.27% remains the same compared to 157b020
Details
deploy/netlify Deploy preview ready!
Details
prettier.prettier Build #20190501.2 succeeded
Details
prettier.prettier (Dev Lint on Linux Node v10) Dev Lint on Linux Node v10 succeeded
Details
prettier.prettier (Dev Test on Linux Node v10) Dev Test on Linux Node v10 succeeded
Details
prettier.prettier (Dev Test on Windows Node v10) Dev Test on Windows Node v10 succeeded
Details
prettier.prettier (Dev Test on macOS Node v10) Dev Test on macOS Node v10 succeeded
Details
prettier.prettier (Prod Build on Linux Node v10) Prod Build on Linux Node v10 succeeded
Details
prettier.prettier (Prod Lint on Linux Node v10) Prod Lint on Linux Node v10 succeeded
Details
prettier.prettier (Prod Pack on Linux Node v10) Prod Pack on Linux Node v10 succeeded
Details
prettier.prettier (Prod Test on macOS Node_v10) Prod Test on macOS Node_v10 succeeded
Details
prettier.prettier (Prod Test on macOS Node_v10_standalone) Prod Test on macOS Node_v10_standalone succeeded
Details
prettier.prettier (Prod Test on macOS Node_v4) Prod Test on macOS Node_v4 succeeded
Details
@dcyriller dcyriller deleted the dcyriller:fix-nested-if branch May 2, 2019
@automatops automatops referenced this pull request May 13, 2019
0 of 1 task complete
@lock lock bot locked as resolved and limited conversation to collaborators Jul 31, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
5 participants
You can’t perform that action at this time.