From bdee3ca2c3aed13a7b0731e754a886fb13a9ff13 Mon Sep 17 00:00:00 2001
From: jsh9 <25124332+jsh9@users.noreply.github.com>
Date: Mon, 22 May 2023 01:41:56 -0700
Subject: [PATCH 1/8] Fix a bug in pragma comment wrapping

---
 src/cercis/lines.py                           |  30 +++-
 .../pragma_comments/Black_default_2.py        | 117 ++++++++++++++
 .../pragma_comments/Cercis_default_2.py       | 147 ++++++++++++++++++
 tests/test_format.py                          |   2 +
 4 files changed, 289 insertions(+), 7 deletions(-)
 create mode 100644 tests/data/configurable_cases/pragma_comments/Black_default_2.py
 create mode 100644 tests/data/configurable_cases/pragma_comments/Cercis_default_2.py

diff --git a/src/cercis/lines.py b/src/cercis/lines.py
index cbb6bd1bbe2..034936cbdfd 100644
--- a/src/cercis/lines.py
+++ b/src/cercis/lines.py
@@ -331,7 +331,7 @@ def contains_unsplittable_type_ignore(self) -> bool:
 
     def trailing_pragma_comment_length(self) -> int:
         """
-        This method comes from the wonderful implementation in Pyink:
+        This method is adapted from the wonderful implementation in Pyink:
         https://github.com/google/pyink/blob/f93771c02e9a26ce9508c59d69c9337c95797eac/src/pyink/lines.py#L316-L328
 
         Pyink is another fork from Black, and inherits Black's MIT license.
@@ -341,14 +341,30 @@ def trailing_pragma_comment_length(self) -> int:
 
         last_leaf = self.leaves[-1]
         length = 0
-        for comment in self.comments.get(id(last_leaf), []):
-            # str(comment) contains the whitespace preceding the `#`
-            comment_str = str(comment)
-            parts = _PRAGMA_REGEX.split(comment_str, maxsplit=1)
-            if len(parts) == 3:
-                length += len(parts[1]) + len(parts[2])
+
+        if id(last_leaf) in self.comments:
+            # In many cases, the ID of the last leaf is the same as one of
+            # the comments.
+            for comment in self.comments.get(id(last_leaf), []):
+                length += self._calc_comment_length(comment)
+        elif len(self.leaves) >= 2 and id(self.leaves[-2]) in self.comments:
+            # In other cases (such as `some_var = some_value  # some comment`),
+            # it's the 2nd to the last leaf that has the same ID as one
+            # of the comments.
+            for comment in self.comments.get(id(self.leaves[-2]), []):
+                length += self._calc_comment_length(comment)
+
         return length
 
+    @classmethod
+    def _calc_comment_length(cls, comment: Leaf) -> int:
+        comment_str = str(comment)  # contains the whitespace preceding the `#`
+        parts = _PRAGMA_REGEX.split(comment_str, maxsplit=1)
+        if len(parts) == 3:
+            return len(parts[1]) + len(parts[2])
+
+        return 0
+
     def contains_multiline_strings(self) -> bool:
         return any(is_multiline_string(leaf) for leaf in self.leaves)
 
diff --git a/tests/data/configurable_cases/pragma_comments/Black_default_2.py b/tests/data/configurable_cases/pragma_comments/Black_default_2.py
new file mode 100644
index 00000000000..dbe1f8cdbd6
--- /dev/null
+++ b/tests/data/configurable_cases/pragma_comments/Black_default_2.py
@@ -0,0 +1,117 @@
+# Some test cases in this file comes from: https://github.com/google/pyink/blob/f93771c02e9a26ce9508c59d69c9337c95797eac/tests/data/pyink/pragma_comments.py
+a_very_long_library_name = private_method(and__long_arg)  # pylint: disable=protected-access
+a_very_long_library_name = private_method(and__long_arg_that_just_fits_limit_)  # pylint: disable=protected-access
+a_very_long_library_name = private_method(and__long_arg_that_just_fits_limit___)  # pylint: disable=protected-access
+a_very_long_library_name = private_method(and__long_arg_that_no_long_fits_______)  # pylint: disable=protected-access
+
+a_very_long_library_name = private_method(and__long_arg)  # pylint:disable=protected-access
+a_very_long_library_name = private_method(and__long_arg_that_just_fits_limit_)  # pylint:disable=protected-access
+a_very_long_library_name = private_method(and__long_arg_that_just_fits_limit___)  # pylint:disable=protected-access
+a_very_long_library_name = private_method(and__long_arg_that_no_long_fits_______)  # pylint:disable=protected-access
+
+a_very_long_library_name = private_method(and__long_arg)  # noqa: E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method(and__long_arg_that_just_fits_limit_)  # noqa: E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method(and__long_arg_that_just_fits_limit___)  # noqa: E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method(and__long_arg_that_no_long_fits_______)  # noqa: E123, W234, ABC456, XYZ2
+
+a_very_long_library_name = private_method(and__long_arg)  # noqa:E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method(and__long_arg_that_just_fits_limit_)  # noqa:E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method(and__long_arg_that_just_fits_limit___)  # noqa:E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method(and__long_arg_that_no_long_fits_______)  # noqa:E123, W234, ABC456, XYZ2
+
+# Black does not wrap a line, no matter how long,
+# if it has "# type: ignore" at the end.
+a_very_long_library_name = private_method(and__long_arg)  # type: ignore[something]
+a_very_long_library_name = private_method(and__long_arg_that_just_fits_limit_)  # type: ignore[something]
+a_very_long_library_name = private_method(and__long_arg_that_just_fits_limit___)  # type: ignore[something]
+a_very_long_library_name = private_method(and__long_arg_that_no_long_fits_______)  # type: ignore[something]
+a_very_long_library_name = private_method(Though_hundreds_of_thousands_had_done_their_very_best_to_disfigure_the_small_piece_of_land_on_which_they_were_crowded_together_by_paving_the_ground_with_stones_scraping_away_every_vestige_of_vegetation_cutting_down_the_trees_turning_away_birds_and_beasts_and_filling_the_air_with_the_smoke_of_naphtha_and_coal_still_spring_was_spring_even_in_the_town)  # type: ignore[something]
+
+# Black only exempts "# type: ignore" but not "# type:ignore".
+# The latter is also valid for mypy and many people use the latter.
+a_very_long_library_name = private_method(and__long_arg)  # type:ignore[something]
+a_very_long_library_name = private_method(and__long_arg_that_just_fits_limit_)  # type:ignore[something]
+a_very_long_library_name = private_method(and__long_arg_that_just_fits_limit___)  # type:ignore[something]
+a_very_long_library_name = private_method(and__long_arg_that_no_long_fits_______)  # type:ignore[something]
+a_very_long_library_name = private_method(Though_hundreds_of_thousands_had_done_their_very_best_to_disfigure_the_small_piece_of_land_on_which_they_were_crowded_together_by_paving_the_ground_with_stones_scraping_away_every_vestige_of_vegetation_cutting_down_the_trees_turning_away_birds_and_beasts_and_filling_the_air_with_the_smoke_of_naphtha_and_coal_still_spring_was_spring_even_in_the_town)  # type:ignore[something]
+
+# output
+
+# Some test cases in this file comes from: https://github.com/google/pyink/blob/f93771c02e9a26ce9508c59d69c9337c95797eac/tests/data/pyink/pragma_comments.py
+a_very_long_library_name = private_method(
+    and__long_arg
+)  # pylint: disable=protected-access
+a_very_long_library_name = private_method(
+    and__long_arg_that_just_fits_limit_
+)  # pylint: disable=protected-access
+a_very_long_library_name = private_method(
+    and__long_arg_that_just_fits_limit___
+)  # pylint: disable=protected-access
+a_very_long_library_name = private_method(
+    and__long_arg_that_no_long_fits_______
+)  # pylint: disable=protected-access
+
+a_very_long_library_name = private_method(
+    and__long_arg
+)  # pylint:disable=protected-access
+a_very_long_library_name = private_method(
+    and__long_arg_that_just_fits_limit_
+)  # pylint:disable=protected-access
+a_very_long_library_name = private_method(
+    and__long_arg_that_just_fits_limit___
+)  # pylint:disable=protected-access
+a_very_long_library_name = private_method(
+    and__long_arg_that_no_long_fits_______
+)  # pylint:disable=protected-access
+
+a_very_long_library_name = private_method(
+    and__long_arg
+)  # noqa: E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method(
+    and__long_arg_that_just_fits_limit_
+)  # noqa: E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method(
+    and__long_arg_that_just_fits_limit___
+)  # noqa: E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method(
+    and__long_arg_that_no_long_fits_______
+)  # noqa: E123, W234, ABC456, XYZ2
+
+a_very_long_library_name = private_method(
+    and__long_arg
+)  # noqa:E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method(
+    and__long_arg_that_just_fits_limit_
+)  # noqa:E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method(
+    and__long_arg_that_just_fits_limit___
+)  # noqa:E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method(
+    and__long_arg_that_no_long_fits_______
+)  # noqa:E123, W234, ABC456, XYZ2
+
+# Black does not wrap a line, no matter how long,
+# if it has "# type: ignore" at the end.
+a_very_long_library_name = private_method(and__long_arg)  # type: ignore[something]
+a_very_long_library_name = private_method(and__long_arg_that_just_fits_limit_)  # type: ignore[something]
+a_very_long_library_name = private_method(and__long_arg_that_just_fits_limit___)  # type: ignore[something]
+a_very_long_library_name = private_method(and__long_arg_that_no_long_fits_______)  # type: ignore[something]
+a_very_long_library_name = private_method(Though_hundreds_of_thousands_had_done_their_very_best_to_disfigure_the_small_piece_of_land_on_which_they_were_crowded_together_by_paving_the_ground_with_stones_scraping_away_every_vestige_of_vegetation_cutting_down_the_trees_turning_away_birds_and_beasts_and_filling_the_air_with_the_smoke_of_naphtha_and_coal_still_spring_was_spring_even_in_the_town)  # type: ignore[something]
+
+# Black only exempts "# type: ignore" but not "# type:ignore".
+# The latter is also valid for mypy and many people use the latter.
+a_very_long_library_name = private_method(
+    and__long_arg
+)  # type:ignore[something]
+a_very_long_library_name = private_method(
+    and__long_arg_that_just_fits_limit_
+)  # type:ignore[something]
+a_very_long_library_name = private_method(
+    and__long_arg_that_just_fits_limit___
+)  # type:ignore[something]
+a_very_long_library_name = private_method(
+    and__long_arg_that_no_long_fits_______
+)  # type:ignore[something]
+a_very_long_library_name = private_method(
+    Though_hundreds_of_thousands_had_done_their_very_best_to_disfigure_the_small_piece_of_land_on_which_they_were_crowded_together_by_paving_the_ground_with_stones_scraping_away_every_vestige_of_vegetation_cutting_down_the_trees_turning_away_birds_and_beasts_and_filling_the_air_with_the_smoke_of_naphtha_and_coal_still_spring_was_spring_even_in_the_town
+)  # type:ignore[something]
diff --git a/tests/data/configurable_cases/pragma_comments/Cercis_default_2.py b/tests/data/configurable_cases/pragma_comments/Cercis_default_2.py
new file mode 100644
index 00000000000..5b1f3c26edc
--- /dev/null
+++ b/tests/data/configurable_cases/pragma_comments/Cercis_default_2.py
@@ -0,0 +1,147 @@
+# Some test cases in this file comes from: https://github.com/google/pyink/blob/f93771c02e9a26ce9508c59d69c9337c95797eac/tests/data/pyink/pragma_comments.py
+a_very_long_library_name = private_method_and__long_arg_  # pylint:disable=protected-access
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # pylint:disable=protected-access
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # pylint:disable=protected-access
+a_very_long_library_name = private_method_and__long_arg_that_no_long_fits________  # pylint:disable=protected-access
+
+a_very_long_library_name = private_method_and__long_arg_  # pylint: disable=protected-access
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # pylint: disable=protected-access
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # pylint: disable=protected-access
+a_very_long_library_name = private_method_and__long_arg_that_no_long_fits________  # pylint: disable=protected-access
+
+a_very_long_library_name = private_method_and__long_arg_  # pylint:  disable=protected-access
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # pylint:  disable=protected-access
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # pylint:  disable=protected-access
+a_very_long_library_name = private_method_and__long_arg_that_no_long_fits________  # pylint:  disable=protected-access
+
+a_very_long_library_name = private_method_and__long_arg_  # pytype:disable=attribute-error
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # pytype:disable=attribute-error
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # pytype:disable=attribute-error
+a_very_long_library_name = private_method_and__long_arg_that_no_long_fits________  # pytype:disable=attribute-error
+
+a_very_long_library_name = private_method_and__long_arg_  # pytype: disable=attribute-error
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # pytype: disable=attribute-error
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # pytype: disable=attribute-error
+a_very_long_library_name = private_method_and__long_arg_that_no_long_fits________  # pytype: disable=attribute-error
+
+a_very_long_library_name = private_method_and__long_arg_  # pytype:  disable=attribute-error
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # pytype:  disable=attribute-error
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # pytype:  disable=attribute-error
+a_very_long_library_name = private_method_and__long_arg_that_no_long_fits________  # pytype:  disable=attribute-error
+
+a_very_long_library_name = private_method_and__long_arg_  # noqa:E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # noqa:E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # noqa:E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method_and__long_arg_that_no_long_fits________  # noqa:E123, W234, ABC456, XYZ2
+
+a_very_long_library_name = private_method_and__long_arg_  # noqa: E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # noqa: E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # noqa: E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method_and__long_arg_that_no_long_fits________  # noqa: E123, W234, ABC456, XYZ2
+
+a_very_long_library_name = private_method_and__long_arg_  # noqa:  E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # noqa:  E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # noqa:  E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method_and__long_arg_that_no_long_fits________  # noqa:  E123, W234, ABC456, XYZ2
+
+a_very_long_library_name = private_method_and__long_arg_  # type:ignore[something]
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # type:ignore[something]
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # type:ignore[something]
+a_very_long_library_name = private_method_and__long_arg_that_no_long_fits________  # type:ignore[something]
+
+a_very_long_library_name = private_method_and__long_arg_  # type: ignore[something]
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # type: ignore[something]
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # type: ignore[something]
+a_very_long_library_name = private_method_and__long_arg_that_no_long_fits________  # type: ignore[something]
+
+a_very_long_library_name = private_method_and__long_arg_  # type:  ignore[something]
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # type:  ignore[something]
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # type:  ignore[something]
+a_very_long_library_name = private_method_and__long_arg_that_no_long_fits________  # type:  ignore[something]
+
+# output
+
+# Some test cases in this file comes from: https://github.com/google/pyink/blob/f93771c02e9a26ce9508c59d69c9337c95797eac/tests/data/pyink/pragma_comments.py
+a_very_long_library_name = private_method_and__long_arg_  # pylint:disable=protected-access
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # pylint:disable=protected-access
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # pylint:disable=protected-access
+a_very_long_library_name = (
+    private_method_and__long_arg_that_no_long_fits________  # pylint:disable=protected-access
+)
+
+a_very_long_library_name = private_method_and__long_arg_  # pylint: disable=protected-access
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # pylint: disable=protected-access
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # pylint: disable=protected-access
+a_very_long_library_name = (
+    private_method_and__long_arg_that_no_long_fits________  # pylint: disable=protected-access
+)
+
+a_very_long_library_name = private_method_and__long_arg_  # pylint:  disable=protected-access
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # pylint:  disable=protected-access
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # pylint:  disable=protected-access
+a_very_long_library_name = (
+    private_method_and__long_arg_that_no_long_fits________  # pylint:  disable=protected-access
+)
+
+a_very_long_library_name = private_method_and__long_arg_  # pytype:disable=attribute-error
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # pytype:disable=attribute-error
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # pytype:disable=attribute-error
+a_very_long_library_name = (
+    private_method_and__long_arg_that_no_long_fits________  # pytype:disable=attribute-error
+)
+
+a_very_long_library_name = private_method_and__long_arg_  # pytype: disable=attribute-error
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # pytype: disable=attribute-error
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # pytype: disable=attribute-error
+a_very_long_library_name = (
+    private_method_and__long_arg_that_no_long_fits________  # pytype: disable=attribute-error
+)
+
+a_very_long_library_name = private_method_and__long_arg_  # pytype:  disable=attribute-error
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # pytype:  disable=attribute-error
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # pytype:  disable=attribute-error
+a_very_long_library_name = (
+    private_method_and__long_arg_that_no_long_fits________  # pytype:  disable=attribute-error
+)
+
+a_very_long_library_name = private_method_and__long_arg_  # noqa:E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # noqa:E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # noqa:E123, W234, ABC456, XYZ2
+a_very_long_library_name = (
+    private_method_and__long_arg_that_no_long_fits________  # noqa:E123, W234, ABC456, XYZ2
+)
+
+a_very_long_library_name = private_method_and__long_arg_  # noqa: E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # noqa: E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # noqa: E123, W234, ABC456, XYZ2
+a_very_long_library_name = (
+    private_method_and__long_arg_that_no_long_fits________  # noqa: E123, W234, ABC456, XYZ2
+)
+
+a_very_long_library_name = private_method_and__long_arg_  # noqa:  E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # noqa:  E123, W234, ABC456, XYZ2
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # noqa:  E123, W234, ABC456, XYZ2
+a_very_long_library_name = (
+    private_method_and__long_arg_that_no_long_fits________  # noqa:  E123, W234, ABC456, XYZ2
+)
+
+a_very_long_library_name = private_method_and__long_arg_  # type:ignore[something]
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # type:ignore[something]
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # type:ignore[something]
+a_very_long_library_name = (
+    private_method_and__long_arg_that_no_long_fits________
+)  # type:ignore[something]
+
+a_very_long_library_name = private_method_and__long_arg_  # type: ignore[something]
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # type: ignore[something]
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # type: ignore[something]
+a_very_long_library_name = (
+    private_method_and__long_arg_that_no_long_fits________
+)  # type: ignore[something]
+
+a_very_long_library_name = private_method_and__long_arg_  # type:  ignore[something]
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit__  # type:  ignore[something]
+a_very_long_library_name = private_method_and__long_arg_that_just_fits_limit____  # type:  ignore[something]
+a_very_long_library_name = (
+    private_method_and__long_arg_that_no_long_fits________
+)  # type:  ignore[something]
diff --git a/tests/test_format.py b/tests/test_format.py
index 2e3c2f30404..853b9e42e7b 100644
--- a/tests/test_format.py
+++ b/tests/test_format.py
@@ -333,7 +333,9 @@ def test_nested_brackets(filename: str, collapse_nested_brackets: bool) -> None:
     "filename, wrap",
     [
         ("Cercis_default.py", False),
+        ("Cercis_default_2.py", False),
         ("Black_default.py", True),
+        ("Black_default_2.py", True),
     ],
 )
 def test_wrap_pragma_comments(filename: str, wrap: bool) -> None:

From 0b891ebf93e32cf6a362a4c64c5fb33146065fdf Mon Sep 17 00:00:00 2001
From: jsh9 <25124332+jsh9@users.noreply.github.com>
Date: Mon, 22 May 2023 23:44:15 -0700
Subject: [PATCH 2/8] Add option to not wrap all comments

---
 src/cercis/__init__.py                        | 16 ++++++++++++
 src/cercis/const.py                           |  1 +
 src/cercis/lines.py                           | 26 ++++++++++++-------
 src/cercis/mode.py                            |  2 ++
 .../line_with_comments/case_False_False.py    |  3 +++
 .../line_with_comments/case_False_True.py     |  3 +++
 .../line_with_comments/case_True_False.py     | 11 ++++++++
 .../line_with_comments/case_True_True.py      | 13 ++++++++++
 tests/test_format.py                          | 23 ++++++++++++++++
 9 files changed, 88 insertions(+), 10 deletions(-)
 create mode 100644 tests/data/configurable_cases/line_with_comments/case_False_False.py
 create mode 100644 tests/data/configurable_cases/line_with_comments/case_False_True.py
 create mode 100644 tests/data/configurable_cases/line_with_comments/case_True_False.py
 create mode 100644 tests/data/configurable_cases/line_with_comments/case_True_True.py

diff --git a/src/cercis/__init__.py b/src/cercis/__init__.py
index 23d060af70f..5d0cf1023c5 100644
--- a/src/cercis/__init__.py
+++ b/src/cercis/__init__.py
@@ -52,6 +52,7 @@
     DEFAULT_USE_TABS,
     DEFAULT_WRAP_LINE_WITH_LONG_STRING,
     DEFAULT_WRAP_PRAGMA_COMMENTS,
+    DEFAULT_WRAP_ALL_COMMENTS,
     STDIN_PLACEHOLDER,
 )
 from cercis.files import (
@@ -328,6 +329,19 @@ def validate_positive_integer(
         " into multiple levels in multiple lines"
     ),
 )
+@click.option(
+    "-wrc",
+    "--wrap-all-comments",
+    type=bool,
+    show_default=True,
+    default=DEFAULT_WRAP_ALL_COMMENTS,
+    help=(
+        "If False, do not wrap long lines if the line exceeds length limit"
+        " only because of trailing comments. Black's"
+        " default behavior is 'True'. Note that this option is a superset"
+        " of --wrap-pragma-comments."
+    ),
+)
 @click.option(
     "-wpc",
     "--wrap-pragma-comments",
@@ -562,6 +576,7 @@ def main(  # noqa: C901
         single_quote: bool,
         wrap_line_with_long_string: bool,
         collapse_nested_brackets: bool,
+        wrap_all_comments: bool,
         wrap_pragma_comments: bool,
         base_indentation_spaces: int,
         other_line_continuation_extra_indent: bool,
@@ -693,6 +708,7 @@ def main(  # noqa: C901
         single_quote=single_quote,
         wrap_line_with_long_string=wrap_line_with_long_string,
         collapse_nested_brackets=collapse_nested_brackets,
+        wrap_all_comments=wrap_all_comments,
         wrap_pragma_comments=wrap_pragma_comments,
         base_indentation_spaces=base_indentation_spaces,
         other_line_continuation_extra_indent=other_line_continuation_extra_indent,
diff --git a/src/cercis/const.py b/src/cercis/const.py
index 978c3fdacdc..f027e915412 100644
--- a/src/cercis/const.py
+++ b/src/cercis/const.py
@@ -7,6 +7,7 @@
 DEFAULT_SINGLE_QUOTE = True
 DEFAULT_WRAP_LINE_WITH_LONG_STRING = False
 DEFAULT_COLLAPSE_NESTED_BRACKETS = True
+DEFAULT_WRAP_ALL_COMMENTS = False
 DEFAULT_WRAP_PRAGMA_COMMENTS = False
 DEFAULT_BASE_INDENTATION_SPACES = 4
 DEFAULT_OTHER_LINE_CONTINUATION_EXTRA_INDENT = False
diff --git a/src/cercis/lines.py b/src/cercis/lines.py
index 034936cbdfd..5b537d473ff 100644
--- a/src/cercis/lines.py
+++ b/src/cercis/lines.py
@@ -329,7 +329,7 @@ def contains_unsplittable_type_ignore(self) -> bool:
 
         return False
 
-    def trailing_pragma_comment_length(self) -> int:
+    def calc_comment_length(self) -> int:
         """
         This method is adapted from the wonderful implementation in Pyink:
         https://github.com/google/pyink/blob/f93771c02e9a26ce9508c59d69c9337c95797eac/src/pyink/lines.py#L316-L328
@@ -346,22 +346,28 @@ def trailing_pragma_comment_length(self) -> int:
             # In many cases, the ID of the last leaf is the same as one of
             # the comments.
             for comment in self.comments.get(id(last_leaf), []):
-                length += self._calc_comment_length(comment)
+                length += self._calc_comment_length_inner(comment)
         elif len(self.leaves) >= 2 and id(self.leaves[-2]) in self.comments:
             # In other cases (such as `some_var = some_value  # some comment`),
             # it's the 2nd to the last leaf that has the same ID as one
             # of the comments.
             for comment in self.comments.get(id(self.leaves[-2]), []):
-                length += self._calc_comment_length(comment)
+                length += self._calc_comment_length_inner(comment)
 
         return length
 
-    @classmethod
-    def _calc_comment_length(cls, comment: Leaf) -> int:
+    def _calc_comment_length_inner(self, comment: Leaf) -> int:
         comment_str = str(comment)  # contains the whitespace preceding the `#`
-        parts = _PRAGMA_REGEX.split(comment_str, maxsplit=1)
-        if len(parts) == 3:
-            return len(parts[1]) + len(parts[2])
+
+        # We need to put this `if` before the other, because `--wrap-comments`
+        # has higher priority than `--wrap-pragma-comments`
+        if not self.mode.wrap_all_comments:
+            return len(comment_str)
+
+        if not self.mode.wrap_pragma_comments:
+            parts = _PRAGMA_REGEX.split(comment_str, maxsplit=1)
+            if len(parts) == 3:
+                return len(parts[1]) + len(parts[2])
 
         return 0
 
@@ -846,10 +852,10 @@ def is_line_short_enough(  # noqa: C901
         line_str = line.render_as_str_for_width_calculation().strip("\n")
 
     width = str_width if mode.preview else len
-    if mode.wrap_pragma_comments:  # Black's default
+    if mode.wrap_pragma_comments and mode.wrap_all_comments:  # Black's default
         effective_length = width(line_str)
     else:  # Cercis's default
-        effective_length = width(line_str) - line.trailing_pragma_comment_length()
+        effective_length = width(line_str) - line.calc_comment_length()
 
     if Preview.multiline_string_handling not in mode:
         return (
diff --git a/src/cercis/mode.py b/src/cercis/mode.py
index 913c2dc9d07..3de301f3e5d 100644
--- a/src/cercis/mode.py
+++ b/src/cercis/mode.py
@@ -29,6 +29,7 @@
     DEFAULT_USE_TABS,
     DEFAULT_WRAP_LINE_WITH_LONG_STRING,
     DEFAULT_WRAP_PRAGMA_COMMENTS,
+    DEFAULT_WRAP_ALL_COMMENTS,
 )
 
 
@@ -203,6 +204,7 @@ class Mode:
     wrap_line_with_long_string: bool = DEFAULT_WRAP_LINE_WITH_LONG_STRING
     collapse_nested_brackets: bool = DEFAULT_COLLAPSE_NESTED_BRACKETS
     wrap_pragma_comments: bool = DEFAULT_WRAP_PRAGMA_COMMENTS
+    wrap_all_comments: bool = DEFAULT_WRAP_ALL_COMMENTS
     base_indentation_spaces: int = DEFAULT_BASE_INDENTATION_SPACES
     other_line_continuation_extra_indent: bool = (
         DEFAULT_OTHER_LINE_CONTINUATION_EXTRA_INDENT
diff --git a/tests/data/configurable_cases/line_with_comments/case_False_False.py b/tests/data/configurable_cases/line_with_comments/case_False_False.py
new file mode 100644
index 00000000000..100d6b66fc7
--- /dev/null
+++ b/tests/data/configurable_cases/line_with_comments/case_False_False.py
@@ -0,0 +1,3 @@
+this_is_a_long_variable = test_func_with_name(arg1, arg2)  # some comments  # noqa: E501
+
+this_is_a_long_variable = test_func_with_long_name(arg1, arg2, arg3)  # some comments  # noqa: E501
diff --git a/tests/data/configurable_cases/line_with_comments/case_False_True.py b/tests/data/configurable_cases/line_with_comments/case_False_True.py
new file mode 100644
index 00000000000..100d6b66fc7
--- /dev/null
+++ b/tests/data/configurable_cases/line_with_comments/case_False_True.py
@@ -0,0 +1,3 @@
+this_is_a_long_variable = test_func_with_name(arg1, arg2)  # some comments  # noqa: E501
+
+this_is_a_long_variable = test_func_with_long_name(arg1, arg2, arg3)  # some comments  # noqa: E501
diff --git a/tests/data/configurable_cases/line_with_comments/case_True_False.py b/tests/data/configurable_cases/line_with_comments/case_True_False.py
new file mode 100644
index 00000000000..b4f6e7adbac
--- /dev/null
+++ b/tests/data/configurable_cases/line_with_comments/case_True_False.py
@@ -0,0 +1,11 @@
+this_is_a_long_variable = test_func_with_name(arg1, arg2)  # some comments  # noqa: E501
+
+this_is_a_long_variable = test_func_with_long_name(arg1, arg2, arg3)  # some comments  # noqa: E501
+
+# output
+
+this_is_a_long_variable = test_func_with_name(arg1, arg2)  # some comments  # noqa: E501
+
+this_is_a_long_variable = test_func_with_long_name(
+    arg1, arg2, arg3
+)  # some comments  # noqa: E501
diff --git a/tests/data/configurable_cases/line_with_comments/case_True_True.py b/tests/data/configurable_cases/line_with_comments/case_True_True.py
new file mode 100644
index 00000000000..51df2ec5c3f
--- /dev/null
+++ b/tests/data/configurable_cases/line_with_comments/case_True_True.py
@@ -0,0 +1,13 @@
+this_is_a_long_variable = test_func_with_name(arg1, arg2)  # some comments  # noqa: E501
+
+this_is_a_long_variable = test_func_with_long_name(arg1, arg2, arg3)  # some comments  # noqa: E501
+
+# output
+
+this_is_a_long_variable = test_func_with_name(
+    arg1, arg2
+)  # some comments  # noqa: E501
+
+this_is_a_long_variable = test_func_with_long_name(
+    arg1, arg2, arg3
+)  # some comments  # noqa: E501
diff --git a/tests/test_format.py b/tests/test_format.py
index 853b9e42e7b..626be861cb4 100644
--- a/tests/test_format.py
+++ b/tests/test_format.py
@@ -343,6 +343,29 @@ def test_wrap_pragma_comments(filename: str, wrap: bool) -> None:
     check_file("configurable_cases/pragma_comments", filename, mode)
 
 
+@pytest.mark.parametrize(
+    "filename, wrap_all_comments, wrap_pragma_comments",
+    [
+        ("case_False_False.py", False, False),
+        ("case_True_False.py", True, False),
+        ("case_True_True.py", True, True),
+        ("case_False_True.py", False, True),
+    ],
+)
+def test_wrap_comments(
+        filename: str,
+        wrap_all_comments: bool,
+        wrap_pragma_comments: bool,
+) -> None:
+    mode = replace(
+        DEFAULT_MODE,
+        wrap_all_comments=wrap_all_comments,
+        wrap_pragma_comments=wrap_pragma_comments,
+        line_length=80,
+    )
+    check_file("configurable_cases/line_with_comments", filename, mode)
+
+
 @pytest.mark.parametrize(
     "closing_bracket_extra_indent, base_indent_spaces, fdei, olcei",
     list(

From cc44349088ae7521737112de19183824ae57e4a7 Mon Sep 17 00:00:00 2001
From: jsh9 <25124332+jsh9@users.noreply.github.com>
Date: Mon, 22 May 2023 23:46:34 -0700
Subject: [PATCH 3/8] Fix unit tests

---
 tests/test_format.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/tests/test_format.py b/tests/test_format.py
index 626be861cb4..88f1be67f80 100644
--- a/tests/test_format.py
+++ b/tests/test_format.py
@@ -49,6 +49,7 @@ def test_simple_format(filename: str) -> None:
         wrap_line_with_long_string=True,
         collapse_nested_brackets=False,
         single_quote=single_quote,
+        wrap_all_comments=True,
         wrap_pragma_comments=True,
         line_length=88,
     )
@@ -61,6 +62,7 @@ def test_preview_format(filename: str) -> None:
         preview=True,
         wrap_line_with_long_string=True,
         collapse_nested_brackets=False,
+        wrap_all_comments=True,
         wrap_pragma_comments=True,
         line_length=88,
     )
@@ -290,6 +292,7 @@ def test_single_quote(filename: str) -> None:
         single_quote=True,
         wrap_line_with_long_string=True,
         collapse_nested_brackets=False,
+        wrap_all_comments=True,
         wrap_pragma_comments=True,
         line_length=88,
     )
@@ -308,7 +311,11 @@ def test_single_quote(filename: str) -> None:
     ],
 )
 def test_opt_out_of_wrapping(filename: str, wrap_line: bool) -> None:
-    mode = replace(DEFAULT_MODE, wrap_line_with_long_string=wrap_line)
+    mode = replace(
+        DEFAULT_MODE,
+        wrap_line_with_long_string=wrap_line,
+        wrap_all_comments=True,
+    )
     _override_single_quote_for_cleaner_future_rebase(mode)
     _use_line_length_of_88_for_cleaner_future_rebase(mode)
     check_file("configurable_cases/line_with_long_string", filename, mode)
@@ -339,7 +346,12 @@ def test_nested_brackets(filename: str, collapse_nested_brackets: bool) -> None:
     ],
 )
 def test_wrap_pragma_comments(filename: str, wrap: bool) -> None:
-    mode = replace(DEFAULT_MODE, wrap_pragma_comments=wrap, line_length=80)
+    mode = replace(
+        DEFAULT_MODE,
+        wrap_all_comments=True,
+        wrap_pragma_comments=wrap,
+        line_length=80,
+    )
     check_file("configurable_cases/pragma_comments", filename, mode)
 
 

From 12d41d3cab20f1f1a7a240ce86aaaa3c5e435833 Mon Sep 17 00:00:00 2001
From: jsh9 <25124332+jsh9@users.noreply.github.com>
Date: Mon, 22 May 2023 23:51:15 -0700
Subject: [PATCH 4/8] Rename option

---
 src/cercis/__init__.py | 16 ++++++++--------
 src/cercis/const.py    |  2 +-
 src/cercis/lines.py    |  4 ++--
 src/cercis/mode.py     |  4 ++--
 tests/test_format.py   | 16 ++++++++--------
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/cercis/__init__.py b/src/cercis/__init__.py
index 5d0cf1023c5..ef5fb40de3e 100644
--- a/src/cercis/__init__.py
+++ b/src/cercis/__init__.py
@@ -52,7 +52,7 @@
     DEFAULT_USE_TABS,
     DEFAULT_WRAP_LINE_WITH_LONG_STRING,
     DEFAULT_WRAP_PRAGMA_COMMENTS,
-    DEFAULT_WRAP_ALL_COMMENTS,
+    DEFAULT_WRAP_COMMENTS,
     STDIN_PLACEHOLDER,
 )
 from cercis.files import (
@@ -330,16 +330,16 @@ def validate_positive_integer(
     ),
 )
 @click.option(
-    "-wrc",
-    "--wrap-all-comments",
+    "-wc",
+    "--wrap-comments",
     type=bool,
     show_default=True,
-    default=DEFAULT_WRAP_ALL_COMMENTS,
+    default=DEFAULT_WRAP_COMMENTS,
     help=(
         "If False, do not wrap long lines if the line exceeds length limit"
         " only because of trailing comments. Black's"
-        " default behavior is 'True'. Note that this option is a superset"
-        " of --wrap-pragma-comments."
+        " default behavior is 'True'. Note that 'comments' are a superset"
+        " of 'pragma comments', which is controled in --wrap-pragma-comments."
     ),
 )
 @click.option(
@@ -576,7 +576,7 @@ def main(  # noqa: C901
         single_quote: bool,
         wrap_line_with_long_string: bool,
         collapse_nested_brackets: bool,
-        wrap_all_comments: bool,
+        wrap_comments: bool,
         wrap_pragma_comments: bool,
         base_indentation_spaces: int,
         other_line_continuation_extra_indent: bool,
@@ -708,7 +708,7 @@ def main(  # noqa: C901
         single_quote=single_quote,
         wrap_line_with_long_string=wrap_line_with_long_string,
         collapse_nested_brackets=collapse_nested_brackets,
-        wrap_all_comments=wrap_all_comments,
+        wrap_comments=wrap_comments,
         wrap_pragma_comments=wrap_pragma_comments,
         base_indentation_spaces=base_indentation_spaces,
         other_line_continuation_extra_indent=other_line_continuation_extra_indent,
diff --git a/src/cercis/const.py b/src/cercis/const.py
index f027e915412..579a0a6b74d 100644
--- a/src/cercis/const.py
+++ b/src/cercis/const.py
@@ -7,7 +7,7 @@
 DEFAULT_SINGLE_QUOTE = True
 DEFAULT_WRAP_LINE_WITH_LONG_STRING = False
 DEFAULT_COLLAPSE_NESTED_BRACKETS = True
-DEFAULT_WRAP_ALL_COMMENTS = False
+DEFAULT_WRAP_COMMENTS = False
 DEFAULT_WRAP_PRAGMA_COMMENTS = False
 DEFAULT_BASE_INDENTATION_SPACES = 4
 DEFAULT_OTHER_LINE_CONTINUATION_EXTRA_INDENT = False
diff --git a/src/cercis/lines.py b/src/cercis/lines.py
index 5b537d473ff..7372c9834e5 100644
--- a/src/cercis/lines.py
+++ b/src/cercis/lines.py
@@ -361,7 +361,7 @@ def _calc_comment_length_inner(self, comment: Leaf) -> int:
 
         # We need to put this `if` before the other, because `--wrap-comments`
         # has higher priority than `--wrap-pragma-comments`
-        if not self.mode.wrap_all_comments:
+        if not self.mode.wrap_comments:
             return len(comment_str)
 
         if not self.mode.wrap_pragma_comments:
@@ -852,7 +852,7 @@ def is_line_short_enough(  # noqa: C901
         line_str = line.render_as_str_for_width_calculation().strip("\n")
 
     width = str_width if mode.preview else len
-    if mode.wrap_pragma_comments and mode.wrap_all_comments:  # Black's default
+    if mode.wrap_pragma_comments and mode.wrap_comments:  # Black's default
         effective_length = width(line_str)
     else:  # Cercis's default
         effective_length = width(line_str) - line.calc_comment_length()
diff --git a/src/cercis/mode.py b/src/cercis/mode.py
index 3de301f3e5d..866622a887c 100644
--- a/src/cercis/mode.py
+++ b/src/cercis/mode.py
@@ -29,7 +29,7 @@
     DEFAULT_USE_TABS,
     DEFAULT_WRAP_LINE_WITH_LONG_STRING,
     DEFAULT_WRAP_PRAGMA_COMMENTS,
-    DEFAULT_WRAP_ALL_COMMENTS,
+    DEFAULT_WRAP_COMMENTS,
 )
 
 
@@ -204,7 +204,7 @@ class Mode:
     wrap_line_with_long_string: bool = DEFAULT_WRAP_LINE_WITH_LONG_STRING
     collapse_nested_brackets: bool = DEFAULT_COLLAPSE_NESTED_BRACKETS
     wrap_pragma_comments: bool = DEFAULT_WRAP_PRAGMA_COMMENTS
-    wrap_all_comments: bool = DEFAULT_WRAP_ALL_COMMENTS
+    wrap_comments: bool = DEFAULT_WRAP_COMMENTS
     base_indentation_spaces: int = DEFAULT_BASE_INDENTATION_SPACES
     other_line_continuation_extra_indent: bool = (
         DEFAULT_OTHER_LINE_CONTINUATION_EXTRA_INDENT
diff --git a/tests/test_format.py b/tests/test_format.py
index 88f1be67f80..29eadedfdc3 100644
--- a/tests/test_format.py
+++ b/tests/test_format.py
@@ -49,7 +49,7 @@ def test_simple_format(filename: str) -> None:
         wrap_line_with_long_string=True,
         collapse_nested_brackets=False,
         single_quote=single_quote,
-        wrap_all_comments=True,
+        wrap_comments=True,
         wrap_pragma_comments=True,
         line_length=88,
     )
@@ -62,7 +62,7 @@ def test_preview_format(filename: str) -> None:
         preview=True,
         wrap_line_with_long_string=True,
         collapse_nested_brackets=False,
-        wrap_all_comments=True,
+        wrap_comments=True,
         wrap_pragma_comments=True,
         line_length=88,
     )
@@ -292,7 +292,7 @@ def test_single_quote(filename: str) -> None:
         single_quote=True,
         wrap_line_with_long_string=True,
         collapse_nested_brackets=False,
-        wrap_all_comments=True,
+        wrap_comments=True,
         wrap_pragma_comments=True,
         line_length=88,
     )
@@ -314,7 +314,7 @@ def test_opt_out_of_wrapping(filename: str, wrap_line: bool) -> None:
     mode = replace(
         DEFAULT_MODE,
         wrap_line_with_long_string=wrap_line,
-        wrap_all_comments=True,
+        wrap_comments=True,
     )
     _override_single_quote_for_cleaner_future_rebase(mode)
     _use_line_length_of_88_for_cleaner_future_rebase(mode)
@@ -348,7 +348,7 @@ def test_nested_brackets(filename: str, collapse_nested_brackets: bool) -> None:
 def test_wrap_pragma_comments(filename: str, wrap: bool) -> None:
     mode = replace(
         DEFAULT_MODE,
-        wrap_all_comments=True,
+        wrap_comments=True,
         wrap_pragma_comments=wrap,
         line_length=80,
     )
@@ -356,7 +356,7 @@ def test_wrap_pragma_comments(filename: str, wrap: bool) -> None:
 
 
 @pytest.mark.parametrize(
-    "filename, wrap_all_comments, wrap_pragma_comments",
+    "filename, wrap_comments, wrap_pragma_comments",
     [
         ("case_False_False.py", False, False),
         ("case_True_False.py", True, False),
@@ -366,12 +366,12 @@ def test_wrap_pragma_comments(filename: str, wrap: bool) -> None:
 )
 def test_wrap_comments(
         filename: str,
-        wrap_all_comments: bool,
+        wrap_comments: bool,
         wrap_pragma_comments: bool,
 ) -> None:
     mode = replace(
         DEFAULT_MODE,
-        wrap_all_comments=wrap_all_comments,
+        wrap_comments=wrap_comments,
         wrap_pragma_comments=wrap_pragma_comments,
         line_length=80,
     )

From 34a8a61af41080ab3d2931a47ec0cd845416e039 Mon Sep 17 00:00:00 2001
From: jsh9 <25124332+jsh9@users.noreply.github.com>
Date: Mon, 22 May 2023 23:52:59 -0700
Subject: [PATCH 5/8] Auto-format

---
 .prettierrc.yaml       |   2 +-
 CHANGELOG.md           |  22 +++----
 README.md              | 141 +++++++++++++++++++----------------------
 gallery/README.md      |   5 +-
 src/cercis/__init__.py |   2 +-
 src/cercis/mode.py     |   2 +-
 6 files changed, 79 insertions(+), 95 deletions(-)

diff --git a/.prettierrc.yaml b/.prettierrc.yaml
index 896f41c71ab..beda5ba4da8 100644
--- a/.prettierrc.yaml
+++ b/.prettierrc.yaml
@@ -1,3 +1,3 @@
 proseWrap: always
-printWidth: 79
+printWidth: 88
 endOfLine: auto
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00d42d7c948..11f8d25bb95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,10 +3,10 @@
 ## [0.1.5] - 2023-05-09
 
 - Added
-  - Configurability to use tabs instead of spaces (two new options:
-    `--use-tabs` and `--tab-width`)
-  - Configurability on base indentation spaces and extra indentation at
-    different line continuation situations
+  - Configurability to use tabs instead of spaces (two new options: `--use-tabs` and
+    `--tab-width`)
+  - Configurability on base indentation spaces and extra indentation at different line
+    continuation situations
 
 ## [0.1.4] - 2023-05-07
 
@@ -32,8 +32,7 @@
 ## [0.1.2] - 2023-05-04
 
 - Added
-  - Merged 2 changes from psf/black:main
-    ([#5](https://github.com/jsh9/cercis/pull/5))
+  - Merged 2 changes from psf/black:main ([#5](https://github.com/jsh9/cercis/pull/5))
   - Added option to not wrap "simple" lines with long strings
     ([#6](https://github.com/jsh9/cercis/pull/6))
 - Full changelog
@@ -42,8 +41,7 @@
 ## [0.1.1] - 2023-05-03
 
 - Added
-  - A configurable option: `single-quote`, for formatting code into single
-    quotes
+  - A configurable option: `single-quote`, for formatting code into single quotes
 - Full changelog
   - https://github.com/jsh9/cercis/compare/0.1.0...0.1.1
 
@@ -52,10 +50,10 @@
 - This is the initial version that branches away from Black (commit:
   [e712e4](https://github.com/psf/black/commit/e712e48e06420d9240ce95c81acfcf6f11d14c83))
 - Changed
-  - The default indentation within a function definition (when line wrap
-    happens) is now 8 spaces. (Black's default is 4, which is
+  - The default indentation within a function definition (when line wrap happens) is now
+    8 spaces. (Black's default is 4, which is
     [not PEP8-compatible](https://github.com/psf/black/issues/1127))
   - Updated README, because `cercis` now branches away from Black
 - Added
-  - A configurable option (`function-definition-extra-indent`) is added instead
-    of enforcing 8 spaces for everyone
+  - A configurable option (`function-definition-extra-indent`) is added instead of
+    enforcing 8 spaces for everyone
diff --git a/README.md b/README.md
index 75320077b0a..95d2541a80d 100644
--- a/README.md
+++ b/README.md
@@ -2,39 +2,35 @@
 
 [![](https://upload.wikimedia.org/wikipedia/commons/thumb/4/4c/Red_bud_2009.jpg/320px-Red_bud_2009.jpg)](https://en.wikipedia.org/wiki/Cercis)
 
-_**Cercis**_ /ˈsɜːrsɪs/ is a Python code formatter that is more configurable
-than [Black](https://github.com/psf/black) (a popular Python code formatter).
+_**Cercis**_ /ˈsɜːrsɪs/ is a Python code formatter that is more configurable than
+[Black](https://github.com/psf/black) (a popular Python code formatter).
 
-[_Cercis_](https://en.wikipedia.org/wiki/Cercis) is also the name of a
-deciduous tree that boasts vibrant pink to purple-hued flowers, which bloom in
-early spring.
+[_Cercis_](https://en.wikipedia.org/wiki/Cercis) is also the name of a deciduous tree
+that boasts vibrant pink to purple-hued flowers, which bloom in early spring.
 
 This code repository is forked from and directly inspired by
-[Black](https://github.com/psf/black). The original license of Black is
-included in this repository (see [LICENSE_ORIGINAL](./LICENSE_ORIGINAL)).
+[Black](https://github.com/psf/black). The original license of Black is included in this
+repository (see [LICENSE_ORIGINAL](./LICENSE_ORIGINAL)).
 
-_Cercis_ inherited Black's very comprehensive test cases, which means we are
-confident that our configurability addition does not introduce any undesirable
-side effects. We also thoroughly tested every configurable options that we
-added.
+_Cercis_ inherited Black's very comprehensive test cases, which means we are confident
+that our configurability addition does not introduce any undesirable side effects. We
+also thoroughly tested every configurable options that we added.
 
-In particular, via its configurable options, _Cercis_ can completely fall back
-to Black. See [Section 4.5](#45-how-to-fall-back-to-blacks-behavior) below for
-more details.
+In particular, via its configurable options, _Cercis_ can completely fall back to Black.
+See [Section 4.5](#45-how-to-fall-back-to-blacks-behavior) below for more details.
 
 ## 1. Motivations
 
-While we like the idea of auto-formatting and code readability, we take issue
-with some style choices and the lack of configurability of the Black formatter.
-Therefore, _Cercis_ aims at providing some configurability beyond Black's
-limited offering.
+While we like the idea of auto-formatting and code readability, we take issue with some
+style choices and the lack of configurability of the Black formatter. Therefore,
+_Cercis_ aims at providing some configurability beyond Black's limited offering.
 
 ## 2. Installation and usage
 
 ### 2.1. Installation
 
-_Cercis_ can be installed by running `pip install cercis`. It requires Python
-3.7+ to run. If you want to format Jupyter Notebooks, install with
+_Cercis_ can be installed by running `pip install cercis`. It requires Python 3.7+ to
+run. If you want to format Jupyter Notebooks, install with
 `pip install "cercis[jupyter]"`.
 
 ### 2.2. Usage
@@ -57,9 +53,8 @@ The commands above reformat entire file(s) in place.
 
 #### 2.2.2. As pre-commit hook
 
-To format Python files (.py), put the following into your
-`.pre-commit-config.yaml` file. Remember to replace `<VERSION>` with your
-version of this tool (such as `v0.1.0`):
+To format Python files (.py), put the following into your `.pre-commit-config.yaml`
+file. Remember to replace `<VERSION>` with your version of this tool (such as `v0.1.0`):
 
 ```yaml
 - repo: https://github.com/jsh9/cercis
@@ -80,9 +75,8 @@ To format Jupyter notebooks (.ipynb), put the following into your
       args: [--line-length=88]
 ```
 
-See [pre-commit](https://github.com/pre-commit/pre-commit) for more
-instructions. In particular,
-[here](https://pre-commit.com/#passing-arguments-to-hooks) is how to specify
+See [pre-commit](https://github.com/pre-commit/pre-commit) for more instructions. In
+particular, [here](https://pre-commit.com/#passing-arguments-to-hooks) is how to specify
 arguments in pre-commit config.
 
 ## 3. _Cercis_'s code style
@@ -90,8 +84,8 @@ arguments in pre-commit config.
 _Cercis_'s code style is largely consistent with the
 [style of of Black](https://black.readthedocs.io/en/stable/the_black_code_style/current_style.html).
 
-The main difference is that _Cercis_ provides several configurable options that
-Black doesn't. Configurability is our main motivation behind creating _Cercis_.
+The main difference is that _Cercis_ provides several configurable options that Black
+doesn't. Configurability is our main motivation behind creating _Cercis_.
 
 _Cercis_ offers the following configurable options:
 
@@ -107,13 +101,12 @@ _Cercis_ offers the following configurable options:
 7. [Collapse nested brackets](#37-collapse-nested-brackets)
 8. [Wrap pragma comments](#38-wrapping-long-lines-ending-with-pragma-comments)
 
-The next section ([How to configure _Cercis_](#4-how-to-configure-cercis))
-contains detailed instructions of how to configure these options.
+The next section ([How to configure _Cercis_](#4-how-to-configure-cercis)) contains
+detailed instructions of how to configure these options.
 
 ### 3.1. Line length
 
-_Cercis_ uses 79 characters as the line length limit, instead of 88 (Black's
-default).
+_Cercis_ uses 79 characters as the line length limit, instead of 88 (Black's default).
 
 You can override this default if necessary.
 
@@ -129,8 +122,8 @@ You can override this default if necessary.
 
 ### 3.2. Single quote vs double quote
 
-_Cercis_ uses single quotes (`'`) as the default for strings, instead of double
-quotes (`"`) which is Black's default.
+_Cercis_ uses single quotes (`'`) as the default for strings, instead of double quotes
+(`"`) which is Black's default.
 
 You can override this default if necessary.
 
@@ -162,9 +155,9 @@ There are two associated options:
 | `pyproject.toml` usage | `use-tabs = false` under `[tool.cercis]` |
 | `pre-commit` usage     | `args: [--use-tabs=False]`               |
 
-- `--tab-width` (int): when calculating line length (to determine whether to
-  wrap lines), how wide shall _Cercis_ treat each tab. Only effective when
-  `--use-tabs` is set to `True`.
+- `--tab-width` (int): when calculating line length (to determine whether to wrap
+  lines), how wide shall _Cercis_ treat each tab. Only effective when `--use-tabs` is
+  set to `True`.
 
 | Option                 |                                       |
 | ---------------------- | ------------------------------------- |
@@ -178,11 +171,10 @@ There are two associated options:
 
 ### 3.4. Base indentation spaces
 
-This option defines the number of spaces that each indentation level adds. This
-option has no effect when `--use-tabs` is set to `True`.
+This option defines the number of spaces that each indentation level adds. This option
+has no effect when `--use-tabs` is set to `True`.
 
-For example, if you set it to 2, contents within a `for` block is indented 2
-spaces:
+For example, if you set it to 2, contents within a `for` block is indented 2 spaces:
 
 ```python
 for i in (1, 2, 3, 4, 5):
@@ -207,9 +199,8 @@ There are three associated options:
 - `--other-line-continuation-extra-indent`
 - `--closing-bracket-extra-indent`
 
-They control whether we add an **additional** indentation level in some
-situations. Note that these options can work well with tabs
-(`--use-tabs=True`).
+They control whether we add an **additional** indentation level in some situations. Note
+that these options can work well with tabs (`--use-tabs=True`).
 
 #### 3.5.1. At function definition (`--function-definition-extra-indent`)
 
@@ -248,16 +239,15 @@ def some_function(
   </tr>
 </table>
 
-We choose to add an extra indentation level when wrapping a function signature
-line. This is because `def␣` happens to be 4 characters, so when the base
-indentation is 4 spaces, it can be difficult to visually distinguish the
-function name and the argument list if we don't add an extra indentation.
+We choose to add an extra indentation level when wrapping a function signature line.
+This is because `def␣` happens to be 4 characters, so when the base indentation is 4
+spaces, it can be difficult to visually distinguish the function name and the argument
+list if we don't add an extra indentation.
 
-If you set `--base-indentation-spaces` to other values than 4, this visual
-separation issue will disappear, and you may not need to turn this option on.
+If you set `--base-indentation-spaces` to other values than 4, this visual separation
+issue will disappear, and you may not need to turn this option on.
 
-This style is encouraged
-[in PEP8](https://peps.python.org/pep-0008/#indentation).
+This style is encouraged [in PEP8](https://peps.python.org/pep-0008/#indentation).
 
 | Option                 |                                                                 |
 | ---------------------- | --------------------------------------------------------------- |
@@ -271,8 +261,7 @@ This style is encouraged
 
 #### 3.5.2. In other line continuations (`--other-line-continuation-extra-indent`)
 
-"Other line continuations" are cases other than in function definitions, such
-as:
+"Other line continuations" are cases other than in function definitions, such as:
 
 ```python
 var = some_function(
@@ -287,8 +276,8 @@ var2 = [
 ]
 ```
 
-So if you set this option (`--other-line-continuation-extra-indent`) to `True`,
-you can add an extra level of indentation in these cases:
+So if you set this option (`--other-line-continuation-extra-indent`) to `True`, you can
+add an extra level of indentation in these cases:
 
 ```python
 var = some_function(
@@ -315,9 +304,8 @@ var2 = [
 
 #### 3.5.3. At closing brackets (`--closing-bracket-extra-indent`)
 
-This option lets people customize where the closing bracket should be. Note
-that both styles are OK according to
-[PEP8](https://peps.python.org/pep-0008/#indentation).
+This option lets people customize where the closing bracket should be. Note that both
+styles are OK according to [PEP8](https://peps.python.org/pep-0008/#indentation).
 
 <table>
   <tr>
@@ -394,9 +382,8 @@ something = {
 
 ### 3.6. "Simple" lines with long strings
 
-By default, Black wraps lines that exceed length limit. But for very simple
-lines (such as assigning a long string to a variable), line wrapping is not
-necessary.
+By default, Black wraps lines that exceed length limit. But for very simple lines (such
+as assigning a long string to a variable), line wrapping is not necessary.
 
 <table>
   <tr>
@@ -537,9 +524,9 @@ The code implementation of this option comes from
 
 ### 3.8. Wrapping long lines ending with pragma comments
 
-"Pragma comments", in this context, mean the directives for Python linters
-usually to tell them to ignore certain errors. Pragma comments that _Cercis_
-currently recognizes include:
+"Pragma comments", in this context, mean the directives for Python linters usually to
+tell them to ignore certain errors. Pragma comments that _Cercis_ currently recognizes
+include:
 
 - _noqa_: `# noqa: E501`
 - _type: ignore_: `# type: ignore[no-untyped-def]`
@@ -620,10 +607,10 @@ var_ = some_func(
 Here are some examples:
 
 - `cercis --single-quote=True myScript.py` to format files to single quotes
-- `cercis --function-definition-extra-indent=False myScript.py` to format files
-  without extra indentation at function definition
-- `cercis --line-length=79 myScript.py` to format files with a line length of
-  79 characters
+- `cercis --function-definition-extra-indent=False myScript.py` to format files without
+  extra indentation at function definition
+- `cercis --line-length=79 myScript.py` to format files with a line length of 79
+  characters
 
 ### 4.2. In your project's `pyproject.toml` file
 
@@ -638,8 +625,8 @@ single-quote = false
 
 ### 4.3. In your project's `.pre-commit-config.yaml` file
 
-You can specify the options under the `args` section of your
-`.pre-commit-config.yaml` file.
+You can specify the options under the `args` section of your `.pre-commit-config.yaml`
+file.
 
 For example:
 
@@ -657,18 +644,18 @@ repos:
         args: [--function-definition-extra-indent=False, --line-length=79]
 ```
 
-The value in `rev` can be any _Cercis_ release, or it can be `main`, which
-means to always use the latest (including unreleased) _Cercis_ features.
+The value in `rev` can be any _Cercis_ release, or it can be `main`, which means to
+always use the latest (including unreleased) _Cercis_ features.
 
 ### 4.4. Specify options in `tox.ini`
 
-Currently, _Cercis_ does not support a config section in `tox.ini`. Instead,
-you can specify the options in `pyproject.toml`.
+Currently, _Cercis_ does not support a config section in `tox.ini`. Instead, you can
+specify the options in `pyproject.toml`.
 
 ### 4.5. How to fall back to Black's behavior
 
-Here are the configuration options to fall back to Black's behavior. Put them
-in `pyproject.toml`:
+Here are the configuration options to fall back to Black's behavior. Put them in
+`pyproject.toml`:
 
 ```toml
 [tool.cercis]
diff --git a/gallery/README.md b/gallery/README.md
index 7464f4c0157..ea48e81a843 100644
--- a/gallery/README.md
+++ b/gallery/README.md
@@ -1,8 +1,7 @@
 # Gallery
 
-Gallery is a script that automates the process of applying different _Black_
-versions to a selected PyPI package and seeing the results between _Black_
-versions.
+Gallery is a script that automates the process of applying different _Black_ versions to
+a selected PyPI package and seeing the results between _Black_ versions.
 
 ## Build
 
diff --git a/src/cercis/__init__.py b/src/cercis/__init__.py
index ef5fb40de3e..7153a0cf5f2 100644
--- a/src/cercis/__init__.py
+++ b/src/cercis/__init__.py
@@ -50,9 +50,9 @@
     DEFAULT_SINGLE_QUOTE,
     DEFAULT_TAB_WIDTH,
     DEFAULT_USE_TABS,
+    DEFAULT_WRAP_COMMENTS,
     DEFAULT_WRAP_LINE_WITH_LONG_STRING,
     DEFAULT_WRAP_PRAGMA_COMMENTS,
-    DEFAULT_WRAP_COMMENTS,
     STDIN_PLACEHOLDER,
 )
 from cercis.files import (
diff --git a/src/cercis/mode.py b/src/cercis/mode.py
index 866622a887c..7aaccd0e9e5 100644
--- a/src/cercis/mode.py
+++ b/src/cercis/mode.py
@@ -27,9 +27,9 @@
     DEFAULT_SINGLE_QUOTE,
     DEFAULT_TAB_WIDTH,
     DEFAULT_USE_TABS,
+    DEFAULT_WRAP_COMMENTS,
     DEFAULT_WRAP_LINE_WITH_LONG_STRING,
     DEFAULT_WRAP_PRAGMA_COMMENTS,
-    DEFAULT_WRAP_COMMENTS,
 )
 
 

From ff60f977b9754c71d8c79f4b5311467b52cb8b2f Mon Sep 17 00:00:00 2001
From: jsh9 <25124332+jsh9@users.noreply.github.com>
Date: Tue, 23 May 2023 00:01:02 -0700
Subject: [PATCH 6/8] Fix format

---
 src/cercis/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cercis/const.py b/src/cercis/const.py
index 579a0a6b74d..a37052e5d8c 100644
--- a/src/cercis/const.py
+++ b/src/cercis/const.py
@@ -1,5 +1,5 @@
 DEFAULT_LINE_LENGTH = 79
-DEFAULT_EXCLUDES = r"/(\.direnv|\.eggs|\.git|\.hg|\.ipynb_checkpoints|\.mypy_cache|\.nox|\.pytest_cache|\.ruff_cache|\.tox|\.svn|\.venv|\.vscode|__pypackages__|_build|buck-out|build|dist|venv)/" # noqa: B950
+DEFAULT_EXCLUDES = r"/(\.direnv|\.eggs|\.git|\.hg|\.ipynb_checkpoints|\.mypy_cache|\.nox|\.pytest_cache|\.ruff_cache|\.tox|\.svn|\.venv|\.vscode|__pypackages__|_build|buck-out|build|dist|venv)/"  # noqa: B950
 DEFAULT_INCLUDES = r"(\.pyi?|\.ipynb)$"
 STDIN_PLACEHOLDER = "__BLACK_STDIN_FILENAME__"
 DEFAULT_FUNCTION_DEFINITION_EXTRA_INDENT = True

From edded190957413b95df6ed7531c67fdcd4ebf6ce Mon Sep 17 00:00:00 2001
From: jsh9 <25124332+jsh9@users.noreply.github.com>
Date: Tue, 23 May 2023 00:44:31 -0700
Subject: [PATCH 7/8] Update README

---
 README.md | 89 +++++++++++++++++++------------------------------------
 1 file changed, 31 insertions(+), 58 deletions(-)

diff --git a/README.md b/README.md
index 9b5597d8511..02fc3baae26 100644
--- a/README.md
+++ b/README.md
@@ -99,7 +99,7 @@ _Cercis_ offers the following configurable options:
    3. [At closing brackets](#353-at-closing-brackets---closing-bracket-extra-indent)
 6. ["Simple" lines with long strings](#36-simple-lines-with-long-strings)
 7. [Collapse nested brackets](#37-collapse-nested-brackets)
-8. [Wrap pragma comments](#38-wrapping-long-lines-ending-with-pragma-comments)
+8. [Wrap lines ending with comments](#38-wrapping-long-lines-ending-with-comments)
 
 The next section ([How to configure _Cercis_](#4-how-to-configure-cercis)) contains
 detailed instructions of how to configure these options.
@@ -522,7 +522,13 @@ value = function(
 The code implementation of this option comes from
 [Pyink](https://github.com/google/pyink), another forked project from Black.
 
-### 3.8. Wrapping long lines ending with pragma comments
+### 3.8. Wrapping long lines ending with comments
+
+Sometimes we have lines that exceed the length limit only because of the in-line
+comment. If we do not want to wrap those lines, we can use two options provided here:
+
+- `--wrap-comments`
+- `--wrap-pragma-comments`
 
 "Pragma comments", in this context, mean the directives for Python linters usually to
 tell them to ignore certain errors. Pragma comments that _Cercis_ currently recognizes
@@ -533,62 +539,15 @@ include:
 - _pylint_: `# pylint: disable=protected-access`
 - _pytype_: `# pytype: disable=attribute-error`
 
-<table>
-  <tr>
-    <td>
-
-```python
-# Cercis's default style
-# (Suppose line length limit is 30)
-
-# This line has 30 characters
-var = some_func(some_long_arg)  # noqa:F501
-
-# This line has 31 characters
-var_ = some_func(
-    some_long_arg
-)  # type: ignore
-
-# Cercis doesn't wraps a line if its main
-# content (without the comment) does not
-# exceed the line length limit.
-
-
-
-
-
-```
-
-  </td>
-
-  <td>
-
-```python
-# Black's style (not configurable)
-# (Suppose line length limit is 30)
-
-# Black doesn't wrap lines, no matter
-# how long, if the line has
-# a "# type: ignore..." comment.
-# (This line has 31 characters.)
-var_ = some_func(some_long_arg)  # type: ignore
-
-# Black does not recognize "# type:ignore",
-# even though mypy recognizes it.
-var_ = some_func(
-    some_long_arg
-)  # type:ignore
-
-# Black only recognizes "# type: ignore"
-var_ = some_func(
-    some_long_arg
-)  # noqa:F501
-```
-
-  </td>
-
-  </tr>
-</table>
+| Option                 |                                              |
+| ---------------------- | -------------------------------------------- |
+| Name                   | `--wrap-comments`                            |
+| Abbreviation           | `-wc`                                        |
+| Default                | `False`                                      |
+| Black's style          | `True`                                       |
+| Command line usage     | `cercis -wc=True myScript.py`                |
+| `pyproject.toml` usage | `wrap-comments = true` under `[tool.cercis]` |
+| `pre-commit` usage     | `args: [--wrap-comments=False]`              |
 
 | Option                 |                                                     |
 | ---------------------- | --------------------------------------------------- |
@@ -600,6 +559,19 @@ var_ = some_func(
 | `pyproject.toml` usage | `wrap-pragma-comments = true` under `[tool.cercis]` |
 | `pre-commit` usage     | `args: [--wrap-pragma-comments=False]`              |
 
+And below is a 2x2 matrix to explain how these two options work together:
+
+|              | `-wc=True`                          | `-wc=False`             |
+| ------------ | ----------------------------------- | ----------------------- |
+| `-wpc=True`  | All comments wrapped w.n.           | No comments are wrapped |
+| `-wpc=False` | p.c. not wrapped; o.c. wrapped w.n. | No comments are wrapped |
+
+Note:
+
+- "w.n." means "when necessary"
+- "p.c." means "pragma comments"
+- "o.c." means "other comments"
+
 ## 4. How to configure _Cercis_
 
 ### 4.1. Dynamically in the command line
@@ -668,5 +640,6 @@ other-line-continuation-extra-indent = false
 closing-bracket-extra-indent = false
 wrap-line-with-long-string = true
 collapse-nested-brackets = false
+wrap-comments = true
 wrap-pragma-comments = true
 ```

From 5e9f99cbee9ab45686e1274eb5ebdaccc1700d19 Mon Sep 17 00:00:00 2001
From: jsh9 <25124332+jsh9@users.noreply.github.com>
Date: Tue, 23 May 2023 00:58:05 -0700
Subject: [PATCH 8/8] Update CHANGELOG

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11f8d25bb95..106187b4492 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## Unreleased
+
+- Added
+  - A new option `--wrap-comments` to not wrap any comments (not just pragma comments)
+
 ## [0.1.5] - 2023-05-09
 
 - Added