aboutsummaryrefslogtreecommitdiffstats
path: root/python/tidy/servo_tidy/tidy.py
diff options
context:
space:
mode:
authormarmeladema <xademax@gmail.com>2019-10-22 22:21:16 +0100
committermarmeladema <xademax@gmail.com>2019-12-09 19:31:46 +0000
commit76ff22f5d0ac7b36230ac3d7e9599167b0f6349a (patch)
tree2f2ef85991c8aaf841f12725e852bb9b38a5e383 /python/tidy/servo_tidy/tidy.py
parent00cf7452ef2bcb272dafb09a711301a2ef280ae2 (diff)
downloadservo-76ff22f5d0ac7b36230ac3d7e9599167b0f6349a.tar.gz
servo-76ff22f5d0ac7b36230ac3d7e9599167b0f6349a.zip
Allow to specify glob pattern for ignored directories in servo-tidy.toml
Diffstat (limited to 'python/tidy/servo_tidy/tidy.py')
-rw-r--r--python/tidy/servo_tidy/tidy.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py
index d2840cc884c..899bb60e775 100644
--- a/python/tidy/servo_tidy/tidy.py
+++ b/python/tidy/servo_tidy/tidy.py
@@ -10,6 +10,7 @@
from __future__ import print_function
import fnmatch
+import glob
import imp
import itertools
import json
@@ -909,7 +910,7 @@ def check_config_file(config_file, print_text=True, no_wpt=False):
exclude = config_content.get("ignore", {})
# 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"]
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):
exclude = config_file.get("ignore", {})
# 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
config["ignore"]["files"] += normilize_paths(exclude.get("files", []))
# Add list of ignored packages to config