Skip to content

Commit 729b82b

Browse files
committed
refactor(linter): rename plugin_name to plugin_specifier (#12148)
Follow-on after #11980. Pure refactor. Rename vars from `plugin_name` to `plugin_specifier`, because that better describes what they are. Later on, we'll add code which does deal with actual plugin names, at which point it'll become confusing.
1 parent 532b816 commit 729b82b

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

crates/oxc_linter/src/config/config_builder.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,10 @@ impl ConfigStoreBuilder {
147147
#[expect(clippy::missing_panics_doc, reason = "infallible")]
148148
let oxlintrc_dir_path = oxlintrc.path.parent().unwrap();
149149

150-
for plugin_name in &plugins.external {
150+
for plugin_specifier in &plugins.external {
151151
Self::load_external_plugin(
152152
oxlintrc_dir_path,
153-
plugin_name,
153+
plugin_specifier,
154154
external_linter,
155155
&resolver,
156156
)?;
@@ -396,7 +396,7 @@ impl ConfigStoreBuilder {
396396
#[cfg(any(not(feature = "oxlint2"), feature = "disable_oxlint2"))]
397397
fn load_external_plugin(
398398
_oxlintrc_dir_path: &Path,
399-
_plugin_name: &str,
399+
_plugin_specifier: &str,
400400
_external_linter: &ExternalLinter,
401401
_resolver: &Resolver,
402402
) -> Result<(), ConfigBuilderError> {
@@ -406,15 +406,15 @@ impl ConfigStoreBuilder {
406406
#[cfg(all(feature = "oxlint2", not(feature = "disable_oxlint2")))]
407407
fn load_external_plugin(
408408
oxlintrc_dir_path: &Path,
409-
plugin_name: &str,
409+
plugin_specifier: &str,
410410
external_linter: &ExternalLinter,
411411
resolver: &Resolver,
412412
) -> Result<(), ConfigBuilderError> {
413413
use crate::PluginLoadResult;
414414

415-
let resolved = resolver.resolve(oxlintrc_dir_path, plugin_name).map_err(|e| {
415+
let resolved = resolver.resolve(oxlintrc_dir_path, plugin_specifier).map_err(|e| {
416416
ConfigBuilderError::PluginLoadFailed {
417-
plugin_name: plugin_name.to_string(),
417+
plugin_specifier: plugin_specifier.to_string(),
418418
error: e.to_string(),
419419
}
420420
})?;
@@ -425,14 +425,14 @@ impl ConfigStoreBuilder {
425425
tokio::runtime::Handle::current().block_on((external_linter.load_plugin)(plugin_path))
426426
})
427427
.map_err(|e| ConfigBuilderError::PluginLoadFailed {
428-
plugin_name: plugin_name.to_string(),
428+
plugin_specifier: plugin_specifier.to_string(),
429429
error: e.to_string(),
430430
})?;
431431

432432
match result {
433433
PluginLoadResult::Success => Ok(()),
434434
PluginLoadResult::Failure(e) => Err(ConfigBuilderError::PluginLoadFailed {
435-
plugin_name: plugin_name.to_string(),
435+
plugin_specifier: plugin_specifier.to_string(),
436436
error: e,
437437
}),
438438
}
@@ -478,7 +478,7 @@ pub enum ConfigBuilderError {
478478
reason: String,
479479
},
480480
PluginLoadFailed {
481-
plugin_name: String,
481+
plugin_specifier: String,
482482
error: String,
483483
},
484484
NoExternalLinterConfigured,
@@ -501,8 +501,8 @@ impl Display for ConfigBuilderError {
501501
ConfigBuilderError::InvalidConfigFile { file, reason } => {
502502
write!(f, "invalid config file {file}: {reason}")
503503
}
504-
ConfigBuilderError::PluginLoadFailed { plugin_name, error } => {
505-
write!(f, "Failed to load external plugin: {plugin_name}\n {error}")?;
504+
ConfigBuilderError::PluginLoadFailed { plugin_specifier, error } => {
505+
write!(f, "Failed to load external plugin: {plugin_specifier}\n {error}")?;
506506
Ok(())
507507
}
508508
ConfigBuilderError::NoExternalLinterConfigured => {

0 commit comments

Comments
 (0)