Don't freeze when multiple comments directly precede # fmt: off

Fixes #371

diff --git a/README.md b/README.md
index c93c3003ff08c5966ba40aa9933e2c63d814a0df..96d169a2118d3ad237e60b6fe51713331dafbfb7 100644 (file)
--- a/README.md
+++ b/README.md
@@ -820,6 +820,11 @@ More details can be found in [CONTRIBUTING](CONTRIBUTING.md).
 
 ## Change Log
 
+### 18.6b4
+
+* hotfix: don't freeze when multiple comments directly precede `# fmt: off` (#371)
+
+
 ### 18.6b3
 
 * typing stub files (`.pyi`) now have blank lines added after constants (#340)

diff --git a/black.py b/black.py
index 0da2fad34a98422e732415776e893d98916209cf..2d23298e9c9ec65781f5c02f96794181bd9972d7 100644 (file)
--- a/black.py
+++ b/black.py
@@ -2608,7 +2608,7 @@ def convert_one_fmt_off_pair(node: Node) -> bool:
                 )
                 return True
 
-            previous_consumed += comment.consumed
+            previous_consumed = comment.consumed
 
     return False
 

diff --git a/tests/data/fmtonoff.py b/tests/data/fmtonoff.py
index 74b52ec28e05ac4793a283ef5c6bdeba8285cce3..b2e9fc0ad97b755d366faad076a3e67721f02cb8 100644 (file)
--- a/tests/data/fmtonoff.py
+++ b/tests/data/fmtonoff.py
@@ -11,6 +11,10 @@ from third_party import (X,
                          Y, Z)
 # fmt: on
 f'trigger 3.6 mode'
+# Comment 1
+
+# Comment 2
+
 # fmt: off
 def func_no_args():
   a; b; c
@@ -159,6 +163,10 @@ from third_party import (X,
                          Y, Z)
 # fmt: on
 f"trigger 3.6 mode"
+# Comment 1
+
+# Comment 2
+
 # fmt: off
 def func_no_args():
   a; b; c