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

Lazily compute ranges for class and function bindings (#1708)

Browse source 
This has a fairly significant performance impact (~320ms to ~307ms on
the CPython benchmark).
This commit is contained in:
Charlie Marsh 2023-01-06 22:55:13 -05:00 • committed by GitHub
parent 0527fb9335
commit 3abd205f94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/ast/helpers.rs
View file

@ -11,7 +11,7 @@ use rustpython_parser::lexer;
use rustpython_parser::lexer::Tok; use rustpython_parser::lexer::Tok;
use rustpython_parser::token::StringKind; use rustpython_parser::token::StringKind;
use crate::ast::types::Range; use crate::ast::types::{Binding, BindingKind, Range};
use crate::source_code_generator::SourceCodeGenerator; use crate::source_code_generator::SourceCodeGenerator;
use crate::source_code_style::SourceCodeStyleDetector; use crate::source_code_style::SourceCodeStyleDetector;
use crate::SourceCodeLocator; use crate::SourceCodeLocator;
@ -406,6 +406,22 @@ pub fn identifier_range(stmt: &Stmt, locator: &SourceCodeLocator) -> Range {
Range::from_located(stmt) Range::from_located(stmt)
} }
/// Like `identifier_range`, but accepts a `Binding`.
pub fn binding_range(binding: &Binding, locator: &SourceCodeLocator) -> Range {
if matches!(
binding.kind,
BindingKind::ClassDefinition | BindingKind::FunctionDefinition
) {
if let Some(source) = &binding.source {
identifier_range(source, locator)
} else {
binding.range
}
} else {
binding.range
}
}
// Return the ranges of `Name` tokens within a specified node. // Return the ranges of `Name` tokens within a specified node.
pub fn find_names<T>(located: &Located<T>, locator: &SourceCodeLocator) -> Vec<Range> { pub fn find_names<T>(located: &Located<T>, locator: &SourceCodeLocator) -> Vec<Range> {
let contents = locator.slice_source_code_range(&Range::from_located(located)); let contents = locator.slice_source_code_range(&Range::from_located(located));

10
src/checkers/ast.rs
View file

@ -15,7 +15,7 @@ use rustpython_parser::ast::{
use rustpython_parser::parser; use rustpython_parser::parser;
use crate::ast::helpers::{ use crate::ast::helpers::{
collect_call_paths, dealias_call_path, extract_handler_names, match_call_path, binding_range, collect_call_paths, dealias_call_path, extract_handler_names, match_call_path,
}; };
use crate::ast::operations::extract_all_names; use crate::ast::operations::extract_all_names;
use crate::ast::relocate::relocate_expr; use crate::ast::relocate::relocate_expr;
@ -560,7 +560,7 @@ where
Binding { Binding {
kind: BindingKind::FunctionDefinition, kind: BindingKind::FunctionDefinition,
used: None, used: None,
range: helpers::identifier_range(stmt, self.locator), range: Range::from_located(stmt),
source: Some(self.current_stmt().clone()), source: Some(self.current_stmt().clone()),
}, },
); );
@ -1544,7 +1544,7 @@ where
Binding { Binding {
kind: BindingKind::ClassDefinition, kind: BindingKind::ClassDefinition,
used: None, used: None,
range: helpers::identifier_range(stmt, self.locator), range: Range::from_located(stmt),
source: Some(self.current_stmt().clone()), source: Some(self.current_stmt().clone()),
}, },
); );
@ -3373,7 +3373,7 @@ impl<'a> Checker<'a> {
name.to_string(), name.to_string(),
existing.range.location.row(), existing.range.location.row(),
), ),
binding.range, binding_range(&binding, self.locator),
)); ));
} }
} }
@ -3935,7 +3935,7 @@ impl<'a> Checker<'a> {
(*name).to_string(), (*name).to_string(),
binding.range.location.row(), binding.range.location.row(),
), ),
self.bindings[*index].range, binding_range(&self.bindings[*index], self.locator),
)); ));
} }
} }