Merge branch 'main' into rename-element-traits

# Conflicts: # crates/gpui2/src/elements/uniform_list.rs # crates/ui2/src/components/context_menu.rs # crates/ui2/src/components/list.rs
2023-11-23 12:47:46 +01:00 · 2023-11-23 12:47:46 +01:00 · 3b918bfee8
commit 3b918bfee8
parent c23f17ee0b f33c0e80a6
34 changed files with 592 additions and 326 deletions
--- a/crates/diagnostics2/src/diagnostics.rs
+++ b/crates/diagnostics2/src/diagnostics.rs
@ -1550,7 +1550,7 @@ mod tests {
                                block_id: ix,
                                editor_style: &editor::EditorStyle::default(),
                            })
-                            .element_id()?
+                            .inner_id()?
                            .try_into()
                            .ok()?,