зеркало из https://github.com/mozilla/gecko-dev.git
servo: Merge #10786 - tidy check for vim and emacs modelines (from zwn:tidy-modelines); r=Manishearth
See #10719. It skips *.webidl files for now since I am not sure where they come from and if they should be edited in tree or not. Source-Repo: https://github.com/servo/servo Source-Revision: 04f8ae56db0ba9df798b39a5b2f1bb1e23d6dcf3
This commit is contained in:
Родитель
5a26bc2ac2
Коммит
30fc93bdf2
|
@ -133,6 +133,14 @@ def check_license(file_name, lines):
|
|||
yield (1, "incorrect license")
|
||||
|
||||
|
||||
def check_modeline(file_name, lines):
|
||||
for idx, line in enumerate(lines[:5]):
|
||||
if re.search('^.*[ \t](vi:|vim:|ex:)[ \t]', line):
|
||||
yield (idx + 1, "vi modeline present")
|
||||
elif re.search('-\*-.*-\*-', line, re.IGNORECASE):
|
||||
yield (idx + 1, "emacs file variables present")
|
||||
|
||||
|
||||
def check_length(file_name, idx, line):
|
||||
if file_name.endswith(".lock") or file_name.endswith(".json"):
|
||||
raise StopIteration
|
||||
|
@ -639,7 +647,7 @@ def scan(faster=False, progress=True):
|
|||
# standard checks
|
||||
files_to_check = filter_files('.', faster, progress)
|
||||
checking_functions = (check_flake8, check_lock, check_webidl_spec, check_json)
|
||||
line_checking_functions = (check_license, check_by_line, check_toml, check_rust, check_spec)
|
||||
line_checking_functions = (check_license, check_by_line, check_toml, check_rust, check_spec, check_modeline)
|
||||
errors = collect_errors_for_files(files_to_check, checking_functions, line_checking_functions)
|
||||
# wpt lint checks
|
||||
wpt_lint_errors = check_wpt_lint_errors(get_wpt_files(faster, progress))
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
# vim: set noexpandtab:
|
||||
// vi: et:
|
||||
/* ex: et:
|
||||
anything -*-Lisp-*-
|
||||
-*- mode: Lisp -*-
|
|
@ -89,6 +89,14 @@ class CheckTidiness(unittest.TestCase):
|
|||
self.assertEqual('found asterisk instead of minimum version number', errors.next()[2])
|
||||
self.assertNoMoreErrors(errors)
|
||||
|
||||
def test_modeline(self):
|
||||
errors = tidy.collect_errors_for_files(iterFile('modeline.txt'), [], [tidy.check_modeline])
|
||||
self.assertEqual('vi modeline present', errors.next()[2])
|
||||
self.assertEqual('vi modeline present', errors.next()[2])
|
||||
self.assertEqual('vi modeline present', errors.next()[2])
|
||||
self.assertEqual('emacs file variables present', errors.next()[2])
|
||||
self.assertEqual('emacs file variables present', errors.next()[2])
|
||||
|
||||
|
||||
def do_tests():
|
||||
suite = unittest.TestLoader().loadTestsFromTestCase(CheckTidiness)
|
||||
|
|
Загрузка…
Ссылка в новой задаче