convert_type_comments now preserves comments following type comments

[superbobry]

Summary

Prior to this PR convert_type_comments codemod stripped any comments following a type comment. So, for example,

y = 5  # type: int  # foo

was converted to

y: int = 5

instead of

y: int = 5  # foo

The PR changes the codemod to preserve any such comments.

Test Plan

Added a new test case.

[facebook-github-bot]

Hi @superbobry!

Thank you for your pull request and welcome to our community.

Action Required

In order to merge any pull request (code, docs, etc.), we require contributors to sign our Contributor License Agreement, and we don't seem to have one on file for you.

Process

In order for us to review and merge your suggested changes, 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.

Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with CLA signed. The tagging process may take up to 1 hour after signing. Please give it that time before contacting us about it.

If you have received this in error or have any questions, please contact us at [email protected]. Thanks!

[facebook-github-bot]

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Meta Open Source project. Thanks!

[zsol]

I'll let @stroxler chime in, but let me ask: what happens for y = 5 # foo # type: int?

[codecov-commenter]

Codecov Report

Merging #702 (48f6398) into main (ff5fcf8) will decrease coverage by 0.00%.
The diff coverage is 92.85%.

@@            Coverage Diff             @@
##             main     #702      +/-   ##
==========================================
- Coverage   94.79%   94.79%   -0.01%     
==========================================
  Files         246      246              
  Lines       25689    25703      +14     
==========================================
+ Hits        24353    24366      +13     
- Misses       1336     1337       +1     

Impacted Files	Coverage Δ
libcst/codemod/commands/convert_type_comments.py	94.96% <90.00%> (-0.21%)	⬇️
...demod/commands/tests/test_convert_type_comments.py	97.43% <100.00%> (+0.13%)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ff5fcf8...48f6398. Read the comment docs.

[superbobry]

Thanks @zsol! y = 5 # foo # type: int is not a valid type comment according to PEP-484:

In some cases, linting tools or other comments may be needed on the same line as a type comment. In these cases, the type comment should be before other comments and linting markers:

# type: ignore # <comment or other marker>

[zsol]

Thanks for the contribution :)