dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-24 12:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(linter): clean up Test a bit

Browse source
This commit is contained in:
Boshen 2023-09-03 15:35:59 +08:00
parent ba54eb67b3
commit 91f4896247
No known key found for this signature in database
GPG key ID: 9C7A8C8AB22BEBD1
1 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
crates/oxc_linter/src/tester.rs
View file

@ -1,13 +1,10 @@
use std::{
path::{Path, PathBuf},
sync::Arc,
};
use std::{path::PathBuf, sync::Arc};
use oxc_allocator::Allocator;
use oxc_diagnostics::miette::{GraphicalReportHandler, GraphicalTheme, NamedSource};
use serde_json::Value;
use crate::{rules::RULES, Fixer, LintOptions, LintService, Linter, Message};
use crate::{rules::RULES, Fixer, LintOptions, LintService, Linter, RuleEnum};
#[derive(Eq, PartialEq)]
enum TestResult {
@ -100,7 +97,10 @@ impl Tester {
let name = self.rule_name.replace('-', "_");
let path = PathBuf::from(name).with_extension("tsx");
let allocator = Allocator::default();
let result = self.run_rules(&allocator, &path, source_text, config, is_fix);
let rule = self.find_rule().read_json(config);
let options = LintOptions::default().with_fix(is_fix);
let linter = Arc::new(Linter::from_options(options).with_rules(vec![rule]));
let result = LintService::run_source(&linter, &path, &allocator, source_text, false);
if result.is_empty() {
return TestResult::Passed;
@ -124,21 +124,10 @@ impl Tester {
TestResult::Failed
}
fn run_rules<'a>(
&mut self,
allocator: &'a Allocator,
path: &Path,
source_text: &'a str,
config: Option<Value>,
is_fix: bool,
) -> Vec<Message<'a>> {
let rule = RULES
fn find_rule(&self) -> &RuleEnum {
RULES
.iter()
.find(|rule| rule.name() == self.rule_name)
.unwrap_or_else(|| panic!("Rule not found: {}", &self.rule_name));
let rule = rule.read_json(config);
let options = LintOptions::default().with_fix(is_fix);
let linter = Arc::new(Linter::from_options(options).with_rules(vec![rule]));
LintService::run_source(&linter, path, allocator, source_text, false)
.unwrap_or_else(|| panic!("Rule not found: {}", &self.rule_name))
}
}