Skip to content

perf(linter): use CompactStr in valid-title #6406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graphite-app merged 1 commit into from
Oct 10, 2024
Merged

perf(linter): use CompactStr in valid-title #6406

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 15 additions & 17 deletions crates/oxc_linter/src/rules/jest/valid_title.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use oxc_ast::{
};
use oxc_diagnostics::OxcDiagnostic;
use oxc_macros::declare_oxc_lint;
use oxc_span::{GetSpan, Span};
use oxc_span::{CompactStr, GetSpan, Span};
use regex::Regex;
use rustc_hash::FxHashMap;

Expand All @@ -30,7 +30,7 @@ pub struct ValidTitle(Box<ValidTitleConfig>);
#[derive(Debug, Default, Clone)]
pub struct ValidTitleConfig {
ignore_type_of_describe_name: bool,
disallowed_words: Vec<String>,
disallowed_words: Vec<CompactStr>,
ignore_space: bool,
must_not_match_patterns: FxHashMap<MatchKind, CompiledMatcherAndMessage>,
must_match_patterns: FxHashMap<MatchKind, CompiledMatcherAndMessage>,
Expand Down Expand Up @@ -85,9 +85,7 @@ impl Rule for ValidTitle {
let disallowed_words = config
.and_then(|v| v.get("disallowedWords"))
.and_then(|v| v.as_array())
.map(|v| {
v.iter().filter_map(|v| v.as_str().map(std::string::ToString::to_string)).collect()
})
.map(|v| v.iter().filter_map(|v| v.as_str().map(CompactStr::from)).collect())
.unwrap_or_default();
let must_not_match_patterns = config
.and_then(|v| v.get("mustNotMatch"))
Expand Down Expand Up @@ -179,7 +177,7 @@ impl ValidTitle {
}
}

type CompiledMatcherAndMessage = (Regex, Option<String>);
type CompiledMatcherAndMessage = (Regex, Option<CompactStr>);

#[derive(Debug, Clone, Hash, PartialEq, Eq)]
enum MatchKind {
Expand Down Expand Up @@ -263,7 +261,7 @@ fn compile_matcher_pattern(pattern: MatcherPattern) -> Option<CompiledMatcherAnd
MatcherPattern::Vec(pattern) => {
let reg_str = pattern.first().and_then(|v| v.as_str()).map(|v| format!("(?u){v}"))?;
let reg = Regex::new(&reg_str).ok()?;
let message = pattern.get(1).map(std::string::ToString::to_string);
let message = pattern.get(1).and_then(serde_json::Value::as_str).map(CompactStr::from);
Some((reg, message))
}
}
Expand Down Expand Up @@ -322,12 +320,12 @@ fn validate_title(
if let Some((regex, message)) = valid_title.must_match_patterns.get(&jest_fn_name) {
if !regex.is_match(title) {
let raw_pattern = regex.as_str();
let message = message.as_ref().map_or_else(
|| format!("{un_prefixed_name} should match {raw_pattern}"),
std::clone::Clone::clone,
);
let message = match message.as_ref() {
Some(message) => message.as_str(),
None => &format!("{un_prefixed_name} should match {raw_pattern}"),
};
ctx.diagnostic(valid_title_diagnostic(
&message,
message,
"Make sure the title matches the `mustMatch` of your config file",
span,
));
Expand All @@ -337,13 +335,13 @@ fn validate_title(
if let Some((regex, message)) = valid_title.must_not_match_patterns.get(&jest_fn_name) {
if regex.is_match(title) {
let raw_pattern = regex.as_str();
let message = message.as_ref().map_or_else(
|| format!("{un_prefixed_name} should not match {raw_pattern}"),
std::string::ToString::to_string,
);
let message = match message.as_ref() {
Some(message) => message.as_str(),
None => &format!("{un_prefixed_name} should not match {raw_pattern}"),
};

ctx.diagnostic(valid_title_diagnostic(
&message,
message,
"Make sure the title not matches the `mustNotMatch` of your config file",
span,
));
Expand Down