From 83f939991583f5c6c2b250ef080e863a7c520e40 Mon Sep 17 00:00:00 2001
From: Myriad-Dreamin <camiyoru@gmail.com>
Date: Mon, 31 Mar 2025 00:52:08 +0800
Subject: [PATCH 1/8] Add tests about label precison

---
 crates/typst-ide/src/definition.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/crates/typst-ide/src/definition.rs b/crates/typst-ide/src/definition.rs
index 69d702b3b..a54329892 100644
--- a/crates/typst-ide/src/definition.rs
+++ b/crates/typst-ide/src/definition.rs
@@ -182,6 +182,12 @@ mod tests {
     #[test]
     fn test_definition_ref() {
         test("#figure[] <hi> See @hi", -2, Side::After).must_be_at("main.typ", 1..9);
+        let source =
+            r#"#let test1(body) = figure(body); #test1([Test1]) <fig:test1> @fig:test1"#;
+        test(source, -2, Side::After).must_be_at("main.typ", 19..31);
+        let source = r#"#let test1(body) = figure(body); #test1([Test1]) <fig:test1> @fig:test1
+#let test2(body) = test1(body); #test2([Test2]) <fig:test2>; @fig:test2"#;
+        test(source, -2, Side::After).must_be_at("main.typ", 19..31);
     }
 
     #[test]

From 8a7a4d154d71046df47571c1121f6c8700ebe4a4 Mon Sep 17 00:00:00 2001
From: Myriad-Dreamin <camiyoru@gmail.com>
Date: Mon, 7 Oct 2024 11:55:29 +0800
Subject: [PATCH 2/8] feat: record label position

---
 crates/typst-eval/src/markup.rs                 |  2 +-
 crates/typst-library/src/foundations/content.rs | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/crates/typst-eval/src/markup.rs b/crates/typst-eval/src/markup.rs
index 5beefa912..22b413d66 100644
--- a/crates/typst-eval/src/markup.rs
+++ b/crates/typst-eval/src/markup.rs
@@ -62,7 +62,7 @@ fn eval_markup<'a>(
                             ));
                         }
 
-                        *elem = std::mem::take(elem).labelled(label);
+                        *elem = std::mem::take(elem).labelled(label, expr.span());
                     } else {
                         vm.engine.sink.warn(warning!(
                             expr.span(),
diff --git a/crates/typst-library/src/foundations/content.rs b/crates/typst-library/src/foundations/content.rs
index daf6c2dd9..827c654c8 100644
--- a/crates/typst-library/src/foundations/content.rs
+++ b/crates/typst-library/src/foundations/content.rs
@@ -82,6 +82,8 @@ pub struct Content {
 struct Inner<T: ?Sized + 'static> {
     /// An optional label attached to the element.
     label: Option<Label>,
+    /// The span where the label is attached.
+    labelled_at: Span,
     /// The element's location which identifies it in the layouted output.
     location: Option<Location>,
     /// Manages the element during realization.
@@ -101,6 +103,7 @@ impl Content {
                 label: None,
                 location: None,
                 lifecycle: SmallBitSet::new(),
+                labelled_at: Span::detached(),
                 elem: elem.into(),
             }),
             span: Span::detached(),
@@ -135,9 +138,16 @@ impl Content {
         self.inner.label
     }
 
-    /// Attach a label to the content.
-    pub fn labelled(mut self, label: Label) -> Self {
-        self.set_label(label);
+    /// Get the span where the label is attached.
+    pub fn labelled_at(&self) -> Span {
+        self.inner.labelled_at
+    }
+
+    /// Set the label of the content.
+    pub fn labelled(mut self, label: Label, labelled_at: Span) -> Self {
+        let m = self.make_mut();
+        m.label = Some(label);
+        m.labelled_at = labelled_at;
         self
     }
 
@@ -742,6 +752,7 @@ impl<T: NativeElement> Bounds for T {
                 location: inner.location,
                 lifecycle: inner.lifecycle.clone(),
                 elem: LazyHash::reuse(self.clone(), &inner.elem),
+                labelled_at: inner.labelled_at,
             }),
             span,
         }

From 4a60f26a229c7d1f384e2bd2570d0b6a3ee1f1c6 Mon Sep 17 00:00:00 2001
From: Myriad-Dreamin <camiyoru@gmail.com>
Date: Mon, 31 Mar 2025 00:46:09 +0800
Subject: [PATCH 3/8] Precisely find label definition

---
 crates/typst-ide/src/definition.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/crates/typst-ide/src/definition.rs b/crates/typst-ide/src/definition.rs
index a54329892..1ba198b02 100644
--- a/crates/typst-ide/src/definition.rs
+++ b/crates/typst-ide/src/definition.rs
@@ -75,7 +75,10 @@ pub fn definition(
             let label = Label::new(PicoStr::intern(node.cast::<ast::Ref>()?.target()));
             let selector = Selector::Label(label);
             let elem = document?.introspector.query_first(&selector)?;
-            return Some(Definition::Span(elem.span()));
+            let labelled_at = elem.labelled_at().or(elem.span());
+            if !labelled_at.is_detached() {
+                return Some(Definition::Span(labelled_at));
+            }
         }
 
         _ => {}

From 9cf58c7967b5428f0619487174e8acd65c0468d7 Mon Sep 17 00:00:00 2001
From: Myriad-Dreamin <camiyoru@gmail.com>
Date: Mon, 31 Mar 2025 00:54:29 +0800
Subject: [PATCH 4/8] Update tests

---
 crates/typst-ide/src/definition.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/typst-ide/src/definition.rs b/crates/typst-ide/src/definition.rs
index 1ba198b02..7080f6d44 100644
--- a/crates/typst-ide/src/definition.rs
+++ b/crates/typst-ide/src/definition.rs
@@ -184,13 +184,13 @@ mod tests {
 
     #[test]
     fn test_definition_ref() {
-        test("#figure[] <hi> See @hi", -2, Side::After).must_be_at("main.typ", 1..9);
+        test("#figure[] <hi> See @hi", -2, Side::After).must_be_at("main.typ", 10..14);
         let source =
             r#"#let test1(body) = figure(body); #test1([Test1]) <fig:test1> @fig:test1"#;
-        test(source, -2, Side::After).must_be_at("main.typ", 19..31);
+        test(source, -2, Side::After).must_be_at("main.typ", 49..60);
         let source = r#"#let test1(body) = figure(body); #test1([Test1]) <fig:test1> @fig:test1
 #let test2(body) = test1(body); #test2([Test2]) <fig:test2>; @fig:test2"#;
-        test(source, -2, Side::After).must_be_at("main.typ", 19..31);
+        test(source, -2, Side::After).must_be_at("main.typ", 120..131);
     }
 
     #[test]

From b64505fff89ecc0df4fe67e90a98b9bf10ca3097 Mon Sep 17 00:00:00 2001
From: Myriad-Dreamin <camiyoru@gmail.com>
Date: Mon, 31 Mar 2025 01:06:01 +0800
Subject: [PATCH 5/8] Fix comment

---
 .../typst-library/src/foundations/content.rs  | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/crates/typst-library/src/foundations/content.rs b/crates/typst-library/src/foundations/content.rs
index 827c654c8..d9b22b417 100644
--- a/crates/typst-library/src/foundations/content.rs
+++ b/crates/typst-library/src/foundations/content.rs
@@ -143,7 +143,7 @@ impl Content {
         self.inner.labelled_at
     }
 
-    /// Set the label of the content.
+    /// Attach a label to the content.
     pub fn labelled(mut self, label: Label, labelled_at: Span) -> Self {
         let m = self.make_mut();
         m.label = Some(label);
@@ -547,10 +547,10 @@ impl Content {
 
 #[scope]
 impl Content {
-    /// The content's element function. This function can be used to create the element
-    /// contained in this content. It can be used in set and show rules for the
-    /// element. Can be compared with global functions to check whether you have
-    /// a specific
+    /// The content's element function. This function can be used to create the
+    /// element contained in this content. It can be used in set and show
+    /// rules for the element. Can be compared with global functions to
+    /// check whether you have a specific
     /// kind of element.
     #[func]
     pub fn func(&self) -> Element {
@@ -882,10 +882,10 @@ impl<T: NativeElement> Deref for Packed<T> {
 
     fn deref(&self) -> &Self::Target {
         // Safety:
-        // - Packed<T> guarantees that the content trait object wraps
-        //   an element of type `T`.
-        // - This downcast works the same way as dyn Any's does. We can't reuse
-        //   that one because we don't want to pay the cost for every deref.
+        // - Packed<T> guarantees that the content trait object wraps an element of type
+        //   `T`.
+        // - This downcast works the same way as dyn Any's does. We can't reuse that one
+        //   because we don't want to pay the cost for every deref.
         let elem = &*self.0.inner.elem;
         unsafe { &*(elem as *const dyn Bounds as *const T) }
     }
@@ -894,11 +894,11 @@ impl<T: NativeElement> Deref for Packed<T> {
 impl<T: NativeElement> DerefMut for Packed<T> {
     fn deref_mut(&mut self) -> &mut Self::Target {
         // Safety:
-        // - Packed<T> guarantees that the content trait object wraps
-        //   an element of type `T`.
+        // - Packed<T> guarantees that the content trait object wraps an element of type
+        //   `T`.
         // - We have guaranteed unique access thanks to `make_mut`.
-        // - This downcast works the same way as dyn Any's does. We can't reuse
-        //   that one because we don't want to pay the cost for every deref.
+        // - This downcast works the same way as dyn Any's does. We can't reuse that one
+        //   because we don't want to pay the cost for every deref.
         let elem = &mut *self.0.make_mut().elem;
         unsafe { &mut *(elem as *mut dyn Bounds as *mut T) }
     }

From 747a4a0f0d20156beab99e1f23c1d5ade99e48cb Mon Sep 17 00:00:00 2001
From: Myriad-Dreamin <camiyoru@gmail.com>
Date: Mon, 31 Mar 2025 02:35:36 +0800
Subject: [PATCH 6/8] fix: revert comment changes

---
 crates/typst-library/src/foundations/content.rs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/crates/typst-library/src/foundations/content.rs b/crates/typst-library/src/foundations/content.rs
index d9b22b417..4352cd7c8 100644
--- a/crates/typst-library/src/foundations/content.rs
+++ b/crates/typst-library/src/foundations/content.rs
@@ -547,11 +547,10 @@ impl Content {
 
 #[scope]
 impl Content {
-    /// The content's element function. This function can be used to create the
-    /// element contained in this content. It can be used in set and show
-    /// rules for the element. Can be compared with global functions to
-    /// check whether you have a specific
-    /// kind of element.
+    /// The content's element function. This function can be used to create the element
+    /// contained in this content. It can be used in set and show rules for the
+    /// element. Can be compared with global functions to check whether you have
+    /// a specific kind of element.
     #[func]
     pub fn func(&self) -> Element {
         self.elem()
@@ -882,8 +881,8 @@ impl<T: NativeElement> Deref for Packed<T> {
 
     fn deref(&self) -> &Self::Target {
         // Safety:
-        // - Packed<T> guarantees that the content trait object wraps an element of type
-        //   `T`.
+        // - Packed<T> guarantees that the content trait object wraps
+        //   an element of type `T`.
         // - This downcast works the same way as dyn Any's does. We can't reuse that one
         //   because we don't want to pay the cost for every deref.
         let elem = &*self.0.inner.elem;
@@ -897,8 +896,8 @@ impl<T: NativeElement> DerefMut for Packed<T> {
         // - Packed<T> guarantees that the content trait object wraps an element of type
         //   `T`.
         // - We have guaranteed unique access thanks to `make_mut`.
-        // - This downcast works the same way as dyn Any's does. We can't reuse that one
-        //   because we don't want to pay the cost for every deref.
+        // - This downcast works the same way as dyn Any's does. We can't reuse
+        //   that one because we don't want to pay the cost for every deref.
         let elem = &mut *self.0.make_mut().elem;
         unsafe { &mut *(elem as *mut dyn Bounds as *mut T) }
     }

From bc26103f42ada904f51099237b5e68dea5fbfe22 Mon Sep 17 00:00:00 2001
From: Myriad-Dreamin <camiyoru@gmail.com>
Date: Mon, 31 Mar 2025 02:36:32 +0800
Subject: [PATCH 7/8] Revert comment changes

---
 crates/typst-library/src/foundations/content.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/typst-library/src/foundations/content.rs b/crates/typst-library/src/foundations/content.rs
index 4352cd7c8..448e4248b 100644
--- a/crates/typst-library/src/foundations/content.rs
+++ b/crates/typst-library/src/foundations/content.rs
@@ -883,8 +883,8 @@ impl<T: NativeElement> Deref for Packed<T> {
         // Safety:
         // - Packed<T> guarantees that the content trait object wraps
         //   an element of type `T`.
-        // - This downcast works the same way as dyn Any's does. We can't reuse that one
-        //   because we don't want to pay the cost for every deref.
+        // - This downcast works the same way as dyn Any's does. We can't reuse
+        //   that one because we don't want to pay the cost for every deref.
         let elem = &*self.0.inner.elem;
         unsafe { &*(elem as *const dyn Bounds as *const T) }
     }
@@ -893,8 +893,8 @@ impl<T: NativeElement> Deref for Packed<T> {
 impl<T: NativeElement> DerefMut for Packed<T> {
     fn deref_mut(&mut self) -> &mut Self::Target {
         // Safety:
-        // - Packed<T> guarantees that the content trait object wraps an element of type
-        //   `T`.
+        // - Packed<T> guarantees that the content trait object wraps
+        //   an element of type `T`.
         // - We have guaranteed unique access thanks to `make_mut`.
         // - This downcast works the same way as dyn Any's does. We can't reuse
         //   that one because we don't want to pay the cost for every deref.

From f06e591144d2c1093e9cc21b545bbea30708b6c5 Mon Sep 17 00:00:00 2001
From: Myriad-Dreamin <camiyoru@gmail.com>
Date: Mon, 31 Mar 2025 02:37:20 +0800
Subject: [PATCH 8/8] Reorder init

---
 crates/typst-library/src/foundations/content.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/typst-library/src/foundations/content.rs b/crates/typst-library/src/foundations/content.rs
index 448e4248b..f240fe7d1 100644
--- a/crates/typst-library/src/foundations/content.rs
+++ b/crates/typst-library/src/foundations/content.rs
@@ -101,9 +101,9 @@ impl Content {
         Self {
             inner: Arc::new(Inner {
                 label: None,
+                labelled_at: Span::detached(),
                 location: None,
                 lifecycle: SmallBitSet::new(),
-                labelled_at: Span::detached(),
                 elem: elem.into(),
             }),
             span: Span::detached(),