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(rosetta): newlines after return statements missing #3063

Merged
merged 4 commits into from
Oct 13, 2021
Merged

Conversation

rix0rrr
Copy link
Contributor

@rix0rrr rix0rrr commented Oct 13, 2021

Handling of newlines was incorrect (and missing a terminating
semicolon) around lines involving returns.

Fix that, and fix correct handling of derived function return
types while we're at it.

Fixes #3054.


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Handling of newlines was incorrect (and missing a terminating
semicolon) around lines involving `return`s.

Fix that, and fix correct handling of derived function return
types while we're at it.

Fixes #3054.
@rix0rrr rix0rrr requested a review from a team October 13, 2021 08:58
@rix0rrr rix0rrr self-assigned this Oct 13, 2021
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Oct 13, 2021
Copy link
Contributor

@nija-at nija-at left a comment

Choose a reason for hiding this comment

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

What about tests for the determineReturnType() changes?

@rix0rrr
Copy link
Contributor Author

rix0rrr commented Oct 13, 2021

What about tests for the determineReturnType() changes?

Those are part of the tests I just added:

https://github.com/aws/jsii/pull/3063/files#diff-68ec0bf3f35da8c538b2c37274eff515a26a26ede79553af9292a7db57ff55e1R13

@rix0rrr rix0rrr requested a review from nija-at October 13, 2021 11:17
@mergify
Copy link
Contributor

mergify bot commented Oct 13, 2021

Thank you for contributing! ❤️ I will now look into making sure the PR is up-to-date, then proceed to try and merge it!

@mergify mergify bot added the pr/ready-to-merge This PR is ready to be merged. label Oct 13, 2021
@mergify
Copy link
Contributor

mergify bot commented Oct 13, 2021

Merging (with squash)...

@mergify mergify bot merged commit 26c95f5 into main Oct 13, 2021
@mergify mergify bot deleted the huijbers/newlines branch October 13, 2021 15:21
@mergify
Copy link
Contributor

mergify bot commented Oct 13, 2021

Merging (with squash)...

@mergify mergify bot removed the pr/ready-to-merge This PR is ready to be merged. label Oct 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contribution/core This is a PR that came from AWS.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

(rosetta) Sometimes lines are joined in python
2 participants