Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lint: Fix colors being randomized on every file with custom checks. 

Now, each custom check language gets a consistent color.
This commit is contained in:
Tim Abbott 2017-07-27 15:59:53 -07:00
parent 1deb58b178
commit d7766d7b6e
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tools/linter_lib/custom_check.py
View File

@ -15,10 +15,9 @@ def build_custom_checkers(by_lang):
# type: (Dict[str, List[str]]) -> Tuple[Callable[[], bool], Callable[[], bool]] # type: (Dict[str, List[str]]) -> Tuple[Callable[[], bool], Callable[[], bool]]
RuleList = List[Dict[str, Any]] RuleList = List[Dict[str, Any]]
def custom_check_file(fn, identifier, rules, skip_rules=None, max_length=None): def custom_check_file(fn, identifier, rules, color, skip_rules=None, max_length=None):
# type: (str, str, RuleList, Optional[Any], Optional[int]) -> bool # type: (str, str, RuleList, str, Optional[Any], Optional[int]) -> bool
failed = False failed = False
color = next(colors)
line_tups = [] line_tups = []
for i, line in enumerate(open(fn)): for i, line in enumerate(open(fn)):
@ -419,11 +418,12 @@ def build_custom_checkers(by_lang):
def check_custom_checks_py(): def check_custom_checks_py():
# type: () -> bool # type: () -> bool
failed = False failed = False
color = next(colors)
for fn in by_lang['py']: for fn in by_lang['py']:
if 'custom_check.py' in fn: if 'custom_check.py' in fn:
continue continue
if custom_check_file(fn, 'py', python_rules, max_length=140): if custom_check_file(fn, 'py', python_rules, color, max_length=140):
failed = True failed = True
return failed return failed
@ -431,30 +431,37 @@ def build_custom_checkers(by_lang):
# type: () -> bool # type: () -> bool
failed = False failed = False
color = next(colors)
for fn in by_lang['js']: for fn in by_lang['js']:
if custom_check_file(fn, 'js', js_rules): if custom_check_file(fn, 'js', js_rules, color):
failed = True failed = True
color = next(colors)
for fn in by_lang['sh']: for fn in by_lang['sh']:
if custom_check_file(fn, 'sh', bash_rules): if custom_check_file(fn, 'sh', bash_rules, color):
failed = True failed = True
color = next(colors)
for fn in by_lang['css']: for fn in by_lang['css']:
if custom_check_file(fn, 'css', css_rules): if custom_check_file(fn, 'css', css_rules, color):
failed = True failed = True
color = next(colors)
for fn in by_lang['handlebars']: for fn in by_lang['handlebars']:
if custom_check_file(fn, 'handlebars', handlebars_rules): if custom_check_file(fn, 'handlebars', handlebars_rules, color):
failed = True failed = True
color = next(colors)
for fn in by_lang['html']: for fn in by_lang['html']:
if custom_check_file(fn, 'html', jinja2_rules): if custom_check_file(fn, 'html', jinja2_rules, color):
failed = True failed = True
color = next(colors)
for fn in by_lang['json']: for fn in by_lang['json']:
if custom_check_file(fn, 'json', json_rules): if custom_check_file(fn, 'json', json_rules, color):
failed = True failed = True
color = next(colors)
markdown_docs_length_exclude = { markdown_docs_length_exclude = {
"api/bots/converter/readme.md", "api/bots/converter/readme.md",
"docs/bots-guide.md", "docs/bots-guide.md",
@ -476,15 +483,17 @@ def build_custom_checkers(by_lang):
rules = markdown_rules rules = markdown_rules
if fn.startswith("templates/zerver/help"): if fn.startswith("templates/zerver/help"):
rules = help_markdown_rules rules = help_markdown_rules
if custom_check_file(fn, 'md', rules, max_length=max_length): if custom_check_file(fn, 'md', rules, color, max_length=max_length):
failed = True failed = True
color = next(colors)
for fn in by_lang['txt'] + by_lang['text']: for fn in by_lang['txt'] + by_lang['text']:
if custom_check_file(fn, 'txt', txt_rules): if custom_check_file(fn, 'txt', txt_rules, color):
failed = True failed = True
color = next(colors)
for fn in by_lang['yaml']: for fn in by_lang['yaml']:
if custom_check_file(fn, 'yaml', txt_rules): if custom_check_file(fn, 'yaml', txt_rules, color):
failed = True failed = True
return failed return failed