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

Rules: indentation: Handle tags

Browse Source
This commit is contained in:
Adrien Vergé
2016-02-05 08:11:56 +01:00
parent 8eb0d0ad74
commit 647d84ff94
2 changed files with 121 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
yamllint/rules/indentation.py
View File

@@ -367,10 +367,13 @@ def check(conf, token, prev, next, nextnext, context):
elif isinstance(token, yaml.ValueToken):
assert context['stack'][-1].type == KEY
# Special case:
# Special cases:
# key: &anchor
# value
if isinstance(next, yaml.AnchorToken):
# and:
# key: !!tag
# value
if isinstance(next, (yaml.AnchorToken, yaml.TagToken)):
if (next.start_mark.line == prev.start_mark.line and
next.start_mark.line < nextnext.start_mark.line):
next = nextnext
@@ -440,8 +443,8 @@ def check(conf, token, prev, next, nextnext, context):
elif (context['stack'][-1].type == B_ENT and
not isinstance(token, yaml.BlockEntryToken) and
context['stack'][-2].implicit_block_seq and
not isinstance(next, yaml.ScalarToken)):
# isinstance(next, yaml.KeyToken)):
not isinstance(token, (yaml.AnchorToken, yaml.TagToken)) and
not isinstance(next, yaml.BlockEntryToken)):
context['stack'].pop()
context['stack'].pop()
@@ -451,10 +454,10 @@ def check(conf, token, prev, next, nextnext, context):
elif (context['stack'][-1].type == VAL and
not isinstance(token, yaml.ValueToken) and
not isinstance(token, yaml.AnchorToken)):
assert context['stack'][-2].type == KEY
context['stack'].pop()
context['stack'].pop()
not isinstance(token, (yaml.AnchorToken, yaml.TagToken))):
assert context['stack'][-2].type == KEY
context['stack'].pop()
context['stack'].pop()
elif (context['stack'][-1].type == KEY and
isinstance(next, (yaml.BlockEndToken,