Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct line numbers in yaml node annotations (#103605)

pull/103623/head
Erik Montnemery 2023-11-07 23:22:23 +01:00 committed by GitHub
parent 95fe7aa491
commit c29b0cd05b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/util/yaml/loader.py
View File

@ -240,7 +240,7 @@ def _add_reference( # type: ignore[no-untyped-def]
if isinstance(obj, str): if isinstance(obj, str):
obj = NodeStrClass(obj) obj = NodeStrClass(obj)
setattr(obj, "__config_file__", loader.get_name()) setattr(obj, "__config_file__", loader.get_name())
setattr(obj, "__line__", node.start_mark.line) setattr(obj, "__line__", node.start_mark.line + 1)
return obj return obj

12
tests/util/yaml/test_init.py
View File

@ -564,12 +564,12 @@ def test_string_annotated(try_both_loaders) -> None:
"key6: 1.0\n" "key6: 1.0\n"
) )
expected_annotations = { expected_annotations = {
"key1": [("<file>", 0), ("<file>", 0)], "key1": [("<file>", 1), ("<file>", 1)],
"key2": [("<file>", 1), ("<file>", 2)], "key2": [("<file>", 2), ("<file>", 3)],
"key3": [("<file>", 3), ("<file>", 4)], "key3": [("<file>", 4), ("<file>", 5)],
"key4": [("<file>", 7), (None, None)], "key4": [("<file>", 8), (None, None)],
"key5": [("<file>", 8), (None, None)], "key5": [("<file>", 9), (None, None)],
"key6": [("<file>", 9), (None, None)], "key6": [("<file>", 10), (None, None)],
} }
with io.StringIO(conf) as file: with io.StringIO(conf) as file:
doc = yaml_loader.parse_yaml(file) doc = yaml_loader.parse_yaml(file)