Fixed

CHANGELOG.md

@@ -2,6 +2,10 @@ Changelog
 =========
 
 NOTE: isort follows the [semver](https://semver.org/) versioning standard.
+
+### 5.0.6 July 8, 2020
+  - Fixed #1302: comments and --trailing-comma can generate invalid code
+
 ### 5.0.5 July 7, 2020
   - Fixed #1285: packaging issue with bundling tests via poetry.
   - Fixed #1284: Regression when sorting `.pyi` files from CLI using black profile.

isort/wrap.py

@@ -76,7 +76,9 @@ def line(content: str, line_separator: str, config: Config = DEFAULT_CONFIG) ->
             ):
                 line_parts = re.split(exp, line_without_comment)
                 if comment:
-                    _comma_maybe = "," if config.include_trailing_comma else ""
+                    _comma_maybe = (
+                        "," if (config.include_trailing_comma and config.use_parentheses) else ""
+                    )
                     line_parts[-1] = f"{line_parts[-1].strip()}{_comma_maybe}  #{comment}"
                 next_line = []
                 while (len(content) + 2) > (

tests/test_regressions.py

@@ -183,3 +183,22 @@ def test_ensure_new_line_before_comments_mixed_with_ensure_newline_before_commen
 """
     assert isort.code(test_input, profile="black") == test_input
     assert isort.code(test_input, profile="black", force_sort_within_sections=True) == test_input
+
+
+def test_trailing_comma_doesnt_introduce_broken_code_with_comment_and_wrap_issue_1302():
+    """Tests to assert the combination of include_trailing_comma and a wrapped line doesnt break.
+    See: https://github.com/timothycrosley/isort/issues/1302.
+    """
+    assert (
+        isort.code(
+            """
+from somewhere import very_very_very_very_very_very_long_symbol # some comment
+""",
+            line_length=50,
+            include_trailing_comma=True,
+        )
+        == """
+from somewhere import \\
+    very_very_very_very_very_very_long_symbol  # some comment
+"""
+    )