From fee5cd10c2038176b23b92ea252999d340dba20f Mon Sep 17 00:00:00 2001 From: FrancescoV1985 Date: Wed, 3 Sep 2025 08:32:33 +0200 Subject: [PATCH 1/2] fixes auto-run js checks in tidy --- src/tools/tidy/src/extra_checks/mod.rs | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/tools/tidy/src/extra_checks/mod.rs b/src/tools/tidy/src/extra_checks/mod.rs index 31169ec596775..0d4cee8d5dba8 100644 --- a/src/tools/tidy/src/extra_checks/mod.rs +++ b/src/tools/tidy/src/extra_checks/mod.rs @@ -720,21 +720,21 @@ impl ExtraCheckArg { if !self.auto { return true; } - let ext = match self.lang { - ExtraCheckLang::Py => ".py", - ExtraCheckLang::Cpp => ".cpp", - ExtraCheckLang::Shell => ".sh", - ExtraCheckLang::Js => ".js", + match self.lang { ExtraCheckLang::Spellcheck => { - for dir in SPELLCHECK_DIRS { - if Path::new(filepath).starts_with(dir) { - return true; - } - } - return false; + SPELLCHECK_DIRS.iter().any(|dir| Path::new(filepath).starts_with(dir)) } - }; - filepath.ends_with(ext) + lang => { + let exts: &[&str] = match lang { + ExtraCheckLang::Py => &[".py"], + ExtraCheckLang::Cpp => &[".cpp"], + ExtraCheckLang::Shell => &[".sh"], + ExtraCheckLang::Js => &[".js", ".ts"], + ExtraCheckLang::Spellcheck => unreachable!(), + }; + exts.iter().any(|ext| filepath.ends_with(ext)) + } + } } fn has_supported_kind(&self) -> bool { From 858414b6bb223b4f22c2c9748a7ef05a000c3bad Mon Sep 17 00:00:00 2001 From: FrancescoV1985 Date: Thu, 4 Sep 2025 08:55:02 +0200 Subject: [PATCH 2/2] improved solution for function is_non_auto_or_matches --- src/tools/tidy/src/extra_checks/mod.rs | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/tools/tidy/src/extra_checks/mod.rs b/src/tools/tidy/src/extra_checks/mod.rs index 0d4cee8d5dba8..34d9ea92629b3 100644 --- a/src/tools/tidy/src/extra_checks/mod.rs +++ b/src/tools/tidy/src/extra_checks/mod.rs @@ -720,21 +720,19 @@ impl ExtraCheckArg { if !self.auto { return true; } - match self.lang { + let exts: &[&str] = match self.lang { + ExtraCheckLang::Py => &[".py"], + ExtraCheckLang::Cpp => &[".cpp"], + ExtraCheckLang::Shell => &[".sh"], + ExtraCheckLang::Js => &[".js", ".ts"], ExtraCheckLang::Spellcheck => { - SPELLCHECK_DIRS.iter().any(|dir| Path::new(filepath).starts_with(dir)) - } - lang => { - let exts: &[&str] = match lang { - ExtraCheckLang::Py => &[".py"], - ExtraCheckLang::Cpp => &[".cpp"], - ExtraCheckLang::Shell => &[".sh"], - ExtraCheckLang::Js => &[".js", ".ts"], - ExtraCheckLang::Spellcheck => unreachable!(), - }; - exts.iter().any(|ext| filepath.ends_with(ext)) + if SPELLCHECK_DIRS.iter().any(|dir| Path::new(filepath).starts_with(dir)) { + return true; + } + &[] } - } + }; + exts.iter().any(|ext| filepath.ends_with(ext)) } fn has_supported_kind(&self) -> bool {