Ensure syntax errors from yapf are correctly handled.

Author: domdfcoding

formate/__init__.py

@@ -186,7 +186,8 @@ def yapf_hook(source: str, formate_global_config: Optional[Mapping] = None, **kw
 	"""
 
 	# 3rd party
-	from yapf.yapflib.yapf_api import FormatCode  # type: ignore[import-untyped]
+	from yapf.pytree.pytree_utils import ParseCodeToTree  # type: ignore[import-untyped]
+	from yapf.yapflib.yapf_api import FormatTree  # type: ignore[import-untyped]
 
 	with TemporaryPathPlus() as tmpdir:
 		config_file = tmpdir / ".style.yapf"
@@ -222,7 +223,8 @@ def yapf_hook(source: str, formate_global_config: Optional[Mapping] = None, **kw
 		with config_file.open('w') as fp:
 			config.write(fp)
 
-		return FormatCode(source, style_config=str(config_file))[0]
+		tree = ParseCodeToTree(source)
+		return FormatTree(tree, style_config=str(config_file))
 
 
 class Reformatter:

tests/test_utils.py

@@ -3,8 +3,11 @@
 
 # 3rd party
 import pytest
+from coincidence.regressions import AdvancedDataRegressionFixture
+from coincidence.selectors import max_version, min_version
 
 # this package
+from formate import yapf_hook
 from formate.classes import Hook
 from formate.exceptions import HookNotFoundError
 from formate.reformat_generics import reformat_generics
@@ -80,3 +83,40 @@ def test_syntaxerror_for_file():
 			ast.parse("def foo()pass", filename="__init__.py")
 
 	assert exc_info.value.filename == "__init__.py"
+
+
+@pytest.mark.parametrize(
+		"python_version",
+		[
+				pytest.param("3.7", marks=max_version("3.9")),
+				pytest.param("3.10", marks=[min_version("3.10"), max_version("3.11")]),
+				pytest.param("3.12", marks=min_version("3.12")),
+				]
+		)
+def test_syntaxerror_for_file_f_string(python_version, advanced_data_regression: AdvancedDataRegressionFixture):
+
+	with pytest.raises(SyntaxError) as exc_info:  # noqa: PT012
+		with syntaxerror_for_file("code.py"):
+			ast.parse("f'")
+
+	exc: SyntaxError = exc_info.value
+	advanced_data_regression.check({
+			"msg": exc.msg,
+			"filename": exc.filename,
+			"lineno": exc.lineno,
+			"offset": exc.offset,
+			"text": exc.text,
+			})
+
+	with pytest.raises(SyntaxError) as exc_info:  # noqa: PT012
+		with syntaxerror_for_file("code.py"):
+			yapf_hook("f'")
+
+	exc: SyntaxError = exc_info.value
+	advanced_data_regression.check({
+			"msg": exc.msg,
+			"filename": exc.filename,
+			"lineno": exc.lineno,
+			"offset": exc.offset,
+			"text": exc.text,
+			})

tests/test_utils_/test_syntaxerror_for_file_f_string_3_10_.yml

@@ -0,0 +1,5 @@
+filename: code.py
+lineno: 1
+msg: unterminated string literal (detected at line 1)
+offset: 1
+text: f'

tests/test_utils_/test_syntaxerror_for_file_f_string_3_12_.yml

@@ -0,0 +1,5 @@
+filename: code.py
+lineno: 1
+msg: unterminated f-string literal (detected at line 1)
+offset: 1
+text: f'

tests/test_utils_/test_syntaxerror_for_file_f_string_3_7_.yml

@@ -0,0 +1,7 @@
+filename: code.py
+lineno: 1
+msg: EOL while scanning string literal
+offset: 3
+text: 'f''
+
+  '