Merge branch 'main' into v0.173.x

zed-industries · Feb 13, 2025 · cf03d4e · cf03d4e
2 parents b7860ae + 7ba1492
commit cf03d4e
Show file tree

Hide file tree

Showing 61 changed files with 2,535 additions and 958 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/assets/icons/file_icons/file_types.json b/assets/icons/file_icons/file_types.json
@@ -18,6 +18,7 @@
     "bash_logout": "terminal",
     "bash_profile": "terminal",
     "bashrc": "terminal",
+    "bicep": "bicep",
     "bmp": "image",
     "c": "c",
     "c++": "cpp",

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
@@ -631,7 +631,7 @@
     }
   },
   {
-    "context": "GitPanel || EmptyPane || SharedScreen || MarkdownPreview || KeyContextView || Welcome",
+    "context": "ChangesList || EmptyPane || SharedScreen || MarkdownPreview || KeyContextView || Welcome",
     "bindings": {
       ":": "command_palette::Toggle",
       "g /": "pane::DeploySearch"

diff --git a/crates/buffer_diff/Cargo.toml b/crates/buffer_diff/Cargo.toml
@@ -20,14 +20,18 @@ futures.workspace = true
 git2.workspace = true
 gpui.workspace = true
 language.workspace = true
+log.workspace = true
 rope.workspace = true
 sum_tree.workspace = true
 text.workspace = true
 util.workspace = true
 
 [dev-dependencies]
+ctor.workspace = true
+env_logger.workspace = true
+gpui = { workspace = true, features = ["test-support"] }
 pretty_assertions.workspace = true
+rand.workspace = true
 serde_json.workspace = true
 text = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
 unindent.workspace = true