1 files changed, 9 insertions, 21 deletions
diff --git a/tools/format.py b/tools/format.py
index a1217a49d..eadbfec3d 100755
--- a/tools/format.py
+++ b/tools/format.py
@@ -17,33 +17,21 @@ rustfmt_config = os.path.join(tools_path, "rustfmt.toml")
 os.chdir(root_path)
 
 run([clang_format_path, "-i", "-style", "Google"] +
-    find_exts("libdeno", ".cc", ".h"))
+    find_exts(["libdeno"], [".cc", ".h"]))
 
-for fn in ["BUILD.gn", ".gn"] + find_exts("build_extra", ".gn", ".gni"):
+for fn in ["BUILD.gn", ".gn"] + find_exts(["build_extra"], [".gn", ".gni"]):
     run(["third_party/depot_tools/gn", "format", fn], env=google_env())
 
-# We use `glob()` instead of `find_exts()` in the tools directory, because:
-#   * On Windows, `os.walk()` (called by `find_exts()`) follows symlinks.
-#   * The tools directory contains a symlink 'clang', pointing at the directory
-#     'third_party/v8/tools/clang', which contains many .py files.
-#   * These third party python files shouldn't be formatted.
-#   * The tools directory has no subdirectories, so `glob()` is sufficient.
-# TODO(ry) Install yapf in third_party.
-run([sys.executable, "third_party/python_packages/bin/yapf", "-i"] +
-    glob("tools/*.py") + find_exts("build_extra", ".py"),
+run([sys.executable, "third_party/python_packages/bin/yapf", "-i"] + find_exts(
+    ["tools", "build_extra"], [".py"], skip=["tools/clang"]),
     env=python_env())
 
-# yapf: disable
-run(["node", prettier, "--write"] +
-    ["rollup.config.js"] + glob("*.json") + glob("*.md") +
-    find_exts(".github/", ".md") +
-    find_exts("js/", ".js", ".ts", ".md") +
-    find_exts("tests/", ".js", ".ts", ".md") +
-    find_exts("tools/", ".js", ".json", ".ts", ".md") +
-    find_exts("website/", ".js", ".ts", ".md"))
-# yapf: enable
+run(["node", prettier, "--write"] + ["rollup.config.js"] + glob("*.json") +
+    glob("*.md") + find_exts([".github", "js", "tests", "tools", "website"],
+                             [".js", ".json", ".ts", ".md"],
+                             skip=["tools/clang"]))
 
 run([
     "third_party/rustfmt/" + platform() +
     "/rustfmt", "--config-path", rustfmt_config
-] + find_exts("src/", ".rs"))
+] + find_exts(["src"], [".rs"]))