Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 17 additions & 18 deletions crates/oxc_linter/src/config/oxlintrc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,29 +142,28 @@ mod test {
#[test]
fn test_oxlintrc_de_plugins_empty_array() {
let config: Oxlintrc = serde_json::from_value(json!({ "plugins": [] })).unwrap();
assert_eq!(config.plugins, LintPlugins::default());
assert_eq!(config.plugins, LintPlugins::empty());
}

#[test]
fn test_oxlintrc_de_plugins_enabled_by_default() {
// NOTE(@DonIsaac): creating a Value with `json!` then deserializing it with serde_json::from_value
// Errs with "invalid type: string \"eslint\", expected a borrowed string" and I can't
// figure out why. This seems to work. Why???
let configs = [
r#"{ "plugins": ["eslint"] }"#,
r#"{ "plugins": ["oxc"] }"#,
r#"{ "plugins": ["deepscan"] }"#, // alias for oxc
];
// ^ these plugins are enabled by default already
for oxlintrc in configs {
let config: Oxlintrc = serde_json::from_str(oxlintrc).unwrap();
assert_eq!(config.plugins, LintPlugins::default());
}
fn test_oxlintrc_empty_config_plugins() {
let config: Oxlintrc = serde_json::from_str(r"{}").unwrap();
assert_eq!(config.plugins, LintPlugins::default());
}

#[test]
fn test_oxlintrc_de_plugins_new() {
let config: Oxlintrc = serde_json::from_str(r#"{ "plugins": ["import"] }"#).unwrap();
assert_eq!(config.plugins, LintPlugins::default().union(LintPlugins::IMPORT));
fn test_oxlintrc_specifying_plugins_will_override() {
let config: Oxlintrc = serde_json::from_str(r#"{ "plugins": ["react", "oxc"] }"#).unwrap();
assert_eq!(config.plugins, LintPlugins::REACT.union(LintPlugins::OXC));
let config: Oxlintrc =
serde_json::from_str(r#"{ "plugins": ["typescript", "unicorn"] }"#).unwrap();
assert_eq!(config.plugins, LintPlugins::TYPESCRIPT.union(LintPlugins::UNICORN));
let config: Oxlintrc =
serde_json::from_str(r#"{ "plugins": ["typescript", "unicorn", "react", "oxc", "import", "jsdoc", "jest", "vitest", "jsx-a11y", "nextjs", "react-perf", "promise", "node", "security"] }"#).unwrap();
assert_eq!(config.plugins, LintPlugins::all());

let config: Oxlintrc =
serde_json::from_str(r#"{ "plugins": ["typescript", "@typescript-eslint"] }"#).unwrap();
assert_eq!(config.plugins, LintPlugins::TYPESCRIPT);
}
}
2 changes: 1 addition & 1 deletion crates/oxc_linter/src/config/plugins.rs
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ impl<'de> Deserialize<'de> for LintPlugins {
where
A: de::SeqAccess<'de>,
{
let mut plugins = LintPlugins::default();
let mut plugins = LintPlugins::empty();
loop {
// serde_json::from_str will provide an &str, while
// serde_json::from_value provides a String. The former is
Expand Down