-
Notifications
You must be signed in to change notification settings - Fork 78
fix issues 686 and 753 #754
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
Open
adrian-gierakowski
wants to merge
3
commits into
dprint:main
Choose a base branch
from
adrian-gierakowski:fix-issues-686-and-753
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| ~~ lineWidth: 80, indentWidth: 2, memberExpression.linePerExpression: true ~~ | ||
| == generator == | ||
| const createTestData = () => | ||
| function*() { | ||
| const startingFrom = yield* Effect.map(DateTime.now, now => DateTime.startOf(now, "day")) | ||
|
|
||
| return HashSet.make(DateTime.toEpochMillis(startingFrom)) | ||
| }; | ||
|
|
||
|
|
||
| [expect] | ||
| const createTestData = () => | ||
| function*() { | ||
| const startingFrom = yield* Effect.map( | ||
| DateTime.now, | ||
| now => DateTime.startOf(now, "day"), | ||
| ); | ||
|
|
||
| return HashSet.make(DateTime.toEpochMillis(startingFrom)); | ||
| }; | ||
|
|
||
| == function == | ||
| const func = () => | ||
| function() { | ||
| const startingFrom = Effect.map(DateTime.now, now => DateTime.startOf(now, 'day')) | ||
|
|
||
| return myObj | ||
| .myMethod({ | ||
| missionType: otherObj.prop.nested, | ||
| }); | ||
| }; | ||
|
|
||
| [expect] | ||
| const func = () => | ||
| function() { | ||
| const startingFrom = Effect.map( | ||
| DateTime.now, | ||
| now => DateTime.startOf(now, "day"), | ||
| ); | ||
|
|
||
| return myObj | ||
| .myMethod({ | ||
| missionType: otherObj.prop.nested, | ||
| }); | ||
| }; |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| ~~ lineWidth: 80, indentWidth: 2, memberExpression.linePerExpression: true ~~ | ||
| == function args == | ||
| const startingFrom = Mylib.map(DateTime.now, now => DateTime.startOf(now, "day")) | ||
|
|
||
| const func = () => | ||
| function() { | ||
| const startingFrom = Mylib.map(DateTime.now, now => DateTime.startOf(now, "day")) | ||
| } | ||
|
|
||
|
|
||
| [expect] | ||
| const startingFrom = Mylib.map( | ||
| DateTime.now, | ||
| now => DateTime.startOf(now, "day"), | ||
| ); | ||
|
|
||
| const func = () => | ||
| function() { | ||
| const startingFrom = Mylib.map( | ||
| DateTime.now, | ||
| now => DateTime.startOf(now, "day"), | ||
| ); | ||
| }; | ||
|
|
||
| == function args same line length == | ||
| const startingFroom = Mylib.map(DateTime.now, now => DateTime.startOf(now, "day")) | ||
|
|
||
| const func = () => | ||
| function() { | ||
| const startingF = Mylib.map(DateTime.now, now => DateTime.startOf(now, "day")) | ||
| } | ||
|
|
||
|
|
||
| [expect] | ||
| const startingFroom = Mylib.map( | ||
| DateTime.now, | ||
| now => DateTime.startOf(now, "day"), | ||
| ); | ||
|
|
||
| const func = () => | ||
| function() { | ||
| const startingF = Mylib.map( | ||
| DateTime.now, | ||
| now => DateTime.startOf(now, "day"), | ||
| ); | ||
| }; | ||
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.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@adrian-gierakowski
Let me just comment on one thing.
I think it should have a name starting with 0, like other files, like "issue0753.txt".
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks.
Btw. I'm not sure of this is the correct fix. Please see my comments in related issue.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In my environment, the behavior of the following test case changed when memberExpression.linePerExpression:
false was set. You may want to check this.
When you do, it's a good idea to incorporate the latest changes from the main branch and check them just to be sure.
https://github.com/naimonon77/dprint-plugin-typescript/blob/issue0753_2/tests/specs/issues/issue0753_02.txt
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, the issue only manifests when
memberExpression.linePerExpression: true. I think that's the reason @dsherret keeps ignoring it since this option is disabled in deno. I'm not interested in disabling this option as without it dprint allows formatting which is quite inconsistent, like:There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The main problem at this point is: what's the intended behaviour in #753 as that would determine if solution in this PR is valid or not
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As far as I can confirm, the intended behavior in #753 is fine.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dsherret would be great if you could confirm and merge if you agree with the above. Thanks!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rebased on main and renamed the test from issue753 to issue0753