feat: implement it

Myriad-Dreamin · Myriad-Dreamin · commit a85a190910dc · 2025-08-09T18:40:30.000+08:00
diff --git a/crates/tinymist-analysis/src/syntax/matcher.rs b/crates/tinymist-analysis/src/syntax/matcher.rs
@@ -701,6 +701,16 @@ impl<'a> SyntaxClass<'a> {
             _ => None,
         }
     }
+
+    pub fn contains_error(&self) -> bool {
+        use SyntaxClass::*;
+        match self {
+            Label { is_error, .. } => *is_error,
+            Normal(kind, _) => *kind == SyntaxKind::Error,
+            Callee(..) | VarAccess(..) => self.node().kind() == SyntaxKind::Error,
+            Ref { .. } | ImportPath(..) | IncludePath(..) => false,
+        }
+    }
 }
 
 /// Classifies node's syntax (inner syntax) that can be operated on by IDE
diff --git a/crates/tinymist-query/src/fixtures/rename/label.typ b/crates/tinymist-query/src/fixtures/rename/label.typ
@@ -0,0 +1,7 @@
+/// compile: true
+
+#set heading(numbering: "1.")
+
+= Labeled <title_label>
+
+/* position after */ @title_label
diff --git a/crates/tinymist-query/src/fixtures/rename/label_indir.typ b/crates/tinymist-query/src/fixtures/rename/label_indir.typ
@@ -0,0 +1,5 @@
+/// compile: true
+
+#let test1(body) = figure(body)
+#test1([Test1]) <fig:test1>
+/* position after */ @fig:test1
diff --git a/crates/tinymist-query/src/fixtures/rename/label_indir2.typ b/crates/tinymist-query/src/fixtures/rename/label_indir2.typ
@@ -0,0 +1,9 @@
+/// compile: true
+
+#let test1(body) = figure(body)
+#test1([Test1]) <fig:test1>
+@fig:test1
+
+#let test2(body) = test1(body)
+#test2([Test2]) <fig:test2>
+/* position after */ @fig:test2
diff --git a/crates/tinymist-query/src/fixtures/rename/snaps/prepare@label.typ.snap b/crates/tinymist-query/src/fixtures/rename/snaps/prepare@label.typ.snap
@@ -0,0 +1,9 @@
+---
+source: crates/tinymist-query/src/prepare_rename.rs
+expression: "JsonRepr::new_redacted(result, &REDACT_LOC)"
+input_file: crates/tinymist-query/src/fixtures/rename/label.typ
+---
+{
+ "placeholder": "title_label",
+ "range": "6:21:6:33"
+}
diff --git a/crates/tinymist-query/src/fixtures/rename/snaps/prepare@label_indir.typ.snap b/crates/tinymist-query/src/fixtures/rename/snaps/prepare@label_indir.typ.snap
@@ -0,0 +1,9 @@
+---
+source: crates/tinymist-query/src/prepare_rename.rs
+expression: "JsonRepr::new_redacted(result, &REDACT_LOC)"
+input_file: crates/tinymist-query/src/fixtures/rename/label_indir.typ
+---
+{
+ "placeholder": "fig:test1",
+ "range": "4:21:4:31"
+}
diff --git a/crates/tinymist-query/src/fixtures/rename/snaps/prepare@label_indir2.typ.snap b/crates/tinymist-query/src/fixtures/rename/snaps/prepare@label_indir2.typ.snap
@@ -0,0 +1,9 @@
+---
+source: crates/tinymist-query/src/prepare_rename.rs
+expression: "JsonRepr::new_redacted(result, &REDACT_LOC)"
+input_file: crates/tinymist-query/src/fixtures/rename/label_indir2.typ
+---
+{
+ "placeholder": "fig:test2",
+ "range": "8:21:8:31"
+}
diff --git a/crates/tinymist-query/src/fixtures/rename/snaps/test@label.typ.snap b/crates/tinymist-query/src/fixtures/rename/snaps/test@label.typ.snap
@@ -0,0 +1,29 @@
+---
+source: crates/tinymist-query/src/rename.rs
+expression: "JsonRepr::new_redacted(result, &REDACT_LOC)"
+input_file: crates/tinymist-query/src/fixtures/rename/label.typ
+---
+{
+ "changeAnnotations": {
+  "Typst Rename Labels": {
+   "description": "The language server searched the labels ambiguously",
+   "label": "Typst Rename Labels",
+   "needsConfirmation": true
+  }
+ },
+ "documentChanges": [
+  {
+   "edits": [
+    {
+     "annotationId": "Typst Rename Labels",
+     "newText": "new_name",
+     "range": "6:21:6:33"
+    }
+   ],
+   "textDocument": {
+    "uri": "s0.typ",
+    "version": null
+   }
+  }
+ ]
+}
diff --git a/crates/tinymist-query/src/fixtures/rename/snaps/test@label_indir.typ.snap b/crates/tinymist-query/src/fixtures/rename/snaps/test@label_indir.typ.snap
@@ -0,0 +1,29 @@
+---
+source: crates/tinymist-query/src/rename.rs
+expression: "JsonRepr::new_redacted(result, &REDACT_LOC)"
+input_file: crates/tinymist-query/src/fixtures/rename/label_indir.typ
+---
+{
+ "changeAnnotations": {
+  "Typst Rename Labels": {
+   "description": "The language server searched the labels ambiguously",
+   "label": "Typst Rename Labels",
+   "needsConfirmation": true
+  }
+ },
+ "documentChanges": [
+  {
+   "edits": [
+    {
+     "annotationId": "Typst Rename Labels",
+     "newText": "new_name",
+     "range": "4:21:4:31"
+    }
+   ],
+   "textDocument": {
+    "uri": "s0.typ",
+    "version": null
+   }
+  }
+ ]
+}
diff --git a/crates/tinymist-query/src/fixtures/rename/snaps/test@label_indir2.typ.snap b/crates/tinymist-query/src/fixtures/rename/snaps/test@label_indir2.typ.snap
@@ -0,0 +1,29 @@
+---
+source: crates/tinymist-query/src/rename.rs
+expression: "JsonRepr::new_redacted(result, &REDACT_LOC)"
+input_file: crates/tinymist-query/src/fixtures/rename/label_indir2.typ
+---
+{
+ "changeAnnotations": {
+  "Typst Rename Labels": {
+   "description": "The language server searched the labels ambiguously",
+   "label": "Typst Rename Labels",
+   "needsConfirmation": true
+  }
+ },
+ "documentChanges": [
+  {
+   "edits": [
+    {
+     "annotationId": "Typst Rename Labels",
+     "newText": "new_name",
+     "range": "8:21:8:31"
+    }
+   ],
+   "textDocument": {
+    "uri": "s0.typ",
+    "version": null
+   }
+  }
+ ]
+}
diff --git a/crates/tinymist-query/src/prepare_rename.rs b/crates/tinymist-query/src/prepare_rename.rs
@@ -38,42 +38,53 @@ impl StatefulRequest for PrepareRenameRequest {
         let doc = graph.snap.success_doc.as_ref();
         let source = ctx.source_by_path(&self.path).ok()?;
         let syntax = ctx.classify_for_decl(&source, self.position)?;
-        if matches!(syntax.node().kind(), SyntaxKind::FieldAccess) {
-            // todo: rename field access
-            log::info!("prepare_rename: field access is not a definition site");
+        if bad_syntax(&syntax) {
             return None;
         }
 
         let origin_selection_range = ctx.to_lsp_range(syntax.node().range(), &source);
         let def = ctx.def_of_syntax(&source, doc, syntax.clone())?;
 
-        let (name, range) = prepare_renaming(&syntax, &def)?;
+        let name = prepare_renaming(&syntax, &def)?;
 
         Some(PrepareRenameResponse::RangeWithPlaceholder {
-            range: range.unwrap_or(origin_selection_range),
+            range: origin_selection_range,
             placeholder: name,
         })
     }
 }
 
-pub(crate) fn prepare_renaming(
-    deref_target: &SyntaxClass,
-    def: &Definition,
-) -> Option<(String, Option<LspRange>)> {
-    let name = def.name().clone();
+fn bad_syntax(syntax: &SyntaxClass) -> bool {
+    if matches!(syntax.node().kind(), SyntaxKind::FieldAccess) {
+        // todo: rename field access
+        log::info!("prepare_rename: field access is not a definition site");
+        return true;
+    }
+
+    if syntax.contains_error() {
+        return true;
+    }
+
+    false
+}
+
+pub(crate) fn prepare_renaming(syntax: &SyntaxClass, def: &Definition) -> Option<String> {
+    if bad_syntax(syntax) {
+        return None;
+    }
+
     let def_fid = def.file_id()?;
 
     if WorkspaceResolver::is_package_file(def_fid) {
         crate::log_debug_ct!(
-            "prepare_rename: {name} is in a package {pkg:?}",
+            "prepare_rename: is in a package {pkg:?}, def: {def:?}",
             pkg = def_fid.package(),
         );
         return None;
     }
 
-    let var_rename = || Some((name.to_string(), None));
+    let decl_name = || def.name().clone().to_string();
 
-    crate::log_debug_ct!("prepare_rename: {name}");
     use Decl::*;
     match def.decl.as_ref() {
         // Cannot rename headings or blocks
@@ -82,21 +93,17 @@ pub(crate) fn prepare_renaming(
         // LexicalKind::Mod(Star) => None,
         // Cannot rename expression import
         // LexicalKind::Mod(Module(ModSrc::Expr(..))) => None,
-        Var(..) => var_rename(),
-        Func(..) | Closure(..) => validate_fn_renaming(def).map(|_| (name.to_string(), None)),
+        Var(..) | Label(..) | ContentRef(..) => Some(decl_name()),
+        Func(..) | Closure(..) => validate_fn_renaming(def).map(|_| decl_name()),
         Module(..) | ModuleAlias(..) | PathStem(..) | ImportPath(..) | IncludePath(..)
         | ModuleImport(..) => {
-            let node = deref_target.node().get().clone();
+            let node = syntax.node().get().clone();
             let path = node.cast::<ast::Str>()?;
             let name = path.get().to_string();
-            Some((name, None))
+            Some(name)
         }
         // todo: bibkey renaming
         BibEntry(..) => None,
-        Label(..) | ContentRef(..) => {
-            // todo: label renaming
-            None
-        }
         ImportAlias(..) | Constant(..) | IdentRef(..) | Import(..) | StrName(..) | Spread(..) => {
             None
         }
@@ -139,13 +146,16 @@ mod tests {
         snapshot_testing("rename", &|ctx, path| {
             let source = ctx.source_by_path(&path).unwrap();
 
+            let docs = find_module_level_docs(&source).unwrap_or_default();
+            let properties = get_test_properties(&docs);
+            let graph = compile_doc_for_test(ctx, &properties);
+
             let request = PrepareRenameRequest {
                 path: path.clone(),
                 position: find_test_position(&source),
             };
-            let snap = WorldComputeGraph::from_world(ctx.world.clone());
 
-            let result = request.request(ctx, snap);
+            let result = request.request(ctx, graph);
             assert_snapshot!(JsonRepr::new_redacted(result, &REDACT_LOC));
         });
     }
diff --git a/crates/tinymist-query/src/rename.rs b/crates/tinymist-query/src/rename.rs
diff --git a/crates/tinymist-query/src/will_rename_files.rs b/crates/tinymist-query/src/will_rename_files.rs

Original file line number	Diff line number	Diff line change
`@@ -701,6 +701,16 @@ impl<'a> SyntaxClass<'a> {`
`701`	`701`	`_ => None,`
`702`	`702`	`}`
`703`	`703`	`}`
	`704`	`+`
	`705`	`+ pub fn contains_error(&self) -> bool {`
	`706`	`+ use SyntaxClass::*;`
	`707`	`+ match self {`
	`708`	`+ Label { is_error, .. } => *is_error,`
	`709`	`+ Normal(kind, _) => *kind == SyntaxKind::Error,`
	`710`	`+ Callee(..) \| VarAccess(..) => self.node().kind() == SyntaxKind::Error,`
	`711`	`+ Ref { .. } \| ImportPath(..) \| IncludePath(..) => false,`
	`712`	`+ }`
	`713`	`+ }`
`704`	`714`	`}`
`705`	`715`
`706`	`716`	`/// Classifies node's syntax (inner syntax) that can be operated on by IDE`