mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-10-01 14:21:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

[ty] Move query filtering outside of symbol visitor

Browse source 
This is prep work for turning this into a Salsa query.
Specifically, we don't want the Salsa query to be
dependent upon the query string.
This commit is contained in:
Andrew Gallant 2025-08-21 13:48:46 -04:00 • committed by Andrew Gallant
parent 06dbec8479
commit ad8c98117a
1 changed files with 26 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

55
crates/ty_ide/src/symbols.rs
View file

@ -86,7 +86,11 @@ pub(crate) fn symbols_for_file(
let mut visitor = SymbolVisitor::new(options);
visitor.visit_body(&module.syntax().body);
visitor.symbols
let mut symbols = visitor.symbols;
if let Some(ref query) = options.query_string {
symbols.retain(|symbol| is_pattern_in_symbol(query, &symbol.name));
}
symbols
}
struct SymbolVisitor<'a> {
@ -115,13 +119,6 @@ impl<'a> SymbolVisitor<'a> {
}
fn add_symbol(&mut self, symbol: SymbolInfo) {
// Filter by query string if provided
if let Some(ref query) = self.options.query_string {
if !Self::is_pattern_in_symbol(query, &symbol.name) {
return;
}
}
if self.options.hierarchical {
if let Some(parent) = self.symbol_stack.last_mut() {
parent.children.push(symbol);
@ -152,27 +149,6 @@ impl<'a> SymbolVisitor<'a> {
fn is_constant_name(name: &str) -> bool {
name.chars().all(|c| c.is_ascii_uppercase() || c == '_')
}
/// Returns true if symbol name contains all characters in the query
/// string in order. The comparison is case insensitive.
fn is_pattern_in_symbol(query_string: &str, symbol_name: &str) -> bool {
let typed_lower = query_string.to_lowercase();
let symbol_lower = symbol_name.to_lowercase();
let typed_chars: Vec<char> = typed_lower.chars().collect();
let symbol_chars: Vec<char> = symbol_lower.chars().collect();
let mut typed_pos = 0;
let mut symbol_pos = 0;
while typed_pos < typed_chars.len() && symbol_pos < symbol_chars.len() {
if typed_chars[typed_pos] == symbol_chars[symbol_pos] {
typed_pos += 1;
}
symbol_pos += 1;
}
typed_pos == typed_chars.len()
}
}
impl SourceOrderVisitor<'_> for SymbolVisitor<'_> {
@ -307,3 +283,24 @@ impl SourceOrderVisitor<'_> for SymbolVisitor<'_> {
}
}
}
/// Returns true if symbol name contains all characters in the query
/// string in order. The comparison is case insensitive.
fn is_pattern_in_symbol(query_string: &str, symbol_name: &str) -> bool {
let typed_lower = query_string.to_lowercase();
let symbol_lower = symbol_name.to_lowercase();
let typed_chars: Vec<char> = typed_lower.chars().collect();
let symbol_chars: Vec<char> = symbol_lower.chars().collect();
let mut typed_pos = 0;
let mut symbol_pos = 0;
while typed_pos < typed_chars.len() && symbol_pos < symbol_chars.len() {
if typed_chars[typed_pos] == symbol_chars[symbol_pos] {
typed_pos += 1;
}
symbol_pos += 1;
}
typed_pos == typed_chars.len()
}