Merge remote-tracking branch 'origin/main' into editor2-paint

2023-11-07 13:09:48 +01:00 · 2023-11-07 13:09:48 +01:00 · bdf6e8bcc7
commit bdf6e8bcc7
parent 6ae09634ce 2afeb50c4b
204 changed files with 48828 additions and 1648 deletions
--- a/crates/editor2/src/display_map.rs
+++ b/crates/editor2/src/display_map.rs
@ -510,8 +510,8 @@ impl DisplaySnapshot {
        self.chunks(
            display_rows,
            language_aware,
-            Some(theme.styles.inlay_highlight_style),
-            Some(theme.styles.suggestion_highlight_style),
+            None, // todo!("add inlay highlight style")
+            None, // todo!("add suggestion highlight style")
        )
        .map(|chunk| {
            let mut highlight_style = chunk