language-servers/tinymist
1
0
Fork 0
mirror of https://github.com/Myriad-Dreamin/tinymist.git synced 2025-11-22 12:34:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

refactor: rename local variables (cont.) (#1026)

Browse source
This commit is contained in:
Myriad-Dreamin 2024-12-18 19:48:34 +08:00 • committed by GitHub
parent 9017e05afa
commit de8e45a539
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
50 changed files with 837 additions and 814 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/tinymist-query/src/rename.rs
View file

@ -98,9 +98,9 @@ impl StatefulRequest for RenameRequest {
let mut edits = HashMap::new();
for i in references {
let uri = i.uri;
let range = i.range;
for loc in references {
let uri = loc.uri;
let range = loc.range;
let edits = edits.entry(uri).or_insert_with(Vec::new);
edits.push(TextEdit {
range,
@ -236,7 +236,7 @@ impl RenameFileWorker<'_> {
fn rename_module_path(&mut self, span: Span, r: &RefExpr, src: &Source) -> Option<TextEdit> {
let importing = r.root.as_ref()?.file_id();
if importing.map_or(true, |i| i != self.def_fid) {
if importing.map_or(true, |fid| fid != self.def_fid) {
return None;
}
crate::log_debug_ct!("import: {span:?} -> {importing:?} v.s. {:?}", self.def_fid);
@ -246,10 +246,11 @@ impl RenameFileWorker<'_> {
let import_node = root.find(span).and_then(deref_expr)?;
let (import_path, has_path_var) = node_ancestors(&import_node).find_map(|import_node| {
match import_node.cast::<ast::Expr>()? {
ast::Expr::Import(i) => {
Some((i.source(), i.new_name().is_none() && i.imports().is_none()))
}
ast::Expr::Include(i) => Some((i.source(), false)),
ast::Expr::Import(import) => Some((
import.source(),
import.new_name().is_none() && import.imports().is_none(),
)),
ast::Expr::Include(include) => Some((include.source(), false)),
_ => None,
}
})?;