[handlebars] allow custom "else if"-like with block params #13930
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jamescdavis
changed the title
jamescdavis
changed the title
jamescdavis
changed the title
jamescdavis
force-pushed
the
allow_block_params_in_else_if
branch
2 times, most recently
from
f2b3862
to
3964285
Compare
jamescdavis
force-pushed
the
allow_block_params_in_else_if
branch
from
3964285
to
299bb7b
Compare
|
I think we should allow break before Prettier pr-13930 --parser glimmer
--print-width 20Input: Output: |
jamescdavis
force-pushed
the
allow_block_params_in_else_if
branch
from
a15c9cf
to
22a1096
Compare
|
@fisker I've added groups to allow breaking. I used nested groups rather than just a single group like in If this looks good, I can follow up with the same treatment for but would break to at |
|
Can you add a test for it? You can use a long condition instead of setting |
4 tasks
crapStone
pushed a commit
to Calciumdibromid/CaBr2
that referenced
this pull request
Jan 11, 2023
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [prettier](https://prettier.io) ([source](https://github.com/prettier/prettier)) | devDependencies | patch | [`2.8.1` -> `2.8.2`](https://renovatebot.com/diffs/npm/prettier/2.8.1/2.8.2) | --- ### Release Notes <details> <summary>prettier/prettier</summary> ### [`v2.8.2`](https://github.com/prettier/prettier/blob/HEAD/CHANGELOG.md#​282) [Compare Source](prettier/prettier@2.8.1...2.8.2) [diff](prettier/prettier@2.8.1...2.8.2) ##### Don't lowercase link references ([#​13155](prettier/prettier#13155) by [@​DerekNonGeneric](https://github.com/DerekNonGeneric) & [@​fisker](https://github.com/fisker)) <!-- prettier-ignore --> ```markdown <!-- Input --> We now don't strictly follow the release notes format suggested by [Keep a Changelog]. [Keep a Changelog]: https://example.com/ <!-- Prettier 2.8.1 --> We now don't strictly follow the release notes format suggested by [Keep a Changelog]. [keep a changelog]: https://example.com/ <!-- ^^^^^^^^^^^^^^^^^^ lowercased --> <!-- Prettier 2.8.2 --> <Same as input> ``` ##### Preserve self-closing tags ([#​13691](prettier/prettier#13691) by [@​dcyriller](https://github.com/dcyriller)) <!-- prettier-ignore --> ```hbs {{! Input }} <div /> <div></div> <custom-component /> <custom-component></custom-component> <i /> <i></i> <Component /> <Component></Component> {{! Prettier 2.8.1 }} <div></div> <div></div> <custom-component></custom-component> <custom-component></custom-component> <i></i> <i></i> <Component /> <Component /> {{! Prettier 2.8.2 }} <div /> <div></div> <custom-component /> <custom-component></custom-component> <i /> <i></i> <Component /> <Component /> ``` ##### Allow custom "else if"-like blocks with block params ([#​13930](prettier/prettier#13930) by [@​jamescdavis](https://github.com/jamescdavis)) [#​13507](prettier/prettier#13507) added support for custom block keywords used with `else`, but failed to allow block params. This updates printer-glimmer to allow block params with custom "else if"-like blocks. <!-- prettier-ignore --> ```hbs {{! Input }} {{#when isAtWork as |work|}} Ship that {{work}}! {{else when isReading as |book|}} You can finish {{book}} eventually... {{else}} Go to bed! {{/when}} {{! Prettier 2.8.1 }} {{#when isAtWork as |work|}} Ship that {{work}}! {{else when isReading}} You can finish {{book}} eventually... {{else}} Go to bed! {{/when}} {{! Prettier 2.8.2 }} {{#when isAtWork as |work|}} Ship that {{work}}! {{else when isReading as |book|}} You can finish {{book}} eventually... {{else}} Go to bed! {{/when}} ``` ##### Preserve empty lines between nested SCSS maps ([#​13931](prettier/prettier#13931) by [@​jneander](https://github.com/jneander)) <!-- prettier-ignore --> ```scss /* Input */ $map: ( 'one': ( 'key': 'value', ), 'two': ( 'key': 'value', ), ) /* Prettier 2.8.1 */ $map: ( 'one': ( 'key': 'value', ), 'two': ( 'key': 'value', ), ) /* Prettier 2.8.2 */ $map: ( 'one': ( 'key': 'value', ), 'two': ( 'key': 'value', ), ) ``` ##### Fix missing parentheses when an expression statement starts with `let[` ([#​14000](prettier/prettier#14000), [#​14044](prettier/prettier#14044) by [@​fisker](https://github.com/fisker), [@​thorn0](https://github.com/thorn0)) <!-- prettier-ignore --> ```jsx // Input (let[0] = 2); // Prettier 2.8.1 let[0] = 2; // Prettier 2.8.1 (second format) SyntaxError: Unexpected token (1:5) > 1 | let[0] = 2; | ^ 2 | // Prettier 2.8.2 (let)[0] = 2; ``` ##### Fix semicolon duplicated at the end of LESS file ([#​14007](prettier/prettier#14007) by [@​mvorisek](https://github.com/mvorisek)) <!-- prettier-ignore --> ```less // Input @​variable: { field: something; }; // Prettier 2.8.1 @​variable: { field: something; }; ; // Prettier 2.8.2 @​variable: { field: something; }; ``` ##### Fix no space after unary minus when followed by opening parenthesis in LESS ([#​14008](prettier/prettier#14008) by [@​mvorisek](https://github.com/mvorisek)) <!-- prettier-ignore --> ```less // Input .unary_minus_single { margin: -(@​a); } .unary_minus_multi { margin: 0 -(@​a); } .binary_minus { margin: 0 - (@​a); } // Prettier 2.8.1 .unary_minus_single { margin: - (@​a); } .unary_minus_multi { margin: 0 - (@​a); } .binary_minus { margin: 0 - (@​a); } // Prettier 2.8.2 .unary_minus_single { margin: -(@​a); } .unary_minus_multi { margin: 0 -(@​a); } .binary_minus { margin: 0 - (@​a); } ``` ##### Do not change case of property name if inside a variable declaration in LESS ([#​14034](prettier/prettier#14034) by [@​mvorisek](https://github.com/mvorisek)) <!-- prettier-ignore --> ```less // Input @​var: { preserveCase: 0; }; // Prettier 2.8.1 @​var: { preservecase: 0; }; // Prettier 2.8.2 @​var: { preserveCase: 0; }; ``` ##### Fix formatting for auto-accessors with comments ([#​14038](prettier/prettier#14038) by [@​fisker](https://github.com/fisker)) <!-- prettier-ignore --> ```jsx // Input class A { @​dec() // comment accessor b; } // Prettier 2.8.1 class A { @​dec() accessor // comment b; } // Prettier 2.8.1 (second format) class A { @​dec() accessor; // comment b; } // Prettier 2.8.2 class A { @​dec() // comment accessor b; } ``` ##### Add parentheses for TSTypeQuery to improve readability ([#​14042](prettier/prettier#14042) by [@​onishi-kohei](https://github.com/onishi-kohei)) <!-- prettier-ignore --> ```tsx // Input a as (typeof node.children)[number] a as (typeof node.children)[] a as ((typeof node.children)[number])[] // Prettier 2.8.1 a as typeof node.children[number]; a as typeof node.children[]; a as typeof node.children[number][]; // Prettier 2.8.2 a as (typeof node.children)[number]; a as (typeof node.children)[]; a as (typeof node.children)[number][]; ``` ##### Fix displacing of comments in default switch case ([#​14047](prettier/prettier#14047) by [@​thorn0](https://github.com/thorn0)) It was a regression in Prettier 2.6.0. <!-- prettier-ignore --> ```jsx // Input switch (state) { default: result = state; // no change break; } // Prettier 2.8.1 switch (state) { default: // no change result = state; break; } // Prettier 2.8.2 switch (state) { default: result = state; // no change break; } ``` ##### Support type annotations on auto accessors via `babel-ts` ([#​14049](prettier/prettier#14049) by [@​sosukesuzuki](https://github.com/sosukesuzuki)) [The bug that `@babel/parser` cannot parse auto accessors with type annotations](babel/babel#15205) has been fixed. So we now support it via `babel-ts` parser. <!-- prettier-ignore --> ```tsx class Foo { accessor prop: number; } ``` ##### Fix formatting of empty type parameters ([#​14073](prettier/prettier#14073) by [@​fisker](https://github.com/fisker)) <!-- prettier-ignore --> ```jsx // Input const foo: bar</* comment */> = () => baz; // Prettier 2.8.1 Error: Comment "comment" was not printed. Please report this error! // Prettier 2.8.2 const foo: bar</* comment */> = () => baz; ``` ##### Add parentheses to head of `ExpressionStatement` instead of the whole statement ([#​14077](prettier/prettier#14077) by [@​fisker](https://github.com/fisker)) <!-- prettier-ignore --> ```jsx // Input ({}).toString.call(foo) === "[object Array]" ? foo.forEach(iterateArray) : iterateObject(foo); // Prettier 2.8.1 ({}.toString.call(foo) === "[object Array]" ? foo.forEach(iterateArray) : iterateObject(foo)); // Prettier 2.8.2 ({}).toString.call(foo.forEach) === "[object Array]" ? foo.forEach(iterateArray) : iterateObject(foo); ``` ##### Fix comments after directive ([#​14081](prettier/prettier#14081) by [@​fisker](https://github.com/fisker)) <!-- prettier-ignore --> ```jsx // Input "use strict" /* comment */; // Prettier 2.8.1 (with other js parsers except `babel`) Error: Comment "comment" was not printed. Please report this error! // Prettier 2.8.2 <Same as input> ``` ##### Fix formatting for comments inside JSX attribute ([#​14082](prettier/prettier#14082) with by [@​fisker](https://github.com/fisker)) <!-- prettier-ignore --> ```jsx // Input function MyFunctionComponent() { <button label=/*old*/"new">button</button> } // Prettier 2.8.1 Error: Comment "old" was not printed. Please report this error! // Prettier 2.8.2 function MyFunctionComponent() { <button label=/*old*/ "new">button</button>; } ``` ##### Quote numeric keys for json-stringify parser ([#​14083](prettier/prettier#14083) by [@​fisker](https://github.com/fisker)) <!-- prettier-ignore --> ```jsx // Input {0: 'value'} // Prettier 2.8.1 { 0: "value" } // Prettier 2.8.2 { "0": "value" } ``` ##### Fix removing commas from function arguments in maps ([#​14089](prettier/prettier#14089) by [@​sosukesuzuki](https://github.com/sosukesuzuki)) <!-- prettier-ignore --> ```scss /* Input */ $foo: map-fn( ( "#{prop}": inner-fn($first, $second), ) ); /* Prettier 2.8.1 */ $foo: map-fn(("#{prop}": inner-fn($first $second))); /* Prettier 2.8.2 */ $foo: map-fn( ( "#{prop}": inner-fn($first, $second), ) ); ``` ##### Do not insert space in LESS property access ([#​14103](prettier/prettier#14103) by [@​fisker](https://github.com/fisker)) <!-- prettier-ignore --> ```less // Input a { color: @​colors[@​white]; } // Prettier 2.8.1 a { color: @​colors[ @​white]; } // Prettier 2.8.2 <Same as input> ``` </details> --- ### Configuration📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC45MC4wIiwidXBkYXRlZEluVmVyIjoiMzQuOTcuNSJ9--> Co-authored-by: cabr2-bot <cabr2.help@gmail.com> Reviewed-on: https://codeberg.org/Calciumdibromid/CaBr2/pulls/1708 Reviewed-by: Epsilon_02 <epsilon_02@noreply.codeberg.org> Co-authored-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org> Co-committed-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org>
crapStone
pushed a commit
to Calciumdibromid/CaBr2
that referenced
this pull request
Feb 10, 2023
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [prettier](https://prettier.io) ([source](https://github.com/prettier/prettier)) | devDependencies | patch | [`2.8.3` -> `2.8.4`](https://renovatebot.com/diffs/npm/prettier/2.8.3/2.8.4) | --- ### Release Notes <details> <summary>prettier/prettier</summary> ### [`v2.8.4`](https://github.com/prettier/prettier/blob/HEAD/CHANGELOG.md#​284) [Compare Source](prettier/prettier@2.8.3...2.8.4) [diff](prettier/prettier@2.8.3...2.8.4) ##### Fix leading comments in mapped types with `readonly` ([#​13427](prettier/prettier#13427) by [@​thorn0](https://github.com/thorn0), [@​sosukesuzuki](https://github.com/sosukesuzuki)) <!-- prettier-ignore --> ```tsx // Input type Type = { // comment readonly [key in Foo]; }; // Prettier 2.8.3 type Type = { readonly // comment [key in Foo]; }; // Prettier 2.8.4 type Type = { // comment readonly [key in Foo]; }; ``` ##### Group params in opening block statements ([#​14067](prettier/prettier#14067) by [@​jamescdavis](https://github.com/jamescdavis)) This is a follow-up to [#​13930](prettier/prettier#13930) to establish wrapping consistency between opening block statements and else blocks by grouping params in opening blocks. This causes params to break to a new line together and not be split across lines unless the length of params exceeds the print width. This also updates the else block wrapping to behave exactly the same as opening blocks. <!-- prettier-ignore --> ```hbs {{! Input }} {{#block param param param param param param param param param param as |blockParam|}} Hello {{else block param param param param param param param param param param as |blockParam|}} There {{/block}} {{! Prettier 2.8.3 }} {{#block param param param param param param param param param param as |blockParam| }} Hello {{else block param param param param param param param param param param}} There {{/block}} {{! Prettier 2.8.4 }} {{#block param param param param param param param param param param as |blockParam| }} Hello {{else block param param param param param param param param param param as |blockParam| }} There {{/block}} ``` ##### Ignore files in `.sl/` ([#​14206](prettier/prettier#14206) by [@​bolinfest](https://github.com/bolinfest)) In [Sapling SCM](https://sapling-scm.com/), `.sl/` is the folder where it stores its state, analogous to `.git/` in Git. It should be ignored in Prettier like the other SCM folders. ##### Recognize `@satisfies` in Closure-style type casts ([#​14262](prettier/prettier#14262) by [@​fisker](https://github.com/fisker)) <!-- prettier-ignore --> ```jsx // Input const a = /** @​satisfies {Record<string, string>} */ ({hello: 1337}); const b = /** @​type {Record<string, string>} */ ({hello: 1337}); // Prettier 2.8.3 const a = /** @​satisfies {Record<string, string>} */ { hello: 1337 }; const b = /** @​type {Record<string, string>} */ ({ hello: 1337 }); // Prettier 2.8.4 const a = /** @​satisfies {Record<string, string>} */ ({hello: 1337}); const b = /** @​type {Record<string, string>} */ ({hello: 1337}); ``` ##### Fix parens in inferred function return types with `extends` ([#​14279](prettier/prettier#14279) by [@​fisker](https://github.com/fisker)) <!-- prettier-ignore --> ```ts // Input type Foo<T> = T extends ((a) => a is infer R extends string) ? R : never; // Prettier 2.8.3 (First format) type Foo<T> = T extends (a) => a is infer R extends string ? R : never; // Prettier 2.8.3 (Second format) SyntaxError: '?' expected. // Prettier 2.8.4 type Foo<T> = T extends ((a) => a is infer R extends string) ? R : never; ``` </details> --- ### Configuration📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC4xMjUuMSIsInVwZGF0ZWRJblZlciI6IjM0LjEyOC4zIn0=--> Co-authored-by: cabr2-bot <cabr2.help@gmail.com> Reviewed-on: https://codeberg.org/Calciumdibromid/CaBr2/pulls/1775 Reviewed-by: Epsilon_02 <epsilon_02@noreply.codeberg.org> Co-authored-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org> Co-committed-by: Calciumdibromid Bot <cabr2_bot@noreply.codeberg.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Description
This is a follow-up to #13507 to allow block params in custom "else if"-like blocks.
Checklist
(If changing the API or CLI) I’ve documented the changes I’ve made (in thedocs/directory).changelog_unreleased/*/XXXX.mdfile followingchangelog_unreleased/TEMPLATE.md.CC: @dcyriller