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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 4 commits into from
May 2, 2019
Merged

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

merged 4 commits into from
May 2, 2019

Conversation

dcyriller
Copy link
Collaborator

@dcyriller dcyriller commented Apr 25, 2019 •
edited
Loading

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 mentioned this pull request Apr 25, 2019
Closed
Turbo87
Turbo87 approved these changes Apr 25, 2019
View reviewed changes
Copy link

@Turbo87 Turbo87 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

awesome!! 👍

alexander-akait
alexander-akait requested changes Apr 25, 2019
View reviewed changes
Copy link
Member

@alexander-akait alexander-akait left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

Need add note in changelog

@dcyriller
Copy link
Collaborator Author

@evilebottnawi done, sorry for that

@dcyriller dcyriller force-pushed the fix-nested-if branch 2 times, most recently from ea48afb to 26e6d8e Compare April 29, 2019 21:03
@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 May 1, 2019 09:28
@dcyriller
Highlight the nested if / else issue
19a61c5 
```
{{#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
Fix {{else}}{{#if}} into {{else if}} merging
2e5dfe1
@dcyriller
Copy link
Collaborator Author

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

@alexander-akait
Copy link
Member

@dcyriller Thanks, can you fix CI?

@dcyriller
Copy link
Collaborator Author

@evilebottnawi CI is now 🍏

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

@alexander-akait
Copy link
Member

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

@alexander-akait alexander-akait merged commit 84cc273 into prettier:master May 2, 2019
@dcyriller dcyriller deleted the fix-nested-if branch May 2, 2019 13:28
@xcomponentadmin xcomponentadmin mentioned this pull request May 13, 2019
Closed
@automatops automatops mentioned this pull request May 13, 2019
Merged
1 task
This was referenced Jun 5, 2019
Merged
Merged
Closed
Merged
This was referenced Jun 5, 2019
Merged
Closed
Closed
Closed
Merged
Merged
Closed
Closed
Closed
Merged
Merged
Open
Closed
Closed
Merged
@lock lock bot added the locked-due-to-inactivity Please open a new issue and fill out the template instead of commenting. label Jul 31, 2019
@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.
Reviewers

@alexander-akait alexander-akait alexander-akait requested changes

@suchipi suchipi suchipi approved these changes

@Turbo87 Turbo87 Turbo87 approved these changes

@lipis lipis lipis approved these changes

Assignees
No one assigned
Labels
locked-due-to-inactivity Please open a new issue and fill out the template instead of commenting.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@dcyriller @alexander-akait @lipis @Turbo87 @suchipi