Merge pull request #18373 from Veykril/veykril/push-mzumrrvynxqu

internal: Merge separate inlay hints targeting same range
rust-lang · Oct 22, 2024 · b35d93c · b35d93c
2 parents 1b00f08 + 3ae93bc
commit b35d93c
Show file tree

Hide file tree

Showing 4 changed files with 153 additions and 246 deletions.
diff --git a/crates/ide/src/inlay_hints.rs b/crates/ide/src/inlay_hints.rs
@@ -475,6 +475,18 @@ impl InlayHintLabel {
         }
     }
 
+    pub fn append_part(&mut self, part: InlayHintLabelPart) {
+        if part.linked_location.is_none() && part.tooltip.is_none() {
+            if let Some(InlayHintLabelPart { text, linked_location: None, tooltip: None }) =
+                self.parts.last_mut()
+            {
+                text.push_str(&part.text);
+                return;
+            }
+        }
+        self.parts.push(part);
+    }
+
     pub fn needs_resolve(&self) -> bool {
         self.parts.iter().any(|part| part.linked_location.is_some() || part.tooltip.is_some())
     }