Skip to content

fix(linter): span disable directive correctly on next line #10141

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
Boshen merged 4 commits into from
Apr 1, 2025
Merged

fix(linter): span disable directive correctly on next line #10141

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce78ec2
span disable directive correctly on next line
ulrichstark Mar 30, 2025
27c36c1
add tests
ulrichstark Mar 31, 2025
5875fb5
handling multiple carriage returns was overengineered
ulrichstark Mar 31, 2025
95ed0c5
Update disable_directives.rs
ulrichstark Apr 1, 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
Prev Previous commit
Next Next commit
add tests
  • Loading branch information
@ulrichstark
ulrichstark committed Mar 31, 2025
commit 27c36c1705be7de5a626980329f29991b8f4fd3f
33 changes: 32 additions & 1 deletion crates/oxc_linter/src/disable_directives.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ semi*/
}

#[cfg(test)]
mod test_unused_directives {
mod tests {
use oxc_allocator::Allocator;
use oxc_ast::Comment;
use oxc_parser::Parser;
Expand Down Expand Up @@ -736,6 +736,17 @@ mod test_unused_directives {
}
}

fn test_directive_span(source_text: &str, expected_start: u32, expected_stop: u32) {
let allocator = Allocator::default();
let semantic = process_source(&allocator, source_text);
let directives =
DisableDirectivesBuilder::new().build(semantic.source_text(), semantic.comments());
let interval = &directives.intervals.intervals[0];

assert_eq!(interval.start, expected_start);
assert_eq!(interval.stop, expected_stop);
}

#[test]
fn unused_enable_all() {
test_directives(
Expand Down Expand Up @@ -900,4 +911,24 @@ mod test_unused_directives {
},
);
}

#[test]
fn next_line_spans() {
test_directive_span("// eslint-disable-next-line max-params", 38, 38);
test_directive_span("// eslint-disable-next-line max-params\n", 38, 39);
test_directive_span("// eslint-disable-next-line max-params\r\n", 38, 40);
test_directive_span("// eslint-disable-next-line max-params\r\r\n", 38, 41);

test_directive_span("// eslint-disable-next-line max-params \n", 42, 43);
test_directive_span("// eslint-disable-next-line max-params \r\n", 42, 44);
test_directive_span("// eslint-disable-next-line max-params \r\r\n", 42, 45);

test_directive_span("// eslint-disable-next-line max-params \nabc", 42, 46);
test_directive_span("// eslint-disable-next-line max-params \r\nabc", 42, 47);
test_directive_span("// eslint-disable-next-line max-params \r\r\nabc", 42, 48);

test_directive_span("// eslint-disable-next-line max-params \nabc\r\r\n", 42, 46);
test_directive_span("// eslint-disable-next-line max-params \r\nabc\r\r\n", 42, 47);
test_directive_span("// eslint-disable-next-line max-params \r\r\nabc\r\r\n", 42, 48);
}
}
Loading