language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-30 22:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Build CommentRanges outside the parser (#11792)

Browse source 
## Summary

This PR updates the parser to remove building the `CommentRanges` and
instead it'll be built by the linter and the formatter when it's
required.

For the linter, it'll be built and owned by the `Indexer` while for the
formatter it'll be built from the `Tokens` struct and passed as an
argument.

## Test Plan

`cargo insta test`
This commit is contained in:
Dhruv Manilawala 2024-06-09 15:25:17 +05:30 • committed by GitHub
parent 7509a48eab
commit 549cc1e437
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 151 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/ruff_linter/src/linter.rs
View file

@ -88,7 +88,7 @@ pub fn check_path(
let mut error = None;
let tokens = parsed.tokens();
let comment_ranges = parsed.comment_ranges();
let comment_ranges = indexer.comment_ranges();
// Collect doc lines. This requires a rare mix of tokens (for comments) and AST
// (for docstrings), which demands special-casing at this level.
@ -105,7 +105,7 @@ pub fn check_path(
.any(|rule_code| rule_code.lint_source().is_tokens())
{
diagnostics.extend(check_tokens(
parsed,
tokens,
path,
locator,
indexer,
@ -218,12 +218,7 @@ pub fn check_path(
.any(|rule_code| rule_code.lint_source().is_physical_lines())
{
diagnostics.extend(check_physical_lines(
locator,
stylist,
indexer,
comment_ranges,
&doc_lines,
settings,
locator, stylist, indexer, &doc_lines, settings,
));
}
@ -385,7 +380,7 @@ pub fn add_noqa_to_path(
// Extract the `# noqa` and `# isort: skip` directives from the source.
let directives = directives::extract_directives(
&parsed,
parsed.tokens(),
directives::Flags::from_settings(settings),
&locator,
&indexer,
@ -428,7 +423,7 @@ pub fn add_noqa_to_path(
path,
&diagnostics,
&locator,
parsed.comment_ranges(),
indexer.comment_ranges(),
&settings.external,
&directives.noqa_line_for,
stylist.line_ending(),
@ -459,7 +454,7 @@ pub fn lint_only(
// Extract the `# noqa` and `# isort: skip` directives from the source.
let directives = directives::extract_directives(
&parsed,
parsed.tokens(),
directives::Flags::from_settings(settings),
&locator,
&indexer,
@ -550,7 +545,7 @@ pub fn lint_fix<'a>(
// Extract the `# noqa` and `# isort: skip` directives from the source.
let directives = directives::extract_directives(
&parsed,
parsed.tokens(),
directives::Flags::from_settings(settings),
&locator,
&indexer,