-
-
Notifications
You must be signed in to change notification settings - Fork 6.5k
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
Remove cycle in printDiffs, diffLines and joinAlignedDiffs #10818
Remove cycle in printDiffs, diffLines and joinAlignedDiffs #10818
Conversation
Thank you for your pull request and welcome to our community. We require contributors to sign our Contributor License Agreement, and we don't seem to have you on file. In order for us to review and merge your code, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA. If you have received this in error or have any questions, please contact us at cla@fb.com. 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.
Thanks! could you add a changelog entry as well? just in case 🙂
Thanks @raymondnumbergenerator! Could you sign the CLA? Then I can merge 🙂 |
Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Facebook open source project. Thanks! |
Thanks! |
This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
Summary
The
jest-diff
package has three files with cyclical dependencies. This makes the logic more confusing to follow and the distinction between files less clear. Several helper functions that should be private are also needed to be exported because of the cycles.formatTrailingSpaces
,printDiffLine
,printDeleteLine
,printInsertLine
,printCommonLine
andcreatePatchMark
are moved fromprintDiffs
tojoinAlignedDiffs
and made private.hasCommonDiff
inprintDiffs
is made private.countChanges
andprintAnnotation
are moved fromprintDiffs
todiffLines
and made private.printDiffLines
is moved fromprintDiffs
todiffLines
and exported there, imports are changed to reflect this.Test plan
No new tests added, passes existing tests with
yarn test
.I ran
madge --circular
to demonstrate that the cycles are gone.Madge output before:
Madge output after: