Apply the bracket fix from issue 471 only for use_parentheses=True

[bp72]

Closes #2154

1. Moved the fix for Issue 471 under the use_parentheses=True condition as it fixes the situation where we added a closing bracket after the comment at line 131.
2. Added tests for the issue isort introduces SyntaxError with multiline "from a import b as c" plus a comment ending in a parenthesis #2154
3. Renamed _comment to noqa_comment

[staticdev]

@bp72 LGTM, do you mind rebasing to current code so we can see checks/pipelines run?

[codecov]

Codecov Report

Merging #2184 (ee8d87f) into main (9255bca) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #2184   +/-   ##
=======================================
  Coverage   99.15%   99.15%           
=======================================
  Files          39       39           
  Lines        3090     3091    +1     
  Branches      748      748           
=======================================
+ Hits         3064     3065    +1     
  Misses         15       15           
  Partials       11       11           

[bp72]

One test has failed, I'm not sure yet why, hmm.

[bp72]

I added a fix for the error that was caught by hypothesis, but now the cyclomatic complexity check is failing :)

[staticdev]

@bp72 we can deal with complexity in a new pr if you want. LGTM.

[bp72]

@staticdev thank you for the review!