Separate test for checking black replaces config with linked one

Author: Shivansh-007

CHANGES.md

@@ -5,7 +5,8 @@
 ### _Black_
 
 - Add new `--workers` parameter (#2514)
-- Bumped typed-ast version minimum to 1.4.3 for 3.10 compatibility (#2519)
+- Fixed feature detection for positional-only arguments in lambdas (#2532)
+- Bumped typed-ast version minimum to 1.4.3 for 3.10 compatiblity (#2519)
 - Allow specifying `config` in config files (#2525)
 
 ### _Blackd_

docs/requirements.txt

@@ -1,6 +1,6 @@
 # Used by ReadTheDocs; pinned requirements for stability.
 
 myst-parser==0.15.1
-Sphinx==4.1.2
+Sphinx==4.2.0
 sphinxcontrib-programoutput==0.17
 sphinx_copybutton==0.4.0

src/black/__init__.py

@@ -1125,7 +1125,11 @@ def get_features_used(node: Node) -> Set[Feature]:
                 features.add(Feature.NUMERIC_UNDERSCORES)
 
         elif n.type == token.SLASH:
-            if n.parent and n.parent.type in {syms.typedargslist, syms.arglist}:
+            if n.parent and n.parent.type in {
+                syms.typedargslist,
+                syms.arglist,
+                syms.varargslist,
+            }:
                 features.add(Feature.POS_ONLY_ARGUMENTS)
 
         elif n.type == token.COLONEQUAL:

tests/test_black.toml renamed to tests/_black_config.toml

@@ -1,9 +1,2 @@
 [tool.black]
 config = "tests/bazqux.toml"
-
-[v1.0.0-syntax]
-# This shouldn't break Black.
-contributors = [
-  "Foo Bar <[email protected]>",
-  { name = "Baz Qux", email = "[email protected]", url = "https://example.com/bazqux" }
-]

tests/invalid_test.toml

@@ -1,8 +1,12 @@
 [tool.black]
-config = "test_black.toml"
-verbose = 0
-color = false
+verbose = 1
+--check = "no"
+diff = "y"
+color = true
 line-length = 79
+target-version = ["py36", "py37", "py38"]
+exclude='\.pyi?$'
+include='\.py?$'
 
 [v1.0.0-syntax]
 # This shouldn't break Black.

tests/test.toml

@@ -805,6 +805,10 @@ def test_get_features_used(self) -> None:
         self.assertEqual(black.get_features_used(node), set())
         node = black.lib2to3_parse(expected)
         self.assertEqual(black.get_features_used(node), set())
+        node = black.lib2to3_parse("lambda a, /, b: ...")
+        self.assertEqual(black.get_features_used(node), {Feature.POS_ONLY_ARGUMENTS})
+        node = black.lib2to3_parse("def fn(a, /, b): ...")
+        self.assertEqual(black.get_features_used(node), {Feature.POS_ONLY_ARGUMENTS})
 
     def test_get_future_imports(self) -> None:
         node = black.lib2to3_parse("\n")
@@ -1268,10 +1272,14 @@ def test_invalid_config_return_code(self) -> None:
     def test_parse_pyproject_toml(self) -> None:
         test_toml_file = THIS_DIR / "test.toml"
         config = black.parse_pyproject_toml(str(test_toml_file))
-        self.assertEqual(config["verbose"], 0)
-        self.assertEqual(config["config"], "test_black.toml")
-        self.assertEqual(config["color"], False)
+        self.assertEqual(config["verbose"], 1)
+        self.assertEqual(config["check"], "no")
+        self.assertEqual(config["diff"], "y")
+        self.assertEqual(config["color"], True)
         self.assertEqual(config["line_length"], 79)
+        self.assertEqual(config["target_version"], ["py36", "py37", "py38"])
+        self.assertEqual(config["exclude"], r"\.pyi?$")
+        self.assertEqual(config["include"], r"\.py?$")
 
     def test_read_pyproject_toml(self) -> None:
         test_toml_file = THIS_DIR / "test.toml"
@@ -1282,6 +1290,22 @@ def test_read_pyproject_toml(self) -> None:
         self.assertEqual(config["check"], "no")
         self.assertEqual(config["diff"], "y")
         self.assertEqual(config["color"], "True")
+        self.assertEqual(config["line_length"], "79")
+        self.assertEqual(config["target_version"], ["py36", "py37", "py38"])
+        self.assertEqual(config["exclude"], r"\.pyi?$")
+        self.assertEqual(config["include"], r"\.py?$")
+
+    def test_black_replace_config(self) -> None:
+        test_toml_file = THIS_DIR / "test_replace.toml"
+        fake_ctx = FakeContext()
+        black.read_pyproject_toml(fake_ctx, FakeParameter(), str(test_toml_file))
+        config = fake_ctx.default_map
+        # `0` in `test_replace.toml` and `1` in `_black_config.toml`. Should be `1` as
+        # the one linked should overwrite the config
+        self.assertEqual(config["verbose"], "1")
+        self.assertEqual(config["check"], "no")
+        self.assertEqual(config["diff"], "y")
+        self.assertEqual(config["color"], "True")
         self.assertEqual(config["line_length"], "88")
         self.assertEqual(config["target_version"], ["py36", "py37", "py38"])
         self.assertEqual(config["exclude"], r"\.pyi?$")

tests/test_black.py

@@ -0,0 +1,4 @@
+[tool.black]
+config = "_black_config.toml"
+verbose = 0
+color = false