Skip to content

refactor(linter): rename plugin_name to plugin_specifier #12148

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
merged 1 commit into from
Jul 9, 2025
Merged

refactor(linter): rename plugin_name to plugin_specifier #12148

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
22 changes: 11 additions & 11 deletions crates/oxc_linter/src/config/config_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,10 @@ impl ConfigStoreBuilder {
#[expect(clippy::missing_panics_doc, reason = "infallible")]
let oxlintrc_dir_path = oxlintrc.path.parent().unwrap();

for plugin_name in &plugins.external {
for plugin_specifier in &plugins.external {
Self::load_external_plugin(
oxlintrc_dir_path,
plugin_name,
plugin_specifier,
external_linter,
&resolver,
)?;
Expand Down Expand Up @@ -396,7 +396,7 @@ impl ConfigStoreBuilder {
#[cfg(any(not(feature = "oxlint2"), feature = "disable_oxlint2"))]
fn load_external_plugin(
_oxlintrc_dir_path: &Path,
_plugin_name: &str,
_plugin_specifier: &str,
_external_linter: &ExternalLinter,
_resolver: &Resolver,
) -> Result<(), ConfigBuilderError> {
Expand All @@ -406,15 +406,15 @@ impl ConfigStoreBuilder {
#[cfg(all(feature = "oxlint2", not(feature = "disable_oxlint2")))]
fn load_external_plugin(
oxlintrc_dir_path: &Path,
plugin_name: &str,
plugin_specifier: &str,
external_linter: &ExternalLinter,
resolver: &Resolver,
) -> Result<(), ConfigBuilderError> {
use crate::PluginLoadResult;

let resolved = resolver.resolve(oxlintrc_dir_path, plugin_name).map_err(|e| {
let resolved = resolver.resolve(oxlintrc_dir_path, plugin_specifier).map_err(|e| {
ConfigBuilderError::PluginLoadFailed {
plugin_name: plugin_name.to_string(),
plugin_specifier: plugin_specifier.to_string(),
error: e.to_string(),
}
})?;
Expand All @@ -425,14 +425,14 @@ impl ConfigStoreBuilder {
tokio::runtime::Handle::current().block_on((external_linter.load_plugin)(plugin_path))
})
.map_err(|e| ConfigBuilderError::PluginLoadFailed {
plugin_name: plugin_name.to_string(),
plugin_specifier: plugin_specifier.to_string(),
error: e.to_string(),
})?;

match result {
PluginLoadResult::Success => Ok(()),
PluginLoadResult::Failure(e) => Err(ConfigBuilderError::PluginLoadFailed {
plugin_name: plugin_name.to_string(),
plugin_specifier: plugin_specifier.to_string(),
error: e,
}),
}
Expand Down Expand Up @@ -478,7 +478,7 @@ pub enum ConfigBuilderError {
reason: String,
},
PluginLoadFailed {
plugin_name: String,
plugin_specifier: String,
error: String,
},
NoExternalLinterConfigured,
Expand All @@ -501,8 +501,8 @@ impl Display for ConfigBuilderError {
ConfigBuilderError::InvalidConfigFile { file, reason } => {
write!(f, "invalid config file {file}: {reason}")
}
ConfigBuilderError::PluginLoadFailed { plugin_name, error } => {
write!(f, "Failed to load external plugin: {plugin_name}\n {error}")?;
ConfigBuilderError::PluginLoadFailed { plugin_specifier, error } => {
write!(f, "Failed to load external plugin: {plugin_specifier}\n {error}")?;
Ok(())
}
ConfigBuilderError::NoExternalLinterConfigured => {
Expand Down
Loading