Skip to content

perf: optimize scope finding in completion handler #342

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

perf: optimize scope finding in completion handler #342

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 7 additions & 19 deletions crates/cairo-m-ls/src/backend.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -993,26 +993,14 @@ impl LanguageServer for Backend {

let index = module_semantic_index(db.upcast(), crate_id, module_name).ok()?;

// Find the scope at the cursor position.
// TODO: This is inefficient. A better approach would be to have a query
// or a method on SemanticIndex to find the narrowest scope at an offset.
// Find the scope at the cursor position using the optimized SemanticIndex method.
let current_scope = {
let mut best_scope = index.root_scope();
let mut smallest_span_size = usize::MAX;

for (scope_id, _) in index.scopes() {
for (_, def) in index.definitions_in_scope(scope_id) {
if def.full_span.start <= offset && offset <= def.full_span.end {
let span_size = def.full_span.end - def.full_span.start;
if span_size < smallest_span_size {
smallest_span_size = span_size;
best_scope = Some(scope_id);
}
}
}
}

best_scope.or_else(|| index.root_scope())?
// Create a span for the cursor position
let cursor_span = chumsky::span::SimpleSpan::from(offset..offset);

// Use the efficient scope_for_span method
index.scope_for_span(cursor_span)
.or_else(|| index.root_scope())?
};

let mut items = Vec::new();
Expand Down
Loading