Mention tab comment fixes, extend tests

diff --git a/README.md b/README.md
index c34fc2963bde1094e0b25e7431075790e4492e92..87ac75751df9032ea0af07ebcc3f16c17367a7a2 100644 (file)
--- a/README.md
+++ b/README.md
@@ -966,6 +966,9 @@ More details can be found in [CONTRIBUTING](CONTRIBUTING.md).
 * *Black* now creates cache files atomically which allows it to be used
   in parallel pipelines (like `xargs -P8`) (#673)
 
+* *Black* now correctly indents comments in files that were previously
+  formatted with tabs (#262)
+
 * `blackd` now supports CORS (#622)
 
 ### 18.9b0

diff --git a/tests/test_black.py b/tests/test_black.py
index db46499bad7c153e84938c8b68143db00d3896cf..7c99f00906b31d3054ff8493911011e2f6b17954 100644 (file)
--- a/tests/test_black.py
+++ b/tests/test_black.py
@@ -526,18 +526,27 @@ class BlackTestCase(unittest.TestCase):
         black.assert_equivalent(source, actual)
         black.assert_stable(source, actual, black.FileMode())
 
-    def test_comment_indentation(self) -> None:
+    def test_tab_comment_indentation(self) -> None:
         contents_tab = "if 1:\n\tif 2:\n\t\tpass\n\t# comment\n\tpass\n"
         contents_spc = "if 1:\n    if 2:\n        pass\n    # comment\n    pass\n"
-
-        self.assertFormatEqual(fs(contents_spc), contents_spc)
-        self.assertFormatEqual(fs(contents_tab), contents_spc)
+        self.assertFormatEqual(contents_spc, fs(contents_spc))
+        self.assertFormatEqual(contents_spc, fs(contents_tab))
 
         contents_tab = "if 1:\n\tif 2:\n\t\tpass\n\t\t# comment\n\tpass\n"
         contents_spc = "if 1:\n    if 2:\n        pass\n        # comment\n    pass\n"
+        self.assertFormatEqual(contents_spc, fs(contents_spc))
+        self.assertFormatEqual(contents_spc, fs(contents_tab))
+
+        # mixed tabs and spaces (valid Python 2 code)
+        contents_tab = "if 1:\n        if 2:\n\t\tpass\n\t# comment\n        pass\n"
+        contents_spc = "if 1:\n    if 2:\n        pass\n    # comment\n    pass\n"
+        self.assertFormatEqual(contents_spc, fs(contents_spc))
+        self.assertFormatEqual(contents_spc, fs(contents_tab))
 
-        self.assertFormatEqual(fs(contents_tab), contents_spc)
-        self.assertFormatEqual(fs(contents_spc), contents_spc)
+        contents_tab = "if 1:\n        if 2:\n\t\tpass\n\t\t# comment\n        pass\n"
+        contents_spc = "if 1:\n    if 2:\n        pass\n        # comment\n    pass\n"
+        self.assertFormatEqual(contents_spc, fs(contents_spc))
+        self.assertFormatEqual(contents_spc, fs(contents_tab))
 
     def test_report_verbose(self) -> None:
         report = black.Report(verbose=True)