Mirrors/yamllint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rules: indentation: Handle anchors

Browse Source
This commit is contained in:
Adrien Vergé
2016-02-04 21:38:38 +01:00
parent 48c7d65c54
commit 4bc3d5a01c
2 changed files with 156 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
yamllint/rules/indentation.py
View File

@@ -367,6 +367,14 @@ def check(conf, token, prev, next, nextnext, context):
elif isinstance(token, yaml.ValueToken):
assert context['stack'][-1].type == KEY
# Special case:
# key: &anchor
# value
if isinstance(next, yaml.AnchorToken):
if (next.start_mark.line == prev.start_mark.line and
next.start_mark.line < nextnext.start_mark.line):
next = nextnext
# Only if value is not empty
if not isinstance(next, (yaml.BlockEndToken,
yaml.FlowMappingEndToken,
@@ -442,10 +450,11 @@ def check(conf, token, prev, next, nextnext, context):
context['stack'].pop()
elif (context['stack'][-1].type == VAL and
not isinstance(token, yaml.ValueToken)):
assert context['stack'][-2].type == KEY
context['stack'].pop()
context['stack'].pop()
not isinstance(token, yaml.ValueToken) and
not isinstance(token, yaml.AnchorToken)):
assert context['stack'][-2].type == KEY
context['stack'].pop()
context['stack'].pop()
elif (context['stack'][-1].type == KEY and
isinstance(next, (yaml.BlockEndToken,