NotAShelf/nff
2
1
Fork 0
Code Issues 6 Pull requests 1 Projects 1 Releases Packages Wiki Activity Actions

WIP: allow using nff as a diagnostics source #1

Draft
NotAShelf wants to merge 26 commits from diagnostics into main
pull from: diagnostics
merge into: NotAShelf:main
Conversation 0 Commits 26 Files changed 12 +17 -20
1 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9791296634 - Show all commits

diagnostics: reduce complexity of redundant rule checks

Prev Next
raf 2025-06-02 05:30:26 +03:00
commit 9791296634
Signed by: NotAShelf
GPG key ID: 29D95B64378DB4BF

37
src/diagnostic.rs
View file

@ -1000,7 +1000,7 @@ impl SemanticAnalyzer {
fn check_for_redundant_rules(&self, source: &str) -> Vec<Diagnostic> { fn check_for_redundant_rules(&self, source: &str) -> Vec<Diagnostic> {
let mut diagnostics = Vec::new(); let mut diagnostics = Vec::new();
let mut rules = Vec::new(); let mut seen_rules = HashSet::new();
for (line_idx, line) in source.lines().enumerate() { for (line_idx, line) in source.lines().enumerate() {
let line_num = line_idx as u32; let line_num = line_idx as u32;
@ -1011,26 +1011,23 @@ impl SemanticAnalyzer {
|| trimmed.contains(" drop") || trimmed.contains(" drop")
|| trimmed.contains(" reject") || trimmed.contains(" reject")
{ {
for (existing_idx, existing_rule) in rules.iter().enumerate() { // Check if rule already exists in the HashSet
if existing_rule == &trimmed { if seen_rules.contains(trimmed) {
let range = Range::new( let range = Range::new(
Position::new(line_num, 0), Position::new(line_num, 0),
Position::new(line_num, line.len() as u32), Position::new(line_num, line.len() as u32),
); );
let diagnostic = Diagnostic::new( let diagnostic = Diagnostic::new(
range, range,
DiagnosticSeverity::Warning, DiagnosticSeverity::Warning,
DiagnosticCode::RedundantRule, DiagnosticCode::RedundantRule,
format!( "Duplicate rule found".to_string(),
"Duplicate rule found (first occurrence at line {})", );
existing_idx + 1 diagnostics.push(diagnostic);
), } else {
); // Add the rule to the HashSet if it's not a duplicate
diagnostics.push(diagnostic); seen_rules.insert(trimmed.to_string());
break;
}
} }
rules.push(trimmed.to_string());
} }
} }