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

Rules: Keep a persistent context for token rules

Browse Source 
This will be needed to build a clean indentation checking algorithm.
This commit is contained in:
Adrien Vergé
2016-01-15 17:01:44 +01:00
parent f09aef4f89
commit d617eb70ae
11 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
yamllint/__init__.py
View File

@@ -38,12 +38,17 @@ def get_costemic_problems(buffer, conf):
token_rules = [r for r in rules if r.TYPE == 'token']
line_rules = [r for r in rules if r.TYPE == 'line']
context = {}
for rule in token_rules:
context[rule.ID] = {}
for elem in parser.token_or_line_generator(buffer):
if isinstance(elem, parser.Token):
for rule in token_rules:
rule_conf = conf[rule.ID]
for problem in rule.check(rule_conf,
elem.curr, elem.prev, elem.next):
elem.curr, elem.prev, elem.next,
context[rule.ID]):
problem.rule = rule.ID
problem.level = rule_conf['level']
yield problem

2
yamllint/rules/braces.py
View File

@@ -25,7 +25,7 @@ CONF = {'min-spaces-inside': int,
'max-spaces-inside': int}
def check(conf, token, prev, next):
def check(conf, token, prev, next, context):
if isinstance(token, yaml.FlowMappingStartToken):
problem = spaces_after(token, prev, next,
min=conf['min-spaces-inside'],

2
yamllint/rules/brackets.py
View File

@@ -25,7 +25,7 @@ CONF = {'min-spaces-inside': int,
'max-spaces-inside': int}
def check(conf, token, prev, next):
def check(conf, token, prev, next, context):
if isinstance(token, yaml.FlowSequenceStartToken):
problem = spaces_after(token, prev, next,
min=conf['min-spaces-inside'],

2
yamllint/rules/colons.py
View File

@@ -25,7 +25,7 @@ CONF = {'max-spaces-before': int,
'max-spaces-after': int}
def check(conf, token, prev, next):
def check(conf, token, prev, next, context):
if isinstance(token, yaml.ValueToken):
problem = spaces_before(token, prev, next,
max=conf['max-spaces-before'],

2
yamllint/rules/commas.py
View File

@@ -25,7 +25,7 @@ CONF = {'max-spaces-before': int,
'max-spaces-after': int}
def check(conf, token, prev, next):
def check(conf, token, prev, next, context):
if isinstance(token, yaml.FlowEntryToken):
problem = spaces_before(token, prev, next,
max=conf['max-spaces-before'],

2
yamllint/rules/comments.py
View File

@@ -26,7 +26,7 @@ CONF = {'require-starting-space': bool,
'min-spaces-from-content': int}
def check(conf, token, prev, next):
def check(conf, token, prev, next, context):
for comment in get_comments_between_tokens(token, next):
if (conf['min-spaces-from-content'] != -1 and
not isinstance(token, yaml.StreamStartToken) and

2
yamllint/rules/comments_indentation.py
View File

@@ -37,7 +37,7 @@ TYPE = 'token'
# # commented line 2
# current: line
def check(conf, token, prev, next):
def check(conf, token, prev, next, context):
if prev is None:
return

2
yamllint/rules/document_end.py
View File

@@ -24,7 +24,7 @@ TYPE = 'token'
CONF = {'present': bool}
def check(conf, token, prev, next):
def check(conf, token, prev, next, context):
if conf['present']:
if (isinstance(token, yaml.StreamEndToken) and
not (isinstance(prev, yaml.DocumentEndToken) or

2
yamllint/rules/document_start.py
View File

@@ -24,7 +24,7 @@ TYPE = 'token'
CONF = {'present': bool}
def check(conf, token, prev, next):
def check(conf, token, prev, next, context):
if conf['present']:
if (isinstance(prev, (yaml.StreamStartToken,
yaml.DocumentEndToken,

2
yamllint/rules/hyphens.py
View File

@@ -24,7 +24,7 @@ TYPE = 'token'
CONF = {'max-spaces-after': int}
def check(conf, token, prev, next):
def check(conf, token, prev, next, context):
if isinstance(token, yaml.BlockEntryToken):
problem = spaces_after(token, prev, next,
max=conf['max-spaces-after'],

2
yamllint/rules/indentation.py
View File

@@ -24,7 +24,7 @@ TYPE = 'token'
CONF = {'spaces': int}
def check(conf, token, prev, next):
def check(conf, token, prev, next, context):
if isinstance(token, (yaml.StreamStartToken, yaml.StreamEndToken)):
return