Skip to content

v2: refactor linter #439

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
kodiakhq merged 5 commits into from
May 6, 2025
Merged

v2: refactor linter #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e3ca98
v2: refactor linter
sbdchd May 6, 2025
b7183cf
fix
sbdchd May 6, 2025
075ee69
fix
sbdchd May 6, 2025
848e943
fmt
sbdchd May 6, 2025
66c1de2
fix
sbdchd May 6, 2025
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
18 changes: 3 additions & 15 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 0 additions & 24 deletions crates/squawk_cli/Cargo.toml
View file
Open in desktop

This file was deleted.

191 changes: 0 additions & 191 deletions crates/squawk_cli/src/main.rs
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions crates/squawk_linter/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ lazy_static.workspace = true
insta.workspace = true
enum-iterator.workspace = true
line-index.workspace = true
serde_plain.workspace = true


[lints]
Expand Down
32 changes: 16 additions & 16 deletions crates/squawk_linter/src/ignore.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ use std::collections::HashSet;
use rowan::{NodeOrToken, TextRange, TextSize};
use squawk_syntax::{SyntaxKind, SyntaxNode, SyntaxToken};

use crate::{ErrorCode, Linter, Violation};
use crate::{Linter, Rule, Violation};

#[derive(Debug)]
pub struct Ignore {
pub range: TextRange,
pub violation_names: HashSet<ErrorCode>,
pub violation_names: HashSet<Rule>,
}

fn comment_body(token: &SyntaxToken) -> Option<(&str, TextRange)> {
Expand Down Expand Up @@ -71,7 +71,7 @@ pub(crate) fn find_ignores(ctx: &mut Linter, file: &SyntaxNode) {
if x.is_empty() {
continue;
}
if let Ok(violation_name) = ErrorCode::try_from(x.trim()) {
if let Ok(violation_name) = Rule::try_from(x.trim()) {
set.insert(violation_name);
} else {
let without_start = x.trim_start();
Expand All @@ -85,10 +85,10 @@ pub(crate) fn find_ignores(ctx: &mut Linter, file: &SyntaxNode) {
let range = TextRange::new(start, end);

ctx.report(Violation::new(
ErrorCode::UnusedIgnore,
Rule::UnusedIgnore,
format!("unknown name {trimmed}"),
range,
vec![],
None,
));
}

Expand All @@ -108,7 +108,7 @@ pub(crate) fn find_ignores(ctx: &mut Linter, file: &SyntaxNode) {
#[cfg(test)]
mod test {

use crate::{find_ignores, ErrorCode, Linter, Violation};
use crate::{find_ignores, Linter, Rule};

#[test]
fn single_ignore() {
Expand All @@ -123,7 +123,7 @@ alter table t drop column c cascade;

assert_eq!(linter.ignores.len(), 1);
let ignore = &linter.ignores[0];
assert!(ignore.violation_names.contains(&ErrorCode::BanDropColumn));
assert!(ignore.violation_names.contains(&Rule::BanDropColumn));
}

#[test]
Expand All @@ -140,7 +140,7 @@ alter table t drop column c cascade;

assert_eq!(linter.ignores.len(), 1);
let ignore = &linter.ignores[0];
assert!(ignore.violation_names.contains(&ErrorCode::BanDropColumn));
assert!(ignore.violation_names.contains(&Rule::BanDropColumn));
}

#[test]
Expand All @@ -157,9 +157,9 @@ alter table t drop column c cascade;

assert_eq!(linter.ignores.len(), 1);
let ignore = &linter.ignores[0];
assert!(ignore.violation_names.contains(&ErrorCode::BanDropColumn));
assert!(ignore.violation_names.contains(&ErrorCode::RenamingColumn));
assert!(ignore.violation_names.contains(&ErrorCode::BanDropDatabase));
assert!(ignore.violation_names.contains(&Rule::BanDropColumn));
assert!(ignore.violation_names.contains(&Rule::RenamingColumn));
assert!(ignore.violation_names.contains(&Rule::BanDropDatabase));
}

#[test]
Expand All @@ -176,9 +176,9 @@ alter table t drop column c cascade;

assert_eq!(linter.ignores.len(), 1);
let ignore = &linter.ignores[0];
assert!(ignore.violation_names.contains(&ErrorCode::BanDropColumn));
assert!(ignore.violation_names.contains(&ErrorCode::RenamingColumn));
assert!(ignore.violation_names.contains(&ErrorCode::BanDropDatabase));
assert!(ignore.violation_names.contains(&Rule::BanDropColumn));
assert!(ignore.violation_names.contains(&Rule::RenamingColumn));
assert!(ignore.violation_names.contains(&Rule::BanDropDatabase));
}

#[test]
Expand All @@ -199,7 +199,7 @@ create table users (
"#;

let parse = squawk_syntax::SourceFile::parse(sql);
let errors: Vec<&Violation> = linter.lint(parse, sql);
let errors = linter.lint(parse, sql);
assert_eq!(errors.len(), 0);
}

Expand All @@ -209,7 +209,7 @@ create table users (
let sql = r#"alter table t add column c char;"#;

let parse = squawk_syntax::SourceFile::parse(sql);
let errors: Vec<&Violation> = linter.lint(parse, sql);
let errors = linter.lint(parse, sql);
assert_eq!(errors.len(), 1);
}
}
Loading
Loading