Skip to content
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

Jump to bottom

refactor(core): register rules using visitor pattern #3483

Merged
merged 3 commits into from
Jul 23, 2024
Merged

refactor(core): register rules using visitor pattern #3483

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c907590
refactor(core): register rules using visitor pattern
ematipico Jul 21, 2024
036b1c8
chore: apply visitor pattern to `fix_all` too
ematipico Jul 23, 2024
214d1b6
clippy
ematipico Jul 23, 2024
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/biome_analyze/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,15 +806,15 @@ impl<'a> RuleFilter<'a> {
}
}
/// Return `true` if the group `G` matches this filter
fn match_group<G: RuleGroup>(self) -> bool {
pub fn match_group<G: RuleGroup>(self) -> bool {
match self {
RuleFilter::Group(group) => group == G::NAME,
RuleFilter::Rule(group, _) => group == G::NAME,
}
}

/// Return `true` if the rule `R` matches this filter
fn match_rule<R>(self) -> bool
pub fn match_rule<R>(self) -> bool
where
R: Rule,
{
Expand Down
9 changes: 9 additions & 0 deletions crates/biome_configuration/src/linter/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,15 @@ impl From<RuleSelector> for RuleFilter<'static> {
}
}

impl<'a> From<&'a RuleSelector> for RuleFilter<'static> {
fn from(value: &'a RuleSelector) -> Self {
match value {
RuleSelector::Group(group) => RuleFilter::Group(group.as_str()),
RuleSelector::Rule(group, name) => RuleFilter::Rule(group.as_str(), name),
}
}
}

impl FromStr for RuleSelector {
type Err = &'static str;
fn from_str(selector: &str) -> Result<Self, Self::Err> {
Expand Down
89 changes: 33 additions & 56 deletions crates/biome_service/src/file_handlers/css.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use super::{
is_diagnostic_error, CodeActionsParams, ExtensionHandler, FixAllParams, LintParams,
LintResults, ParseResult, SearchCapabilities, SyntaxVisitor,
is_diagnostic_error, ActionVisitor, CodeActionsParams, ExtensionHandler, FixAllParams,
LintParams, LintResults, LintVisitor, ParseResult, SearchCapabilities, SyntaxVisitor,
};
use crate::configuration::to_analyzer_rules;
use crate::file_handlers::DebugCapabilities;
Expand All @@ -21,7 +21,7 @@ use biome_analyze::{
AnalysisFilter, AnalyzerConfiguration, AnalyzerOptions, ControlFlow, Never,
RuleCategoriesBuilder, RuleCategory, RuleError,
};
use biome_css_analyze::analyze;
use biome_css_analyze::{analyze, visit_registry};
use biome_css_formatter::context::CssFormatOptions;
use biome_css_formatter::format_node;
use biome_css_parser::CssParserOptions;
Expand All @@ -31,7 +31,6 @@ use biome_formatter::{
FormatError, IndentStyle, IndentWidth, LineEnding, LineWidth, Printed, QuoteStyle,
};
use biome_fs::BiomePath;
use biome_js_analyze::visit_registry;
use biome_parser::AnyParse;
use biome_rowan::{AstNode, NodeCache};
use biome_rowan::{TextRange, TextSize, TokenAtOffset};
Expand Down Expand Up @@ -338,42 +337,34 @@ fn lint(params: LintParams) -> LintResults {
let analyzer_options =
workspace_settings.analyzer_options::<CssLanguage>(params.path, &params.language);
let tree = params.parse.tree();
let mut diagnostics = params.parse.into_diagnostics();

let has_only_filter = !params.only.is_empty();
let mut rules = None;

let mut enabled_rules = if let Some(settings) = params.workspace.settings() {
// Compute final rules (taking `overrides` into account)
rules = settings.as_rules(params.path.as_path());

if has_only_filter {
params
.only
.into_iter()
.map(|selector| selector.into())
.collect::<Vec<_>>()
} else {
rules
.as_ref()
.map(|rules| rules.as_enabled_rules())
.unwrap_or_default()
.into_iter()
.collect::<Vec<_>>()
}
} else {
Vec::new()
};
let rules = params
.workspace
.settings()
.as_ref()
.and_then(|settings| settings.as_rules(params.path.as_path()));

let mut enabled_rules = vec![];
let mut disabled_rules = vec![];
let mut syntax_visitor = SyntaxVisitor::default();
let mut lint_visitor = LintVisitor::new(
&params.only,
&params.skip,
params.workspace.settings(),
params.path.as_path(),
);
let mut action_visitor =
ActionVisitor::new(params.workspace.settings(), &params.categories);
visit_registry(&mut syntax_visitor);
visit_registry(&mut lint_visitor);
visit_registry(&mut action_visitor);
enabled_rules.extend(syntax_visitor.enabled_rules);

let disabled_rules = params
.skip
.into_iter()
.map(|selector| selector.into())
.collect::<Vec<_>>();
let (lint_enabled_rules, lint_disabled_rules) = lint_visitor.finish();
enabled_rules.extend(lint_enabled_rules);
disabled_rules.extend(lint_disabled_rules);
enabled_rules.extend(action_visitor.enabled_rules);
let mut diagnostics = params.parse.into_diagnostics();

let filter = AnalysisFilter {
categories: params.categories,
Expand Down Expand Up @@ -540,32 +531,18 @@ pub(crate) fn fix_all(params: FixAllParams) -> Result<FixFileResult, WorkspaceEr

// Compute final rules (taking `overrides` into account)
let rules = settings.as_rules(params.biome_path.as_path());

let mut enabled_rules = if !params.only.is_empty() {
params
.only
.into_iter()
.map(|selector| selector.into())
.collect::<Vec<_>>()
} else {
rules
.as_ref()
.map(|rules| rules.as_enabled_rules())
.unwrap_or_default()
.into_iter()
.collect::<Vec<_>>()
};

let mut lint_visitor = LintVisitor::new(
&params.only,
&params.skip,
params.workspace.settings(),
params.biome_path.as_path(),
);
let mut syntax_visitor = SyntaxVisitor::default();
visit_registry(&mut lint_visitor);
visit_registry(&mut syntax_visitor);
let (mut enabled_rules, disabled_rules) = lint_visitor.finish();
enabled_rules.extend(syntax_visitor.enabled_rules);

let disabled_rules = params
.skip
.into_iter()
.map(|selector| selector.into())
.collect::<Vec<_>>();

let filter = AnalysisFilter {
categories: RuleCategoriesBuilder::default()
.with_syntax()
Expand Down
88 changes: 34 additions & 54 deletions crates/biome_service/src/file_handlers/graphql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use super::{
is_diagnostic_error, CodeActionsParams, DocumentFileSource, ExtensionHandler, FixAllParams,
LintParams, LintResults, ParseResult, SearchCapabilities, SyntaxVisitor,
is_diagnostic_error, ActionVisitor, CodeActionsParams, DocumentFileSource, ExtensionHandler,
FixAllParams, LintParams, LintResults, LintVisitor, ParseResult, SearchCapabilities,
SyntaxVisitor,
};
use crate::file_handlers::DebugCapabilities;
use crate::file_handlers::{
Expand All @@ -24,12 +25,11 @@ use biome_formatter::{
QuoteStyle,
};
use biome_fs::BiomePath;
use biome_graphql_analyze::analyze;
use biome_graphql_analyze::{analyze, visit_registry};
use biome_graphql_formatter::context::GraphqlFormatOptions;
use biome_graphql_formatter::format_node;
use biome_graphql_parser::parse_graphql_with_cache;
use biome_graphql_syntax::{GraphqlLanguage, GraphqlRoot, GraphqlSyntaxNode, TextRange, TextSize};
use biome_js_analyze::visit_registry;
use biome_parser::AnyParse;
use biome_rowan::{AstNode, NodeCache, TokenAtOffset};
use std::borrow::Cow;
Expand Down Expand Up @@ -296,42 +296,34 @@ fn lint(params: LintParams) -> LintResults {
let analyzer_options = workspace_settings
.analyzer_options::<GraphqlLanguage>(params.path, &params.language);
let tree = params.parse.tree();
let mut diagnostics = params.parse.into_diagnostics();

let has_only_filter = !params.only.is_empty();
let mut rules = None;

let mut enabled_rules = if let Some(settings) = params.workspace.settings() {
// Compute final rules (taking `overrides` into account)
rules = settings.as_rules(params.path.as_path());

if has_only_filter {
params
.only
.into_iter()
.map(|selector| selector.into())
.collect::<Vec<_>>()
} else {
rules
.as_ref()
.map(|rules| rules.as_enabled_rules())
.unwrap_or_default()
.into_iter()
.collect::<Vec<_>>()
}
} else {
Vec::new()
};
let rules = params
.workspace
.settings()
.as_ref()
.and_then(|settings| settings.as_rules(params.path.as_path()));

let mut enabled_rules = vec![];
let mut disabled_rules = vec![];
let mut syntax_visitor = SyntaxVisitor::default();
let mut lint_visitor = LintVisitor::new(
&params.only,
&params.skip,
params.workspace.settings(),
params.path.as_path(),
);
let mut action_visitor =
ActionVisitor::new(params.workspace.settings(), &params.categories);
visit_registry(&mut syntax_visitor);
visit_registry(&mut lint_visitor);
visit_registry(&mut action_visitor);
enabled_rules.extend(syntax_visitor.enabled_rules);

let disabled_rules = params
.skip
.into_iter()
.map(|selector| selector.into())
.collect::<Vec<_>>();
let (lint_enabled_rules, lint_disabled_rules) = lint_visitor.finish();
enabled_rules.extend(lint_enabled_rules);
disabled_rules.extend(lint_disabled_rules);
enabled_rules.extend(action_visitor.enabled_rules);
let mut diagnostics = params.parse.into_diagnostics();

let filter = AnalysisFilter {
categories: params.categories,
Expand Down Expand Up @@ -492,31 +484,19 @@ pub(crate) fn fix_all(params: FixAllParams) -> Result<FixFileResult, WorkspaceEr

// Compute final rules (taking `overrides` into account)
let rules = settings.as_rules(params.biome_path.as_path());
let mut enabled_rules = if !params.only.is_empty() {
params
.only
.into_iter()
.map(|selector| selector.into())
.collect::<Vec<_>>()
} else {
rules
.as_ref()
.map(|rules| rules.as_enabled_rules())
.unwrap_or_default()
.into_iter()
.collect::<Vec<_>>()
};

let mut lint_visitor = LintVisitor::new(
&params.only,
&params.skip,
params.workspace.settings(),
params.biome_path.as_path(),
);
let mut syntax_visitor = SyntaxVisitor::default();
visit_registry(&mut lint_visitor);
visit_registry(&mut syntax_visitor);
let (mut enabled_rules, disabled_rules) = lint_visitor.finish();
enabled_rules.extend(syntax_visitor.enabled_rules);

let disabled_rules = params
.skip
.into_iter()
.map(|selector| selector.into())
.collect::<Vec<_>>();

let filter = AnalysisFilter {
categories: RuleCategoriesBuilder::default()
.with_syntax()
Expand Down
Loading
Loading