Handle other nested cases (dicts and lists) for yapf fixup.

Author: domdfcoding

formate/__init__.py

@@ -227,9 +227,23 @@ def yapf_hook(source: str, formate_global_config: Optional[Mapping] = None, **kw
 		reformatted_code: str = FormatTree(tree, style_config=str(config_file))
 
 		# Yapf can collapse nested calls onto one line but does nothing about the commas.
-		bad_nested_call = "), )"
-		while bad_nested_call in reformatted_code:
-			reformatted_code = reformatted_code.replace(bad_nested_call, "))")
+		# TODO: more performant, with re.sub?
+		for bad_pattern, good_pattern in [
+			("), )", "))"),
+			("), }", ")}"),
+			("), ]", ")]"),
+
+			("], )", "])"),
+			("], }", "]}"),
+			("], ]", "]]"),
+
+			("}, )", "})"),
+			("}, }", "}}"),
+			("}, ]", "}]"),
+		]:
+
+			while bad_pattern in reformatted_code:
+				reformatted_code = reformatted_code.replace(bad_pattern, good_pattern)
 
 		return reformatted_code
 

tests/test_yapf_nested_fixups.py

@@ -0,0 +1,34 @@
+# 3rd party
+from coincidence.regressions import AdvancedFileRegressionFixture
+from domdf_python_tools.paths import PathPlus
+
+# this package
+from formate import yapf_hook
+
+
+def test_nested_call(advanced_file_regression: AdvancedFileRegressionFixture):
+	src = """
+a = cls(**dict(map(
+		lambda f: (f[0].name, curried.get_in(f[1], d, f[0].default)),
+		from_fields,
+		), ), )
+"""
+
+	advanced_file_regression.check(yapf_hook(src))
+
+
+def test_nested_array(advanced_file_regression: AdvancedFileRegressionFixture):
+	src = """
+def foo():
+	example = {
+			"table": {"nested_table": [
+					{"array_options": [1, 2, 3]},
+					{"another_array": [1, 2]},
+					{'c': 3},
+					], },
+			}
+"""
+
+	advanced_file_regression.check(
+			yapf_hook(src, yapf_style=PathPlus(__file__).parent.parent.joinpath(".style.yapf").as_posix()),
+			)

tests/test_yapf_nested_fixups_/test_nested_array.txt

@@ -0,0 +1,8 @@
+def foo():
+	example = {
+			"table": {"nested_table": [
+					{"array_options": [1, 2, 3]},
+					{"another_array": [1, 2]},
+					{'c': 3},
+					]},
+			}

tests/test_yapf_nested_fixups_/test_nested_call.txt

@@ -0,0 +1,6 @@
+a = cls(
+    **dict(
+        map(
+            lambda f: (f[0].name, curried.get_in(f[1], d, f[0].default)),
+            from_fields,
+        )))