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
4 changes: 2 additions & 2 deletions crates/oxc_linter/src/config/config_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -475,8 +475,8 @@ impl ConfigStoreBuilder {
}?;

match result {
PluginLoadResult::Success { name, offset, rules } => {
external_plugin_store.register_plugin(plugin_path, name, offset, rules);
PluginLoadResult::Success { name, offset, rule_names } => {
external_plugin_store.register_plugin(plugin_path, name, offset, rule_names);
Ok(())
}
PluginLoadResult::Failure(e) => Err(ConfigBuilderError::PluginLoadFailed {
Expand Down
7 changes: 6 additions & 1 deletion crates/oxc_linter/src/external_linter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ pub type ExternalLinterCb = Arc<

#[derive(Clone, Debug, Deserialize, Serialize)]
pub enum PluginLoadResult {
Success { name: String, offset: usize, rules: Vec<String> },
#[serde(rename_all = "camelCase")]
Success {
name: String,
offset: usize,
rule_names: Vec<String>,
},
Failure(String),
}

Expand Down
4 changes: 2 additions & 2 deletions crates/oxc_linter/src/external_plugin_store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ impl ExternalPluginStore {
plugin_path: String,
plugin_name: String,
offset: usize,
rules: Vec<String>,
rule_names: Vec<String>,
) {
let newly_inserted = self.registered_plugin_paths.insert(plugin_path);
assert!(newly_inserted, "register_plugin: plugin already registered");
Expand All @@ -54,7 +54,7 @@ impl ExternalPluginStore {
self.rules.len()
);

for rule_name in rules {
for rule_name in rule_names {
let rule_id = self.rules.push(ExternalRule { name: rule_name.clone(), plugin_id });
self.plugins[plugin_id].rules.insert(rule_name, rule_id);
}
Expand Down
6 changes: 3 additions & 3 deletions napi/oxlint2/src-js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ async function loadPluginImpl(path) {

// TODO: Use a validation library to assert the shape of the plugin, and of rules
let ruleId = registeredRules.length;
const rules = [];
const ruleNames = [];
const ret = {
name: plugin.meta.name,
offset: ruleId,
rules,
ruleNames,
};

for (const [ruleName, rule] of Object.entries(plugin.rules)) {
rules.push(ruleName);
ruleNames.push(ruleName);
registeredRules.push({ rule, context: new Context(ruleId) });
ruleId++;
}
Expand Down
Loading