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.

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

fix(linter): find disabled directives using the message's Span. #4010

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/oxc_linter/src/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::{cell::RefCell, path::Path, rc::Rc, sync::Arc};
use oxc_cfg::ControlFlowGraph;
use oxc_diagnostics::{OxcDiagnostic, Severity};
use oxc_semantic::{AstNodes, JSDocFinder, ScopeTree, Semantic, SymbolTable};
use oxc_span::{SourceType, Span};
use oxc_span::{GetSpan, SourceType, Span};
use oxc_syntax::module_record::ModuleRecord;

use crate::{
Expand Down Expand Up @@ -157,7 +157,7 @@ impl<'a> LintContext<'a> {
}

fn add_diagnostic(&self, message: Message<'a>) {
if !self.disable_directives.contains(self.current_rule_name, message.start()) {
if !self.disable_directives.contains(self.current_rule_name, message.span()) {
let mut message = message;
if message.error.severity != self.severity {
message.error = message.error.with_severity(self.severity);
Expand Down
4 changes: 2 additions & 2 deletions crates/oxc_linter/src/disable_directives.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ pub struct DisableDirectives<'a> {
}

impl<'a> DisableDirectives<'a> {
pub fn contains(&self, rule_name: &'static str, start: u32) -> bool {
self.intervals.find(start, start + 1).any(|interval| {
pub fn contains(&self, rule_name: &'static str, span: Span) -> bool {
self.intervals.find(span.start, span.end).any(|interval| {
interval.val == DisabledRule::All
// Our rule name currently does not contain the prefix.
// For example, this will match `@typescript-eslint/no-var-requires` given
Expand Down
9 changes: 9 additions & 0 deletions crates/oxc_linter/src/fixer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,15 +189,24 @@ impl<'a> Message<'a> {
Self { error, start, end, fix, fixed: false }
}

#[inline]
pub fn start(&self) -> u32 {
self.start
}

#[inline]
pub fn end(&self) -> u32 {
self.end
}
}

impl<'a> GetSpan for Message<'a> {
#[inline]
fn span(&self) -> Span {
Span::new(self.start(), self.end())
}
}

/// The fixer of the code.
/// Note that our parser has handled the BOM, so we don't need to port the BOM test cases from `ESLint`.
pub struct Fixer<'a> {
Expand Down
9 changes: 8 additions & 1 deletion crates/oxc_linter/src/rules/unicorn/no_empty_file.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,13 @@ impl Rule for NoEmptyFile {
return;
}

ctx.diagnostic(no_empty_file_diagnostic(Span::new(0, 0)));
let mut span = program.span;
// only show diagnostic for the first 100 characters to avoid huge diagnostic messages with
// empty programs containing a bunch of comments.
// NOTE: if the enable/disable directives come after the first 100 characters they won't be
// respected by this diagnostic.
span.end = std::cmp::min(span.end, 100);
ctx.diagnostic(no_empty_file_diagnostic(span));
}
}

Expand Down Expand Up @@ -104,6 +110,7 @@ fn test() {
r"[]",
r"(() => {})()",
"(() => {})();",
"/* eslint-disable no-empty-file */",
];

let fail = vec![
Expand Down
45 changes: 22 additions & 23 deletions crates/oxc_linter/src/snapshots/no_empty_file.snap
Original file line number Diff line number Diff line change
Expand Up @@ -9,141 +9,140 @@ source: crates/oxc_linter/src/tester.rs
⚠ eslint-plugin-unicorn(no-empty-file): Empty files are not allowed.
╭─[no_empty_file.tsx:1:1]
1 │
·
·
╰────
help: Delete this file or add some code to it.

⚠ eslint-plugin-unicorn(no-empty-file): Empty files are not allowed.
╭─[no_empty_file.tsx:1:1]
1 │
·
· ────
╰────
help: Delete this file or add some code to it.

⚠ eslint-plugin-unicorn(no-empty-file): Empty files are not allowed.
╭─[no_empty_file.tsx:1:1]
1 │
·
·
╰────
help: Delete this file or add some code to it.

⚠ eslint-plugin-unicorn(no-empty-file): Empty files are not allowed.
╭─[no_empty_file.tsx:1:1]
0 │
·
·
╰────
help: Delete this file or add some code to it.

⚠ eslint-plugin-unicorn(no-empty-file): Empty files are not allowed.
╭─[no_empty_file.tsx:1:1]
1 │
·
·
╰────
help: Delete this file or add some code to it.

⚠ eslint-plugin-unicorn(no-empty-file): Empty files are not allowed.
╭─[no_empty_file.tsx:1:1]
1 │
· ▲
2 │
3 │
1 │ ╭─▶
2 │ │
3 │ ╰─▶
╰────
help: Delete this file or add some code to it.

⚠ eslint-plugin-unicorn(no-empty-file): Empty files are not allowed.
╭─[no_empty_file.tsx:1:1]
1 │ // comment
·
· ──────────
╰────
help: Delete this file or add some code to it.

⚠ eslint-plugin-unicorn(no-empty-file): Empty files are not allowed.
╭─[no_empty_file.tsx:1:1]
1 │ /* comment */
·
· ─────────────
╰────
help: Delete this file or add some code to it.

⚠ eslint-plugin-unicorn(no-empty-file): Empty files are not allowed.
╭─[no_empty_file.tsx:1:1]
1 │ #!/usr/bin/env node
·
· ───────────────────
╰────
help: Delete this file or add some code to it.

⚠ eslint-plugin-unicorn(no-empty-file): Empty files are not allowed.
╭─[no_empty_file.tsx:1:1]
1 │ 'use asm';
·
· ──────────
╰────
help: Delete this file or add some code to it.

⚠ eslint-plugin-unicorn(no-empty-file): Empty files are not allowed.
╭─[no_empty_file.tsx:1:1]
1 │ 'use strict';
·
· ─────────────
╰────
help: Delete this file or add some code to it.

⚠ eslint-plugin-unicorn(no-empty-file): Empty files are not allowed.
╭─[no_empty_file.tsx:1:1]
1 │ "use strict"
·
· ────────────
╰────
help: Delete this file or add some code to it.

⚠ eslint-plugin-unicorn(no-empty-file): Empty files are not allowed.
╭─[no_empty_file.tsx:1:1]
1 │ ""
·
· ──
╰────
help: Delete this file or add some code to it.

⚠ eslint-plugin-unicorn(no-empty-file): Empty files are not allowed.
╭─[no_empty_file.tsx:1:1]
1 │ ;
·
·
╰────
help: Delete this file or add some code to it.

⚠ eslint-plugin-unicorn(no-empty-file): Empty files are not allowed.
╭─[no_empty_file.tsx:1:1]
1 │ ;;
·
· ──
╰────
help: Delete this file or add some code to it.

⚠ eslint-plugin-unicorn(no-empty-file): Empty files are not allowed.
╭─[no_empty_file.tsx:1:1]
1 │ {}
·
· ──
╰────
help: Delete this file or add some code to it.

⚠ eslint-plugin-unicorn(no-empty-file): Empty files are not allowed.
╭─[no_empty_file.tsx:1:1]
1 │ {;;}
·
· ────
╰────
help: Delete this file or add some code to it.

⚠ eslint-plugin-unicorn(no-empty-file): Empty files are not allowed.
╭─[no_empty_file.tsx:1:1]
1 │ {{}}
·
· ────
╰────
help: Delete this file or add some code to it.

⚠ eslint-plugin-unicorn(no-empty-file): Empty files are not allowed.
╭─[no_empty_file.tsx:1:1]
1 │ "";
·
· ───
╰────
help: Delete this file or add some code to it.

⚠ eslint-plugin-unicorn(no-empty-file): Empty files are not allowed.
╭─[no_empty_file.tsx:1:1]
1 │ "use strict";
·
· ─────────────
╰────
help: Delete this file or add some code to it.
Loading