Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Allow to specify glob pattern for ignored directories in servo-tidy.toml

Browse source
This commit is contained in:
marmeladema 2019-10-22 22:21:16 +01:00
parent 00cf7452ef
commit 76ff22f5d0
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
python/tidy/servo_tidy/tidy.py
View file

@ -10,6 +10,7 @@
from __future__ import print_function from __future__ import print_function
import fnmatch import fnmatch
import glob
import imp import imp
import itertools import itertools
import json import json
@ -909,7 +910,7 @@ def check_config_file(config_file, print_text=True, no_wpt=False):
exclude = config_content.get("ignore", {}) exclude = config_content.get("ignore", {})
# Check for invalid listed ignored directories # Check for invalid listed ignored directories
exclude_dirs = exclude.get("directories", []) exclude_dirs = [d for p in exclude.get("directories", []) for d in (glob.glob(p) or [p])]
skip_dirs = ["./target", "./tests"] skip_dirs = ["./target", "./tests"]
invalid_dirs = [d for d in exclude_dirs if not os.path.isdir(d) and not any(s in d for s in skip_dirs)] invalid_dirs = [d for d in exclude_dirs if not os.path.isdir(d) and not any(s in d for s in skip_dirs)]
@ -971,7 +972,8 @@ def check_config_file(config_file, print_text=True, no_wpt=False):
def parse_config(config_file): def parse_config(config_file):
exclude = config_file.get("ignore", {}) exclude = config_file.get("ignore", {})
# Add list of ignored directories to config # Add list of ignored directories to config
config["ignore"]["directories"] += normilize_paths(exclude.get("directories", [])) ignored_directories = [d for p in exclude.get("directories", []) for d in (glob.glob(p) or [p])]
config["ignore"]["directories"] += normilize_paths(ignored_directories)
# Add list of ignored files to config # Add list of ignored files to config
config["ignore"]["files"] += normilize_paths(exclude.get("files", [])) config["ignore"]["files"] += normilize_paths(exclude.get("files", []))
# Add list of ignored packages to config # Add list of ignored packages to config

2
servo-tidy.toml
View file

@ -91,7 +91,7 @@ directories = [
"./python/tidy/servo_tidy_tests", "./python/tidy/servo_tidy_tests",
"./components/script/dom/bindings/codegen/parser", "./components/script/dom/bindings/codegen/parser",
"./components/script/dom/bindings/codegen/ply", "./components/script/dom/bindings/codegen/ply",
"./python/_virtualenv", "./python/_virtualenv*",
"./components/hashglobe/src", "./components/hashglobe/src",
# Generated and upstream code combined with our own. Could use cleanup # Generated and upstream code combined with our own. Could use cleanup
"./target", "./target",