Skip to content

Commit

Permalink
Revert
Browse files Browse the repository at this point in the history
  • Loading branch information
@charliermarsh
charliermarsh committed Jul 6, 2023
1 parent 35f3dc3 commit 28d0adf
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 163 deletions.
11 changes: 0 additions & 11 deletions Cargo.lock
View file

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

8 changes: 1 addition & 7 deletions crates/ruff/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ruff_rustpython = { path = "../ruff_rustpython" }
ruff_text_size = { workspace = true }
ruff_textwrap = { path = "../ruff_textwrap" }

aho-corasick = {version = "1.0.2"}
aho-corasick = { version = "1.0.2" }
annotate-snippets = { version = "0.9.1", features = ["color"] }
anyhow = { workspace = true }
bitflags = { workspace = true }
Expand Down Expand Up @@ -79,8 +79,6 @@ toml = { workspace = true }
typed-arena = { version = "2.0.2" }
unicode-width = { version = "0.1.10" }
unicode_names2 = { version = "0.6.0", git = "https://github.com/youknowone/unicode_names2.git", rev = "4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde" }
unicase = "2.6.0"
criterion = "0.5.1"

[dev-dependencies]
insta = { workspace = true }
Expand All @@ -94,7 +92,3 @@ default = []
schemars = ["dep:schemars"]
# Enables the UnreachableCode rule
unreachable-code = []

[[bench]]
name = "benchmark"
harness = false
58 changes: 0 additions & 58 deletions crates/ruff/benches/benchmark.rs
View file

This file was deleted.

2 changes: 1 addition & 1 deletion crates/ruff/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pub mod line_width;
pub mod linter;
pub mod logging;
pub mod message;
pub mod noqa;
mod noqa;
pub mod packaging;
pub mod pyproject_toml;
pub mod registry;
Expand Down
105 changes: 19 additions & 86 deletions crates/ruff/src/noqa.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ use log::warn;
use once_cell::sync::Lazy;
use ruff_text_size::{TextLen, TextRange, TextSize};
use rustpython_parser::ast::Ranged;
use unicase::UniCase;

use ruff_diagnostics::Diagnostic;
use ruff_python_ast::source_code::Locator;
Expand All @@ -31,7 +30,7 @@ static NOQA_MATCHER: Lazy<AhoCorasick> = Lazy::new(|| {
/// A directive to ignore a set of rules for a given line of Python source code (e.g.,
/// `# noqa: F401, F841`).
#[derive(Debug)]
pub enum Directive<'a> {
pub(crate) enum Directive<'a> {
/// The `noqa` directive ignores all rules (e.g., `# noqa`).
All(All),
/// The `noqa` directive ignores specific rules (e.g., `# noqa: F401, F841`).
Expand All @@ -40,23 +39,25 @@ pub enum Directive<'a> {

impl<'a> Directive<'a> {
/// Extract the noqa `Directive` from a line of Python source code.
pub fn try_extract(text: &'a str, offset: TextSize) -> Option<Self> {
pub(crate) fn try_extract(text: &'a str, offset: TextSize) -> Option<Self> {
for mat in NOQA_MATCHER.find_iter(text) {
let mut comment_start = mat.start();
let noqa_literal_start = mat.start();

// Determine the start of the comment.
let mut comment_start = noqa_literal_start;

// Trim any whitespace between the `#` character and the `noqa` literal.
comment_start -= text[..comment_start].len() - text[..comment_start].trim_end().len();

// The next character has to be the `#` character.
if !text[..comment_start].ends_with('#') {
if text[..comment_start].ends_with('#') {
comment_start -= 1;
} else {
continue;
}

// The start of the `#` character.
comment_start -= 1;

// If the next character is `:`, then it's a list of codes. Otherwise, it's an `all`
// directive.
// If the next character is `:`, then it's a list of codes. Otherwise, it's a directive
// to ignore all rules.
let noqa_literal_end = mat.end();
return Some(if text[noqa_literal_end..].starts_with(':') {
// E.g., `# noqa: F401, F841`.
Expand Down Expand Up @@ -116,7 +117,9 @@ impl<'a> Directive<'a> {

/// Lex an individual rule code (e.g., `F401`).
fn lex_code(text: &str) -> Option<&str> {
// Extract, e.g., the `F` in `F401`.
let prefix = text.chars().take_while(char::is_ascii_uppercase).count();
// Extract, e.g., the `401` in `F401`.
let suffix = text[prefix..]
.chars()
.take_while(char::is_ascii_digit)
Expand All @@ -130,7 +133,7 @@ impl<'a> Directive<'a> {
}

#[derive(Debug)]
pub struct All {
pub(crate) struct All {
range: TextRange,
}

Expand All @@ -142,7 +145,7 @@ impl Ranged for All {
}

#[derive(Debug)]
pub struct Codes<'a> {
pub(crate) struct Codes<'a> {
range: TextRange,
codes: Vec<&'a str>,
}
Expand Down Expand Up @@ -233,7 +236,7 @@ impl FileExemption {
/// [`FileExemption`], but only for a single line, as opposed to an aggregated set of exemptions
/// across a source file.
#[derive(Debug)]
pub enum ParsedFileExemption<'a> {
pub(crate) enum ParsedFileExemption<'a> {
/// No file-level exemption was found.
None,
/// The file-level exemption ignores all rules (e.g., `# ruff: noqa`).
Expand All @@ -244,77 +247,7 @@ pub enum ParsedFileExemption<'a> {

impl<'a> ParsedFileExemption<'a> {
/// Return a [`ParsedFileExemption`] for a given comment line.
pub fn parse(line: &'a str) -> Self {
let line = line.trim_whitespace_start();

if line.len() >= "# flake8: noqa".len() {
if UniCase::new(&line[.."# flake8: noqa".len()]) == UniCase::new("# flake8: noqa") {
return Self::All;
}
}

if line.len() >= "# ruff: noqa".len() {
if UniCase::new(&line[.."# ruff: noqa".len()]) == UniCase::new("# ruff: noqa") {
let remainder = &line["# ruff: noqa".len()..];
if remainder.is_empty() {
return Self::All;
} else if let Some(codes) = remainder.strip_prefix(':') {
let codes = codes
.split(|c: char| c.is_whitespace() || c == ',')
.map(str::trim)
.filter(|code| !code.is_empty())
.collect_vec();
if codes.is_empty() {
warn!("Expected rule codes on `noqa` directive: \"{line}\"");
}
return Self::Codes(codes);
}
}
}

Self::None
}

/// Return a [`ParsedFileExemption`] for a given comment line.
pub fn matches(line: &'a str) -> Self {
let line = line.trim_whitespace_start();

if line.len() >= "# flake8: noqa".len() {
if matches!(
&line[.."# flake8: noqa".len()],
"# flake8: noqa" | "# flake8: NOQA" | "# flake8: NoQA"
) {
return Self::All;
}
}

if line.len() >= "# ruff: noqa".len() {
if matches!(
&line[.."# ruff: noqa".len()],
"# ruff: noqa" | "# ruff: NOQA" | "# ruff: NoQA"
) {
let remainder = &line["# ruff: noqa".len()..];
if remainder.is_empty() {
return Self::All;
} else if let Some(codes) = remainder.strip_prefix(':') {
let codes = codes
.split(|c: char| c.is_whitespace() || c == ',')
.map(str::trim)
.filter(|code| !code.is_empty())
.collect_vec();
if codes.is_empty() {
warn!("Expected rule codes on `noqa` directive: \"{line}\"");
}
return Self::Codes(codes);
}
}
}

Self::None
}

/// Return a [`ParsedFileExemption`] for a given comment line.
pub fn extract(line: &'a str) -> Self {
pub(crate) fn extract(line: &'a str) -> Self {
let line = line.trim_whitespace_start();

if line.starts_with("# flake8: noqa")
Expand Down Expand Up @@ -621,7 +554,7 @@ impl NoqaMapping {
}

/// Returns the re-mapped position or `position` if no mapping exists.
pub fn resolve(&self, offset: TextSize) -> TextSize {
pub(crate) fn resolve(&self, offset: TextSize) -> TextSize {
let index = self.ranges.binary_search_by(|range| {
if range.end() < offset {
std::cmp::Ordering::Less
Expand All @@ -639,7 +572,7 @@ impl NoqaMapping {
}
}

pub fn push_mapping(&mut self, range: TextRange) {
pub(crate) fn push_mapping(&mut self, range: TextRange) {
if let Some(last_range) = self.ranges.last_mut() {
// Strictly sorted insertion
if last_range.end() <= range.start() {
Expand Down

0 comments on commit 28d0adf

Please sign in to comment.