From f369e9a48be652797b81737b86fde54d97ee0613 Mon Sep 17 00:00:00 2001
From: Brian Strauch <bstrauch@confluent.io>
Date: Fri, 26 Jan 2024 16:58:48 -0800
Subject: [PATCH 001/372] vim: fix dtx when x is immediately to the right

---
 crates/vim/src/motion.rs        | 19 +++++++++++--------
 crates/vim/src/normal/delete.rs |  7 +++++++
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
index 01d8bec569..d7a46888cc 100644
--- a/crates/vim/src/motion.rs
+++ b/crates/vim/src/motion.rs
@@ -434,10 +434,13 @@ impl Motion {
                 SelectionGoal::None,
             ),
             Matching => (matching(map, point), SelectionGoal::None),
-            FindForward { before, char } => (
-                find_forward(map, point, *before, *char, times),
-                SelectionGoal::None,
-            ),
+            FindForward { before, char } => {
+                if let Some(new_point) = find_forward(map, point, *before, *char, times) {
+                    return Some((new_point, SelectionGoal::None));
+                } else {
+                    return None;
+                }
+            }
             FindBackward { after, char } => (
                 find_backward(map, point, *after, *char, times),
                 SelectionGoal::None,
@@ -882,7 +885,7 @@ fn find_forward(
     before: bool,
     target: char,
     times: usize,
-) -> DisplayPoint {
+) -> Option<DisplayPoint> {
     let mut to = from;
     let mut found = false;
 
@@ -897,12 +900,12 @@ fn find_forward(
     if found {
         if before && to.column() > 0 {
             *to.column_mut() -= 1;
-            map.clip_point(to, Bias::Left)
+            Some(map.clip_point(to, Bias::Left))
         } else {
-            to
+            Some(to)
         }
     } else {
-        from
+        None
     }
 }
 
diff --git a/crates/vim/src/normal/delete.rs b/crates/vim/src/normal/delete.rs
index ed9cdf19fa..cbcdcadca9 100644
--- a/crates/vim/src/normal/delete.rs
+++ b/crates/vim/src/normal/delete.rs
@@ -472,4 +472,11 @@ mod test {
         the ˇlazy dog"})
             .await;
     }
+
+    #[gpui::test]
+    async fn test_delete_to_adjacent_character(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+        cx.assert_neovim_compatible("ˇax", ["d", "t", "x"]).await;
+        cx.assert_neovim_compatible("aˇx", ["d", "t", "x"]).await;
+    }
 }

From 5b9f15e0750edb32e1449c78b9d1c7114d7aceed Mon Sep 17 00:00:00 2001
From: Brian Strauch <bstrauch@confluent.io>
Date: Fri, 26 Jan 2024 20:02:59 -0800
Subject: [PATCH 002/372] add test_data

---
 .../test_data/test_delete_to_adjacent_character.json   | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 crates/vim/test_data/test_delete_to_adjacent_character.json

diff --git a/crates/vim/test_data/test_delete_to_adjacent_character.json b/crates/vim/test_data/test_delete_to_adjacent_character.json
new file mode 100644
index 0000000000..130719c890
--- /dev/null
+++ b/crates/vim/test_data/test_delete_to_adjacent_character.json
@@ -0,0 +1,10 @@
+{"Put":{"state":"ˇax"}}
+{"Key":"d"}
+{"Key":"t"}
+{"Key":"x"}
+{"Get":{"state":"ˇx","mode":"Normal"}}
+{"Put":{"state":"aˇx"}}
+{"Key":"d"}
+{"Key":"t"}
+{"Key":"x"}
+{"Get":{"state":"aˇx","mode":"Normal"}}

From 3493e71ad43f6225fecef8bceca622fc7f6febfc Mon Sep 17 00:00:00 2001
From: Noritada Kobayashi <noritada.kobayashi@gmail.com>
Date: Sun, 28 Jan 2024 20:46:32 +0900
Subject: [PATCH 003/372] Add Ruby file icon (#6922)

This icon is designed based on [Ruby's official logo], to harmonize with
the other icons.
It is deformed and simplified to be human-recognizable, even at letter
size.

[Ruby's official logo]: https://www.ruby-lang.org/en/about/logo/

Release Notes:

- Added Ruby file icon.
---
 assets/icons/file_icons/file_types.json | 5 ++++-
 assets/icons/file_icons/ruby.svg        | 7 +++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 assets/icons/file_icons/ruby.svg

diff --git a/assets/icons/file_icons/file_types.json b/assets/icons/file_icons/file_types.json
index a65155d4eb..bda16db73c 100644
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -79,7 +79,7 @@
         "ps1": "terminal",
         "psd": "image",
         "py": "python",
-        "rb": "code",
+        "rb": "ruby",
         "rkt": "code",
         "rs": "rust",
         "rtf": "document",
@@ -161,6 +161,9 @@
         "python": {
             "icon": "icons/file_icons/python.svg"
         },
+        "ruby": {
+            "icon": "icons/file_icons/ruby.svg"
+        },
         "rust": {
             "icon": "icons/file_icons/rust.svg"
         },
diff --git a/assets/icons/file_icons/ruby.svg b/assets/icons/file_icons/ruby.svg
new file mode 100644
index 0000000000..e09ad6b5a1
--- /dev/null
+++ b/assets/icons/file_icons/ruby.svg
@@ -0,0 +1,7 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 7.9 4.8 12C6.1 12 8.5 10.5 9.5 9.5Z" fill="black" fill-opacity="0.6"/>
+<path d="M12 4.8 7.9 5 9.5 9.5 12 12Z" fill="black" fill-opacity="0.6"/>
+<path d="M12 4.8V12H4.8" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.3 7.2 2 10C2 11.8 3.6 12 4.8 12 6.5 12 8.5 10.5 9.5 9.5 10.5 8.5 12 6.5 12 4.8 12 3.6 11.8 2 10 2L7.2 2.3" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<ellipse rx="1.9" ry="3.8" cx="7.5" cy="0" transform="rotate(45)" stroke="black" stroke-width="1.25"/>
+</svg>

From e38489196da9e2d0faeb236b18f5f248704cb0e1 Mon Sep 17 00:00:00 2001
From: d1y <chenhonzhou@gmail.com>
Date: Sun, 28 Jan 2024 22:30:30 +0800
Subject: [PATCH 004/372] Make .gitkeep icon use VCS icon (#6931)

This should be a standard recognized by everyone

```bash
mkdir todo
touch todo/.gitkeep # just placeholder
git add todo
git commit
```

Release Notes:

- Added icon for `.gitkeep` files.
---
 assets/icons/file_icons/file_types.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/icons/file_icons/file_types.json b/assets/icons/file_icons/file_types.json
index bda16db73c..a55d505de4 100644
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -37,6 +37,7 @@
         "gitattributes": "vcs",
         "gitignore": "vcs",
         "gitmodules": "vcs",
+        "gitkeep": "vcs",
         "go": "code",
         "h": "code",
         "handlebars": "code",

From f7b6bfefe65ab19075770245ff24a8a2a85be8fa Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Sun, 28 Jan 2024 15:35:53 +0100
Subject: [PATCH 005/372] chore: Remove rerun-if-changed clause that might
 cause spurious rebuilds (#4193)

Something is stomping over the timestamp of generated scene.h right
after the build script finishes:
`Dirty gpui v0.1.0 (/Users/someonetoignore/work/zed/zed/crates/gpui):
the file target/debug/build/gpui-ca04eedfe8d0e13c/out/scene.h has
changed (1705922004.637000680s, 1s after last build at
1705922003.507431315s)`
^ That's an output of `-v` flag added to either `cargo run` or `cargo
build`.
This comes up when you do `cargo build` followed by `cargo run` or
another `cargo build`; the artifact is not getting reused, even though
it should be possible?
Release Notes:
- N/A
---
 crates/gpui/build.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crates/gpui/build.rs b/crates/gpui/build.rs
index 44228b2e75..b237583847 100644
--- a/crates/gpui/build.rs
+++ b/crates/gpui/build.rs
@@ -100,7 +100,6 @@ fn compile_metal_shaders(header_path: &Path) {
     let air_output_path = PathBuf::from(env::var("OUT_DIR").unwrap()).join("shaders.air");
     let metallib_output_path = PathBuf::from(env::var("OUT_DIR").unwrap()).join("shaders.metallib");
 
-    println!("cargo:rerun-if-changed={}", header_path.display());
     println!("cargo:rerun-if-changed={}", shader_path);
 
     let output = Command::new("xcrun")

From 5dec9f7163392e9ac1c8ce5fab34a8140e437ed9 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Sun, 28 Jan 2024 10:48:38 -0500
Subject: [PATCH 006/372] Link to the Zed roadmap in `CONTRIBUTING.md` (#6937)

This PR updates `CONTRIBUTING.md` to link to the public Zed roadmap.

Release Notes:

- N/A
---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fb98e37768..3690f8c81e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,7 +10,7 @@ All activity in Zed forums is subject to our [Code of Conduct](https://zed.dev/d
 
 If you're looking for ideas about what to work on, check out:
 
-- Our public roadmap (link coming soon!) contains a rough outline of our near-term priorities for Zed.
+- Our [public roadmap](https://zed.dev/roadmap) contains a rough outline of our near-term priorities for Zed.
 - Our [top-ranking issues](https://github.com/zed-industries/zed/issues/5393) based on votes by the community.
 
 Outside of a handful of extremely popular languages and themes, we are generally not looking to extend Zed's language or theme support by directly building them into Zed. We really want to build a plugin system to handle making the editor extensible going forward. If you are passionate about shipping new languages or themes we suggest contributing to the extension system to help us get there faster.
@@ -19,7 +19,7 @@ Outside of a handful of extremely popular languages and themes, we are generally
 
 The best way to propose a change is to [start a discussion on our GitHub repository](https://github.com/zed-industries/zed/discussions).
 
-First, write a short **problem statement**, which *clearly* and *briefly* describes the problem you want to solve independently from any specific solution. It doesn't need to be long or formal, but it's difficult to consider a solution in absence of a clear understanding of the problem.
+First, write a short **problem statement**, which _clearly_ and _briefly_ describes the problem you want to solve independently from any specific solution. It doesn't need to be long or formal, but it's difficult to consider a solution in absence of a clear understanding of the problem.
 
 Next, write a short **solution proposal**. How can the problem (or set of problems) you have stated above be addressed? What are the pros and cons of your approach? Again, keep it brief and informal. This isn't a specification, but rather a starting point for a conversation.
 

From e8bf06fc422638484388dc16c65dbca07c3b0006 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Sun, 28 Jan 2024 11:07:37 -0500
Subject: [PATCH 007/372] Style crate names in `CONTRIBUTING.md` (#6939)

This PR styles the crate names in `CONTRIBUTING.md` using inline code.

Release Notes:

- N/A
---
 CONTRIBUTING.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3690f8c81e..24082a0deb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -43,14 +43,14 @@ We plan to set aside time each week to pair program with contributors on promisi
 
 Zed is made up of several smaller crates - let's go over those you're most likely to interact with:
 
-- [gpui](/crates/gpui) is a GPU-accelerated UI framework which provides all of the building blocks for Zed. **We recommend familiarizing yourself with the root level GPUI documentation**
-- [editor](/crates/editor) contains the core `Editor` type that drives both the code editor and all various input fields within Zed. It also handles a display layer for LSP features such as Inlay Hints or code completions.
-- [project](/crates/project) manages files and navigation within the filetree. It is also Zed's side of communication with LSP.
-- [workspace](/crates/workspace) handles local state serialization and groups projects together.
-- [vim](/crates/vim) is a thin implementation of Vim workflow over `editor`.
-- [lsp](/crates/lsp) handles communication with external LSP server.
-- [language](/crates/language) drives `editor`'s understanding of language - from providing a list of symbols to the syntax map.
-- [collab](/crates/collab) is the collaboration server itself, driving the collaboration features such as project sharing.
-- [rpc](/crates/rpc) defines messages to be exchanged with collaboration server.
-- [theme](/crates/theme) defines the theme system and provides a default theme.
-- [ui](/crates/ui) is a collection of UI components and common patterns used throughout Zed.
+- [`gpui`](/crates/gpui) is a GPU-accelerated UI framework which provides all of the building blocks for Zed. **We recommend familiarizing yourself with the root level GPUI documentation**
+- [`editor`](/crates/editor) contains the core `Editor` type that drives both the code editor and all various input fields within Zed. It also handles a display layer for LSP features such as Inlay Hints or code completions.
+- [`project`](/crates/project) manages files and navigation within the filetree. It is also Zed's side of communication with LSP.
+- [`workspace`](/crates/workspace) handles local state serialization and groups projects together.
+- [`vim`](/crates/vim) is a thin implementation of Vim workflow over `editor`.
+- [`lsp`](/crates/lsp) handles communication with external LSP server.
+- [`language`](/crates/language) drives `editor`'s understanding of language - from providing a list of symbols to the syntax map.
+- [`collab`](/crates/collab) is the collaboration server itself, driving the collaboration features such as project sharing.
+- [`rpc`](/crates/rpc) defines messages to be exchanged with collaboration server.
+- [`theme`](/crates/theme) defines the theme system and provides a default theme.
+- [`ui`](/crates/ui) is a collection of UI components and common patterns used throughout Zed.

From 027f0558415719bd2123df25c146cd4ae566c900 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Sun, 28 Jan 2024 12:01:10 -0500
Subject: [PATCH 008/372] Update casing of "OpenAI" in identifiers to match
 Rust conventions (#6940)

This PR updates the casing of "OpenAI" when used in Rust identifiers to
match the [Rust naming
guidelines](https://rust-lang.github.io/api-guidelines/naming.html):

> In `UpperCamelCase`, acronyms and contractions of compound words count
as one word: use `Uuid` rather than `UUID`, `Usize` rather than `USize`
or `Stdin` rather than `StdIn`.

Release Notes:

- N/A
---
 crates/ai/src/providers/open_ai.rs            |  9 ++++
 crates/ai/src/providers/open_ai/completion.rs | 46 +++++++++----------
 crates/ai/src/providers/open_ai/embedding.rs  | 42 ++++++++---------
 crates/ai/src/providers/open_ai/mod.rs        |  9 ----
 crates/ai/src/providers/open_ai/model.rs      |  8 ++--
 crates/ai/src/providers/open_ai/new.rs        | 11 -----
 crates/assistant/src/assistant.rs             |  4 +-
 crates/assistant/src/assistant_panel.rs       | 18 ++++----
 crates/assistant/src/assistant_settings.rs    | 26 +++++------
 crates/assistant/src/prompts.rs               |  4 +-
 crates/semantic_index/src/semantic_index.rs   |  4 +-
 11 files changed, 85 insertions(+), 96 deletions(-)
 create mode 100644 crates/ai/src/providers/open_ai.rs
 delete mode 100644 crates/ai/src/providers/open_ai/mod.rs
 delete mode 100644 crates/ai/src/providers/open_ai/new.rs

diff --git a/crates/ai/src/providers/open_ai.rs b/crates/ai/src/providers/open_ai.rs
new file mode 100644
index 0000000000..9de21b8a60
--- /dev/null
+++ b/crates/ai/src/providers/open_ai.rs
@@ -0,0 +1,9 @@
+pub mod completion;
+pub mod embedding;
+pub mod model;
+
+pub use completion::*;
+pub use embedding::*;
+pub use model::OpenAiLanguageModel;
+
+pub const OPEN_AI_API_URL: &'static str = "https://api.openai.com/v1";
diff --git a/crates/ai/src/providers/open_ai/completion.rs b/crates/ai/src/providers/open_ai/completion.rs
index aa58950113..4bdb94d79b 100644
--- a/crates/ai/src/providers/open_ai/completion.rs
+++ b/crates/ai/src/providers/open_ai/completion.rs
@@ -21,7 +21,7 @@ use crate::{
     models::LanguageModel,
 };
 
-use crate::providers::open_ai::{OpenAILanguageModel, OPENAI_API_URL};
+use crate::providers::open_ai::{OpenAiLanguageModel, OPEN_AI_API_URL};
 
 #[derive(Clone, Copy, Serialize, Deserialize, Debug, Eq, PartialEq)]
 #[serde(rename_all = "lowercase")]
@@ -58,7 +58,7 @@ pub struct RequestMessage {
 }
 
 #[derive(Debug, Default, Serialize)]
-pub struct OpenAIRequest {
+pub struct OpenAiRequest {
     pub model: String,
     pub messages: Vec<RequestMessage>,
     pub stream: bool,
@@ -66,7 +66,7 @@ pub struct OpenAIRequest {
     pub temperature: f32,
 }
 
-impl CompletionRequest for OpenAIRequest {
+impl CompletionRequest for OpenAiRequest {
     fn data(&self) -> serde_json::Result<String> {
         serde_json::to_string(self)
     }
@@ -79,7 +79,7 @@ pub struct ResponseMessage {
 }
 
 #[derive(Deserialize, Debug)]
-pub struct OpenAIUsage {
+pub struct OpenAiUsage {
     pub prompt_tokens: u32,
     pub completion_tokens: u32,
     pub total_tokens: u32,
@@ -93,20 +93,20 @@ pub struct ChatChoiceDelta {
 }
 
 #[derive(Deserialize, Debug)]
-pub struct OpenAIResponseStreamEvent {
+pub struct OpenAiResponseStreamEvent {
     pub id: Option<String>,
     pub object: String,
     pub created: u32,
     pub model: String,
     pub choices: Vec<ChatChoiceDelta>,
-    pub usage: Option<OpenAIUsage>,
+    pub usage: Option<OpenAiUsage>,
 }
 
 pub async fn stream_completion(
     credential: ProviderCredential,
     executor: BackgroundExecutor,
     request: Box<dyn CompletionRequest>,
-) -> Result<impl Stream<Item = Result<OpenAIResponseStreamEvent>>> {
+) -> Result<impl Stream<Item = Result<OpenAiResponseStreamEvent>>> {
     let api_key = match credential {
         ProviderCredential::Credentials { api_key } => api_key,
         _ => {
@@ -114,10 +114,10 @@ pub async fn stream_completion(
         }
     };
 
-    let (tx, rx) = futures::channel::mpsc::unbounded::<Result<OpenAIResponseStreamEvent>>();
+    let (tx, rx) = futures::channel::mpsc::unbounded::<Result<OpenAiResponseStreamEvent>>();
 
     let json_data = request.data()?;
-    let mut response = Request::post(format!("{OPENAI_API_URL}/chat/completions"))
+    let mut response = Request::post(format!("{OPEN_AI_API_URL}/chat/completions"))
         .header("Content-Type", "application/json")
         .header("Authorization", format!("Bearer {}", api_key))
         .body(json_data)?
@@ -132,7 +132,7 @@ pub async fn stream_completion(
 
                 fn parse_line(
                     line: Result<String, io::Error>,
-                ) -> Result<Option<OpenAIResponseStreamEvent>> {
+                ) -> Result<Option<OpenAiResponseStreamEvent>> {
                     if let Some(data) = line?.strip_prefix("data: ") {
                         let event = serde_json::from_str(data)?;
                         Ok(Some(event))
@@ -169,16 +169,16 @@ pub async fn stream_completion(
         response.body_mut().read_to_string(&mut body).await?;
 
         #[derive(Deserialize)]
-        struct OpenAIResponse {
-            error: OpenAIError,
+        struct OpenAiResponse {
+            error: OpenAiError,
         }
 
         #[derive(Deserialize)]
-        struct OpenAIError {
+        struct OpenAiError {
             message: String,
         }
 
-        match serde_json::from_str::<OpenAIResponse>(&body) {
+        match serde_json::from_str::<OpenAiResponse>(&body) {
             Ok(response) if !response.error.message.is_empty() => Err(anyhow!(
                 "Failed to connect to OpenAI API: {}",
                 response.error.message,
@@ -194,16 +194,16 @@ pub async fn stream_completion(
 }
 
 #[derive(Clone)]
-pub struct OpenAICompletionProvider {
-    model: OpenAILanguageModel,
+pub struct OpenAiCompletionProvider {
+    model: OpenAiLanguageModel,
     credential: Arc<RwLock<ProviderCredential>>,
     executor: BackgroundExecutor,
 }
 
-impl OpenAICompletionProvider {
+impl OpenAiCompletionProvider {
     pub async fn new(model_name: String, executor: BackgroundExecutor) -> Self {
         let model = executor
-            .spawn(async move { OpenAILanguageModel::load(&model_name) })
+            .spawn(async move { OpenAiLanguageModel::load(&model_name) })
             .await;
         let credential = Arc::new(RwLock::new(ProviderCredential::NoCredentials));
         Self {
@@ -214,7 +214,7 @@ impl OpenAICompletionProvider {
     }
 }
 
-impl CredentialProvider for OpenAICompletionProvider {
+impl CredentialProvider for OpenAiCompletionProvider {
     fn has_credentials(&self) -> bool {
         match *self.credential.read() {
             ProviderCredential::Credentials { .. } => true,
@@ -232,7 +232,7 @@ impl CredentialProvider for OpenAICompletionProvider {
                 if let Some(api_key) = env::var("OPENAI_API_KEY").log_err() {
                     async move { ProviderCredential::Credentials { api_key } }.boxed()
                 } else {
-                    let credentials = cx.read_credentials(OPENAI_API_URL);
+                    let credentials = cx.read_credentials(OPEN_AI_API_URL);
                     async move {
                         if let Some(Some((_, api_key))) = credentials.await.log_err() {
                             if let Some(api_key) = String::from_utf8(api_key).log_err() {
@@ -266,7 +266,7 @@ impl CredentialProvider for OpenAICompletionProvider {
         let credential = credential.clone();
         let write_credentials = match credential {
             ProviderCredential::Credentials { api_key } => {
-                Some(cx.write_credentials(OPENAI_API_URL, "Bearer", api_key.as_bytes()))
+                Some(cx.write_credentials(OPEN_AI_API_URL, "Bearer", api_key.as_bytes()))
             }
             _ => None,
         };
@@ -281,7 +281,7 @@ impl CredentialProvider for OpenAICompletionProvider {
 
     fn delete_credentials(&self, cx: &mut AppContext) -> BoxFuture<()> {
         *self.credential.write() = ProviderCredential::NoCredentials;
-        let delete_credentials = cx.delete_credentials(OPENAI_API_URL);
+        let delete_credentials = cx.delete_credentials(OPEN_AI_API_URL);
         async move {
             delete_credentials.await.log_err();
         }
@@ -289,7 +289,7 @@ impl CredentialProvider for OpenAICompletionProvider {
     }
 }
 
-impl CompletionProvider for OpenAICompletionProvider {
+impl CompletionProvider for OpenAiCompletionProvider {
     fn base_model(&self) -> Box<dyn LanguageModel> {
         let model: Box<dyn LanguageModel> = Box::new(self.model.clone());
         model
diff --git a/crates/ai/src/providers/open_ai/embedding.rs b/crates/ai/src/providers/open_ai/embedding.rs
index 89aebb1b76..7480a454a1 100644
--- a/crates/ai/src/providers/open_ai/embedding.rs
+++ b/crates/ai/src/providers/open_ai/embedding.rs
@@ -25,17 +25,17 @@ use util::ResultExt;
 use crate::auth::{CredentialProvider, ProviderCredential};
 use crate::embedding::{Embedding, EmbeddingProvider};
 use crate::models::LanguageModel;
-use crate::providers::open_ai::OpenAILanguageModel;
+use crate::providers::open_ai::OpenAiLanguageModel;
 
-use crate::providers::open_ai::OPENAI_API_URL;
+use crate::providers::open_ai::OPEN_AI_API_URL;
 
 lazy_static! {
-    static ref OPENAI_BPE_TOKENIZER: CoreBPE = cl100k_base().unwrap();
+    static ref OPEN_AI_BPE_TOKENIZER: CoreBPE = cl100k_base().unwrap();
 }
 
 #[derive(Clone)]
-pub struct OpenAIEmbeddingProvider {
-    model: OpenAILanguageModel,
+pub struct OpenAiEmbeddingProvider {
+    model: OpenAiLanguageModel,
     credential: Arc<RwLock<ProviderCredential>>,
     pub client: Arc<dyn HttpClient>,
     pub executor: BackgroundExecutor,
@@ -44,42 +44,42 @@ pub struct OpenAIEmbeddingProvider {
 }
 
 #[derive(Serialize)]
-struct OpenAIEmbeddingRequest<'a> {
+struct OpenAiEmbeddingRequest<'a> {
     model: &'static str,
     input: Vec<&'a str>,
 }
 
 #[derive(Deserialize)]
-struct OpenAIEmbeddingResponse {
-    data: Vec<OpenAIEmbedding>,
-    usage: OpenAIEmbeddingUsage,
+struct OpenAiEmbeddingResponse {
+    data: Vec<OpenAiEmbedding>,
+    usage: OpenAiEmbeddingUsage,
 }
 
 #[derive(Debug, Deserialize)]
-struct OpenAIEmbedding {
+struct OpenAiEmbedding {
     embedding: Vec<f32>,
     index: usize,
     object: String,
 }
 
 #[derive(Deserialize)]
-struct OpenAIEmbeddingUsage {
+struct OpenAiEmbeddingUsage {
     prompt_tokens: usize,
     total_tokens: usize,
 }
 
-impl OpenAIEmbeddingProvider {
+impl OpenAiEmbeddingProvider {
     pub async fn new(client: Arc<dyn HttpClient>, executor: BackgroundExecutor) -> Self {
         let (rate_limit_count_tx, rate_limit_count_rx) = watch::channel_with(None);
         let rate_limit_count_tx = Arc::new(Mutex::new(rate_limit_count_tx));
 
         // Loading the model is expensive, so ensure this runs off the main thread.
         let model = executor
-            .spawn(async move { OpenAILanguageModel::load("text-embedding-ada-002") })
+            .spawn(async move { OpenAiLanguageModel::load("text-embedding-ada-002") })
             .await;
         let credential = Arc::new(RwLock::new(ProviderCredential::NoCredentials));
 
-        OpenAIEmbeddingProvider {
+        OpenAiEmbeddingProvider {
             model,
             credential,
             client,
@@ -140,7 +140,7 @@ impl OpenAIEmbeddingProvider {
             .header("Content-Type", "application/json")
             .header("Authorization", format!("Bearer {}", api_key))
             .body(
-                serde_json::to_string(&OpenAIEmbeddingRequest {
+                serde_json::to_string(&OpenAiEmbeddingRequest {
                     input: spans.clone(),
                     model: "text-embedding-ada-002",
                 })
@@ -152,7 +152,7 @@ impl OpenAIEmbeddingProvider {
     }
 }
 
-impl CredentialProvider for OpenAIEmbeddingProvider {
+impl CredentialProvider for OpenAiEmbeddingProvider {
     fn has_credentials(&self) -> bool {
         match *self.credential.read() {
             ProviderCredential::Credentials { .. } => true,
@@ -170,7 +170,7 @@ impl CredentialProvider for OpenAIEmbeddingProvider {
                 if let Some(api_key) = env::var("OPENAI_API_KEY").log_err() {
                     async move { ProviderCredential::Credentials { api_key } }.boxed()
                 } else {
-                    let credentials = cx.read_credentials(OPENAI_API_URL);
+                    let credentials = cx.read_credentials(OPEN_AI_API_URL);
                     async move {
                         if let Some(Some((_, api_key))) = credentials.await.log_err() {
                             if let Some(api_key) = String::from_utf8(api_key).log_err() {
@@ -204,7 +204,7 @@ impl CredentialProvider for OpenAIEmbeddingProvider {
         let credential = credential.clone();
         let write_credentials = match credential {
             ProviderCredential::Credentials { api_key } => {
-                Some(cx.write_credentials(OPENAI_API_URL, "Bearer", api_key.as_bytes()))
+                Some(cx.write_credentials(OPEN_AI_API_URL, "Bearer", api_key.as_bytes()))
             }
             _ => None,
         };
@@ -219,7 +219,7 @@ impl CredentialProvider for OpenAIEmbeddingProvider {
 
     fn delete_credentials(&self, cx: &mut AppContext) -> BoxFuture<()> {
         *self.credential.write() = ProviderCredential::NoCredentials;
-        let delete_credentials = cx.delete_credentials(OPENAI_API_URL);
+        let delete_credentials = cx.delete_credentials(OPEN_AI_API_URL);
         async move {
             delete_credentials.await.log_err();
         }
@@ -228,7 +228,7 @@ impl CredentialProvider for OpenAIEmbeddingProvider {
 }
 
 #[async_trait]
-impl EmbeddingProvider for OpenAIEmbeddingProvider {
+impl EmbeddingProvider for OpenAiEmbeddingProvider {
     fn base_model(&self) -> Box<dyn LanguageModel> {
         let model: Box<dyn LanguageModel> = Box::new(self.model.clone());
         model
@@ -270,7 +270,7 @@ impl EmbeddingProvider for OpenAIEmbeddingProvider {
                 StatusCode::OK => {
                     let mut body = String::new();
                     response.body_mut().read_to_string(&mut body).await?;
-                    let response: OpenAIEmbeddingResponse = serde_json::from_str(&body)?;
+                    let response: OpenAiEmbeddingResponse = serde_json::from_str(&body)?;
 
                     log::trace!(
                         "openai embedding completed. tokens: {:?}",
diff --git a/crates/ai/src/providers/open_ai/mod.rs b/crates/ai/src/providers/open_ai/mod.rs
deleted file mode 100644
index 7d2f86045d..0000000000
--- a/crates/ai/src/providers/open_ai/mod.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-pub mod completion;
-pub mod embedding;
-pub mod model;
-
-pub use completion::*;
-pub use embedding::*;
-pub use model::OpenAILanguageModel;
-
-pub const OPENAI_API_URL: &'static str = "https://api.openai.com/v1";
diff --git a/crates/ai/src/providers/open_ai/model.rs b/crates/ai/src/providers/open_ai/model.rs
index 6e306c80b9..ba3488d7dd 100644
--- a/crates/ai/src/providers/open_ai/model.rs
+++ b/crates/ai/src/providers/open_ai/model.rs
@@ -5,22 +5,22 @@ use util::ResultExt;
 use crate::models::{LanguageModel, TruncationDirection};
 
 #[derive(Clone)]
-pub struct OpenAILanguageModel {
+pub struct OpenAiLanguageModel {
     name: String,
     bpe: Option<CoreBPE>,
 }
 
-impl OpenAILanguageModel {
+impl OpenAiLanguageModel {
     pub fn load(model_name: &str) -> Self {
         let bpe = tiktoken_rs::get_bpe_from_model(model_name).log_err();
-        OpenAILanguageModel {
+        OpenAiLanguageModel {
             name: model_name.to_string(),
             bpe,
         }
     }
 }
 
-impl LanguageModel for OpenAILanguageModel {
+impl LanguageModel for OpenAiLanguageModel {
     fn name(&self) -> String {
         self.name.clone()
     }
diff --git a/crates/ai/src/providers/open_ai/new.rs b/crates/ai/src/providers/open_ai/new.rs
deleted file mode 100644
index c7d67f2ba1..0000000000
--- a/crates/ai/src/providers/open_ai/new.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-pub trait LanguageModel {
-    fn name(&self) -> String;
-    fn count_tokens(&self, content: &str) -> anyhow::Result<usize>;
-    fn truncate(
-        &self,
-        content: &str,
-        length: usize,
-        direction: TruncationDirection,
-    ) -> anyhow::Result<String>;
-    fn capacity(&self) -> anyhow::Result<usize>;
-}
diff --git a/crates/assistant/src/assistant.rs b/crates/assistant/src/assistant.rs
index 743c8b22e6..d86d889aff 100644
--- a/crates/assistant/src/assistant.rs
+++ b/crates/assistant/src/assistant.rs
@@ -7,7 +7,7 @@ mod streaming_diff;
 use ai::providers::open_ai::Role;
 use anyhow::Result;
 pub use assistant_panel::AssistantPanel;
-use assistant_settings::OpenAIModel;
+use assistant_settings::OpenAiModel;
 use chrono::{DateTime, Local};
 use collections::HashMap;
 use fs::Fs;
@@ -68,7 +68,7 @@ struct SavedConversation {
     messages: Vec<SavedMessage>,
     message_metadata: HashMap<MessageId, MessageMetadata>,
     summary: String,
-    model: OpenAIModel,
+    model: OpenAiModel,
 }
 
 impl SavedConversation {
diff --git a/crates/assistant/src/assistant_panel.rs b/crates/assistant/src/assistant_panel.rs
index 3fcbb9a3c9..2488e2c763 100644
--- a/crates/assistant/src/assistant_panel.rs
+++ b/crates/assistant/src/assistant_panel.rs
@@ -1,5 +1,5 @@
 use crate::{
-    assistant_settings::{AssistantDockPosition, AssistantSettings, OpenAIModel},
+    assistant_settings::{AssistantDockPosition, AssistantSettings, OpenAiModel},
     codegen::{self, Codegen, CodegenKind},
     prompts::generate_content_prompt,
     Assist, CycleMessageRole, InlineAssist, MessageId, MessageMetadata, MessageStatus,
@@ -10,7 +10,7 @@ use ai::prompts::repository_context::PromptCodeSnippet;
 use ai::{
     auth::ProviderCredential,
     completion::{CompletionProvider, CompletionRequest},
-    providers::open_ai::{OpenAICompletionProvider, OpenAIRequest, RequestMessage},
+    providers::open_ai::{OpenAiCompletionProvider, OpenAiRequest, RequestMessage},
 };
 use anyhow::{anyhow, Result};
 use chrono::{DateTime, Local};
@@ -123,7 +123,7 @@ impl AssistantPanel {
                 .unwrap_or_default();
             // Defaulting currently to GPT4, allow for this to be set via config.
             let completion_provider =
-                OpenAICompletionProvider::new("gpt-4".into(), cx.background_executor().clone())
+                OpenAiCompletionProvider::new("gpt-4".into(), cx.background_executor().clone())
                     .await;
 
             // TODO: deserialize state.
@@ -717,7 +717,7 @@ impl AssistantPanel {
                 content: prompt,
             });
 
-            let request = Box::new(OpenAIRequest {
+            let request = Box::new(OpenAiRequest {
                 model: model.full_name().into(),
                 messages,
                 stream: true,
@@ -1393,7 +1393,7 @@ struct Conversation {
     pending_summary: Task<Option<()>>,
     completion_count: usize,
     pending_completions: Vec<PendingCompletion>,
-    model: OpenAIModel,
+    model: OpenAiModel,
     token_count: Option<usize>,
     max_token_count: usize,
     pending_token_count: Task<Option<()>>,
@@ -1501,7 +1501,7 @@ impl Conversation {
         };
         let model = saved_conversation.model;
         let completion_provider: Arc<dyn CompletionProvider> = Arc::new(
-            OpenAICompletionProvider::new(
+            OpenAiCompletionProvider::new(
                 model.full_name().into(),
                 cx.background_executor().clone(),
             )
@@ -1626,7 +1626,7 @@ impl Conversation {
         Some(self.max_token_count as isize - self.token_count? as isize)
     }
 
-    fn set_model(&mut self, model: OpenAIModel, cx: &mut ModelContext<Self>) {
+    fn set_model(&mut self, model: OpenAiModel, cx: &mut ModelContext<Self>) {
         self.model = model;
         self.count_remaining_tokens(cx);
         cx.notify();
@@ -1679,7 +1679,7 @@ impl Conversation {
                 return Default::default();
             }
 
-            let request: Box<dyn CompletionRequest> = Box::new(OpenAIRequest {
+            let request: Box<dyn CompletionRequest> = Box::new(OpenAiRequest {
                 model: self.model.full_name().to_string(),
                 messages: self
                     .messages(cx)
@@ -1962,7 +1962,7 @@ impl Conversation {
                     content: "Summarize the conversation into a short title without punctuation"
                         .into(),
                 }));
-            let request: Box<dyn CompletionRequest> = Box::new(OpenAIRequest {
+            let request: Box<dyn CompletionRequest> = Box::new(OpenAiRequest {
                 model: self.model.full_name().to_string(),
                 messages: messages.collect(),
                 stream: true,
diff --git a/crates/assistant/src/assistant_settings.rs b/crates/assistant/src/assistant_settings.rs
index b2a9231a57..4b37a1b2f6 100644
--- a/crates/assistant/src/assistant_settings.rs
+++ b/crates/assistant/src/assistant_settings.rs
@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
 use settings::Settings;
 
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
-pub enum OpenAIModel {
+pub enum OpenAiModel {
     #[serde(rename = "gpt-3.5-turbo-0613")]
     ThreePointFiveTurbo,
     #[serde(rename = "gpt-4-0613")]
@@ -14,28 +14,28 @@ pub enum OpenAIModel {
     FourTurbo,
 }
 
-impl OpenAIModel {
+impl OpenAiModel {
     pub fn full_name(&self) -> &'static str {
         match self {
-            OpenAIModel::ThreePointFiveTurbo => "gpt-3.5-turbo-0613",
-            OpenAIModel::Four => "gpt-4-0613",
-            OpenAIModel::FourTurbo => "gpt-4-1106-preview",
+            OpenAiModel::ThreePointFiveTurbo => "gpt-3.5-turbo-0613",
+            OpenAiModel::Four => "gpt-4-0613",
+            OpenAiModel::FourTurbo => "gpt-4-1106-preview",
         }
     }
 
     pub fn short_name(&self) -> &'static str {
         match self {
-            OpenAIModel::ThreePointFiveTurbo => "gpt-3.5-turbo",
-            OpenAIModel::Four => "gpt-4",
-            OpenAIModel::FourTurbo => "gpt-4-turbo",
+            OpenAiModel::ThreePointFiveTurbo => "gpt-3.5-turbo",
+            OpenAiModel::Four => "gpt-4",
+            OpenAiModel::FourTurbo => "gpt-4-turbo",
         }
     }
 
     pub fn cycle(&self) -> Self {
         match self {
-            OpenAIModel::ThreePointFiveTurbo => OpenAIModel::Four,
-            OpenAIModel::Four => OpenAIModel::FourTurbo,
-            OpenAIModel::FourTurbo => OpenAIModel::ThreePointFiveTurbo,
+            OpenAiModel::ThreePointFiveTurbo => OpenAiModel::Four,
+            OpenAiModel::Four => OpenAiModel::FourTurbo,
+            OpenAiModel::FourTurbo => OpenAiModel::ThreePointFiveTurbo,
         }
     }
 }
@@ -54,7 +54,7 @@ pub struct AssistantSettings {
     pub dock: AssistantDockPosition,
     pub default_width: Pixels,
     pub default_height: Pixels,
-    pub default_open_ai_model: OpenAIModel,
+    pub default_open_ai_model: OpenAiModel,
 }
 
 /// Assistant panel settings
@@ -79,7 +79,7 @@ pub struct AssistantSettingsContent {
     /// The default OpenAI model to use when starting new conversations.
     ///
     /// Default: gpt-4-1106-preview
-    pub default_open_ai_model: Option<OpenAIModel>,
+    pub default_open_ai_model: Option<OpenAiModel>,
 }
 
 impl Settings for AssistantSettings {
diff --git a/crates/assistant/src/prompts.rs b/crates/assistant/src/prompts.rs
index c88e257295..c9614a4851 100644
--- a/crates/assistant/src/prompts.rs
+++ b/crates/assistant/src/prompts.rs
@@ -4,7 +4,7 @@ use ai::prompts::file_context::FileContext;
 use ai::prompts::generate::GenerateInlineContent;
 use ai::prompts::preamble::EngineerPreamble;
 use ai::prompts::repository_context::{PromptCodeSnippet, RepositoryContext};
-use ai::providers::open_ai::OpenAILanguageModel;
+use ai::providers::open_ai::OpenAiLanguageModel;
 use language::{BufferSnapshot, OffsetRangeExt, ToOffset};
 use std::cmp::{self, Reverse};
 use std::ops::Range;
@@ -131,7 +131,7 @@ pub fn generate_content_prompt(
     project_name: Option<String>,
 ) -> anyhow::Result<String> {
     // Using new Prompt Templates
-    let openai_model: Arc<dyn LanguageModel> = Arc::new(OpenAILanguageModel::load(model));
+    let openai_model: Arc<dyn LanguageModel> = Arc::new(OpenAiLanguageModel::load(model));
     let lang_name = if let Some(language_name) = language_name {
         Some(language_name.to_string())
     } else {
diff --git a/crates/semantic_index/src/semantic_index.rs b/crates/semantic_index/src/semantic_index.rs
index 62773cced8..6725b5a93e 100644
--- a/crates/semantic_index/src/semantic_index.rs
+++ b/crates/semantic_index/src/semantic_index.rs
@@ -8,7 +8,7 @@ mod semantic_index_tests;
 
 use crate::semantic_index_settings::SemanticIndexSettings;
 use ai::embedding::{Embedding, EmbeddingProvider};
-use ai::providers::open_ai::OpenAIEmbeddingProvider;
+use ai::providers::open_ai::OpenAiEmbeddingProvider;
 use anyhow::{anyhow, Context as _, Result};
 use collections::{BTreeMap, HashMap, HashSet};
 use db::VectorDatabase;
@@ -91,7 +91,7 @@ pub fn init(
 
     cx.spawn(move |cx| async move {
         let embedding_provider =
-            OpenAIEmbeddingProvider::new(http_client, cx.background_executor().clone()).await;
+            OpenAiEmbeddingProvider::new(http_client, cx.background_executor().clone()).await;
         let semantic_index = SemanticIndex::new(
             fs,
             db_file_path,

From 42e605a766995b7deec8f31ecb71690548f7674d Mon Sep 17 00:00:00 2001
From: ge <g.linevich@reface.ai>
Date: Fri, 26 Jan 2024 07:12:12 +0200
Subject: [PATCH 009/372] fix: adding prefix arg to npm subcommands

---
 crates/node_runtime/src/node_runtime.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/node_runtime/src/node_runtime.rs b/crates/node_runtime/src/node_runtime.rs
index ecabdeb718..e40f83fae0 100644
--- a/crates/node_runtime/src/node_runtime.rs
+++ b/crates/node_runtime/src/node_runtime.rs
@@ -166,6 +166,7 @@ impl NodeRuntime for RealNodeRuntime {
 
             if let Some(directory) = directory {
                 command.current_dir(directory);
+                command.args(["--prefix".into(), directory.to_path_buf()]);
             }
 
             command.output().await.map_err(|e| anyhow!("{e}"))

From 4fc01163daf0ae20fe8a46202dc088a5b743111d Mon Sep 17 00:00:00 2001
From: d1y <chenhonzhou@gmail.com>
Date: Mon, 29 Jan 2024 01:32:43 +0800
Subject: [PATCH 010/372] Add Vue file icon (#6930)

https://github.com/vuejs/art/blob/master/white-on-dark-logo.svg
<img width="222" alt="image"
src="https://github.com/zed-industries/zed/assets/45585937/2839dd7e-ea25-4f9b-aac9-2437f1c3df23">

Release Notes:

- Added icon for `.vue` files.
---
 assets/icons/file_icons/file_types.json | 4 ++++
 assets/icons/file_icons/vue.svg         | 4 ++++
 2 files changed, 8 insertions(+)
 create mode 100644 assets/icons/file_icons/vue.svg

diff --git a/assets/icons/file_icons/file_types.json b/assets/icons/file_icons/file_types.json
index a55d505de4..ac722183fa 100644
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -98,6 +98,7 @@
         "tsv": "storage",
         "tsx": "code",
         "txt": "document",
+        "vue": "vue",
         "wav": "audio",
         "webm": "video",
         "xls": "document",
@@ -191,6 +192,9 @@
         },
         "video": {
             "icon": "icons/file_icons/video.svg"
+        },
+        "vue": {
+            "icon": "icons/file_icons/vue.svg"
         }
     }
 }
diff --git a/assets/icons/file_icons/vue.svg b/assets/icons/file_icons/vue.svg
new file mode 100644
index 0000000000..0709cdfe67
--- /dev/null
+++ b/assets/icons/file_icons/vue.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 14 14">
+  <path d="M7 8.135 3.578 2.212l-.18-.312H1l6 10.392L13 1.9h-2.4L7 8.135Z"/>
+  <path d="M7 3.675 5.972 1.9H1l.18.312h4.615L7 4.3l1.205-2.088h4.615L13 1.9H8.028L7 3.675Z"/>
+</svg>

From b213458803cae3efdb97e609f07b34660df753ad Mon Sep 17 00:00:00 2001
From: Ikko Eltociear Ashimine <eltociear@gmail.com>
Date: Mon, 29 Jan 2024 02:56:50 +0900
Subject: [PATCH 011/372] Fix typo in copilot.rs (#6933)

specifcially -> specifically

Release Notes:

- N/A
---
 crates/copilot/src/copilot.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/copilot/src/copilot.rs b/crates/copilot/src/copilot.rs
index 49fb46780f..6345bdb794 100644
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -964,7 +964,7 @@ async fn get_copilot_lsp(http: Arc<dyn HttpClient>) -> anyhow::Result<PathBuf> {
         let server_path = version_dir.join(SERVER_PATH);
 
         if fs::metadata(&server_path).await.is_err() {
-            // Copilot LSP looks for this dist dir specifcially, so lets add it in.
+            // Copilot LSP looks for this dist dir specifically, so lets add it in.
             let dist_dir = version_dir.join("dist");
             fs::create_dir_all(dist_dir.as_path()).await?;
 

From 1f82a2aca1ef45ce182f5fc5068dee652f7d63e0 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Sun, 28 Jan 2024 14:07:53 -0500
Subject: [PATCH 012/372] Remove obviated comment in `zed-licenses.toml`
 (#6946)

This PR removes a comment from `zed-licenses.toml`, as it no longer
applies now that we don't have `buildLicenses.ts` anymore.

Release Notes:

- N/A
---
 script/licenses/zed-licenses.toml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/script/licenses/zed-licenses.toml b/script/licenses/zed-licenses.toml
index e166b653c8..d338e7ab0b 100644
--- a/script/licenses/zed-licenses.toml
+++ b/script/licenses/zed-licenses.toml
@@ -1,5 +1,3 @@
-# NOTE: This file's location is hardcoded into the theme build system in 
-# styles/src/buildLicenses.ts
 no-clearly-defined = true
 private = { ignore = true }
 accepted = [

From c0c0abae568d5fad8cd8c796434aaf27f03066d1 Mon Sep 17 00:00:00 2001
From: Brooks Swinnerton <bswinnerton@gmail.com>
Date: Sun, 28 Jan 2024 15:13:09 -0500
Subject: [PATCH 013/372] Add support for u and U in vim visual mode

---
 assets/keymaps/vim.json                       |  3 +-
 crates/vim/src/normal.rs                      |  6 +-
 crates/vim/src/normal/case.rs                 | 80 +++++++++++++++++--
 .../test_data/test_convert_to_lower_case.json | 12 +++
 .../test_data/test_convert_to_upper_case.json | 12 +++
 5 files changed, 103 insertions(+), 10 deletions(-)
 create mode 100644 crates/vim/test_data/test_convert_to_lower_case.json
 create mode 100644 crates/vim/test_data/test_convert_to_upper_case.json

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 32acb90d69..0bdf1aae32 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -400,7 +400,8 @@
   {
     "context": "Editor && vim_mode == visual && !VimWaiting && !VimObject",
     "bindings": {
-      "u": "editor::Undo",
+      "u": "vim::ConvertToLowerCase",
+      "U": "vim::ConvertToUpperCase",
       "o": "vim::OtherEnd",
       "shift-o": "vim::OtherEnd",
       "d": "vim::VisualDelete",
diff --git a/crates/vim/src/normal.rs b/crates/vim/src/normal.rs
index c21f54f2d3..399180fea4 100644
--- a/crates/vim/src/normal.rs
+++ b/crates/vim/src/normal.rs
@@ -26,7 +26,7 @@ use log::error;
 use workspace::Workspace;
 
 use self::{
-    case::change_case,
+    case::{change_case, convert_to_lower_case, convert_to_upper_case},
     change::{change_motion, change_object},
     delete::{delete_motion, delete_object},
     yank::{yank_motion, yank_object},
@@ -48,6 +48,8 @@ actions!(
         Yank,
         YankLine,
         ChangeCase,
+        ConvertToUpperCase,
+        ConvertToLowerCase,
         JoinLines,
     ]
 );
@@ -60,6 +62,8 @@ pub(crate) fn register(workspace: &mut Workspace, cx: &mut ViewContext<Workspace
     workspace.register_action(insert_line_above);
     workspace.register_action(insert_line_below);
     workspace.register_action(change_case);
+    workspace.register_action(convert_to_upper_case);
+    workspace.register_action(convert_to_lower_case);
     workspace.register_action(yank_line);
 
     workspace.register_action(|_: &mut Workspace, _: &DeleteLeft, cx| {
diff --git a/crates/vim/src/normal/case.rs b/crates/vim/src/normal/case.rs
index d94454891f..049df4bb27 100644
--- a/crates/vim/src/normal/case.rs
+++ b/crates/vim/src/normal/case.rs
@@ -3,9 +3,40 @@ use gpui::ViewContext;
 use language::{Bias, Point};
 use workspace::Workspace;
 
-use crate::{normal::ChangeCase, state::Mode, Vim};
+use crate::{
+    normal::ChangeCase, normal::ConvertToLowerCase, normal::ConvertToUpperCase, state::Mode, Vim,
+};
 
 pub fn change_case(_: &mut Workspace, _: &ChangeCase, cx: &mut ViewContext<Workspace>) {
+    transform_case(cx, |c| {
+        if c.is_lowercase() {
+            c.to_uppercase().collect::<Vec<char>>()
+        } else {
+            c.to_lowercase().collect::<Vec<char>>()
+        }
+    })
+}
+
+pub fn convert_to_upper_case(
+    _: &mut Workspace,
+    _: &ConvertToUpperCase,
+    cx: &mut ViewContext<Workspace>,
+) {
+    transform_case(cx, |c| c.to_uppercase().collect::<Vec<char>>())
+}
+
+pub fn convert_to_lower_case(
+    _: &mut Workspace,
+    _: &ConvertToLowerCase,
+    cx: &mut ViewContext<Workspace>,
+) {
+    transform_case(cx, |c| c.to_lowercase().collect::<Vec<char>>())
+}
+
+fn transform_case<F>(cx: &mut ViewContext<Workspace>, transform: F)
+where
+    F: Fn(char) -> Vec<char> + Copy,
+{
     Vim::update(cx, |vim, cx| {
         vim.record_current_action(cx);
         let count = vim.take_count(cx).unwrap_or(1) as u32;
@@ -54,13 +85,7 @@ pub fn change_case(_: &mut Workspace, _: &ChangeCase, cx: &mut ViewContext<Works
                         let text = snapshot
                             .text_for_range(range.start..range.end)
                             .flat_map(|s| s.chars())
-                            .flat_map(|c| {
-                                if c.is_lowercase() {
-                                    c.to_uppercase().collect::<Vec<char>>()
-                                } else {
-                                    c.to_lowercase().collect::<Vec<char>>()
-                                }
-                            })
+                            .flat_map(|c| transform(c))
                             .collect::<String>();
 
                         buffer.edit([(range, text)], None, cx)
@@ -74,6 +99,7 @@ pub fn change_case(_: &mut Workspace, _: &ChangeCase, cx: &mut ViewContext<Works
         vim.switch_mode(Mode::Normal, true, cx)
     })
 }
+
 #[cfg(test)]
 mod test {
     use crate::{state::Mode, test::NeovimBackedTestContext};
@@ -113,4 +139,42 @@ mod test {
         cx.simulate_keystroke("~");
         cx.assert_state("aSSˇcdˇE\n", Mode::Normal);
     }
+
+    #[gpui::test]
+    async fn test_convert_to_upper_case(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+        // works in visual mode
+        cx.set_shared_state("a😀C«dÉ1*fˇ»\n").await;
+        cx.simulate_shared_keystrokes(["U"]).await;
+        cx.assert_shared_state("a😀CˇDÉ1*F\n").await;
+
+        // works with line selections
+        cx.set_shared_state("abˇC\n").await;
+        cx.simulate_shared_keystrokes(["shift-v", "U"]).await;
+        cx.assert_shared_state("ˇABC\n").await;
+
+        // works in visual block mode
+        cx.set_shared_state("ˇaa\nbb\ncc").await;
+        cx.simulate_shared_keystrokes(["ctrl-v", "j", "U"]).await;
+        cx.assert_shared_state("ˇAa\nBb\ncc").await;
+    }
+
+    #[gpui::test]
+    async fn test_convert_to_lower_case(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+        // works in visual mode
+        cx.set_shared_state("A😀c«DÉ1*fˇ»\n").await;
+        cx.simulate_shared_keystrokes(["u"]).await;
+        cx.assert_shared_state("A😀cˇdé1*f\n").await;
+
+        // works with line selections
+        cx.set_shared_state("ABˇc\n").await;
+        cx.simulate_shared_keystrokes(["shift-v", "u"]).await;
+        cx.assert_shared_state("ˇabc\n").await;
+
+        // works in visual block mode
+        cx.set_shared_state("ˇAa\nBb\nCc").await;
+        cx.simulate_shared_keystrokes(["ctrl-v", "j", "u"]).await;
+        cx.assert_shared_state("ˇaa\nbb\nCc").await;
+    }
 }
diff --git a/crates/vim/test_data/test_convert_to_lower_case.json b/crates/vim/test_data/test_convert_to_lower_case.json
new file mode 100644
index 0000000000..83d7435c89
--- /dev/null
+++ b/crates/vim/test_data/test_convert_to_lower_case.json
@@ -0,0 +1,12 @@
+{"Put":{"state":"A😀c«DÉ1*fˇ»\n"}}
+{"Key":"u"}
+{"Get":{"state":"A😀cˇdé1*f\n","mode":"Normal"}}
+{"Put":{"state":"ABˇc\n"}}
+{"Key":"shift-v"}
+{"Key":"u"}
+{"Get":{"state":"ˇabc\n","mode":"Normal"}}
+{"Put":{"state":"ˇAa\nBb\nCc"}}
+{"Key":"ctrl-v"}
+{"Key":"j"}
+{"Key":"u"}
+{"Get":{"state":"ˇaa\nbb\nCc","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_convert_to_upper_case.json b/crates/vim/test_data/test_convert_to_upper_case.json
new file mode 100644
index 0000000000..afc0563c36
--- /dev/null
+++ b/crates/vim/test_data/test_convert_to_upper_case.json
@@ -0,0 +1,12 @@
+{"Put":{"state":"a😀C«dÉ1*fˇ»\n"}}
+{"Key":"U"}
+{"Get":{"state":"a😀CˇDÉ1*F\n","mode":"Normal"}}
+{"Put":{"state":"abˇC\n"}}
+{"Key":"shift-v"}
+{"Key":"U"}
+{"Get":{"state":"ˇABC\n","mode":"Normal"}}
+{"Put":{"state":"ˇaa\nbb\ncc"}}
+{"Key":"ctrl-v"}
+{"Key":"j"}
+{"Key":"U"}
+{"Get":{"state":"ˇAa\nBb\ncc","mode":"Normal"}}

From 52f7f2d77025517c34e1f6c74582553dec90948c Mon Sep 17 00:00:00 2001
From: Brooks Swinnerton <bswinnerton@gmail.com>
Date: Sun, 28 Jan 2024 15:20:50 -0500
Subject: [PATCH 014/372] Update name of function to match other implementation

---
 crates/vim/src/normal/case.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/vim/src/normal/case.rs b/crates/vim/src/normal/case.rs
index 049df4bb27..db33e48c34 100644
--- a/crates/vim/src/normal/case.rs
+++ b/crates/vim/src/normal/case.rs
@@ -8,7 +8,7 @@ use crate::{
 };
 
 pub fn change_case(_: &mut Workspace, _: &ChangeCase, cx: &mut ViewContext<Workspace>) {
-    transform_case(cx, |c| {
+    manipulate_text(cx, |c| {
         if c.is_lowercase() {
             c.to_uppercase().collect::<Vec<char>>()
         } else {
@@ -22,7 +22,7 @@ pub fn convert_to_upper_case(
     _: &ConvertToUpperCase,
     cx: &mut ViewContext<Workspace>,
 ) {
-    transform_case(cx, |c| c.to_uppercase().collect::<Vec<char>>())
+    manipulate_text(cx, |c| c.to_uppercase().collect::<Vec<char>>())
 }
 
 pub fn convert_to_lower_case(
@@ -30,10 +30,10 @@ pub fn convert_to_lower_case(
     _: &ConvertToLowerCase,
     cx: &mut ViewContext<Workspace>,
 ) {
-    transform_case(cx, |c| c.to_lowercase().collect::<Vec<char>>())
+    manipulate_text(cx, |c| c.to_lowercase().collect::<Vec<char>>())
 }
 
-fn transform_case<F>(cx: &mut ViewContext<Workspace>, transform: F)
+fn manipulate_text<F>(cx: &mut ViewContext<Workspace>, transform: F)
 where
     F: Fn(char) -> Vec<char> + Copy,
 {

From 444f918e51effada7097cec8a4857bb9a21b5823 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Sun, 28 Jan 2024 15:25:57 -0500
Subject: [PATCH 015/372] Retrieve credentials for saved conversations (#6949)

This PR fixes an issue where credentials for saved conversations weren't
being fully retrieved, which was preventing continuing a conversation
with the assistant in a saved conversation.

Release Notes:

- Fixed continuing a saved conversation with the Zed assistant.
---
 crates/assistant/src/assistant_panel.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crates/assistant/src/assistant_panel.rs b/crates/assistant/src/assistant_panel.rs
index 2488e2c763..9e21248a1d 100644
--- a/crates/assistant/src/assistant_panel.rs
+++ b/crates/assistant/src/assistant_panel.rs
@@ -1096,6 +1096,7 @@ impl AssistantPanel {
             let conversation =
                 Conversation::deserialize(saved_conversation, path.clone(), languages, &mut cx)
                     .await?;
+
             this.update(&mut cx, |this, cx| {
                 // If, by the time we've loaded the conversation, the user has already opened
                 // the same conversation, we don't want to open it again.
@@ -1507,7 +1508,9 @@ impl Conversation {
             )
             .await,
         );
-        cx.update(|cx| completion_provider.retrieve_credentials(cx))?;
+        cx.update(|cx| completion_provider.retrieve_credentials(cx))?
+            .await;
+
         let markdown = language_registry.language_for_name("Markdown");
         let mut message_anchors = Vec::new();
         let mut next_message_id = MessageId(0);
@@ -1676,6 +1679,7 @@ impl Conversation {
 
         if should_assist {
             if !self.completion_provider.has_credentials() {
+                log::info!("completion provider has no credentials");
                 return Default::default();
             }
 

From 7767062c094db07a04a452bcb0bc25ef0dec1e49 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Sun, 28 Jan 2024 23:46:10 +0200
Subject: [PATCH 016/372] Add missing workspace edit capabilities (#6950)

Closes https://github.com/zed-industries/zed/issues/6916

Specification:
https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#workspaceEdit
Adds a safe minimum of the capabilities that Zed supports already,
allowing rust-analyzer to send file edits on rename.

Release Notes:

- Fixed rust module rename from editor not renaming the FS entries
([6916](https://github.com/zed-industries/zed/issues/6916))
---
 crates/lsp/src/lsp.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index bf7c3e7911..65da2bc7dc 100644
--- a/crates/lsp/src/lsp.rs
+++ b/crates/lsp/src/lsp.rs
@@ -479,6 +479,15 @@ impl LanguageServer {
                     diagnostic: Some(DiagnosticWorkspaceClientCapabilities {
                         refresh_support: None,
                     }),
+                    workspace_edit: Some(WorkspaceEditClientCapabilities {
+                        resource_operations: Some(vec![
+                            ResourceOperationKind::Create,
+                            ResourceOperationKind::Rename,
+                            ResourceOperationKind::Delete,
+                        ]),
+                        document_changes: Some(true),
+                        ..WorkspaceEditClientCapabilities::default()
+                    }),
                     ..Default::default()
                 }),
                 text_document: Some(TextDocumentClientCapabilities {

From db68fc51303e5bf9621246c0bb4edb8233641510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Molina=20Rebolledo?=
 <ivanmolinarebolledo@gmail.com>
Date: Sun, 28 Jan 2024 16:44:50 -0600
Subject: [PATCH 017/372] Add PureScript LSP/Highlighting support (#6911)

This PR adds basic support for the language using the
`purescript-language-server`.

Release Notes:

- Added support for PureScript.
---
 Cargo.lock                                    |  10 ++
 Cargo.toml                                    |   1 +
 crates/zed/Cargo.toml                         |   1 +
 crates/zed/src/languages.rs                   |   8 +
 crates/zed/src/languages/purescript.rs        | 139 +++++++++++++++++
 .../zed/src/languages/purescript/brackets.scm |   3 +
 .../zed/src/languages/purescript/config.toml  |  13 ++
 .../src/languages/purescript/highlights.scm   | 144 ++++++++++++++++++
 .../zed/src/languages/purescript/indents.scm  |   3 +
 9 files changed, 322 insertions(+)
 create mode 100644 crates/zed/src/languages/purescript.rs
 create mode 100644 crates/zed/src/languages/purescript/brackets.scm
 create mode 100644 crates/zed/src/languages/purescript/config.toml
 create mode 100644 crates/zed/src/languages/purescript/highlights.scm
 create mode 100644 crates/zed/src/languages/purescript/indents.scm

diff --git a/Cargo.lock b/Cargo.lock
index cfeb83bf5c..21d97b093e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8549,6 +8549,15 @@ dependencies = [
  "tree-sitter",
 ]
 
+[[package]]
+name = "tree-sitter-purescript"
+version = "1.0.0"
+source = "git+https://github.com/ivanmoreau/tree-sitter-purescript?rev=a37140f0c7034977b90faa73c94fcb8a5e45ed08#a37140f0c7034977b90faa73c94fcb8a5e45ed08"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
 [[package]]
 name = "tree-sitter-python"
 version = "0.20.4"
@@ -9739,6 +9748,7 @@ dependencies = [
  "tree-sitter-nix",
  "tree-sitter-nu",
  "tree-sitter-php",
+ "tree-sitter-purescript",
  "tree-sitter-python",
  "tree-sitter-racket",
  "tree-sitter-ruby",
diff --git a/Cargo.toml b/Cargo.toml
index 1af796ae79..eaa09c4c8f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -148,6 +148,7 @@ tree-sitter-json = { git = "https://github.com/tree-sitter/tree-sitter-json", re
 tree-sitter-rust = "0.20.3"
 tree-sitter-markdown = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "330ecab87a3e3a7211ac69bbadc19eabecdb1cca" }
 tree-sitter-php = "0.21.1"
+tree-sitter-purescript = { git = "https://github.com/ivanmoreau/tree-sitter-purescript", rev = "a37140f0c7034977b90faa73c94fcb8a5e45ed08" }
 tree-sitter-python = "0.20.2"
 tree-sitter-toml = { git = "https://github.com/tree-sitter/tree-sitter-toml", rev = "342d9be207c2dba869b9967124c679b5e6fd0ebe" }
 tree-sitter-typescript = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "5d20856f34315b068c41edaee2ac8a100081d259" }
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 3ad3595044..97c5a6e394 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -134,6 +134,7 @@ tree-sitter-ruby.workspace = true
 tree-sitter-haskell.workspace = true
 tree-sitter-html.workspace = true
 tree-sitter-php.workspace = true
+tree-sitter-purescript.workspace = true
 tree-sitter-scheme.workspace = true
 tree-sitter-svelte.workspace = true
 tree-sitter-racket.workspace = true
diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index a93b8b29a7..ac3d7f2ee8 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -23,6 +23,7 @@ mod language_plugin;
 mod lua;
 mod nu;
 mod php;
+mod purescript;
 mod python;
 mod ruby;
 mod rust;
@@ -258,6 +259,13 @@ pub fn init(
         ],
     );
 
+    language(
+        "purescript",
+        tree_sitter_purescript::language(),
+        vec![Arc::new(purescript::PurescriptLspAdapter::new(
+            node_runtime.clone(),
+        ))],
+    );
     language("elm", tree_sitter_elm::language(), vec![]);
     language("glsl", tree_sitter_glsl::language(), vec![]);
     language("nix", tree_sitter_nix::language(), vec![]);
diff --git a/crates/zed/src/languages/purescript.rs b/crates/zed/src/languages/purescript.rs
new file mode 100644
index 0000000000..bdf55f1b93
--- /dev/null
+++ b/crates/zed/src/languages/purescript.rs
@@ -0,0 +1,139 @@
+use anyhow::{anyhow, Result};
+use async_trait::async_trait;
+use collections::HashMap;
+use futures::StreamExt;
+use language::{LanguageServerName, LspAdapter, LspAdapterDelegate};
+use lsp::LanguageServerBinary;
+use node_runtime::NodeRuntime;
+use serde_json::json;
+use smol::fs;
+use std::{
+    any::Any,
+    ffi::OsString,
+    path::{Path, PathBuf},
+    sync::Arc,
+};
+use util::{async_maybe, ResultExt};
+
+const SERVER_PATH: &'static str = "node_modules/.bin/purescript-language-server";
+
+fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
+    vec![server_path.into(), "--stdio".into()]
+}
+
+pub struct PurescriptLspAdapter {
+    node: Arc<dyn NodeRuntime>,
+}
+
+impl PurescriptLspAdapter {
+    pub fn new(node: Arc<dyn NodeRuntime>) -> Self {
+        Self { node }
+    }
+}
+
+#[async_trait]
+impl LspAdapter for PurescriptLspAdapter {
+    fn name(&self) -> LanguageServerName {
+        LanguageServerName("purescript-language-server".into())
+    }
+
+    fn short_name(&self) -> &'static str {
+        "purescript"
+    }
+
+    async fn fetch_latest_server_version(
+        &self,
+        _: &dyn LspAdapterDelegate,
+    ) -> Result<Box<dyn 'static + Send + Any>> {
+        Ok(Box::new(
+            self.node
+                .npm_package_latest_version("purescript-language-server")
+                .await?,
+        ) as Box<_>)
+    }
+
+    async fn fetch_server_binary(
+        &self,
+        version: Box<dyn 'static + Send + Any>,
+        container_dir: PathBuf,
+        _: &dyn LspAdapterDelegate,
+    ) -> Result<LanguageServerBinary> {
+        let version = version.downcast::<String>().unwrap();
+        let server_path = container_dir.join(SERVER_PATH);
+
+        if fs::metadata(&server_path).await.is_err() {
+            self.node
+                .npm_install_packages(
+                    &container_dir,
+                    &[("purescript-language-server", version.as_str())],
+                )
+                .await?;
+        }
+
+        Ok(LanguageServerBinary {
+            path: self.node.binary_path().await?,
+            arguments: server_binary_arguments(&server_path),
+        })
+    }
+
+    async fn cached_server_binary(
+        &self,
+        container_dir: PathBuf,
+        _: &dyn LspAdapterDelegate,
+    ) -> Option<LanguageServerBinary> {
+        get_cached_server_binary(container_dir, &*self.node).await
+    }
+
+    async fn installation_test_binary(
+        &self,
+        container_dir: PathBuf,
+    ) -> Option<LanguageServerBinary> {
+        get_cached_server_binary(container_dir, &*self.node).await
+    }
+
+    fn initialization_options(&self) -> Option<serde_json::Value> {
+        Some(json!({
+            "purescript": {
+                "addSpagoSources": true
+            }
+        }))
+    }
+
+    fn language_ids(&self) -> HashMap<String, String> {
+        [("PureScript".into(), "purescript".into())]
+            .into_iter()
+            .collect()
+    }
+}
+
+async fn get_cached_server_binary(
+    container_dir: PathBuf,
+    node: &dyn NodeRuntime,
+) -> Option<LanguageServerBinary> {
+    async_maybe!({
+        let mut last_version_dir = None;
+        let mut entries = fs::read_dir(&container_dir).await?;
+        while let Some(entry) = entries.next().await {
+            let entry = entry?;
+            if entry.file_type().await?.is_dir() {
+                last_version_dir = Some(entry.path());
+            }
+        }
+
+        let last_version_dir = last_version_dir.ok_or_else(|| anyhow!("no cached binary"))?;
+        let server_path = last_version_dir.join(SERVER_PATH);
+        if server_path.exists() {
+            Ok(LanguageServerBinary {
+                path: node.binary_path().await?,
+                arguments: server_binary_arguments(&server_path),
+            })
+        } else {
+            Err(anyhow!(
+                "missing executable in directory {:?}",
+                last_version_dir
+            ))
+        }
+    })
+    .await
+    .log_err()
+}
diff --git a/crates/zed/src/languages/purescript/brackets.scm b/crates/zed/src/languages/purescript/brackets.scm
new file mode 100644
index 0000000000..191fd9c084
--- /dev/null
+++ b/crates/zed/src/languages/purescript/brackets.scm
@@ -0,0 +1,3 @@
+("(" @open ")" @close)
+("[" @open "]" @close)
+("{" @open "}" @close)
diff --git a/crates/zed/src/languages/purescript/config.toml b/crates/zed/src/languages/purescript/config.toml
new file mode 100644
index 0000000000..f568ef4d1d
--- /dev/null
+++ b/crates/zed/src/languages/purescript/config.toml
@@ -0,0 +1,13 @@
+name = "PureScript"
+path_suffixes = ["purs"]
+autoclose_before = ",=)}]"
+line_comment = "-- "
+block_comment = ["{- ", " -}"]
+brackets = [
+    { start = "{", end = "}", close = true, newline = true },
+    { start = "[", end = "]", close = true, newline = true },
+    { start = "(", end = ")", close = true, newline = true },
+    { start = "\"", end = "\"", close = true, newline = false },
+    { start = "'", end = "'", close = true, newline = false },
+    { start = "`", end = "`", close = true, newline = false },
+]
diff --git a/crates/zed/src/languages/purescript/highlights.scm b/crates/zed/src/languages/purescript/highlights.scm
new file mode 100644
index 0000000000..b6e969af78
--- /dev/null
+++ b/crates/zed/src/languages/purescript/highlights.scm
@@ -0,0 +1,144 @@
+;; Copyright 2022 nvim-treesitter
+;;
+;; Licensed under the Apache License, Version 2.0 (the "License");
+;; you may not use this file except in compliance with the License.
+;; You may obtain a copy of the License at
+;;
+;;     http://www.apache.org/licenses/LICENSE-2.0
+;;
+;; Unless required by applicable law or agreed to in writing, software
+;; distributed under the License is distributed on an "AS IS" BASIS,
+;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+;; See the License for the specific language governing permissions and
+;; limitations under the License.
+
+;; ----------------------------------------------------------------------------
+;; Literals and comments
+
+(integer) @number
+(exp_negation) @number
+(exp_literal (number)) @float
+(char) @character
+[
+  (string)
+  (triple_quote_string)
+] @string
+
+(comment) @comment
+
+
+;; ----------------------------------------------------------------------------
+;; Punctuation
+
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
+
+[
+  (comma)
+  ";"
+] @punctuation.delimiter
+
+
+;; ----------------------------------------------------------------------------
+;; Keywords, operators, includes
+
+[
+  "forall"
+  "∀"
+] @keyword
+
+;; (pragma) @constant
+
+[
+  "if"
+  "then"
+  "else"
+  "case"
+  "of"
+] @keyword
+
+[
+  "import"
+  "module"
+] @keyword
+
+[
+  (operator)
+  (constructor_operator)
+  (type_operator)
+  (qualified_module)  ; grabs the `.` (dot), ex: import System.IO
+  (all_names)
+  (wildcard)
+  "="
+  "|"
+  "::"
+  "=>"
+  "->"
+  "<-"
+  "\\"
+  "`"
+  "@"
+  "∷"
+  "⇒"
+  "<="
+  "⇐"
+  "→"
+  "←"
+] @operator
+
+(module) @title
+
+[
+  (where)
+  "let"
+  "in"
+  "class"
+  "instance"
+  "derive"
+  "foreign"
+  "data"
+  "newtype"
+  "type"
+  "as"
+  "hiding"
+  "do"
+  "ado"
+  "infix"
+  "infixl"
+  "infixr"
+] @keyword
+
+
+;; ----------------------------------------------------------------------------
+;; Functions and variables
+
+(variable) @variable
+(pat_wildcard) @variable
+
+(signature name: (variable) @type)
+(function
+  name: (variable) @function
+  patterns: (patterns))
+
+
+(exp_infix (exp_name) @function (#set! "priority" 101))
+(exp_apply . (exp_name (variable) @function))
+(exp_apply . (exp_name (qualified_variable (variable) @function)))
+
+
+;; ----------------------------------------------------------------------------
+;; Types
+
+(type) @type
+(type_variable) @type
+
+(constructor) @constructor
+
+; True or False
+((constructor) @_bool (#match? @_bool "(True|False)")) @boolean
diff --git a/crates/zed/src/languages/purescript/indents.scm b/crates/zed/src/languages/purescript/indents.scm
new file mode 100644
index 0000000000..112b414aa4
--- /dev/null
+++ b/crates/zed/src/languages/purescript/indents.scm
@@ -0,0 +1,3 @@
+(_ "[" "]" @end) @indent
+(_ "{" "}" @end) @indent
+(_ "(" ")" @end) @indent

From 6305761064f25d607d5c8fb888c5e01a5cf99e7c Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Sun, 28 Jan 2024 18:09:11 -0500
Subject: [PATCH 018/372] Update top ranking issues script to take in a day
 interval

---
 script/update_top_ranking_issues/main.py      |  43 +-
 script/update_top_ranking_issues/poetry.lock  | 533 ++++++++++++++++++
 .../update_top_ranking_issues/pyproject.toml  |  19 +
 .../requirements.txt                          |   5 -
 4 files changed, 585 insertions(+), 15 deletions(-)
 create mode 100644 script/update_top_ranking_issues/poetry.lock
 create mode 100644 script/update_top_ranking_issues/pyproject.toml
 delete mode 100644 script/update_top_ranking_issues/requirements.txt

diff --git a/script/update_top_ranking_issues/main.py b/script/update_top_ranking_issues/main.py
index 0cd1d6f5c1..8c42008d14 100644
--- a/script/update_top_ranking_issues/main.py
+++ b/script/update_top_ranking_issues/main.py
@@ -21,7 +21,7 @@ CORE_LABELS: set[str] = set(
         "documentation",
         "enhancement",
         "panic / crash",
-        "platform support"
+        "platform support",
     ]
 )
 # A set of labels for adding in labels that we want present in the final
@@ -46,9 +46,19 @@ class IssueData:
 
 
 @app.command()
-def main(github_token: Optional[str] = None, prod: bool = False) -> None:
+def main(
+    github_token: Optional[str] = None,
+    prod: bool = False,
+    query_day_interval: Optional[int] = None,
+) -> None:
     start_time: datetime = datetime.now()
 
+    start_date: datetime | None = None
+
+    if query_day_interval:
+        tz = timezone("america/new_york")
+        start_date = datetime.now(tz) - timedelta(days=query_day_interval)
+
     # GitHub Workflow will pass in the token as an environment variable,
     # but we can place it in our env when running the script locally, for convenience
     github_token = github_token or os.getenv("GITHUB_ACCESS_TOKEN")
@@ -66,7 +76,7 @@ def main(github_token: Optional[str] = None, prod: bool = False) -> None:
     (
         label_to_issue_data,
         error_message_to_erroneous_issue_data,
-    ) = get_issue_maps(github, repository)
+    ) = get_issue_maps(github, repository, start_date)
 
     issue_text: str = get_issue_text(
         label_to_issue_data,
@@ -88,10 +98,14 @@ def main(github_token: Optional[str] = None, prod: bool = False) -> None:
 
 
 def get_issue_maps(
-    github: Github, repository: Repository
+    github: Github,
+    repository: Repository,
+    start_date: datetime | None = None,
 ) -> tuple[dict[str, list[IssueData]], dict[str, list[IssueData]]]:
     label_to_issues: defaultdict[str, list[Issue]] = get_label_to_issues(
-        github, repository
+        github,
+        repository,
+        start_date,
     )
     label_to_issue_data: dict[str, list[IssueData]] = get_label_to_issue_data(
         label_to_issues
@@ -123,7 +137,9 @@ def get_issue_maps(
 
 
 def get_label_to_issues(
-    github: Github, repository: Repository
+    github: Github,
+    repository: Repository,
+    start_date: datetime | None = None,
 ) -> defaultdict[str, list[Issue]]:
     label_to_issues: defaultdict[str, list[Issue]] = defaultdict(list)
 
@@ -132,11 +148,18 @@ def get_label_to_issues(
         [f'-label:"{label}"' for label in IGNORED_LABELS]
     )
 
-    for label in labels:
-        query: str = f'repo:{repository.full_name} is:open is:issue label:"{label}" {ignored_labels_text} sort:reactions-+1-desc'
+    date_query: str = (
+        f"created:>={start_date.strftime('%Y-%m-%d')}" if start_date else ""
+    )
 
-        for issue in github.search_issues(query)[0:ISSUES_PER_LABEL]:
-            label_to_issues[label].append(issue)
+    for label in labels:
+        query: str = f'repo:{repository.full_name} is:open is:issue {date_query} label:"{label}" {ignored_labels_text} sort:reactions-+1-desc'
+
+        issues = github.search_issues(query)
+
+        if issues.totalCount > 0:
+            for issue in issues[0:ISSUES_PER_LABEL]:
+                label_to_issues[label].append(issue)
 
     return label_to_issues
 
diff --git a/script/update_top_ranking_issues/poetry.lock b/script/update_top_ranking_issues/poetry.lock
new file mode 100644
index 0000000000..01a981d5bc
--- /dev/null
+++ b/script/update_top_ranking_issues/poetry.lock
@@ -0,0 +1,533 @@
+# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand.
+
+[[package]]
+name = "certifi"
+version = "2023.11.17"
+description = "Python package for providing Mozilla's CA Bundle."
+optional = false
+python-versions = ">=3.6"
+files = [
+    {file = "certifi-2023.11.17-py3-none-any.whl", hash = "sha256:e036ab49d5b79556f99cfc2d9320b34cfbe5be05c5871b51de9329f0603b0474"},
+    {file = "certifi-2023.11.17.tar.gz", hash = "sha256:9b469f3a900bf28dc19b8cfbf8019bf47f7fdd1a65a1d4ffb98fc14166beb4d1"},
+]
+
+[[package]]
+name = "cffi"
+version = "1.16.0"
+description = "Foreign Function Interface for Python calling C code."
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "cffi-1.16.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6b3d6606d369fc1da4fd8c357d026317fbb9c9b75d36dc16e90e84c26854b088"},
+    {file = "cffi-1.16.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ac0f5edd2360eea2f1daa9e26a41db02dd4b0451b48f7c318e217ee092a213e9"},
+    {file = "cffi-1.16.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7e61e3e4fa664a8588aa25c883eab612a188c725755afff6289454d6362b9673"},
+    {file = "cffi-1.16.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a72e8961a86d19bdb45851d8f1f08b041ea37d2bd8d4fd19903bc3083d80c896"},
+    {file = "cffi-1.16.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5b50bf3f55561dac5438f8e70bfcdfd74543fd60df5fa5f62d94e5867deca684"},
+    {file = "cffi-1.16.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7651c50c8c5ef7bdb41108b7b8c5a83013bfaa8a935590c5d74627c047a583c7"},
+    {file = "cffi-1.16.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e4108df7fe9b707191e55f33efbcb2d81928e10cea45527879a4749cbe472614"},
+    {file = "cffi-1.16.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:32c68ef735dbe5857c810328cb2481e24722a59a2003018885514d4c09af9743"},
+    {file = "cffi-1.16.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:673739cb539f8cdaa07d92d02efa93c9ccf87e345b9a0b556e3ecc666718468d"},
+    {file = "cffi-1.16.0-cp310-cp310-win32.whl", hash = "sha256:9f90389693731ff1f659e55c7d1640e2ec43ff725cc61b04b2f9c6d8d017df6a"},
+    {file = "cffi-1.16.0-cp310-cp310-win_amd64.whl", hash = "sha256:e6024675e67af929088fda399b2094574609396b1decb609c55fa58b028a32a1"},
+    {file = "cffi-1.16.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b84834d0cf97e7d27dd5b7f3aca7b6e9263c56308ab9dc8aae9784abb774d404"},
+    {file = "cffi-1.16.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1b8ebc27c014c59692bb2664c7d13ce7a6e9a629be20e54e7271fa696ff2b417"},
+    {file = "cffi-1.16.0-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ee07e47c12890ef248766a6e55bd38ebfb2bb8edd4142d56db91b21ea68b7627"},
+    {file = "cffi-1.16.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8a9d3ebe49f084ad71f9269834ceccbf398253c9fac910c4fd7053ff1386936"},
+    {file = "cffi-1.16.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e70f54f1796669ef691ca07d046cd81a29cb4deb1e5f942003f401c0c4a2695d"},
+    {file = "cffi-1.16.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5bf44d66cdf9e893637896c7faa22298baebcd18d1ddb6d2626a6e39793a1d56"},
+    {file = "cffi-1.16.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7b78010e7b97fef4bee1e896df8a4bbb6712b7f05b7ef630f9d1da00f6444d2e"},
+    {file = "cffi-1.16.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:c6a164aa47843fb1b01e941d385aab7215563bb8816d80ff3a363a9f8448a8dc"},
+    {file = "cffi-1.16.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e09f3ff613345df5e8c3667da1d918f9149bd623cd9070c983c013792a9a62eb"},
+    {file = "cffi-1.16.0-cp311-cp311-win32.whl", hash = "sha256:2c56b361916f390cd758a57f2e16233eb4f64bcbeee88a4881ea90fca14dc6ab"},
+    {file = "cffi-1.16.0-cp311-cp311-win_amd64.whl", hash = "sha256:db8e577c19c0fda0beb7e0d4e09e0ba74b1e4c092e0e40bfa12fe05b6f6d75ba"},
+    {file = "cffi-1.16.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:fa3a0128b152627161ce47201262d3140edb5a5c3da88d73a1b790a959126956"},
+    {file = "cffi-1.16.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:68e7c44931cc171c54ccb702482e9fc723192e88d25a0e133edd7aff8fcd1f6e"},
+    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:abd808f9c129ba2beda4cfc53bde801e5bcf9d6e0f22f095e45327c038bfe68e"},
+    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:88e2b3c14bdb32e440be531ade29d3c50a1a59cd4e51b1dd8b0865c54ea5d2e2"},
+    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fcc8eb6d5902bb1cf6dc4f187ee3ea80a1eba0a89aba40a5cb20a5087d961357"},
+    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b7be2d771cdba2942e13215c4e340bfd76398e9227ad10402a8767ab1865d2e6"},
+    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e715596e683d2ce000574bae5d07bd522c781a822866c20495e52520564f0969"},
+    {file = "cffi-1.16.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:2d92b25dbf6cae33f65005baf472d2c245c050b1ce709cc4588cdcdd5495b520"},
+    {file = "cffi-1.16.0-cp312-cp312-win32.whl", hash = "sha256:b2ca4e77f9f47c55c194982e10f058db063937845bb2b7a86c84a6cfe0aefa8b"},
+    {file = "cffi-1.16.0-cp312-cp312-win_amd64.whl", hash = "sha256:68678abf380b42ce21a5f2abde8efee05c114c2fdb2e9eef2efdb0257fba1235"},
+    {file = "cffi-1.16.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0c9ef6ff37e974b73c25eecc13952c55bceed9112be2d9d938ded8e856138bcc"},
+    {file = "cffi-1.16.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a09582f178759ee8128d9270cd1344154fd473bb77d94ce0aeb2a93ebf0feaf0"},
+    {file = "cffi-1.16.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e760191dd42581e023a68b758769e2da259b5d52e3103c6060ddc02c9edb8d7b"},
+    {file = "cffi-1.16.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:80876338e19c951fdfed6198e70bc88f1c9758b94578d5a7c4c91a87af3cf31c"},
+    {file = "cffi-1.16.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a6a14b17d7e17fa0d207ac08642c8820f84f25ce17a442fd15e27ea18d67c59b"},
+    {file = "cffi-1.16.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6602bc8dc6f3a9e02b6c22c4fc1e47aa50f8f8e6d3f78a5e16ac33ef5fefa324"},
+    {file = "cffi-1.16.0-cp38-cp38-win32.whl", hash = "sha256:131fd094d1065b19540c3d72594260f118b231090295d8c34e19a7bbcf2e860a"},
+    {file = "cffi-1.16.0-cp38-cp38-win_amd64.whl", hash = "sha256:31d13b0f99e0836b7ff893d37af07366ebc90b678b6664c955b54561fc36ef36"},
+    {file = "cffi-1.16.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:582215a0e9adbe0e379761260553ba11c58943e4bbe9c36430c4ca6ac74b15ed"},
+    {file = "cffi-1.16.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b29ebffcf550f9da55bec9e02ad430c992a87e5f512cd63388abb76f1036d8d2"},
+    {file = "cffi-1.16.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dc9b18bf40cc75f66f40a7379f6a9513244fe33c0e8aa72e2d56b0196a7ef872"},
+    {file = "cffi-1.16.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9cb4a35b3642fc5c005a6755a5d17c6c8b6bcb6981baf81cea8bfbc8903e8ba8"},
+    {file = "cffi-1.16.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b86851a328eedc692acf81fb05444bdf1891747c25af7529e39ddafaf68a4f3f"},
+    {file = "cffi-1.16.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c0f31130ebc2d37cdd8e44605fb5fa7ad59049298b3f745c74fa74c62fbfcfc4"},
+    {file = "cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f8e709127c6c77446a8c0a8c8bf3c8ee706a06cd44b1e827c3e6a2ee6b8c098"},
+    {file = "cffi-1.16.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:748dcd1e3d3d7cd5443ef03ce8685043294ad6bd7c02a38d1bd367cfd968e000"},
+    {file = "cffi-1.16.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8895613bcc094d4a1b2dbe179d88d7fb4a15cee43c052e8885783fac397d91fe"},
+    {file = "cffi-1.16.0-cp39-cp39-win32.whl", hash = "sha256:ed86a35631f7bfbb28e108dd96773b9d5a6ce4811cf6ea468bb6a359b256b1e4"},
+    {file = "cffi-1.16.0-cp39-cp39-win_amd64.whl", hash = "sha256:3686dffb02459559c74dd3d81748269ffb0eb027c39a6fc99502de37d501faa8"},
+    {file = "cffi-1.16.0.tar.gz", hash = "sha256:bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0"},
+]
+
+[package.dependencies]
+pycparser = "*"
+
+[[package]]
+name = "charset-normalizer"
+version = "3.3.2"
+description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
+optional = false
+python-versions = ">=3.7.0"
+files = [
+    {file = "charset-normalizer-3.3.2.tar.gz", hash = "sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-win32.whl", hash = "sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-win32.whl", hash = "sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-win_amd64.whl", hash = "sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-win32.whl", hash = "sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-win_amd64.whl", hash = "sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:95f2a5796329323b8f0512e09dbb7a1860c46a39da62ecb2324f116fa8fdc85c"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c002b4ffc0be611f0d9da932eb0f704fe2602a9a949d1f738e4c34c75b0863d5"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a981a536974bbc7a512cf44ed14938cf01030a99e9b3a06dd59578882f06f985"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3287761bc4ee9e33561a7e058c72ac0938c4f57fe49a09eae428fd88aafe7bb6"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:42cb296636fcc8b0644486d15c12376cb9fa75443e00fb25de0b8602e64c1714"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0a55554a2fa0d408816b3b5cedf0045f4b8e1a6065aec45849de2d6f3f8e9786"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c083af607d2515612056a31f0a8d9e0fcb5876b7bfc0abad3ecd275bc4ebc2d5"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:87d1351268731db79e0f8e745d92493ee2841c974128ef629dc518b937d9194c"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:bd8f7df7d12c2db9fab40bdd87a7c09b1530128315d047a086fa3ae3435cb3a8"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:c180f51afb394e165eafe4ac2936a14bee3eb10debc9d9e4db8958fe36afe711"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8c622a5fe39a48f78944a87d4fb8a53ee07344641b0562c540d840748571b811"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-win32.whl", hash = "sha256:db364eca23f876da6f9e16c9da0df51aa4f104a972735574842618b8c6d999d4"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-win_amd64.whl", hash = "sha256:86216b5cee4b06df986d214f664305142d9c76df9b6512be2738aa72a2048f99"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:6463effa3186ea09411d50efc7d85360b38d5f09b870c48e4600f63af490e56a"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6c4caeef8fa63d06bd437cd4bdcf3ffefe6738fb1b25951440d80dc7df8c03ac"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:37e55c8e51c236f95b033f6fb391d7d7970ba5fe7ff453dad675e88cf303377a"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ae5f4161f18c61806f411a13b0310bea87f987c7d2ecdbdaad0e94eb2e404238"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b2b0a0c0517616b6869869f8c581d4eb2dd83a4d79e0ebcb7d373ef9956aeb0a"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:45485e01ff4d3630ec0d9617310448a8702f70e9c01906b0d0118bdf9d124cf2"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:eb00ed941194665c332bf8e078baf037d6c35d7c4f3102ea2d4f16ca94a26dc8"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:2127566c664442652f024c837091890cb1942c30937add288223dc895793f898"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a50aebfa173e157099939b17f18600f72f84eed3049e743b68ad15bd69b6bf99"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:4d0d1650369165a14e14e1e47b372cfcb31d6ab44e6e33cb2d4e57265290044d"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:923c0c831b7cfcb071580d3f46c4baf50f174be571576556269530f4bbd79d04"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-win32.whl", hash = "sha256:6ef1d82a3af9d3eecdba2321dc1b3c238245d890843e040e41e470ffa64c3e25"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-win_amd64.whl", hash = "sha256:eb8821e09e916165e160797a6c17edda0679379a4be5c716c260e836e122f54b"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:22afcb9f253dac0696b5a4be4a1c0f8762f8239e21b99680099abd9b2b1b2269"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e27ad930a842b4c5eb8ac0016b0a54f5aebbe679340c26101df33424142c143c"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1f79682fbe303db92bc2b1136016a38a42e835d932bab5b3b1bfcfbf0640e519"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b261ccdec7821281dade748d088bb6e9b69e6d15b30652b74cbbac25e280b796"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:122c7fa62b130ed55f8f285bfd56d5f4b4a5b503609d181f9ad85e55c89f4185"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:d0eccceffcb53201b5bfebb52600a5fb483a20b61da9dbc885f8b103cbe7598c"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f96df6923e21816da7e0ad3fd47dd8f94b2a5ce594e00677c0013018b813458"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:7f04c839ed0b6b98b1a7501a002144b76c18fb1c1850c8b98d458ac269e26ed2"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:34d1c8da1e78d2e001f363791c98a272bb734000fcef47a491c1e3b0505657a8"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-win32.whl", hash = "sha256:aed38f6e4fb3f5d6bf81bfa990a07806be9d83cf7bacef998ab1a9bd660a581f"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-win_amd64.whl", hash = "sha256:b01b88d45a6fcb69667cd6d2f7a9aeb4bf53760d7fc536bf679ec94fe9f3ff3d"},
+    {file = "charset_normalizer-3.3.2-py3-none-any.whl", hash = "sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc"},
+]
+
+[[package]]
+name = "click"
+version = "8.1.7"
+description = "Composable command line interface toolkit"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "click-8.1.7-py3-none-any.whl", hash = "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28"},
+    {file = "click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de"},
+]
+
+[package.dependencies]
+colorama = {version = "*", markers = "platform_system == \"Windows\""}
+
+[[package]]
+name = "colorama"
+version = "0.4.6"
+description = "Cross-platform colored terminal text."
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
+files = [
+    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
+    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
+]
+
+[[package]]
+name = "deprecated"
+version = "1.2.14"
+description = "Python @deprecated decorator to deprecate old python classes, functions or methods."
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+files = [
+    {file = "Deprecated-1.2.14-py2.py3-none-any.whl", hash = "sha256:6fac8b097794a90302bdbb17b9b815e732d3c4720583ff1b198499d78470466c"},
+    {file = "Deprecated-1.2.14.tar.gz", hash = "sha256:e5323eb936458dccc2582dc6f9c322c852a775a27065ff2b0c4970b9d53d01b3"},
+]
+
+[package.dependencies]
+wrapt = ">=1.10,<2"
+
+[package.extras]
+dev = ["PyTest", "PyTest-Cov", "bump2version (<1)", "sphinx (<2)", "tox"]
+
+[[package]]
+name = "idna"
+version = "3.6"
+description = "Internationalized Domain Names in Applications (IDNA)"
+optional = false
+python-versions = ">=3.5"
+files = [
+    {file = "idna-3.6-py3-none-any.whl", hash = "sha256:c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f"},
+    {file = "idna-3.6.tar.gz", hash = "sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca"},
+]
+
+[[package]]
+name = "mypy"
+version = "1.6.0"
+description = "Optional static typing for Python"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "mypy-1.6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:091f53ff88cb093dcc33c29eee522c087a438df65eb92acd371161c1f4380ff0"},
+    {file = "mypy-1.6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:eb7ff4007865833c470a601498ba30462b7374342580e2346bf7884557e40531"},
+    {file = "mypy-1.6.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:49499cf1e464f533fc45be54d20a6351a312f96ae7892d8e9f1708140e27ce41"},
+    {file = "mypy-1.6.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4c192445899c69f07874dabda7e931b0cc811ea055bf82c1ababf358b9b2a72c"},
+    {file = "mypy-1.6.0-cp310-cp310-win_amd64.whl", hash = "sha256:3df87094028e52766b0a59a3e46481bb98b27986ed6ded6a6cc35ecc75bb9182"},
+    {file = "mypy-1.6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3c8835a07b8442da900db47ccfda76c92c69c3a575872a5b764332c4bacb5a0a"},
+    {file = "mypy-1.6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:24f3de8b9e7021cd794ad9dfbf2e9fe3f069ff5e28cb57af6f873ffec1cb0425"},
+    {file = "mypy-1.6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:856bad61ebc7d21dbc019b719e98303dc6256cec6dcc9ebb0b214b81d6901bd8"},
+    {file = "mypy-1.6.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:89513ddfda06b5c8ebd64f026d20a61ef264e89125dc82633f3c34eeb50e7d60"},
+    {file = "mypy-1.6.0-cp311-cp311-win_amd64.whl", hash = "sha256:9f8464ed410ada641c29f5de3e6716cbdd4f460b31cf755b2af52f2d5ea79ead"},
+    {file = "mypy-1.6.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:971104bcb180e4fed0d7bd85504c9036346ab44b7416c75dd93b5c8c6bb7e28f"},
+    {file = "mypy-1.6.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ab98b8f6fdf669711f3abe83a745f67f50e3cbaea3998b90e8608d2b459fd566"},
+    {file = "mypy-1.6.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1a69db3018b87b3e6e9dd28970f983ea6c933800c9edf8c503c3135b3274d5ad"},
+    {file = "mypy-1.6.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:dccd850a2e3863891871c9e16c54c742dba5470f5120ffed8152956e9e0a5e13"},
+    {file = "mypy-1.6.0-cp312-cp312-win_amd64.whl", hash = "sha256:f8598307150b5722854f035d2e70a1ad9cc3c72d392c34fffd8c66d888c90f17"},
+    {file = "mypy-1.6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:fea451a3125bf0bfe716e5d7ad4b92033c471e4b5b3e154c67525539d14dc15a"},
+    {file = "mypy-1.6.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:e28d7b221898c401494f3b77db3bac78a03ad0a0fff29a950317d87885c655d2"},
+    {file = "mypy-1.6.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e4b7a99275a61aa22256bab5839c35fe8a6887781862471df82afb4b445daae6"},
+    {file = "mypy-1.6.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:7469545380dddce5719e3656b80bdfbb217cfe8dbb1438532d6abc754b828fed"},
+    {file = "mypy-1.6.0-cp38-cp38-win_amd64.whl", hash = "sha256:7807a2a61e636af9ca247ba8494031fb060a0a744b9fee7de3a54bed8a753323"},
+    {file = "mypy-1.6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d2dad072e01764823d4b2f06bc7365bb1d4b6c2f38c4d42fade3c8d45b0b4b67"},
+    {file = "mypy-1.6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b19006055dde8a5425baa5f3b57a19fa79df621606540493e5e893500148c72f"},
+    {file = "mypy-1.6.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:31eba8a7a71f0071f55227a8057468b8d2eb5bf578c8502c7f01abaec8141b2f"},
+    {file = "mypy-1.6.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8e0db37ac4ebb2fee7702767dfc1b773c7365731c22787cb99f507285014fcaf"},
+    {file = "mypy-1.6.0-cp39-cp39-win_amd64.whl", hash = "sha256:c69051274762cccd13498b568ed2430f8d22baa4b179911ad0c1577d336ed849"},
+    {file = "mypy-1.6.0-py3-none-any.whl", hash = "sha256:9e1589ca150a51d9d00bb839bfeca2f7a04f32cd62fad87a847bc0818e15d7dc"},
+    {file = "mypy-1.6.0.tar.gz", hash = "sha256:4f3d27537abde1be6d5f2c96c29a454da333a2a271ae7d5bc7110e6d4b7beb3f"},
+]
+
+[package.dependencies]
+mypy-extensions = ">=1.0.0"
+typing-extensions = ">=4.1.0"
+
+[package.extras]
+dmypy = ["psutil (>=4.0)"]
+install-types = ["pip"]
+reports = ["lxml"]
+
+[[package]]
+name = "mypy-extensions"
+version = "1.0.0"
+description = "Type system extensions for programs checked with the mypy type checker."
+optional = false
+python-versions = ">=3.5"
+files = [
+    {file = "mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d"},
+    {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"},
+]
+
+[[package]]
+name = "pycparser"
+version = "2.21"
+description = "C parser in Python"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+files = [
+    {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"},
+    {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"},
+]
+
+[[package]]
+name = "pygithub"
+version = "1.55"
+description = "Use the full Github API v3"
+optional = false
+python-versions = ">=3.6"
+files = [
+    {file = "PyGithub-1.55-py3-none-any.whl", hash = "sha256:2caf0054ea079b71e539741ae56c5a95e073b81fa472ce222e81667381b9601b"},
+    {file = "PyGithub-1.55.tar.gz", hash = "sha256:1bbfff9372047ff3f21d5cd8e07720f3dbfdaf6462fcaed9d815f528f1ba7283"},
+]
+
+[package.dependencies]
+deprecated = "*"
+pyjwt = ">=2.0"
+pynacl = ">=1.4.0"
+requests = ">=2.14.0"
+
+[package.extras]
+integrations = ["cryptography"]
+
+[[package]]
+name = "pyjwt"
+version = "2.8.0"
+description = "JSON Web Token implementation in Python"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "PyJWT-2.8.0-py3-none-any.whl", hash = "sha256:59127c392cc44c2da5bb3192169a91f429924e17aff6534d70fdc02ab3e04320"},
+    {file = "PyJWT-2.8.0.tar.gz", hash = "sha256:57e28d156e3d5c10088e0c68abb90bfac3df82b40a71bd0daa20c65ccd5c23de"},
+]
+
+[package.extras]
+crypto = ["cryptography (>=3.4.0)"]
+dev = ["coverage[toml] (==5.0.4)", "cryptography (>=3.4.0)", "pre-commit", "pytest (>=6.0.0,<7.0.0)", "sphinx (>=4.5.0,<5.0.0)", "sphinx-rtd-theme", "zope.interface"]
+docs = ["sphinx (>=4.5.0,<5.0.0)", "sphinx-rtd-theme", "zope.interface"]
+tests = ["coverage[toml] (==5.0.4)", "pytest (>=6.0.0,<7.0.0)"]
+
+[[package]]
+name = "pynacl"
+version = "1.5.0"
+description = "Python binding to the Networking and Cryptography (NaCl) library"
+optional = false
+python-versions = ">=3.6"
+files = [
+    {file = "PyNaCl-1.5.0-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:401002a4aaa07c9414132aaed7f6836ff98f59277a234704ff66878c2ee4a0d1"},
+    {file = "PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:52cb72a79269189d4e0dc537556f4740f7f0a9ec41c1322598799b0bdad4ef92"},
+    {file = "PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a36d4a9dda1f19ce6e03c9a784a2921a4b726b02e1c736600ca9c22029474394"},
+    {file = "PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:0c84947a22519e013607c9be43706dd42513f9e6ae5d39d3613ca1e142fba44d"},
+    {file = "PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:06b8f6fa7f5de8d5d2f7573fe8c863c051225a27b61e6860fd047b1775807858"},
+    {file = "PyNaCl-1.5.0-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:a422368fc821589c228f4c49438a368831cb5bbc0eab5ebe1d7fac9dded6567b"},
+    {file = "PyNaCl-1.5.0-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:61f642bf2378713e2c2e1de73444a3778e5f0a38be6fee0fe532fe30060282ff"},
+    {file = "PyNaCl-1.5.0-cp36-abi3-win32.whl", hash = "sha256:e46dae94e34b085175f8abb3b0aaa7da40767865ac82c928eeb9e57e1ea8a543"},
+    {file = "PyNaCl-1.5.0-cp36-abi3-win_amd64.whl", hash = "sha256:20f42270d27e1b6a29f54032090b972d97f0a1b0948cc52392041ef7831fee93"},
+    {file = "PyNaCl-1.5.0.tar.gz", hash = "sha256:8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba"},
+]
+
+[package.dependencies]
+cffi = ">=1.4.1"
+
+[package.extras]
+docs = ["sphinx (>=1.6.5)", "sphinx-rtd-theme"]
+tests = ["hypothesis (>=3.27.0)", "pytest (>=3.2.1,!=3.3.0)"]
+
+[[package]]
+name = "pytz"
+version = "2022.1"
+description = "World timezone definitions, modern and historical"
+optional = false
+python-versions = "*"
+files = [
+    {file = "pytz-2022.1-py2.py3-none-any.whl", hash = "sha256:e68985985296d9a66a881eb3193b0906246245294a881e7c8afe623866ac6a5c"},
+    {file = "pytz-2022.1.tar.gz", hash = "sha256:1e760e2fe6a8163bc0b3d9a19c4f84342afa0a2affebfaa84b01b978a02ecaa7"},
+]
+
+[[package]]
+name = "requests"
+version = "2.31.0"
+description = "Python HTTP for Humans."
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"},
+    {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"},
+]
+
+[package.dependencies]
+certifi = ">=2017.4.17"
+charset-normalizer = ">=2,<4"
+idna = ">=2.5,<4"
+urllib3 = ">=1.21.1,<3"
+
+[package.extras]
+socks = ["PySocks (>=1.5.6,!=1.5.7)"]
+use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
+
+[[package]]
+name = "typer"
+version = "0.9.0"
+description = "Typer, build great CLIs. Easy to code. Based on Python type hints."
+optional = false
+python-versions = ">=3.6"
+files = [
+    {file = "typer-0.9.0-py3-none-any.whl", hash = "sha256:5d96d986a21493606a358cae4461bd8cdf83cbf33a5aa950ae629ca3b51467ee"},
+    {file = "typer-0.9.0.tar.gz", hash = "sha256:50922fd79aea2f4751a8e0408ff10d2662bd0c8bbfa84755a699f3bada2978b2"},
+]
+
+[package.dependencies]
+click = ">=7.1.1,<9.0.0"
+typing-extensions = ">=3.7.4.3"
+
+[package.extras]
+all = ["colorama (>=0.4.3,<0.5.0)", "rich (>=10.11.0,<14.0.0)", "shellingham (>=1.3.0,<2.0.0)"]
+dev = ["autoflake (>=1.3.1,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)", "pre-commit (>=2.17.0,<3.0.0)"]
+doc = ["cairosvg (>=2.5.2,<3.0.0)", "mdx-include (>=1.4.1,<2.0.0)", "mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=8.1.4,<9.0.0)", "pillow (>=9.3.0,<10.0.0)"]
+test = ["black (>=22.3.0,<23.0.0)", "coverage (>=6.2,<7.0)", "isort (>=5.0.6,<6.0.0)", "mypy (==0.910)", "pytest (>=4.4.0,<8.0.0)", "pytest-cov (>=2.10.0,<5.0.0)", "pytest-sugar (>=0.9.4,<0.10.0)", "pytest-xdist (>=1.32.0,<4.0.0)", "rich (>=10.11.0,<14.0.0)", "shellingham (>=1.3.0,<2.0.0)"]
+
+[[package]]
+name = "types-pytz"
+version = "2023.3.1.1"
+description = "Typing stubs for pytz"
+optional = false
+python-versions = "*"
+files = [
+    {file = "types-pytz-2023.3.1.1.tar.gz", hash = "sha256:cc23d0192cd49c8f6bba44ee0c81e4586a8f30204970fc0894d209a6b08dab9a"},
+    {file = "types_pytz-2023.3.1.1-py3-none-any.whl", hash = "sha256:1999a123a3dc0e39a2ef6d19f3f8584211de9e6a77fe7a0259f04a524e90a5cf"},
+]
+
+[[package]]
+name = "typing-extensions"
+version = "4.9.0"
+description = "Backported and Experimental Type Hints for Python 3.8+"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "typing_extensions-4.9.0-py3-none-any.whl", hash = "sha256:af72aea155e91adfc61c3ae9e0e342dbc0cba726d6cba4b6c72c1f34e47291cd"},
+    {file = "typing_extensions-4.9.0.tar.gz", hash = "sha256:23478f88c37f27d76ac8aee6c905017a143b0b1b886c3c9f66bc2fd94f9f5783"},
+]
+
+[[package]]
+name = "urllib3"
+version = "2.1.0"
+description = "HTTP library with thread-safe connection pooling, file post, and more."
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "urllib3-2.1.0-py3-none-any.whl", hash = "sha256:55901e917a5896a349ff771be919f8bd99aff50b79fe58fec595eb37bbc56bb3"},
+    {file = "urllib3-2.1.0.tar.gz", hash = "sha256:df7aa8afb0148fa78488e7899b2c59b5f4ffcfa82e6c54ccb9dd37c1d7b52d54"},
+]
+
+[package.extras]
+brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)"]
+socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"]
+zstd = ["zstandard (>=0.18.0)"]
+
+[[package]]
+name = "wrapt"
+version = "1.16.0"
+description = "Module for decorators, wrappers and monkey patching."
+optional = false
+python-versions = ">=3.6"
+files = [
+    {file = "wrapt-1.16.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ffa565331890b90056c01db69c0fe634a776f8019c143a5ae265f9c6bc4bd6d4"},
+    {file = "wrapt-1.16.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e4fdb9275308292e880dcbeb12546df7f3e0f96c6b41197e0cf37d2826359020"},
+    {file = "wrapt-1.16.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bb2dee3874a500de01c93d5c71415fcaef1d858370d405824783e7a8ef5db440"},
+    {file = "wrapt-1.16.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2a88e6010048489cda82b1326889ec075a8c856c2e6a256072b28eaee3ccf487"},
+    {file = "wrapt-1.16.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ac83a914ebaf589b69f7d0a1277602ff494e21f4c2f743313414378f8f50a4cf"},
+    {file = "wrapt-1.16.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:73aa7d98215d39b8455f103de64391cb79dfcad601701a3aa0dddacf74911d72"},
+    {file = "wrapt-1.16.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:807cc8543a477ab7422f1120a217054f958a66ef7314f76dd9e77d3f02cdccd0"},
+    {file = "wrapt-1.16.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:bf5703fdeb350e36885f2875d853ce13172ae281c56e509f4e6eca049bdfb136"},
+    {file = "wrapt-1.16.0-cp310-cp310-win32.whl", hash = "sha256:f6b2d0c6703c988d334f297aa5df18c45e97b0af3679bb75059e0e0bd8b1069d"},
+    {file = "wrapt-1.16.0-cp310-cp310-win_amd64.whl", hash = "sha256:decbfa2f618fa8ed81c95ee18a387ff973143c656ef800c9f24fb7e9c16054e2"},
+    {file = "wrapt-1.16.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1a5db485fe2de4403f13fafdc231b0dbae5eca4359232d2efc79025527375b09"},
+    {file = "wrapt-1.16.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:75ea7d0ee2a15733684badb16de6794894ed9c55aa5e9903260922f0482e687d"},
+    {file = "wrapt-1.16.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a452f9ca3e3267cd4d0fcf2edd0d035b1934ac2bd7e0e57ac91ad6b95c0c6389"},
+    {file = "wrapt-1.16.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:43aa59eadec7890d9958748db829df269f0368521ba6dc68cc172d5d03ed8060"},
+    {file = "wrapt-1.16.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:72554a23c78a8e7aa02abbd699d129eead8b147a23c56e08d08dfc29cfdddca1"},
+    {file = "wrapt-1.16.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:d2efee35b4b0a347e0d99d28e884dfd82797852d62fcd7ebdeee26f3ceb72cf3"},
+    {file = "wrapt-1.16.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:6dcfcffe73710be01d90cae08c3e548d90932d37b39ef83969ae135d36ef3956"},
+    {file = "wrapt-1.16.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:eb6e651000a19c96f452c85132811d25e9264d836951022d6e81df2fff38337d"},
+    {file = "wrapt-1.16.0-cp311-cp311-win32.whl", hash = "sha256:66027d667efe95cc4fa945af59f92c5a02c6f5bb6012bff9e60542c74c75c362"},
+    {file = "wrapt-1.16.0-cp311-cp311-win_amd64.whl", hash = "sha256:aefbc4cb0a54f91af643660a0a150ce2c090d3652cf4052a5397fb2de549cd89"},
+    {file = "wrapt-1.16.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:5eb404d89131ec9b4f748fa5cfb5346802e5ee8836f57d516576e61f304f3b7b"},
+    {file = "wrapt-1.16.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:9090c9e676d5236a6948330e83cb89969f433b1943a558968f659ead07cb3b36"},
+    {file = "wrapt-1.16.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:94265b00870aa407bd0cbcfd536f17ecde43b94fb8d228560a1e9d3041462d73"},
+    {file = "wrapt-1.16.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f2058f813d4f2b5e3a9eb2eb3faf8f1d99b81c3e51aeda4b168406443e8ba809"},
+    {file = "wrapt-1.16.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:98b5e1f498a8ca1858a1cdbffb023bfd954da4e3fa2c0cb5853d40014557248b"},
+    {file = "wrapt-1.16.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:14d7dc606219cdd7405133c713f2c218d4252f2a469003f8c46bb92d5d095d81"},
+    {file = "wrapt-1.16.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:49aac49dc4782cb04f58986e81ea0b4768e4ff197b57324dcbd7699c5dfb40b9"},
+    {file = "wrapt-1.16.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:418abb18146475c310d7a6dc71143d6f7adec5b004ac9ce08dc7a34e2babdc5c"},
+    {file = "wrapt-1.16.0-cp312-cp312-win32.whl", hash = "sha256:685f568fa5e627e93f3b52fda002c7ed2fa1800b50ce51f6ed1d572d8ab3e7fc"},
+    {file = "wrapt-1.16.0-cp312-cp312-win_amd64.whl", hash = "sha256:dcdba5c86e368442528f7060039eda390cc4091bfd1dca41e8046af7c910dda8"},
+    {file = "wrapt-1.16.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:d462f28826f4657968ae51d2181a074dfe03c200d6131690b7d65d55b0f360f8"},
+    {file = "wrapt-1.16.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a33a747400b94b6d6b8a165e4480264a64a78c8a4c734b62136062e9a248dd39"},
+    {file = "wrapt-1.16.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b3646eefa23daeba62643a58aac816945cadc0afaf21800a1421eeba5f6cfb9c"},
+    {file = "wrapt-1.16.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ebf019be5c09d400cf7b024aa52b1f3aeebeff51550d007e92c3c1c4afc2a40"},
+    {file = "wrapt-1.16.0-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:0d2691979e93d06a95a26257adb7bfd0c93818e89b1406f5a28f36e0d8c1e1fc"},
+    {file = "wrapt-1.16.0-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:1acd723ee2a8826f3d53910255643e33673e1d11db84ce5880675954183ec47e"},
+    {file = "wrapt-1.16.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:bc57efac2da352a51cc4658878a68d2b1b67dbe9d33c36cb826ca449d80a8465"},
+    {file = "wrapt-1.16.0-cp36-cp36m-win32.whl", hash = "sha256:da4813f751142436b075ed7aa012a8778aa43a99f7b36afe9b742d3ed8bdc95e"},
+    {file = "wrapt-1.16.0-cp36-cp36m-win_amd64.whl", hash = "sha256:6f6eac2360f2d543cc875a0e5efd413b6cbd483cb3ad7ebf888884a6e0d2e966"},
+    {file = "wrapt-1.16.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a0ea261ce52b5952bf669684a251a66df239ec6d441ccb59ec7afa882265d593"},
+    {file = "wrapt-1.16.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7bd2d7ff69a2cac767fbf7a2b206add2e9a210e57947dd7ce03e25d03d2de292"},
+    {file = "wrapt-1.16.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9159485323798c8dc530a224bd3ffcf76659319ccc7bbd52e01e73bd0241a0c5"},
+    {file = "wrapt-1.16.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a86373cf37cd7764f2201b76496aba58a52e76dedfaa698ef9e9688bfd9e41cf"},
+    {file = "wrapt-1.16.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:73870c364c11f03ed072dda68ff7aea6d2a3a5c3fe250d917a429c7432e15228"},
+    {file = "wrapt-1.16.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:b935ae30c6e7400022b50f8d359c03ed233d45b725cfdd299462f41ee5ffba6f"},
+    {file = "wrapt-1.16.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:db98ad84a55eb09b3c32a96c576476777e87c520a34e2519d3e59c44710c002c"},
+    {file = "wrapt-1.16.0-cp37-cp37m-win32.whl", hash = "sha256:9153ed35fc5e4fa3b2fe97bddaa7cbec0ed22412b85bcdaf54aeba92ea37428c"},
+    {file = "wrapt-1.16.0-cp37-cp37m-win_amd64.whl", hash = "sha256:66dfbaa7cfa3eb707bbfcd46dab2bc6207b005cbc9caa2199bcbc81d95071a00"},
+    {file = "wrapt-1.16.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1dd50a2696ff89f57bd8847647a1c363b687d3d796dc30d4dd4a9d1689a706f0"},
+    {file = "wrapt-1.16.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:44a2754372e32ab315734c6c73b24351d06e77ffff6ae27d2ecf14cf3d229202"},
+    {file = "wrapt-1.16.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e9723528b9f787dc59168369e42ae1c3b0d3fadb2f1a71de14531d321ee05b0"},
+    {file = "wrapt-1.16.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dbed418ba5c3dce92619656802cc5355cb679e58d0d89b50f116e4a9d5a9603e"},
+    {file = "wrapt-1.16.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:941988b89b4fd6b41c3f0bfb20e92bd23746579736b7343283297c4c8cbae68f"},
+    {file = "wrapt-1.16.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6a42cd0cfa8ffc1915aef79cb4284f6383d8a3e9dcca70c445dcfdd639d51267"},
+    {file = "wrapt-1.16.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:1ca9b6085e4f866bd584fb135a041bfc32cab916e69f714a7d1d397f8c4891ca"},
+    {file = "wrapt-1.16.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:d5e49454f19ef621089e204f862388d29e6e8d8b162efce05208913dde5b9ad6"},
+    {file = "wrapt-1.16.0-cp38-cp38-win32.whl", hash = "sha256:c31f72b1b6624c9d863fc095da460802f43a7c6868c5dda140f51da24fd47d7b"},
+    {file = "wrapt-1.16.0-cp38-cp38-win_amd64.whl", hash = "sha256:490b0ee15c1a55be9c1bd8609b8cecd60e325f0575fc98f50058eae366e01f41"},
+    {file = "wrapt-1.16.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9b201ae332c3637a42f02d1045e1d0cccfdc41f1f2f801dafbaa7e9b4797bfc2"},
+    {file = "wrapt-1.16.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2076fad65c6736184e77d7d4729b63a6d1ae0b70da4868adeec40989858eb3fb"},
+    {file = "wrapt-1.16.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c5cd603b575ebceca7da5a3a251e69561bec509e0b46e4993e1cac402b7247b8"},
+    {file = "wrapt-1.16.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b47cfad9e9bbbed2339081f4e346c93ecd7ab504299403320bf85f7f85c7d46c"},
+    {file = "wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f8212564d49c50eb4565e502814f694e240c55551a5f1bc841d4fcaabb0a9b8a"},
+    {file = "wrapt-1.16.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:5f15814a33e42b04e3de432e573aa557f9f0f56458745c2074952f564c50e664"},
+    {file = "wrapt-1.16.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:db2e408d983b0e61e238cf579c09ef7020560441906ca990fe8412153e3b291f"},
+    {file = "wrapt-1.16.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:edfad1d29c73f9b863ebe7082ae9321374ccb10879eeabc84ba3b69f2579d537"},
+    {file = "wrapt-1.16.0-cp39-cp39-win32.whl", hash = "sha256:ed867c42c268f876097248e05b6117a65bcd1e63b779e916fe2e33cd6fd0d3c3"},
+    {file = "wrapt-1.16.0-cp39-cp39-win_amd64.whl", hash = "sha256:eb1b046be06b0fce7249f1d025cd359b4b80fc1c3e24ad9eca33e0dcdb2e4a35"},
+    {file = "wrapt-1.16.0-py3-none-any.whl", hash = "sha256:6906c4100a8fcbf2fa735f6059214bb13b97f75b1a61777fcf6432121ef12ef1"},
+    {file = "wrapt-1.16.0.tar.gz", hash = "sha256:5f370f952971e7d17c7d1ead40e49f32345a7f7a5373571ef44d800d06b1899d"},
+]
+
+[metadata]
+lock-version = "2.0"
+python-versions = "^3.11"
+content-hash = "c8cbcfeae85fbc095998877c78ca7ea750b268c824ab56b58d87c55e8f547c31"
diff --git a/script/update_top_ranking_issues/pyproject.toml b/script/update_top_ranking_issues/pyproject.toml
new file mode 100644
index 0000000000..ad7a6567ea
--- /dev/null
+++ b/script/update_top_ranking_issues/pyproject.toml
@@ -0,0 +1,19 @@
+[tool.poetry]
+name = "update-top-ranking-issues"
+version = "0.1.0"
+description = ""
+authors = ["Joseph T. Lyons <JosephTLyons@gmail.com>"]
+readme = "README.md"
+
+[tool.poetry.dependencies]
+PyGithub = "1.55"
+mypy = "1.6.0"
+python = "3.12.1"
+pytz = "2022.1"
+typer = "0.9.0"
+types-pytz = "2023.3.1.1"
+
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
diff --git a/script/update_top_ranking_issues/requirements.txt b/script/update_top_ranking_issues/requirements.txt
deleted file mode 100644
index 191e292be1..0000000000
--- a/script/update_top_ranking_issues/requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-mypy==1.6.0
-PyGithub==1.55
-pytz==2022.1
-typer==0.9.0
-types-pytz==2023.3.1.1

From 80cdd60d4cc2f2e84fcd91dda951071e8fef5c28 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Sun, 28 Jan 2024 18:22:39 -0500
Subject: [PATCH 019/372] Add a weekly report

---
 ...es.yml => update_all_top_ranking_issues.yml} |  2 +-
 .../update_weekly_top_ranking_issues.yml        | 17 +++++++++++++++++
 script/update_top_ranking_issues/main.py        |  6 ++++--
 3 files changed, 22 insertions(+), 3 deletions(-)
 rename .github/workflows/{update_top_ranking_issues.yml => update_all_top_ranking_issues.yml} (89%)
 create mode 100644 .github/workflows/update_weekly_top_ranking_issues.yml

diff --git a/.github/workflows/update_top_ranking_issues.yml b/.github/workflows/update_all_top_ranking_issues.yml
similarity index 89%
rename from .github/workflows/update_top_ranking_issues.yml
rename to .github/workflows/update_all_top_ranking_issues.yml
index 8b93bee7e2..0ffdb6aeb2 100644
--- a/.github/workflows/update_top_ranking_issues.yml
+++ b/.github/workflows/update_all_top_ranking_issues.yml
@@ -14,4 +14,4 @@ jobs:
                   architecture: "x64"
                   cache: "pip"
             - run: pip install -r script/update_top_ranking_issues/requirements.txt
-            - run: python script/update_top_ranking_issues/main.py --github-token ${{ secrets.GITHUB_TOKEN }} --prod
+            - run: python script/update_top_ranking_issues/main.py 5393 --github-token ${{ secrets.GITHUB_TOKEN }} --prod
diff --git a/.github/workflows/update_weekly_top_ranking_issues.yml b/.github/workflows/update_weekly_top_ranking_issues.yml
new file mode 100644
index 0000000000..38f32ddd5a
--- /dev/null
+++ b/.github/workflows/update_weekly_top_ranking_issues.yml
@@ -0,0 +1,17 @@
+on:
+    schedule:
+        - cron: "0 17 * * SUN"
+    workflow_dispatch:
+
+jobs:
+    update_top_ranking_issues:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - uses: actions/setup-python@v4
+              with:
+                  python-version: "3.10.5"
+                  architecture: "x64"
+                  cache: "pip"
+            - run: pip install -r script/update_top_ranking_issues/requirements.txt
+            - run: python script/update_top_ranking_issues/main.py 6952 --github-token ${{ secrets.GITHUB_TOKEN }} --prod --query-day-interval 7
diff --git a/script/update_top_ranking_issues/main.py b/script/update_top_ranking_issues/main.py
index 8c42008d14..bad453e128 100644
--- a/script/update_top_ranking_issues/main.py
+++ b/script/update_top_ranking_issues/main.py
@@ -47,6 +47,7 @@ class IssueData:
 
 @app.command()
 def main(
+    issue_reference_number: int,
     github_token: Optional[str] = None,
     prod: bool = False,
     query_day_interval: Optional[int] = None,
@@ -57,7 +58,8 @@ def main(
 
     if query_day_interval:
         tz = timezone("america/new_york")
-        start_date = datetime.now(tz) - timedelta(days=query_day_interval)
+        current_time = datetime.now(tz).replace(hour=0, minute=0, second=0, microsecond=0)
+        start_date = current_time - timedelta(days=query_day_interval)
 
     # GitHub Workflow will pass in the token as an environment variable,
     # but we can place it in our env when running the script locally, for convenience
@@ -84,7 +86,7 @@ def main(
     )
 
     if prod:
-        top_ranking_issues_issue: Issue = repository.get_issue(5393)
+        top_ranking_issues_issue: Issue = repository.get_issue(issue_reference_number)
         top_ranking_issues_issue.edit(body=issue_text)
     else:
         print(issue_text)

From 7c93f6244d4013dd1967189d1ca7c3bd16b76538 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Sun, 28 Jan 2024 18:30:47 -0500
Subject: [PATCH 020/372] Reinstate requirements.txt

---
 script/update_top_ranking_issues/pyproject.toml   | 2 +-
 script/update_top_ranking_issues/requirements.txt | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 script/update_top_ranking_issues/requirements.txt

diff --git a/script/update_top_ranking_issues/pyproject.toml b/script/update_top_ranking_issues/pyproject.toml
index ad7a6567ea..b9e96e03e9 100644
--- a/script/update_top_ranking_issues/pyproject.toml
+++ b/script/update_top_ranking_issues/pyproject.toml
@@ -6,8 +6,8 @@ authors = ["Joseph T. Lyons <JosephTLyons@gmail.com>"]
 readme = "README.md"
 
 [tool.poetry.dependencies]
-PyGithub = "1.55"
 mypy = "1.6.0"
+PyGithub = "1.55"
 python = "3.12.1"
 pytz = "2022.1"
 typer = "0.9.0"
diff --git a/script/update_top_ranking_issues/requirements.txt b/script/update_top_ranking_issues/requirements.txt
new file mode 100644
index 0000000000..191e292be1
--- /dev/null
+++ b/script/update_top_ranking_issues/requirements.txt
@@ -0,0 +1,5 @@
+mypy==1.6.0
+PyGithub==1.55
+pytz==2022.1
+typer==0.9.0
+types-pytz==2023.3.1.1

From 5d0c144ce74ef12220c5e1c03e8b1a0c053192dc Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Sun, 28 Jan 2024 21:55:40 -0500
Subject: [PATCH 021/372] theme_importer: Define more colors in `VsCodeTheme`
 (#6960)

This PR extends the `VsCodeTheme` struct with more of the colors
available on a VS Code theme.

Release Notes:

- N/A
---
 Cargo.lock                                    |   86 +-
 crates/theme_importer/Cargo.toml              |    1 +
 crates/theme_importer/src/vscode/converter.rs |  126 +-
 crates/theme_importer/src/vscode/theme.rs     | 1531 +----------------
 4 files changed, 118 insertions(+), 1626 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 21d97b093e..d3d0096972 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -493,7 +493,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -541,7 +541,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -585,7 +585,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -854,7 +854,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.37",
+ "syn 2.0.48",
  "which",
 ]
 
@@ -1308,7 +1308,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1950,7 +1950,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e"
 dependencies = [
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -2678,7 +2678,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -2880,7 +2880,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -3506,7 +3506,7 @@ checksum = "ce243b1bfa62ffc028f1cc3b6034ec63d649f3031bc8a4fbbb004e1ac17d1f68"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -3949,7 +3949,7 @@ checksum = "ba125974b109d512fccbc6c0244e7580143e460895dfd6ea7f8bbb692fd94396"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -4848,7 +4848,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -4914,7 +4914,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -4963,7 +4963,7 @@ checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -5171,7 +5171,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -5224,7 +5224,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -5428,7 +5428,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
 dependencies = [
  "proc-macro2",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -5476,9 +5476,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.67"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
  "unicode-ident",
 ]
@@ -5764,9 +5764,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -6310,7 +6310,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rust-embed-utils",
- "syn 2.0.37",
+ "syn 2.0.48",
  "walkdir",
 ]
 
@@ -6595,7 +6595,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -6636,7 +6636,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sea-bae",
- "syn 2.0.37",
+ "syn 2.0.48",
  "unicode-ident",
 ]
 
@@ -6797,22 +6797,22 @@ checksum = "5a9f47faea3cad316faa914d013d24f471cd90bfca1a0c70f05a3f42c6441e99"
 
 [[package]]
 name = "serde"
-version = "1.0.188"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.188"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -6867,7 +6867,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -7537,7 +7537,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -7664,9 +7664,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.37"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7891,6 +7891,7 @@ dependencies = [
  "strum",
  "theme",
  "uuid 1.4.1",
+ "vscode_theme",
 ]
 
 [[package]]
@@ -7932,7 +7933,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -8095,7 +8096,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -8289,7 +8290,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -9038,6 +9039,15 @@ dependencies = [
  "zed_actions",
 ]
 
+[[package]]
+name = "vscode_theme"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b3666211944f2e6ba2c359bc9efc1891157e910b1b11c3900892ea9f18179d2"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "vte"
 version = "0.13.0"
@@ -9120,7 +9130,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
  "wasm-bindgen-shared",
 ]
 
@@ -9154,7 +9164,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -9797,7 +9807,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.48",
 ]
 
 [[package]]
diff --git a/crates/theme_importer/Cargo.toml b/crates/theme_importer/Cargo.toml
index 3587d9c8af..fe51a9dd3e 100644
--- a/crates/theme_importer/Cargo.toml
+++ b/crates/theme_importer/Cargo.toml
@@ -25,3 +25,4 @@ simplelog = "0.9"
 strum = { version = "0.25.0", features = ["derive"] }
 theme = { path = "../theme" }
 uuid.workspace = true
+vscode_theme = "0.2.0"
diff --git a/crates/theme_importer/src/vscode/converter.rs b/crates/theme_importer/src/vscode/converter.rs
index b862dc69d7..bf11ac67ac 100644
--- a/crates/theme_importer/src/vscode/converter.rs
+++ b/crates/theme_importer/src/vscode/converter.rs
@@ -74,31 +74,34 @@ impl VsCodeThemeConverter {
 
         Ok(StatusColorsContent {
             conflict: vscode_colors
-                .git_decoration_conflicting_resource_foreground
+                .git_decoration
+                .conflicting_resource_foreground
                 .clone(),
-            created: vscode_colors.editor_gutter_added_background.clone(),
-            deleted: vscode_colors.editor_gutter_deleted_background.clone(),
-            error: vscode_colors.editor_error_foreground.clone(),
-            error_background: vscode_colors.editor_error_background.clone(),
-            error_border: vscode_colors.editor_error_border.clone(),
-            hidden: vscode_colors.tab_inactive_foreground.clone(),
+            created: vscode_colors.editor_gutter.added_background.clone(),
+            deleted: vscode_colors.editor_gutter.deleted_background.clone(),
+            error: vscode_colors.editor_error.foreground.clone(),
+            error_background: vscode_colors.editor_error.background.clone(),
+            error_border: vscode_colors.editor_error.border.clone(),
+            hidden: vscode_colors.tab.inactive_foreground.clone(),
             hint: vscode_colors
-                .editor_inlay_hint_foreground
+                .editor_inlay_hint
+                .foreground
                 .clone()
                 .or(vscode_base_status_colors.hint),
-            hint_border: vscode_colors.editor_hint_border.clone(),
+            hint_border: vscode_colors.editor_hint.border.clone(),
             ignored: vscode_colors
-                .git_decoration_ignored_resource_foreground
+                .git_decoration
+                .ignored_resource_foreground
                 .clone(),
-            info: vscode_colors.editor_info_foreground.clone(),
-            info_background: vscode_colors.editor_info_background.clone(),
-            info_border: vscode_colors.editor_info_border.clone(),
-            modified: vscode_colors.editor_gutter_modified_background.clone(),
+            info: vscode_colors.editor_info.foreground.clone(),
+            info_background: vscode_colors.editor_info.background.clone(),
+            info_border: vscode_colors.editor_info.border.clone(),
+            modified: vscode_colors.editor_gutter.modified_background.clone(),
             // renamed: None,
             // success: None,
-            warning: vscode_colors.editor_warning_foreground.clone(),
-            warning_background: vscode_colors.editor_warning_background.clone(),
-            warning_border: vscode_colors.editor_warning_border.clone(),
+            warning: vscode_colors.editor_warning.foreground.clone(),
+            warning_background: vscode_colors.editor_warning.background.clone(),
+            warning_border: vscode_colors.editor_warning.border.clone(),
             ..Default::default()
         })
     }
@@ -106,11 +109,11 @@ impl VsCodeThemeConverter {
     fn convert_theme_colors(&self) -> Result<ThemeColorsContent> {
         let vscode_colors = &self.theme.colors;
 
-        let vscode_panel_border = vscode_colors.panel_border.clone();
-        let vscode_tab_inactive_background = vscode_colors.tab_inactive_background.clone();
-        let vscode_editor_foreground = vscode_colors.editor_foreground.clone();
-        let vscode_editor_background = vscode_colors.editor_background.clone();
-        let vscode_scrollbar_slider_background = vscode_colors.scrollbar_slider_background.clone();
+        let vscode_panel_border = vscode_colors.panel.border.clone();
+        let vscode_tab_inactive_background = vscode_colors.tab.inactive_background.clone();
+        let vscode_editor_foreground = vscode_colors.editor.foreground.clone();
+        let vscode_editor_background = vscode_colors.editor.background.clone();
+        let vscode_scrollbar_slider_background = vscode_colors.scrollbar_slider.background.clone();
         let vscode_token_colors_foreground = self
             .theme
             .token_colors
@@ -126,68 +129,71 @@ impl VsCodeThemeConverter {
             border_selected: vscode_panel_border.clone(),
             border_transparent: vscode_panel_border.clone(),
             border_disabled: vscode_panel_border.clone(),
-            elevated_surface_background: vscode_colors.dropdown_background.clone(),
-            surface_background: vscode_colors.panel_background.clone(),
+            elevated_surface_background: vscode_colors.dropdown.background.clone(),
+            surface_background: vscode_colors.panel.background.clone(),
             background: vscode_editor_background.clone(),
-            element_background: vscode_colors.button_background.clone(),
-            element_hover: vscode_colors.list_hover_background.clone(),
-            element_selected: vscode_colors.list_active_selection_background.clone(),
-            drop_target_background: vscode_colors.list_drop_background.clone(),
-            ghost_element_hover: vscode_colors.list_hover_background.clone(),
-            ghost_element_selected: vscode_colors.list_active_selection_background.clone(),
+            element_background: vscode_colors.button.background.clone(),
+            element_hover: vscode_colors.list.hover_background.clone(),
+            element_selected: vscode_colors.list.active_selection_background.clone(),
+            drop_target_background: vscode_colors.list.drop_background.clone(),
+            ghost_element_hover: vscode_colors.list.hover_background.clone(),
+            ghost_element_selected: vscode_colors.list.active_selection_background.clone(),
             text: vscode_colors
                 .foreground
                 .clone()
                 .or(vscode_token_colors_foreground.clone()),
-            text_muted: vscode_colors.tab_inactive_foreground.clone(),
-            status_bar_background: vscode_colors.status_bar_background.clone(),
-            title_bar_background: vscode_colors.title_bar_active_background.clone(),
+            text_muted: vscode_colors.tab.inactive_foreground.clone(),
+            status_bar_background: vscode_colors.status_bar.background.clone(),
+            title_bar_background: vscode_colors.title_bar.active_background.clone(),
             toolbar_background: vscode_colors
-                .breadcrumb_background
+                .breadcrumb
+                .background
                 .clone()
                 .or(vscode_editor_background.clone()),
-            tab_bar_background: vscode_colors.editor_group_header_tabs_background.clone(),
+            tab_bar_background: vscode_colors.editor_group_header.tabs_background.clone(),
             tab_inactive_background: vscode_tab_inactive_background.clone(),
             tab_active_background: vscode_colors
-                .tab_active_background
+                .tab
+                .active_background
                 .clone()
                 .or(vscode_tab_inactive_background.clone()),
-            panel_background: vscode_colors.panel_background.clone(),
+            panel_background: vscode_colors.panel.background.clone(),
             scrollbar_thumb_background: vscode_scrollbar_slider_background.clone(),
             scrollbar_thumb_hover_background: vscode_colors
-                .scrollbar_slider_hover_background
+                .scrollbar_slider
+                .hover_background
                 .clone(),
             scrollbar_thumb_border: vscode_scrollbar_slider_background.clone(),
             scrollbar_track_background: vscode_editor_background.clone(),
-            scrollbar_track_border: vscode_colors.editor_overview_ruler_border.clone(),
+            scrollbar_track_border: vscode_colors.editor_overview_ruler.border.clone(),
             editor_foreground: vscode_editor_foreground
                 .clone()
                 .or(vscode_token_colors_foreground.clone()),
             editor_background: vscode_editor_background.clone(),
             editor_gutter_background: vscode_editor_background.clone(),
-            editor_active_line_background: vscode_colors.editor_line_highlight_background.clone(),
-            editor_line_number: vscode_colors.editor_line_number_foreground.clone(),
-            editor_active_line_number: vscode_colors.editor_foreground.clone(),
+            editor_active_line_background: vscode_colors.editor.line_highlight_background.clone(),
+            editor_line_number: vscode_colors.editor_line_number.foreground.clone(),
+            editor_active_line_number: vscode_colors.editor.foreground.clone(),
             editor_wrap_guide: vscode_panel_border.clone(),
             editor_active_wrap_guide: vscode_panel_border.clone(),
-            terminal_background: vscode_colors.terminal_background.clone(),
-            terminal_ansi_black: vscode_colors.terminal_ansi_black.clone(),
-            terminal_ansi_bright_black: vscode_colors.terminal_ansi_bright_black.clone(),
-            terminal_ansi_red: vscode_colors.terminal_ansi_red.clone(),
-            terminal_ansi_bright_red: vscode_colors.terminal_ansi_bright_red.clone(),
-            terminal_ansi_green: vscode_colors.terminal_ansi_green.clone(),
-            terminal_ansi_bright_green: vscode_colors.terminal_ansi_bright_green.clone(),
-            terminal_ansi_yellow: vscode_colors.terminal_ansi_yellow.clone(),
-            terminal_ansi_bright_yellow: vscode_colors.terminal_ansi_bright_yellow.clone(),
-            terminal_ansi_blue: vscode_colors.terminal_ansi_blue.clone(),
-            terminal_ansi_bright_blue: vscode_colors.terminal_ansi_bright_blue.clone(),
-            terminal_ansi_magenta: vscode_colors.terminal_ansi_magenta.clone(),
-            terminal_ansi_bright_magenta: vscode_colors.terminal_ansi_bright_magenta.clone(),
-            terminal_ansi_cyan: vscode_colors.terminal_ansi_cyan.clone(),
-            terminal_ansi_bright_cyan: vscode_colors.terminal_ansi_bright_cyan.clone(),
-            terminal_ansi_white: vscode_colors.terminal_ansi_white.clone(),
-            terminal_ansi_bright_white: vscode_colors.terminal_ansi_bright_white.clone(),
-            link_text_hover: vscode_colors.text_link_active_foreground.clone(),
+            terminal_background: vscode_colors.terminal.background.clone(),
+            terminal_ansi_black: vscode_colors.terminal.ansi_black.clone(),
+            terminal_ansi_bright_black: vscode_colors.terminal.ansi_bright_black.clone(),
+            terminal_ansi_red: vscode_colors.terminal.ansi_red.clone(),
+            terminal_ansi_bright_red: vscode_colors.terminal.ansi_bright_red.clone(),
+            terminal_ansi_green: vscode_colors.terminal.ansi_green.clone(),
+            terminal_ansi_bright_green: vscode_colors.terminal.ansi_bright_green.clone(),
+            terminal_ansi_yellow: vscode_colors.terminal.ansi_yellow.clone(),
+            terminal_ansi_bright_yellow: vscode_colors.terminal.ansi_bright_yellow.clone(),
+            terminal_ansi_blue: vscode_colors.terminal.ansi_blue.clone(),
+            terminal_ansi_bright_blue: vscode_colors.terminal.ansi_bright_blue.clone(),
+            terminal_ansi_magenta: vscode_colors.terminal.ansi_magenta.clone(),
+            terminal_ansi_bright_magenta: vscode_colors.terminal.ansi_bright_magenta.clone(),
+            terminal_ansi_cyan: vscode_colors.terminal.ansi_cyan.clone(),
+            terminal_ansi_bright_cyan: vscode_colors.terminal.ansi_bright_cyan.clone(),
+            terminal_ansi_white: vscode_colors.terminal.ansi_white.clone(),
+            terminal_ansi_bright_white: vscode_colors.terminal.ansi_bright_white.clone(),
+            link_text_hover: vscode_colors.text_link.active_foreground.clone(),
             ..Default::default()
         })
     }
diff --git a/crates/theme_importer/src/vscode/theme.rs b/crates/theme_importer/src/vscode/theme.rs
index 505d0c7d55..b6b073b446 100644
--- a/crates/theme_importer/src/vscode/theme.rs
+++ b/crates/theme_importer/src/vscode/theme.rs
@@ -1,15 +1,8 @@
-use serde::{Deserialize, Deserializer};
+use serde::Deserialize;
+use vscode_theme::Colors;
 
 use crate::vscode::VsCodeTokenColor;
 
-fn empty_string_as_none<'de, D>(deserializer: D) -> Result<Option<String>, D::Error>
-where
-    D: Deserializer<'de>,
-{
-    let value = Option::<String>::deserialize(deserializer)?;
-    Ok(value.filter(|value| !value.is_empty()))
-}
-
 #[derive(Deserialize, Debug)]
 pub struct VsCodeTheme {
     #[serde(rename = "$schema")]
@@ -21,1525 +14,7 @@ pub struct VsCodeTheme {
     pub semantic_class: Option<String>,
     #[serde(rename = "semanticHighlighting")]
     pub semantic_highlighting: Option<bool>,
-    pub colors: VsCodeColors,
+    pub colors: Colors,
     #[serde(rename = "tokenColors")]
     pub token_colors: Vec<VsCodeTokenColor>,
 }
-
-#[derive(Debug, Deserialize)]
-pub struct VsCodeColors {
-    #[serde(
-        default,
-        rename = "terminal.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub terminal_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "terminal.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub terminal_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "terminal.ansiBrightBlack",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub terminal_ansi_bright_black: Option<String>,
-
-    #[serde(
-        default,
-        rename = "terminal.ansiBrightRed",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub terminal_ansi_bright_red: Option<String>,
-
-    #[serde(
-        default,
-        rename = "terminal.ansiBrightGreen",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub terminal_ansi_bright_green: Option<String>,
-
-    #[serde(
-        default,
-        rename = "terminal.ansiBrightYellow",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub terminal_ansi_bright_yellow: Option<String>,
-
-    #[serde(
-        default,
-        rename = "terminal.ansiBrightBlue",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub terminal_ansi_bright_blue: Option<String>,
-
-    #[serde(
-        default,
-        rename = "terminal.ansiBrightMagenta",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub terminal_ansi_bright_magenta: Option<String>,
-
-    #[serde(
-        default,
-        rename = "terminal.ansiBrightCyan",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub terminal_ansi_bright_cyan: Option<String>,
-
-    #[serde(
-        default,
-        rename = "terminal.ansiBrightWhite",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub terminal_ansi_bright_white: Option<String>,
-
-    #[serde(
-        default,
-        rename = "terminal.ansiBlack",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub terminal_ansi_black: Option<String>,
-
-    #[serde(
-        default,
-        rename = "terminal.ansiRed",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub terminal_ansi_red: Option<String>,
-
-    #[serde(
-        default,
-        rename = "terminal.ansiGreen",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub terminal_ansi_green: Option<String>,
-
-    #[serde(
-        default,
-        rename = "terminal.ansiYellow",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub terminal_ansi_yellow: Option<String>,
-
-    #[serde(
-        default,
-        rename = "terminal.ansiBlue",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub terminal_ansi_blue: Option<String>,
-
-    #[serde(
-        default,
-        rename = "terminal.ansiMagenta",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub terminal_ansi_magenta: Option<String>,
-
-    #[serde(
-        default,
-        rename = "terminal.ansiCyan",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub terminal_ansi_cyan: Option<String>,
-
-    #[serde(
-        default,
-        rename = "terminal.ansiWhite",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub terminal_ansi_white: Option<String>,
-
-    #[serde(
-        default,
-        rename = "textLink.activeForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub text_link_active_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "focusBorder",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub focus_border: Option<String>,
-
-    #[serde(default, deserialize_with = "empty_string_as_none")]
-    pub foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "selection.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub selection_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "errorForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub error_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "button.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub button_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "button.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub button_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "button.secondaryBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub button_secondary_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "button.secondaryForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub button_secondary_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "button.secondaryHoverBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub button_secondary_hover_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "dropdown.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub dropdown_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "dropdown.border",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub dropdown_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "dropdown.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub dropdown_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "input.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub input_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "input.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub input_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "input.border",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub input_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "input.placeholderForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub input_placeholder_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "inputOption.activeBorder",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub input_option_active_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "inputValidation.infoBorder",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub input_validation_info_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "inputValidation.warningBorder",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub input_validation_warning_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "inputValidation.errorBorder",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub input_validation_error_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "badge.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub badge_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "badge.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub badge_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "progressBar.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub progress_bar_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "list.activeSelectionBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub list_active_selection_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "list.activeSelectionForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub list_active_selection_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "list.dropBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub list_drop_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "list.focusBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub list_focus_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "list.highlightForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub list_highlight_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "list.hoverBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub list_hover_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "list.inactiveSelectionBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub list_inactive_selection_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "list.warningForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub list_warning_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "list.errorForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub list_error_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "activityBar.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub activity_bar_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "activityBar.inactiveForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub activity_bar_inactive_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "activityBar.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub activity_bar_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "activityBar.activeBorder",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub activity_bar_active_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "activityBar.activeBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub activity_bar_active_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "activityBarBadge.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub activity_bar_badge_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "activityBarBadge.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub activity_bar_badge_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "sideBar.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub side_bar_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "sideBarTitle.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub side_bar_title_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "sideBarSectionHeader.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub side_bar_section_header_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "sideBarSectionHeader.border",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub side_bar_section_header_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorGroup.border",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_group_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorGroup.dropBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_group_drop_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorGroupHeader.tabsBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_group_header_tabs_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "tab.activeBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub tab_active_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "tab.activeForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub tab_active_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "tab.border",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub tab_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "tab.activeBorderTop",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub tab_active_border_top: Option<String>,
-
-    #[serde(
-        default,
-        rename = "tab.inactiveBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub tab_inactive_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "tab.inactiveForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub tab_inactive_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editor.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editor.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorInlayHint.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_inlay_hint_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorInlayHint.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_inlay_hint_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorInlayHint.parameterForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_inlay_hint_parameter_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorInlayHint.parameterBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_inlay_hint_parameter_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorInlayHint.typForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_inlay_hint_typ_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorInlayHint.typBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_inlay_hint_typ_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorLineNumber.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_line_number_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editor.selectionBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_selection_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editor.selectionHighlightBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_selection_highlight_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editor.foldBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_fold_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editor.wordHighlightBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_word_highlight_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editor.wordHighlightStrongBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_word_highlight_strong_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editor.findMatchBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_find_match_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editor.findMatchHighlightBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_find_match_highlight_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editor.findRangeHighlightBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_find_range_highlight_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editor.hoverHighlightBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_hover_highlight_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editor.lineHighlightBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_line_highlight_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editor.lineHighlightBorder",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_line_highlight_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorLink.activeForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_link_active_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editor.rangeHighlightBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_range_highlight_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editor.snippetTabstopHighlightBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_snippet_tabstop_highlight_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editor.snippetTabstopHighlightBorder",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_snippet_tabstop_highlight_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editor.snippetFinalTabstopHighlightBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_snippet_final_tabstop_highlight_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editor.snippetFinalTabstopHighlightBorder",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_snippet_final_tabstop_highlight_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorWhitespace.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_whitespace_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorIndentGuide.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_indent_guide_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorIndentGuide.activeBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_indent_guide_active_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorRuler.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_ruler_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorCodeLens.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_code_lens_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorBracketHighlight.foreground1",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_bracket_highlight_foreground1: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorBracketHighlight.foreground2",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_bracket_highlight_foreground2: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorBracketHighlight.foreground3",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_bracket_highlight_foreground3: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorBracketHighlight.foreground4",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_bracket_highlight_foreground4: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorBracketHighlight.foreground5",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_bracket_highlight_foreground5: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorBracketHighlight.foreground6",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_bracket_highlight_foreground6: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorBracketHighlight.unexpectedBracket.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_bracket_highlight_unexpected_bracket_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorOverviewRuler.border",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_overview_ruler_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorOverviewRuler.selectionHighlightForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_overview_ruler_selection_highlight_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorOverviewRuler.wordHighlightForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_overview_ruler_word_highlight_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorOverviewRuler.wordHighlightStrongForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_overview_ruler_word_highlight_strong_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorOverviewRuler.modifiedForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_overview_ruler_modified_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorOverviewRuler.addedForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_overview_ruler_added_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorOverviewRuler.deletedForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_overview_ruler_deleted_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorOverviewRuler.errorForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_overview_ruler_error_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorOverviewRuler.warningForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_overview_ruler_warning_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorOverviewRuler.infoForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_overview_ruler_info_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorError.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_error_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorError.border",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_error_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorError.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_error_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorWarning.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_warning_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorWarning.border",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_warning_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorWarning.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_warning_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorInfo.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_info_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorInfo.border",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_info_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorInfo.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_info_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorHint.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_hint_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorHint.border",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_hint_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorGutter.modifiedBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_gutter_modified_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorGutter.addedBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_gutter_added_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorGutter.deletedBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_gutter_deleted_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "gitDecoration.modifiedResourceForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub git_decoration_modified_resource_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "gitDecoration.deletedResourceForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub git_decoration_deleted_resource_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "gitDecoration.untrackedResourceForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub git_decoration_untracked_resource_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "gitDecoration.ignoredResourceForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub git_decoration_ignored_resource_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "gitDecoration.conflictingResourceForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub git_decoration_conflicting_resource_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "diffEditor.insertedTextBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub diff_editor_inserted_text_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "diffEditor.removedTextBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub diff_editor_removed_text_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "inlineChat.regionHighlight",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub inline_chat_region_highlight: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorWidget.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_widget_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorSuggestWidget.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_suggest_widget_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorSuggestWidget.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_suggest_widget_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorSuggestWidget.selectedBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_suggest_widget_selected_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorHoverWidget.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_hover_widget_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorHoverWidget.border",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_hover_widget_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorMarkerNavigation.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_marker_navigation_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "peekView.border",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub peek_view_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "peekViewEditor.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub peek_view_editor_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "peekViewEditor.matchHighlightBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub peek_view_editor_match_highlight_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "peekViewResult.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub peek_view_result_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "peekViewResult.fileForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub peek_view_result_file_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "peekViewResult.lineForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub peek_view_result_line_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "peekViewResult.matchHighlightBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub peek_view_result_match_highlight_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "peekViewResult.selectionBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub peek_view_result_selection_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "peekViewResult.selectionForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub peek_view_result_selection_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "peekViewTitle.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub peek_view_title_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "peekViewTitleDescription.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub peek_view_title_description_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "peekViewTitleLabel.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub peek_view_title_label_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "merge.currentHeaderBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub merge_current_header_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "merge.incomingHeaderBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub merge_incoming_header_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorOverviewRuler.currentContentForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_overview_ruler_current_content_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "editorOverviewRuler.incomingContentForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub editor_overview_ruler_incoming_content_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "panel.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub panel_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "panel.border",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub panel_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "panelTitle.activeBorder",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub panel_title_active_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "panelTitle.activeForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub panel_title_active_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "panelTitle.inactiveForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub panel_title_inactive_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "scrollbar.shadow",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub scrollbar_shadow: Option<String>,
-
-    #[serde(
-        default,
-        rename = "scrollbarSlider.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub scrollbar_slider_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "scrollbarSlider.activeBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub scrollbar_slider_active_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "scrollbarSlider.hoverBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub scrollbar_slider_hover_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "statusBar.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub status_bar_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "statusBar.border",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub status_bar_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "statusBar.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub status_bar_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "statusBar.debuggingBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub status_bar_debugging_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "statusBar.debuggingForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub status_bar_debugging_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "statusBar.noFolderBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub status_bar_no_folder_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "statusBar.noFolderForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub status_bar_no_folder_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "statusBarItem.prominentBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub status_bar_item_prominent_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "statusBarItem.prominentHoverBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub status_bar_item_prominent_hover_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "statusBarItem.remoteForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub status_bar_item_remote_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "statusBarItem.remoteBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub status_bar_item_remote_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "titleBar.activeBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub title_bar_active_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "titleBar.activeForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub title_bar_active_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "titleBar.inactiveBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub title_bar_inactive_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "titleBar.inactiveForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub title_bar_inactive_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "extensionButton.prominentForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub extension_button_prominent_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "extensionButton.prominentBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub extension_button_prominent_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "extensionButton.prominentHoverBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub extension_button_prominent_hover_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "pickerGroup.border",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub picker_group_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "pickerGroup.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub picker_group_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "debugToolBar.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub debug_tool_bar_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "walkThrough.embeddedEditorBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub walk_through_embedded_editor_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "settings.headerForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub settings_header_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "settings.modifiedItemIndicator",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub settings_modified_item_indicator: Option<String>,
-
-    #[serde(
-        default,
-        rename = "settings.dropdownBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub settings_dropdown_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "settings.dropdownForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub settings_dropdown_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "settings.dropdownBorder",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub settings_dropdown_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "settings.checkboxBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub settings_checkbox_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "settings.checkboxForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub settings_checkbox_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "settings.checkboxBorder",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub settings_checkbox_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "settings.textInputBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub settings_text_input_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "settings.textInputForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub settings_text_input_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "settings.textInputBorder",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub settings_text_input_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "settings.numberInputBackground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub settings_number_input_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "settings.numberInputForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub settings_number_input_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "settings.numberInputBorder",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub settings_number_input_border: Option<String>,
-
-    #[serde(
-        default,
-        rename = "breadcrumb.foreground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub breadcrumb_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "breadcrumb.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub breadcrumb_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "breadcrumb.focusForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub breadcrumb_focus_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "breadcrumb.activeSelectionForeground",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub breadcrumb_active_selection_foreground: Option<String>,
-
-    #[serde(
-        default,
-        rename = "breadcrumbPicker.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub breadcrumb_picker_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "listFilterWidget.background",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub list_filter_widget_background: Option<String>,
-
-    #[serde(
-        default,
-        rename = "listFilterWidget.outline",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub list_filter_widget_outline: Option<String>,
-
-    #[serde(
-        default,
-        rename = "listFilterWidget.noMatchesOutline",
-        deserialize_with = "empty_string_as_none"
-    )]
-    pub list_filter_widget_no_matches_outline: Option<String>,
-}

From 6cd306e4c914fd6e264f9e13103d67a9ef42da2f Mon Sep 17 00:00:00 2001
From: Brian Ginsburg <7957636+bgins@users.noreply.github.com>
Date: Sun, 28 Jan 2024 19:07:27 -0800
Subject: [PATCH 022/372] docs: Add initial language settings documentation
 (#6957)

This pull request implements the following documentation changes:

- [x] Copy existing language settings docs from old docs repo
- [x] Add new pages for Zig, Haskell, Gleam, Deno and PureScript
- [x] Add `rust-analyzer` target directory section to Rust language page

Release Notes:

- Added initial language settings documentation
([#4264](https://github.com/zed-industries/zed/issues/4264)).
---
 docs/src/languages/c.md          |  4 +++
 docs/src/languages/cpp.md        |  4 +++
 docs/src/languages/css.md        |  4 +++
 docs/src/languages/deno.md       |  4 +++
 docs/src/languages/elixir.md     | 43 +++++++++++++++++++++++
 docs/src/languages/elm.md        |  4 +++
 docs/src/languages/erb.md        |  4 +++
 docs/src/languages/gleam.md      |  4 +++
 docs/src/languages/go.md         |  4 +++
 docs/src/languages/haskell.md    |  4 +++
 docs/src/languages/html.md       |  4 +++
 docs/src/languages/javascript.md | 25 +++++++++++++
 docs/src/languages/json.md       |  4 +++
 docs/src/languages/lua.md        |  4 +++
 docs/src/languages/markdown.md   |  4 +++
 docs/src/languages/php.md        |  4 +++
 docs/src/languages/purescript.md |  4 +++
 docs/src/languages/python.md     | 60 ++++++++++++++++++++++++++++++++
 docs/src/languages/racket.md     |  4 +++
 docs/src/languages/ruby.md       | 39 +++++++++++++++++++++
 docs/src/languages/rust.md       | 24 +++++++++++++
 docs/src/languages/scheme.md     |  4 +++
 docs/src/languages/svelte.md     |  4 +++
 docs/src/languages/toml.md       |  5 +++
 docs/src/languages/tsx.md        |  4 +++
 docs/src/languages/typescript.md |  4 +++
 docs/src/languages/vue.md        |  4 +++
 docs/src/languages/yaml.md       |  4 +++
 docs/src/languages/zig.md        |  4 +++
 29 files changed, 288 insertions(+)
 create mode 100644 docs/src/languages/c.md
 create mode 100644 docs/src/languages/cpp.md
 create mode 100644 docs/src/languages/css.md
 create mode 100644 docs/src/languages/deno.md
 create mode 100644 docs/src/languages/elixir.md
 create mode 100644 docs/src/languages/elm.md
 create mode 100644 docs/src/languages/erb.md
 create mode 100644 docs/src/languages/gleam.md
 create mode 100644 docs/src/languages/go.md
 create mode 100644 docs/src/languages/haskell.md
 create mode 100644 docs/src/languages/html.md
 create mode 100644 docs/src/languages/javascript.md
 create mode 100644 docs/src/languages/json.md
 create mode 100644 docs/src/languages/lua.md
 create mode 100644 docs/src/languages/markdown.md
 create mode 100644 docs/src/languages/php.md
 create mode 100644 docs/src/languages/purescript.md
 create mode 100644 docs/src/languages/python.md
 create mode 100644 docs/src/languages/racket.md
 create mode 100644 docs/src/languages/ruby.md
 create mode 100644 docs/src/languages/rust.md
 create mode 100644 docs/src/languages/scheme.md
 create mode 100644 docs/src/languages/svelte.md
 create mode 100644 docs/src/languages/toml.md
 create mode 100644 docs/src/languages/tsx.md
 create mode 100644 docs/src/languages/typescript.md
 create mode 100644 docs/src/languages/vue.md
 create mode 100644 docs/src/languages/yaml.md
 create mode 100644 docs/src/languages/zig.md

diff --git a/docs/src/languages/c.md b/docs/src/languages/c.md
new file mode 100644
index 0000000000..9afddad731
--- /dev/null
+++ b/docs/src/languages/c.md
@@ -0,0 +1,4 @@
+# C
+
+- Tree Sitter: [tree-sitter-c](https://github.com/tree-sitter/tree-sitter-c)
+- Language Server: [clangd](https://github.com/clangd/clangd)
diff --git a/docs/src/languages/cpp.md b/docs/src/languages/cpp.md
new file mode 100644
index 0000000000..cfa183f71c
--- /dev/null
+++ b/docs/src/languages/cpp.md
@@ -0,0 +1,4 @@
+# C++
+
+- Tree Sitter: [tree-sitter-cpp](https://github.com/tree-sitter/tree-sitter-cpp)
+- Language Server: [clangd](https://github.com/clangd/clangd)
diff --git a/docs/src/languages/css.md b/docs/src/languages/css.md
new file mode 100644
index 0000000000..4ac6b3de6c
--- /dev/null
+++ b/docs/src/languages/css.md
@@ -0,0 +1,4 @@
+# CSS
+
+- Tree Sitter: [tree-sitter-css](https://github.com/tree-sitter/tree-sitter-css)
+- Language Server: N/A
diff --git a/docs/src/languages/deno.md b/docs/src/languages/deno.md
new file mode 100644
index 0000000000..c8c492233e
--- /dev/null
+++ b/docs/src/languages/deno.md
@@ -0,0 +1,4 @@
+# Deno
+
+- Tree Sitter: [tree-sitter-typescript](https://github.com/tree-sitter/tree-sitter-typescript)
+- Language Server: [deno](https://github.com/denoland/deno)
diff --git a/docs/src/languages/elixir.md b/docs/src/languages/elixir.md
new file mode 100644
index 0000000000..078bc50e2c
--- /dev/null
+++ b/docs/src/languages/elixir.md
@@ -0,0 +1,43 @@
+# Elixir
+
+- Tree Sitter: [tree-sitter-elixir](https://github.com/elixir-lang/tree-sitter-elixir)
+- Language Server: [elixir-ls](https://github.com/elixir-lsp/elixir-ls)
+
+### Setting up `elixir-ls`
+
+1. Install `elixir`:
+
+```bash
+brew install elixir
+```
+
+2. Install `elixir-ls`:
+
+```bash
+brew install elixir-ls
+```
+
+3. Restart Zed
+
+{% hint style="warning" %}
+If `elixir-ls` is not running in an elixir project, check the error log via the command palette action `zed: open log`.  If you find an error message mentioning: `invalid LSP message header "Shall I install Hex? (if running non-interactively, use \"mix local.hex --force\") [Yn]`, you might need to install [`Hex`](https://hex.pm). You run `elixir-ls` from the command line and accept the prompt to install `Hex`.
+{% endhint %}
+
+### Formatting with Mix
+
+If you prefer to format your code with [Mix](https://hexdocs.pm/mix/Mix.html), use the following snippet in your `settings.json` file to configure it as an external formatter.  Formatting will occur on file save.
+
+```json
+{
+  "language_overrides": {
+    "Elixir": {
+      "format_on_save": {
+        "external": {
+          "command": "mix",
+          "arguments": ["format", "--stdin-filename", "{buffer_path}", "-"]
+        }
+      }
+    }
+  }
+}
+```
diff --git a/docs/src/languages/elm.md b/docs/src/languages/elm.md
new file mode 100644
index 0000000000..8c12d87fa3
--- /dev/null
+++ b/docs/src/languages/elm.md
@@ -0,0 +1,4 @@
+# Elm
+
+- Tree Sitter: [tree-sitter-elm](https://github.com/elm-tooling/tree-sitter-elm)
+- Language Server: N/A
diff --git a/docs/src/languages/erb.md b/docs/src/languages/erb.md
new file mode 100644
index 0000000000..a94b986436
--- /dev/null
+++ b/docs/src/languages/erb.md
@@ -0,0 +1,4 @@
+# ERB
+
+- Tree Sitter: [tree-sitter-embedded-template](https://github.com/tree-sitter/tree-sitter-embedded-template)
+- Language Server: [solargraph](https://github.com/castwide/solargraph)
diff --git a/docs/src/languages/gleam.md b/docs/src/languages/gleam.md
new file mode 100644
index 0000000000..78fecda259
--- /dev/null
+++ b/docs/src/languages/gleam.md
@@ -0,0 +1,4 @@
+# Gleam
+
+- Tree Sitter: [tree-sitter-gleam](https://github.com/gleam-lang/tree-sitter-gleam)
+- Language Server: [gleam](https://github.com/gleam-lang/gleam)
diff --git a/docs/src/languages/go.md b/docs/src/languages/go.md
new file mode 100644
index 0000000000..3440d185ba
--- /dev/null
+++ b/docs/src/languages/go.md
@@ -0,0 +1,4 @@
+# Go
+
+- Tree Sitter: [tree-sitter-go](https://github.com/tree-sitter/tree-sitter-go)
+- Language Server: [gopls](https://github.com/golang/tools/tree/master/gopls)
diff --git a/docs/src/languages/haskell.md b/docs/src/languages/haskell.md
new file mode 100644
index 0000000000..c3ac1e8860
--- /dev/null
+++ b/docs/src/languages/haskell.md
@@ -0,0 +1,4 @@
+# Haskell
+
+- Tree Sitter: [tree-sitter-haskell](https://github.com/tree-sitter/tree-sitter-haskell)
+- Language Server: [hls](https://github.com/haskell/haskell-language-server)
diff --git a/docs/src/languages/html.md b/docs/src/languages/html.md
new file mode 100644
index 0000000000..f435959436
--- /dev/null
+++ b/docs/src/languages/html.md
@@ -0,0 +1,4 @@
+# HTML
+
+- Tree Sitter: [tree-sitter-html](https://github.com/tree-sitter/tree-sitter-html)
+- Language Server: [vscode-html-language-server](https://github.com/hrsh7th/vscode-langservers-extracted)
diff --git a/docs/src/languages/javascript.md b/docs/src/languages/javascript.md
new file mode 100644
index 0000000000..26f9a5ebac
--- /dev/null
+++ b/docs/src/languages/javascript.md
@@ -0,0 +1,25 @@
+# JavaScript
+
+- Tree Sitter: [tree-sitter-javascript](https://github.com/tree-sitter/tree-sitter-javascript)
+- Language Server: [typescript-language-server](https://github.com/typescript-language-server/typescript-language-server)
+
+### Code formatting
+
+Formatting on save is enabled by default for JavaScript, using TypeScript's built-in code formatting. But many JavaScript projects use other command-line code-formatting tools, such as [Prettier](https://prettier.io/). You can use one of these tools by specifying an _external_ code formatter for JavaScript in your settings. See the [configuration](../configuration/configuring-zed.md) documentation for more information.
+
+For example, if you have Prettier installed and on your `PATH`, you can use it to format JavaScript files by adding the following to your `settings.json`:
+
+```json
+{
+  "language_overrides": {
+    "JavaScript": {
+      "format_on_save": {
+        "external": {
+          "command": "prettier",
+          "arguments": ["--stdin-filepath", "{buffer_path}"]
+        }
+      }
+    }
+  }
+}
+```
diff --git a/docs/src/languages/json.md b/docs/src/languages/json.md
new file mode 100644
index 0000000000..2eaa90b321
--- /dev/null
+++ b/docs/src/languages/json.md
@@ -0,0 +1,4 @@
+# JSON
+
+- Tree Sitter: [tree-sitter-json](https://github.com/tree-sitter/tree-sitter-json)
+- Language Server: [json-language-server](https://github.com/zed-industries/json-language-server)
diff --git a/docs/src/languages/lua.md b/docs/src/languages/lua.md
new file mode 100644
index 0000000000..b2fa23bd27
--- /dev/null
+++ b/docs/src/languages/lua.md
@@ -0,0 +1,4 @@
+# Lua
+
+- Tree Sitter: [tree-sitter-lua](https://github.com/MunifTanjim/tree-sitter-lua)
+- Language Server: [lua-language-server](https://github.com/LuaLS/lua-language-server)
diff --git a/docs/src/languages/markdown.md b/docs/src/languages/markdown.md
new file mode 100644
index 0000000000..ec3dadc8fa
--- /dev/null
+++ b/docs/src/languages/markdown.md
@@ -0,0 +1,4 @@
+# Markdown
+
+- Tree Sitter: [tree-sitter-markdown](https://github.com/MDeiml/tree-sitter-markdown)
+- Language Server: N/A
diff --git a/docs/src/languages/php.md b/docs/src/languages/php.md
new file mode 100644
index 0000000000..37393b604f
--- /dev/null
+++ b/docs/src/languages/php.md
@@ -0,0 +1,4 @@
+# PHP
+
+- Tree Sitter: [tree-sitter-php](https://github.com/tree-sitter/tree-sitter-php)
+- Language Server: [intelephense](https://intelephense.com/)
diff --git a/docs/src/languages/purescript.md b/docs/src/languages/purescript.md
new file mode 100644
index 0000000000..d534f861ac
--- /dev/null
+++ b/docs/src/languages/purescript.md
@@ -0,0 +1,4 @@
+# PureScript
+
+- Tree Sitter: [tree-sitter-purescript](https://github.com/ivanmoreau/tree-sitter-purescript)
+- Language Server: [purescript](https://github.com/nwolverson/purescript-language-server)
diff --git a/docs/src/languages/python.md b/docs/src/languages/python.md
new file mode 100644
index 0000000000..6f40b7c62c
--- /dev/null
+++ b/docs/src/languages/python.md
@@ -0,0 +1,60 @@
+# Python
+
+- Tree Sitter: [tree-sitter-python](https://github.com/tree-sitter/tree-sitter-python)
+- Language Server: [pyright](https://github.com/microsoft/pyright)
+
+### Configuration
+
+The [pyright](https://github.com/microsoft/pyright) language server offers flexible configuration options specified in a JSON-formatted text configuration. By default, the file is called `pyrightconfig.json` and is located within the root directory of your project. Pyright settings can also be specified in a `[tool.pyright]` section of a `pyproject.toml` file. A `pyrightconfig.json` file always takes precedent over `pyproject.toml` if both are present.
+
+For more information, see the Pyright [configuration documentation](https://microsoft.github.io/pyright/#/configuration).
+
+### Virtual environments
+
+A python [virtual environment](https://docs.python.org/3/tutorial/venv.html) allows you to store all of a project's dependencies, including the Python interpreter and package manager, in a single directory that's isolated from any other Python projects on your computer.
+
+By default, the Pyright language server will look for Python packages in the default global locations. But you can also configure Pyright to use the packages installed in a given virtual environment.
+
+To do this, create a JSON file called `pyrightconfig.json` at the root of your project. This file must include two keys:
+
+* `venvPath`: a relative path from your project directory to any directory that _contains_ one or more virtual environment directories
+* `venv`: the name of a virtual environment directory
+
+For example, a common approach is to create a virtual environment directory called `.venv` at the root of your project directory with the following commands:
+
+```bash
+# create a virtual environment in the .venv directory
+python3 -m venv .venv
+# set up the current shell to use that virtual environment
+source .venv/bin/activate
+```
+
+Having done that, you would create a `pyrightconfig.json` with the following content:
+
+```json
+{
+  "venvPath": ".",
+  "venv": ".venv"
+}
+```
+
+### Code formatting
+
+The Pyright language server does not provide code formatting. If you want to automatically reformat your Python code when saving, you'll need to specify an _external_code formatter in your settings. See the [configuration](../configuration/configuring-zed.md) documentation for more information.
+
+A common tool for formatting python code is [Black](https://black.readthedocs.io/en/stable/). If you have Black installed globally, you can use it to format Python files by adding the following to your `settings.json`:
+
+```json
+{
+  "language_overrides": {
+    "Python": {
+      "format_on_save": {
+        "external": {
+          "command": "black",
+          "arguments": ["-"]
+        }
+      }
+    }
+  }
+}
+```
diff --git a/docs/src/languages/racket.md b/docs/src/languages/racket.md
new file mode 100644
index 0000000000..73e6de0f9a
--- /dev/null
+++ b/docs/src/languages/racket.md
@@ -0,0 +1,4 @@
+# Racket
+
+- Tree Sitter: [tree-sitter-racket](https://github.com/zed-industries/tree-sitter-racket)
+- Language Server: N/A
diff --git a/docs/src/languages/ruby.md b/docs/src/languages/ruby.md
new file mode 100644
index 0000000000..f785e26656
--- /dev/null
+++ b/docs/src/languages/ruby.md
@@ -0,0 +1,39 @@
+# Ruby
+
+- Tree Sitter: [tree-sitter-ruby](https://github.com/tree-sitter/tree-sitter-ruby)
+- Language Server: [solargraph](https://github.com/castwide/solargraph)
+
+### Setup
+
+Zed currently doesn't install Solargraph automatically. To use Solargraph, you need to install the gem. Zed just looks for an executable called `solargraph` on your `PATH`.
+
+You can install the gem manually with the following command:
+
+```shell
+gem install solargraph
+```
+
+Alternatively, if your project uses Bundler, you can add the Solargraph gem to your `Gemfile`:
+
+```ruby
+gem 'solargraph', group: :development
+```
+
+Solargraph has formatting and diagnostics disabled by default. We can tell Zed to enable them by adding the following to your `settings.json`:
+
+```json
+{
+   "lsp": {
+      "solargraph": {
+         "initialization_options": {
+            "diagnostics": true,
+            "formatting": true
+         }
+      }
+   }
+}
+```
+
+### Configuration
+
+Solargraph reads its configuration from a file called `.solargraph.yml` in the root of your project. For more information about this file, see the [Solargraph configuration documentation](https://solargraph.org/guides/configuration).
diff --git a/docs/src/languages/rust.md b/docs/src/languages/rust.md
new file mode 100644
index 0000000000..af82a41ab8
--- /dev/null
+++ b/docs/src/languages/rust.md
@@ -0,0 +1,24 @@
+# Rust
+
+- Tree Sitter: [tree-sitter-rust](https://github.com/tree-sitter/tree-sitter-rust)
+- Language Server: [rust-analyzer](https://github.com/rust-lang/rust-analyzer)
+
+### Target directory
+
+The `rust-analyzer` target directory can be set in `initialization_options`:
+
+```json
+{
+  "lsp": {
+    "rust-analyzer": {
+      "initialization_options": {
+        "rust": {
+          "analyzerTargetDir": true
+        }
+      }
+    }
+  }
+}
+```
+
+A `true` setting will set the target directory to `target/rust-analyzer`. You can set a custom directory with a string like `"target/analyzer"` instead of `true`.
diff --git a/docs/src/languages/scheme.md b/docs/src/languages/scheme.md
new file mode 100644
index 0000000000..4662e8e183
--- /dev/null
+++ b/docs/src/languages/scheme.md
@@ -0,0 +1,4 @@
+# Scheme
+
+- Tree Sitter: [tree-sitter-scheme](https://github.com/6cdh/tree-sitter-scheme)
+- Language Server: N/A
diff --git a/docs/src/languages/svelte.md b/docs/src/languages/svelte.md
new file mode 100644
index 0000000000..c1907096fb
--- /dev/null
+++ b/docs/src/languages/svelte.md
@@ -0,0 +1,4 @@
+# Svelte
+
+- Tree Sitter: [tree-sitter-svelte](https://github.com/Himujjal/tree-sitter-svelte)
+- Language Server: [svelte](https://github.com/sveltejs/language-tools/tree/master/packages/language-server)
diff --git a/docs/src/languages/toml.md b/docs/src/languages/toml.md
new file mode 100644
index 0000000000..52c25de9a0
--- /dev/null
+++ b/docs/src/languages/toml.md
@@ -0,0 +1,5 @@
+# TOML
+
+
+- Tree Sitter: [tree-sitter-toml](https://github.com/tree-sitter/tree-sitter-toml)
+- Language Server: N/A
diff --git a/docs/src/languages/tsx.md b/docs/src/languages/tsx.md
new file mode 100644
index 0000000000..63b4e927fc
--- /dev/null
+++ b/docs/src/languages/tsx.md
@@ -0,0 +1,4 @@
+# TSX
+
+- Tree Sitter: [tree-sitter-typescript](https://github.com/tree-sitter/tree-sitter-typescript)
+- Language Server: [typescript-language-server](https://github.com/typescript-language-server/typescript-language-server)
diff --git a/docs/src/languages/typescript.md b/docs/src/languages/typescript.md
new file mode 100644
index 0000000000..91b72115fe
--- /dev/null
+++ b/docs/src/languages/typescript.md
@@ -0,0 +1,4 @@
+# TypeScript
+
+- Tree Sitter: [tree-sitter-typescript](https://github.com/tree-sitter/tree-sitter-typescript)
+- Language Server: [typescript-language-server](https://github.com/typescript-language-server/typescript-language-server)
diff --git a/docs/src/languages/vue.md b/docs/src/languages/vue.md
new file mode 100644
index 0000000000..53b7207291
--- /dev/null
+++ b/docs/src/languages/vue.md
@@ -0,0 +1,4 @@
+# Vue
+
+- Tree Sitter: [tree-sitter-vue](https://github.com/vuejs/language-tools/tree/master/packages/vue-language-server)
+- Language Server: [vue](https://github.com/vuejs/language-tools)
diff --git a/docs/src/languages/yaml.md b/docs/src/languages/yaml.md
new file mode 100644
index 0000000000..65e0f21145
--- /dev/null
+++ b/docs/src/languages/yaml.md
@@ -0,0 +1,4 @@
+# YAML
+
+- Tree Sitter: [tree-sitter-yaml](https://github.com/zed-industries/tree-sitter-yaml)
+- Language Server: [yaml-language-server](https://github.com/redhat-developer/yaml-language-server)
diff --git a/docs/src/languages/zig.md b/docs/src/languages/zig.md
new file mode 100644
index 0000000000..ab94b4c956
--- /dev/null
+++ b/docs/src/languages/zig.md
@@ -0,0 +1,4 @@
+# Zig
+
+- Tree Sitter: [tree-sitter-zig](https://github.com/maxxnino/tree-sitter-zig)
+- Language Server: [zls](https://github.com/zigtools/zls)

From 00a6ac6141b9e054c9c79a4567a5c4bc6027c6d1 Mon Sep 17 00:00:00 2001
From: Kieran Gill <kierangilliam@users.noreply.github.com>
Date: Sun, 28 Jan 2024 22:33:07 -0500
Subject: [PATCH 023/372] docs: Consistent shortcut style (#6961)

Hey all. This is a follow-up to my last PR
https://github.com/zed-industries/zed/pull/6821. I went through and
applied the same style changes to more pages so your docs are more
consistent.

<img width="1330" alt="image"
src="https://github.com/zed-industries/zed/assets/18583882/b9adbb38-b98d-47c6-b585-7e298ffae854">


Note that some pages from your old docs repo haven't been ported to
`zed-industries/zed` yet.

Release Notes:

- Improved documentation consistency.
---
 docs/src/configuring_zed.md               |   2 +-
 docs/src/configuring_zed__key_bindings.md | 648 +++++++++++-----------
 2 files changed, 325 insertions(+), 325 deletions(-)

diff --git a/docs/src/configuring_zed.md b/docs/src/configuring_zed.md
index 46f0d35bec..8ad075d6e7 100644
--- a/docs/src/configuring_zed.md
+++ b/docs/src/configuring_zed.md
@@ -24,7 +24,7 @@ The following global settings can be overridden with a folder-specific configura
 
 ## Global settings
 
-To get started with editing Zed's global settings, open `~/.config/zed/settings.json` via `cmd-,`, the command palette (`zed: open settings`), or the `Zed > Settings > Open Settings` application menu item.
+To get started with editing Zed's global settings, open `~/.config/zed/settings.json` via `⌘` + `,`, the command palette (`zed: open settings`), or the `Zed > Settings > Open Settings` application menu item.
 
 Here are all the currently available settings.
 
diff --git a/docs/src/configuring_zed__key_bindings.md b/docs/src/configuring_zed__key_bindings.md
index 4263d976df..c271aac975 100644
--- a/docs/src/configuring_zed__key_bindings.md
+++ b/docs/src/configuring_zed__key_bindings.md
@@ -8,7 +8,7 @@ We have a growing collection of pre-defined keymaps in our [keymaps repository](
 
 #### Accessing custom key bindings
 
-You can open `keymap.json` via `CMD + K, CMD + S`, the command palette, or the `Zed > Settings > Open Key Bindings` application menu item.
+You can open `keymap.json` via `⌘` + `K`, `⌘` + `S`, the command palette, or the `Zed > Settings > Open Key Bindings` application menu item.
 
 #### Adding a custom key binding
 
@@ -18,14 +18,14 @@ An example of adding a set of custom key bindings:
 
 ```json
 [
-    {
-        "context": "Editor",
-        "bindings": {
-            "ctrl-w": "editor::SelectLargerSyntaxNode",
-            "ctrl-shift-W": "editor::SelectSmallerSyntaxNode",
-            "ctrl-c": "editor::Cancel"
-        }
+  {
+    "context": "Editor",
+    "bindings": {
+      "ctrl-w": "editor::SelectLargerSyntaxNode",
+      "ctrl-shift-W": "editor::SelectSmallerSyntaxNode",
+      "ctrl-c": "editor::Cancel"
     }
+  }
 ]
 ```
 
@@ -37,268 +37,268 @@ _There are some key bindings that can't be overridden; we are working on an issu
 
 #### Global
 
-| **Command**                      | **Target**     | **Default Shortcut**           |
-| -------------------------------- | -------------- | ------------------------------ |
-| Open recent                      | Branches       | `Alt + Command + B`            |
-| Toggle focus                     | Collab Panel   | `Command + Shift + C`          |
-| Toggle inlay hints               | Editor         | `Control + :`                  |
-| Cancel                           | Menu           | `Control + C`                  |
-| Cancel                           | Menu           | `Escape`                       |
-| Confirm                          | Menu           | `Enter`                        |
-| Secondary confirm                | Menu           | `Command + Enter`              |
-| Select first                     | Menu           | `Command + Up`                 |
-| Select first                     | Menu           | `Page Up`                      |
-| Select first                     | Menu           | `Shift + Page Down`            |
-| Select first                     | Menu           | `Shift + Page Up`              |
-| Select last                      | Menu           | `Command + Down`               |
-| Select last                      | Menu           | `Page Down`                    |
-| Select next                      | Menu           | `Control + N`                  |
-| Select next                      | Menu           | `Down`                         |
-| Select prev                      | Menu           | `Control + P`                  |
-| Select prev                      | Menu           | `Up`                           |
-| Show context menu                | Menu           | `Control + Enter`              |
-| Activate next item               | Pane           | `Alt + Command + Right`        |
-| Activate next item               | Pane           | `Command + }`                  |
-| Activate prev item               | Pane           | `Alt + Command + Left`         |
-| Activate prev item               | Pane           | `Command + {`                  |
-| Close active item                | Pane           | `Command + W`                  |
-| Close all items                  | Pane           | `Command + K, Command + W`     |
-| Close clean items                | Pane           | `Command + K, U`               |
-| Close inactive items             | Pane           | `Alt + Command + T`            |
-| Open recent                      | Projects       | `Alt + Command + O`            |
-| Toggle focus                     | Terminal Panel | ``Control + ` ``               |
-| Activate pane in direction down  | Workspace      | `Command + K, Command + Down`  |
-| Activate pane in direction left  | Workspace      | `Command + K, Command + Left`  |
-| Activate pane in direction right | Workspace      | `Command + K, Command + Right` |
-| Activate pane in direction up    | Workspace      | `Command + K, Command + Up`    |
-| Close inactive tabs and panes    | Workspace      | `Control + Alt + Command + W`  |
-| Close window                     | Workspace      | `Command + Shift + W`          |
-| Follow next collaborator         | Workspace      | `Control + Alt + Command + F`  |
-| New file                         | Workspace      | `Command + N`                  |
-| New terminal                     | Workspace      | `Control + ~`                  |
-| New window                       | Workspace      | `Command + Shift + N`          |
-| Open                             | Workspace      | `Command + O`                  |
-| Save                             | Workspace      | `Command + S`                  |
-| Save as                          | Workspace      | `Command + Shift + S`          |
-| Swap pane in direction           | Workspace      | `Command + K, Shift + Down`    |
-| Swap pane in direction           | Workspace      | `Command + K, Shift + Left`    |
-| Swap pane in direction           | Workspace      | `Command + K, Shift + Right`   |
-| Swap pane in direction           | Workspace      | `Command + K, Shift + Up`      |
-| Toggle zoom                      | Workspace      | `Shift + Escape`               |
-| Debug elements                   | Zed            | `Command + Alt + I`            |
-| Decrease buffer font size        | Zed            | `Command + `                   |
-| Hide                             | Zed            | `Command + H`                  |
-| Hide others                      | Zed            | `Alt + Command + H`            |
-| Increase buffer font size        | Zed            | `Command + +`                  |
-| Increase buffer font size        | Zed            | `Command + =`                  |
-| Minimize                         | Zed            | `Command + M`                  |
-| Open settings                    | Zed            | `Command + ,`                  |
-| Quit                             | Zed            | `Command + Q`                  |
-| Reset buffer font size           | Zed            | `Command + 0`                  |
-| Toggle full screen               | Zed            | `Control + Command + F`        |
+| **Command**                      | **Target**     | **Default Shortcut**          |
+| -------------------------------- | -------------- | ----------------------------- |
+| Open recent                      | Branches       | `Alt` + `⌘` + `B`             |
+| Toggle focus                     | Collab Panel   | `⌘` + `Shift` + `C`           |
+| Toggle inlay hints               | Editor         | `Control` + `:`               |
+| Cancel                           | Menu           | `Control` + `C`               |
+| Cancel                           | Menu           | `Escape`                      |
+| Confirm                          | Menu           | `Enter`                       |
+| Secondary confirm                | Menu           | `⌘` + `Enter`                 |
+| Select first                     | Menu           | `⌘` + `Up`                    |
+| Select first                     | Menu           | `Page Up`                     |
+| Select first                     | Menu           | `Shift` + `Page Down`         |
+| Select first                     | Menu           | `Shift` + `Page Up`           |
+| Select last                      | Menu           | `⌘` + `Down`                  |
+| Select last                      | Menu           | `Page Down`                   |
+| Select next                      | Menu           | `Control` + `N`               |
+| Select next                      | Menu           | `Down`                        |
+| Select prev                      | Menu           | `Control` + `P`               |
+| Select prev                      | Menu           | `Up`                          |
+| Show context menu                | Menu           | `Control` + `Enter`           |
+| Activate next item               | Pane           | `Alt` + `⌘` + `Right`         |
+| Activate next item               | Pane           | `⌘` + `}`                     |
+| Activate prev item               | Pane           | `Alt` + `⌘` + `Left`          |
+| Activate prev item               | Pane           | `⌘` + `{`                     |
+| Close active item                | Pane           | `⌘` + `W`                     |
+| Close all items                  | Pane           | `⌘` + `K`, `⌘` + `W`          |
+| Close clean items                | Pane           | `⌘` + `K`, `U`                |
+| Close inactive items             | Pane           | `Alt` + `⌘` + `T`             |
+| Open recent                      | Projects       | `Alt` + `⌘` + `O`             |
+| Toggle focus                     | Terminal Panel | `Control` + `` ` ``           |
+| Activate pane in direction down  | Workspace      | `⌘` + `K`, `⌘` + `Down`       |
+| Activate pane in direction left  | Workspace      | `⌘` + `K`, `⌘` + `Left`       |
+| Activate pane in direction right | Workspace      | `⌘` + `K`, `⌘` + `Right`      |
+| Activate pane in direction up    | Workspace      | `⌘` + `K`, `⌘` + `Up`         |
+| Close inactive tabs and panes    | Workspace      | `Control` + `Alt` + `⌘` + `W` |
+| Close window                     | Workspace      | `⌘` + `Shift` + `W`           |
+| Follow next collaborator         | Workspace      | `Control` + `Alt` + `⌘` + `F` |
+| New file                         | Workspace      | `⌘` + `N`                     |
+| New terminal                     | Workspace      | `Control` + `~`               |
+| New window                       | Workspace      | `⌘` + `Shift` + `N`           |
+| Open                             | Workspace      | `⌘` + `O`                     |
+| Save                             | Workspace      | `⌘` + `S`                     |
+| Save as                          | Workspace      | `⌘` + `Shift` + `S`           |
+| Swap pane in direction           | Workspace      | `⌘` + `K`, `Shift` + `Down`   |
+| Swap pane in direction           | Workspace      | `⌘` + `K`, `Shift` + `Left`   |
+| Swap pane in direction           | Workspace      | `⌘` + `K`, `Shift` + `Right`  |
+| Swap pane in direction           | Workspace      | `⌘` + `K`, `Shift` + `Up`     |
+| Toggle zoom                      | Workspace      | `Shift` + `Escape`            |
+| Debug elements                   | Zed            | `⌘` + `Alt` + `I`             |
+| Decrease buffer font size        | Zed            | `⌘` + `` ` ``                 |
+| Hide                             | Zed            | `⌘` + `H`                     |
+| Hide others                      | Zed            | `Alt` + `⌘` + `H`             |
+| Increase buffer font size        | Zed            | `⌘` + `+`                     |
+| Increase buffer font size        | Zed            | `⌘` + `=`                     |
+| Minimize                         | Zed            | `⌘` + `M`                     |
+| Open settings                    | Zed            | `⌘` + `,`                     |
+| Quit                             | Zed            | `⌘` + `Q`                     |
+| Reset buffer font size           | Zed            | `⌘` + `0`                     |
+| Toggle full screen               | Zed            | `Control` + `⌘` + `F`         |
 
 #### Editor
 
-| **Command**                      | **Target** | **Default Shortcut**                 |
-| -------------------------------- | ---------- | ------------------------------------ |
-| Inline assist                    | Assistant  | `Control + Enter`                    |
-| Add selection above              | Editor     | `Command + Alt + Up`                 |
-| Add selection above              | Editor     | `Command + Control + P`              |
-| Add selection below              | Editor     | `Command + Alt + Down`               |
-| Add selection below              | Editor     | `Command + Control + N`              |
-| Backspace                        | Editor     | `Backspace`                          |
-| Backspace                        | Editor     | `Control + H`                        |
-| Backspace                        | Editor     | `Shift + Backspace`                  |
-| Cancel                           | Editor     | `Escape`                             |
-| Confirm code action              | Editor     | `Enter`                              |
-| Confirm completion               | Editor     | `Enter`                              |
-| Confirm completion               | Editor     | `Tab`                                |
-| Confirm rename                   | Editor     | `Enter`                              |
-| Context menu first               | Editor     | `Page Up`                            |
-| Context menu last                | Editor     | `Page Down`                          |
-| Context menu next                | Editor     | `Control + N`                        |
-| Context menu next                | Editor     | `Down`                               |
-| Context menu prev                | Editor     | `Control + P`                        |
-| Context menu prev                | Editor     | `Up`                                 |
-| Copy                             | Editor     | `Command + C`                        |
-| Cut                              | Editor     | `Command + X`                        |
-| Cut to end of line               | Editor     | `Control + K`                        |
-| Delete                           | Editor     | `Control + D`                        |
-| Delete                           | Editor     | `Delete`                             |
-| Delete line                      | Editor     | `Control + Shift + K`                |
-| Delete to beginning of line      | Editor     | `Command + Backspace`                |
-| Delete to end of line            | Editor     | `Command + Delete`                   |
-| Delete to next subword end       | Editor     | `Control + Alt + D`                  |
-| Delete to next subword end       | Editor     | `Control + Alt + Delete`             |
-| Delete to next word end          | Editor     | `Alt + D`                            |
-| Delete to next word end          | Editor     | `Alt + Delete`                       |
-| Delete to previous subword start | Editor     | `Control + Alt + Backspace`          |
-| Delete to previous subword start | Editor     | `Control + Alt + H`                  |
-| Delete to previous word start    | Editor     | `Alt + Backspace`                    |
-| Delete to previous word start    | Editor     | `Alt + H`                            |
-| Duplicate line                   | Editor     | `Command + Shift + D`                |
-| Find all references              | Editor     | `Alt + Shift + F12`                  |
-| Fold                             | Editor     | `Alt + Command + [`                  |
-| Format                           | Editor     | `Command + Shift + I`                |
-| Go to definition                 | Editor     | `F12`                                |
-| Go to definition split           | Editor     | `Alt + F12`                          |
-| Go to diagnostic                 | Editor     | `F8`                                 |
-| Go to hunk                       | Editor     | `Command + F8`                       |
-| Go to prev diagnostic            | Editor     | `Shift + F8`                         |
-| Go to prev hunk                  | Editor     | `Command + Shift + F8`               |
-| Go to type definition            | Editor     | `Command + F12`                      |
-| Go to type definition split      | Editor     | `Alt + Command + F12`                |
-| Hover                            | Editor     | `Command + K, Command + I`           |
-| Indent                           | Editor     | `Command + ]`                        |
-| Join lines                       | Editor     | `Control + J`                        |
-| Move down                        | Editor     | `Control + N`                        |
-| Move down                        | Editor     | `Down`                               |
-| Move left                        | Editor     | `Control + B`                        |
-| Move left                        | Editor     | `Left`                               |
-| Move line down                   | Editor     | `Control + Command + Down`           |
-| Move line up                     | Editor     | `Control + Command + Up`             |
-| Move page down                   | Editor     | `Control + V`                        |
-| Move page down                   | Editor     | `Shift + Page Down`                  |
-| Move page up                     | Editor     | `Alt + V`                            |
-| Move page up                     | Editor     | `Shift + Page Up`                    |
-| Move right                       | Editor     | `Control + F`                        |
-| Move right                       | Editor     | `Right`                              |
-| Move to beginning                | Editor     | `Command + Up`                       |
-| Move to beginning of line        | Editor     | `Command + Left`                     |
-| Move to beginning of line        | Editor     | `Control + A`                        |
-| Move to beginning of line        | Editor     | `Home`                               |
-| Move to enclosing bracket        | Editor     | `Control + M`                        |
-| Move to end                      | Editor     | `Command + Down`                     |
-| Move to end of line              | Editor     | `Command + Right`                    |
-| Move to end of line              | Editor     | `Control + E`                        |
-| Move to end of line              | Editor     | `End`                                |
-| Move to end of paragraph         | Editor     | `Control + Down`                     |
-| Move to next subword end         | Editor     | `Control + Alt + F`                  |
-| Move to next subword end         | Editor     | `Control + Alt + Right`              |
-| Move to next word end            | Editor     | `Alt + F`                            |
-| Move to next word end            | Editor     | `Alt + Right`                        |
-| Move to previous subword start   | Editor     | `Control + Alt + B`                  |
-| Move to previous subword start   | Editor     | `Control + Alt + Left`               |
-| Move to previous word start      | Editor     | `Alt + B`                            |
-| Move to previous word start      | Editor     | `Alt + Left`                         |
-| Move to start of paragraph       | Editor     | `Control + Up`                       |
-| Move up                          | Editor     | `Control + P`                        |
-| Move up                          | Editor     | `Up`                                 |
-| Next screen                      | Editor     | `Control + L`                        |
-| Open excerpts                    | Editor     | `Alt + Enter`                        |
-| Outdent                          | Editor     | `Command + [`                        |
-| Page down                        | Editor     | `Page Down`                          |
-| Page up                          | Editor     | `Page Up`                            |
-| Paste                            | Editor     | `Command + V`                        |
-| Redo                             | Editor     | `Command + Shift + Z`                |
-| Redo selection                   | Editor     | `Command + Shift + U`                |
-| Rename                           | Editor     | `F2`                                 |
-| Reveal in finder                 | Editor     | `Alt + Command + R`                  |
-| Select all                       | Editor     | `Command + A`                        |
-| Select all matches               | Editor     | `Command + Shift + L`                |
-| Select down                      | Editor     | `Control + Shift + N`                |
-| Select down                      | Editor     | `Shift + Down`                       |
-| Select larger syntax node        | Editor     | `Alt + Up`                           |
-| Select left                      | Editor     | `Control + Shift + B`                |
-| Select left                      | Editor     | `Shift + Left`                       |
-| Select line                      | Editor     | `Command + L`                        |
-| Select next                      | Editor     | `Command + D`                        |
-| Select next                      | Editor     | `Command + K, Command + D`           |
-| Select previous                  | Editor     | `Command + K, Control + Command + D` |
-| Select previous                  | Editor     | `Control + Command + D`              |
-| Select right                     | Editor     | `Control + Shift + F`                |
-| Select right                     | Editor     | `Shift + Right`                      |
-| Select smaller syntax node       | Editor     | `Alt + Down`                         |
-| Select to beginning              | Editor     | `Command + Shift + Up`               |
-| Select to beginning of line      | Editor     | `Command + Shift + Left`             |
-| Select to beginning of line      | Editor     | `Control + Shift + A`                |
-| Select to beginning of line      | Editor     | `Shift + Home`                       |
-| Select to end                    | Editor     | `Command + Shift + Down`             |
-| Select to end of line            | Editor     | `Command + Shift + Right`            |
-| Select to end of line            | Editor     | `Control + Shift + E`                |
-| Select to end of line            | Editor     | `Shift + End`                        |
-| Select to end of paragraph       | Editor     | `Control + Shift + Down`             |
-| Select to next subword end       | Editor     | `Control + Alt + Shift + F`          |
-| Select to next subword end       | Editor     | `Control + Alt + Shift + Right`      |
-| Select to next word end          | Editor     | `Alt + Shift + F`                    |
-| Select to next word end          | Editor     | `Alt + Shift + Right`                |
-| Select to previous subword start | Editor     | `Control + Alt + Shift + B`          |
-| Select to previous subword start | Editor     | `Control + Alt + Shift + Left`       |
-| Select to previous word start    | Editor     | `Alt + Shift + B`                    |
-| Select to previous word start    | Editor     | `Alt + Shift + Left`                 |
-| Select to start of paragraph     | Editor     | `Control + Shift + Up`               |
-| Select up                        | Editor     | `Control + Shift + P`                |
-| Select up                        | Editor     | `Shift + Up`                         |
-| Show character palette           | Editor     | `Control + Command + Space`          |
-| Show completions                 | Editor     | `Control + Space`                    |
-| Tab                              | Editor     | `Tab`                                |
-| Tab prev                         | Editor     | `Shift + Tab`                        |
-| Toggle code actions              | Editor     | `Command + .`                        |
-| Toggle comments                  | Editor     | `Command + /`                        |
-| Transpose                        | Editor     | `Control + T`                        |
-| Undo                             | Editor     | `Command + Z`                        |
-| Undo selection                   | Editor     | `Command + U`                        |
-| Unfold lines                     | Editor     | `Alt + Command + ]`                  |
+| **Command**                      | **Target** | **Default Shortcut**                  |
+| -------------------------------- | ---------- | ------------------------------------- |
+| Inline assist                    | Assistant  | `Control` + `Enter`                   |
+| Add selection above              | Editor     | `⌘` + `Alt` + `Up`                    |
+| Add selection above              | Editor     | `⌘` + `Control` + `P`                 |
+| Add selection below              | Editor     | `⌘` + `Alt` + `Down`                  |
+| Add selection below              | Editor     | `⌘` + `Control` + `N`                 |
+| Backspace                        | Editor     | `Backspace`                           |
+| Backspace                        | Editor     | `Control` + `H`                       |
+| Backspace                        | Editor     | `Shift` + `Backspace`                 |
+| Cancel                           | Editor     | `Escape`                              |
+| Confirm code action              | Editor     | `Enter`                               |
+| Confirm completion               | Editor     | `Enter`                               |
+| Confirm completion               | Editor     | `Tab`                                 |
+| Confirm rename                   | Editor     | `Enter`                               |
+| Context menu first               | Editor     | `Page Up`                             |
+| Context menu last                | Editor     | `Page Down`                           |
+| Context menu next                | Editor     | `Control` + `N`                       |
+| Context menu next                | Editor     | `Down`                                |
+| Context menu prev                | Editor     | `Control` + `P`                       |
+| Context menu prev                | Editor     | `Up`                                  |
+| Copy                             | Editor     | `⌘` + `C`                             |
+| Cut                              | Editor     | `⌘` + `X`                             |
+| Cut to end of line               | Editor     | `Control` + `K`                       |
+| Delete                           | Editor     | `Control` + `D`                       |
+| Delete                           | Editor     | `Delete`                              |
+| Delete line                      | Editor     | `Control` + `Shift` + `K`             |
+| Delete to beginning of line      | Editor     | `⌘` + `Backspace`                     |
+| Delete to end of line            | Editor     | `⌘` + `Delete`                        |
+| Delete to next subword end       | Editor     | `Control` + `Alt` + `D`               |
+| Delete to next subword end       | Editor     | `Control` + `Alt` + `Delete`          |
+| Delete to next word end          | Editor     | `Alt` + `D`                           |
+| Delete to next word end          | Editor     | `Alt` + `Delete`                      |
+| Delete to previous subword start | Editor     | `Control` + `Alt` + `Backspace`       |
+| Delete to previous subword start | Editor     | `Control` + `Alt` + `H`               |
+| Delete to previous word start    | Editor     | `Alt` + `Backspace`                   |
+| Delete to previous word start    | Editor     | `Alt` + `H`                           |
+| Duplicate line                   | Editor     | `⌘` + `Shift` + `D`                   |
+| Find all references              | Editor     | `Alt` + `Shift` + `F12`               |
+| Fold                             | Editor     | `Alt` + `⌘` + `[`                     |
+| Format                           | Editor     | `⌘` + `Shift` + `I`                   |
+| Go to definition                 | Editor     | `F12`                                 |
+| Go to definition split           | Editor     | `Alt` + `F12`                         |
+| Go to diagnostic                 | Editor     | `F8`                                  |
+| Go to hunk                       | Editor     | `⌘` + `F8`                            |
+| Go to prev diagnostic            | Editor     | `Shift` + `F8`                        |
+| Go to prev hunk                  | Editor     | `⌘` + `Shift` + `F8`                  |
+| Go to type definition            | Editor     | `⌘` + `F12`                           |
+| Go to type definition split      | Editor     | `Alt` + `⌘` + `F12`                   |
+| Hover                            | Editor     | `⌘` + `K`, `⌘` + `I`                  |
+| Indent                           | Editor     | `⌘` + `]`                             |
+| Join lines                       | Editor     | `Control` + `J`                       |
+| Move down                        | Editor     | `Control` + `N`                       |
+| Move down                        | Editor     | `Down`                                |
+| Move left                        | Editor     | `Control` + `B`                       |
+| Move left                        | Editor     | `Left`                                |
+| Move line down                   | Editor     | `Control` + `⌘` + `Down`              |
+| Move line up                     | Editor     | `Control` + `⌘` + `Up`                |
+| Move page down                   | Editor     | `Control` + `V`                       |
+| Move page down                   | Editor     | `Shift` + `Page Down`                 |
+| Move page up                     | Editor     | `Alt` + `V`                           |
+| Move page up                     | Editor     | `Shift` + `Page Up`                   |
+| Move right                       | Editor     | `Control` + `F`                       |
+| Move right                       | Editor     | `Right`                               |
+| Move to beginning                | Editor     | `⌘` + `Up`                            |
+| Move to beginning of line        | Editor     | `⌘` + `Left`                          |
+| Move to beginning of line        | Editor     | `Control` + `A`                       |
+| Move to beginning of line        | Editor     | `Home`                                |
+| Move to enclosing bracket        | Editor     | `Control` + `M`                       |
+| Move to end                      | Editor     | `⌘` + `Down`                          |
+| Move to end of line              | Editor     | `⌘` + `Right`                         |
+| Move to end of line              | Editor     | `Control` + `E`                       |
+| Move to end of line              | Editor     | `End`                                 |
+| Move to end of paragraph         | Editor     | `Control` + `Down`                    |
+| Move to next subword end         | Editor     | `Control` + `Alt` + `F`               |
+| Move to next subword end         | Editor     | `Control` + `Alt` + `Right`           |
+| Move to next word end            | Editor     | `Alt` + `F`                           |
+| Move to next word end            | Editor     | `Alt` + `Right`                       |
+| Move to previous subword start   | Editor     | `Control` + `Alt` + `B`               |
+| Move to previous subword start   | Editor     | `Control` + `Alt` + `Left`            |
+| Move to previous word start      | Editor     | `Alt` + `B`                           |
+| Move to previous word start      | Editor     | `Alt` + `Left`                        |
+| Move to start of paragraph       | Editor     | `Control` + `Up`                      |
+| Move up                          | Editor     | `Control` + `P`                       |
+| Move up                          | Editor     | `Up`                                  |
+| Next screen                      | Editor     | `Control` + `L`                       |
+| Open excerpts                    | Editor     | `Alt` + `Enter`                       |
+| Outdent                          | Editor     | `⌘` + `[`                             |
+| Page down                        | Editor     | `Page Down`                           |
+| Page up                          | Editor     | `Page Up`                             |
+| Paste                            | Editor     | `⌘` + `V`                             |
+| Redo                             | Editor     | `⌘` + `Shift` + `Z`                   |
+| Redo selection                   | Editor     | `⌘` + `Shift` + `U`                   |
+| Rename                           | Editor     | `F2`                                  |
+| Reveal in finder                 | Editor     | `Alt` + `⌘` + `R`                     |
+| Select all                       | Editor     | `⌘` + `A`                             |
+| Select all matches               | Editor     | `⌘` + `Shift` + `L`                   |
+| Select down                      | Editor     | `Control` + `Shift` + `N`             |
+| Select down                      | Editor     | `Shift` + `Down`                      |
+| Select larger syntax node        | Editor     | `Alt` + `Up`                          |
+| Select left                      | Editor     | `Control` + `Shift` + `B`             |
+| Select left                      | Editor     | `Shift` + `Left`                      |
+| Select line                      | Editor     | `⌘` + `L`                             |
+| Select next                      | Editor     | `⌘` + `D`                             |
+| Select next                      | Editor     | `⌘` + `K`, `⌘` + `D`                  |
+| Select previous                  | Editor     | `⌘` + `K`, `Control` + `⌘` + `D`      |
+| Select previous                  | Editor     | `Control` + `⌘` + `D`                 |
+| Select right                     | Editor     | `Control` + `Shift` + `F`             |
+| Select right                     | Editor     | `Shift` + `Right`                     |
+| Select smaller syntax node       | Editor     | `Alt` + `Down`                        |
+| Select to beginning              | Editor     | `⌘` + `Shift` + `Up`                  |
+| Select to beginning of line      | Editor     | `⌘` + `Shift` + `Left`                |
+| Select to beginning of line      | Editor     | `Control` + `Shift` + `A`             |
+| Select to beginning of line      | Editor     | `Shift` + `Home`                      |
+| Select to end                    | Editor     | `⌘` + `Shift` + `Down`                |
+| Select to end of line            | Editor     | `⌘` + `Shift` + `Right`               |
+| Select to end of line            | Editor     | `Control` + `Shift` + `E`             |
+| Select to end of line            | Editor     | `Shift` + `End`                       |
+| Select to end of paragraph       | Editor     | `Control` + `Shift` + `Down`          |
+| Select to next subword end       | Editor     | `Control` + `Alt` + `Shift` + `F`     |
+| Select to next subword end       | Editor     | `Control` + `Alt` + `Shift` + `Right` |
+| Select to next word end          | Editor     | `Alt` + `Shift` + `F`                 |
+| Select to next word end          | Editor     | `Alt` + `Shift` + `Right`             |
+| Select to previous subword start | Editor     | `Control` + `Alt` + `Shift` + `B`     |
+| Select to previous subword start | Editor     | `Control` + `Alt` + `Shift` + `Left`  |
+| Select to previous word start    | Editor     | `Alt` + `Shift` + `B`                 |
+| Select to previous word start    | Editor     | `Alt` + `Shift` + `Left`              |
+| Select to start of paragraph     | Editor     | `Control` + `Shift` + `Up`            |
+| Select up                        | Editor     | `Control` + `Shift` + `P`             |
+| Select up                        | Editor     | `Shift` + `Up`                        |
+| Show character palette           | Editor     | `Control` + `⌘` + `Space`             |
+| Show completions                 | Editor     | `Control` + `Space`                   |
+| Tab                              | Editor     | `Tab`                                 |
+| Tab prev                         | Editor     | `Shift` + `Tab`                       |
+| Toggle code actions              | Editor     | `⌘` + `.`                             |
+| Toggle comments                  | Editor     | `⌘` + `/`                             |
+| Transpose                        | Editor     | `Control` + `T`                       |
+| Undo                             | Editor     | `⌘` + `Z`                             |
+| Undo selection                   | Editor     | `⌘` + `U`                             |
+| Unfold lines                     | Editor     | `Alt` + `⌘` + `]`                     |
 
 #### Editor (Full Only)
 
-| **Command**         | **Target**    | **Default Shortcut**      |
-| ------------------- | ------------- | ------------------------- |
-| Quote selection     | Assistant     | `Command + >`             |
-| Deploy              | Buffer Search | `Command + E`             |
-| Deploy              | Buffer Search | `Command + F`             |
-| Next suggestion     | Copilot       | `Alt + ]`                 |
-| Previous suggestion | Copilot       | `Alt + [`                 |
-| Suggest             | Copilot       | `Alt + \`                 |
-| Newline             | Editor        | `Enter`                   |
-| Newline             | Editor        | `Shift + Enter`           |
-| Newline above       | Editor        | `Command + Shift + Enter` |
-| Newline below       | Editor        | `Command + Enter`         |
-| Toggle soft wrap    | Editor        | `Alt + Z`                 |
-| Toggle              | Go To Line    | `Control + G`             |
-| Toggle              | Outline       | `Command + Shift + O`     |
+| **Command**         | **Target**    | **Default Shortcut**    |
+| ------------------- | ------------- | ----------------------- |
+| Quote selection     | Assistant     | `⌘` + `>`               |
+| Deploy              | Buffer Search | `⌘` + `E`               |
+| Deploy              | Buffer Search | `⌘` + `F`               |
+| Next suggestion     | Copilot       | `Alt` + `]`             |
+| Previous suggestion | Copilot       | `Alt` + `[`             |
+| Suggest             | Copilot       | `Alt` + `\`             |
+| Newline             | Editor        | `Enter`                 |
+| Newline             | Editor        | `Shift` + `Enter`       |
+| Newline above       | Editor        | `⌘` + `Shift` + `Enter` |
+| Newline below       | Editor        | `⌘` + `Enter`           |
+| Toggle soft wrap    | Editor        | `Alt` + `Z`             |
+| Toggle              | Go To Line    | `Control` + `G`         |
+| Toggle              | Outline       | `⌘` + `Shift` + `O`     |
 
 #### Editor (Auto Height Only)
 
-| **Command**   | **Target** | **Default Shortcut**      |
-| ------------- | ---------- | ------------------------- |
-| Newline       | Editor     | `Control + Enter`         |
-| Newline below | Editor     | `Control + Shift + Enter` |
+| **Command**   | **Target** | **Default Shortcut**          |
+| ------------- | ---------- | ----------------------------- |
+| Newline       | Editor     | `Control` + `Enter`           |
+| Newline below | Editor     | `Control` + `Shift` + `Enter` |
 
 #### Pane
 
-| **Command**            | **Target**     | **Default Shortcut**  |
-| ---------------------- | -------------- | --------------------- |
-| Activate item 1        | Pane           | `Control + 1`         |
-| Activate item 2        | Pane           | `Control + 2`         |
-| Activate item 3        | Pane           | `Control + 3`         |
-| Activate item 4        | Pane           | `Control + 4`         |
-| Activate item 5        | Pane           | `Control + 5`         |
-| Activate item 6        | Pane           | `Control + 6`         |
-| Activate item 7        | Pane           | `Control + 7`         |
-| Activate item 8        | Pane           | `Control + 8`         |
-| Activate item 9        | Pane           | `Control + 9`         |
-| Activate last item     | Pane           | `Control + 0`         |
-| Go back                | Pane           | `Control + `          |
-| Go forward             | Pane           | `Control + _`         |
-| Reopen closed item     | Pane           | `Command + Shift + T` |
-| Split down             | Pane           | `Command + K, Down`   |
-| Split left             | Pane           | `Command + K, Left`   |
-| Split right            | Pane           | `Command + K, Right`  |
-| Split up               | Pane           | `Command + K, Up`     |
-| Toggle filters         | Project Search | `Alt + Command + F`   |
-| Toggle focus           | Project Search | `Command + F`         |
-| Toggle focus           | Project Search | `Command + Shift + F` |
-| Activate regex mode    | Search         | `Alt + Command + G`   |
-| Activate semantic mode | Search         | `Alt + Command + S`   |
-| Activate text mode     | Search         | `Alt + Command + X`   |
-| Cycle mode             | Search         | `Alt + Tab`           |
-| Select all matches     | Search         | `Alt + Enter`         |
-| Select next match      | Search         | `Command + G`         |
-| Select prev match      | Search         | `Command + Shift + G` |
-| Toggle case sensitive  | Search         | `Alt + Command + C`   |
-| Toggle replace         | Search         | `Command + Shift + H` |
-| Toggle whole word      | Search         | `Alt + Command + W`   |
+| **Command**            | **Target**     | **Default Shortcut** |
+| ---------------------- | -------------- | -------------------- |
+| Activate item 1        | Pane           | `Control` + `1`      |
+| Activate item 2        | Pane           | `Control` + `2`      |
+| Activate item 3        | Pane           | `Control` + `3`      |
+| Activate item 4        | Pane           | `Control` + `4`      |
+| Activate item 5        | Pane           | `Control` + `5`      |
+| Activate item 6        | Pane           | `Control` + `6`      |
+| Activate item 7        | Pane           | `Control` + `7`      |
+| Activate item 8        | Pane           | `Control` + `8`      |
+| Activate item 9        | Pane           | `Control` + `9`      |
+| Activate last item     | Pane           | `Control` + `0`      |
+| Go back                | Pane           | `Control` + ` `      |
+| Go forward             | Pane           | `Control` + `_`      |
+| Reopen closed item     | Pane           | `⌘` + `Shift` + `T`  |
+| Split down             | Pane           | `⌘` + `K`, `Down`    |
+| Split left             | Pane           | `⌘` + `K`, `Left`    |
+| Split right            | Pane           | `⌘` + `K`, `Right`   |
+| Split up               | Pane           | `⌘` + `K`, `Up`      |
+| Toggle filters         | Project Search | `Alt` + `⌘` + `F`    |
+| Toggle focus           | Project Search | `⌘` + `F`            |
+| Toggle focus           | Project Search | `⌘` + `Shift` + `F`  |
+| Activate regex mode    | Search         | `Alt` + `⌘` + `G`    |
+| Activate semantic mode | Search         | `Alt` + `⌘` + `S`    |
+| Activate text mode     | Search         | `Alt` + `⌘` + `X`    |
+| Cycle mode             | Search         | `Alt` + `Tab`        |
+| Select all matches     | Search         | `Alt` + `Enter`      |
+| Select next match      | Search         | `⌘` + `G`            |
+| Select prev match      | Search         | `⌘` + `Shift` + `G`  |
+| Toggle case sensitive  | Search         | `Alt` + `⌘` + `C`    |
+| Toggle replace         | Search         | `⌘` + `Shift` + `H`  |
+| Toggle whole word      | Search         | `Alt` + `⌘` + `W`    |
 
 #### Buffer Search Bar
 
@@ -306,100 +306,100 @@ _There are some key bindings that can't be overridden; we are working on an issu
 | ---------------------- | ------------- | -------------------- |
 | Dismiss                | Buffer Search | `Escape`             |
 | Focus editor           | Buffer Search | `Tab`                |
-| Cycle mode             | Search        | `Alt + Tab`          |
+| Cycle mode             | Search        | `Alt` + `Tab`        |
 | Next history query     | Search        | `Down`               |
 | Previous history query | Search        | `Up`                 |
 | Replace all            | Search        | `Command + Enter`    |
 | Replace next           | Search        | `Enter`              |
-| Select all matches     | Search        | `Alt + Enter`        |
+| Select all matches     | Search        | `Alt` + `Enter`      |
 | Select next match      | Search        | `Enter`              |
-| Select prev match      | Search        | `Shift + Enter`      |
+| Select prev match      | Search        | `Shift` + `Enter`    |
 
 #### Workspace
 
-| **Command**        | **Target**        | **Default Shortcut**       |
-| ------------------ | ----------------- | -------------------------- |
-| Toggle focus       | Assistant         | `Command + ?`              |
-| Toggle             | Command Palette   | `Command + Shift + P`      |
-| Deploy             | Diagnostics       | `Command + Shift + M`      |
-| Toggle             | File Finder       | `Command + P`              |
-| Toggle             | Language Selector | `Command + K, M`           |
-| Toggle focus       | Project Panel     | `Command + Shift + E`      |
-| Toggle             | Project Symbols   | `Command + T`              |
-| Toggle             | Theme Selector    | `Command + K, Command + T` |
-| Activate pane 1    | Workspace         | `Command + 1`              |
-| Activate pane 2    | Workspace         | `Command + 2`              |
-| Activate pane 3    | Workspace         | `Command + 3`              |
-| Activate pane 4    | Workspace         | `Command + 4`              |
-| Activate pane 5    | Workspace         | `Command + 5`              |
-| Activate pane 6    | Workspace         | `Command + 6`              |
-| Activate pane 7    | Workspace         | `Command + 7`              |
-| Activate pane 8    | Workspace         | `Command + 8`              |
-| Activate pane 9    | Workspace         | `Command + 9`              |
-| Close all docks    | Workspace         | `Alt + Command + Y`        |
-| New search         | Workspace         | `Command + Shift + F`      |
-| Save all           | Workspace         | `Command + Alt + S`        |
-| Toggle bottom dock | Workspace         | `Command + J`              |
-| Toggle left dock   | Workspace         | `Command + B`              |
-| Toggle right dock  | Workspace         | `Command + R`              |
-| Open keymap        | Zed               | `Command + K, Command + S` |
+| **Command**        | **Target**        | **Default Shortcut** |
+| ------------------ | ----------------- | -------------------- |
+| Toggle focus       | Assistant         | `⌘` + `?`            |
+| Toggle             | Command Palette   | `⌘` + `Shift` + `P`  |
+| Deploy             | Diagnostics       | `⌘` + `Shift` + `M`  |
+| Toggle             | File Finder       | `⌘` + `P`            |
+| Toggle             | Language Selector | `⌘` + `K`, `M`       |
+| Toggle focus       | Project Panel     | `⌘` + `Shift` + `E`  |
+| Toggle             | Project Symbols   | `⌘` + `T`            |
+| Toggle             | Theme Selector    | `⌘` + `K`, `⌘` + `T` |
+| Activate pane 1    | Workspace         | `⌘` + `1`            |
+| Activate pane 2    | Workspace         | `⌘` + `2`            |
+| Activate pane 3    | Workspace         | `⌘` + `3`            |
+| Activate pane 4    | Workspace         | `⌘` + `4`            |
+| Activate pane 5    | Workspace         | `⌘` + `5`            |
+| Activate pane 6    | Workspace         | `⌘` + `6`            |
+| Activate pane 7    | Workspace         | `⌘` + `7`            |
+| Activate pane 8    | Workspace         | `⌘` + `8`            |
+| Activate pane 9    | Workspace         | `⌘` + `9`            |
+| Close all docks    | Workspace         | `Alt` + `⌘` + `Y`    |
+| New search         | Workspace         | `⌘` + `Shift` + `F`  |
+| Save all           | Workspace         | `⌘` + `Alt` + `S`    |
+| Toggle bottom dock | Workspace         | `⌘` + `J`            |
+| Toggle left dock   | Workspace         | `⌘` + `B`            |
+| Toggle right dock  | Workspace         | `⌘` + `R`            |
+| Open keymap        | Zed               | `⌘` + `K`, `⌘` + `S` |
 
 #### Project Panel
 
 | **Command**             | **Target**    | **Default Shortcut**        |
 | ----------------------- | ------------- | --------------------------- |
 | Collapse selected entry | Project Panel | `Left`                      |
-| Copy                    | Project Panel | `Command + C`               |
-| Copy path               | Project Panel | `Command + Alt + C`         |
-| Copy relative path      | Project Panel | `Alt + Command + Shift + C` |
-| Cut                     | Project Panel | `Command + X`               |
+| Copy                    | Project Panel | `⌘` + `C`                   |
+| Copy path               | Project Panel | `⌘` + `Alt` + `C`           |
+| Copy relative path      | Project Panel | `Alt` + `⌘` + `Shift` + `C` |
+| Cut                     | Project Panel | `⌘` + `X`                   |
 | Delete                  | Project Panel | `Backspace`                 |
 | Expand selected entry   | Project Panel | `Right`                     |
-| New directory           | Project Panel | `Alt + Command + N`         |
+| New directory           | Project Panel | `Alt` + `⌘` + `N`           |
 | New file                | Project Panel | `Command + N`               |
-| New search in directory | Project Panel | `Alt + Shift + F`           |
+| New search in directory | Project Panel | `Alt` + `Shift` + `F`       |
 | Open                    | Project Panel | `Space`                     |
-| Paste                   | Project Panel | `Command + V`               |
+| Paste                   | Project Panel | `⌘` + `V`                   |
 | Rename                  | Project Panel | `Enter`                     |
 | Rename                  | Project Panel | `F2`                        |
-| Reveal in finder        | Project Panel | `Alt + Command + R`         |
+| Reveal in finder        | Project Panel | `Alt` + `⌘` + `R`           |
 
 #### Project Search Bar
 
-| **Command**            | **Target**     | **Default Shortcut**  |
-| ---------------------- | -------------- | --------------------- |
-| Search in new          | Project Search | `Command + Enter`     |
-| Toggle focus           | Project Search | `Escape`              |
-| Activate regex mode    | Search         | `Alt + Command + G`   |
-| Activate semantic mode | Search         | `Alt + Command + S`   |
-| Activate text mode     | Search         | `Alt + Command + X`   |
-| Cycle mode             | Search         | `Alt + Tab`           |
-| Next history query     | Search         | `Down`                |
-| Previous history query | Search         | `Up`                  |
-| Replace all            | Search         | `Command + Enter`     |
-| Replace next           | Search         | `Enter`               |
-| Toggle replace         | Search         | `Command + Shift + H` |
+| **Command**            | **Target**     | **Default Shortcut** |
+| ---------------------- | -------------- | -------------------- |
+| Search in new          | Project Search | `⌘` + `Enter`        |
+| Toggle focus           | Project Search | `Escape`             |
+| Activate regex mode    | Search         | `Alt` + `⌘` + `G`    |
+| Activate semantic mode | Search         | `Alt` + `⌘` + `S`    |
+| Activate text mode     | Search         | `Alt` + `⌘` + `X`    |
+| Cycle mode             | Search         | `Alt` + `Tab`        |
+| Next history query     | Search         | `Down`               |
+| Previous history query | Search         | `Up`                 |
+| Replace all            | Search         | `Command + Enter`    |
+| Replace next           | Search         | `Enter`              |
+| Toggle replace         | Search         | `⌘` + `Shift` + `H`  |
 
 #### Terminal
 
-| **Command**                 | **Target** | **Default Shortcut**        |
-| --------------------------- | ---------- | --------------------------- |
-| Clear                       | Terminal   | `Command + K`               |
-| Copy                        | Terminal   | `Command + C`               |
-| Delete line                 | Terminal   | `Command + Backspace`       |
-| Move to beginning of line   | Terminal   | `Command + Left`            |
-| Move to end of line         | Terminal   | `Command + Right`           |
-| Move to next word end       | Terminal   | `Alt + Right`               |
-| Move to previous word start | Terminal   | `Alt + Left`                |
-| Paste                       | Terminal   | `Command + V`               |
-| Show character palette      | Terminal   | `Control + Command + Space` |
+| **Command**                 | **Target** | **Default Shortcut**      |
+| --------------------------- | ---------- | ------------------------- |
+| Clear                       | Terminal   | `⌘` + `K`                 |
+| Copy                        | Terminal   | `⌘` + `C`                 |
+| Delete line                 | Terminal   | `⌘` + `Backspace`         |
+| Move to beginning of line   | Terminal   | `⌘` + `Left`              |
+| Move to end of line         | Terminal   | `⌘` + `Right`             |
+| Move to next word end       | Terminal   | `Alt` + `Right`           |
+| Move to previous word start | Terminal   | `Alt` + `Left`            |
+| Paste                       | Terminal   | `⌘` + `V`                 |
+| Show character palette      | Terminal   | `Control` + `⌘` + `Space` |
 
 #### Assistant Editor
 
 | **Command**        | **Target** | **Default Shortcut** |
 | ------------------ | ---------- | -------------------- |
-| Assist             | Assistant  | `Command + Enter`    |
-| Cycle message role | Assistant  | `Control + R`        |
-| Quote selection    | Assistant  | `Command + >`        |
-| Split              | Assistant  | `Shift + Enter`      |
-| Save               | Workspace  | `Command + S`        |
+| Assist             | Assistant  | `⌘` + `Enter`        |
+| Cycle message role | Assistant  | `Control` + `R`      |
+| Quote selection    | Assistant  | `⌘` + `>`            |
+| Split              | Assistant  | `Shift` + `Enter`    |
+| Save               | Workspace  | `⌘` + `S`            |

From e22ffb67400429fcf0a7bfdae7d3ba8c148677a9 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Mon, 29 Jan 2024 02:47:25 -0500
Subject: [PATCH 024/372] Run weekly update each day

---
 .github/workflows/update_weekly_top_ranking_issues.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update_weekly_top_ranking_issues.yml b/.github/workflows/update_weekly_top_ranking_issues.yml
index 38f32ddd5a..fa9a33bdf5 100644
--- a/.github/workflows/update_weekly_top_ranking_issues.yml
+++ b/.github/workflows/update_weekly_top_ranking_issues.yml
@@ -1,6 +1,6 @@
 on:
     schedule:
-        - cron: "0 17 * * SUN"
+        - cron: "0 15 * * *"
     workflow_dispatch:
 
 jobs:

From 8fbc88b7087170246d345e88c95c225e4d89b251 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Mon, 29 Jan 2024 10:06:57 +0100
Subject: [PATCH 025/372] Load embedded fonts directly from .rdata instead of
 cloning (#6932)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The fonts we embed in Zed binary (Zed Sans & Zed Mono) weigh about 30Mb in total and we are cloning them several times during startup and loading of embedded assets (once explicitly in Zed and then under the hood in font-kit). Moreover, after loading we have at least 2 copies of each font in our program; one in .rdata and the other on the heap for use by font-kit.
This commit does away with that distinction (we're no longer allocating the font data) and slightly relaxes the interface of `TextSystem::add_fonts` by expecting one to pass `Cow<[u8]>` instead of `Arc<Vec<u8>>`. Additionally, `AssetSource::get` now returns `Cow<'static, [u8]>` instead of `Cow<'self, [u8]>`; all existing implementations conform with that change.

Note that this optimization takes effect only in Release builds, as the library we use for asset embedding - rust-embed - embeds the assets only in Release mode and in Dev builds it simply loads data from disk. Thus it returns `Cow<[u8]>` in it's interface. Therefore, we still copy that memory around in Dev builds, but that's not really an issue.
This patch makes no assumptions about the build profile we're running under, that's just an intrinsic property of rust-embed.

Tl;dr: this should shave off about 30Mb of memory usage and a fair chunk (~30ms) of startup time.

Release Notes:
- Improved startup time and memory usage.
---
 crates/assets/src/lib.rs                    |  2 +-
 crates/gpui/src/assets.rs                   |  4 +--
 crates/gpui/src/platform.rs                 |  2 +-
 crates/gpui/src/platform/mac/text_system.rs | 27 +++++++++++++++------
 crates/gpui/src/text_system.rs              |  3 ++-
 crates/storybook/src/assets.rs              |  2 +-
 crates/storybook/src/storybook.rs           |  8 +++---
 crates/theme_importer/src/assets.rs         |  2 +-
 crates/zed/src/main.rs                      |  6 ++---
 crates/zed/src/zed.rs                       | 14 +++--------
 10 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/crates/assets/src/lib.rs b/crates/assets/src/lib.rs
index 010b7ebda3..4f013dd5af 100644
--- a/crates/assets/src/lib.rs
+++ b/crates/assets/src/lib.rs
@@ -16,7 +16,7 @@ use rust_embed::RustEmbed;
 pub struct Assets;
 
 impl AssetSource for Assets {
-    fn load(&self, path: &str) -> Result<std::borrow::Cow<[u8]>> {
+    fn load(&self, path: &str) -> Result<std::borrow::Cow<'static, [u8]>> {
         Self::get(path)
             .map(|f| f.data)
             .ok_or_else(|| anyhow!("could not find asset at path \"{}\"", path))
diff --git a/crates/gpui/src/assets.rs b/crates/gpui/src/assets.rs
index b5e3735eb5..e2667e67bb 100644
--- a/crates/gpui/src/assets.rs
+++ b/crates/gpui/src/assets.rs
@@ -11,14 +11,14 @@ use std::{
 /// A source of assets for this app to use.
 pub trait AssetSource: 'static + Send + Sync {
     /// Load the given asset from the source path.
-    fn load(&self, path: &str) -> Result<Cow<[u8]>>;
+    fn load(&self, path: &str) -> Result<Cow<'static, [u8]>>;
 
     /// List the assets at the given path.
     fn list(&self, path: &str) -> Result<Vec<SharedString>>;
 }
 
 impl AssetSource for () {
-    fn load(&self, path: &str) -> Result<Cow<[u8]>> {
+    fn load(&self, path: &str) -> Result<Cow<'static, [u8]>> {
         Err(anyhow!(
             "get called on empty asset provider with \"{}\"",
             path
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index a7b71c7885..92dd08f059 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -204,7 +204,7 @@ pub trait PlatformDispatcher: Send + Sync {
 }
 
 pub(crate) trait PlatformTextSystem: Send + Sync {
-    fn add_fonts(&self, fonts: &[Arc<Vec<u8>>]) -> Result<()>;
+    fn add_fonts(&self, fonts: Vec<Cow<'static, [u8]>>) -> Result<()>;
     fn all_font_names(&self) -> Vec<String>;
     fn all_font_families(&self) -> Vec<String>;
     fn font_id(&self, descriptor: &Font) -> Result<FontId>;
diff --git a/crates/gpui/src/platform/mac/text_system.rs b/crates/gpui/src/platform/mac/text_system.rs
index e8c8b45311..053e5859be 100644
--- a/crates/gpui/src/platform/mac/text_system.rs
+++ b/crates/gpui/src/platform/mac/text_system.rs
@@ -34,7 +34,7 @@ use pathfinder_geometry::{
     vector::{Vector2F, Vector2I},
 };
 use smallvec::SmallVec;
-use std::{char, cmp, convert::TryFrom, ffi::c_void, sync::Arc};
+use std::{borrow::Cow, char, cmp, convert::TryFrom, ffi::c_void, sync::Arc};
 
 use super::open_type;
 
@@ -74,7 +74,7 @@ impl Default for MacTextSystem {
 }
 
 impl PlatformTextSystem for MacTextSystem {
-    fn add_fonts(&self, fonts: &[Arc<Vec<u8>>]) -> Result<()> {
+    fn add_fonts(&self, fonts: Vec<Cow<'static, [u8]>>) -> Result<()> {
         self.0.write().add_fonts(fonts)
     }
 
@@ -183,12 +183,23 @@ impl PlatformTextSystem for MacTextSystem {
 }
 
 impl MacTextSystemState {
-    fn add_fonts(&mut self, fonts: &[Arc<Vec<u8>>]) -> Result<()> {
-        self.memory_source.add_fonts(
-            fonts
-                .iter()
-                .map(|bytes| Handle::from_memory(bytes.clone(), 0)),
-        )?;
+    fn add_fonts(&mut self, fonts: Vec<Cow<'static, [u8]>>) -> Result<()> {
+        let fonts = fonts
+            .into_iter()
+            .map(|bytes| match bytes {
+                Cow::Borrowed(embedded_font) => {
+                    let data_provider = unsafe {
+                        core_graphics::data_provider::CGDataProvider::from_slice(embedded_font)
+                    };
+                    let font = core_graphics::font::CGFont::from_data_provider(data_provider)
+                        .map_err(|_| anyhow!("Could not load an embedded font."))?;
+                    let font = font_kit::loaders::core_text::Font::from_core_graphics_font(font);
+                    Ok(Handle::from_native(&font))
+                }
+                Cow::Owned(bytes) => Ok(Handle::from_memory(Arc::new(bytes), 0)),
+            })
+            .collect::<Result<Vec<_>>>()?;
+        self.memory_source.add_fonts(fonts.into_iter())?;
         Ok(())
     }
 
diff --git a/crates/gpui/src/text_system.rs b/crates/gpui/src/text_system.rs
index 15042cbf59..d5180e30c0 100644
--- a/crates/gpui/src/text_system.rs
+++ b/crates/gpui/src/text_system.rs
@@ -19,6 +19,7 @@ use itertools::Itertools;
 use parking_lot::{Mutex, RwLock, RwLockUpgradableReadGuard};
 use smallvec::{smallvec, SmallVec};
 use std::{
+    borrow::Cow,
     cmp,
     fmt::{Debug, Display, Formatter},
     hash::{Hash, Hasher},
@@ -85,7 +86,7 @@ impl TextSystem {
     }
 
     /// Add a font's data to the text system.
-    pub fn add_fonts(&self, fonts: &[Arc<Vec<u8>>]) -> Result<()> {
+    pub fn add_fonts(&self, fonts: Vec<Cow<'static, [u8]>>) -> Result<()> {
         self.platform_text_system.add_fonts(fonts)
     }
 
diff --git a/crates/storybook/src/assets.rs b/crates/storybook/src/assets.rs
index 9fc71917b4..c8dbe9ec60 100644
--- a/crates/storybook/src/assets.rs
+++ b/crates/storybook/src/assets.rs
@@ -15,7 +15,7 @@ use rust_embed::RustEmbed;
 pub struct Assets;
 
 impl AssetSource for Assets {
-    fn load(&self, path: &str) -> Result<Cow<[u8]>> {
+    fn load(&self, path: &str) -> Result<Cow<'static, [u8]>> {
         Self::get(path)
             .map(|f| f.data)
             .ok_or_else(|| anyhow!("could not find asset at path \"{}\"", path))
diff --git a/crates/storybook/src/storybook.rs b/crates/storybook/src/storybook.rs
index 70e830222f..47fc3b042a 100644
--- a/crates/storybook/src/storybook.rs
+++ b/crates/storybook/src/storybook.rs
@@ -2,8 +2,6 @@ mod assets;
 mod stories;
 mod story_selector;
 
-use std::sync::Arc;
-
 use clap::Parser;
 use dialoguer::FuzzySelect;
 use gpui::{
@@ -128,10 +126,10 @@ fn load_embedded_fonts(cx: &AppContext) -> gpui::Result<()> {
     let mut embedded_fonts = Vec::new();
     for font_path in font_paths {
         if font_path.ends_with(".ttf") {
-            let font_bytes = cx.asset_source().load(&font_path)?.to_vec();
-            embedded_fonts.push(Arc::from(font_bytes));
+            let font_bytes = cx.asset_source().load(&font_path)?;
+            embedded_fonts.push(font_bytes);
         }
     }
 
-    cx.text_system().add_fonts(&embedded_fonts)
+    cx.text_system().add_fonts(embedded_fonts)
 }
diff --git a/crates/theme_importer/src/assets.rs b/crates/theme_importer/src/assets.rs
index 9009b4c144..171912f6b8 100644
--- a/crates/theme_importer/src/assets.rs
+++ b/crates/theme_importer/src/assets.rs
@@ -11,7 +11,7 @@ use rust_embed::RustEmbed;
 pub struct Assets;
 
 impl AssetSource for Assets {
-    fn load(&self, path: &str) -> Result<Cow<[u8]>> {
+    fn load(&self, path: &str) -> Result<Cow<'static, [u8]>> {
         Self::get(path)
             .map(|f| f.data)
             .ok_or_else(|| anyhow!("could not find asset at path \"{}\"", path))
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 0b7a983cb6..3e546ca547 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -815,14 +815,14 @@ fn load_embedded_fonts(cx: &AppContext) {
             }
 
             scope.spawn(async {
-                let font_bytes = asset_source.load(font_path).unwrap().to_vec();
-                embedded_fonts.lock().push(Arc::from(font_bytes));
+                let font_bytes = asset_source.load(font_path).unwrap();
+                embedded_fonts.lock().push(font_bytes);
             });
         }
     }));
 
     cx.text_system()
-        .add_fonts(&embedded_fonts.into_inner())
+        .add_fonts(embedded_fonts.into_inner())
         .unwrap();
 }
 
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index bf001dac72..f045e62f83 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -2676,17 +2676,9 @@ mod tests {
     #[gpui::test]
     fn test_bundled_settings_and_themes(cx: &mut AppContext) {
         cx.text_system()
-            .add_fonts(&[
-                Assets
-                    .load("fonts/zed-sans/zed-sans-extended.ttf")
-                    .unwrap()
-                    .to_vec()
-                    .into(),
-                Assets
-                    .load("fonts/zed-mono/zed-mono-extended.ttf")
-                    .unwrap()
-                    .to_vec()
-                    .into(),
+            .add_fonts(vec![
+                Assets.load("fonts/zed-sans/zed-sans-extended.ttf").unwrap(),
+                Assets.load("fonts/zed-mono/zed-mono-extended.ttf").unwrap(),
             ])
             .unwrap();
         let themes = ThemeRegistry::default();

From 9ef830e9bbaa3c773f246031b5520c95e70dfdfc Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Mon, 29 Jan 2024 10:48:54 +0100
Subject: [PATCH 026/372] update: Add arch and os to release query parameters.
 (#6976)

This is no-op right now, but we need it for multi-platform support and
(potentially) to split the Universal Binary on mac into two
non-universal targets.
Related to: #6837
Release Notes:
- N/A
---
 crates/auto_update/src/auto_update.rs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs
index 08e9e38dd5..5ce3316be8 100644
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -18,7 +18,12 @@ use smol::io::AsyncReadExt;
 use settings::{Settings, SettingsStore};
 use smol::{fs::File, process::Command};
 
-use std::{ffi::OsString, sync::Arc, time::Duration};
+use std::{
+    env::consts::{ARCH, OS},
+    ffi::OsString,
+    sync::Arc,
+    time::Duration,
+};
 use update_notification::UpdateNotification;
 use util::channel::{AppCommitSha, ReleaseChannel};
 use util::http::HttpClient;
@@ -249,7 +254,10 @@ impl AutoUpdater {
             )
         })?;
 
-        let mut url_string = format!("{server_url}/api/releases/latest?asset=Zed.dmg");
+        let mut url_string = format!(
+            "{server_url}/api/releases/latest?asset=Zed.dmg&os={}&arch={}",
+            OS, ARCH
+        );
         cx.update(|cx| {
             if let Some(param) = cx
                 .try_global::<ReleaseChannel>()

From 49542757fde7dfef613504417b9be5cb97cd0335 Mon Sep 17 00:00:00 2001
From: George Munyoro <32019551+georgemunyoro@users.noreply.github.com>
Date: Mon, 29 Jan 2024 12:06:02 +0200
Subject: [PATCH 027/372] Correctly check existence of target directory in
 `copy_recursive` function (#6875)

Fixes https://github.com/zed-industries/zed/issues/6778

Release Notes:

- Fixed issue where copy-paste for folders was not working in the
project panel
([#6778](https://github.com/zed-industries/zed/issues/6778)).
---
 crates/fs/src/fs.rs                       |  2 +-
 crates/project_panel/src/project_panel.rs | 95 +++++++++++++++++++++++
 2 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index 350a33b208..b010394ec2 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -1183,7 +1183,7 @@ pub fn copy_recursive<'a>(
             .await?
             .ok_or_else(|| anyhow!("path does not exist: {}", source.display()))?;
         if metadata.is_dir {
-            if !options.overwrite && fs.metadata(target).await.is_ok() {
+            if !options.overwrite && fs.metadata(target).await.is_ok_and(|m| m.is_some()) {
                 if options.ignore_if_exists {
                     return Ok(());
                 } else {
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index f261089be0..51704b745e 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -2455,6 +2455,101 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_copy_paste_directory(cx: &mut gpui::TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor().clone());
+        fs.insert_tree(
+            "/root",
+            json!({
+                "a": {
+                    "one.txt": "",
+                    "two.txt": "",
+                    "inner_dir": {
+                        "three.txt": "",
+                        "four.txt": "",
+                    }
+                },
+                "b": {}
+            }),
+        )
+        .await;
+
+        let project = Project::test(fs.clone(), ["/root".as_ref()], cx).await;
+        let workspace = cx.add_window(|cx| Workspace::test_new(project.clone(), cx));
+        let cx = &mut VisualTestContext::from_window(*workspace, cx);
+        let panel = workspace
+            .update(cx, |workspace, cx| ProjectPanel::new(workspace, cx))
+            .unwrap();
+
+        select_path(&panel, "root/a", cx);
+        panel.update(cx, |panel, cx| {
+            panel.copy(&Default::default(), cx);
+            panel.select_next(&Default::default(), cx);
+            panel.paste(&Default::default(), cx);
+        });
+        cx.executor().run_until_parked();
+
+        let pasted_dir = find_project_entry(&panel, "root/b/a", cx);
+        assert_ne!(pasted_dir, None, "Pasted directory should have an entry");
+
+        let pasted_dir_file = find_project_entry(&panel, "root/b/a/one.txt", cx);
+        assert_ne!(
+            pasted_dir_file, None,
+            "Pasted directory file should have an entry"
+        );
+
+        let pasted_dir_inner_dir = find_project_entry(&panel, "root/b/a/inner_dir", cx);
+        assert_ne!(
+            pasted_dir_inner_dir, None,
+            "Directories inside pasted directory should have an entry"
+        );
+
+        toggle_expand_dir(&panel, "root/b", cx);
+        toggle_expand_dir(&panel, "root/b/a", cx);
+        toggle_expand_dir(&panel, "root/b/a/inner_dir", cx);
+
+        assert_eq!(
+            visible_entries_as_strings(&panel, 0..50, cx),
+            &[
+                //
+                "v root",
+                "    > a",
+                "    v b",
+                "        v a",
+                "            v inner_dir  <== selected",
+                "                  four.txt",
+                "                  three.txt",
+                "              one.txt",
+                "              two.txt",
+            ]
+        );
+
+        select_path(&panel, "root", cx);
+        panel.update(cx, |panel, cx| panel.paste(&Default::default(), cx));
+        cx.executor().run_until_parked();
+        panel.update(cx, |panel, cx| panel.paste(&Default::default(), cx));
+        cx.executor().run_until_parked();
+        assert_eq!(
+            visible_entries_as_strings(&panel, 0..50, cx),
+            &[
+                //
+                "v root  <== selected",
+                "    > a",
+                "    > a copy",
+                "    > a copy 1",
+                "    v b",
+                "        v a",
+                "            v inner_dir",
+                "                  four.txt",
+                "                  three.txt",
+                "              one.txt",
+                "              two.txt"
+            ]
+        );
+    }
+
     #[gpui::test]
     async fn test_remove_opened_file(cx: &mut gpui::TestAppContext) {
         init_test_with_editor(cx);

From 8263da02bd65e50611a4a70199273f49929fd8ea Mon Sep 17 00:00:00 2001
From: d1y <chenhonzhou@gmail.com>
Date: Mon, 29 Jan 2024 19:47:23 +0800
Subject: [PATCH 028/372] Make .jsonc icon use storage icon (#6972)

Jsonc is a simplified json format which allows comments and unquoted
values delimited by whitespace. A jsonc formatted file can be
unambiguously transformed to a json file. Comments will be stripped out
and quotes added.

Release Notes:

- Added an icon for .jsonc files
---
 assets/icons/file_icons/file_types.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/icons/file_icons/file_types.json b/assets/icons/file_icons/file_types.json
index ac722183fa..b2236e0230 100644
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -53,6 +53,7 @@
         "jpg": "image",
         "js": "code",
         "json": "storage",
+        "jsonc": "storage",
         "ldf": "storage",
         "lock": "lock",
         "log": "log",

From 843919dd1448684b308977e7b3855f853e9afe8f Mon Sep 17 00:00:00 2001
From: liruifengv <liruifeng1024@gmail.com>
Date: Mon, 29 Jan 2024 20:08:12 +0800
Subject: [PATCH 029/372] docs: Update configuring_zed__key_bindings.md (#6974)

Release notes: N/A
---
 docs/src/configuring_zed__key_bindings.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/configuring_zed__key_bindings.md b/docs/src/configuring_zed__key_bindings.md
index c271aac975..34d3699944 100644
--- a/docs/src/configuring_zed__key_bindings.md
+++ b/docs/src/configuring_zed__key_bindings.md
@@ -2,7 +2,7 @@ Zed can be configured via a simple JSON file located at `~/.config/zed/keymap.js
 
 ### Predefined keymaps
 
-We have a growing collection of pre-defined keymaps in our [keymaps repository](https://github.com/zed-industries/keymaps).
+We have a growing collection of pre-defined keymaps in [zed repository's keymaps folder](https://github.com/zed-industries/zed/tree/main/assets/keymaps).
 
 ### Custom key bindings
 

From a827d0dac6512c976cdac8da62a376e6f163a055 Mon Sep 17 00:00:00 2001
From: Abel Chalier <abel.chalier@gmail.com>
Date: Mon, 29 Jan 2024 13:34:26 +0100
Subject: [PATCH 030/372] fixed zig config on line_comments (#6979)

On a .zig files , the `CMD-/` keybinding don't work,
In the language config its the only language with '//' type comment that
is written in singular without array.
This fixed the problem, so i assume it was just a typo

![image](https://github.com/zed-industries/zed/assets/6186996/d7f2381a-8b21-4f50-8910-6685b81a5aec)

Release notes:
- Fixed line comment continuations and Editor::ToggleComments for Zig, Haskell and PureScript.
---
 crates/zed/src/languages/haskell/config.toml    | 2 +-
 crates/zed/src/languages/purescript/config.toml | 2 +-
 crates/zed/src/languages/zig/config.toml        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/zed/src/languages/haskell/config.toml b/crates/zed/src/languages/haskell/config.toml
index 9d0c3f602c..7b1454431e 100644
--- a/crates/zed/src/languages/haskell/config.toml
+++ b/crates/zed/src/languages/haskell/config.toml
@@ -1,7 +1,7 @@
 name = "Haskell"
 path_suffixes = ["hs"]
 autoclose_before = ",=)}]"
-line_comment = "-- "
+line_comments = ["-- "]
 block_comment = ["{- ", " -}"]
 brackets = [
     { start = "{", end = "}", close = true, newline = true },
diff --git a/crates/zed/src/languages/purescript/config.toml b/crates/zed/src/languages/purescript/config.toml
index f568ef4d1d..ee9810dbb7 100644
--- a/crates/zed/src/languages/purescript/config.toml
+++ b/crates/zed/src/languages/purescript/config.toml
@@ -1,7 +1,7 @@
 name = "PureScript"
 path_suffixes = ["purs"]
 autoclose_before = ",=)}]"
-line_comment = "-- "
+line_comments = ["-- "]
 block_comment = ["{- ", " -}"]
 brackets = [
     { start = "{", end = "}", close = true, newline = true },
diff --git a/crates/zed/src/languages/zig/config.toml b/crates/zed/src/languages/zig/config.toml
index 2ac71fd5c0..6f72663280 100644
--- a/crates/zed/src/languages/zig/config.toml
+++ b/crates/zed/src/languages/zig/config.toml
@@ -1,6 +1,6 @@
 name = "Zig"
 path_suffixes = ["zig"]
-line_comment = "// "
+line_comments = ["// "]
 autoclose_before = ";:.,=}])>"
 brackets = [
     { start = "{", end = "}", close = true, newline = true },

From d2968866b29403ccfeaf6015e644b58bdd59cbe4 Mon Sep 17 00:00:00 2001
From: bestgopher <84328409@qq.com>
Date: Mon, 29 Jan 2024 22:55:31 +0800
Subject: [PATCH 031/372] rust: Update rust-analyzer repo address (#6986)

I am so sorry that I closed the
https://github.com/zed-industries/zed/pull/6980 misoperationally. Here
is a new pr.
---
 crates/zed/src/languages/rust.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/crates/zed/src/languages/rust.rs b/crates/zed/src/languages/rust.rs
index 0082c5cdc0..c8ca6fc1f7 100644
--- a/crates/zed/src/languages/rust.rs
+++ b/crates/zed/src/languages/rust.rs
@@ -32,8 +32,7 @@ impl LspAdapter for RustLspAdapter {
         delegate: &dyn LspAdapterDelegate,
     ) -> Result<Box<dyn 'static + Send + Any>> {
         let release =
-            latest_github_release("rust-analyzer/rust-analyzer", false, delegate.http_client())
-                .await?;
+            latest_github_release("rust-lang/rust-analyzer", false, delegate.http_client()).await?;
         let asset_name = format!("rust-analyzer-{}-apple-darwin.gz", consts::ARCH);
         let asset = release
             .assets

From d1a600303317cfc917c988298994c5dbb3057420 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Mon, 29 Jan 2024 10:26:30 -0500
Subject: [PATCH 032/372] Use Git status color for icons in project panel
 (#6992)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR updates the icons in the file tree in the project panel to also
use the Git status color:

<img width="267" alt="Screenshot 2024-01-29 at 10 21 41 AM"
src="https://github.com/zed-industries/zed/assets/1486634/2f4f6e9e-8050-4f5b-851a-e407aec823a0">

Release Notes:

- Updated icons in project panel to reflect Git status
([#6991](https://github.com/zed-industries/zed/issues/6991)).
---
 crates/project_panel/src/project_panel.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 51704b745e..6bcc1e3300 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -1380,7 +1380,7 @@ impl ProjectPanel {
                     .indent_step_size(px(settings.indent_size))
                     .selected(is_selected)
                     .child(if let Some(icon) = &icon {
-                        div().child(Icon::from_path(icon.to_string()).color(Color::Muted))
+                        div().child(Icon::from_path(icon.to_string()).color(filename_text_color))
                     } else {
                         div().size(IconSize::default().rems()).invisible()
                     })

From d694017d0568f2a5815f5330be5d2574bdc64a65 Mon Sep 17 00:00:00 2001
From: Pseudomata <pseudomata@proton.me>
Date: Mon, 29 Jan 2024 11:32:35 -0500
Subject: [PATCH 033/372] Add Haskell file type icon (#6995)

Small change to add the Haskell logo as a file icon. Screenshot below
shows what this looks like.

![CleanShot 2024-01-29 at 11 21
30@2x](https://github.com/zed-industries/zed/assets/132238190/b484c679-965a-4e73-88dc-ebb670a0f390)
---
 assets/icons/file_icons/file_types.json |  4 ++++
 assets/icons/file_icons/haskell.svg     | 13 +++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 assets/icons/file_icons/haskell.svg

diff --git a/assets/icons/file_icons/file_types.json b/assets/icons/file_icons/file_types.json
index b2236e0230..36c3349cb6 100644
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -45,6 +45,7 @@
         "heex": "elixir",
         "htm": "template",
         "html": "template",
+        "hs": "haskell",
         "ib": "storage",
         "ico": "image",
         "ini": "settings",
@@ -146,6 +147,9 @@
         "expanded_folder": {
             "icon": "icons/file_icons/folder_open.svg"
         },
+        "haskell": {
+            "icon": "icons/file_icons/haskell.svg"
+        },
         "image": {
             "icon": "icons/file_icons/image.svg"
         },
diff --git a/assets/icons/file_icons/haskell.svg b/assets/icons/file_icons/haskell.svg
new file mode 100644
index 0000000000..ff3a687f52
--- /dev/null
+++ b/assets/icons/file_icons/haskell.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 32 32"
+   version="1.1"
+   id="svg977"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs981" />
+  <path
+     id="path973"
+     d="M 10.699219 8.9003906 L 10.699219 9 C 12.199219 11.3 13.800781 13.600391 15.300781 15.900391 L 15.300781 16 C 13.800781 18.3 12.199219 20.600391 10.699219 22.900391 L 10.699219 23 L 14.199219 23 L 14.300781 22.900391 C 15.200781 21.500391 16.199609 20.099219 17.099609 18.699219 C 17.199609 18.599219 17.099219 18.599219 17.199219 18.699219 C 18.099219 20.099219 19.1 21.500391 20 22.900391 L 20.099609 23 L 23.599609 23 C 21.699609 20 19.699219 17.099609 17.699219 14.099609 C 16.499219 12.399609 15.399219 10.600391 14.199219 8.9003906 L 10.699219 8.9003906 z M 6 9 C 7.6 11.3 9.0996094 13.6 10.599609 16 L 10.599609 16.099609 C 9.4996094 17.799609 8.4007813 19.399609 7.3007812 21.099609 C 6.8007813 21.699609 6.4 22.4 6 23 L 6 23.099609 L 9.5 23.099609 C 11.1 20.699609 12.699219 18.399609 14.199219 16.099609 L 14.199219 16 C 13.499219 14.8 12.700391 13.7 11.900391 12.5 C 11.100391 11.4 10.399609 10.199609 9.5996094 9.0996094 L 9.5 9 L 6 9 z M 18.199219 13 L 18.199219 13.099609 C 18.699219 13.899609 19.199219 14.600391 19.699219 15.400391 L 26 15.400391 L 26 13 L 18.199219 13 z M 20.5 16.599609 L 20.5 16.699219 C 21 17.499219 21.5 18.2 22 19 L 26 19 L 26 16.599609 L 20.5 16.599609 z " />
+</svg>

From d60ef81ede7e6511a39dc7f89542d1be5cd760d1 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Mon, 29 Jan 2024 11:58:24 -0500
Subject: [PATCH 034/372] Setup Danger (#6994)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR sets up [Danger](https://danger.systems/js/) to help us codify
some of our PR rules.

As an initial rule, Danger will check to ensure that every PR has a
`Release Notes` section:

<img width="943" alt="Screenshot 2024-01-29 at 11 50 12 AM"
src="https://github.com/zed-industries/zed/assets/1486634/4d56e759-e72f-4bc0-8e74-42c55e2e6888">

Release Notes:

- N/A
---
 .github/workflows/danger.yml |   35 ++
 script/danger/.gitignore     |    1 +
 script/danger/dangerfile.ts  |   27 +
 script/danger/package.json   |   12 +
 script/danger/pnpm-lock.yaml | 1060 ++++++++++++++++++++++++++++++++++
 5 files changed, 1135 insertions(+)
 create mode 100644 .github/workflows/danger.yml
 create mode 100644 script/danger/.gitignore
 create mode 100644 script/danger/dangerfile.ts
 create mode 100644 script/danger/package.json
 create mode 100644 script/danger/pnpm-lock.yaml

diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
new file mode 100644
index 0000000000..92d73171ea
--- /dev/null
+++ b/.github/workflows/danger.yml
@@ -0,0 +1,35 @@
+name: Danger
+
+on:
+  pull_request:
+    branches: [main]
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - edited
+
+jobs:
+  danger:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v2.2.4
+        with:
+          version: 8
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: "pnpm"
+          cache-dependency-path: "script/danger/pnpm-lock.yaml"
+
+      - run: pnpm install --dir script/danger
+
+      - name: Run Danger
+        run: pnpm run --dir script/danger danger ci
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
diff --git a/script/danger/.gitignore b/script/danger/.gitignore
new file mode 100644
index 0000000000..c2658d7d1b
--- /dev/null
+++ b/script/danger/.gitignore
@@ -0,0 +1 @@
+node_modules/
diff --git a/script/danger/dangerfile.ts b/script/danger/dangerfile.ts
new file mode 100644
index 0000000000..e8732fe980
--- /dev/null
+++ b/script/danger/dangerfile.ts
@@ -0,0 +1,27 @@
+import { danger, warn } from "danger";
+
+const RELEASE_NOTES_PATTERN = new RegExp("Release Notes:\\r?\\n\\s+-", "gm");
+
+const hasReleaseNotes = RELEASE_NOTES_PATTERN.test(danger.github.pr.body);
+if (!hasReleaseNotes) {
+  warn(
+    [
+      "This PR is missing release notes.",
+      "",
+      'Please add a "Release Notes" section that describes the change:',
+      "",
+      "```",
+      "Release Notes:",
+      "",
+      "- (Added|Fixed|Improved) ... ([#<public_issue_number_if_exists>](https://github.com/zed-industries/zed/issues/<public_issue_number_if_exists>)).",
+      "```",
+      "",
+      'If your change is not user-facing, you can use "N/A" for the entry:',
+      "```",
+      "Release Notes:",
+      "",
+      "- N/A",
+      "```",
+    ].join("\n"),
+  );
+}
diff --git a/script/danger/package.json b/script/danger/package.json
new file mode 100644
index 0000000000..345088a4d0
--- /dev/null
+++ b/script/danger/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "danger",
+  "version": "1.0.0",
+  "private": true,
+  "main": "index.js",
+  "scripts": {
+    "danger": "danger"
+  },
+  "devDependencies": {
+    "danger": "11.3.1"
+  }
+}
diff --git a/script/danger/pnpm-lock.yaml b/script/danger/pnpm-lock.yaml
new file mode 100644
index 0000000000..778ee7421a
--- /dev/null
+++ b/script/danger/pnpm-lock.yaml
@@ -0,0 +1,1060 @@
+lockfileVersion: '6.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+devDependencies:
+  danger:
+    specifier: 11.3.1
+    version: 11.3.1
+
+packages:
+
+  /@gitbeaker/core@35.8.1:
+    resolution: {integrity: sha512-KBrDykVKSmU9Q9Gly8KeHOgdc0lZSa435srECxuO0FGqqBcUQ82hPqUc13YFkkdOI9T1JRA3qSFajg8ds0mZKA==}
+    engines: {node: '>=14.2.0'}
+    dependencies:
+      '@gitbeaker/requester-utils': 35.8.1
+      form-data: 4.0.0
+      li: 1.3.0
+      mime: 3.0.0
+      query-string: 7.1.3
+      xcase: 2.0.1
+    dev: true
+
+  /@gitbeaker/node@35.8.1:
+    resolution: {integrity: sha512-g6rX853y61qNhzq9cWtxIEoe2KDeFBtXAeWMGWJnc3nz3WRump2pIICvJqw/yobLZqmTNt+ea6w3/n92Mnbn3g==}
+    engines: {node: '>=14.2.0'}
+    deprecated: Please use its successor @gitbeaker/rest
+    dependencies:
+      '@gitbeaker/core': 35.8.1
+      '@gitbeaker/requester-utils': 35.8.1
+      delay: 5.0.0
+      got: 11.8.6
+      xcase: 2.0.1
+    dev: true
+
+  /@gitbeaker/requester-utils@35.8.1:
+    resolution: {integrity: sha512-MFzdH+Z6eJaCZA5ruWsyvm6SXRyrQHjYVR6aY8POFraIy7ceIHOprWCs1R+0ydDZ8KtBnd8OTHjlJ0sLtSFJCg==}
+    engines: {node: '>=14.2.0'}
+    dependencies:
+      form-data: 4.0.0
+      qs: 6.11.2
+      xcase: 2.0.1
+    dev: true
+
+  /@octokit/auth-token@2.5.0:
+    resolution: {integrity: sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==}
+    dependencies:
+      '@octokit/types': 6.41.0
+    dev: true
+
+  /@octokit/core@3.6.0:
+    resolution: {integrity: sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==}
+    dependencies:
+      '@octokit/auth-token': 2.5.0
+      '@octokit/graphql': 4.8.0
+      '@octokit/request': 5.6.3
+      '@octokit/request-error': 2.1.0
+      '@octokit/types': 6.41.0
+      before-after-hook: 2.2.3
+      universal-user-agent: 6.0.1
+    transitivePeerDependencies:
+      - encoding
+    dev: true
+
+  /@octokit/endpoint@6.0.12:
+    resolution: {integrity: sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==}
+    dependencies:
+      '@octokit/types': 6.41.0
+      is-plain-object: 5.0.0
+      universal-user-agent: 6.0.1
+    dev: true
+
+  /@octokit/graphql@4.8.0:
+    resolution: {integrity: sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==}
+    dependencies:
+      '@octokit/request': 5.6.3
+      '@octokit/types': 6.41.0
+      universal-user-agent: 6.0.1
+    transitivePeerDependencies:
+      - encoding
+    dev: true
+
+  /@octokit/openapi-types@12.11.0:
+    resolution: {integrity: sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ==}
+    dev: true
+
+  /@octokit/plugin-paginate-rest@2.21.3(@octokit/core@3.6.0):
+    resolution: {integrity: sha512-aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw==}
+    peerDependencies:
+      '@octokit/core': '>=2'
+    dependencies:
+      '@octokit/core': 3.6.0
+      '@octokit/types': 6.41.0
+    dev: true
+
+  /@octokit/plugin-request-log@1.0.4(@octokit/core@3.6.0):
+    resolution: {integrity: sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==}
+    peerDependencies:
+      '@octokit/core': '>=3'
+    dependencies:
+      '@octokit/core': 3.6.0
+    dev: true
+
+  /@octokit/plugin-rest-endpoint-methods@5.16.2(@octokit/core@3.6.0):
+    resolution: {integrity: sha512-8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw==}
+    peerDependencies:
+      '@octokit/core': '>=3'
+    dependencies:
+      '@octokit/core': 3.6.0
+      '@octokit/types': 6.41.0
+      deprecation: 2.3.1
+    dev: true
+
+  /@octokit/request-error@2.1.0:
+    resolution: {integrity: sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==}
+    dependencies:
+      '@octokit/types': 6.41.0
+      deprecation: 2.3.1
+      once: 1.4.0
+    dev: true
+
+  /@octokit/request@5.6.3:
+    resolution: {integrity: sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==}
+    dependencies:
+      '@octokit/endpoint': 6.0.12
+      '@octokit/request-error': 2.1.0
+      '@octokit/types': 6.41.0
+      is-plain-object: 5.0.0
+      node-fetch: 2.7.0
+      universal-user-agent: 6.0.1
+    transitivePeerDependencies:
+      - encoding
+    dev: true
+
+  /@octokit/rest@18.12.0:
+    resolution: {integrity: sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q==}
+    dependencies:
+      '@octokit/core': 3.6.0
+      '@octokit/plugin-paginate-rest': 2.21.3(@octokit/core@3.6.0)
+      '@octokit/plugin-request-log': 1.0.4(@octokit/core@3.6.0)
+      '@octokit/plugin-rest-endpoint-methods': 5.16.2(@octokit/core@3.6.0)
+    transitivePeerDependencies:
+      - encoding
+    dev: true
+
+  /@octokit/types@6.41.0:
+    resolution: {integrity: sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg==}
+    dependencies:
+      '@octokit/openapi-types': 12.11.0
+    dev: true
+
+  /@sindresorhus/is@4.6.0:
+    resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==}
+    engines: {node: '>=10'}
+    dev: true
+
+  /@szmarczak/http-timer@4.0.6:
+    resolution: {integrity: sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==}
+    engines: {node: '>=10'}
+    dependencies:
+      defer-to-connect: 2.0.1
+    dev: true
+
+  /@tootallnate/once@2.0.0:
+    resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
+    engines: {node: '>= 10'}
+    dev: true
+
+  /@types/cacheable-request@6.0.3:
+    resolution: {integrity: sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==}
+    dependencies:
+      '@types/http-cache-semantics': 4.0.4
+      '@types/keyv': 3.1.4
+      '@types/node': 20.11.10
+      '@types/responselike': 1.0.3
+    dev: true
+
+  /@types/http-cache-semantics@4.0.4:
+    resolution: {integrity: sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==}
+    dev: true
+
+  /@types/keyv@3.1.4:
+    resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==}
+    dependencies:
+      '@types/node': 20.11.10
+    dev: true
+
+  /@types/node@20.11.10:
+    resolution: {integrity: sha512-rZEfe/hJSGYmdfX9tvcPMYeYPW2sNl50nsw4jZmRcaG0HIAb0WYEpsB05GOb53vjqpyE9GUhlDQ4jLSoB5q9kg==}
+    dependencies:
+      undici-types: 5.26.5
+    dev: true
+
+  /@types/responselike@1.0.3:
+    resolution: {integrity: sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==}
+    dependencies:
+      '@types/node': 20.11.10
+    dev: true
+
+  /agent-base@6.0.2:
+    resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
+    engines: {node: '>= 6.0.0'}
+    dependencies:
+      debug: 4.3.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /ansi-styles@3.2.1:
+    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
+    engines: {node: '>=4'}
+    dependencies:
+      color-convert: 1.9.3
+    dev: true
+
+  /async-retry@1.2.3:
+    resolution: {integrity: sha512-tfDb02Th6CE6pJUF2gjW5ZVjsgwlucVXOEQMvEX9JgSJMs9gAX+Nz3xRuJBKuUYjTSYORqvDBORdAQ3LU59g7Q==}
+    dependencies:
+      retry: 0.12.0
+    dev: true
+
+  /asynckit@0.4.0:
+    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
+    dev: true
+
+  /before-after-hook@2.2.3:
+    resolution: {integrity: sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==}
+    dev: true
+
+  /braces@3.0.2:
+    resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
+    engines: {node: '>=8'}
+    dependencies:
+      fill-range: 7.0.1
+    dev: true
+
+  /buffer-equal-constant-time@1.0.1:
+    resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==}
+    dev: true
+
+  /cacheable-lookup@5.0.4:
+    resolution: {integrity: sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==}
+    engines: {node: '>=10.6.0'}
+    dev: true
+
+  /cacheable-request@7.0.4:
+    resolution: {integrity: sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==}
+    engines: {node: '>=8'}
+    dependencies:
+      clone-response: 1.0.3
+      get-stream: 5.2.0
+      http-cache-semantics: 4.1.1
+      keyv: 4.5.4
+      lowercase-keys: 2.0.0
+      normalize-url: 6.1.0
+      responselike: 2.0.1
+    dev: true
+
+  /call-bind@1.0.5:
+    resolution: {integrity: sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==}
+    dependencies:
+      function-bind: 1.1.2
+      get-intrinsic: 1.2.2
+      set-function-length: 1.2.0
+    dev: true
+
+  /chalk@2.4.2:
+    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
+    engines: {node: '>=4'}
+    dependencies:
+      ansi-styles: 3.2.1
+      escape-string-regexp: 1.0.5
+      supports-color: 5.5.0
+    dev: true
+
+  /clone-response@1.0.3:
+    resolution: {integrity: sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==}
+    dependencies:
+      mimic-response: 1.0.1
+    dev: true
+
+  /color-convert@1.9.3:
+    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
+    dependencies:
+      color-name: 1.1.3
+    dev: true
+
+  /color-name@1.1.3:
+    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
+    dev: true
+
+  /colors@1.4.0:
+    resolution: {integrity: sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==}
+    engines: {node: '>=0.1.90'}
+    dev: true
+
+  /combined-stream@1.0.8:
+    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
+    engines: {node: '>= 0.8'}
+    dependencies:
+      delayed-stream: 1.0.0
+    dev: true
+
+  /commander@2.20.3:
+    resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
+    dev: true
+
+  /core-js@3.35.1:
+    resolution: {integrity: sha512-IgdsbxNyMskrTFxa9lWHyMwAJU5gXOPP+1yO+K59d50VLVAIDAbs7gIv705KzALModfK3ZrSZTPNpC0PQgIZuw==}
+    requiresBuild: true
+    dev: true
+
+  /danger@11.3.1:
+    resolution: {integrity: sha512-+slkGnbf0czY7g4LSuYpYkKJgFrb9YIXFJvV5JAuLLF39CXLlUw0iebgeL3ASK1t6RDb8xe+Rk2F5ilh2Hdv2w==}
+    engines: {node: '>=14.13.1'}
+    hasBin: true
+    dependencies:
+      '@gitbeaker/core': 35.8.1
+      '@gitbeaker/node': 35.8.1
+      '@octokit/rest': 18.12.0
+      async-retry: 1.2.3
+      chalk: 2.4.2
+      commander: 2.20.3
+      core-js: 3.35.1
+      debug: 4.3.4
+      fast-json-patch: 3.1.1
+      get-stdin: 6.0.0
+      http-proxy-agent: 5.0.0
+      https-proxy-agent: 5.0.1
+      hyperlinker: 1.0.0
+      json5: 2.2.3
+      jsonpointer: 5.0.1
+      jsonwebtoken: 9.0.2
+      lodash.find: 4.6.0
+      lodash.includes: 4.3.0
+      lodash.isobject: 3.0.2
+      lodash.keys: 4.2.0
+      lodash.mapvalues: 4.6.0
+      lodash.memoize: 4.1.2
+      memfs-or-file-map-to-github-branch: 1.2.1
+      micromatch: 4.0.5
+      node-cleanup: 2.1.2
+      node-fetch: 2.7.0
+      override-require: 1.1.1
+      p-limit: 2.3.0
+      parse-diff: 0.7.1
+      parse-git-config: 2.0.3
+      parse-github-url: 1.0.2
+      parse-link-header: 2.0.0
+      pinpoint: 1.1.0
+      prettyjson: 1.2.5
+      readline-sync: 1.4.10
+      regenerator-runtime: 0.13.11
+      require-from-string: 2.0.2
+      supports-hyperlinks: 1.0.1
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+    dev: true
+
+  /debug@4.3.4:
+    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+    dependencies:
+      ms: 2.1.2
+    dev: true
+
+  /decode-uri-component@0.2.2:
+    resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
+    engines: {node: '>=0.10'}
+    dev: true
+
+  /decompress-response@6.0.0:
+    resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      mimic-response: 3.1.0
+    dev: true
+
+  /defer-to-connect@2.0.1:
+    resolution: {integrity: sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==}
+    engines: {node: '>=10'}
+    dev: true
+
+  /define-data-property@1.1.1:
+    resolution: {integrity: sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      get-intrinsic: 1.2.2
+      gopd: 1.0.1
+      has-property-descriptors: 1.0.1
+    dev: true
+
+  /delay@5.0.0:
+    resolution: {integrity: sha512-ReEBKkIfe4ya47wlPYf/gu5ib6yUG0/Aez0JQZQz94kiWtRQvZIQbTiehsnwHvLSWJnQdhVeqYue7Id1dKr0qw==}
+    engines: {node: '>=10'}
+    dev: true
+
+  /delayed-stream@1.0.0:
+    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
+    engines: {node: '>=0.4.0'}
+    dev: true
+
+  /deprecation@2.3.1:
+    resolution: {integrity: sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==}
+    dev: true
+
+  /ecdsa-sig-formatter@1.0.11:
+    resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==}
+    dependencies:
+      safe-buffer: 5.2.1
+    dev: true
+
+  /end-of-stream@1.4.4:
+    resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
+    dependencies:
+      once: 1.4.0
+    dev: true
+
+  /escape-string-regexp@1.0.5:
+    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
+    engines: {node: '>=0.8.0'}
+    dev: true
+
+  /expand-tilde@2.0.2:
+    resolution: {integrity: sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      homedir-polyfill: 1.0.3
+    dev: true
+
+  /extend-shallow@2.0.1:
+    resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      is-extendable: 0.1.1
+    dev: true
+
+  /fast-json-patch@3.1.1:
+    resolution: {integrity: sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ==}
+    dev: true
+
+  /fill-range@7.0.1:
+    resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      to-regex-range: 5.0.1
+    dev: true
+
+  /filter-obj@1.1.0:
+    resolution: {integrity: sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /form-data@4.0.0:
+    resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
+    engines: {node: '>= 6'}
+    dependencies:
+      asynckit: 0.4.0
+      combined-stream: 1.0.8
+      mime-types: 2.1.35
+    dev: true
+
+  /fs-exists-sync@0.1.0:
+    resolution: {integrity: sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /function-bind@1.1.2:
+    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
+    dev: true
+
+  /get-intrinsic@1.2.2:
+    resolution: {integrity: sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==}
+    dependencies:
+      function-bind: 1.1.2
+      has-proto: 1.0.1
+      has-symbols: 1.0.3
+      hasown: 2.0.0
+    dev: true
+
+  /get-stdin@6.0.0:
+    resolution: {integrity: sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /get-stream@5.2.0:
+    resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
+    engines: {node: '>=8'}
+    dependencies:
+      pump: 3.0.0
+    dev: true
+
+  /git-config-path@1.0.1:
+    resolution: {integrity: sha512-KcJ2dlrrP5DbBnYIZ2nlikALfRhKzNSX0stvv3ImJ+fvC4hXKoV+U+74SV0upg+jlQZbrtQzc0bu6/Zh+7aQbg==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      extend-shallow: 2.0.1
+      fs-exists-sync: 0.1.0
+      homedir-polyfill: 1.0.3
+    dev: true
+
+  /gopd@1.0.1:
+    resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
+    dependencies:
+      get-intrinsic: 1.2.2
+    dev: true
+
+  /got@11.8.6:
+    resolution: {integrity: sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==}
+    engines: {node: '>=10.19.0'}
+    dependencies:
+      '@sindresorhus/is': 4.6.0
+      '@szmarczak/http-timer': 4.0.6
+      '@types/cacheable-request': 6.0.3
+      '@types/responselike': 1.0.3
+      cacheable-lookup: 5.0.4
+      cacheable-request: 7.0.4
+      decompress-response: 6.0.0
+      http2-wrapper: 1.0.3
+      lowercase-keys: 2.0.0
+      p-cancelable: 2.1.1
+      responselike: 2.0.1
+    dev: true
+
+  /has-flag@2.0.0:
+    resolution: {integrity: sha512-P+1n3MnwjR/Epg9BBo1KT8qbye2g2Ou4sFumihwt6I4tsUX7jnLcX4BTOSKg/B1ZrIYMN9FcEnG4x5a7NB8Eng==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /has-flag@3.0.0:
+    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /has-property-descriptors@1.0.1:
+    resolution: {integrity: sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==}
+    dependencies:
+      get-intrinsic: 1.2.2
+    dev: true
+
+  /has-proto@1.0.1:
+    resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
+  /has-symbols@1.0.3:
+    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
+  /hasown@2.0.0:
+    resolution: {integrity: sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      function-bind: 1.1.2
+    dev: true
+
+  /homedir-polyfill@1.0.3:
+    resolution: {integrity: sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      parse-passwd: 1.0.0
+    dev: true
+
+  /http-cache-semantics@4.1.1:
+    resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==}
+    dev: true
+
+  /http-proxy-agent@5.0.0:
+    resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==}
+    engines: {node: '>= 6'}
+    dependencies:
+      '@tootallnate/once': 2.0.0
+      agent-base: 6.0.2
+      debug: 4.3.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /http2-wrapper@1.0.3:
+    resolution: {integrity: sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==}
+    engines: {node: '>=10.19.0'}
+    dependencies:
+      quick-lru: 5.1.1
+      resolve-alpn: 1.2.1
+    dev: true
+
+  /https-proxy-agent@5.0.1:
+    resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
+    engines: {node: '>= 6'}
+    dependencies:
+      agent-base: 6.0.2
+      debug: 4.3.4
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /hyperlinker@1.0.0:
+    resolution: {integrity: sha512-Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /ini@1.3.8:
+    resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
+    dev: true
+
+  /is-extendable@0.1.1:
+    resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /is-number@7.0.0:
+    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
+    engines: {node: '>=0.12.0'}
+    dev: true
+
+  /is-plain-object@5.0.0:
+    resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /json-buffer@3.0.1:
+    resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
+    dev: true
+
+  /json5@2.2.3:
+    resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
+    engines: {node: '>=6'}
+    hasBin: true
+    dev: true
+
+  /jsonpointer@5.0.1:
+    resolution: {integrity: sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /jsonwebtoken@9.0.2:
+    resolution: {integrity: sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==}
+    engines: {node: '>=12', npm: '>=6'}
+    dependencies:
+      jws: 3.2.2
+      lodash.includes: 4.3.0
+      lodash.isboolean: 3.0.3
+      lodash.isinteger: 4.0.4
+      lodash.isnumber: 3.0.3
+      lodash.isplainobject: 4.0.6
+      lodash.isstring: 4.0.1
+      lodash.once: 4.1.1
+      ms: 2.1.3
+      semver: 7.5.4
+    dev: true
+
+  /jwa@1.4.1:
+    resolution: {integrity: sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==}
+    dependencies:
+      buffer-equal-constant-time: 1.0.1
+      ecdsa-sig-formatter: 1.0.11
+      safe-buffer: 5.2.1
+    dev: true
+
+  /jws@3.2.2:
+    resolution: {integrity: sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==}
+    dependencies:
+      jwa: 1.4.1
+      safe-buffer: 5.2.1
+    dev: true
+
+  /keyv@4.5.4:
+    resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
+    dependencies:
+      json-buffer: 3.0.1
+    dev: true
+
+  /li@1.3.0:
+    resolution: {integrity: sha512-z34TU6GlMram52Tss5mt1m//ifRIpKH5Dqm7yUVOdHI+BQCs9qGPHFaCUTIzsWX7edN30aa2WrPwR7IO10FHaw==}
+    dev: true
+
+  /lodash.find@4.6.0:
+    resolution: {integrity: sha512-yaRZoAV3Xq28F1iafWN1+a0rflOej93l1DQUejs3SZ41h2O9UJBoS9aueGjPDgAl4B6tPC0NuuchLKaDQQ3Isg==}
+    dev: true
+
+  /lodash.includes@4.3.0:
+    resolution: {integrity: sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==}
+    dev: true
+
+  /lodash.isboolean@3.0.3:
+    resolution: {integrity: sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==}
+    dev: true
+
+  /lodash.isinteger@4.0.4:
+    resolution: {integrity: sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==}
+    dev: true
+
+  /lodash.isnumber@3.0.3:
+    resolution: {integrity: sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==}
+    dev: true
+
+  /lodash.isobject@3.0.2:
+    resolution: {integrity: sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA==}
+    dev: true
+
+  /lodash.isplainobject@4.0.6:
+    resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
+    dev: true
+
+  /lodash.isstring@4.0.1:
+    resolution: {integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==}
+    dev: true
+
+  /lodash.keys@4.2.0:
+    resolution: {integrity: sha512-J79MkJcp7Df5mizHiVNpjoHXLi4HLjh9VLS/M7lQSGoQ+0oQ+lWEigREkqKyizPB1IawvQLLKY8mzEcm1tkyxQ==}
+    dev: true
+
+  /lodash.mapvalues@4.6.0:
+    resolution: {integrity: sha512-JPFqXFeZQ7BfS00H58kClY7SPVeHertPE0lNuCyZ26/XlN8TvakYD7b9bGyNmXbT/D3BbtPAAmq90gPWqLkxlQ==}
+    dev: true
+
+  /lodash.memoize@4.1.2:
+    resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
+    dev: true
+
+  /lodash.once@4.1.1:
+    resolution: {integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==}
+    dev: true
+
+  /lowercase-keys@2.0.0:
+    resolution: {integrity: sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==}
+    engines: {node: '>=8'}
+    dev: true
+
+  /lru-cache@6.0.0:
+    resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
+    engines: {node: '>=10'}
+    dependencies:
+      yallist: 4.0.0
+    dev: true
+
+  /memfs-or-file-map-to-github-branch@1.2.1:
+    resolution: {integrity: sha512-I/hQzJ2a/pCGR8fkSQ9l5Yx+FQ4e7X6blNHyWBm2ojeFLT3GVzGkTj7xnyWpdclrr7Nq4dmx3xrvu70m3ypzAQ==}
+    dependencies:
+      '@octokit/rest': 18.12.0
+    transitivePeerDependencies:
+      - encoding
+    dev: true
+
+  /micromatch@4.0.5:
+    resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
+    engines: {node: '>=8.6'}
+    dependencies:
+      braces: 3.0.2
+      picomatch: 2.3.1
+    dev: true
+
+  /mime-db@1.52.0:
+    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
+    engines: {node: '>= 0.6'}
+    dev: true
+
+  /mime-types@2.1.35:
+    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
+    engines: {node: '>= 0.6'}
+    dependencies:
+      mime-db: 1.52.0
+    dev: true
+
+  /mime@3.0.0:
+    resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==}
+    engines: {node: '>=10.0.0'}
+    hasBin: true
+    dev: true
+
+  /mimic-response@1.0.1:
+    resolution: {integrity: sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /mimic-response@3.1.0:
+    resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
+    engines: {node: '>=10'}
+    dev: true
+
+  /minimist@1.2.8:
+    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
+    dev: true
+
+  /ms@2.1.2:
+    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
+    dev: true
+
+  /ms@2.1.3:
+    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
+    dev: true
+
+  /node-cleanup@2.1.2:
+    resolution: {integrity: sha512-qN8v/s2PAJwGUtr1/hYTpNKlD6Y9rc4p8KSmJXyGdYGZsDGKXrGThikLFP9OCHFeLeEpQzPwiAtdIvBLqm//Hw==}
+    dev: true
+
+  /node-fetch@2.7.0:
+    resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==}
+    engines: {node: 4.x || >=6.0.0}
+    peerDependencies:
+      encoding: ^0.1.0
+    peerDependenciesMeta:
+      encoding:
+        optional: true
+    dependencies:
+      whatwg-url: 5.0.0
+    dev: true
+
+  /normalize-url@6.1.0:
+    resolution: {integrity: sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==}
+    engines: {node: '>=10'}
+    dev: true
+
+  /object-inspect@1.13.1:
+    resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==}
+    dev: true
+
+  /once@1.4.0:
+    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
+    dependencies:
+      wrappy: 1.0.2
+    dev: true
+
+  /override-require@1.1.1:
+    resolution: {integrity: sha512-eoJ9YWxFcXbrn2U8FKT6RV+/Kj7fiGAB1VvHzbYKt8xM5ZuKZgCGvnHzDxmreEjcBH28ejg5MiOH4iyY1mQnkg==}
+    dev: true
+
+  /p-cancelable@2.1.1:
+    resolution: {integrity: sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==}
+    engines: {node: '>=8'}
+    dev: true
+
+  /p-limit@2.3.0:
+    resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
+    engines: {node: '>=6'}
+    dependencies:
+      p-try: 2.2.0
+    dev: true
+
+  /p-try@2.2.0:
+    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
+    engines: {node: '>=6'}
+    dev: true
+
+  /parse-diff@0.7.1:
+    resolution: {integrity: sha512-1j3l8IKcy4yRK2W4o9EYvJLSzpAVwz4DXqCewYyx2vEwk2gcf3DBPqc8Fj4XV3K33OYJ08A8fWwyu/ykD/HUSg==}
+    dev: true
+
+  /parse-git-config@2.0.3:
+    resolution: {integrity: sha512-Js7ueMZOVSZ3tP8C7E3KZiHv6QQl7lnJ+OkbxoaFazzSa2KyEHqApfGbU3XboUgUnq4ZuUmskUpYKTNx01fm5A==}
+    engines: {node: '>=6'}
+    dependencies:
+      expand-tilde: 2.0.2
+      git-config-path: 1.0.1
+      ini: 1.3.8
+    dev: true
+
+  /parse-github-url@1.0.2:
+    resolution: {integrity: sha512-kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw==}
+    engines: {node: '>=0.10.0'}
+    hasBin: true
+    dev: true
+
+  /parse-link-header@2.0.0:
+    resolution: {integrity: sha512-xjU87V0VyHZybn2RrCX5TIFGxTVZE6zqqZWMPlIKiSKuWh/X5WZdt+w1Ki1nXB+8L/KtL+nZ4iq+sfI6MrhhMw==}
+    dependencies:
+      xtend: 4.0.2
+    dev: true
+
+  /parse-passwd@1.0.0:
+    resolution: {integrity: sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /picomatch@2.3.1:
+    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
+    engines: {node: '>=8.6'}
+    dev: true
+
+  /pinpoint@1.1.0:
+    resolution: {integrity: sha512-+04FTD9x7Cls2rihLlo57QDCcHoLBGn5Dk51SwtFBWkUWLxZaBXyNVpCw1S+atvE7GmnFjeaRZ0WLq3UYuqAdg==}
+    dev: true
+
+  /prettyjson@1.2.5:
+    resolution: {integrity: sha512-rksPWtoZb2ZpT5OVgtmy0KHVM+Dca3iVwWY9ifwhcexfjebtgjg3wmrUt9PvJ59XIYBcknQeYHD8IAnVlh9lAw==}
+    hasBin: true
+    dependencies:
+      colors: 1.4.0
+      minimist: 1.2.8
+    dev: true
+
+  /pump@3.0.0:
+    resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==}
+    dependencies:
+      end-of-stream: 1.4.4
+      once: 1.4.0
+    dev: true
+
+  /qs@6.11.2:
+    resolution: {integrity: sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==}
+    engines: {node: '>=0.6'}
+    dependencies:
+      side-channel: 1.0.4
+    dev: true
+
+  /query-string@7.1.3:
+    resolution: {integrity: sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg==}
+    engines: {node: '>=6'}
+    dependencies:
+      decode-uri-component: 0.2.2
+      filter-obj: 1.1.0
+      split-on-first: 1.1.0
+      strict-uri-encode: 2.0.0
+    dev: true
+
+  /quick-lru@5.1.1:
+    resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==}
+    engines: {node: '>=10'}
+    dev: true
+
+  /readline-sync@1.4.10:
+    resolution: {integrity: sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw==}
+    engines: {node: '>= 0.8.0'}
+    dev: true
+
+  /regenerator-runtime@0.13.11:
+    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+    dev: true
+
+  /require-from-string@2.0.2:
+    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
+  /resolve-alpn@1.2.1:
+    resolution: {integrity: sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==}
+    dev: true
+
+  /responselike@2.0.1:
+    resolution: {integrity: sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==}
+    dependencies:
+      lowercase-keys: 2.0.0
+    dev: true
+
+  /retry@0.12.0:
+    resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==}
+    engines: {node: '>= 4'}
+    dev: true
+
+  /safe-buffer@5.2.1:
+    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
+    dev: true
+
+  /semver@7.5.4:
+    resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dependencies:
+      lru-cache: 6.0.0
+    dev: true
+
+  /set-function-length@1.2.0:
+    resolution: {integrity: sha512-4DBHDoyHlM1IRPGYcoxexgh67y4ueR53FKV1yyxwFMY7aCqcN/38M1+SwZ/qJQ8iLv7+ck385ot4CcisOAPT9w==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      define-data-property: 1.1.1
+      function-bind: 1.1.2
+      get-intrinsic: 1.2.2
+      gopd: 1.0.1
+      has-property-descriptors: 1.0.1
+    dev: true
+
+  /side-channel@1.0.4:
+    resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
+    dependencies:
+      call-bind: 1.0.5
+      get-intrinsic: 1.2.2
+      object-inspect: 1.13.1
+    dev: true
+
+  /split-on-first@1.1.0:
+    resolution: {integrity: sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==}
+    engines: {node: '>=6'}
+    dev: true
+
+  /strict-uri-encode@2.0.0:
+    resolution: {integrity: sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /supports-color@5.5.0:
+    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
+    engines: {node: '>=4'}
+    dependencies:
+      has-flag: 3.0.0
+    dev: true
+
+  /supports-hyperlinks@1.0.1:
+    resolution: {integrity: sha512-HHi5kVSefKaJkGYXbDuKbUGRVxqnWGn3J2e39CYcNJEfWciGq2zYtOhXLTlvrOZW1QU7VX67w7fMmWafHX9Pfw==}
+    engines: {node: '>=4'}
+    dependencies:
+      has-flag: 2.0.0
+      supports-color: 5.5.0
+    dev: true
+
+  /to-regex-range@5.0.1:
+    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
+    engines: {node: '>=8.0'}
+    dependencies:
+      is-number: 7.0.0
+    dev: true
+
+  /tr46@0.0.3:
+    resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
+    dev: true
+
+  /undici-types@5.26.5:
+    resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
+    dev: true
+
+  /universal-user-agent@6.0.1:
+    resolution: {integrity: sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==}
+    dev: true
+
+  /webidl-conversions@3.0.1:
+    resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
+    dev: true
+
+  /whatwg-url@5.0.0:
+    resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
+    dependencies:
+      tr46: 0.0.3
+      webidl-conversions: 3.0.1
+    dev: true
+
+  /wrappy@1.0.2:
+    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
+    dev: true
+
+  /xcase@2.0.1:
+    resolution: {integrity: sha512-UmFXIPU+9Eg3E9m/728Bii0lAIuoc+6nbrNUKaRPJOFp91ih44qqGlWtxMB6kXFrRD6po+86ksHM5XHCfk6iPw==}
+    dev: true
+
+  /xtend@4.0.2:
+    resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
+    engines: {node: '>=0.4'}
+    dev: true
+
+  /yallist@4.0.0:
+    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
+    dev: true

From 849a1324f70f1a600cdafa446a5e0bd74046c599 Mon Sep 17 00:00:00 2001
From: Julia <floc@unpromptedtirade.com>
Date: Tue, 23 Jan 2024 16:25:10 -0500
Subject: [PATCH 035/372] Fix hovering over elements nested inside their
 parents

Co-Authored-By: Conrad Irwin <conrad@zed.dev>
---
 crates/collab_ui/src/collab_panel.rs |  2 --
 crates/gpui/src/window.rs            | 34 +++++++++++++---------------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index ac7ac8cabc..8037132640 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -2496,8 +2496,6 @@ impl CollabPanel {
                     .absolute()
                     .right(rems(0.))
                     .h_full()
-                    // HACK: Without this the channel name clips on top of the icons, but I'm not sure why.
-                    .z_index(10)
                     .child(
                         h_flex()
                             .h_full()
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 618c7eb4e4..3688b27552 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -859,15 +859,14 @@ impl<'a> WindowContext<'a> {
 
             // At this point, we've established that this opaque layer is on top of the queried layer
             // and contains the position:
-            // - If the opaque layer is an extension of the queried layer, we don't want
-            // to consider the opaque layer to be on top and so we ignore it.
-            // - Else, we will bail early and say that the queried layer wasn't the top one.
-            let opaque_layer_is_extension_of_queried_layer = opaque_layer.len() >= layer.len()
-                && opaque_layer
-                    .iter()
-                    .zip(layer.iter())
-                    .all(|(a, b)| a.z_index == b.z_index);
-            if !opaque_layer_is_extension_of_queried_layer {
+            // If neither the opaque layer or the queried layer is an extension of the other then
+            // we know they are on different stacking orders, and return false.
+            let is_on_same_layer = opaque_layer
+                .iter()
+                .zip(layer.iter())
+                .all(|(a, b)| a.z_index == b.z_index);
+
+            if !is_on_same_layer {
                 return false;
             }
         }
@@ -908,15 +907,14 @@ impl<'a> WindowContext<'a> {
 
             // At this point, we've established that this opaque layer is on top of the queried layer
             // and contains the position:
-            // - If the opaque layer is an extension of the queried layer, we don't want
-            // to consider the opaque layer to be on top and so we ignore it.
-            // - Else, we will bail early and say that the queried layer wasn't the top one.
-            let opaque_layer_is_extension_of_queried_layer = opaque_layer.len() >= layer.len()
-                && opaque_layer
-                    .iter()
-                    .zip(layer.iter())
-                    .all(|(a, b)| a.z_index == b.z_index);
-            if !opaque_layer_is_extension_of_queried_layer {
+            // If neither the opaque layer or the queried layer is an extension of the other then
+            // we know they are on different stacking orders, and return false.
+            let is_on_same_layer = opaque_layer
+                .iter()
+                .zip(layer.iter())
+                .all(|(a, b)| a.z_index == b.z_index);
+
+            if !is_on_same_layer {
                 return false;
             }
         }

From 941e838be9d1bbc6ffd12ff3d1b65e23c737da0d Mon Sep 17 00:00:00 2001
From: Julia <floc@unpromptedtirade.com>
Date: Mon, 29 Jan 2024 11:49:57 -0500
Subject: [PATCH 036/372] Prevent z-index id shuffle when number of z-indicies
 in the scene change

---
 crates/collab_ui/src/collab_panel.rs |  1 +
 crates/gpui/src/view.rs              |  8 ++++-
 crates/gpui/src/window/element_cx.rs | 45 ++++++++++++++++++++++------
 3 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index 8037132640..e9cd02620f 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -2495,6 +2495,7 @@ impl CollabPanel {
                 h_flex()
                     .absolute()
                     .right(rems(0.))
+                    .z_index(1)
                     .h_full()
                     .child(
                         h_flex()
diff --git a/crates/gpui/src/view.rs b/crates/gpui/src/view.rs
index 47f2809038..d171cada4e 100644
--- a/crates/gpui/src/view.rs
+++ b/crates/gpui/src/view.rs
@@ -328,7 +328,13 @@ impl Element for AnyView {
                 element.draw(bounds.origin, bounds.size.into(), cx);
             }
 
-            state.next_stacking_order_id = cx.window.next_frame.next_stacking_order_id;
+            state.next_stacking_order_id = cx
+                .window
+                .next_frame
+                .next_stacking_order_ids
+                .last()
+                .copied()
+                .unwrap();
             state.cache_key = Some(ViewCacheKey {
                 bounds,
                 stacking_order: cx.stacking_order().clone(),
diff --git a/crates/gpui/src/window/element_cx.rs b/crates/gpui/src/window/element_cx.rs
index 145597b039..c7814fc101 100644
--- a/crates/gpui/src/window/element_cx.rs
+++ b/crates/gpui/src/window/element_cx.rs
@@ -59,7 +59,7 @@ pub(crate) struct Frame {
     pub(crate) scene: Scene,
     pub(crate) depth_map: Vec<(StackingOrder, EntityId, Bounds<Pixels>)>,
     pub(crate) z_index_stack: StackingOrder,
-    pub(crate) next_stacking_order_id: u16,
+    pub(crate) next_stacking_order_ids: Vec<u16>,
     pub(crate) next_root_z_index: u16,
     pub(crate) content_mask_stack: Vec<ContentMask<Pixels>>,
     pub(crate) element_offset_stack: Vec<Point<Pixels>>,
@@ -85,7 +85,7 @@ impl Frame {
             scene: Scene::default(),
             depth_map: Vec::new(),
             z_index_stack: StackingOrder::default(),
-            next_stacking_order_id: 0,
+            next_stacking_order_ids: vec![0],
             next_root_z_index: 0,
             content_mask_stack: Vec::new(),
             element_offset_stack: Vec::new(),
@@ -106,7 +106,7 @@ impl Frame {
         self.mouse_listeners.values_mut().for_each(Vec::clear);
         self.dispatch_tree.clear();
         self.depth_map.clear();
-        self.next_stacking_order_id = 0;
+        self.next_stacking_order_ids = vec![0];
         self.next_root_z_index = 0;
         self.reused_views.clear();
         self.scene.clear();
@@ -351,8 +351,22 @@ impl<'a> ElementContext<'a> {
             }
         }
 
-        debug_assert!(next_stacking_order_id >= self.window.next_frame.next_stacking_order_id);
-        self.window.next_frame.next_stacking_order_id = next_stacking_order_id;
+        debug_assert!(
+            next_stacking_order_id
+                >= self
+                    .window
+                    .next_frame
+                    .next_stacking_order_ids
+                    .last()
+                    .copied()
+                    .unwrap()
+        );
+        *self
+            .window
+            .next_frame
+            .next_stacking_order_ids
+            .last_mut()
+            .unwrap() = next_stacking_order_id;
     }
 
     /// Push a text style onto the stack, and call a function with that style active.
@@ -434,8 +448,13 @@ impl<'a> ElementContext<'a> {
         };
 
         let new_root_z_index = post_inc(&mut self.window_mut().next_frame.next_root_z_index);
-        let new_stacking_order_id =
-            post_inc(&mut self.window_mut().next_frame.next_stacking_order_id);
+        let new_stacking_order_id = post_inc(
+            self.window_mut()
+                .next_frame
+                .next_stacking_order_ids
+                .last_mut()
+                .unwrap(),
+        );
         let new_context = StackingContext {
             z_index: new_root_z_index,
             id: new_stacking_order_id,
@@ -455,8 +474,14 @@ impl<'a> ElementContext<'a> {
     /// Called during painting to invoke the given closure in a new stacking context. The given
     /// z-index is interpreted relative to the previous call to `stack`.
     pub fn with_z_index<R>(&mut self, z_index: u16, f: impl FnOnce(&mut Self) -> R) -> R {
-        let new_stacking_order_id =
-            post_inc(&mut self.window_mut().next_frame.next_stacking_order_id);
+        let new_stacking_order_id = post_inc(
+            self.window_mut()
+                .next_frame
+                .next_stacking_order_ids
+                .last_mut()
+                .unwrap(),
+        );
+        self.window_mut().next_frame.next_stacking_order_ids.push(0);
         let new_context = StackingContext {
             z_index,
             id: new_stacking_order_id,
@@ -466,6 +491,8 @@ impl<'a> ElementContext<'a> {
         let result = f(self);
         self.window_mut().next_frame.z_index_stack.pop();
 
+        self.window_mut().next_frame.next_stacking_order_ids.pop();
+
         result
     }
 

From 5ab715aac949c8d14dc6142bed6d5698ebbb0985 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Sun, 28 Jan 2024 21:05:08 +0100
Subject: [PATCH 037/372] text: Wrap BufferId into a newtype

---
 crates/assistant/src/assistant_panel.rs       |  10 +-
 crates/assistant/src/codegen.rs               |  19 +-
 crates/assistant/src/prompts.rs               |   9 +-
 crates/channel/src/channel_buffer.rs          |  14 +-
 crates/collab/src/db/queries/buffers.rs       |   2 +-
 crates/collab/src/db/tests/buffer_tests.rs    |  16 +-
 crates/copilot/src/copilot.rs                 |  15 +-
 crates/editor/src/display_map.rs              |  10 +-
 crates/editor/src/editor.rs                   |  26 ++-
 crates/editor/src/editor_tests.rs             | 105 +++++++---
 crates/editor/src/inlay_hint_cache.rs         |   8 +-
 crates/editor/src/items.rs                    |  43 ++--
 crates/editor/src/movement.rs                 |  10 +-
 crates/git/src/diff.rs                        |   6 +-
 crates/language/src/buffer.rs                 |  22 ++-
 crates/language/src/buffer_tests.rs           | 140 +++++++------
 crates/language/src/proto.rs                  |   9 +-
 .../src/syntax_map/syntax_map_tests.rs        |  10 +-
 crates/multi_buffer/src/anchor.rs             |   3 +-
 crates/multi_buffer/src/multi_buffer.rs       | 148 ++++++++++----
 crates/project/src/lsp_command.rs             |  89 +++++----
 crates/project/src/lsp_ext_command.rs         |  10 +-
 crates/project/src/project.rs                 | 187 ++++++++++--------
 crates/project/src/worktree.rs                |  11 +-
 crates/project/src/worktree_tests.rs          |  17 +-
 crates/search/src/buffer_search.rs            |  20 +-
 crates/text/src/anchor.rs                     |   6 +-
 crates/text/src/tests.rs                      |  40 ++--
 crates/text/src/text.rs                       |  40 +++-
 crates/vim/src/editor_events.rs               |   6 +-
 crates/zed/src/languages/c.rs                 |   5 +-
 crates/zed/src/languages/python.rs            |   5 +-
 crates/zed/src/languages/rust.rs              |   5 +-
 crates/zed/src/languages/typescript.rs        |   4 +-
 34 files changed, 687 insertions(+), 383 deletions(-)

diff --git a/crates/assistant/src/assistant_panel.rs b/crates/assistant/src/assistant_panel.rs
index 9e21248a1d..e04077d64e 100644
--- a/crates/assistant/src/assistant_panel.rs
+++ b/crates/assistant/src/assistant_panel.rs
@@ -35,7 +35,7 @@ use gpui::{
     StatefulInteractiveElement, Styled, Subscription, Task, TextStyle, UniformListScrollHandle,
     View, ViewContext, VisualContext, WeakModel, WeakView, WhiteSpace, WindowContext,
 };
-use language::{language_settings::SoftWrap, Buffer, LanguageRegistry, ToOffset as _};
+use language::{language_settings::SoftWrap, Buffer, BufferId, LanguageRegistry, ToOffset as _};
 use project::Project;
 use search::{buffer_search::DivRegistrar, BufferSearchBar};
 use semantic_index::{SemanticIndex, SemanticIndexStatus};
@@ -1414,7 +1414,7 @@ impl Conversation {
     ) -> Self {
         let markdown = language_registry.language_for_name("Markdown");
         let buffer = cx.new_model(|cx| {
-            let mut buffer = Buffer::new(0, cx.entity_id().as_u64(), "");
+            let mut buffer = Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), "");
             buffer.set_language_registry(language_registry);
             cx.spawn(|buffer, mut cx| async move {
                 let markdown = markdown.await?;
@@ -1515,7 +1515,11 @@ impl Conversation {
         let mut message_anchors = Vec::new();
         let mut next_message_id = MessageId(0);
         let buffer = cx.new_model(|cx| {
-            let mut buffer = Buffer::new(0, cx.entity_id().as_u64(), saved_conversation.text);
+            let mut buffer = Buffer::new(
+                0,
+                BufferId::new(cx.entity_id().as_u64()).unwrap(),
+                saved_conversation.text,
+            );
             for message in saved_conversation.messages {
                 message_anchors.push(MessageAnchor {
                     id: message.id,
diff --git a/crates/assistant/src/codegen.rs b/crates/assistant/src/codegen.rs
index 8af3010f40..d592ce88ae 100644
--- a/crates/assistant/src/codegen.rs
+++ b/crates/assistant/src/codegen.rs
@@ -365,7 +365,9 @@ mod tests {
     use futures::stream::{self};
     use gpui::{Context, TestAppContext};
     use indoc::indoc;
-    use language::{language_settings, tree_sitter_rust, Buffer, Language, LanguageConfig, Point};
+    use language::{
+        language_settings, tree_sitter_rust, Buffer, BufferId, Language, LanguageConfig, Point,
+    };
     use rand::prelude::*;
     use serde::Serialize;
     use settings::SettingsStore;
@@ -394,8 +396,9 @@ mod tests {
                 }
             }
         "};
-        let buffer =
-            cx.new_model(|cx| Buffer::new(0, 0, text).with_language(Arc::new(rust_lang()), cx));
+        let buffer = cx.new_model(|cx| {
+            Buffer::new(0, BufferId::new(1).unwrap(), text).with_language(Arc::new(rust_lang()), cx)
+        });
         let buffer = cx.new_model(|cx| MultiBuffer::singleton(buffer, cx));
         let range = buffer.read_with(cx, |buffer, cx| {
             let snapshot = buffer.snapshot(cx);
@@ -460,8 +463,9 @@ mod tests {
                 le
             }
         "};
-        let buffer =
-            cx.new_model(|cx| Buffer::new(0, 0, text).with_language(Arc::new(rust_lang()), cx));
+        let buffer = cx.new_model(|cx| {
+            Buffer::new(0, BufferId::new(1).unwrap(), text).with_language(Arc::new(rust_lang()), cx)
+        });
         let buffer = cx.new_model(|cx| MultiBuffer::singleton(buffer, cx));
         let position = buffer.read_with(cx, |buffer, cx| {
             let snapshot = buffer.snapshot(cx);
@@ -525,8 +529,9 @@ mod tests {
             "  \n",
             "}\n" //
         );
-        let buffer =
-            cx.new_model(|cx| Buffer::new(0, 0, text).with_language(Arc::new(rust_lang()), cx));
+        let buffer = cx.new_model(|cx| {
+            Buffer::new(0, BufferId::new(1).unwrap(), text).with_language(Arc::new(rust_lang()), cx)
+        });
         let buffer = cx.new_model(|cx| MultiBuffer::singleton(buffer, cx));
         let position = buffer.read_with(cx, |buffer, cx| {
             let snapshot = buffer.snapshot(cx);
diff --git a/crates/assistant/src/prompts.rs b/crates/assistant/src/prompts.rs
index c9614a4851..9042fda5be 100644
--- a/crates/assistant/src/prompts.rs
+++ b/crates/assistant/src/prompts.rs
@@ -178,7 +178,9 @@ pub(crate) mod tests {
 
     use gpui::{AppContext, Context};
     use indoc::indoc;
-    use language::{language_settings, tree_sitter_rust, Buffer, Language, LanguageConfig, Point};
+    use language::{
+        language_settings, tree_sitter_rust, Buffer, BufferId, Language, LanguageConfig, Point,
+    };
     use settings::SettingsStore;
 
     pub(crate) fn rust_lang() -> Language {
@@ -253,8 +255,9 @@ pub(crate) mod tests {
                 }
             }
         "};
-        let buffer =
-            cx.new_model(|cx| Buffer::new(0, 0, text).with_language(Arc::new(rust_lang()), cx));
+        let buffer = cx.new_model(|cx| {
+            Buffer::new(0, BufferId::new(1).unwrap(), text).with_language(Arc::new(rust_lang()), cx)
+        });
         let snapshot = buffer.read(cx).snapshot();
 
         assert_eq!(
diff --git a/crates/channel/src/channel_buffer.rs b/crates/channel/src/channel_buffer.rs
index e87954edf6..dc63c55d15 100644
--- a/crates/channel/src/channel_buffer.rs
+++ b/crates/channel/src/channel_buffer.rs
@@ -9,6 +9,7 @@ use rpc::{
     TypedEnvelope,
 };
 use std::{sync::Arc, time::Duration};
+use text::BufferId;
 use util::ResultExt;
 
 pub const ACKNOWLEDGE_DEBOUNCE_INTERVAL: Duration = Duration::from_millis(250);
@@ -53,7 +54,7 @@ impl ChannelBuffer {
                 channel_id: channel.id,
             })
             .await?;
-
+        let buffer_id = BufferId::new(response.buffer_id)?;
         let base_text = response.base_text;
         let operations = response
             .operations
@@ -63,12 +64,7 @@ impl ChannelBuffer {
 
         let buffer = cx.new_model(|cx| {
             let capability = channel_store.read(cx).channel_capability(channel.id);
-            language::Buffer::remote(
-                response.buffer_id,
-                response.replica_id as u16,
-                capability,
-                base_text,
-            )
+            language::Buffer::remote(buffer_id, response.replica_id as u16, capability, base_text)
         })?;
         buffer.update(&mut cx, |buffer, cx| buffer.apply_ops(operations, cx))??;
 
@@ -107,7 +103,7 @@ impl ChannelBuffer {
         }
     }
 
-    pub fn remote_id(&self, cx: &AppContext) -> u64 {
+    pub fn remote_id(&self, cx: &AppContext) -> BufferId {
         self.buffer.read(cx).remote_id()
     }
 
@@ -210,7 +206,7 @@ impl ChannelBuffer {
     pub fn acknowledge_buffer_version(&mut self, cx: &mut ModelContext<'_, ChannelBuffer>) {
         let buffer = self.buffer.read(cx);
         let version = buffer.version();
-        let buffer_id = buffer.remote_id();
+        let buffer_id = buffer.remote_id().into();
         let client = self.client.clone();
         let epoch = self.epoch();
 
diff --git a/crates/collab/src/db/queries/buffers.rs b/crates/collab/src/db/queries/buffers.rs
index 59b8f8d01f..b42e26e465 100644
--- a/crates/collab/src/db/queries/buffers.rs
+++ b/crates/collab/src/db/queries/buffers.rs
@@ -693,7 +693,7 @@ impl Database {
             return Ok(());
         }
 
-        let mut text_buffer = text::Buffer::new(0, 0, base_text);
+        let mut text_buffer = text::Buffer::new(0, text::BufferId::new(1).unwrap(), base_text);
         text_buffer
             .apply_ops(operations.into_iter().filter_map(operation_from_wire))
             .unwrap();
diff --git a/crates/collab/src/db/tests/buffer_tests.rs b/crates/collab/src/db/tests/buffer_tests.rs
index 2eb8e15301..0d7438b517 100644
--- a/crates/collab/src/db/tests/buffer_tests.rs
+++ b/crates/collab/src/db/tests/buffer_tests.rs
@@ -67,7 +67,7 @@ async fn test_channel_buffers(db: &Arc<Database>) {
         .await
         .unwrap();
 
-    let mut buffer_a = Buffer::new(0, 0, "".to_string());
+    let mut buffer_a = Buffer::new(0, text::BufferId::new(0).unwrap(), "".to_string());
     let mut operations = Vec::new();
     operations.push(buffer_a.edit([(0..0, "hello world")]));
     operations.push(buffer_a.edit([(5..5, ", cruel")]));
@@ -90,7 +90,11 @@ async fn test_channel_buffers(db: &Arc<Database>) {
         .await
         .unwrap();
 
-    let mut buffer_b = Buffer::new(0, 0, buffer_response_b.base_text);
+    let mut buffer_b = Buffer::new(
+        0,
+        text::BufferId::new(0).unwrap(),
+        buffer_response_b.base_text,
+    );
     buffer_b
         .apply_ops(buffer_response_b.operations.into_iter().map(|operation| {
             let operation = proto::deserialize_operation(operation).unwrap();
@@ -223,7 +227,11 @@ async fn test_channel_buffers_last_operations(db: &Database) {
                 .unwrap(),
         );
 
-        text_buffers.push(Buffer::new(0, 0, "".to_string()));
+        text_buffers.push(Buffer::new(
+            0,
+            text::BufferId::new(1).unwrap(),
+            "".to_string(),
+        ));
     }
 
     let operations = db
@@ -270,7 +278,7 @@ async fn test_channel_buffers_last_operations(db: &Database) {
     db.join_channel_buffer(buffers[1].channel_id, user_id, connection_id)
         .await
         .unwrap();
-    text_buffers[1] = Buffer::new(1, 0, "def".to_string());
+    text_buffers[1] = Buffer::new(1, text::BufferId::new(1).unwrap(), "def".to_string());
     update_buffer(
         buffers[1].channel_id,
         user_id,
diff --git a/crates/copilot/src/copilot.rs b/crates/copilot/src/copilot.rs
index 6345bdb794..6b2816b6f3 100644
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -1023,12 +1023,15 @@ async fn get_copilot_lsp(http: Arc<dyn HttpClient>) -> anyhow::Result<PathBuf> {
 mod tests {
     use super::*;
     use gpui::TestAppContext;
+    use language::BufferId;
 
     #[gpui::test(iterations = 10)]
     async fn test_buffer_management(cx: &mut TestAppContext) {
         let (copilot, mut lsp) = Copilot::fake(cx);
 
-        let buffer_1 = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), "Hello"));
+        let buffer_1 = cx.new_model(|cx| {
+            Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), "Hello")
+        });
         let buffer_1_uri: lsp::Url = format!("buffer://{}", buffer_1.entity_id().as_u64())
             .parse()
             .unwrap();
@@ -1046,7 +1049,13 @@ mod tests {
             }
         );
 
-        let buffer_2 = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), "Goodbye"));
+        let buffer_2 = cx.new_model(|cx| {
+            Buffer::new(
+                0,
+                BufferId::new(cx.entity_id().as_u64()).unwrap(),
+                "Goodbye",
+            )
+        });
         let buffer_2_uri: lsp::Url = format!("buffer://{}", buffer_2.entity_id().as_u64())
             .parse()
             .unwrap();
@@ -1235,7 +1244,7 @@ mod tests {
 
         fn buffer_reloaded(
             &self,
-            _: u64,
+            _: BufferId,
             _: &clock::Global,
             _: language::RopeFingerprint,
             _: language::LineEnding,
diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
index 7f29a7d04f..6d81f3e37c 100644
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -1007,6 +1007,7 @@ pub mod tests {
     use settings::SettingsStore;
     use smol::stream::StreamExt;
     use std::{env, sync::Arc};
+    use text::BufferId;
     use theme::{LoadThemes, SyntaxTheme};
     use util::test::{marked_text_ranges, sample_text};
     use Bias::*;
@@ -1467,7 +1468,8 @@ pub mod tests {
         cx.update(|cx| init_test(cx, |s| s.defaults.tab_size = Some(2.try_into().unwrap())));
 
         let buffer = cx.new_model(|cx| {
-            Buffer::new(0, cx.entity_id().as_u64(), text).with_language(language, cx)
+            Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+                .with_language(language, cx)
         });
         cx.condition(&buffer, |buf, _| !buf.is_parsing()).await;
         let buffer = cx.new_model(|cx| MultiBuffer::singleton(buffer, cx));
@@ -1553,7 +1555,8 @@ pub mod tests {
         cx.update(|cx| init_test(cx, |_| {}));
 
         let buffer = cx.new_model(|cx| {
-            Buffer::new(0, cx.entity_id().as_u64(), text).with_language(language, cx)
+            Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+                .with_language(language, cx)
         });
         cx.condition(&buffer, |buf, _| !buf.is_parsing()).await;
         let buffer = cx.new_model(|cx| MultiBuffer::singleton(buffer, cx));
@@ -1620,7 +1623,8 @@ pub mod tests {
         let (text, highlighted_ranges) = marked_text_ranges(r#"constˇ «a»: B = "c «d»""#, false);
 
         let buffer = cx.new_model(|cx| {
-            Buffer::new(0, cx.entity_id().as_u64(), text).with_language(language, cx)
+            Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+                .with_language(language, cx)
         });
         cx.condition(&buffer, |buf, _| !buf.is_parsing()).await;
 
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index a572729e76..bc7061524e 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -109,7 +109,7 @@ use std::{
 };
 pub use sum_tree::Bias;
 use sum_tree::TreeMap;
-use text::{OffsetUtf16, Rope};
+use text::{BufferId, OffsetUtf16, Rope};
 use theme::{
     observe_buffer_font_size_adjustment, ActiveTheme, PlayerColor, StatusColors, SyntaxTheme,
     ThemeColors, ThemeSettings,
@@ -1289,19 +1289,37 @@ impl InlayHintRefreshReason {
 
 impl Editor {
     pub fn single_line(cx: &mut ViewContext<Self>) -> Self {
-        let buffer = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), String::new()));
+        let buffer = cx.new_model(|cx| {
+            Buffer::new(
+                0,
+                BufferId::new(cx.entity_id().as_u64()).unwrap(),
+                String::new(),
+            )
+        });
         let buffer = cx.new_model(|cx| MultiBuffer::singleton(buffer, cx));
         Self::new(EditorMode::SingleLine, buffer, None, cx)
     }
 
     pub fn multi_line(cx: &mut ViewContext<Self>) -> Self {
-        let buffer = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), String::new()));
+        let buffer = cx.new_model(|cx| {
+            Buffer::new(
+                0,
+                BufferId::new(cx.entity_id().as_u64()).unwrap(),
+                String::new(),
+            )
+        });
         let buffer = cx.new_model(|cx| MultiBuffer::singleton(buffer, cx));
         Self::new(EditorMode::Full, buffer, None, cx)
     }
 
     pub fn auto_height(max_lines: usize, cx: &mut ViewContext<Self>) -> Self {
-        let buffer = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), String::new()));
+        let buffer = cx.new_model(|cx| {
+            Buffer::new(
+                0,
+                BufferId::new(cx.entity_id().as_u64()).unwrap(),
+                String::new(),
+            )
+        });
         let buffer = cx.new_model(|cx| MultiBuffer::singleton(buffer, cx));
         Self::new(EditorMode::AutoHeight { max_lines }, buffer, None, cx)
     }
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 8c31a2bcdf..a039d27098 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -39,7 +39,8 @@ fn test_edit_events(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
 
     let buffer = cx.new_model(|cx| {
-        let mut buffer = language::Buffer::new(0, cx.entity_id().as_u64(), "123456");
+        let mut buffer =
+            language::Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), "123456");
         buffer.set_group_interval(Duration::from_secs(1));
         buffer
     });
@@ -154,7 +155,9 @@ fn test_undo_redo_with_selection_restoration(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
 
     let mut now = Instant::now();
-    let buffer = cx.new_model(|cx| language::Buffer::new(0, cx.entity_id().as_u64(), "123456"));
+    let buffer = cx.new_model(|cx| {
+        language::Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), "123456")
+    });
     let group_interval = buffer.update(cx, |buffer, _| buffer.transaction_group_interval());
     let buffer = cx.new_model(|cx| MultiBuffer::singleton(buffer, cx));
     let editor = cx.add_window(|cx| build_editor(buffer.clone(), cx));
@@ -225,7 +228,8 @@ fn test_ime_composition(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
 
     let buffer = cx.new_model(|cx| {
-        let mut buffer = language::Buffer::new(0, cx.entity_id().as_u64(), "abcde");
+        let mut buffer =
+            language::Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), "abcde");
         // Ensure automatic grouping doesn't occur.
         buffer.set_group_interval(Duration::ZERO);
         buffer
@@ -629,7 +633,7 @@ async fn test_navigation_history(cx: &mut TestAppContext) {
 
             // Ensure we don't panic when navigation data contains invalid anchors *and* points.
             let mut invalid_anchor = editor.scroll_manager.anchor().anchor;
-            invalid_anchor.text_anchor.buffer_id = Some(999);
+            invalid_anchor.text_anchor.buffer_id = BufferId::new(999).ok();
             let invalid_point = Point::new(9999, 0);
             editor.navigate(
                 Box::new(NavigationData {
@@ -2342,11 +2346,20 @@ fn test_indent_outdent_with_excerpts(cx: &mut TestAppContext) {
     ));
 
     let toml_buffer = cx.new_model(|cx| {
-        Buffer::new(0, cx.entity_id().as_u64(), "a = 1\nb = 2\n").with_language(toml_language, cx)
+        Buffer::new(
+            0,
+            BufferId::new(cx.entity_id().as_u64()).unwrap(),
+            "a = 1\nb = 2\n",
+        )
+        .with_language(toml_language, cx)
     });
     let rust_buffer = cx.new_model(|cx| {
-        Buffer::new(0, cx.entity_id().as_u64(), "const c: usize = 3;\n")
-            .with_language(rust_language, cx)
+        Buffer::new(
+            0,
+            BufferId::new(cx.entity_id().as_u64()).unwrap(),
+            "const c: usize = 3;\n",
+        )
+        .with_language(rust_language, cx)
     });
     let multibuffer = cx.new_model(|cx| {
         let mut multibuffer = MultiBuffer::new(0, ReadWrite);
@@ -3984,8 +3997,10 @@ async fn test_select_larger_smaller_syntax_node(cx: &mut gpui::TestAppContext) {
     "#
     .unindent();
 
-    let buffer = cx
-        .new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), text).with_language(language, cx));
+    let buffer = cx.new_model(|cx| {
+        Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+            .with_language(language, cx)
+    });
     let buffer = cx.new_model(|cx| MultiBuffer::singleton(buffer, cx));
     let (view, cx) = cx.add_window_view(|cx| build_editor(buffer, cx));
 
@@ -4149,8 +4164,10 @@ async fn test_autoindent_selections(cx: &mut gpui::TestAppContext) {
 
     let text = "fn a() {}";
 
-    let buffer = cx
-        .new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), text).with_language(language, cx));
+    let buffer = cx.new_model(|cx| {
+        Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+            .with_language(language, cx)
+    });
     let buffer = cx.new_model(|cx| MultiBuffer::singleton(buffer, cx));
     let (editor, cx) = cx.add_window_view(|cx| build_editor(buffer, cx));
     editor
@@ -4713,8 +4730,10 @@ async fn test_surround_with_pair(cx: &mut gpui::TestAppContext) {
     "#
     .unindent();
 
-    let buffer = cx
-        .new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), text).with_language(language, cx));
+    let buffer = cx.new_model(|cx| {
+        Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+            .with_language(language, cx)
+    });
     let buffer = cx.new_model(|cx| MultiBuffer::singleton(buffer, cx));
     let (view, cx) = cx.add_window_view(|cx| build_editor(buffer, cx));
     view.condition::<crate::EditorEvent>(cx, |view, cx| !view.buffer.read(cx).is_parsing(cx))
@@ -4862,8 +4881,10 @@ async fn test_delete_autoclose_pair(cx: &mut gpui::TestAppContext) {
     "#
     .unindent();
 
-    let buffer = cx
-        .new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), text).with_language(language, cx));
+    let buffer = cx.new_model(|cx| {
+        Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+            .with_language(language, cx)
+    });
     let buffer = cx.new_model(|cx| MultiBuffer::singleton(buffer, cx));
     let (editor, cx) = cx.add_window_view(|cx| build_editor(buffer, cx));
     editor
@@ -6095,7 +6116,13 @@ async fn test_toggle_block_comment(cx: &mut gpui::TestAppContext) {
 fn test_editing_disjoint_excerpts(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
 
-    let buffer = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), sample_text(3, 4, 'a')));
+    let buffer = cx.new_model(|cx| {
+        Buffer::new(
+            0,
+            BufferId::new(cx.entity_id().as_u64()).unwrap(),
+            sample_text(3, 4, 'a'),
+        )
+    });
     let multibuffer = cx.new_model(|cx| {
         let mut multibuffer = MultiBuffer::new(0, ReadWrite);
         multibuffer.push_excerpts(
@@ -6179,7 +6206,13 @@ fn test_editing_overlapping_excerpts(cx: &mut TestAppContext) {
             primary: None,
         }
     });
-    let buffer = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), initial_text));
+    let buffer = cx.new_model(|cx| {
+        Buffer::new(
+            0,
+            BufferId::new(cx.entity_id().as_u64()).unwrap(),
+            initial_text,
+        )
+    });
     let multibuffer = cx.new_model(|cx| {
         let mut multibuffer = MultiBuffer::new(0, ReadWrite);
         multibuffer.push_excerpts(buffer, excerpt_ranges, cx);
@@ -6237,7 +6270,13 @@ fn test_editing_overlapping_excerpts(cx: &mut TestAppContext) {
 fn test_refresh_selections(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
 
-    let buffer = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), sample_text(3, 4, 'a')));
+    let buffer = cx.new_model(|cx| {
+        Buffer::new(
+            0,
+            BufferId::new(cx.entity_id().as_u64()).unwrap(),
+            sample_text(3, 4, 'a'),
+        )
+    });
     let mut excerpt1_id = None;
     let multibuffer = cx.new_model(|cx| {
         let mut multibuffer = MultiBuffer::new(0, ReadWrite);
@@ -6322,7 +6361,13 @@ fn test_refresh_selections(cx: &mut TestAppContext) {
 fn test_refresh_selections_while_selecting_with_mouse(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
 
-    let buffer = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), sample_text(3, 4, 'a')));
+    let buffer = cx.new_model(|cx| {
+        Buffer::new(
+            0,
+            BufferId::new(cx.entity_id().as_u64()).unwrap(),
+            sample_text(3, 4, 'a'),
+        )
+    });
     let mut excerpt1_id = None;
     let multibuffer = cx.new_model(|cx| {
         let mut multibuffer = MultiBuffer::new(0, ReadWrite);
@@ -6417,8 +6462,10 @@ async fn test_extra_newline_insertion(cx: &mut gpui::TestAppContext) {
         "{{} }\n",     //
     );
 
-    let buffer = cx
-        .new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), text).with_language(language, cx));
+    let buffer = cx.new_model(|cx| {
+        Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+            .with_language(language, cx)
+    });
     let buffer = cx.new_model(|cx| MultiBuffer::singleton(buffer, cx));
     let (view, cx) = cx.add_window_view(|cx| build_editor(buffer, cx));
     view.condition::<crate::EditorEvent>(cx, |view, cx| !view.buffer.read(cx).is_parsing(cx))
@@ -7498,8 +7545,20 @@ async fn test_copilot_multibuffer(executor: BackgroundExecutor, cx: &mut gpui::T
     let (copilot, copilot_lsp) = Copilot::fake(cx);
     _ = cx.update(|cx| cx.set_global(copilot));
 
-    let buffer_1 = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), "a = 1\nb = 2\n"));
-    let buffer_2 = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), "c = 3\nd = 4\n"));
+    let buffer_1 = cx.new_model(|cx| {
+        Buffer::new(
+            0,
+            BufferId::new(cx.entity_id().as_u64()).unwrap(),
+            "a = 1\nb = 2\n",
+        )
+    });
+    let buffer_2 = cx.new_model(|cx| {
+        Buffer::new(
+            0,
+            BufferId::new(cx.entity_id().as_u64()).unwrap(),
+            "c = 3\nd = 4\n",
+        )
+    });
     let multibuffer = cx.new_model(|cx| {
         let mut multibuffer = MultiBuffer::new(0, ReadWrite);
         multibuffer.push_excerpts(
diff --git a/crates/editor/src/inlay_hint_cache.rs b/crates/editor/src/inlay_hint_cache.rs
index c4c18aefbf..71e039a843 100644
--- a/crates/editor/src/inlay_hint_cache.rs
+++ b/crates/editor/src/inlay_hint_cache.rs
@@ -28,7 +28,7 @@ use collections::{hash_map, HashMap, HashSet};
 use language::language_settings::InlayHintSettings;
 use smol::lock::Semaphore;
 use sum_tree::Bias;
-use text::{ToOffset, ToPoint};
+use text::{BufferId, ToOffset, ToPoint};
 use util::post_inc;
 
 pub struct InlayHintCache {
@@ -50,7 +50,7 @@ struct TasksForRanges {
 struct CachedExcerptHints {
     version: usize,
     buffer_version: Global,
-    buffer_id: u64,
+    buffer_id: BufferId,
     ordered_hints: Vec<InlayId>,
     hints_by_id: HashMap<InlayId, InlayHint>,
 }
@@ -93,7 +93,7 @@ struct ExcerptHintsUpdate {
 
 #[derive(Debug, Clone, Copy)]
 struct ExcerptQuery {
-    buffer_id: u64,
+    buffer_id: BufferId,
     excerpt_id: ExcerptId,
     cache_version: usize,
     invalidate: InvalidationStrategy,
@@ -553,7 +553,7 @@ impl InlayHintCache {
     /// Queries a certain hint from the cache for extra data via the LSP <a href="https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#inlayHint_resolve">resolve</a> request.
     pub(super) fn spawn_hint_resolve(
         &self,
-        buffer_id: u64,
+        buffer_id: BufferId,
         excerpt_id: ExcerptId,
         id: InlayId,
         cx: &mut ViewContext<'_, Editor>,
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index 11ea07ff5c..f26c4361b7 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -30,7 +30,7 @@ use std::{
     path::{Path, PathBuf},
     sync::Arc,
 };
-use text::Selection;
+use text::{BufferId, Selection};
 use theme::Theme;
 use ui::{h_flex, prelude::*, Label};
 use util::{paths::PathExt, paths::FILE_ROW_COLUMN_DELIMITER, ResultExt, TryFutureExt};
@@ -73,12 +73,14 @@ impl FollowableItem for Editor {
             .iter()
             .map(|excerpt| excerpt.buffer_id)
             .collect::<HashSet<_>>();
-        let buffers = project.update(cx, |project, cx| {
-            buffer_ids
-                .iter()
-                .map(|id| project.open_buffer_by_id(*id, cx))
-                .collect::<Vec<_>>()
-        });
+        let buffers = project
+            .update(cx, |project, cx| {
+                buffer_ids
+                    .iter()
+                    .map(|id| BufferId::new(*id).map(|id| project.open_buffer_by_id(id, cx)))
+                    .collect::<Result<Vec<_>>>()
+            })
+            .ok()?;
 
         let pane = pane.downgrade();
         Some(cx.spawn(|mut cx| async move {
@@ -109,10 +111,12 @@ impl FollowableItem for Editor {
                                 MultiBuffer::new(replica_id, project.read(cx).capability());
                             let mut excerpts = state.excerpts.into_iter().peekable();
                             while let Some(excerpt) = excerpts.peek() {
-                                let buffer_id = excerpt.buffer_id;
+                                let Ok(buffer_id) = BufferId::new(excerpt.buffer_id) else {
+                                    continue;
+                                };
                                 let buffer_excerpts = iter::from_fn(|| {
                                     let excerpt = excerpts.peek()?;
-                                    (excerpt.buffer_id == buffer_id)
+                                    (excerpt.buffer_id == u64::from(buffer_id))
                                         .then(|| excerpts.next().unwrap())
                                 });
                                 let buffer =
@@ -189,7 +193,7 @@ impl FollowableItem for Editor {
             .excerpts()
             .map(|(id, buffer, range)| proto::Excerpt {
                 id: id.to_proto(),
-                buffer_id: buffer.remote_id(),
+                buffer_id: buffer.remote_id().into(),
                 context_start: Some(serialize_text_anchor(&range.context.start)),
                 context_end: Some(serialize_text_anchor(&range.context.end)),
                 primary_start: range
@@ -336,9 +340,9 @@ async fn update_editor_from_message(
     let inserted_excerpt_buffers = project.update(cx, |project, cx| {
         inserted_excerpt_buffer_ids
             .into_iter()
-            .map(|id| project.open_buffer_by_id(id, cx))
-            .collect::<Vec<_>>()
-    })?;
+            .map(|id| BufferId::new(id).map(|id| project.open_buffer_by_id(id, cx)))
+            .collect::<Result<Vec<_>>>()
+    })??;
     let _inserted_excerpt_buffers = try_join_all(inserted_excerpt_buffers).await?;
 
     // Update the editor's excerpts.
@@ -362,7 +366,7 @@ async fn update_editor_from_message(
                 let Some(previous_excerpt_id) = insertion.previous_excerpt_id else {
                     continue;
                 };
-                let buffer_id = excerpt.buffer_id;
+                let buffer_id = BufferId::new(excerpt.buffer_id)?;
                 let Some(buffer) = project.read(cx).buffer_for_id(buffer_id) else {
                     continue;
                 };
@@ -370,7 +374,7 @@ async fn update_editor_from_message(
                 let adjacent_excerpts = iter::from_fn(|| {
                     let insertion = insertions.peek()?;
                     if insertion.previous_excerpt_id.is_none()
-                        && insertion.excerpt.as_ref()?.buffer_id == buffer_id
+                        && insertion.excerpt.as_ref()?.buffer_id == u64::from(buffer_id)
                     {
                         insertions.next()?.excerpt
                     } else {
@@ -395,8 +399,9 @@ async fn update_editor_from_message(
             }
 
             multibuffer.remove_excerpts(removed_excerpt_ids, cx);
-        });
-    })?;
+            Result::<(), anyhow::Error>::Ok(())
+        })
+    })??;
 
     // Deserialize the editor state.
     let (selections, pending_selection, scroll_top_anchor) = this.update(cx, |editor, cx| {
@@ -450,13 +455,13 @@ async fn update_editor_from_message(
 }
 
 fn serialize_excerpt(
-    buffer_id: u64,
+    buffer_id: BufferId,
     id: &ExcerptId,
     range: &ExcerptRange<language::Anchor>,
 ) -> Option<proto::Excerpt> {
     Some(proto::Excerpt {
         id: id.to_proto(),
-        buffer_id,
+        buffer_id: buffer_id.into(),
         context_start: Some(serialize_text_anchor(&range.context.start)),
         context_end: Some(serialize_text_anchor(&range.context.end)),
         primary_start: range
diff --git a/crates/editor/src/movement.rs b/crates/editor/src/movement.rs
index 0cf8ac7440..71c2cceac1 100644
--- a/crates/editor/src/movement.rs
+++ b/crates/editor/src/movement.rs
@@ -522,6 +522,7 @@ mod tests {
     use language::Capability;
     use project::Project;
     use settings::SettingsStore;
+    use text::BufferId;
     use util::post_inc;
 
     #[gpui::test]
@@ -822,8 +823,13 @@ mod tests {
 
             let font = font("Helvetica");
 
-            let buffer =
-                cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), "abc\ndefg\nhijkl\nmn"));
+            let buffer = cx.new_model(|cx| {
+                Buffer::new(
+                    0,
+                    BufferId::new(cx.entity_id().as_u64()).unwrap(),
+                    "abc\ndefg\nhijkl\nmn",
+                )
+            });
             let multibuffer = cx.new_model(|cx| {
                 let mut multibuffer = MultiBuffer::new(0, Capability::ReadWrite);
                 multibuffer.push_excerpts(
diff --git a/crates/git/src/diff.rs b/crates/git/src/diff.rs
index 6e83bab220..07b0240f60 100644
--- a/crates/git/src/diff.rs
+++ b/crates/git/src/diff.rs
@@ -314,7 +314,7 @@ mod tests {
     use std::assert_eq;
 
     use super::*;
-    use text::Buffer;
+    use text::{Buffer, BufferId};
     use unindent::Unindent as _;
 
     #[test]
@@ -333,7 +333,7 @@ mod tests {
         "
         .unindent();
 
-        let mut buffer = Buffer::new(0, 0, buffer_text);
+        let mut buffer = Buffer::new(0, BufferId::new(1).unwrap(), buffer_text);
         let mut diff = BufferDiff::new();
         smol::block_on(diff.update(&diff_base, &buffer));
         assert_hunks(
@@ -393,7 +393,7 @@ mod tests {
         "
         .unindent();
 
-        let buffer = Buffer::new(0, 0, buffer_text);
+        let buffer = Buffer::new(0, BufferId::new(1).unwrap(), buffer_text);
         let mut diff = BufferDiff::new();
         smol::block_on(diff.update(&diff_base, &buffer));
         assert_eq!(diff.hunks(&buffer).count(), 8);
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 64d15e6856..7a658d1b03 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -15,7 +15,7 @@ use crate::{
     },
     CodeLabel, LanguageScope, Outline,
 };
-use anyhow::{anyhow, Result};
+use anyhow::{anyhow, Context, Result};
 pub use clock::ReplicaId;
 use futures::channel::oneshot;
 use gpui::{AppContext, EventEmitter, HighlightStyle, ModelContext, Task, TaskLabel};
@@ -44,10 +44,10 @@ use sum_tree::TreeMap;
 use text::operation_queue::OperationQueue;
 use text::*;
 pub use text::{
-    Anchor, Bias, Buffer as TextBuffer, BufferSnapshot as TextBufferSnapshot, Edit, OffsetRangeExt,
-    OffsetUtf16, Patch, Point, PointUtf16, Rope, RopeFingerprint, Selection, SelectionGoal,
-    Subscription, TextDimension, TextSummary, ToOffset, ToOffsetUtf16, ToPoint, ToPointUtf16,
-    Transaction, TransactionId, Unclipped,
+    Anchor, Bias, Buffer as TextBuffer, BufferId, BufferSnapshot as TextBufferSnapshot, Edit,
+    OffsetRangeExt, OffsetUtf16, Patch, Point, PointUtf16, Rope, RopeFingerprint, Selection,
+    SelectionGoal, Subscription, TextDimension, TextSummary, ToOffset, ToOffsetUtf16, ToPoint,
+    ToPointUtf16, Transaction, TransactionId, Unclipped,
 };
 use theme::SyntaxTheme;
 #[cfg(any(test, feature = "test-support"))]
@@ -396,7 +396,7 @@ pub trait LocalFile: File {
     /// Called when the buffer is reloaded from disk.
     fn buffer_reloaded(
         &self,
-        buffer_id: u64,
+        buffer_id: BufferId,
         version: &clock::Global,
         fingerprint: RopeFingerprint,
         line_ending: LineEnding,
@@ -517,7 +517,7 @@ pub enum CharKind {
 
 impl Buffer {
     /// Create a new buffer with the given base text.
-    pub fn new<T: Into<String>>(replica_id: ReplicaId, id: u64, base_text: T) -> Self {
+    pub fn new<T: Into<String>>(replica_id: ReplicaId, id: BufferId, base_text: T) -> Self {
         Self::build(
             TextBuffer::new(replica_id, id, base_text.into()),
             None,
@@ -528,7 +528,7 @@ impl Buffer {
 
     /// Create a new buffer that is a replica of a remote buffer.
     pub fn remote(
-        remote_id: u64,
+        remote_id: BufferId,
         replica_id: ReplicaId,
         capability: Capability,
         base_text: String,
@@ -549,7 +549,9 @@ impl Buffer {
         message: proto::BufferState,
         file: Option<Arc<dyn File>>,
     ) -> Result<Self> {
-        let buffer = TextBuffer::new(replica_id, message.id, message.base_text);
+        let buffer_id = BufferId::new(message.id)
+            .with_context(|| anyhow!("Could not deserialize buffer_id"))?;
+        let buffer = TextBuffer::new(replica_id, buffer_id, message.base_text);
         let mut this = Self::build(
             buffer,
             message.diff_base.map(|text| text.into_boxed_str().into()),
@@ -572,7 +574,7 @@ impl Buffer {
     /// Serialize the buffer's state to a protobuf message.
     pub fn to_proto(&self) -> proto::BufferState {
         proto::BufferState {
-            id: self.remote_id(),
+            id: self.remote_id().into(),
             file: self.file.as_ref().map(|f| f.to_proto()),
             base_text: self.base_text().to_string(),
             diff_base: self.diff_base.as_ref().map(|h| h.to_string()),
diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rs
index 6079f1de93..05cec88126 100644
--- a/crates/language/src/buffer_tests.rs
+++ b/crates/language/src/buffer_tests.rs
@@ -18,7 +18,7 @@ use std::{
     time::{Duration, Instant},
 };
 use text::network::Network;
-use text::LineEnding;
+use text::{BufferId, LineEnding};
 use text::{Point, ToPoint};
 use unindent::Unindent as _;
 use util::{assert_set_eq, post_inc, test::marked_text_ranges, RandomCharIter};
@@ -43,8 +43,12 @@ fn test_line_endings(cx: &mut gpui::AppContext) {
     init_settings(cx, |_| {});
 
     cx.new_model(|cx| {
-        let mut buffer = Buffer::new(0, cx.entity_id().as_u64(), "one\r\ntwo\rthree")
-            .with_language(Arc::new(rust_lang()), cx);
+        let mut buffer = Buffer::new(
+            0,
+            BufferId::new(cx.entity_id().as_u64()).unwrap(),
+            "one\r\ntwo\rthree",
+        )
+        .with_language(Arc::new(rust_lang()), cx);
         assert_eq!(buffer.text(), "one\ntwo\nthree");
         assert_eq!(buffer.line_ending(), LineEnding::Windows);
 
@@ -138,8 +142,10 @@ fn test_edit_events(cx: &mut gpui::AppContext) {
     let buffer_1_events = Arc::new(Mutex::new(Vec::new()));
     let buffer_2_events = Arc::new(Mutex::new(Vec::new()));
 
-    let buffer1 = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), "abcdef"));
-    let buffer2 = cx.new_model(|cx| Buffer::new(1, cx.entity_id().as_u64(), "abcdef"));
+    let buffer1 = cx
+        .new_model(|cx| Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), "abcdef"));
+    let buffer2 = cx
+        .new_model(|cx| Buffer::new(1, BufferId::new(cx.entity_id().as_u64()).unwrap(), "abcdef"));
     let buffer1_ops = Arc::new(Mutex::new(Vec::new()));
     buffer1.update(cx, {
         let buffer1_ops = buffer1_ops.clone();
@@ -218,7 +224,8 @@ fn test_edit_events(cx: &mut gpui::AppContext) {
 #[gpui::test]
 async fn test_apply_diff(cx: &mut TestAppContext) {
     let text = "a\nbb\nccc\ndddd\neeeee\nffffff\n";
-    let buffer = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), text));
+    let buffer =
+        cx.new_model(|cx| Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text));
     let anchor = buffer.update(cx, |buffer, _| buffer.anchor_before(Point::new(3, 3)));
 
     let text = "a\nccc\ndddd\nffffff\n";
@@ -250,7 +257,8 @@ async fn test_normalize_whitespace(cx: &mut gpui::TestAppContext) {
     ]
     .join("\n");
 
-    let buffer = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), text));
+    let buffer =
+        cx.new_model(|cx| Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text));
 
     // Spawn a task to format the buffer's whitespace.
     // Pause so that the foratting task starts running.
@@ -315,7 +323,8 @@ async fn test_normalize_whitespace(cx: &mut gpui::TestAppContext) {
 async fn test_reparse(cx: &mut gpui::TestAppContext) {
     let text = "fn a() {}";
     let buffer = cx.new_model(|cx| {
-        Buffer::new(0, cx.entity_id().as_u64(), text).with_language(Arc::new(rust_lang()), cx)
+        Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+            .with_language(Arc::new(rust_lang()), cx)
     });
 
     // Wait for the initial text to parse
@@ -443,8 +452,8 @@ async fn test_reparse(cx: &mut gpui::TestAppContext) {
 #[gpui::test]
 async fn test_resetting_language(cx: &mut gpui::TestAppContext) {
     let buffer = cx.new_model(|cx| {
-        let mut buffer =
-            Buffer::new(0, cx.entity_id().as_u64(), "{}").with_language(Arc::new(rust_lang()), cx);
+        let mut buffer = Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), "{}")
+            .with_language(Arc::new(rust_lang()), cx);
         buffer.set_sync_parse_timeout(Duration::ZERO);
         buffer
     });
@@ -493,7 +502,8 @@ async fn test_outline(cx: &mut gpui::TestAppContext) {
     .unindent();
 
     let buffer = cx.new_model(|cx| {
-        Buffer::new(0, cx.entity_id().as_u64(), text).with_language(Arc::new(rust_lang()), cx)
+        Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+            .with_language(Arc::new(rust_lang()), cx)
     });
     let outline = buffer
         .update(cx, |buffer, _| buffer.snapshot().outline(None))
@@ -579,7 +589,8 @@ async fn test_outline_nodes_with_newlines(cx: &mut gpui::TestAppContext) {
     .unindent();
 
     let buffer = cx.new_model(|cx| {
-        Buffer::new(0, cx.entity_id().as_u64(), text).with_language(Arc::new(rust_lang()), cx)
+        Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+            .with_language(Arc::new(rust_lang()), cx)
     });
     let outline = buffer
         .update(cx, |buffer, _| buffer.snapshot().outline(None))
@@ -617,7 +628,8 @@ async fn test_outline_with_extra_context(cx: &mut gpui::TestAppContext) {
     .unindent();
 
     let buffer = cx.new_model(|cx| {
-        Buffer::new(0, cx.entity_id().as_u64(), text).with_language(Arc::new(language), cx)
+        Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+            .with_language(Arc::new(language), cx)
     });
     let snapshot = buffer.update(cx, |buffer, _| buffer.snapshot());
 
@@ -661,7 +673,8 @@ async fn test_symbols_containing(cx: &mut gpui::TestAppContext) {
     .unindent();
 
     let buffer = cx.new_model(|cx| {
-        Buffer::new(0, cx.entity_id().as_u64(), text).with_language(Arc::new(rust_lang()), cx)
+        Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+            .with_language(Arc::new(rust_lang()), cx)
     });
     let snapshot = buffer.update(cx, |buffer, _| buffer.snapshot());
 
@@ -883,8 +896,8 @@ fn test_enclosing_bracket_ranges_where_brackets_are_not_outermost_children(cx: &
 fn test_range_for_syntax_ancestor(cx: &mut AppContext) {
     cx.new_model(|cx| {
         let text = "fn a() { b(|c| {}) }";
-        let buffer =
-            Buffer::new(0, cx.entity_id().as_u64(), text).with_language(Arc::new(rust_lang()), cx);
+        let buffer = Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+            .with_language(Arc::new(rust_lang()), cx);
         let snapshot = buffer.snapshot();
 
         assert_eq!(
@@ -924,8 +937,8 @@ fn test_autoindent_with_soft_tabs(cx: &mut AppContext) {
 
     cx.new_model(|cx| {
         let text = "fn a() {}";
-        let mut buffer =
-            Buffer::new(0, cx.entity_id().as_u64(), text).with_language(Arc::new(rust_lang()), cx);
+        let mut buffer = Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+            .with_language(Arc::new(rust_lang()), cx);
 
         buffer.edit([(8..8, "\n\n")], Some(AutoindentMode::EachLine), cx);
         assert_eq!(buffer.text(), "fn a() {\n    \n}");
@@ -967,8 +980,8 @@ fn test_autoindent_with_hard_tabs(cx: &mut AppContext) {
 
     cx.new_model(|cx| {
         let text = "fn a() {}";
-        let mut buffer =
-            Buffer::new(0, cx.entity_id().as_u64(), text).with_language(Arc::new(rust_lang()), cx);
+        let mut buffer = Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+            .with_language(Arc::new(rust_lang()), cx);
 
         buffer.edit([(8..8, "\n\n")], Some(AutoindentMode::EachLine), cx);
         assert_eq!(buffer.text(), "fn a() {\n\t\n}");
@@ -1007,10 +1020,9 @@ fn test_autoindent_does_not_adjust_lines_with_unchanged_suggestion(cx: &mut AppC
     init_settings(cx, |_| {});
 
     cx.new_model(|cx| {
-        let entity_id = cx.entity_id();
         let mut buffer = Buffer::new(
             0,
-            entity_id.as_u64(),
+            BufferId::new(cx.entity_id().as_u64()).unwrap(),
             "
             fn a() {
             c;
@@ -1085,7 +1097,7 @@ fn test_autoindent_does_not_adjust_lines_with_unchanged_suggestion(cx: &mut AppC
 
         let mut buffer = Buffer::new(
             0,
-            cx.entity_id().as_u64(),
+            BufferId::new(cx.entity_id().as_u64()).unwrap(),
             "
             fn a() {
                 b();
@@ -1150,7 +1162,7 @@ fn test_autoindent_does_not_adjust_lines_within_newly_created_errors(cx: &mut Ap
     cx.new_model(|cx| {
         let mut buffer = Buffer::new(
             0,
-            cx.entity_id().as_u64(),
+            BufferId::new(cx.entity_id().as_u64()).unwrap(),
             "
             fn a() {
                 i
@@ -1212,7 +1224,7 @@ fn test_autoindent_adjusts_lines_when_only_text_changes(cx: &mut AppContext) {
     cx.new_model(|cx| {
         let mut buffer = Buffer::new(
             0,
-            cx.entity_id().as_u64(),
+            BufferId::new(cx.entity_id().as_u64()).unwrap(),
             "
             fn a() {}
             "
@@ -1268,8 +1280,8 @@ fn test_autoindent_with_edit_at_end_of_buffer(cx: &mut AppContext) {
 
     cx.new_model(|cx| {
         let text = "a\nb";
-        let mut buffer =
-            Buffer::new(0, cx.entity_id().as_u64(), text).with_language(Arc::new(rust_lang()), cx);
+        let mut buffer = Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+            .with_language(Arc::new(rust_lang()), cx);
         buffer.edit(
             [(0..1, "\n"), (2..3, "\n")],
             Some(AutoindentMode::EachLine),
@@ -1295,8 +1307,8 @@ fn test_autoindent_multi_line_insertion(cx: &mut AppContext) {
         "
         .unindent();
 
-        let mut buffer =
-            Buffer::new(0, cx.entity_id().as_u64(), text).with_language(Arc::new(rust_lang()), cx);
+        let mut buffer = Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+            .with_language(Arc::new(rust_lang()), cx);
         buffer.edit(
             [(Point::new(3, 0)..Point::new(3, 0), "e(\n    f()\n);\n")],
             Some(AutoindentMode::EachLine),
@@ -1333,8 +1345,8 @@ fn test_autoindent_block_mode(cx: &mut AppContext) {
             }
         "#
         .unindent();
-        let mut buffer =
-            Buffer::new(0, cx.entity_id().as_u64(), text).with_language(Arc::new(rust_lang()), cx);
+        let mut buffer = Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+            .with_language(Arc::new(rust_lang()), cx);
 
         // When this text was copied, both of the quotation marks were at the same
         // indent level, but the indentation of the first line was not included in
@@ -1419,8 +1431,8 @@ fn test_autoindent_block_mode_without_original_indent_columns(cx: &mut AppContex
             }
         "#
         .unindent();
-        let mut buffer =
-            Buffer::new(0, cx.entity_id().as_u64(), text).with_language(Arc::new(rust_lang()), cx);
+        let mut buffer = Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+            .with_language(Arc::new(rust_lang()), cx);
 
         // The original indent columns are not known, so this text is
         // auto-indented in a block as if the first line was copied in
@@ -1499,17 +1511,18 @@ fn test_autoindent_language_without_indents_query(cx: &mut AppContext) {
         "
         .unindent();
 
-        let mut buffer = Buffer::new(0, cx.entity_id().as_u64(), text).with_language(
-            Arc::new(Language::new(
-                LanguageConfig {
-                    name: "Markdown".into(),
-                    auto_indent_using_last_non_empty_line: false,
-                    ..Default::default()
-                },
-                Some(tree_sitter_json::language()),
-            )),
-            cx,
-        );
+        let mut buffer = Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+            .with_language(
+                Arc::new(Language::new(
+                    LanguageConfig {
+                        name: "Markdown".into(),
+                        auto_indent_using_last_non_empty_line: false,
+                        ..Default::default()
+                    },
+                    Some(tree_sitter_json::language()),
+                )),
+                cx,
+            );
         buffer.edit(
             [(Point::new(3, 0)..Point::new(3, 0), "\n")],
             Some(AutoindentMode::EachLine),
@@ -1575,7 +1588,7 @@ fn test_autoindent_with_injected_languages(cx: &mut AppContext) {
             false,
         );
 
-        let mut buffer = Buffer::new(0, cx.entity_id().as_u64(), text);
+        let mut buffer = Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text);
         buffer.set_language_registry(language_registry);
         buffer.set_language(Some(html_language), cx);
         buffer.edit(
@@ -1611,8 +1624,8 @@ fn test_autoindent_query_with_outdent_captures(cx: &mut AppContext) {
     });
 
     cx.new_model(|cx| {
-        let mut buffer =
-            Buffer::new(0, cx.entity_id().as_u64(), "").with_language(Arc::new(ruby_lang()), cx);
+        let mut buffer = Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), "")
+            .with_language(Arc::new(ruby_lang()), cx);
 
         let text = r#"
             class C
@@ -1713,8 +1726,8 @@ fn test_language_scope_at_with_javascript(cx: &mut AppContext) {
         "#
         .unindent();
 
-        let buffer =
-            Buffer::new(0, cx.entity_id().as_u64(), &text).with_language(Arc::new(language), cx);
+        let buffer = Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), &text)
+            .with_language(Arc::new(language), cx);
         let snapshot = buffer.snapshot();
 
         let config = snapshot.language_scope_at(0).unwrap();
@@ -1831,8 +1844,12 @@ fn test_language_scope_at_with_rust(cx: &mut AppContext) {
         "#
         .unindent();
 
-        let buffer = Buffer::new(0, cx.entity_id().as_u64(), text.clone())
-            .with_language(Arc::new(language), cx);
+        let buffer = Buffer::new(
+            0,
+            BufferId::new(cx.entity_id().as_u64()).unwrap(),
+            text.clone(),
+        )
+        .with_language(Arc::new(language), cx);
         let snapshot = buffer.snapshot();
 
         // By default, all brackets are enabled
@@ -1876,7 +1893,7 @@ fn test_language_scope_at_with_combined_injections(cx: &mut AppContext) {
         language_registry.add(Arc::new(html_lang()));
         language_registry.add(Arc::new(erb_lang()));
 
-        let mut buffer = Buffer::new(0, cx.entity_id().as_u64(), text);
+        let mut buffer = Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text);
         buffer.set_language_registry(language_registry.clone());
         buffer.set_language(
             language_registry
@@ -1911,7 +1928,7 @@ fn test_serialization(cx: &mut gpui::AppContext) {
     let mut now = Instant::now();
 
     let buffer1 = cx.new_model(|cx| {
-        let mut buffer = Buffer::new(0, cx.entity_id().as_u64(), "abc");
+        let mut buffer = Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), "abc");
         buffer.edit([(3..3, "D")], None, cx);
 
         now += Duration::from_secs(1);
@@ -1966,8 +1983,13 @@ fn test_random_collaboration(cx: &mut AppContext, mut rng: StdRng) {
     let mut replica_ids = Vec::new();
     let mut buffers = Vec::new();
     let network = Arc::new(Mutex::new(Network::new(rng.clone())));
-    let base_buffer =
-        cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), base_text.as_str()));
+    let base_buffer = cx.new_model(|cx| {
+        Buffer::new(
+            0,
+            BufferId::new(cx.entity_id().as_u64()).unwrap(),
+            base_text.as_str(),
+        )
+    });
 
     for i in 0..rng.gen_range(min_peers..=max_peers) {
         let buffer = cx.new_model(|cx| {
@@ -2475,8 +2497,12 @@ fn assert_bracket_pairs(
 ) {
     let (expected_text, selection_ranges) = marked_text_ranges(selection_text, false);
     let buffer = cx.new_model(|cx| {
-        Buffer::new(0, cx.entity_id().as_u64(), expected_text.clone())
-            .with_language(Arc::new(language), cx)
+        Buffer::new(
+            0,
+            BufferId::new(cx.entity_id().as_u64()).unwrap(),
+            expected_text.clone(),
+        )
+        .with_language(Arc::new(language), cx)
     });
     let buffer = buffer.update(cx, |buffer, _cx| buffer.snapshot());
 
diff --git a/crates/language/src/proto.rs b/crates/language/src/proto.rs
index 45136ba1d7..eec2dcbb29 100644
--- a/crates/language/src/proto.rs
+++ b/crates/language/src/proto.rs
@@ -241,7 +241,7 @@ pub fn serialize_anchor(anchor: &Anchor) -> proto::Anchor {
             Bias::Left => proto::Bias::Left as i32,
             Bias::Right => proto::Bias::Right as i32,
         },
-        buffer_id: anchor.buffer_id,
+        buffer_id: anchor.buffer_id.map(Into::into),
     }
 }
 
@@ -420,6 +420,11 @@ pub fn deserialize_diagnostics(
 
 /// Deserializes an [`Anchor`] from the RPC representation.
 pub fn deserialize_anchor(anchor: proto::Anchor) -> Option<Anchor> {
+    let buffer_id = if let Some(id) = anchor.buffer_id {
+        Some(BufferId::new(id).ok()?)
+    } else {
+        None
+    };
     Some(Anchor {
         timestamp: clock::Lamport {
             replica_id: anchor.replica_id as ReplicaId,
@@ -430,7 +435,7 @@ pub fn deserialize_anchor(anchor: proto::Anchor) -> Option<Anchor> {
             proto::Bias::Left => Bias::Left,
             proto::Bias::Right => Bias::Right,
         },
-        buffer_id: anchor.buffer_id,
+        buffer_id,
     })
 }
 
diff --git a/crates/language/src/syntax_map/syntax_map_tests.rs b/crates/language/src/syntax_map/syntax_map_tests.rs
index 8b9169d1cc..abf52c64e5 100644
--- a/crates/language/src/syntax_map/syntax_map_tests.rs
+++ b/crates/language/src/syntax_map/syntax_map_tests.rs
@@ -2,7 +2,7 @@ use super::*;
 use crate::LanguageConfig;
 use rand::rngs::StdRng;
 use std::{env, ops::Range, sync::Arc};
-use text::Buffer;
+use text::{Buffer, BufferId};
 use tree_sitter::Node;
 use unindent::Unindent as _;
 use util::test::marked_text_ranges;
@@ -86,7 +86,7 @@ fn test_syntax_map_layers_for_range() {
 
     let mut buffer = Buffer::new(
         0,
-        0,
+        BufferId::new(1).unwrap(),
         r#"
             fn a() {
                 assert_eq!(
@@ -185,7 +185,7 @@ fn test_dynamic_language_injection() {
 
     let mut buffer = Buffer::new(
         0,
-        0,
+        BufferId::new(1).unwrap(),
         r#"
             This is a code block:
 
@@ -860,7 +860,7 @@ fn test_random_edits(
         .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
         .unwrap_or(10);
 
-    let mut buffer = Buffer::new(0, 0, text);
+    let mut buffer = Buffer::new(0, BufferId::new(1).unwrap(), text);
 
     let mut syntax_map = SyntaxMap::new();
     syntax_map.set_language_registry(registry.clone());
@@ -1040,7 +1040,7 @@ fn test_edit_sequence(language_name: &str, steps: &[&str]) -> (Buffer, SyntaxMap
         .now_or_never()
         .unwrap()
         .unwrap();
-    let mut buffer = Buffer::new(0, 0, Default::default());
+    let mut buffer = Buffer::new(0, BufferId::new(1).unwrap(), Default::default());
 
     let mut mutated_syntax_map = SyntaxMap::new();
     mutated_syntax_map.set_language_registry(registry.clone());
diff --git a/crates/multi_buffer/src/anchor.rs b/crates/multi_buffer/src/anchor.rs
index 39a8182da1..877f74c21b 100644
--- a/crates/multi_buffer/src/anchor.rs
+++ b/crates/multi_buffer/src/anchor.rs
@@ -5,10 +5,11 @@ use std::{
     ops::{Range, Sub},
 };
 use sum_tree::Bias;
+use text::BufferId;
 
 #[derive(Clone, Copy, Eq, PartialEq, Debug, Hash)]
 pub struct Anchor {
-    pub buffer_id: Option<u64>,
+    pub buffer_id: Option<BufferId>,
     pub excerpt_id: ExcerptId,
     pub text_anchor: text::Anchor,
 }
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index d83a547dcd..0f90612358 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -33,7 +33,7 @@ use sum_tree::{Bias, Cursor, SumTree};
 use text::{
     locator::Locator,
     subscription::{Subscription, Topic},
-    Edit, TextSummary,
+    BufferId, Edit, TextSummary,
 };
 use theme::SyntaxTheme;
 use util::post_inc;
@@ -48,7 +48,7 @@ pub struct ExcerptId(usize);
 
 pub struct MultiBuffer {
     snapshot: RefCell<MultiBufferSnapshot>,
-    buffers: RefCell<HashMap<u64, BufferState>>,
+    buffers: RefCell<HashMap<BufferId, BufferState>>,
     next_excerpt_id: usize,
     subscriptions: Topic,
     singleton: bool,
@@ -101,7 +101,7 @@ struct History {
 #[derive(Clone)]
 struct Transaction {
     id: TransactionId,
-    buffer_transactions: HashMap<u64, text::TransactionId>,
+    buffer_transactions: HashMap<BufferId, text::TransactionId>,
     first_edit_at: Instant,
     last_edit_at: Instant,
     suppress_grouping: bool,
@@ -161,7 +161,7 @@ pub struct ExcerptBoundary {
 struct Excerpt {
     id: ExcerptId,
     locator: Locator,
-    buffer_id: u64,
+    buffer_id: BufferId,
     buffer: BufferSnapshot,
     range: ExcerptRange<text::Anchor>,
     max_buffer_row: u32,
@@ -366,7 +366,7 @@ impl MultiBuffer {
         offset: T,
         theme: Option<&SyntaxTheme>,
         cx: &AppContext,
-    ) -> Option<(u64, Vec<OutlineItem<Anchor>>)> {
+    ) -> Option<(BufferId, Vec<OutlineItem<Anchor>>)> {
         self.read(cx).symbols_containing(offset, theme)
     }
 
@@ -412,7 +412,7 @@ impl MultiBuffer {
             is_insertion: bool,
             original_indent_column: u32,
         }
-        let mut buffer_edits: HashMap<u64, Vec<BufferEdit>> = Default::default();
+        let mut buffer_edits: HashMap<BufferId, Vec<BufferEdit>> = Default::default();
         let mut edited_excerpt_ids = Vec::new();
         let mut cursor = snapshot.excerpts.cursor::<usize>();
         for (ix, (range, new_text)) in edits.enumerate() {
@@ -514,7 +514,7 @@ impl MultiBuffer {
         // Non-generic part of edit, hoisted out to avoid blowing up LLVM IR.
         fn tail(
             this: &mut MultiBuffer,
-            buffer_edits: HashMap<u64, Vec<BufferEdit>>,
+            buffer_edits: HashMap<BufferId, Vec<BufferEdit>>,
             autoindent_mode: Option<AutoindentMode>,
             edited_excerpt_ids: Vec<ExcerptId>,
             cx: &mut ModelContext<MultiBuffer>,
@@ -720,7 +720,7 @@ impl MultiBuffer {
         cursor_shape: CursorShape,
         cx: &mut ModelContext<Self>,
     ) {
-        let mut selections_by_buffer: HashMap<u64, Vec<Selection<text::Anchor>>> =
+        let mut selections_by_buffer: HashMap<BufferId, Vec<Selection<text::Anchor>>> =
             Default::default();
         let snapshot = self.read(cx);
         let mut cursor = snapshot.excerpts.cursor::<Option<&Locator>>();
@@ -1440,7 +1440,7 @@ impl MultiBuffer {
             .collect()
     }
 
-    pub fn buffer(&self, buffer_id: u64) -> Option<Model<Buffer>> {
+    pub fn buffer(&self, buffer_id: BufferId) -> Option<Model<Buffer>> {
         self.buffers
             .borrow()
             .get(&buffer_id)
@@ -1661,7 +1661,8 @@ impl MultiBuffer {
 #[cfg(any(test, feature = "test-support"))]
 impl MultiBuffer {
     pub fn build_simple(text: &str, cx: &mut gpui::AppContext) -> Model<Self> {
-        let buffer = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), text));
+        let buffer = cx
+            .new_model(|cx| Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text));
         cx.new_model(|cx| Self::singleton(buffer, cx))
     }
 
@@ -1671,7 +1672,9 @@ impl MultiBuffer {
     ) -> Model<Self> {
         let multi = cx.new_model(|_| Self::new(0, Capability::ReadWrite));
         for (text, ranges) in excerpts {
-            let buffer = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), text));
+            let buffer = cx.new_model(|cx| {
+                Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+            });
             let excerpt_ranges = ranges.into_iter().map(|range| ExcerptRange {
                 context: range,
                 primary: None,
@@ -1760,7 +1763,9 @@ impl MultiBuffer {
             if excerpt_ids.is_empty() || (rng.gen() && excerpt_ids.len() < max_excerpts) {
                 let buffer_handle = if rng.gen() || self.buffers.borrow().is_empty() {
                     let text = RandomCharIter::new(&mut *rng).take(10).collect::<String>();
-                    buffers.push(cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), text)));
+                    buffers.push(cx.new_model(|cx| {
+                        Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+                    }));
                     let buffer = buffers.last().unwrap().read(cx);
                     log::info!(
                         "Creating new buffer {} with text: {:?}",
@@ -1987,7 +1992,7 @@ impl MultiBufferSnapshot {
         (start..end, word_kind)
     }
 
-    pub fn as_singleton(&self) -> Option<(&ExcerptId, u64, &BufferSnapshot)> {
+    pub fn as_singleton(&self) -> Option<(&ExcerptId, BufferId, &BufferSnapshot)> {
         if self.singleton {
             self.excerpts
                 .iter()
@@ -3209,7 +3214,7 @@ impl MultiBufferSnapshot {
         &self,
         offset: T,
         theme: Option<&SyntaxTheme>,
-    ) -> Option<(u64, Vec<OutlineItem<Anchor>>)> {
+    ) -> Option<(BufferId, Vec<OutlineItem<Anchor>>)> {
         let anchor = self.anchor_before(offset);
         let excerpt_id = anchor.excerpt_id;
         let excerpt = self.excerpt(excerpt_id)?;
@@ -3249,7 +3254,7 @@ impl MultiBufferSnapshot {
         }
     }
 
-    pub fn buffer_id_for_excerpt(&self, excerpt_id: ExcerptId) -> Option<u64> {
+    pub fn buffer_id_for_excerpt(&self, excerpt_id: ExcerptId) -> Option<BufferId> {
         Some(self.excerpt(excerpt_id)?.buffer_id)
     }
 
@@ -3387,7 +3392,7 @@ impl History {
     fn end_transaction(
         &mut self,
         now: Instant,
-        buffer_transactions: HashMap<u64, TransactionId>,
+        buffer_transactions: HashMap<BufferId, TransactionId>,
     ) -> bool {
         assert_ne!(self.transaction_depth, 0);
         self.transaction_depth -= 1;
@@ -3561,7 +3566,7 @@ impl Excerpt {
     fn new(
         id: ExcerptId,
         locator: Locator,
-        buffer_id: u64,
+        buffer_id: BufferId,
         buffer: BufferSnapshot,
         range: ExcerptRange<text::Anchor>,
         has_trailing_newline: bool,
@@ -4154,8 +4159,13 @@ mod tests {
 
     #[gpui::test]
     fn test_singleton(cx: &mut AppContext) {
-        let buffer =
-            cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), sample_text(6, 6, 'a')));
+        let buffer = cx.new_model(|cx| {
+            Buffer::new(
+                0,
+                BufferId::new(cx.entity_id().as_u64()).unwrap(),
+                sample_text(6, 6, 'a'),
+            )
+        });
         let multibuffer = cx.new_model(|cx| MultiBuffer::singleton(buffer.clone(), cx));
 
         let snapshot = multibuffer.read(cx).snapshot(cx);
@@ -4182,7 +4192,8 @@ mod tests {
 
     #[gpui::test]
     fn test_remote(cx: &mut AppContext) {
-        let host_buffer = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), "a"));
+        let host_buffer =
+            cx.new_model(|cx| Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), "a"));
         let guest_buffer = cx.new_model(|cx| {
             let state = host_buffer.read(cx).to_proto();
             let ops = cx
@@ -4213,10 +4224,20 @@ mod tests {
 
     #[gpui::test]
     fn test_excerpt_boundaries_and_clipping(cx: &mut AppContext) {
-        let buffer_1 =
-            cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), sample_text(6, 6, 'a')));
-        let buffer_2 =
-            cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), sample_text(6, 6, 'g')));
+        let buffer_1 = cx.new_model(|cx| {
+            Buffer::new(
+                0,
+                BufferId::new(cx.entity_id().as_u64()).unwrap(),
+                sample_text(6, 6, 'a'),
+            )
+        });
+        let buffer_2 = cx.new_model(|cx| {
+            Buffer::new(
+                0,
+                BufferId::new(cx.entity_id().as_u64()).unwrap(),
+                sample_text(6, 6, 'g'),
+            )
+        });
         let multibuffer = cx.new_model(|_| MultiBuffer::new(0, Capability::ReadWrite));
 
         let events = Arc::new(RwLock::new(Vec::<Event>::new()));
@@ -4449,10 +4470,20 @@ mod tests {
 
     #[gpui::test]
     fn test_excerpt_events(cx: &mut AppContext) {
-        let buffer_1 =
-            cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), sample_text(10, 3, 'a')));
-        let buffer_2 =
-            cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), sample_text(10, 3, 'm')));
+        let buffer_1 = cx.new_model(|cx| {
+            Buffer::new(
+                0,
+                BufferId::new(cx.entity_id().as_u64()).unwrap(),
+                sample_text(10, 3, 'a'),
+            )
+        });
+        let buffer_2 = cx.new_model(|cx| {
+            Buffer::new(
+                0,
+                BufferId::new(cx.entity_id().as_u64()).unwrap(),
+                sample_text(10, 3, 'm'),
+            )
+        });
 
         let leader_multibuffer = cx.new_model(|_| MultiBuffer::new(0, Capability::ReadWrite));
         let follower_multibuffer = cx.new_model(|_| MultiBuffer::new(0, Capability::ReadWrite));
@@ -4557,8 +4588,13 @@ mod tests {
 
     #[gpui::test]
     fn test_push_excerpts_with_context_lines(cx: &mut AppContext) {
-        let buffer =
-            cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), sample_text(20, 3, 'a')));
+        let buffer = cx.new_model(|cx| {
+            Buffer::new(
+                0,
+                BufferId::new(cx.entity_id().as_u64()).unwrap(),
+                sample_text(20, 3, 'a'),
+            )
+        });
         let multibuffer = cx.new_model(|_| MultiBuffer::new(0, Capability::ReadWrite));
         let anchor_ranges = multibuffer.update(cx, |multibuffer, cx| {
             multibuffer.push_excerpts_with_context_lines(
@@ -4594,8 +4630,13 @@ mod tests {
 
     #[gpui::test]
     async fn test_stream_excerpts_with_context_lines(cx: &mut TestAppContext) {
-        let buffer =
-            cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), sample_text(20, 3, 'a')));
+        let buffer = cx.new_model(|cx| {
+            Buffer::new(
+                0,
+                BufferId::new(cx.entity_id().as_u64()).unwrap(),
+                sample_text(20, 3, 'a'),
+            )
+        });
         let multibuffer = cx.new_model(|_| MultiBuffer::new(0, Capability::ReadWrite));
         let anchor_ranges = multibuffer.update(cx, |multibuffer, cx| {
             let snapshot = buffer.read(cx);
@@ -4641,7 +4682,9 @@ mod tests {
 
     #[gpui::test]
     fn test_singleton_multibuffer_anchors(cx: &mut AppContext) {
-        let buffer = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), "abcd"));
+        let buffer = cx.new_model(|cx| {
+            Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), "abcd")
+        });
         let multibuffer = cx.new_model(|cx| MultiBuffer::singleton(buffer.clone(), cx));
         let old_snapshot = multibuffer.read(cx).snapshot(cx);
         buffer.update(cx, |buffer, cx| {
@@ -4661,8 +4704,12 @@ mod tests {
 
     #[gpui::test]
     fn test_multibuffer_anchors(cx: &mut AppContext) {
-        let buffer_1 = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), "abcd"));
-        let buffer_2 = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), "efghi"));
+        let buffer_1 = cx.new_model(|cx| {
+            Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), "abcd")
+        });
+        let buffer_2 = cx.new_model(|cx| {
+            Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), "efghi")
+        });
         let multibuffer = cx.new_model(|cx| {
             let mut multibuffer = MultiBuffer::new(0, Capability::ReadWrite);
             multibuffer.push_excerpts(
@@ -4719,9 +4766,16 @@ mod tests {
 
     #[gpui::test]
     fn test_resolving_anchors_after_replacing_their_excerpts(cx: &mut AppContext) {
-        let buffer_1 = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), "abcd"));
-        let buffer_2 =
-            cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), "ABCDEFGHIJKLMNOP"));
+        let buffer_1 = cx.new_model(|cx| {
+            Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), "abcd")
+        });
+        let buffer_2 = cx.new_model(|cx| {
+            Buffer::new(
+                0,
+                BufferId::new(cx.entity_id().as_u64()).unwrap(),
+                "ABCDEFGHIJKLMNOP",
+            )
+        });
         let multibuffer = cx.new_model(|_| MultiBuffer::new(0, Capability::ReadWrite));
 
         // Create an insertion id in buffer 1 that doesn't exist in buffer 2.
@@ -4932,9 +4986,13 @@ mod tests {
                         let base_text = util::RandomCharIter::new(&mut rng)
                             .take(10)
                             .collect::<String>();
-                        buffers.push(
-                            cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), base_text)),
-                        );
+                        buffers.push(cx.new_model(|cx| {
+                            Buffer::new(
+                                0,
+                                BufferId::new(cx.entity_id().as_u64()).unwrap(),
+                                base_text,
+                            )
+                        }));
                         buffers.last().unwrap()
                     } else {
                         buffers.choose(&mut rng).unwrap()
@@ -5276,8 +5334,12 @@ mod tests {
         let test_settings = SettingsStore::test(cx);
         cx.set_global(test_settings);
 
-        let buffer_1 = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), "1234"));
-        let buffer_2 = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), "5678"));
+        let buffer_1 = cx.new_model(|cx| {
+            Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), "1234")
+        });
+        let buffer_2 = cx.new_model(|cx| {
+            Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), "5678")
+        });
         let multibuffer = cx.new_model(|_| MultiBuffer::new(0, Capability::ReadWrite));
         let group_interval = multibuffer.read(cx).history.group_interval;
         multibuffer.update(cx, |multibuffer, cx| {
diff --git a/crates/project/src/lsp_command.rs b/crates/project/src/lsp_command.rs
index 5536b4d84d..20bcd4b7b3 100644
--- a/crates/project/src/lsp_command.rs
+++ b/crates/project/src/lsp_command.rs
@@ -21,7 +21,7 @@ use lsp::{
     OneOf, ServerCapabilities,
 };
 use std::{cmp::Reverse, ops::Range, path::Path, sync::Arc};
-use text::LineEnding;
+use text::{BufferId, LineEnding};
 
 pub fn lsp_formatting_options(tab_size: u32) -> lsp::FormattingOptions {
     lsp::FormattingOptions {
@@ -84,7 +84,7 @@ pub trait LspCommand: 'static + Sized + Send {
         cx: AsyncAppContext,
     ) -> Result<Self::Response>;
 
-    fn buffer_id_from_proto(message: &Self::ProtoRequest) -> u64;
+    fn buffer_id_from_proto(message: &Self::ProtoRequest) -> Result<BufferId>;
 }
 
 pub(crate) struct PrepareRename {
@@ -205,7 +205,7 @@ impl LspCommand for PrepareRename {
     fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::PrepareRename {
         proto::PrepareRename {
             project_id,
-            buffer_id: buffer.remote_id(),
+            buffer_id: buffer.remote_id().into(),
             position: Some(language::proto::serialize_anchor(
                 &buffer.anchor_before(self.position),
             )),
@@ -274,8 +274,8 @@ impl LspCommand for PrepareRename {
         }
     }
 
-    fn buffer_id_from_proto(message: &proto::PrepareRename) -> u64 {
-        message.buffer_id
+    fn buffer_id_from_proto(message: &proto::PrepareRename) -> Result<BufferId> {
+        BufferId::new(message.buffer_id)
     }
 }
 
@@ -332,7 +332,7 @@ impl LspCommand for PerformRename {
     fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::PerformRename {
         proto::PerformRename {
             project_id,
-            buffer_id: buffer.remote_id(),
+            buffer_id: buffer.remote_id().into(),
             position: Some(language::proto::serialize_anchor(
                 &buffer.anchor_before(self.position),
             )),
@@ -393,8 +393,8 @@ impl LspCommand for PerformRename {
             .await
     }
 
-    fn buffer_id_from_proto(message: &proto::PerformRename) -> u64 {
-        message.buffer_id
+    fn buffer_id_from_proto(message: &proto::PerformRename) -> Result<BufferId> {
+        BufferId::new(message.buffer_id)
     }
 }
 
@@ -437,7 +437,7 @@ impl LspCommand for GetDefinition {
     fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::GetDefinition {
         proto::GetDefinition {
             project_id,
-            buffer_id: buffer.remote_id(),
+            buffer_id: buffer.remote_id().into(),
             position: Some(language::proto::serialize_anchor(
                 &buffer.anchor_before(self.position),
             )),
@@ -486,8 +486,8 @@ impl LspCommand for GetDefinition {
         location_links_from_proto(message.links, project, cx).await
     }
 
-    fn buffer_id_from_proto(message: &proto::GetDefinition) -> u64 {
-        message.buffer_id
+    fn buffer_id_from_proto(message: &proto::GetDefinition) -> Result<BufferId> {
+        BufferId::new(message.buffer_id)
     }
 }
 
@@ -538,7 +538,7 @@ impl LspCommand for GetTypeDefinition {
     fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::GetTypeDefinition {
         proto::GetTypeDefinition {
             project_id,
-            buffer_id: buffer.remote_id(),
+            buffer_id: buffer.remote_id().into(),
             position: Some(language::proto::serialize_anchor(
                 &buffer.anchor_before(self.position),
             )),
@@ -587,8 +587,8 @@ impl LspCommand for GetTypeDefinition {
         location_links_from_proto(message.links, project, cx).await
     }
 
-    fn buffer_id_from_proto(message: &proto::GetTypeDefinition) -> u64 {
-        message.buffer_id
+    fn buffer_id_from_proto(message: &proto::GetTypeDefinition) -> Result<BufferId> {
+        BufferId::new(message.buffer_id)
     }
 }
 
@@ -617,9 +617,10 @@ async fn location_links_from_proto(
     for link in proto_links {
         let origin = match link.origin {
             Some(origin) => {
+                let buffer_id = BufferId::new(origin.buffer_id)?;
                 let buffer = project
                     .update(&mut cx, |this, cx| {
-                        this.wait_for_remote_buffer(origin.buffer_id, cx)
+                        this.wait_for_remote_buffer(buffer_id, cx)
                     })?
                     .await?;
                 let start = origin
@@ -642,9 +643,10 @@ async fn location_links_from_proto(
         };
 
         let target = link.target.ok_or_else(|| anyhow!("missing target"))?;
+        let buffer_id = BufferId::new(target.buffer_id)?;
         let buffer = project
             .update(&mut cx, |this, cx| {
-                this.wait_for_remote_buffer(target.buffer_id, cx)
+                this.wait_for_remote_buffer(buffer_id, cx)
             })?
             .await?;
         let start = target
@@ -761,7 +763,9 @@ fn location_links_to_proto(
         .into_iter()
         .map(|definition| {
             let origin = definition.origin.map(|origin| {
-                let buffer_id = project.create_buffer_for_peer(&origin.buffer, peer_id, cx);
+                let buffer_id = project
+                    .create_buffer_for_peer(&origin.buffer, peer_id, cx)
+                    .into();
                 proto::Location {
                     start: Some(serialize_anchor(&origin.range.start)),
                     end: Some(serialize_anchor(&origin.range.end)),
@@ -769,7 +773,9 @@ fn location_links_to_proto(
                 }
             });
 
-            let buffer_id = project.create_buffer_for_peer(&definition.target.buffer, peer_id, cx);
+            let buffer_id = project
+                .create_buffer_for_peer(&definition.target.buffer, peer_id, cx)
+                .into();
             let target = proto::Location {
                 start: Some(serialize_anchor(&definition.target.range.start)),
                 end: Some(serialize_anchor(&definition.target.range.end)),
@@ -859,7 +865,7 @@ impl LspCommand for GetReferences {
     fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::GetReferences {
         proto::GetReferences {
             project_id,
-            buffer_id: buffer.remote_id(),
+            buffer_id: buffer.remote_id().into(),
             position: Some(language::proto::serialize_anchor(
                 &buffer.anchor_before(self.position),
             )),
@@ -901,7 +907,7 @@ impl LspCommand for GetReferences {
                 proto::Location {
                     start: Some(serialize_anchor(&definition.range.start)),
                     end: Some(serialize_anchor(&definition.range.end)),
-                    buffer_id,
+                    buffer_id: buffer_id.into(),
                 }
             })
             .collect();
@@ -917,9 +923,10 @@ impl LspCommand for GetReferences {
     ) -> Result<Vec<Location>> {
         let mut locations = Vec::new();
         for location in message.locations {
+            let buffer_id = BufferId::new(location.buffer_id)?;
             let target_buffer = project
                 .update(&mut cx, |this, cx| {
-                    this.wait_for_remote_buffer(location.buffer_id, cx)
+                    this.wait_for_remote_buffer(buffer_id, cx)
                 })?
                 .await?;
             let start = location
@@ -941,8 +948,8 @@ impl LspCommand for GetReferences {
         Ok(locations)
     }
 
-    fn buffer_id_from_proto(message: &proto::GetReferences) -> u64 {
-        message.buffer_id
+    fn buffer_id_from_proto(message: &proto::GetReferences) -> Result<BufferId> {
+        BufferId::new(message.buffer_id)
     }
 }
 
@@ -1007,7 +1014,7 @@ impl LspCommand for GetDocumentHighlights {
     fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::GetDocumentHighlights {
         proto::GetDocumentHighlights {
             project_id,
-            buffer_id: buffer.remote_id(),
+            buffer_id: buffer.remote_id().into(),
             position: Some(language::proto::serialize_anchor(
                 &buffer.anchor_before(self.position),
             )),
@@ -1092,8 +1099,8 @@ impl LspCommand for GetDocumentHighlights {
         Ok(highlights)
     }
 
-    fn buffer_id_from_proto(message: &proto::GetDocumentHighlights) -> u64 {
-        message.buffer_id
+    fn buffer_id_from_proto(message: &proto::GetDocumentHighlights) -> Result<BufferId> {
+        BufferId::new(message.buffer_id)
     }
 }
 
@@ -1195,7 +1202,7 @@ impl LspCommand for GetHover {
     fn to_proto(&self, project_id: u64, buffer: &Buffer) -> Self::ProtoRequest {
         proto::GetHover {
             project_id,
-            buffer_id: buffer.remote_id(),
+            buffer_id: buffer.remote_id().into(),
             position: Some(language::proto::serialize_anchor(
                 &buffer.anchor_before(self.position),
             )),
@@ -1308,8 +1315,8 @@ impl LspCommand for GetHover {
         }))
     }
 
-    fn buffer_id_from_proto(message: &Self::ProtoRequest) -> u64 {
-        message.buffer_id
+    fn buffer_id_from_proto(message: &Self::ProtoRequest) -> Result<BufferId> {
+        BufferId::new(message.buffer_id)
     }
 }
 
@@ -1492,7 +1499,7 @@ impl LspCommand for GetCompletions {
         let anchor = buffer.anchor_after(self.position);
         proto::GetCompletions {
             project_id,
-            buffer_id: buffer.remote_id(),
+            buffer_id: buffer.remote_id().into(),
             position: Some(language::proto::serialize_anchor(&anchor)),
             version: serialize_version(&buffer.version()),
         }
@@ -1556,8 +1563,8 @@ impl LspCommand for GetCompletions {
         future::try_join_all(completions).await
     }
 
-    fn buffer_id_from_proto(message: &proto::GetCompletions) -> u64 {
-        message.buffer_id
+    fn buffer_id_from_proto(message: &proto::GetCompletions) -> Result<BufferId> {
+        BufferId::new(message.buffer_id)
     }
 }
 
@@ -1630,7 +1637,7 @@ impl LspCommand for GetCodeActions {
     fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::GetCodeActions {
         proto::GetCodeActions {
             project_id,
-            buffer_id: buffer.remote_id(),
+            buffer_id: buffer.remote_id().into(),
             start: Some(language::proto::serialize_anchor(&self.range.start)),
             end: Some(language::proto::serialize_anchor(&self.range.end)),
             version: serialize_version(&buffer.version()),
@@ -1695,8 +1702,8 @@ impl LspCommand for GetCodeActions {
             .collect()
     }
 
-    fn buffer_id_from_proto(message: &proto::GetCodeActions) -> u64 {
-        message.buffer_id
+    fn buffer_id_from_proto(message: &proto::GetCodeActions) -> Result<BufferId> {
+        BufferId::new(message.buffer_id)
     }
 }
 
@@ -1768,7 +1775,7 @@ impl LspCommand for OnTypeFormatting {
     fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::OnTypeFormatting {
         proto::OnTypeFormatting {
             project_id,
-            buffer_id: buffer.remote_id(),
+            buffer_id: buffer.remote_id().into(),
             position: Some(language::proto::serialize_anchor(
                 &buffer.anchor_before(self.position),
             )),
@@ -1831,8 +1838,8 @@ impl LspCommand for OnTypeFormatting {
         Ok(Some(language::proto::deserialize_transaction(transaction)?))
     }
 
-    fn buffer_id_from_proto(message: &proto::OnTypeFormatting) -> u64 {
-        message.buffer_id
+    fn buffer_id_from_proto(message: &proto::OnTypeFormatting) -> Result<BufferId> {
+        BufferId::new(message.buffer_id)
     }
 }
 
@@ -2291,7 +2298,7 @@ impl LspCommand for InlayHints {
     fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::InlayHints {
         proto::InlayHints {
             project_id,
-            buffer_id: buffer.remote_id(),
+            buffer_id: buffer.remote_id().into(),
             start: Some(language::proto::serialize_anchor(&self.range.start)),
             end: Some(language::proto::serialize_anchor(&self.range.end)),
             version: serialize_version(&buffer.version()),
@@ -2358,7 +2365,7 @@ impl LspCommand for InlayHints {
         Ok(hints)
     }
 
-    fn buffer_id_from_proto(message: &proto::InlayHints) -> u64 {
-        message.buffer_id
+    fn buffer_id_from_proto(message: &proto::InlayHints) -> Result<BufferId> {
+        BufferId::new(message.buffer_id)
     }
 }
diff --git a/crates/project/src/lsp_ext_command.rs b/crates/project/src/lsp_ext_command.rs
index 683e5087cc..a35fdd152f 100644
--- a/crates/project/src/lsp_ext_command.rs
+++ b/crates/project/src/lsp_ext_command.rs
@@ -1,13 +1,13 @@
 use std::{path::Path, sync::Arc};
 
-use anyhow::Context;
+use anyhow::{Context, Result};
 use async_trait::async_trait;
 use gpui::{AppContext, AsyncAppContext, Model};
 use language::{point_to_lsp, proto::deserialize_anchor, Buffer};
 use lsp::{LanguageServer, LanguageServerId};
 use rpc::proto::{self, PeerId};
 use serde::{Deserialize, Serialize};
-use text::{PointUtf16, ToPointUtf16};
+use text::{BufferId, PointUtf16, ToPointUtf16};
 
 use crate::{lsp_command::LspCommand, Project};
 
@@ -83,7 +83,7 @@ impl LspCommand for ExpandMacro {
     fn to_proto(&self, project_id: u64, buffer: &Buffer) -> proto::LspExtExpandMacro {
         proto::LspExtExpandMacro {
             project_id,
-            buffer_id: buffer.remote_id(),
+            buffer_id: buffer.remote_id().into(),
             position: Some(language::proto::serialize_anchor(
                 &buffer.anchor_before(self.position),
             )),
@@ -131,7 +131,7 @@ impl LspCommand for ExpandMacro {
         })
     }
 
-    fn buffer_id_from_proto(message: &proto::LspExtExpandMacro) -> u64 {
-        message.buffer_id
+    fn buffer_id_from_proto(message: &proto::LspExtExpandMacro) -> Result<BufferId> {
+        BufferId::new(message.buffer_id)
     }
 }
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 4f7fe8302a..9b1a59ce85 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -12,7 +12,7 @@ mod project_tests;
 #[cfg(test)]
 mod worktree_tests;
 
-use anyhow::{anyhow, Context as _, Result};
+use anyhow::{anyhow, bail, Context as _, Result};
 use client::{proto, Client, Collaborator, TypedEnvelope, UserStore};
 use clock::ReplicaId;
 use collections::{hash_map, BTreeMap, HashMap, HashSet, VecDeque};
@@ -81,7 +81,7 @@ use std::{
     time::{Duration, Instant},
 };
 use terminals::Terminals;
-use text::Anchor;
+use text::{Anchor, BufferId};
 use util::{
     debug_panic, defer, http::HttpClient, merge_json_value_into,
     paths::LOCAL_SETTINGS_RELATIVE_PATH, post_inc, ResultExt, TryFutureExt as _,
@@ -120,9 +120,9 @@ pub struct Project {
     collaborators: HashMap<proto::PeerId, Collaborator>,
     client_subscriptions: Vec<client::Subscription>,
     _subscriptions: Vec<gpui::Subscription>,
-    next_buffer_id: u64,
+    next_buffer_id: BufferId,
     opened_buffer: (watch::Sender<()>, watch::Receiver<()>),
-    shared_buffers: HashMap<proto::PeerId, HashSet<u64>>,
+    shared_buffers: HashMap<proto::PeerId, HashSet<BufferId>>,
     #[allow(clippy::type_complexity)]
     loading_buffers_by_path: HashMap<
         ProjectPath,
@@ -131,14 +131,14 @@ pub struct Project {
     #[allow(clippy::type_complexity)]
     loading_local_worktrees:
         HashMap<Arc<Path>, Shared<Task<Result<Model<Worktree>, Arc<anyhow::Error>>>>>,
-    opened_buffers: HashMap<u64, OpenBuffer>,
-    local_buffer_ids_by_path: HashMap<ProjectPath, u64>,
-    local_buffer_ids_by_entry_id: HashMap<ProjectEntryId, u64>,
+    opened_buffers: HashMap<BufferId, OpenBuffer>,
+    local_buffer_ids_by_path: HashMap<ProjectPath, BufferId>,
+    local_buffer_ids_by_entry_id: HashMap<ProjectEntryId, BufferId>,
     /// A mapping from a buffer ID to None means that we've started waiting for an ID but haven't finished loading it.
     /// Used for re-issuing buffer requests when peers temporarily disconnect
-    incomplete_remote_buffers: HashMap<u64, Option<Model<Buffer>>>,
-    buffer_snapshots: HashMap<u64, HashMap<LanguageServerId, Vec<LspBufferSnapshot>>>, // buffer_id -> server_id -> vec of snapshots
-    buffers_being_formatted: HashSet<u64>,
+    incomplete_remote_buffers: HashMap<BufferId, Option<Model<Buffer>>>,
+    buffer_snapshots: HashMap<BufferId, HashMap<LanguageServerId, Vec<LspBufferSnapshot>>>, // buffer_id -> server_id -> vec of snapshots
+    buffers_being_formatted: HashSet<BufferId>,
     buffers_needing_diff: HashSet<WeakModel<Buffer>>,
     git_diff_debouncer: DelayedDebounced,
     nonce: u128,
@@ -210,7 +210,7 @@ struct LspBufferSnapshot {
 /// Message ordered with respect to buffer operations
 enum BufferOrderedMessage {
     Operation {
-        buffer_id: u64,
+        buffer_id: BufferId,
         operation: proto::Operation,
     },
     LanguageServerUpdate {
@@ -224,7 +224,7 @@ enum LocalProjectUpdate {
     WorktreesChanged,
     CreateBufferForPeer {
         peer_id: proto::PeerId,
-        buffer_id: u64,
+        buffer_id: BufferId,
     },
 }
 
@@ -636,7 +636,7 @@ impl Project {
                 worktrees: Vec::new(),
                 buffer_ordered_messages_tx: tx,
                 collaborators: Default::default(),
-                next_buffer_id: 0,
+                next_buffer_id: BufferId::new(1).unwrap(),
                 opened_buffers: Default::default(),
                 shared_buffers: Default::default(),
                 incomplete_remote_buffers: Default::default(),
@@ -722,7 +722,7 @@ impl Project {
                 worktrees: Vec::new(),
                 buffer_ordered_messages_tx: tx,
                 loading_buffers_by_path: Default::default(),
-                next_buffer_id: 0,
+                next_buffer_id: BufferId::default(),
                 opened_buffer: watch::channel(),
                 shared_buffers: Default::default(),
                 incomplete_remote_buffers: Default::default(),
@@ -997,7 +997,7 @@ impl Project {
         cx.notify();
     }
 
-    pub fn buffer_for_id(&self, remote_id: u64) -> Option<Model<Buffer>> {
+    pub fn buffer_for_id(&self, remote_id: BufferId) -> Option<Model<Buffer>> {
         self.opened_buffers
             .get(&remote_id)
             .and_then(|buffer| buffer.upgrade())
@@ -1479,7 +1479,7 @@ impl Project {
                                                 variant: Some(
                                                     proto::create_buffer_for_peer::Variant::Chunk(
                                                         proto::BufferChunk {
-                                                            buffer_id,
+                                                            buffer_id: buffer_id.into(),
                                                             operations: chunk,
                                                             is_last,
                                                         },
@@ -1713,7 +1713,7 @@ impl Project {
         if self.is_remote() {
             return Err(anyhow!("creating buffers as a guest is not supported yet"));
         }
-        let id = post_inc(&mut self.next_buffer_id);
+        let id = self.next_buffer_id.next();
         let buffer = cx.new_model(|cx| {
             Buffer::new(self.replica_id(), id, text)
                 .with_language(language.unwrap_or_else(|| language::PLAIN_TEXT.clone()), cx)
@@ -1814,7 +1814,7 @@ impl Project {
         worktree: &Model<Worktree>,
         cx: &mut ModelContext<Self>,
     ) -> Task<Result<Model<Buffer>>> {
-        let buffer_id = post_inc(&mut self.next_buffer_id);
+        let buffer_id = self.next_buffer_id.next();
         let load_buffer = worktree.update(cx, |worktree, cx| {
             let worktree = worktree.as_local_mut().unwrap();
             worktree.load_buffer(buffer_id, path, cx)
@@ -1845,8 +1845,9 @@ impl Project {
                     path: path_string,
                 })
                 .await?;
+            let buffer_id = BufferId::new(response.buffer_id)?;
             this.update(&mut cx, |this, cx| {
-                this.wait_for_remote_buffer(response.buffer_id, cx)
+                this.wait_for_remote_buffer(buffer_id, cx)
             })?
             .await
         })
@@ -1895,7 +1896,7 @@ impl Project {
 
     pub fn open_buffer_by_id(
         &mut self,
-        id: u64,
+        id: BufferId,
         cx: &mut ModelContext<Self>,
     ) -> Task<Result<Model<Buffer>>> {
         if let Some(buffer) = self.buffer_for_id(id) {
@@ -1903,11 +1904,12 @@ impl Project {
         } else if self.is_local() {
             Task::ready(Err(anyhow!("buffer {} does not exist", id)))
         } else if let Some(project_id) = self.remote_id() {
-            let request = self
-                .client
-                .request(proto::OpenBufferById { project_id, id });
+            let request = self.client.request(proto::OpenBufferById {
+                project_id,
+                id: id.into(),
+            });
             cx.spawn(move |this, mut cx| async move {
-                let buffer_id = request.await?.buffer_id;
+                let buffer_id = BufferId::new(request.await?.buffer_id)?;
                 this.update(&mut cx, |this, cx| {
                     this.wait_for_remote_buffer(buffer_id, cx)
                 })?
@@ -2223,7 +2225,7 @@ impl Project {
         let mut operations_by_buffer_id = HashMap::default();
         async fn flush_operations(
             this: &WeakModel<Project>,
-            operations_by_buffer_id: &mut HashMap<u64, Vec<proto::Operation>>,
+            operations_by_buffer_id: &mut HashMap<BufferId, Vec<proto::Operation>>,
             needs_resync_with_host: &mut bool,
             is_local: bool,
             cx: &mut AsyncAppContext,
@@ -2232,7 +2234,7 @@ impl Project {
                 let request = this.update(cx, |this, _| {
                     let project_id = this.remote_id()?;
                     Some(this.client.request(proto::UpdateBuffer {
-                        buffer_id,
+                        buffer_id: buffer_id.into(),
                         project_id,
                         operations,
                     }))
@@ -4078,7 +4080,9 @@ impl Project {
                         buffer_ids: remote_buffers
                             .iter()
                             .filter_map(|buffer| {
-                                buffer.update(&mut cx, |buffer, _| buffer.remote_id()).ok()
+                                buffer
+                                    .update(&mut cx, |buffer, _| buffer.remote_id().into())
+                                    .ok()
                             })
                             .collect(),
                     })
@@ -4324,7 +4328,7 @@ impl Project {
                             buffer_ids: buffers
                                 .iter()
                                 .map(|buffer| {
-                                    buffer.update(&mut cx, |buffer, _| buffer.remote_id())
+                                    buffer.update(&mut cx, |buffer, _| buffer.remote_id().into())
                                 })
                                 .collect::<Result<_>>()?,
                         })
@@ -4720,8 +4724,9 @@ impl Project {
             });
             cx.spawn(move |this, mut cx| async move {
                 let response = request.await?;
+                let buffer_id = BufferId::new(response.buffer_id)?;
                 this.update(&mut cx, |this, cx| {
-                    this.wait_for_remote_buffer(response.buffer_id, cx)
+                    this.wait_for_remote_buffer(buffer_id, cx)
                 })?
                 .await
             })
@@ -5047,7 +5052,7 @@ impl Project {
                 let response = client
                     .request(proto::ApplyCompletionAdditionalEdits {
                         project_id,
-                        buffer_id,
+                        buffer_id: buffer_id.into(),
                         completion: Some(language::proto::serialize_completion(&completion)),
                     })
                     .await?;
@@ -5179,7 +5184,7 @@ impl Project {
             let client = self.client.clone();
             let request = proto::ApplyCodeAction {
                 project_id,
-                buffer_id: buffer_handle.read(cx).remote_id(),
+                buffer_id: buffer_handle.read(cx).remote_id().into(),
                 action: Some(language::proto::serialize_code_action(&action)),
             };
             cx.spawn(move |this, mut cx| async move {
@@ -5242,7 +5247,7 @@ impl Project {
             let client = self.client.clone();
             let request = proto::OnTypeFormatting {
                 project_id,
-                buffer_id: buffer.read(cx).remote_id(),
+                buffer_id: buffer.read(cx).remote_id().into(),
                 position: Some(serialize_anchor(&position)),
                 trigger,
                 version: serialize_version(&buffer.read(cx).version()),
@@ -5531,7 +5536,7 @@ impl Project {
         let range = buffer.anchor_before(range.start)..buffer.anchor_before(range.end);
         let range_start = range.start;
         let range_end = range.end;
-        let buffer_id = buffer.remote_id();
+        let buffer_id = buffer.remote_id().into();
         let buffer_version = buffer.version().clone();
         let lsp_request = InlayHints { range };
 
@@ -5624,7 +5629,7 @@ impl Project {
             let client = self.client.clone();
             let request = proto::ResolveInlayHint {
                 project_id,
-                buffer_id: buffer_handle.read(cx).remote_id(),
+                buffer_id: buffer_handle.read(cx).remote_id().into(),
                 language_server_id: server_id.0 as u64,
                 hint: Some(InlayHints::project_to_proto_hint(hint.clone())),
             };
@@ -5659,9 +5664,10 @@ impl Project {
                 let response = request.await?;
                 let mut result = HashMap::default();
                 for location in response.locations {
+                    let buffer_id = BufferId::new(location.buffer_id)?;
                     let target_buffer = this
                         .update(&mut cx, |this, cx| {
-                            this.wait_for_remote_buffer(location.buffer_id, cx)
+                            this.wait_for_remote_buffer(buffer_id, cx)
                         })?
                         .await?;
                     let start = location
@@ -6555,7 +6561,7 @@ impl Project {
                             self.client
                                 .send(proto::UpdateBufferFile {
                                     project_id,
-                                    buffer_id: buffer_id as u64,
+                                    buffer_id: buffer_id.into(),
                                     file: Some(new_file.to_proto()),
                                 })
                                 .log_err();
@@ -6721,7 +6727,7 @@ impl Project {
             for (buffer, diff_base) in diff_bases_by_buffer {
                 let buffer_id = buffer.update(&mut cx, |buffer, cx| {
                     buffer.set_diff_base(diff_base.clone(), cx);
-                    buffer.remote_id()
+                    buffer.remote_id().into()
                 })?;
                 if let Some(project_id) = remote_id {
                     client
@@ -7353,7 +7359,7 @@ impl Project {
     ) -> Result<proto::Ack> {
         this.update(&mut cx, |this, cx| {
             let payload = envelope.payload.clone();
-            let buffer_id = payload.buffer_id;
+            let buffer_id = BufferId::new(payload.buffer_id)?;
             let ops = payload
                 .operations
                 .into_iter()
@@ -7404,7 +7410,7 @@ impl Project {
                             as Arc<dyn language::File>);
                     }
 
-                    let buffer_id = state.id;
+                    let buffer_id = BufferId::new(state.id)?;
                     let buffer = cx.new_model(|_| {
                         Buffer::from_proto(this.replica_id(), this.capability(), state, buffer_file)
                             .unwrap()
@@ -7413,9 +7419,10 @@ impl Project {
                         .insert(buffer_id, Some(buffer));
                 }
                 proto::create_buffer_for_peer::Variant::Chunk(chunk) => {
+                    let buffer_id = BufferId::new(chunk.buffer_id)?;
                     let buffer = this
                         .incomplete_remote_buffers
-                        .get(&chunk.buffer_id)
+                        .get(&buffer_id)
                         .cloned()
                         .flatten()
                         .ok_or_else(|| {
@@ -7432,7 +7439,7 @@ impl Project {
                     buffer.update(cx, |buffer, cx| buffer.apply_ops(operations, cx))?;
 
                     if chunk.is_last {
-                        this.incomplete_remote_buffers.remove(&chunk.buffer_id);
+                        this.incomplete_remote_buffers.remove(&buffer_id);
                         this.register_buffer(&buffer, cx)?;
                     }
                 }
@@ -7450,6 +7457,7 @@ impl Project {
     ) -> Result<()> {
         this.update(&mut cx, |this, cx| {
             let buffer_id = envelope.payload.buffer_id;
+            let buffer_id = BufferId::new(buffer_id)?;
             let diff_base = envelope.payload.diff_base;
             if let Some(buffer) = this
                 .opened_buffers
@@ -7475,6 +7483,7 @@ impl Project {
         mut cx: AsyncAppContext,
     ) -> Result<()> {
         let buffer_id = envelope.payload.buffer_id;
+        let buffer_id = BufferId::new(buffer_id)?;
 
         this.update(&mut cx, |this, cx| {
             let payload = envelope.payload.clone();
@@ -7509,7 +7518,7 @@ impl Project {
         _: Arc<Client>,
         mut cx: AsyncAppContext,
     ) -> Result<proto::BufferSaved> {
-        let buffer_id = envelope.payload.buffer_id;
+        let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
         let (project_id, buffer) = this.update(&mut cx, |this, _cx| {
             let project_id = this.remote_id().ok_or_else(|| anyhow!("not connected"))?;
             let buffer = this
@@ -7530,7 +7539,7 @@ impl Project {
             .await?;
         Ok(buffer.update(&mut cx, |buffer, _| proto::BufferSaved {
             project_id,
-            buffer_id,
+            buffer_id: buffer_id.into(),
             version: serialize_version(buffer.saved_version()),
             mtime: Some(buffer.saved_mtime().into()),
             fingerprint: language::proto::serialize_fingerprint(buffer.saved_version_fingerprint()),
@@ -7547,9 +7556,10 @@ impl Project {
         let reload = this.update(&mut cx, |this, cx| {
             let mut buffers = HashSet::default();
             for buffer_id in &envelope.payload.buffer_ids {
+                let buffer_id = BufferId::new(*buffer_id)?;
                 buffers.insert(
                     this.opened_buffers
-                        .get(buffer_id)
+                        .get(&buffer_id)
                         .and_then(|buffer| buffer.upgrade())
                         .ok_or_else(|| anyhow!("unknown buffer id {}", buffer_id))?,
                 );
@@ -7580,12 +7590,12 @@ impl Project {
         this.update(&mut cx, |this, cx| {
             let Some(guest_id) = envelope.original_sender_id else {
                 error!("missing original_sender_id on SynchronizeBuffers request");
-                return;
+                bail!("missing original_sender_id on SynchronizeBuffers request");
             };
 
             this.shared_buffers.entry(guest_id).or_default().clear();
             for buffer in envelope.payload.buffers {
-                let buffer_id = buffer.id;
+                let buffer_id = BufferId::new(buffer.id)?;
                 let remote_version = language::proto::deserialize_version(&buffer.version);
                 if let Some(buffer) = this.buffer_for_id(buffer_id) {
                     this.shared_buffers
@@ -7595,7 +7605,7 @@ impl Project {
 
                     let buffer = buffer.read(cx);
                     response.buffers.push(proto::BufferVersion {
-                        id: buffer_id,
+                        id: buffer_id.into(),
                         version: language::proto::serialize_version(&buffer.version),
                     });
 
@@ -7605,7 +7615,7 @@ impl Project {
                         client
                             .send(proto::UpdateBufferFile {
                                 project_id,
-                                buffer_id: buffer_id as u64,
+                                buffer_id: buffer_id.into(),
                                 file: Some(file.to_proto()),
                             })
                             .log_err();
@@ -7614,7 +7624,7 @@ impl Project {
                     client
                         .send(proto::UpdateDiffBase {
                             project_id,
-                            buffer_id: buffer_id as u64,
+                            buffer_id: buffer_id.into(),
                             diff_base: buffer.diff_base().map(Into::into),
                         })
                         .log_err();
@@ -7622,7 +7632,7 @@ impl Project {
                     client
                         .send(proto::BufferReloaded {
                             project_id,
-                            buffer_id,
+                            buffer_id: buffer_id.into(),
                             version: language::proto::serialize_version(buffer.saved_version()),
                             mtime: Some(buffer.saved_mtime().into()),
                             fingerprint: language::proto::serialize_fingerprint(
@@ -7642,7 +7652,7 @@ impl Project {
                                     client
                                         .request(proto::UpdateBuffer {
                                             project_id,
-                                            buffer_id,
+                                            buffer_id: buffer_id.into(),
                                             operations: chunk,
                                         })
                                         .await?;
@@ -7654,7 +7664,8 @@ impl Project {
                         .detach();
                 }
             }
-        })?;
+            Ok(())
+        })??;
 
         Ok(response)
     }
@@ -7669,9 +7680,10 @@ impl Project {
         let format = this.update(&mut cx, |this, cx| {
             let mut buffers = HashSet::default();
             for buffer_id in &envelope.payload.buffer_ids {
+                let buffer_id = BufferId::new(*buffer_id)?;
                 buffers.insert(
                     this.opened_buffers
-                        .get(buffer_id)
+                        .get(&buffer_id)
                         .and_then(|buffer| buffer.upgrade())
                         .ok_or_else(|| anyhow!("unknown buffer id {}", buffer_id))?,
                 );
@@ -7696,11 +7708,12 @@ impl Project {
         mut cx: AsyncAppContext,
     ) -> Result<proto::ApplyCompletionAdditionalEditsResponse> {
         let (buffer, completion) = this.update(&mut cx, |this, cx| {
+            let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
             let buffer = this
                 .opened_buffers
-                .get(&envelope.payload.buffer_id)
+                .get(&buffer_id)
                 .and_then(|buffer| buffer.upgrade())
-                .ok_or_else(|| anyhow!("unknown buffer id {}", envelope.payload.buffer_id))?;
+                .ok_or_else(|| anyhow!("unknown buffer id {}", buffer_id))?;
             let language = buffer.read(cx).language();
             let completion = language::proto::deserialize_completion(
                 envelope
@@ -7774,9 +7787,10 @@ impl Project {
                 .ok_or_else(|| anyhow!("invalid action"))?,
         )?;
         let apply_code_action = this.update(&mut cx, |this, cx| {
+            let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
             let buffer = this
                 .opened_buffers
-                .get(&envelope.payload.buffer_id)
+                .get(&buffer_id)
                 .and_then(|buffer| buffer.upgrade())
                 .ok_or_else(|| anyhow!("unknown buffer id {}", envelope.payload.buffer_id))?;
             Ok::<_, anyhow::Error>(this.apply_code_action(buffer, action, false, cx))
@@ -7798,11 +7812,12 @@ impl Project {
         mut cx: AsyncAppContext,
     ) -> Result<proto::OnTypeFormattingResponse> {
         let on_type_formatting = this.update(&mut cx, |this, cx| {
+            let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
             let buffer = this
                 .opened_buffers
-                .get(&envelope.payload.buffer_id)
+                .get(&buffer_id)
                 .and_then(|buffer| buffer.upgrade())
-                .ok_or_else(|| anyhow!("unknown buffer id {}", envelope.payload.buffer_id))?;
+                .ok_or_else(|| anyhow!("unknown buffer id {}", buffer_id))?;
             let position = envelope
                 .payload
                 .position
@@ -7830,9 +7845,10 @@ impl Project {
         mut cx: AsyncAppContext,
     ) -> Result<proto::InlayHintsResponse> {
         let sender_id = envelope.original_sender_id()?;
+        let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
         let buffer = this.update(&mut cx, |this, _| {
             this.opened_buffers
-                .get(&envelope.payload.buffer_id)
+                .get(&buffer_id)
                 .and_then(|buffer| buffer.upgrade())
                 .ok_or_else(|| anyhow!("unknown buffer id {}", envelope.payload.buffer_id))
         })??;
@@ -7886,10 +7902,11 @@ impl Project {
         let hint = InlayHints::proto_to_project_hint(proto_hint)
             .context("resolved proto inlay hint conversion")?;
         let buffer = this.update(&mut cx, |this, _cx| {
+            let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
             this.opened_buffers
-                .get(&envelope.payload.buffer_id)
+                .get(&buffer_id)
                 .and_then(|buffer| buffer.upgrade())
-                .ok_or_else(|| anyhow!("unknown buffer id {}", envelope.payload.buffer_id))
+                .ok_or_else(|| anyhow!("unknown buffer id {}", buffer_id))
         })??;
         let response_hint = this
             .update(&mut cx, |project, cx| {
@@ -7930,7 +7947,7 @@ impl Project {
         <T::LspRequest as lsp::request::Request>::Result: Send,
     {
         let sender_id = envelope.original_sender_id()?;
-        let buffer_id = T::buffer_id_from_proto(&envelope.payload);
+        let buffer_id = T::buffer_id_from_proto(&envelope.payload)?;
         let buffer_handle = this.update(&mut cx, |this, _cx| {
             this.opened_buffers
                 .get(&buffer_id)
@@ -7995,7 +8012,7 @@ impl Project {
                     let start = serialize_anchor(&range.start);
                     let end = serialize_anchor(&range.end);
                     let buffer_id = this.update(&mut cx, |this, cx| {
-                        this.create_buffer_for_peer(&buffer, peer_id, cx)
+                        this.create_buffer_for_peer(&buffer, peer_id, cx).into()
                     })?;
                     locations.push(proto::Location {
                         buffer_id,
@@ -8037,7 +8054,7 @@ impl Project {
 
         Ok(proto::OpenBufferForSymbolResponse {
             buffer_id: this.update(&mut cx, |this, cx| {
-                this.create_buffer_for_peer(&buffer, peer_id, cx)
+                this.create_buffer_for_peer(&buffer, peer_id, cx).into()
             })?,
         })
     }
@@ -8057,14 +8074,13 @@ impl Project {
         mut cx: AsyncAppContext,
     ) -> Result<proto::OpenBufferResponse> {
         let peer_id = envelope.original_sender_id()?;
+        let buffer_id = BufferId::new(envelope.payload.id)?;
         let buffer = this
-            .update(&mut cx, |this, cx| {
-                this.open_buffer_by_id(envelope.payload.id, cx)
-            })?
+            .update(&mut cx, |this, cx| this.open_buffer_by_id(buffer_id, cx))?
             .await?;
         this.update(&mut cx, |this, cx| {
             Ok(proto::OpenBufferResponse {
-                buffer_id: this.create_buffer_for_peer(&buffer, peer_id, cx),
+                buffer_id: this.create_buffer_for_peer(&buffer, peer_id, cx).into(),
             })
         })?
     }
@@ -8090,7 +8106,7 @@ impl Project {
         let buffer = open_buffer.await?;
         this.update(&mut cx, |this, cx| {
             Ok(proto::OpenBufferResponse {
-                buffer_id: this.create_buffer_for_peer(&buffer, peer_id, cx),
+                buffer_id: this.create_buffer_for_peer(&buffer, peer_id, cx).into(),
             })
         })?
     }
@@ -8108,7 +8124,7 @@ impl Project {
         for (buffer, transaction) in project_transaction.0 {
             serialized_transaction
                 .buffer_ids
-                .push(self.create_buffer_for_peer(&buffer, peer_id, cx));
+                .push(self.create_buffer_for_peer(&buffer, peer_id, cx).into());
             serialized_transaction
                 .transactions
                 .push(language::proto::serialize_transaction(&transaction));
@@ -8126,6 +8142,7 @@ impl Project {
             let mut project_transaction = ProjectTransaction::default();
             for (buffer_id, transaction) in message.buffer_ids.into_iter().zip(message.transactions)
             {
+                let buffer_id = BufferId::new(buffer_id)?;
                 let buffer = this
                     .update(&mut cx, |this, cx| {
                         this.wait_for_remote_buffer(buffer_id, cx)
@@ -8158,7 +8175,7 @@ impl Project {
         buffer: &Model<Buffer>,
         peer_id: proto::PeerId,
         cx: &mut AppContext,
-    ) -> u64 {
+    ) -> BufferId {
         let buffer_id = buffer.read(cx).remote_id();
         if let ProjectClientState::Shared { updates_tx, .. } = &self.client_state {
             updates_tx
@@ -8170,7 +8187,7 @@ impl Project {
 
     fn wait_for_remote_buffer(
         &mut self,
-        id: u64,
+        id: BufferId,
         cx: &mut ModelContext<Self>,
     ) -> Task<Result<Model<Buffer>>> {
         let mut opened_buffer_rx = self.opened_buffer.1.clone();
@@ -8239,7 +8256,7 @@ impl Project {
                     .filter_map(|(id, buffer)| {
                         let buffer = buffer.upgrade()?;
                         Some(proto::BufferVersion {
-                            id: *id,
+                            id: (*id).into(),
                             version: language::proto::serialize_version(&buffer.read(cx).version),
                         })
                     })
@@ -8265,7 +8282,12 @@ impl Project {
                     .into_iter()
                     .map(|buffer| {
                         let client = client.clone();
-                        let buffer_id = buffer.id;
+                        let buffer_id = match BufferId::new(buffer.id) {
+                            Ok(id) => id,
+                            Err(e) => {
+                                return Task::ready(Err(e));
+                            }
+                        };
                         let remote_version = language::proto::deserialize_version(&buffer.version);
                         if let Some(buffer) = this.buffer_for_id(buffer_id) {
                             let operations =
@@ -8276,7 +8298,7 @@ impl Project {
                                     client
                                         .request(proto::UpdateBuffer {
                                             project_id,
-                                            buffer_id,
+                                            buffer_id: buffer_id.into(),
                                             operations: chunk,
                                         })
                                         .await?;
@@ -8294,7 +8316,10 @@ impl Project {
             // creates these buffers for us again to unblock any waiting futures.
             for id in incomplete_buffer_ids {
                 cx.background_executor()
-                    .spawn(client.request(proto::OpenBufferById { project_id, id }))
+                    .spawn(client.request(proto::OpenBufferById {
+                        project_id,
+                        id: id.into(),
+                    }))
                     .detach();
             }
 
@@ -8436,6 +8461,7 @@ impl Project {
     ) -> Result<()> {
         let fingerprint = deserialize_fingerprint(&envelope.payload.fingerprint)?;
         let version = deserialize_version(&envelope.payload.version);
+        let buffer_id = BufferId::new(envelope.payload.buffer_id)?;
         let mtime = envelope
             .payload
             .mtime
@@ -8445,11 +8471,11 @@ impl Project {
         this.update(&mut cx, |this, cx| {
             let buffer = this
                 .opened_buffers
-                .get(&envelope.payload.buffer_id)
+                .get(&buffer_id)
                 .and_then(|buffer| buffer.upgrade())
                 .or_else(|| {
                     this.incomplete_remote_buffers
-                        .get(&envelope.payload.buffer_id)
+                        .get(&buffer_id)
                         .and_then(|b| b.clone())
                 });
             if let Some(buffer) = buffer {
@@ -8478,14 +8504,15 @@ impl Project {
             .mtime
             .ok_or_else(|| anyhow!("missing mtime"))?
             .into();
+        let buffer_id = BufferId::new(payload.buffer_id)?;
         this.update(&mut cx, |this, cx| {
             let buffer = this
                 .opened_buffers
-                .get(&payload.buffer_id)
+                .get(&buffer_id)
                 .and_then(|buffer| buffer.upgrade())
                 .or_else(|| {
                     this.incomplete_remote_buffers
-                        .get(&payload.buffer_id)
+                        .get(&buffer_id)
                         .cloned()
                         .flatten()
                 });
diff --git a/crates/project/src/worktree.rs b/crates/project/src/worktree.rs
index 3ece157ba5..84bb0aa7a6 100644
--- a/crates/project/src/worktree.rs
+++ b/crates/project/src/worktree.rs
@@ -62,6 +62,7 @@ use std::{
     time::{Duration, SystemTime},
 };
 use sum_tree::{Bias, Edit, SeekTarget, SumTree, TreeMap, TreeSet};
+use text::BufferId;
 use util::{
     paths::{PathMatcher, HOME},
     ResultExt,
@@ -672,7 +673,7 @@ impl LocalWorktree {
 
     pub(crate) fn load_buffer(
         &mut self,
-        id: u64,
+        id: BufferId,
         path: &Path,
         cx: &mut ModelContext<Worktree>,
     ) -> Task<Result<Model<Buffer>>> {
@@ -1043,7 +1044,7 @@ impl LocalWorktree {
         let buffer = buffer_handle.read(cx);
 
         let rpc = self.client.clone();
-        let buffer_id = buffer.remote_id();
+        let buffer_id: u64 = buffer.remote_id().into();
         let project_id = self.share.as_ref().map(|share| share.project_id);
 
         let text = buffer.as_rope().clone();
@@ -1481,7 +1482,7 @@ impl RemoteWorktree {
         cx: &mut ModelContext<Worktree>,
     ) -> Task<Result<()>> {
         let buffer = buffer_handle.read(cx);
-        let buffer_id = buffer.remote_id();
+        let buffer_id = buffer.remote_id().into();
         let version = buffer.version();
         let rpc = self.client.clone();
         let project_id = self.project_id;
@@ -2840,7 +2841,7 @@ impl language::LocalFile for File {
 
     fn buffer_reloaded(
         &self,
-        buffer_id: u64,
+        buffer_id: BufferId,
         version: &clock::Global,
         fingerprint: RopeFingerprint,
         line_ending: LineEnding,
@@ -2853,7 +2854,7 @@ impl language::LocalFile for File {
                 .client
                 .send(proto::BufferReloaded {
                     project_id,
-                    buffer_id,
+                    buffer_id: buffer_id.into(),
                     version: serialize_version(version),
                     mtime: Some(mtime.into()),
                     fingerprint: serialize_fingerprint(fingerprint),
diff --git a/crates/project/src/worktree_tests.rs b/crates/project/src/worktree_tests.rs
index fbf8b74d62..26a180e5f9 100644
--- a/crates/project/src/worktree_tests.rs
+++ b/crates/project/src/worktree_tests.rs
@@ -21,6 +21,7 @@ use std::{
     path::{Path, PathBuf},
     sync::Arc,
 };
+use text::BufferId;
 use util::{http::FakeHttpClient, test::temp_tree, ResultExt};
 
 #[gpui::test]
@@ -511,9 +512,11 @@ async fn test_open_gitignored_files(cx: &mut TestAppContext) {
     let prev_read_dir_count = fs.read_dir_call_count();
     let buffer = tree
         .update(cx, |tree, cx| {
-            tree.as_local_mut()
-                .unwrap()
-                .load_buffer(0, "one/node_modules/b/b1.js".as_ref(), cx)
+            tree.as_local_mut().unwrap().load_buffer(
+                BufferId::new(1).unwrap(),
+                "one/node_modules/b/b1.js".as_ref(),
+                cx,
+            )
         })
         .await
         .unwrap();
@@ -553,9 +556,11 @@ async fn test_open_gitignored_files(cx: &mut TestAppContext) {
     let prev_read_dir_count = fs.read_dir_call_count();
     let buffer = tree
         .update(cx, |tree, cx| {
-            tree.as_local_mut()
-                .unwrap()
-                .load_buffer(0, "one/node_modules/a/a2.js".as_ref(), cx)
+            tree.as_local_mut().unwrap().load_buffer(
+                BufferId::new(1).unwrap(),
+                "one/node_modules/a/a2.js".as_ref(),
+                cx,
+            )
         })
         .await
         .unwrap();
diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index ad08636852..bf01347ce8 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -1007,7 +1007,7 @@ mod tests {
     use super::*;
     use editor::{DisplayPoint, Editor};
     use gpui::{Context, Hsla, TestAppContext, VisualTestContext};
-    use language::Buffer;
+    use language::{Buffer, BufferId};
     use smol::stream::StreamExt as _;
     use unindent::Unindent as _;
 
@@ -1029,7 +1029,7 @@ mod tests {
         let buffer = cx.new_model(|cx| {
             Buffer::new(
                 0,
-                cx.entity_id().as_u64(),
+                BufferId::new(cx.entity_id().as_u64()).unwrap(),
                 r#"
                 A regular expression (shortened as regex or regexp;[1] also referred to as
                 rational expression[2][3]) is a sequence of characters that specifies a search
@@ -1385,7 +1385,13 @@ mod tests {
             expected_query_matches_count > 1,
             "Should pick a query with multiple results"
         );
-        let buffer = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), buffer_text));
+        let buffer = cx.new_model(|cx| {
+            Buffer::new(
+                0,
+                BufferId::new(cx.entity_id().as_u64()).unwrap(),
+                buffer_text,
+            )
+        });
         let window = cx.add_window(|_| ());
 
         let editor = window.build_view(cx, |cx| Editor::for_buffer(buffer.clone(), None, cx));
@@ -1581,7 +1587,13 @@ mod tests {
         for "find" or "find and replace" operations on strings, or for input validation.
         "#
         .unindent();
-        let buffer = cx.new_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), buffer_text));
+        let buffer = cx.new_model(|cx| {
+            Buffer::new(
+                0,
+                BufferId::new(cx.entity_id().as_u64()).unwrap(),
+                buffer_text,
+            )
+        });
         let cx = cx.add_empty_window();
 
         let editor = cx.new_view(|cx| Editor::for_buffer(buffer.clone(), None, cx));
diff --git a/crates/text/src/anchor.rs b/crates/text/src/anchor.rs
index a65e3753d4..db44a34030 100644
--- a/crates/text/src/anchor.rs
+++ b/crates/text/src/anchor.rs
@@ -1,6 +1,6 @@
 use crate::{
-    locator::Locator, BufferSnapshot, Point, PointUtf16, TextDimension, ToOffset, ToPoint,
-    ToPointUtf16,
+    locator::Locator, BufferId, BufferSnapshot, Point, PointUtf16, TextDimension, ToOffset,
+    ToPoint, ToPointUtf16,
 };
 use anyhow::Result;
 use std::{cmp::Ordering, fmt::Debug, ops::Range};
@@ -11,7 +11,7 @@ pub struct Anchor {
     pub timestamp: clock::Lamport,
     pub offset: usize,
     pub bias: Bias,
-    pub buffer_id: Option<u64>,
+    pub buffer_id: Option<BufferId>,
 }
 
 impl Anchor {
diff --git a/crates/text/src/tests.rs b/crates/text/src/tests.rs
index 7e26e0a296..ca1e81b1c3 100644
--- a/crates/text/src/tests.rs
+++ b/crates/text/src/tests.rs
@@ -18,7 +18,7 @@ fn init_logger() {
 
 #[test]
 fn test_edit() {
-    let mut buffer = Buffer::new(0, 0, "abc".into());
+    let mut buffer = Buffer::new(0, BufferId::new(1).unwrap(), "abc".into());
     assert_eq!(buffer.text(), "abc");
     buffer.edit([(3..3, "def")]);
     assert_eq!(buffer.text(), "abcdef");
@@ -42,7 +42,7 @@ fn test_random_edits(mut rng: StdRng) {
     let mut reference_string = RandomCharIter::new(&mut rng)
         .take(reference_string_len)
         .collect::<String>();
-    let mut buffer = Buffer::new(0, 0, reference_string.clone());
+    let mut buffer = Buffer::new(0, BufferId::new(1).unwrap(), reference_string.clone());
     LineEnding::normalize(&mut reference_string);
 
     buffer.set_group_interval(Duration::from_millis(rng.gen_range(0..=200)));
@@ -164,7 +164,7 @@ fn test_line_endings() {
         LineEnding::Windows
     );
 
-    let mut buffer = Buffer::new(0, 0, "one\r\ntwo\rthree".into());
+    let mut buffer = Buffer::new(0, BufferId::new(1).unwrap(), "one\r\ntwo\rthree".into());
     assert_eq!(buffer.text(), "one\ntwo\nthree");
     assert_eq!(buffer.line_ending(), LineEnding::Windows);
     buffer.check_invariants();
@@ -178,7 +178,7 @@ fn test_line_endings() {
 
 #[test]
 fn test_line_len() {
-    let mut buffer = Buffer::new(0, 0, "".into());
+    let mut buffer = Buffer::new(0, BufferId::new(1).unwrap(), "".into());
     buffer.edit([(0..0, "abcd\nefg\nhij")]);
     buffer.edit([(12..12, "kl\nmno")]);
     buffer.edit([(18..18, "\npqrs\n")]);
@@ -195,7 +195,7 @@ fn test_line_len() {
 #[test]
 fn test_common_prefix_at_position() {
     let text = "a = str; b = δα";
-    let buffer = Buffer::new(0, 0, text.into());
+    let buffer = Buffer::new(0, BufferId::new(1).unwrap(), text.into());
 
     let offset1 = offset_after(text, "str");
     let offset2 = offset_after(text, "δα");
@@ -243,7 +243,11 @@ fn test_common_prefix_at_position() {
 
 #[test]
 fn test_text_summary_for_range() {
-    let buffer = Buffer::new(0, 0, "ab\nefg\nhklm\nnopqrs\ntuvwxyz".into());
+    let buffer = Buffer::new(
+        0,
+        BufferId::new(1).unwrap(),
+        "ab\nefg\nhklm\nnopqrs\ntuvwxyz".into(),
+    );
     assert_eq!(
         buffer.text_summary_for_range::<TextSummary, _>(1..3),
         TextSummary {
@@ -313,7 +317,7 @@ fn test_text_summary_for_range() {
 
 #[test]
 fn test_chars_at() {
-    let mut buffer = Buffer::new(0, 0, "".into());
+    let mut buffer = Buffer::new(0, BufferId::new(1).unwrap(), "".into());
     buffer.edit([(0..0, "abcd\nefgh\nij")]);
     buffer.edit([(12..12, "kl\nmno")]);
     buffer.edit([(18..18, "\npqrs")]);
@@ -335,7 +339,7 @@ fn test_chars_at() {
     assert_eq!(chars.collect::<String>(), "PQrs");
 
     // Regression test:
-    let mut buffer = Buffer::new(0, 0, "".into());
+    let mut buffer = Buffer::new(0, BufferId::new(1).unwrap(), "".into());
     buffer.edit([(0..0, "[workspace]\nmembers = [\n    \"xray_core\",\n    \"xray_server\",\n    \"xray_cli\",\n    \"xray_wasm\",\n]\n")]);
     buffer.edit([(60..60, "\n")]);
 
@@ -345,7 +349,7 @@ fn test_chars_at() {
 
 #[test]
 fn test_anchors() {
-    let mut buffer = Buffer::new(0, 0, "".into());
+    let mut buffer = Buffer::new(0, BufferId::new(1).unwrap(), "".into());
     buffer.edit([(0..0, "abc")]);
     let left_anchor = buffer.anchor_before(2);
     let right_anchor = buffer.anchor_after(2);
@@ -463,7 +467,7 @@ fn test_anchors() {
 
 #[test]
 fn test_anchors_at_start_and_end() {
-    let mut buffer = Buffer::new(0, 0, "".into());
+    let mut buffer = Buffer::new(0, BufferId::new(1).unwrap(), "".into());
     let before_start_anchor = buffer.anchor_before(0);
     let after_end_anchor = buffer.anchor_after(0);
 
@@ -486,7 +490,7 @@ fn test_anchors_at_start_and_end() {
 
 #[test]
 fn test_undo_redo() {
-    let mut buffer = Buffer::new(0, 0, "1234".into());
+    let mut buffer = Buffer::new(0, BufferId::new(1).unwrap(), "1234".into());
     // Set group interval to zero so as to not group edits in the undo stack.
     buffer.set_group_interval(Duration::from_secs(0));
 
@@ -523,7 +527,7 @@ fn test_undo_redo() {
 #[test]
 fn test_history() {
     let mut now = Instant::now();
-    let mut buffer = Buffer::new(0, 0, "123456".into());
+    let mut buffer = Buffer::new(0, BufferId::new(1).unwrap(), "123456".into());
     buffer.set_group_interval(Duration::from_millis(300));
 
     let transaction_1 = buffer.start_transaction_at(now).unwrap();
@@ -590,7 +594,7 @@ fn test_history() {
 #[test]
 fn test_finalize_last_transaction() {
     let now = Instant::now();
-    let mut buffer = Buffer::new(0, 0, "123456".into());
+    let mut buffer = Buffer::new(0, BufferId::new(1).unwrap(), "123456".into());
 
     buffer.start_transaction_at(now);
     buffer.edit([(2..4, "cd")]);
@@ -625,7 +629,7 @@ fn test_finalize_last_transaction() {
 #[test]
 fn test_edited_ranges_for_transaction() {
     let now = Instant::now();
-    let mut buffer = Buffer::new(0, 0, "1234567".into());
+    let mut buffer = Buffer::new(0, BufferId::new(1).unwrap(), "1234567".into());
 
     buffer.start_transaction_at(now);
     buffer.edit([(2..4, "cd")]);
@@ -664,9 +668,9 @@ fn test_edited_ranges_for_transaction() {
 fn test_concurrent_edits() {
     let text = "abcdef";
 
-    let mut buffer1 = Buffer::new(1, 0, text.into());
-    let mut buffer2 = Buffer::new(2, 0, text.into());
-    let mut buffer3 = Buffer::new(3, 0, text.into());
+    let mut buffer1 = Buffer::new(1, BufferId::new(1).unwrap(), text.into());
+    let mut buffer2 = Buffer::new(2, BufferId::new(1).unwrap(), text.into());
+    let mut buffer3 = Buffer::new(3, BufferId::new(1).unwrap(), text.into());
 
     let buf1_op = buffer1.edit([(1..2, "12")]);
     assert_eq!(buffer1.text(), "a12cdef");
@@ -705,7 +709,7 @@ fn test_random_concurrent_edits(mut rng: StdRng) {
     let mut network = Network::new(rng.clone());
 
     for i in 0..peers {
-        let mut buffer = Buffer::new(i as ReplicaId, 0, base_text.clone());
+        let mut buffer = Buffer::new(i as ReplicaId, BufferId::new(1).unwrap(), base_text.clone());
         buffer.history.group_interval = Duration::from_millis(rng.gen_range(0..=200));
         buffers.push(buffer);
         replica_ids.push(i as u16);
diff --git a/crates/text/src/text.rs b/crates/text/src/text.rs
index acc170a508..9ce9efe7e0 100644
--- a/crates/text/src/text.rs
+++ b/crates/text/src/text.rs
@@ -26,6 +26,7 @@ pub use selection::*;
 use std::{
     borrow::Cow,
     cmp::{self, Ordering, Reverse},
+    fmt::Display,
     future::Future,
     iter::Iterator,
     ops::{self, Deref, Range, Sub},
@@ -59,10 +60,39 @@ pub struct Buffer {
     wait_for_version_txs: Vec<(clock::Global, oneshot::Sender<()>)>,
 }
 
+#[repr(transparent)]
+#[derive(Clone, Copy, Debug, Default, Hash, PartialEq, PartialOrd, Ord, Eq)]
+pub struct BufferId(u64);
+
+impl Display for BufferId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl BufferId {
+    /// Returns Err if `id` is outside of BufferId domain.
+    pub fn new(id: u64) -> anyhow::Result<Self> {
+        Ok(Self(id))
+    }
+    /// Increments this buffer id, returning the old value.
+    /// So that's a post-increment operator in disguise.
+    pub fn next(&mut self) -> Self {
+        let old = *self;
+        self.0 += 1;
+        old
+    }
+}
+impl From<BufferId> for u64 {
+    fn from(id: BufferId) -> Self {
+        id.0
+    }
+}
+
 #[derive(Clone)]
 pub struct BufferSnapshot {
     replica_id: ReplicaId,
-    remote_id: u64,
+    remote_id: BufferId,
     visible_text: Rope,
     deleted_text: Rope,
     line_ending: LineEnding,
@@ -369,7 +399,7 @@ struct Edits<'a, D: TextDimension, F: FnMut(&FragmentSummary) -> bool> {
     old_end: D,
     new_end: D,
     range: Range<(&'a Locator, usize)>,
-    buffer_id: u64,
+    buffer_id: BufferId,
 }
 
 #[derive(Clone, Debug, Default, Eq, PartialEq)]
@@ -478,7 +508,7 @@ pub struct UndoOperation {
 }
 
 impl Buffer {
-    pub fn new(replica_id: u16, remote_id: u64, mut base_text: String) -> Buffer {
+    pub fn new(replica_id: u16, remote_id: BufferId, mut base_text: String) -> Buffer {
         let line_ending = LineEnding::detect(&base_text);
         LineEnding::normalize(&mut base_text);
 
@@ -545,7 +575,7 @@ impl Buffer {
         self.lamport_clock.replica_id
     }
 
-    pub fn remote_id(&self) -> u64 {
+    pub fn remote_id(&self) -> BufferId {
         self.remote_id
     }
 
@@ -1590,7 +1620,7 @@ impl BufferSnapshot {
         &self.visible_text
     }
 
-    pub fn remote_id(&self) -> u64 {
+    pub fn remote_id(&self) -> BufferId {
         self.remote_id
     }
 
diff --git a/crates/vim/src/editor_events.rs b/crates/vim/src/editor_events.rs
index e325c529a7..da964efd21 100644
--- a/crates/vim/src/editor_events.rs
+++ b/crates/vim/src/editor_events.rs
@@ -69,14 +69,14 @@ mod test {
     use crate::{test::VimTestContext, Vim};
     use editor::Editor;
     use gpui::{Context, Entity, VisualTestContext};
-    use language::Buffer;
+    use language::{Buffer, BufferId};
 
     // regression test for blur called with a different active editor
     #[gpui::test]
     async fn test_blur_focus(cx: &mut gpui::TestAppContext) {
         let mut cx = VimTestContext::new(cx, true).await;
 
-        let buffer = cx.new_model(|_| Buffer::new(0, 0, "a = 1\nb = 2\n"));
+        let buffer = cx.new_model(|_| Buffer::new(0, BufferId::new(1).unwrap(), "a = 1\nb = 2\n"));
         let window2 = cx.add_window(|cx| Editor::for_buffer(buffer, None, cx));
         let editor2 = cx
             .update(|cx| {
@@ -111,7 +111,7 @@ mod test {
         let mut cx1 = VisualTestContext::from_window(cx.window, &cx);
         let editor1 = cx.editor.clone();
 
-        let buffer = cx.new_model(|_| Buffer::new(0, 0, "a = 1\nb = 2\n"));
+        let buffer = cx.new_model(|_| Buffer::new(0, BufferId::new(1).unwrap(), "a = 1\nb = 2\n"));
         let (editor2, cx2) = cx.add_window_view(|cx| Editor::for_buffer(buffer, None, cx));
 
         editor2.update(cx2, |_, cx| {
diff --git a/crates/zed/src/languages/c.rs b/crates/zed/src/languages/c.rs
index 57af9f5365..655ac044c1 100644
--- a/crates/zed/src/languages/c.rs
+++ b/crates/zed/src/languages/c.rs
@@ -278,6 +278,7 @@ mod tests {
     use language::{language_settings::AllLanguageSettings, AutoindentMode, Buffer};
     use settings::SettingsStore;
     use std::num::NonZeroU32;
+    use text::BufferId;
 
     #[gpui::test]
     async fn test_c_autoindent(cx: &mut TestAppContext) {
@@ -295,8 +296,8 @@ mod tests {
         let language = crate::languages::language("c", tree_sitter_c::language(), None).await;
 
         cx.new_model(|cx| {
-            let mut buffer =
-                Buffer::new(0, cx.entity_id().as_u64(), "").with_language(language, cx);
+            let mut buffer = Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), "")
+                .with_language(language, cx);
 
             // empty function
             buffer.edit([(0..0, "int main() {}")], None, cx);
diff --git a/crates/zed/src/languages/python.rs b/crates/zed/src/languages/python.rs
index 437e3a2d87..216957df66 100644
--- a/crates/zed/src/languages/python.rs
+++ b/crates/zed/src/languages/python.rs
@@ -181,6 +181,7 @@ mod tests {
     use language::{language_settings::AllLanguageSettings, AutoindentMode, Buffer};
     use settings::SettingsStore;
     use std::num::NonZeroU32;
+    use text::BufferId;
 
     #[gpui::test]
     async fn test_python_autoindent(cx: &mut TestAppContext) {
@@ -199,8 +200,8 @@ mod tests {
         });
 
         cx.new_model(|cx| {
-            let mut buffer =
-                Buffer::new(0, cx.entity_id().as_u64(), "").with_language(language, cx);
+            let mut buffer = Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), "")
+                .with_language(language, cx);
             let append = |buffer: &mut Buffer, text: &str, cx: &mut ModelContext<Buffer>| {
                 let ix = buffer.len();
                 buffer.edit([(ix..ix, text)], Some(AutoindentMode::EachLine), cx);
diff --git a/crates/zed/src/languages/rust.rs b/crates/zed/src/languages/rust.rs
index c8ca6fc1f7..ffbe706fe8 100644
--- a/crates/zed/src/languages/rust.rs
+++ b/crates/zed/src/languages/rust.rs
@@ -297,6 +297,7 @@ mod tests {
     use gpui::{Context, Hsla, TestAppContext};
     use language::language_settings::AllLanguageSettings;
     use settings::SettingsStore;
+    use text::BufferId;
     use theme::SyntaxTheme;
 
     #[gpui::test]
@@ -509,8 +510,8 @@ mod tests {
         let language = crate::languages::language("rust", tree_sitter_rust::language(), None).await;
 
         cx.new_model(|cx| {
-            let mut buffer =
-                Buffer::new(0, cx.entity_id().as_u64(), "").with_language(language, cx);
+            let mut buffer = Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), "")
+                .with_language(language, cx);
 
             // indent between braces
             buffer.set_text("fn a() {}", cx);
diff --git a/crates/zed/src/languages/typescript.rs b/crates/zed/src/languages/typescript.rs
index 5d04e31f6b..08dc21965b 100644
--- a/crates/zed/src/languages/typescript.rs
+++ b/crates/zed/src/languages/typescript.rs
@@ -349,6 +349,7 @@ async fn get_cached_eslint_server_binary(
 #[cfg(test)]
 mod tests {
     use gpui::{Context, TestAppContext};
+    use text::BufferId;
     use unindent::Unindent;
 
     #[gpui::test]
@@ -376,7 +377,8 @@ mod tests {
         .unindent();
 
         let buffer = cx.new_model(|cx| {
-            language::Buffer::new(0, cx.entity_id().as_u64(), text).with_language(language, cx)
+            language::Buffer::new(0, BufferId::new(cx.entity_id().as_u64()).unwrap(), text)
+                .with_language(language, cx)
         });
         let outline = buffer.update(cx, |buffer, _| buffer.snapshot().outline(None).unwrap());
         assert_eq!(

From b29f45ea68b3977855e666c09deb55a3b3f355df Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Mon, 29 Jan 2024 17:05:18 +0100
Subject: [PATCH 038/372] Change underlying type of BufferId to NonZeroU64.

---
 crates/collab/src/db/tests/buffer_tests.rs |  4 ++--
 crates/project/src/project.rs              |  2 +-
 crates/text/src/text.rs                    | 12 +++++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/crates/collab/src/db/tests/buffer_tests.rs b/crates/collab/src/db/tests/buffer_tests.rs
index 0d7438b517..de02c2b7b0 100644
--- a/crates/collab/src/db/tests/buffer_tests.rs
+++ b/crates/collab/src/db/tests/buffer_tests.rs
@@ -67,7 +67,7 @@ async fn test_channel_buffers(db: &Arc<Database>) {
         .await
         .unwrap();
 
-    let mut buffer_a = Buffer::new(0, text::BufferId::new(0).unwrap(), "".to_string());
+    let mut buffer_a = Buffer::new(0, text::BufferId::new(1).unwrap(), "".to_string());
     let mut operations = Vec::new();
     operations.push(buffer_a.edit([(0..0, "hello world")]));
     operations.push(buffer_a.edit([(5..5, ", cruel")]));
@@ -92,7 +92,7 @@ async fn test_channel_buffers(db: &Arc<Database>) {
 
     let mut buffer_b = Buffer::new(
         0,
-        text::BufferId::new(0).unwrap(),
+        text::BufferId::new(1).unwrap(),
         buffer_response_b.base_text,
     );
     buffer_b
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 9b1a59ce85..50b886e44b 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -722,7 +722,7 @@ impl Project {
                 worktrees: Vec::new(),
                 buffer_ordered_messages_tx: tx,
                 loading_buffers_by_path: Default::default(),
-                next_buffer_id: BufferId::default(),
+                next_buffer_id: BufferId::new(1).unwrap(),
                 opened_buffer: watch::channel(),
                 shared_buffers: Default::default(),
                 incomplete_remote_buffers: Default::default(),
diff --git a/crates/text/src/text.rs b/crates/text/src/text.rs
index 9ce9efe7e0..fc2cf3b753 100644
--- a/crates/text/src/text.rs
+++ b/crates/text/src/text.rs
@@ -11,7 +11,7 @@ mod tests;
 mod undo_map;
 
 pub use anchor::*;
-use anyhow::{anyhow, Result};
+use anyhow::{anyhow, Context as _, Result};
 pub use clock::ReplicaId;
 use collections::{HashMap, HashSet};
 use locator::Locator;
@@ -29,6 +29,7 @@ use std::{
     fmt::Display,
     future::Future,
     iter::Iterator,
+    num::NonZeroU64,
     ops::{self, Deref, Range, Sub},
     str,
     sync::Arc,
@@ -61,8 +62,8 @@ pub struct Buffer {
 }
 
 #[repr(transparent)]
-#[derive(Clone, Copy, Debug, Default, Hash, PartialEq, PartialOrd, Ord, Eq)]
-pub struct BufferId(u64);
+#[derive(Clone, Copy, Debug, Hash, PartialEq, PartialOrd, Ord, Eq)]
+pub struct BufferId(NonZeroU64);
 
 impl Display for BufferId {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -73,19 +74,20 @@ impl Display for BufferId {
 impl BufferId {
     /// Returns Err if `id` is outside of BufferId domain.
     pub fn new(id: u64) -> anyhow::Result<Self> {
+        let id = NonZeroU64::new(id).context("Buffer id cannot be 0.")?;
         Ok(Self(id))
     }
     /// Increments this buffer id, returning the old value.
     /// So that's a post-increment operator in disguise.
     pub fn next(&mut self) -> Self {
         let old = *self;
-        self.0 += 1;
+        self.0 = self.0.saturating_add(1);
         old
     }
 }
 impl From<BufferId> for u64 {
     fn from(id: BufferId) -> Self {
-        id.0
+        id.0.get()
     }
 }
 

From 1313402a6bfd3f508aec8b4a8d89b0b5a826261b Mon Sep 17 00:00:00 2001
From: Amin Yahyaabadi <aminyahyaabadi74@gmail.com>
Date: Mon, 29 Jan 2024 12:18:10 -0800
Subject: [PATCH 039/372] Introduce cross-platform file-watching (#6855)

This adds cross-platform file-watching via the
[Notify](https://github.com/notify-rs/notify) crate. The previous
fs-events implementation is now only used on MacOS, and on other
platforms Notify is used. The watching function interface is the same.

Related to #5391 #5395 #5394.

Release Notes:

- N/A
---
 Cargo.lock                     | 72 +++++++++++++++++++++++++++++++++-
 crates/fs/Cargo.toml           |  7 +++-
 crates/fs/src/fs.rs            | 59 +++++++++++++++++++++++++++-
 crates/project/src/worktree.rs | 15 ++++---
 4 files changed, 141 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d3d0096972..8a141a31cb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2737,6 +2737,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
+ "notify",
  "parking_lot 0.11.2",
  "regex",
  "rope",
@@ -2756,7 +2757,7 @@ name = "fsevent"
 version = "2.0.2"
 dependencies = [
  "bitflags 1.3.2",
- "fsevent-sys",
+ "fsevent-sys 3.1.0",
  "parking_lot 0.11.2",
  "tempfile",
 ]
@@ -2770,6 +2771,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "fsevent-sys"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "fuchsia-zircon"
 version = "0.3.3"
@@ -3509,6 +3519,26 @@ dependencies = [
  "syn 2.0.48",
 ]
 
+[[package]]
+name = "inotify"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
+dependencies = [
+ "bitflags 1.3.2",
+ "inotify-sys",
+ "libc",
+]
+
+[[package]]
+name = "inotify-sys"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "install_cli"
 version = "0.1.0"
@@ -3726,6 +3756,26 @@ dependencies = [
  "winapi-build",
 ]
 
+[[package]]
+name = "kqueue"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
+dependencies = [
+ "kqueue-sys",
+ "libc",
+]
+
+[[package]]
+name = "kqueue-sys"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
+dependencies = [
+ "bitflags 1.3.2",
+ "libc",
+]
+
 [[package]]
 name = "kurbo"
 version = "0.8.3"
@@ -4281,6 +4331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
 dependencies = [
  "libc",
+ "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.48.0",
 ]
@@ -4534,6 +4585,25 @@ dependencies = [
  "util",
 ]
 
+[[package]]
+name = "notify"
+version = "6.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
+dependencies = [
+ "bitflags 2.4.1",
+ "crossbeam-channel",
+ "filetime",
+ "fsevent-sys 4.1.0",
+ "inotify",
+ "kqueue",
+ "libc",
+ "log",
+ "mio 0.8.8",
+ "walkdir",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "ntapi"
 version = "0.3.7"
diff --git a/crates/fs/Cargo.toml b/crates/fs/Cargo.toml
index 599b1678ca..4f7293b1a7 100644
--- a/crates/fs/Cargo.toml
+++ b/crates/fs/Cargo.toml
@@ -20,7 +20,6 @@ anyhow.workspace = true
 async-trait.workspace = true
 futures.workspace = true
 tempfile = "3"
-fsevent = { path = "../fsevent" }
 lazy_static.workspace = true
 parking_lot.workspace = true
 smol.workspace = true
@@ -35,6 +34,12 @@ time.workspace = true
 
 gpui = { path = "../gpui", optional = true}
 
+[target.'cfg(target_os = "macos")'.dependencies]
+fsevent = { path = "../fsevent" }
+
+[target.'cfg(not(target_os = "macos"))'.dependencies]
+notify = "6.1.1"
+
 [dev-dependencies]
 gpui = { path = "../gpui", features = ["test-support"] }
 
diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index b010394ec2..edd3da101c 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -1,7 +1,16 @@
 pub mod repository;
 
 use anyhow::{anyhow, Result};
+#[cfg(target_os = "macos")]
+pub use fsevent::Event;
+#[cfg(target_os = "macos")]
 use fsevent::EventStream;
+
+#[cfg(not(target_os = "macos"))]
+pub use notify::Event;
+#[cfg(not(target_os = "macos"))]
+use notify::{Config, Watcher};
+
 use futures::{future::BoxFuture, Stream, StreamExt};
 use git2::Repository as LibGitRepository;
 use parking_lot::Mutex;
@@ -48,11 +57,13 @@ pub trait Fs: Send + Sync {
         &self,
         path: &Path,
     ) -> Result<Pin<Box<dyn Send + Stream<Item = Result<PathBuf>>>>>;
+
     async fn watch(
         &self,
         path: &Path,
         latency: Duration,
-    ) -> Pin<Box<dyn Send + Stream<Item = Vec<fsevent::Event>>>>;
+    ) -> Pin<Box<dyn Send + Stream<Item = Vec<Event>>>>;
+
     fn open_repo(&self, abs_dot_git: &Path) -> Option<Arc<Mutex<dyn GitRepository>>>;
     fn is_fake(&self) -> bool;
     #[cfg(any(test, feature = "test-support"))]
@@ -251,11 +262,12 @@ impl Fs for RealFs {
         Ok(Box::pin(result))
     }
 
+    #[cfg(target_os = "macos")]
     async fn watch(
         &self,
         path: &Path,
         latency: Duration,
-    ) -> Pin<Box<dyn Send + Stream<Item = Vec<fsevent::Event>>>> {
+    ) -> Pin<Box<dyn Send + Stream<Item = Vec<Event>>>> {
         let (tx, rx) = smol::channel::unbounded();
         let (stream, handle) = EventStream::new(&[path], latency);
         std::thread::spawn(move || {
@@ -267,6 +279,35 @@ impl Fs for RealFs {
         })))
     }
 
+    #[cfg(not(target_os = "macos"))]
+    async fn watch(
+        &self,
+        path: &Path,
+        latency: Duration,
+    ) -> Pin<Box<dyn Send + Stream<Item = Vec<Event>>>> {
+        let (tx, rx) = smol::channel::unbounded();
+
+        let mut watcher = notify::recommended_watcher(move |res| match res {
+            Ok(event) => {
+                let _ = tx.try_send(vec![event]);
+            }
+            Err(err) => {
+                eprintln!("watch error: {:?}", err);
+            }
+        })
+        .unwrap();
+
+        watcher
+            .configure(Config::default().with_poll_interval(latency))
+            .unwrap();
+
+        watcher
+            .watch(path, notify::RecursiveMode::Recursive)
+            .unwrap();
+
+        Box::pin(rx)
+    }
+
     fn open_repo(&self, dotgit_path: &Path) -> Option<Arc<Mutex<dyn GitRepository>>> {
         LibGitRepository::open(&dotgit_path)
             .log_err()
@@ -284,6 +325,20 @@ impl Fs for RealFs {
     }
 }
 
+#[cfg(target_os = "macos")]
+pub fn fs_events_paths(events: Vec<Event>) -> Vec<PathBuf> {
+    events.into_iter().map(|event| event.path).collect()
+}
+
+#[cfg(not(target_os = "macos"))]
+pub fn fs_events_paths(events: Vec<Event>) -> Vec<PathBuf> {
+    events
+        .into_iter()
+        .map(|event| event.paths.into_iter())
+        .flatten()
+        .collect()
+}
+
 #[cfg(any(test, feature = "test-support"))]
 pub struct FakeFs {
     // Use an unfair lock to ensure tests are deterministic.
diff --git a/crates/project/src/worktree.rs b/crates/project/src/worktree.rs
index 84bb0aa7a6..6ba9a9d026 100644
--- a/crates/project/src/worktree.rs
+++ b/crates/project/src/worktree.rs
@@ -3221,10 +3221,7 @@ impl BackgroundScanner {
         }
     }
 
-    async fn run(
-        &mut self,
-        mut fs_events_rx: Pin<Box<dyn Send + Stream<Item = Vec<fsevent::Event>>>>,
-    ) {
+    async fn run(&mut self, mut fs_events_rx: Pin<Box<dyn Send + Stream<Item = Vec<fs::Event>>>>) {
         use futures::FutureExt as _;
 
         // Populate ignores above the root.
@@ -3271,9 +3268,10 @@ impl BackgroundScanner {
         // have the previous state loaded yet.
         self.phase = BackgroundScannerPhase::EventsReceivedDuringInitialScan;
         if let Poll::Ready(Some(events)) = futures::poll!(fs_events_rx.next()) {
-            let mut paths = events.into_iter().map(|e| e.path).collect::<Vec<_>>();
+            let mut paths = fs::fs_events_paths(events);
+
             while let Poll::Ready(Some(more_events)) = futures::poll!(fs_events_rx.next()) {
-                paths.extend(more_events.into_iter().map(|e| e.path));
+                paths.extend(fs::fs_events_paths(more_events));
             }
             self.process_events(paths).await;
         }
@@ -3312,9 +3310,10 @@ impl BackgroundScanner {
 
                 events = fs_events_rx.next().fuse() => {
                     let Some(events) = events else { break };
-                    let mut paths = events.into_iter().map(|e| e.path).collect::<Vec<_>>();
+                    let mut paths = fs::fs_events_paths(events);
+
                     while let Poll::Ready(Some(more_events)) = futures::poll!(fs_events_rx.next()) {
-                        paths.extend(more_events.into_iter().map(|e| e.path));
+                        paths.extend(fs::fs_events_paths(more_events));
                     }
                     self.process_events(paths.clone()).await;
                 }

From c008c78e875be678b08a1dd7e7be5c0912a71833 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 29 Jan 2024 14:24:59 -0700
Subject: [PATCH 040/372] Fix slow query for fetching descendants of channels
 (#7008)

Release Notes:

- N/A

---------

Co-authored-by: Max <max@zed.dev>
---
 .../20240129193601_fix_parent_path_index.sql  |  4 +
 crates/collab/src/db/queries/channels.rs      | 98 ++++++-------------
 crates/collab/src/db/tables/channel.rs        |  4 +
 3 files changed, 37 insertions(+), 69 deletions(-)
 create mode 100644 crates/collab/migrations/20240129193601_fix_parent_path_index.sql

diff --git a/crates/collab/migrations/20240129193601_fix_parent_path_index.sql b/crates/collab/migrations/20240129193601_fix_parent_path_index.sql
new file mode 100644
index 0000000000..73dd6e37cd
--- /dev/null
+++ b/crates/collab/migrations/20240129193601_fix_parent_path_index.sql
@@ -0,0 +1,4 @@
+-- Add migration script here
+
+DROP INDEX index_channels_on_parent_path;
+CREATE INDEX index_channels_on_parent_path ON channels (parent_path text_pattern_ops);
diff --git a/crates/collab/src/db/queries/channels.rs b/crates/collab/src/db/queries/channels.rs
index a0d80d4b94..05f216f3f1 100644
--- a/crates/collab/src/db/queries/channels.rs
+++ b/crates/collab/src/db/queries/channels.rs
@@ -197,12 +197,10 @@ impl Database {
                 }
             } else if visibility == ChannelVisibility::Members {
                 if self
-                    .get_channel_descendants_including_self(vec![channel_id], &*tx)
+                    .get_channel_descendants_excluding_self([&channel], &*tx)
                     .await?
                     .into_iter()
-                    .any(|channel| {
-                        channel.id != channel_id && channel.visibility == ChannelVisibility::Public
-                    })
+                    .any(|channel| channel.visibility == ChannelVisibility::Public)
                 {
                     Err(ErrorCode::BadPublicNesting
                         .with_tag("direction", "children")
@@ -261,10 +259,11 @@ impl Database {
                 .await?;
 
             let channels_to_remove = self
-                .get_channel_descendants_including_self(vec![channel.id], &*tx)
+                .get_channel_descendants_excluding_self([&channel], &*tx)
                 .await?
                 .into_iter()
                 .map(|channel| channel.id)
+                .chain(Some(channel_id))
                 .collect::<Vec<_>>();
 
             channel::Entity::delete_many()
@@ -445,16 +444,12 @@ impl Database {
     ) -> Result<MembershipUpdated> {
         let new_channels = self.get_user_channels(user_id, Some(channel), &*tx).await?;
         let removed_channels = self
-            .get_channel_descendants_including_self(vec![channel.id], &*tx)
+            .get_channel_descendants_excluding_self([channel], &*tx)
             .await?
             .into_iter()
-            .filter_map(|channel| {
-                if !new_channels.channels.iter().any(|c| c.id == channel.id) {
-                    Some(channel.id)
-                } else {
-                    None
-                }
-            })
+            .map(|channel| channel.id)
+            .chain([channel.id])
+            .filter(|channel_id| !new_channels.channels.iter().any(|c| c.id == *channel_id))
             .collect::<Vec<_>>();
 
         Ok(MembershipUpdated {
@@ -545,26 +540,6 @@ impl Database {
         .await
     }
 
-    pub async fn get_channel_memberships(
-        &self,
-        user_id: UserId,
-    ) -> Result<(Vec<channel_member::Model>, Vec<channel::Model>)> {
-        self.transaction(|tx| async move {
-            let memberships = channel_member::Entity::find()
-                .filter(channel_member::Column::UserId.eq(user_id))
-                .all(&*tx)
-                .await?;
-            let channels = self
-                .get_channel_descendants_including_self(
-                    memberships.iter().map(|m| m.channel_id),
-                    &*tx,
-                )
-                .await?;
-            Ok((memberships, channels))
-        })
-        .await
-    }
-
     /// Returns all channels for the user with the given ID.
     pub async fn get_channels_for_user(&self, user_id: UserId) -> Result<ChannelsForUser> {
         self.transaction(|tx| async move {
@@ -596,13 +571,21 @@ impl Database {
             .all(&*tx)
             .await?;
 
-        let descendants = self
-            .get_channel_descendants_including_self(
-                channel_memberships.iter().map(|m| m.channel_id),
-                &*tx,
-            )
+        let channels = channel::Entity::find()
+            .filter(channel::Column::Id.is_in(channel_memberships.iter().map(|m| m.channel_id)))
+            .all(&*tx)
             .await?;
 
+        let mut descendants = self
+            .get_channel_descendants_excluding_self(channels.iter(), &*tx)
+            .await?;
+
+        for channel in channels {
+            if let Err(ix) = descendants.binary_search_by_key(&channel.path(), |c| c.path()) {
+                descendants.insert(ix, channel);
+            }
+        }
+
         let roles_by_channel_id = channel_memberships
             .iter()
             .map(|membership| (membership.channel_id, membership.role))
@@ -880,46 +863,23 @@ impl Database {
 
     // Get the descendants of the given set if channels, ordered by their
     // path.
-    async fn get_channel_descendants_including_self(
+    pub(crate) async fn get_channel_descendants_excluding_self(
         &self,
-        channel_ids: impl IntoIterator<Item = ChannelId>,
+        channels: impl IntoIterator<Item = &channel::Model>,
         tx: &DatabaseTransaction,
     ) -> Result<Vec<channel::Model>> {
-        let mut values = String::new();
-        for id in channel_ids {
-            if !values.is_empty() {
-                values.push_str(", ");
-            }
-            write!(&mut values, "({})", id).unwrap();
+        let mut filter = Condition::any();
+        for channel in channels.into_iter() {
+            filter = filter.add(channel::Column::ParentPath.like(channel.descendant_path_filter()));
         }
 
-        if values.is_empty() {
+        if filter.is_empty() {
             return Ok(vec![]);
         }
 
-        let sql = format!(
-            r#"
-            SELECT DISTINCT
-                descendant_channels.*,
-                descendant_channels.parent_path || descendant_channels.id as full_path
-            FROM
-                channels parent_channels, channels descendant_channels
-            WHERE
-                descendant_channels.id IN ({values}) OR
-                (
-                    parent_channels.id IN ({values}) AND
-                    descendant_channels.parent_path LIKE (parent_channels.parent_path || parent_channels.id || '/%')
-                )
-            ORDER BY
-                full_path ASC
-            "#
-        );
-
         Ok(channel::Entity::find()
-            .from_raw_sql(Statement::from_string(
-                self.pool.get_database_backend(),
-                sql,
-            ))
+            .filter(filter)
+            .order_by_asc(Expr::cust("parent_path || id || '/'"))
             .all(tx)
             .await?)
     }
diff --git a/crates/collab/src/db/tables/channel.rs b/crates/collab/src/db/tables/channel.rs
index 7b38218d67..7625e4775f 100644
--- a/crates/collab/src/db/tables/channel.rs
+++ b/crates/collab/src/db/tables/channel.rs
@@ -39,6 +39,10 @@ impl Model {
     pub fn path(&self) -> String {
         format!("{}{}/", self.parent_path, self.id)
     }
+
+    pub fn descendant_path_filter(&self) -> String {
+        format!("{}{}/%", self.parent_path, self.id)
+    }
 }
 
 impl ActiveModelBehavior for ActiveModel {}

From 3728da116585707d77fad94e5bba65b9f66671c1 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Mon, 29 Jan 2024 13:46:45 -0800
Subject: [PATCH 041/372] collab 0.42.1

---
 Cargo.lock               | 2 +-
 crates/collab/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8a141a31cb..fa1f43f4b4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1428,7 +1428,7 @@ dependencies = [
 
 [[package]]
 name = "collab"
-version = "0.42.0"
+version = "0.42.1"
 dependencies = [
  "anyhow",
  "async-trait",
diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml
index fe32d3d76b..ab072c13cc 100644
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Nathan Sobo <nathan@zed.dev>"]
 default-run = "collab"
 edition = "2021"
 name = "collab"
-version = "0.42.0"
+version = "0.42.1"
 publish = false
 license = "AGPL-3.0-or-later"
 

From 2a2cf45e9094bc4c3ee739ebaf4b81e752345490 Mon Sep 17 00:00:00 2001
From: Ben Hamment <Otterpocket@users.noreply.github.com>
Date: Mon, 29 Jan 2024 22:41:57 +0000
Subject: [PATCH 042/372] Improve file types list for Ruby syntax (#7022)

### Improved list of file types that require Ruby syntax highlighting

- `.ru` files: These are Rackup files and are used for configuring Rack
applications.
- `.thor` files: Used for defining Thor tasks. Thor is a toolkit for
building powerful command-line interfaces in Ruby.
- `.cap, .capfile, and Capfile`: These files are used for Capistrano
deployment configuration.
- `.jbuilder` files: Used for creating JSON responses in a Rails
application.
- `.rabl files`: RABL (Ruby API Builder Language) files are used for
defining JSON templates.
- `.rxml` files: RXML files are used for creating XML responses.
- `.builder` files: Builder templates, which are used for generating XML
and other formats.
- `.gemspec` files: These files define metadata for a RubyGem.
- `.rdoc` files: RDoc documentation files.
- `.thor` files: These files are used for defining Thor tasks.
- `.pryrc` files: Configuration files for the Pry REPL (Read-Eval-Print
Loop).
- `.simplecov`: Configuration file for SimpleCov, a code coverage
analysis tool.

#### Some examples
- <img width="393" alt="image"
src="https://github.com/zed-industries/zed/assets/7274458/4e30b03a-ae21-4bae-ab11-48aa46b4bd0b">
- <img width="501" alt="image"
src="https://github.com/zed-industries/zed/assets/7274458/07251529-bcde-42d2-8973-341679e5cbc4">
- <img width="365" alt="image"
src="https://github.com/zed-industries/zed/assets/7274458/8c9c116c-2b51-4062-b83b-83f60838d28a">
- <img width="396" alt="image"
src="https://github.com/zed-industries/zed/assets/7274458/02d591af-88df-41f0-ba52-b11fa370ba07">
- <img width="432" alt="image"
src="https://github.com/zed-industries/zed/assets/7274458/91cd760f-f56a-488a-9736-bc03a44b27cf">
- <img width="296" alt="image"
src="https://github.com/zed-industries/zed/assets/7274458/282c331e-8896-49d4-b3b6-b3edbf0c1cc5">
- <img width="316" alt="image"
src="https://github.com/zed-industries/zed/assets/7274458/a2ddfccf-43d4-4657-a764-9e8d62aa4467">
- <img width="536" alt="image"
src="https://github.com/zed-industries/zed/assets/7274458/b0fce8db-4a9e-4615-bf5d-0b6c523bcbc8">

- `path_suffixes` Also new lines the array for readability especially
for diffs.

Release Notes:

- Associated `.ru`, `.thor`, `.cap`, `.capfile`, `Capfile`, `.jbuilder`,
`.rabl`, `.rxml`, `.builder`, `.gemspec`, `.rdoc`, `.thor`, `.pryrc`,
and `.simplecov` files with Ruby.
---
 crates/zed/src/languages/ruby/config.toml | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/crates/zed/src/languages/ruby/config.toml b/crates/zed/src/languages/ruby/config.toml
index e522cd06a2..8f2f1fab97 100644
--- a/crates/zed/src/languages/ruby/config.toml
+++ b/crates/zed/src/languages/ruby/config.toml
@@ -1,5 +1,24 @@
 name = "Ruby"
-path_suffixes = ["rb", "Gemfile", "rake", "Rakefile"]
+path_suffixes = [
+  "rb",
+  "Gemfile",
+  "rake",
+  "Rakefile",
+  "ru",
+  "thor",
+  "cap",
+  "capfile",
+  "Capfile",
+  "jbuilder",
+  "rabl",
+  "rxml",
+  "builder",
+  "gemspec",
+  "rdoc",
+  "thor",
+  "pryrc",
+  "simplecov"
+]
 first_line_pattern = '^#!.*\bruby\b'
 line_comments = ["# "]
 autoclose_before = ";:.,=}])>"

From 76560968149daf88a95d3f579be029dd54656a02 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Mon, 29 Jan 2024 17:51:34 -0500
Subject: [PATCH 043/372] Rework access to `ThemeRegistry` global (#7023)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR reworks how we access the `ThemeRegistry` global.

Previously we were making calls directly on the context, like
`cx.global::<ThemeRegistry>`. However, one problem with this is that it
spreads out the knowledge of exactly what type is stored in the global.

In order to make it easier to adjust the type we store in the context
(e.g., wrapping the `ThemeRegistry` in an `Arc`), we now call methods on
the `ThemeRegistry` itself for accessing the global.

It would also be interesting to see how we could prevent access to the
`ThemeRegistry` without going through one of these dedicated methods 🤔

Release Notes:

- N/A
---
 crates/storybook/src/storybook.rs           |  2 +-
 crates/theme/src/registry.rs                | 19 ++++++++++++++++++-
 crates/theme/src/settings.rs                |  5 ++---
 crates/theme/src/theme.rs                   |  2 +-
 crates/theme_selector/src/theme_selector.rs |  4 ++--
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/crates/storybook/src/storybook.rs b/crates/storybook/src/storybook.rs
index 47fc3b042a..efbd46665c 100644
--- a/crates/storybook/src/storybook.rs
+++ b/crates/storybook/src/storybook.rs
@@ -71,7 +71,7 @@ fn main() {
 
         let selector = story_selector;
 
-        let theme_registry = cx.global::<ThemeRegistry>();
+        let theme_registry = ThemeRegistry::global(cx);
         let mut theme_settings = ThemeSettings::get_global(cx).clone();
         theme_settings.active_theme = theme_registry.get(&theme_name).unwrap();
         ThemeSettings::override_global(theme_settings, cx);
diff --git a/crates/theme/src/registry.rs b/crates/theme/src/registry.rs
index c90b1c909e..1fbee2449e 100644
--- a/crates/theme/src/registry.rs
+++ b/crates/theme/src/registry.rs
@@ -2,7 +2,7 @@ use std::collections::HashMap;
 use std::sync::Arc;
 
 use anyhow::{anyhow, Context, Result};
-use gpui::{AssetSource, HighlightStyle, SharedString};
+use gpui::{AppContext, AssetSource, HighlightStyle, SharedString};
 use refineable::Refineable;
 use util::ResultExt;
 
@@ -24,6 +24,23 @@ pub struct ThemeRegistry {
 }
 
 impl ThemeRegistry {
+    /// Returns the global [`ThemeRegistry`].
+    pub fn global(cx: &AppContext) -> &Self {
+        cx.global::<ThemeRegistry>()
+    }
+
+    /// Returns a mutable reference to the global [`ThemeRegistry`].
+    pub fn global_mut(cx: &mut AppContext) -> &mut Self {
+        cx.global_mut::<ThemeRegistry>()
+    }
+
+    /// Returns a mutable reference to the global [`ThemeRegistry`].
+    ///
+    /// Inserts a default [`ThemeRegistry`] if one does not yet exist.
+    pub fn default_global(cx: &mut AppContext) -> &mut Self {
+        cx.default_global::<ThemeRegistry>()
+    }
+
     pub fn new(assets: Box<dyn AssetSource>) -> Self {
         let mut registry = Self {
             assets,
diff --git a/crates/theme/src/settings.rs b/crates/theme/src/settings.rs
index 67e7e7a0d8..828a2f5de5 100644
--- a/crates/theme/src/settings.rs
+++ b/crates/theme/src/settings.rs
@@ -164,7 +164,7 @@ impl settings::Settings for ThemeSettings {
         user_values: &[&Self::FileContent],
         cx: &mut AppContext,
     ) -> Result<Self> {
-        let themes = cx.default_global::<ThemeRegistry>();
+        let themes = ThemeRegistry::default_global(cx);
 
         let mut this = Self {
             ui_font_size: defaults.ui_font_size.unwrap().into(),
@@ -230,8 +230,7 @@ impl settings::Settings for ThemeSettings {
         cx: &AppContext,
     ) -> schemars::schema::RootSchema {
         let mut root_schema = generator.root_schema_for::<ThemeSettingsContent>();
-        let theme_names = cx
-            .global::<ThemeRegistry>()
+        let theme_names = ThemeRegistry::global(cx)
             .list_names(params.staff_mode)
             .map(|theme_name| Value::String(theme_name.to_string()))
             .collect();
diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs
index 5018a72da0..2686ffe62d 100644
--- a/crates/theme/src/theme.rs
+++ b/crates/theme/src/theme.rs
@@ -63,7 +63,7 @@ pub fn init(themes_to_load: LoadThemes, cx: &mut AppContext) {
     cx.set_global(ThemeRegistry::new(assets));
 
     if load_user_themes {
-        cx.global_mut::<ThemeRegistry>().load_user_themes();
+        ThemeRegistry::global_mut(cx).load_user_themes();
     }
 
     ThemeSettings::register(cx);
diff --git a/crates/theme_selector/src/theme_selector.rs b/crates/theme_selector/src/theme_selector.rs
index 14251c4a53..d67ff9ba71 100644
--- a/crates/theme_selector/src/theme_selector.rs
+++ b/crates/theme_selector/src/theme_selector.rs
@@ -102,7 +102,7 @@ impl ThemeSelectorDelegate {
         let original_theme = cx.theme().clone();
 
         let staff_mode = cx.is_staff();
-        let registry = cx.global::<ThemeRegistry>();
+        let registry = ThemeRegistry::global(cx);
         let mut themes = registry.list(staff_mode).collect::<Vec<_>>();
         themes.sort_unstable_by(|a, b| {
             a.appearance
@@ -135,7 +135,7 @@ impl ThemeSelectorDelegate {
 
     fn show_selected_theme(&mut self, cx: &mut ViewContext<Picker<ThemeSelectorDelegate>>) {
         if let Some(mat) = self.matches.get(self.selected_index) {
-            let registry = cx.global::<ThemeRegistry>();
+            let registry = ThemeRegistry::global(cx);
             match registry.get(&mat.string) {
                 Ok(theme) => {
                     Self::set_theme(theme, cx);

From e69e6f558663ce01339e987c5179c1a849c9a0c6 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Mon, 29 Jan 2024 18:09:37 -0500
Subject: [PATCH 044/372] Add a newtype wrapper around the global
 `ThemeRegistry` (#7025)

This PR adds a newtype wrapper around the global `ThemeRegistry`.

This allows us to limit where the `ThemeRegistry` can be accessed
directly via `cx.global` et al., without going through the dedicated
methods on the `ThemeRegistry`.

Release Notes:

- N/A
---
 Cargo.lock                   |  1 +
 crates/theme/Cargo.toml      |  1 +
 crates/theme/src/registry.rs | 21 ++++++++++++++++++---
 crates/theme/src/theme.rs    |  2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fa1f43f4b4..1562c4a7b3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7920,6 +7920,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "color",
+ "derive_more",
  "fs",
  "gpui",
  "indexmap 1.9.3",
diff --git a/crates/theme/Cargo.toml b/crates/theme/Cargo.toml
index 9c061b226f..a4b177fb9b 100644
--- a/crates/theme/Cargo.toml
+++ b/crates/theme/Cargo.toml
@@ -21,6 +21,7 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
+derive_more.workspace = true
 fs = { path = "../fs" }
 gpui = { path = "../gpui" }
 indexmap = { version = "1.6.2", features = ["serde"] }
diff --git a/crates/theme/src/registry.rs b/crates/theme/src/registry.rs
index 1fbee2449e..c44e7c11dd 100644
--- a/crates/theme/src/registry.rs
+++ b/crates/theme/src/registry.rs
@@ -2,6 +2,7 @@ use std::collections::HashMap;
 use std::sync::Arc;
 
 use anyhow::{anyhow, Context, Result};
+use derive_more::{Deref, DerefMut};
 use gpui::{AppContext, AssetSource, HighlightStyle, SharedString};
 use refineable::Refineable;
 use util::ResultExt;
@@ -18,6 +19,20 @@ pub struct ThemeMeta {
     pub appearance: Appearance,
 }
 
+/// The global [`ThemeRegistry`].
+///
+/// This newtype exists for obtaining a unique [`TypeId`](std::any::TypeId) when
+/// inserting the [`ThemeRegistry`] into the context as a global.
+///
+/// This should not be exposed outside of this module.
+#[derive(Default, Deref, DerefMut)]
+struct GlobalThemeRegistry(ThemeRegistry);
+
+/// Initializes the theme registry.
+pub fn init(assets: Box<dyn AssetSource>, cx: &mut AppContext) {
+    cx.set_global(GlobalThemeRegistry(ThemeRegistry::new(assets)));
+}
+
 pub struct ThemeRegistry {
     assets: Box<dyn AssetSource>,
     themes: HashMap<SharedString, Arc<Theme>>,
@@ -26,19 +41,19 @@ pub struct ThemeRegistry {
 impl ThemeRegistry {
     /// Returns the global [`ThemeRegistry`].
     pub fn global(cx: &AppContext) -> &Self {
-        cx.global::<ThemeRegistry>()
+        cx.global::<GlobalThemeRegistry>()
     }
 
     /// Returns a mutable reference to the global [`ThemeRegistry`].
     pub fn global_mut(cx: &mut AppContext) -> &mut Self {
-        cx.global_mut::<ThemeRegistry>()
+        cx.global_mut::<GlobalThemeRegistry>()
     }
 
     /// Returns a mutable reference to the global [`ThemeRegistry`].
     ///
     /// Inserts a default [`ThemeRegistry`] if one does not yet exist.
     pub fn default_global(cx: &mut AppContext) -> &mut Self {
-        cx.default_global::<ThemeRegistry>()
+        cx.default_global::<GlobalThemeRegistry>()
     }
 
     pub fn new(assets: Box<dyn AssetSource>) -> Self {
diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs
index 2686ffe62d..bb25133210 100644
--- a/crates/theme/src/theme.rs
+++ b/crates/theme/src/theme.rs
@@ -60,7 +60,7 @@ pub fn init(themes_to_load: LoadThemes, cx: &mut AppContext) {
         LoadThemes::JustBase => (Box::new(()) as Box<dyn AssetSource>, false),
         LoadThemes::All(assets) => (assets, true),
     };
-    cx.set_global(ThemeRegistry::new(assets));
+    registry::init(assets, cx);
 
     if load_user_themes {
         ThemeRegistry::global_mut(cx).load_user_themes();

From 2c834c24a34be278e6322552e1d6e3ca0783cd4e Mon Sep 17 00:00:00 2001
From: Amin Yahyaabadi <aminyahyaabadi74@gmail.com>
Date: Mon, 29 Jan 2024 18:04:15 -0800
Subject: [PATCH 045/372] Build media and live-kit in test-mode on non-MacOS
 (#6859)

Build media and live-kit in test-mode on non-MacOS (Related to
https://github.com/zed-industries/zed/issues/5391
https://github.com/zed-industries/zed/issues/5395
https://github.com/zed-industries/zed/issues/5394)

This makes it possible to build the media and live-kit crates on
non-MacOS

Release Notes:

- N/A
---
 crates/live_kit_client/Cargo.toml             |  6 +++
 crates/live_kit_client/src/live_kit_client.rs |  8 ++--
 crates/live_kit_client/src/test.rs            |  2 +
 crates/media/build.rs                         |  8 +++-
 crates/media/src/bindings.rs                  |  2 +
 crates/media/src/media.rs                     |  5 +++
 script/bootstrap                              |  3 ++
 script/linux                                  | 40 +++++++++++++++++++
 8 files changed, 68 insertions(+), 6 deletions(-)
 create mode 100755 script/linux

diff --git a/crates/live_kit_client/Cargo.toml b/crates/live_kit_client/Cargo.toml
index 757ef9da13..1eb4f618e0 100644
--- a/crates/live_kit_client/Cargo.toml
+++ b/crates/live_kit_client/Cargo.toml
@@ -42,6 +42,12 @@ nanoid = { version ="0.4", optional = true}
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation = "0.9.3"
 
+[target.'cfg(not(target_os = "macos"))'.dependencies]
+async-trait = { workspace = true }
+collections = { path = "../collections", features = ["test-support"] }
+gpui = { path = "../gpui", features = ["test-support"] }
+live_kit_server = { path = "../live_kit_server" }
+
 [dev-dependencies]
 collections = { path = "../collections", features = ["test-support"] }
 gpui = { path = "../gpui", features = ["test-support"] }
diff --git a/crates/live_kit_client/src/live_kit_client.rs b/crates/live_kit_client/src/live_kit_client.rs
index abec27462e..1e9054e73c 100644
--- a/crates/live_kit_client/src/live_kit_client.rs
+++ b/crates/live_kit_client/src/live_kit_client.rs
@@ -1,15 +1,15 @@
 use std::sync::Arc;
 
-#[cfg(not(any(test, feature = "test-support")))]
+#[cfg(all(target_os = "macos", not(any(test, feature = "test-support"))))]
 pub mod prod;
 
-#[cfg(not(any(test, feature = "test-support")))]
+#[cfg(all(target_os = "macos", not(any(test, feature = "test-support"))))]
 pub use prod::*;
 
-#[cfg(any(test, feature = "test-support"))]
+#[cfg(any(test, feature = "test-support", not(target_os = "macos")))]
 pub mod test;
 
-#[cfg(any(test, feature = "test-support"))]
+#[cfg(any(test, feature = "test-support", not(target_os = "macos")))]
 pub use test::*;
 
 pub type Sid = String;
diff --git a/crates/live_kit_client/src/test.rs b/crates/live_kit_client/src/test.rs
index 96ca2b90dc..0de5bada34 100644
--- a/crates/live_kit_client/src/test.rs
+++ b/crates/live_kit_client/src/test.rs
@@ -5,6 +5,7 @@ use collections::{BTreeMap, HashMap, HashSet};
 use futures::Stream;
 use gpui::BackgroundExecutor;
 use live_kit_server::{proto, token};
+#[cfg(target_os = "macos")]
 use media::core_video::CVImageBuffer;
 use parking_lot::Mutex;
 use postage::watch;
@@ -845,6 +846,7 @@ impl Frame {
         self.height
     }
 
+    #[cfg(target_os = "macos")]
     pub fn image(&self) -> CVImageBuffer {
         unimplemented!("you can't call this in test mode")
     }
diff --git a/crates/media/build.rs b/crates/media/build.rs
index 7e66efd39d..ad6032ad41 100644
--- a/crates/media/build.rs
+++ b/crates/media/build.rs
@@ -1,6 +1,7 @@
-use std::{env, path::PathBuf, process::Command};
-
+#[cfg(target_os = "macos")]
 fn main() {
+    use std::{env, path::PathBuf, process::Command};
+
     let sdk_path = String::from_utf8(
         Command::new("xcrun")
             .args(["--sdk", "macosx", "--show-sdk-path"])
@@ -37,3 +38,6 @@ fn main() {
         .write_to_file(out_path.join("bindings.rs"))
         .expect("couldn't write dispatch bindings");
 }
+
+#[cfg(not(target_os = "macos"))]
+fn main() {}
diff --git a/crates/media/src/bindings.rs b/crates/media/src/bindings.rs
index a1c0b0da3e..a1c78c17c4 100644
--- a/crates/media/src/bindings.rs
+++ b/crates/media/src/bindings.rs
@@ -3,6 +3,8 @@
 #![allow(non_snake_case)]
 #![allow(unused)]
 
+#[cfg(target_os = "macos")]
 use objc::*;
 
+#[cfg(target_os = "macos")]
 include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
diff --git a/crates/media/src/media.rs b/crates/media/src/media.rs
index 269244dbf9..8d24e45cf2 100644
--- a/crates/media/src/media.rs
+++ b/crates/media/src/media.rs
@@ -3,12 +3,14 @@
 
 mod bindings;
 
+#[cfg(target_os = "macos")]
 use core_foundation::{
     base::{CFTypeID, TCFType},
     declare_TCFType, impl_CFTypeDescription, impl_TCFType,
 };
 use std::ffi::c_void;
 
+#[cfg(target_os = "macos")]
 pub mod io_surface {
     use super::*;
 
@@ -27,6 +29,7 @@ pub mod io_surface {
     }
 }
 
+#[cfg(target_os = "macos")]
 pub mod core_video {
     #![allow(non_snake_case)]
 
@@ -206,6 +209,7 @@ pub mod core_video {
     }
 }
 
+#[cfg(target_os = "macos")]
 pub mod core_media {
     #![allow(non_snake_case)]
 
@@ -413,6 +417,7 @@ pub mod core_media {
     }
 }
 
+#[cfg(target_os = "macos")]
 pub mod video_toolbox {
     #![allow(non_snake_case)]
 
diff --git a/script/bootstrap b/script/bootstrap
index 09504d633c..16ae872dbd 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -11,3 +11,6 @@ echo "migrating database..."
 
 echo "seeding database..."
 script/seed-db
+
+echo "Linux dependencies..."
+script/linux
diff --git a/script/linux b/script/linux
new file mode 100755
index 0000000000..1acf7a6e16
--- /dev/null
+++ b/script/linux
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+# if not on Linux, do nothing
+[[ $(uname) == "Linux" ]] || exit 0
+
+# if sudo is not installed, define an empty alias
+maysudo=$(command -v sudo || true)
+export maysudo
+
+# Ubuntu, Debian, etc.
+apt=$(command -v apt-get || true)
+deps=(
+  libasound2-dev
+)
+if [[ -n $apt ]]; then
+  $maysudo "$apt" install -y "${deps[@]}"
+  exit 0
+fi
+
+# Fedora, CentOS, RHEL, etc.
+dnf=$(command -v dnf || true)
+deps=(
+  alsa-lib-devel
+)
+if [[ -n $dnf ]]; then
+  $maysudo "$dnf" install -y "${deps[@]}"
+  exit 0
+fi
+
+# Arch, Manjaro, etc.
+pacman=$(command -v pacman || true)
+deps=(
+  alsa-lib
+)
+if [[ -n $pacman ]]; then
+  $maysudo "$pacman" -S --noconfirm "${deps[@]}"
+  exit 0
+fi
+
+echo "Unsupported Linux distribution in script/linux"

From 5f4dd36a1aad521a3e241dda45cb9c7695814f4e Mon Sep 17 00:00:00 2001
From: d1y <chenhonzhou@gmail.com>
Date: Tue, 30 Jan 2024 10:21:23 +0800
Subject: [PATCH 046/372] Add ability to expand/collapse directories using the
 `project_panel::Open` action (#6914)

#6910

I changed the `open_file` symbol to `open`, because this is more
consistent with the original intention

Release Notes:

- Added the ability to expand/collapse directories using the
`project_panel::Open` action.
---
 crates/project_panel/src/project_panel.rs | 54 +++++++++++++++++++++--
 1 file changed, 50 insertions(+), 4 deletions(-)

diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 6bcc1e3300..183f454d19 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -561,10 +561,12 @@ impl ProjectPanel {
         }
     }
 
-    fn open_file(&mut self, _: &Open, cx: &mut ViewContext<Self>) {
+    fn open(&mut self, _: &Open, cx: &mut ViewContext<Self>) {
         if let Some((_, entry)) = self.selected_entry(cx) {
             if entry.is_file() {
                 self.open_entry(entry.id, true, cx);
+            } else {
+                self.toggle_expanded(entry.id, cx);
             }
         }
     }
@@ -1476,7 +1478,7 @@ impl Render for ProjectPanel {
                 .on_action(cx.listener(Self::expand_selected_entry))
                 .on_action(cx.listener(Self::collapse_selected_entry))
                 .on_action(cx.listener(Self::collapse_all_entries))
-                .on_action(cx.listener(Self::open_file))
+                .on_action(cx.listener(Self::open))
                 .on_action(cx.listener(Self::confirm))
                 .on_action(cx.listener(Self::cancel))
                 .on_action(cx.listener(Self::copy_path))
@@ -2576,7 +2578,7 @@ mod tests {
 
         toggle_expand_dir(&panel, "src/test", cx);
         select_path(&panel, "src/test/first.rs", cx);
-        panel.update(cx, |panel, cx| panel.open_file(&Open, cx));
+        panel.update(cx, |panel, cx| panel.open(&Open, cx));
         cx.executor().run_until_parked();
         assert_eq!(
             visible_entries_as_strings(&panel, 0..10, cx),
@@ -2604,7 +2606,7 @@ mod tests {
         ensure_no_open_items_and_panes(&workspace, cx);
 
         select_path(&panel, "src/test/second.rs", cx);
-        panel.update(cx, |panel, cx| panel.open_file(&Open, cx));
+        panel.update(cx, |panel, cx| panel.open(&Open, cx));
         cx.executor().run_until_parked();
         assert_eq!(
             visible_entries_as_strings(&panel, 0..10, cx),
@@ -2810,6 +2812,50 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    async fn test_dir_toggle_collapse(cx: &mut gpui::TestAppContext) {
+        init_test_with_editor(cx);
+
+        let fs = FakeFs::new(cx.executor().clone());
+        fs.insert_tree(
+            "/project_root",
+            json!({
+                "dir_1": {
+                    "nested_dir": {
+                        "file_a.py": "# File contents",
+                    }
+                },
+                "file_1.py": "# File contents",
+            }),
+        )
+        .await;
+
+        let project = Project::test(fs.clone(), ["/project_root".as_ref()], cx).await;
+        let workspace = cx.add_window(|cx| Workspace::test_new(project.clone(), cx));
+        let cx = &mut VisualTestContext::from_window(*workspace, cx);
+        let panel = workspace
+            .update(cx, |workspace, cx| ProjectPanel::new(workspace, cx))
+            .unwrap();
+
+        panel.update(cx, |panel, cx| panel.open(&Open, cx));
+        cx.executor().run_until_parked();
+        select_path(&panel, "project_root/dir_1", cx);
+        panel.update(cx, |panel, cx| panel.open(&Open, cx));
+        select_path(&panel, "project_root/dir_1/nested_dir", cx);
+        panel.update(cx, |panel, cx| panel.open(&Open, cx));
+        panel.update(cx, |panel, cx| panel.open(&Open, cx));
+        cx.executor().run_until_parked();
+        assert_eq!(
+            visible_entries_as_strings(&panel, 0..10, cx),
+            &[
+                "v project_root",
+                "    v dir_1",
+                "        > nested_dir  <== selected",
+                "      file_1.py",
+            ]
+        );
+    }
+
     #[gpui::test]
     async fn test_collapse_all_entries(cx: &mut gpui::TestAppContext) {
         init_test_with_editor(cx);

From 9cb5a84b8d37062bdd0f0afe7aeae64f714d1568 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Mon, 29 Jan 2024 21:32:45 -0500
Subject: [PATCH 047/372] Add support for loading user themes (#7027)

This PR adds support for loading user themes in Zed.

Themes are loaded from the `themes` directory under the Zed config:
`~/.config/zed/themes`. This directory should contain JSON files
containing a `ThemeFamilyContent`.

Here's an example of the general structure of a theme family file:

```jsonc
{
  "name": "Vitesse",
  "author": "Anthony Fu",
  "themes": [
    {
      "name": "Vitesse Dark Soft",
      "appearance": "dark",
      "style": {
        "border": "#252525",
        // ...
      }
    }
  ]
}
```

Themes placed in this directory will be loaded and available in the
theme selector.

Release Notes:

- Added support for loading user themes from `~/.config/zed/themes`.
---
 Cargo.lock                                  |   1 +
 crates/theme/Cargo.toml                     |   1 +
 crates/theme/src/registry.rs                | 104 +++++++++++++-------
 crates/theme/src/settings.rs                |  24 +++++
 crates/theme/src/theme.rs                   |   2 +-
 crates/theme_selector/src/theme_selector.rs |   2 +-
 crates/util/src/paths.rs                    |   1 +
 crates/zed/src/main.rs                      |  32 +++++-
 crates/zed/src/zed.rs                       |   2 +-
 9 files changed, 131 insertions(+), 38 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1562c4a7b3..3817ba633c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7922,6 +7922,7 @@ dependencies = [
  "color",
  "derive_more",
  "fs",
+ "futures 0.3.28",
  "gpui",
  "indexmap 1.9.3",
  "itertools 0.11.0",
diff --git a/crates/theme/Cargo.toml b/crates/theme/Cargo.toml
index a4b177fb9b..b7ffb1cb13 100644
--- a/crates/theme/Cargo.toml
+++ b/crates/theme/Cargo.toml
@@ -23,6 +23,7 @@ doctest = false
 anyhow.workspace = true
 derive_more.workspace = true
 fs = { path = "../fs" }
+futures.workspace = true
 gpui = { path = "../gpui" }
 indexmap = { version = "1.6.2", features = ["serde"] }
 palette = { version = "0.7.3", default-features = false, features = ["std"] }
diff --git a/crates/theme/src/registry.rs b/crates/theme/src/registry.rs
index c44e7c11dd..afd2983f04 100644
--- a/crates/theme/src/registry.rs
+++ b/crates/theme/src/registry.rs
@@ -1,9 +1,13 @@
 use std::collections::HashMap;
+use std::path::Path;
 use std::sync::Arc;
 
 use anyhow::{anyhow, Context, Result};
 use derive_more::{Deref, DerefMut};
+use fs::Fs;
+use futures::StreamExt;
 use gpui::{AppContext, AssetSource, HighlightStyle, SharedString};
+use parking_lot::RwLock;
 use refineable::Refineable;
 use util::ResultExt;
 
@@ -26,40 +30,41 @@ pub struct ThemeMeta {
 ///
 /// This should not be exposed outside of this module.
 #[derive(Default, Deref, DerefMut)]
-struct GlobalThemeRegistry(ThemeRegistry);
+struct GlobalThemeRegistry(Arc<ThemeRegistry>);
 
 /// Initializes the theme registry.
 pub fn init(assets: Box<dyn AssetSource>, cx: &mut AppContext) {
-    cx.set_global(GlobalThemeRegistry(ThemeRegistry::new(assets)));
+    cx.set_global(GlobalThemeRegistry(Arc::new(ThemeRegistry::new(assets))));
+}
+
+struct ThemeRegistryState {
+    themes: HashMap<SharedString, Arc<Theme>>,
 }
 
 pub struct ThemeRegistry {
+    state: RwLock<ThemeRegistryState>,
     assets: Box<dyn AssetSource>,
-    themes: HashMap<SharedString, Arc<Theme>>,
 }
 
 impl ThemeRegistry {
     /// Returns the global [`ThemeRegistry`].
-    pub fn global(cx: &AppContext) -> &Self {
-        cx.global::<GlobalThemeRegistry>()
+    pub fn global(cx: &AppContext) -> Arc<Self> {
+        cx.global::<GlobalThemeRegistry>().0.clone()
     }
 
-    /// Returns a mutable reference to the global [`ThemeRegistry`].
-    pub fn global_mut(cx: &mut AppContext) -> &mut Self {
-        cx.global_mut::<GlobalThemeRegistry>()
-    }
-
-    /// Returns a mutable reference to the global [`ThemeRegistry`].
+    /// Returns the global [`ThemeRegistry`].
     ///
     /// Inserts a default [`ThemeRegistry`] if one does not yet exist.
-    pub fn default_global(cx: &mut AppContext) -> &mut Self {
-        cx.default_global::<GlobalThemeRegistry>()
+    pub fn default_global(cx: &mut AppContext) -> Arc<Self> {
+        cx.default_global::<GlobalThemeRegistry>().0.clone()
     }
 
     pub fn new(assets: Box<dyn AssetSource>) -> Self {
-        let mut registry = Self {
+        let registry = Self {
+            state: RwLock::new(ThemeRegistryState {
+                themes: HashMap::new(),
+            }),
             assets,
-            themes: HashMap::new(),
         };
 
         // We're loading our new versions of the One themes by default, as
@@ -72,30 +77,27 @@ impl ThemeRegistry {
         registry
     }
 
-    fn insert_theme_families(&mut self, families: impl IntoIterator<Item = ThemeFamily>) {
+    fn insert_theme_families(&self, families: impl IntoIterator<Item = ThemeFamily>) {
         for family in families.into_iter() {
             self.insert_themes(family.themes);
         }
     }
 
-    fn insert_themes(&mut self, themes: impl IntoIterator<Item = Theme>) {
+    fn insert_themes(&self, themes: impl IntoIterator<Item = Theme>) {
+        let mut state = self.state.write();
         for theme in themes.into_iter() {
-            self.themes.insert(theme.name.clone(), Arc::new(theme));
+            state.themes.insert(theme.name.clone(), Arc::new(theme));
         }
     }
 
     #[allow(unused)]
-    fn insert_user_theme_families(
-        &mut self,
-        families: impl IntoIterator<Item = ThemeFamilyContent>,
-    ) {
+    fn insert_user_theme_families(&self, families: impl IntoIterator<Item = ThemeFamilyContent>) {
         for family in families.into_iter() {
             self.insert_user_themes(family.themes);
         }
     }
 
-    #[allow(unused)]
-    fn insert_user_themes(&mut self, themes: impl IntoIterator<Item = ThemeContent>) {
+    pub fn insert_user_themes(&self, themes: impl IntoIterator<Item = ThemeContent>) {
         self.insert_themes(themes.into_iter().map(|user_theme| {
             let mut theme_colors = match user_theme.appearance {
                 AppearanceContent::Light => ThemeColors::light(),
@@ -186,28 +188,36 @@ impl ThemeRegistry {
     }
 
     pub fn clear(&mut self) {
-        self.themes.clear();
+        self.state.write().themes.clear();
     }
 
-    pub fn list_names(&self, _staff: bool) -> impl Iterator<Item = SharedString> + '_ {
-        self.themes.keys().cloned()
+    pub fn list_names(&self, _staff: bool) -> Vec<SharedString> {
+        self.state.read().themes.keys().cloned().collect()
     }
 
-    pub fn list(&self, _staff: bool) -> impl Iterator<Item = ThemeMeta> + '_ {
-        self.themes.values().map(|theme| ThemeMeta {
-            name: theme.name.clone(),
-            appearance: theme.appearance(),
-        })
+    pub fn list(&self, _staff: bool) -> Vec<ThemeMeta> {
+        self.state
+            .read()
+            .themes
+            .values()
+            .map(|theme| ThemeMeta {
+                name: theme.name.clone(),
+                appearance: theme.appearance(),
+            })
+            .collect()
     }
 
     pub fn get(&self, name: &str) -> Result<Arc<Theme>> {
-        self.themes
+        self.state
+            .read()
+            .themes
             .get(name)
             .ok_or_else(|| anyhow!("theme not found: {}", name))
             .cloned()
     }
 
-    pub fn load_user_themes(&mut self) {
+    /// Loads the themes bundled with the Zed binary and adds them to the registry.
+    pub fn load_bundled_themes(&self) {
         let theme_paths = self
             .assets
             .list("themes/")
@@ -230,6 +240,32 @@ impl ThemeRegistry {
             self.insert_user_theme_families([theme_family]);
         }
     }
+
+    /// Loads the user themes from the specified directory and adds them to the registry.
+    pub async fn load_user_themes(&self, themes_path: &Path, fs: Arc<dyn Fs>) -> Result<()> {
+        let mut theme_paths = fs
+            .read_dir(themes_path)
+            .await
+            .with_context(|| format!("reading themes from {themes_path:?}"))?;
+
+        while let Some(theme_path) = theme_paths.next().await {
+            let Some(theme_path) = theme_path.log_err() else {
+                continue;
+            };
+
+            let Some(reader) = fs.open_sync(&theme_path).await.log_err() else {
+                continue;
+            };
+
+            let Some(theme) = serde_json::from_reader(reader).log_err() else {
+                continue;
+            };
+
+            self.insert_user_theme_families([theme]);
+        }
+
+        Ok(())
+    }
 }
 
 impl Default for ThemeRegistry {
diff --git a/crates/theme/src/settings.rs b/crates/theme/src/settings.rs
index 828a2f5de5..67c0814dfa 100644
--- a/crates/theme/src/settings.rs
+++ b/crates/theme/src/settings.rs
@@ -26,6 +26,7 @@ pub struct ThemeSettings {
     pub buffer_font: Font,
     pub buffer_font_size: Pixels,
     pub buffer_line_height: BufferLineHeight,
+    pub requested_theme: Option<String>,
     pub active_theme: Arc<Theme>,
     pub theme_overrides: Option<ThemeStyleContent>,
 }
@@ -89,6 +90,25 @@ impl ThemeSettings {
         f32::max(self.buffer_line_height.value(), MIN_LINE_HEIGHT)
     }
 
+    /// Switches to the theme with the given name, if it exists.
+    ///
+    /// Returns a `Some` containing the new theme if it was successful.
+    /// Returns `None` otherwise.
+    pub fn switch_theme(&mut self, theme: &str, cx: &mut AppContext) -> Option<Arc<Theme>> {
+        let themes = ThemeRegistry::default_global(cx);
+
+        let mut new_theme = None;
+
+        if let Some(theme) = themes.get(&theme).log_err() {
+            self.active_theme = theme.clone();
+            new_theme = Some(theme);
+        }
+
+        self.apply_theme_overrides();
+
+        new_theme
+    }
+
     /// Applies the theme overrides, if there are any, to the current theme.
     pub fn apply_theme_overrides(&mut self) {
         if let Some(theme_overrides) = &self.theme_overrides {
@@ -182,6 +202,7 @@ impl settings::Settings for ThemeSettings {
             },
             buffer_font_size: defaults.buffer_font_size.unwrap().into(),
             buffer_line_height: defaults.buffer_line_height.unwrap(),
+            requested_theme: defaults.theme.clone(),
             active_theme: themes
                 .get(defaults.theme.as_ref().unwrap())
                 .or(themes.get(&one_dark().name))
@@ -205,6 +226,8 @@ impl settings::Settings for ThemeSettings {
             }
 
             if let Some(value) = &value.theme {
+                this.requested_theme = Some(value.clone());
+
                 if let Some(theme) = themes.get(value).log_err() {
                     this.active_theme = theme;
                 }
@@ -232,6 +255,7 @@ impl settings::Settings for ThemeSettings {
         let mut root_schema = generator.root_schema_for::<ThemeSettingsContent>();
         let theme_names = ThemeRegistry::global(cx)
             .list_names(params.staff_mode)
+            .into_iter()
             .map(|theme_name| Value::String(theme_name.to_string()))
             .collect();
 
diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs
index bb25133210..ba0203d999 100644
--- a/crates/theme/src/theme.rs
+++ b/crates/theme/src/theme.rs
@@ -63,7 +63,7 @@ pub fn init(themes_to_load: LoadThemes, cx: &mut AppContext) {
     registry::init(assets, cx);
 
     if load_user_themes {
-        ThemeRegistry::global_mut(cx).load_user_themes();
+        ThemeRegistry::global(cx).load_bundled_themes();
     }
 
     ThemeSettings::register(cx);
diff --git a/crates/theme_selector/src/theme_selector.rs b/crates/theme_selector/src/theme_selector.rs
index d67ff9ba71..1e87785bc2 100644
--- a/crates/theme_selector/src/theme_selector.rs
+++ b/crates/theme_selector/src/theme_selector.rs
@@ -103,7 +103,7 @@ impl ThemeSelectorDelegate {
 
         let staff_mode = cx.is_staff();
         let registry = ThemeRegistry::global(cx);
-        let mut themes = registry.list(staff_mode).collect::<Vec<_>>();
+        let mut themes = registry.list(staff_mode);
         themes.sort_unstable_by(|a, b| {
             a.appearance
                 .is_light()
diff --git a/crates/util/src/paths.rs b/crates/util/src/paths.rs
index 2df28def4c..cfab7d0a40 100644
--- a/crates/util/src/paths.rs
+++ b/crates/util/src/paths.rs
@@ -8,6 +8,7 @@ lazy_static::lazy_static! {
     pub static ref CONFIG_DIR: PathBuf = HOME.join(".config").join("zed");
     pub static ref CONVERSATIONS_DIR: PathBuf = HOME.join(".config/zed/conversations");
     pub static ref EMBEDDINGS_DIR: PathBuf = HOME.join(".config/zed/embeddings");
+    pub static ref THEMES_DIR: PathBuf = HOME.join(".config/zed/themes");
     pub static ref LOGS_DIR: PathBuf = HOME.join("Library/Logs/Zed");
     pub static ref SUPPORT_DIR: PathBuf = HOME.join("Library/Application Support/Zed");
     pub static ref PLUGINS_DIR: PathBuf = HOME.join("Library/Application Support/Zed/plugins");
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 3e546ca547..5955d79a59 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -38,7 +38,7 @@ use std::{
     },
     thread,
 };
-use theme::ActiveTheme;
+use theme::{ActiveTheme, ThemeRegistry, ThemeSettings};
 use util::{
     async_maybe,
     channel::{parse_zed_link, AppCommitSha, ReleaseChannel, RELEASE_CHANNEL},
@@ -164,6 +164,36 @@ fn main() {
         );
         assistant::init(cx);
 
+        // TODO: Should we be loading the themes in a different spot?
+        cx.spawn({
+            let fs = fs.clone();
+            |cx| async move {
+                if let Some(theme_registry) =
+                    cx.update(|cx| ThemeRegistry::global(cx).clone()).log_err()
+                {
+                    if let Some(()) = theme_registry
+                        .load_user_themes(&paths::THEMES_DIR.clone(), fs)
+                        .await
+                        .log_err()
+                    {
+                        cx.update(|cx| {
+                            let mut theme_settings = ThemeSettings::get_global(cx).clone();
+
+                            if let Some(requested_theme) = theme_settings.requested_theme.clone() {
+                                if let Some(_theme) =
+                                    theme_settings.switch_theme(&requested_theme, cx)
+                                {
+                                    ThemeSettings::override_global(theme_settings, cx);
+                                }
+                            }
+                        })
+                        .log_err();
+                    }
+                }
+            }
+        })
+        .detach();
+
         cx.spawn(|_| watch_languages(fs.clone(), languages.clone()))
             .detach();
         watch_file_types(fs.clone(), cx);
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index f045e62f83..95d3d751b0 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -2690,7 +2690,7 @@ mod tests {
         theme::init(theme::LoadThemes::JustBase, cx);
 
         let mut has_default_theme = false;
-        for theme_name in themes.list(false).map(|meta| meta.name) {
+        for theme_name in themes.list(false).into_iter().map(|meta| meta.name) {
             let theme = themes.get(&theme_name).unwrap();
             assert_eq!(theme.name, theme_name);
             if theme.name == ThemeSettings::get(None, cx).active_theme.name {

From 1ab49fdbe6bd6940d8e4ee54e613875be627aaf0 Mon Sep 17 00:00:00 2001
From: Todsaporn Banjerdkit <katopz@gmail.com>
Date: Tue, 30 Jan 2024 10:42:03 +0700
Subject: [PATCH 048/372] Use fallback BPE if the language model doesn't have
 one (#6848)

Release Notes:

- Added a fallback BPE if the language model doesn't have one.

---------

Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>
---
 crates/ai/src/providers/open_ai/embedding.rs | 2 +-
 crates/ai/src/providers/open_ai/model.rs     | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/crates/ai/src/providers/open_ai/embedding.rs b/crates/ai/src/providers/open_ai/embedding.rs
index 7480a454a1..4a8b051df3 100644
--- a/crates/ai/src/providers/open_ai/embedding.rs
+++ b/crates/ai/src/providers/open_ai/embedding.rs
@@ -30,7 +30,7 @@ use crate::providers::open_ai::OpenAiLanguageModel;
 use crate::providers::open_ai::OPEN_AI_API_URL;
 
 lazy_static! {
-    static ref OPEN_AI_BPE_TOKENIZER: CoreBPE = cl100k_base().unwrap();
+    pub(crate) static ref OPEN_AI_BPE_TOKENIZER: CoreBPE = cl100k_base().unwrap();
 }
 
 #[derive(Clone)]
diff --git a/crates/ai/src/providers/open_ai/model.rs b/crates/ai/src/providers/open_ai/model.rs
index ba3488d7dd..21ea0334bd 100644
--- a/crates/ai/src/providers/open_ai/model.rs
+++ b/crates/ai/src/providers/open_ai/model.rs
@@ -1,9 +1,10 @@
 use anyhow::anyhow;
 use tiktoken_rs::CoreBPE;
-use util::ResultExt;
 
 use crate::models::{LanguageModel, TruncationDirection};
 
+use super::OPEN_AI_BPE_TOKENIZER;
+
 #[derive(Clone)]
 pub struct OpenAiLanguageModel {
     name: String,
@@ -12,10 +13,11 @@ pub struct OpenAiLanguageModel {
 
 impl OpenAiLanguageModel {
     pub fn load(model_name: &str) -> Self {
-        let bpe = tiktoken_rs::get_bpe_from_model(model_name).log_err();
+        let bpe =
+            tiktoken_rs::get_bpe_from_model(model_name).unwrap_or(OPEN_AI_BPE_TOKENIZER.to_owned());
         OpenAiLanguageModel {
             name: model_name.to_string(),
-            bpe,
+            bpe: Some(bpe),
         }
     }
 }

From 31e95265440ef5bdca142b3c809bb46e97906e6d Mon Sep 17 00:00:00 2001
From: Vishal Bhavsar <vbhavsar@gmail.com>
Date: Mon, 29 Jan 2024 22:58:24 -0500
Subject: [PATCH 049/372] vim: Add support for moving to first, middle and last
 visible lines (`H`, `L`, `M`) (#6919)

This change implements the vim
[motion](https://github.com/vim/vim/blob/master/runtime/doc/motion.txt)
commands to move the cursor to the top, middle and bottom of the visible
view. This feature is requested in
https://github.com/zed-industries/zed/issues/4941.

This change takes inspiration from
[crates/vim/src/normal/scroll.rs](https://github.com/zed-industries/zed/blob/main/crates/vim/src/normal/scroll.rs).

A note on the behavior of these commands: Because
`NeovimBackedTestContext` requires compatibility with nvim, the current
implementation causes slightly non-standard behavior: it causes the
editor to scroll a few lines. The standard behavior causes no scrolling.
It is easy enough to account for the margin by adding
`VERTICAL_SCROLL_MARGIN`. However, doing so will cause test failures due
to the disparity between nvim and zed states. Perhaps
`NeovimBackedTestContext` should have a switch to be more tolerant for
such cases.

Release Notes:

- Added support for moving to top, middle and bottom of the screen in
vim mode (`H`, `M`, and `L`)
([#4941](https://github.com/zed-industries/zed/issues/4941)).
---
 assets/keymaps/vim.json                      |   3 +
 crates/editor/src/display_map.rs             |   2 +
 crates/editor/src/editor.rs                  |   2 +
 crates/editor/src/movement.rs                |   4 +
 crates/editor/src/scroll.rs                  |   2 +-
 crates/vim/src/motion.rs                     | 284 +++++++++++++++++++
 crates/vim/test_data/test_window_bottom.json |  15 +
 crates/vim/test_data/test_window_middle.json |  17 ++
 crates/vim/test_data/test_window_top.json    |   9 +
 9 files changed, 337 insertions(+), 1 deletion(-)
 create mode 100644 crates/vim/test_data/test_window_bottom.json
 create mode 100644 crates/vim/test_data/test_window_middle.json
 create mode 100644 crates/vim/test_data/test_window_top.json

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 0bdf1aae32..26ccfa8920 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -341,6 +341,9 @@
       "shift-s": "vim::SubstituteLine",
       "> >": "editor::Indent",
       "< <": "editor::Outdent",
+      "shift-h": "vim::WindowTop",
+      "shift-m": "vim::WindowMiddle",
+      "shift-l": "vim::WindowBottom",
       "ctrl-pagedown": "pane::ActivateNextItem",
       "ctrl-pageup": "pane::ActivatePrevItem"
     }
diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
index 6d81f3e37c..787fb4590f 100644
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -586,6 +586,8 @@ impl DisplaySnapshot {
             text_system,
             editor_style,
             rem_size,
+            anchor: _,
+            visible_rows: _,
         }: &TextLayoutDetails,
     ) -> Arc<LineLayout> {
         let mut runs = Vec::new();
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index bc7061524e..6b7eee4c10 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -3052,6 +3052,8 @@ impl Editor {
             text_system: cx.text_system().clone(),
             editor_style: self.style.clone().unwrap(),
             rem_size: cx.rem_size(),
+            anchor: self.scroll_manager.anchor().anchor,
+            visible_rows: self.visible_line_count(),
         }
     }
 
diff --git a/crates/editor/src/movement.rs b/crates/editor/src/movement.rs
index 71c2cceac1..f268e926c7 100644
--- a/crates/editor/src/movement.rs
+++ b/crates/editor/src/movement.rs
@@ -8,6 +8,8 @@ use language::Point;
 
 use std::{ops::Range, sync::Arc};
 
+use multi_buffer::Anchor;
+
 /// Defines search strategy for items in `movement` module.
 /// `FindRange::SingeLine` only looks for a match on a single line at a time, whereas
 /// `FindRange::MultiLine` keeps going until the end of a string.
@@ -23,6 +25,8 @@ pub struct TextLayoutDetails {
     pub(crate) text_system: Arc<TextSystem>,
     pub(crate) editor_style: EditorStyle,
     pub(crate) rem_size: Pixels,
+    pub anchor: Anchor,
+    pub visible_rows: Option<f32>,
 }
 
 /// Returns a column to the left of the current point, wrapping
diff --git a/crates/editor/src/scroll.rs b/crates/editor/src/scroll.rs
index d7f1456bd6..993e845e24 100644
--- a/crates/editor/src/scroll.rs
+++ b/crates/editor/src/scroll.rs
@@ -299,7 +299,7 @@ impl ScrollManager {
 }
 
 impl Editor {
-    pub fn vertical_scroll_margin(&mut self) -> usize {
+    pub fn vertical_scroll_margin(&self) -> usize {
         self.scroll_manager.vertical_scroll_margin as usize
     }
 
diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
index d7a46888cc..b5c090683a 100644
--- a/crates/vim/src/motion.rs
+++ b/crates/vim/src/motion.rs
@@ -41,6 +41,9 @@ pub enum Motion {
     StartOfLineDownward,
     EndOfLineDownward,
     GoToColumn,
+    WindowTop,
+    WindowMiddle,
+    WindowBottom,
 }
 
 #[derive(Clone, Deserialize, PartialEq)]
@@ -136,6 +139,9 @@ actions!(
         StartOfLineDownward,
         EndOfLineDownward,
         GoToColumn,
+        WindowTop,
+        WindowMiddle,
+        WindowBottom,
     ]
 );
 
@@ -231,6 +237,13 @@ pub fn register(workspace: &mut Workspace, _: &mut ViewContext<Workspace>) {
     workspace.register_action(|_: &mut Workspace, action: &RepeatFind, cx: _| {
         repeat_motion(action.backwards, cx)
     });
+    workspace.register_action(|_: &mut Workspace, &WindowTop, cx: _| motion(Motion::WindowTop, cx));
+    workspace.register_action(|_: &mut Workspace, &WindowMiddle, cx: _| {
+        motion(Motion::WindowMiddle, cx)
+    });
+    workspace.register_action(|_: &mut Workspace, &WindowBottom, cx: _| {
+        motion(Motion::WindowBottom, cx)
+    });
 }
 
 pub(crate) fn motion(motion: Motion, cx: &mut WindowContext) {
@@ -295,6 +308,9 @@ impl Motion {
             | NextLineStart
             | StartOfLineDownward
             | StartOfParagraph
+            | WindowTop
+            | WindowMiddle
+            | WindowBottom
             | EndOfParagraph => true,
             EndOfLine { .. }
             | NextWordEnd { .. }
@@ -336,6 +352,9 @@ impl Motion {
             | PreviousWordStart { .. }
             | FirstNonWhitespace { .. }
             | FindBackward { .. }
+            | WindowTop
+            | WindowMiddle
+            | WindowBottom
             | NextLineStart => false,
         }
     }
@@ -353,6 +372,9 @@ impl Motion {
             | NextWordEnd { .. }
             | Matching
             | FindForward { .. }
+            | WindowTop
+            | WindowMiddle
+            | WindowBottom
             | NextLineStart => true,
             Left
             | Backspace
@@ -449,6 +471,9 @@ impl Motion {
             StartOfLineDownward => (next_line_start(map, point, times - 1), SelectionGoal::None),
             EndOfLineDownward => (next_line_end(map, point, times), SelectionGoal::None),
             GoToColumn => (go_to_column(map, point, times), SelectionGoal::None),
+            WindowTop => window_top(map, point, &text_layout_details),
+            WindowMiddle => window_middle(map, point, &text_layout_details),
+            WindowBottom => window_bottom(map, point, &text_layout_details),
         };
 
         (new_point != point || infallible).then_some((new_point, goal))
@@ -955,6 +980,51 @@ pub(crate) fn next_line_end(
     end_of_line(map, false, point)
 }
 
+fn window_top(
+    map: &DisplaySnapshot,
+    point: DisplayPoint,
+    text_layout_details: &TextLayoutDetails,
+) -> (DisplayPoint, SelectionGoal) {
+    let first_visible_line = text_layout_details.anchor.to_display_point(map);
+    let new_col = point.column().min(map.line_len(first_visible_line.row()));
+    let new_point = DisplayPoint::new(first_visible_line.row(), new_col);
+    (map.clip_point(new_point, Bias::Left), SelectionGoal::None)
+}
+
+fn window_middle(
+    map: &DisplaySnapshot,
+    point: DisplayPoint,
+    text_layout_details: &TextLayoutDetails,
+) -> (DisplayPoint, SelectionGoal) {
+    if let Some(visible_rows) = text_layout_details.visible_rows {
+        let first_visible_line = text_layout_details.anchor.to_display_point(map);
+        let max_rows = (visible_rows as u32).min(map.max_buffer_row());
+        let new_row = first_visible_line.row() + (max_rows.div_euclid(2));
+        let new_col = point.column().min(map.line_len(new_row));
+        let new_point = DisplayPoint::new(new_row, new_col);
+        (map.clip_point(new_point, Bias::Left), SelectionGoal::None)
+    } else {
+        (point, SelectionGoal::None)
+    }
+}
+
+fn window_bottom(
+    map: &DisplaySnapshot,
+    point: DisplayPoint,
+    text_layout_details: &TextLayoutDetails,
+) -> (DisplayPoint, SelectionGoal) {
+    if let Some(visible_rows) = text_layout_details.visible_rows {
+        let first_visible_line = text_layout_details.anchor.to_display_point(map);
+        let bottom_row = first_visible_line.row() + (visible_rows) as u32;
+        let bottom_row_capped = bottom_row.min(map.max_buffer_row());
+        let new_col = point.column().min(map.line_len(bottom_row_capped));
+        let new_point = DisplayPoint::new(bottom_row_capped, new_col);
+        (map.clip_point(new_point, Bias::Left), SelectionGoal::None)
+    } else {
+        (point, SelectionGoal::None)
+    }
+}
+
 #[cfg(test)]
 mod test {
 
@@ -1107,4 +1177,218 @@ mod test {
         cx.simulate_shared_keystrokes(["enter"]).await;
         cx.assert_shared_state("one\n  ˇtwo\nthree").await;
     }
+
+    #[gpui::test]
+    async fn test_window_top(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+        let initial_state = indoc! {r"abc
+          def
+          paragraph
+          the second
+          third ˇand
+          final"};
+
+        cx.set_shared_state(initial_state).await;
+        cx.simulate_shared_keystrokes(["shift-h"]).await;
+        cx.assert_shared_state(indoc! {r"abˇc
+          def
+          paragraph
+          the second
+          third and
+          final"})
+            .await;
+
+        // clip point
+        cx.set_shared_state(indoc! {r"
+          1 2 3
+          4 5 6
+          7 8 ˇ9
+          "})
+            .await;
+        cx.simulate_shared_keystrokes(["shift-h"]).await;
+        cx.assert_shared_state(indoc! {r"
+          1 2 ˇ3
+          4 5 6
+          7 8 9
+          "})
+            .await;
+
+        cx.set_shared_state(indoc! {r"
+          1 2 3
+          4 5 6
+          ˇ7 8 9
+          "})
+            .await;
+        cx.simulate_shared_keystrokes(["shift-h"]).await;
+        cx.assert_shared_state(indoc! {r"
+          ˇ1 2 3
+          4 5 6
+          7 8 9
+          "})
+            .await;
+    }
+
+    #[gpui::test]
+    async fn test_window_middle(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+        let initial_state = indoc! {r"abˇc
+          def
+          paragraph
+          the second
+          third and
+          final"};
+
+        cx.set_shared_state(initial_state).await;
+        cx.simulate_shared_keystrokes(["shift-m"]).await;
+        cx.assert_shared_state(indoc! {r"abc
+          def
+          paˇragraph
+          the second
+          third and
+          final"})
+            .await;
+
+        cx.set_shared_state(indoc! {r"
+          1 2 3
+          4 5 6
+          7 8 ˇ9
+          "})
+            .await;
+        cx.simulate_shared_keystrokes(["shift-m"]).await;
+        cx.assert_shared_state(indoc! {r"
+          1 2 3
+          4 5 ˇ6
+          7 8 9
+          "})
+            .await;
+        cx.set_shared_state(indoc! {r"
+          1 2 3
+          4 5 6
+          ˇ7 8 9
+          "})
+            .await;
+        cx.simulate_shared_keystrokes(["shift-m"]).await;
+        cx.assert_shared_state(indoc! {r"
+          1 2 3
+          ˇ4 5 6
+          7 8 9
+          "})
+            .await;
+        cx.set_shared_state(indoc! {r"
+          ˇ1 2 3
+          4 5 6
+          7 8 9
+          "})
+            .await;
+        cx.simulate_shared_keystrokes(["shift-m"]).await;
+        cx.assert_shared_state(indoc! {r"
+          1 2 3
+          ˇ4 5 6
+          7 8 9
+          "})
+            .await;
+        cx.set_shared_state(indoc! {r"
+          1 2 3
+          ˇ4 5 6
+          7 8 9
+          "})
+            .await;
+        cx.simulate_shared_keystrokes(["shift-m"]).await;
+        cx.assert_shared_state(indoc! {r"
+          1 2 3
+          ˇ4 5 6
+          7 8 9
+          "})
+            .await;
+        cx.set_shared_state(indoc! {r"
+          1 2 3
+          4 5 ˇ6
+          7 8 9
+          "})
+            .await;
+        cx.simulate_shared_keystrokes(["shift-m"]).await;
+        cx.assert_shared_state(indoc! {r"
+          1 2 3
+          4 5 ˇ6
+          7 8 9
+          "})
+            .await;
+    }
+
+    #[gpui::test]
+    async fn test_window_bottom(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+        let initial_state = indoc! {r"abc
+          deˇf
+          paragraph
+          the second
+          third and
+          final"};
+
+        cx.set_shared_state(initial_state).await;
+        cx.simulate_shared_keystrokes(["shift-l"]).await;
+        cx.assert_shared_state(indoc! {r"abc
+          def
+          paragraph
+          the second
+          third and
+          fiˇnal"})
+            .await;
+
+        cx.set_shared_state(indoc! {r"
+          1 2 3
+          4 5 ˇ6
+          7 8 9
+          "})
+            .await;
+        cx.simulate_shared_keystrokes(["shift-l"]).await;
+        cx.assert_shared_state(indoc! {r"
+          1 2 3
+          4 5 6
+          7 8 9
+          ˇ"})
+            .await;
+
+        cx.set_shared_state(indoc! {r"
+          1 2 3
+          ˇ4 5 6
+          7 8 9
+          "})
+            .await;
+        cx.simulate_shared_keystrokes(["shift-l"]).await;
+        cx.assert_shared_state(indoc! {r"
+          1 2 3
+          4 5 6
+          7 8 9
+          ˇ"})
+            .await;
+
+        cx.set_shared_state(indoc! {r"
+          1 2 ˇ3
+          4 5 6
+          7 8 9
+          "})
+            .await;
+        cx.simulate_shared_keystrokes(["shift-l"]).await;
+        cx.assert_shared_state(indoc! {r"
+          1 2 3
+          4 5 6
+          7 8 9
+          ˇ"})
+            .await;
+
+        cx.set_shared_state(indoc! {r"
+          ˇ1 2 3
+          4 5 6
+          7 8 9
+          "})
+            .await;
+        cx.simulate_shared_keystrokes(["shift-l"]).await;
+        cx.assert_shared_state(indoc! {r"
+          1 2 3
+          4 5 6
+          7 8 9
+          ˇ"})
+            .await;
+    }
 }
diff --git a/crates/vim/test_data/test_window_bottom.json b/crates/vim/test_data/test_window_bottom.json
new file mode 100644
index 0000000000..50400883f2
--- /dev/null
+++ b/crates/vim/test_data/test_window_bottom.json
@@ -0,0 +1,15 @@
+{"Put":{"state":"abc\ndeˇf\nparagraph\nthe second\nthird and\nfinal"}}
+{"Key":"shift-l"}
+{"Get":{"state":"abc\ndef\nparagraph\nthe second\nthird and\nfiˇnal","mode":"Normal"}}
+{"Put":{"state":"1 2 3\n4 5 ˇ6\n7 8 9\n"}}
+{"Key":"shift-l"}
+{"Get":{"state":"1 2 3\n4 5 6\n7 8 9\nˇ","mode":"Normal"}}
+{"Put":{"state":"1 2 3\nˇ4 5 6\n7 8 9\n"}}
+{"Key":"shift-l"}
+{"Get":{"state":"1 2 3\n4 5 6\n7 8 9\nˇ","mode":"Normal"}}
+{"Put":{"state":"1 2 ˇ3\n4 5 6\n7 8 9\n"}}
+{"Key":"shift-l"}
+{"Get":{"state":"1 2 3\n4 5 6\n7 8 9\nˇ","mode":"Normal"}}
+{"Put":{"state":"ˇ1 2 3\n4 5 6\n7 8 9\n"}}
+{"Key":"shift-l"}
+{"Get":{"state":"1 2 3\n4 5 6\n7 8 9\nˇ","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_window_middle.json b/crates/vim/test_data/test_window_middle.json
new file mode 100644
index 0000000000..91154923e4
--- /dev/null
+++ b/crates/vim/test_data/test_window_middle.json
@@ -0,0 +1,17 @@
+{"Put":{"state":"abˇc\ndef\nparagraph\nthe second\nthird and\nfinal"}}
+{"Key":"shift-m"}
+{"Get":{"state":"abc\ndef\npaˇragraph\nthe second\nthird and\nfinal","mode":"Normal"}}
+{"Put":{"state":"1 2 3\n4 5 6\n7 8 ˇ9\n"}}
+{"Key":"shift-m"}
+{"Get":{"state":"1 2 3\n4 5 ˇ6\n7 8 9\n","mode":"Normal"}}
+{"Put":{"state":"1 2 3\n4 5 6\nˇ7 8 9\n"}}
+{"Key":"shift-m"}
+{"Get":{"state":"1 2 3\nˇ4 5 6\n7 8 9\n","mode":"Normal"}}
+{"Put":{"state":"ˇ1 2 3\n4 5 6\n7 8 9\n"}}
+{"Key":"shift-m"}
+{"Get":{"state":"1 2 3\nˇ4 5 6\n7 8 9\n","mode":"Normal"}}
+{"Key":"shift-m"}
+{"Get":{"state":"1 2 3\nˇ4 5 6\n7 8 9\n","mode":"Normal"}}
+{"Put":{"state":"1 2 3\n4 5 ˇ6\n7 8 9\n"}}
+{"Key":"shift-m"}
+{"Get":{"state":"1 2 3\n4 5 ˇ6\n7 8 9\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_window_top.json b/crates/vim/test_data/test_window_top.json
new file mode 100644
index 0000000000..607a26c110
--- /dev/null
+++ b/crates/vim/test_data/test_window_top.json
@@ -0,0 +1,9 @@
+{"Put":{"state":"abc\ndef\nparagraph\nthe second\nthird ˇand\nfinal"}}
+{"Key":"shift-h"}
+{"Get":{"state":"abˇc\ndef\nparagraph\nthe second\nthird and\nfinal","mode":"Normal"}}
+{"Put":{"state":"1 2 3\n4 5 6\n7 8 ˇ9\n"}}
+{"Key":"shift-h"}
+{"Get":{"state":"1 2 ˇ3\n4 5 6\n7 8 9\n","mode":"Normal"}}
+{"Put":{"state":"1 2 3\n4 5 6\nˇ7 8 9\n"}}
+{"Key":"shift-h"}
+{"Get":{"state":"ˇ1 2 3\n4 5 6\n7 8 9\n","mode":"Normal"}}

From 9f9bef4175f04a292cb71ac2737d8e5bceeae9dc Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Mon, 29 Jan 2024 23:11:25 -0500
Subject: [PATCH 050/372] Prevent GitHub from displaying comments within JSON
 files as errors (#7043)

This PR adds a `.gitattributes` rule to prevent GitHub from displaying
comments within JSON files as errors.

We have a number of JSON files (e.g., settings) that make use of
comments, and having a bunch of red in a diff is annoying.

Release Notes:

- N/A
---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..9973cfb4db
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Prevent GitHub from displaying comments within JSON files as errors.
+*.json linguist-language=JSON-with-Comments

From 3736ce9d9d331c2574fc7c06f598c166f671a255 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 29 Jan 2024 21:39:18 -0700
Subject: [PATCH 051/372] protobuf linter? (#7019)

Release Notes:

- N/A
---
 .github/actions/check_style/action.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/actions/check_style/action.yml b/.github/actions/check_style/action.yml
index 74bb871bf5..1577377911 100644
--- a/.github/actions/check_style/action.yml
+++ b/.github/actions/check_style/action.yml
@@ -22,3 +22,9 @@ runs:
       run: |
         export SQUAWK_GITHUB_TOKEN=${{ github.token }}
         . ./script/squawk
+
+    - uses: bufbuild/buf-setup-action@v1
+    - uses: bufbuild/buf-breaking-action@v1
+      with:
+        input: "crates/rpc/proto/"
+        against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=main,subdir=crates/rpc/proto/"

From 0cb8b0e4515904914d235582762a2d9e01e97a4d Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Mon, 29 Jan 2024 23:47:20 -0500
Subject: [PATCH 052/372] Clean up `Cargo.toml` files (#7044)

This PR cleans up some inconsistencies in the `Cargo.toml` files that
were driving me crazy.

Release Notes:

- N/A
---
 crates/activity_indicator/Cargo.toml | 1 -
 crates/ai/Cargo.toml                 | 1 -
 crates/assets/Cargo.toml             | 3 ---
 crates/assistant/Cargo.toml          | 1 -
 crates/audio/Cargo.toml              | 1 -
 crates/auto_update/Cargo.toml        | 1 -
 crates/breadcrumbs/Cargo.toml        | 1 -
 crates/call/Cargo.toml               | 1 -
 crates/channel/Cargo.toml            | 1 -
 crates/cli/Cargo.toml                | 1 -
 crates/client/Cargo.toml             | 1 -
 crates/clock/Cargo.toml              | 1 -
 crates/collab/Cargo.toml             | 1 -
 crates/collab_ui/Cargo.toml          | 1 -
 crates/collections/Cargo.toml        | 1 -
 crates/command_palette/Cargo.toml    | 1 -
 crates/copilot/Cargo.toml            | 1 -
 crates/copilot_ui/Cargo.toml         | 1 -
 crates/db/Cargo.toml                 | 1 -
 crates/diagnostics/Cargo.toml        | 1 -
 crates/editor/Cargo.toml             | 1 -
 crates/feature_flags/Cargo.toml      | 1 -
 crates/feedback/Cargo.toml           | 1 -
 crates/file_finder/Cargo.toml        | 1 -
 crates/fs/Cargo.toml                 | 1 -
 crates/fuzzy/Cargo.toml              | 1 -
 crates/git/Cargo.toml                | 1 -
 crates/go_to_line/Cargo.toml         | 1 -
 crates/gpui/Cargo.toml               | 1 -
 crates/gpui_macros/Cargo.toml        | 1 -
 crates/install_cli/Cargo.toml        | 1 -
 crates/journal/Cargo.toml            | 1 -
 crates/language/Cargo.toml           | 1 -
 crates/language_selector/Cargo.toml  | 1 -
 crates/language_tools/Cargo.toml     | 1 -
 crates/live_kit_client/Cargo.toml    | 1 -
 crates/live_kit_server/Cargo.toml    | 1 -
 crates/lsp/Cargo.toml                | 1 -
 crates/media/Cargo.toml              | 1 -
 crates/menu/Cargo.toml               | 1 -
 crates/multi_buffer/Cargo.toml       | 1 -
 crates/node_runtime/Cargo.toml       | 1 -
 crates/notifications/Cargo.toml      | 1 -
 crates/outline/Cargo.toml            | 1 -
 crates/picker/Cargo.toml             | 1 -
 crates/plugin/Cargo.toml             | 1 -
 crates/plugin_macros/Cargo.toml      | 1 -
 crates/plugin_runtime/Cargo.toml     | 1 -
 crates/prettier/Cargo.toml           | 1 -
 crates/project/Cargo.toml            | 1 -
 crates/project_panel/Cargo.toml      | 1 -
 crates/project_symbols/Cargo.toml    | 1 -
 crates/quick_action_bar/Cargo.toml   | 1 -
 crates/recent_projects/Cargo.toml    | 1 -
 crates/refineable/Cargo.toml         | 1 -
 crates/rich_text/Cargo.toml          | 1 -
 crates/rope/Cargo.toml               | 1 -
 crates/rpc/Cargo.toml                | 1 -
 crates/search/Cargo.toml             | 1 -
 crates/semantic_index/Cargo.toml     | 1 -
 crates/settings/Cargo.toml           | 1 -
 crates/snippet/Cargo.toml            | 1 -
 crates/sqlez/Cargo.toml              | 1 -
 crates/sqlez_macros/Cargo.toml       | 1 -
 crates/story/Cargo.toml              | 3 ---
 crates/storybook/Cargo.toml          | 1 -
 crates/sum_tree/Cargo.toml           | 1 -
 crates/terminal/Cargo.toml           | 1 -
 crates/terminal_view/Cargo.toml      | 1 -
 crates/text/Cargo.toml               | 1 -
 crates/theme/Cargo.toml              | 1 -
 crates/theme_importer/Cargo.toml     | 1 -
 crates/theme_selector/Cargo.toml     | 1 -
 crates/ui/Cargo.toml                 | 1 -
 crates/util/Cargo.toml               | 1 -
 crates/vcs_menu/Cargo.toml           | 2 --
 crates/vim/Cargo.toml                | 1 -
 crates/welcome/Cargo.toml            | 1 -
 crates/workspace/Cargo.toml          | 1 -
 crates/zed/Cargo.toml                | 1 -
 crates/zed_actions/Cargo.toml        | 3 ---
 81 files changed, 88 deletions(-)

diff --git a/crates/activity_indicator/Cargo.toml b/crates/activity_indicator/Cargo.toml
index bf255f2690..6f0ca876c7 100644
--- a/crates/activity_indicator/Cargo.toml
+++ b/crates/activity_indicator/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/activity_indicator.rs"
 doctest = false
diff --git a/crates/ai/Cargo.toml b/crates/ai/Cargo.toml
index 0b130c25e1..85dc53b1be 100644
--- a/crates/ai/Cargo.toml
+++ b/crates/ai/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/ai.rs"
 doctest = false
diff --git a/crates/assets/Cargo.toml b/crates/assets/Cargo.toml
index 2b4f72cf7b..253e4af4ce 100644
--- a/crates/assets/Cargo.toml
+++ b/crates/assets/Cargo.toml
@@ -5,9 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 gpui = {path = "../gpui"}
 rust-embed.workspace = true
diff --git a/crates/assistant/Cargo.toml b/crates/assistant/Cargo.toml
index 427c5541cc..ca93f5bdf7 100644
--- a/crates/assistant/Cargo.toml
+++ b/crates/assistant/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/assistant.rs"
 doctest = false
diff --git a/crates/audio/Cargo.toml b/crates/audio/Cargo.toml
index 067cfcfc05..37b2a7a156 100644
--- a/crates/audio/Cargo.toml
+++ b/crates/audio/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/audio.rs"
 doctest = false
diff --git a/crates/auto_update/Cargo.toml b/crates/auto_update/Cargo.toml
index 2e41eb89c3..f3315a922e 100644
--- a/crates/auto_update/Cargo.toml
+++ b/crates/auto_update/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/auto_update.rs"
 doctest = false
diff --git a/crates/breadcrumbs/Cargo.toml b/crates/breadcrumbs/Cargo.toml
index f2df9b2f07..03f0a85250 100644
--- a/crates/breadcrumbs/Cargo.toml
+++ b/crates/breadcrumbs/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/breadcrumbs.rs"
 doctest = false
diff --git a/crates/call/Cargo.toml b/crates/call/Cargo.toml
index c333e6994e..968db6eed8 100644
--- a/crates/call/Cargo.toml
+++ b/crates/call/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/call.rs"
 doctest = false
diff --git a/crates/channel/Cargo.toml b/crates/channel/Cargo.toml
index 8f2f75e9f0..f2038d6cdc 100644
--- a/crates/channel/Cargo.toml
+++ b/crates/channel/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/channel.rs"
 doctest = false
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index 3eeb9dd4b2..d790644e99 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/cli.rs"
 doctest = false
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
index ebb498a2be..08627d1641 100644
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/client.rs"
 doctest = false
diff --git a/crates/clock/Cargo.toml b/crates/clock/Cargo.toml
index 27163a3a5a..c81a6fda67 100644
--- a/crates/clock/Cargo.toml
+++ b/crates/clock/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/clock.rs"
 doctest = false
diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml
index ab072c13cc..04523f94e4 100644
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -7,7 +7,6 @@ version = "0.42.1"
 publish = false
 license = "AGPL-3.0-or-later"
 
-
 [[bin]]
 name = "collab"
 
diff --git a/crates/collab_ui/Cargo.toml b/crates/collab_ui/Cargo.toml
index 41ac8e2873..b158d528b3 100644
--- a/crates/collab_ui/Cargo.toml
+++ b/crates/collab_ui/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/collab_ui.rs"
 doctest = false
diff --git a/crates/collections/Cargo.toml b/crates/collections/Cargo.toml
index 5f135d7ad3..85cee90e12 100644
--- a/crates/collections/Cargo.toml
+++ b/crates/collections/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "Apache-2.0"
 
-
 [lib]
 path = "src/collections.rs"
 doctest = false
diff --git a/crates/command_palette/Cargo.toml b/crates/command_palette/Cargo.toml
index 3989e6411f..b60d46ab9a 100644
--- a/crates/command_palette/Cargo.toml
+++ b/crates/command_palette/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/command_palette.rs"
 doctest = false
diff --git a/crates/copilot/Cargo.toml b/crates/copilot/Cargo.toml
index ef8615fdf9..46cce455f1 100644
--- a/crates/copilot/Cargo.toml
+++ b/crates/copilot/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/copilot.rs"
 doctest = false
diff --git a/crates/copilot_ui/Cargo.toml b/crates/copilot_ui/Cargo.toml
index 92fafc18fe..4c9b590dc8 100644
--- a/crates/copilot_ui/Cargo.toml
+++ b/crates/copilot_ui/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/copilot_ui.rs"
 doctest = false
diff --git a/crates/db/Cargo.toml b/crates/db/Cargo.toml
index ef88295018..e5ca5fcc6b 100644
--- a/crates/db/Cargo.toml
+++ b/crates/db/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/db.rs"
 doctest = false
diff --git a/crates/diagnostics/Cargo.toml b/crates/diagnostics/Cargo.toml
index a3532d2a10..2e162c1938 100644
--- a/crates/diagnostics/Cargo.toml
+++ b/crates/diagnostics/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/diagnostics.rs"
 doctest = false
diff --git a/crates/editor/Cargo.toml b/crates/editor/Cargo.toml
index a04df2f5bc..d21d431ff9 100644
--- a/crates/editor/Cargo.toml
+++ b/crates/editor/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/editor.rs"
 doctest = false
diff --git a/crates/feature_flags/Cargo.toml b/crates/feature_flags/Cargo.toml
index 8c398003b4..cb25ccc9b4 100644
--- a/crates/feature_flags/Cargo.toml
+++ b/crates/feature_flags/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/feature_flags.rs"
 
diff --git a/crates/feedback/Cargo.toml b/crates/feedback/Cargo.toml
index 9b52e6a157..4ad55d5b0a 100644
--- a/crates/feedback/Cargo.toml
+++ b/crates/feedback/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/feedback.rs"
 
diff --git a/crates/file_finder/Cargo.toml b/crates/file_finder/Cargo.toml
index 68d9ca3658..42369e6dc4 100644
--- a/crates/file_finder/Cargo.toml
+++ b/crates/file_finder/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/file_finder.rs"
 doctest = false
diff --git a/crates/fs/Cargo.toml b/crates/fs/Cargo.toml
index 4f7293b1a7..aea2db8ab3 100644
--- a/crates/fs/Cargo.toml
+++ b/crates/fs/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/fs.rs"
 
diff --git a/crates/fuzzy/Cargo.toml b/crates/fuzzy/Cargo.toml
index 9b42d78867..5fc2e3de63 100644
--- a/crates/fuzzy/Cargo.toml
+++ b/crates/fuzzy/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/fuzzy.rs"
 doctest = false
diff --git a/crates/git/Cargo.toml b/crates/git/Cargo.toml
index 74b39af9a4..f48aafd37c 100644
--- a/crates/git/Cargo.toml
+++ b/crates/git/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/git.rs"
 
diff --git a/crates/go_to_line/Cargo.toml b/crates/go_to_line/Cargo.toml
index 6069116408..b90b9cc81e 100644
--- a/crates/go_to_line/Cargo.toml
+++ b/crates/go_to_line/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/go_to_line.rs"
 doctest = false
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 6a0ab1df3b..76d0cdb43d 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -7,7 +7,6 @@ description = "Zed's GPU-accelerated UI framework"
 publish = false
 license = "Apache-2.0"
 
-
 [features]
 test-support = ["backtrace", "dhat", "env_logger", "collections/test-support", "util/test-support"]
 
diff --git a/crates/gpui_macros/Cargo.toml b/crates/gpui_macros/Cargo.toml
index 16e0a8f0d5..a347ffc6e7 100644
--- a/crates/gpui_macros/Cargo.toml
+++ b/crates/gpui_macros/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "Apache-2.0"
 
-
 [lib]
 path = "src/gpui_macros.rs"
 proc-macro = true
diff --git a/crates/install_cli/Cargo.toml b/crates/install_cli/Cargo.toml
index 6ee84a96bb..ede2abcf0d 100644
--- a/crates/install_cli/Cargo.toml
+++ b/crates/install_cli/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/install_cli.rs"
 
diff --git a/crates/journal/Cargo.toml b/crates/journal/Cargo.toml
index 7417502ea7..d73718c8d7 100644
--- a/crates/journal/Cargo.toml
+++ b/crates/journal/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/journal.rs"
 doctest = false
diff --git a/crates/language/Cargo.toml b/crates/language/Cargo.toml
index d35c568b37..3d0e57dbc8 100644
--- a/crates/language/Cargo.toml
+++ b/crates/language/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/language.rs"
 doctest = false
diff --git a/crates/language_selector/Cargo.toml b/crates/language_selector/Cargo.toml
index faf4d50b47..bc7ebf4e87 100644
--- a/crates/language_selector/Cargo.toml
+++ b/crates/language_selector/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/language_selector.rs"
 doctest = false
diff --git a/crates/language_tools/Cargo.toml b/crates/language_tools/Cargo.toml
index d791f4f62d..dc6d64c13d 100644
--- a/crates/language_tools/Cargo.toml
+++ b/crates/language_tools/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/language_tools.rs"
 doctest = false
diff --git a/crates/live_kit_client/Cargo.toml b/crates/live_kit_client/Cargo.toml
index 1eb4f618e0..0eae185c0a 100644
--- a/crates/live_kit_client/Cargo.toml
+++ b/crates/live_kit_client/Cargo.toml
@@ -6,7 +6,6 @@ description = "Bindings to LiveKit Swift client SDK"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/live_kit_client.rs"
 doctest = false
diff --git a/crates/live_kit_server/Cargo.toml b/crates/live_kit_server/Cargo.toml
index 4b9c99cb8e..500bd15a95 100644
--- a/crates/live_kit_server/Cargo.toml
+++ b/crates/live_kit_server/Cargo.toml
@@ -6,7 +6,6 @@ description = "SDK for the LiveKit server API"
 publish = false
 license = "AGPL-3.0-or-later"
 
-
 [lib]
 path = "src/live_kit_server.rs"
 doctest = false
diff --git a/crates/lsp/Cargo.toml b/crates/lsp/Cargo.toml
index f5681733f9..6ef3b92b8b 100644
--- a/crates/lsp/Cargo.toml
+++ b/crates/lsp/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/lsp.rs"
 doctest = false
diff --git a/crates/media/Cargo.toml b/crates/media/Cargo.toml
index a4916a86d5..48c50a4fda 100644
--- a/crates/media/Cargo.toml
+++ b/crates/media/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "Apache-2.0"
 
-
 [lib]
 path = "src/media.rs"
 doctest = false
diff --git a/crates/menu/Cargo.toml b/crates/menu/Cargo.toml
index b32cbccdb9..5492570b6b 100644
--- a/crates/menu/Cargo.toml
+++ b/crates/menu/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/menu.rs"
 doctest = false
diff --git a/crates/multi_buffer/Cargo.toml b/crates/multi_buffer/Cargo.toml
index fc2343c8ba..d0be28ba94 100644
--- a/crates/multi_buffer/Cargo.toml
+++ b/crates/multi_buffer/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/multi_buffer.rs"
 doctest = false
diff --git a/crates/node_runtime/Cargo.toml b/crates/node_runtime/Cargo.toml
index fa01d1816c..c174cfa226 100644
--- a/crates/node_runtime/Cargo.toml
+++ b/crates/node_runtime/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/node_runtime.rs"
 doctest = false
diff --git a/crates/notifications/Cargo.toml b/crates/notifications/Cargo.toml
index 4a69a354bf..5ec2d02417 100644
--- a/crates/notifications/Cargo.toml
+++ b/crates/notifications/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/notification_store.rs"
 doctest = false
diff --git a/crates/outline/Cargo.toml b/crates/outline/Cargo.toml
index fe54b8d706..5fa8bbb03a 100644
--- a/crates/outline/Cargo.toml
+++ b/crates/outline/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/outline.rs"
 doctest = false
diff --git a/crates/picker/Cargo.toml b/crates/picker/Cargo.toml
index 16a8fef7b6..bf7cb468ac 100644
--- a/crates/picker/Cargo.toml
+++ b/crates/picker/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/picker.rs"
 doctest = false
diff --git a/crates/plugin/Cargo.toml b/crates/plugin/Cargo.toml
index c338070dd3..1bdd47f594 100644
--- a/crates/plugin/Cargo.toml
+++ b/crates/plugin/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [dependencies]
 serde.workspace = true
 serde_derive.workspace = true
diff --git a/crates/plugin_macros/Cargo.toml b/crates/plugin_macros/Cargo.toml
index 68a633c507..a125bc67e5 100644
--- a/crates/plugin_macros/Cargo.toml
+++ b/crates/plugin_macros/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 proc-macro = true
 
diff --git a/crates/plugin_runtime/Cargo.toml b/crates/plugin_runtime/Cargo.toml
index dc5d6a3655..f701c893e7 100644
--- a/crates/plugin_runtime/Cargo.toml
+++ b/crates/plugin_runtime/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [dependencies]
 wasmtime = "2.0"
 wasmtime-wasi = "2.0"
diff --git a/crates/prettier/Cargo.toml b/crates/prettier/Cargo.toml
index f2170faa8c..be4bb6f2f9 100644
--- a/crates/prettier/Cargo.toml
+++ b/crates/prettier/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/prettier.rs"
 doctest = false
diff --git a/crates/project/Cargo.toml b/crates/project/Cargo.toml
index ddaeeb4fd6..453553ed8e 100644
--- a/crates/project/Cargo.toml
+++ b/crates/project/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/project.rs"
 doctest = false
diff --git a/crates/project_panel/Cargo.toml b/crates/project_panel/Cargo.toml
index e2ae844604..d7fbb501cb 100644
--- a/crates/project_panel/Cargo.toml
+++ b/crates/project_panel/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/project_panel.rs"
 doctest = false
diff --git a/crates/project_symbols/Cargo.toml b/crates/project_symbols/Cargo.toml
index 5bbd645fe6..8f2f8bbf7a 100644
--- a/crates/project_symbols/Cargo.toml
+++ b/crates/project_symbols/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/project_symbols.rs"
 doctest = false
diff --git a/crates/quick_action_bar/Cargo.toml b/crates/quick_action_bar/Cargo.toml
index ef886df778..e57bd07502 100644
--- a/crates/quick_action_bar/Cargo.toml
+++ b/crates/quick_action_bar/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/quick_action_bar.rs"
 doctest = false
diff --git a/crates/recent_projects/Cargo.toml b/crates/recent_projects/Cargo.toml
index 90af59afcd..62a4754eff 100644
--- a/crates/recent_projects/Cargo.toml
+++ b/crates/recent_projects/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/recent_projects.rs"
 doctest = false
diff --git a/crates/refineable/Cargo.toml b/crates/refineable/Cargo.toml
index 782c546931..e586f0fc6a 100644
--- a/crates/refineable/Cargo.toml
+++ b/crates/refineable/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "Apache-2.0"
 
-
 [lib]
 path = "src/refineable.rs"
 doctest = false
diff --git a/crates/rich_text/Cargo.toml b/crates/rich_text/Cargo.toml
index a48581402f..cb8478e36d 100644
--- a/crates/rich_text/Cargo.toml
+++ b/crates/rich_text/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/rich_text.rs"
 doctest = false
diff --git a/crates/rope/Cargo.toml b/crates/rope/Cargo.toml
index 1f88b15bb1..4839bceb64 100644
--- a/crates/rope/Cargo.toml
+++ b/crates/rope/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/rope.rs"
 
diff --git a/crates/rpc/Cargo.toml b/crates/rpc/Cargo.toml
index de2183a34e..e4bca184ee 100644
--- a/crates/rpc/Cargo.toml
+++ b/crates/rpc/Cargo.toml
@@ -6,7 +6,6 @@ version = "0.1.0"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/rpc.rs"
 doctest = false
diff --git a/crates/search/Cargo.toml b/crates/search/Cargo.toml
index f0ef38d7c7..42ac3ab8e1 100644
--- a/crates/search/Cargo.toml
+++ b/crates/search/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/search.rs"
 doctest = false
diff --git a/crates/semantic_index/Cargo.toml b/crates/semantic_index/Cargo.toml
index 74eaaef161..d0c159d994 100644
--- a/crates/semantic_index/Cargo.toml
+++ b/crates/semantic_index/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/semantic_index.rs"
 doctest = false
diff --git a/crates/settings/Cargo.toml b/crates/settings/Cargo.toml
index fc273657ab..f977a87227 100644
--- a/crates/settings/Cargo.toml
+++ b/crates/settings/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/settings.rs"
 doctest = false
diff --git a/crates/snippet/Cargo.toml b/crates/snippet/Cargo.toml
index 5e77c87867..c2c62cc01e 100644
--- a/crates/snippet/Cargo.toml
+++ b/crates/snippet/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/snippet.rs"
 doctest = false
diff --git a/crates/sqlez/Cargo.toml b/crates/sqlez/Cargo.toml
index 559f62c975..ef7c7a3c1c 100644
--- a/crates/sqlez/Cargo.toml
+++ b/crates/sqlez/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [dependencies]
 anyhow.workspace = true
 indoc.workspace = true
diff --git a/crates/sqlez_macros/Cargo.toml b/crates/sqlez_macros/Cargo.toml
index 9307662926..bfb234ba4a 100644
--- a/crates/sqlez_macros/Cargo.toml
+++ b/crates/sqlez_macros/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/sqlez_macros.rs"
 proc-macro = true
diff --git a/crates/story/Cargo.toml b/crates/story/Cargo.toml
index 17905fffe5..47117a38be 100644
--- a/crates/story/Cargo.toml
+++ b/crates/story/Cargo.toml
@@ -5,9 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 gpui = { path = "../gpui" }
 smallvec.workspace = true
diff --git a/crates/storybook/Cargo.toml b/crates/storybook/Cargo.toml
index 1b4b088925..241fc5f4a8 100644
--- a/crates/storybook/Cargo.toml
+++ b/crates/storybook/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [[bin]]
 name = "storybook"
 path = "src/storybook.rs"
diff --git a/crates/sum_tree/Cargo.toml b/crates/sum_tree/Cargo.toml
index a27bb2443b..adeaf9dfa8 100644
--- a/crates/sum_tree/Cargo.toml
+++ b/crates/sum_tree/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "Apache-2.0"
 
-
 [lib]
 path = "src/sum_tree.rs"
 doctest = false
diff --git a/crates/terminal/Cargo.toml b/crates/terminal/Cargo.toml
index f4304c5816..44be85e436 100644
--- a/crates/terminal/Cargo.toml
+++ b/crates/terminal/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/terminal.rs"
 doctest = false
diff --git a/crates/terminal_view/Cargo.toml b/crates/terminal_view/Cargo.toml
index 508fb05014..664397a0a3 100644
--- a/crates/terminal_view/Cargo.toml
+++ b/crates/terminal_view/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/terminal_view.rs"
 doctest = false
diff --git a/crates/text/Cargo.toml b/crates/text/Cargo.toml
index 26b5884e03..3bbcb7fab5 100644
--- a/crates/text/Cargo.toml
+++ b/crates/text/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/text.rs"
 doctest = false
diff --git a/crates/theme/Cargo.toml b/crates/theme/Cargo.toml
index b7ffb1cb13..d854a32497 100644
--- a/crates/theme/Cargo.toml
+++ b/crates/theme/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [features]
 default = []
 stories = ["dep:itertools", "dep:story"]
diff --git a/crates/theme_importer/Cargo.toml b/crates/theme_importer/Cargo.toml
index fe51a9dd3e..6b5b5743f5 100644
--- a/crates/theme_importer/Cargo.toml
+++ b/crates/theme_importer/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [dependencies]
 any_ascii = "0.3.2"
 anyhow.workspace = true
diff --git a/crates/theme_selector/Cargo.toml b/crates/theme_selector/Cargo.toml
index c1f08c9e88..d24039b84c 100644
--- a/crates/theme_selector/Cargo.toml
+++ b/crates/theme_selector/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/theme_selector.rs"
 doctest = false
diff --git a/crates/ui/Cargo.toml b/crates/ui/Cargo.toml
index 25d306fb59..7eb6ca3a12 100644
--- a/crates/ui/Cargo.toml
+++ b/crates/ui/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 name = "ui"
 path = "src/ui.rs"
diff --git a/crates/util/Cargo.toml b/crates/util/Cargo.toml
index a140901677..c2f10619b2 100644
--- a/crates/util/Cargo.toml
+++ b/crates/util/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "Apache-2.0"
 
-
 [lib]
 path = "src/util.rs"
 doctest = true
diff --git a/crates/vcs_menu/Cargo.toml b/crates/vcs_menu/Cargo.toml
index c50d09f7e8..7333cae93f 100644
--- a/crates/vcs_menu/Cargo.toml
+++ b/crates/vcs_menu/Cargo.toml
@@ -3,10 +3,8 @@ name = "vcs_menu"
 version = "0.1.0"
 edition = "2021"
 publish = false
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 license = "GPL-3.0-or-later"
 
-
 [dependencies]
 fuzzy = { path = "../fuzzy"}
 fs = {path = "../fs"}
diff --git a/crates/vim/Cargo.toml b/crates/vim/Cargo.toml
index 3f7d48e95a..d76bce811a 100644
--- a/crates/vim/Cargo.toml
+++ b/crates/vim/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/vim.rs"
 doctest = false
diff --git a/crates/welcome/Cargo.toml b/crates/welcome/Cargo.toml
index f2fa364a12..9dfce5888d 100644
--- a/crates/welcome/Cargo.toml
+++ b/crates/welcome/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/welcome.rs"
 
diff --git a/crates/workspace/Cargo.toml b/crates/workspace/Cargo.toml
index ffb8dcbca7..d60b724f35 100644
--- a/crates/workspace/Cargo.toml
+++ b/crates/workspace/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 path = "src/workspace.rs"
 doctest = false
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 97c5a6e394..7736f7a97b 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -6,7 +6,6 @@ version = "0.121.0"
 publish = false
 license = "GPL-3.0-or-later"
 
-
 [lib]
 name = "zed"
 path = "src/zed.rs"
diff --git a/crates/zed_actions/Cargo.toml b/crates/zed_actions/Cargo.toml
index b668690ef1..5e98793f8b 100644
--- a/crates/zed_actions/Cargo.toml
+++ b/crates/zed_actions/Cargo.toml
@@ -5,9 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"
 
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 gpui = { path = "../gpui" }
 serde.workspace = true

From 372bc427bdc780ae758de0ac261ff1d9e59758f3 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Mon, 29 Jan 2024 23:50:31 -0500
Subject: [PATCH 053/372] Fix casing of `OpenZedUrl` action (#7045)

This PR updates the casing of the `OpenZedUrl` action to match the [Rust
naming
guidelines](https://rust-lang.github.io/api-guidelines/naming.html).

Release Notes:

- N/A
---
 crates/command_palette/src/command_palette.rs | 4 ++--
 crates/zed/src/zed.rs                         | 4 ++--
 crates/zed_actions/src/lib.rs                 | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/crates/command_palette/src/command_palette.rs b/crates/command_palette/src/command_palette.rs
index a130947793..34e2ca38a5 100644
--- a/crates/command_palette/src/command_palette.rs
+++ b/crates/command_palette/src/command_palette.rs
@@ -18,7 +18,7 @@ use util::{
     ResultExt,
 };
 use workspace::{ModalView, Workspace};
-use zed_actions::OpenZedURL;
+use zed_actions::OpenZedUrl;
 
 actions!(command_palette, [Toggle]);
 
@@ -236,7 +236,7 @@ impl PickerDelegate for CommandPaletteDelegate {
             if *RELEASE_CHANNEL == ReleaseChannel::Dev {
                 if parse_zed_link(&query).is_some() {
                     intercept_result = Some(CommandInterceptResult {
-                        action: OpenZedURL { url: query.clone() }.boxed_clone(),
+                        action: OpenZedUrl { url: query.clone() }.boxed_clone(),
                         string: query.clone(),
                         positions: vec![],
                     })
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 95d3d751b0..86fe95765f 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -38,7 +38,7 @@ use workspace::{
     create_and_open_local_file, notifications::simple_message_notification::MessageNotification,
     open_new, AppState, NewFile, NewWindow, Workspace, WorkspaceSettings,
 };
-use zed_actions::{OpenBrowser, OpenSettings, OpenZedURL, Quit};
+use zed_actions::{OpenBrowser, OpenSettings, OpenZedUrl, Quit};
 
 actions!(
     zed,
@@ -201,7 +201,7 @@ pub fn initialize_workspace(app_state: Arc<AppState>, cx: &mut AppContext) {
             .register_action(|_, _: &ToggleFullScreen, cx| {
                 cx.toggle_full_screen();
             })
-            .register_action(|_, action: &OpenZedURL, cx| {
+            .register_action(|_, action: &OpenZedUrl, cx| {
                 cx.global::<Arc<OpenListener>>()
                     .open_urls(&[action.url.clone()])
             })
diff --git a/crates/zed_actions/src/lib.rs b/crates/zed_actions/src/lib.rs
index badf76a6e7..9c62e225c7 100644
--- a/crates/zed_actions/src/lib.rs
+++ b/crates/zed_actions/src/lib.rs
@@ -16,10 +16,10 @@ pub struct OpenBrowser {
 }
 
 #[derive(Clone, PartialEq, Deserialize)]
-pub struct OpenZedURL {
+pub struct OpenZedUrl {
     pub url: String,
 }
 
-impl_actions!(zed, [OpenBrowser, OpenZedURL]);
+impl_actions!(zed, [OpenBrowser, OpenZedUrl]);
 
 actions!(zed, [OpenSettings, Quit]);

From b865db455db19e192746980aee0e2c32c286afc7 Mon Sep 17 00:00:00 2001
From: Robert Clover <robert@clover.gdn>
Date: Tue, 30 Jan 2024 16:01:02 +1100
Subject: [PATCH 054/372] Fix terminal line background being reset on each line
 (#7040)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Release Notes:

- Fixed #5027
- Fixed #5079

Info:

The terminal draws a rectangle for the background color of cells, but
this was being reset on every line. The effect of this was that tools
like Vim, Helix, and git-delta would only have one line with a
background color:

<img width="979" alt="Screenshot 2024-01-30 at 2 48 13 pm"
src="https://github.com/zed-industries/zed/assets/52195359/ab1873d2-0653-44c6-9406-bc2a277d9a2f">

After this change:

<img width="1011" alt="Screenshot 2024-01-30 at 2 49 45 pm"
src="https://github.com/zed-industries/zed/assets/52195359/6e4d2a70-590b-48b0-a464-4c827f55622e">
---
 crates/terminal_view/src/terminal_element.rs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index aebfdd28c2..c691d74754 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -218,7 +218,22 @@ impl TerminalElement {
                         match cur_alac_color {
                             Some(cur_color) => {
                                 if bg == cur_color {
-                                    cur_rect = cur_rect.take().map(|rect| rect.extend());
+                                    // `cur_rect` can be None if it was moved to the `rects` vec after wrapping around
+                                    // from one line to the next. The variables are all set correctly but there is no current
+                                    // rect, so we create one if necessary.
+                                    cur_rect = cur_rect.map_or_else(
+                                        || {
+                                            Some(LayoutRect::new(
+                                                AlacPoint::new(
+                                                    line_index as i32,
+                                                    cell.point.column.0 as i32,
+                                                ),
+                                                1,
+                                                convert_color(&bg, theme),
+                                            ))
+                                        },
+                                        |rect| Some(rect.extend()),
+                                    );
                                 } else {
                                     cur_alac_color = Some(bg);
                                     if cur_rect.is_some() {

From dd74643993b13de285b184d6ab26cf0a16c00162 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <53836821+bennetbo@users.noreply.github.com>
Date: Tue, 30 Jan 2024 06:56:51 +0100
Subject: [PATCH 055/372] gpui: Support loading image from filesystem (#6978)

This PR implements support for loading and displaying images from a
local file using gpui's `img` element.

API Changes:
- Changed `SharedUrl` to `SharedUrl::File`, `SharedUrl::Network`

Usage:
```rust
// load from network
img(SharedUrl::network(...)) // previously img(SharedUrl(...)

// load from filesystem
img(SharedUrl::file(...))
```

This will be useful when implementing markdown image support, because we
need to be able to render images from the filesystem (relative/absolute
path), e.g. when implementing markdown preview #5064.

I also added an example `image` to the gpui crate, let me know if this
is useful. Showcase:
<img width="872" alt="image"
src="https://github.com/zed-industries/zed/assets/53836821/b4310a26-db81-44fa-9a7b-61e7d0ad4349">

**Note**: The example is fetching images from [Lorem
Picsum](https://picsum.photos) ([Github
Repo](https://github.com/DMarby/picsum-photos)), which is a free
resource for fetching images in a specific size. Please let me know if
you're okay with using this in the example.
---
 crates/client/src/user.rs                     |  2 +-
 crates/collab/src/tests/integration_tests.rs  |  6 +-
 crates/collab_ui/src/chat_panel.rs            |  4 +-
 .../src/chat_panel/message_editor.rs          |  6 +-
 .../stories/collab_notification.rs            |  6 +-
 crates/gpui/examples/image.rs                 | 59 +++++++++++++++++
 crates/gpui/src/elements/img.rs               | 12 ----
 crates/gpui/src/image_cache.rs                | 37 +++++++----
 crates/gpui/src/shared_url.rs                 | 64 +++++++++++++++----
 crates/theme/src/styles/stories/players.rs    | 42 +++++++-----
 crates/ui/src/components/stories/avatar.rs    | 46 ++++++++-----
 crates/ui/src/components/stories/list_item.rs | 16 ++---
 12 files changed, 210 insertions(+), 90 deletions(-)
 create mode 100644 crates/gpui/examples/image.rs

diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs
index e571d2dc15..23cd97994f 100644
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -707,7 +707,7 @@ impl User {
         Arc::new(User {
             id: message.id,
             github_login: message.github_login,
-            avatar_uri: message.avatar_url.into(),
+            avatar_uri: SharedUrl::network(message.avatar_url),
         })
     }
 }
diff --git a/crates/collab/src/tests/integration_tests.rs b/crates/collab/src/tests/integration_tests.rs
index 625544e4a1..6dd1751c8c 100644
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -9,7 +9,7 @@ use fs::{repository::GitFileStatus, FakeFs, Fs as _, RemoveOptions};
 use futures::StreamExt as _;
 use gpui::{
     px, size, AppContext, BackgroundExecutor, Model, Modifiers, MouseButton, MouseDownEvent,
-    TestAppContext,
+    SharedUrl, TestAppContext,
 };
 use language::{
     language_settings::{AllLanguageSettings, Formatter},
@@ -1828,7 +1828,7 @@ async fn test_active_call_events(
             owner: Arc::new(User {
                 id: client_a.user_id().unwrap(),
                 github_login: "user_a".to_string(),
-                avatar_uri: "avatar_a".into(),
+                avatar_uri: SharedUrl::network("avatar_a"),
             }),
             project_id: project_a_id,
             worktree_root_names: vec!["a".to_string()],
@@ -1846,7 +1846,7 @@ async fn test_active_call_events(
             owner: Arc::new(User {
                 id: client_b.user_id().unwrap(),
                 github_login: "user_b".to_string(),
-                avatar_uri: "avatar_b".into(),
+                avatar_uri: SharedUrl::network("avatar_b"),
             }),
             project_id: project_b_id,
             worktree_root_names: vec!["b".to_string()]
diff --git a/crates/collab_ui/src/chat_panel.rs b/crates/collab_ui/src/chat_panel.rs
index b01cffebe9..14fab4301b 100644
--- a/crates/collab_ui/src/chat_panel.rs
+++ b/crates/collab_ui/src/chat_panel.rs
@@ -714,7 +714,7 @@ fn format_timestamp(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use gpui::HighlightStyle;
+    use gpui::{HighlightStyle, SharedUrl};
     use pretty_assertions::assert_eq;
     use rich_text::Highlight;
     use time::{Date, OffsetDateTime, Time, UtcOffset};
@@ -730,7 +730,7 @@ mod tests {
             timestamp: OffsetDateTime::now_utc(),
             sender: Arc::new(client::User {
                 github_login: "fgh".into(),
-                avatar_uri: "avatar_fgh".into(),
+                avatar_uri: SharedUrl::network("avatar_fgh"),
                 id: 103,
             }),
             nonce: 5,
diff --git a/crates/collab_ui/src/chat_panel/message_editor.rs b/crates/collab_ui/src/chat_panel/message_editor.rs
index 06501fe3fc..48cf4ab405 100644
--- a/crates/collab_ui/src/chat_panel/message_editor.rs
+++ b/crates/collab_ui/src/chat_panel/message_editor.rs
@@ -365,7 +365,7 @@ impl Render for MessageEditor {
 mod tests {
     use super::*;
     use client::{Client, User, UserStore};
-    use gpui::TestAppContext;
+    use gpui::{SharedUrl, TestAppContext};
     use language::{Language, LanguageConfig};
     use rpc::proto;
     use settings::SettingsStore;
@@ -392,7 +392,7 @@ mod tests {
                         user: Arc::new(User {
                             github_login: "a-b".into(),
                             id: 101,
-                            avatar_uri: "avatar_a-b".into(),
+                            avatar_uri: SharedUrl::network("avatar_a-b"),
                         }),
                         kind: proto::channel_member::Kind::Member,
                         role: proto::ChannelRole::Member,
@@ -401,7 +401,7 @@ mod tests {
                         user: Arc::new(User {
                             github_login: "C_D".into(),
                             id: 102,
-                            avatar_uri: "avatar_C_D".into(),
+                            avatar_uri: SharedUrl::network("avatar_C_D"),
                         }),
                         kind: proto::channel_member::Kind::Member,
                         role: proto::ChannelRole::Member,
diff --git a/crates/collab_ui/src/notifications/stories/collab_notification.rs b/crates/collab_ui/src/notifications/stories/collab_notification.rs
index e67ce817b6..e04a7b3904 100644
--- a/crates/collab_ui/src/notifications/stories/collab_notification.rs
+++ b/crates/collab_ui/src/notifications/stories/collab_notification.rs
@@ -1,4 +1,4 @@
-use gpui::prelude::*;
+use gpui::{prelude::*, SharedUrl};
 use story::{StoryContainer, StoryItem, StorySection};
 use ui::prelude::*;
 
@@ -19,7 +19,7 @@ impl Render for CollabNotificationStory {
                 "Incoming Call Notification",
                 window_container(400., 72.).child(
                     CollabNotification::new(
-                        "https://avatars.githubusercontent.com/u/1486634?v=4",
+                        SharedUrl::network("https://avatars.githubusercontent.com/u/1486634?v=4"),
                         Button::new("accept", "Accept"),
                         Button::new("decline", "Decline"),
                     )
@@ -36,7 +36,7 @@ impl Render for CollabNotificationStory {
                 "Project Shared Notification",
                 window_container(400., 72.).child(
                     CollabNotification::new(
-                        "https://avatars.githubusercontent.com/u/1714999?v=4",
+                        SharedUrl::network("https://avatars.githubusercontent.com/u/1714999?v=4"),
                         Button::new("open", "Open"),
                         Button::new("dismiss", "Dismiss"),
                     )
diff --git a/crates/gpui/examples/image.rs b/crates/gpui/examples/image.rs
new file mode 100644
index 0000000000..01a9cfb435
--- /dev/null
+++ b/crates/gpui/examples/image.rs
@@ -0,0 +1,59 @@
+use gpui::*;
+
+#[derive(IntoElement)]
+struct ImageFromResource {
+    text: SharedString,
+    resource: SharedUrl,
+}
+
+impl RenderOnce for ImageFromResource {
+    fn render(self, _: &mut WindowContext) -> impl IntoElement {
+        div().child(
+            div()
+                .flex_row()
+                .size_full()
+                .gap_4()
+                .child(self.text)
+                .child(img(self.resource).w(px(512.0)).h(px(512.0))),
+        )
+    }
+}
+
+struct ImageShowcase {
+    local_resource: SharedUrl,
+    remote_resource: SharedUrl,
+}
+
+impl Render for ImageShowcase {
+    fn render(&mut self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
+        div()
+            .flex()
+            .flex_row()
+            .size_full()
+            .justify_center()
+            .items_center()
+            .gap_8()
+            .bg(rgb(0xFFFFFF))
+            .child(ImageFromResource {
+                text: "Image loaded from a local file".into(),
+                resource: self.local_resource.clone(),
+            })
+            .child(ImageFromResource {
+                text: "Image loaded from a remote resource".into(),
+                resource: self.remote_resource.clone(),
+            })
+    }
+}
+
+fn main() {
+    env_logger::init();
+
+    App::new().run(|cx: &mut AppContext| {
+        cx.open_window(WindowOptions::default(), |cx| {
+            cx.new_view(|_cx| ImageShowcase {
+                local_resource: SharedUrl::file("../zed/resources/app-icon.png"),
+                remote_resource: SharedUrl::network("https://picsum.photos/512/512"),
+            })
+        });
+    });
+}
diff --git a/crates/gpui/src/elements/img.rs b/crates/gpui/src/elements/img.rs
index e7377373fe..d1455d33d6 100644
--- a/crates/gpui/src/elements/img.rs
+++ b/crates/gpui/src/elements/img.rs
@@ -27,18 +27,6 @@ impl From<SharedUrl> for ImageSource {
     }
 }
 
-impl From<&'static str> for ImageSource {
-    fn from(uri: &'static str) -> Self {
-        Self::Uri(uri.into())
-    }
-}
-
-impl From<String> for ImageSource {
-    fn from(uri: String) -> Self {
-        Self::Uri(uri.into())
-    }
-}
-
 impl From<Arc<ImageData>> for ImageSource {
     fn from(value: Arc<ImageData>) -> Self {
         Self::Data(value)
diff --git a/crates/gpui/src/image_cache.rs b/crates/gpui/src/image_cache.rs
index 95b41c3b2c..318aea8265 100644
--- a/crates/gpui/src/image_cache.rs
+++ b/crates/gpui/src/image_cache.rs
@@ -68,22 +68,31 @@ impl ImageCache {
                         {
                             let uri = uri.clone();
                             async move {
-                                let mut response =
-                                    client.get(uri.as_ref(), ().into(), true).await?;
-                                let mut body = Vec::new();
-                                response.body_mut().read_to_end(&mut body).await?;
+                                match uri {
+                                    SharedUrl::File(uri) => {
+                                        let image = image::open(uri.as_ref())?.into_bgra8();
+                                        Ok(Arc::new(ImageData::new(image)))
+                                    }
+                                    SharedUrl::Network(uri) => {
+                                        let mut response =
+                                            client.get(uri.as_ref(), ().into(), true).await?;
+                                        let mut body = Vec::new();
+                                        response.body_mut().read_to_end(&mut body).await?;
 
-                                if !response.status().is_success() {
-                                    return Err(Error::BadStatus {
-                                        status: response.status(),
-                                        body: String::from_utf8_lossy(&body).into_owned(),
-                                    });
+                                        if !response.status().is_success() {
+                                            return Err(Error::BadStatus {
+                                                status: response.status(),
+                                                body: String::from_utf8_lossy(&body).into_owned(),
+                                            });
+                                        }
+
+                                        let format = image::guess_format(&body)?;
+                                        let image =
+                                            image::load_from_memory_with_format(&body, format)?
+                                                .into_bgra8();
+                                        Ok(Arc::new(ImageData::new(image)))
+                                    }
                                 }
-
-                                let format = image::guess_format(&body)?;
-                                let image = image::load_from_memory_with_format(&body, format)?
-                                    .into_bgra8();
-                                Ok(Arc::new(ImageData::new(image)))
                             }
                         }
                         .map_err({
diff --git a/crates/gpui/src/shared_url.rs b/crates/gpui/src/shared_url.rs
index 8fb9018943..d419482391 100644
--- a/crates/gpui/src/shared_url.rs
+++ b/crates/gpui/src/shared_url.rs
@@ -1,25 +1,65 @@
-use derive_more::{Deref, DerefMut};
+use std::ops::{Deref, DerefMut};
 
 use crate::SharedString;
 
-/// A [`SharedString`] containing a URL.
-#[derive(Deref, DerefMut, Default, PartialEq, Eq, Hash, Clone)]
-pub struct SharedUrl(SharedString);
+/// A URL stored in a `SharedString` pointing to a file or a remote resource.
+#[derive(PartialEq, Eq, Hash, Clone)]
+pub enum SharedUrl {
+    /// A path to a local file.
+    File(SharedString),
+    /// A URL to a remote resource.
+    Network(SharedString),
+}
+
+impl SharedUrl {
+    /// Create a URL pointing to a local file.
+    pub fn file<S: Into<SharedString>>(s: S) -> Self {
+        Self::File(s.into())
+    }
+
+    /// Create a URL pointing to a remote resource.
+    pub fn network<S: Into<SharedString>>(s: S) -> Self {
+        Self::Network(s.into())
+    }
+}
+
+impl Default for SharedUrl {
+    fn default() -> Self {
+        Self::Network(SharedString::default())
+    }
+}
+
+impl Deref for SharedUrl {
+    type Target = SharedString;
+
+    fn deref(&self) -> &Self::Target {
+        match self {
+            Self::File(s) => s,
+            Self::Network(s) => s,
+        }
+    }
+}
+
+impl DerefMut for SharedUrl {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        match self {
+            Self::File(s) => s,
+            Self::Network(s) => s,
+        }
+    }
+}
 
 impl std::fmt::Debug for SharedUrl {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.0.fmt(f)
+        match self {
+            Self::File(s) => write!(f, "File({:?})", s),
+            Self::Network(s) => write!(f, "Network({:?})", s),
+        }
     }
 }
 
 impl std::fmt::Display for SharedUrl {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0.as_ref())
-    }
-}
-
-impl<T: Into<SharedString>> From<T> for SharedUrl {
-    fn from(value: T) -> Self {
-        Self(value.into())
+        write!(f, "{}", self.as_ref())
     }
 }
diff --git a/crates/theme/src/styles/stories/players.rs b/crates/theme/src/styles/stories/players.rs
index 21af258641..8963736e61 100644
--- a/crates/theme/src/styles/stories/players.rs
+++ b/crates/theme/src/styles/stories/players.rs
@@ -1,4 +1,4 @@
-use gpui::{div, img, px, IntoElement, ParentElement, Render, Styled, ViewContext};
+use gpui::{div, img, px, IntoElement, ParentElement, Render, SharedUrl, Styled, ViewContext};
 use story::Story;
 
 use crate::{ActiveTheme, PlayerColors};
@@ -53,10 +53,12 @@ impl Render for PlayerStory {
                             .border_2()
                             .border_color(player.cursor)
                             .child(
-                                img("https://avatars.githubusercontent.com/u/1714999?v=4")
-                                    .rounded_full()
-                                    .size_6()
-                                    .bg(gpui::red()),
+                                img(SharedUrl::network(
+                                    "https://avatars.githubusercontent.com/u/1714999?v=4",
+                                ))
+                                .rounded_full()
+                                .size_6()
+                                .bg(gpui::red()),
                             )
                     }),
                 ))
@@ -82,10 +84,12 @@ impl Render for PlayerStory {
                                     .border_color(player.background)
                                     .size(px(28.))
                                     .child(
-                                        img("https://avatars.githubusercontent.com/u/1714999?v=4")
-                                            .rounded_full()
-                                            .size(px(24.))
-                                            .bg(gpui::red()),
+                                        img(SharedUrl::network(
+                                            "https://avatars.githubusercontent.com/u/1714999?v=4",
+                                        ))
+                                        .rounded_full()
+                                        .size(px(24.))
+                                        .bg(gpui::red()),
                                     ),
                             )
                             .child(
@@ -98,10 +102,12 @@ impl Render for PlayerStory {
                                     .border_color(player.background)
                                     .size(px(28.))
                                     .child(
-                                        img("https://avatars.githubusercontent.com/u/1714999?v=4")
-                                            .rounded_full()
-                                            .size(px(24.))
-                                            .bg(gpui::red()),
+                                        img(SharedUrl::network(
+                                            "https://avatars.githubusercontent.com/u/1714999?v=4",
+                                        ))
+                                        .rounded_full()
+                                        .size(px(24.))
+                                        .bg(gpui::red()),
                                     ),
                             )
                             .child(
@@ -114,10 +120,12 @@ impl Render for PlayerStory {
                                     .border_color(player.background)
                                     .size(px(28.))
                                     .child(
-                                        img("https://avatars.githubusercontent.com/u/1714999?v=4")
-                                            .rounded_full()
-                                            .size(px(24.))
-                                            .bg(gpui::red()),
+                                        img(SharedUrl::network(
+                                            "https://avatars.githubusercontent.com/u/1714999?v=4",
+                                        ))
+                                        .rounded_full()
+                                        .size(px(24.))
+                                        .bg(gpui::red()),
                                     ),
                             )
                     }),
diff --git a/crates/ui/src/components/stories/avatar.rs b/crates/ui/src/components/stories/avatar.rs
index 9da475b0d9..5820d2b8c9 100644
--- a/crates/ui/src/components/stories/avatar.rs
+++ b/crates/ui/src/components/stories/avatar.rs
@@ -1,4 +1,4 @@
-use gpui::Render;
+use gpui::{Render, SharedUrl};
 use story::{StoryContainer, StoryItem, StorySection};
 
 use crate::{prelude::*, AudioStatus, Availability, AvatarAvailabilityIndicator};
@@ -13,50 +13,66 @@ impl Render for AvatarStory {
                 StorySection::new()
                     .child(StoryItem::new(
                         "Default",
-                        Avatar::new("https://avatars.githubusercontent.com/u/1714999?v=4"),
+                        Avatar::new(SharedUrl::network(
+                            "https://avatars.githubusercontent.com/u/1714999?v=4",
+                        )),
                     ))
                     .child(StoryItem::new(
                         "Default",
-                        Avatar::new("https://avatars.githubusercontent.com/u/326587?v=4"),
+                        Avatar::new(SharedUrl::network(
+                            "https://avatars.githubusercontent.com/u/326587?v=4",
+                        )),
                     )),
             )
             .child(
                 StorySection::new()
                     .child(StoryItem::new(
                         "With free availability indicator",
-                        Avatar::new("https://avatars.githubusercontent.com/u/326587?v=4")
-                            .indicator(AvatarAvailabilityIndicator::new(Availability::Free)),
+                        Avatar::new(SharedUrl::network(
+                            "https://avatars.githubusercontent.com/u/326587?v=4",
+                        ))
+                        .indicator(AvatarAvailabilityIndicator::new(Availability::Free)),
                     ))
                     .child(StoryItem::new(
                         "With busy availability indicator",
-                        Avatar::new("https://avatars.githubusercontent.com/u/326587?v=4")
-                            .indicator(AvatarAvailabilityIndicator::new(Availability::Busy)),
+                        Avatar::new(SharedUrl::network(
+                            "https://avatars.githubusercontent.com/u/326587?v=4",
+                        ))
+                        .indicator(AvatarAvailabilityIndicator::new(Availability::Busy)),
                     )),
             )
             .child(
                 StorySection::new()
                     .child(StoryItem::new(
                         "With info border",
-                        Avatar::new("https://avatars.githubusercontent.com/u/326587?v=4")
-                            .border_color(cx.theme().status().info_border),
+                        Avatar::new(SharedUrl::network(
+                            "https://avatars.githubusercontent.com/u/326587?v=4",
+                        ))
+                        .border_color(cx.theme().status().info_border),
                     ))
                     .child(StoryItem::new(
                         "With error border",
-                        Avatar::new("https://avatars.githubusercontent.com/u/326587?v=4")
-                            .border_color(cx.theme().status().error_border),
+                        Avatar::new(SharedUrl::network(
+                            "https://avatars.githubusercontent.com/u/326587?v=4",
+                        ))
+                        .border_color(cx.theme().status().error_border),
                     )),
             )
             .child(
                 StorySection::new()
                     .child(StoryItem::new(
                         "With muted audio indicator",
-                        Avatar::new("https://avatars.githubusercontent.com/u/326587?v=4")
-                            .indicator(AvatarAudioStatusIndicator::new(AudioStatus::Muted)),
+                        Avatar::new(SharedUrl::network(
+                            "https://avatars.githubusercontent.com/u/326587?v=4",
+                        ))
+                        .indicator(AvatarAudioStatusIndicator::new(AudioStatus::Muted)),
                     ))
                     .child(StoryItem::new(
                         "With deafened audio indicator",
-                        Avatar::new("https://avatars.githubusercontent.com/u/326587?v=4")
-                            .indicator(AvatarAudioStatusIndicator::new(AudioStatus::Deafened)),
+                        Avatar::new(SharedUrl::network(
+                            "https://avatars.githubusercontent.com/u/326587?v=4",
+                        ))
+                        .indicator(AvatarAudioStatusIndicator::new(AudioStatus::Deafened)),
                     )),
             )
     }
diff --git a/crates/ui/src/components/stories/list_item.rs b/crates/ui/src/components/stories/list_item.rs
index ae7be9b9c7..014b56b422 100644
--- a/crates/ui/src/components/stories/list_item.rs
+++ b/crates/ui/src/components/stories/list_item.rs
@@ -45,7 +45,7 @@ impl Render for ListItemStory {
             .child(
                 ListItem::new("with_start slot avatar")
                     .child("Hello, world!")
-                    .start_slot(Avatar::new(SharedUrl::from(
+                    .start_slot(Avatar::new(SharedUrl::network(
                         "https://avatars.githubusercontent.com/u/1714999?v=4",
                     ))),
             )
@@ -53,7 +53,7 @@ impl Render for ListItemStory {
             .child(
                 ListItem::new("with_left_avatar")
                     .child("Hello, world!")
-                    .end_slot(Avatar::new(SharedUrl::from(
+                    .end_slot(Avatar::new(SharedUrl::network(
                         "https://avatars.githubusercontent.com/u/1714999?v=4",
                     ))),
             )
@@ -64,23 +64,23 @@ impl Render for ListItemStory {
                     .end_slot(
                         h_flex()
                             .gap_2()
-                            .child(Avatar::new(SharedUrl::from(
+                            .child(Avatar::new(SharedUrl::network(
                                 "https://avatars.githubusercontent.com/u/1789?v=4",
                             )))
-                            .child(Avatar::new(SharedUrl::from(
+                            .child(Avatar::new(SharedUrl::network(
                                 "https://avatars.githubusercontent.com/u/1789?v=4",
                             )))
-                            .child(Avatar::new(SharedUrl::from(
+                            .child(Avatar::new(SharedUrl::network(
                                 "https://avatars.githubusercontent.com/u/1789?v=4",
                             )))
-                            .child(Avatar::new(SharedUrl::from(
+                            .child(Avatar::new(SharedUrl::network(
                                 "https://avatars.githubusercontent.com/u/1789?v=4",
                             )))
-                            .child(Avatar::new(SharedUrl::from(
+                            .child(Avatar::new(SharedUrl::network(
                                 "https://avatars.githubusercontent.com/u/1789?v=4",
                             ))),
                     )
-                    .end_hover_slot(Avatar::new(SharedUrl::from(
+                    .end_hover_slot(Avatar::new(SharedUrl::network(
                         "https://avatars.githubusercontent.com/u/1714999?v=4",
                     ))),
             )

From 561cd37c85eee05564d3128ba4e0f0b10824fb5b Mon Sep 17 00:00:00 2001
From: Hans <weartistt@gmail.com>
Date: Tue, 30 Jan 2024 15:23:10 +0800
Subject: [PATCH 056/372] Spell adjust (#7050)

---
 crates/collab/src/db/queries/channels.rs | 2 +-
 crates/collab/src/rpc.rs                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/collab/src/db/queries/channels.rs b/crates/collab/src/db/queries/channels.rs
index 05f216f3f1..76337381f7 100644
--- a/crates/collab/src/db/queries/channels.rs
+++ b/crates/collab/src/db/queries/channels.rs
@@ -173,7 +173,7 @@ impl Database {
         .await
     }
 
-    /// Sets the visibiltity of the given channel.
+    /// Sets the visibility of the given channel.
     pub async fn set_channel_visibility(
         &self,
         channel_id: ChannelId,
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 71f0510a69..cb758f0cac 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -1263,7 +1263,7 @@ async fn rejoin_room(
     Ok(())
 }
 
-/// leave room disonnects from the room.
+/// leave room disconnects from the room.
 async fn leave_room(
     _: proto::LeaveRoom,
     response: Response<proto::LeaveRoom>,

From 843916d5850480a3d51f90556d76ea8936827d83 Mon Sep 17 00:00:00 2001
From: Hans <weartistt@gmail.com>
Date: Tue, 30 Jan 2024 16:17:06 +0800
Subject: [PATCH 057/372] Fix two typos (#7056)

---
 crates/gpui/src/platform/mac/display_linker.rs | 2 +-
 crates/plugin_runtime/src/plugin.rs            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/gpui/src/platform/mac/display_linker.rs b/crates/gpui/src/platform/mac/display_linker.rs
index e25487ec0b..7d012da950 100644
--- a/crates/gpui/src/platform/mac/display_linker.rs
+++ b/crates/gpui/src/platform/mac/display_linker.rs
@@ -91,7 +91,7 @@ unsafe extern "C" fn trampoline(
 }
 
 mod sys {
-    //! Derived from display-link crate under the fololwing license:
+    //! Derived from display-link crate under the following license:
     //! <https://github.com/BrainiumLLC/display-link/blob/master/LICENSE-MIT>
     //! Apple docs: [CVDisplayLink](https://developer.apple.com/documentation/corevideo/cvdisplaylinkoutputcallback?language=objc)
     #![allow(dead_code, non_upper_case_globals)]
diff --git a/crates/plugin_runtime/src/plugin.rs b/crates/plugin_runtime/src/plugin.rs
index a19a49c47a..78ec85a0f2 100644
--- a/crates/plugin_runtime/src/plugin.rs
+++ b/crates/plugin_runtime/src/plugin.rs
@@ -412,7 +412,7 @@ impl Plugin {
     //
     // phew...
     //
-    // now the problem is, webassambly doesn't support buffers.
+    // now the problem is, webassembly doesn't support buffers.
     // only really like i32s, that's it (yeah, it's sad. Not even unsigned!)
     // (ok, I'm exaggerating a bit).
     //

From cddc0fbf928a6a7a9f8f6f8a57bc33c46a96fbce Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Tue, 30 Jan 2024 09:17:19 +0100
Subject: [PATCH 058/372] vim: fix `t` not being repeatable with `,` (#7007)

This fixes `t` not being repeatable with `,` and `;` in normal mode.

Release Notes:

- Fixed `t` in Vim mode not being repeatable with `,` or `;`.

---------

Co-authored-by: Conrad <conrad@zed.dev>
---
 assets/keymaps/vim.json                       |   7 +-
 crates/vim/src/motion.rs                      | 139 ++++++++++++------
 .../vim/test_data/test_comma_semicolon.json   |  17 +++
 3 files changed, 113 insertions(+), 50 deletions(-)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 26ccfa8920..2b0ad672b0 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -330,12 +330,7 @@
       "*": "vim::MoveToNext",
       "#": "vim::MoveToPrev",
       ";": "vim::RepeatFind",
-      ",": [
-        "vim::RepeatFind",
-        {
-          "backwards": true
-        }
-      ],
+      ",": "vim::RepeatFindReversed",
       "r": ["vim::PushOperator", "Replace"],
       "s": "vim::Substitute",
       "shift-s": "vim::SubstituteLine",
diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
index b5c090683a..e8cd21bba3 100644
--- a/crates/vim/src/motion.rs
+++ b/crates/vim/src/motion.rs
@@ -37,6 +37,8 @@ pub enum Motion {
     Matching,
     FindForward { before: bool, char: char },
     FindBackward { after: bool, char: char },
+    RepeatFind { last_find: Box<Motion> },
+    RepeatFindReversed { last_find: Box<Motion> },
     NextLineStart,
     StartOfLineDownward,
     EndOfLineDownward,
@@ -102,16 +104,9 @@ pub struct StartOfLine {
     pub(crate) display_lines: bool,
 }
 
-#[derive(Clone, Deserialize, PartialEq)]
-struct RepeatFind {
-    #[serde(default)]
-    backwards: bool,
-}
-
 impl_actions!(
     vim,
     [
-        RepeatFind,
         StartOfLine,
         EndOfLine,
         FirstNonWhitespace,
@@ -139,6 +134,8 @@ actions!(
         StartOfLineDownward,
         EndOfLineDownward,
         GoToColumn,
+        RepeatFind,
+        RepeatFindReversed,
         WindowTop,
         WindowMiddle,
         WindowBottom,
@@ -234,8 +231,27 @@ pub fn register(workspace: &mut Workspace, _: &mut ViewContext<Workspace>) {
     });
     workspace
         .register_action(|_: &mut Workspace, &GoToColumn, cx: _| motion(Motion::GoToColumn, cx));
-    workspace.register_action(|_: &mut Workspace, action: &RepeatFind, cx: _| {
-        repeat_motion(action.backwards, cx)
+
+    workspace.register_action(|_: &mut Workspace, _: &RepeatFind, cx: _| {
+        if let Some(last_find) = Vim::read(cx)
+            .workspace_state
+            .last_find
+            .clone()
+            .map(Box::new)
+        {
+            motion(Motion::RepeatFind { last_find }, cx);
+        }
+    });
+
+    workspace.register_action(|_: &mut Workspace, _: &RepeatFindReversed, cx: _| {
+        if let Some(last_find) = Vim::read(cx)
+            .workspace_state
+            .last_find
+            .clone()
+            .map(Box::new)
+        {
+            motion(Motion::RepeatFindReversed { last_find }, cx);
+        }
     });
     workspace.register_action(|_: &mut Workspace, &WindowTop, cx: _| motion(Motion::WindowTop, cx));
     workspace.register_action(|_: &mut Workspace, &WindowMiddle, cx: _| {
@@ -265,35 +281,6 @@ pub(crate) fn motion(motion: Motion, cx: &mut WindowContext) {
     Vim::update(cx, |vim, cx| vim.clear_operator(cx));
 }
 
-fn repeat_motion(backwards: bool, cx: &mut WindowContext) {
-    let find = match Vim::read(cx).workspace_state.last_find.clone() {
-        Some(Motion::FindForward { before, char }) => {
-            if backwards {
-                Motion::FindBackward {
-                    after: before,
-                    char,
-                }
-            } else {
-                Motion::FindForward { before, char }
-            }
-        }
-
-        Some(Motion::FindBackward { after, char }) => {
-            if backwards {
-                Motion::FindForward {
-                    before: after,
-                    char,
-                }
-            } else {
-                Motion::FindBackward { after, char }
-            }
-        }
-        _ => return,
-    };
-
-    motion(find, cx)
-}
-
 // Motion handling is specified here:
 // https://github.com/vim/vim/blob/master/runtime/doc/motion.txt
 impl Motion {
@@ -325,7 +312,9 @@ impl Motion {
             | NextWordStart { .. }
             | PreviousWordStart { .. }
             | FirstNonWhitespace { .. }
-            | FindBackward { .. } => false,
+            | FindBackward { .. }
+            | RepeatFind { .. }
+            | RepeatFindReversed { .. } => false,
         }
     }
 
@@ -339,6 +328,7 @@ impl Motion {
             | NextWordEnd { .. }
             | Matching
             | FindForward { .. }
+            | RepeatFind { .. }
             | Left
             | Backspace
             | Right
@@ -352,6 +342,7 @@ impl Motion {
             | PreviousWordStart { .. }
             | FirstNonWhitespace { .. }
             | FindBackward { .. }
+            | RepeatFindReversed { .. }
             | WindowTop
             | WindowMiddle
             | WindowBottom
@@ -388,6 +379,9 @@ impl Motion {
             | PreviousWordStart { .. }
             | FirstNonWhitespace { .. }
             | FindBackward { .. } => false,
+            RepeatFind { last_find: motion } | RepeatFindReversed { last_find: motion } => {
+                motion.inclusive()
+            }
         }
     }
 
@@ -456,17 +450,58 @@ impl Motion {
                 SelectionGoal::None,
             ),
             Matching => (matching(map, point), SelectionGoal::None),
+            // t f
             FindForward { before, char } => {
-                if let Some(new_point) = find_forward(map, point, *before, *char, times) {
-                    return Some((new_point, SelectionGoal::None));
-                } else {
-                    return None;
-                }
+                return find_forward(map, point, *before, *char, times)
+                    .map(|new_point| (new_point, SelectionGoal::None))
             }
+            // T F
             FindBackward { after, char } => (
                 find_backward(map, point, *after, *char, times),
                 SelectionGoal::None,
             ),
+            // ; -- repeat the last find done with t, f, T, F
+            RepeatFind { last_find } => match **last_find {
+                Motion::FindForward { before, char } => {
+                    let mut new_point = find_forward(map, point, before, char, times);
+                    if new_point == Some(point) {
+                        new_point = find_forward(map, point, before, char, times + 1);
+                    }
+
+                    return new_point.map(|new_point| (new_point, SelectionGoal::None));
+                }
+
+                Motion::FindBackward { after, char } => {
+                    let mut new_point = find_backward(map, point, after, char, times);
+                    if new_point == point {
+                        new_point = find_backward(map, point, after, char, times + 1);
+                    }
+
+                    (new_point, SelectionGoal::None)
+                }
+                _ => return None,
+            },
+            // , -- repeat the last find done with t, f, T, F, in opposite direction
+            RepeatFindReversed { last_find } => match **last_find {
+                Motion::FindForward { before, char } => {
+                    let mut new_point = find_backward(map, point, before, char, times);
+                    if new_point == point {
+                        new_point = find_backward(map, point, before, char, times + 1);
+                    }
+
+                    (new_point, SelectionGoal::None)
+                }
+
+                Motion::FindBackward { after, char } => {
+                    let mut new_point = find_forward(map, point, after, char, times);
+                    if new_point == Some(point) {
+                        new_point = find_forward(map, point, after, char, times + 1);
+                    }
+
+                    return new_point.map(|new_point| (new_point, SelectionGoal::None));
+                }
+                _ => return None,
+            },
             NextLineStart => (next_line_start(map, point, times), SelectionGoal::None),
             StartOfLineDownward => (next_line_start(map, point, times - 1), SelectionGoal::None),
             EndOfLineDownward => (next_line_end(map, point, times), SelectionGoal::None),
@@ -1155,6 +1190,7 @@ mod test {
     async fn test_comma_semicolon(cx: &mut gpui::TestAppContext) {
         let mut cx = NeovimBackedTestContext::new(cx).await;
 
+        // f and F
         cx.set_shared_state("ˇone two three four").await;
         cx.simulate_shared_keystrokes(["f", "o"]).await;
         cx.assert_shared_state("one twˇo three four").await;
@@ -1162,6 +1198,21 @@ mod test {
         cx.assert_shared_state("ˇone two three four").await;
         cx.simulate_shared_keystrokes(["2", ";"]).await;
         cx.assert_shared_state("one two three fˇour").await;
+        cx.simulate_shared_keystrokes(["shift-f", "e"]).await;
+        cx.assert_shared_state("one two threˇe four").await;
+        cx.simulate_shared_keystrokes(["2", ";"]).await;
+        cx.assert_shared_state("onˇe two three four").await;
+        cx.simulate_shared_keystrokes([","]).await;
+        cx.assert_shared_state("one two thrˇee four").await;
+
+        // t and T
+        cx.set_shared_state("ˇone two three four").await;
+        cx.simulate_shared_keystrokes(["t", "o"]).await;
+        cx.assert_shared_state("one tˇwo three four").await;
+        cx.simulate_shared_keystrokes([","]).await;
+        cx.assert_shared_state("oˇne two three four").await;
+        cx.simulate_shared_keystrokes(["2", ";"]).await;
+        cx.assert_shared_state("one two three ˇfour").await;
         cx.simulate_shared_keystrokes(["shift-t", "e"]).await;
         cx.assert_shared_state("one two threeˇ four").await;
         cx.simulate_shared_keystrokes(["3", ";"]).await;
diff --git a/crates/vim/test_data/test_comma_semicolon.json b/crates/vim/test_data/test_comma_semicolon.json
index 8cde887ed1..e08b6963fa 100644
--- a/crates/vim/test_data/test_comma_semicolon.json
+++ b/crates/vim/test_data/test_comma_semicolon.json
@@ -7,6 +7,23 @@
 {"Key":"2"}
 {"Key":";"}
 {"Get":{"state":"one two three fˇour","mode":"Normal"}}
+{"Key":"shift-f"}
+{"Key":"e"}
+{"Get":{"state":"one two threˇe four","mode":"Normal"}}
+{"Key":"2"}
+{"Key":";"}
+{"Get":{"state":"onˇe two three four","mode":"Normal"}}
+{"Key":","}
+{"Get":{"state":"one two thrˇee four","mode":"Normal"}}
+{"Put":{"state":"ˇone two three four"}}
+{"Key":"t"}
+{"Key":"o"}
+{"Get":{"state":"one tˇwo three four","mode":"Normal"}}
+{"Key":","}
+{"Get":{"state":"oˇne two three four","mode":"Normal"}}
+{"Key":"2"}
+{"Key":";"}
+{"Get":{"state":"one two three ˇfour","mode":"Normal"}}
 {"Key":"shift-t"}
 {"Key":"e"}
 {"Get":{"state":"one two threeˇ four","mode":"Normal"}}

From dc5f4c8719ea5023f6ebe4daf9704e9f0c5ed7ee Mon Sep 17 00:00:00 2001
From: d1y <chenhonzhou@gmail.com>
Date: Tue, 30 Jan 2024 17:37:48 +0800
Subject: [PATCH 059/372] Add CSS file type icon (#7062)

The SVG icon RAW link: https://www.svgrepo.com/svg/473577/css3
The Licensing https://www.svgrepo.com/page/licensing/#CC0

<img width="309" alt="image"
src="https://github.com/zed-industries/zed/assets/45585937/4b1fa935-144f-4c02-a378-b0974e4d0b39">


Release Notes:

- Added a CSS file type icon
---
 assets/icons/file_icons/css.svg         | 4 ++++
 assets/icons/file_icons/file_types.json | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 assets/icons/file_icons/css.svg

diff --git a/assets/icons/file_icons/css.svg b/assets/icons/file_icons/css.svg
new file mode 100644
index 0000000000..659f856232
--- /dev/null
+++ b/assets/icons/file_icons/css.svg
@@ -0,0 +1,4 @@
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<path d="M24.235 6.519l-16.47-0.004 0.266 3.277 12.653 0.002-0.319 3.394h-8.298l0.3 3.215h7.725l-0.457 4.403-3.636 1.005-3.694-1.012-0.235-2.637h-3.262l0.362 4.817 6.829 2.128 6.714-1.912 1.521-16.675zM2.879 1.004h26.242l-2.387 26.946-10.763 3.045-10.703-3.047z"></path>
+</svg>
diff --git a/assets/icons/file_icons/file_types.json b/assets/icons/file_icons/file_types.json
index 36c3349cb6..cbfc654b9d 100644
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -13,7 +13,7 @@
         "cc": "code",
         "conf": "settings",
         "cpp": "code",
-        "css": "code",
+        "css": "css",
         "csv": "storage",
         "dat": "storage",
         "db": "storage",
@@ -129,6 +129,9 @@
         "collapsed_folder": {
             "icon": "icons/file_icons/folder.svg"
         },
+        "css": {
+          "icon": "icons/file_icons/css.svg"
+        },
         "default": {
             "icon": "icons/file_icons/file.svg"
         },

From 4af542567c952b1255dafd6e61bd618b5ae73103 Mon Sep 17 00:00:00 2001
From: Hans <weartistt@gmail.com>
Date: Tue, 30 Jan 2024 17:40:33 +0800
Subject: [PATCH 060/372] Fix a spelling typo (#7059)

Release notes: N/A
---
 crates/terminal/src/terminal_settings.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/terminal/src/terminal_settings.rs b/crates/terminal/src/terminal_settings.rs
index 4ea0f3afcb..7b3d97145c 100644
--- a/crates/terminal/src/terminal_settings.rs
+++ b/crates/terminal/src/terminal_settings.rs
@@ -259,7 +259,7 @@ pub enum WorkingDirectory {
     FirstProjectDirectory,
     /// Always use this platform's home directory (if it can be found).
     AlwaysHome,
-    /// Slways use a specific directory. This value will be shell expanded.
+    /// Always use a specific directory. This value will be shell expanded.
     /// If this path is not a valid directory the terminal will default to
     /// this platform's home directory  (if it can be found).
     Always { directory: String },

From 7b8bd97652dd22b8b6c6dc32b58953528ab6d3a8 Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Tue, 30 Jan 2024 10:47:39 +0100
Subject: [PATCH 061/372] vim: implement <space> in normal mode (#7011)

This fixes #6815 by implementing `<space>` in normal mode in Vim. Turns
out that `<space>` behaves like a reverse `<backspace>` (which we
already had): it goes to the right and, if at end of line, to the next
line.

That means I had to touch `movement::right`, which is used in a few
places, but it's documentation said that it would go to the next line,
which it did *not*. So I changed the behaviour.

But I would love another pair of eyes on this, because I don't want to
break non-Vim behaviour.

Release Notes:

- Added support for `<space>` in Vim normal mode: `<space>` goes to the
right and to next line if at end of line.
([#6815](https://github.com/zed-industries/zed/issues/6815)).
---
 assets/keymaps/vim.json       |  1 +
 crates/editor/src/movement.rs |  7 +++----
 crates/vim/src/motion.rs      | 25 +++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 2b0ad672b0..bbf132232f 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -31,6 +31,7 @@
       "up": "vim::Up",
       "l": "vim::Right",
       "right": "vim::Right",
+      "space": "vim::Space",
       "$": "vim::EndOfLine",
       "^": "vim::FirstNonWhitespace",
       "_": "vim::StartOfLineDownward",
diff --git a/crates/editor/src/movement.rs b/crates/editor/src/movement.rs
index f268e926c7..fa5e5f1655 100644
--- a/crates/editor/src/movement.rs
+++ b/crates/editor/src/movement.rs
@@ -50,11 +50,10 @@ pub fn saturating_left(map: &DisplaySnapshot, mut point: DisplayPoint) -> Displa
     map.clip_point(point, Bias::Left)
 }
 
-/// Returns a column to the right of the current point, wrapping
-/// to the next line if that point is at the end of line.
+/// Returns a column to the right of the current point, doing nothing
+// if that point is at the end of the line.
 pub fn right(map: &DisplaySnapshot, mut point: DisplayPoint) -> DisplayPoint {
-    let max_column = map.line_len(point.row());
-    if point.column() < max_column {
+    if point.column() < map.line_len(point.row()) {
         *point.column_mut() += 1;
     } else if point.row() < map.max_point().row() {
         *point.row_mut() += 1;
diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
index e8cd21bba3..22800b2e9c 100644
--- a/crates/vim/src/motion.rs
+++ b/crates/vim/src/motion.rs
@@ -23,6 +23,7 @@ pub enum Motion {
     Down { display_lines: bool },
     Up { display_lines: bool },
     Right,
+    Space,
     NextWordStart { ignore_punctuation: bool },
     NextWordEnd { ignore_punctuation: bool },
     PreviousWordStart { ignore_punctuation: bool },
@@ -124,6 +125,7 @@ actions!(
         Left,
         Backspace,
         Right,
+        Space,
         CurrentLine,
         StartOfParagraph,
         EndOfParagraph,
@@ -163,6 +165,7 @@ pub fn register(workspace: &mut Workspace, _: &mut ViewContext<Workspace>) {
         )
     });
     workspace.register_action(|_: &mut Workspace, _: &Right, cx: _| motion(Motion::Right, cx));
+    workspace.register_action(|_: &mut Workspace, _: &Space, cx: _| motion(Motion::Space, cx));
     workspace.register_action(|_: &mut Workspace, action: &FirstNonWhitespace, cx: _| {
         motion(
             Motion::FirstNonWhitespace {
@@ -306,6 +309,7 @@ impl Motion {
             | Left
             | Backspace
             | Right
+            | Space
             | StartOfLine { .. }
             | EndOfLineDownward
             | GoToColumn
@@ -332,6 +336,7 @@ impl Motion {
             | Left
             | Backspace
             | Right
+            | Space
             | StartOfLine { .. }
             | StartOfParagraph
             | EndOfParagraph
@@ -370,6 +375,7 @@ impl Motion {
             Left
             | Backspace
             | Right
+            | Space
             | StartOfLine { .. }
             | StartOfLineDownward
             | StartOfParagraph
@@ -412,6 +418,7 @@ impl Motion {
                 display_lines: true,
             } => up_display(map, point, goal, times, &text_layout_details),
             Right => (right(map, point, times), SelectionGoal::None),
+            Space => (space(map, point, times), SelectionGoal::None),
             NextWordStart { ignore_punctuation } => (
                 next_word_start(map, point, *ignore_punctuation, times),
                 SelectionGoal::None,
@@ -614,6 +621,24 @@ fn backspace(map: &DisplaySnapshot, mut point: DisplayPoint, times: usize) -> Di
     point
 }
 
+fn space(map: &DisplaySnapshot, mut point: DisplayPoint, times: usize) -> DisplayPoint {
+    for _ in 0..times {
+        point = wrapping_right(map, point);
+    }
+    point
+}
+
+fn wrapping_right(map: &DisplaySnapshot, mut point: DisplayPoint) -> DisplayPoint {
+    let max_column = map.line_len(point.row()).saturating_sub(1);
+    if point.column() < max_column {
+        *point.column_mut() += 1;
+    } else if point.row() < map.max_point().row() {
+        *point.row_mut() += 1;
+        *point.column_mut() = 0;
+    }
+    point
+}
+
 pub(crate) fn start_of_relative_buffer_row(
     map: &DisplaySnapshot,
     point: DisplayPoint,

From fb9eb6a0fc35e7670406a8170ebb10a378dbf0f1 Mon Sep 17 00:00:00 2001
From: Ammar Arif <evergreenkary@gmail.com>
Date: Tue, 30 Jan 2024 17:50:15 +0800
Subject: [PATCH 062/372] Add taplo `toml` LSP (#7034)

Release Notes:

- Added `toml` LSP using [taplo](https://taplo.tamasfe.dev/)
---
 crates/zed/src/languages.rs      |  11 ++-
 crates/zed/src/languages/toml.rs | 114 +++++++++++++++++++++++++++++++
 docs/src/languages/toml.md       |   2 +-
 3 files changed, 123 insertions(+), 4 deletions(-)
 create mode 100644 crates/zed/src/languages/toml.rs

diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index ac3d7f2ee8..b487210050 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -29,6 +29,7 @@ mod ruby;
 mod rust;
 mod svelte;
 mod tailwind;
+mod toml;
 mod typescript;
 mod uiua;
 mod vue;
@@ -149,7 +150,11 @@ pub fn init(
         tree_sitter_rust::language(),
         vec![Arc::new(rust::RustLspAdapter)],
     );
-    language("toml", tree_sitter_toml::language(), vec![]);
+    language(
+        "toml",
+        tree_sitter_toml::language(),
+        vec![Arc::new(toml::TaploLspAdapter)],
+    );
     match &DenoSettings::get(None, cx).enable {
         true => {
             language(
@@ -291,7 +296,7 @@ pub fn init(
                 let path = child.path();
                 let config_path = path.join("config.toml");
                 if let Ok(config) = std::fs::read(&config_path) {
-                    let config: LanguageConfig = toml::from_slice(&config).unwrap();
+                    let config: LanguageConfig = ::toml::from_slice(&config).unwrap();
                     if let Some(grammar_name) = config.grammar_name.clone() {
                         languages.register_wasm(path.into(), grammar_name, config);
                     }
@@ -317,7 +322,7 @@ pub async fn language(
 }
 
 fn load_config(name: &str) -> LanguageConfig {
-    toml::from_slice(
+    ::toml::from_slice(
         &LanguageDir::get(&format!("{}/config.toml", name))
             .unwrap()
             .data,
diff --git a/crates/zed/src/languages/toml.rs b/crates/zed/src/languages/toml.rs
new file mode 100644
index 0000000000..129b5fcb66
--- /dev/null
+++ b/crates/zed/src/languages/toml.rs
@@ -0,0 +1,114 @@
+use anyhow::{Context, Result};
+use async_compression::futures::bufread::GzipDecoder;
+use async_trait::async_trait;
+use futures::{io::BufReader, StreamExt};
+use language::{LanguageServerName, LspAdapter, LspAdapterDelegate};
+use lsp::LanguageServerBinary;
+use smol::fs::{self, File};
+use std::{any::Any, path::PathBuf};
+use util::async_maybe;
+use util::github::latest_github_release;
+use util::{github::GitHubLspBinaryVersion, ResultExt};
+
+pub struct TaploLspAdapter;
+
+#[async_trait]
+impl LspAdapter for TaploLspAdapter {
+    fn name(&self) -> LanguageServerName {
+        LanguageServerName("taplo-ls".into())
+    }
+
+    fn short_name(&self) -> &'static str {
+        "taplo-ls"
+    }
+
+    async fn fetch_latest_server_version(
+        &self,
+        delegate: &dyn LspAdapterDelegate,
+    ) -> Result<Box<dyn 'static + Send + Any>> {
+        let release = latest_github_release("tamasfe/taplo", false, delegate.http_client()).await?;
+        let asset_name = format!("taplo-full-darwin-{arch}.gz", arch = std::env::consts::ARCH);
+
+        let asset = release
+            .assets
+            .iter()
+            .find(|asset| asset.name == asset_name)
+            .context(format!("no asset found matching {asset_name:?}"))?;
+
+        Ok(Box::new(GitHubLspBinaryVersion {
+            name: release.name,
+            url: asset.browser_download_url.clone(),
+        }))
+    }
+
+    async fn fetch_server_binary(
+        &self,
+        version: Box<dyn 'static + Send + Any>,
+        container_dir: PathBuf,
+        delegate: &dyn LspAdapterDelegate,
+    ) -> Result<LanguageServerBinary> {
+        let version = version.downcast::<GitHubLspBinaryVersion>().unwrap();
+        let binary_path = container_dir.join("taplo");
+
+        if fs::metadata(&binary_path).await.is_err() {
+            let mut response = delegate
+                .http_client()
+                .get(&version.url, Default::default(), true)
+                .await
+                .context("error downloading release")?;
+
+            let decompressed_bytes = GzipDecoder::new(BufReader::new(response.body_mut()));
+            let mut file = File::create(&binary_path).await?;
+
+            futures::io::copy(decompressed_bytes, &mut file).await?;
+
+            fs::set_permissions(
+                &binary_path,
+                <fs::Permissions as fs::unix::PermissionsExt>::from_mode(0o755),
+            )
+            .await?;
+        }
+
+        Ok(LanguageServerBinary {
+            path: binary_path,
+            arguments: vec!["lsp".into(), "stdio".into()],
+        })
+    }
+
+    async fn cached_server_binary(
+        &self,
+        container_dir: PathBuf,
+        _: &dyn LspAdapterDelegate,
+    ) -> Option<LanguageServerBinary> {
+        get_cached_server_binary(container_dir).await
+    }
+
+    async fn installation_test_binary(
+        &self,
+        container_dir: PathBuf,
+    ) -> Option<LanguageServerBinary> {
+        get_cached_server_binary(container_dir)
+            .await
+            .map(|mut binary| {
+                binary.arguments = vec!["--help".into()];
+                binary
+            })
+    }
+}
+
+async fn get_cached_server_binary(container_dir: PathBuf) -> Option<LanguageServerBinary> {
+    async_maybe!({
+        let mut last = None;
+        let mut entries = fs::read_dir(&container_dir).await?;
+        while let Some(entry) = entries.next().await {
+            last = Some(entry?.path());
+        }
+
+        anyhow::Ok(LanguageServerBinary {
+            path: last.context("no cached binary")?,
+            arguments: Default::default(),
+        })
+    })
+    .await
+    .log_err()
+}
diff --git a/docs/src/languages/toml.md b/docs/src/languages/toml.md
index 52c25de9a0..23826c3489 100644
--- a/docs/src/languages/toml.md
+++ b/docs/src/languages/toml.md
@@ -2,4 +2,4 @@
 
 
 - Tree Sitter: [tree-sitter-toml](https://github.com/tree-sitter/tree-sitter-toml)
-- Language Server: N/A
+- Language Server: [taplo](https://taplo.tamasfe.dev)

From a0582d02b9f393ba94551d61ce6e5ffacf77760a Mon Sep 17 00:00:00 2001
From: d1y <chenhonzhou@gmail.com>
Date: Tue, 30 Jan 2024 17:58:56 +0800
Subject: [PATCH 063/372] Make avif/heif/webp files to use image icon (#7063)

The Wikipedia Link:

- https://en.wikipedia.org/wiki/AVIF
- https://en.wikipedia.org/wiki/High_Efficiency_Image_File_Format
- https://en.wikipedia.org/wiki/WebP

Release Notes:

- Made avif/heif/webp files to use an image icon
---
 assets/icons/file_icons/file_types.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/assets/icons/file_icons/file_types.json b/assets/icons/file_icons/file_types.json
index cbfc654b9d..a77f187a28 100644
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -2,6 +2,7 @@
     "suffixes": {
         "aac": "audio",
         "accdb": "storage",
+        "avif": "image",
         "bak": "backup",
         "bash": "terminal",
         "bash_aliases": "terminal",
@@ -43,6 +44,7 @@
         "handlebars": "code",
         "hbs": "template",
         "heex": "elixir",
+        "heif": "image",
         "htm": "template",
         "html": "template",
         "hs": "haskell",
@@ -102,6 +104,7 @@
         "txt": "document",
         "vue": "vue",
         "wav": "audio",
+        "webp": "image",
         "webm": "video",
         "xls": "document",
         "xlsx": "document",

From d18c0d9df0ab39a4e4f4da7902e7f31fe1a4b8e3 Mon Sep 17 00:00:00 2001
From: Noritada Kobayashi <noritada.kobayashi@gmail.com>
Date: Tue, 30 Jan 2024 20:20:05 +0900
Subject: [PATCH 064/372] Make minor documentation corrections and improvements
 (#7070)

This PR makes minor documentation corrections and improvements.

Release Notes:

- N/A
---
 docs/src/configuring_zed__configuring_vim.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/src/configuring_zed__configuring_vim.md b/docs/src/configuring_zed__configuring_vim.md
index 22b84b274f..01d1607cac 100644
--- a/docs/src/configuring_zed__configuring_vim.md
+++ b/docs/src/configuring_zed__configuring_vim.md
@@ -5,7 +5,7 @@ Zed includes a vim emulation layer known as “vim mode”. This document aims t
 ### Philosophy
 Vim mode in Zed is supposed to primarily "do what you expect": it mostly tries to copy vim exactly, but will use Zed-specific functionality when available to make things smoother.
 
-This means Zed will never be 100% vim compatible, but should be 100% vim familiar! We expect that our vim mode already copes with 90% of your workflow, and we'd like to keep improving it. If you find things that you can’t yet do in vim mode, but which you rely on in your current workflow, please leave feedback in the editor itself (`:feedback`), or [file an issue](https://github.com/zed-industries/zed).
+This means Zed will never be 100% vim compatible, but should be 100% vim familiar! We expect that our vim mode already copes with 90% of your workflow, and we'd like to keep improving it. If you find things that you can’t yet do in vim mode, but which you rely on in your current workflow, please leave feedback in the editor itself (`:feedback`), or [file an issue](https://github.com/zed-industries/zed/issues).
 
 ### Zed-specific features
 Zed is built on a modern foundation that (among other things) uses tree-sitter to understand the content of the file you're editing, and supports multiple cursors out of the box.
@@ -142,14 +142,14 @@ Currently supported vim-specific commands (as of Zed 0.106):
 
 ### Related settings
 There are a few Zed settings that you may also enjoy if you use vim mode:
-```
+```json
 {
   // disable cursor blink
-  "cursor_blink": false
+  "cursor_blink": false,
   // use relative line numbers
   "relative_line_numbers": true,
   // hide the scroll bar
-  "scrollbar": {"show": "never"},
+  "scrollbar": {"show": "never"}
 }
 ```
 

From 6c7893db35d51cfbc8e8859a1fbe478f92388f1f Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Tue, 30 Jan 2024 09:54:23 -0500
Subject: [PATCH 065/372] Rename `SharedUrl` to `SharedUri` (#7084)

This PR renames `SharedUrl` to `SharedUri` to better reflect its intent.

I'm still not entirely happy with this naming, as the file paths that we
can store in here are not _really_ URIs, as they are lacking a protocol.

I want to explore changing `SharedUri` / `SharedUrl` back to alway
storing a URL and treat local filepaths differently, as it seems we're
conflating two different concerns under the same umbrella, at the
moment.

Release Notes:

- N/A
---
 crates/client/src/user.rs                     |  6 +++---
 crates/collab/src/tests/integration_tests.rs  |  6 +++---
 crates/collab_ui/src/chat_panel.rs            |  4 ++--
 .../src/chat_panel/message_editor.rs          |  6 +++---
 .../src/notifications/collab_notification.rs  |  6 +++---
 .../stories/collab_notification.rs            |  6 +++---
 crates/gpui/examples/image.rs                 | 10 +++++-----
 crates/gpui/src/elements/img.rs               |  8 ++++----
 crates/gpui/src/gpui.rs                       |  4 ++--
 crates/gpui/src/image_cache.rs                | 10 +++++-----
 .../gpui/src/{shared_url.rs => shared_uri.rs} | 20 +++++++++----------
 crates/theme/src/styles/stories/players.rs    | 10 +++++-----
 crates/ui/src/components/stories/avatar.rs    | 18 ++++++++---------
 crates/ui/src/components/stories/list_item.rs | 18 ++++++++---------
 14 files changed, 66 insertions(+), 66 deletions(-)
 rename crates/gpui/src/{shared_url.rs => shared_uri.rs} (75%)

diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs
index 23cd97994f..d6a60f5b4c 100644
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -4,7 +4,7 @@ use collections::{hash_map::Entry, HashMap, HashSet};
 use feature_flags::FeatureFlagAppExt;
 use futures::{channel::mpsc, Future, StreamExt};
 use gpui::{
-    AppContext, AsyncAppContext, EventEmitter, Model, ModelContext, SharedString, SharedUrl, Task,
+    AppContext, AsyncAppContext, EventEmitter, Model, ModelContext, SharedString, SharedUri, Task,
     WeakModel,
 };
 use postage::{sink::Sink, watch};
@@ -22,7 +22,7 @@ pub struct ParticipantIndex(pub u32);
 pub struct User {
     pub id: UserId,
     pub github_login: String,
-    pub avatar_uri: SharedUrl,
+    pub avatar_uri: SharedUri,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -707,7 +707,7 @@ impl User {
         Arc::new(User {
             id: message.id,
             github_login: message.github_login,
-            avatar_uri: SharedUrl::network(message.avatar_url),
+            avatar_uri: SharedUri::network(message.avatar_url),
         })
     }
 }
diff --git a/crates/collab/src/tests/integration_tests.rs b/crates/collab/src/tests/integration_tests.rs
index 6dd1751c8c..0d9a64e511 100644
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -9,7 +9,7 @@ use fs::{repository::GitFileStatus, FakeFs, Fs as _, RemoveOptions};
 use futures::StreamExt as _;
 use gpui::{
     px, size, AppContext, BackgroundExecutor, Model, Modifiers, MouseButton, MouseDownEvent,
-    SharedUrl, TestAppContext,
+    SharedUri, TestAppContext,
 };
 use language::{
     language_settings::{AllLanguageSettings, Formatter},
@@ -1828,7 +1828,7 @@ async fn test_active_call_events(
             owner: Arc::new(User {
                 id: client_a.user_id().unwrap(),
                 github_login: "user_a".to_string(),
-                avatar_uri: SharedUrl::network("avatar_a"),
+                avatar_uri: SharedUri::network("avatar_a"),
             }),
             project_id: project_a_id,
             worktree_root_names: vec!["a".to_string()],
@@ -1846,7 +1846,7 @@ async fn test_active_call_events(
             owner: Arc::new(User {
                 id: client_b.user_id().unwrap(),
                 github_login: "user_b".to_string(),
-                avatar_uri: SharedUrl::network("avatar_b"),
+                avatar_uri: SharedUri::network("avatar_b"),
             }),
             project_id: project_b_id,
             worktree_root_names: vec!["b".to_string()]
diff --git a/crates/collab_ui/src/chat_panel.rs b/crates/collab_ui/src/chat_panel.rs
index 14fab4301b..879ff67d63 100644
--- a/crates/collab_ui/src/chat_panel.rs
+++ b/crates/collab_ui/src/chat_panel.rs
@@ -714,7 +714,7 @@ fn format_timestamp(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use gpui::{HighlightStyle, SharedUrl};
+    use gpui::{HighlightStyle, SharedUri};
     use pretty_assertions::assert_eq;
     use rich_text::Highlight;
     use time::{Date, OffsetDateTime, Time, UtcOffset};
@@ -730,7 +730,7 @@ mod tests {
             timestamp: OffsetDateTime::now_utc(),
             sender: Arc::new(client::User {
                 github_login: "fgh".into(),
-                avatar_uri: SharedUrl::network("avatar_fgh"),
+                avatar_uri: SharedUri::network("avatar_fgh"),
                 id: 103,
             }),
             nonce: 5,
diff --git a/crates/collab_ui/src/chat_panel/message_editor.rs b/crates/collab_ui/src/chat_panel/message_editor.rs
index 48cf4ab405..701ecd8e8e 100644
--- a/crates/collab_ui/src/chat_panel/message_editor.rs
+++ b/crates/collab_ui/src/chat_panel/message_editor.rs
@@ -365,7 +365,7 @@ impl Render for MessageEditor {
 mod tests {
     use super::*;
     use client::{Client, User, UserStore};
-    use gpui::{SharedUrl, TestAppContext};
+    use gpui::{SharedUri, TestAppContext};
     use language::{Language, LanguageConfig};
     use rpc::proto;
     use settings::SettingsStore;
@@ -392,7 +392,7 @@ mod tests {
                         user: Arc::new(User {
                             github_login: "a-b".into(),
                             id: 101,
-                            avatar_uri: SharedUrl::network("avatar_a-b"),
+                            avatar_uri: SharedUri::network("avatar_a-b"),
                         }),
                         kind: proto::channel_member::Kind::Member,
                         role: proto::ChannelRole::Member,
@@ -401,7 +401,7 @@ mod tests {
                         user: Arc::new(User {
                             github_login: "C_D".into(),
                             id: 102,
-                            avatar_uri: SharedUrl::network("avatar_C_D"),
+                            avatar_uri: SharedUri::network("avatar_C_D"),
                         }),
                         kind: proto::channel_member::Kind::Member,
                         role: proto::ChannelRole::Member,
diff --git a/crates/collab_ui/src/notifications/collab_notification.rs b/crates/collab_ui/src/notifications/collab_notification.rs
index 69d26e50fd..97b7100106 100644
--- a/crates/collab_ui/src/notifications/collab_notification.rs
+++ b/crates/collab_ui/src/notifications/collab_notification.rs
@@ -1,10 +1,10 @@
-use gpui::{img, prelude::*, AnyElement, SharedUrl};
+use gpui::{img, prelude::*, AnyElement, SharedUri};
 use smallvec::SmallVec;
 use ui::prelude::*;
 
 #[derive(IntoElement)]
 pub struct CollabNotification {
-    avatar_uri: SharedUrl,
+    avatar_uri: SharedUri,
     accept_button: Button,
     dismiss_button: Button,
     children: SmallVec<[AnyElement; 2]>,
@@ -12,7 +12,7 @@ pub struct CollabNotification {
 
 impl CollabNotification {
     pub fn new(
-        avatar_uri: impl Into<SharedUrl>,
+        avatar_uri: impl Into<SharedUri>,
         accept_button: Button,
         dismiss_button: Button,
     ) -> Self {
diff --git a/crates/collab_ui/src/notifications/stories/collab_notification.rs b/crates/collab_ui/src/notifications/stories/collab_notification.rs
index e04a7b3904..55700ca6f0 100644
--- a/crates/collab_ui/src/notifications/stories/collab_notification.rs
+++ b/crates/collab_ui/src/notifications/stories/collab_notification.rs
@@ -1,4 +1,4 @@
-use gpui::{prelude::*, SharedUrl};
+use gpui::{prelude::*, SharedUri};
 use story::{StoryContainer, StoryItem, StorySection};
 use ui::prelude::*;
 
@@ -19,7 +19,7 @@ impl Render for CollabNotificationStory {
                 "Incoming Call Notification",
                 window_container(400., 72.).child(
                     CollabNotification::new(
-                        SharedUrl::network("https://avatars.githubusercontent.com/u/1486634?v=4"),
+                        SharedUri::network("https://avatars.githubusercontent.com/u/1486634?v=4"),
                         Button::new("accept", "Accept"),
                         Button::new("decline", "Decline"),
                     )
@@ -36,7 +36,7 @@ impl Render for CollabNotificationStory {
                 "Project Shared Notification",
                 window_container(400., 72.).child(
                     CollabNotification::new(
-                        SharedUrl::network("https://avatars.githubusercontent.com/u/1714999?v=4"),
+                        SharedUri::network("https://avatars.githubusercontent.com/u/1714999?v=4"),
                         Button::new("open", "Open"),
                         Button::new("dismiss", "Dismiss"),
                     )
diff --git a/crates/gpui/examples/image.rs b/crates/gpui/examples/image.rs
index 01a9cfb435..f0bb371bad 100644
--- a/crates/gpui/examples/image.rs
+++ b/crates/gpui/examples/image.rs
@@ -3,7 +3,7 @@ use gpui::*;
 #[derive(IntoElement)]
 struct ImageFromResource {
     text: SharedString,
-    resource: SharedUrl,
+    resource: SharedUri,
 }
 
 impl RenderOnce for ImageFromResource {
@@ -20,8 +20,8 @@ impl RenderOnce for ImageFromResource {
 }
 
 struct ImageShowcase {
-    local_resource: SharedUrl,
-    remote_resource: SharedUrl,
+    local_resource: SharedUri,
+    remote_resource: SharedUri,
 }
 
 impl Render for ImageShowcase {
@@ -51,8 +51,8 @@ fn main() {
     App::new().run(|cx: &mut AppContext| {
         cx.open_window(WindowOptions::default(), |cx| {
             cx.new_view(|_cx| ImageShowcase {
-                local_resource: SharedUrl::file("../zed/resources/app-icon.png"),
-                remote_resource: SharedUrl::network("https://picsum.photos/512/512"),
+                local_resource: SharedUri::file("../zed/resources/app-icon.png"),
+                remote_resource: SharedUri::network("https://picsum.photos/512/512"),
             })
         });
     });
diff --git a/crates/gpui/src/elements/img.rs b/crates/gpui/src/elements/img.rs
index d1455d33d6..00804fe565 100644
--- a/crates/gpui/src/elements/img.rs
+++ b/crates/gpui/src/elements/img.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use crate::{
     point, size, Bounds, DevicePixels, Element, ElementContext, ImageData, InteractiveElement,
-    InteractiveElementState, Interactivity, IntoElement, LayoutId, Pixels, SharedUrl, Size,
+    InteractiveElementState, Interactivity, IntoElement, LayoutId, Pixels, SharedUri, Size,
     StyleRefinement, Styled,
 };
 use futures::FutureExt;
@@ -13,7 +13,7 @@ use util::ResultExt;
 #[derive(Clone, Debug)]
 pub enum ImageSource {
     /// Image content will be loaded from provided URI at render time.
-    Uri(SharedUrl),
+    Uri(SharedUri),
     /// Cached image data
     Data(Arc<ImageData>),
     // TODO: move surface definitions into mac platform module
@@ -21,8 +21,8 @@ pub enum ImageSource {
     Surface(CVImageBuffer),
 }
 
-impl From<SharedUrl> for ImageSource {
-    fn from(value: SharedUrl) -> Self {
+impl From<SharedUri> for ImageSource {
+    fn from(value: SharedUri) -> Self {
         Self::Uri(value)
     }
 }
diff --git a/crates/gpui/src/gpui.rs b/crates/gpui/src/gpui.rs
index 638e94de39..36674b52bf 100644
--- a/crates/gpui/src/gpui.rs
+++ b/crates/gpui/src/gpui.rs
@@ -83,7 +83,7 @@ mod platform;
 pub mod prelude;
 mod scene;
 mod shared_string;
-mod shared_url;
+mod shared_uri;
 mod style;
 mod styled;
 mod subscription;
@@ -133,7 +133,7 @@ pub use refineable::*;
 pub use scene::*;
 use seal::Sealed;
 pub use shared_string::*;
-pub use shared_url::*;
+pub use shared_uri::*;
 pub use smol::Timer;
 pub use style::*;
 pub use styled::*;
diff --git a/crates/gpui/src/image_cache.rs b/crates/gpui/src/image_cache.rs
index 318aea8265..3c9a1741ed 100644
--- a/crates/gpui/src/image_cache.rs
+++ b/crates/gpui/src/image_cache.rs
@@ -1,4 +1,4 @@
-use crate::{AppContext, ImageData, ImageId, SharedUrl, Task};
+use crate::{AppContext, ImageData, ImageId, SharedUri, Task};
 use collections::HashMap;
 use futures::{future::Shared, AsyncReadExt, FutureExt, TryFutureExt};
 use image::ImageError;
@@ -41,7 +41,7 @@ impl From<ImageError> for Error {
 
 pub(crate) struct ImageCache {
     client: Arc<dyn HttpClient>,
-    images: Arc<Mutex<HashMap<SharedUrl, FetchImageTask>>>,
+    images: Arc<Mutex<HashMap<SharedUri, FetchImageTask>>>,
 }
 
 type FetchImageTask = Shared<Task<Result<Arc<ImageData>, Error>>>;
@@ -54,7 +54,7 @@ impl ImageCache {
         }
     }
 
-    pub fn get(&self, uri: impl Into<SharedUrl>, cx: &AppContext) -> FetchImageTask {
+    pub fn get(&self, uri: impl Into<SharedUri>, cx: &AppContext) -> FetchImageTask {
         let uri = uri.into();
         let mut images = self.images.lock();
 
@@ -69,11 +69,11 @@ impl ImageCache {
                             let uri = uri.clone();
                             async move {
                                 match uri {
-                                    SharedUrl::File(uri) => {
+                                    SharedUri::File(uri) => {
                                         let image = image::open(uri.as_ref())?.into_bgra8();
                                         Ok(Arc::new(ImageData::new(image)))
                                     }
-                                    SharedUrl::Network(uri) => {
+                                    SharedUri::Network(uri) => {
                                         let mut response =
                                             client.get(uri.as_ref(), ().into(), true).await?;
                                         let mut body = Vec::new();
diff --git a/crates/gpui/src/shared_url.rs b/crates/gpui/src/shared_uri.rs
similarity index 75%
rename from crates/gpui/src/shared_url.rs
rename to crates/gpui/src/shared_uri.rs
index d419482391..0784ea87ff 100644
--- a/crates/gpui/src/shared_url.rs
+++ b/crates/gpui/src/shared_uri.rs
@@ -2,34 +2,34 @@ use std::ops::{Deref, DerefMut};
 
 use crate::SharedString;
 
-/// A URL stored in a `SharedString` pointing to a file or a remote resource.
+/// A URI stored in a [`SharedString`].
 #[derive(PartialEq, Eq, Hash, Clone)]
-pub enum SharedUrl {
+pub enum SharedUri {
     /// A path to a local file.
     File(SharedString),
     /// A URL to a remote resource.
     Network(SharedString),
 }
 
-impl SharedUrl {
-    /// Create a URL pointing to a local file.
+impl SharedUri {
+    /// Creates a [`SharedUri`] pointing to a local file.
     pub fn file<S: Into<SharedString>>(s: S) -> Self {
         Self::File(s.into())
     }
 
-    /// Create a URL pointing to a remote resource.
+    /// Creates a [`SharedUri`] pointing to a remote resource.
     pub fn network<S: Into<SharedString>>(s: S) -> Self {
         Self::Network(s.into())
     }
 }
 
-impl Default for SharedUrl {
+impl Default for SharedUri {
     fn default() -> Self {
         Self::Network(SharedString::default())
     }
 }
 
-impl Deref for SharedUrl {
+impl Deref for SharedUri {
     type Target = SharedString;
 
     fn deref(&self) -> &Self::Target {
@@ -40,7 +40,7 @@ impl Deref for SharedUrl {
     }
 }
 
-impl DerefMut for SharedUrl {
+impl DerefMut for SharedUri {
     fn deref_mut(&mut self) -> &mut Self::Target {
         match self {
             Self::File(s) => s,
@@ -49,7 +49,7 @@ impl DerefMut for SharedUrl {
     }
 }
 
-impl std::fmt::Debug for SharedUrl {
+impl std::fmt::Debug for SharedUri {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             Self::File(s) => write!(f, "File({:?})", s),
@@ -58,7 +58,7 @@ impl std::fmt::Debug for SharedUrl {
     }
 }
 
-impl std::fmt::Display for SharedUrl {
+impl std::fmt::Display for SharedUri {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "{}", self.as_ref())
     }
diff --git a/crates/theme/src/styles/stories/players.rs b/crates/theme/src/styles/stories/players.rs
index 8963736e61..e9462cbbbb 100644
--- a/crates/theme/src/styles/stories/players.rs
+++ b/crates/theme/src/styles/stories/players.rs
@@ -1,4 +1,4 @@
-use gpui::{div, img, px, IntoElement, ParentElement, Render, SharedUrl, Styled, ViewContext};
+use gpui::{div, img, px, IntoElement, ParentElement, Render, SharedUri, Styled, ViewContext};
 use story::Story;
 
 use crate::{ActiveTheme, PlayerColors};
@@ -53,7 +53,7 @@ impl Render for PlayerStory {
                             .border_2()
                             .border_color(player.cursor)
                             .child(
-                                img(SharedUrl::network(
+                                img(SharedUri::network(
                                     "https://avatars.githubusercontent.com/u/1714999?v=4",
                                 ))
                                 .rounded_full()
@@ -84,7 +84,7 @@ impl Render for PlayerStory {
                                     .border_color(player.background)
                                     .size(px(28.))
                                     .child(
-                                        img(SharedUrl::network(
+                                        img(SharedUri::network(
                                             "https://avatars.githubusercontent.com/u/1714999?v=4",
                                         ))
                                         .rounded_full()
@@ -102,7 +102,7 @@ impl Render for PlayerStory {
                                     .border_color(player.background)
                                     .size(px(28.))
                                     .child(
-                                        img(SharedUrl::network(
+                                        img(SharedUri::network(
                                             "https://avatars.githubusercontent.com/u/1714999?v=4",
                                         ))
                                         .rounded_full()
@@ -120,7 +120,7 @@ impl Render for PlayerStory {
                                     .border_color(player.background)
                                     .size(px(28.))
                                     .child(
-                                        img(SharedUrl::network(
+                                        img(SharedUri::network(
                                             "https://avatars.githubusercontent.com/u/1714999?v=4",
                                         ))
                                         .rounded_full()
diff --git a/crates/ui/src/components/stories/avatar.rs b/crates/ui/src/components/stories/avatar.rs
index 5820d2b8c9..6a8f70a318 100644
--- a/crates/ui/src/components/stories/avatar.rs
+++ b/crates/ui/src/components/stories/avatar.rs
@@ -1,4 +1,4 @@
-use gpui::{Render, SharedUrl};
+use gpui::{Render, SharedUri};
 use story::{StoryContainer, StoryItem, StorySection};
 
 use crate::{prelude::*, AudioStatus, Availability, AvatarAvailabilityIndicator};
@@ -13,13 +13,13 @@ impl Render for AvatarStory {
                 StorySection::new()
                     .child(StoryItem::new(
                         "Default",
-                        Avatar::new(SharedUrl::network(
+                        Avatar::new(SharedUri::network(
                             "https://avatars.githubusercontent.com/u/1714999?v=4",
                         )),
                     ))
                     .child(StoryItem::new(
                         "Default",
-                        Avatar::new(SharedUrl::network(
+                        Avatar::new(SharedUri::network(
                             "https://avatars.githubusercontent.com/u/326587?v=4",
                         )),
                     )),
@@ -28,14 +28,14 @@ impl Render for AvatarStory {
                 StorySection::new()
                     .child(StoryItem::new(
                         "With free availability indicator",
-                        Avatar::new(SharedUrl::network(
+                        Avatar::new(SharedUri::network(
                             "https://avatars.githubusercontent.com/u/326587?v=4",
                         ))
                         .indicator(AvatarAvailabilityIndicator::new(Availability::Free)),
                     ))
                     .child(StoryItem::new(
                         "With busy availability indicator",
-                        Avatar::new(SharedUrl::network(
+                        Avatar::new(SharedUri::network(
                             "https://avatars.githubusercontent.com/u/326587?v=4",
                         ))
                         .indicator(AvatarAvailabilityIndicator::new(Availability::Busy)),
@@ -45,14 +45,14 @@ impl Render for AvatarStory {
                 StorySection::new()
                     .child(StoryItem::new(
                         "With info border",
-                        Avatar::new(SharedUrl::network(
+                        Avatar::new(SharedUri::network(
                             "https://avatars.githubusercontent.com/u/326587?v=4",
                         ))
                         .border_color(cx.theme().status().info_border),
                     ))
                     .child(StoryItem::new(
                         "With error border",
-                        Avatar::new(SharedUrl::network(
+                        Avatar::new(SharedUri::network(
                             "https://avatars.githubusercontent.com/u/326587?v=4",
                         ))
                         .border_color(cx.theme().status().error_border),
@@ -62,14 +62,14 @@ impl Render for AvatarStory {
                 StorySection::new()
                     .child(StoryItem::new(
                         "With muted audio indicator",
-                        Avatar::new(SharedUrl::network(
+                        Avatar::new(SharedUri::network(
                             "https://avatars.githubusercontent.com/u/326587?v=4",
                         ))
                         .indicator(AvatarAudioStatusIndicator::new(AudioStatus::Muted)),
                     ))
                     .child(StoryItem::new(
                         "With deafened audio indicator",
-                        Avatar::new(SharedUrl::network(
+                        Avatar::new(SharedUri::network(
                             "https://avatars.githubusercontent.com/u/326587?v=4",
                         ))
                         .indicator(AvatarAudioStatusIndicator::new(AudioStatus::Deafened)),
diff --git a/crates/ui/src/components/stories/list_item.rs b/crates/ui/src/components/stories/list_item.rs
index 014b56b422..b0bf579fc5 100644
--- a/crates/ui/src/components/stories/list_item.rs
+++ b/crates/ui/src/components/stories/list_item.rs
@@ -1,4 +1,4 @@
-use gpui::{Render, SharedUrl};
+use gpui::{Render, SharedUri};
 use story::Story;
 
 use crate::{prelude::*, Avatar};
@@ -45,7 +45,7 @@ impl Render for ListItemStory {
             .child(
                 ListItem::new("with_start slot avatar")
                     .child("Hello, world!")
-                    .start_slot(Avatar::new(SharedUrl::network(
+                    .start_slot(Avatar::new(SharedUri::network(
                         "https://avatars.githubusercontent.com/u/1714999?v=4",
                     ))),
             )
@@ -53,7 +53,7 @@ impl Render for ListItemStory {
             .child(
                 ListItem::new("with_left_avatar")
                     .child("Hello, world!")
-                    .end_slot(Avatar::new(SharedUrl::network(
+                    .end_slot(Avatar::new(SharedUri::network(
                         "https://avatars.githubusercontent.com/u/1714999?v=4",
                     ))),
             )
@@ -64,23 +64,23 @@ impl Render for ListItemStory {
                     .end_slot(
                         h_flex()
                             .gap_2()
-                            .child(Avatar::new(SharedUrl::network(
+                            .child(Avatar::new(SharedUri::network(
                                 "https://avatars.githubusercontent.com/u/1789?v=4",
                             )))
-                            .child(Avatar::new(SharedUrl::network(
+                            .child(Avatar::new(SharedUri::network(
                                 "https://avatars.githubusercontent.com/u/1789?v=4",
                             )))
-                            .child(Avatar::new(SharedUrl::network(
+                            .child(Avatar::new(SharedUri::network(
                                 "https://avatars.githubusercontent.com/u/1789?v=4",
                             )))
-                            .child(Avatar::new(SharedUrl::network(
+                            .child(Avatar::new(SharedUri::network(
                                 "https://avatars.githubusercontent.com/u/1789?v=4",
                             )))
-                            .child(Avatar::new(SharedUrl::network(
+                            .child(Avatar::new(SharedUri::network(
                                 "https://avatars.githubusercontent.com/u/1789?v=4",
                             ))),
                     )
-                    .end_hover_slot(Avatar::new(SharedUrl::network(
+                    .end_hover_slot(Avatar::new(SharedUri::network(
                         "https://avatars.githubusercontent.com/u/1714999?v=4",
                     ))),
             )

From 6d4fe8098b8fc17f7cd92fb5c9f8fb3ee0c29da7 Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Tue, 30 Jan 2024 16:10:35 +0100
Subject: [PATCH 066/372] Fix panic in fuzzy-finder for unicode characters
 (#7080)

This fixes a panic in the fuzzy finder which someone ran into when
typing in a query that contained the lower-case version of a unicode
character that has more chars than its upper-case version.

It also fixes another problem which was that we didn't find a match if
both candidates and query contained upper-case characters whose
lower-case version had more chars.


Release Notes:

- Fixed a panic in fuzzy-finder that could occur when matching with
queries containing upper-case unicode characters whose lower-case
version has more chars.

Co-authored-by: bennetbo <bennetbo@gmx.de>
---
 crates/fuzzy/src/matcher.rs | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/crates/fuzzy/src/matcher.rs b/crates/fuzzy/src/matcher.rs
index e808a4886f..9b0d62893b 100644
--- a/crates/fuzzy/src/matcher.rs
+++ b/crates/fuzzy/src/matcher.rs
@@ -45,7 +45,7 @@ impl<'a> Matcher<'a> {
             lowercase_query,
             query_char_bag,
             min_score: 0.0,
-            last_positions: vec![0; query.len()],
+            last_positions: vec![0; lowercase_query.len()],
             match_positions: vec![0; query.len()],
             score_matrix: Vec::new(),
             best_position_matrix: Vec::new(),
@@ -82,7 +82,7 @@ impl<'a> Matcher<'a> {
             lowercase_candidate_chars.clear();
             for c in candidate.to_string().chars() {
                 candidate_chars.push(c);
-                lowercase_candidate_chars.push(c.to_ascii_lowercase());
+                lowercase_candidate_chars.append(&mut c.to_lowercase().collect::<Vec<_>>());
             }
 
             if !self.find_last_positions(lowercase_prefix, &lowercase_candidate_chars) {
@@ -383,6 +383,25 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_lowercase_longer_than_uppercase() {
+        // This character has more chars in lower-case than in upper-case.
+        let paths = vec!["\u{0130}"];
+        let query = "\u{0130}";
+        assert_eq!(
+            match_single_path_query(query, false, &paths),
+            vec![("\u{0130}", vec![0])]
+        );
+
+        // Path is the lower-case version of the query
+        let paths = vec!["i\u{307}"];
+        let query = "\u{0130}";
+        assert_eq!(
+            match_single_path_query(query, false, &paths),
+            vec![("i\u{307}", vec![0])]
+        );
+    }
+
     #[test]
     fn test_match_multibyte_path_entries() {
         let paths = vec!["aαbβ/cγdδ", "αβγδ/bcde", "c1️⃣2️⃣3️⃣/d4️⃣5️⃣6️⃣/e7️⃣8️⃣9️⃣/f", "/d/🆒/h"];

From 2980f0508c5e2d5190a2506d888f55994d0ef793 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Tue, 30 Jan 2024 11:26:02 -0500
Subject: [PATCH 067/372] Rework loading images from files (#7088)

This PR is a follow-up to #7084, where I noted that I wasn't satisfied
with using `SharedUri` to represent both URIs and paths on the local
filesystem:

> I'm still not entirely happy with this naming, as the file paths that
we can store in here are not _really_ URIs, as they are lacking a
protocol.
>
> I want to explore changing `SharedUri` / `SharedUrl` back to alway
storing a URL and treat local filepaths differently, as it seems we're
conflating two different concerns under the same umbrella, at the
moment.

`SharedUri` has now been reverted to just containing a `SharedString`
with a URI.

`ImageSource` now has a new `File` variant that is used to load an image
from a `PathBuf`.

Release Notes:

- N/A
---
 crates/client/src/user.rs                     |  2 +-
 crates/collab/src/tests/integration_tests.rs  |  6 +-
 crates/collab_ui/src/chat_panel.rs            |  4 +-
 .../src/chat_panel/message_editor.rs          |  6 +-
 .../stories/collab_notification.rs            |  6 +-
 crates/gpui/examples/image.rs                 | 45 ++++++++-----
 crates/gpui/src/elements/img.rs               | 33 +++++++++-
 crates/gpui/src/image_cache.rs                | 41 ++++++++----
 crates/gpui/src/shared_uri.rs                 | 64 ++++---------------
 crates/theme/src/styles/stories/players.rs    | 42 +++++-------
 crates/ui/src/components/stories/avatar.rs    | 46 +++++--------
 crates/ui/src/components/stories/list_item.rs | 34 +++++-----
 12 files changed, 163 insertions(+), 166 deletions(-)

diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs
index d6a60f5b4c..0263d9a950 100644
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -707,7 +707,7 @@ impl User {
         Arc::new(User {
             id: message.id,
             github_login: message.github_login,
-            avatar_uri: SharedUri::network(message.avatar_url),
+            avatar_uri: message.avatar_url.into(),
         })
     }
 }
diff --git a/crates/collab/src/tests/integration_tests.rs b/crates/collab/src/tests/integration_tests.rs
index 0d9a64e511..625544e4a1 100644
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -9,7 +9,7 @@ use fs::{repository::GitFileStatus, FakeFs, Fs as _, RemoveOptions};
 use futures::StreamExt as _;
 use gpui::{
     px, size, AppContext, BackgroundExecutor, Model, Modifiers, MouseButton, MouseDownEvent,
-    SharedUri, TestAppContext,
+    TestAppContext,
 };
 use language::{
     language_settings::{AllLanguageSettings, Formatter},
@@ -1828,7 +1828,7 @@ async fn test_active_call_events(
             owner: Arc::new(User {
                 id: client_a.user_id().unwrap(),
                 github_login: "user_a".to_string(),
-                avatar_uri: SharedUri::network("avatar_a"),
+                avatar_uri: "avatar_a".into(),
             }),
             project_id: project_a_id,
             worktree_root_names: vec!["a".to_string()],
@@ -1846,7 +1846,7 @@ async fn test_active_call_events(
             owner: Arc::new(User {
                 id: client_b.user_id().unwrap(),
                 github_login: "user_b".to_string(),
-                avatar_uri: SharedUri::network("avatar_b"),
+                avatar_uri: "avatar_b".into(),
             }),
             project_id: project_b_id,
             worktree_root_names: vec!["b".to_string()]
diff --git a/crates/collab_ui/src/chat_panel.rs b/crates/collab_ui/src/chat_panel.rs
index 879ff67d63..b01cffebe9 100644
--- a/crates/collab_ui/src/chat_panel.rs
+++ b/crates/collab_ui/src/chat_panel.rs
@@ -714,7 +714,7 @@ fn format_timestamp(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use gpui::{HighlightStyle, SharedUri};
+    use gpui::HighlightStyle;
     use pretty_assertions::assert_eq;
     use rich_text::Highlight;
     use time::{Date, OffsetDateTime, Time, UtcOffset};
@@ -730,7 +730,7 @@ mod tests {
             timestamp: OffsetDateTime::now_utc(),
             sender: Arc::new(client::User {
                 github_login: "fgh".into(),
-                avatar_uri: SharedUri::network("avatar_fgh"),
+                avatar_uri: "avatar_fgh".into(),
                 id: 103,
             }),
             nonce: 5,
diff --git a/crates/collab_ui/src/chat_panel/message_editor.rs b/crates/collab_ui/src/chat_panel/message_editor.rs
index 701ecd8e8e..06501fe3fc 100644
--- a/crates/collab_ui/src/chat_panel/message_editor.rs
+++ b/crates/collab_ui/src/chat_panel/message_editor.rs
@@ -365,7 +365,7 @@ impl Render for MessageEditor {
 mod tests {
     use super::*;
     use client::{Client, User, UserStore};
-    use gpui::{SharedUri, TestAppContext};
+    use gpui::TestAppContext;
     use language::{Language, LanguageConfig};
     use rpc::proto;
     use settings::SettingsStore;
@@ -392,7 +392,7 @@ mod tests {
                         user: Arc::new(User {
                             github_login: "a-b".into(),
                             id: 101,
-                            avatar_uri: SharedUri::network("avatar_a-b"),
+                            avatar_uri: "avatar_a-b".into(),
                         }),
                         kind: proto::channel_member::Kind::Member,
                         role: proto::ChannelRole::Member,
@@ -401,7 +401,7 @@ mod tests {
                         user: Arc::new(User {
                             github_login: "C_D".into(),
                             id: 102,
-                            avatar_uri: SharedUri::network("avatar_C_D"),
+                            avatar_uri: "avatar_C_D".into(),
                         }),
                         kind: proto::channel_member::Kind::Member,
                         role: proto::ChannelRole::Member,
diff --git a/crates/collab_ui/src/notifications/stories/collab_notification.rs b/crates/collab_ui/src/notifications/stories/collab_notification.rs
index 55700ca6f0..e67ce817b6 100644
--- a/crates/collab_ui/src/notifications/stories/collab_notification.rs
+++ b/crates/collab_ui/src/notifications/stories/collab_notification.rs
@@ -1,4 +1,4 @@
-use gpui::{prelude::*, SharedUri};
+use gpui::prelude::*;
 use story::{StoryContainer, StoryItem, StorySection};
 use ui::prelude::*;
 
@@ -19,7 +19,7 @@ impl Render for CollabNotificationStory {
                 "Incoming Call Notification",
                 window_container(400., 72.).child(
                     CollabNotification::new(
-                        SharedUri::network("https://avatars.githubusercontent.com/u/1486634?v=4"),
+                        "https://avatars.githubusercontent.com/u/1486634?v=4",
                         Button::new("accept", "Accept"),
                         Button::new("decline", "Decline"),
                     )
@@ -36,7 +36,7 @@ impl Render for CollabNotificationStory {
                 "Project Shared Notification",
                 window_container(400., 72.).child(
                     CollabNotification::new(
-                        SharedUri::network("https://avatars.githubusercontent.com/u/1714999?v=4"),
+                        "https://avatars.githubusercontent.com/u/1714999?v=4",
                         Button::new("open", "Open"),
                         Button::new("dismiss", "Dismiss"),
                     )
diff --git a/crates/gpui/examples/image.rs b/crates/gpui/examples/image.rs
index f0bb371bad..48cc39df58 100644
--- a/crates/gpui/examples/image.rs
+++ b/crates/gpui/examples/image.rs
@@ -1,12 +1,25 @@
+use std::path::PathBuf;
+use std::str::FromStr;
+use std::sync::Arc;
+
 use gpui::*;
 
 #[derive(IntoElement)]
-struct ImageFromResource {
+struct ImageContainer {
     text: SharedString,
-    resource: SharedUri,
+    src: ImageSource,
 }
 
-impl RenderOnce for ImageFromResource {
+impl ImageContainer {
+    pub fn new(text: impl Into<SharedString>, src: impl Into<ImageSource>) -> Self {
+        Self {
+            text: text.into(),
+            src: src.into(),
+        }
+    }
+}
+
+impl RenderOnce for ImageContainer {
     fn render(self, _: &mut WindowContext) -> impl IntoElement {
         div().child(
             div()
@@ -14,13 +27,13 @@ impl RenderOnce for ImageFromResource {
                 .size_full()
                 .gap_4()
                 .child(self.text)
-                .child(img(self.resource).w(px(512.0)).h(px(512.0))),
+                .child(img(self.src).w(px(512.0)).h(px(512.0))),
         )
     }
 }
 
 struct ImageShowcase {
-    local_resource: SharedUri,
+    local_resource: Arc<PathBuf>,
     remote_resource: SharedUri,
 }
 
@@ -34,14 +47,14 @@ impl Render for ImageShowcase {
             .items_center()
             .gap_8()
             .bg(rgb(0xFFFFFF))
-            .child(ImageFromResource {
-                text: "Image loaded from a local file".into(),
-                resource: self.local_resource.clone(),
-            })
-            .child(ImageFromResource {
-                text: "Image loaded from a remote resource".into(),
-                resource: self.remote_resource.clone(),
-            })
+            .child(ImageContainer::new(
+                "Image loaded from a local file",
+                self.local_resource.clone(),
+            ))
+            .child(ImageContainer::new(
+                "Image loaded from a remote resource",
+                self.remote_resource.clone(),
+            ))
     }
 }
 
@@ -51,8 +64,10 @@ fn main() {
     App::new().run(|cx: &mut AppContext| {
         cx.open_window(WindowOptions::default(), |cx| {
             cx.new_view(|_cx| ImageShowcase {
-                local_resource: SharedUri::file("../zed/resources/app-icon.png"),
-                remote_resource: SharedUri::network("https://picsum.photos/512/512"),
+                local_resource: Arc::new(
+                    PathBuf::from_str("crates/zed/resources/app-icon.png").unwrap(),
+                ),
+                remote_resource: "https://picsum.photos/512/512".into(),
             })
         });
     });
diff --git a/crates/gpui/src/elements/img.rs b/crates/gpui/src/elements/img.rs
index 00804fe565..cb97309d36 100644
--- a/crates/gpui/src/elements/img.rs
+++ b/crates/gpui/src/elements/img.rs
@@ -1,9 +1,10 @@
+use std::path::PathBuf;
 use std::sync::Arc;
 
 use crate::{
     point, size, Bounds, DevicePixels, Element, ElementContext, ImageData, InteractiveElement,
     InteractiveElementState, Interactivity, IntoElement, LayoutId, Pixels, SharedUri, Size,
-    StyleRefinement, Styled,
+    StyleRefinement, Styled, UriOrPath,
 };
 use futures::FutureExt;
 use media::core_video::CVImageBuffer;
@@ -14,6 +15,8 @@ use util::ResultExt;
 pub enum ImageSource {
     /// Image content will be loaded from provided URI at render time.
     Uri(SharedUri),
+    /// Image content will be loaded from the provided file at render time.
+    File(Arc<PathBuf>),
     /// Cached image data
     Data(Arc<ImageData>),
     // TODO: move surface definitions into mac platform module
@@ -27,6 +30,24 @@ impl From<SharedUri> for ImageSource {
     }
 }
 
+impl From<&'static str> for ImageSource {
+    fn from(uri: &'static str) -> Self {
+        Self::Uri(uri.into())
+    }
+}
+
+impl From<String> for ImageSource {
+    fn from(uri: String) -> Self {
+        Self::Uri(uri.into())
+    }
+}
+
+impl From<Arc<PathBuf>> for ImageSource {
+    fn from(value: Arc<PathBuf>) -> Self {
+        Self::File(value)
+    }
+}
+
 impl From<Arc<ImageData>> for ImageSource {
     fn from(value: Arc<ImageData>) -> Self {
         Self::Data(value)
@@ -91,8 +112,14 @@ impl Element for Img {
                 let corner_radii = style.corner_radii.to_pixels(bounds.size, cx.rem_size());
                 cx.with_z_index(1, |cx| {
                     match source {
-                        ImageSource::Uri(uri) => {
-                            let image_future = cx.image_cache.get(uri.clone(), cx);
+                        ImageSource::Uri(_) | ImageSource::File(_) => {
+                            let uri_or_path: UriOrPath = match source {
+                                ImageSource::Uri(uri) => uri.into(),
+                                ImageSource::File(path) => path.into(),
+                                _ => unreachable!(),
+                            };
+
+                            let image_future = cx.image_cache.get(uri_or_path.clone(), cx);
                             if let Some(data) = image_future
                                 .clone()
                                 .now_or_never()
diff --git a/crates/gpui/src/image_cache.rs b/crates/gpui/src/image_cache.rs
index 3c9a1741ed..cffa5f637b 100644
--- a/crates/gpui/src/image_cache.rs
+++ b/crates/gpui/src/image_cache.rs
@@ -3,6 +3,7 @@ use collections::HashMap;
 use futures::{future::Shared, AsyncReadExt, FutureExt, TryFutureExt};
 use image::ImageError;
 use parking_lot::Mutex;
+use std::path::PathBuf;
 use std::sync::Arc;
 use thiserror::Error;
 use util::http::{self, HttpClient};
@@ -41,7 +42,25 @@ impl From<ImageError> for Error {
 
 pub(crate) struct ImageCache {
     client: Arc<dyn HttpClient>,
-    images: Arc<Mutex<HashMap<SharedUri, FetchImageTask>>>,
+    images: Arc<Mutex<HashMap<UriOrPath, FetchImageTask>>>,
+}
+
+#[derive(Debug, PartialEq, Eq, Hash, Clone)]
+pub enum UriOrPath {
+    Uri(SharedUri),
+    Path(Arc<PathBuf>),
+}
+
+impl From<SharedUri> for UriOrPath {
+    fn from(value: SharedUri) -> Self {
+        Self::Uri(value)
+    }
+}
+
+impl From<Arc<PathBuf>> for UriOrPath {
+    fn from(value: Arc<PathBuf>) -> Self {
+        Self::Path(value)
+    }
 }
 
 type FetchImageTask = Shared<Task<Result<Arc<ImageData>, Error>>>;
@@ -54,11 +73,11 @@ impl ImageCache {
         }
     }
 
-    pub fn get(&self, uri: impl Into<SharedUri>, cx: &AppContext) -> FetchImageTask {
-        let uri = uri.into();
+    pub fn get(&self, uri_or_path: impl Into<UriOrPath>, cx: &AppContext) -> FetchImageTask {
+        let uri_or_path = uri_or_path.into();
         let mut images = self.images.lock();
 
-        match images.get(&uri) {
+        match images.get(&uri_or_path) {
             Some(future) => future.clone(),
             None => {
                 let client = self.client.clone();
@@ -66,14 +85,14 @@ impl ImageCache {
                     .background_executor()
                     .spawn(
                         {
-                            let uri = uri.clone();
+                            let uri_or_path = uri_or_path.clone();
                             async move {
-                                match uri {
-                                    SharedUri::File(uri) => {
+                                match uri_or_path {
+                                    UriOrPath::Path(uri) => {
                                         let image = image::open(uri.as_ref())?.into_bgra8();
                                         Ok(Arc::new(ImageData::new(image)))
                                     }
-                                    SharedUri::Network(uri) => {
+                                    UriOrPath::Uri(uri) => {
                                         let mut response =
                                             client.get(uri.as_ref(), ().into(), true).await?;
                                         let mut body = Vec::new();
@@ -96,16 +115,16 @@ impl ImageCache {
                             }
                         }
                         .map_err({
-                            let uri = uri.clone();
+                            let uri_or_path = uri_or_path.clone();
                             move |error| {
-                                log::log!(log::Level::Error, "{:?} {:?}", &uri, &error);
+                                log::log!(log::Level::Error, "{:?} {:?}", &uri_or_path, &error);
                                 error
                             }
                         }),
                     )
                     .shared();
 
-                images.insert(uri, future.clone());
+                images.insert(uri_or_path, future.clone());
                 future
             }
         }
diff --git a/crates/gpui/src/shared_uri.rs b/crates/gpui/src/shared_uri.rs
index 0784ea87ff..e257aaf08d 100644
--- a/crates/gpui/src/shared_uri.rs
+++ b/crates/gpui/src/shared_uri.rs
@@ -1,65 +1,25 @@
-use std::ops::{Deref, DerefMut};
+use derive_more::{Deref, DerefMut};
 
 use crate::SharedString;
 
-/// A URI stored in a [`SharedString`].
-#[derive(PartialEq, Eq, Hash, Clone)]
-pub enum SharedUri {
-    /// A path to a local file.
-    File(SharedString),
-    /// A URL to a remote resource.
-    Network(SharedString),
-}
-
-impl SharedUri {
-    /// Creates a [`SharedUri`] pointing to a local file.
-    pub fn file<S: Into<SharedString>>(s: S) -> Self {
-        Self::File(s.into())
-    }
-
-    /// Creates a [`SharedUri`] pointing to a remote resource.
-    pub fn network<S: Into<SharedString>>(s: S) -> Self {
-        Self::Network(s.into())
-    }
-}
-
-impl Default for SharedUri {
-    fn default() -> Self {
-        Self::Network(SharedString::default())
-    }
-}
-
-impl Deref for SharedUri {
-    type Target = SharedString;
-
-    fn deref(&self) -> &Self::Target {
-        match self {
-            Self::File(s) => s,
-            Self::Network(s) => s,
-        }
-    }
-}
-
-impl DerefMut for SharedUri {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        match self {
-            Self::File(s) => s,
-            Self::Network(s) => s,
-        }
-    }
-}
+/// A [`SharedString`] containing a URI.
+#[derive(Deref, DerefMut, Default, PartialEq, Eq, Hash, Clone)]
+pub struct SharedUri(SharedString);
 
 impl std::fmt::Debug for SharedUri {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::File(s) => write!(f, "File({:?})", s),
-            Self::Network(s) => write!(f, "Network({:?})", s),
-        }
+        self.0.fmt(f)
     }
 }
 
 impl std::fmt::Display for SharedUri {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.as_ref())
+        write!(f, "{}", self.0.as_ref())
+    }
+}
+
+impl<T: Into<SharedString>> From<T> for SharedUri {
+    fn from(value: T) -> Self {
+        Self(value.into())
     }
 }
diff --git a/crates/theme/src/styles/stories/players.rs b/crates/theme/src/styles/stories/players.rs
index e9462cbbbb..21af258641 100644
--- a/crates/theme/src/styles/stories/players.rs
+++ b/crates/theme/src/styles/stories/players.rs
@@ -1,4 +1,4 @@
-use gpui::{div, img, px, IntoElement, ParentElement, Render, SharedUri, Styled, ViewContext};
+use gpui::{div, img, px, IntoElement, ParentElement, Render, Styled, ViewContext};
 use story::Story;
 
 use crate::{ActiveTheme, PlayerColors};
@@ -53,12 +53,10 @@ impl Render for PlayerStory {
                             .border_2()
                             .border_color(player.cursor)
                             .child(
-                                img(SharedUri::network(
-                                    "https://avatars.githubusercontent.com/u/1714999?v=4",
-                                ))
-                                .rounded_full()
-                                .size_6()
-                                .bg(gpui::red()),
+                                img("https://avatars.githubusercontent.com/u/1714999?v=4")
+                                    .rounded_full()
+                                    .size_6()
+                                    .bg(gpui::red()),
                             )
                     }),
                 ))
@@ -84,12 +82,10 @@ impl Render for PlayerStory {
                                     .border_color(player.background)
                                     .size(px(28.))
                                     .child(
-                                        img(SharedUri::network(
-                                            "https://avatars.githubusercontent.com/u/1714999?v=4",
-                                        ))
-                                        .rounded_full()
-                                        .size(px(24.))
-                                        .bg(gpui::red()),
+                                        img("https://avatars.githubusercontent.com/u/1714999?v=4")
+                                            .rounded_full()
+                                            .size(px(24.))
+                                            .bg(gpui::red()),
                                     ),
                             )
                             .child(
@@ -102,12 +98,10 @@ impl Render for PlayerStory {
                                     .border_color(player.background)
                                     .size(px(28.))
                                     .child(
-                                        img(SharedUri::network(
-                                            "https://avatars.githubusercontent.com/u/1714999?v=4",
-                                        ))
-                                        .rounded_full()
-                                        .size(px(24.))
-                                        .bg(gpui::red()),
+                                        img("https://avatars.githubusercontent.com/u/1714999?v=4")
+                                            .rounded_full()
+                                            .size(px(24.))
+                                            .bg(gpui::red()),
                                     ),
                             )
                             .child(
@@ -120,12 +114,10 @@ impl Render for PlayerStory {
                                     .border_color(player.background)
                                     .size(px(28.))
                                     .child(
-                                        img(SharedUri::network(
-                                            "https://avatars.githubusercontent.com/u/1714999?v=4",
-                                        ))
-                                        .rounded_full()
-                                        .size(px(24.))
-                                        .bg(gpui::red()),
+                                        img("https://avatars.githubusercontent.com/u/1714999?v=4")
+                                            .rounded_full()
+                                            .size(px(24.))
+                                            .bg(gpui::red()),
                                     ),
                             )
                     }),
diff --git a/crates/ui/src/components/stories/avatar.rs b/crates/ui/src/components/stories/avatar.rs
index 6a8f70a318..9da475b0d9 100644
--- a/crates/ui/src/components/stories/avatar.rs
+++ b/crates/ui/src/components/stories/avatar.rs
@@ -1,4 +1,4 @@
-use gpui::{Render, SharedUri};
+use gpui::Render;
 use story::{StoryContainer, StoryItem, StorySection};
 
 use crate::{prelude::*, AudioStatus, Availability, AvatarAvailabilityIndicator};
@@ -13,66 +13,50 @@ impl Render for AvatarStory {
                 StorySection::new()
                     .child(StoryItem::new(
                         "Default",
-                        Avatar::new(SharedUri::network(
-                            "https://avatars.githubusercontent.com/u/1714999?v=4",
-                        )),
+                        Avatar::new("https://avatars.githubusercontent.com/u/1714999?v=4"),
                     ))
                     .child(StoryItem::new(
                         "Default",
-                        Avatar::new(SharedUri::network(
-                            "https://avatars.githubusercontent.com/u/326587?v=4",
-                        )),
+                        Avatar::new("https://avatars.githubusercontent.com/u/326587?v=4"),
                     )),
             )
             .child(
                 StorySection::new()
                     .child(StoryItem::new(
                         "With free availability indicator",
-                        Avatar::new(SharedUri::network(
-                            "https://avatars.githubusercontent.com/u/326587?v=4",
-                        ))
-                        .indicator(AvatarAvailabilityIndicator::new(Availability::Free)),
+                        Avatar::new("https://avatars.githubusercontent.com/u/326587?v=4")
+                            .indicator(AvatarAvailabilityIndicator::new(Availability::Free)),
                     ))
                     .child(StoryItem::new(
                         "With busy availability indicator",
-                        Avatar::new(SharedUri::network(
-                            "https://avatars.githubusercontent.com/u/326587?v=4",
-                        ))
-                        .indicator(AvatarAvailabilityIndicator::new(Availability::Busy)),
+                        Avatar::new("https://avatars.githubusercontent.com/u/326587?v=4")
+                            .indicator(AvatarAvailabilityIndicator::new(Availability::Busy)),
                     )),
             )
             .child(
                 StorySection::new()
                     .child(StoryItem::new(
                         "With info border",
-                        Avatar::new(SharedUri::network(
-                            "https://avatars.githubusercontent.com/u/326587?v=4",
-                        ))
-                        .border_color(cx.theme().status().info_border),
+                        Avatar::new("https://avatars.githubusercontent.com/u/326587?v=4")
+                            .border_color(cx.theme().status().info_border),
                     ))
                     .child(StoryItem::new(
                         "With error border",
-                        Avatar::new(SharedUri::network(
-                            "https://avatars.githubusercontent.com/u/326587?v=4",
-                        ))
-                        .border_color(cx.theme().status().error_border),
+                        Avatar::new("https://avatars.githubusercontent.com/u/326587?v=4")
+                            .border_color(cx.theme().status().error_border),
                     )),
             )
             .child(
                 StorySection::new()
                     .child(StoryItem::new(
                         "With muted audio indicator",
-                        Avatar::new(SharedUri::network(
-                            "https://avatars.githubusercontent.com/u/326587?v=4",
-                        ))
-                        .indicator(AvatarAudioStatusIndicator::new(AudioStatus::Muted)),
+                        Avatar::new("https://avatars.githubusercontent.com/u/326587?v=4")
+                            .indicator(AvatarAudioStatusIndicator::new(AudioStatus::Muted)),
                     ))
                     .child(StoryItem::new(
                         "With deafened audio indicator",
-                        Avatar::new(SharedUri::network(
-                            "https://avatars.githubusercontent.com/u/326587?v=4",
-                        ))
-                        .indicator(AvatarAudioStatusIndicator::new(AudioStatus::Deafened)),
+                        Avatar::new("https://avatars.githubusercontent.com/u/326587?v=4")
+                            .indicator(AvatarAudioStatusIndicator::new(AudioStatus::Deafened)),
                     )),
             )
     }
diff --git a/crates/ui/src/components/stories/list_item.rs b/crates/ui/src/components/stories/list_item.rs
index b0bf579fc5..67ec36816f 100644
--- a/crates/ui/src/components/stories/list_item.rs
+++ b/crates/ui/src/components/stories/list_item.rs
@@ -1,4 +1,4 @@
-use gpui::{Render, SharedUri};
+use gpui::Render;
 use story::Story;
 
 use crate::{prelude::*, Avatar};
@@ -45,17 +45,17 @@ impl Render for ListItemStory {
             .child(
                 ListItem::new("with_start slot avatar")
                     .child("Hello, world!")
-                    .start_slot(Avatar::new(SharedUri::network(
+                    .start_slot(Avatar::new(
                         "https://avatars.githubusercontent.com/u/1714999?v=4",
-                    ))),
+                    )),
             )
             .child(Story::label("With end slot"))
             .child(
                 ListItem::new("with_left_avatar")
                     .child("Hello, world!")
-                    .end_slot(Avatar::new(SharedUri::network(
+                    .end_slot(Avatar::new(
                         "https://avatars.githubusercontent.com/u/1714999?v=4",
-                    ))),
+                    )),
             )
             .child(Story::label("With end hover slot"))
             .child(
@@ -64,25 +64,25 @@ impl Render for ListItemStory {
                     .end_slot(
                         h_flex()
                             .gap_2()
-                            .child(Avatar::new(SharedUri::network(
+                            .child(Avatar::new(
                                 "https://avatars.githubusercontent.com/u/1789?v=4",
-                            )))
-                            .child(Avatar::new(SharedUri::network(
+                            ))
+                            .child(Avatar::new(
                                 "https://avatars.githubusercontent.com/u/1789?v=4",
-                            )))
-                            .child(Avatar::new(SharedUri::network(
+                            ))
+                            .child(Avatar::new(
                                 "https://avatars.githubusercontent.com/u/1789?v=4",
-                            )))
-                            .child(Avatar::new(SharedUri::network(
+                            ))
+                            .child(Avatar::new(
                                 "https://avatars.githubusercontent.com/u/1789?v=4",
-                            )))
-                            .child(Avatar::new(SharedUri::network(
+                            ))
+                            .child(Avatar::new(
                                 "https://avatars.githubusercontent.com/u/1789?v=4",
-                            ))),
+                            )),
                     )
-                    .end_hover_slot(Avatar::new(SharedUri::network(
+                    .end_hover_slot(Avatar::new(
                         "https://avatars.githubusercontent.com/u/1714999?v=4",
-                    ))),
+                    )),
             )
             .child(Story::label("With `on_click`"))
             .child(

From e5c4c8522b78a702430b618a9292958505e041cb Mon Sep 17 00:00:00 2001
From: fminkowski <fminkowski@gmail.com>
Date: Tue, 30 Jan 2024 12:54:39 -0500
Subject: [PATCH 068/372] C# Support: Add treesitter and OmniSharp LSP support
 (#6908)

This PR adds the C# tree-sitter grammar. It also adds OmniSharp-Roslyn
for LSP support.

Resolves issue
[#5299](https://github.com/zed-industries/zed/issues/5299)

Release Notes:

- Added C# support

## VSCode
<img width="984" alt="vscode"
src="https://github.com/zed-industries/zed/assets/6967829/1f6b4cb7-4e00-4d61-8e58-2867dc5c8ecf">

## Zed
<img width="1722" alt="zed"
src="https://github.com/zed-industries/zed/assets/6967829/88436c78-93de-4e26-be15-b0dea6590c55">
---
 Cargo.lock                                    |  10 +
 Cargo.toml                                    |   1 +
 crates/zed/Cargo.toml                         |   1 +
 crates/zed/src/languages.rs                   |   6 +
 crates/zed/src/languages/csharp.rs            | 144 ++++++++++
 crates/zed/src/languages/csharp/config.toml   |  12 +
 .../zed/src/languages/csharp/highlights.scm   | 254 ++++++++++++++++++
 .../zed/src/languages/csharp/injections.scm   |   2 +
 crates/zed/src/languages/csharp/outline.scm   |  38 +++
 docs/src/languages/csharp.md                  |   4 +
 10 files changed, 472 insertions(+)
 create mode 100644 crates/zed/src/languages/csharp.rs
 create mode 100644 crates/zed/src/languages/csharp/config.toml
 create mode 100644 crates/zed/src/languages/csharp/highlights.scm
 create mode 100644 crates/zed/src/languages/csharp/injections.scm
 create mode 100644 crates/zed/src/languages/csharp/outline.scm
 create mode 100644 docs/src/languages/csharp.md

diff --git a/Cargo.lock b/Cargo.lock
index 3817ba633c..462c7ef795 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8455,6 +8455,15 @@ dependencies = [
  "tree-sitter",
 ]
 
+[[package]]
+name = "tree-sitter-c-sharp"
+version = "0.20.0"
+source = "git+https://github.com/tree-sitter/tree-sitter-c-sharp?rev=dd5e59721a5f8dae34604060833902b882023aaf#dd5e59721a5f8dae34604060833902b882023aaf"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
 [[package]]
 name = "tree-sitter-cpp"
 version = "0.20.0"
@@ -9813,6 +9822,7 @@ dependencies = [
  "tree-sitter",
  "tree-sitter-bash",
  "tree-sitter-c",
+ "tree-sitter-c-sharp",
  "tree-sitter-cpp",
  "tree-sitter-css",
  "tree-sitter-elixir",
diff --git a/Cargo.toml b/Cargo.toml
index eaa09c4c8f..0d49975536 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -136,6 +136,7 @@ uuid = { version = "1.1.2", features = ["v4"] }
 tree-sitter-bash = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "7331995b19b8f8aba2d5e26deb51d2195c18bc94" }
 tree-sitter-c = "0.20.1"
 tree-sitter-cpp = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev="f44509141e7e483323d2ec178f2d2e6c0fc041c1" }
+tree-sitter-c-sharp = { git = "https://github.com/tree-sitter/tree-sitter-c-sharp", rev = "dd5e59721a5f8dae34604060833902b882023aaf" }
 tree-sitter-css = { git = "https://github.com/tree-sitter/tree-sitter-css", rev = "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51" }
 tree-sitter-elixir = { git = "https://github.com/elixir-lang/tree-sitter-elixir", rev = "a2861e88a730287a60c11ea9299c033c7d076e30" }
 tree-sitter-elm = { git = "https://github.com/elm-tooling/tree-sitter-elm", rev = "692c50c0b961364c40299e73c1306aecb5d20f40"}
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 7736f7a97b..ec0241dac8 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -115,6 +115,7 @@ tree-sitter.workspace = true
 tree-sitter-bash.workspace = true
 tree-sitter-c.workspace = true
 tree-sitter-cpp.workspace = true
+tree-sitter-c-sharp.workspace = true
 tree-sitter-css.workspace = true
 tree-sitter-elixir.workspace = true
 tree-sitter-elm.workspace = true
diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index b487210050..0faeb358fd 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -10,6 +10,7 @@ use util::{asset_str, paths::PLUGINS_DIR};
 use self::{deno::DenoSettings, elixir::ElixirSettings};
 
 mod c;
+mod csharp;
 mod css;
 mod deno;
 mod elixir;
@@ -73,6 +74,11 @@ pub fn init(
         tree_sitter_cpp::language(),
         vec![Arc::new(c::CLspAdapter)],
     );
+    language(
+        "csharp",
+        tree_sitter_c_sharp::language(),
+        vec![Arc::new(csharp::OmniSharpAdapter {})],
+    );
     language(
         "css",
         tree_sitter_css::language(),
diff --git a/crates/zed/src/languages/csharp.rs b/crates/zed/src/languages/csharp.rs
new file mode 100644
index 0000000000..e70bc78279
--- /dev/null
+++ b/crates/zed/src/languages/csharp.rs
@@ -0,0 +1,144 @@
+use anyhow::{anyhow, Context, Result};
+use async_compression::futures::bufread::GzipDecoder;
+use async_tar::Archive;
+use async_trait::async_trait;
+use futures::{io::BufReader, StreamExt};
+use language::{LanguageServerName, LspAdapterDelegate};
+use lsp::LanguageServerBinary;
+use smol::fs;
+use std::env::consts::ARCH;
+use std::ffi::OsString;
+use std::{any::Any, path::PathBuf};
+use util::async_maybe;
+use util::github::latest_github_release;
+use util::{github::GitHubLspBinaryVersion, ResultExt};
+
+pub struct OmniSharpAdapter;
+
+#[async_trait]
+impl super::LspAdapter for OmniSharpAdapter {
+    fn name(&self) -> LanguageServerName {
+        LanguageServerName("OmniSharp".into())
+    }
+
+    fn short_name(&self) -> &'static str {
+        "OmniSharp"
+    }
+
+    async fn fetch_latest_server_version(
+        &self,
+        delegate: &dyn LspAdapterDelegate,
+    ) -> Result<Box<dyn 'static + Send + Any>> {
+        let release =
+            latest_github_release("OmniSharp/omnisharp-roslyn", false, delegate.http_client())
+                .await?;
+
+        let mapped_arch = match ARCH {
+            "aarch64" => Some("arm64"),
+            "x86_64" => Some("x64"),
+            _ => None,
+        };
+
+        match mapped_arch {
+            None => Ok(Box::new(())),
+            Some(arch) => {
+                let asset_name = format!("omnisharp-osx-{}-net6.0.tar.gz", arch);
+                let asset = release
+                    .assets
+                    .iter()
+                    .find(|asset| asset.name == asset_name)
+                    .ok_or_else(|| anyhow!("no asset found matching {:?}", asset_name))?;
+                let version = GitHubLspBinaryVersion {
+                    name: release.name,
+                    url: asset.browser_download_url.clone(),
+                };
+
+                Ok(Box::new(version) as Box<_>)
+            }
+        }
+    }
+
+    async fn fetch_server_binary(
+        &self,
+        version: Box<dyn 'static + Send + Any>,
+        container_dir: PathBuf,
+        delegate: &dyn LspAdapterDelegate,
+    ) -> Result<LanguageServerBinary> {
+        let version = version.downcast::<GitHubLspBinaryVersion>().unwrap();
+        let binary_path = container_dir.join("omnisharp");
+
+        if fs::metadata(&binary_path).await.is_err() {
+            let mut response = delegate
+                .http_client()
+                .get(&version.url, Default::default(), true)
+                .await
+                .context("error downloading release")?;
+            let decompressed_bytes = GzipDecoder::new(BufReader::new(response.body_mut()));
+            let archive = Archive::new(decompressed_bytes);
+            archive.unpack(container_dir).await?;
+        }
+
+        fs::set_permissions(
+            &binary_path,
+            <fs::Permissions as fs::unix::PermissionsExt>::from_mode(0o755),
+        )
+        .await?;
+        Ok(LanguageServerBinary {
+            path: binary_path,
+            arguments: server_binary_arguments(),
+        })
+    }
+
+    async fn cached_server_binary(
+        &self,
+        container_dir: PathBuf,
+        _: &dyn LspAdapterDelegate,
+    ) -> Option<LanguageServerBinary> {
+        get_cached_server_binary(container_dir).await
+    }
+
+    async fn installation_test_binary(
+        &self,
+        container_dir: PathBuf,
+    ) -> Option<LanguageServerBinary> {
+        get_cached_server_binary(container_dir)
+            .await
+            .map(|mut binary| {
+                binary.arguments = vec!["--help".into()];
+                binary
+            })
+    }
+}
+
+async fn get_cached_server_binary(container_dir: PathBuf) -> Option<LanguageServerBinary> {
+    async_maybe!({
+        let mut last_binary_path = None;
+        let mut entries = fs::read_dir(&container_dir).await?;
+        while let Some(entry) = entries.next().await {
+            let entry = entry?;
+            if entry.file_type().await?.is_file()
+                && entry
+                    .file_name()
+                    .to_str()
+                    .map_or(false, |name| name == "omnisharp")
+            {
+                last_binary_path = Some(entry.path());
+            }
+        }
+
+        if let Some(path) = last_binary_path {
+            Ok(LanguageServerBinary {
+                path,
+                arguments: server_binary_arguments(),
+            })
+        } else {
+            Err(anyhow!("no cached binary"))
+        }
+    })
+    .await
+    .log_err()
+}
+
+fn server_binary_arguments() -> Vec<OsString> {
+    vec!["-lsp".into()]
+}
diff --git a/crates/zed/src/languages/csharp/config.toml b/crates/zed/src/languages/csharp/config.toml
new file mode 100644
index 0000000000..7835283df4
--- /dev/null
+++ b/crates/zed/src/languages/csharp/config.toml
@@ -0,0 +1,12 @@
+name = "CSharp"
+path_suffixes = ["cs"]
+line_comments = ["// "]
+autoclose_before = ";:.,=}])>"
+brackets = [
+    { start = "{", end = "}", close = true, newline = true },
+    { start = "[", end = "]", close = true, newline = true },
+    { start = "(", end = ")", close = true, newline = true },
+    { start = "\"", end = "\"", close = true, newline = false, not_in = ["string"] },
+    { start = "'", end = "'", close = true, newline = false, not_in = ["string", "comment"] },
+    { start = "/*", end = " */", close = true, newline = false, not_in = ["string", "comment"] },
+]
diff --git a/crates/zed/src/languages/csharp/highlights.scm b/crates/zed/src/languages/csharp/highlights.scm
new file mode 100644
index 0000000000..cb3c1ad4ad
--- /dev/null
+++ b/crates/zed/src/languages/csharp/highlights.scm
@@ -0,0 +1,254 @@
+;; Methods
+(method_declaration name: (identifier) @function)
+(local_function_statement name: (identifier) @function)
+
+;; Types
+(interface_declaration name: (identifier) @type)
+(class_declaration name: (identifier) @type)
+(enum_declaration name: (identifier) @type)
+(struct_declaration (identifier) @type)
+(record_declaration (identifier) @type)
+(record_struct_declaration (identifier) @type)
+(namespace_declaration name: (identifier) @type)
+
+(constructor_declaration name: (identifier) @constructor)
+(destructor_declaration name: (identifier) @constructor)
+
+[
+  (implicit_type)
+  (predefined_type)
+] @type.builtin
+
+(_ type: (identifier) @type)
+
+;; Enum
+(enum_member_declaration (identifier) @property)
+
+;; Literals
+[
+  (real_literal)
+  (integer_literal)
+] @number
+
+[
+  (character_literal)
+  (string_literal)
+  (verbatim_string_literal)
+  (interpolated_string_text)
+  (interpolated_verbatim_string_text)
+  "\""
+  "$\""
+  "@$\""
+  "$@\""
+ ] @string
+
+[
+  (boolean_literal)
+  (null_literal)
+] @constant
+
+;; Comments
+(comment) @comment
+
+;; Tokens
+[
+  ";"
+  "."
+  ","
+] @punctuation.delimiter
+
+[
+  "--"
+  "-"
+  "-="
+  "&"
+  "&="
+  "&&"
+  "+"
+  "++"
+  "+="
+  "<"
+  "<="
+  "<<"
+  "<<="
+  "="
+  "=="
+  "!"
+  "!="
+  "=>"
+  ">"
+  ">="
+  ">>"
+  ">>="
+  ">>>"
+  ">>>="
+  "|"
+  "|="
+  "||"
+  "?"
+  "??"
+  "??="
+  "^"
+  "^="
+  "~"
+  "*"
+  "*="
+  "/"
+  "/="
+  "%"
+  "%="
+  ":"
+] @operator
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+]  @punctuation.bracket
+
+;; Keywords
+(modifier) @keyword
+(this_expression) @keyword
+(escape_sequence) @keyword
+
+[
+  "add"
+  "alias"
+  "as"
+  "base"
+  "break"
+  "case"
+  "catch"
+  "checked"
+  "class"
+  "continue"
+  "default"
+  "delegate"
+  "do"
+  "else"
+  "enum"
+  "event"
+  "explicit"
+  "extern"
+  "finally"
+  "for"
+  "foreach"
+  "global"
+  "goto"
+  "if"
+  "implicit"
+  "interface"
+  "is"
+  "lock"
+  "namespace"
+  "notnull"
+  "operator"
+  "params"
+  "return"
+  "remove"
+  "sizeof"
+  "stackalloc"
+  "static"
+  "struct"
+  "switch"
+  "throw"
+  "try"
+  "typeof"
+  "unchecked"
+  "using"
+  "while"
+  "new"
+  "await"
+  "in"
+  "yield"
+  "get"
+  "set"
+  "when"
+  "out"
+  "ref"
+  "from"
+  "where"
+  "select"
+  "record"
+  "init"
+  "with"
+  "let"
+] @keyword
+
+
+;; Linq
+(from_clause (identifier) @variable)
+(group_clause (identifier) @variable)
+(order_by_clause (identifier) @variable)
+(join_clause (identifier) @variable)
+(select_clause (identifier) @variable)
+(query_continuation (identifier) @variable) @keyword
+
+;; Record
+(with_expression
+  (with_initializer_expression
+    (simple_assignment_expression
+      (identifier) @variable)))
+
+;; Exprs
+(binary_expression (identifier) @variable (identifier) @variable)
+(binary_expression (identifier)* @variable)
+(conditional_expression (identifier) @variable)
+(prefix_unary_expression (identifier) @variable)
+(postfix_unary_expression (identifier)* @variable)
+(assignment_expression (identifier) @variable)
+(cast_expression (_) (identifier) @variable)
+
+;; Class
+(base_list (identifier) @type) ;; applies to record_base too
+(property_declaration (generic_name))
+(property_declaration
+  name: (identifier) @variable)
+(property_declaration
+  name: (identifier) @variable)
+(property_declaration
+  name: (identifier) @variable)
+
+;; Lambda
+(lambda_expression) @variable
+
+;; Attribute
+(attribute) @attribute
+
+;; Parameter
+(parameter
+  name: (identifier) @variable)
+(parameter (identifier) @variable)
+(parameter_modifier) @keyword
+
+;; Variable declarations
+(variable_declarator (identifier) @variable)
+(for_each_statement left: (identifier) @variable)
+(catch_declaration (_) (identifier) @variable)
+
+;; Return
+(return_statement (identifier) @variable)
+(yield_statement (identifier) @variable)
+
+;; Type
+(generic_name (identifier) @type)
+(type_parameter (identifier) @property)
+(type_argument_list (identifier) @type)
+(as_expression right: (identifier) @type)
+(is_expression right: (identifier) @type)
+
+;; Type constraints
+(type_parameter_constraints_clause (identifier) @property)
+
+;; Switch
+(switch_statement (identifier) @variable)
+(switch_expression (identifier) @variable)
+
+;; Lock statement
+(lock_statement (identifier) @variable)
+
+;; Method calls
+(invocation_expression (member_access_expression name: (identifier) @function))
diff --git a/crates/zed/src/languages/csharp/injections.scm b/crates/zed/src/languages/csharp/injections.scm
new file mode 100644
index 0000000000..2f0e58eb64
--- /dev/null
+++ b/crates/zed/src/languages/csharp/injections.scm
@@ -0,0 +1,2 @@
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/crates/zed/src/languages/csharp/outline.scm b/crates/zed/src/languages/csharp/outline.scm
new file mode 100644
index 0000000000..aed899b37b
--- /dev/null
+++ b/crates/zed/src/languages/csharp/outline.scm
@@ -0,0 +1,38 @@
+(class_declaration
+    "class" @context
+    name: (identifier) @name
+) @item
+
+(constructor_declaration
+    name: (identifier) @name
+) @item
+
+(property_declaration
+    type: (identifier)? @context
+    type: (predefined_type)? @context
+    name: (identifier) @name
+) @item
+
+(field_declaration
+    (variable_declaration) @context
+) @item
+
+(method_declaration
+    name: (identifier) @name
+    parameters: (parameter_list) @context
+) @item
+
+(enum_declaration
+    "enum" @context
+    name: (identifier) @name
+) @item
+
+(namespace_declaration
+    "namespace" @context
+    name: (qualified_name) @name
+) @item
+
+(interface_declaration
+    "interface" @context
+    name: (identifier) @name
+) @item
diff --git a/docs/src/languages/csharp.md b/docs/src/languages/csharp.md
new file mode 100644
index 0000000000..1de49c503c
--- /dev/null
+++ b/docs/src/languages/csharp.md
@@ -0,0 +1,4 @@
+# C#
+
+- Tree Sitter: [tree-sitter-c-sharp](https://github.com/tree-sitter/tree-sitter-c-sharp)
+- Language Server: [OmniSharp](https://github.com/OmniSharp/omnisharp-roslyn)

From 30b9cef5ba98d39a16952a8cf9b8cd33ccdd4f1c Mon Sep 17 00:00:00 2001
From: Remco Smits <djsmits12@gmail.com>
Date: Tue, 30 Jan 2024 18:58:36 +0100
Subject: [PATCH 069/372] Improve mention visibility by adding a background
 color (#7014)

When the chat if going fast, It's hard to see who is mentioning you, so
this feature will make it more clear by the UI instead of needing to
read all the messages.

<img width="242" alt="Screenshot 2024-01-29 at 21 19 07"
src="https://github.com/zed-industries/zed/assets/62463826/65ec307d-5027-4ead-9568-854fc746c822">

Release Notes:

- Added background to messages that mention you.
---
 crates/collab_ui/src/chat_panel.rs | 128 ++++++++++++++++-------------
 1 file changed, 70 insertions(+), 58 deletions(-)

diff --git a/crates/collab_ui/src/chat_panel.rs b/crates/collab_ui/src/chat_panel.rs
index b01cffebe9..aad22a1e50 100644
--- a/crates/collab_ui/src/chat_panel.rs
+++ b/crates/collab_ui/src/chat_panel.rs
@@ -8,8 +8,9 @@ use db::kvp::KEY_VALUE_STORE;
 use editor::Editor;
 use gpui::{
     actions, div, list, prelude::*, px, Action, AppContext, AsyncWindowContext, DismissEvent,
-    ElementId, EventEmitter, FocusHandle, FocusableView, FontWeight, ListOffset, ListScrollEvent,
-    ListState, Model, Render, Subscription, Task, View, ViewContext, VisualContext, WeakView,
+    ElementId, EventEmitter, Fill, FocusHandle, FocusableView, FontWeight, ListOffset,
+    ListScrollEvent, ListState, Model, Render, Subscription, Task, View, ViewContext,
+    VisualContext, WeakView,
 };
 use language::LanguageRegistry;
 use menu::Confirm;
@@ -335,67 +336,78 @@ impl ChatPanel {
         };
         let this = cx.view().clone();
 
-        v_flex()
-            .w_full()
-            .relative()
-            .overflow_hidden()
-            .when(!is_continuation_from_previous, |this| {
-                this.pt_3().child(
-                    h_flex()
-                        .text_ui_sm()
-                        .child(
-                            div().absolute().child(
+        let mentioning_you = message
+            .mentions
+            .iter()
+            .any(|m| Some(m.1) == self.client.user_id());
+
+        v_flex().w_full().relative().child(
+            div()
+                .bg(if mentioning_you {
+                    Fill::from(cx.theme().colors().background)
+                } else {
+                    Fill::default()
+                })
+                .rounded_md()
+                .overflow_hidden()
+                .px_1()
+                .py_0p5()
+                .when(!is_continuation_from_previous, |this| {
+                    this.mt_1().child(
+                        h_flex()
+                            .text_ui_sm()
+                            .child(div().absolute().child(
                                 Avatar::new(message.sender.avatar_uri.clone()).size(rems(1.)),
+                            ))
+                            .child(
+                                div()
+                                    .pl(cx.rem_size() + px(6.0))
+                                    .pr(px(8.0))
+                                    .font_weight(FontWeight::BOLD)
+                                    .child(Label::new(message.sender.github_login.clone())),
+                            )
+                            .child(
+                                Label::new(format_timestamp(
+                                    OffsetDateTime::now_utc(),
+                                    message.timestamp,
+                                    self.local_timezone,
+                                ))
+                                .size(LabelSize::Small)
+                                .color(Color::Muted),
                             ),
-                        )
+                    )
+                })
+                .when(mentioning_you, |this| this.mt_1())
+                .child(
+                    v_flex()
+                        .w_full()
+                        .text_ui_sm()
+                        .id(element_id)
+                        .group("")
+                        .child(text.element("body".into(), cx))
                         .child(
                             div()
-                                .pl(cx.rem_size() + px(6.0))
-                                .pr(px(8.0))
-                                .font_weight(FontWeight::BOLD)
-                                .child(Label::new(message.sender.github_login.clone())),
-                        )
-                        .child(
-                            Label::new(format_timestamp(
-                                OffsetDateTime::now_utc(),
-                                message.timestamp,
-                                self.local_timezone,
-                            ))
-                            .size(LabelSize::Small)
-                            .color(Color::Muted),
+                                .absolute()
+                                .z_index(1)
+                                .right_0()
+                                .w_6()
+                                .bg(cx.theme().colors().panel_background)
+                                .when(!self.has_open_menu(message_id_to_remove), |el| {
+                                    el.visible_on_hover("")
+                                })
+                                .children(message_id_to_remove.map(|message_id| {
+                                    popover_menu(("menu", message_id))
+                                        .trigger(IconButton::new(
+                                            ("trigger", message_id),
+                                            IconName::Ellipsis,
+                                        ))
+                                        .menu(move |cx| {
+                                            Some(Self::render_message_menu(&this, message_id, cx))
+                                        })
+                                })),
                         ),
-                )
-            })
-            .when(is_continuation_from_previous, |this| this.pt_1())
-            .child(
-                v_flex()
-                    .w_full()
-                    .text_ui_sm()
-                    .id(element_id)
-                    .group("")
-                    .child(text.element("body".into(), cx))
-                    .child(
-                        div()
-                            .absolute()
-                            .z_index(1)
-                            .right_0()
-                            .w_6()
-                            .bg(cx.theme().colors().panel_background)
-                            .when(!self.has_open_menu(message_id_to_remove), |el| {
-                                el.visible_on_hover("")
-                            })
-                            .children(message_id_to_remove.map(|message_id| {
-                                popover_menu(("menu", message_id))
-                                    .trigger(IconButton::new(
-                                        ("trigger", message_id),
-                                        IconName::Ellipsis,
-                                    ))
-                                    .menu(move |cx| {
-                                        Some(Self::render_message_menu(&this, message_id, cx))
-                                    })
-                            })),
-                    ),
-            )
+                ),
+        )
     }
 
     fn has_open_menu(&self, message_id: Option<u64>) -> bool {

From 631f8859007797138738aab13bea150b21573f75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B1=B1=E9=A2=A8=E9=9C=B2?=
 <shirayama.kazatsuyu@gmail.com>
Date: Wed, 31 Jan 2024 03:07:46 +0900
Subject: [PATCH 070/372] Ensure sqlez build succeeds on Windows (#7072)

On Windows, `OsStr` must be a valid
[WTF-8](https://simonsapin.github.io/wtf-8/) sequence, and there are no
safety ways converting from bytes to OsStr in std. So I added
`PathExt::try_from_bytes` and use it in `sqlez`.
---
 Cargo.lock                   | 35 +++++++++++++++++++++++++++++++++++
 crates/sqlez/Cargo.toml      |  1 +
 crates/sqlez/src/bindable.rs | 12 +++++-------
 crates/util/Cargo.toml       |  3 +++
 crates/util/src/paths.rs     | 28 +++++++++++++++++++++++++++-
 5 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 462c7ef795..7a86cf72a7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2802,6 +2802,16 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
+[[package]]
+name = "futf"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843"
+dependencies = [
+ "mac",
+ "new_debug_unreachable",
+]
+
 [[package]]
 name = "futures"
 version = "0.1.31"
@@ -4128,6 +4138,12 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "mac"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
+
 [[package]]
 name = "mach2"
 version = "0.4.1"
@@ -4502,6 +4518,12 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
+
 [[package]]
 name = "nix"
 version = "0.23.2"
@@ -7281,6 +7303,7 @@ dependencies = [
  "parking_lot 0.11.2",
  "smol",
  "thread_local",
+ "util",
  "uuid 1.4.1",
 ]
 
@@ -7810,6 +7833,17 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "tendril"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0"
+dependencies = [
+ "futf",
+ "mac",
+ "utf-8",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.1.3"
@@ -8998,6 +9032,7 @@ dependencies = [
  "smol",
  "take-until",
  "tempfile",
+ "tendril",
  "url",
 ]
 
diff --git a/crates/sqlez/Cargo.toml b/crates/sqlez/Cargo.toml
index ef7c7a3c1c..6a3006f794 100644
--- a/crates/sqlez/Cargo.toml
+++ b/crates/sqlez/Cargo.toml
@@ -14,4 +14,5 @@ thread_local = "1.1.4"
 lazy_static.workspace = true
 parking_lot.workspace = true
 futures.workspace = true
+util = { path = "../util" }
 uuid.workspace = true
diff --git a/crates/sqlez/src/bindable.rs b/crates/sqlez/src/bindable.rs
index ebfddbe1da..e8b9679936 100644
--- a/crates/sqlez/src/bindable.rs
+++ b/crates/sqlez/src/bindable.rs
@@ -1,11 +1,10 @@
 use std::{
-    ffi::OsStr,
-    os::unix::prelude::OsStrExt,
     path::{Path, PathBuf},
     sync::Arc,
 };
 
 use anyhow::{Context, Result};
+use util::paths::PathExt;
 
 use crate::statement::{SqlType, Statement};
 
@@ -299,7 +298,9 @@ impl<T: Bind, const COUNT: usize> Bind for [T; COUNT] {
 impl StaticColumnCount for &Path {}
 impl Bind for &Path {
     fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
-        self.as_os_str().as_bytes().bind(statement, start_index)
+        self.as_os_str()
+            .as_encoded_bytes()
+            .bind(statement, start_index)
     }
 }
 
@@ -321,10 +322,7 @@ impl Column for PathBuf {
     fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
         let blob = statement.column_blob(start_index)?;
 
-        Ok((
-            PathBuf::from(OsStr::from_bytes(blob).to_owned()),
-            start_index + 1,
-        ))
+        PathBuf::try_from_bytes(blob).map(|path| (path, start_index + 1))
     }
 }
 
diff --git a/crates/util/Cargo.toml b/crates/util/Cargo.toml
index c2f10619b2..211cec7d25 100644
--- a/crates/util/Cargo.toml
+++ b/crates/util/Cargo.toml
@@ -31,6 +31,9 @@ git2 = { workspace = true, optional = true }
 dirs = "3.0"
 take-until = "0.2.0"
 
+[target.'cfg(windows)'.dependencies]
+tendril = "0.4.3"
+
 [dev-dependencies]
 tempfile.workspace = true
 git2.workspace = true
diff --git a/crates/util/src/paths.rs b/crates/util/src/paths.rs
index cfab7d0a40..6e7fc3f653 100644
--- a/crates/util/src/paths.rs
+++ b/crates/util/src/paths.rs
@@ -1,4 +1,7 @@
-use std::path::{Path, PathBuf};
+use std::{
+    ffi::OsStr,
+    path::{Path, PathBuf},
+};
 
 use globset::{Glob, GlobMatcher};
 use serde::{Deserialize, Serialize};
@@ -40,6 +43,29 @@ pub trait PathExt {
     fn compact(&self) -> PathBuf;
     fn icon_suffix(&self) -> Option<&str>;
     fn extension_or_hidden_file_name(&self) -> Option<&str>;
+    fn try_from_bytes<'a>(bytes: &'a [u8]) -> anyhow::Result<Self>
+    where
+        Self: From<&'a Path>,
+    {
+        #[cfg(unix)]
+        {
+            use std::os::unix::prelude::OsStrExt;
+            Ok(Self::from(Path::new(OsStr::from_bytes(bytes))))
+        }
+        #[cfg(windows)]
+        {
+            use anyhow::anyhow;
+            use tendril::fmt::{Format, WTF8};
+            WTF8::validate(bytes)
+                .then(|| {
+                    // Safety: bytes are valid WTF-8 sequence.
+                    Self::from(Path::new(unsafe {
+                        OsStr::from_encoded_bytes_unchecked(bytes)
+                    }))
+                })
+                .ok_or_else(|| anyhow!("Invalid WTF-8 sequence: {bytes:?}"))
+        }
+    }
 }
 
 impl<T: AsRef<Path>> PathExt for T {

From c07355265fcc8dd4bc3cf05279b4b321fb68d476 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 30 Jan 2024 11:16:43 -0700
Subject: [PATCH 071/372] Add logging for the font_descriptor panic (#7097)

Release Notes:

- Fixed a panic caused by an inconsistency in font metrics.
---
 crates/gpui/src/platform/mac/text_system.rs | 39 ++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/crates/gpui/src/platform/mac/text_system.rs b/crates/gpui/src/platform/mac/text_system.rs
index 053e5859be..24ab8346f4 100644
--- a/crates/gpui/src/platform/mac/text_system.rs
+++ b/crates/gpui/src/platform/mac/text_system.rs
@@ -10,6 +10,7 @@ use core_foundation::{
     array::CFIndex,
     attributed_string::{CFAttributedStringRef, CFMutableAttributedString},
     base::{CFRange, TCFType},
+    number::CFNumber,
     string::CFString,
 };
 use core_graphics::{
@@ -17,7 +18,14 @@ use core_graphics::{
     color_space::CGColorSpace,
     context::CGContext,
 };
-use core_text::{font::CTFont, line::CTLine, string_attributes::kCTFontAttributeName};
+use core_text::{
+    font::CTFont,
+    font_descriptor::{
+        kCTFontSlantTrait, kCTFontSymbolicTrait, kCTFontWeightTrait, kCTFontWidthTrait,
+    },
+    line::CTLine,
+    string_attributes::kCTFontAttributeName,
+};
 use font_kit::{
     font::Font as FontKitFont,
     handle::Handle,
@@ -219,6 +227,35 @@ impl MacTextSystemState {
             let Some(_) = font.glyph_for_char('m') else {
                 continue;
             };
+            // We've seen a number of panics in production caused by calling font.properties()
+            // which unwraps a downcast to CFNumber. This is an attempt to avoid the panic,
+            // and to try and identify the incalcitrant font.
+            let traits = font.native_font().all_traits();
+            if unsafe {
+                !(traits
+                    .get(kCTFontSymbolicTrait)
+                    .downcast::<CFNumber>()
+                    .is_some()
+                    && traits
+                        .get(kCTFontWidthTrait)
+                        .downcast::<CFNumber>()
+                        .is_some()
+                    && traits
+                        .get(kCTFontWeightTrait)
+                        .downcast::<CFNumber>()
+                        .is_some()
+                    && traits
+                        .get(kCTFontSlantTrait)
+                        .downcast::<CFNumber>()
+                        .is_some())
+            } {
+                log::error!(
+                    "Failed to read traits for font {:?}",
+                    font.postscript_name().unwrap()
+                );
+                continue;
+            }
+
             let font_id = FontId(self.fonts.len());
             font_ids.push(font_id);
             let postscript_name = font.postscript_name().unwrap();

From dfbcaf36fc0440f5bbdb617b2b66cf7bb00cd220 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 30 Jan 2024 11:35:07 -0700
Subject: [PATCH 072/372] nightly url setting (#7037)

Release Notes:

- Added the ability to set settings per-release stage
- Added a `"server_url"` setting
---
 Cargo.lock                                |  1 +
 assets/settings/default.json              | 23 +++++++
 crates/auto_update/src/auto_update.rs     | 38 +++++------
 crates/channel/src/channel_store_tests.rs |  1 +
 crates/client/src/client.rs               | 80 ++++++++++++++++-------
 crates/client/src/telemetry.rs            | 17 ++---
 crates/collab/src/tests/test_server.rs    |  1 +
 crates/feedback/src/feedback_modal.rs     |  6 +-
 crates/settings/src/settings_store.rs     | 42 +++++++++++-
 crates/util/Cargo.toml                    |  1 +
 crates/util/src/http.rs                   | 50 ++++++++++++--
 crates/zed/src/main.rs                    | 33 +++++++---
 12 files changed, 217 insertions(+), 76 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7a86cf72a7..f0f7fb512a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9025,6 +9025,7 @@ dependencies = [
  "isahc",
  "lazy_static",
  "log",
+ "parking_lot 0.11.2",
  "rand 0.8.5",
  "rust-embed",
  "serde",
diff --git a/assets/settings/default.json b/assets/settings/default.json
index 01165c9e31..f81f2b0252 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -503,5 +503,28 @@
     //         }
     //     }
     // }
+  },
+  // The server to connect to. If the environment variable
+  // ZED_SERVER_URL is set, it will override this setting.
+  "server_url": "https://zed.dev",
+  // Settings overrides to use when using Zed Preview.
+  // Mostly useful for developers who are managing multiple instances of Zed.
+  "preview": {
+    // "theme": "Andromeda"
+  },
+  // Settings overrides to use when using Zed Nightly.
+  // Mostly useful for developers who are managing multiple instances of Zed.
+  "nightly": {
+    // "theme": "Andromeda"
+  },
+  // Settings overrides to use when using Zed Stable.
+  // Mostly useful for developers who are managing multiple instances of Zed.
+  "stable": {
+    // "theme": "Andromeda"
+  },
+  // Settings overrides to use when using Zed Stable.
+  // Mostly useful for developers who are managing multiple instances of Zed.
+  "dev": {
+    // "theme": "Andromeda"
   }
 }
diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs
index 5ce3316be8..9673e8bbb2 100644
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -25,8 +25,11 @@ use std::{
     time::Duration,
 };
 use update_notification::UpdateNotification;
-use util::channel::{AppCommitSha, ReleaseChannel};
 use util::http::HttpClient;
+use util::{
+    channel::{AppCommitSha, ReleaseChannel},
+    http::ZedHttpClient,
+};
 use workspace::Workspace;
 
 const SHOULD_SHOW_UPDATE_NOTIFICATION_KEY: &str = "auto-updater-should-show-updated-notification";
@@ -54,9 +57,8 @@ pub enum AutoUpdateStatus {
 pub struct AutoUpdater {
     status: AutoUpdateStatus,
     current_version: SemanticVersion,
-    http_client: Arc<dyn HttpClient>,
+    http_client: Arc<ZedHttpClient>,
     pending_poll: Option<Task<Option<()>>>,
-    server_url: String,
 }
 
 #[derive(Deserialize)]
@@ -92,7 +94,7 @@ impl Settings for AutoUpdateSetting {
     }
 }
 
-pub fn init(http_client: Arc<dyn HttpClient>, server_url: String, cx: &mut AppContext) {
+pub fn init(http_client: Arc<ZedHttpClient>, cx: &mut AppContext) {
     AutoUpdateSetting::register(cx);
 
     cx.observe_new_views(|workspace: &mut Workspace, _cx| {
@@ -106,7 +108,7 @@ pub fn init(http_client: Arc<dyn HttpClient>, server_url: String, cx: &mut AppCo
 
     if let Some(version) = ZED_APP_VERSION.or_else(|| cx.app_metadata().app_version) {
         let auto_updater = cx.new_model(|cx| {
-            let updater = AutoUpdater::new(version, http_client, server_url);
+            let updater = AutoUpdater::new(version, http_client);
 
             let mut update_subscription = AutoUpdateSetting::get_global(cx)
                 .0
@@ -151,10 +153,11 @@ pub fn view_release_notes(_: &ViewReleaseNotes, cx: &mut AppContext) -> Option<(
         ReleaseChannel::Stable | ReleaseChannel::Preview
     ) {
         let auto_updater = auto_updater.read(cx);
-        let server_url = &auto_updater.server_url;
         let release_channel = release_channel.dev_name();
         let current_version = auto_updater.current_version;
-        let url = format!("{server_url}/releases/{release_channel}/{current_version}");
+        let url = &auto_updater
+            .http_client
+            .zed_url(&format!("/releases/{release_channel}/{current_version}"));
         cx.open_url(&url);
     }
 
@@ -191,16 +194,11 @@ impl AutoUpdater {
         cx.default_global::<Option<Model<Self>>>().clone()
     }
 
-    fn new(
-        current_version: SemanticVersion,
-        http_client: Arc<dyn HttpClient>,
-        server_url: String,
-    ) -> Self {
+    fn new(current_version: SemanticVersion, http_client: Arc<ZedHttpClient>) -> Self {
         Self {
             status: AutoUpdateStatus::Idle,
             current_version,
             http_client,
-            server_url,
             pending_poll: None,
         }
     }
@@ -246,18 +244,14 @@ impl AutoUpdater {
     }
 
     async fn update(this: Model<Self>, mut cx: AsyncAppContext) -> Result<()> {
-        let (client, server_url, current_version) = this.read_with(&cx, |this, _| {
-            (
-                this.http_client.clone(),
-                this.server_url.clone(),
-                this.current_version,
-            )
+        let (client, current_version) = this.read_with(&cx, |this, _| {
+            (this.http_client.clone(), this.current_version)
         })?;
 
-        let mut url_string = format!(
-            "{server_url}/api/releases/latest?asset=Zed.dmg&os={}&arch={}",
+        let mut url_string = client.zed_url(&format!(
+            "/api/releases/latest?asset=Zed.dmg&os={}&arch={}",
             OS, ARCH
-        );
+        ));
         cx.update(|cx| {
             if let Some(param) = cx
                 .try_global::<ReleaseChannel>()
diff --git a/crates/channel/src/channel_store_tests.rs b/crates/channel/src/channel_store_tests.rs
index ad2098766d..6450736d34 100644
--- a/crates/channel/src/channel_store_tests.rs
+++ b/crates/channel/src/channel_store_tests.rs
@@ -329,6 +329,7 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
 fn init_test(cx: &mut AppContext) -> Model<ChannelStore> {
     let settings_store = SettingsStore::test(cx);
     cx.set_global(settings_store);
+    client::init_settings(cx);
 
     let http = FakeHttpClient::with_404_response();
     let client = Client::new(http.clone(), cx);
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index 3c2a831ce2..dd9514ac56 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -26,7 +26,7 @@ use rpc::proto::{AnyTypedEnvelope, EntityMessage, EnvelopedMessage, PeerId, Requ
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use serde_json;
-use settings::Settings;
+use settings::{Settings, SettingsStore};
 use std::{
     any::TypeId,
     collections::HashMap,
@@ -41,8 +41,8 @@ use std::{
 use telemetry::Telemetry;
 use thiserror::Error;
 use url::Url;
-use util::channel::ReleaseChannel;
 use util::http::HttpClient;
+use util::{channel::ReleaseChannel, http::ZedHttpClient};
 use util::{ResultExt, TryFutureExt};
 
 pub use rpc::*;
@@ -50,9 +50,8 @@ pub use telemetry::Event;
 pub use user::*;
 
 lazy_static! {
-    pub static ref ZED_SERVER_URL: String =
-        std::env::var("ZED_SERVER_URL").unwrap_or_else(|_| "https://zed.dev".to_string());
-    pub static ref ZED_RPC_URL: Option<String> = std::env::var("ZED_RPC_URL").ok();
+    static ref ZED_SERVER_URL: Option<String> = std::env::var("ZED_SERVER_URL").ok();
+    static ref ZED_RPC_URL: Option<String> = std::env::var("ZED_RPC_URL").ok();
     pub static ref IMPERSONATE_LOGIN: Option<String> = std::env::var("ZED_IMPERSONATE")
         .ok()
         .and_then(|s| if s.is_empty() { None } else { Some(s) });
@@ -73,13 +72,45 @@ pub const CONNECTION_TIMEOUT: Duration = Duration::from_secs(5);
 
 actions!(client, [SignIn, SignOut, Reconnect]);
 
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema)]
+pub struct ClientSettingsContent {
+    server_url: Option<String>,
+}
+
+#[derive(Deserialize)]
+pub struct ClientSettings {
+    pub server_url: String,
+}
+
+impl Settings for ClientSettings {
+    const KEY: Option<&'static str> = None;
+
+    type FileContent = ClientSettingsContent;
+
+    fn load(
+        default_value: &Self::FileContent,
+        user_values: &[&Self::FileContent],
+        _: &mut AppContext,
+    ) -> Result<Self>
+    where
+        Self: Sized,
+    {
+        let mut result = Self::load_via_json_merge(default_value, user_values)?;
+        if let Some(server_url) = &*ZED_SERVER_URL {
+            result.server_url = server_url.clone()
+        }
+        Ok(result)
+    }
+}
+
 pub fn init_settings(cx: &mut AppContext) {
     TelemetrySettings::register(cx);
+    cx.update_global(|store: &mut SettingsStore, cx| {
+        store.register_setting::<ClientSettings>(cx);
+    });
 }
 
 pub fn init(client: &Arc<Client>, cx: &mut AppContext) {
-    init_settings(cx);
-
     let client = Arc::downgrade(client);
     cx.on_action({
         let client = client.clone();
@@ -121,7 +152,7 @@ pub fn init(client: &Arc<Client>, cx: &mut AppContext) {
 pub struct Client {
     id: AtomicU64,
     peer: Arc<Peer>,
-    http: Arc<dyn HttpClient>,
+    http: Arc<ZedHttpClient>,
     telemetry: Arc<Telemetry>,
     state: RwLock<ClientState>,
 
@@ -390,8 +421,8 @@ impl settings::Settings for TelemetrySettings {
 }
 
 impl Client {
-    pub fn new(http: Arc<dyn HttpClient>, cx: &mut AppContext) -> Arc<Self> {
-        Arc::new(Self {
+    pub fn new(http: Arc<ZedHttpClient>, cx: &mut AppContext) -> Arc<Self> {
+        let client = Arc::new(Self {
             id: AtomicU64::new(0),
             peer: Peer::new(0),
             telemetry: Telemetry::new(http.clone(), cx),
@@ -402,14 +433,16 @@ impl Client {
             authenticate: Default::default(),
             #[cfg(any(test, feature = "test-support"))]
             establish_connection: Default::default(),
-        })
+        });
+
+        client
     }
 
     pub fn id(&self) -> u64 {
         self.id.load(std::sync::atomic::Ordering::SeqCst)
     }
 
-    pub fn http_client(&self) -> Arc<dyn HttpClient> {
+    pub fn http_client(&self) -> Arc<ZedHttpClient> {
         self.http.clone()
     }
 
@@ -925,14 +958,14 @@ impl Client {
     }
 
     async fn get_rpc_url(
-        http: Arc<dyn HttpClient>,
+        http: Arc<ZedHttpClient>,
         release_channel: Option<ReleaseChannel>,
     ) -> Result<Url> {
         if let Some(url) = &*ZED_RPC_URL {
             return Url::parse(url).context("invalid rpc url");
         }
 
-        let mut url = format!("{}/rpc", *ZED_SERVER_URL);
+        let mut url = http.zed_url("/rpc");
         if let Some(preview_param) =
             release_channel.and_then(|channel| channel.release_query_param())
         {
@@ -1053,10 +1086,10 @@ impl Client {
 
                     // Open the Zed sign-in page in the user's browser, with query parameters that indicate
                     // that the user is signing in from a Zed app running on the same device.
-                    let mut url = format!(
-                        "{}/native_app_signin?native_app_port={}&native_app_public_key={}",
-                        *ZED_SERVER_URL, port, public_key_string
-                    );
+                    let mut url = http.zed_url(&format!(
+                        "/native_app_signin?native_app_port={}&native_app_public_key={}",
+                        port, public_key_string
+                    ));
 
                     if let Some(impersonate_login) = IMPERSONATE_LOGIN.as_ref() {
                         log::info!("impersonating user @{}", impersonate_login);
@@ -1088,7 +1121,7 @@ impl Client {
                                     }
 
                                     let post_auth_url =
-                                        format!("{}/native_app_signin_succeeded", *ZED_SERVER_URL);
+                                        http.zed_url("/native_app_signin_succeeded");
                                     req.respond(
                                         tiny_http::Response::empty(302).with_header(
                                             tiny_http::Header::from_bytes(
@@ -1130,7 +1163,7 @@ impl Client {
     }
 
     async fn authenticate_as_admin(
-        http: Arc<dyn HttpClient>,
+        http: Arc<ZedHttpClient>,
         login: String,
         mut api_token: String,
     ) -> Result<Credentials> {
@@ -1351,7 +1384,7 @@ async fn read_credentials_from_keychain(cx: &AsyncAppContext) -> Option<Credenti
     }
 
     let (user_id, access_token) = cx
-        .update(|cx| cx.read_credentials(&ZED_SERVER_URL))
+        .update(|cx| cx.read_credentials(&ClientSettings::get_global(cx).server_url))
         .log_err()?
         .await
         .log_err()??;
@@ -1368,7 +1401,7 @@ async fn write_credentials_to_keychain(
 ) -> Result<()> {
     cx.update(move |cx| {
         cx.write_credentials(
-            &ZED_SERVER_URL,
+            &ClientSettings::get_global(cx).server_url,
             &credentials.user_id.to_string(),
             credentials.access_token.as_bytes(),
         )
@@ -1377,7 +1410,7 @@ async fn write_credentials_to_keychain(
 }
 
 async fn delete_credentials_from_keychain(cx: &AsyncAppContext) -> Result<()> {
-    cx.update(move |cx| cx.delete_credentials(&ZED_SERVER_URL))?
+    cx.update(move |cx| cx.delete_credentials(&ClientSettings::get_global(cx).server_url))?
         .await
 }
 
@@ -1684,6 +1717,7 @@ mod tests {
         cx.update(|cx| {
             let settings_store = SettingsStore::test(cx);
             cx.set_global(settings_store);
+            init_settings(cx);
         });
     }
 }
diff --git a/crates/client/src/telemetry.rs b/crates/client/src/telemetry.rs
index 824ac3f9ea..2132cee38b 100644
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -1,10 +1,9 @@
 mod event_coalescer;
 
-use crate::{TelemetrySettings, ZED_SERVER_URL};
+use crate::TelemetrySettings;
 use chrono::{DateTime, Utc};
 use futures::Future;
 use gpui::{AppContext, AppMetadata, BackgroundExecutor, Task};
-use lazy_static::lazy_static;
 use parking_lot::Mutex;
 use serde::Serialize;
 use settings::{Settings, SettingsStore};
@@ -13,7 +12,7 @@ use sysinfo::{
     CpuRefreshKind, Pid, PidExt, ProcessExt, ProcessRefreshKind, RefreshKind, System, SystemExt,
 };
 use tempfile::NamedTempFile;
-use util::http::HttpClient;
+use util::http::{HttpClient, ZedHttpClient};
 #[cfg(not(debug_assertions))]
 use util::ResultExt;
 use util::{channel::ReleaseChannel, TryFutureExt};
@@ -21,7 +20,7 @@ use util::{channel::ReleaseChannel, TryFutureExt};
 use self::event_coalescer::EventCoalescer;
 
 pub struct Telemetry {
-    http_client: Arc<dyn HttpClient>,
+    http_client: Arc<ZedHttpClient>,
     executor: BackgroundExecutor,
     state: Arc<Mutex<TelemetryState>>,
 }
@@ -43,12 +42,6 @@ struct TelemetryState {
     max_queue_size: usize,
 }
 
-const EVENTS_URL_PATH: &'static str = "/api/events";
-
-lazy_static! {
-    static ref EVENTS_URL: String = format!("{}{}", *ZED_SERVER_URL, EVENTS_URL_PATH);
-}
-
 #[derive(Serialize, Debug)]
 struct EventRequestBody {
     installation_id: Option<Arc<str>>,
@@ -149,7 +142,7 @@ const FLUSH_INTERVAL: Duration = Duration::from_secs(1);
 const FLUSH_INTERVAL: Duration = Duration::from_secs(60 * 5);
 
 impl Telemetry {
-    pub fn new(client: Arc<dyn HttpClient>, cx: &mut AppContext) -> Arc<Self> {
+    pub fn new(client: Arc<ZedHttpClient>, cx: &mut AppContext) -> Arc<Self> {
         let release_channel = cx
             .try_global::<ReleaseChannel>()
             .map(|release_channel| release_channel.display_name());
@@ -548,7 +541,7 @@ impl Telemetry {
                     }
 
                     this.http_client
-                        .post_json(EVENTS_URL.as_str(), json_bytes.into())
+                        .post_json(&this.http_client.zed_url("/api/events"), json_bytes.into())
                         .await?;
                     anyhow::Ok(())
                 }
diff --git a/crates/collab/src/tests/test_server.rs b/crates/collab/src/tests/test_server.rs
index 757add782c..e10f03605a 100644
--- a/crates/collab/src/tests/test_server.rs
+++ b/crates/collab/src/tests/test_server.rs
@@ -153,6 +153,7 @@ impl TestServer {
             }
             let settings = SettingsStore::test(cx);
             cx.set_global(settings);
+            client::init_settings(cx);
         });
 
         let http = FakeHttpClient::with_404_response();
diff --git a/crates/feedback/src/feedback_modal.rs b/crates/feedback/src/feedback_modal.rs
index 5067551d5c..536059989f 100644
--- a/crates/feedback/src/feedback_modal.rs
+++ b/crates/feedback/src/feedback_modal.rs
@@ -2,7 +2,7 @@ use std::{ops::RangeInclusive, sync::Arc, time::Duration};
 
 use anyhow::{anyhow, bail};
 use bitflags::bitflags;
-use client::{Client, ZED_SERVER_URL};
+use client::Client;
 use db::kvp::KEY_VALUE_STORE;
 use editor::{Editor, EditorEvent};
 use futures::AsyncReadExt;
@@ -16,7 +16,7 @@ use project::Project;
 use regex::Regex;
 use serde_derive::Serialize;
 use ui::{prelude::*, Button, ButtonStyle, IconPosition, Tooltip};
-use util::ResultExt;
+use util::{http::HttpClient, ResultExt};
 use workspace::{ModalView, Toast, Workspace};
 
 use crate::{system_specs::SystemSpecs, GiveFeedback, OpenZedRepo};
@@ -293,12 +293,12 @@ impl FeedbackModal {
             }
         }
 
-        let feedback_endpoint = format!("{}/api/feedback", *ZED_SERVER_URL);
         let telemetry = zed_client.telemetry();
         let metrics_id = telemetry.metrics_id();
         let installation_id = telemetry.installation_id();
         let is_staff = telemetry.is_staff();
         let http_client = zed_client.http_client();
+        let feedback_endpoint = http_client.zed_url("/api/feedback");
         let request = FeedbackRequestBody {
             feedback_text: &feedback_text,
             email,
diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs
index 78bfefd4fa..e8c0297def 100644
--- a/crates/settings/src/settings_store.rs
+++ b/crates/settings/src/settings_store.rs
@@ -1,6 +1,6 @@
 use anyhow::{anyhow, Context, Result};
 use collections::{btree_map, hash_map, BTreeMap, HashMap};
-use gpui::AppContext;
+use gpui::{AppContext, AsyncAppContext};
 use lazy_static::lazy_static;
 use schemars::{gen::SchemaGenerator, schema::RootSchema, JsonSchema};
 use serde::{de::DeserializeOwned, Deserialize as _, Serialize};
@@ -13,7 +13,9 @@ use std::{
     str,
     sync::Arc,
 };
-use util::{merge_non_null_json_value_into, RangeExt, ResultExt as _};
+use util::{
+    channel::RELEASE_CHANNEL_NAME, merge_non_null_json_value_into, RangeExt, ResultExt as _,
+};
 
 /// A value that can be defined as a user setting.
 ///
@@ -102,6 +104,14 @@ pub trait Settings: 'static + Send + Sync {
         cx.global::<SettingsStore>().get(None)
     }
 
+    #[track_caller]
+    fn try_read_global<'a, R>(cx: &'a AsyncAppContext, f: impl FnOnce(&Self) -> R) -> Option<R>
+    where
+        Self: Sized,
+    {
+        cx.try_read_global(|s: &SettingsStore, _| f(s.get(None)))
+    }
+
     #[track_caller]
     fn override_global<'a>(settings: Self, cx: &'a mut AppContext)
     where
@@ -197,6 +207,15 @@ impl SettingsStore {
                 user_values_stack = vec![user_settings];
             }
 
+            if let Some(release_settings) = &self.raw_user_settings.get(&*RELEASE_CHANNEL_NAME) {
+                if let Some(release_settings) = setting_value
+                    .deserialize_setting(&release_settings)
+                    .log_err()
+                {
+                    user_values_stack.push(release_settings);
+                }
+            }
+
             if let Some(setting) = setting_value
                 .load_setting(&default_settings, &user_values_stack, cx)
                 .context("A default setting must be added to the `default.json` file")
@@ -484,6 +503,15 @@ impl SettingsStore {
             }
         }
 
+        for release_stage in ["dev", "nightly", "stable", "preview"] {
+            let schema = combined_schema.schema.clone();
+            combined_schema
+                .schema
+                .object()
+                .properties
+                .insert(release_stage.to_string(), schema.into());
+        }
+
         serde_json::to_value(&combined_schema).unwrap()
     }
 
@@ -509,6 +537,16 @@ impl SettingsStore {
                 paths_stack.push(None);
             }
 
+            if let Some(release_settings) = &self.raw_user_settings.get(&*RELEASE_CHANNEL_NAME) {
+                if let Some(release_settings) = setting_value
+                    .deserialize_setting(&release_settings)
+                    .log_err()
+                {
+                    user_settings_stack.push(release_settings);
+                    paths_stack.push(None);
+                }
+            }
+
             // If the global settings file changed, reload the global value for the field.
             if changed_local_path.is_none() {
                 if let Some(value) = setting_value
diff --git a/crates/util/Cargo.toml b/crates/util/Cargo.toml
index 211cec7d25..924c6fe688 100644
--- a/crates/util/Cargo.toml
+++ b/crates/util/Cargo.toml
@@ -30,6 +30,7 @@ serde_json.workspace = true
 git2 = { workspace = true, optional = true }
 dirs = "3.0"
 take-until = "0.2.0"
+parking_lot.workspace = true
 
 [target.'cfg(windows)'.dependencies]
 tendril = "0.4.3"
diff --git a/crates/util/src/http.rs b/crates/util/src/http.rs
index f6487c04f2..6218c59c2b 100644
--- a/crates/util/src/http.rs
+++ b/crates/util/src/http.rs
@@ -6,12 +6,49 @@ pub use isahc::{
     Error,
 };
 pub use isahc::{AsyncBody, Request, Response};
+use parking_lot::Mutex;
 use smol::future::FutureExt;
 #[cfg(feature = "test-support")]
 use std::fmt;
 use std::{sync::Arc, time::Duration};
 pub use url::Url;
 
+pub struct ZedHttpClient {
+    pub zed_host: Mutex<String>,
+    client: Box<dyn HttpClient>,
+}
+
+impl ZedHttpClient {
+    pub fn zed_url(&self, path: &str) -> String {
+        format!("{}{}", self.zed_host.lock(), path)
+    }
+}
+
+impl HttpClient for Arc<ZedHttpClient> {
+    fn send(&self, req: Request<AsyncBody>) -> BoxFuture<Result<Response<AsyncBody>, Error>> {
+        self.client.send(req)
+    }
+}
+
+impl HttpClient for ZedHttpClient {
+    fn send(&self, req: Request<AsyncBody>) -> BoxFuture<Result<Response<AsyncBody>, Error>> {
+        self.client.send(req)
+    }
+}
+
+pub fn zed_client(zed_host: &str) -> Arc<ZedHttpClient> {
+    Arc::new(ZedHttpClient {
+        zed_host: Mutex::new(zed_host.to_string()),
+        client: Box::new(
+            isahc::HttpClient::builder()
+                .connect_timeout(Duration::from_secs(5))
+                .low_speed_timeout(100, Duration::from_secs(5))
+                .build()
+                .unwrap(),
+        ),
+    })
+}
+
 pub trait HttpClient: Send + Sync {
     fn send(&self, req: Request<AsyncBody>) -> BoxFuture<Result<Response<AsyncBody>, Error>>;
 
@@ -81,17 +118,20 @@ pub struct FakeHttpClient {
 
 #[cfg(feature = "test-support")]
 impl FakeHttpClient {
-    pub fn create<Fut, F>(handler: F) -> Arc<dyn HttpClient>
+    pub fn create<Fut, F>(handler: F) -> Arc<ZedHttpClient>
     where
         Fut: 'static + Send + futures::Future<Output = Result<Response<AsyncBody>, Error>>,
         F: 'static + Send + Sync + Fn(Request<AsyncBody>) -> Fut,
     {
-        Arc::new(Self {
-            handler: Box::new(move |req| Box::pin(handler(req))),
+        Arc::new(ZedHttpClient {
+            zed_host: Mutex::new("http://test.example".into()),
+            client: Box::new(Self {
+                handler: Box::new(move |req| Box::pin(handler(req))),
+            }),
         })
     }
 
-    pub fn with_404_response() -> Arc<dyn HttpClient> {
+    pub fn with_404_response() -> Arc<ZedHttpClient> {
         Self::create(|_| async move {
             Ok(Response::builder()
                 .status(404)
@@ -100,7 +140,7 @@ impl FakeHttpClient {
         })
     }
 
-    pub fn with_200_response() -> Arc<dyn HttpClient> {
+    pub fn with_200_response() -> Arc<ZedHttpClient> {
         Self::create(|_| async move {
             Ok(Response::builder()
                 .status(200)
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 5955d79a59..d045637f63 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -42,7 +42,7 @@ use theme::{ActiveTheme, ThemeRegistry, ThemeSettings};
 use util::{
     async_maybe,
     channel::{parse_zed_link, AppCommitSha, ReleaseChannel, RELEASE_CHANNEL},
-    http::{self, HttpClient},
+    http::{self, HttpClient, ZedHttpClient},
     paths::{self, CRASHES_DIR, CRASHES_RETIRED_DIR},
     ResultExt,
 };
@@ -59,7 +59,6 @@ fn main() {
     menu::init();
     zed_actions::init();
 
-    let http = http::client();
     init_paths();
     init_logger();
 
@@ -132,6 +131,9 @@ fn main() {
         cx.set_global(store);
         handle_settings_file_changes(user_settings_file_rx, cx);
         handle_keymap_file_changes(user_keymap_file_rx, cx);
+        client::init_settings(cx);
+
+        let http = http::zed_client(&client::ClientSettings::get_global(cx).server_url);
 
         let client = client::Client::new(http.clone(), cx);
         let mut languages = LanguageRegistry::new(login_shell_env_loaded);
@@ -201,7 +203,20 @@ fn main() {
         languages.set_theme(cx.theme().clone());
         cx.observe_global::<SettingsStore>({
             let languages = languages.clone();
-            move |cx| languages.set_theme(cx.theme().clone())
+            let http = http.clone();
+            let client = client.clone();
+
+            move |cx| {
+                languages.set_theme(cx.theme().clone());
+                let new_host = &client::ClientSettings::get_global(cx).server_url;
+                let mut host = http.zed_host.lock();
+                if &*host != new_host {
+                    *host = new_host.clone();
+                    if client.status().borrow().is_connected() {
+                        client.reconnect(&cx.to_async());
+                    }
+                }
+            }
         })
         .detach();
 
@@ -230,7 +245,7 @@ fn main() {
         cx.set_global(Arc::downgrade(&app_state));
 
         audio::init(Assets, cx);
-        auto_update::init(http.clone(), client::ZED_SERVER_URL.clone(), cx);
+        auto_update::init(http.clone(), cx);
 
         workspace::init(app_state.clone(), cx);
         recent_projects::init(cx);
@@ -634,7 +649,7 @@ fn init_panic_hook(app: &App, installation_id: Option<String>, session_id: Strin
     }));
 }
 
-fn upload_panics_and_crashes(http: Arc<dyn HttpClient>, cx: &mut AppContext) {
+fn upload_panics_and_crashes(http: Arc<ZedHttpClient>, cx: &mut AppContext) {
     let telemetry_settings = *client::TelemetrySettings::get_global(cx);
     cx.background_executor()
         .spawn(async move {
@@ -650,10 +665,10 @@ fn upload_panics_and_crashes(http: Arc<dyn HttpClient>, cx: &mut AppContext) {
 
 /// upload panics to us (via zed.dev)
 async fn upload_previous_panics(
-    http: Arc<dyn HttpClient>,
+    http: Arc<ZedHttpClient>,
     telemetry_settings: client::TelemetrySettings,
 ) -> Result<()> {
-    let panic_report_url = format!("{}/api/panic", &*client::ZED_SERVER_URL);
+    let panic_report_url = http.zed_url("/api/panic");
     let mut children = smol::fs::read_dir(&*paths::LOGS_DIR).await?;
     while let Some(child) = children.next().await {
         let child = child?;
@@ -717,7 +732,7 @@ static LAST_CRASH_UPLOADED: &'static str = "LAST_CRASH_UPLOADED";
 /// upload crashes from apple's diagnostic reports to our server.
 /// (only if telemetry is enabled)
 async fn upload_previous_crashes(
-    http: Arc<dyn HttpClient>,
+    http: Arc<ZedHttpClient>,
     telemetry_settings: client::TelemetrySettings,
 ) -> Result<()> {
     if !telemetry_settings.diagnostics {
@@ -728,7 +743,7 @@ async fn upload_previous_crashes(
         .unwrap_or("zed-2024-01-17-221900.ips".to_string()); // don't upload old crash reports from before we had this.
     let mut uploaded = last_uploaded.clone();
 
-    let crash_report_url = format!("{}/api/crash", &*client::ZED_SERVER_URL);
+    let crash_report_url = http.zed_url("/api/crash");
 
     for dir in [&*CRASHES_DIR, &*CRASHES_RETIRED_DIR] {
         let mut children = smol::fs::read_dir(&dir).await?;

From 7bfa584eb65be22034ffc4c6c7504df11a2af917 Mon Sep 17 00:00:00 2001
From: Derrick Laird <swampdonk@gmail.com>
Date: Tue, 30 Jan 2024 12:08:10 -0700
Subject: [PATCH 073/372] Add protobuf support (#6748)

Release Notes:

- Added protobuf syntax highlighting
([#5160](https://github.com/zed-industries/zed/issues/5160)).
---
 Cargo.lock                                    | 10 +++
 Cargo.toml                                    |  1 +
 crates/zed/Cargo.toml                         |  1 +
 crates/zed/src/languages.rs                   |  1 +
 crates/zed/src/languages/proto/config.toml    | 12 ++++
 crates/zed/src/languages/proto/highlights.scm | 61 +++++++++++++++++++
 crates/zed/src/languages/proto/outline.scm    | 19 ++++++
 docs/src/languages/proto.md                   |  4 ++
 8 files changed, 109 insertions(+)
 create mode 100644 crates/zed/src/languages/proto/config.toml
 create mode 100644 crates/zed/src/languages/proto/highlights.scm
 create mode 100644 crates/zed/src/languages/proto/outline.scm
 create mode 100644 docs/src/languages/proto.md

diff --git a/Cargo.lock b/Cargo.lock
index f0f7fb512a..88cd36edca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8665,6 +8665,15 @@ dependencies = [
  "tree-sitter",
 ]
 
+[[package]]
+name = "tree-sitter-proto"
+version = "0.0.2"
+source = "git+https://github.com/rewinfrey/tree-sitter-proto?rev=36d54f288aee112f13a67b550ad32634d0c2cb52#36d54f288aee112f13a67b550ad32634d0c2cb52"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
 [[package]]
 name = "tree-sitter-purescript"
 version = "1.0.0"
@@ -9876,6 +9885,7 @@ dependencies = [
  "tree-sitter-nix",
  "tree-sitter-nu",
  "tree-sitter-php",
+ "tree-sitter-proto",
  "tree-sitter-purescript",
  "tree-sitter-python",
  "tree-sitter-racket",
diff --git a/Cargo.toml b/Cargo.toml
index 0d49975536..f3c558356c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -149,6 +149,7 @@ tree-sitter-json = { git = "https://github.com/tree-sitter/tree-sitter-json", re
 tree-sitter-rust = "0.20.3"
 tree-sitter-markdown = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "330ecab87a3e3a7211ac69bbadc19eabecdb1cca" }
 tree-sitter-php = "0.21.1"
+tree-sitter-proto = {git = "https://github.com/rewinfrey/tree-sitter-proto", rev = "36d54f288aee112f13a67b550ad32634d0c2cb52"}
 tree-sitter-purescript = { git = "https://github.com/ivanmoreau/tree-sitter-purescript", rev = "a37140f0c7034977b90faa73c94fcb8a5e45ed08" }
 tree-sitter-python = "0.20.2"
 tree-sitter-toml = { git = "https://github.com/tree-sitter/tree-sitter-toml", rev = "342d9be207c2dba869b9967124c679b5e6fd0ebe" }
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index ec0241dac8..d0c7e8d7d7 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -127,6 +127,7 @@ tree-sitter-heex.workspace = true
 tree-sitter-json.workspace = true
 tree-sitter-rust.workspace = true
 tree-sitter-markdown.workspace = true
+tree-sitter-proto.workspace = true
 tree-sitter-python.workspace = true
 tree-sitter-toml.workspace = true
 tree-sitter-typescript.workspace = true
diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index 0faeb358fd..8e923ac2fd 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -295,6 +295,7 @@ pub fn init(
         tree_sitter_uiua::language(),
         vec![Arc::new(uiua::UiuaLanguageServer {})],
     );
+    language("proto", tree_sitter_proto::language(), vec![]);
 
     if let Ok(children) = std::fs::read_dir(&*PLUGINS_DIR) {
         for child in children {
diff --git a/crates/zed/src/languages/proto/config.toml b/crates/zed/src/languages/proto/config.toml
new file mode 100644
index 0000000000..81fe1bdfb4
--- /dev/null
+++ b/crates/zed/src/languages/proto/config.toml
@@ -0,0 +1,12 @@
+name = "proto"
+path_suffixes = ["proto"]
+line_comments = ["// "]
+autoclose_before = ";:.,=}])>"
+brackets = [
+    { start = "{", end = "}", close = true, newline = true },
+    { start = "[", end = "]", close = true, newline = true },
+    { start = "(", end = ")", close = true, newline = true },
+    { start = "\"", end = "\"", close = true, newline = false, not_in = ["comment", "string"] },
+    { start = "'", end = "'", close = true, newline = false, not_in = ["comment", "string"] },
+    { start = "/*", end = " */", close = true, newline = false, not_in = ["comment", "string"] },
+]
diff --git a/crates/zed/src/languages/proto/highlights.scm b/crates/zed/src/languages/proto/highlights.scm
new file mode 100644
index 0000000000..5d0a513bee
--- /dev/null
+++ b/crates/zed/src/languages/proto/highlights.scm
@@ -0,0 +1,61 @@
+[
+  "syntax"
+  "package"
+  "option"
+  "optional"
+  "import"
+  "service"
+  "rpc"
+  "returns"
+  "message"
+  "enum"
+  "oneof"
+  "repeated"
+  "reserved"
+  "to"
+] @keyword
+
+[
+  (key_type)
+  (type)
+  (message_name)
+  (enum_name)
+  (service_name)
+  (rpc_name)
+  (message_or_enum_type)
+] @type
+
+(enum_field
+  (identifier) @constant)
+
+[
+  (string)
+  "\"proto3\""
+] @string
+
+(int_lit) @number
+
+[
+  (true)
+  (false)
+] @boolean
+
+(comment) @comment
+
+[
+  "("
+  ")"
+  "["
+  "]"
+  "{"
+  "}"
+  "<"
+  ">"
+]  @punctuation.bracket
+
+[
+ ";"
+ ","
+] @punctuation.delimiter
+
+"=" @operator
diff --git a/crates/zed/src/languages/proto/outline.scm b/crates/zed/src/languages/proto/outline.scm
new file mode 100644
index 0000000000..f90b1bae33
--- /dev/null
+++ b/crates/zed/src/languages/proto/outline.scm
@@ -0,0 +1,19 @@
+(message
+    "message" @context
+    (message_name
+        (identifier) @name)) @item
+
+(service
+    "service" @context
+    (service_name
+        (identifier) @name)) @item
+
+(rpc
+    "rpc" @context
+    (rpc_name
+        (identifier) @name)) @item
+
+(enum
+    "enum" @context
+    (enum_name
+        (identifier) @name)) @item
diff --git a/docs/src/languages/proto.md b/docs/src/languages/proto.md
new file mode 100644
index 0000000000..486542a76c
--- /dev/null
+++ b/docs/src/languages/proto.md
@@ -0,0 +1,4 @@
+# Proto
+
+- Tree-Sitter: [tree-sitter-proto](https://github.com/rewinfrey/tree-sitter-proto)
+- Language-Server: N/A

From e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Tue, 30 Jan 2024 20:08:20 +0100
Subject: [PATCH 074/372] gpui: Add Global marker trait (#7095)

This should prevent a class of bugs where one queries the wrong type of
global, which results in oddities at runtime.

Release Notes:

- N/A

---------

Co-authored-by: Marshall <marshall@zed.dev>
Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>
---
 Cargo.lock                                    | 24 +++++-
 Cargo.toml                                    |  1 +
 crates/audio/src/assets.rs                    | 12 ++-
 crates/audio/src/audio.rs                     |  6 +-
 crates/auto_update/Cargo.toml                 |  1 +
 crates/auto_update/src/auto_update.rs         | 34 ++++----
 crates/auto_update/src/update_notification.rs |  4 +-
 crates/call/src/call.rs                       | 17 +++-
 crates/channel/Cargo.toml                     |  1 +
 crates/channel/src/channel_store.rs           | 14 ++--
 crates/client/Cargo.toml                      |  1 +
 crates/client/src/client.rs                   | 24 ++++--
 crates/client/src/telemetry.rs                |  8 +-
 crates/collections/src/collections.rs         |  9 ---
 crates/command_palette/Cargo.toml             |  3 +
 crates/command_palette/src/command_palette.rs | 29 ++++---
 crates/copilot/src/copilot.rs                 | 28 ++++++-
 crates/db/Cargo.toml                          |  1 +
 crates/db/src/db.rs                           | 15 ++--
 crates/editor/src/editor.rs                   |  5 +-
 crates/editor/src/editor_tests.rs             |  8 +-
 crates/editor/src/scroll.rs                   |  4 +-
 crates/feature_flags/src/feature_flags.rs     |  4 +-
 crates/feedback/Cargo.toml                    |  1 +
 crates/feedback/src/feedback_modal.rs         |  2 +-
 crates/feedback/src/system_specs.rs           |  4 +-
 crates/gpui/src/app.rs                        | 32 ++++----
 crates/gpui/src/app/async_context.rs          | 14 ++--
 crates/gpui/src/app/model_context.rs          |  4 +-
 crates/gpui/src/app/test_context.rs           | 14 ++--
 crates/gpui/src/elements/div.rs               | 12 +--
 crates/gpui/src/gpui.rs                       |  9 ++-
 crates/gpui/src/style.rs                      |  6 +-
 crates/gpui/src/window.rs                     | 10 +--
 .../notifications/src/notification_store.rs   | 12 ++-
 crates/project_panel/src/file_associations.rs |  4 +-
 crates/release_channel/Cargo.toml             | 10 +++
 crates/release_channel/LICENSE-GPL            |  1 +
 .../channel.rs => release_channel/src/lib.rs} | 55 ++++++++++---
 crates/search/src/project_search.rs           | 10 ++-
 crates/semantic_index/Cargo.toml              |  1 +
 crates/semantic_index/src/semantic_index.rs   | 19 +++--
 crates/settings/Cargo.toml                    |  1 +
 crates/settings/src/settings_store.rs         | 18 +++--
 crates/theme/src/registry.rs                  | 12 +--
 crates/theme/src/settings.rs                  |  5 +-
 crates/theme/src/theme.rs                     |  2 +-
 crates/theme_selector/src/theme_selector.rs   | 18 -----
 crates/util/src/util.rs                       |  1 -
 crates/vim/Cargo.toml                         |  2 +
 crates/vim/src/vim.rs                         | 15 ++--
 crates/workspace/Cargo.toml                   |  1 +
 crates/workspace/src/notifications.rs         |  4 +-
 crates/workspace/src/workspace.rs             | 79 +++++++++++++------
 crates/zed/Cargo.toml                         |  1 +
 crates/zed/src/main.rs                        | 19 +++--
 crates/zed/src/only_instance.rs               |  8 +-
 crates/zed/src/open_listener.rs               | 16 +++-
 crates/zed/src/zed.rs                         | 11 ++-
 59 files changed, 449 insertions(+), 237 deletions(-)
 create mode 100644 crates/release_channel/Cargo.toml
 create mode 120000 crates/release_channel/LICENSE-GPL
 rename crates/{util/src/channel.rs => release_channel/src/lib.rs} (67%)

diff --git a/Cargo.lock b/Cargo.lock
index 88cd36edca..c3921a00b1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -661,6 +661,7 @@ dependencies = [
  "log",
  "menu",
  "project",
+ "release_channel",
  "schemars",
  "serde",
  "serde_derive",
@@ -1188,6 +1189,7 @@ dependencies = [
  "parking_lot 0.11.2",
  "postage",
  "rand 0.8.5",
+ "release_channel",
  "rpc",
  "schemars",
  "serde",
@@ -1361,6 +1363,7 @@ dependencies = [
  "parking_lot 0.11.2",
  "postage",
  "rand 0.8.5",
+ "release_channel",
  "rpc",
  "schemars",
  "serde",
@@ -1596,6 +1599,7 @@ dependencies = [
  "anyhow",
  "client",
  "collections",
+ "copilot",
  "ctor",
  "editor",
  "env_logger",
@@ -1606,6 +1610,7 @@ dependencies = [
  "menu",
  "picker",
  "project",
+ "release_channel",
  "serde",
  "serde_json",
  "settings",
@@ -2040,6 +2045,7 @@ dependencies = [
  "lazy_static",
  "log",
  "parking_lot 0.11.2",
+ "release_channel",
  "serde",
  "serde_derive",
  "smol",
@@ -2512,6 +2518,7 @@ dependencies = [
  "postage",
  "project",
  "regex",
+ "release_channel",
  "serde",
  "serde_derive",
  "serde_json",
@@ -4907,9 +4914,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "opaque-debug"
@@ -6108,6 +6115,14 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
+[[package]]
+name = "release_channel"
+version = "0.1.0"
+dependencies = [
+ "gpui",
+ "once_cell",
+]
+
 [[package]]
 name = "rend"
 version = "0.4.0"
@@ -6849,6 +6864,7 @@ dependencies = [
  "pretty_assertions",
  "project",
  "rand 0.8.5",
+ "release_channel",
  "rpc",
  "rusqlite",
  "rust-embed",
@@ -6988,6 +7004,7 @@ dependencies = [
  "lazy_static",
  "postage",
  "pretty_assertions",
+ "release_channel",
  "rust-embed",
  "schemars",
  "serde",
@@ -9139,6 +9156,7 @@ dependencies = [
  "async-trait",
  "collections",
  "command_palette",
+ "copilot",
  "diagnostics",
  "editor",
  "futures 0.3.28",
@@ -9687,6 +9705,7 @@ dependencies = [
  "client",
  "collections",
  "db",
+ "derive_more",
  "env_logger",
  "fs",
  "futures 0.3.28",
@@ -9840,6 +9859,7 @@ dependencies = [
  "rand 0.8.5",
  "recent_projects",
  "regex",
+ "release_channel",
  "rope",
  "rpc",
  "rsa 0.4.0",
diff --git a/Cargo.toml b/Cargo.toml
index f3c558356c..c254233b33 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -59,6 +59,7 @@ members = [
     "crates/project_symbols",
     "crates/quick_action_bar",
     "crates/recent_projects",
+    "crates/release_channel",
     "crates/rope",
     "crates/rpc",
     "crates/search",
diff --git a/crates/audio/src/assets.rs b/crates/audio/src/assets.rs
index b58e1f6aee..387990cb72 100644
--- a/crates/audio/src/assets.rs
+++ b/crates/audio/src/assets.rs
@@ -2,7 +2,7 @@ use std::{io::Cursor, sync::Arc};
 
 use anyhow::Result;
 use collections::HashMap;
-use gpui::{AppContext, AssetSource};
+use gpui::{AppContext, AssetSource, Global};
 use rodio::{
     source::{Buffered, SamplesConverter},
     Decoder, Source,
@@ -15,6 +15,10 @@ pub struct SoundRegistry {
     assets: Box<dyn AssetSource>,
 }
 
+struct GlobalSoundRegistry(Arc<SoundRegistry>);
+
+impl Global for GlobalSoundRegistry {}
+
 impl SoundRegistry {
     pub fn new(source: impl AssetSource) -> Arc<Self> {
         Arc::new(Self {
@@ -24,7 +28,11 @@ impl SoundRegistry {
     }
 
     pub fn global(cx: &AppContext) -> Arc<Self> {
-        cx.global::<Arc<Self>>().clone()
+        cx.global::<GlobalSoundRegistry>().0.clone()
+    }
+
+    pub(crate) fn set_global(source: impl AssetSource, cx: &mut AppContext) {
+        cx.set_global(GlobalSoundRegistry(SoundRegistry::new(source)));
     }
 
     pub fn get(&self, name: &str) -> Result<impl Source<Item = f32>> {
diff --git a/crates/audio/src/audio.rs b/crates/audio/src/audio.rs
index 9264ed25d6..a116674288 100644
--- a/crates/audio/src/audio.rs
+++ b/crates/audio/src/audio.rs
@@ -1,12 +1,12 @@
 use assets::SoundRegistry;
-use gpui::{AppContext, AssetSource};
+use gpui::{AppContext, AssetSource, Global};
 use rodio::{OutputStream, OutputStreamHandle};
 use util::ResultExt;
 
 mod assets;
 
 pub fn init(source: impl AssetSource, cx: &mut AppContext) {
-    cx.set_global(SoundRegistry::new(source));
+    SoundRegistry::set_global(source, cx);
     cx.set_global(Audio::new());
 }
 
@@ -37,6 +37,8 @@ pub struct Audio {
     output_handle: Option<OutputStreamHandle>,
 }
 
+impl Global for Audio {}
+
 impl Audio {
     pub fn new() -> Self {
         Self {
diff --git a/crates/auto_update/Cargo.toml b/crates/auto_update/Cargo.toml
index f3315a922e..dbd06832ba 100644
--- a/crates/auto_update/Cargo.toml
+++ b/crates/auto_update/Cargo.toml
@@ -15,6 +15,7 @@ client = { path = "../client" }
 gpui = { path = "../gpui" }
 menu = { path = "../menu" }
 project = { path = "../project" }
+release_channel = { path = "../release_channel" }
 settings = { path = "../settings" }
 theme = { path = "../theme" }
 workspace = { path = "../workspace" }
diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs
index 9673e8bbb2..d04acb10f1 100644
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -5,8 +5,8 @@ use client::{Client, TelemetrySettings, ZED_APP_PATH, ZED_APP_VERSION};
 use db::kvp::KEY_VALUE_STORE;
 use db::RELEASE_CHANNEL;
 use gpui::{
-    actions, AppContext, AsyncAppContext, Context as _, Model, ModelContext, SemanticVersion, Task,
-    ViewContext, VisualContext, WindowContext,
+    actions, AppContext, AsyncAppContext, Context as _, Global, Model, ModelContext,
+    SemanticVersion, Task, ViewContext, VisualContext, WindowContext,
 };
 use isahc::AsyncBody;
 
@@ -18,6 +18,7 @@ use smol::io::AsyncReadExt;
 use settings::{Settings, SettingsStore};
 use smol::{fs::File, process::Command};
 
+use release_channel::{AppCommitSha, ReleaseChannel};
 use std::{
     env::consts::{ARCH, OS},
     ffi::OsString,
@@ -25,11 +26,7 @@ use std::{
     time::Duration,
 };
 use update_notification::UpdateNotification;
-use util::http::HttpClient;
-use util::{
-    channel::{AppCommitSha, ReleaseChannel},
-    http::ZedHttpClient,
-};
+use util::http::{HttpClient, ZedHttpClient};
 use workspace::Workspace;
 
 const SHOULD_SHOW_UPDATE_NOTIFICATION_KEY: &str = "auto-updater-should-show-updated-notification";
@@ -94,6 +91,11 @@ impl Settings for AutoUpdateSetting {
     }
 }
 
+#[derive(Default)]
+struct GlobalAutoUpdate(Option<Model<AutoUpdater>>);
+
+impl Global for GlobalAutoUpdate {}
+
 pub fn init(http_client: Arc<ZedHttpClient>, cx: &mut AppContext) {
     AutoUpdateSetting::register(cx);
 
@@ -127,7 +129,7 @@ pub fn init(http_client: Arc<ZedHttpClient>, cx: &mut AppContext) {
 
             updater
         });
-        cx.set_global(Some(auto_updater));
+        cx.set_global(GlobalAutoUpdate(Some(auto_updater)));
     }
 }
 
@@ -146,7 +148,7 @@ pub fn check(_: &Check, cx: &mut WindowContext) {
 
 pub fn view_release_notes(_: &ViewReleaseNotes, cx: &mut AppContext) -> Option<()> {
     let auto_updater = AutoUpdater::get(cx)?;
-    let release_channel = cx.try_global::<ReleaseChannel>()?;
+    let release_channel = ReleaseChannel::try_global(cx)?;
 
     if matches!(
         release_channel,
@@ -191,7 +193,7 @@ pub fn notify_of_any_new_update(cx: &mut ViewContext<Workspace>) -> Option<()> {
 
 impl AutoUpdater {
     pub fn get(cx: &mut AppContext) -> Option<Model<Self>> {
-        cx.default_global::<Option<Model<Self>>>().clone()
+        cx.default_global::<GlobalAutoUpdate>().0.clone()
     }
 
     fn new(current_version: SemanticVersion, http_client: Arc<ZedHttpClient>) -> Self {
@@ -253,8 +255,7 @@ impl AutoUpdater {
             OS, ARCH
         ));
         cx.update(|cx| {
-            if let Some(param) = cx
-                .try_global::<ReleaseChannel>()
+            if let Some(param) = ReleaseChannel::try_global(cx)
                 .map(|release_channel| release_channel.release_query_param())
                 .flatten()
             {
@@ -276,7 +277,9 @@ impl AutoUpdater {
 
         let should_download = match *RELEASE_CHANNEL {
             ReleaseChannel::Nightly => cx
-                .try_read_global::<AppCommitSha, _>(|sha, _| release.version != sha.0)
+                .update(|cx| AppCommitSha::try_global(cx).map(|sha| release.version != sha.0))
+                .ok()
+                .flatten()
                 .unwrap_or(true),
             _ => release.version.parse::<SemanticVersion>()? > current_version,
         };
@@ -311,9 +314,8 @@ impl AutoUpdater {
         let mut dmg_file = File::create(&dmg_path).await?;
 
         let (installation_id, release_channel, telemetry) = cx.update(|cx| {
-            let installation_id = cx.global::<Arc<Client>>().telemetry().installation_id();
-            let release_channel = cx
-                .try_global::<ReleaseChannel>()
+            let installation_id = Client::global(cx).telemetry().installation_id();
+            let release_channel = ReleaseChannel::try_global(cx)
                 .map(|release_channel| release_channel.display_name());
             let telemetry = TelemetrySettings::get_global(cx).metrics;
 
diff --git a/crates/auto_update/src/update_notification.rs b/crates/auto_update/src/update_notification.rs
index 1562d90057..eece0c105a 100644
--- a/crates/auto_update/src/update_notification.rs
+++ b/crates/auto_update/src/update_notification.rs
@@ -3,7 +3,7 @@ use gpui::{
     SemanticVersion, StatefulInteractiveElement, Styled, ViewContext,
 };
 use menu::Cancel;
-use util::channel::ReleaseChannel;
+use release_channel::ReleaseChannel;
 use workspace::ui::{h_flex, v_flex, Icon, IconName, Label, StyledExt};
 
 pub struct UpdateNotification {
@@ -14,7 +14,7 @@ impl EventEmitter<DismissEvent> for UpdateNotification {}
 
 impl Render for UpdateNotification {
     fn render(&mut self, cx: &mut gpui::ViewContext<Self>) -> impl IntoElement {
-        let app_name = cx.global::<ReleaseChannel>().display_name();
+        let app_name = ReleaseChannel::global(cx).display_name();
 
         v_flex()
             .on_action(cx.listener(UpdateNotification::dismiss))
diff --git a/crates/call/src/call.rs b/crates/call/src/call.rs
index 6d57a42ff7..11fc549084 100644
--- a/crates/call/src/call.rs
+++ b/crates/call/src/call.rs
@@ -9,8 +9,8 @@ use client::{proto, Client, TypedEnvelope, User, UserStore, ZED_ALWAYS_ACTIVE};
 use collections::HashSet;
 use futures::{channel::oneshot, future::Shared, Future, FutureExt};
 use gpui::{
-    AppContext, AsyncAppContext, Context, EventEmitter, Model, ModelContext, Subscription, Task,
-    WeakModel,
+    AppContext, AsyncAppContext, Context, EventEmitter, Global, Model, ModelContext, Subscription,
+    Task, WeakModel,
 };
 use postage::watch;
 use project::Project;
@@ -21,11 +21,15 @@ use std::sync::Arc;
 pub use participant::ParticipantLocation;
 pub use room::Room;
 
+struct GlobalActiveCall(Model<ActiveCall>);
+
+impl Global for GlobalActiveCall {}
+
 pub fn init(client: Arc<Client>, user_store: Model<UserStore>, cx: &mut AppContext) {
     CallSettings::register(cx);
 
     let active_call = cx.new_model(|cx| ActiveCall::new(client, user_store, cx));
-    cx.set_global(active_call);
+    cx.set_global(GlobalActiveCall(active_call));
 }
 
 pub struct OneAtATime {
@@ -154,7 +158,12 @@ impl ActiveCall {
     }
 
     pub fn global(cx: &AppContext) -> Model<Self> {
-        cx.global::<Model<Self>>().clone()
+        cx.global::<GlobalActiveCall>().0.clone()
+    }
+
+    pub fn try_global(cx: &AppContext) -> Option<Model<Self>> {
+        cx.try_global::<GlobalActiveCall>()
+            .map(|call| call.0.clone())
     }
 
     pub fn invite(
diff --git a/crates/channel/Cargo.toml b/crates/channel/Cargo.toml
index f2038d6cdc..f33f7e7f34 100644
--- a/crates/channel/Cargo.toml
+++ b/crates/channel/Cargo.toml
@@ -21,6 +21,7 @@ util = { path = "../util" }
 rpc = { path = "../rpc" }
 text = { path = "../text" }
 language = { path = "../language" }
+release_channel = { path = "../release_channel" }
 settings = { path = "../settings" }
 feature_flags = { path = "../feature_flags" }
 sum_tree = { path = "../sum_tree" }
diff --git a/crates/channel/src/channel_store.rs b/crates/channel/src/channel_store.rs
index 20a0955678..0d0752aec8 100644
--- a/crates/channel/src/channel_store.rs
+++ b/crates/channel/src/channel_store.rs
@@ -5,13 +5,13 @@ use anyhow::{anyhow, Result};
 use channel_index::ChannelIndex;
 use client::{Client, Subscription, User, UserId, UserStore};
 use collections::{hash_map, HashMap, HashSet};
-use db::RELEASE_CHANNEL;
 use futures::{channel::mpsc, future::Shared, Future, FutureExt, StreamExt};
 use gpui::{
-    AppContext, AsyncAppContext, Context, EventEmitter, Model, ModelContext, SharedString, Task,
-    WeakModel,
+    AppContext, AsyncAppContext, Context, EventEmitter, Global, Model, ModelContext, SharedString,
+    Task, WeakModel,
 };
 use language::Capability;
+use release_channel::RELEASE_CHANNEL;
 use rpc::{
     proto::{self, ChannelRole, ChannelVisibility},
     TypedEnvelope,
@@ -22,7 +22,7 @@ use util::{async_maybe, maybe, ResultExt};
 pub fn init(client: &Arc<Client>, user_store: Model<UserStore>, cx: &mut AppContext) {
     let channel_store =
         cx.new_model(|cx| ChannelStore::new(client.clone(), user_store.clone(), cx));
-    cx.set_global(channel_store);
+    cx.set_global(GlobalChannelStore(channel_store));
 }
 
 pub const RECONNECT_TIMEOUT: Duration = Duration::from_secs(30);
@@ -143,9 +143,13 @@ enum OpenedModelHandle<E> {
     Loading(Shared<Task<Result<Model<E>, Arc<anyhow::Error>>>>),
 }
 
+struct GlobalChannelStore(Model<ChannelStore>);
+
+impl Global for GlobalChannelStore {}
+
 impl ChannelStore {
     pub fn global(cx: &AppContext) -> Model<Self> {
-        cx.global::<Model<Self>>().clone()
+        cx.global::<GlobalChannelStore>().0.clone()
     }
 
     pub fn new(
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
index 08627d1641..fe012ddcc5 100644
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -18,6 +18,7 @@ collections = { path = "../collections" }
 db = { path = "../db" }
 gpui = { path = "../gpui" }
 util = { path = "../util" }
+release_channel = { path = "../release_channel" }
 rpc = { path = "../rpc" }
 text = { path = "../text" }
 settings = { path = "../settings" }
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index dd9514ac56..3b182e25ca 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -15,13 +15,14 @@ use futures::{
     TryFutureExt as _, TryStreamExt,
 };
 use gpui::{
-    actions, AnyModel, AnyWeakModel, AppContext, AsyncAppContext, Model, SemanticVersion, Task,
-    WeakModel,
+    actions, AnyModel, AnyWeakModel, AppContext, AsyncAppContext, Global, Model, SemanticVersion,
+    Task, WeakModel,
 };
 use lazy_static::lazy_static;
 use parking_lot::RwLock;
 use postage::watch;
 use rand::prelude::*;
+use release_channel::ReleaseChannel;
 use rpc::proto::{AnyTypedEnvelope, EntityMessage, EnvelopedMessage, PeerId, RequestMessage};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -41,8 +42,7 @@ use std::{
 use telemetry::Telemetry;
 use thiserror::Error;
 use url::Url;
-use util::http::HttpClient;
-use util::{channel::ReleaseChannel, http::ZedHttpClient};
+use util::http::{HttpClient, ZedHttpClient};
 use util::{ResultExt, TryFutureExt};
 
 pub use rpc::*;
@@ -149,6 +149,10 @@ pub fn init(client: &Arc<Client>, cx: &mut AppContext) {
     });
 }
 
+struct GlobalClient(Arc<Client>);
+
+impl Global for GlobalClient {}
+
 pub struct Client {
     id: AtomicU64,
     peer: Arc<Peer>,
@@ -483,6 +487,13 @@ impl Client {
         self
     }
 
+    pub fn global(cx: &AppContext) -> Arc<Self> {
+        cx.global::<GlobalClient>().0.clone()
+    }
+    pub fn set_global(client: Arc<Client>, cx: &mut AppContext) {
+        cx.set_global(GlobalClient(client))
+    }
+
     pub fn user_id(&self) -> Option<u64> {
         self.state
             .read()
@@ -996,7 +1007,10 @@ impl Client {
         credentials: &Credentials,
         cx: &AsyncAppContext,
     ) -> Task<Result<Connection, EstablishConnectionError>> {
-        let release_channel = cx.try_read_global(|channel: &ReleaseChannel, _| *channel);
+        let release_channel = cx
+            .update(|cx| ReleaseChannel::try_global(cx))
+            .ok()
+            .flatten();
 
         let request = Request::builder()
             .header(
diff --git a/crates/client/src/telemetry.rs b/crates/client/src/telemetry.rs
index 2132cee38b..1a8627f286 100644
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -5,6 +5,7 @@ use chrono::{DateTime, Utc};
 use futures::Future;
 use gpui::{AppContext, AppMetadata, BackgroundExecutor, Task};
 use parking_lot::Mutex;
+use release_channel::ReleaseChannel;
 use serde::Serialize;
 use settings::{Settings, SettingsStore};
 use std::{env, io::Write, mem, path::PathBuf, sync::Arc, time::Duration};
@@ -15,7 +16,7 @@ use tempfile::NamedTempFile;
 use util::http::{HttpClient, ZedHttpClient};
 #[cfg(not(debug_assertions))]
 use util::ResultExt;
-use util::{channel::ReleaseChannel, TryFutureExt};
+use util::TryFutureExt;
 
 use self::event_coalescer::EventCoalescer;
 
@@ -143,9 +144,8 @@ const FLUSH_INTERVAL: Duration = Duration::from_secs(60 * 5);
 
 impl Telemetry {
     pub fn new(client: Arc<ZedHttpClient>, cx: &mut AppContext) -> Arc<Self> {
-        let release_channel = cx
-            .try_global::<ReleaseChannel>()
-            .map(|release_channel| release_channel.display_name());
+        let release_channel =
+            ReleaseChannel::try_global(cx).map(|release_channel| release_channel.display_name());
 
         TelemetrySettings::register(cx);
 
diff --git a/crates/collections/src/collections.rs b/crates/collections/src/collections.rs
index 7628349353..be41aaebd6 100644
--- a/crates/collections/src/collections.rs
+++ b/crates/collections/src/collections.rs
@@ -11,13 +11,4 @@ pub type HashMap<K, V> = std::collections::HashMap<K, V>;
 pub type HashSet<T> = std::collections::HashSet<T>;
 
 pub use rustc_hash::{FxHashMap, FxHashSet};
-use std::any::TypeId;
 pub use std::collections::*;
-
-// NEW TYPES
-
-#[derive(Default)]
-pub struct CommandPaletteFilter {
-    pub hidden_namespaces: HashSet<&'static str>,
-    pub hidden_action_types: HashSet<TypeId>,
-}
diff --git a/crates/command_palette/Cargo.toml b/crates/command_palette/Cargo.toml
index b60d46ab9a..3591bf016b 100644
--- a/crates/command_palette/Cargo.toml
+++ b/crates/command_palette/Cargo.toml
@@ -12,11 +12,14 @@ doctest = false
 [dependencies]
 client = { path = "../client" }
 collections = { path = "../collections" }
+# HACK: We're only depending on `copilot` here for `CommandPaletteFilter`.  See the attached comment on that type.
+copilot = { path = "../copilot" }
 editor = { path = "../editor" }
 fuzzy = {  path = "../fuzzy" }
 gpui = { path = "../gpui" }
 picker = { path = "../picker" }
 project = { path = "../project" }
+release_channel = { path = "../release_channel" }
 settings = { path = "../settings" }
 theme = { path = "../theme" }
 ui = { path = "../ui" }
diff --git a/crates/command_palette/src/command_palette.rs b/crates/command_palette/src/command_palette.rs
index 34e2ca38a5..6851f260e7 100644
--- a/crates/command_palette/src/command_palette.rs
+++ b/crates/command_palette/src/command_palette.rs
@@ -4,19 +4,18 @@ use std::{
 };
 
 use client::telemetry::Telemetry;
-use collections::{CommandPaletteFilter, HashMap};
+use collections::HashMap;
+use copilot::CommandPaletteFilter;
 use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{
-    actions, Action, AppContext, DismissEvent, EventEmitter, FocusHandle, FocusableView,
+    actions, Action, AppContext, DismissEvent, EventEmitter, FocusHandle, FocusableView, Global,
     ParentElement, Render, Styled, View, ViewContext, VisualContext, WeakView,
 };
 use picker::{Picker, PickerDelegate};
 
+use release_channel::{parse_zed_link, ReleaseChannel};
 use ui::{h_flex, prelude::*, v_flex, HighlightedLabel, KeyBinding, ListItem, ListItemSpacing};
-use util::{
-    channel::{parse_zed_link, ReleaseChannel, RELEASE_CHANNEL},
-    ResultExt,
-};
+use util::ResultExt;
 use workspace::{ModalView, Workspace};
 use zed_actions::OpenZedUrl;
 
@@ -100,8 +99,11 @@ impl Render for CommandPalette {
     }
 }
 
-pub type CommandPaletteInterceptor =
-    Box<dyn Fn(&str, &AppContext) -> Option<CommandInterceptResult>>;
+pub struct CommandPaletteInterceptor(
+    pub Box<dyn Fn(&str, &AppContext) -> Option<CommandInterceptResult>>,
+);
+
+impl Global for CommandPaletteInterceptor {}
 
 pub struct CommandInterceptResult {
     pub action: Box<dyn Action>,
@@ -139,6 +141,8 @@ impl Clone for Command {
 #[derive(Default)]
 struct HitCounts(HashMap<String, usize>);
 
+impl Global for HitCounts {}
+
 impl CommandPaletteDelegate {
     fn new(
         command_palette: WeakView<CommandPalette>,
@@ -229,11 +233,14 @@ impl PickerDelegate for CommandPaletteDelegate {
 
             let mut intercept_result = cx
                 .try_read_global(|interceptor: &CommandPaletteInterceptor, cx| {
-                    (interceptor)(&query, cx)
+                    (interceptor.0)(&query, cx)
                 })
                 .flatten();
-
-            if *RELEASE_CHANNEL == ReleaseChannel::Dev {
+            let release_channel = cx
+                .update(|cx| ReleaseChannel::try_global(cx))
+                .ok()
+                .flatten();
+            if release_channel == Some(ReleaseChannel::Dev) {
                 if parse_zed_link(&query).is_some() {
                     intercept_result = Some(CommandInterceptResult {
                         action: OpenZedUrl { url: query.clone() }.boxed_clone(),
diff --git a/crates/copilot/src/copilot.rs b/crates/copilot/src/copilot.rs
index 6b2816b6f3..6f5c523400 100644
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -5,7 +5,7 @@ use async_tar::Archive;
 use collections::{HashMap, HashSet};
 use futures::{channel::oneshot, future::Shared, Future, FutureExt, TryFutureExt};
 use gpui::{
-    actions, AppContext, AsyncAppContext, Context, Entity, EntityId, EventEmitter, Model,
+    actions, AppContext, AsyncAppContext, Context, Entity, EntityId, EventEmitter, Global, Model,
     ModelContext, Task, WeakModel,
 };
 use language::{
@@ -32,6 +32,17 @@ use util::{
     ResultExt,
 };
 
+// HACK: This type is only defined in `copilot` since it is the earliest ancestor
+// of the crates that use it.
+//
+// This is not great. Let's find a better place for it to live.
+#[derive(Default)]
+pub struct CommandPaletteFilter {
+    pub hidden_namespaces: HashSet<&'static str>,
+    pub hidden_action_types: HashSet<TypeId>,
+}
+
+impl Global for CommandPaletteFilter {}
 actions!(
     copilot,
     [
@@ -54,7 +65,7 @@ pub fn init(
         let node_runtime = node_runtime.clone();
         move |cx| Copilot::start(new_server_id, http, node_runtime, cx)
     });
-    cx.set_global(copilot.clone());
+    Copilot::set_global(copilot.clone(), cx);
     cx.observe(&copilot, |handle, cx| {
         let copilot_action_types = [
             TypeId::of::<Suggest>(),
@@ -65,7 +76,7 @@ pub fn init(
         let copilot_auth_action_types = [TypeId::of::<SignOut>()];
         let copilot_no_auth_action_types = [TypeId::of::<SignIn>()];
         let status = handle.read(cx).status();
-        let filter = cx.default_global::<collections::CommandPaletteFilter>();
+        let filter = cx.default_global::<CommandPaletteFilter>();
 
         match status {
             Status::Disabled => {
@@ -307,9 +318,18 @@ pub enum Event {
 
 impl EventEmitter<Event> for Copilot {}
 
+struct GlobalCopilot(Model<Copilot>);
+
+impl Global for GlobalCopilot {}
+
 impl Copilot {
     pub fn global(cx: &AppContext) -> Option<Model<Self>> {
-        cx.try_global::<Model<Self>>().map(|model| model.clone())
+        cx.try_global::<GlobalCopilot>()
+            .map(|model| model.0.clone())
+    }
+
+    pub fn set_global(copilot: Model<Self>, cx: &mut AppContext) {
+        cx.set_global(GlobalCopilot(copilot));
     }
 
     fn start(
diff --git a/crates/db/Cargo.toml b/crates/db/Cargo.toml
index e5ca5fcc6b..492c2fb004 100644
--- a/crates/db/Cargo.toml
+++ b/crates/db/Cargo.toml
@@ -15,6 +15,7 @@ test-support = []
 [dependencies]
 collections = { path = "../collections" }
 gpui = { path = "../gpui" }
+release_channel = { path = "../release_channel" }
 sqlez = { path = "../sqlez" }
 sqlez_macros = { path = "../sqlez_macros" }
 util = { path = "../util" }
diff --git a/crates/db/src/db.rs b/crates/db/src/db.rs
index 26c3dee4d0..b0ed1606d8 100644
--- a/crates/db/src/db.rs
+++ b/crates/db/src/db.rs
@@ -10,16 +10,16 @@ pub use lazy_static;
 pub use smol;
 pub use sqlez;
 pub use sqlez_macros;
-pub use util::channel::{RELEASE_CHANNEL, RELEASE_CHANNEL_NAME};
 pub use util::paths::DB_DIR;
 
+use release_channel::ReleaseChannel;
+pub use release_channel::RELEASE_CHANNEL;
 use sqlez::domain::Migrator;
 use sqlez::thread_safe_connection::ThreadSafeConnection;
 use sqlez_macros::sql;
 use std::future::Future;
 use std::path::{Path, PathBuf};
 use std::sync::atomic::{AtomicBool, Ordering};
-use util::channel::ReleaseChannel;
 use util::{async_maybe, ResultExt};
 
 const CONNECTION_INITIALIZE_QUERY: &'static str = sql!(
@@ -223,7 +223,7 @@ mod tests {
             .prefix("DbTests")
             .tempdir()
             .unwrap();
-        let _bad_db = open_db::<BadDB>(tempdir.path(), &util::channel::ReleaseChannel::Dev).await;
+        let _bad_db = open_db::<BadDB>(tempdir.path(), &release_channel::ReleaseChannel::Dev).await;
     }
 
     /// Test that DB exists but corrupted (causing recreate)
@@ -261,11 +261,12 @@ mod tests {
             .unwrap();
         {
             let corrupt_db =
-                open_db::<CorruptedDB>(tempdir.path(), &util::channel::ReleaseChannel::Dev).await;
+                open_db::<CorruptedDB>(tempdir.path(), &release_channel::ReleaseChannel::Dev).await;
             assert!(corrupt_db.persistent());
         }
 
-        let good_db = open_db::<GoodDB>(tempdir.path(), &util::channel::ReleaseChannel::Dev).await;
+        let good_db =
+            open_db::<GoodDB>(tempdir.path(), &release_channel::ReleaseChannel::Dev).await;
         assert!(
             good_db.select_row::<usize>("SELECT * FROM test2").unwrap()()
                 .unwrap()
@@ -309,7 +310,7 @@ mod tests {
         {
             // Setup the bad database
             let corrupt_db =
-                open_db::<CorruptedDB>(tempdir.path(), &util::channel::ReleaseChannel::Dev).await;
+                open_db::<CorruptedDB>(tempdir.path(), &release_channel::ReleaseChannel::Dev).await;
             assert!(corrupt_db.persistent());
         }
 
@@ -320,7 +321,7 @@ mod tests {
             let guard = thread::spawn(move || {
                 let good_db = smol::block_on(open_db::<GoodDB>(
                     tmp_path.as_path(),
-                    &util::channel::ReleaseChannel::Dev,
+                    &release_channel::ReleaseChannel::Dev,
                 ));
                 assert!(
                     good_db.select_row::<usize>("SELECT * FROM test2").unwrap()()
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 6b7eee4c10..c1b2f2087d 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -104,7 +104,6 @@ use std::{
     ops::{ControlFlow, Deref, DerefMut, Range, RangeInclusive},
     path::Path,
     sync::Arc,
-    sync::Weak,
     time::{Duration, Instant},
 };
 pub use sum_tree::Bias;
@@ -241,7 +240,7 @@ pub fn init(cx: &mut AppContext) {
     .detach();
 
     cx.on_action(move |_: &workspace::NewFile, cx| {
-        let app_state = cx.global::<Weak<workspace::AppState>>();
+        let app_state = workspace::AppState::global(cx);
         if let Some(app_state) = app_state.upgrade() {
             workspace::open_new(&app_state, cx, |workspace, cx| {
                 Editor::new_file(workspace, &Default::default(), cx)
@@ -250,7 +249,7 @@ pub fn init(cx: &mut AppContext) {
         }
     });
     cx.on_action(move |_: &workspace::NewWindow, cx| {
-        let app_state = cx.global::<Weak<workspace::AppState>>();
+        let app_state = workspace::AppState::global(cx);
         if let Some(app_state) = app_state.upgrade() {
             workspace::open_new(&app_state, cx, |workspace, cx| {
                 Editor::new_file(workspace, &Default::default(), cx)
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index a039d27098..297ee0770b 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -7226,7 +7226,7 @@ async fn test_copilot(executor: BackgroundExecutor, cx: &mut gpui::TestAppContex
     init_test(cx, |_| {});
 
     let (copilot, copilot_lsp) = Copilot::fake(cx);
-    _ = cx.update(|cx| cx.set_global(copilot));
+    _ = cx.update(|cx| Copilot::set_global(copilot, cx));
     let mut cx = EditorLspTestContext::new_rust(
         lsp::ServerCapabilities {
             completion_provider: Some(lsp::CompletionOptions {
@@ -7479,7 +7479,7 @@ async fn test_copilot_completion_invalidation(
     init_test(cx, |_| {});
 
     let (copilot, copilot_lsp) = Copilot::fake(cx);
-    _ = cx.update(|cx| cx.set_global(copilot));
+    _ = cx.update(|cx| Copilot::set_global(copilot, cx));
     let mut cx = EditorLspTestContext::new_rust(
         lsp::ServerCapabilities {
             completion_provider: Some(lsp::CompletionOptions {
@@ -7543,7 +7543,7 @@ async fn test_copilot_multibuffer(executor: BackgroundExecutor, cx: &mut gpui::T
     init_test(cx, |_| {});
 
     let (copilot, copilot_lsp) = Copilot::fake(cx);
-    _ = cx.update(|cx| cx.set_global(copilot));
+    _ = cx.update(|cx| Copilot::set_global(copilot, cx));
 
     let buffer_1 = cx.new_model(|cx| {
         Buffer::new(
@@ -7660,7 +7660,7 @@ async fn test_copilot_disabled_globs(executor: BackgroundExecutor, cx: &mut gpui
     });
 
     let (copilot, copilot_lsp) = Copilot::fake(cx);
-    _ = cx.update(|cx| cx.set_global(copilot));
+    _ = cx.update(|cx| Copilot::set_global(copilot, cx));
 
     let fs = FakeFs::new(cx.executor());
     fs.insert_tree(
diff --git a/crates/editor/src/scroll.rs b/crates/editor/src/scroll.rs
index 993e845e24..46af2da371 100644
--- a/crates/editor/src/scroll.rs
+++ b/crates/editor/src/scroll.rs
@@ -10,7 +10,7 @@ use crate::{
     MultiBufferSnapshot, ToPoint,
 };
 pub use autoscroll::{Autoscroll, AutoscrollStrategy};
-use gpui::{point, px, AppContext, Entity, Pixels, Task, ViewContext};
+use gpui::{point, px, AppContext, Entity, Global, Pixels, Task, ViewContext};
 use language::{Bias, Point};
 pub use scroll_amount::ScrollAmount;
 use std::{
@@ -27,6 +27,8 @@ const SCROLLBAR_SHOW_INTERVAL: Duration = Duration::from_secs(1);
 #[derive(Default)]
 pub struct ScrollbarAutoHide(pub bool);
 
+impl Global for ScrollbarAutoHide {}
+
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub struct ScrollAnchor {
     pub offset: gpui::Point<f32>,
diff --git a/crates/feature_flags/src/feature_flags.rs b/crates/feature_flags/src/feature_flags.rs
index 907c37ddcd..0a3df28c69 100644
--- a/crates/feature_flags/src/feature_flags.rs
+++ b/crates/feature_flags/src/feature_flags.rs
@@ -1,4 +1,4 @@
-use gpui::{AppContext, Subscription, ViewContext};
+use gpui::{AppContext, Global, Subscription, ViewContext};
 
 #[derive(Default)]
 struct FeatureFlags {
@@ -12,6 +12,8 @@ impl FeatureFlags {
     }
 }
 
+impl Global for FeatureFlags {}
+
 pub trait FeatureFlag {
     const NAME: &'static str;
 }
diff --git a/crates/feedback/Cargo.toml b/crates/feedback/Cargo.toml
index 4ad55d5b0a..cbdd903b2d 100644
--- a/crates/feedback/Cargo.toml
+++ b/crates/feedback/Cargo.toml
@@ -19,6 +19,7 @@ gpui = { path = "../gpui" }
 language = { path = "../language" }
 menu = { path = "../menu" }
 project = { path = "../project" }
+release_channel = { path = "../release_channel" }
 settings = { path = "../settings" }
 theme = { path = "../theme" }
 ui = { path = "../ui" }
diff --git a/crates/feedback/src/feedback_modal.rs b/crates/feedback/src/feedback_modal.rs
index 536059989f..31ff5989f3 100644
--- a/crates/feedback/src/feedback_modal.rs
+++ b/crates/feedback/src/feedback_modal.rs
@@ -225,7 +225,7 @@ impl FeedbackModal {
             None,
             &["Yes, Submit!", "No"],
         );
-        let client = cx.global::<Arc<Client>>().clone();
+        let client = Client::global(cx).clone();
         let specs = self.system_specs.clone();
         cx.spawn(|this, mut cx| async move {
             let answer = answer.await.ok();
diff --git a/crates/feedback/src/system_specs.rs b/crates/feedback/src/system_specs.rs
index 099e7460b4..1d1fc93841 100644
--- a/crates/feedback/src/system_specs.rs
+++ b/crates/feedback/src/system_specs.rs
@@ -1,10 +1,10 @@
 use client::ZED_APP_VERSION;
 use gpui::AppContext;
 use human_bytes::human_bytes;
+use release_channel::ReleaseChannel;
 use serde::Serialize;
 use std::{env, fmt::Display};
 use sysinfo::{RefreshKind, System, SystemExt};
-use util::channel::ReleaseChannel;
 
 #[derive(Clone, Debug, Serialize)]
 pub struct SystemSpecs {
@@ -21,7 +21,7 @@ impl SystemSpecs {
         let app_version = ZED_APP_VERSION
             .or_else(|| cx.app_metadata().app_version)
             .map(|v| v.to_string());
-        let release_channel = cx.global::<ReleaseChannel>().display_name();
+        let release_channel = ReleaseChannel::global(cx).display_name();
         let os_name = cx.app_metadata().os_name;
         let system = System::new_with_specifics(RefreshKind::new().with_memory());
         let memory = system.total_memory();
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 57f2254ef2..9f92445045 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -17,7 +17,7 @@ use time::UtcOffset;
 use crate::{
     current_platform, image_cache::ImageCache, init_app_menus, Action, ActionRegistry, Any,
     AnyView, AnyWindowHandle, AppMetadata, AssetSource, BackgroundExecutor, ClipboardItem, Context,
-    DispatchPhase, DisplayId, Entity, EventEmitter, ForegroundExecutor, KeyBinding, Keymap,
+    DispatchPhase, DisplayId, Entity, EventEmitter, ForegroundExecutor, Global, KeyBinding, Keymap,
     Keystroke, LayoutId, Menu, PathPromptOptions, Pixels, Platform, PlatformDisplay, Point, Render,
     SharedString, SubscriberSet, Subscription, SvgRenderer, Task, TextStyle, TextStyleRefinement,
     TextSystem, View, ViewContext, Window, WindowContext, WindowHandle, WindowId,
@@ -823,13 +823,13 @@ impl AppContext {
     }
 
     /// Check whether a global of the given type has been assigned.
-    pub fn has_global<G: 'static>(&self) -> bool {
+    pub fn has_global<G: Global>(&self) -> bool {
         self.globals_by_type.contains_key(&TypeId::of::<G>())
     }
 
     /// Access the global of the given type. Panics if a global for that type has not been assigned.
     #[track_caller]
-    pub fn global<G: 'static>(&self) -> &G {
+    pub fn global<G: Global>(&self) -> &G {
         self.globals_by_type
             .get(&TypeId::of::<G>())
             .map(|any_state| any_state.downcast_ref::<G>().unwrap())
@@ -838,7 +838,7 @@ impl AppContext {
     }
 
     /// Access the global of the given type if a value has been assigned.
-    pub fn try_global<G: 'static>(&self) -> Option<&G> {
+    pub fn try_global<G: Global>(&self) -> Option<&G> {
         self.globals_by_type
             .get(&TypeId::of::<G>())
             .map(|any_state| any_state.downcast_ref::<G>().unwrap())
@@ -846,7 +846,7 @@ impl AppContext {
 
     /// Access the global of the given type mutably. Panics if a global for that type has not been assigned.
     #[track_caller]
-    pub fn global_mut<G: 'static>(&mut self) -> &mut G {
+    pub fn global_mut<G: Global>(&mut self) -> &mut G {
         let global_type = TypeId::of::<G>();
         self.push_effect(Effect::NotifyGlobalObservers { global_type });
         self.globals_by_type
@@ -858,7 +858,7 @@ impl AppContext {
 
     /// Access the global of the given type mutably. A default value is assigned if a global of this type has not
     /// yet been assigned.
-    pub fn default_global<G: 'static + Default>(&mut self) -> &mut G {
+    pub fn default_global<G: Global + Default>(&mut self) -> &mut G {
         let global_type = TypeId::of::<G>();
         self.push_effect(Effect::NotifyGlobalObservers { global_type });
         self.globals_by_type
@@ -869,7 +869,7 @@ impl AppContext {
     }
 
     /// Sets the value of the global of the given type.
-    pub fn set_global<G: Any>(&mut self, global: G) {
+    pub fn set_global<G: Global>(&mut self, global: G) {
         let global_type = TypeId::of::<G>();
         self.push_effect(Effect::NotifyGlobalObservers { global_type });
         self.globals_by_type.insert(global_type, Box::new(global));
@@ -882,7 +882,7 @@ impl AppContext {
     }
 
     /// Remove the global of the given type from the app context. Does not notify global observers.
-    pub fn remove_global<G: Any>(&mut self) -> G {
+    pub fn remove_global<G: Global>(&mut self) -> G {
         let global_type = TypeId::of::<G>();
         self.push_effect(Effect::NotifyGlobalObservers { global_type });
         *self
@@ -895,7 +895,7 @@ impl AppContext {
 
     /// Updates the global of the given type with a closure. Unlike `global_mut`, this method provides
     /// your closure with mutable access to the `AppContext` and the global simultaneously.
-    pub fn update_global<G: 'static, R>(&mut self, f: impl FnOnce(&mut G, &mut Self) -> R) -> R {
+    pub fn update_global<G: Global, R>(&mut self, f: impl FnOnce(&mut G, &mut Self) -> R) -> R {
         self.update(|cx| {
             let mut global = cx.lease_global::<G>();
             let result = f(&mut global, cx);
@@ -905,7 +905,7 @@ impl AppContext {
     }
 
     /// Register a callback to be invoked when a global of the given type is updated.
-    pub fn observe_global<G: 'static>(
+    pub fn observe_global<G: Global>(
         &mut self,
         mut f: impl FnMut(&mut Self) + 'static,
     ) -> Subscription {
@@ -921,7 +921,7 @@ impl AppContext {
     }
 
     /// Move the global of the given type to the stack.
-    pub(crate) fn lease_global<G: 'static>(&mut self) -> GlobalLease<G> {
+    pub(crate) fn lease_global<G: Global>(&mut self) -> GlobalLease<G> {
         GlobalLease::new(
             self.globals_by_type
                 .remove(&TypeId::of::<G>())
@@ -931,7 +931,7 @@ impl AppContext {
     }
 
     /// Restore the global of the given type after it is moved to the stack.
-    pub(crate) fn end_global_lease<G: 'static>(&mut self, lease: GlobalLease<G>) {
+    pub(crate) fn end_global_lease<G: Global>(&mut self, lease: GlobalLease<G>) {
         let global_type = TypeId::of::<G>();
         self.push_effect(Effect::NotifyGlobalObservers { global_type });
         self.globals_by_type.insert(global_type, lease.global);
@@ -1293,12 +1293,12 @@ pub(crate) enum Effect {
 }
 
 /// Wraps a global variable value during `update_global` while the value has been moved to the stack.
-pub(crate) struct GlobalLease<G: 'static> {
+pub(crate) struct GlobalLease<G: Global> {
     global: Box<dyn Any>,
     global_type: PhantomData<G>,
 }
 
-impl<G: 'static> GlobalLease<G> {
+impl<G: Global> GlobalLease<G> {
     fn new(global: Box<dyn Any>) -> Self {
         GlobalLease {
             global,
@@ -1307,7 +1307,7 @@ impl<G: 'static> GlobalLease<G> {
     }
 }
 
-impl<G: 'static> Deref for GlobalLease<G> {
+impl<G: Global> Deref for GlobalLease<G> {
     type Target = G;
 
     fn deref(&self) -> &Self::Target {
@@ -1315,7 +1315,7 @@ impl<G: 'static> Deref for GlobalLease<G> {
     }
 }
 
-impl<G: 'static> DerefMut for GlobalLease<G> {
+impl<G: Global> DerefMut for GlobalLease<G> {
     fn deref_mut(&mut self) -> &mut Self::Target {
         self.global.downcast_mut().unwrap()
     }
diff --git a/crates/gpui/src/app/async_context.rs b/crates/gpui/src/app/async_context.rs
index f1bfe7ef4e..6252da6c18 100644
--- a/crates/gpui/src/app/async_context.rs
+++ b/crates/gpui/src/app/async_context.rs
@@ -1,6 +1,6 @@
 use crate::{
     AnyView, AnyWindowHandle, AppCell, AppContext, BackgroundExecutor, Context, DismissEvent,
-    FocusableView, ForegroundExecutor, Model, ModelContext, Render, Result, Task, View,
+    FocusableView, ForegroundExecutor, Global, Model, ModelContext, Render, Result, Task, View,
     ViewContext, VisualContext, WindowContext, WindowHandle,
 };
 use anyhow::{anyhow, Context as _};
@@ -144,7 +144,7 @@ impl AsyncAppContext {
 
     /// Determine whether global state of the specified type has been assigned.
     /// Returns an error if the `AppContext` has been dropped.
-    pub fn has_global<G: 'static>(&self) -> Result<bool> {
+    pub fn has_global<G: Global>(&self) -> Result<bool> {
         let app = self
             .app
             .upgrade()
@@ -157,7 +157,7 @@ impl AsyncAppContext {
     ///
     /// Panics if no global state of the specified type has been assigned.
     /// Returns an error if the `AppContext` has been dropped.
-    pub fn read_global<G: 'static, R>(&self, read: impl FnOnce(&G, &AppContext) -> R) -> Result<R> {
+    pub fn read_global<G: Global, R>(&self, read: impl FnOnce(&G, &AppContext) -> R) -> Result<R> {
         let app = self
             .app
             .upgrade()
@@ -172,7 +172,7 @@ impl AsyncAppContext {
     /// if no state of the specified type has been assigned.
     ///
     /// Returns an error if no state of the specified type has been assigned the `AppContext` has been dropped.
-    pub fn try_read_global<G: 'static, R>(
+    pub fn try_read_global<G: Global, R>(
         &self,
         read: impl FnOnce(&G, &AppContext) -> R,
     ) -> Option<R> {
@@ -183,7 +183,7 @@ impl AsyncAppContext {
 
     /// A convenience method for [AppContext::update_global]
     /// for updating the global state of the specified type.
-    pub fn update_global<G: 'static, R>(
+    pub fn update_global<G: Global, R>(
         &mut self,
         update: impl FnOnce(&mut G, &mut AppContext) -> R,
     ) -> Result<R> {
@@ -235,7 +235,7 @@ impl AsyncWindowContext {
     }
 
     /// A convenience method for [`AppContext::global`].
-    pub fn read_global<G: 'static, R>(
+    pub fn read_global<G: Global, R>(
         &mut self,
         read: impl FnOnce(&G, &WindowContext) -> R,
     ) -> Result<R> {
@@ -249,7 +249,7 @@ impl AsyncWindowContext {
         update: impl FnOnce(&mut G, &mut WindowContext) -> R,
     ) -> Result<R>
     where
-        G: 'static,
+        G: Global,
     {
         self.window.update(self, |_, cx| cx.update_global(update))
     }
diff --git a/crates/gpui/src/app/model_context.rs b/crates/gpui/src/app/model_context.rs
index 38caa1b260..74569d5e5b 100644
--- a/crates/gpui/src/app/model_context.rs
+++ b/crates/gpui/src/app/model_context.rs
@@ -1,6 +1,6 @@
 use crate::{
     AnyView, AnyWindowHandle, AppContext, AsyncAppContext, Context, Effect, Entity, EntityId,
-    EventEmitter, Model, Subscription, Task, View, WeakModel, WindowContext, WindowHandle,
+    EventEmitter, Global, Model, Subscription, Task, View, WeakModel, WindowContext, WindowHandle,
 };
 use anyhow::Result;
 use derive_more::{Deref, DerefMut};
@@ -193,7 +193,7 @@ impl<'a, T: 'static> ModelContext<'a, T> {
     /// Updates the given global
     pub fn update_global<G, R>(&mut self, f: impl FnOnce(&mut G, &mut Self) -> R) -> R
     where
-        G: 'static,
+        G: Global,
     {
         let mut global = self.app.lease_global::<G>();
         let result = f(&mut global, self);
diff --git a/crates/gpui/src/app/test_context.rs b/crates/gpui/src/app/test_context.rs
index a33105492b..bf213e2818 100644
--- a/crates/gpui/src/app/test_context.rs
+++ b/crates/gpui/src/app/test_context.rs
@@ -1,8 +1,8 @@
 use crate::{
     Action, AnyElement, AnyView, AnyWindowHandle, AppCell, AppContext, AsyncAppContext,
     AvailableSpace, BackgroundExecutor, Bounds, ClipboardItem, Context, Entity, EventEmitter,
-    ForegroundExecutor, InputEvent, Keystroke, Model, ModelContext, Pixels, Platform, Point,
-    Render, Result, Size, Task, TestDispatcher, TestPlatform, TestWindow, TextSystem, View,
+    ForegroundExecutor, Global, InputEvent, Keystroke, Model, ModelContext, Pixels, Platform,
+    Point, Render, Result, Size, Task, TestDispatcher, TestPlatform, TestWindow, TextSystem, View,
     ViewContext, VisualContext, WindowContext, WindowHandle, WindowOptions,
 };
 use anyhow::{anyhow, bail};
@@ -256,20 +256,20 @@ impl TestAppContext {
     }
 
     /// true if the given global is defined
-    pub fn has_global<G: 'static>(&self) -> bool {
+    pub fn has_global<G: Global>(&self) -> bool {
         let app = self.app.borrow();
         app.has_global::<G>()
     }
 
     /// runs the given closure with a reference to the global
     /// panics if `has_global` would return false.
-    pub fn read_global<G: 'static, R>(&self, read: impl FnOnce(&G, &AppContext) -> R) -> R {
+    pub fn read_global<G: Global, R>(&self, read: impl FnOnce(&G, &AppContext) -> R) -> R {
         let app = self.app.borrow();
         read(app.global(), &app)
     }
 
     /// runs the given closure with a reference to the global (if set)
-    pub fn try_read_global<G: 'static, R>(
+    pub fn try_read_global<G: Global, R>(
         &self,
         read: impl FnOnce(&G, &AppContext) -> R,
     ) -> Option<R> {
@@ -278,13 +278,13 @@ impl TestAppContext {
     }
 
     /// sets the global in this context.
-    pub fn set_global<G: 'static>(&mut self, global: G) {
+    pub fn set_global<G: Global>(&mut self, global: G) {
         let mut lock = self.app.borrow_mut();
         lock.set_global(global);
     }
 
     /// updates the global in this context. (panics if `has_global` would return false)
-    pub fn update_global<G: 'static, R>(
+    pub fn update_global<G: Global, R>(
         &mut self,
         update: impl FnOnce(&mut G, &mut AppContext) -> R,
     ) -> R {
diff --git a/crates/gpui/src/elements/div.rs b/crates/gpui/src/elements/div.rs
index 6d529213f0..e166b99a8e 100644
--- a/crates/gpui/src/elements/div.rs
+++ b/crates/gpui/src/elements/div.rs
@@ -17,11 +17,11 @@
 
 use crate::{
     point, px, size, Action, AnyDrag, AnyElement, AnyTooltip, AnyView, AppContext, Bounds,
-    ClickEvent, DispatchPhase, Element, ElementContext, ElementId, FocusHandle, IntoElement,
-    IsZero, KeyContext, KeyDownEvent, KeyUpEvent, LayoutId, MouseButton, MouseDownEvent,
-    MouseMoveEvent, MouseUpEvent, ParentElement, Pixels, Point, Render, ScrollWheelEvent,
-    SharedString, Size, StackingOrder, Style, StyleRefinement, Styled, Task, View, Visibility,
-    WindowContext,
+    ClickEvent, DispatchPhase, Element, ElementContext, ElementId, FocusHandle, Global,
+    IntoElement, IsZero, KeyContext, KeyDownEvent, KeyUpEvent, LayoutId, MouseButton,
+    MouseDownEvent, MouseMoveEvent, MouseUpEvent, ParentElement, Pixels, Point, Render,
+    ScrollWheelEvent, SharedString, Size, StackingOrder, Style, StyleRefinement, Styled, Task,
+    View, Visibility, WindowContext,
 };
 
 use collections::HashMap;
@@ -2070,6 +2070,8 @@ impl ElementClickedState {
 #[derive(Default)]
 pub(crate) struct GroupBounds(HashMap<SharedString, SmallVec<[Bounds<Pixels>; 1]>>);
 
+impl Global for GroupBounds {}
+
 impl GroupBounds {
     pub fn get(name: &SharedString, cx: &mut AppContext) -> Option<Bounds<Pixels>> {
         cx.default_global::<Self>()
diff --git a/crates/gpui/src/gpui.rs b/crates/gpui/src/gpui.rs
index 36674b52bf..4fe5f62111 100644
--- a/crates/gpui/src/gpui.rs
+++ b/crates/gpui/src/gpui.rs
@@ -258,14 +258,14 @@ pub trait EventEmitter<E: Any>: 'static {}
 /// can be used interchangeably.
 pub trait BorrowAppContext {
     /// Set a global value on the context.
-    fn set_global<T: 'static>(&mut self, global: T);
+    fn set_global<T: Global>(&mut self, global: T);
 }
 
 impl<C> BorrowAppContext for C
 where
     C: BorrowMut<AppContext>,
 {
-    fn set_global<G: 'static>(&mut self, global: G) {
+    fn set_global<G: Global>(&mut self, global: G) {
         self.borrow_mut().set_global(global)
     }
 }
@@ -287,3 +287,8 @@ impl<T> Flatten<T> for Result<T> {
         self
     }
 }
+
+/// A marker trait for types that can be stored in GPUI's global state.
+///
+/// Implement this on types you want to store in the context as a global.
+pub trait Global: 'static {}
diff --git a/crates/gpui/src/style.rs b/crates/gpui/src/style.rs
index a12bb6df12..d5209bd5bd 100644
--- a/crates/gpui/src/style.rs
+++ b/crates/gpui/src/style.rs
@@ -3,8 +3,8 @@ use std::{iter, mem, ops::Range};
 use crate::{
     black, phi, point, quad, rems, AbsoluteLength, Bounds, ContentMask, Corners, CornersRefinement,
     CursorStyle, DefiniteLength, Edges, EdgesRefinement, ElementContext, Font, FontFeatures,
-    FontStyle, FontWeight, Hsla, Length, Pixels, Point, PointRefinement, Rgba, SharedString, Size,
-    SizeRefinement, Styled, TextRun,
+    FontStyle, FontWeight, Global, Hsla, Length, Pixels, Point, PointRefinement, Rgba,
+    SharedString, Size, SizeRefinement, Styled, TextRun,
 };
 use collections::HashSet;
 use refineable::Refineable;
@@ -20,6 +20,8 @@ pub use taffy::style::{
 /// GPUI.
 pub struct DebugBelow;
 
+impl Global for DebugBelow {}
+
 /// The CSS styling that can be applied to an element via the `Styled` trait
 #[derive(Clone, Refineable, Debug)]
 #[refineable(Debug)]
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 3688b27552..d64feb56a4 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -2,7 +2,7 @@ use crate::{
     px, size, transparent_black, Action, AnyDrag, AnyView, AppContext, Arena, AsyncWindowContext,
     AvailableSpace, Bounds, Context, Corners, CursorStyle, DispatchActionListener, DispatchNodeId,
     DispatchTree, DisplayId, Edges, Effect, Entity, EntityId, EventEmitter, FileDropEvent, Flatten,
-    GlobalElementId, Hsla, KeyBinding, KeyContext, KeyDownEvent, KeyMatch, KeymatchMode,
+    Global, GlobalElementId, Hsla, KeyBinding, KeyContext, KeyDownEvent, KeyMatch, KeymatchMode,
     KeymatchResult, Keystroke, KeystrokeEvent, Model, ModelContext, Modifiers, MouseButton,
     MouseMoveEvent, MouseUpEvent, Pixels, PlatformAtlas, PlatformDisplay, PlatformInput,
     PlatformWindow, Point, PromptLevel, Render, ScaledPixels, SharedString, Size, SubscriberSet,
@@ -708,7 +708,7 @@ impl<'a> WindowContext<'a> {
     /// access both to the global and the context.
     pub fn update_global<G, R>(&mut self, f: impl FnOnce(&mut G, &mut Self) -> R) -> R
     where
-        G: 'static,
+        G: Global,
     {
         let mut global = self.app.lease_global::<G>();
         let result = f(&mut global, self);
@@ -1441,7 +1441,7 @@ impl<'a> WindowContext<'a> {
 
     /// Register the given handler to be invoked whenever the global of the given type
     /// is updated.
-    pub fn observe_global<G: 'static>(
+    pub fn observe_global<G: Global>(
         &mut self,
         f: impl Fn(&mut WindowContext<'_>) + 'static,
     ) -> Subscription {
@@ -2198,7 +2198,7 @@ impl<'a, V: 'static> ViewContext<'a, V> {
     /// Updates the global state of the given type.
     pub fn update_global<G, R>(&mut self, f: impl FnOnce(&mut G, &mut Self) -> R) -> R
     where
-        G: 'static,
+        G: Global,
     {
         let mut global = self.app.lease_global::<G>();
         let result = f(&mut global, self);
@@ -2207,7 +2207,7 @@ impl<'a, V: 'static> ViewContext<'a, V> {
     }
 
     /// Register a callback to be invoked when the given global state changes.
-    pub fn observe_global<G: 'static>(
+    pub fn observe_global<G: Global>(
         &mut self,
         mut f: impl FnMut(&mut V, &mut ViewContext<'_, V>) + 'static,
     ) -> Subscription {
diff --git a/crates/notifications/src/notification_store.rs b/crates/notifications/src/notification_store.rs
index 77c1d247ca..a01a1e59d8 100644
--- a/crates/notifications/src/notification_store.rs
+++ b/crates/notifications/src/notification_store.rs
@@ -3,7 +3,9 @@ use channel::{ChannelMessage, ChannelMessageId, ChannelStore};
 use client::{Client, UserStore};
 use collections::HashMap;
 use db::smol::stream::StreamExt;
-use gpui::{AppContext, AsyncAppContext, Context as _, EventEmitter, Model, ModelContext, Task};
+use gpui::{
+    AppContext, AsyncAppContext, Context as _, EventEmitter, Global, Model, ModelContext, Task,
+};
 use rpc::{proto, Notification, TypedEnvelope};
 use std::{ops::Range, sync::Arc};
 use sum_tree::{Bias, SumTree};
@@ -12,9 +14,13 @@ use util::ResultExt;
 
 pub fn init(client: Arc<Client>, user_store: Model<UserStore>, cx: &mut AppContext) {
     let notification_store = cx.new_model(|cx| NotificationStore::new(client, user_store, cx));
-    cx.set_global(notification_store);
+    cx.set_global(GlobalNotificationStore(notification_store));
 }
 
+struct GlobalNotificationStore(Model<NotificationStore>);
+
+impl Global for GlobalNotificationStore {}
+
 pub struct NotificationStore {
     client: Arc<Client>,
     user_store: Model<UserStore>,
@@ -70,7 +76,7 @@ struct NotificationId(u64);
 
 impl NotificationStore {
     pub fn global(cx: &AppContext) -> Model<Self> {
-        cx.global::<Model<Self>>().clone()
+        cx.global::<GlobalNotificationStore>().0.clone()
     }
 
     pub fn new(
diff --git a/crates/project_panel/src/file_associations.rs b/crates/project_panel/src/file_associations.rs
index 783fae4c52..5f596440ac 100644
--- a/crates/project_panel/src/file_associations.rs
+++ b/crates/project_panel/src/file_associations.rs
@@ -2,7 +2,7 @@ use std::{path::Path, str, sync::Arc};
 
 use collections::HashMap;
 
-use gpui::{AppContext, AssetSource};
+use gpui::{AppContext, AssetSource, Global};
 use serde_derive::Deserialize;
 use util::{maybe, paths::PathExt};
 
@@ -17,6 +17,8 @@ pub struct FileAssociations {
     types: HashMap<String, TypeConfig>,
 }
 
+impl Global for FileAssociations {}
+
 const COLLAPSED_DIRECTORY_TYPE: &'static str = "collapsed_folder";
 const EXPANDED_DIRECTORY_TYPE: &'static str = "expanded_folder";
 const COLLAPSED_CHEVRON_TYPE: &'static str = "collapsed_chevron";
diff --git a/crates/release_channel/Cargo.toml b/crates/release_channel/Cargo.toml
new file mode 100644
index 0000000000..243ea5ace3
--- /dev/null
+++ b/crates/release_channel/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "release_channel"
+version = "0.1.0"
+edition = "2021"
+publish = false
+license = "GPL-3.0-or-later"
+
+[dependencies]
+gpui = { path = "../gpui" }
+once_cell = "1.19.0"
diff --git a/crates/release_channel/LICENSE-GPL b/crates/release_channel/LICENSE-GPL
new file mode 120000
index 0000000000..89e542f750
--- /dev/null
+++ b/crates/release_channel/LICENSE-GPL
@@ -0,0 +1 @@
+../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/util/src/channel.rs b/crates/release_channel/src/lib.rs
similarity index 67%
rename from crates/util/src/channel.rs
rename to crates/release_channel/src/lib.rs
index 135e49c87f..06860e9af5 100644
--- a/crates/util/src/channel.rs
+++ b/crates/release_channel/src/lib.rs
@@ -1,24 +1,44 @@
-use lazy_static::lazy_static;
+use gpui::{AppContext, Global};
+use once_cell::sync::Lazy;
 use std::env;
 
-lazy_static! {
-    pub static ref RELEASE_CHANNEL_NAME: String = if cfg!(debug_assertions) {
+#[doc(hidden)]
+pub static RELEASE_CHANNEL_NAME: Lazy<String> = if cfg!(debug_assertions) {
+    Lazy::new(|| {
         env::var("ZED_RELEASE_CHANNEL")
             .unwrap_or_else(|_| include_str!("../../zed/RELEASE_CHANNEL").to_string())
-    } else {
-        include_str!("../../zed/RELEASE_CHANNEL").to_string()
-    };
-    pub static ref RELEASE_CHANNEL: ReleaseChannel = match RELEASE_CHANNEL_NAME.as_str().trim() {
+    })
+} else {
+    Lazy::new(|| include_str!("../../zed/RELEASE_CHANNEL").to_string())
+};
+#[doc(hidden)]
+pub static RELEASE_CHANNEL: Lazy<ReleaseChannel> =
+    Lazy::new(|| match RELEASE_CHANNEL_NAME.as_str().trim() {
         "dev" => ReleaseChannel::Dev,
         "nightly" => ReleaseChannel::Nightly,
         "preview" => ReleaseChannel::Preview,
         "stable" => ReleaseChannel::Stable,
         _ => panic!("invalid release channel {}", *RELEASE_CHANNEL_NAME),
-    };
-}
+    });
 
+#[derive(Clone)]
 pub struct AppCommitSha(pub String);
 
+struct GlobalAppCommitSha(AppCommitSha);
+
+impl Global for GlobalAppCommitSha {}
+
+impl AppCommitSha {
+    pub fn try_global(cx: &AppContext) -> Option<AppCommitSha> {
+        cx.try_global::<GlobalAppCommitSha>()
+            .map(|sha| sha.0.clone())
+    }
+
+    pub fn set_global(sha: AppCommitSha, cx: &mut AppContext) {
+        cx.set_global(GlobalAppCommitSha(sha))
+    }
+}
+
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Default)]
 pub enum ReleaseChannel {
     #[default]
@@ -28,7 +48,24 @@ pub enum ReleaseChannel {
     Stable,
 }
 
+struct GlobalReleaseChannel(ReleaseChannel);
+
+impl Global for GlobalReleaseChannel {}
+
 impl ReleaseChannel {
+    pub fn init(cx: &mut AppContext) {
+        cx.set_global(GlobalReleaseChannel(*RELEASE_CHANNEL))
+    }
+
+    pub fn global(cx: &AppContext) -> Self {
+        cx.global::<GlobalReleaseChannel>().0
+    }
+
+    pub fn try_global(cx: &AppContext) -> Option<Self> {
+        cx.try_global::<GlobalReleaseChannel>()
+            .map(|channel| channel.0)
+    }
+
     pub fn display_name(&self) -> &'static str {
         match self {
             ReleaseChannel::Dev => "Zed Dev",
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 0aedb3fd41..89f94ad6c4 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -13,10 +13,10 @@ use editor::{
 use editor::{EditorElement, EditorStyle};
 use gpui::{
     actions, div, Action, AnyElement, AnyView, AppContext, Context as _, Element, EntityId,
-    EventEmitter, FocusHandle, FocusableView, FontStyle, FontWeight, Hsla, InteractiveElement,
-    IntoElement, KeyContext, Model, ModelContext, ParentElement, PromptLevel, Render, SharedString,
-    Styled, Subscription, Task, TextStyle, View, ViewContext, VisualContext, WeakModel, WeakView,
-    WhiteSpace, WindowContext,
+    EventEmitter, FocusHandle, FocusableView, FontStyle, FontWeight, Global, Hsla,
+    InteractiveElement, IntoElement, KeyContext, Model, ModelContext, ParentElement, PromptLevel,
+    Render, SharedString, Styled, Subscription, Task, TextStyle, View, ViewContext, VisualContext,
+    WeakModel, WeakView, WhiteSpace, WindowContext,
 };
 use menu::Confirm;
 use project::{
@@ -58,6 +58,8 @@ actions!(
 #[derive(Default)]
 struct ActiveSettings(HashMap<WeakModel<Project>, ProjectSearchSettings>);
 
+impl Global for ActiveSettings {}
+
 pub fn init(cx: &mut AppContext) {
     cx.set_global(ActiveSettings::default());
     cx.observe_new_views(|workspace: &mut Workspace, _cx| {
diff --git a/crates/semantic_index/Cargo.toml b/crates/semantic_index/Cargo.toml
index d0c159d994..274b603313 100644
--- a/crates/semantic_index/Cargo.toml
+++ b/crates/semantic_index/Cargo.toml
@@ -17,6 +17,7 @@ language = { path = "../language" }
 project = { path = "../project" }
 workspace = { path = "../workspace" }
 util = { path = "../util" }
+release_channel = { path = "../release_channel" }
 rpc = { path = "../rpc" }
 settings = { path = "../settings" }
 anyhow.workspace = true
diff --git a/crates/semantic_index/src/semantic_index.rs b/crates/semantic_index/src/semantic_index.rs
index 6725b5a93e..324e03381e 100644
--- a/crates/semantic_index/src/semantic_index.rs
+++ b/crates/semantic_index/src/semantic_index.rs
@@ -15,8 +15,8 @@ use db::VectorDatabase;
 use embedding_queue::{EmbeddingQueue, FileToEmbed};
 use futures::{future, FutureExt, StreamExt};
 use gpui::{
-    AppContext, AsyncAppContext, BorrowWindow, Context, Model, ModelContext, Task, ViewContext,
-    WeakModel,
+    AppContext, AsyncAppContext, BorrowWindow, Context, Global, Model, ModelContext, Task,
+    ViewContext, WeakModel,
 };
 use language::{Anchor, Bias, Buffer, Language, LanguageRegistry};
 use lazy_static::lazy_static;
@@ -25,6 +25,7 @@ use parking_lot::Mutex;
 use parsing::{CodeContextRetriever, Span, SpanDigest, PARSEABLE_ENTIRE_FILE_TYPES};
 use postage::watch;
 use project::{Fs, PathChange, Project, ProjectEntryId, Worktree, WorktreeId};
+use release_channel::ReleaseChannel;
 use settings::Settings;
 use smol::channel;
 use std::{
@@ -38,7 +39,7 @@ use std::{
     time::{Duration, Instant, SystemTime},
 };
 use util::paths::PathMatcher;
-use util::{channel::RELEASE_CHANNEL_NAME, http::HttpClient, paths::EMBEDDINGS_DIR, ResultExt};
+use util::{http::HttpClient, paths::EMBEDDINGS_DIR, ResultExt};
 use workspace::Workspace;
 
 const SEMANTIC_INDEX_VERSION: usize = 11;
@@ -58,7 +59,7 @@ pub fn init(
     SemanticIndexSettings::register(cx);
 
     let db_file_path = EMBEDDINGS_DIR
-        .join(Path::new(RELEASE_CHANNEL_NAME.as_str()))
+        .join(Path::new(ReleaseChannel::global(cx).dev_name()))
         .join("embeddings_db");
 
     cx.observe_new_views(
@@ -101,7 +102,7 @@ pub fn init(
         )
         .await?;
 
-        cx.update(|cx| cx.set_global(semantic_index.clone()))?;
+        cx.update(|cx| cx.set_global(GlobalSemanticIndex(semantic_index.clone())))?;
 
         anyhow::Ok(())
     })
@@ -130,6 +131,10 @@ pub struct SemanticIndex {
     projects: HashMap<WeakModel<Project>, ProjectState>,
 }
 
+struct GlobalSemanticIndex(Model<SemanticIndex>);
+
+impl Global for GlobalSemanticIndex {}
+
 struct ProjectState {
     worktrees: HashMap<WorktreeId, WorktreeState>,
     pending_file_count_rx: watch::Receiver<usize>,
@@ -274,8 +279,8 @@ pub struct SearchResult {
 
 impl SemanticIndex {
     pub fn global(cx: &mut AppContext) -> Option<Model<SemanticIndex>> {
-        cx.try_global::<Model<Self>>()
-            .map(|semantic_index| semantic_index.clone())
+        cx.try_global::<GlobalSemanticIndex>()
+            .map(|semantic_index| semantic_index.0.clone())
     }
 
     pub fn authenticate(&mut self, cx: &mut AppContext) -> Task<bool> {
diff --git a/crates/settings/Cargo.toml b/crates/settings/Cargo.toml
index f977a87227..cd6af095e7 100644
--- a/crates/settings/Cargo.toml
+++ b/crates/settings/Cargo.toml
@@ -17,6 +17,7 @@ collections = { path = "../collections" }
 gpui = { path = "../gpui" }
 fs = { path = "../fs" }
 feature_flags = { path = "../feature_flags" }
+release_channel = { path = "../release_channel" }
 util = { path = "../util" }
 
 anyhow.workspace = true
diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs
index e8c0297def..41dfa521ed 100644
--- a/crates/settings/src/settings_store.rs
+++ b/crates/settings/src/settings_store.rs
@@ -1,6 +1,6 @@
 use anyhow::{anyhow, Context, Result};
 use collections::{btree_map, hash_map, BTreeMap, HashMap};
-use gpui::{AppContext, AsyncAppContext};
+use gpui::{AppContext, AsyncAppContext, Global};
 use lazy_static::lazy_static;
 use schemars::{gen::SchemaGenerator, schema::RootSchema, JsonSchema};
 use serde::{de::DeserializeOwned, Deserialize as _, Serialize};
@@ -13,9 +13,7 @@ use std::{
     str,
     sync::Arc,
 };
-use util::{
-    channel::RELEASE_CHANNEL_NAME, merge_non_null_json_value_into, RangeExt, ResultExt as _,
-};
+use util::{merge_non_null_json_value_into, RangeExt, ResultExt as _};
 
 /// A value that can be defined as a user setting.
 ///
@@ -139,6 +137,8 @@ pub struct SettingsStore {
     )>,
 }
 
+impl Global for SettingsStore {}
+
 impl Default for SettingsStore {
     fn default() -> Self {
         SettingsStore {
@@ -207,7 +207,10 @@ impl SettingsStore {
                 user_values_stack = vec![user_settings];
             }
 
-            if let Some(release_settings) = &self.raw_user_settings.get(&*RELEASE_CHANNEL_NAME) {
+            if let Some(release_settings) = &self
+                .raw_user_settings
+                .get(&*release_channel::RELEASE_CHANNEL_NAME)
+            {
                 if let Some(release_settings) = setting_value
                     .deserialize_setting(&release_settings)
                     .log_err()
@@ -537,7 +540,10 @@ impl SettingsStore {
                 paths_stack.push(None);
             }
 
-            if let Some(release_settings) = &self.raw_user_settings.get(&*RELEASE_CHANNEL_NAME) {
+            if let Some(release_settings) = &self
+                .raw_user_settings
+                .get(&*release_channel::RELEASE_CHANNEL_NAME)
+            {
                 if let Some(release_settings) = setting_value
                     .deserialize_setting(&release_settings)
                     .log_err()
diff --git a/crates/theme/src/registry.rs b/crates/theme/src/registry.rs
index afd2983f04..b5f1500429 100644
--- a/crates/theme/src/registry.rs
+++ b/crates/theme/src/registry.rs
@@ -6,7 +6,7 @@ use anyhow::{anyhow, Context, Result};
 use derive_more::{Deref, DerefMut};
 use fs::Fs;
 use futures::StreamExt;
-use gpui::{AppContext, AssetSource, HighlightStyle, SharedString};
+use gpui::{AppContext, AssetSource, Global, HighlightStyle, SharedString};
 use parking_lot::RwLock;
 use refineable::Refineable;
 use util::ResultExt;
@@ -32,10 +32,7 @@ pub struct ThemeMeta {
 #[derive(Default, Deref, DerefMut)]
 struct GlobalThemeRegistry(Arc<ThemeRegistry>);
 
-/// Initializes the theme registry.
-pub fn init(assets: Box<dyn AssetSource>, cx: &mut AppContext) {
-    cx.set_global(GlobalThemeRegistry(Arc::new(ThemeRegistry::new(assets))));
-}
+impl Global for GlobalThemeRegistry {}
 
 struct ThemeRegistryState {
     themes: HashMap<SharedString, Arc<Theme>>,
@@ -59,6 +56,11 @@ impl ThemeRegistry {
         cx.default_global::<GlobalThemeRegistry>().0.clone()
     }
 
+    /// Sets the global [`ThemeRegistry`].
+    pub(crate) fn set_global(assets: Box<dyn AssetSource>, cx: &mut AppContext) {
+        cx.set_global(GlobalThemeRegistry(Arc::new(ThemeRegistry::new(assets))));
+    }
+
     pub fn new(assets: Box<dyn AssetSource>) -> Self {
         let registry = Self {
             state: RwLock::new(ThemeRegistryState {
diff --git a/crates/theme/src/settings.rs b/crates/theme/src/settings.rs
index 67c0814dfa..f7157fa139 100644
--- a/crates/theme/src/settings.rs
+++ b/crates/theme/src/settings.rs
@@ -2,7 +2,8 @@ use crate::one_themes::one_dark;
 use crate::{SyntaxTheme, Theme, ThemeRegistry, ThemeStyleContent};
 use anyhow::Result;
 use gpui::{
-    px, AppContext, Font, FontFeatures, FontStyle, FontWeight, Pixels, Subscription, ViewContext,
+    px, AppContext, Font, FontFeatures, FontStyle, FontWeight, Global, Pixels, Subscription,
+    ViewContext,
 };
 use refineable::Refineable;
 use schemars::{
@@ -34,6 +35,8 @@ pub struct ThemeSettings {
 #[derive(Default)]
 pub(crate) struct AdjustedBufferFontSize(Pixels);
 
+impl Global for AdjustedBufferFontSize {}
+
 #[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema)]
 pub struct ThemeSettingsContent {
     #[serde(default)]
diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs
index ba0203d999..8161217c8f 100644
--- a/crates/theme/src/theme.rs
+++ b/crates/theme/src/theme.rs
@@ -60,7 +60,7 @@ pub fn init(themes_to_load: LoadThemes, cx: &mut AppContext) {
         LoadThemes::JustBase => (Box::new(()) as Box<dyn AssetSource>, false),
         LoadThemes::All(assets) => (assets, true),
     };
-    registry::init(assets, cx);
+    ThemeRegistry::set_global(assets, cx);
 
     if load_user_themes {
         ThemeRegistry::global(cx).load_bundled_themes();
diff --git a/crates/theme_selector/src/theme_selector.rs b/crates/theme_selector/src/theme_selector.rs
index 1e87785bc2..21d9073570 100644
--- a/crates/theme_selector/src/theme_selector.rs
+++ b/crates/theme_selector/src/theme_selector.rs
@@ -36,24 +36,6 @@ pub fn toggle(workspace: &mut Workspace, _: &Toggle, cx: &mut ViewContext<Worksp
     });
 }
 
-#[cfg(debug_assertions)]
-pub fn reload(cx: &mut AppContext) {
-    let current_theme_name = cx.theme().name.clone();
-    let current_theme = cx.update_global(|registry: &mut ThemeRegistry, _cx| {
-        registry.clear();
-        registry.get(&current_theme_name)
-    });
-    match current_theme {
-        Ok(theme) => {
-            ThemeSelectorDelegate::set_theme(theme, cx);
-            log::info!("reloaded theme {}", current_theme_name);
-        }
-        Err(error) => {
-            log::error!("failed to load theme {}: {:?}", current_theme_name, error)
-        }
-    }
-}
-
 impl ModalView for ThemeSelector {}
 
 pub struct ThemeSelector {
diff --git a/crates/util/src/util.rs b/crates/util/src/util.rs
index ed03eb25ba..b1205aa109 100644
--- a/crates/util/src/util.rs
+++ b/crates/util/src/util.rs
@@ -1,5 +1,4 @@
 pub mod arc_cow;
-pub mod channel;
 pub mod fs;
 pub mod github;
 pub mod http;
diff --git a/crates/vim/Cargo.toml b/crates/vim/Cargo.toml
index d76bce811a..6207630f8f 100644
--- a/crates/vim/Cargo.toml
+++ b/crates/vim/Cargo.toml
@@ -28,6 +28,8 @@ regex.workspace = true
 
 collections = { path = "../collections" }
 command_palette = { path = "../command_palette" }
+# HACK: We're only depending on `copilot` here for `CommandPaletteFilter`.  See the attached comment on that type.
+copilot = { path = "../copilot" }
 editor = { path = "../editor" }
 gpui = { path = "../gpui" }
 language = { path = "../language" }
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index 0cb038807b..d35a2b9a6f 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -15,11 +15,12 @@ mod utils;
 mod visual;
 
 use anyhow::Result;
-use collections::{CommandPaletteFilter, HashMap};
+use collections::HashMap;
 use command_palette::CommandPaletteInterceptor;
+use copilot::CommandPaletteFilter;
 use editor::{movement, Editor, EditorEvent, EditorMode};
 use gpui::{
-    actions, impl_actions, Action, AppContext, EntityId, KeyContext, Subscription, View,
+    actions, impl_actions, Action, AppContext, EntityId, Global, KeyContext, Subscription, View,
     ViewContext, WeakView, WindowContext,
 };
 use language::{CursorShape, Point, Selection, SelectionGoal};
@@ -171,9 +172,9 @@ pub fn observe_keystrokes(cx: &mut WindowContext) {
     .detach()
 }
 
-/// The state pertaining to Vim mode. Stored as a global.
+/// The state pertaining to Vim mode.
 #[derive(Default)]
-pub struct Vim {
+struct Vim {
     active_editor: Option<WeakView<Editor>>,
     editor_subscription: Option<Subscription>,
     enabled: bool,
@@ -182,6 +183,8 @@ pub struct Vim {
     default_state: EditorState,
 }
 
+impl Global for Vim {}
+
 impl Vim {
     fn read(cx: &mut AppContext) -> &Self {
         cx.global::<Self>()
@@ -512,7 +515,9 @@ impl Vim {
             });
 
             if self.enabled {
-                cx.set_global::<CommandPaletteInterceptor>(Box::new(command::command_interceptor));
+                cx.set_global::<CommandPaletteInterceptor>(CommandPaletteInterceptor(Box::new(
+                    command::command_interceptor,
+                )));
             } else if cx.has_global::<CommandPaletteInterceptor>() {
                 let _ = cx.remove_global::<CommandPaletteInterceptor>();
             }
diff --git a/crates/workspace/Cargo.toml b/crates/workspace/Cargo.toml
index d60b724f35..7693ce0509 100644
--- a/crates/workspace/Cargo.toml
+++ b/crates/workspace/Cargo.toml
@@ -43,6 +43,7 @@ async-recursion = "1.0.0"
 itertools = "0.10"
 bincode = "1.2.1"
 anyhow.workspace = true
+derive_more.workspace = true
 futures.workspace = true
 lazy_static.workspace = true
 log.workspace = true
diff --git a/crates/workspace/src/notifications.rs b/crates/workspace/src/notifications.rs
index 30d8ec9e82..33d5834ae7 100644
--- a/crates/workspace/src/notifications.rs
+++ b/crates/workspace/src/notifications.rs
@@ -1,7 +1,7 @@
 use crate::{Toast, Workspace};
 use collections::HashMap;
 use gpui::{
-    AnyView, AppContext, AsyncWindowContext, DismissEvent, Entity, EntityId, EventEmitter,
+    AnyView, AppContext, AsyncWindowContext, DismissEvent, Entity, EntityId, EventEmitter, Global,
     PromptLevel, Render, Task, View, ViewContext, VisualContext, WindowContext,
 };
 use std::{any::TypeId, ops::DerefMut};
@@ -39,6 +39,8 @@ pub(crate) struct NotificationTracker {
     notifications_sent: HashMap<TypeId, Vec<usize>>,
 }
 
+impl Global for NotificationTracker {}
+
 impl std::ops::Deref for NotificationTracker {
     type Target = HashMap<TypeId, Vec<usize>>;
 
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 35072c4030..093393944b 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -18,6 +18,7 @@ use client::{
     Client, ErrorExt, Status, TypedEnvelope, UserStore,
 };
 use collections::{hash_map, HashMap, HashSet};
+use derive_more::{Deref, DerefMut};
 use dock::{Dock, DockPosition, Panel, PanelButtons, PanelHandle};
 use futures::{
     channel::{mpsc, oneshot},
@@ -28,7 +29,7 @@ use gpui::{
     actions, canvas, div, impl_actions, point, px, size, Action, AnyElement, AnyModel, AnyView,
     AnyWeakView, AppContext, AsyncAppContext, AsyncWindowContext, Bounds, Context, Div,
     DragMoveEvent, Element, ElementContext, Entity, EntityId, EventEmitter, FocusHandle,
-    FocusableView, GlobalPixels, InteractiveElement, IntoElement, KeyContext, LayoutId,
+    FocusableView, Global, GlobalPixels, InteractiveElement, IntoElement, KeyContext, LayoutId,
     ManagedView, Model, ModelContext, ParentElement, PathPromptOptions, Pixels, Point, PromptLevel,
     Render, SharedString, Size, Styled, Subscription, Task, View, ViewContext, VisualContext,
     WeakView, WindowBounds, WindowContext, WindowHandle, WindowOptions,
@@ -59,6 +60,7 @@ use std::{
     borrow::Cow,
     cmp, env,
     path::{Path, PathBuf},
+    sync::Weak,
     sync::{atomic::AtomicUsize, Arc},
     time::Duration,
 };
@@ -256,8 +258,13 @@ pub fn init(app_state: Arc<AppState>, cx: &mut AppContext) {
     });
 }
 
-type ProjectItemBuilders =
-    HashMap<TypeId, fn(Model<Project>, AnyModel, &mut ViewContext<Pane>) -> Box<dyn ItemHandle>>;
+#[derive(Clone, Default, Deref, DerefMut)]
+struct ProjectItemBuilders(
+    HashMap<TypeId, fn(Model<Project>, AnyModel, &mut ViewContext<Pane>) -> Box<dyn ItemHandle>>,
+);
+
+impl Global for ProjectItemBuilders {}
+
 pub fn register_project_item<I: ProjectItem>(cx: &mut AppContext) {
     let builders = cx.default_global::<ProjectItemBuilders>();
     builders.insert(TypeId::of::<I::Item>(), |project, model, cx| {
@@ -273,13 +280,20 @@ type FollowableItemBuilder = fn(
     &mut Option<proto::view::Variant>,
     &mut WindowContext,
 ) -> Option<Task<Result<Box<dyn FollowableItemHandle>>>>;
-type FollowableItemBuilders = HashMap<
-    TypeId,
-    (
-        FollowableItemBuilder,
-        fn(&AnyView) -> Box<dyn FollowableItemHandle>,
-    ),
->;
+
+#[derive(Default, Deref, DerefMut)]
+struct FollowableItemBuilders(
+    HashMap<
+        TypeId,
+        (
+            FollowableItemBuilder,
+            fn(&AnyView) -> Box<dyn FollowableItemHandle>,
+        ),
+    >,
+);
+
+impl Global for FollowableItemBuilders {}
+
 pub fn register_followable_item<I: FollowableItem>(cx: &mut AppContext) {
     let builders = cx.default_global::<FollowableItemBuilders>();
     builders.insert(
@@ -296,16 +310,22 @@ pub fn register_followable_item<I: FollowableItem>(cx: &mut AppContext) {
     );
 }
 
-type ItemDeserializers = HashMap<
-    Arc<str>,
-    fn(
-        Model<Project>,
-        WeakView<Workspace>,
-        WorkspaceId,
-        ItemId,
-        &mut ViewContext<Pane>,
-    ) -> Task<Result<Box<dyn ItemHandle>>>,
->;
+#[derive(Default, Deref, DerefMut)]
+struct ItemDeserializers(
+    HashMap<
+        Arc<str>,
+        fn(
+            Model<Project>,
+            WeakView<Workspace>,
+            WorkspaceId,
+            ItemId,
+            &mut ViewContext<Pane>,
+        ) -> Task<Result<Box<dyn ItemHandle>>>,
+    >,
+);
+
+impl Global for ItemDeserializers {}
+
 pub fn register_deserializable_item<I: Item>(cx: &mut AppContext) {
     if let Some(serialized_item_kind) = I::serialized_item_kind() {
         let deserializers = cx.default_global::<ItemDeserializers>();
@@ -331,6 +351,10 @@ pub struct AppState {
     pub node_runtime: Arc<dyn NodeRuntime>,
 }
 
+struct GlobalAppState(Weak<AppState>);
+
+impl Global for GlobalAppState {}
+
 pub struct WorkspaceStore {
     workspaces: HashSet<WindowHandle<Workspace>>,
     followers: Vec<Follower>,
@@ -345,6 +369,17 @@ struct Follower {
 }
 
 impl AppState {
+    pub fn global(cx: &AppContext) -> Weak<Self> {
+        cx.global::<GlobalAppState>().0.clone()
+    }
+    pub fn try_global(cx: &AppContext) -> Option<Weak<Self>> {
+        cx.try_global::<GlobalAppState>()
+            .map(|state| state.0.clone())
+    }
+    pub fn set_global(state: Weak<AppState>, cx: &mut AppContext) {
+        cx.set_global(GlobalAppState(state));
+    }
+
     #[cfg(any(test, feature = "test-support"))]
     pub fn test(cx: &mut AppContext) -> Arc<Self> {
         use node_runtime::FakeNodeRuntime;
@@ -616,7 +651,7 @@ impl Workspace {
         let modal_layer = cx.new_view(|_| ModalLayer::new());
 
         let mut active_call = None;
-        if let Some(call) = cx.try_global::<Model<ActiveCall>>() {
+        if let Some(call) = ActiveCall::try_global(cx) {
             let call = call.clone();
             let mut subscriptions = Vec::new();
             subscriptions.push(cx.subscribe(&call, Self::on_active_call_event));
@@ -3657,7 +3692,7 @@ impl WorkspaceStore {
         update: proto::update_followers::Variant,
         cx: &AppContext,
     ) -> Option<()> {
-        let active_call = cx.try_global::<Model<ActiveCall>>()?;
+        let active_call = ActiveCall::try_global(cx)?;
         let room_id = active_call.read(cx).room()?.read(cx).id();
         let follower_ids: Vec<_> = self
             .followers
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index d0c7e8d7d7..7497b26f0d 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -59,6 +59,7 @@ project_panel = { path = "../project_panel" }
 project_symbols = { path = "../project_symbols" }
 quick_action_bar = { path = "../quick_action_bar" }
 recent_projects = { path = "../recent_projects" }
+release_channel = { path = "../release_channel" }
 rope = { path = "../rope"}
 rpc = { path = "../rpc" }
 settings = { path = "../settings" }
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index d045637f63..863bdd3712 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -19,6 +19,7 @@ use log::LevelFilter;
 use assets::Assets;
 use node_runtime::RealNodeRuntime;
 use parking_lot::Mutex;
+use release_channel::{parse_zed_link, AppCommitSha, ReleaseChannel, RELEASE_CHANNEL};
 use serde::{Deserialize, Serialize};
 use settings::{
     default_settings, handle_settings_file_changes, watch_config_file, Settings, SettingsStore,
@@ -34,14 +35,13 @@ use std::{
     path::{Path, PathBuf},
     sync::{
         atomic::{AtomicU32, Ordering},
-        Arc, Weak,
+        Arc,
     },
     thread,
 };
 use theme::{ActiveTheme, ThemeRegistry, ThemeSettings};
 use util::{
     async_maybe,
-    channel::{parse_zed_link, AppCommitSha, ReleaseChannel, RELEASE_CHANNEL},
     http::{self, HttpClient, ZedHttpClient},
     paths::{self, CRASHES_DIR, CRASHES_RETIRED_DIR},
     ResultExt,
@@ -102,8 +102,7 @@ fn main() {
     let open_listener = listener.clone();
     app.on_open_urls(move |urls, _| open_listener.open_urls(&urls));
     app.on_reopen(move |cx| {
-        if let Some(app_state) = cx
-            .try_global::<Weak<AppState>>()
+        if let Some(app_state) = AppState::try_global(cx)
             .map(|app_state| app_state.upgrade())
             .flatten()
         {
@@ -115,12 +114,12 @@ fn main() {
     });
 
     app.run(move |cx| {
-        cx.set_global(*RELEASE_CHANNEL);
+        ReleaseChannel::init(cx);
         if let Some(build_sha) = option_env!("ZED_COMMIT_SHA") {
-            cx.set_global(AppCommitSha(build_sha.into()))
+            AppCommitSha::set_global(AppCommitSha(build_sha.into()), cx);
         }
 
-        cx.set_global(listener.clone());
+        OpenListener::set_global(listener.clone(), cx);
 
         load_embedded_fonts(cx);
 
@@ -148,7 +147,7 @@ fn main() {
         let user_store = cx.new_model(|cx| UserStore::new(client.clone(), cx));
         let workspace_store = cx.new_model(|cx| WorkspaceStore::new(client.clone(), cx));
 
-        cx.set_global(client.clone());
+        Client::set_global(client.clone(), cx);
 
         zed::init(cx);
         theme::init(theme::LoadThemes::All(Box::new(Assets)), cx);
@@ -242,7 +241,7 @@ fn main() {
             workspace_store,
             node_runtime,
         });
-        cx.set_global(Arc::downgrade(&app_state));
+        AppState::set_global(Arc::downgrade(&app_state), cx);
 
         audio::init(Assets, cx);
         auto_update::init(http.clone(), cx);
@@ -565,7 +564,7 @@ fn init_panic_hook(app: &App, installation_id: Option<String>, session_id: Strin
             .or_else(|| info.payload().downcast_ref::<String>().map(|s| s.clone()))
             .unwrap_or_else(|| "Box<Any>".to_string());
 
-        if *util::channel::RELEASE_CHANNEL == ReleaseChannel::Dev {
+        if *release_channel::RELEASE_CHANNEL == ReleaseChannel::Dev {
             let location = info.location().unwrap();
             let backtrace = Backtrace::new();
             eprintln!(
diff --git a/crates/zed/src/only_instance.rs b/crates/zed/src/only_instance.rs
index e950392d99..27d8aa02b5 100644
--- a/crates/zed/src/only_instance.rs
+++ b/crates/zed/src/only_instance.rs
@@ -5,7 +5,7 @@ use std::{
     time::Duration,
 };
 
-use util::channel::ReleaseChannel;
+use release_channel::ReleaseChannel;
 
 const LOCALHOST: Ipv4Addr = Ipv4Addr::new(127, 0, 0, 1);
 const CONNECT_TIMEOUT: Duration = Duration::from_millis(10);
@@ -13,7 +13,7 @@ const RECEIVE_TIMEOUT: Duration = Duration::from_millis(35);
 const SEND_TIMEOUT: Duration = Duration::from_millis(20);
 
 fn address() -> SocketAddr {
-    let port = match *util::channel::RELEASE_CHANNEL {
+    let port = match *release_channel::RELEASE_CHANNEL {
         ReleaseChannel::Dev => 43737,
         ReleaseChannel::Preview => 43738,
         ReleaseChannel::Stable => 43739,
@@ -24,7 +24,7 @@ fn address() -> SocketAddr {
 }
 
 fn instance_handshake() -> &'static str {
-    match *util::channel::RELEASE_CHANNEL {
+    match *release_channel::RELEASE_CHANNEL {
         ReleaseChannel::Dev => "Zed Editor Dev Instance Running",
         ReleaseChannel::Nightly => "Zed Editor Nightly Instance Running",
         ReleaseChannel::Preview => "Zed Editor Preview Instance Running",
@@ -39,7 +39,7 @@ pub enum IsOnlyInstance {
 }
 
 pub fn ensure_only_instance() -> IsOnlyInstance {
-    if *db::ZED_STATELESS || *util::channel::RELEASE_CHANNEL == ReleaseChannel::Dev {
+    if *db::ZED_STATELESS || *release_channel::RELEASE_CHANNEL == ReleaseChannel::Dev {
         return IsOnlyInstance::Yes;
     }
 
diff --git a/crates/zed/src/open_listener.rs b/crates/zed/src/open_listener.rs
index f3a10208d0..8ef5d61c6b 100644
--- a/crates/zed/src/open_listener.rs
+++ b/crates/zed/src/open_listener.rs
@@ -6,8 +6,9 @@ use editor::Editor;
 use futures::channel::mpsc::{UnboundedReceiver, UnboundedSender};
 use futures::channel::{mpsc, oneshot};
 use futures::{FutureExt, SinkExt, StreamExt};
-use gpui::AsyncAppContext;
+use gpui::{AppContext, AsyncAppContext, Global};
 use language::{Bias, Point};
+use release_channel::parse_zed_link;
 use std::collections::HashMap;
 use std::ffi::OsStr;
 use std::os::unix::prelude::OsStrExt;
@@ -17,7 +18,6 @@ use std::sync::Arc;
 use std::thread;
 use std::time::Duration;
 use std::{path::PathBuf, sync::atomic::AtomicBool};
-use util::channel::parse_zed_link;
 use util::paths::PathLikeWithPosition;
 use util::ResultExt;
 use workspace::AppState;
@@ -42,7 +42,19 @@ pub struct OpenListener {
     pub triggered: AtomicBool,
 }
 
+struct GlobalOpenListener(Arc<OpenListener>);
+
+impl Global for GlobalOpenListener {}
+
 impl OpenListener {
+    pub fn global(cx: &AppContext) -> Arc<Self> {
+        cx.global::<GlobalOpenListener>().0.clone()
+    }
+
+    pub fn set_global(listener: Arc<OpenListener>, cx: &mut AppContext) {
+        cx.set_global(GlobalOpenListener(listener))
+    }
+
     pub fn new() -> (Self, UnboundedReceiver<OpenRequest>) {
         let (tx, rx) = mpsc::unbounded();
         (
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 86fe95765f..d48b943822 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -20,6 +20,7 @@ use assets::Assets;
 use futures::{channel::mpsc, select_biased, StreamExt};
 use project_panel::ProjectPanel;
 use quick_action_bar::QuickActionBar;
+use release_channel::{AppCommitSha, ReleaseChannel};
 use rope::Rope;
 use search::project_search::ProjectSearchBar;
 use settings::{initial_local_settings_content, KeymapFile, Settings, SettingsStore};
@@ -27,7 +28,6 @@ use std::{borrow::Cow, ops::Deref, path::Path, sync::Arc};
 use terminal_view::terminal_panel::{self, TerminalPanel};
 use util::{
     asset_str,
-    channel::{AppCommitSha, ReleaseChannel},
     paths::{self, LOCAL_SETTINGS_RELATIVE_PATH},
     ResultExt,
 };
@@ -202,8 +202,7 @@ pub fn initialize_workspace(app_state: Arc<AppState>, cx: &mut AppContext) {
                 cx.toggle_full_screen();
             })
             .register_action(|_, action: &OpenZedUrl, cx| {
-                cx.global::<Arc<OpenListener>>()
-                    .open_urls(&[action.url.clone()])
+                OpenListener::global(cx).open_urls(&[action.url.clone()])
             })
             .register_action(|_, action: &OpenBrowser, cx| cx.open_url(&action.url))
             .register_action(move |_, _: &IncreaseBufferFontSize, cx| {
@@ -370,12 +369,12 @@ fn initialize_pane(workspace: &mut Workspace, pane: &View<Pane>, cx: &mut ViewCo
 }
 
 fn about(_: &mut Workspace, _: &About, cx: &mut gpui::ViewContext<Workspace>) {
-    let app_name = cx.global::<ReleaseChannel>().display_name();
+    let app_name = ReleaseChannel::global(cx).display_name();
     let version = env!("CARGO_PKG_VERSION");
     let message = format!("{app_name} {version}");
-    let detail = cx.try_global::<AppCommitSha>().map(|sha| sha.0.as_ref());
+    let detail = AppCommitSha::try_global(cx).map(|sha| sha.0.clone());
 
-    let prompt = cx.prompt(PromptLevel::Info, &message, detail, &["OK"]);
+    let prompt = cx.prompt(PromptLevel::Info, &message, detail.as_deref(), &["OK"]);
     cx.foreground_executor()
         .spawn(async {
             prompt.await.ok();

From e7566026101b37ace3d5c989d2e38db20e4133e2 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Tue, 30 Jan 2024 20:18:39 +0100
Subject: [PATCH 075/372] log: Use local timezone in log timestamps (#7079)

I'm gonna let it sit for a day in case anybody has any objections to
that change.

Release Notes:

- Logs now use local timestamps instead of UTC-based timestamps

---------

Co-authored-by: Beniamin <beniamin@zagan.be>
---
 crates/zed/src/main.rs | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 863bdd3712..ba651cf8e0 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -9,6 +9,7 @@ use client::{Client, UserStore};
 use collab_ui::channel_view::ChannelView;
 use db::kvp::KEY_VALUE_STORE;
 use editor::Editor;
+use env_logger::Builder;
 use fs::RealFs;
 use futures::StreamExt;
 use gpui::{App, AppContext, AsyncAppContext, Context, SemanticVersion, Task};
@@ -483,7 +484,29 @@ fn init_paths() {
 
 fn init_logger() {
     if stdout_is_a_pty() {
-        env_logger::init();
+        Builder::new()
+            .format(|buf, record| {
+                use env_logger::fmt::Color;
+
+                let subtle = buf
+                    .style()
+                    .set_color(Color::Black)
+                    .set_intense(true)
+                    .clone();
+                write!(buf, "{}", subtle.value("["))?;
+                write!(
+                    buf,
+                    "{} ",
+                    chrono::Local::now().format("%Y-%m-%dT%H:%M:%S%:z")
+                )?;
+                write!(buf, "{:<5}", buf.default_styled_level(record.level()))?;
+                if let Some(path) = record.module_path() {
+                    write!(buf, " {}", path)?;
+                }
+                write!(buf, "{}", subtle.value("]"))?;
+                writeln!(buf, " {}", record.args())
+            })
+            .init();
     } else {
         let level = LevelFilter::Info;
 
@@ -503,7 +526,8 @@ fn init_logger() {
             .expect("could not open logfile");
 
         let config = ConfigBuilder::new()
-            .set_time_format_str("%Y-%m-%dT%T") //All timestamps are UTC
+            .set_time_format_str("%Y-%m-%dT%T%:z")
+            .set_time_to_local(true)
             .build();
 
         simplelog::WriteLogger::init(level, config, log_file).expect("could not initialize logger");

From 1d794dbb3700be20cad1eb5a02ea46b7b6c1632e Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Tue, 30 Jan 2024 14:37:29 -0500
Subject: [PATCH 076/372] Only `impl Global` for `DebugBelow` when compiling
 with `debug_assertions` (#7102)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR fixes this error when compiling a release build:

<img width="504" alt="Screenshot 2024-01-30 at 2 30 38 PM"
src="https://github.com/zed-industries/zed/assets/1486634/96470735-2b9e-4945-b4c3-c86ef0168b8c">

`DebugBelow` only exists when compiling with `debug_assertions`, so we
only want to implement it using that same criterion.

Release Notes:

- N/A
---
 crates/gpui/src/style.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/gpui/src/style.rs b/crates/gpui/src/style.rs
index d5209bd5bd..ef2622e3eb 100644
--- a/crates/gpui/src/style.rs
+++ b/crates/gpui/src/style.rs
@@ -14,12 +14,13 @@ pub use taffy::style::{
     Overflow, Position,
 };
 
-#[cfg(debug_assertions)]
 /// Use this struct for interfacing with the 'debug_below' styling from your own elements.
 /// If a parent element has this style set on it, then this struct will be set as a global in
 /// GPUI.
+#[cfg(debug_assertions)]
 pub struct DebugBelow;
 
+#[cfg(debug_assertions)]
 impl Global for DebugBelow {}
 
 /// The CSS styling that can be applied to an element via the `Styled` trait

From a54eaaeceeea9ef3874de4e699d9523fb9482293 Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Tue, 30 Jan 2024 11:42:28 -0800
Subject: [PATCH 077/372] Add raw window handle implementations to GPUI (#7101)

This is in preparation for experiments with wgpu. This should have no
external effect.

Release Notes:

- N/A
---
 Cargo.lock                              |  9 +++++++-
 crates/gpui/Cargo.toml                  |  1 +
 crates/gpui/src/platform.rs             |  9 ++++----
 crates/gpui/src/platform/mac/window.rs  | 30 ++++++++++++++++++++++++-
 crates/gpui/src/platform/test/window.rs | 17 ++++++++++++++
 5 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c3921a00b1..a9c91d04d4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3129,6 +3129,7 @@ dependencies = [
  "png",
  "postage",
  "rand 0.8.5",
+ "raw-window-handle 0.6.0",
  "refineable",
  "resvg",
  "schemars",
@@ -4495,7 +4496,7 @@ dependencies = [
  "jni-sys",
  "ndk-sys",
  "num_enum",
- "raw-window-handle",
+ "raw-window-handle 0.5.2",
  "thiserror",
 ]
 
@@ -5953,6 +5954,12 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
 
+[[package]]
+name = "raw-window-handle"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544"
+
 [[package]]
 name = "rawpointer"
 version = "0.2.1"
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 76d0cdb43d..66acb0c1e6 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -58,6 +58,7 @@ slotmap = "1.0.6"
 schemars.workspace = true
 bitflags = "2.4.0"
 anyhow.workspace = true
+raw-window-handle = "0.6.0"
 
 [dev-dependencies]
 backtrace = "0.3"
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 92dd08f059..67c3a70ccb 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -8,13 +8,14 @@ mod test;
 use crate::{
     Action, AnyWindowHandle, AsyncWindowContext, BackgroundExecutor, Bounds, DevicePixels, Font,
     FontId, FontMetrics, FontRun, ForegroundExecutor, GlobalPixels, GlyphId, Keymap, LineLayout,
-    Pixels, PlatformInput, Point, RenderGlyphParams, RenderImageParams, RenderSvgParams, Result,
-    Scene, SharedString, Size, Task, TaskLabel, WindowContext,
+    Pixels, PlatformInput, Point, RenderGlyphParams, RenderImageParams, RenderSvgParams, Scene,
+    SharedString, Size, Task, TaskLabel, WindowContext,
 };
-use anyhow::anyhow;
+use anyhow::{anyhow, Result};
 use async_task::Runnable;
 use futures::channel::oneshot;
 use parking::Unparker;
+use raw_window_handle::{HasDisplayHandle, HasWindowHandle};
 use seahash::SeaHasher;
 use serde::{Deserialize, Serialize};
 use std::borrow::Cow;
@@ -138,7 +139,7 @@ impl Debug for DisplayId {
 
 unsafe impl Send for DisplayId {}
 
-pub(crate) trait PlatformWindow {
+pub(crate) trait PlatformWindow: HasWindowHandle + HasDisplayHandle {
     fn bounds(&self) -> WindowBounds;
     fn content_size(&self) -> Size<Pixels>;
     fn scale_factor(&self) -> f32;
diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index a244286c2d..ce25c4d6eb 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -32,6 +32,10 @@ use objc::{
     sel, sel_impl,
 };
 use parking_lot::Mutex;
+use raw_window_handle::{
+    AppKitDisplayHandle, AppKitWindowHandle, DisplayHandle, HasDisplayHandle, HasWindowHandle,
+    RawWindowHandle, WindowHandle,
+};
 use smallvec::SmallVec;
 use std::{
     any::Any,
@@ -41,7 +45,7 @@ use std::{
     ops::Range,
     os::raw::c_char,
     path::PathBuf,
-    ptr,
+    ptr::{self, NonNull},
     rc::Rc,
     sync::{Arc, Weak},
     time::Duration,
@@ -316,6 +320,7 @@ struct MacWindowState {
     handle: AnyWindowHandle,
     executor: ForegroundExecutor,
     native_window: id,
+    native_view: NonNull<id>,
     renderer: MetalRenderer,
     kind: WindowKind,
     request_frame_callback: Option<Box<dyn FnMut()>>,
@@ -523,6 +528,7 @@ impl MacWindow {
                 handle,
                 executor,
                 native_window,
+                native_view: NonNull::new_unchecked(native_view as *mut _),
                 renderer: MetalRenderer::new(true),
                 kind: options.kind,
                 request_frame_callback: None,
@@ -1011,6 +1017,28 @@ impl PlatformWindow for MacWindow {
     }
 }
 
+impl HasWindowHandle for MacWindow {
+    fn window_handle(
+        &self,
+    ) -> Result<raw_window_handle::WindowHandle<'_>, raw_window_handle::HandleError> {
+        // SAFETY: The AppKitWindowHandle is a wrapper around a pointer to an NSView
+        unsafe {
+            Ok(WindowHandle::borrow_raw(RawWindowHandle::AppKit(
+                AppKitWindowHandle::new(self.0.lock().native_view.cast()),
+            )))
+        }
+    }
+}
+
+impl HasDisplayHandle for MacWindow {
+    fn display_handle(
+        &self,
+    ) -> Result<raw_window_handle::DisplayHandle<'_>, raw_window_handle::HandleError> {
+        // SAFETY: This is a no-op on macOS
+        unsafe { Ok(DisplayHandle::borrow_raw(AppKitDisplayHandle::new().into())) }
+    }
+}
+
 fn get_scale_factor(native_window: id) -> f32 {
     let factor = unsafe {
         let screen: id = msg_send![native_window, screen];
diff --git a/crates/gpui/src/platform/test/window.rs b/crates/gpui/src/platform/test/window.rs
index af58707c6d..b310084fc4 100644
--- a/crates/gpui/src/platform/test/window.rs
+++ b/crates/gpui/src/platform/test/window.rs
@@ -5,6 +5,7 @@ use crate::{
 };
 use collections::HashMap;
 use parking_lot::Mutex;
+use raw_window_handle::{HasDisplayHandle, HasWindowHandle};
 use std::{
     rc::{Rc, Weak},
     sync::{self, Arc},
@@ -29,6 +30,22 @@ pub(crate) struct TestWindowState {
 #[derive(Clone)]
 pub(crate) struct TestWindow(pub(crate) Arc<Mutex<TestWindowState>>);
 
+impl HasWindowHandle for TestWindow {
+    fn window_handle(
+        &self,
+    ) -> Result<raw_window_handle::WindowHandle<'_>, raw_window_handle::HandleError> {
+        unimplemented!("Test Windows are not backed by a real platform window")
+    }
+}
+
+impl HasDisplayHandle for TestWindow {
+    fn display_handle(
+        &self,
+    ) -> Result<raw_window_handle::DisplayHandle<'_>, raw_window_handle::HandleError> {
+        unimplemented!("Test Windows are not backed by a real platform window")
+    }
+}
+
 impl TestWindow {
     pub fn new(
         options: WindowOptions,

From 2e7f9c48bba495af94622914abe18ed27bb614d5 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Tue, 30 Jan 2024 14:57:54 -0500
Subject: [PATCH 078/372] Use fully-qualified name to avoid an unused import
 (#7104)

This PR adjusts how we implement `Global` conditionally to avoid an
unused import when compiling in release mode.

Release Notes:

- N/A
---
 crates/gpui/src/style.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/gpui/src/style.rs b/crates/gpui/src/style.rs
index ef2622e3eb..6118a0ae96 100644
--- a/crates/gpui/src/style.rs
+++ b/crates/gpui/src/style.rs
@@ -3,8 +3,8 @@ use std::{iter, mem, ops::Range};
 use crate::{
     black, phi, point, quad, rems, AbsoluteLength, Bounds, ContentMask, Corners, CornersRefinement,
     CursorStyle, DefiniteLength, Edges, EdgesRefinement, ElementContext, Font, FontFeatures,
-    FontStyle, FontWeight, Global, Hsla, Length, Pixels, Point, PointRefinement, Rgba,
-    SharedString, Size, SizeRefinement, Styled, TextRun,
+    FontStyle, FontWeight, Hsla, Length, Pixels, Point, PointRefinement, Rgba, SharedString, Size,
+    SizeRefinement, Styled, TextRun,
 };
 use collections::HashSet;
 use refineable::Refineable;
@@ -21,7 +21,7 @@ pub use taffy::style::{
 pub struct DebugBelow;
 
 #[cfg(debug_assertions)]
-impl Global for DebugBelow {}
+impl crate::Global for DebugBelow {}
 
 /// The CSS styling that can be applied to an element via the `Styled` trait
 #[derive(Clone, Refineable, Debug)]

From 911b4b5ae80d9f9a263b2c25e7f614df19315a86 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 30 Jan 2024 13:19:35 -0700
Subject: [PATCH 079/372] Migrate automatically on service start (#7103)

This avoids a forgettable manual step in deploying collab

Release Notes:

- N/A
---
 crates/collab/src/main.rs | 63 +++++++++++++++------------------------
 script/deploy-migration   | 26 ----------------
 2 files changed, 24 insertions(+), 65 deletions(-)
 delete mode 100755 script/deploy-migration

diff --git a/crates/collab/src/main.rs b/crates/collab/src/main.rs
index 87df7cac6f..517a0589a8 100644
--- a/crates/collab/src/main.rs
+++ b/crates/collab/src/main.rs
@@ -28,49 +28,11 @@ async fn main() -> Result<()> {
         Some("version") => {
             println!("collab v{VERSION}");
         }
-        Some("migrate") => {
-            let config = envy::from_env::<MigrateConfig>().expect("error loading config");
-            let mut db_options = db::ConnectOptions::new(config.database_url.clone());
-            db_options.max_connections(5);
-            let db = Database::new(db_options, Executor::Production).await?;
-
-            let migrations_path = config
-                .migrations_path
-                .as_deref()
-                .unwrap_or_else(|| Path::new(concat!(env!("CARGO_MANIFEST_DIR"), "/migrations")));
-
-            let migrations = db.migrate(&migrations_path, false).await?;
-            for (migration, duration) in migrations {
-                println!(
-                    "Ran {} {} {:?}",
-                    migration.version, migration.description, duration
-                );
-            }
-
-            return Ok(());
-        }
         Some("serve") => {
             let config = envy::from_env::<Config>().expect("error loading config");
             init_tracing(&config);
 
-            if config.is_development() {
-                // sanity check database url so even if we deploy a busted ZED_ENVIRONMENT to production
-                // we do not run
-                if config.database_url != "postgres://postgres@localhost/zed" {
-                    panic!("about to run development migrations on a non-development database?")
-                }
-                let migrations_path = Path::new(concat!(env!("CARGO_MANIFEST_DIR"), "/migrations"));
-                let db_options = db::ConnectOptions::new(config.database_url.clone());
-                let db = Database::new(db_options, Executor::Production).await?;
-
-                let migrations = db.migrate(&migrations_path, false).await?;
-                for (migration, duration) in migrations {
-                    println!(
-                        "Ran {} {} {:?}",
-                        migration.version, migration.description, duration
-                    );
-                }
-            }
+            run_migrations().await?;
 
             let state = AppState::new(config).await?;
 
@@ -116,6 +78,29 @@ async fn main() -> Result<()> {
     Ok(())
 }
 
+async fn run_migrations() -> Result<()> {
+    let config = envy::from_env::<MigrateConfig>().expect("error loading config");
+    let db_options = db::ConnectOptions::new(config.database_url.clone());
+    let db = Database::new(db_options, Executor::Production).await?;
+
+    let migrations_path = config
+        .migrations_path
+        .as_deref()
+        .unwrap_or_else(|| Path::new(concat!(env!("CARGO_MANIFEST_DIR"), "/migrations")));
+
+    let migrations = db.migrate(&migrations_path, false).await?;
+    for (migration, duration) in migrations {
+        log::info!(
+            "Migrated {} {} {:?}",
+            migration.version,
+            migration.description,
+            duration
+        );
+    }
+
+    return Ok(());
+}
+
 async fn handle_root() -> String {
     format!("collab v{VERSION}")
 }
diff --git a/script/deploy-migration b/script/deploy-migration
deleted file mode 100755
index 5d90f6575a..0000000000
--- a/script/deploy-migration
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-set -eu
-source script/lib/deploy-helpers.sh
-
-if [[ $# < 2 ]]; then
-  echo "Usage: $0 <production|staging|preview|nightly> <tag-name>"
-  exit 1
-fi
-environment=$1
-version=$2
-
-export_vars_for_environment ${environment}
-image_id=$(image_id_for_version ${version})
-
-export ZED_KUBE_NAMESPACE=${environment}
-export ZED_IMAGE_ID=${image_id}
-export ZED_MIGRATE_JOB_NAME=zed-migrate-${version}
-
-target_zed_kube_cluster
-envsubst < crates/collab/k8s/migrate.template.yml | kubectl apply -f -
-
-pod=$(kubectl --namespace=${environment} get pods --selector=job-name=${ZED_MIGRATE_JOB_NAME} --output=jsonpath='{.items[0].metadata.name}')
-
-echo "Job pod:" $pod
-kubectl --namespace=${environment} logs -f ${pod}

From 3075e58729785784624c257943f3b3f240927730 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 30 Jan 2024 13:22:54 -0700
Subject: [PATCH 080/372] collab 0.43.0

---
 Cargo.lock               | 2 +-
 crates/collab/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a9c91d04d4..f677efdcfd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1431,7 +1431,7 @@ dependencies = [
 
 [[package]]
 name = "collab"
-version = "0.42.1"
+version = "0.43.0"
 dependencies = [
  "anyhow",
  "async-trait",
diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml
index 04523f94e4..ec5de4a9a0 100644
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Nathan Sobo <nathan@zed.dev>"]
 default-run = "collab"
 edition = "2021"
 name = "collab"
-version = "0.42.1"
+version = "0.43.0"
 publish = false
 license = "AGPL-3.0-or-later"
 

From 7f66e366b4670d2949ae1fe803e6e4f575bfe20d Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 30 Jan 2024 13:29:39 -0700
Subject: [PATCH 081/372] Release version of clippy? (#7107)

Release Notes:

- N/A
---
 .github/actions/check_style/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/check_style/action.yml b/.github/actions/check_style/action.yml
index 1577377911..d4e5d62f2c 100644
--- a/.github/actions/check_style/action.yml
+++ b/.github/actions/check_style/action.yml
@@ -14,7 +14,7 @@ runs:
       # so specify those here, and disable the rest until Zed's workspace
       # will have more fixes & suppression for the standard lint set
       run: |
-        cargo clippy --workspace --all-features --all-targets -- -A clippy::all -D clippy::dbg_macro -D clippy::todo
+        cargo clippy --release --workspace --all-features --all-targets -- -A clippy::all -D clippy::dbg_macro -D clippy::todo
         cargo clippy -p gpui
 
     - name: Find modified migrations

From a5826e22f5e1cc210d3d30e45075f4288ca9827e Mon Sep 17 00:00:00 2001
From: Derrick Laird <swampdonk@gmail.com>
Date: Tue, 30 Jan 2024 13:48:33 -0700
Subject: [PATCH 082/372] Add Go file icon (#7110)

![IMG_4664](https://github.com/zed-industries/zed/assets/8725798/75436116-7c7e-4ae6-b76c-13f21c52bee8)

Release Notes:

- Added icon to `.go` files
---
 assets/icons/file_icons/file_types.json | 5 ++++-
 assets/icons/file_icons/go.svg          | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 assets/icons/file_icons/go.svg

diff --git a/assets/icons/file_icons/file_types.json b/assets/icons/file_icons/file_types.json
index a77f187a28..e5510d8599 100644
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -39,7 +39,7 @@
         "gitignore": "vcs",
         "gitmodules": "vcs",
         "gitkeep": "vcs",
-        "go": "code",
+        "go": "go",
         "h": "code",
         "handlebars": "code",
         "hbs": "template",
@@ -156,6 +156,9 @@
         "haskell": {
             "icon": "icons/file_icons/haskell.svg"
         },
+        "go": {
+            "icon": "icons/file_icons/go.svg"
+        },
         "image": {
             "icon": "icons/file_icons/image.svg"
         },
diff --git a/assets/icons/file_icons/go.svg b/assets/icons/file_icons/go.svg
new file mode 100644
index 0000000000..f8dba3e3f8
--- /dev/null
+++ b/assets/icons/file_icons/go.svg
@@ -0,0 +1 @@
+<svg height="14" viewBox="0 0 207 78" width="14" xmlns="http://www.w3.org/2000/svg"><g fill="#000000"><path d="m16.2 24.1c-.4 0-.5-.2-.3-.5l2.1-2.7c.2-.3.7-.5 1.1-.5h35.7c.4 0 .5.3.3.6l-1.7 2.6c-.2.3-.7.6-1 .6z"/><path d="m1.1 33.3c-.4 0-.5-.2-.3-.5l2.1-2.7c.2-.3.7-.5 1.1-.5h45.6c.4 0 .6.3.5.6l-.8 2.4c-.1.4-.5.6-.9.6z"/><path d="m25.3 42.5c-.4 0-.5-.3-.3-.6l1.4-2.5c.2-.3.6-.6 1-.6h20c.4 0 .6.3.6.7l-.2 2.4c0 .4-.4.7-.7.7z"/><g transform="translate(55)"><path d="m74.1 22.3c-6.3 1.6-10.6 2.8-16.8 4.4-1.5.4-1.6.5-2.9-1-1.5-1.7-2.6-2.8-4.7-3.8-6.3-3.1-12.4-2.2-18.1 1.5-6.8 4.4-10.3 10.9-10.2 19 .1 8 5.6 14.6 13.5 15.7 6.8.9 12.5-1.5 17-6.6.9-1.1 1.7-2.3 2.7-3.7-3.6 0-8.1 0-19.3 0-2.1 0-2.6-1.3-1.9-3 1.3-3.1 3.7-8.3 5.1-10.9.3-.6 1-1.6 2.5-1.6h36.4c-.2 2.7-.2 5.4-.6 8.1-1.1 7.2-3.8 13.8-8.2 19.6-7.2 9.5-16.6 15.4-28.5 17-9.8 1.3-18.9-.6-26.9-6.6-7.4-5.6-11.6-13-12.7-22.2-1.3-10.9 1.9-20.7 8.5-29.3 7.1-9.3 16.5-15.2 28-17.3 9.4-1.7 18.4-.6 26.5 4.9 5.3 3.5 9.1 8.3 11.6 14.1.6.9.2 1.4-1 1.7z"/><path d="m107.2 77.6c-9.1-.2-17.4-2.8-24.4-8.8-5.9-5.1-9.6-11.6-10.8-19.3-1.8-11.3 1.3-21.3 8.1-30.2 7.3-9.6 16.1-14.6 28-16.7 10.2-1.8 19.8-.8 28.5 5.1 7.9 5.4 12.8 12.7 14.1 22.3 1.7 13.5-2.2 24.5-11.5 33.9-6.6 6.7-14.7 10.9-24 12.8-2.7.5-5.4.6-8 .9zm23.8-40.4c-.1-1.3-.1-2.3-.3-3.3-1.8-9.9-10.9-15.5-20.4-13.3-9.3 2.1-15.3 8-17.5 17.4-1.8 7.8 2 15.7 9.2 18.9 5.5 2.4 11 2.1 16.3-.6 7.9-4.1 12.2-10.5 12.7-19.1z" fill-rule="nonzero"/></g></g></svg>

From 871b8525b4741e7b4275623d5c6813713b49ecfa Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 30 Jan 2024 14:38:51 -0700
Subject: [PATCH 083/372] Fix per-env settings override (#7114)

Due to a misplaced .trim(), the RELEASE_CHANNEL_NAME included the
trailing newline.

Release Notes:

- N/A
---
 crates/release_channel/src/lib.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/release_channel/src/lib.rs b/crates/release_channel/src/lib.rs
index 06860e9af5..410b02868e 100644
--- a/crates/release_channel/src/lib.rs
+++ b/crates/release_channel/src/lib.rs
@@ -6,14 +6,14 @@ use std::env;
 pub static RELEASE_CHANNEL_NAME: Lazy<String> = if cfg!(debug_assertions) {
     Lazy::new(|| {
         env::var("ZED_RELEASE_CHANNEL")
-            .unwrap_or_else(|_| include_str!("../../zed/RELEASE_CHANNEL").to_string())
+            .unwrap_or_else(|_| include_str!("../../zed/RELEASE_CHANNEL").trim().to_string())
     })
 } else {
-    Lazy::new(|| include_str!("../../zed/RELEASE_CHANNEL").to_string())
+    Lazy::new(|| include_str!("../../zed/RELEASE_CHANNEL").trim().to_string())
 };
 #[doc(hidden)]
 pub static RELEASE_CHANNEL: Lazy<ReleaseChannel> =
-    Lazy::new(|| match RELEASE_CHANNEL_NAME.as_str().trim() {
+    Lazy::new(|| match RELEASE_CHANNEL_NAME.as_str() {
         "dev" => ReleaseChannel::Dev,
         "nightly" => ReleaseChannel::Nightly,
         "preview" => ReleaseChannel::Preview,

From cbcaca4153e7644c096d4df231c819d7cf1c32bc Mon Sep 17 00:00:00 2001
From: Felix Salazar <fxsalazar@users.noreply.github.com>
Date: Tue, 30 Jan 2024 22:57:42 +0100
Subject: [PATCH 084/372] Show highlighted symbol in the scrollbar (#7029)

Release Notes:

- Added highlighted symbols to the scrollbar; partially mentioned in:
  - https://github.com/zed-industries/zed/issues/5308
  - https://github.com/zed-industries/zed/issues/4866
---
 assets/settings/default.json         |  4 ++-
 crates/editor/src/editor_settings.rs |  5 +++
 crates/editor/src/element.rs         | 51 +++++++++++++++++++++++++---
 3 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index f81f2b0252..914baeede7 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -111,7 +111,9 @@
     // Whether to show git diff indicators in the scrollbar.
     "git_diff": true,
     // Whether to show selections in the scrollbar.
-    "selections": true
+    "selections": true,
+    // Whether to show symbols selections in the scrollbar.
+    "symbols_selections": true
   },
   "relative_line_numbers": false,
   // When to populate a new search's query based on the text under the cursor.
diff --git a/crates/editor/src/editor_settings.rs b/crates/editor/src/editor_settings.rs
index 212ce9fd34..7a5f074d44 100644
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -31,6 +31,7 @@ pub struct Scrollbar {
     pub show: ShowScrollbar,
     pub git_diff: bool,
     pub selections: bool,
+    pub symbols_selections: bool,
 }
 
 /// When to show the scrollbar in the editor.
@@ -103,6 +104,10 @@ pub struct ScrollbarContent {
     ///
     /// Default: true
     pub selections: Option<bool>,
+    /// Whether to show symbols highlighted markers in the scrollbar.
+    ///
+    /// Default: true
+    pub symbols_selections: Option<bool>,
 }
 
 impl Settings for EditorSettings {
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 8a944c2cb4..2c5bf48395 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -16,9 +16,10 @@ use crate::{
     },
     mouse_context_menu,
     scroll::scroll_amount::ScrollAmount,
-    CursorShape, DisplayPoint, Editor, EditorMode, EditorSettings, EditorSnapshot, EditorStyle,
-    HalfPageDown, HalfPageUp, HoveredCursor, LineDown, LineUp, OpenExcerpts, PageDown, PageUp,
-    Point, SelectPhase, Selection, SoftWrap, ToPoint, CURSORS_VISIBLE_FOR, MAX_LINE_LEN,
+    CursorShape, DisplayPoint, DocumentHighlightRead, DocumentHighlightWrite, Editor, EditorMode,
+    EditorSettings, EditorSnapshot, EditorStyle, HalfPageDown, HalfPageUp, HoveredCursor, LineDown,
+    LineUp, OpenExcerpts, PageDown, PageUp, Point, SelectPhase, Selection, SoftWrap, ToPoint,
+    CURSORS_VISIBLE_FOR, MAX_LINE_LEN,
 };
 use anyhow::Result;
 use collections::{BTreeMap, HashMap};
@@ -1366,6 +1367,44 @@ impl EditorElement {
                 }
             }
 
+            if layout.is_singleton && scrollbar_settings.symbols_selections {
+                let selection_ranges = self.editor.read(cx).background_highlights_in_range(
+                    Anchor::min()..Anchor::max(),
+                    &layout.position_map.snapshot,
+                    cx.theme().colors(),
+                );
+                for hunk in selection_ranges {
+                    let start_display = Point::new(hunk.0.start.row(), 0)
+                        .to_display_point(&layout.position_map.snapshot.display_snapshot);
+                    let end_display = Point::new(hunk.0.end.row(), 0)
+                        .to_display_point(&layout.position_map.snapshot.display_snapshot);
+                    let start_y = y_for_row(start_display.row() as f32);
+                    let mut end_y = if hunk.0.start == hunk.0.end {
+                        y_for_row((end_display.row() + 1) as f32)
+                    } else {
+                        y_for_row((end_display.row()) as f32)
+                    };
+
+                    if end_y - start_y < px(1.) {
+                        end_y = start_y + px(1.);
+                    }
+                    let bounds = Bounds::from_corners(point(left, start_y), point(right, end_y));
+
+                    cx.paint_quad(quad(
+                        bounds,
+                        Corners::default(),
+                        cx.theme().status().info,
+                        Edges {
+                            top: Pixels::ZERO,
+                            right: px(1.),
+                            bottom: Pixels::ZERO,
+                            left: px(1.),
+                        },
+                        cx.theme().colors().scrollbar_thumb_border,
+                    ));
+                }
+            }
+
             if layout.is_singleton && scrollbar_settings.git_diff {
                 for hunk in layout
                     .position_map
@@ -2032,8 +2071,12 @@ impl EditorElement {
                     ||
                     // Selections
                     (is_singleton && scrollbar_settings.selections && editor.has_background_highlights::<BufferSearchHighlights>())
+                    ||
+                    // Symbols Selections
+                    (is_singleton && scrollbar_settings.symbols_selections && (editor.has_background_highlights::<DocumentHighlightRead>() || editor.has_background_highlights::<DocumentHighlightWrite>()))
+                    ||
                     // Scrollmanager
-                    || editor.scroll_manager.scrollbars_visible()
+                    editor.scroll_manager.scrollbars_visible()
                 }
                 ShowScrollbar::System => editor.scroll_manager.scrollbars_visible(),
                 ShowScrollbar::Always => true,

From 176f63e86eefeaf1673ca2bc25a2dec3fbc4c126 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Tue, 30 Jan 2024 19:20:15 -0500
Subject: [PATCH 085/372] Add ability to copy a permalink to a line (#7119)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR adds the ability to copy the permalink to a line from within
Zed.

This functionality is available through the `editor: copy permalink to
line` action in the command palette:

<img width="589" alt="Screenshot 2024-01-30 at 7 07 46 PM"
src="https://github.com/zed-industries/zed/assets/1486634/332282cb-211f-4f16-9eb1-415bcfee9b7b">

Executing this action will create a permalink to the currently selected
line(s) and copy it to the clipboard.

Here is an example line:

```
https://github.com/maxdeviant/auk/blob/56c80e80112744740be1969c89fdd34db4be6f64/src/lib.rs#L25
```

Currently, both GitHub and GitLab are supported.

### Notes and known limitations

- In order to determine where to permalink to, we read the URL of the
`origin` remote in Git. This feature will not work if the `origin`
remote is not present.
- Attempting to permalink to a ref that is not pushed to the origin will
result in the link 404ing.
- Attempting to permalink when Git is in a dirty state may not generate
the right link.
- For instance, modifying a file (e.g., adding new lines) and grabbing a
permalink to it will result in incorrect line numbers.

Release Notes:

- Added the ability to copy a permalink to a line
([#6777](https://github.com/zed-industries/zed/issues/6777)).
- Available via the `editor: copy permalink to line` action in the
command palette.
---
 Cargo.lock                         |   1 +
 Cargo.toml                         |   1 +
 crates/channel/Cargo.toml          |   2 +-
 crates/client/Cargo.toml           |   2 +-
 crates/editor/Cargo.toml           |   1 +
 crates/editor/src/actions.rs       |   1 +
 crates/editor/src/editor.rs        |  39 +++-
 crates/editor/src/element.rs       |   1 +
 crates/editor/src/git.rs           |   2 +
 crates/editor/src/git/permalink.rs | 288 +++++++++++++++++++++++++++++
 crates/fs/src/repository.rs        |  24 +++
 crates/util/Cargo.toml             |   2 +-
 crates/zed/Cargo.toml              |   2 +-
 13 files changed, 361 insertions(+), 5 deletions(-)
 create mode 100644 crates/editor/src/git/permalink.rs

diff --git a/Cargo.lock b/Cargo.lock
index f677efdcfd..737ce42797 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2336,6 +2336,7 @@ dependencies = [
  "tree-sitter-typescript",
  "ui",
  "unindent",
+ "url",
  "util",
  "workspace",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index c254233b33..e2723f5ee7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -132,6 +132,7 @@ tree-sitter = { version = "0.20" }
 unindent = { version = "0.1.7" }
 pretty_assertions = "1.3.0"
 git2 = { version = "0.15", default-features = false}
+url = "2.2"
 uuid = { version = "1.1.2", features = ["v4"] }
 
 tree-sitter-bash = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "7331995b19b8f8aba2d5e26deb51d2195c18bc94" }
diff --git a/crates/channel/Cargo.toml b/crates/channel/Cargo.toml
index f33f7e7f34..8c3e6dea21 100644
--- a/crates/channel/Cargo.toml
+++ b/crates/channel/Cargo.toml
@@ -42,7 +42,7 @@ thiserror.workspace = true
 time.workspace = true
 tiny_http = "0.8"
 uuid.workspace = true
-url = "2.2"
+url.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 tempfile = "3"
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
index fe012ddcc5..7cf00e7df0 100644
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -46,7 +46,7 @@ thiserror.workspace = true
 time.workspace = true
 tiny_http = "0.8"
 uuid.workspace = true
-url = "2.2"
+url.workspace = true
 
 [dev-dependencies]
 collections = { path = "../collections", features = ["test-support"] }
diff --git a/crates/editor/Cargo.toml b/crates/editor/Cargo.toml
index d21d431ff9..bd117d10a4 100644
--- a/crates/editor/Cargo.toml
+++ b/crates/editor/Cargo.toml
@@ -67,6 +67,7 @@ serde_json.workspace = true
 serde_derive.workspace = true
 smallvec.workspace = true
 smol.workspace = true
+url.workspace = true
 
 tree-sitter-rust = { workspace = true, optional = true }
 tree-sitter-html = { workspace = true, optional = true }
diff --git a/crates/editor/src/actions.rs b/crates/editor/src/actions.rs
index 9cfaeaaf4a..dd3735c6a9 100644
--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -110,6 +110,7 @@ gpui::actions!(
         Copy,
         CopyHighlightJson,
         CopyPath,
+        CopyPermalinkToLine,
         CopyRelativePath,
         Cut,
         CutToEndOfLine,
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index c1b2f2087d..b6b2bac7be 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -117,7 +117,7 @@ use ui::{
     h_flex, prelude::*, ButtonSize, ButtonStyle, IconButton, IconName, IconSize, ListItem, Popover,
     Tooltip,
 };
-use util::{post_inc, RangeExt, ResultExt, TryFutureExt};
+use util::{maybe, post_inc, RangeExt, ResultExt, TryFutureExt};
 use workspace::{searchable::SearchEvent, ItemNavHistory, Pane, SplitDirection, ViewId, Workspace};
 
 const CURSOR_BLINK_INTERVAL: Duration = Duration::from_millis(500);
@@ -8215,6 +8215,43 @@ impl Editor {
         }
     }
 
+    pub fn copy_permalink_to_line(&mut self, _: &CopyPermalinkToLine, cx: &mut ViewContext<Self>) {
+        use git::permalink::{build_permalink, BuildPermalinkParams};
+
+        let permalink = maybe!({
+            let project = self.project.clone()?;
+            let project = project.read(cx);
+
+            let worktree = project.visible_worktrees(cx).next()?;
+
+            let mut cwd = worktree.read(cx).abs_path().to_path_buf();
+            cwd.push(".git");
+
+            let repo = project.fs().open_repo(&cwd)?;
+            let origin_url = repo.lock().remote_url("origin")?;
+            let sha = repo.lock().head_sha()?;
+
+            let buffer = self.buffer().read(cx).as_singleton()?;
+            let file = buffer.read(cx).file().and_then(|f| f.as_local())?;
+            let path = file.path().to_str().map(|path| path.to_string())?;
+
+            let selections = self.selections.all::<Point>(cx);
+            let selection = selections.iter().peekable().next();
+
+            build_permalink(BuildPermalinkParams {
+                remote_url: &origin_url,
+                sha: &sha,
+                path: &path,
+                selection: selection.map(|selection| selection.range()),
+            })
+            .log_err()
+        });
+
+        if let Some(permalink) = permalink {
+            cx.write_to_clipboard(ClipboardItem::new(permalink.to_string()));
+        }
+    }
+
     pub fn highlight_rows(&mut self, rows: Option<Range<u32>>) {
         self.highlighted_rows = rows;
     }
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 2c5bf48395..7f37f539d3 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -277,6 +277,7 @@ impl EditorElement {
         register_action(view, cx, Editor::copy_path);
         register_action(view, cx, Editor::copy_relative_path);
         register_action(view, cx, Editor::copy_highlight_json);
+        register_action(view, cx, Editor::copy_permalink_to_line);
         register_action(view, cx, |editor, action, cx| {
             if let Some(task) = editor.format(action, cx) {
                 task.detach_and_log_err(cx);
diff --git a/crates/editor/src/git.rs b/crates/editor/src/git.rs
index 6eb80b99fc..18e544e4a6 100644
--- a/crates/editor/src/git.rs
+++ b/crates/editor/src/git.rs
@@ -1,3 +1,5 @@
+pub mod permalink;
+
 use std::ops::Range;
 
 use git::diff::{DiffHunk, DiffHunkStatus};
diff --git a/crates/editor/src/git/permalink.rs b/crates/editor/src/git/permalink.rs
new file mode 100644
index 0000000000..1dc1aa3953
--- /dev/null
+++ b/crates/editor/src/git/permalink.rs
@@ -0,0 +1,288 @@
+use std::ops::Range;
+
+use anyhow::{anyhow, Result};
+use language::Point;
+use url::Url;
+
+enum GitHostingProvider {
+    Github,
+    Gitlab,
+}
+
+impl GitHostingProvider {
+    fn base_url(&self) -> Url {
+        let base_url = match self {
+            Self::Github => "https://github.com",
+            Self::Gitlab => "https://gitlab.com",
+        };
+
+        Url::parse(&base_url).unwrap()
+    }
+
+    /// Returns the fragment portion of the URL for the selected lines in
+    /// the representation the [`GitHostingProvider`] expects.
+    fn line_fragment(&self, selection: &Range<Point>) -> String {
+        if selection.start.row == selection.end.row {
+            let line = selection.start.row + 1;
+
+            match self {
+                Self::Github | Self::Gitlab => format!("L{}", line),
+            }
+        } else {
+            let start_line = selection.start.row + 1;
+            let end_line = selection.end.row + 1;
+
+            match self {
+                Self::Github => format!("L{}-L{}", start_line, end_line),
+                Self::Gitlab => format!("L{}-{}", start_line, end_line),
+            }
+        }
+    }
+}
+
+pub struct BuildPermalinkParams<'a> {
+    pub remote_url: &'a str,
+    pub sha: &'a str,
+    pub path: &'a str,
+    pub selection: Option<Range<Point>>,
+}
+
+pub fn build_permalink(params: BuildPermalinkParams) -> Result<Url> {
+    let BuildPermalinkParams {
+        remote_url,
+        sha,
+        path,
+        selection,
+    } = params;
+
+    let ParsedGitRemote {
+        provider,
+        owner,
+        repo,
+    } = parse_git_remote_url(remote_url)
+        .ok_or_else(|| anyhow!("failed to parse Git remote URL"))?;
+
+    let path = match provider {
+        GitHostingProvider::Github => format!("{owner}/{repo}/blob/{sha}/{path}"),
+        GitHostingProvider::Gitlab => format!("{owner}/{repo}/-/blob/{sha}/{path}"),
+    };
+    let line_fragment = selection.map(|selection| provider.line_fragment(&selection));
+
+    let mut permalink = provider.base_url().join(&path).unwrap();
+    permalink.set_fragment(line_fragment.as_deref());
+
+    Ok(permalink)
+}
+
+struct ParsedGitRemote<'a> {
+    pub provider: GitHostingProvider,
+    pub owner: &'a str,
+    pub repo: &'a str,
+}
+
+fn parse_git_remote_url(url: &str) -> Option<ParsedGitRemote> {
+    if url.starts_with("git@github.com:") || url.starts_with("https://github.com/") {
+        let repo_with_owner = url
+            .trim_start_matches("git@github.com:")
+            .trim_start_matches("https://github.com/")
+            .trim_end_matches(".git");
+
+        let (owner, repo) = repo_with_owner.split_once("/")?;
+
+        return Some(ParsedGitRemote {
+            provider: GitHostingProvider::Github,
+            owner,
+            repo,
+        });
+    }
+
+    if url.starts_with("git@gitlab.com:") || url.starts_with("https://gitlab.com/") {
+        let repo_with_owner = url
+            .trim_start_matches("git@gitlab.com:")
+            .trim_start_matches("https://gitlab.com/")
+            .trim_end_matches(".git");
+
+        let (owner, repo) = repo_with_owner.split_once("/")?;
+
+        return Some(ParsedGitRemote {
+            provider: GitHostingProvider::Gitlab,
+            owner,
+            repo,
+        });
+    }
+
+    None
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_build_github_permalink_from_ssh_url() {
+        let permalink = build_permalink(BuildPermalinkParams {
+            remote_url: "git@github.com:zed-industries/zed.git",
+            sha: "e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7",
+            path: "crates/editor/src/git/permalink.rs",
+            selection: None,
+        })
+        .unwrap();
+
+        let expected_url = "https://github.com/zed-industries/zed/blob/e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7/crates/editor/src/git/permalink.rs";
+        assert_eq!(permalink.to_string(), expected_url.to_string())
+    }
+
+    #[test]
+    fn test_build_github_permalink_from_ssh_url_single_line_selection() {
+        let permalink = build_permalink(BuildPermalinkParams {
+            remote_url: "git@github.com:zed-industries/zed.git",
+            sha: "e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7",
+            path: "crates/editor/src/git/permalink.rs",
+            selection: Some(Point::new(6, 1)..Point::new(6, 10)),
+        })
+        .unwrap();
+
+        let expected_url = "https://github.com/zed-industries/zed/blob/e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7/crates/editor/src/git/permalink.rs#L7";
+        assert_eq!(permalink.to_string(), expected_url.to_string())
+    }
+
+    #[test]
+    fn test_build_github_permalink_from_ssh_url_multi_line_selection() {
+        let permalink = build_permalink(BuildPermalinkParams {
+            remote_url: "git@github.com:zed-industries/zed.git",
+            sha: "e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7",
+            path: "crates/editor/src/git/permalink.rs",
+            selection: Some(Point::new(23, 1)..Point::new(47, 10)),
+        })
+        .unwrap();
+
+        let expected_url = "https://github.com/zed-industries/zed/blob/e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7/crates/editor/src/git/permalink.rs#L24-L48";
+        assert_eq!(permalink.to_string(), expected_url.to_string())
+    }
+
+    #[test]
+    fn test_build_github_permalink_from_https_url() {
+        let permalink = build_permalink(BuildPermalinkParams {
+            remote_url: "https://github.com/zed-industries/zed.git",
+            sha: "b2efec9824c45fcc90c9a7eb107a50d1772a60aa",
+            path: "crates/zed/src/main.rs",
+            selection: None,
+        })
+        .unwrap();
+
+        let expected_url = "https://github.com/zed-industries/zed/blob/b2efec9824c45fcc90c9a7eb107a50d1772a60aa/crates/zed/src/main.rs";
+        assert_eq!(permalink.to_string(), expected_url.to_string())
+    }
+
+    #[test]
+    fn test_build_github_permalink_from_https_url_single_line_selection() {
+        let permalink = build_permalink(BuildPermalinkParams {
+            remote_url: "https://github.com/zed-industries/zed.git",
+            sha: "b2efec9824c45fcc90c9a7eb107a50d1772a60aa",
+            path: "crates/zed/src/main.rs",
+            selection: Some(Point::new(6, 1)..Point::new(6, 10)),
+        })
+        .unwrap();
+
+        let expected_url = "https://github.com/zed-industries/zed/blob/b2efec9824c45fcc90c9a7eb107a50d1772a60aa/crates/zed/src/main.rs#L7";
+        assert_eq!(permalink.to_string(), expected_url.to_string())
+    }
+
+    #[test]
+    fn test_build_github_permalink_from_https_url_multi_line_selection() {
+        let permalink = build_permalink(BuildPermalinkParams {
+            remote_url: "https://github.com/zed-industries/zed.git",
+            sha: "b2efec9824c45fcc90c9a7eb107a50d1772a60aa",
+            path: "crates/zed/src/main.rs",
+            selection: Some(Point::new(23, 1)..Point::new(47, 10)),
+        })
+        .unwrap();
+
+        let expected_url = "https://github.com/zed-industries/zed/blob/b2efec9824c45fcc90c9a7eb107a50d1772a60aa/crates/zed/src/main.rs#L24-L48";
+        assert_eq!(permalink.to_string(), expected_url.to_string())
+    }
+
+    #[test]
+    fn test_build_gitlab_permalink_from_ssh_url() {
+        let permalink = build_permalink(BuildPermalinkParams {
+            remote_url: "git@gitlab.com:zed-industries/zed.git",
+            sha: "e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7",
+            path: "crates/editor/src/git/permalink.rs",
+            selection: None,
+        })
+        .unwrap();
+
+        let expected_url = "https://gitlab.com/zed-industries/zed/-/blob/e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7/crates/editor/src/git/permalink.rs";
+        assert_eq!(permalink.to_string(), expected_url.to_string())
+    }
+
+    #[test]
+    fn test_build_gitlab_permalink_from_ssh_url_single_line_selection() {
+        let permalink = build_permalink(BuildPermalinkParams {
+            remote_url: "git@gitlab.com:zed-industries/zed.git",
+            sha: "e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7",
+            path: "crates/editor/src/git/permalink.rs",
+            selection: Some(Point::new(6, 1)..Point::new(6, 10)),
+        })
+        .unwrap();
+
+        let expected_url = "https://gitlab.com/zed-industries/zed/-/blob/e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7/crates/editor/src/git/permalink.rs#L7";
+        assert_eq!(permalink.to_string(), expected_url.to_string())
+    }
+
+    #[test]
+    fn test_build_gitlab_permalink_from_ssh_url_multi_line_selection() {
+        let permalink = build_permalink(BuildPermalinkParams {
+            remote_url: "git@gitlab.com:zed-industries/zed.git",
+            sha: "e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7",
+            path: "crates/editor/src/git/permalink.rs",
+            selection: Some(Point::new(23, 1)..Point::new(47, 10)),
+        })
+        .unwrap();
+
+        let expected_url = "https://gitlab.com/zed-industries/zed/-/blob/e6ebe7974deb6bb6cc0e2595c8ec31f0c71084b7/crates/editor/src/git/permalink.rs#L24-48";
+        assert_eq!(permalink.to_string(), expected_url.to_string())
+    }
+
+    #[test]
+    fn test_build_gitlab_permalink_from_https_url() {
+        let permalink = build_permalink(BuildPermalinkParams {
+            remote_url: "https://gitlab.com/zed-industries/zed.git",
+            sha: "b2efec9824c45fcc90c9a7eb107a50d1772a60aa",
+            path: "crates/zed/src/main.rs",
+            selection: None,
+        })
+        .unwrap();
+
+        let expected_url = "https://gitlab.com/zed-industries/zed/-/blob/b2efec9824c45fcc90c9a7eb107a50d1772a60aa/crates/zed/src/main.rs";
+        assert_eq!(permalink.to_string(), expected_url.to_string())
+    }
+
+    #[test]
+    fn test_build_gitlab_permalink_from_https_url_single_line_selection() {
+        let permalink = build_permalink(BuildPermalinkParams {
+            remote_url: "https://gitlab.com/zed-industries/zed.git",
+            sha: "b2efec9824c45fcc90c9a7eb107a50d1772a60aa",
+            path: "crates/zed/src/main.rs",
+            selection: Some(Point::new(6, 1)..Point::new(6, 10)),
+        })
+        .unwrap();
+
+        let expected_url = "https://gitlab.com/zed-industries/zed/-/blob/b2efec9824c45fcc90c9a7eb107a50d1772a60aa/crates/zed/src/main.rs#L7";
+        assert_eq!(permalink.to_string(), expected_url.to_string())
+    }
+
+    #[test]
+    fn test_build_gitlab_permalink_from_https_url_multi_line_selection() {
+        let permalink = build_permalink(BuildPermalinkParams {
+            remote_url: "https://gitlab.com/zed-industries/zed.git",
+            sha: "b2efec9824c45fcc90c9a7eb107a50d1772a60aa",
+            path: "crates/zed/src/main.rs",
+            selection: Some(Point::new(23, 1)..Point::new(47, 10)),
+        })
+        .unwrap();
+
+        let expected_url = "https://gitlab.com/zed-industries/zed/-/blob/b2efec9824c45fcc90c9a7eb107a50d1772a60aa/crates/zed/src/main.rs#L24-48";
+        assert_eq!(permalink.to_string(), expected_url.to_string())
+    }
+}
diff --git a/crates/fs/src/repository.rs b/crates/fs/src/repository.rs
index 620ea72acc..4bd666381c 100644
--- a/crates/fs/src/repository.rs
+++ b/crates/fs/src/repository.rs
@@ -26,8 +26,14 @@ pub struct Branch {
 pub trait GitRepository: Send {
     fn reload_index(&self);
     fn load_index_text(&self, relative_file_path: &Path) -> Option<String>;
+
+    /// Returns the URL of the remote with the given name.
+    fn remote_url(&self, name: &str) -> Option<String>;
     fn branch_name(&self) -> Option<String>;
 
+    /// Returns the SHA of the current HEAD.
+    fn head_sha(&self) -> Option<String>;
+
     /// Get the statuses of all of the files in the index that start with the given
     /// path and have changes with respect to the HEAD commit. This is fast because
     /// the index stores hashes of trees, so that unchanged directories can be skipped.
@@ -88,12 +94,22 @@ impl GitRepository for LibGitRepository {
         None
     }
 
+    fn remote_url(&self, name: &str) -> Option<String> {
+        let remote = self.find_remote(name).ok()?;
+        remote.url().map(|url| url.to_string())
+    }
+
     fn branch_name(&self) -> Option<String> {
         let head = self.head().log_err()?;
         let branch = String::from_utf8_lossy(head.shorthand_bytes());
         Some(branch.to_string())
     }
 
+    fn head_sha(&self) -> Option<String> {
+        let head = self.head().ok()?;
+        head.target().map(|oid| oid.to_string())
+    }
+
     fn staged_statuses(&self, path_prefix: &Path) -> TreeMap<RepoPath, GitFileStatus> {
         let mut map = TreeMap::default();
 
@@ -255,11 +271,19 @@ impl GitRepository for FakeGitRepository {
         state.index_contents.get(path).cloned()
     }
 
+    fn remote_url(&self, _name: &str) -> Option<String> {
+        None
+    }
+
     fn branch_name(&self) -> Option<String> {
         let state = self.state.lock();
         state.branch_name.clone()
     }
 
+    fn head_sha(&self) -> Option<String> {
+        None
+    }
+
     fn staged_statuses(&self, path_prefix: &Path) -> TreeMap<RepoPath, GitFileStatus> {
         let mut map = TreeMap::default();
         let state = self.state.lock();
diff --git a/crates/util/Cargo.toml b/crates/util/Cargo.toml
index 924c6fe688..a1045f8f82 100644
--- a/crates/util/Cargo.toml
+++ b/crates/util/Cargo.toml
@@ -21,7 +21,7 @@ lazy_static.workspace = true
 futures.workspace = true
 isahc.workspace = true
 smol.workspace = true
-url = "2.2"
+url.workspace = true
 rand.workspace = true
 rust-embed.workspace = true
 tempfile = { workspace = true, optional = true }
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 7497b26f0d..3741efbad0 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -148,7 +148,7 @@ tree-sitter-vue.workspace = true
 tree-sitter-uiua.workspace = true
 tree-sitter-zig.workspace = true
 
-url = "2.2"
+url.workspace = true
 urlencoding = "2.1.2"
 uuid.workspace = true
 

From d97e780135cfee67dad0379bb9f4a0ce7dac4b9f Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Tue, 30 Jan 2024 20:49:58 -0500
Subject: [PATCH 086/372] Restrict access to global `Audio` (#7122)

This PR restricts access to the `Audio` global to force consumers to go
through the `Audio` public interface to interact with it.

Release Notes:

- N/A
---
 Cargo.lock                |  1 +
 crates/audio/Cargo.toml   | 16 +++++++---------
 crates/audio/src/audio.rs | 16 ++++++++++------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 737ce42797..82e3c827ae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -640,6 +640,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "collections",
+ "derive_more",
  "futures 0.3.28",
  "gpui",
  "log",
diff --git a/crates/audio/Cargo.toml b/crates/audio/Cargo.toml
index 37b2a7a156..7b9b76b635 100644
--- a/crates/audio/Cargo.toml
+++ b/crates/audio/Cargo.toml
@@ -10,14 +10,12 @@ path = "src/audio.rs"
 doctest = false
 
 [dependencies]
-gpui = { path = "../gpui" }
-collections = { path = "../collections" }
-util = { path = "../util" }
-
-
-rodio ={version = "0.17.1", default-features=false, features = ["wav"]}
-
-log.workspace = true
-futures.workspace = true
 anyhow.workspace = true
+collections = { path = "../collections" }
+derive_more.workspace = true
+futures.workspace = true
+gpui = { path = "../gpui" }
+log.workspace = true
 parking_lot.workspace = true
+rodio = { version = "0.17.1", default-features = false, features = ["wav"] }
+util = { path = "../util" }
diff --git a/crates/audio/src/audio.rs b/crates/audio/src/audio.rs
index a116674288..defa1e2fa9 100644
--- a/crates/audio/src/audio.rs
+++ b/crates/audio/src/audio.rs
@@ -1,4 +1,5 @@
 use assets::SoundRegistry;
+use derive_more::{Deref, DerefMut};
 use gpui::{AppContext, AssetSource, Global};
 use rodio::{OutputStream, OutputStreamHandle};
 use util::ResultExt;
@@ -7,7 +8,7 @@ mod assets;
 
 pub fn init(source: impl AssetSource, cx: &mut AppContext) {
     SoundRegistry::set_global(source, cx);
-    cx.set_global(Audio::new());
+    cx.set_global(GlobalAudio(Audio::new()));
 }
 
 pub enum Sound {
@@ -37,7 +38,10 @@ pub struct Audio {
     output_handle: Option<OutputStreamHandle>,
 }
 
-impl Global for Audio {}
+#[derive(Deref, DerefMut)]
+struct GlobalAudio(Audio);
+
+impl Global for GlobalAudio {}
 
 impl Audio {
     pub fn new() -> Self {
@@ -58,11 +62,11 @@ impl Audio {
     }
 
     pub fn play_sound(sound: Sound, cx: &mut AppContext) {
-        if !cx.has_global::<Self>() {
+        if !cx.has_global::<GlobalAudio>() {
             return;
         }
 
-        cx.update_global::<Self, _>(|this, cx| {
+        cx.update_global::<GlobalAudio, _>(|this, cx| {
             let output_handle = this.ensure_output_exists()?;
             let source = SoundRegistry::global(cx).get(sound.file()).log_err()?;
             output_handle.play_raw(source).log_err()?;
@@ -71,11 +75,11 @@ impl Audio {
     }
 
     pub fn end_call(cx: &mut AppContext) {
-        if !cx.has_global::<Self>() {
+        if !cx.has_global::<GlobalAudio>() {
             return;
         }
 
-        cx.update_global::<Self, _>(|this, _| {
+        cx.update_global::<GlobalAudio, _>(|this, _| {
             this._output_stream.take();
             this.output_handle.take();
         });

From e338f34097be311e8b3248d3d449c08db6634d8c Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Tue, 30 Jan 2024 21:41:29 -0500
Subject: [PATCH 087/372] Sort dependencies in `Cargo.toml` files (#7126)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR sorts the dependency lists in our `Cargo.toml` files so that
they are in alphabetical order.

This should make them easier to visually scan when looking for a
dependency.

Apologies in advance for any merge conflicts 🙈

Release Notes:

- N/A
---
 Cargo.toml                           | 105 ++++++++++----------
 crates/activity_indicator/Cargo.toml |  11 +--
 crates/ai/Cargo.toml                 |  26 ++---
 crates/assets/Cargo.toml             |   2 +-
 crates/assistant/Cargo.toml          |  40 ++++----
 crates/auto_update/Cargo.toml        |  20 ++--
 crates/breadcrumbs/Cargo.toml        |   6 +-
 crates/call/Cargo.toml               |  27 +++--
 crates/channel/Cargo.toml            |  31 +++---
 crates/client/Cargo.toml             |   2 +-
 crates/collab/Cargo.toml             |  56 +++++------
 crates/collab_ui/Cargo.toml          |  56 +++++------
 crates/color/Cargo.toml              |   2 +-
 crates/command_palette/Cargo.toml    |  16 +--
 crates/copilot/Cargo.toml            |  23 +++--
 crates/copilot_ui/Cargo.toml         |   8 +-
 crates/db/Cargo.toml                 |  14 +--
 crates/diagnostics/Cargo.toml        |  32 +++---
 crates/editor/Cargo.toml             |  74 +++++++-------
 crates/feature_flags/Cargo.toml      |   2 +-
 crates/feedback/Cargo.toml           |  28 +++---
 crates/file_finder/Cargo.toml        |  19 ++--
 crates/fs/Cargo.toml                 |   2 +-
 crates/git/Cargo.toml                |  18 ++--
 crates/go_to_line/Cargo.toml         |   4 +-
 crates/gpui/Cargo.toml               |  22 ++---
 crates/gpui_macros/Cargo.toml        |   4 +-
 crates/install_cli/Cargo.toml        |   4 +-
 crates/journal/Cargo.toml            |  14 +--
 crates/language/Cargo.toml           |  55 +++++------
 crates/language_selector/Cargo.toml  |   6 +-
 crates/language_tools/Cargo.toml     |  24 ++---
 crates/live_kit_client/Cargo.toml    |  27 +++--
 crates/live_kit_server/Cargo.toml    |   2 +-
 crates/lsp/Cargo.toml                |  12 +--
 crates/media/Cargo.toml              |   2 +-
 crates/multi_buffer/Cargo.toml       |  51 +++++-----
 crates/node_runtime/Cargo.toml       |   8 +-
 crates/notifications/Cargo.toml      |   5 +-
 crates/outline/Cargo.toml            |  11 +--
 crates/picker/Cargo.toml             |  11 +--
 crates/plugin/Cargo.toml             |   4 +-
 crates/plugin_macros/Cargo.toml      |   6 +-
 crates/plugin_runtime/Cargo.toml     |  10 +-
 crates/prettier/Cargo.toml           |  23 +++--
 crates/project/Cargo.toml            |  55 +++++------
 crates/project_panel/Cargo.toml      |  26 ++---
 crates/project_symbols/Cargo.toml    |  19 ++--
 crates/quick_action_bar/Cargo.toml   |   2 +-
 crates/recent_projects/Cargo.toml    |  11 +--
 crates/refineable/Cargo.toml         |   6 +-
 crates/rich_text/Cargo.toml          |  14 +--
 crates/rope/Cargo.toml               |   6 +-
 crates/rpc/Cargo.toml                |  14 +--
 crates/search/Cargo.toml             |  26 ++---
 crates/semantic_index/Cargo.toml     |  74 +++++++-------
 crates/settings/Cargo.toml           |  19 ++--
 crates/sqlez/Cargo.toml              |   6 +-
 crates/sqlez_macros/Cargo.toml       |   6 +-
 crates/story/Cargo.toml              |   2 +-
 crates/storybook/Cargo.toml          |   8 +-
 crates/terminal/Cargo.toml           |  35 ++++---
 crates/terminal_view/Cargo.toml      |  48 ++++-----
 crates/text/Cargo.toml               |  15 ++-
 crates/theme/Cargo.toml              |   8 +-
 crates/theme_selector/Cargo.toml     |   8 +-
 crates/ui/Cargo.toml                 |   2 +-
 crates/util/Cargo.toml               |  20 ++--
 crates/vcs_menu/Cargo.toml           |  15 ++-
 crates/vim/Cargo.toml                |  39 ++++----
 crates/welcome/Cargo.toml            |  17 ++--
 crates/workspace/Cargo.toml          |  42 ++++----
 crates/zed/Cargo.toml                | 143 +++++++++++++--------------
 73 files changed, 773 insertions(+), 838 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index e2723f5ee7..148ef519c3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,8 +1,8 @@
 [workspace]
 members = [
-    "crates/assets",
     "crates/activity_indicator",
     "crates/ai",
+    "crates/assets",
     "crates/assistant",
     "crates/audio",
     "crates/auto_update",
@@ -19,8 +19,6 @@ members = [
     "crates/copilot",
     "crates/copilot_ui",
     "crates/db",
-    "crates/refineable",
-    "crates/refineable/derive_refineable",
     "crates/diagnostics",
     "crates/editor",
     "crates/feature_flags",
@@ -32,9 +30,9 @@ members = [
     "crates/git",
     "crates/go_to_line",
     "crates/gpui",
-    "crates/gpui_macros",
     "crates/gpui",
     "crates/gpui_macros",
+    "crates/gpui_macros",
     "crates/install_cli",
     "crates/journal",
     "crates/journal",
@@ -59,7 +57,10 @@ members = [
     "crates/project_symbols",
     "crates/quick_action_bar",
     "crates/recent_projects",
+    "crates/refineable",
+    "crates/refineable/derive_refineable",
     "crates/release_channel",
+    "crates/rich_text",
     "crates/rope",
     "crates/rpc",
     "crates/search",
@@ -68,7 +69,7 @@ members = [
     "crates/snippet",
     "crates/sqlez",
     "crates/sqlez_macros",
-    "crates/rich_text",
+    "crates/story",
     "crates/storybook",
     "crates/sum_tree",
     "crates/terminal",
@@ -79,11 +80,10 @@ members = [
     "crates/theme_selector",
     "crates/ui",
     "crates/util",
-    "crates/story",
-    "crates/vim",
     "crates/vcs_menu",
-    "crates/workspace",
+    "crates/vim",
     "crates/welcome",
+    "crates/workspace",
     "crates/zed",
     "crates/zed_actions",
 ]
@@ -91,84 +91,83 @@ default-members = ["crates/zed"]
 resolver = "2"
 
 [workspace.dependencies]
-anyhow = { version = "1.0.57" }
-async-trait = { version = "0.1" }
+anyhow = "1.0.57"
 async-compression = { version = "0.4", features = ["gzip", "futures-io"] }
+async-trait = "0.1"
 chrono = { version = "0.4", features = ["serde"] }
 ctor = "0.2.6"
-derive_more = { version = "0.99.17" }
-env_logger = { version = "0.9" }
-futures = { version = "0.3" }
-globset = { version = "0.4" }
+derive_more = "0.99.17"
+env_logger = "0.9"
+futures = "0.3"
+git2 = { version = "0.15", default-features = false}
+globset = "0.4"
 indoc = "1"
 # We explicitly disable a http2 support in isahc.
 isahc = { version = "1.7.2", default-features = false, features = ["static-curl", "text-decoding"] }
-lazy_static = { version = "1.4.0" }
+lazy_static = "1.4.0"
 log = { version = "0.4.16", features = ["kv_unstable_serde"] }
-ordered-float = { version = "2.1.1" }
-parking_lot = { version = "0.11.1" }
+ordered-float = "2.1.1"
+parking_lot = "0.11.1"
 postage = { version = "0.5", features = ["futures-traits"] }
-prost = { version = "0.8" }
-rand = { version = "0.8.5" }
+pretty_assertions = "1.3.0"
+prost = "0.8"
+rand = "0.8.5"
 refineable = { path = "./crates/refineable" }
-regex = { version = "1.5" }
-rust-embed = { version = "8.0", features = ["include-exclude"] }
+regex = "1.5"
 rusqlite = { version = "0.29.0", features = ["blob", "array", "modern_sqlite"] }
-schemars = { version = "0.8" }
+rust-embed = { version = "8.0", features = ["include-exclude"] }
+schemars = "0.8"
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_derive = { version = "1.0", features = ["deserialize_in_place"] }
 serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
 serde_repr = "0.1"
 smallvec = { version = "1.6", features = ["union"] }
-smol = { version = "1.2" }
+smol = "1.2"
 strum = { version = "0.25.0", features = ["derive"] }
 sysinfo = "0.29.10"
-tempfile = { version = "3.9.0" }
-thiserror = { version = "1.0.29" }
-time = { version = "0.3", features = ["serde", "serde-well-known"] }
-toml = { version = "0.5" }
+tempfile = "3.9.0"
+thiserror = "1.0.29"
 tiktoken-rs = "0.5.7"
-tree-sitter = { version = "0.20" }
-unindent = { version = "0.1.7" }
-pretty_assertions = "1.3.0"
-git2 = { version = "0.15", default-features = false}
-url = "2.2"
-uuid = { version = "1.1.2", features = ["v4"] }
-
+time = { version = "0.3", features = ["serde", "serde-well-known"] }
+toml = "0.5"
+tree-sitter = "0.20"
 tree-sitter-bash = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "7331995b19b8f8aba2d5e26deb51d2195c18bc94" }
 tree-sitter-c = "0.20.1"
-tree-sitter-cpp = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev="f44509141e7e483323d2ec178f2d2e6c0fc041c1" }
 tree-sitter-c-sharp = { git = "https://github.com/tree-sitter/tree-sitter-c-sharp", rev = "dd5e59721a5f8dae34604060833902b882023aaf" }
+tree-sitter-cpp = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev="f44509141e7e483323d2ec178f2d2e6c0fc041c1" }
 tree-sitter-css = { git = "https://github.com/tree-sitter/tree-sitter-css", rev = "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51" }
 tree-sitter-elixir = { git = "https://github.com/elixir-lang/tree-sitter-elixir", rev = "a2861e88a730287a60c11ea9299c033c7d076e30" }
-tree-sitter-elm = { git = "https://github.com/elm-tooling/tree-sitter-elm", rev = "692c50c0b961364c40299e73c1306aecb5d20f40"}
+tree-sitter-elm = { git = "https://github.com/elm-tooling/tree-sitter-elm", rev = "692c50c0b961364c40299e73c1306aecb5d20f40" }
 tree-sitter-embedded-template = "0.20.0"
-tree-sitter-glsl = { git = "https://github.com/theHamsta/tree-sitter-glsl", rev = "2a56fb7bc8bb03a1892b4741279dd0a8758b7fb3" }
 tree-sitter-gleam = { git = "https://github.com/gleam-lang/tree-sitter-gleam", rev = "58b7cac8fc14c92b0677c542610d8738c373fa81" }
+tree-sitter-glsl = { git = "https://github.com/theHamsta/tree-sitter-glsl", rev = "2a56fb7bc8bb03a1892b4741279dd0a8758b7fb3" }
 tree-sitter-go = { git = "https://github.com/tree-sitter/tree-sitter-go", rev = "aeb2f33b366fd78d5789ff104956ce23508b85db" }
-tree-sitter-heex = { git = "https://github.com/phoenixframework/tree-sitter-heex", rev = "2e1348c3cf2c9323e87c2744796cf3f3868aa82a" }
-tree-sitter-json = { git = "https://github.com/tree-sitter/tree-sitter-json", rev = "40a81c01a40ac48744e0c8ccabbaba1920441199" }
-tree-sitter-rust = "0.20.3"
-tree-sitter-markdown = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "330ecab87a3e3a7211ac69bbadc19eabecdb1cca" }
-tree-sitter-php = "0.21.1"
-tree-sitter-proto = {git = "https://github.com/rewinfrey/tree-sitter-proto", rev = "36d54f288aee112f13a67b550ad32634d0c2cb52"}
-tree-sitter-purescript = { git = "https://github.com/ivanmoreau/tree-sitter-purescript", rev = "a37140f0c7034977b90faa73c94fcb8a5e45ed08" }
-tree-sitter-python = "0.20.2"
-tree-sitter-toml = { git = "https://github.com/tree-sitter/tree-sitter-toml", rev = "342d9be207c2dba869b9967124c679b5e6fd0ebe" }
-tree-sitter-typescript = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "5d20856f34315b068c41edaee2ac8a100081d259" }
-tree-sitter-ruby = "0.20.0"
 tree-sitter-haskell = { git = "https://github.com/tree-sitter/tree-sitter-haskell", rev = "cf98de23e4285b8e6bcb57b050ef2326e2cc284b" }
+tree-sitter-heex = { git = "https://github.com/phoenixframework/tree-sitter-heex", rev = "2e1348c3cf2c9323e87c2744796cf3f3868aa82a" }
 tree-sitter-html = "0.19.0"
-tree-sitter-scheme = { git = "https://github.com/6cdh/tree-sitter-scheme", rev = "af0fd1fa452cb2562dc7b5c8a8c55551c39273b9" }
-tree-sitter-svelte = { git = "https://github.com/Himujjal/tree-sitter-svelte", rev = "697bb515471871e85ff799ea57a76298a71a9cca" }
-tree-sitter-racket = { git = "https://github.com/zed-industries/tree-sitter-racket", rev = "eb010cf2c674c6fd9a6316a84e28ef90190fe51a" }
-tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "f545a41f57502e1b5ddf2a6668896c1b0620f930" }
+tree-sitter-json = { git = "https://github.com/tree-sitter/tree-sitter-json", rev = "40a81c01a40ac48744e0c8ccabbaba1920441199" }
 tree-sitter-lua = "0.0.14"
+tree-sitter-markdown = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "330ecab87a3e3a7211ac69bbadc19eabecdb1cca" }
 tree-sitter-nix = { git = "https://github.com/nix-community/tree-sitter-nix", rev = "66e3e9ce9180ae08fc57372061006ef83f0abde7" }
 tree-sitter-nu = { git = "https://github.com/nushell/tree-sitter-nu", rev = "26bbaecda0039df4067861ab38ea8ea169f7f5aa" }
-tree-sitter-vue = { git = "https://github.com/zed-industries/tree-sitter-vue", rev = "6608d9d60c386f19d80af7d8132322fa11199c42" }
+tree-sitter-php = "0.21.1"
+tree-sitter-proto = {git = "https://github.com/rewinfrey/tree-sitter-proto", rev = "36d54f288aee112f13a67b550ad32634d0c2cb52" }
+tree-sitter-purescript = { git = "https://github.com/ivanmoreau/tree-sitter-purescript", rev = "a37140f0c7034977b90faa73c94fcb8a5e45ed08" }
+tree-sitter-python = "0.20.2"
+tree-sitter-racket = { git = "https://github.com/zed-industries/tree-sitter-racket", rev = "eb010cf2c674c6fd9a6316a84e28ef90190fe51a" }
+tree-sitter-ruby = "0.20.0"
+tree-sitter-rust = "0.20.3"
+tree-sitter-scheme = { git = "https://github.com/6cdh/tree-sitter-scheme", rev = "af0fd1fa452cb2562dc7b5c8a8c55551c39273b9" }
+tree-sitter-svelte = { git = "https://github.com/Himujjal/tree-sitter-svelte", rev = "697bb515471871e85ff799ea57a76298a71a9cca" }
+tree-sitter-toml = { git = "https://github.com/tree-sitter/tree-sitter-toml", rev = "342d9be207c2dba869b9967124c679b5e6fd0ebe" }
+tree-sitter-typescript = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "5d20856f34315b068c41edaee2ac8a100081d259" }
 tree-sitter-uiua = { git = "https://github.com/shnarazk/tree-sitter-uiua", rev = "9260f11be5900beda4ee6d1a24ab8ddfaf5a19b2" }
+tree-sitter-vue = { git = "https://github.com/zed-industries/tree-sitter-vue", rev = "6608d9d60c386f19d80af7d8132322fa11199c42" }
+tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "f545a41f57502e1b5ddf2a6668896c1b0620f930" }
 tree-sitter-zig = { git = "https://github.com/maxxnino/tree-sitter-zig", rev = "0d08703e4c3f426ec61695d7617415fff97029bd" }
+unindent = "0.1.7"
+url = "2.2"
+uuid = { version = "1.1.2", features = ["v4"] }
 
 [patch.crates-io]
 tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "31c40449749c4263a91a43593831b82229049a4c" }
diff --git a/crates/activity_indicator/Cargo.toml b/crates/activity_indicator/Cargo.toml
index 6f0ca876c7..8c438db31d 100644
--- a/crates/activity_indicator/Cargo.toml
+++ b/crates/activity_indicator/Cargo.toml
@@ -10,20 +10,19 @@ path = "src/activity_indicator.rs"
 doctest = false
 
 [dependencies]
+anyhow.workspace = true
 auto_update = { path = "../auto_update" }
 editor = { path = "../editor" }
-language = { path = "../language" }
+futures.workspace = true
 gpui = { path = "../gpui" }
+language = { path = "../language" }
 project = { path = "../project" }
 settings = { path = "../settings" }
+smallvec.workspace = true
+theme = { path = "../theme" }
 ui = { path = "../ui" }
 util = { path = "../util" }
-theme = { path = "../theme" }
 workspace = { path = "../workspace", package = "workspace" }
 
-anyhow.workspace = true
-futures.workspace = true
-smallvec.workspace = true
-
 [dev-dependencies]
 editor = { path = "../editor", features = ["test-support"] }
diff --git a/crates/ai/Cargo.toml b/crates/ai/Cargo.toml
index 85dc53b1be..516514e768 100644
--- a/crates/ai/Cargo.toml
+++ b/crates/ai/Cargo.toml
@@ -13,27 +13,27 @@ doctest = false
 test-support = []
 
 [dependencies]
-gpui = { path = "../gpui" }
-util = { path = "../util" }
-language = { path = "../language" }
-async-trait.workspace = true
 anyhow.workspace = true
+async-trait.workspace = true
+bincode = "1.3.3"
 futures.workspace = true
+gpui = { path = "../gpui" }
+isahc.workspace = true
+language = { path = "../language" }
 lazy_static.workspace = true
+log.workspace = true
+matrixmultiply = "0.3.7"
 ordered-float.workspace = true
 parking_lot.workspace = true
-isahc.workspace = true
-regex.workspace = true
-serde.workspace = true
-serde_json.workspace = true
+parse_duration = "2.1.1"
 postage.workspace = true
 rand.workspace = true
-log.workspace = true
-parse_duration = "2.1.1"
-tiktoken-rs.workspace = true
-matrixmultiply = "0.3.7"
+regex.workspace = true
 rusqlite = { version = "0.29.0", features = ["blob", "array", "modern_sqlite"] }
-bincode = "1.3.3"
+serde.workspace = true
+serde_json.workspace = true
+tiktoken-rs.workspace = true
+util = { path = "../util" }
 
 [dev-dependencies]
 gpui = { path = "../gpui", features = ["test-support"] }
diff --git a/crates/assets/Cargo.toml b/crates/assets/Cargo.toml
index 253e4af4ce..54100afd3c 100644
--- a/crates/assets/Cargo.toml
+++ b/crates/assets/Cargo.toml
@@ -6,6 +6,6 @@ publish = false
 license = "GPL-3.0-or-later"
 
 [dependencies]
+anyhow.workspace = true
 gpui = {path = "../gpui"}
 rust-embed.workspace = true
-anyhow.workspace = true
diff --git a/crates/assistant/Cargo.toml b/crates/assistant/Cargo.toml
index ca93f5bdf7..180f3f6c2e 100644
--- a/crates/assistant/Cargo.toml
+++ b/crates/assistant/Cargo.toml
@@ -11,45 +11,43 @@ doctest = false
 
 [dependencies]
 ai = { path = "../ai" }
+anyhow.workspace = true
+chrono.workspace = true
 client = { path = "../client" }
 collections = { path = "../collections"}
 editor = { path = "../editor" }
 fs = { path = "../fs" }
-gpui = { path = "../gpui" }
-language = { path = "../language" }
-menu = { path = "../menu" }
-multi_buffer = { path = "../multi_buffer" }
-project = { path = "../project" }
-search = { path = "../search" }
-semantic_index = { path = "../semantic_index" }
-settings = { path = "../settings" }
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
-
-uuid.workspace = true
-log.workspace = true
-anyhow.workspace = true
-chrono.workspace = true
 futures.workspace = true
+gpui = { path = "../gpui" }
 indoc.workspace = true
 isahc.workspace = true
+language = { path = "../language" }
+log.workspace = true
+menu = { path = "../menu" }
+multi_buffer = { path = "../multi_buffer" }
 ordered-float.workspace = true
 parking_lot.workspace = true
+project = { path = "../project" }
 regex.workspace = true
 schemars.workspace = true
+search = { path = "../search" }
+semantic_index = { path = "../semantic_index" }
 serde.workspace = true
 serde_json.workspace = true
+settings = { path = "../settings" }
 smol.workspace = true
+theme = { path = "../theme" }
 tiktoken-rs.workspace = true
+ui = { path = "../ui" }
+util = { path = "../util" }
+uuid.workspace = true
+workspace = { path = "../workspace" }
 
 [dev-dependencies]
-ai = { path = "../ai", features = ["test-support"]}
-editor = { path = "../editor", features = ["test-support"] }
-project = { path = "../project", features = ["test-support"] }
-
+ai = { path = "../ai", features = ["test-support"] }
 ctor.workspace = true
+editor = { path = "../editor", features = ["test-support"] }
 env_logger.workspace = true
 log.workspace = true
+project = { path = "../project", features = ["test-support"] }
 rand.workspace = true
diff --git a/crates/auto_update/Cargo.toml b/crates/auto_update/Cargo.toml
index dbd06832ba..c89f1d40fe 100644
--- a/crates/auto_update/Cargo.toml
+++ b/crates/auto_update/Cargo.toml
@@ -10,23 +10,23 @@ path = "src/auto_update.rs"
 doctest = false
 
 [dependencies]
-db = { path = "../db" }
-client = { path = "../client" }
-gpui = { path = "../gpui" }
-menu = { path = "../menu" }
-project = { path = "../project" }
-release_channel = { path = "../release_channel" }
-settings = { path = "../settings" }
-theme = { path = "../theme" }
-workspace = { path = "../workspace" }
-util = { path = "../util" }
 anyhow.workspace = true
+client = { path = "../client" }
+db = { path = "../db" }
+gpui = { path = "../gpui" }
 isahc.workspace = true
 lazy_static.workspace = true
 log.workspace = true
+menu = { path = "../menu" }
+project = { path = "../project" }
+release_channel = { path = "../release_channel" }
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
+settings = { path = "../settings" }
 smol.workspace = true
 tempfile.workspace = true
+theme = { path = "../theme" }
+util = { path = "../util" }
+workspace = { path = "../workspace" }
diff --git a/crates/breadcrumbs/Cargo.toml b/crates/breadcrumbs/Cargo.toml
index 03f0a85250..a2048084fe 100644
--- a/crates/breadcrumbs/Cargo.toml
+++ b/crates/breadcrumbs/Cargo.toml
@@ -13,15 +13,15 @@ doctest = false
 collections = { path = "../collections" }
 editor = { path = "../editor" }
 gpui = { path = "../gpui" }
-ui = { path = "../ui" }
+itertools = "0.10"
 language = { path = "../language" }
+outline = { path = "../outline" }
 project = { path = "../project" }
 search = { path = "../search" }
 settings = { path = "../settings" }
 theme = { path = "../theme" }
+ui = { path = "../ui" }
 workspace = { path = "../workspace" }
-outline = { path = "../outline" }
-itertools = "0.10"
 
 [dev-dependencies]
 editor = { path = "../editor", features = ["test-support"] }
diff --git a/crates/call/Cargo.toml b/crates/call/Cargo.toml
index 968db6eed8..9d4b51e659 100644
--- a/crates/call/Cargo.toml
+++ b/crates/call/Cargo.toml
@@ -20,36 +20,35 @@ test-support = [
 ]
 
 [dependencies]
+anyhow.workspace = true
+async-broadcast = "0.4"
 audio = { path = "../audio" }
 client = { path = "../client" }
 collections = { path = "../collections" }
-gpui = { path = "../gpui" }
-log.workspace = true
-live_kit_client = { path = "../live_kit_client" }
 fs = { path = "../fs" }
-language = { path = "../language" }
-media = { path = "../media" }
-project = { path = "../project" }
-settings = { path = "../settings" }
-util = { path = "../util" }
-
-anyhow.workspace = true
-async-broadcast = "0.4"
 futures.workspace = true
+gpui = { path = "../gpui" }
 image = "0.23"
+language = { path = "../language" }
+live_kit_client = { path = "../live_kit_client" }
+log.workspace = true
+media = { path = "../media" }
 postage.workspace = true
+project = { path = "../project" }
 schemars.workspace = true
 serde.workspace = true
-serde_json.workspace = true
 serde_derive.workspace = true
+serde_json.workspace = true
+settings = { path = "../settings" }
 smallvec.workspace = true
+util = { path = "../util" }
 
 [dev-dependencies]
 client = { path = "../client", features = ["test-support"] }
-fs = { path = "../fs", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
 collections = { path = "../collections", features = ["test-support"] }
+fs = { path = "../fs", features = ["test-support"] }
 gpui = { path = "../gpui", features = ["test-support"] }
+language = { path = "../language", features = ["test-support"] }
 live_kit_client = { path = "../live_kit_client", features = ["test-support"] }
 project = { path = "../project", features = ["test-support"] }
 util = { path = "../util", features = ["test-support"] }
diff --git a/crates/channel/Cargo.toml b/crates/channel/Cargo.toml
index 8c3e6dea21..afb5799b61 100644
--- a/crates/channel/Cargo.toml
+++ b/crates/channel/Cargo.toml
@@ -13,39 +13,38 @@ doctest = false
 test-support = ["collections/test-support", "gpui/test-support", "rpc/test-support"]
 
 [dependencies]
+anyhow.workspace = true
 client = { path = "../client" }
+clock = { path = "../clock" }
 collections = { path = "../collections" }
 db = { path = "../db" }
-gpui = { path = "../gpui" }
-util = { path = "../util" }
-rpc = { path = "../rpc" }
-text = { path = "../text" }
-language = { path = "../language" }
-release_channel = { path = "../release_channel" }
-settings = { path = "../settings" }
 feature_flags = { path = "../feature_flags" }
-sum_tree = { path = "../sum_tree" }
-clock = { path = "../clock" }
-
-anyhow.workspace = true
 futures.workspace = true
+gpui = { path = "../gpui" }
 image = "0.23"
+language = { path = "../language" }
 lazy_static.workspace = true
-smallvec.workspace = true
 log.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
 rand.workspace = true
+release_channel = { path = "../release_channel" }
+rpc = { path = "../rpc" }
 schemars.workspace = true
+serde.workspace = true
+serde_derive.workspace = true
+settings = { path = "../settings" }
+smallvec.workspace = true
 smol.workspace = true
+sum_tree = { path = "../sum_tree" }
+tempfile.workspace = true
+text = { path = "../text" }
 thiserror.workspace = true
 time.workspace = true
 tiny_http = "0.8"
-uuid.workspace = true
 url.workspace = true
-serde.workspace = true
-serde_derive.workspace = true
-tempfile = "3"
+util = { path = "../util" }
+uuid.workspace = true
 
 [dev-dependencies]
 collections = { path = "../collections", features = ["test-support"] }
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
index 7cf00e7df0..37d617821e 100644
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -41,7 +41,7 @@ serde_derive.workspace = true
 serde_json.workspace = true
 smol.workspace = true
 sysinfo.workspace = true
-tempfile = "3"
+tempfile.workspace = true
 thiserror.workspace = true
 time.workspace = true
 tiny_http = "0.8"
diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml
index ec5de4a9a0..6b8af7db23 100644
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -15,26 +15,22 @@ name = "seed"
 required-features = ["seed-support"]
 
 [dependencies]
-clock = { path = "../clock" }
-collections = { path = "../collections" }
-live_kit_server = { path = "../live_kit_server" }
-text = { path = "../text" }
-rpc = { path = "../rpc" }
-util = { path = "../util" }
-
 anyhow.workspace = true
 async-tungstenite = "0.16"
 axum = { version = "0.5", features = ["json", "headers", "ws"] }
 axum-extra = { version = "0.3", features = ["erased-json"] }
 base64 = "0.13"
-clap = { version = "3.1", features = ["derive"], optional = true }
 chrono.workspace = true
+clap = { version = "3.1", features = ["derive"], optional = true }
+clock = { path = "../clock" }
+collections = { path = "../collections" }
 dashmap = "5.4"
 envy = "0.4.2"
 futures.workspace = true
 hyper = "0.14"
 lazy_static.workspace = true
 lipsum = { version = "0.8", optional = true }
+live_kit_server = { path = "../live_kit_server" }
 log.workspace = true
 nanoid = "0.4"
 parking_lot.workspace = true
@@ -42,62 +38,62 @@ prometheus = "0.13"
 prost.workspace = true
 rand.workspace = true
 reqwest = { version = "0.11", features = ["json"], optional = true }
+rpc = { path = "../rpc" }
 scrypt = "0.7"
-smallvec.workspace = true
 sea-orm = { version = "0.12.x", features = ["sqlx-postgres", "postgres-array", "runtime-tokio-rustls", "with-uuid"] }
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
 sha-1 = "0.9"
+smallvec.workspace = true
 sqlx = { version = "0.7", features = ["runtime-tokio-rustls", "postgres", "json", "time", "uuid", "any"] }
+text = { path = "../text" }
 time.workspace = true
 tokio = { version = "1", features = ["full"] }
 tokio-tungstenite = "0.17"
+toml.workspace = true
 tonic = "0.6"
 tower = "0.4"
-toml.workspace = true
 tracing = "0.1.34"
 tracing-log = "0.1.3"
 tracing-subscriber = { version = "0.3.11", features = ["env-filter", "json"] }
+util = { path = "../util" }
 uuid.workspace = true
 
 [dev-dependencies]
+async-trait.workspace = true
 audio = { path = "../audio" }
-collections = { path = "../collections", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
 call = { path = "../call", features = ["test-support"] }
-client = { path = "../client", features = ["test-support"] }
 channel = { path = "../channel" }
+client = { path = "../client", features = ["test-support"] }
+collab_ui = { path = "../collab_ui", features = ["test-support"] }
+collections = { path = "../collections", features = ["test-support"] }
+ctor.workspace = true
 editor = { path = "../editor", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
+env_logger.workspace = true
+file_finder = { path = "../file_finder"}
 fs = { path = "../fs", features = ["test-support"] }
 git = { path = "../git", features = ["test-support"] }
+gpui = { path = "../gpui", features = ["test-support"] }
+indoc.workspace = true
+language = { path = "../language", features = ["test-support"] }
+lazy_static.workspace = true
 live_kit_client = { path = "../live_kit_client", features = ["test-support"] }
 lsp = { path = "../lsp", features = ["test-support"] }
+menu = { path = "../menu"}
 node_runtime = { path = "../node_runtime" }
 notifications = { path = "../notifications", features = ["test-support"] }
-file_finder = { path = "../file_finder"}
-menu = { path = "../menu"}
-
+pretty_assertions.workspace = true
 project = { path = "../project", features = ["test-support"] }
 rpc = { path = "../rpc", features = ["test-support"] }
-settings = { path = "../settings", features = ["test-support"] }
-theme = { path = "../theme" }
-workspace = { path = "../workspace", features = ["test-support"] }
-
-collab_ui = { path = "../collab_ui", features = ["test-support"] }
-
-async-trait.workspace = true
-pretty_assertions.workspace = true
-ctor.workspace = true
-env_logger.workspace = true
-indoc.workspace = true
-util = { path = "../util" }
-lazy_static.workspace = true
 sea-orm = { version = "0.12.x", features = ["sqlx-sqlite"] }
 serde_json.workspace = true
+settings = { path = "../settings", features = ["test-support"] }
 sqlx = { version = "0.7", features = ["sqlite"] }
+theme = { path = "../theme" }
 unindent.workspace = true
+util = { path = "../util" }
+workspace = { path = "../workspace", features = ["test-support"] }
 
 [features]
 seed-support = ["clap", "lipsum", "reqwest"]
diff --git a/crates/collab_ui/Cargo.toml b/crates/collab_ui/Cargo.toml
index b158d528b3..82de5384b3 100644
--- a/crates/collab_ui/Cargo.toml
+++ b/crates/collab_ui/Cargo.toml
@@ -25,50 +25,47 @@ test-support = [
 ]
 
 [dependencies]
+anyhow.workspace = true
 auto_update = { path = "../auto_update" }
-db = { path = "../db" }
 call = { path = "../call" }
-client = { path = "../client" }
 channel = { path = "../channel" }
+client = { path = "../client" }
 clock = { path = "../clock" }
 collections = { path = "../collections" }
-# context_menu = { path = "../context_menu" }
-# drag_and_drop = { path = "../drag_and_drop" }
+db = { path = "../db" }
 editor = { path = "../editor" }
+feature_flags = { path = "../feature_flags" }
 feedback = { path = "../feedback" }
-fuzzy = {  path = "../fuzzy" }
+futures.workspace = true
+fuzzy = { path = "../fuzzy" }
 gpui = { path = "../gpui" }
 language = { path = "../language" }
-menu = {  path = "../menu" }
-notifications = { path = "../notifications" }
-rich_text = { path = "../rich_text" }
-picker = { path = "../picker" }
-project = { path = "../project" }
-recent_projects = { path = "../recent_projects" }
-rpc = { path = "../rpc" }
-settings = { path = "../settings" }
-story = { path = "../story", optional = true }
-feature_flags = { path = "../feature_flags"}
-theme = { path = "../theme" }
-theme_selector = { path = "../theme_selector" }
-vcs_menu = { path = "../vcs_menu" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
-zed_actions = { path = "../zed_actions"}
-
-anyhow.workspace = true
-futures.workspace = true
 lazy_static.workspace = true
 log.workspace = true
+menu = { path = "../menu" }
+notifications = { path = "../notifications" }
 parking_lot.workspace = true
-schemars.workspace = true
+picker = { path = "../picker" }
 postage.workspace = true
+project = { path = "../project" }
+recent_projects = { path = "../recent_projects" }
+rich_text = { path = "../rich_text" }
+rpc = { path = "../rpc" }
+schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-time.workspace = true
+settings = { path = "../settings" }
 smallvec.workspace = true
+story = { path = "../story", optional = true }
+theme = { path = "../theme" }
+theme_selector = { path = "../theme_selector" }
+time.workspace = true
+ui = { path = "../ui" }
+util = { path = "../util" }
+vcs_menu = { path = "../vcs_menu" }
+workspace = { path = "../workspace" }
+zed_actions = { path = "../zed_actions" }
 
 [dev-dependencies]
 call = { path = "../call", features = ["test-support"] }
@@ -77,11 +74,10 @@ collections = { path = "../collections", features = ["test-support"] }
 editor = { path = "../editor", features = ["test-support"] }
 gpui = { path = "../gpui", features = ["test-support"] }
 notifications = { path = "../notifications", features = ["test-support"] }
+pretty_assertions.workspace = true
 project = { path = "../project", features = ["test-support"] }
 rpc = { path = "../rpc", features = ["test-support"] }
 settings = { path = "../settings", features = ["test-support"] }
+tree-sitter-markdown.workspace = true
 util = { path = "../util", features = ["test-support"] }
 workspace = { path = "../workspace", features = ["test-support"] }
-
-pretty_assertions.workspace = true
-tree-sitter-markdown.workspace = true
diff --git a/crates/color/Cargo.toml b/crates/color/Cargo.toml
index ae3622e11f..84fe609703 100644
--- a/crates/color/Cargo.toml
+++ b/crates/color/Cargo.toml
@@ -14,6 +14,6 @@ path = "src/color.rs"
 doctest = true
 
 [dependencies]
-story = { path = "../story", optional = true }
 itertools = { version = "0.11.0", optional = true }
 palette = "0.7.3"
+story = { path = "../story", optional = true }
diff --git a/crates/command_palette/Cargo.toml b/crates/command_palette/Cargo.toml
index 3591bf016b..6665193403 100644
--- a/crates/command_palette/Cargo.toml
+++ b/crates/command_palette/Cargo.toml
@@ -10,6 +10,7 @@ path = "src/command_palette.rs"
 doctest = false
 
 [dependencies]
+anyhow.workspace = true
 client = { path = "../client" }
 collections = { path = "../collections" }
 # HACK: We're only depending on `copilot` here for `CommandPaletteFilter`.  See the attached comment on that type.
@@ -20,23 +21,22 @@ gpui = { path = "../gpui" }
 picker = { path = "../picker" }
 project = { path = "../project" }
 release_channel = { path = "../release_channel" }
+serde.workspace = true
 settings = { path = "../settings" }
 theme = { path = "../theme" }
 ui = { path = "../ui" }
 util = { path = "../util" }
 workspace = { path = "../workspace" }
 zed_actions = { path = "../zed_actions" }
-anyhow.workspace = true
-serde.workspace = true
 
 [dev-dependencies]
-gpui = { path = "../gpui", features = ["test-support"] }
+ctor.workspace = true
 editor = { path = "../editor", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
-project = { path = "../project", features = ["test-support"] }
-menu = { path = "../menu" }
+env_logger.workspace = true
 go_to_line = { path = "../go_to_line" }
+gpui = { path = "../gpui", features = ["test-support"] }
+language = { path = "../language", features = ["test-support"] }
+menu = { path = "../menu" }
+project = { path = "../project", features = ["test-support"] }
 serde_json.workspace = true
 workspace = { path = "../workspace", features = ["test-support"] }
-ctor.workspace = true
-env_logger.workspace = true
diff --git a/crates/copilot/Cargo.toml b/crates/copilot/Cargo.toml
index 46cce455f1..2f9c577c1d 100644
--- a/crates/copilot/Cargo.toml
+++ b/crates/copilot/Cargo.toml
@@ -20,24 +20,23 @@ test-support = [
 ]
 
 [dependencies]
-collections = { path = "../collections" }
-# context_menu = { path = "../context_menu" }
-gpui = { path = "../gpui" }
-language = { path = "../language" }
-settings = { path = "../settings" }
-theme = { path = "../theme" }
-lsp = { path = "../lsp" }
-node_runtime = { path = "../node_runtime"}
-util = { path = "../util" }
+anyhow.workspace = true
 async-compression.workspace = true
 async-tar = "0.4.2"
-anyhow.workspace = true
+collections = { path = "../collections" }
+futures.workspace = true
+gpui = { path = "../gpui" }
+language = { path = "../language" }
 log.workspace = true
+lsp = { path = "../lsp" }
+node_runtime = { path = "../node_runtime"}
+parking_lot.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
+settings = { path = "../settings" }
 smol.workspace = true
-futures.workspace = true
-parking_lot.workspace = true
+theme = { path = "../theme" }
+util = { path = "../util" }
 
 [dev-dependencies]
 clock = { path = "../clock" }
diff --git a/crates/copilot_ui/Cargo.toml b/crates/copilot_ui/Cargo.toml
index 4c9b590dc8..3d3f37ca6b 100644
--- a/crates/copilot_ui/Cargo.toml
+++ b/crates/copilot_ui/Cargo.toml
@@ -10,20 +10,20 @@ path = "src/copilot_ui.rs"
 doctest = false
 
 [dependencies]
+anyhow.workspace = true
 copilot = { path = "../copilot" }
 editor = { path = "../editor" }
 fs = { path = "../fs" }
-zed_actions = { path = "../zed_actions"}
+futures.workspace = true
 gpui = { path = "../gpui" }
 language = { path = "../language" }
 settings = { path = "../settings" }
+smol.workspace = true
 theme = { path = "../theme" }
 ui = { path = "../ui" }
 util = { path = "../util" }
 workspace = {path = "../workspace" }
-anyhow.workspace = true
-smol.workspace = true
-futures.workspace = true
+zed_actions = { path = "../zed_actions"}
 
 [dev-dependencies]
 editor = { path = "../editor", features = ["test-support"] }
diff --git a/crates/db/Cargo.toml b/crates/db/Cargo.toml
index 492c2fb004..5a70f2a937 100644
--- a/crates/db/Cargo.toml
+++ b/crates/db/Cargo.toml
@@ -13,23 +13,23 @@ doctest = false
 test-support = []
 
 [dependencies]
+anyhow.workspace = true
+async-trait.workspace = true
 collections = { path = "../collections" }
 gpui = { path = "../gpui" }
-release_channel = { path = "../release_channel" }
-sqlez = { path = "../sqlez" }
-sqlez_macros = { path = "../sqlez_macros" }
-util = { path = "../util" }
-anyhow.workspace = true
 indoc.workspace = true
-async-trait.workspace = true
 lazy_static.workspace = true
 log.workspace = true
 parking_lot.workspace = true
+release_channel = { path = "../release_channel" }
 serde.workspace = true
 serde_derive.workspace = true
 smol.workspace = true
+sqlez = { path = "../sqlez" }
+sqlez_macros = { path = "../sqlez_macros" }
+util = { path = "../util" }
 
 [dev-dependencies]
-gpui = { path = "../gpui", features = ["test-support"] }
 env_logger.workspace = true
+gpui = { path = "../gpui", features = ["test-support"] }
 tempfile.workspace = true
diff --git a/crates/diagnostics/Cargo.toml b/crates/diagnostics/Cargo.toml
index 2e162c1938..6ceaf56f72 100644
--- a/crates/diagnostics/Cargo.toml
+++ b/crates/diagnostics/Cargo.toml
@@ -10,35 +10,33 @@ path = "src/diagnostics.rs"
 doctest = false
 
 [dependencies]
+anyhow.workspace = true
 collections = { path = "../collections" }
 editor = { path = "../editor" }
-gpui = { path = "../gpui" }
-ui = { path = "../ui" }
-language = { path = "../language" }
-lsp = { path = "../lsp" }
-project = { path = "../project" }
-settings = { path = "../settings" }
-theme = { path = "../theme" }
-util = { path = "../util" }
-workspace = {path = "../workspace" }
-
-log.workspace = true
-anyhow.workspace = true
 futures.workspace = true
+gpui = { path = "../gpui" }
+language = { path = "../language" }
+log.workspace = true
+lsp = { path = "../lsp" }
+postage.workspace = true
+project = { path = "../project" }
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
+settings = { path = "../settings" }
 smallvec.workspace = true
-postage.workspace = true
+theme = { path = "../theme" }
+ui = { path = "../ui" }
+util = { path = "../util" }
+workspace = {path = "../workspace" }
 
 [dev-dependencies]
 client = { path = "../client", features = ["test-support"] }
 editor = { path = "../editor", features = ["test-support"] }
+gpui = { path = "../gpui", features = ["test-support"] }
 language = { path = "../language", features = ["test-support"] }
 lsp = { path = "../lsp", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-workspace = {path = "../workspace", features = ["test-support"] }
-theme = { path = "../theme", features = ["test-support"] }
-
 serde_json.workspace = true
+theme = { path = "../theme", features = ["test-support"] }
 unindent.workspace = true
+workspace = {path = "../workspace", features = ["test-support"] }
diff --git a/crates/editor/Cargo.toml b/crates/editor/Cargo.toml
index bd117d10a4..b5067afbf2 100644
--- a/crates/editor/Cargo.toml
+++ b/crates/editor/Cargo.toml
@@ -24,72 +24,68 @@ test-support = [
 ]
 
 [dependencies]
+aho-corasick = "1.1"
+anyhow.workspace = true
 client = { path = "../client" }
 clock = { path = "../clock" }
+collections = { path = "../collections" }
+convert_case = "0.6.0"
 copilot = { path = "../copilot" }
 db = { path = "../db" }
-collections = { path = "../collections" }
-# context_menu = { path = "../context_menu" }
+futures.workspace = true
 fuzzy = {  path = "../fuzzy" }
 git = { path = "../git" }
 gpui = { path = "../gpui" }
-language = { path = "../language" }
-lsp = { path = "../lsp" }
-multi_buffer = { path = "../multi_buffer" }
-project = { path = "../project" }
-rpc = { path = "../rpc" }
-rich_text = { path = "../rich_text" }
-settings = { path = "../settings" }
-snippet = { path = "../snippet" }
-sum_tree = { path = "../sum_tree" }
-text = { path = "../text" }
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-sqlez = { path = "../sqlez" }
-workspace = { path = "../workspace" }
-
-aho-corasick = "1.1"
-anyhow.workspace = true
-convert_case = "0.6.0"
-futures.workspace = true
 indoc = "1.0.4"
 itertools = "0.10"
+language = { path = "../language" }
 lazy_static.workspace = true
 log.workspace = true
+lsp = { path = "../lsp" }
+multi_buffer = { path = "../multi_buffer" }
 ordered-float.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
+project = { path = "../project" }
 rand.workspace = true
+rich_text = { path = "../rich_text" }
+rpc = { path = "../rpc" }
 schemars.workspace = true
 serde.workspace = true
-serde_json.workspace = true
 serde_derive.workspace = true
+serde_json.workspace = true
+settings = { path = "../settings" }
 smallvec.workspace = true
 smol.workspace = true
-url.workspace = true
-
-tree-sitter-rust = { workspace = true, optional = true }
+snippet = { path = "../snippet" }
+sqlez = { path = "../sqlez" }
+sum_tree = { path = "../sum_tree" }
+text = { path = "../text" }
+theme = { path = "../theme" }
 tree-sitter-html = { workspace = true, optional = true }
+tree-sitter-rust = { workspace = true, optional = true }
 tree-sitter-typescript = { workspace = true, optional = true }
+ui = { path = "../ui" }
+url.workspace = true
+util = { path = "../util" }
+workspace = { path = "../workspace" }
 
 [dev-dependencies]
 copilot = { path = "../copilot", features = ["test-support"] }
-text = { path = "../text", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
-lsp = { path = "../lsp", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-util = { path = "../util", features = ["test-support"] }
-project = { path = "../project", features = ["test-support"] }
-settings = { path = "../settings", features = ["test-support"] }
-workspace = { path = "../workspace", features = ["test-support"] }
-multi_buffer = { path = "../multi_buffer", features = ["test-support"] }
-
 ctor.workspace = true
 env_logger.workspace = true
+gpui = { path = "../gpui", features = ["test-support"] }
+language = { path = "../language", features = ["test-support"] }
+lsp = { path = "../lsp", features = ["test-support"] }
+multi_buffer = { path = "../multi_buffer", features = ["test-support"] }
+project = { path = "../project", features = ["test-support"] }
 rand.workspace = true
-unindent.workspace = true
-tree-sitter.workspace = true
-tree-sitter-rust.workspace = true
+settings = { path = "../settings", features = ["test-support"] }
+text = { path = "../text", features = ["test-support"] }
 tree-sitter-html.workspace = true
+tree-sitter-rust.workspace = true
 tree-sitter-typescript.workspace = true
+tree-sitter.workspace = true
+unindent.workspace = true
+util = { path = "../util", features = ["test-support"] }
+workspace = { path = "../workspace", features = ["test-support"] }
diff --git a/crates/feature_flags/Cargo.toml b/crates/feature_flags/Cargo.toml
index cb25ccc9b4..20c106393f 100644
--- a/crates/feature_flags/Cargo.toml
+++ b/crates/feature_flags/Cargo.toml
@@ -9,5 +9,5 @@ license = "GPL-3.0-or-later"
 path = "src/feature_flags.rs"
 
 [dependencies]
-gpui = { path = "../gpui" }
 anyhow.workspace = true
+gpui = { path = "../gpui" }
diff --git a/crates/feedback/Cargo.toml b/crates/feedback/Cargo.toml
index cbdd903b2d..fdac5dd6a6 100644
--- a/crates/feedback/Cargo.toml
+++ b/crates/feedback/Cargo.toml
@@ -12,38 +12,36 @@ path = "src/feedback.rs"
 test-support = []
 
 [dependencies]
+anyhow.workspace = true
+bitflags = "2.4.1"
 client = { path = "../client" }
 db = { path = "../db" }
 editor = { path = "../editor" }
-gpui = { path = "../gpui" }
-language = { path = "../language" }
-menu = { path = "../menu" }
-project = { path = "../project" }
-release_channel = { path = "../release_channel" }
-settings = { path = "../settings" }
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace"}
-
-bitflags = "2.4.1"
-human_bytes = "0.4.1"
-
-anyhow.workspace = true
 futures.workspace = true
+gpui = { path = "../gpui" }
+human_bytes = "0.4.1"
 isahc.workspace = true
+language = { path = "../language" }
 lazy_static.workspace = true
 log.workspace = true
+menu = { path = "../menu" }
 postage.workspace = true
+project = { path = "../project" }
 regex.workspace = true
+release_channel = { path = "../release_channel" }
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
+settings = { path = "../settings" }
 smallvec.workspace = true
 smol.workspace = true
 sysinfo.workspace = true
+theme = { path = "../theme" }
 tree-sitter-markdown = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "330ecab87a3e3a7211ac69bbadc19eabecdb1cca" }
+ui = { path = "../ui" }
 urlencoding = "2.1.2"
+util = { path = "../util" }
+workspace = { path = "../workspace"}
 
 [dev-dependencies]
 editor = { path = "../editor", features = ["test-support"] }
diff --git a/crates/file_finder/Cargo.toml b/crates/file_finder/Cargo.toml
index 42369e6dc4..56b644e7f8 100644
--- a/crates/file_finder/Cargo.toml
+++ b/crates/file_finder/Cargo.toml
@@ -10,30 +10,29 @@ path = "src/file_finder.rs"
 doctest = false
 
 [dependencies]
-editor = { path = "../editor" }
+anyhow.workspace = true
 collections = { path = "../collections" }
+editor = { path = "../editor" }
 fuzzy = {  path = "../fuzzy" }
 gpui = { path = "../gpui" }
 menu = { path = "../menu" }
 picker = { path = "../picker" }
+postage.workspace = true
 project = { path = "../project" }
+serde.workspace = true
 settings = { path = "../settings" }
 text = { path = "../text" }
-util = { path = "../util" }
 theme = { path = "../theme" }
 ui = { path = "../ui" }
+util = { path = "../util" }
 workspace = { path = "../workspace" }
-postage.workspace = true
-anyhow.workspace = true
-serde.workspace = true
 
 [dev-dependencies]
+ctor.workspace = true
 editor = { path = "../editor", features = ["test-support"] }
+env_logger.workspace = true
 gpui = { path = "../gpui", features = ["test-support"] }
 language = { path = "../language", features = ["test-support"] }
-workspace = { path = "../workspace", features = ["test-support"] }
-theme = { path = "../theme", features = ["test-support"] }
-
 serde_json.workspace = true
-ctor.workspace = true
-env_logger.workspace = true
+theme = { path = "../theme", features = ["test-support"] }
+workspace = { path = "../workspace", features = ["test-support"] }
diff --git a/crates/fs/Cargo.toml b/crates/fs/Cargo.toml
index aea2db8ab3..debdefe3ce 100644
--- a/crates/fs/Cargo.toml
+++ b/crates/fs/Cargo.toml
@@ -18,7 +18,7 @@ sum_tree = { path = "../sum_tree" }
 anyhow.workspace = true
 async-trait.workspace = true
 futures.workspace = true
-tempfile = "3"
+tempfile.workspace = true
 lazy_static.workspace = true
 parking_lot.workspace = true
 smol.workspace = true
diff --git a/crates/git/Cargo.toml b/crates/git/Cargo.toml
index f48aafd37c..2d4b652069 100644
--- a/crates/git/Cargo.toml
+++ b/crates/git/Cargo.toml
@@ -10,18 +10,18 @@ path = "src/git.rs"
 
 [dependencies]
 anyhow.workspace = true
-clock = { path = "../clock" }
-lazy_static.workspace = true
-sum_tree = { path = "../sum_tree" }
-text = { path = "../text" }
-collections = { path = "../collections" }
-util = { path = "../util" }
-log.workspace = true
-smol.workspace = true
-parking_lot.workspace = true
 async-trait.workspace = true
+clock = { path = "../clock" }
+collections = { path = "../collections" }
 futures.workspace = true
 git2.workspace = true
+lazy_static.workspace = true
+log.workspace = true
+parking_lot.workspace = true
+smol.workspace = true
+sum_tree = { path = "../sum_tree" }
+text = { path = "../text" }
+util = { path = "../util" }
 
 [dev-dependencies]
 unindent.workspace = true
diff --git a/crates/go_to_line/Cargo.toml b/crates/go_to_line/Cargo.toml
index b90b9cc81e..1968e2dadf 100644
--- a/crates/go_to_line/Cargo.toml
+++ b/crates/go_to_line/Cargo.toml
@@ -13,14 +13,14 @@ doctest = false
 editor = { path = "../editor" }
 gpui = { path = "../gpui" }
 menu = { path = "../menu" }
+postage.workspace = true
 serde.workspace = true
 settings = { path = "../settings" }
 text = { path = "../text" }
-workspace = { path = "../workspace" }
-postage.workspace = true
 theme = { path = "../theme" }
 ui = { path = "../ui" }
 util = { path = "../util" }
+workspace = { path = "../workspace" }
 
 [dev-dependencies]
 editor = { path = "../editor", features = ["test-support"] }
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 66acb0c1e6..0bc28b8db4 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -15,22 +15,22 @@ path = "src/gpui.rs"
 doctest = false
 
 [dependencies]
-collections = { path = "../collections" }
-gpui_macros = { path = "../gpui_macros" }
-util = { path = "../util" }
-sum_tree = { path = "../sum_tree" }
+anyhow.workspace = true
 async-task = "4.7"
 backtrace = { version = "0.3", optional = true }
+bitflags = "2.4.0"
+collections = { path = "../collections" }
 ctor.workspace = true
-linkme = "0.3"
 derive_more.workspace = true
 dhat = { version = "0.3", optional = true }
 env_logger = { version = "0.9", optional = true }
 etagere = "0.2"
 futures.workspace = true
+gpui_macros = { path = "../gpui_macros" }
 image = "0.23"
 itertools = "0.10"
 lazy_static.workspace = true
+linkme = "0.3"
 log.workspace = true
 num_cpus = "1.13"
 ordered-float.workspace = true
@@ -39,26 +39,26 @@ parking_lot.workspace = true
 pathfinder_geometry = "0.5"
 postage.workspace = true
 rand.workspace = true
+raw-window-handle = "0.6.0"
 refineable.workspace = true
 resvg = "0.14"
+schemars.workspace = true
 seahash = "4.1"
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
+slotmap = "1.0.6"
 smallvec.workspace = true
 smol.workspace = true
+sum_tree = { path = "../sum_tree" }
 taffy = { git = "https://github.com/DioxusLabs/taffy", rev = "1876f72bee5e376023eaa518aa7b8a34c769bd1b" }
 thiserror.workspace = true
 time.workspace = true
 tiny-skia = "0.5"
 usvg = { version = "0.14", features = [] }
+util = { path = "../util" }
 uuid = { version = "1.1.2", features = ["v4"] }
 waker-fn = "1.1.0"
-slotmap = "1.0.6"
-schemars.workspace = true
-bitflags = "2.4.0"
-anyhow.workspace = true
-raw-window-handle = "0.6.0"
 
 [dev-dependencies]
 backtrace = "0.3"
@@ -74,7 +74,6 @@ bindgen = "0.65.1"
 cbindgen = "0.26.0"
 
 [target.'cfg(target_os = "macos")'.dependencies]
-media = { path = "../media" }
 block = "0.1"
 cocoa = "0.25"
 core-foundation = { version = "0.9.3", features = ["with-uuid"] }
@@ -83,5 +82,6 @@ core-text = "19.2"
 font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "d97147f" }
 foreign-types = "0.3"
 log.workspace = true
+media = { path = "../media" }
 metal = "0.21.0"
 objc = "0.2"
diff --git a/crates/gpui_macros/Cargo.toml b/crates/gpui_macros/Cargo.toml
index a347ffc6e7..f5a7589139 100644
--- a/crates/gpui_macros/Cargo.toml
+++ b/crates/gpui_macros/Cargo.toml
@@ -10,6 +10,6 @@ path = "src/gpui_macros.rs"
 proc-macro = true
 
 [dependencies]
-syn = { version = "1.0.72", features = ["full"] }
-quote = "1.0.9"
 proc-macro2 = "1.0.66"
+quote = "1.0.9"
+syn = { version = "1.0.72", features = ["full"] }
diff --git a/crates/install_cli/Cargo.toml b/crates/install_cli/Cargo.toml
index ede2abcf0d..d50ab5191a 100644
--- a/crates/install_cli/Cargo.toml
+++ b/crates/install_cli/Cargo.toml
@@ -12,8 +12,8 @@ path = "src/install_cli.rs"
 test-support = []
 
 [dependencies]
-smol.workspace = true
 anyhow.workspace = true
-log.workspace = true
 gpui = { path = "../gpui" }
+log.workspace = true
+smol.workspace = true
 util = { path = "../util" }
diff --git a/crates/journal/Cargo.toml b/crates/journal/Cargo.toml
index d73718c8d7..9330a2efff 100644
--- a/crates/journal/Cargo.toml
+++ b/crates/journal/Cargo.toml
@@ -10,18 +10,18 @@ path = "src/journal.rs"
 doctest = false
 
 [dependencies]
-editor = { path = "../editor" }
-gpui = { path = "../gpui" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
-settings = { path = "../settings" }
 anyhow.workspace = true
 chrono = "0.4"
 dirs = "4.0"
-serde.workspace = true
-schemars.workspace = true
+editor = { path = "../editor" }
+gpui = { path = "../gpui" }
 log.workspace = true
+schemars.workspace = true
+serde.workspace = true
+settings = { path = "../settings" }
 shellexpand = "2.1.0"
+util = { path = "../util" }
+workspace = { path = "../workspace" }
 
 [dev-dependencies]
 editor = { path = "../editor", features = ["test-support"] }
diff --git a/crates/language/Cargo.toml b/crates/language/Cargo.toml
index 3d0e57dbc8..cf8801e857 100644
--- a/crates/language/Cargo.toml
+++ b/crates/language/Cargo.toml
@@ -23,65 +23,62 @@ test-support = [
 ]
 
 [dependencies]
-clock = { path = "../clock" }
-collections = { path = "../collections" }
-fuzzy = {  path = "../fuzzy" }
-git = { path = "../git" }
-gpui = { path = "../gpui" }
-lsp = { path = "../lsp" }
-rpc = { path = "../rpc" }
-settings = { path = "../settings" }
-sum_tree = { path = "../sum_tree" }
-text = { path = "../text" }
-theme = { path = "../theme" }
-util = { path = "../util" }
-
 anyhow.workspace = true
 async-broadcast = "0.4"
 async-trait.workspace = true
+clock = { path = "../clock" }
+collections = { path = "../collections" }
 futures.workspace = true
+fuzzy = {  path = "../fuzzy" }
+git = { path = "../git" }
 globset.workspace = true
+gpui = { path = "../gpui" }
 lazy_static.workspace = true
 log.workspace = true
+lsp = { path = "../lsp" }
 parking_lot.workspace = true
 postage.workspace = true
+pulldown-cmark = { version = "0.9.2", default-features = false }
+rand = { workspace = true, optional = true }
 regex.workspace = true
+rpc = { path = "../rpc" }
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
+settings = { path = "../settings" }
 similar = "1.3"
 smallvec.workspace = true
 smol.workspace = true
-tree-sitter.workspace = true
-unicase = "2.6"
-
-rand = { workspace = true, optional = true }
+sum_tree = { path = "../sum_tree" }
+text = { path = "../text" }
+theme = { path = "../theme" }
 tree-sitter-rust = { workspace = true, optional = true }
 tree-sitter-typescript = { workspace = true, optional = true }
-pulldown-cmark = { version = "0.9.2", default-features = false }
+tree-sitter.workspace = true
+unicase = "2.6"
+util = { path = "../util" }
 
 [dev-dependencies]
 client = { path = "../client", features = ["test-support"] }
 collections = { path = "../collections", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-lsp = { path = "../lsp", features = ["test-support"] }
-text = { path = "../text", features = ["test-support"] }
-settings = { path = "../settings", features = ["test-support"] }
-util = { path = "../util", features = ["test-support"] }
 ctor.workspace = true
 env_logger.workspace = true
+gpui = { path = "../gpui", features = ["test-support"] }
 indoc.workspace = true
+lsp = { path = "../lsp", features = ["test-support"] }
 rand.workspace = true
-unindent.workspace = true
-
+settings = { path = "../settings", features = ["test-support"] }
+text = { path = "../text", features = ["test-support"] }
+tree-sitter-elixir.workspace = true
 tree-sitter-embedded-template.workspace = true
+tree-sitter-heex.workspace = true
 tree-sitter-html.workspace = true
 tree-sitter-json.workspace = true
 tree-sitter-markdown.workspace = true
-tree-sitter-rust.workspace = true
 tree-sitter-python.workspace = true
-tree-sitter-typescript.workspace = true
 tree-sitter-ruby.workspace = true
-tree-sitter-elixir.workspace = true
-tree-sitter-heex.workspace = true
+tree-sitter-rust.workspace = true
+tree-sitter-typescript.workspace = true
+unindent.workspace = true
+util = { path = "../util", features = ["test-support"] }
diff --git a/crates/language_selector/Cargo.toml b/crates/language_selector/Cargo.toml
index bc7ebf4e87..adeb9359d2 100644
--- a/crates/language_selector/Cargo.toml
+++ b/crates/language_selector/Cargo.toml
@@ -10,18 +10,18 @@ path = "src/language_selector.rs"
 doctest = false
 
 [dependencies]
+anyhow.workspace = true
 editor = { path = "../editor" }
 fuzzy = {  path = "../fuzzy" }
-language = { path = "../language" }
 gpui = { path = "../gpui" }
+language = { path = "../language" }
 picker = { path = "../picker" }
 project = { path = "../project" }
+settings = { path = "../settings" }
 theme = { path = "../theme" }
 ui = { path = "../ui" }
-settings = { path = "../settings" }
 util = { path = "../util" }
 workspace = { path = "../workspace" }
-anyhow.workspace = true
 
 [dev-dependencies]
 editor = { path = "../editor", features = ["test-support"] }
diff --git a/crates/language_tools/Cargo.toml b/crates/language_tools/Cargo.toml
index dc6d64c13d..d32677fd6e 100644
--- a/crates/language_tools/Cargo.toml
+++ b/crates/language_tools/Cargo.toml
@@ -10,27 +10,27 @@ path = "src/language_tools.rs"
 doctest = false
 
 [dependencies]
+anyhow.workspace = true
 collections = { path = "../collections" }
 editor = { path = "../editor" }
+futures.workspace = true
+gpui = { path = "../gpui" }
+language = { path = "../language" }
+lsp = { path = "../lsp" }
+project = { path = "../project" }
+serde.workspace = true
+serde_json.workspace = true
 settings = { path = "../settings" }
 theme = { path = "../theme" }
-language = { path = "../language" }
-project = { path = "../project" }
-workspace = { path = "../workspace" }
-gpui = { path = "../gpui" }
+tree-sitter.workspace = true
 ui = { path = "../ui" }
 util = { path = "../util" }
-lsp = { path = "../lsp" }
-futures.workspace = true
-serde.workspace = true
-anyhow.workspace = true
-tree-sitter.workspace = true
-serde_json.workspace = true
+workspace = { path = "../workspace" }
 
 [dev-dependencies]
 client = { path = "../client", features = ["test-support"] }
 editor = { path = "../editor", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-util = { path = "../util", features = ["test-support"] }
 env_logger.workspace = true
+gpui = { path = "../gpui", features = ["test-support"] }
 unindent.workspace = true
+util = { path = "../util", features = ["test-support"] }
diff --git a/crates/live_kit_client/Cargo.toml b/crates/live_kit_client/Cargo.toml
index 0eae185c0a..32c180c48c 100644
--- a/crates/live_kit_client/Cargo.toml
+++ b/crates/live_kit_client/Cargo.toml
@@ -23,21 +23,19 @@ test-support = [
 ]
 
 [dependencies]
-collections = { path = "../collections", optional = true }
-gpui = { path = "../gpui", optional = true }
-live_kit_server = { path = "../live_kit_server", optional = true }
-media = { path = "../media" }
-
 anyhow.workspace = true
 async-broadcast = "0.4"
+async-trait = { workspace = true, optional = true }
+collections = { path = "../collections", optional = true }
 futures.workspace = true
+gpui = { path = "../gpui", optional = true }
+live_kit_server = { path = "../live_kit_server", optional = true }
 log.workspace = true
+media = { path = "../media" }
+nanoid = { version ="0.4", optional = true}
 parking_lot.workspace = true
 postage.workspace = true
 
-async-trait = { workspace = true, optional = true }
-nanoid = { version ="0.4", optional = true}
-
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation = "0.9.3"
 
@@ -48,21 +46,20 @@ gpui = { path = "../gpui", features = ["test-support"] }
 live_kit_server = { path = "../live_kit_server" }
 
 [dev-dependencies]
-collections = { path = "../collections", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-live_kit_server = { path = "../live_kit_server" }
-media = { path = "../media" }
-nanoid = "0.4"
-
 anyhow.workspace = true
 async-trait.workspace = true
 block = "0.1"
-bytes = "1.2"
 byteorder = "1.4"
+bytes = "1.2"
+collections = { path = "../collections", features = ["test-support"] }
 foreign-types = "0.3"
 futures.workspace = true
+gpui = { path = "../gpui", features = ["test-support"] }
 hmac = "0.12"
 jwt = "0.16"
+live_kit_server = { path = "../live_kit_server" }
+media = { path = "../media" }
+nanoid = "0.4"
 parking_lot.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
diff --git a/crates/live_kit_server/Cargo.toml b/crates/live_kit_server/Cargo.toml
index 500bd15a95..63b4fe1066 100644
--- a/crates/live_kit_server/Cargo.toml
+++ b/crates/live_kit_server/Cargo.toml
@@ -15,8 +15,8 @@ anyhow.workspace = true
 async-trait.workspace = true
 futures.workspace = true
 hmac = "0.12"
-log.workspace = true
 jwt = "0.16"
+log.workspace = true
 prost = "0.8"
 prost-types = "0.8"
 reqwest = "0.11"
diff --git a/crates/lsp/Cargo.toml b/crates/lsp/Cargo.toml
index 6ef3b92b8b..f43c8a4bd8 100644
--- a/crates/lsp/Cargo.toml
+++ b/crates/lsp/Cargo.toml
@@ -13,13 +13,11 @@ doctest = false
 test-support = ["async-pipe"]
 
 [dependencies]
-collections = { path = "../collections" }
-gpui = { path = "../gpui" }
-util = { path = "../util" }
-
 anyhow.workspace = true
 async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "82d00a04211cf4e1236029aa03e6b6ce2a74c553", optional = true }
+collections = { path = "../collections" }
 futures.workspace = true
+gpui = { path = "../gpui" }
 log.workspace = true
 lsp-types = { git = "https://github.com/zed-industries/lsp-types", branch = "updated-completion-list-item-defaults" }
 parking_lot.workspace = true
@@ -28,12 +26,12 @@ serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
 smol.workspace = true
+util = { path = "../util" }
 
 [dev-dependencies]
-gpui = { path = "../gpui", features = ["test-support"] }
-util = { path = "../util", features = ["test-support"] }
-
 async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "82d00a04211cf4e1236029aa03e6b6ce2a74c553" }
 ctor.workspace = true
 env_logger.workspace = true
+gpui = { path = "../gpui", features = ["test-support"] }
 unindent.workspace = true
+util = { path = "../util", features = ["test-support"] }
diff --git a/crates/media/Cargo.toml b/crates/media/Cargo.toml
index 48c50a4fda..351ae37252 100644
--- a/crates/media/Cargo.toml
+++ b/crates/media/Cargo.toml
@@ -17,8 +17,8 @@ foreign-types = "0.3"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation = "0.9.3"
-objc = "0.2"
 metal = "0.21.0"
+objc = "0.2"
 
 [build-dependencies]
 bindgen = "0.65.1"
diff --git a/crates/multi_buffer/Cargo.toml b/crates/multi_buffer/Cargo.toml
index d0be28ba94..87f36f3096 100644
--- a/crates/multi_buffer/Cargo.toml
+++ b/crates/multi_buffer/Cargo.toml
@@ -21,59 +21,56 @@ test-support = [
 ]
 
 [dependencies]
+aho-corasick = "1.1"
+anyhow.workspace = true
 client = { path = "../client" }
 clock = { path = "../clock" }
 collections = { path = "../collections" }
-git = { path = "../git" }
-gpui = { path = "../gpui" }
-language = { path = "../language" }
-lsp = { path = "../lsp" }
-rich_text = { path = "../rich_text" }
-settings = { path = "../settings" }
-snippet = { path = "../snippet" }
-sum_tree = { path = "../sum_tree" }
-text = { path = "../text" }
-theme = { path = "../theme" }
-util = { path = "../util" }
-
-aho-corasick = "1.1"
-anyhow.workspace = true
 convert_case = "0.6.0"
 futures.workspace = true
+git = { path = "../git" }
+gpui = { path = "../gpui" }
 indoc = "1.0.4"
 itertools = "0.10"
+language = { path = "../language" }
 lazy_static.workspace = true
 log.workspace = true
+lsp = { path = "../lsp" }
 ordered-float.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
 pulldown-cmark = { version = "0.9.2", default-features = false }
 rand.workspace = true
+rich_text = { path = "../rich_text" }
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
+settings = { path = "../settings" }
 smallvec.workspace = true
 smol.workspace = true
-
-tree-sitter-rust = { workspace = true, optional = true }
+snippet = { path = "../snippet" }
+sum_tree = { path = "../sum_tree" }
+text = { path = "../text" }
+theme = { path = "../theme" }
 tree-sitter-html = { workspace = true, optional = true }
+tree-sitter-rust = { workspace = true, optional = true }
 tree-sitter-typescript = { workspace = true, optional = true }
+util = { path = "../util" }
 
 [dev-dependencies]
 copilot = { path = "../copilot", features = ["test-support"] }
-text = { path = "../text", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
-lsp = { path = "../lsp", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-util = { path = "../util", features = ["test-support"] }
-project = { path = "../project", features = ["test-support"] }
-settings = { path = "../settings", features = ["test-support"] }
-
 ctor.workspace = true
 env_logger.workspace = true
+gpui = { path = "../gpui", features = ["test-support"] }
+language = { path = "../language", features = ["test-support"] }
+lsp = { path = "../lsp", features = ["test-support"] }
+project = { path = "../project", features = ["test-support"] }
 rand.workspace = true
-unindent.workspace = true
-tree-sitter.workspace = true
-tree-sitter-rust.workspace = true
+settings = { path = "../settings", features = ["test-support"] }
+text = { path = "../text", features = ["test-support"] }
 tree-sitter-html.workspace = true
+tree-sitter-rust.workspace = true
 tree-sitter-typescript.workspace = true
+tree-sitter.workspace = true
+unindent.workspace = true
+util = { path = "../util", features = ["test-support"] }
diff --git a/crates/node_runtime/Cargo.toml b/crates/node_runtime/Cargo.toml
index c174cfa226..b111cf5752 100644
--- a/crates/node_runtime/Cargo.toml
+++ b/crates/node_runtime/Cargo.toml
@@ -10,15 +10,15 @@ path = "src/node_runtime.rs"
 doctest = false
 
 [dependencies]
-util = { path = "../util" }
+anyhow.workspace = true
 async-compression.workspace = true
 async-tar = "0.4.2"
-futures.workspace = true
 async-trait.workspace = true
-anyhow.workspace = true
+futures.workspace = true
+log.workspace = true
 parking_lot.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
 smol.workspace = true
-log.workspace = true
+util = { path = "../util" }
diff --git a/crates/notifications/Cargo.toml b/crates/notifications/Cargo.toml
index 5ec2d02417..134bda415b 100644
--- a/crates/notifications/Cargo.toml
+++ b/crates/notifications/Cargo.toml
@@ -18,6 +18,7 @@ test-support = [
 ]
 
 [dependencies]
+anyhow.workspace = true
 channel = { path = "../channel" }
 client = { path = "../client" }
 clock = { path = "../clock" }
@@ -29,10 +30,8 @@ rpc = { path = "../rpc" }
 settings = { path = "../settings" }
 sum_tree = { path = "../sum_tree" }
 text = { path = "../text" }
-util = { path = "../util" }
-
-anyhow.workspace = true
 time.workspace = true
+util = { path = "../util" }
 
 [dev-dependencies]
 client = { path = "../client", features = ["test-support"] }
diff --git a/crates/outline/Cargo.toml b/crates/outline/Cargo.toml
index 5fa8bbb03a..9dbd540797 100644
--- a/crates/outline/Cargo.toml
+++ b/crates/outline/Cargo.toml
@@ -13,18 +13,17 @@ doctest = false
 editor = { path = "../editor" }
 fuzzy = {  path = "../fuzzy" }
 gpui = { path = "../gpui" }
-ui = { path = "../ui" }
 language = { path = "../language" }
+ordered-float.workspace = true
 picker = { path = "../picker" }
+postage.workspace = true
 settings = { path = "../settings" }
+smol.workspace = true
 text = { path = "../text" }
 theme = { path = "../theme" }
-workspace = { path = "../workspace" }
+ui = { path = "../ui" }
 util = { path = "../util" }
-
-ordered-float.workspace = true
-postage.workspace = true
-smol.workspace = true
+workspace = { path = "../workspace" }
 
 [dev-dependencies]
 editor = { path = "../editor", features = ["test-support"] }
diff --git a/crates/picker/Cargo.toml b/crates/picker/Cargo.toml
index bf7cb468ac..c24d037919 100644
--- a/crates/picker/Cargo.toml
+++ b/crates/picker/Cargo.toml
@@ -11,19 +11,18 @@ doctest = false
 
 [dependencies]
 editor = { path = "../editor" }
-ui = { path = "../ui" }
 gpui = { path = "../gpui" }
 menu = { path = "../menu" }
+parking_lot.workspace = true
 settings = { path = "../settings" }
-util = { path = "../util" }
 theme = { path = "../theme" }
+ui = { path = "../ui" }
+util = { path = "../util" }
 workspace = { path = "../workspace"}
 
-parking_lot.workspace = true
-
 [dev-dependencies]
+ctor.workspace = true
 editor = { path = "../editor", features = ["test-support"] }
+env_logger.workspace = true
 gpui = { path = "../gpui", features = ["test-support"] }
 serde_json.workspace = true
-ctor.workspace = true
-env_logger.workspace = true
diff --git a/crates/plugin/Cargo.toml b/crates/plugin/Cargo.toml
index 1bdd47f594..c07da5d7c7 100644
--- a/crates/plugin/Cargo.toml
+++ b/crates/plugin/Cargo.toml
@@ -6,7 +6,7 @@ publish = false
 license = "GPL-3.0-or-later"
 
 [dependencies]
-serde.workspace = true
-serde_derive.workspace = true
 bincode = "1.3"
 plugin_macros = { path = "../plugin_macros" }
+serde.workspace = true
+serde_derive.workspace = true
diff --git a/crates/plugin_macros/Cargo.toml b/crates/plugin_macros/Cargo.toml
index a125bc67e5..9d940f2423 100644
--- a/crates/plugin_macros/Cargo.toml
+++ b/crates/plugin_macros/Cargo.toml
@@ -9,9 +9,9 @@ license = "GPL-3.0-or-later"
 proc-macro = true
 
 [dependencies]
-syn = { version = "1.0", features = ["full",  "extra-traits"] }
-quote = "1.0"
+bincode = "1.3"
 proc-macro2 = "1.0"
+quote = "1.0"
 serde.workspace = true
 serde_derive.workspace = true
-bincode = "1.3"
+syn = { version = "1.0", features = ["full",  "extra-traits"] }
diff --git a/crates/plugin_runtime/Cargo.toml b/crates/plugin_runtime/Cargo.toml
index f701c893e7..9df33c05b5 100644
--- a/crates/plugin_runtime/Cargo.toml
+++ b/crates/plugin_runtime/Cargo.toml
@@ -6,16 +6,16 @@ publish = false
 license = "GPL-3.0-or-later"
 
 [dependencies]
-wasmtime = "2.0"
-wasmtime-wasi = "2.0"
-wasi-common = "2.0"
 anyhow.workspace = true
+bincode = "1.3"
+pollster = "0.2.5"
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-bincode = "1.3"
-pollster = "0.2.5"
 smol.workspace = true
+wasi-common = "2.0"
+wasmtime = "2.0"
+wasmtime-wasi = "2.0"
 
 [build-dependencies]
 wasmtime = { version = "2.0", features = ["all-arch"] }
diff --git a/crates/prettier/Cargo.toml b/crates/prettier/Cargo.toml
index be4bb6f2f9..565a43ded7 100644
--- a/crates/prettier/Cargo.toml
+++ b/crates/prettier/Cargo.toml
@@ -13,24 +13,23 @@ doctest = false
 test-support = []
 
 [dependencies]
+anyhow.workspace = true
 client = { path = "../client" }
-collections = { path = "../collections"}
-language = { path = "../language" }
-gpui = { path = "../gpui" }
+collections = { path = "../collections" }
 fs = { path = "../fs" }
-lsp = { path = "../lsp" }
-node_runtime = { path = "../node_runtime"}
-util = { path = "../util" }
-
+futures.workspace = true
+gpui = { path = "../gpui" }
+language = { path = "../language" }
 log.workspace = true
+lsp = { path = "../lsp" }
+node_runtime = { path = "../node_runtime" }
+parking_lot.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-anyhow.workspace = true
-futures.workspace = true
-parking_lot.workspace = true
+util = { path = "../util" }
 
 [dev-dependencies]
-language = { path = "../language", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
 fs = { path = "../fs",  features = ["test-support"] }
+gpui = { path = "../gpui", features = ["test-support"] }
+language = { path = "../language", features = ["test-support"] }
diff --git a/crates/project/Cargo.toml b/crates/project/Cargo.toml
index 453553ed8e..78e9625afb 100644
--- a/crates/project/Cargo.toml
+++ b/crates/project/Cargo.toml
@@ -21,66 +21,65 @@ test-support = [
 ]
 
 [dependencies]
-text = { path = "../text" }
-copilot = { path = "../copilot" }
-client = { path = "../client" }
-clock = { path = "../clock" }
-collections = { path = "../collections" }
-db = { path = "../db" }
-fs = { path = "../fs" }
-fsevent = { path = "../fsevent" }
-fuzzy = {  path = "../fuzzy" }
-git = { path = "../git" }
-gpui = { path = "../gpui" }
-language = { path = "../language" }
-lsp = { path = "../lsp" }
-node_runtime = { path = "../node_runtime" }
-prettier = { path = "../prettier" }
-rpc = { path = "../rpc" }
-settings = { path = "../settings" }
-sum_tree = { path = "../sum_tree" }
-terminal = { path = "../terminal" }
-util = { path = "../util" }
-
 aho-corasick = "1.1"
 anyhow.workspace = true
 async-trait.workspace = true
 backtrace = "0.3"
+client = { path = "../client" }
+clock = { path = "../clock" }
+collections = { path = "../collections" }
+copilot = { path = "../copilot" }
+db = { path = "../db" }
+fs = { path = "../fs" }
+fsevent = { path = "../fsevent" }
 futures.workspace = true
+fuzzy = {  path = "../fuzzy" }
+git = { path = "../git" }
 globset.workspace = true
+gpui = { path = "../gpui" }
 ignore = "0.4"
+itertools = "0.10"
+language = { path = "../language" }
 lazy_static.workspace = true
 log.workspace = true
+lsp = { path = "../lsp" }
+node_runtime = { path = "../node_runtime" }
 parking_lot.workspace = true
 postage.workspace = true
+prettier = { path = "../prettier" }
 rand.workspace = true
 regex.workspace = true
+rpc = { path = "../rpc" }
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
+settings = { path = "../settings" }
 sha2 = "0.10"
 similar = "1.3"
 smol.workspace = true
+sum_tree = { path = "../sum_tree" }
+terminal = { path = "../terminal" }
+text = { path = "../text" }
 thiserror.workspace = true
 toml.workspace = true
-itertools = "0.10"
+util = { path = "../util" }
 
 [dev-dependencies]
-ctor.workspace = true
-env_logger.workspace = true
-pretty_assertions.workspace = true
 client = { path = "../client", features = ["test-support"] }
 collections = { path = "../collections", features = ["test-support"] }
+ctor.workspace = true
 db = { path = "../db", features = ["test-support"] }
+env_logger.workspace = true
 fs = { path = "../fs",  features = ["test-support"] }
+git2.workspace = true
 gpui = { path = "../gpui", features = ["test-support"] }
 language = { path = "../language", features = ["test-support"] }
 lsp = { path = "../lsp", features = ["test-support"] }
-settings = { path = "../settings", features = ["test-support"] }
 prettier = { path = "../prettier", features = ["test-support"] }
-util = { path = "../util", features = ["test-support"] }
+pretty_assertions.workspace = true
 rpc = { path = "../rpc", features = ["test-support"] }
-git2.workspace = true
+settings = { path = "../settings", features = ["test-support"] }
 tempfile.workspace = true
 unindent.workspace = true
+util = { path = "../util", features = ["test-support"] }
diff --git a/crates/project_panel/Cargo.toml b/crates/project_panel/Cargo.toml
index d7fbb501cb..d681b9b38c 100644
--- a/crates/project_panel/Cargo.toml
+++ b/crates/project_panel/Cargo.toml
@@ -10,33 +10,33 @@ path = "src/project_panel.rs"
 doctest = false
 
 [dependencies]
+anyhow.workspace = true
 collections = { path = "../collections" }
 db = { path = "../db" }
 editor = { path = "../editor" }
+futures.workspace = true
 gpui = { path = "../gpui" }
 menu = {  path = "../menu" }
-project = { path = "../project" }
-search = { path = "../search" }
-settings = { path = "../settings" }
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace", package = "workspace" }
-anyhow.workspace = true
 postage.workspace = true
-futures.workspace = true
+pretty_assertions.workspace = true
+project = { path = "../project" }
+schemars.workspace = true
+search = { path = "../search" }
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-schemars.workspace = true
+settings = { path = "../settings" }
 smallvec.workspace = true
-pretty_assertions.workspace = true
+theme = { path = "../theme" }
+ui = { path = "../ui" }
 unicase = "2.6"
+util = { path = "../util" }
+workspace = { path = "../workspace", package = "workspace" }
 
 [dev-dependencies]
 client = { path = "../client", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
 editor = { path = "../editor", features = ["test-support"] }
 gpui = { path = "../gpui", features = ["test-support"] }
-workspace = { path = "../workspace", features = ["test-support"] }
+language = { path = "../language", features = ["test-support"] }
 serde_json.workspace = true
+workspace = { path = "../workspace", features = ["test-support"] }
diff --git a/crates/project_symbols/Cargo.toml b/crates/project_symbols/Cargo.toml
index 8f2f8bbf7a..27d36ea99a 100644
--- a/crates/project_symbols/Cargo.toml
+++ b/crates/project_symbols/Cargo.toml
@@ -10,30 +10,29 @@ path = "src/project_symbols.rs"
 doctest = false
 
 [dependencies]
+anyhow.workspace = true
 editor = { path = "../editor" }
 fuzzy = {   path = "../fuzzy" }
 gpui = { path = "../gpui" }
+ordered-float.workspace = true
 picker = { path = "../picker" }
+postage.workspace = true
 project = { path = "../project" }
-text = { path = "../text" }
+serde_json.workspace = true
 settings = { path = "../settings" }
-workspace = { path = "../workspace" }
+smol.workspace = true
+text = { path = "../text" }
 theme = { path = "../theme" }
 util = { path = "../util" }
-
-anyhow.workspace = true
-ordered-float.workspace = true
-postage.workspace = true
-smol.workspace = true
-serde_json.workspace = true
+workspace = { path = "../workspace" }
 
 [dev-dependencies]
-futures.workspace = true
 editor = { path = "../editor", features = ["test-support"] }
-settings = { path = "../settings", features = ["test-support"] }
+futures.workspace = true
 gpui = { path = "../gpui", features = ["test-support"] }
 language = { path = "../language", features = ["test-support"] }
 lsp = { path = "../lsp", features = ["test-support"] }
 project = { path = "../project", features = ["test-support"] }
+settings = { path = "../settings", features = ["test-support"] }
 theme = { path = "../theme", features = ["test-support"] }
 workspace = { path = "../workspace", features = ["test-support"] }
diff --git a/crates/quick_action_bar/Cargo.toml b/crates/quick_action_bar/Cargo.toml
index e57bd07502..56c92be8a1 100644
--- a/crates/quick_action_bar/Cargo.toml
+++ b/crates/quick_action_bar/Cargo.toml
@@ -14,8 +14,8 @@ assistant = { path = "../assistant" }
 editor = { path = "../editor" }
 gpui = { path = "../gpui" }
 search = { path = "../search" }
-workspace = { path = "../workspace" }
 ui = { path = "../ui" }
+workspace = { path = "../workspace" }
 
 [dev-dependencies]
 editor = { path = "../editor", features = ["test-support"] }
diff --git a/crates/recent_projects/Cargo.toml b/crates/recent_projects/Cargo.toml
index 62a4754eff..ee4e4498fd 100644
--- a/crates/recent_projects/Cargo.toml
+++ b/crates/recent_projects/Cargo.toml
@@ -11,21 +11,20 @@ doctest = false
 
 [dependencies]
 editor = { path = "../editor" }
+futures.workspace = true
 fuzzy = {  path = "../fuzzy" }
 gpui = { path = "../gpui" }
 language = { path = "../language" }
+ordered-float.workspace = true
 picker = { path = "../picker" }
+postage.workspace = true
 settings = { path = "../settings" }
+smol.workspace = true
 text = { path = "../text" }
-util = { path = "../util"}
 theme = { path = "../theme" }
 ui = { path = "../ui" }
+util = { path = "../util"}
 workspace = { path = "../workspace" }
 
-futures.workspace = true
-ordered-float.workspace = true
-postage.workspace = true
-smol.workspace = true
-
 [dev-dependencies]
 editor = { path = "../editor", features = ["test-support"] }
diff --git a/crates/refineable/Cargo.toml b/crates/refineable/Cargo.toml
index e586f0fc6a..cc1b5d0344 100644
--- a/crates/refineable/Cargo.toml
+++ b/crates/refineable/Cargo.toml
@@ -10,7 +10,7 @@ path = "src/refineable.rs"
 doctest = false
 
 [dependencies]
-syn = "1.0.72"
-quote = "1.0.9"
-proc-macro2 = "1.0.66"
 derive_refineable = { path = "./derive_refineable" }
+proc-macro2 = "1.0.66"
+quote = "1.0.9"
+syn = "1.0.72"
diff --git a/crates/rich_text/Cargo.toml b/crates/rich_text/Cargo.toml
index cb8478e36d..a772407a83 100644
--- a/crates/rich_text/Cargo.toml
+++ b/crates/rich_text/Cargo.toml
@@ -16,16 +16,16 @@ test-support = [
 ]
 
 [dependencies]
-collections = { path = "../collections" }
-gpui = { path = "../gpui" }
-sum_tree = { path = "../sum_tree" }
-theme = { path = "../theme" }
-language = { path = "../language" }
-util = { path = "../util" }
-ui = { path = "../ui" }
 anyhow.workspace = true
+collections = { path = "../collections" }
 futures.workspace = true
+gpui = { path = "../gpui" }
+language = { path = "../language" }
 lazy_static.workspace = true
 pulldown-cmark = { version = "0.9.2", default-features = false }
 smallvec.workspace = true
 smol.workspace = true
+sum_tree = { path = "../sum_tree" }
+theme = { path = "../theme" }
+ui = { path = "../ui" }
+util = { path = "../util" }
diff --git a/crates/rope/Cargo.toml b/crates/rope/Cargo.toml
index 4839bceb64..60d6e8f40b 100644
--- a/crates/rope/Cargo.toml
+++ b/crates/rope/Cargo.toml
@@ -9,14 +9,14 @@ license = "GPL-3.0-or-later"
 path = "src/rope.rs"
 
 [dependencies]
+arrayvec = "0.7.1"
 bromberg_sl2 = { git = "https://github.com/zed-industries/bromberg_sl2", rev = "950bc5482c216c395049ae33ae4501e08975f17f" }
+log.workspace = true
 smallvec.workspace = true
 sum_tree = { path = "../sum_tree" }
-arrayvec = "0.7.1"
-log.workspace = true
 util = { path = "../util" }
 
 [dev-dependencies]
+gpui = { path = "../gpui", features = ["test-support"] }
 rand.workspace = true
 util = { path = "../util", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"]  }
diff --git a/crates/rpc/Cargo.toml b/crates/rpc/Cargo.toml
index e4bca184ee..fe213be68c 100644
--- a/crates/rpc/Cargo.toml
+++ b/crates/rpc/Cargo.toml
@@ -14,25 +14,25 @@ doctest = false
 test-support = ["collections/test-support", "gpui/test-support"]
 
 [dependencies]
-clock = { path = "../clock" }
-collections = { path = "../collections" }
-gpui = { path = "../gpui", optional = true }
-util = { path = "../util" }
 anyhow.workspace = true
 async-lock = "2.4"
 async-tungstenite = "0.16"
 base64 = "0.13"
+clock = { path = "../clock" }
+collections = { path = "../collections" }
 futures.workspace = true
+gpui = { path = "../gpui", optional = true }
 parking_lot.workspace = true
 prost.workspace = true
 rand.workspace = true
 rsa = "0.4"
-serde_json.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
+serde_json.workspace = true
 smol-timeout = "0.6"
 strum.workspace = true
 tracing = { version = "0.1.34", features = ["log"] }
+util = { path = "../util" }
 zstd = "0.11"
 
 [build-dependencies]
@@ -40,8 +40,8 @@ prost-build = "0.9"
 
 [dev-dependencies]
 collections = { path = "../collections", features = ["test-support"] }
+ctor.workspace = true
+env_logger.workspace = true
 gpui = { path = "../gpui", features = ["test-support"] }
 smol.workspace = true
 tempfile.workspace = true
-ctor.workspace = true
-env_logger.workspace = true
diff --git a/crates/search/Cargo.toml b/crates/search/Cargo.toml
index 42ac3ab8e1..6388ad062b 100644
--- a/crates/search/Cargo.toml
+++ b/crates/search/Cargo.toml
@@ -10,32 +10,32 @@ path = "src/search.rs"
 doctest = false
 
 [dependencies]
+anyhow.workspace = true
 bitflags = "1"
 collections = { path = "../collections" }
 editor = { path = "../editor" }
+futures.workspace = true
 gpui = { path = "../gpui" }
 language = { path = "../language" }
-menu = { path = "../menu" }
-project = { path = "../project" }
-settings = { path = "../settings" }
-theme = { path = "../theme" }
-util = { path = "../util" }
-ui = {path = "../ui"}
-workspace = { path = "../workspace" }
-semantic_index = { path = "../semantic_index" }
-anyhow.workspace = true
-futures.workspace = true
 log.workspace = true
+menu = { path = "../menu" }
 postage.workspace = true
+project = { path = "../project" }
+semantic_index = { path = "../semantic_index" }
 serde.workspace = true
 serde_derive.workspace = true
+serde_json.workspace = true
+settings = { path = "../settings" }
 smallvec.workspace = true
 smol.workspace = true
-serde_json.workspace = true
+theme = { path = "../theme" }
+ui = {path = "../ui"}
+util = { path = "../util" }
+workspace = { path = "../workspace" }
+
 [dev-dependencies]
 client = { path = "../client", features = ["test-support"] }
 editor = { path = "../editor", features = ["test-support"] }
 gpui = { path = "../gpui", features = ["test-support"] }
-
-workspace = { path = "../workspace", features = ["test-support"] }
 unindent.workspace = true
+workspace = { path = "../workspace", features = ["test-support"] }
diff --git a/crates/semantic_index/Cargo.toml b/crates/semantic_index/Cargo.toml
index 274b603313..a49145f0a0 100644
--- a/crates/semantic_index/Cargo.toml
+++ b/crates/semantic_index/Cargo.toml
@@ -11,61 +11,59 @@ doctest = false
 
 [dependencies]
 ai = { path = "../ai" }
+anyhow.workspace = true
+async-trait.workspace = true
 collections = { path = "../collections" }
+futures.workspace = true
+globset.workspace = true
 gpui = { path = "../gpui" }
 language = { path = "../language" }
+lazy_static.workspace = true
+log.workspace = true
+ndarray = { version = "0.15.0" }
+ordered-float.workspace = true
+parking_lot.workspace = true
+postage.workspace = true
 project = { path = "../project" }
-workspace = { path = "../workspace" }
-util = { path = "../util" }
+rand.workspace = true
 release_channel = { path = "../release_channel" }
 rpc = { path = "../rpc" }
-settings = { path = "../settings" }
-anyhow.workspace = true
-postage.workspace = true
-futures.workspace = true
-ordered-float.workspace = true
-smol.workspace = true
 rusqlite.workspace = true
-log.workspace = true
-tree-sitter.workspace = true
-lazy_static.workspace = true
+schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-async-trait.workspace = true
-tiktoken-rs.workspace = true
-parking_lot.workspace = true
-rand.workspace = true
-schemars.workspace = true
-globset.workspace = true
+settings = { path = "../settings" }
 sha1 = "0.10.5"
-ndarray = { version = "0.15.0" }
+smol.workspace = true
+tiktoken-rs.workspace = true
+tree-sitter.workspace = true
+util = { path = "../util" }
+workspace = { path = "../workspace" }
 
 [dev-dependencies]
 ai = { path = "../ai", features = ["test-support"] }
-collections = { path = "../collections", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
-project = { path = "../project", features = ["test-support"] }
-rpc = { path = "../rpc", features = ["test-support"] }
-workspace = { path = "../workspace", features = ["test-support"] }
-settings = { path = "../settings", features = ["test-support"]}
-rust-embed.workspace = true
 client = { path = "../client" }
-node_runtime = { path = "../node_runtime"}
-
-pretty_assertions.workspace = true
-rand.workspace = true
-unindent.workspace = true
-tempfile.workspace = true
+collections = { path = "../collections", features = ["test-support"] }
 ctor.workspace = true
 env_logger.workspace = true
-
-tree-sitter-typescript.workspace = true
-tree-sitter-json.workspace = true
-tree-sitter-rust.workspace = true
-tree-sitter-toml.workspace = true
+gpui = { path = "../gpui", features = ["test-support"] }
+language = { path = "../language", features = ["test-support"] }
+node_runtime = { path = "../node_runtime"}
+pretty_assertions.workspace = true
+project = { path = "../project", features = ["test-support"] }
+rand.workspace = true
+rpc = { path = "../rpc", features = ["test-support"] }
+rust-embed.workspace = true
+settings = { path = "../settings", features = ["test-support"]}
+tempfile.workspace = true
 tree-sitter-cpp.workspace = true
 tree-sitter-elixir.workspace = true
+tree-sitter-json.workspace = true
 tree-sitter-lua.workspace = true
-tree-sitter-ruby.workspace = true
 tree-sitter-php.workspace = true
+tree-sitter-ruby.workspace = true
+tree-sitter-rust.workspace = true
+tree-sitter-toml.workspace = true
+tree-sitter-typescript.workspace = true
+unindent.workspace = true
+workspace = { path = "../workspace", features = ["test-support"] }
diff --git a/crates/settings/Cargo.toml b/crates/settings/Cargo.toml
index cd6af095e7..5e93189a23 100644
--- a/crates/settings/Cargo.toml
+++ b/crates/settings/Cargo.toml
@@ -13,31 +13,30 @@ doctest = false
 test-support = ["gpui/test-support", "fs/test-support"]
 
 [dependencies]
-collections = { path = "../collections" }
-gpui = { path = "../gpui" }
-fs = { path = "../fs" }
-feature_flags = { path = "../feature_flags" }
-release_channel = { path = "../release_channel" }
-util = { path = "../util" }
-
 anyhow.workspace = true
+collections = { path = "../collections" }
+feature_flags = { path = "../feature_flags" }
+fs = { path = "../fs" }
 futures.workspace = true
-serde_json_lenient = {version = "0.1", features = ["preserve_order", "raw_value"]}
+gpui = { path = "../gpui" }
 lazy_static.workspace = true
 postage.workspace = true
+release_channel = { path = "../release_channel" }
 rust-embed.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
+serde_json_lenient = {version = "0.1", features = ["preserve_order", "raw_value"] }
 smallvec.workspace = true
 toml.workspace = true
-tree-sitter.workspace = true
 tree-sitter-json = "*"
+tree-sitter.workspace = true
+util = { path = "../util" }
 
 [dev-dependencies]
-gpui = { path = "../gpui", features = ["test-support"] }
 fs = { path = "../fs", features = ["test-support"] }
+gpui = { path = "../gpui", features = ["test-support"] }
 indoc.workspace = true
 pretty_assertions.workspace = true
 unindent.workspace = true
diff --git a/crates/sqlez/Cargo.toml b/crates/sqlez/Cargo.toml
index 6a3006f794..0d5f9dba54 100644
--- a/crates/sqlez/Cargo.toml
+++ b/crates/sqlez/Cargo.toml
@@ -7,12 +7,12 @@ license = "GPL-3.0-or-later"
 
 [dependencies]
 anyhow.workspace = true
+futures.workspace = true
 indoc.workspace = true
+lazy_static.workspace = true
 libsqlite3-sys = { version = "0.26", features = ["bundled"] }
+parking_lot.workspace = true
 smol.workspace = true
 thread_local = "1.1.4"
-lazy_static.workspace = true
-parking_lot.workspace = true
-futures.workspace = true
 util = { path = "../util" }
 uuid.workspace = true
diff --git a/crates/sqlez_macros/Cargo.toml b/crates/sqlez_macros/Cargo.toml
index bfb234ba4a..a6e3881b7f 100644
--- a/crates/sqlez_macros/Cargo.toml
+++ b/crates/sqlez_macros/Cargo.toml
@@ -11,9 +11,9 @@ proc-macro = true
 doctest = false
 
 [dependencies]
-syn = "1.0"
-quote = "1.0"
-proc-macro2 = "1.0"
 lazy_static.workspace = true
+proc-macro2 = "1.0"
+quote = "1.0"
 sqlez = { path = "../sqlez" }
 sqlformat = "0.2"
+syn = "1.0"
diff --git a/crates/story/Cargo.toml b/crates/story/Cargo.toml
index 47117a38be..9b17a04096 100644
--- a/crates/story/Cargo.toml
+++ b/crates/story/Cargo.toml
@@ -7,5 +7,5 @@ license = "GPL-3.0-or-later"
 
 [dependencies]
 gpui = { path = "../gpui" }
+itertools = { package = "itertools", version = "0.10" }
 smallvec.workspace = true
-itertools = {package = "itertools", version = "0.10"}
diff --git a/crates/storybook/Cargo.toml b/crates/storybook/Cargo.toml
index 241fc5f4a8..6177609d94 100644
--- a/crates/storybook/Cargo.toml
+++ b/crates/storybook/Cargo.toml
@@ -16,7 +16,7 @@ backtrace-on-stack-overflow = "0.3.0"
 chrono = "0.4"
 clap = { version = "4.4", features = ["derive", "string"] }
 collab_ui = { path = "../collab_ui", features = ["stories"] }
-strum = { version = "0.25.0", features = ["derive"] }
+ctrlc = "3.4"
 dialoguer = { version = "0.11.0", features = ["fuzzy-select"] }
 editor = { path = "../editor" }
 fuzzy = {  path = "../fuzzy" }
@@ -25,18 +25,18 @@ indoc.workspace = true
 itertools = "0.11.0"
 language = { path = "../language" }
 log.workspace = true
+menu = { path = "../menu" }
+picker = { path = "../picker" }
 rust-embed.workspace = true
 serde.workspace = true
 settings = { path = "../settings" }
 simplelog = "0.9"
 smallvec.workspace = true
 story = { path = "../story" }
+strum = { version = "0.25.0", features = ["derive"] }
 theme = { path = "../theme" }
-menu = { path = "../menu" }
 ui = { path = "../ui", features = ["stories"] }
 util = { path = "../util" }
-picker = { path = "../picker" }
-ctrlc = "3.4"
 
 [dev-dependencies]
 gpui = { path = "../gpui", features = ["test-support"] }
diff --git a/crates/terminal/Cargo.toml b/crates/terminal/Cargo.toml
index 44be85e436..baad46b261 100644
--- a/crates/terminal/Cargo.toml
+++ b/crates/terminal/Cargo.toml
@@ -11,30 +11,29 @@ doctest = false
 
 
 [dependencies]
-gpui = { path = "../gpui" }
-settings = { path = "../settings" }
-db = { path = "../db" }
-theme = { path = "../theme" }
-util = { path = "../util" }
-
 alacritty_terminal = "0.21"
-procinfo = { git = "https://github.com/zed-industries/wezterm", rev = "5cd757e5f2eb039ed0c6bb6512223e69d5efc64d", default-features = false }
-smallvec.workspace = true
-smol.workspace = true
-mio-extras = "2.0.6"
-futures.workspace = true
-ordered-float.workspace = true
-itertools = "0.10"
-dirs = "4.0.0"
-shellexpand = "2.1.0"
-libc = "0.2"
 anyhow.workspace = true
-schemars.workspace = true
-thiserror.workspace = true
+db = { path = "../db" }
+dirs = "4.0.0"
+futures.workspace = true
+gpui = { path = "../gpui" }
+itertools = "0.10"
 lazy_static.workspace = true
+libc = "0.2"
+mio-extras = "2.0.6"
+ordered-float.workspace = true
+procinfo = { git = "https://github.com/zed-industries/wezterm", rev = "5cd757e5f2eb039ed0c6bb6512223e69d5efc64d", default-features = false }
+schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
+settings = { path = "../settings" }
+shellexpand = "2.1.0"
+smallvec.workspace = true
+smol.workspace = true
+theme = { path = "../theme" }
+thiserror.workspace = true
+util = { path = "../util" }
 
 [dev-dependencies]
 rand.workspace = true
diff --git a/crates/terminal_view/Cargo.toml b/crates/terminal_view/Cargo.toml
index 664397a0a3..dfffe3824f 100644
--- a/crates/terminal_view/Cargo.toml
+++ b/crates/terminal_view/Cargo.toml
@@ -10,39 +10,39 @@ path = "src/terminal_view.rs"
 doctest = false
 
 [dependencies]
+anyhow.workspace = true
+db = { path = "../db" }
+dirs = "4.0.0"
 editor = { path = "../editor" }
-language = { path = "../language" }
+futures.workspace = true
 gpui = { path = "../gpui" }
+itertools = "0.10"
+language = { path = "../language" }
+lazy_static.workspace = true
+libc = "0.2"
+mio-extras = "2.0.6"
+ordered-float.workspace = true
+procinfo = { git = "https://github.com/zed-industries/wezterm", rev = "5cd757e5f2eb039ed0c6bb6512223e69d5efc64d", default-features = false }
 project = { path = "../project" }
 search = { path = "../search" }
-settings = { path = "../settings" }
-theme = { path = "../theme" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
-db = { path = "../db" }
-procinfo = { git = "https://github.com/zed-industries/wezterm", rev = "5cd757e5f2eb039ed0c6bb6512223e69d5efc64d", default-features = false }
-terminal = { path = "../terminal" }
-ui = { path = "../ui" }
-smallvec.workspace = true
-smol.workspace = true
-mio-extras = "2.0.6"
-futures.workspace = true
-ordered-float.workspace = true
-itertools = "0.10"
-dirs = "4.0.0"
-shellexpand = "2.1.0"
-libc = "0.2"
-anyhow.workspace = true
-thiserror.workspace = true
-lazy_static.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
+settings = { path = "../settings" }
+shellexpand = "2.1.0"
+smallvec.workspace = true
+smol.workspace = true
+terminal = { path = "../terminal" }
+theme = { path = "../theme" }
+thiserror.workspace = true
+ui = { path = "../ui" }
+util = { path = "../util" }
+workspace = { path = "../workspace" }
 
 [dev-dependencies]
+client = { path = "../client", features = ["test-support"] }
 editor = { path = "../editor", features = ["test-support"] }
 gpui = { path = "../gpui", features = ["test-support"] }
-client = { path = "../client", features = ["test-support"]}
-project = { path = "../project", features = ["test-support"]}
-workspace = { path = "../workspace", features = ["test-support"] }
+project = { path = "../project", features = ["test-support"] }
 rand.workspace = true
+workspace = { path = "../workspace", features = ["test-support"] }
diff --git a/crates/text/Cargo.toml b/crates/text/Cargo.toml
index 3bbcb7fab5..e3cf4b0238 100644
--- a/crates/text/Cargo.toml
+++ b/crates/text/Cargo.toml
@@ -13,26 +13,25 @@ doctest = false
 test-support = ["rand"]
 
 [dependencies]
+anyhow.workspace = true
 clock = { path = "../clock" }
 collections = { path = "../collections" }
-rope = { path = "../rope" }
-sum_tree = { path = "../sum_tree" }
-util = { path = "../util" }
-
-anyhow.workspace = true
 digest = { version = "0.9", features = ["std"] }
 lazy_static.workspace = true
 log.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
 rand = { workspace = true, optional = true }
-smallvec.workspace = true
 regex.workspace = true
+rope = { path = "../rope" }
+smallvec.workspace = true
+sum_tree = { path = "../sum_tree" }
+util = { path = "../util" }
 
 [dev-dependencies]
 collections = { path = "../collections", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-util = { path = "../util", features = ["test-support"] }
 ctor.workspace = true
 env_logger.workspace = true
+gpui = { path = "../gpui", features = ["test-support"] }
 rand.workspace = true
+util = { path = "../util", features = ["test-support"] }
diff --git a/crates/theme/Cargo.toml b/crates/theme/Cargo.toml
index d854a32497..81ae89a268 100644
--- a/crates/theme/Cargo.toml
+++ b/crates/theme/Cargo.toml
@@ -20,11 +20,13 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
+color = {path = "../color"}
 derive_more.workspace = true
 fs = { path = "../fs" }
 futures.workspace = true
 gpui = { path = "../gpui" }
 indexmap = { version = "1.6.2", features = ["serde"] }
+itertools = { version = "0.11.0", optional = true }
 palette = { version = "0.7.3", default-features = false, features = ["std"] }
 parking_lot.workspace = true
 refineable.workspace = true
@@ -36,12 +38,10 @@ serde_repr.workspace = true
 settings = { path = "../settings" }
 story = { path = "../story", optional = true }
 toml.workspace = true
-uuid.workspace = true
 util = { path = "../util" }
-color = {path = "../color"}
-itertools = { version = "0.11.0", optional = true }
+uuid.workspace = true
 
 [dev-dependencies]
-gpui = { path = "../gpui", features = ["test-support"] }
 fs = { path = "../fs", features = ["test-support"] }
+gpui = { path = "../gpui", features = ["test-support"] }
 settings = { path = "../settings", features = ["test-support"] }
diff --git a/crates/theme_selector/Cargo.toml b/crates/theme_selector/Cargo.toml
index d24039b84c..b3727092ea 100644
--- a/crates/theme_selector/Cargo.toml
+++ b/crates/theme_selector/Cargo.toml
@@ -16,16 +16,16 @@ feature_flags = { path = "../feature_flags" }
 fs = { path = "../fs" }
 fuzzy = {  path = "../fuzzy" }
 gpui = { path = "../gpui" }
+log.workspace = true
+parking_lot.workspace = true
 picker = { path = "../picker" }
+postage.workspace = true
 settings = { path = "../settings" }
+smol.workspace = true
 theme = { path = "../theme" }
 ui = { path = "../ui" }
 util = { path = "../util" }
 workspace = { path = "../workspace" }
-log.workspace = true
-parking_lot.workspace = true
-postage.workspace = true
-smol.workspace = true
 
 [dev-dependencies]
 editor = { path = "../editor", features = ["test-support"] }
diff --git a/crates/ui/Cargo.toml b/crates/ui/Cargo.toml
index 7eb6ca3a12..0c5316e594 100644
--- a/crates/ui/Cargo.toml
+++ b/crates/ui/Cargo.toml
@@ -15,13 +15,13 @@ chrono = "0.4"
 gpui = { path = "../gpui" }
 itertools = { version = "0.11.0", optional = true }
 menu = { path = "../menu"}
+rand = "0.8"
 serde.workspace = true
 settings = { path = "../settings" }
 smallvec.workspace = true
 story = { path = "../story", optional = true }
 strum = { version = "0.25.0", features = ["derive"] }
 theme = { path = "../theme" }
-rand = "0.8"
 
 [features]
 default = []
diff --git a/crates/util/Cargo.toml b/crates/util/Cargo.toml
index a1045f8f82..c510d6f557 100644
--- a/crates/util/Cargo.toml
+++ b/crates/util/Cargo.toml
@@ -15,26 +15,26 @@ test-support = ["tempfile", "git2"]
 [dependencies]
 anyhow.workspace = true
 backtrace = "0.3"
-globset.workspace = true
-log.workspace = true
-lazy_static.workspace = true
+dirs = "3.0"
 futures.workspace = true
+git2 = { workspace = true, optional = true }
+globset.workspace = true
 isahc.workspace = true
-smol.workspace = true
-url.workspace = true
+lazy_static.workspace = true
+log.workspace = true
+parking_lot.workspace = true
 rand.workspace = true
 rust-embed.workspace = true
-tempfile = { workspace = true, optional = true }
 serde.workspace = true
 serde_json.workspace = true
-git2 = { workspace = true, optional = true }
-dirs = "3.0"
+smol.workspace = true
 take-until = "0.2.0"
-parking_lot.workspace = true
+tempfile = { workspace = true, optional = true }
+url.workspace = true
 
 [target.'cfg(windows)'.dependencies]
 tendril = "0.4.3"
 
 [dev-dependencies]
-tempfile.workspace = true
 git2.workspace = true
+tempfile.workspace = true
diff --git a/crates/vcs_menu/Cargo.toml b/crates/vcs_menu/Cargo.toml
index 7333cae93f..88cbbb0a84 100644
--- a/crates/vcs_menu/Cargo.toml
+++ b/crates/vcs_menu/Cargo.toml
@@ -6,12 +6,11 @@ publish = false
 license = "GPL-3.0-or-later"
 
 [dependencies]
-fuzzy = { path = "../fuzzy"}
-fs = {path = "../fs"}
-gpui = {path = "../gpui"}
-picker = {path = "../picker"}
-util = {path = "../util"}
-ui = {path = "../ui"}
-workspace = { path = "../workspace" }
-
 anyhow.workspace = true
+fs = { path = "../fs" }
+fuzzy = {  path = "../fuzzy" }
+gpui = { path = "../gpui" }
+picker = { path = "../picker" }
+ui = { path = "../ui" }
+util = { path = "../util" }
+workspace = { path = "../workspace" }
diff --git a/crates/vim/Cargo.toml b/crates/vim/Cargo.toml
index 6207630f8f..13c0b7bd45 100644
--- a/crates/vim/Cargo.toml
+++ b/crates/vim/Cargo.toml
@@ -14,44 +14,41 @@ neovim = ["nvim-rs", "async-compat", "async-trait", "tokio"]
 
 [dependencies]
 anyhow.workspace = true
-serde.workspace = true
-serde_derive.workspace = true
-itertools = "0.10"
-log.workspace = true
-
 async-compat = { version = "0.2.1", "optional" = true }
 async-trait = { workspace = true, "optional" = true }
-nvim-rs = { git = "https://github.com/KillTheMule/nvim-rs", branch = "master", features = ["use_tokio"], optional = true }
-tokio = { version = "1.15", "optional" = true }
-serde_json.workspace = true
-regex.workspace = true
-
 collections = { path = "../collections" }
 command_palette = { path = "../command_palette" }
 # HACK: We're only depending on `copilot` here for `CommandPaletteFilter`.  See the attached comment on that type.
 copilot = { path = "../copilot" }
+diagnostics = { path = "../diagnostics" }
 editor = { path = "../editor" }
 gpui = { path = "../gpui" }
+itertools = "0.10"
 language = { path = "../language" }
+log.workspace = true
+nvim-rs = { git = "https://github.com/KillTheMule/nvim-rs", branch = "master", features = ["use_tokio"], optional = true }
+regex.workspace = true
 search = { path = "../search" }
+serde.workspace = true
+serde_derive.workspace = true
+serde_json.workspace = true
 settings = { path = "../settings" }
-workspace = { path = "../workspace" }
 theme = { path = "../theme" }
+tokio = { version = "1.15", "optional" = true }
 ui = { path = "../ui"}
-diagnostics = { path = "../diagnostics" }
+workspace = { path = "../workspace" }
 zed_actions = { path = "../zed_actions" }
 
 [dev-dependencies]
-indoc.workspace = true
-parking_lot.workspace = true
-futures.workspace = true
-
 editor = { path = "../editor", features = ["test-support"] }
+futures.workspace = true
 gpui = { path = "../gpui", features = ["test-support"] }
+indoc.workspace = true
 language = { path = "../language", features = ["test-support"] }
-project = { path = "../project", features = ["test-support"] }
-util = { path = "../util", features = ["test-support"] }
-settings = { path = "../settings" }
-workspace = { path = "../workspace", features = ["test-support"] }
-theme = { path = "../theme", features = ["test-support"] }
 lsp = { path = "../lsp", features = ["test-support"] }
+parking_lot.workspace = true
+project = { path = "../project", features = ["test-support"] }
+settings = { path = "../settings" }
+theme = { path = "../theme", features = ["test-support"] }
+util = { path = "../util", features = ["test-support"] }
+workspace = { path = "../workspace", features = ["test-support"] }
diff --git a/crates/welcome/Cargo.toml b/crates/welcome/Cargo.toml
index 9dfce5888d..e915581f64 100644
--- a/crates/welcome/Cargo.toml
+++ b/crates/welcome/Cargo.toml
@@ -12,27 +12,26 @@ path = "src/welcome.rs"
 test-support = []
 
 [dependencies]
+anyhow.workspace = true
 client = { path = "../client" }
+db = { path = "../db" }
 editor = { path = "../editor" }
 fs = { path = "../fs" }
 fuzzy = {  path = "../fuzzy" }
 gpui = { path = "../gpui" }
-ui = { path = "../ui" }
-db = { path = "../db" }
 install_cli = { path = "../install_cli" }
+log.workspace = true
+picker = { path = "../picker" }
 project = { path = "../project" }
+schemars.workspace = true
+serde.workspace = true
 settings = { path = "../settings" }
 theme = { path = "../theme" }
 theme_selector = { path = "../theme_selector" }
+ui = { path = "../ui" }
 util = { path = "../util" }
-picker = { path = "../picker" }
-workspace = { path = "../workspace" }
 vim = { path = "../vim" }
-
-anyhow.workspace = true
-log.workspace = true
-schemars.workspace = true
-serde.workspace = true
+workspace = { path = "../workspace" }
 
 [dev-dependencies]
 editor = { path = "../editor", features = ["test-support"] }
diff --git a/crates/workspace/Cargo.toml b/crates/workspace/Cargo.toml
index 7693ce0509..bbba42e9af 100644
--- a/crates/workspace/Cargo.toml
+++ b/crates/workspace/Cargo.toml
@@ -20,50 +20,46 @@ test-support = [
 ]
 
 [dependencies]
-db = { path = "../db" }
+anyhow.workspace = true
+async-recursion = "1.0.0"
+bincode = "1.2.1"
 call = { path = "../call" }
 client = { path = "../client" }
 collections = { path = "../collections" }
-# context_menu = { path = "../context_menu" }
+db = { path = "../db" }
+derive_more.workspace = true
 fs = { path = "../fs" }
+futures.workspace = true
 gpui = { path = "../gpui" }
 install_cli = { path = "../install_cli" }
-language = { path = "../language" }
-#menu = { path = "../menu" }
-node_runtime = { path = "../node_runtime" }
-project = { path = "../project" }
-settings = { path = "../settings" }
-sqlez = { path = "../sqlez" }
-terminal = { path = "../terminal" }
-theme = { path = "../theme" }
-util = { path = "../util" }
-ui = { path = "../ui" }
-
-async-recursion = "1.0.0"
 itertools = "0.10"
-bincode = "1.2.1"
-anyhow.workspace = true
-derive_more.workspace = true
-futures.workspace = true
+language = { path = "../language" }
 lazy_static.workspace = true
 log.workspace = true
+node_runtime = { path = "../node_runtime" }
 parking_lot.workspace = true
 postage.workspace = true
+project = { path = "../project" }
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
+settings = { path = "../settings" }
 smallvec.workspace = true
+sqlez = { path = "../sqlez" }
+terminal = { path = "../terminal" }
+theme = { path = "../theme" }
+ui = { path = "../ui" }
+util = { path = "../util" }
 uuid.workspace = true
 
 [dev-dependencies]
 call = { path = "../call", features = ["test-support"] }
 client = { path = "../client", features = ["test-support"] }
+db = { path = "../db", features = ["test-support"] }
+env_logger.workspace = true
+fs = { path = "../fs", features = ["test-support"] }
 gpui = { path = "../gpui", features = ["test-support"] }
+indoc.workspace = true
 project = { path = "../project", features = ["test-support"] }
 settings = { path = "../settings", features = ["test-support"] }
-fs = { path = "../fs", features = ["test-support"] }
-db = { path = "../db", features = ["test-support"] }
-
-indoc.workspace = true
-env_logger.workspace = true
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 3741efbad0..c930c2eeb1 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -16,156 +16,147 @@ name = "Zed"
 path = "src/main.rs"
 
 [dependencies]
-ai = { path = "../ai"}
+activity_indicator = { path = "../activity_indicator" }
+ai = { path = "../ai" }
+anyhow.workspace = true
+assets = { path = "../assets" }
+assistant = { path = "../assistant" }
+async-compression.workspace = true
+async-recursion = "0.3"
+async-tar = "0.4.2"
+async-trait.workspace = true
 audio = { path = "../audio" }
-activity_indicator = { path = "../activity_indicator"}
 auto_update = { path = "../auto_update" }
+backtrace = "0.3"
 breadcrumbs = { path = "../breadcrumbs" }
 call = { path = "../call" }
 channel = { path = "../channel" }
+chrono = "0.4"
 cli = { path = "../cli" }
+client = { path = "../client" }
 collab_ui = { path = "../collab_ui" }
 collections = { path = "../collections" }
 command_palette = { path = "../command_palette" }
-# component_test = { path = "../component_test" }
-client = { path = "../client" }
-# clock = { path = "../clock" }
 copilot = { path = "../copilot" }
 copilot_ui = { path = "../copilot_ui" }
-diagnostics = { path = "../diagnostics" }
+ctor.workspace = true
 db = { path = "../db" }
+diagnostics = { path = "../diagnostics" }
 editor = { path = "../editor" }
+env_logger.workspace = true
+feature_flags = { path = "../feature_flags" }
 feedback = { path = "../feedback" }
 file_finder = { path = "../file_finder" }
-search = { path = "../search" }
 fs = { path = "../fs" }
 fsevent = { path = "../fsevent" }
+futures.workspace = true
 go_to_line = { path = "../go_to_line" }
 gpui = { path = "../gpui" }
+ignore = "0.4"
+image = "0.23"
+indexmap = "1.6.2"
 install_cli = { path = "../install_cli" }
+isahc.workspace = true
 journal = { path = "../journal" }
 language = { path = "../language" }
 language_selector = { path = "../language_selector" }
+language_tools = { path = "../language_tools" }
+lazy_static.workspace = true
+libc = "0.2"
+log.workspace = true
 lsp = { path = "../lsp" }
 menu = { path = "../menu" }
-language_tools = { path = "../language_tools" }
 node_runtime = { path = "../node_runtime" }
 notifications = { path = "../notifications" }
-assistant = { path = "../assistant" }
+num_cpus = "1.13.0"
 outline = { path = "../outline" }
-# plugin_runtime = { path = "../plugin_runtime",optional = true }
+parking_lot.workspace = true
+postage.workspace = true
 project = { path = "../project" }
 project_panel = { path = "../project_panel" }
 project_symbols = { path = "../project_symbols" }
 quick_action_bar = { path = "../quick_action_bar" }
-recent_projects = { path = "../recent_projects" }
-release_channel = { path = "../release_channel" }
-rope = { path = "../rope"}
-rpc = { path = "../rpc" }
-settings = { path = "../settings" }
-feature_flags = { path = "../feature_flags" }
-sum_tree = { path = "../sum_tree" }
-shellexpand = "2.1.0"
-text = { path = "../text" }
-terminal_view = { path = "../terminal_view" }
-theme = { path = "../theme" }
-theme_selector = { path = "../theme_selector" }
-util = { path = "../util" }
-semantic_index = { path = "../semantic_index" }
-vim = { path = "../vim" }
-workspace = { path = "../workspace" }
-welcome = { path = "../welcome" }
-zed_actions = {path = "../zed_actions"}
-assets = {path = "../assets"}
-anyhow.workspace = true
-async-compression.workspace = true
-async-tar = "0.4.2"
-async-recursion = "0.3"
-async-trait.workspace = true
-backtrace = "0.3"
-chrono = "0.4"
-ctor.workspace = true
-env_logger.workspace = true
-futures.workspace = true
-ignore = "0.4"
-image = "0.23"
-indexmap = "1.6.2"
-isahc.workspace = true
-lazy_static.workspace = true
-libc = "0.2"
-log.workspace = true
-num_cpus = "1.13.0"
-parking_lot.workspace = true
-postage.workspace = true
 rand.workspace = true
+recent_projects = { path = "../recent_projects" }
 regex.workspace = true
+release_channel = { path = "../release_channel" }
+rope = { path = "../rope" }
+rpc = { path = "../rpc" }
 rsa = "0.4"
 rust-embed.workspace = true
+schemars.workspace = true
+search = { path = "../search" }
+semantic_index = { path = "../semantic_index" }
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-schemars.workspace = true
+settings = { path = "../settings" }
+shellexpand = "2.1.0"
 simplelog = "0.9"
 smallvec.workspace = true
 smol.workspace = true
+sum_tree = { path = "../sum_tree" }
 tempfile.workspace = true
+terminal_view = { path = "../terminal_view" }
+text = { path = "../text" }
+theme = { path = "../theme" }
+theme_selector = { path = "../theme_selector" }
 thiserror.workspace = true
 tiny_http = "0.8"
 toml.workspace = true
-tree-sitter.workspace = true
 tree-sitter-bash.workspace = true
+tree-sitter-c-sharp.workspace = true
 tree-sitter-c.workspace = true
 tree-sitter-cpp.workspace = true
-tree-sitter-c-sharp.workspace = true
 tree-sitter-css.workspace = true
 tree-sitter-elixir.workspace = true
 tree-sitter-elm.workspace = true
 tree-sitter-embedded-template.workspace = true
-tree-sitter-glsl.workspace = true
 tree-sitter-gleam.workspace = true
+tree-sitter-glsl.workspace = true
 tree-sitter-go.workspace = true
-tree-sitter-heex.workspace = true
-tree-sitter-json.workspace = true
-tree-sitter-rust.workspace = true
-tree-sitter-markdown.workspace = true
-tree-sitter-proto.workspace = true
-tree-sitter-python.workspace = true
-tree-sitter-toml.workspace = true
-tree-sitter-typescript.workspace = true
-tree-sitter-ruby.workspace = true
 tree-sitter-haskell.workspace = true
+tree-sitter-heex.workspace = true
 tree-sitter-html.workspace = true
-tree-sitter-php.workspace = true
-tree-sitter-purescript.workspace = true
-tree-sitter-scheme.workspace = true
-tree-sitter-svelte.workspace = true
-tree-sitter-racket.workspace = true
-tree-sitter-yaml.workspace = true
+tree-sitter-json.workspace = true
 tree-sitter-lua.workspace = true
+tree-sitter-markdown.workspace = true
 tree-sitter-nix.workspace = true
 tree-sitter-nu.workspace = true
-tree-sitter-vue.workspace = true
+tree-sitter-php.workspace = true
+tree-sitter-proto.workspace = true
+tree-sitter-purescript.workspace = true
+tree-sitter-python.workspace = true
+tree-sitter-racket.workspace = true
+tree-sitter-ruby.workspace = true
+tree-sitter-rust.workspace = true
+tree-sitter-scheme.workspace = true
+tree-sitter-svelte.workspace = true
+tree-sitter-toml.workspace = true
+tree-sitter-typescript.workspace = true
 tree-sitter-uiua.workspace = true
+tree-sitter-vue.workspace = true
+tree-sitter-yaml.workspace = true
 tree-sitter-zig.workspace = true
-
+tree-sitter.workspace = true
 url.workspace = true
 urlencoding = "2.1.2"
+util = { path = "../util" }
 uuid.workspace = true
+vim = { path = "../vim" }
+welcome = { path = "../welcome" }
+workspace = { path = "../workspace" }
+zed_actions = { path = "../zed_actions" }
 
 [dev-dependencies]
 call = { path = "../call", features = ["test-support"] }
-# client = { path = "../client", features = ["test-support"] }
 editor = { path = "../editor", features = ["test-support"] }
 gpui = { path = "../gpui", features = ["test-support"] }
 language = { path = "../language", features = ["test-support"] }
-# lsp = { path = "../lsp", features = ["test-support"] }
 project = { path = "../project", features = ["test-support"] }
-# rpc = { path = "../rpc", features = ["test-support"] }
-# settings = { path = "../settings", features = ["test-support"] }
 text = { path = "../text", features = ["test-support"] }
-# util = { path = "../util", features = ["test-support"] }
-workspace = { path = "../workspace", features = ["test-support"] }
 unindent.workspace = true
+workspace = { path = "../workspace", features = ["test-support"] }
 
 [package.metadata.bundle-dev]
 icon = ["resources/app-icon-preview@2x.png", "resources/app-icon-preview.png"]

From 28f875f5f9712c7a7943263a72c2131a241fda1b Mon Sep 17 00:00:00 2001
From: Zongle Wang <wangzongler@gmail.com>
Date: Wed, 31 Jan 2024 10:47:30 +0800
Subject: [PATCH 088/372] Note installation step via Homebrew (#7053)

https://formulae.brew.sh/cask/zed
---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index b2c1f43797..ba3f3d7d66 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,11 @@ Support for additional platforms is on our [roadmap](https://zed.dev/roadmap):
 - Windows ([tracking issue](https://github.com/zed-industries/zed/issues/5394))
 - Web ([tracking issue](https://github.com/zed-industries/zed/issues/5396))
 
+For macOS users, you can also install Zed from Homebrew:
+```sh
+brew install zed
+```
+
 ## Developing Zed
 
 - [Building Zed](./docs/src/developing_zed__building_zed.md)

From dbb5fad147680520956c5f62525128ad4b91e77a Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Tue, 30 Jan 2024 22:01:35 -0500
Subject: [PATCH 089/372] Fix some formatting issues in `Cargo.toml` files
 (#7127)

This PR fixes some formatting issues in some of the `Cargo.toml` files.

I tried to fix most of these in #7126, but there were a few that I
missed.

Release Notes:

- N/A
---
 crates/assets/Cargo.toml          | 2 +-
 crates/assistant/Cargo.toml       | 2 +-
 crates/collab/Cargo.toml          | 4 ++--
 crates/copilot/Cargo.toml         | 2 +-
 crates/copilot_ui/Cargo.toml      | 4 ++--
 crates/diagnostics/Cargo.toml     | 4 ++--
 crates/feedback/Cargo.toml        | 2 +-
 crates/picker/Cargo.toml          | 2 +-
 crates/recent_projects/Cargo.toml | 2 +-
 crates/search/Cargo.toml          | 2 +-
 crates/semantic_index/Cargo.toml  | 2 +-
 crates/theme/Cargo.toml           | 2 +-
 crates/ui/Cargo.toml              | 2 +-
 crates/vim/Cargo.toml             | 2 +-
 14 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/crates/assets/Cargo.toml b/crates/assets/Cargo.toml
index 54100afd3c..ad9cd25b83 100644
--- a/crates/assets/Cargo.toml
+++ b/crates/assets/Cargo.toml
@@ -7,5 +7,5 @@ license = "GPL-3.0-or-later"
 
 [dependencies]
 anyhow.workspace = true
-gpui = {path = "../gpui"}
+gpui = { path = "../gpui" }
 rust-embed.workspace = true
diff --git a/crates/assistant/Cargo.toml b/crates/assistant/Cargo.toml
index 180f3f6c2e..dba31674b0 100644
--- a/crates/assistant/Cargo.toml
+++ b/crates/assistant/Cargo.toml
@@ -14,7 +14,7 @@ ai = { path = "../ai" }
 anyhow.workspace = true
 chrono.workspace = true
 client = { path = "../client" }
-collections = { path = "../collections"}
+collections = { path = "../collections" }
 editor = { path = "../editor" }
 fs = { path = "../fs" }
 futures.workspace = true
diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml
index 6b8af7db23..a271e1a8f3 100644
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -71,7 +71,7 @@ collections = { path = "../collections", features = ["test-support"] }
 ctor.workspace = true
 editor = { path = "../editor", features = ["test-support"] }
 env_logger.workspace = true
-file_finder = { path = "../file_finder"}
+file_finder = { path = "../file_finder" }
 fs = { path = "../fs", features = ["test-support"] }
 git = { path = "../git", features = ["test-support"] }
 gpui = { path = "../gpui", features = ["test-support"] }
@@ -80,7 +80,7 @@ language = { path = "../language", features = ["test-support"] }
 lazy_static.workspace = true
 live_kit_client = { path = "../live_kit_client", features = ["test-support"] }
 lsp = { path = "../lsp", features = ["test-support"] }
-menu = { path = "../menu"}
+menu = { path = "../menu" }
 node_runtime = { path = "../node_runtime" }
 notifications = { path = "../notifications", features = ["test-support"] }
 pretty_assertions.workspace = true
diff --git a/crates/copilot/Cargo.toml b/crates/copilot/Cargo.toml
index 2f9c577c1d..73ce1c4df4 100644
--- a/crates/copilot/Cargo.toml
+++ b/crates/copilot/Cargo.toml
@@ -29,7 +29,7 @@ gpui = { path = "../gpui" }
 language = { path = "../language" }
 log.workspace = true
 lsp = { path = "../lsp" }
-node_runtime = { path = "../node_runtime"}
+node_runtime = { path = "../node_runtime" }
 parking_lot.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
diff --git a/crates/copilot_ui/Cargo.toml b/crates/copilot_ui/Cargo.toml
index 3d3f37ca6b..6d9f87ddce 100644
--- a/crates/copilot_ui/Cargo.toml
+++ b/crates/copilot_ui/Cargo.toml
@@ -22,8 +22,8 @@ smol.workspace = true
 theme = { path = "../theme" }
 ui = { path = "../ui" }
 util = { path = "../util" }
-workspace = {path = "../workspace" }
-zed_actions = { path = "../zed_actions"}
+workspace = { path = "../workspace" }
+zed_actions = { path = "../zed_actions" }
 
 [dev-dependencies]
 editor = { path = "../editor", features = ["test-support"] }
diff --git a/crates/diagnostics/Cargo.toml b/crates/diagnostics/Cargo.toml
index 6ceaf56f72..79a7a717c7 100644
--- a/crates/diagnostics/Cargo.toml
+++ b/crates/diagnostics/Cargo.toml
@@ -28,7 +28,7 @@ smallvec.workspace = true
 theme = { path = "../theme" }
 ui = { path = "../ui" }
 util = { path = "../util" }
-workspace = {path = "../workspace" }
+workspace = { path = "../workspace" }
 
 [dev-dependencies]
 client = { path = "../client", features = ["test-support"] }
@@ -39,4 +39,4 @@ lsp = { path = "../lsp", features = ["test-support"] }
 serde_json.workspace = true
 theme = { path = "../theme", features = ["test-support"] }
 unindent.workspace = true
-workspace = {path = "../workspace", features = ["test-support"] }
+workspace = { path = "../workspace", features = ["test-support"] }
diff --git a/crates/feedback/Cargo.toml b/crates/feedback/Cargo.toml
index fdac5dd6a6..59344eebec 100644
--- a/crates/feedback/Cargo.toml
+++ b/crates/feedback/Cargo.toml
@@ -41,7 +41,7 @@ tree-sitter-markdown = { git = "https://github.com/MDeiml/tree-sitter-markdown",
 ui = { path = "../ui" }
 urlencoding = "2.1.2"
 util = { path = "../util" }
-workspace = { path = "../workspace"}
+workspace = { path = "../workspace" }
 
 [dev-dependencies]
 editor = { path = "../editor", features = ["test-support"] }
diff --git a/crates/picker/Cargo.toml b/crates/picker/Cargo.toml
index c24d037919..480911fe47 100644
--- a/crates/picker/Cargo.toml
+++ b/crates/picker/Cargo.toml
@@ -18,7 +18,7 @@ settings = { path = "../settings" }
 theme = { path = "../theme" }
 ui = { path = "../ui" }
 util = { path = "../util" }
-workspace = { path = "../workspace"}
+workspace = { path = "../workspace" }
 
 [dev-dependencies]
 ctor.workspace = true
diff --git a/crates/recent_projects/Cargo.toml b/crates/recent_projects/Cargo.toml
index ee4e4498fd..333bb107a4 100644
--- a/crates/recent_projects/Cargo.toml
+++ b/crates/recent_projects/Cargo.toml
@@ -23,7 +23,7 @@ smol.workspace = true
 text = { path = "../text" }
 theme = { path = "../theme" }
 ui = { path = "../ui" }
-util = { path = "../util"}
+util = { path = "../util" }
 workspace = { path = "../workspace" }
 
 [dev-dependencies]
diff --git a/crates/search/Cargo.toml b/crates/search/Cargo.toml
index 6388ad062b..0266770d10 100644
--- a/crates/search/Cargo.toml
+++ b/crates/search/Cargo.toml
@@ -29,7 +29,7 @@ settings = { path = "../settings" }
 smallvec.workspace = true
 smol.workspace = true
 theme = { path = "../theme" }
-ui = {path = "../ui"}
+ui = { path = "../ui" }
 util = { path = "../util" }
 workspace = { path = "../workspace" }
 
diff --git a/crates/semantic_index/Cargo.toml b/crates/semantic_index/Cargo.toml
index a49145f0a0..7e8717a78e 100644
--- a/crates/semantic_index/Cargo.toml
+++ b/crates/semantic_index/Cargo.toml
@@ -48,7 +48,7 @@ ctor.workspace = true
 env_logger.workspace = true
 gpui = { path = "../gpui", features = ["test-support"] }
 language = { path = "../language", features = ["test-support"] }
-node_runtime = { path = "../node_runtime"}
+node_runtime = { path = "../node_runtime" }
 pretty_assertions.workspace = true
 project = { path = "../project", features = ["test-support"] }
 rand.workspace = true
diff --git a/crates/theme/Cargo.toml b/crates/theme/Cargo.toml
index 81ae89a268..d459661706 100644
--- a/crates/theme/Cargo.toml
+++ b/crates/theme/Cargo.toml
@@ -20,7 +20,7 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
-color = {path = "../color"}
+color = { path = "../color" }
 derive_more.workspace = true
 fs = { path = "../fs" }
 futures.workspace = true
diff --git a/crates/ui/Cargo.toml b/crates/ui/Cargo.toml
index 0c5316e594..4b1d2d7c86 100644
--- a/crates/ui/Cargo.toml
+++ b/crates/ui/Cargo.toml
@@ -14,7 +14,7 @@ anyhow.workspace = true
 chrono = "0.4"
 gpui = { path = "../gpui" }
 itertools = { version = "0.11.0", optional = true }
-menu = { path = "../menu"}
+menu = { path = "../menu" }
 rand = "0.8"
 serde.workspace = true
 settings = { path = "../settings" }
diff --git a/crates/vim/Cargo.toml b/crates/vim/Cargo.toml
index 13c0b7bd45..c5b6ec0732 100644
--- a/crates/vim/Cargo.toml
+++ b/crates/vim/Cargo.toml
@@ -35,7 +35,7 @@ serde_json.workspace = true
 settings = { path = "../settings" }
 theme = { path = "../theme" }
 tokio = { version = "1.15", "optional" = true }
-ui = { path = "../ui"}
+ui = { path = "../ui" }
 workspace = { path = "../workspace" }
 zed_actions = { path = "../zed_actions" }
 

From aee0f65b26e76b398f9e64ecfc50392429c4005c Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 30 Jan 2024 20:10:52 -0700
Subject: [PATCH 090/372] Attempt to fix a panic in worktree scanning (#7128)

Somehow (and this should be investigated separately) we're ending up
with paths that look like: /path/to/project/../../path/to/dependency,
these pass the Ok(repo_path) = path.strip_prefix(), but then fail.

Release Notes:

- Fixed (hopefully) a panic that could occur due to path confusing in
git status
---
 crates/project/src/worktree.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/project/src/worktree.rs b/crates/project/src/worktree.rs
index 6ba9a9d026..959a63a7c7 100644
--- a/crates/project/src/worktree.rs
+++ b/crates/project/src/worktree.rs
@@ -3867,7 +3867,7 @@ impl BackgroundScanner {
                     fs_entry.is_ignored = ignore_stack.is_abs_path_ignored(&abs_path, is_dir);
                     fs_entry.is_external = !canonical_path.starts_with(&root_canonical_path);
 
-                    if !is_dir && !fs_entry.is_ignored {
+                    if !is_dir && !fs_entry.is_ignored && !fs_entry.is_external {
                         if let Some((work_dir, repo)) = state.snapshot.local_repo_for_path(path) {
                             if let Ok(repo_path) = path.strip_prefix(work_dir.0) {
                                 let repo_path = RepoPath(repo_path.into());

From db99d4fef1b175d5c7bb74656c585799abdb7ec5 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 30 Jan 2024 20:11:06 -0700
Subject: [PATCH 091/372] No more nightly/preview collab anymore (#7112)

Release Notes:

- N/A
---
 crates/collab/k8s/environments/nightly.sh | 4 ----
 crates/collab/k8s/environments/preview.sh | 4 ----
 script/deploy-collab                      | 2 +-
 script/deploy-postgrest                   | 5 -----
 script/what-is-deployed                   | 2 +-
 5 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 crates/collab/k8s/environments/nightly.sh
 delete mode 100644 crates/collab/k8s/environments/preview.sh

diff --git a/crates/collab/k8s/environments/nightly.sh b/crates/collab/k8s/environments/nightly.sh
deleted file mode 100644
index 49c562437b..0000000000
--- a/crates/collab/k8s/environments/nightly.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-ZED_ENVIRONMENT=nightly
-RUST_LOG=info
-INVITE_LINK_PREFIX=https://zed.dev/invites/
-DATABASE_MAX_CONNECTIONS=10
diff --git a/crates/collab/k8s/environments/preview.sh b/crates/collab/k8s/environments/preview.sh
deleted file mode 100644
index 132a1ef53c..0000000000
--- a/crates/collab/k8s/environments/preview.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-ZED_ENVIRONMENT=preview
-RUST_LOG=info
-INVITE_LINK_PREFIX=https://zed.dev/invites/
-DATABASE_MAX_CONNECTIONS=10
diff --git a/script/deploy-collab b/script/deploy-collab
index 54442d5ddf..7bda42c424 100755
--- a/script/deploy-collab
+++ b/script/deploy-collab
@@ -4,7 +4,7 @@ set -eu
 source script/lib/deploy-helpers.sh
 
 if [[ $# < 2 ]]; then
-  echo "Usage: $0 <production|preview|nightly|staging> <tag-name>"
+  echo "Usage: $0 <production|staging> <tag-name>"
   exit 1
 fi
 environment=$1
diff --git a/script/deploy-postgrest b/script/deploy-postgrest
index f94a140274..14fbd50e30 100755
--- a/script/deploy-postgrest
+++ b/script/deploy-postgrest
@@ -9,11 +9,6 @@ if [[ $# < 1 ]]; then
 fi
 environment=$1
 
-if [[ ${environment} == "preview" || ${environment} == "nightly" ]]; then
-  echo "website does not exist in preview or nightly"
-  exit 1
-fi
-
 export_vars_for_environment ${environment}
 
 export ZED_DO_CERTIFICATE_ID=$(doctl compute certificate list --format ID --no-header)
diff --git a/script/what-is-deployed b/script/what-is-deployed
index c0f9b23487..cbf73255dd 100755
--- a/script/what-is-deployed
+++ b/script/what-is-deployed
@@ -4,7 +4,7 @@ set -eu
 source script/lib/deploy-helpers.sh
 
 if [[ $# < 1 ]]; then
-  echo "Usage: $0 <production|preview|nightly|staging>"
+  echo "Usage: $0 <production|staging>"
   exit 1
 fi
 environment=$1

From 9459394ea0127cc4220b80e13a9a812a5a6d899c Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Tue, 30 Jan 2024 19:59:13 -0800
Subject: [PATCH 092/372] Re-enable language plugin functionality with some
 fixes (#7105)

Part of https://github.com/zed-industries/zed/issues/7096

* [x] Load all queries for language plugins, not just highlight query
* [x] Auto-reload languages when changing the `plugins` directory
* [x] Bump Tree-sitter for language loading and unloading fixes
* [x] Figure out code signing

Release Notes:

- N/A

---------

Co-authored-by: Antonio <antonio@zed.dev>
Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>
---
 Cargo.lock                            | 414 +++++++++++++++++++++++++-
 Cargo.toml                            |   7 +-
 crates/language/src/language.rs       |  46 ++-
 crates/zed/resources/zed.entitlements |   6 +-
 crates/zed/src/languages.rs           |  86 ++++--
 crates/zed/src/main.rs                |  32 +-
 6 files changed, 527 insertions(+), 64 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 82e3c827ae..d8b069e39c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -243,6 +243,12 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "arbitrary"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
+
 [[package]]
 name = "arrayref"
 version = "0.3.7"
@@ -1852,6 +1858,105 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "cranelift-bforest"
+version = "0.103.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+dependencies = [
+ "cranelift-entity",
+]
+
+[[package]]
+name = "cranelift-codegen"
+version = "0.103.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+dependencies = [
+ "bumpalo",
+ "cranelift-bforest",
+ "cranelift-codegen-meta",
+ "cranelift-codegen-shared",
+ "cranelift-control",
+ "cranelift-entity",
+ "cranelift-isle",
+ "gimli",
+ "hashbrown 0.14.0",
+ "log",
+ "regalloc2",
+ "smallvec",
+ "target-lexicon",
+]
+
+[[package]]
+name = "cranelift-codegen-meta"
+version = "0.103.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+dependencies = [
+ "cranelift-codegen-shared",
+]
+
+[[package]]
+name = "cranelift-codegen-shared"
+version = "0.103.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+
+[[package]]
+name = "cranelift-control"
+version = "0.103.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+dependencies = [
+ "arbitrary",
+]
+
+[[package]]
+name = "cranelift-entity"
+version = "0.103.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+dependencies = [
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "cranelift-frontend"
+version = "0.103.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+dependencies = [
+ "cranelift-codegen",
+ "log",
+ "smallvec",
+ "target-lexicon",
+]
+
+[[package]]
+name = "cranelift-isle"
+version = "0.103.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+
+[[package]]
+name = "cranelift-native"
+version = "0.103.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+dependencies = [
+ "cranelift-codegen",
+ "libc",
+ "target-lexicon",
+]
+
+[[package]]
+name = "cranelift-wasm"
+version = "0.103.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+dependencies = [
+ "cranelift-codegen",
+ "cranelift-entity",
+ "cranelift-frontend",
+ "itertools 0.10.5",
+ "log",
+ "smallvec",
+ "wasmparser",
+ "wasmtime-types",
+]
+
 [[package]]
 name = "crc"
 version = "3.0.1"
@@ -2455,6 +2560,12 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
 
+[[package]]
+name = "fallible-iterator"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
+
 [[package]]
 name = "fallible-streaming-iterator"
 version = "0.1.9"
@@ -3008,6 +3119,11 @@ name = "gimli"
 version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+dependencies = [
+ "fallible-iterator 0.3.0",
+ "indexmap 2.0.0",
+ "stable_deref_trait",
+]
 
 [[package]]
 name = "git"
@@ -3520,6 +3636,7 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.0",
+ "serde",
 ]
 
 [[package]]
@@ -3926,6 +4043,12 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
+[[package]]
+name = "leb128"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
+
 [[package]]
 name = "libc"
 version = "0.2.152"
@@ -4154,6 +4277,15 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
 
+[[package]]
+name = "mach"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "mach2"
 version = "0.4.1"
@@ -4232,6 +4364,15 @@ version = "2.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
 
+[[package]]
+name = "memfd"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64"
+dependencies = [
+ "rustix 0.38.30",
+]
+
 [[package]]
 name = "memmap2"
 version = "0.2.3"
@@ -4889,6 +5030,9 @@ version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
 dependencies = [
+ "crc32fast",
+ "hashbrown 0.14.0",
+ "indexmap 2.0.0",
  "memchr",
 ]
 
@@ -5812,6 +5956,15 @@ version = "2.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
 
+[[package]]
+name = "psm"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "ptr_meta"
 version = "0.1.4"
@@ -6063,6 +6216,19 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "regalloc2"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6"
+dependencies = [
+ "hashbrown 0.13.2",
+ "log",
+ "rustc-hash",
+ "slice-group-by",
+ "smallvec",
+]
+
 [[package]]
 name = "regex"
 version = "1.9.5"
@@ -6399,7 +6565,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2"
 dependencies = [
  "bitflags 2.4.1",
- "fallible-iterator",
+ "fallible-iterator 0.2.0",
  "fallible-streaming-iterator",
  "hashlink",
  "libsqlite3-sys",
@@ -7211,6 +7377,12 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "slice-group-by"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7"
+
 [[package]]
 name = "slotmap"
 version = "1.0.6"
@@ -7317,6 +7489,12 @@ dependencies = [
  "der",
 ]
 
+[[package]]
+name = "sptr"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a"
+
 [[package]]
 name = "sqlez"
 version = "0.1.0"
@@ -7573,6 +7751,12 @@ dependencies = [
  "uuid 1.4.1",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -7846,6 +8030,12 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
+[[package]]
+name = "target-lexicon"
+version = "0.12.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae"
+
 [[package]]
 name = "tempfile"
 version = "3.9.0"
@@ -8490,10 +8680,12 @@ dependencies = [
 [[package]]
 name = "tree-sitter"
 version = "0.20.10"
-source = "git+https://github.com/tree-sitter/tree-sitter?rev=31c40449749c4263a91a43593831b82229049a4c#31c40449749c4263a91a43593831b82229049a4c"
+source = "git+https://github.com/tree-sitter/tree-sitter?rev=1d8975319c2d5de1bf710e7e21db25b0eee4bc66#1d8975319c2d5de1bf710e7e21db25b0eee4bc66"
 dependencies = [
  "cc",
  "regex",
+ "wasmtime",
+ "wasmtime-c-api-impl",
 ]
 
 [[package]]
@@ -9328,6 +9520,224 @@ version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
 
+[[package]]
+name = "wasm-encoder"
+version = "0.38.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ad2b51884de9c7f4fe2fd1043fccb8dcad4b1e29558146ee57a144d15779f3f"
+dependencies = [
+ "leb128",
+]
+
+[[package]]
+name = "wasmparser"
+version = "0.118.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95ee9723b928e735d53000dec9eae7b07a60e490c85ab54abb66659fc61bfcd9"
+dependencies = [
+ "indexmap 2.0.0",
+ "semver",
+]
+
+[[package]]
+name = "wasmtime"
+version = "16.0.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+dependencies = [
+ "anyhow",
+ "bincode",
+ "bumpalo",
+ "cfg-if 1.0.0",
+ "indexmap 2.0.0",
+ "libc",
+ "log",
+ "object",
+ "once_cell",
+ "paste",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "target-lexicon",
+ "wasmparser",
+ "wasmtime-cranelift",
+ "wasmtime-environ",
+ "wasmtime-jit",
+ "wasmtime-runtime",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "wasmtime-asm-macros"
+version = "16.0.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
+[[package]]
+name = "wasmtime-c-api-impl"
+version = "16.0.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+dependencies = [
+ "anyhow",
+ "log",
+ "once_cell",
+ "tracing",
+ "wasmtime",
+ "wasmtime-c-api-macros",
+]
+
+[[package]]
+name = "wasmtime-c-api-macros"
+version = "0.0.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "wasmtime-cranelift"
+version = "16.0.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+dependencies = [
+ "anyhow",
+ "cfg-if 1.0.0",
+ "cranelift-codegen",
+ "cranelift-control",
+ "cranelift-entity",
+ "cranelift-frontend",
+ "cranelift-native",
+ "cranelift-wasm",
+ "gimli",
+ "log",
+ "object",
+ "target-lexicon",
+ "thiserror",
+ "wasmparser",
+ "wasmtime-cranelift-shared",
+ "wasmtime-environ",
+ "wasmtime-versioned-export-macros",
+]
+
+[[package]]
+name = "wasmtime-cranelift-shared"
+version = "16.0.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+dependencies = [
+ "anyhow",
+ "cranelift-codegen",
+ "cranelift-control",
+ "cranelift-native",
+ "gimli",
+ "object",
+ "target-lexicon",
+ "wasmtime-environ",
+]
+
+[[package]]
+name = "wasmtime-environ"
+version = "16.0.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+dependencies = [
+ "anyhow",
+ "cranelift-entity",
+ "gimli",
+ "indexmap 2.0.0",
+ "log",
+ "object",
+ "serde",
+ "serde_derive",
+ "target-lexicon",
+ "thiserror",
+ "wasmparser",
+ "wasmtime-types",
+]
+
+[[package]]
+name = "wasmtime-jit"
+version = "16.0.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+dependencies = [
+ "anyhow",
+ "bincode",
+ "cfg-if 1.0.0",
+ "gimli",
+ "log",
+ "object",
+ "rustix 0.38.30",
+ "serde",
+ "serde_derive",
+ "target-lexicon",
+ "wasmtime-environ",
+ "wasmtime-jit-icache-coherence",
+ "wasmtime-runtime",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "wasmtime-jit-icache-coherence"
+version = "16.0.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "wasmtime-runtime"
+version = "16.0.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+dependencies = [
+ "anyhow",
+ "cc",
+ "cfg-if 1.0.0",
+ "indexmap 2.0.0",
+ "libc",
+ "log",
+ "mach",
+ "memfd",
+ "memoffset 0.9.0",
+ "paste",
+ "psm",
+ "rustix 0.38.30",
+ "sptr",
+ "wasm-encoder",
+ "wasmtime-asm-macros",
+ "wasmtime-environ",
+ "wasmtime-versioned-export-macros",
+ "wasmtime-wmemcheck",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "wasmtime-types"
+version = "16.0.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+dependencies = [
+ "cranelift-entity",
+ "serde",
+ "serde_derive",
+ "thiserror",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasmtime-versioned-export-macros"
+version = "16.0.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "wasmtime-wmemcheck"
+version = "16.0.0"
+source = "git+https://github.com/bytecodealliance/wasmtime?rev=v16.0.0#6613acd1e4817957a4a7745125ef063b43c273a7"
+
 [[package]]
 name = "web-sys"
 version = "0.3.64"
diff --git a/Cargo.toml b/Cargo.toml
index 148ef519c3..b224033101 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -130,7 +130,7 @@ thiserror = "1.0.29"
 tiktoken-rs = "0.5.7"
 time = { version = "0.3", features = ["serde", "serde-well-known"] }
 toml = "0.5"
-tree-sitter = "0.20"
+tree-sitter = { version = "0.20", features = ["wasm"] }
 tree-sitter-bash = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "7331995b19b8f8aba2d5e26deb51d2195c18bc94" }
 tree-sitter-c = "0.20.1"
 tree-sitter-c-sharp = { git = "https://github.com/tree-sitter/tree-sitter-c-sharp", rev = "dd5e59721a5f8dae34604060833902b882023aaf" }
@@ -168,10 +168,11 @@ tree-sitter-zig = { git = "https://github.com/maxxnino/tree-sitter-zig", rev = "
 unindent = "0.1.7"
 url = "2.2"
 uuid = { version = "1.1.2", features = ["v4"] }
+wasmtime = "16"
 
 [patch.crates-io]
-tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "31c40449749c4263a91a43593831b82229049a4c" }
-# wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "v16.0.0" }
+tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "1d8975319c2d5de1bf710e7e21db25b0eee4bc66" }
+wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "v16.0.0" }
 
 [profile.dev]
 split-debuginfo = "unpacked"
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index 5b860a9de6..bd4c7f5d93 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -52,7 +52,7 @@ use std::{
 };
 use syntax_map::SyntaxSnapshot;
 use theme::{SyntaxTheme, Theme};
-use tree_sitter::{self, Query};
+use tree_sitter::{self, wasmtime, Query, WasmStore};
 use unicase::UniCase;
 use util::{http::HttpClient, paths::PathExt};
 use util::{post_inc, ResultExt, TryFutureExt as _, UnwrapFuture};
@@ -96,7 +96,9 @@ impl LspBinaryStatusSender {
 
 thread_local! {
     static PARSER: RefCell<Parser> = {
-        RefCell::new(Parser::new())
+        let mut parser = Parser::new();
+        parser.set_wasm_store(WasmStore::new(WASM_ENGINE.clone()).unwrap()).unwrap();
+        RefCell::new(parser)
     };
 }
 
@@ -104,6 +106,7 @@ lazy_static! {
     pub(crate) static ref NEXT_GRAMMAR_ID: AtomicUsize = Default::default();
     /// A shared grammar for plain text, exposed for reuse by downstream crates.
     #[doc(hidden)]
+    pub static ref WASM_ENGINE: wasmtime::Engine = wasmtime::Engine::default();
     pub static ref PLAIN_TEXT: Arc<Language> = Arc::new(Language::new(
         LanguageConfig {
             name: "Plain Text".into(),
@@ -706,8 +709,8 @@ enum AvailableGrammar {
         get_queries: fn(&str) -> LanguageQueries,
     },
     Wasm {
-        _grammar_name: Arc<str>,
-        _path: Arc<Path>,
+        path: Arc<Path>,
+        get_queries: fn(&Path) -> LanguageQueries,
     },
 }
 
@@ -773,9 +776,6 @@ impl LanguageRegistry {
     }
 
     /// Clear out all of the loaded languages and reload them from scratch.
-    ///
-    /// This is useful in development, when queries have changed.
-    #[cfg(debug_assertions)]
     pub fn reload(&self) {
         self.state.write().reload();
     }
@@ -802,15 +802,17 @@ impl LanguageRegistry {
         });
     }
 
-    pub fn register_wasm(&self, path: Arc<Path>, grammar_name: Arc<str>, config: LanguageConfig) {
+    pub fn register_wasm(
+        &self,
+        path: Arc<Path>,
+        config: LanguageConfig,
+        get_queries: fn(&Path) -> LanguageQueries,
+    ) {
         let state = &mut *self.state.write();
         state.available_languages.push(AvailableLanguage {
             id: post_inc(&mut state.next_available_language_id),
             config,
-            grammar: AvailableGrammar::Wasm {
-                _grammar_name: grammar_name,
-                _path: path,
-            },
+            grammar: AvailableGrammar::Wasm { path, get_queries },
             lsp_adapters: Vec::new(),
             loaded: false,
         });
@@ -944,8 +946,23 @@ impl LanguageRegistry {
                                             asset_dir,
                                             get_queries,
                                         } => (grammar, (get_queries)(asset_dir)),
-                                        AvailableGrammar::Wasm { .. } => {
-                                            Err(anyhow!("not supported"))?
+                                        AvailableGrammar::Wasm { path, get_queries } => {
+                                            let grammar_name =
+                                                &language.config.grammar_name.as_ref().ok_or_else(
+                                                    || anyhow!("missing grammar name"),
+                                                )?;
+                                            let mut wasm_path = path.join(grammar_name.as_ref());
+                                            wasm_path.set_extension("wasm");
+                                            let wasm_bytes = std::fs::read(&wasm_path)?;
+                                            let grammar = PARSER.with(|parser| {
+                                                let mut parser = parser.borrow_mut();
+                                                let mut store = parser.take_wasm_store().unwrap();
+                                                let grammar =
+                                                    store.load_language(&grammar_name, &wasm_bytes);
+                                                parser.set_wasm_store(store).unwrap();
+                                                grammar
+                                            })?;
+                                            (grammar, get_queries(path.as_ref()))
                                         }
                                     };
                                     Language::new(language.config, Some(grammar))
@@ -1172,7 +1189,6 @@ impl LanguageRegistryState {
         *self.subscription.0.borrow_mut() = ();
     }
 
-    #[cfg(debug_assertions)]
     fn reload(&mut self) {
         self.languages.clear();
         self.version += 1;
diff --git a/crates/zed/resources/zed.entitlements b/crates/zed/resources/zed.entitlements
index f40a8a253a..cb4cd3dc69 100644
--- a/crates/zed/resources/zed.entitlements
+++ b/crates/zed/resources/zed.entitlements
@@ -6,6 +6,10 @@
 	<true/>
 	<key>com.apple.security.cs.allow-jit</key>
 	<true/>
+	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+	<true/>
+	<!-- <key>com.apple.security.cs.disable-library-validation</key>
+	<true/> -->
 	<key>com.apple.security.device.audio-input</key>
 	<true/>
 	<key>com.apple.security.device.camera</key>
@@ -18,7 +22,5 @@
 	<true/>
 	<key>com.apple.security.personal-information.photos-library</key>
 	<true/>
-	<!-- <key>com.apple.security.cs.disable-library-validation</key>
-	<true/> -->
 </dict>
 </plist>
diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index 8e923ac2fd..5ed9e43ec5 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -4,8 +4,8 @@ pub use language::*;
 use node_runtime::NodeRuntime;
 use rust_embed::RustEmbed;
 use settings::Settings;
-use std::{borrow::Cow, str, sync::Arc};
-use util::{asset_str, paths::PLUGINS_DIR};
+use std::{borrow::Cow, fs, path::Path, str, sync::Arc};
+use util::{asset_str, paths::PLUGINS_DIR, ResultExt};
 
 use self::{deno::DenoSettings, elixir::ElixirSettings};
 
@@ -303,10 +303,11 @@ pub fn init(
                 let path = child.path();
                 let config_path = path.join("config.toml");
                 if let Ok(config) = std::fs::read(&config_path) {
-                    let config: LanguageConfig = ::toml::from_slice(&config).unwrap();
-                    if let Some(grammar_name) = config.grammar_name.clone() {
-                        languages.register_wasm(path.into(), grammar_name, config);
-                    }
+                    languages.register_wasm(
+                        path.into(),
+                        ::toml::from_slice(&config).unwrap(),
+                        load_plugin_queries,
+                    );
                 }
             }
         }
@@ -338,27 +339,62 @@ fn load_config(name: &str) -> LanguageConfig {
     .unwrap()
 }
 
-fn load_queries(name: &str) -> LanguageQueries {
-    LanguageQueries {
-        highlights: load_query(name, "/highlights"),
-        brackets: load_query(name, "/brackets"),
-        indents: load_query(name, "/indents"),
-        outline: load_query(name, "/outline"),
-        embedding: load_query(name, "/embedding"),
-        injections: load_query(name, "/injections"),
-        overrides: load_query(name, "/overrides"),
-    }
-}
+const QUERY_FILENAME_PREFIXES: &[(
+    &str,
+    fn(&mut LanguageQueries) -> &mut Option<Cow<'static, str>>,
+)] = &[
+    ("highlights", |q| &mut q.highlights),
+    ("brackets", |q| &mut q.brackets),
+    ("outline", |q| &mut q.outline),
+    ("indents", |q| &mut q.indents),
+    ("embedding", |q| &mut q.embedding),
+    ("injections", |q| &mut q.injections),
+    ("overrides", |q| &mut q.overrides),
+];
 
-fn load_query(name: &str, filename_prefix: &str) -> Option<Cow<'static, str>> {
-    let mut result = None;
+fn load_queries(name: &str) -> LanguageQueries {
+    let mut result = LanguageQueries::default();
     for path in LanguageDir::iter() {
-        if let Some(remainder) = path.strip_prefix(name) {
-            if remainder.starts_with(filename_prefix) {
-                let contents = asset_str::<LanguageDir>(path.as_ref());
-                match &mut result {
-                    None => result = Some(contents),
-                    Some(r) => r.to_mut().push_str(contents.as_ref()),
+        if let Some(remainder) = path.strip_prefix(name).and_then(|p| p.strip_prefix('/')) {
+            if !remainder.ends_with(".scm") {
+                continue;
+            }
+            for (name, query) in QUERY_FILENAME_PREFIXES {
+                if remainder.starts_with(name) {
+                    let contents = asset_str::<LanguageDir>(path.as_ref());
+                    match query(&mut result) {
+                        None => *query(&mut result) = Some(contents),
+                        Some(r) => r.to_mut().push_str(contents.as_ref()),
+                    }
+                }
+            }
+        }
+    }
+    result
+}
+
+fn load_plugin_queries(root_path: &Path) -> LanguageQueries {
+    let mut result = LanguageQueries::default();
+    if let Some(entries) = fs::read_dir(root_path).log_err() {
+        for entry in entries {
+            let Some(entry) = entry.log_err() else {
+                continue;
+            };
+            let path = entry.path();
+            if let Some(remainder) = path.strip_prefix(root_path).ok().and_then(|p| p.to_str()) {
+                if !remainder.ends_with(".scm") {
+                    continue;
+                }
+                for (name, query) in QUERY_FILENAME_PREFIXES {
+                    if remainder.starts_with(name) {
+                        if let Some(contents) = fs::read_to_string(&path).log_err() {
+                            match query(&mut result) {
+                                None => *query(&mut result) = Some(contents.into()),
+                                Some(r) => r.to_mut().push_str(contents.as_ref()),
+                            }
+                        }
+                        break;
+                    }
                 }
             }
         }
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index ba651cf8e0..3e5a1adb6f 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -39,12 +39,13 @@ use std::{
         Arc,
     },
     thread,
+    time::Duration,
 };
 use theme::{ActiveTheme, ThemeRegistry, ThemeSettings};
 use util::{
     async_maybe,
     http::{self, HttpClient, ZedHttpClient},
-    paths::{self, CRASHES_DIR, CRASHES_RETIRED_DIR},
+    paths::{self, CRASHES_DIR, CRASHES_RETIRED_DIR, PLUGINS_DIR},
     ResultExt,
 };
 use uuid::Uuid;
@@ -894,26 +895,28 @@ fn load_embedded_fonts(cx: &AppContext) {
         .unwrap();
 }
 
-#[cfg(debug_assertions)]
-async fn watch_languages(fs: Arc<dyn fs::Fs>, languages: Arc<LanguageRegistry>) -> Option<()> {
-    use std::time::Duration;
+async fn watch_languages(fs: Arc<dyn fs::Fs>, languages: Arc<LanguageRegistry>) {
+    let reload_debounce = Duration::from_millis(250);
 
-    let mut events = fs
-        .watch(
-            "crates/zed/src/languages".as_ref(),
-            Duration::from_millis(100),
+    let mut events = fs.watch(PLUGINS_DIR.as_ref(), reload_debounce).await;
+
+    #[cfg(debug_assertions)]
+    {
+        events = futures::stream::select(
+            events,
+            fs.watch("crates/zed/src/languages".as_ref(), reload_debounce)
+                .await,
         )
-        .await;
+        .boxed();
+    }
+
     while (events.next().await).is_some() {
         languages.reload();
     }
-    Some(())
 }
 
 #[cfg(debug_assertions)]
 fn watch_file_types(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {
-    use std::time::Duration;
-
     cx.spawn(|cx| async move {
         let mut events = fs
             .watch(
@@ -933,10 +936,5 @@ fn watch_file_types(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {
     .detach()
 }
 
-#[cfg(not(debug_assertions))]
-async fn watch_languages(_: Arc<dyn fs::Fs>, _: Arc<LanguageRegistry>) -> Option<()> {
-    None
-}
-
 #[cfg(not(debug_assertions))]
 fn watch_file_types(_fs: Arc<dyn fs::Fs>, _cx: &mut AppContext) {}

From e5fe811d7ad0fc26934edd76f891d20bdc3bb194 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Tue, 30 Jan 2024 23:33:54 -0500
Subject: [PATCH 093/372] theme_importer: Add ability to print theme JSON
 schema (#7129)

This PR adds a quick subcommand to the `theme_importer` to facilitate
printing out the JSON schema for a theme.

Note that you do need to pass a `<PATH>` to the subcommand still, even
though it will be ignored. I'll rework the CLI to this at some point.

The JSON schema for the current version of the theme can also be found
at
[`https://zed.dev/schema/themes/v0.1.0.json`](https://zed.dev/schema/themes/v0.1.0.json).

Release Notes:

- N/A
---
 Cargo.lock                        |  1 +
 crates/theme_importer/Cargo.toml  |  1 +
 crates/theme_importer/src/main.rs | 29 +++++++++++++++++++++++++++--
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d8b069e39c..87e56d599e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8207,6 +8207,7 @@ dependencies = [
  "palette",
  "pathfinder_color",
  "rust-embed",
+ "schemars",
  "serde",
  "serde_json",
  "simplelog",
diff --git a/crates/theme_importer/Cargo.toml b/crates/theme_importer/Cargo.toml
index 6b5b5743f5..2214af85c7 100644
--- a/crates/theme_importer/Cargo.toml
+++ b/crates/theme_importer/Cargo.toml
@@ -18,6 +18,7 @@ log.workspace = true
 palette = { version = "0.7.3", default-features = false, features = ["std"] }
 pathfinder_color = "0.5"
 rust-embed.workspace = true
+schemars = { workspace = true, features = ["indexmap"] }
 serde.workspace = true
 serde_json.workspace = true
 simplelog = "0.9"
diff --git a/crates/theme_importer/src/main.rs b/crates/theme_importer/src/main.rs
index 6f3dc83006..a8cc8a1bdf 100644
--- a/crates/theme_importer/src/main.rs
+++ b/crates/theme_importer/src/main.rs
@@ -7,13 +7,14 @@ use std::fs::File;
 use std::path::PathBuf;
 
 use anyhow::{Context, Result};
-use clap::Parser;
+use clap::{Parser, Subcommand};
 use indexmap::IndexMap;
 use json_comments::StripComments;
 use log::LevelFilter;
+use schemars::schema_for;
 use serde::Deserialize;
 use simplelog::{TermLogger, TerminalMode};
-use theme::{Appearance, AppearanceContent};
+use theme::{Appearance, AppearanceContent, ThemeFamilyContent};
 
 use crate::vscode::VsCodeTheme;
 use crate::vscode::VsCodeThemeConverter;
@@ -74,6 +75,15 @@ struct Args {
     /// Whether to warn when values are missing from the theme.
     #[arg(long)]
     warn_on_missing: bool,
+
+    #[command(subcommand)]
+    command: Option<Command>,
+}
+
+#[derive(Subcommand)]
+enum Command {
+    /// Prints the JSON schema for a theme.
+    PrintSchema,
 }
 
 fn main() -> Result<()> {
@@ -97,6 +107,21 @@ fn main() -> Result<()> {
     TermLogger::init(LevelFilter::Trace, log_config, TerminalMode::Mixed)
         .expect("could not initialize logger");
 
+    if let Some(command) = args.command {
+        match command {
+            Command::PrintSchema => {
+                let theme_family_schema = schema_for!(ThemeFamilyContent);
+
+                println!(
+                    "{}",
+                    serde_json::to_string_pretty(&theme_family_schema).unwrap()
+                );
+
+                return Ok(());
+            }
+        }
+    }
+
     let theme_file_path = args.theme_path;
 
     let theme_file = match File::open(&theme_file_path) {

From ba91adf48a97e03565ee9e884618f6549e3a4b8c Mon Sep 17 00:00:00 2001
From: Derrick Laird <swampdonk@gmail.com>
Date: Wed, 31 Jan 2024 00:46:13 -0700
Subject: [PATCH 094/372] languages: add highlighting for go.mod (#7137)

Release Notes:

- Added syntax highlighting for go.mod files. Fixes #7133

<img width="863" alt="image"
src="https://github.com/zed-industries/zed/assets/8725798/dc521a02-c53a-44aa-b0c1-eebf31835679">
---
 Cargo.lock                                    | 10 +++++++
 Cargo.toml                                    |  1 +
 crates/zed/Cargo.toml                         |  1 +
 crates/zed/src/languages.rs                   |  1 +
 crates/zed/src/languages/gomod/config.toml    |  7 +++++
 crates/zed/src/languages/gomod/highlights.scm | 18 ++++++++++++
 crates/zed/src/languages/gomod/structure.scm  | 29 +++++++++++++++++++
 7 files changed, 67 insertions(+)
 create mode 100644 crates/zed/src/languages/gomod/config.toml
 create mode 100644 crates/zed/src/languages/gomod/highlights.scm
 create mode 100644 crates/zed/src/languages/gomod/structure.scm

diff --git a/Cargo.lock b/Cargo.lock
index 87e56d599e..00917fb3dd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8790,6 +8790,15 @@ dependencies = [
  "tree-sitter",
 ]
 
+[[package]]
+name = "tree-sitter-gomod"
+version = "1.0.2"
+source = "git+https://github.com/camdencheek/tree-sitter-go-mod#bbe2fe3be4b87e06a613e685250f473d2267f430"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
 [[package]]
 name = "tree-sitter-haskell"
 version = "0.14.0"
@@ -10316,6 +10325,7 @@ dependencies = [
  "tree-sitter-gleam",
  "tree-sitter-glsl",
  "tree-sitter-go",
+ "tree-sitter-gomod",
  "tree-sitter-haskell",
  "tree-sitter-heex",
  "tree-sitter-html",
diff --git a/Cargo.toml b/Cargo.toml
index b224033101..b423969259 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -142,6 +142,7 @@ tree-sitter-embedded-template = "0.20.0"
 tree-sitter-gleam = { git = "https://github.com/gleam-lang/tree-sitter-gleam", rev = "58b7cac8fc14c92b0677c542610d8738c373fa81" }
 tree-sitter-glsl = { git = "https://github.com/theHamsta/tree-sitter-glsl", rev = "2a56fb7bc8bb03a1892b4741279dd0a8758b7fb3" }
 tree-sitter-go = { git = "https://github.com/tree-sitter/tree-sitter-go", rev = "aeb2f33b366fd78d5789ff104956ce23508b85db" }
+tree-sitter-gomod = { git = "https://github.com/camdencheek/tree-sitter-go-mod" }
 tree-sitter-haskell = { git = "https://github.com/tree-sitter/tree-sitter-haskell", rev = "cf98de23e4285b8e6bcb57b050ef2326e2cc284b" }
 tree-sitter-heex = { git = "https://github.com/phoenixframework/tree-sitter-heex", rev = "2e1348c3cf2c9323e87c2744796cf3f3868aa82a" }
 tree-sitter-html = "0.19.0"
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index c930c2eeb1..c57c27b854 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -115,6 +115,7 @@ tree-sitter-embedded-template.workspace = true
 tree-sitter-gleam.workspace = true
 tree-sitter-glsl.workspace = true
 tree-sitter-go.workspace = true
+tree-sitter-gomod.workspace = true
 tree-sitter-haskell.workspace = true
 tree-sitter-heex.workspace = true
 tree-sitter-html.workspace = true
diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index 5ed9e43ec5..2055518df3 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -122,6 +122,7 @@ pub fn init(
         tree_sitter_go::language(),
         vec![Arc::new(go::GoLspAdapter)],
     );
+    language("gomod", tree_sitter_gomod::language(), vec![]);
     language(
         "zig",
         tree_sitter_zig::language(),
diff --git a/crates/zed/src/languages/gomod/config.toml b/crates/zed/src/languages/gomod/config.toml
new file mode 100644
index 0000000000..80c252949d
--- /dev/null
+++ b/crates/zed/src/languages/gomod/config.toml
@@ -0,0 +1,7 @@
+name = "Go Mod"
+path_suffixes = ["mod"]
+line_comments = ["//"]
+autoclose_before = ")"
+brackets = [
+    { start = "(", end = ")", close = true, newline = true}
+]
diff --git a/crates/zed/src/languages/gomod/highlights.scm b/crates/zed/src/languages/gomod/highlights.scm
new file mode 100644
index 0000000000..0d3e0ca551
--- /dev/null
+++ b/crates/zed/src/languages/gomod/highlights.scm
@@ -0,0 +1,18 @@
+[
+  "require"
+  "replace"
+  "go"
+  "toolchain"
+  "exclude"
+  "retract"
+  "module"
+] @keyword
+
+"=>" @operator
+
+(comment) @comment
+
+[
+(version)
+(go_version)
+] @string
diff --git a/crates/zed/src/languages/gomod/structure.scm b/crates/zed/src/languages/gomod/structure.scm
new file mode 100644
index 0000000000..0df01ea255
--- /dev/null
+++ b/crates/zed/src/languages/gomod/structure.scm
@@ -0,0 +1,29 @@
+(require_directive
+  "require" @structure.anchor
+  ("(") @structure.open
+  (")") @structure.close
+)
+
+(exclude_directive
+  "exclude" @structure.anchor
+  ("(") @structure.open
+  (")") @structure.close
+)
+
+(module_directive
+  "module" @structure.anchor
+  ("(") @structure.open
+  (")") @structure.close
+)
+
+(replace_directive
+  "replace" @structure.anchor
+  ("(") @structure.open
+  (")") @structure.close
+)
+
+(retract_directive
+  "retract" @structure.anchor
+  ("(") @structure.open
+  (")") @structure.close
+)

From c3d4fa4336e412b49a9bd9fd5edd8808c92ce59b Mon Sep 17 00:00:00 2001
From: d1y <chenhonzhou@gmail.com>
Date: Wed, 31 Jan 2024 15:54:03 +0800
Subject: [PATCH 095/372] Permalink add Gitee host support (#7134)

China's largest git code hosting platform
About Gitee: https://gitee.com/about_us

Release Notes:

- Added Gitee host support   with Git-Permalink
---
 crates/editor/src/git/permalink.rs | 104 ++++++++++++++++++++++++++++-
 1 file changed, 103 insertions(+), 1 deletion(-)

diff --git a/crates/editor/src/git/permalink.rs b/crates/editor/src/git/permalink.rs
index 1dc1aa3953..39edae0dce 100644
--- a/crates/editor/src/git/permalink.rs
+++ b/crates/editor/src/git/permalink.rs
@@ -7,6 +7,7 @@ use url::Url;
 enum GitHostingProvider {
     Github,
     Gitlab,
+    Gitee,
 }
 
 impl GitHostingProvider {
@@ -14,6 +15,7 @@ impl GitHostingProvider {
         let base_url = match self {
             Self::Github => "https://github.com",
             Self::Gitlab => "https://gitlab.com",
+            Self::Gitee => "https://gitee.com",
         };
 
         Url::parse(&base_url).unwrap()
@@ -26,7 +28,7 @@ impl GitHostingProvider {
             let line = selection.start.row + 1;
 
             match self {
-                Self::Github | Self::Gitlab => format!("L{}", line),
+                Self::Github | Self::Gitlab | Self::Gitee => format!("L{}", line),
             }
         } else {
             let start_line = selection.start.row + 1;
@@ -35,6 +37,7 @@ impl GitHostingProvider {
             match self {
                 Self::Github => format!("L{}-L{}", start_line, end_line),
                 Self::Gitlab => format!("L{}-{}", start_line, end_line),
+                Self::Gitee => format!("L{}-{}", start_line, end_line),
             }
         }
     }
@@ -65,6 +68,7 @@ pub fn build_permalink(params: BuildPermalinkParams) -> Result<Url> {
     let path = match provider {
         GitHostingProvider::Github => format!("{owner}/{repo}/blob/{sha}/{path}"),
         GitHostingProvider::Gitlab => format!("{owner}/{repo}/-/blob/{sha}/{path}"),
+        GitHostingProvider::Gitee => format!("{owner}/{repo}/blob/{sha}/{path}"),
     };
     let line_fragment = selection.map(|selection| provider.line_fragment(&selection));
 
@@ -111,6 +115,21 @@ fn parse_git_remote_url(url: &str) -> Option<ParsedGitRemote> {
         });
     }
 
+    if url.starts_with("git@gitee.com:") || url.starts_with("https://gitee.com/") {
+        let repo_with_owner = url
+            .trim_start_matches("git@gitee.com:")
+            .trim_start_matches("https://gitee.com/")
+            .trim_end_matches(".git");
+
+        let (owner, repo) = repo_with_owner.split_once("/")?;
+
+        return Some(ParsedGitRemote {
+            provider: GitHostingProvider::Gitee,
+            owner,
+            repo,
+        });
+    }
+
     None
 }
 
@@ -285,4 +304,87 @@ mod tests {
         let expected_url = "https://gitlab.com/zed-industries/zed/-/blob/b2efec9824c45fcc90c9a7eb107a50d1772a60aa/crates/zed/src/main.rs#L24-48";
         assert_eq!(permalink.to_string(), expected_url.to_string())
     }
+
+    #[test]
+    fn test_build_gitee_permalink_from_ssh_url() {
+        let permalink = build_permalink(BuildPermalinkParams {
+            remote_url: "git@gitee.com:libkitten/zed.git",
+            sha: "e5fe811d7ad0fc26934edd76f891d20bdc3bb194",
+            path: "crates/editor/src/git/permalink.rs",
+            selection: None,
+        })
+        .unwrap();
+
+        let expected_url = "https://gitee.com/libkitten/zed/blob/e5fe811d7ad0fc26934edd76f891d20bdc3bb194/crates/editor/src/git/permalink.rs";
+        assert_eq!(permalink.to_string(), expected_url.to_string())
+    }
+
+    #[test]
+    fn test_build_gitee_permalink_from_ssh_url_single_line_selection() {
+        let permalink = build_permalink(BuildPermalinkParams {
+            remote_url: "git@gitee.com:libkitten/zed.git",
+            sha: "e5fe811d7ad0fc26934edd76f891d20bdc3bb194",
+            path: "crates/editor/src/git/permalink.rs",
+            selection: Some(Point::new(6, 1)..Point::new(6, 10)),
+        })
+        .unwrap();
+
+        let expected_url = "https://gitee.com/libkitten/zed/blob/e5fe811d7ad0fc26934edd76f891d20bdc3bb194/crates/editor/src/git/permalink.rs#L7";
+        assert_eq!(permalink.to_string(), expected_url.to_string())
+    }
+
+    #[test]
+    fn test_build_gitee_permalink_from_ssh_url_multi_line_selection() {
+        let permalink = build_permalink(BuildPermalinkParams {
+            remote_url: "git@gitee.com:libkitten/zed.git",
+            sha: "e5fe811d7ad0fc26934edd76f891d20bdc3bb194",
+            path: "crates/editor/src/git/permalink.rs",
+            selection: Some(Point::new(23, 1)..Point::new(47, 10)),
+        })
+        .unwrap();
+
+        let expected_url = "https://gitee.com/libkitten/zed/blob/e5fe811d7ad0fc26934edd76f891d20bdc3bb194/crates/editor/src/git/permalink.rs#L24-48";
+        assert_eq!(permalink.to_string(), expected_url.to_string())
+    }
+
+    #[test]
+    fn test_build_gitee_permalink_from_https_url() {
+        let permalink = build_permalink(BuildPermalinkParams {
+            remote_url: "https://gitee.com/libkitten/zed.git",
+            sha: "e5fe811d7ad0fc26934edd76f891d20bdc3bb194",
+            path: "crates/zed/src/main.rs",
+            selection: None,
+        })
+        .unwrap();
+
+        let expected_url = "https://gitee.com/libkitten/zed/blob/e5fe811d7ad0fc26934edd76f891d20bdc3bb194/crates/zed/src/main.rs";
+        assert_eq!(permalink.to_string(), expected_url.to_string())
+    }
+
+    #[test]
+    fn test_build_gitee_permalink_from_https_url_single_line_selection() {
+        let permalink = build_permalink(BuildPermalinkParams {
+            remote_url: "https://gitee.com/libkitten/zed.git",
+            sha: "e5fe811d7ad0fc26934edd76f891d20bdc3bb194",
+            path: "crates/zed/src/main.rs",
+            selection: Some(Point::new(6, 1)..Point::new(6, 10)),
+        })
+        .unwrap();
+
+        let expected_url = "https://gitee.com/libkitten/zed/blob/e5fe811d7ad0fc26934edd76f891d20bdc3bb194/crates/zed/src/main.rs#L7";
+        assert_eq!(permalink.to_string(), expected_url.to_string())
+    }
+
+    #[test]
+    fn test_build_gitee_permalink_from_https_url_multi_line_selection() {
+        let permalink = build_permalink(BuildPermalinkParams {
+            remote_url: "https://gitee.com/libkitten/zed.git",
+            sha: "e5fe811d7ad0fc26934edd76f891d20bdc3bb194",
+            path: "crates/zed/src/main.rs",
+            selection: Some(Point::new(23, 1)..Point::new(47, 10)),
+        })
+        .unwrap();
+        let expected_url = "https://gitee.com/libkitten/zed/blob/e5fe811d7ad0fc26934edd76f891d20bdc3bb194/crates/zed/src/main.rs#L24-48";
+        assert_eq!(permalink.to_string(), expected_url.to_string())
+    }
 }

From 634fe99fa506d2ce9485a362ae8f80c370ef291b Mon Sep 17 00:00:00 2001
From: Andrey Kuzmin <hi@unsoundscapes.com>
Date: Wed, 31 Jan 2024 10:05:38 +0100
Subject: [PATCH 096/372]  Add LSP support for Elm (#7116)

Closes #4595

Release Notes:

- Added LSP support for Elm
([#4595](https://github.com/zed-industries/zed/issues/4595)).

---------

Co-authored-by: Jared M. Smith <absynce@gmail.com>
---
 crates/zed/src/languages.rs     |   7 +-
 crates/zed/src/languages/elm.rs | 122 ++++++++++++++++++++++++++++++++
 docs/src/languages/elm.md       |   2 +-
 3 files changed, 129 insertions(+), 2 deletions(-)
 create mode 100644 crates/zed/src/languages/elm.rs

diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index 2055518df3..92682d590a 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -14,6 +14,7 @@ mod csharp;
 mod css;
 mod deno;
 mod elixir;
+mod elm;
 mod gleam;
 mod go;
 mod haskell;
@@ -278,7 +279,11 @@ pub fn init(
             node_runtime.clone(),
         ))],
     );
-    language("elm", tree_sitter_elm::language(), vec![]);
+    language(
+        "elm",
+        tree_sitter_elm::language(),
+        vec![Arc::new(elm::ElmLspAdapter::new(node_runtime.clone()))],
+    );
     language("glsl", tree_sitter_glsl::language(), vec![]);
     language("nix", tree_sitter_nix::language(), vec![]);
     language(
diff --git a/crates/zed/src/languages/elm.rs b/crates/zed/src/languages/elm.rs
new file mode 100644
index 0000000000..6eb5645102
--- /dev/null
+++ b/crates/zed/src/languages/elm.rs
@@ -0,0 +1,122 @@
+use anyhow::{anyhow, Result};
+use async_trait::async_trait;
+use futures::StreamExt;
+use language::{LanguageServerName, LspAdapter, LspAdapterDelegate};
+use lsp::LanguageServerBinary;
+use node_runtime::NodeRuntime;
+use smol::fs;
+use std::{
+    any::Any,
+    ffi::OsString,
+    path::{Path, PathBuf},
+    sync::Arc,
+};
+use util::ResultExt;
+
+const SERVER_PATH: &'static str = "node_modules/@elm-tooling/elm-language-server/out/node/index.js";
+
+fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
+    vec![server_path.into(), "--stdio".into()]
+}
+
+pub struct ElmLspAdapter {
+    node: Arc<dyn NodeRuntime>,
+}
+
+impl ElmLspAdapter {
+    pub fn new(node: Arc<dyn NodeRuntime>) -> Self {
+        ElmLspAdapter { node }
+    }
+}
+
+#[async_trait]
+impl LspAdapter for ElmLspAdapter {
+    fn name(&self) -> LanguageServerName {
+        LanguageServerName("elm-language-server".into())
+    }
+
+    fn short_name(&self) -> &'static str {
+        "elmLS"
+    }
+
+    async fn fetch_latest_server_version(
+        &self,
+        _: &dyn LspAdapterDelegate,
+    ) -> Result<Box<dyn 'static + Any + Send>> {
+        Ok(Box::new(
+            self.node
+                .npm_package_latest_version("@elm-tooling/elm-language-server")
+                .await?,
+        ) as Box<_>)
+    }
+
+    async fn fetch_server_binary(
+        &self,
+        version: Box<dyn 'static + Send + Any>,
+        container_dir: PathBuf,
+        _: &dyn LspAdapterDelegate,
+    ) -> Result<LanguageServerBinary> {
+        let version = version.downcast::<String>().unwrap();
+        let server_path = container_dir.join(SERVER_PATH);
+
+        if fs::metadata(&server_path).await.is_err() {
+            self.node
+                .npm_install_packages(
+                    &container_dir,
+                    &[("@elm-tooling/elm-language-server", version.as_str())],
+                )
+                .await?;
+        }
+
+        Ok(LanguageServerBinary {
+            path: self.node.binary_path().await?,
+            arguments: server_binary_arguments(&server_path),
+        })
+    }
+
+    async fn cached_server_binary(
+        &self,
+        container_dir: PathBuf,
+        _: &dyn LspAdapterDelegate,
+    ) -> Option<LanguageServerBinary> {
+        get_cached_server_binary(container_dir, &*self.node).await
+    }
+
+    async fn installation_test_binary(
+        &self,
+        container_dir: PathBuf,
+    ) -> Option<LanguageServerBinary> {
+        get_cached_server_binary(container_dir, &*self.node).await
+    }
+}
+
+async fn get_cached_server_binary(
+    container_dir: PathBuf,
+    node: &dyn NodeRuntime,
+) -> Option<LanguageServerBinary> {
+    (|| async move {
+        let mut last_version_dir = None;
+        let mut entries = fs::read_dir(&container_dir).await?;
+        while let Some(entry) = entries.next().await {
+            let entry = entry?;
+            if entry.file_type().await?.is_dir() {
+                last_version_dir = Some(entry.path());
+            }
+        }
+        let last_version_dir = last_version_dir.ok_or_else(|| anyhow!("no cached binary"))?;
+        let server_path = last_version_dir.join(SERVER_PATH);
+        if server_path.exists() {
+            Ok(LanguageServerBinary {
+                path: node.binary_path().await?,
+                arguments: server_binary_arguments(&server_path),
+            })
+        } else {
+            Err(anyhow!(
+                "missing executable in directory {:?}",
+                last_version_dir
+            ))
+        }
+    })()
+    .await
+    .log_err()
+}
diff --git a/docs/src/languages/elm.md b/docs/src/languages/elm.md
index 8c12d87fa3..ec6aa46c7a 100644
--- a/docs/src/languages/elm.md
+++ b/docs/src/languages/elm.md
@@ -1,4 +1,4 @@
 # Elm
 
 - Tree Sitter: [tree-sitter-elm](https://github.com/elm-tooling/tree-sitter-elm)
-- Language Server: N/A
+- Language Server: [elm-language-server](https://github.com/elm-tooling/elm-language-server)

From 7cb97e57f98d15370daf094c2b65d0b5d8295b8f Mon Sep 17 00:00:00 2001
From: Julia <floc@unpromptedtirade.com>
Date: Tue, 30 Jan 2024 16:21:15 -0500
Subject: [PATCH 097/372] Add debounce for re-querying completion documentation

---
 assets/settings/default.json          |  3 +
 crates/editor/src/debounced_delay.rs  | 49 +++++++++++++++
 crates/editor/src/editor.rs           | 85 ++++++++++++++++++---------
 crates/editor/src/editor_settings.rs  |  6 ++
 crates/project/src/debounced_delay.rs | 49 +++++++++++++++
 crates/project/src/project.rs         | 56 ++----------------
 docs/src/configuring_zed.md           | 10 ++++
 7 files changed, 179 insertions(+), 79 deletions(-)
 create mode 100644 crates/editor/src/debounced_delay.rs
 create mode 100644 crates/project/src/debounced_delay.rs

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 914baeede7..33efad6ceb 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -62,6 +62,9 @@
   // Whether to display inline and alongside documentation for items in the
   // completions menu
   "show_completion_documentation": true,
+  // The debounce delay before re-querying the language server for completion
+  // documentation when not included in original completion list.
+  "completion_documentation_secondary_query_debounce": 300,
   // Whether to show wrap guides in the editor. Setting this to true will
   // show a guide at the 'preferred_line_length' value if softwrap is set to
   // 'preferred_line_length', and will show any additional guides as specified
diff --git a/crates/editor/src/debounced_delay.rs b/crates/editor/src/debounced_delay.rs
new file mode 100644
index 0000000000..b9d8ebf103
--- /dev/null
+++ b/crates/editor/src/debounced_delay.rs
@@ -0,0 +1,49 @@
+use std::time::Duration;
+
+use futures::{channel::oneshot, FutureExt};
+use gpui::{Task, ViewContext};
+
+use crate::Editor;
+
+pub struct DebouncedDelay {
+    task: Option<Task<()>>,
+    cancel_channel: Option<oneshot::Sender<()>>,
+}
+
+impl DebouncedDelay {
+    pub fn new() -> DebouncedDelay {
+        DebouncedDelay {
+            task: None,
+            cancel_channel: None,
+        }
+    }
+
+    pub fn fire_new<F>(&mut self, delay: Duration, cx: &mut ViewContext<Editor>, func: F)
+    where
+        F: 'static + Send + FnOnce(&mut Editor, &mut ViewContext<Editor>) -> Task<()>,
+    {
+        if let Some(channel) = self.cancel_channel.take() {
+            _ = channel.send(());
+        }
+
+        let (sender, mut receiver) = oneshot::channel::<()>();
+        self.cancel_channel = Some(sender);
+
+        let previous_task = self.task.take();
+        self.task = Some(cx.spawn(move |model, mut cx| async move {
+            let mut timer = cx.background_executor().timer(delay).fuse();
+            if let Some(previous_task) = previous_task {
+                previous_task.await;
+            }
+
+            futures::select_biased! {
+                _ = receiver => return,
+                _ = timer => {}
+            }
+
+            if let Ok(task) = model.update(&mut cx, |project, cx| (func)(project, cx)) {
+                task.await;
+            }
+        }));
+    }
+}
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index b6b2bac7be..c795eecb04 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -19,6 +19,7 @@ mod editor_settings;
 mod element;
 mod inlay_hint_cache;
 
+mod debounced_delay;
 mod git;
 mod highlight_matching_bracket;
 mod hover_popover;
@@ -45,6 +46,7 @@ use clock::ReplicaId;
 use collections::{BTreeMap, Bound, HashMap, HashSet, VecDeque};
 use convert_case::{Case, Casing};
 use copilot::Copilot;
+use debounced_delay::DebouncedDelay;
 pub use display_map::DisplayPoint;
 use display_map::*;
 pub use editor_settings::EditorSettings;
@@ -85,7 +87,7 @@ pub use multi_buffer::{
     ToPoint,
 };
 use ordered_float::OrderedFloat;
-use parking_lot::RwLock;
+use parking_lot::{Mutex, RwLock};
 use project::{FormatTrigger, Location, Project, ProjectPath, ProjectTransaction};
 use rand::prelude::*;
 use rpc::proto::*;
@@ -383,6 +385,7 @@ pub struct Editor {
     mouse_context_menu: Option<MouseContextMenu>,
     completion_tasks: Vec<(CompletionId, Task<Option<()>>)>,
     next_completion_id: CompletionId,
+    completion_documentation_pre_resolve_debounce: DebouncedDelay,
     available_code_actions: Option<(Model<Buffer>, Arc<[CodeAction]>)>,
     code_actions_task: Option<Task<()>>,
     document_highlights_task: Option<Task<()>>,
@@ -701,6 +704,7 @@ struct CompletionsMenu {
     matches: Arc<[StringMatch]>,
     selected_item: usize,
     scroll_handle: UniformListScrollHandle,
+    selected_completion_documentation_resolve_debounce: Arc<Mutex<DebouncedDelay>>,
 }
 
 impl CompletionsMenu {
@@ -741,30 +745,31 @@ impl CompletionsMenu {
     }
 
     fn pre_resolve_completion_documentation(
-        &self,
+        completions: Arc<RwLock<Box<[Completion]>>>,
+        matches: Arc<[StringMatch]>,
         editor: &Editor,
         cx: &mut ViewContext<Editor>,
-    ) -> Option<Task<()>> {
+    ) -> Task<()> {
         let settings = EditorSettings::get_global(cx);
         if !settings.show_completion_documentation {
-            return None;
+            return Task::ready(());
         }
 
         let Some(provider) = editor.completion_provider.as_ref() else {
-            return None;
+            return Task::ready(());
         };
 
         let resolve_task = provider.resolve_completions(
-            self.matches.iter().map(|m| m.candidate_id).collect(),
-            self.completions.clone(),
+            matches.iter().map(|m| m.candidate_id).collect(),
+            completions.clone(),
             cx,
         );
 
-        return Some(cx.spawn(move |this, mut cx| async move {
+        return cx.spawn(move |this, mut cx| async move {
             if let Some(true) = resolve_task.await.log_err() {
                 this.update(&mut cx, |_, cx| cx.notify()).ok();
             }
-        }));
+        });
     }
 
     fn attempt_resolve_selected_completion_documentation(
@@ -785,12 +790,20 @@ impl CompletionsMenu {
         let resolve_task = project.update(cx, |project, cx| {
             project.resolve_completions(vec![completion_index], self.completions.clone(), cx)
         });
-        cx.spawn(move |this, mut cx| async move {
-            if let Some(true) = resolve_task.await.log_err() {
-                this.update(&mut cx, |_, cx| cx.notify()).ok();
-            }
-        })
-        .detach();
+
+        let delay_ms =
+            EditorSettings::get_global(cx).completion_documentation_secondary_query_debounce;
+        let delay = Duration::from_millis(delay_ms);
+
+        self.selected_completion_documentation_resolve_debounce
+            .lock()
+            .fire_new(delay, cx, |_, cx| {
+                cx.spawn(move |this, mut cx| async move {
+                    if let Some(true) = resolve_task.await.log_err() {
+                        this.update(&mut cx, |_, cx| cx.notify()).ok();
+                    }
+                })
+            });
     }
 
     fn visible(&self) -> bool {
@@ -1434,6 +1447,7 @@ impl Editor {
             mouse_context_menu: None,
             completion_tasks: Default::default(),
             next_completion_id: 0,
+            completion_documentation_pre_resolve_debounce: DebouncedDelay::new(),
             next_inlay_id: 0,
             available_code_actions: Default::default(),
             code_actions_task: Default::default(),
@@ -3143,7 +3157,7 @@ impl Editor {
         let task = cx.spawn(|this, mut cx| {
             async move {
                 let completions = completions.await.log_err();
-                let (menu, pre_resolve_task) = if let Some(completions) = completions {
+                let menu = if let Some(completions) = completions {
                     let mut menu = CompletionsMenu {
                         id,
                         initial_position: position,
@@ -3163,23 +3177,40 @@ impl Editor {
                         matches: Vec::new().into(),
                         selected_item: 0,
                         scroll_handle: UniformListScrollHandle::new(),
+                        selected_completion_documentation_resolve_debounce: Arc::new(Mutex::new(
+                            DebouncedDelay::new(),
+                        )),
                     };
                     menu.filter(query.as_deref(), cx.background_executor().clone())
                         .await;
 
                     if menu.matches.is_empty() {
-                        (None, None)
+                        None
                     } else {
-                        let pre_resolve_task = this
-                            .update(&mut cx, |editor, cx| {
-                                menu.pre_resolve_completion_documentation(editor, cx)
-                            })
-                            .ok()
-                            .flatten();
-                        (Some(menu), pre_resolve_task)
+                        this.update(&mut cx, |editor, cx| {
+                            let completions = menu.completions.clone();
+                            let matches = menu.matches.clone();
+
+                            let delay_ms = EditorSettings::get_global(cx)
+                                .completion_documentation_secondary_query_debounce;
+                            let delay = Duration::from_millis(delay_ms);
+
+                            editor
+                                .completion_documentation_pre_resolve_debounce
+                                .fire_new(delay, cx, |editor, cx| {
+                                    CompletionsMenu::pre_resolve_completion_documentation(
+                                        completions,
+                                        matches,
+                                        editor,
+                                        cx,
+                                    )
+                                });
+                        })
+                        .ok();
+                        Some(menu)
                     }
                 } else {
-                    (None, None)
+                    None
                 };
 
                 this.update(&mut cx, |this, cx| {
@@ -3215,10 +3246,6 @@ impl Editor {
                     }
                 })?;
 
-                if let Some(pre_resolve_task) = pre_resolve_task {
-                    pre_resolve_task.await;
-                }
-
                 Ok::<_, anyhow::Error>(())
             }
             .log_err()
diff --git a/crates/editor/src/editor_settings.rs b/crates/editor/src/editor_settings.rs
index 7a5f074d44..d4d71cd2bf 100644
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -8,6 +8,7 @@ pub struct EditorSettings {
     pub hover_popover_enabled: bool,
     pub show_completions_on_input: bool,
     pub show_completion_documentation: bool,
+    pub completion_documentation_secondary_query_debounce: u64,
     pub use_on_type_format: bool,
     pub scrollbar: Scrollbar,
     pub relative_line_numbers: bool,
@@ -72,6 +73,11 @@ pub struct EditorSettingsContent {
     ///
     /// Default: true
     pub show_completion_documentation: Option<bool>,
+    /// The debounce delay before re-querying the language server for completion
+    /// documentation when not included in original completion list.
+    ///
+    /// Default: 300 ms
+    pub completion_documentation_secondary_query_debounce: Option<u64>,
     /// Whether to use additional LSP queries to format (and amend) the code after
     /// every "trigger" symbol input, defined by LSP server capabilities.
     ///
diff --git a/crates/project/src/debounced_delay.rs b/crates/project/src/debounced_delay.rs
new file mode 100644
index 0000000000..152df1ba0e
--- /dev/null
+++ b/crates/project/src/debounced_delay.rs
@@ -0,0 +1,49 @@
+use std::time::Duration;
+
+use futures::{channel::oneshot, FutureExt};
+use gpui::{ModelContext, Task};
+
+use crate::Project;
+
+pub struct DebouncedDelay {
+    task: Option<Task<()>>,
+    cancel_channel: Option<oneshot::Sender<()>>,
+}
+
+impl DebouncedDelay {
+    pub fn new() -> DebouncedDelay {
+        DebouncedDelay {
+            task: None,
+            cancel_channel: None,
+        }
+    }
+
+    pub fn fire_new<F>(&mut self, delay: Duration, cx: &mut ModelContext<Project>, func: F)
+    where
+        F: 'static + Send + FnOnce(&mut Project, &mut ModelContext<Project>) -> Task<()>,
+    {
+        if let Some(channel) = self.cancel_channel.take() {
+            _ = channel.send(());
+        }
+
+        let (sender, mut receiver) = oneshot::channel::<()>();
+        self.cancel_channel = Some(sender);
+
+        let previous_task = self.task.take();
+        self.task = Some(cx.spawn(move |model, mut cx| async move {
+            let mut timer = cx.background_executor().timer(delay).fuse();
+            if let Some(previous_task) = previous_task {
+                previous_task.await;
+            }
+
+            futures::select_biased! {
+                _ = receiver => return,
+                _ = timer => {}
+            }
+
+            if let Ok(task) = model.update(&mut cx, |project, cx| (func)(project, cx)) {
+                task.await;
+            }
+        }));
+    }
+}
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 50b886e44b..fc7c80c7f9 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -1,3 +1,4 @@
+pub mod debounced_delay;
 mod ignore;
 pub mod lsp_command;
 pub mod lsp_ext_command;
@@ -17,11 +18,9 @@ use client::{proto, Client, Collaborator, TypedEnvelope, UserStore};
 use clock::ReplicaId;
 use collections::{hash_map, BTreeMap, HashMap, HashSet, VecDeque};
 use copilot::Copilot;
+use debounced_delay::DebouncedDelay;
 use futures::{
-    channel::{
-        mpsc::{self, UnboundedReceiver},
-        oneshot,
-    },
+    channel::mpsc::{self, UnboundedReceiver},
     future::{try_join_all, Shared},
     stream::FuturesUnordered,
     AsyncWriteExt, Future, FutureExt, StreamExt, TryFutureExt,
@@ -140,7 +139,7 @@ pub struct Project {
     buffer_snapshots: HashMap<BufferId, HashMap<LanguageServerId, Vec<LspBufferSnapshot>>>, // buffer_id -> server_id -> vec of snapshots
     buffers_being_formatted: HashSet<BufferId>,
     buffers_needing_diff: HashSet<WeakModel<Buffer>>,
-    git_diff_debouncer: DelayedDebounced,
+    git_diff_debouncer: DebouncedDelay,
     nonce: u128,
     _maintain_buffer_languages: Task<()>,
     _maintain_workspace_config: Task<Result<()>>,
@@ -154,54 +153,11 @@ pub struct Project {
     prettier_instances: HashMap<PathBuf, PrettierInstance>,
 }
 
-struct DelayedDebounced {
-    task: Option<Task<()>>,
-    cancel_channel: Option<oneshot::Sender<()>>,
-}
-
 pub enum LanguageServerToQuery {
     Primary,
     Other(LanguageServerId),
 }
 
-impl DelayedDebounced {
-    fn new() -> DelayedDebounced {
-        DelayedDebounced {
-            task: None,
-            cancel_channel: None,
-        }
-    }
-
-    fn fire_new<F>(&mut self, delay: Duration, cx: &mut ModelContext<Project>, func: F)
-    where
-        F: 'static + Send + FnOnce(&mut Project, &mut ModelContext<Project>) -> Task<()>,
-    {
-        if let Some(channel) = self.cancel_channel.take() {
-            _ = channel.send(());
-        }
-
-        let (sender, mut receiver) = oneshot::channel::<()>();
-        self.cancel_channel = Some(sender);
-
-        let previous_task = self.task.take();
-        self.task = Some(cx.spawn(move |project, mut cx| async move {
-            let mut timer = cx.background_executor().timer(delay).fuse();
-            if let Some(previous_task) = previous_task {
-                previous_task.await;
-            }
-
-            futures::select_biased! {
-                _ = receiver => return,
-                    _ = timer => {}
-            }
-
-            if let Ok(task) = project.update(&mut cx, |project, cx| (func)(project, cx)) {
-                task.await;
-            }
-        }));
-    }
-}
-
 struct LspBufferSnapshot {
     version: i32,
     snapshot: TextBufferSnapshot,
@@ -670,7 +626,7 @@ impl Project {
                 last_workspace_edits_by_language_server: Default::default(),
                 buffers_being_formatted: Default::default(),
                 buffers_needing_diff: Default::default(),
-                git_diff_debouncer: DelayedDebounced::new(),
+                git_diff_debouncer: DebouncedDelay::new(),
                 nonce: StdRng::from_entropy().gen(),
                 terminals: Terminals {
                     local_handles: Vec::new(),
@@ -774,7 +730,7 @@ impl Project {
                 opened_buffers: Default::default(),
                 buffers_being_formatted: Default::default(),
                 buffers_needing_diff: Default::default(),
-                git_diff_debouncer: DelayedDebounced::new(),
+                git_diff_debouncer: DebouncedDelay::new(),
                 buffer_snapshots: Default::default(),
                 nonce: StdRng::from_entropy().gen(),
                 terminals: Terminals {
diff --git a/docs/src/configuring_zed.md b/docs/src/configuring_zed.md
index 8ad075d6e7..6b65d0a137 100644
--- a/docs/src/configuring_zed.md
+++ b/docs/src/configuring_zed.md
@@ -622,6 +622,16 @@ These values take in the same options as the root-level settings with the same n
 
 `boolean` values
 
+## Completion Documentation Debounce Delay
+
+- Description: The debounce delay before re-querying the language server for completion documentation when not included in original completion list.
+- Setting: `completion_documentation_secondary_query_debounce`
+- Default: `300` ms
+
+**Options**
+
+`integer` values
+
 ## Show Copilot Suggestions
 
 - Description: Whether or not to show Copilot suggestions as you type or wait for a `copilot::Toggle`.

From 8c8a5ad27586df3e938959b114a4ebdc2423428c Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Wed, 31 Jan 2024 11:05:22 -0500
Subject: [PATCH 098/372] Make theme parsing more lenient (#7154)

This PR improves the theme parsing to be a bit more lenient, allowing
things like comments and trailing commas in theme files.

Release Notes:

- N/A
---
 Cargo.lock                   | 1 +
 Cargo.toml                   | 1 +
 crates/settings/Cargo.toml   | 2 +-
 crates/theme/Cargo.toml      | 1 +
 crates/theme/src/registry.rs | 2 +-
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 00917fb3dd..ae9cf8525d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8183,6 +8183,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
+ "serde_json_lenient",
  "serde_repr",
  "settings",
  "story",
diff --git a/Cargo.toml b/Cargo.toml
index b423969259..ffb1ef5328 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -120,6 +120,7 @@ schemars = "0.8"
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_derive = { version = "1.0", features = ["deserialize_in_place"] }
 serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
+serde_json_lenient = { version = "0.1", features = ["preserve_order", "raw_value"] }
 serde_repr = "0.1"
 smallvec = { version = "1.6", features = ["union"] }
 smol = "1.2"
diff --git a/crates/settings/Cargo.toml b/crates/settings/Cargo.toml
index 5e93189a23..2d0669cada 100644
--- a/crates/settings/Cargo.toml
+++ b/crates/settings/Cargo.toml
@@ -27,7 +27,7 @@ schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-serde_json_lenient = {version = "0.1", features = ["preserve_order", "raw_value"] }
+serde_json_lenient.workspace = true
 smallvec.workspace = true
 toml.workspace = true
 tree-sitter-json = "*"
diff --git a/crates/theme/Cargo.toml b/crates/theme/Cargo.toml
index d459661706..b29ac5d2fe 100644
--- a/crates/theme/Cargo.toml
+++ b/crates/theme/Cargo.toml
@@ -34,6 +34,7 @@ schemars = { workspace = true, features = ["indexmap"] }
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
+serde_json_lenient.workspace = true
 serde_repr.workspace = true
 settings = { path = "../settings" }
 story = { path = "../story", optional = true }
diff --git a/crates/theme/src/registry.rs b/crates/theme/src/registry.rs
index b5f1500429..2bbb5c6120 100644
--- a/crates/theme/src/registry.rs
+++ b/crates/theme/src/registry.rs
@@ -259,7 +259,7 @@ impl ThemeRegistry {
                 continue;
             };
 
-            let Some(theme) = serde_json::from_reader(reader).log_err() else {
+            let Some(theme) = serde_json_lenient::from_reader(reader).log_err() else {
                 continue;
             };
 

From 5941102aac43643a509516f67bc9730f1d6185ed Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Wed, 31 Jan 2024 17:37:16 +0100
Subject: [PATCH 099/372] gpui: Add runtime-shaders feature so that Xcode.app
 is no longer necessary for Nix-based workflows (#7148)

Release Notes:

- N/A

Co-authored-by: Niklas <niklas@niklaskorz.de>
---
 crates/gpui/Cargo.toml                        |  9 ++++++-
 crates/gpui/build.rs                          | 25 +++++++++++++++++--
 .../gpui/src/platform/mac/metal_renderer.rs   | 10 +++++++-
 3 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 0bc28b8db4..96c7b4b02c 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -8,7 +8,14 @@ publish = false
 license = "Apache-2.0"
 
 [features]
-test-support = ["backtrace", "dhat", "env_logger", "collections/test-support", "util/test-support"]
+test-support = [
+    "backtrace",
+    "dhat",
+    "env_logger",
+    "collections/test-support",
+    "util/test-support",
+]
+runtime_shaders = []
 
 [lib]
 path = "src/gpui.rs"
diff --git a/crates/gpui/build.rs b/crates/gpui/build.rs
index b237583847..4c86fe9a62 100644
--- a/crates/gpui/build.rs
+++ b/crates/gpui/build.rs
@@ -1,7 +1,6 @@
 use std::{
     env,
     path::{Path, PathBuf},
-    process::{self, Command},
 };
 
 use cbindgen::Config;
@@ -9,6 +8,9 @@ use cbindgen::Config;
 fn main() {
     generate_dispatch_bindings();
     let header_path = generate_shader_bindings();
+    #[cfg(feature = "runtime_shaders")]
+    emit_stitched_shaders(&header_path);
+    #[cfg(not(feature = "runtime_shaders"))]
     compile_metal_shaders(&header_path);
 }
 
@@ -95,11 +97,30 @@ fn generate_shader_bindings() -> PathBuf {
     output_path
 }
 
+/// To enable runtime compilation, we need to "stitch" the shaders file with the generated header
+/// so that it is self-contained.
+#[cfg(feature = "runtime_shaders")]
+fn emit_stitched_shaders(header_path: &Path) {
+    use std::str::FromStr;
+    fn stitch_header(header: &Path, shader_path: &Path) -> std::io::Result<PathBuf> {
+        let header_contents = std::fs::read_to_string(header)?;
+        let shader_contents = std::fs::read_to_string(shader_path)?;
+        let stitched_contents = format!("{header_contents}\n{shader_contents}");
+        let out_path = PathBuf::from(env::var("OUT_DIR").unwrap()).join("stitched_shaders.metal");
+        let _ = std::fs::write(&out_path, stitched_contents)?;
+        Ok(out_path)
+    }
+    let shader_source_path = "./src/platform/mac/shaders.metal";
+    let shader_path = PathBuf::from_str(shader_source_path).unwrap();
+    stitch_header(header_path, &shader_path).unwrap();
+    println!("cargo:rerun-if-changed={}", &shader_source_path);
+}
+#[cfg(not(feature = "runtime_shaders"))]
 fn compile_metal_shaders(header_path: &Path) {
+    use std::process::{self, Command};
     let shader_path = "./src/platform/mac/shaders.metal";
     let air_output_path = PathBuf::from(env::var("OUT_DIR").unwrap()).join("shaders.air");
     let metallib_output_path = PathBuf::from(env::var("OUT_DIR").unwrap()).join("shaders.metallib");
-
     println!("cargo:rerun-if-changed={}", shader_path);
 
     let output = Command::new("xcrun")
diff --git a/crates/gpui/src/platform/mac/metal_renderer.rs b/crates/gpui/src/platform/mac/metal_renderer.rs
index 1589757d93..68027ceff6 100644
--- a/crates/gpui/src/platform/mac/metal_renderer.rs
+++ b/crates/gpui/src/platform/mac/metal_renderer.rs
@@ -17,7 +17,11 @@ use objc::{self, msg_send, sel, sel_impl};
 use smallvec::SmallVec;
 use std::{ffi::c_void, mem, ptr, sync::Arc};
 
+#[cfg(not(feature = "runtime_shaders"))]
 const SHADERS_METALLIB: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/shaders.metallib"));
+#[cfg(feature = "runtime_shaders")]
+const SHADERS_SOURCE_FILE: &'static str =
+    include_str!(concat!(env!("OUT_DIR"), "/stitched_shaders.metal"));
 const INSTANCE_BUFFER_SIZE: usize = 32 * 1024 * 1024; // This is an arbitrary decision. There's probably a more optimal value (maybe even we could adjust dynamically...)
 
 pub(crate) struct MetalRenderer {
@@ -60,7 +64,11 @@ impl MetalRenderer {
                     | AutoresizingMask::HEIGHT_SIZABLE
             ];
         }
-
+        #[cfg(feature = "runtime_shaders")]
+        let library = device
+            .new_library_with_source(&SHADERS_SOURCE_FILE, &metal::CompileOptions::new())
+            .expect("error building metal library");
+        #[cfg(not(feature = "runtime_shaders"))]
         let library = device
             .new_library_with_data(SHADERS_METALLIB)
             .expect("error building metal library");

From 6e443ac298c39ff55aaec68b552cb4e970cb5adb Mon Sep 17 00:00:00 2001
From: Pyae Sone Aung <44226349+PyaeSoneAungRgn@users.noreply.github.com>
Date: Wed, 31 Jan 2024 23:44:28 +0630
Subject: [PATCH 100/372] Add PHP file type icon (#7159)

Add PHP file type icon from
[file-icons/icons](https://github.com/file-icons/icons)


[https://github.com/file-icons/icons/blob/master/svg/PHP.svg](https://github.com/file-icons/icons/blob/master/svg/PHP.svg)

<img width="408" alt="Screenshot 2024-01-31 at 23 14 55"
src="https://github.com/zed-industries/zed/assets/44226349/26c3d19d-3a5d-4fc6-b551-f5351ba62b7d">


Release Notes:

- Added PHP file type icon.
---
 assets/icons/file_icons/file_types.json | 5 ++++-
 assets/icons/file_icons/php.svg         | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 assets/icons/file_icons/php.svg

diff --git a/assets/icons/file_icons/file_types.json b/assets/icons/file_icons/file_types.json
index e5510d8599..ce6c257fe6 100644
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -74,7 +74,7 @@
         "ogg": "video",
         "pdb": "storage",
         "pdf": "document",
-        "php": "code",
+        "php": "php",
         "png": "image",
         "ppt": "document",
         "pptx": "document",
@@ -171,6 +171,9 @@
         "phoenix": {
             "icon": "icons/file_icons/phoenix.svg"
         },
+        "php": {
+            "icon": "icons/file_icons/php.svg"
+        },
         "prettier": {
             "icon": "icons/file_icons/prettier.svg"
         },
diff --git a/assets/icons/file_icons/php.svg b/assets/icons/file_icons/php.svg
new file mode 100644
index 0000000000..f1b0887f79
--- /dev/null
+++ b/assets/icons/file_icons/php.svg
@@ -0,0 +1 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="512" height="512"><path d="M170.322 349.808c-2.4-15.66-9-28.38-25.020-34.531-6.27-2.4-11.7-6.78-17.88-9.54-7.020-3.15-14.16-6.15-21.57-8.1-5.61-1.5-10.83 1.020-14.16 5.94-3.15 4.62-0.87 8.97 1.77 12.84 2.97 4.35 6.27 8.49 9.6 12.57 5.52 6.78 11.37 13.29 16.74 20.161 5.13 6.57 9.51 13.86 8.76 22.56-1.65 19.080-10.29 34.891-24.21 47.76-1.53 1.38-4.23 2.37-6.21 2.19-8.88-0.96-16.95-4.32-23.46-10.53-7.47-7.11-6.33-15.48 2.61-20.67 2.13-1.23 4.35-2.37 6.3-3.87 5.46-4.11 7.29-11.13 4.32-17.22-1.41-2.94-3-6.12-5.34-8.25-11.43-10.41-22.651-21.151-34.891-30.63-29.671-23.041-44.91-53.52-47.251-90.421-2.64-40.981 6.87-79.231 28.5-114.242 8.19-13.29 17.73-25.951 32.37-32.52 9.96-4.47 20.88-6.99 31.531-9.78 29.311-7.71 58.89-13.5 89.401-8.34 26.28 4.41 45.511 17.94 54.331 43.77 5.79 16.89 7.17 34.35 5.37 52.231-3.54 35.131-29.49 66.541-63.331 75.841-14.67 4.020-22.68 1.77-31.5-10.44-6.33-8.79-11.58-18.36-17.25-27.631-0.84-1.38-1.44-2.97-2.16-4.44-0.69-1.47-1.44-2.88-2.16-4.35 2.13 15.24 5.67 29.911 13.98 42.99 4.5 7.11 10.5 12.36 19.29 13.14 32.34 2.91 59.641-7.71 79.021-33.721 21.69-29.101 26.461-62.581 20.19-97.831-1.23-6.96-3.3-13.77-4.77-20.7-0.99-4.47 0.78-7.77 5.19-9.33 2.040-0.69 4.14-1.26 6.18-1.68 26.461-5.7 53.221-7.59 80.191-4.86 30.601 3.060 59.551 11.46 85.441 28.471 40.531 26.67 65.641 64.621 79.291 110.522 1.98 6.66 2.28 13.95 2.46 20.971 0.12 4.68-2.88 5.91-6.45 2.97-3.93-3.21-7.53-6.87-10.92-10.65-3.15-3.57-5.67-7.65-8.73-11.4-2.37-2.94-4.44-2.49-5.58 1.17-0.72 2.22-1.35 4.41-1.98 6.63-7.080 25.26-18.24 48.3-36.33 67.711-2.52 2.73-4.77 6.78-5.070 10.38-0.78 9.96-1.35 20.13-0.39 30.060 1.98 21.331 5.070 42.57 7.47 63.871 1.35 12.030-2.52 19.11-13.83 23.281-7.95 2.91-16.47 5.040-24.87 5.64-13.38 0.93-26.88 0.27-40.32 0.27-0.36-15 0.93-29.731-13.17-37.771 2.73-11.13 5.88-21.69 7.77-32.49 1.56-8.97 0.24-17.79-6.060-25.14-5.91-6.93-13.32-8.82-20.101-4.86-20.43 11.91-41.671 11.97-63.301 4.17-9.93-3.6-16.86-1.56-22.351 7.5-5.91 9.75-8.4 20.7-7.74 31.771 0.84 13.95 3.27 27.75 5.13 41.64 1.020 7.77 0.15 9.78-7.56 11.76-17.13 4.35-34.56 4.83-52.081 3.42-0.93-0.090-1.86-0.48-2.46-0.63-0.87-14.55 0.66-29.671-16.68-37.411 7.68-16.29 6.63-33.18 3.99-50.070l-0.060-0.15zM66.761 292.718c2.55-2.4 4.59-6.15 5.31-9.6 1.8-8.64-4.68-20.22-12.18-23.43-3.99-1.74-7.47-1.11-10.29 2.070-6.87 7.77-13.65 15.63-20.401 23.521-1.14 1.35-2.16 2.94-2.97 4.53-2.7 5.19-1.11 8.97 4.65 10.38 3.48 0.87 7.080 1.050 10.65 1.56 9.3-0.9 18.3-2.46 25.23-9v-0.030zM67.541 206.347c-0.030-6.18-5.19-11.34-11.28-11.37-6.27-0.030-11.67 5.58-11.46 11.76 0.27 6.21 5.43 11.19 11.61 11.070 6.24-0.090 11.22-5.19 11.16-11.43l-0.030-0.030z"></path></svg>
\ No newline at end of file

From 39200ec9f74bf933894dc98d55a187efb80673c2 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Wed, 31 Jan 2024 12:34:31 -0500
Subject: [PATCH 101/372] Adjust heading levels in docs (#7163)

This PR adjusts the heading levels in the docs, as some of them weren't
following the right hierarchy.

I also formatted all of the docs with Prettier.

Release Notes:

- N/A
---
 docs/src/CODE_OF_CONDUCT.md                   |  22 ++--
 docs/src/configuring_zed.md                   |   7 +-
 docs/src/configuring_zed__configuring_vim.md  |  35 +++---
 docs/src/configuring_zed__key_bindings.md     |  32 +++---
 docs/src/developing_zed__adding_languages.md  |  10 +-
 docs/src/developing_zed__building_zed.md      |  24 ++--
 .../developing_zed__local_collaboration.md    |   2 +-
 docs/src/feedback.md                          |  12 +-
 docs/src/getting_started.md                   |   6 +-
 docs/src/languages/elixir.md                  |   4 +-
 docs/src/languages/python.md                  |   6 +-
 docs/src/languages/ruby.md                    |  14 +--
 docs/src/languages/toml.md                    |   1 -
 docs/src/telemetry.md                         | 106 +++++++++---------
 14 files changed, 144 insertions(+), 137 deletions(-)

diff --git a/docs/src/CODE_OF_CONDUCT.md b/docs/src/CODE_OF_CONDUCT.md
index bc1d5522a0..10cd92c53a 100644
--- a/docs/src/CODE_OF_CONDUCT.md
+++ b/docs/src/CODE_OF_CONDUCT.md
@@ -17,23 +17,23 @@ diverse, inclusive, and healthy community.
 Examples of behavior that contributes to a positive environment for our
 community include:
 
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our mistakes,
   and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
+- Focusing on what is best not just for us as individuals, but for the
   overall community
 
 Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery, and sexual attention or
+- The use of sexualized language or imagery, and sexual attention or
   advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
+- Trolling, insulting or derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email
   address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
+- Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
 ## Enforcement Responsibilities
@@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
 ### 4. Permanent Ban
 
 **Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
+standards, including sustained inappropriate behavior, harassment of an
 individual, or aggression toward or disparagement of classes of individuals.
 
 **Consequence**: A permanent ban from any sort of public interaction within
diff --git a/docs/src/configuring_zed.md b/docs/src/configuring_zed.md
index 6b65d0a137..173fab8d69 100644
--- a/docs/src/configuring_zed.md
+++ b/docs/src/configuring_zed.md
@@ -2,7 +2,7 @@
 
 ## Folder-specific settings
 
-Folder-specific settings are used to override Zed's global settings for files within a specific directory in the project panel.  To get started, create a `.zed` subdirectory and add a `settings.json` within it.  It should be noted that folder-specific settings don't need to live only a project's root, but can be defined at multiple levels in the project hierarchy.  In setups like this, Zed will find the configuration nearest to the file you are working in and apply those settings to it.  In most cases, this level of flexibility won't be needed and a single configuration for all files in a project is all that is required; the `Zed > Settings > Open Local Settings` menu action is built for this case.  Running this action will look for a `.zed/settings.json` file at the root of the first top-level directory in your project panel.  If it does not exist, it will create it.
+Folder-specific settings are used to override Zed's global settings for files within a specific directory in the project panel. To get started, create a `.zed` subdirectory and add a `settings.json` within it. It should be noted that folder-specific settings don't need to live only a project's root, but can be defined at multiple levels in the project hierarchy. In setups like this, Zed will find the configuration nearest to the file you are working in and apply those settings to it. In most cases, this level of flexibility won't be needed and a single configuration for all files in a project is all that is required; the `Zed > Settings > Open Local Settings` menu action is built for this case. Running this action will look for a `.zed/settings.json` file at the root of the first top-level directory in your project panel. If it does not exist, it will create it.
 
 The following global settings can be overridden with a folder-specific configuration:
 
@@ -20,7 +20,7 @@ The following global settings can be overridden with a folder-specific configura
 - `show_copilot_suggestions`
 - `show_whitespaces`
 
-*See the Global settings section for details about these settings*
+_See the Global settings section for details about these settings_
 
 ## Global settings
 
@@ -110,7 +110,7 @@ The name of any font family installed on the user's system
 
 **Options**
 
-Zed supports a subset of OpenType features that can be enabled or disabled for a given buffer or terminal font.  The following [OpenType features](https://en.wikipedia.org/wiki/List_of_typographic_features) can be enabled or disabled too: `calt`, `case`, `cpsp`, `frac`, `liga`, `onum`, `ordn`, `pnum`, `ss01`, `ss02`, `ss03`, `ss04`, `ss05`, `ss06`, `ss07`, `ss08`, `ss09`, `ss10`, `ss11`, `ss12`, `ss13`, `ss14`, `ss15`, `ss16`, `ss17`, `ss18`, `ss19`, `ss20`, `subs`, `sups`, `swsh`, `titl`, `tnum`, `zero`.
+Zed supports a subset of OpenType features that can be enabled or disabled for a given buffer or terminal font. The following [OpenType features](https://en.wikipedia.org/wiki/List_of_typographic_features) can be enabled or disabled too: `calt`, `case`, `cpsp`, `frac`, `liga`, `onum`, `ordn`, `pnum`, `ss01`, `ss02`, `ss03`, `ss04`, `ss05`, `ss06`, `ss07`, `ss08`, `ss09`, `ss10`, `ss11`, `ss12`, `ss13`, `ss14`, `ss15`, `ss16`, `ss17`, `ss18`, `ss19`, `ss20`, `subs`, `sups`, `swsh`, `titl`, `tnum`, `zero`.
 
 For example, to disable ligatures for a given font you can add the following to your settings:
 
@@ -1005,6 +1005,7 @@ Run the `theme selector: toggle` action in the command palette to see a current
 ```
 
 ### Default Width
+
 - Description: Customise default width taken by project panel
 - Setting: `default_width`
 - Default: N/A width in pixels (eg: 420)
diff --git a/docs/src/configuring_zed__configuring_vim.md b/docs/src/configuring_zed__configuring_vim.md
index 01d1607cac..69388f9c0b 100644
--- a/docs/src/configuring_zed__configuring_vim.md
+++ b/docs/src/configuring_zed__configuring_vim.md
@@ -2,15 +2,18 @@
 
 Zed includes a vim emulation layer known as “vim mode”. This document aims to describe how it works, and how to make the most out of it.
 
-### Philosophy
+## Philosophy
+
 Vim mode in Zed is supposed to primarily "do what you expect": it mostly tries to copy vim exactly, but will use Zed-specific functionality when available to make things smoother.
 
 This means Zed will never be 100% vim compatible, but should be 100% vim familiar! We expect that our vim mode already copes with 90% of your workflow, and we'd like to keep improving it. If you find things that you can’t yet do in vim mode, but which you rely on in your current workflow, please leave feedback in the editor itself (`:feedback`), or [file an issue](https://github.com/zed-industries/zed/issues).
 
-### Zed-specific features
+## Zed-specific features
+
 Zed is built on a modern foundation that (among other things) uses tree-sitter to understand the content of the file you're editing, and supports multiple cursors out of the box.
 
 Vim mode has several "core Zed" key bindings, that will help you make the most of Zed's specific feature set.
+
 ```
 # Normal mode
 g d   Go to definition
@@ -45,8 +48,9 @@ Vim mode emulates visual block mode using Zed's multiple cursor support. This ag
 
 Finally, Vim mode's search and replace functionality is backed by Zed's. This means that the pattern syntax is slightly different, see the section on [Regex differences](#regex-differences) for details.
 
-### Custom key bindings
-Zed does not yet have an equivalent to vim’s `map` command to convert one set of keystrokes into another, however you can bind any sequence of keys to fire any Action documented in the  [Key bindings documentation](https://docs.zed.dev/configuration/key-bindings).
+## Custom key bindings
+
+Zed does not yet have an equivalent to vim’s `map` command to convert one set of keystrokes into another, however you can bind any sequence of keys to fire any Action documented in the [Key bindings documentation](https://docs.zed.dev/configuration/key-bindings).
 
 You can edit your personal key bindings with `:keymap`.
 For vim-specific shortcuts, you may find the following template a good place to start:
@@ -84,7 +88,7 @@ You can see the bindings that are enabled by default in vim mode [here](https://
 
 The details of the context are a little out of scope for this doc, but suffice to say that `menu` is true when a menu is open (e.g. the completions menu), `VimWaiting` is true after you type `f` or `t` when we’re waiting for a new key (and you probably don’t want bindings to happen). Please reach out on [GitHub](https://github.com/zed-industries/zed) if you want help making a key bindings work.
 
-### Command palette
+## Command palette
 
 Vim mode allows you to enable Zed’s command palette with `:`. This means that you can use vim's command palette to run any action that Zed supports.
 
@@ -95,6 +99,7 @@ We do not (yet) emulate the full power of vim’s command line, in particular we
 As mentioned above, one thing to be aware of is that the regex engine is slightly different from vim's in `:%s/a/b`.
 
 Currently supported vim-specific commands (as of Zed 0.106):
+
 ```
 # window management
 :w[rite][!], :wq[!], :q[uit][!], :wa[ll][!], :wqa[ll][!], :qa[ll][!], :[e]x[it][!], :up[date]
@@ -139,9 +144,10 @@ Currently supported vim-specific commands (as of Zed 0.106):
     to sort the current selection (with i, case-insensitively)
 ```
 
+## Related settings
 
-### Related settings
 There are a few Zed settings that you may also enjoy if you use vim mode:
+
 ```json
 {
   // disable cursor blink
@@ -149,21 +155,22 @@ There are a few Zed settings that you may also enjoy if you use vim mode:
   // use relative line numbers
   "relative_line_numbers": true,
   // hide the scroll bar
-  "scrollbar": {"show": "never"}
+  "scrollbar": { "show": "never" }
 }
 ```
 
-### Regex differences
+## Regex differences
 
 Zed uses a different regular expression engine from Vim. This means that you will have to use a different syntax for some things.
 
 Notably:
-* Vim uses `\(` and `\)` to represent capture groups, in Zed these are `(` and `)`.
-* On the flip side, `(` and `)` represent literal parentheses, but in Zed these must be escaped to `\(` and `\)`.
-* When replacing, Vim uses `\0` to represent the entire match, in Zed this is `$0`, same for numbered capture groups `\1` -> `$1`.
-* Vim uses `\<` and `\>` to represent word boundaries, in Zed these are both handled by `\b`
-* Vim uses `/g` to indicate "all matches on one line", in Zed this is implied
-* Vim uses `/i` to indicate "case-insensitive", in Zed you can either use `(?i)` at the start of the pattern or toggle case-sensitivity with `cmd-option-c`.
+
+- Vim uses `\(` and `\)` to represent capture groups, in Zed these are `(` and `)`.
+- On the flip side, `(` and `)` represent literal parentheses, but in Zed these must be escaped to `\(` and `\)`.
+- When replacing, Vim uses `\0` to represent the entire match, in Zed this is `$0`, same for numbered capture groups `\1` -> `$1`.
+- Vim uses `\<` and `\>` to represent word boundaries, in Zed these are both handled by `\b`
+- Vim uses `/g` to indicate "all matches on one line", in Zed this is implied
+- Vim uses `/i` to indicate "case-insensitive", in Zed you can either use `(?i)` at the start of the pattern or toggle case-sensitivity with `cmd-option-c`.
 
 To help with the transition, the command palette will fix parentheses and replace groups for you when you run `:%s//`. So `%s:/\(a\)(b)/\1/` will be converted into a search for "(a)\(b\)" and a replacement of "$1".
 
diff --git a/docs/src/configuring_zed__key_bindings.md b/docs/src/configuring_zed__key_bindings.md
index 34d3699944..27728e9761 100644
--- a/docs/src/configuring_zed__key_bindings.md
+++ b/docs/src/configuring_zed__key_bindings.md
@@ -1,16 +1,16 @@
 Zed can be configured via a simple JSON file located at `~/.config/zed/keymap.json`.
 
-### Predefined keymaps
+## Predefined keymaps
 
 We have a growing collection of pre-defined keymaps in [zed repository's keymaps folder](https://github.com/zed-industries/zed/tree/main/assets/keymaps).
 
-### Custom key bindings
+## Custom key bindings
 
-#### Accessing custom key bindings
+### Accessing custom key bindings
 
 You can open `keymap.json` via `⌘` + `K`, `⌘` + `S`, the command palette, or the `Zed > Settings > Open Key Bindings` application menu item.
 
-#### Adding a custom key binding
+### Adding a custom key binding
 
 To customize key bindings, specify a context and the list of bindings to set. Re-mapping an existing binding will clobber the existing binding in favor of the custom one.
 
@@ -33,9 +33,9 @@ You can see more examples in Zed's [`default.json`](https://zed.dev/ref/default.
 
 _There are some key bindings that can't be overridden; we are working on an issue surrounding this._
 
-### All key bindings
+## All key bindings
 
-#### Global
+### Global
 
 | **Command**                      | **Target**     | **Default Shortcut**          |
 | -------------------------------- | -------------- | ----------------------------- |
@@ -97,7 +97,7 @@ _There are some key bindings that can't be overridden; we are working on an issu
 | Reset buffer font size           | Zed            | `⌘` + `0`                     |
 | Toggle full screen               | Zed            | `Control` + `⌘` + `F`         |
 
-#### Editor
+### Editor
 
 | **Command**                      | **Target** | **Default Shortcut**                  |
 | -------------------------------- | ---------- | ------------------------------------- |
@@ -240,7 +240,7 @@ _There are some key bindings that can't be overridden; we are working on an issu
 | Undo selection                   | Editor     | `⌘` + `U`                             |
 | Unfold lines                     | Editor     | `Alt` + `⌘` + `]`                     |
 
-#### Editor (Full Only)
+### Editor (Full Only)
 
 | **Command**         | **Target**    | **Default Shortcut**    |
 | ------------------- | ------------- | ----------------------- |
@@ -258,14 +258,14 @@ _There are some key bindings that can't be overridden; we are working on an issu
 | Toggle              | Go To Line    | `Control` + `G`         |
 | Toggle              | Outline       | `⌘` + `Shift` + `O`     |
 
-#### Editor (Auto Height Only)
+### Editor (Auto Height Only)
 
 | **Command**   | **Target** | **Default Shortcut**          |
 | ------------- | ---------- | ----------------------------- |
 | Newline       | Editor     | `Control` + `Enter`           |
 | Newline below | Editor     | `Control` + `Shift` + `Enter` |
 
-#### Pane
+### Pane
 
 | **Command**            | **Target**     | **Default Shortcut** |
 | ---------------------- | -------------- | -------------------- |
@@ -300,7 +300,7 @@ _There are some key bindings that can't be overridden; we are working on an issu
 | Toggle replace         | Search         | `⌘` + `Shift` + `H`  |
 | Toggle whole word      | Search         | `Alt` + `⌘` + `W`    |
 
-#### Buffer Search Bar
+### Buffer Search Bar
 
 | **Command**            | **Target**    | **Default Shortcut** |
 | ---------------------- | ------------- | -------------------- |
@@ -315,7 +315,7 @@ _There are some key bindings that can't be overridden; we are working on an issu
 | Select next match      | Search        | `Enter`              |
 | Select prev match      | Search        | `Shift` + `Enter`    |
 
-#### Workspace
+### Workspace
 
 | **Command**        | **Target**        | **Default Shortcut** |
 | ------------------ | ----------------- | -------------------- |
@@ -344,7 +344,7 @@ _There are some key bindings that can't be overridden; we are working on an issu
 | Toggle right dock  | Workspace         | `⌘` + `R`            |
 | Open keymap        | Zed               | `⌘` + `K`, `⌘` + `S` |
 
-#### Project Panel
+### Project Panel
 
 | **Command**             | **Target**    | **Default Shortcut**        |
 | ----------------------- | ------------- | --------------------------- |
@@ -364,7 +364,7 @@ _There are some key bindings that can't be overridden; we are working on an issu
 | Rename                  | Project Panel | `F2`                        |
 | Reveal in finder        | Project Panel | `Alt` + `⌘` + `R`           |
 
-#### Project Search Bar
+### Project Search Bar
 
 | **Command**            | **Target**     | **Default Shortcut** |
 | ---------------------- | -------------- | -------------------- |
@@ -380,7 +380,7 @@ _There are some key bindings that can't be overridden; we are working on an issu
 | Replace next           | Search         | `Enter`              |
 | Toggle replace         | Search         | `⌘` + `Shift` + `H`  |
 
-#### Terminal
+### Terminal
 
 | **Command**                 | **Target** | **Default Shortcut**      |
 | --------------------------- | ---------- | ------------------------- |
@@ -394,7 +394,7 @@ _There are some key bindings that can't be overridden; we are working on an issu
 | Paste                       | Terminal   | `⌘` + `V`                 |
 | Show character palette      | Terminal   | `Control` + `⌘` + `Space` |
 
-#### Assistant Editor
+### Assistant Editor
 
 | **Command**        | **Target** | **Default Shortcut** |
 | ------------------ | ---------- | -------------------- |
diff --git a/docs/src/developing_zed__adding_languages.md b/docs/src/developing_zed__adding_languages.md
index 7fce7e8544..28ffd714b2 100644
--- a/docs/src/developing_zed__adding_languages.md
+++ b/docs/src/developing_zed__adding_languages.md
@@ -18,10 +18,10 @@ We use tree-sitter queries to match certain properties to highlight.
 
 ```ts
 const font: FontFamily = {
-    weight: "normal",
-    underline: false,
-    italic: false,
-}
+  weight: "normal",
+  underline: false,
+  italic: false,
+};
 ```
 
 Match a property identifier and highlight it using the identifier `@property`. In the above example, `weight`, `underline`, and `italic` would be highlighted.
@@ -40,7 +40,7 @@ Match a property identifier and highlight it using the identifier `@property`. I
 
 ```ts
 function buildDefaultSyntax(colorScheme: Theme): Partial<Syntax> {
-    // ...
+  // ...
 }
 ```
 
diff --git a/docs/src/developing_zed__building_zed.md b/docs/src/developing_zed__building_zed.md
index 6aecc3ad4c..ba648f7d2d 100644
--- a/docs/src/developing_zed__building_zed.md
+++ b/docs/src/developing_zed__building_zed.md
@@ -15,21 +15,21 @@ git submodule update --init --recursive
 
 - Install [Xcode command line tools](https://developer.apple.com/xcode/resources/)
 
-    ```bash
-    xcode-select --install
-    ```
+  ```bash
+  xcode-select --install
+  ```
 
 - Ensure that the Xcode command line tools are using your newly installed copy of Xcode:
 
-    ```
-    sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer
-    ```
+  ```
+  sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer
+  ```
 
 * Install the Rust wasm toolchain:
 
-    ```bash
-    rustup target add wasm32-wasi
-    ```
+  ```bash
+  rustup target add wasm32-wasi
+  ```
 
 ## Backend Dependencies
 
@@ -38,9 +38,9 @@ If you are developing collaborative features of Zed, you'll need to install the
 - Install [Postgres](https://postgresapp.com)
 - Install [Livekit](https://formulae.brew.sh/formula/livekit) and [Foreman](https://formulae.brew.sh/formula/foreman)
 
-    ```bash
-    brew install livekit foreman
-    ```
+  ```bash
+  brew install livekit foreman
+  ```
 
 ## Building Zed from Source
 
diff --git a/docs/src/developing_zed__local_collaboration.md b/docs/src/developing_zed__local_collaboration.md
index 15fe396911..7477c64be5 100644
--- a/docs/src/developing_zed__local_collaboration.md
+++ b/docs/src/developing_zed__local_collaboration.md
@@ -12,7 +12,7 @@ script/bootstrap
 
 This script will set up the `zed` Postgres database, and populate it with some users. It requires internet access, because it fetches some users from the GitHub API.
 
-The script will create several *admin* users, who you'll sign in as by default when developing locally. The GitHub logins for these default admin users are specified in this file:
+The script will create several _admin_ users, who you'll sign in as by default when developing locally. The GitHub logins for these default admin users are specified in this file:
 
 ```
 cat crates/collab/.admins.default.json
diff --git a/docs/src/feedback.md b/docs/src/feedback.md
index b7424817d2..50f8c9266a 100644
--- a/docs/src/feedback.md
+++ b/docs/src/feedback.md
@@ -1,29 +1,29 @@
 # Giving feedback
 
-### Zed repository
+## Zed repository
 
 We track our issues at [`zed-industries/zed`](https://github.com/zed-industries/zed/issues).
 
-#### Feature requests
+### Feature requests
 
 Try to focus on the things that are most critical to you rather than exhaustively listing all features another editor you have used has.
 
 Command palette: `request feature`
 
-#### Bug reports
+### Bug reports
 
 Try to add as much detail as possible, if it is not obvious to reproduce. Let us know how severe the problem is for you; is the issue more of a minor inconvenience or something that would prevent you from using Zed?
 
 Command palette: `file bug report`
 
-### In-app feedback
+## In-app feedback
 
 Anonymous feedback can be submitted from within Zed via the feedback editor (command palette: `give feedback`).
 
-### Zed forum
+## Zed forum
 
 Use the [Zed forum](https://github.com/zed-industries/zed/discussions) to ask questions and learn from one another. We will be present in the forum and answering questions as well.
 
-### Email
+## Email
 
 If you prefer to write up your thoughts as an email, you can send them to [hi@zed.dev](mailto:hi@zed.dev).
diff --git a/docs/src/getting_started.md b/docs/src/getting_started.md
index 0a6643d75d..f1fbdd163d 100644
--- a/docs/src/getting_started.md
+++ b/docs/src/getting_started.md
@@ -2,14 +2,14 @@
 
 Welcome to Zed! We are excited to have you. Here is a jumping-off point to getting started.
 
-### Download Zed
+## Download Zed
 
 You can obtain the release build via the [download page](https://zed.dev/download). After the first manual installation, Zed will periodically check for and install updates automatically for you.
 
-### Configure Zed
+## Configure Zed
 
 Use `⌘` + `,` to open your custom settings to set things like fonts, formatting settings, per-language settings and more. You can access the default configuration using the `Zed > Settings > Open Default Settings` menu item. See Configuring Zed for all available settings.
 
-### Set up your key bindings
+## Set up your key bindings
 
 You can access the default key binding set using the `Zed > Settings > Open Default Key Bindings` menu item. Use `⌘` + `K`, `⌘` + `S` to open your custom keymap to add your own key bindings. See Key Bindings for more info.
diff --git a/docs/src/languages/elixir.md b/docs/src/languages/elixir.md
index 078bc50e2c..72832c18d1 100644
--- a/docs/src/languages/elixir.md
+++ b/docs/src/languages/elixir.md
@@ -20,12 +20,12 @@ brew install elixir-ls
 3. Restart Zed
 
 {% hint style="warning" %}
-If `elixir-ls` is not running in an elixir project, check the error log via the command palette action `zed: open log`.  If you find an error message mentioning: `invalid LSP message header "Shall I install Hex? (if running non-interactively, use \"mix local.hex --force\") [Yn]`, you might need to install [`Hex`](https://hex.pm). You run `elixir-ls` from the command line and accept the prompt to install `Hex`.
+If `elixir-ls` is not running in an elixir project, check the error log via the command palette action `zed: open log`. If you find an error message mentioning: `invalid LSP message header "Shall I install Hex? (if running non-interactively, use \"mix local.hex --force\") [Yn]`, you might need to install [`Hex`](https://hex.pm). You run `elixir-ls` from the command line and accept the prompt to install `Hex`.
 {% endhint %}
 
 ### Formatting with Mix
 
-If you prefer to format your code with [Mix](https://hexdocs.pm/mix/Mix.html), use the following snippet in your `settings.json` file to configure it as an external formatter.  Formatting will occur on file save.
+If you prefer to format your code with [Mix](https://hexdocs.pm/mix/Mix.html), use the following snippet in your `settings.json` file to configure it as an external formatter. Formatting will occur on file save.
 
 ```json
 {
diff --git a/docs/src/languages/python.md b/docs/src/languages/python.md
index 6f40b7c62c..9c2da16e38 100644
--- a/docs/src/languages/python.md
+++ b/docs/src/languages/python.md
@@ -17,8 +17,8 @@ By default, the Pyright language server will look for Python packages in the def
 
 To do this, create a JSON file called `pyrightconfig.json` at the root of your project. This file must include two keys:
 
-* `venvPath`: a relative path from your project directory to any directory that _contains_ one or more virtual environment directories
-* `venv`: the name of a virtual environment directory
+- `venvPath`: a relative path from your project directory to any directory that _contains_ one or more virtual environment directories
+- `venv`: the name of a virtual environment directory
 
 For example, a common approach is to create a virtual environment directory called `.venv` at the root of your project directory with the following commands:
 
@@ -40,7 +40,7 @@ Having done that, you would create a `pyrightconfig.json` with the following con
 
 ### Code formatting
 
-The Pyright language server does not provide code formatting. If you want to automatically reformat your Python code when saving, you'll need to specify an _external_code formatter in your settings. See the [configuration](../configuration/configuring-zed.md) documentation for more information.
+The Pyright language server does not provide code formatting. If you want to automatically reformat your Python code when saving, you'll need to specify an \_external_code formatter in your settings. See the [configuration](../configuration/configuring-zed.md) documentation for more information.
 
 A common tool for formatting python code is [Black](https://black.readthedocs.io/en/stable/). If you have Black installed globally, you can use it to format Python files by adding the following to your `settings.json`:
 
diff --git a/docs/src/languages/ruby.md b/docs/src/languages/ruby.md
index f785e26656..6bd8b1ac44 100644
--- a/docs/src/languages/ruby.md
+++ b/docs/src/languages/ruby.md
@@ -23,14 +23,14 @@ Solargraph has formatting and diagnostics disabled by default. We can tell Zed t
 
 ```json
 {
-   "lsp": {
-      "solargraph": {
-         "initialization_options": {
-            "diagnostics": true,
-            "formatting": true
-         }
+  "lsp": {
+    "solargraph": {
+      "initialization_options": {
+        "diagnostics": true,
+        "formatting": true
       }
-   }
+    }
+  }
 }
 ```
 
diff --git a/docs/src/languages/toml.md b/docs/src/languages/toml.md
index 23826c3489..7b923ca507 100644
--- a/docs/src/languages/toml.md
+++ b/docs/src/languages/toml.md
@@ -1,5 +1,4 @@
 # TOML
 
-
 - Tree Sitter: [tree-sitter-toml](https://github.com/tree-sitter/tree-sitter-toml)
 - Language Server: [taplo](https://taplo.tamasfe.dev)
diff --git a/docs/src/telemetry.md b/docs/src/telemetry.md
index 966424dd48..c14cbea04d 100644
--- a/docs/src/telemetry.md
+++ b/docs/src/telemetry.md
@@ -30,14 +30,14 @@ When a panic occurs, the following data is sent:
 - `thread`: The name of the thread that panicked
 - `payload`: The panic message
 - `location_data`: The location of the panic
-    - `file`
-    - `line`
+  - `file`
+  - `line`
 - `backtrace`: The backtrace of the panic
 - `app_version`: Zed's app version
 - `release_channel`: Zed's release channel
-    - `stable`
-    - `preview`
-    - `dev`
+  - `stable`
+  - `preview`
+  - `dev`
 - `os_name`: The name of your operating system
 - `os_version`: The version of your operating system
 - `architecture`: The architecture of your CPU
@@ -62,9 +62,9 @@ The following data is sent:
 - `os_version`: The version of your operating system
 - `architecture`: The architecture of your CPU
 - `release_channel`: Zed's release channel
-    - `stable`
-    - `preview`
-    - `dev`
+  - `stable`
+  - `preview`
+  - `dev`
 - `events`: A vector of `ClickhouseEventWrapper`s
 
 #### ClickhouseEventWrapper
@@ -75,57 +75,57 @@ The following data is sent:
 #### ClickhouseEvent
 
 - `editor`
-    - `operation`: The editor operation that was performed
-        - `open`
-        - `save`
-    - `file_extension`: The extension of the file that was opened or saved
-    - `vim_mode`: A boolean that indicates whether the user is in vim mode or not
-    - `copilot_enabled`: A boolean that indicates whether the user has copilot enabled or not
-    - `copilot_enabled_for_language`: A boolean that indicates whether the user has copilot enabled for the language of the file that was opened or saved
-    - `milliseconds_since_first_event`: Duration of time between this event's timestamp and the timestamp of the first event in the current batch
+  - `operation`: The editor operation that was performed
+    - `open`
+    - `save`
+  - `file_extension`: The extension of the file that was opened or saved
+  - `vim_mode`: A boolean that indicates whether the user is in vim mode or not
+  - `copilot_enabled`: A boolean that indicates whether the user has copilot enabled or not
+  - `copilot_enabled_for_language`: A boolean that indicates whether the user has copilot enabled for the language of the file that was opened or saved
+  - `milliseconds_since_first_event`: Duration of time between this event's timestamp and the timestamp of the first event in the current batch
 - `copilot`
-    - `suggestion_id`: The ID of the suggestion
-    - `suggestion_accepted`: A boolean that indicates whether the suggestion was accepted or not
-    - `file_extension`: The file extension of the file that was opened or saved
-    - `milliseconds_since_first_event`: Same as above
+  - `suggestion_id`: The ID of the suggestion
+  - `suggestion_accepted`: A boolean that indicates whether the suggestion was accepted or not
+  - `file_extension`: The file extension of the file that was opened or saved
+  - `milliseconds_since_first_event`: Same as above
 - `call`
-    - `operation`: The call operation that was performed
-        - `accept incoming`
-        - `decline incoming`
-        - `disable microphone`
-        - `disable screen share`
-        - `enable microphone`
-        - `enable screen share`
-        - `hang up`
-        - `invite`
-        - `join channel`
-        - `open channel notes`
-        - `share project`
-        - `unshare project`
-    - `room_id`: The ID of the room
-    - `channel_id`: The ID of the channel
-    - `milliseconds_since_first_event`: Same as above
+  - `operation`: The call operation that was performed
+    - `accept incoming`
+    - `decline incoming`
+    - `disable microphone`
+    - `disable screen share`
+    - `enable microphone`
+    - `enable screen share`
+    - `hang up`
+    - `invite`
+    - `join channel`
+    - `open channel notes`
+    - `share project`
+    - `unshare project`
+  - `room_id`: The ID of the room
+  - `channel_id`: The ID of the channel
+  - `milliseconds_since_first_event`: Same as above
 - `assistant`
-    - `conversation_id`: The ID of the conversation (for panel events only)
-    - `kind`: An enum with the following variants:
-        - `panel`
-        - `inline`
-    - `model`: The model that was used
-    - `milliseconds_since_first_event`: Same as above
+  - `conversation_id`: The ID of the conversation (for panel events only)
+  - `kind`: An enum with the following variants:
+    - `panel`
+    - `inline`
+  - `model`: The model that was used
+  - `milliseconds_since_first_event`: Same as above
 - `cpu`
-    - `usage_as_percentage`: The CPU usage
-    - `core_count`: The number of cores on the CPU
-    - `milliseconds_since_first_event`: Same as above
+  - `usage_as_percentage`: The CPU usage
+  - `core_count`: The number of cores on the CPU
+  - `milliseconds_since_first_event`: Same as above
 - `memory`
-    - `memory_in_bytes`: The amount of memory used in bytes
-    - `virtual_memory_in_bytes`: The amount of virtual memory used in bytes
-    - `milliseconds_since_first_event`: Same as above
+  - `memory_in_bytes`: The amount of memory used in bytes
+  - `virtual_memory_in_bytes`: The amount of virtual memory used in bytes
+  - `milliseconds_since_first_event`: Same as above
 - `app`
-    - `operation`: The app operation that was performed
-        - `first open`
-        - `open`
-        - `close`
-    - `milliseconds_since_first_event`: Same as above
+  - `operation`: The app operation that was performed
+    - `first open`
+    - `open`
+    - `close`
+  - `milliseconds_since_first_event`: Same as above
 
 You can audit the metrics data that Zed has reported by running the command `zed: open telemetry log` from the command palette, or clicking `Help > View Telemetry Log` in the application menu.
 

From b7ced3943e6fe69068a00b32010052562d6e35a1 Mon Sep 17 00:00:00 2001
From: d1y <chenhonzhou@gmail.com>
Date: Thu, 1 Feb 2024 01:41:19 +0800
Subject: [PATCH 102/372] Add highlighting for git_commit (#7147)

https://github.com/zed-industries/zed/assets/45585937/32cf5622-e960-4775-986d-bcfd30c81098

Release Notes:

- Added highlighting for git_commit
---
 Cargo.lock                                    | 10 ++++++
 Cargo.toml                                    |  1 +
 crates/zed/Cargo.toml                         |  1 +
 crates/zed/src/languages.rs                   |  2 +-
 .../zed/src/languages/gitcommit/config.toml   | 11 ++++++
 .../src/languages/gitcommit/highlights.scm    | 34 +++++++++++++++++++
 .../src/languages/gitcommit/injections.scm    |  8 +++++
 7 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 crates/zed/src/languages/gitcommit/config.toml
 create mode 100644 crates/zed/src/languages/gitcommit/highlights.scm
 create mode 100644 crates/zed/src/languages/gitcommit/injections.scm

diff --git a/Cargo.lock b/Cargo.lock
index ae9cf8525d..3774dc4751 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8764,6 +8764,15 @@ dependencies = [
  "tree-sitter",
 ]
 
+[[package]]
+name = "tree-sitter-gitcommit"
+version = "0.3.3"
+source = "git+https://github.com/gbprod/tree-sitter-gitcommit#e8d9eda4e5ea0b08aa39d48dab0f6553058fbe0f"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
 [[package]]
 name = "tree-sitter-gleam"
 version = "0.34.0"
@@ -10323,6 +10332,7 @@ dependencies = [
  "tree-sitter-elixir",
  "tree-sitter-elm",
  "tree-sitter-embedded-template",
+ "tree-sitter-gitcommit",
  "tree-sitter-gleam",
  "tree-sitter-glsl",
  "tree-sitter-go",
diff --git a/Cargo.toml b/Cargo.toml
index ffb1ef5328..d312c27abd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -140,6 +140,7 @@ tree-sitter-css = { git = "https://github.com/tree-sitter/tree-sitter-css", rev
 tree-sitter-elixir = { git = "https://github.com/elixir-lang/tree-sitter-elixir", rev = "a2861e88a730287a60c11ea9299c033c7d076e30" }
 tree-sitter-elm = { git = "https://github.com/elm-tooling/tree-sitter-elm", rev = "692c50c0b961364c40299e73c1306aecb5d20f40" }
 tree-sitter-embedded-template = "0.20.0"
+tree-sitter-gitcommit = { git = "https://github.com/gbprod/tree-sitter-gitcommit" }
 tree-sitter-gleam = { git = "https://github.com/gleam-lang/tree-sitter-gleam", rev = "58b7cac8fc14c92b0677c542610d8738c373fa81" }
 tree-sitter-glsl = { git = "https://github.com/theHamsta/tree-sitter-glsl", rev = "2a56fb7bc8bb03a1892b4741279dd0a8758b7fb3" }
 tree-sitter-go = { git = "https://github.com/tree-sitter/tree-sitter-go", rev = "aeb2f33b366fd78d5789ff104956ce23508b85db" }
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index c57c27b854..c27f963bd1 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -112,6 +112,7 @@ tree-sitter-css.workspace = true
 tree-sitter-elixir.workspace = true
 tree-sitter-elm.workspace = true
 tree-sitter-embedded-template.workspace = true
+tree-sitter-gitcommit.workspace = true
 tree-sitter-gleam.workspace = true
 tree-sitter-glsl.workspace = true
 tree-sitter-go.workspace = true
diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index 92682d590a..8fcb27a5ce 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -112,7 +112,7 @@ pub fn init(
             })],
         ),
     }
-
+    language("gitcommit", tree_sitter_gitcommit::language(), vec![]);
     language(
         "gleam",
         tree_sitter_gleam::language(),
diff --git a/crates/zed/src/languages/gitcommit/config.toml b/crates/zed/src/languages/gitcommit/config.toml
new file mode 100644
index 0000000000..25eb2425df
--- /dev/null
+++ b/crates/zed/src/languages/gitcommit/config.toml
@@ -0,0 +1,11 @@
+name = "Git commit"
+path_suffixes = [
+  # Refer to https://github.com/neovim/neovim/blob/master/runtime/lua/vim/filetype.lua#L1286-L1290
+  "TAG_EDITMSG",
+  "MERGE_MSG",
+  "COMMIT_EDITMSG",
+  "NOTES_EDITMSG",
+  "EDIT_DESCRIPTION",
+]
+line_comments = ["#"]
+brackets = []
diff --git a/crates/zed/src/languages/gitcommit/highlights.scm b/crates/zed/src/languages/gitcommit/highlights.scm
new file mode 100644
index 0000000000..a8a3352057
--- /dev/null
+++ b/crates/zed/src/languages/gitcommit/highlights.scm
@@ -0,0 +1,34 @@
+(comment) @comment
+(generated_comment) @comment
+(title) @text.title
+(text) @text
+(branch) @text.reference
+(change) @keyword
+(filepath) @text.uri
+(arrow) @punctuation.delimiter
+
+(subject) @text.title
+(subject (overflow) @text)
+(prefix (type) @keyword)
+(prefix (scope) @parameter)
+(prefix [
+    "("
+    ")"
+    ":"
+] @punctuation.delimiter)
+(prefix [
+    "!"
+] @punctuation.special)
+
+(message) @text
+
+(trailer (token) @keyword)
+(trailer (value) @text)
+
+(breaking_change (token) @text.warning)
+(breaking_change (value) @text)
+
+(scissor) @comment
+(subject_prefix) @keyword
+
+(ERROR) @error
diff --git a/crates/zed/src/languages/gitcommit/injections.scm b/crates/zed/src/languages/gitcommit/injections.scm
new file mode 100644
index 0000000000..5e516f5a23
--- /dev/null
+++ b/crates/zed/src/languages/gitcommit/injections.scm
@@ -0,0 +1,8 @@
+((diff) @injection.content
+ (#set! injection.combined)
+ (#set! injection.language "diff"))
+
+((rebase_command) @injection.content
+ (#set! injection.combined)
+ (#set! injection.language "git_rebase"))
+

From 59f77d316fb526b312e837d4e1e56f0259de9f4b Mon Sep 17 00:00:00 2001
From: Ares Andrew <ttenx@pm.me>
Date: Thu, 1 Feb 2024 01:50:37 +0800
Subject: [PATCH 103/372] Use mimalloc as default allocator (#7140)

From https://github.com/microsoft/mimalloc:
> In our benchmarks (see
[below](https://github.com/microsoft/mimalloc#performance)), mimalloc
outperforms other leading allocators (jemalloc, tcmalloc, Hoard, etc),
and often uses less memory. A nice property is that it does consistently
well over a wide range of benchmarks. There is also good huge OS page
support for larger server programs.


Release Notes:

- Changed default allocator to mimalloc.
---
 Cargo.lock             | 20 ++++++++++++++++++++
 crates/zed/Cargo.toml  |  1 +
 crates/zed/src/main.rs |  4 ++++
 3 files changed, 25 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index 3774dc4751..0a6d44fc35 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4093,6 +4093,16 @@ version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
 
+[[package]]
+name = "libmimalloc-sys"
+version = "0.1.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "libsqlite3-sys"
 version = "0.26.0"
@@ -4422,6 +4432,15 @@ dependencies = [
  "objc",
 ]
 
+[[package]]
+name = "mimalloc"
+version = "0.1.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c"
+dependencies = [
+ "libmimalloc-sys",
+]
+
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -10285,6 +10304,7 @@ dependencies = [
  "log",
  "lsp",
  "menu",
+ "mimalloc",
  "node_runtime",
  "notifications",
  "num_cpus",
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index c27f963bd1..0b73a44919 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -66,6 +66,7 @@ libc = "0.2"
 log.workspace = true
 lsp = { path = "../lsp" }
 menu = { path = "../menu" }
+mimalloc = "0.1"
 node_runtime = { path = "../node_runtime" }
 notifications = { path = "../notifications" }
 num_cpus = "1.13.0"
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 3e5a1adb6f..97ee6d1c68 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -18,6 +18,7 @@ use language::LanguageRegistry;
 use log::LevelFilter;
 
 use assets::Assets;
+use mimalloc::MiMalloc;
 use node_runtime::RealNodeRuntime;
 use parking_lot::Mutex;
 use release_channel::{parse_zed_link, AppCommitSha, ReleaseChannel, RELEASE_CHANNEL};
@@ -57,6 +58,9 @@ use zed::{
     OpenRequest,
 };
 
+#[global_allocator]
+static GLOBAL: MiMalloc = MiMalloc;
+
 fn main() {
     menu::init();
     zed_actions::init();

From 689d43047d5d175596412698430a17df4a06ce0e Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 31 Jan 2024 11:46:03 -0700
Subject: [PATCH 104/372] Don't panic when collaborating with older Zed
 versions (#7162)

Older Zed versions may send a buffer id of 0, which is no-longer
supported. (as of #6993)

This doesn't fix that, but it does ensure that we don't panic in the
workspace by maintaining the invariant that from_proto_state returns
Some(Task) if the variant matches.

It also converts the panic to an error should something similar happen
again in the future.


Release Notes:

- N/A
---
 crates/editor/src/items.rs        | 16 +++++++---------
 crates/workspace/src/workspace.rs |  6 ++++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index f26c4361b7..d9ea6385cb 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -73,18 +73,16 @@ impl FollowableItem for Editor {
             .iter()
             .map(|excerpt| excerpt.buffer_id)
             .collect::<HashSet<_>>();
-        let buffers = project
-            .update(cx, |project, cx| {
-                buffer_ids
-                    .iter()
-                    .map(|id| BufferId::new(*id).map(|id| project.open_buffer_by_id(id, cx)))
-                    .collect::<Result<Vec<_>>>()
-            })
-            .ok()?;
+        let buffers = project.update(cx, |project, cx| {
+            buffer_ids
+                .iter()
+                .map(|id| BufferId::new(*id).map(|id| project.open_buffer_by_id(id, cx)))
+                .collect::<Result<Vec<_>>>()
+        });
 
         let pane = pane.downgrade();
         Some(cx.spawn(|mut cx| async move {
-            let mut buffers = futures::future::try_join_all(buffers)
+            let mut buffers = futures::future::try_join_all(buffers?)
                 .await
                 .debug_assert_ok("leaders don't share views for unshared buffers")?;
             let editor = pane.update(&mut cx, |pane, cx| {
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 093393944b..177d7384b6 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -2784,8 +2784,10 @@ impl Workspace {
                         item_tasks.push(task);
                         leader_view_ids.push(id);
                         break;
-                    } else {
-                        assert!(variant.is_some());
+                    } else if variant.is_none() {
+                        Err(anyhow!(
+                            "failed to construct view from leader (maybe from a different version of zed?)"
+                        ))?;
                     }
                 }
             }

From ebdabb907a5e286e4bdaff4c2e8486c3ddc75df3 Mon Sep 17 00:00:00 2001
From: Vishal Bhavsar <vbhavsar@gmail.com>
Date: Wed, 31 Jan 2024 13:50:08 -0500
Subject: [PATCH 105/372] vim: Support counts for `H` and `L` motions (#7149)

Release Notes:

- Added support for counts to `H` and `L` motions
([#4941](https://github.com/zed-industries/zed/issues/4941)).
---
 crates/vim/src/motion.rs                     | 59 +++++++++++++++++---
 crates/vim/test_data/test_window_bottom.json |  4 ++
 crates/vim/test_data/test_window_top.json    |  4 ++
 3 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
index 22800b2e9c..944db88a7c 100644
--- a/crates/vim/src/motion.rs
+++ b/crates/vim/src/motion.rs
@@ -513,9 +513,9 @@ impl Motion {
             StartOfLineDownward => (next_line_start(map, point, times - 1), SelectionGoal::None),
             EndOfLineDownward => (next_line_end(map, point, times), SelectionGoal::None),
             GoToColumn => (go_to_column(map, point, times), SelectionGoal::None),
-            WindowTop => window_top(map, point, &text_layout_details),
+            WindowTop => window_top(map, point, &text_layout_details, times - 1),
             WindowMiddle => window_middle(map, point, &text_layout_details),
-            WindowBottom => window_bottom(map, point, &text_layout_details),
+            WindowBottom => window_bottom(map, point, &text_layout_details, times - 1),
         };
 
         (new_point != point || infallible).then_some((new_point, goal))
@@ -1044,11 +1044,24 @@ fn window_top(
     map: &DisplaySnapshot,
     point: DisplayPoint,
     text_layout_details: &TextLayoutDetails,
+    times: usize,
 ) -> (DisplayPoint, SelectionGoal) {
     let first_visible_line = text_layout_details.anchor.to_display_point(map);
-    let new_col = point.column().min(map.line_len(first_visible_line.row()));
-    let new_point = DisplayPoint::new(first_visible_line.row(), new_col);
-    (map.clip_point(new_point, Bias::Left), SelectionGoal::None)
+
+    if let Some(visible_rows) = text_layout_details.visible_rows {
+        let bottom_row = first_visible_line.row() + visible_rows as u32;
+        let new_row = (first_visible_line.row() + (times as u32)).min(bottom_row);
+        let new_col = point.column().min(map.line_len(first_visible_line.row()));
+
+        let new_point = DisplayPoint::new(new_row, new_col);
+        (map.clip_point(new_point, Bias::Left), SelectionGoal::None)
+    } else {
+        let new_row = first_visible_line.row() + (times as u32);
+        let new_col = point.column().min(map.line_len(first_visible_line.row()));
+
+        let new_point = DisplayPoint::new(new_row, new_col);
+        (map.clip_point(new_point, Bias::Left), SelectionGoal::None)
+    }
 }
 
 fn window_middle(
@@ -1072,13 +1085,19 @@ fn window_bottom(
     map: &DisplaySnapshot,
     point: DisplayPoint,
     text_layout_details: &TextLayoutDetails,
+    times: usize,
 ) -> (DisplayPoint, SelectionGoal) {
     if let Some(visible_rows) = text_layout_details.visible_rows {
         let first_visible_line = text_layout_details.anchor.to_display_point(map);
         let bottom_row = first_visible_line.row() + (visible_rows) as u32;
         let bottom_row_capped = bottom_row.min(map.max_buffer_row());
-        let new_col = point.column().min(map.line_len(bottom_row_capped));
-        let new_point = DisplayPoint::new(bottom_row_capped, new_col);
+        let new_row = if bottom_row_capped.saturating_sub(times as u32) < first_visible_line.row() {
+            first_visible_line.row()
+        } else {
+            bottom_row_capped.saturating_sub(times as u32)
+        };
+        let new_col = point.column().min(map.line_len(new_row));
+        let new_point = DisplayPoint::new(new_row, new_col);
         (map.clip_point(new_point, Bias::Left), SelectionGoal::None)
     } else {
         (point, SelectionGoal::None)
@@ -1302,6 +1321,18 @@ mod test {
           7 8 9
           "})
             .await;
+
+        cx.set_shared_state(indoc! {r"
+          1 2 3
+          4 5 ˇ6
+          7 8 9"})
+            .await;
+        cx.simulate_shared_keystrokes(["9", "shift-h"]).await;
+        cx.assert_shared_state(indoc! {r"
+          1 2 3
+          4 5 6
+          7 8 ˇ9"})
+            .await;
     }
 
     #[gpui::test]
@@ -1466,5 +1497,19 @@ mod test {
           7 8 9
           ˇ"})
             .await;
+
+        cx.set_shared_state(indoc! {r"
+          1 2 3
+          4 5 ˇ6
+          7 8 9
+          "})
+            .await;
+        cx.simulate_shared_keystrokes(["9", "shift-l"]).await;
+        cx.assert_shared_state(indoc! {r"
+          1 2 ˇ3
+          4 5 6
+          7 8 9
+          "})
+            .await;
     }
 }
diff --git a/crates/vim/test_data/test_window_bottom.json b/crates/vim/test_data/test_window_bottom.json
index 50400883f2..a4855ccb96 100644
--- a/crates/vim/test_data/test_window_bottom.json
+++ b/crates/vim/test_data/test_window_bottom.json
@@ -13,3 +13,7 @@
 {"Put":{"state":"ˇ1 2 3\n4 5 6\n7 8 9\n"}}
 {"Key":"shift-l"}
 {"Get":{"state":"1 2 3\n4 5 6\n7 8 9\nˇ","mode":"Normal"}}
+{"Put":{"state":"1 2 3\n4 5 ˇ6\n7 8 9\n"}}
+{"Key":"9"}
+{"Key":"shift-l"}
+{"Get":{"state":"1 2 ˇ3\n4 5 6\n7 8 9\n","mode":"Normal"}}
diff --git a/crates/vim/test_data/test_window_top.json b/crates/vim/test_data/test_window_top.json
index 607a26c110..aab6bd6280 100644
--- a/crates/vim/test_data/test_window_top.json
+++ b/crates/vim/test_data/test_window_top.json
@@ -7,3 +7,7 @@
 {"Put":{"state":"1 2 3\n4 5 6\nˇ7 8 9\n"}}
 {"Key":"shift-h"}
 {"Get":{"state":"ˇ1 2 3\n4 5 6\n7 8 9\n","mode":"Normal"}}
+{"Put":{"state":"1 2 3\n4 5 ˇ6\n7 8 9"}}
+{"Key":"9"}
+{"Key":"shift-h"}
+{"Get":{"state":"1 2 3\n4 5 6\n7 8 ˇ9","mode":"Normal"}}

From 5d85801d1fb44f03b8d1e20c87a5531e576486f6 Mon Sep 17 00:00:00 2001
From: d1y <chenhonzhou@gmail.com>
Date: Thu, 1 Feb 2024 03:11:03 +0800
Subject: [PATCH 106/372] Add highlighting for go.work (#7142)

<img width="617" alt="image"
src="https://github.com/zed-industries/zed/assets/45585937/ecb28152-db02-450e-bc81-395abd1c1eef">

Release Notes:

- Added  highlighting for go.work
---
 Cargo.lock                                     | 10 ++++++++++
 Cargo.toml                                     |  1 +
 crates/zed/Cargo.toml                          |  1 +
 crates/zed/src/languages.rs                    |  1 +
 crates/zed/src/languages/gowork/config.toml    |  7 +++++++
 crates/zed/src/languages/gowork/highlights.scm | 14 ++++++++++++++
 6 files changed, 34 insertions(+)
 create mode 100644 crates/zed/src/languages/gowork/config.toml
 create mode 100644 crates/zed/src/languages/gowork/highlights.scm

diff --git a/Cargo.lock b/Cargo.lock
index 0a6d44fc35..cacc3cb91e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8828,6 +8828,15 @@ dependencies = [
  "tree-sitter",
 ]
 
+[[package]]
+name = "tree-sitter-gowork"
+version = "0.0.1"
+source = "git+https://github.com/d1y/tree-sitter-go-work#a2a4b99b53b3740855ff33f0b54cab0bb4ce6f45"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
 [[package]]
 name = "tree-sitter-haskell"
 version = "0.14.0"
@@ -10357,6 +10366,7 @@ dependencies = [
  "tree-sitter-glsl",
  "tree-sitter-go",
  "tree-sitter-gomod",
+ "tree-sitter-gowork",
  "tree-sitter-haskell",
  "tree-sitter-heex",
  "tree-sitter-html",
diff --git a/Cargo.toml b/Cargo.toml
index d312c27abd..a954995ac2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -145,6 +145,7 @@ tree-sitter-gleam = { git = "https://github.com/gleam-lang/tree-sitter-gleam", r
 tree-sitter-glsl = { git = "https://github.com/theHamsta/tree-sitter-glsl", rev = "2a56fb7bc8bb03a1892b4741279dd0a8758b7fb3" }
 tree-sitter-go = { git = "https://github.com/tree-sitter/tree-sitter-go", rev = "aeb2f33b366fd78d5789ff104956ce23508b85db" }
 tree-sitter-gomod = { git = "https://github.com/camdencheek/tree-sitter-go-mod" }
+tree-sitter-gowork = { git = "https://github.com/d1y/tree-sitter-go-work" }
 tree-sitter-haskell = { git = "https://github.com/tree-sitter/tree-sitter-haskell", rev = "cf98de23e4285b8e6bcb57b050ef2326e2cc284b" }
 tree-sitter-heex = { git = "https://github.com/phoenixframework/tree-sitter-heex", rev = "2e1348c3cf2c9323e87c2744796cf3f3868aa82a" }
 tree-sitter-html = "0.19.0"
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 0b73a44919..d668aa30c6 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -118,6 +118,7 @@ tree-sitter-gleam.workspace = true
 tree-sitter-glsl.workspace = true
 tree-sitter-go.workspace = true
 tree-sitter-gomod.workspace = true
+tree-sitter-gowork.workspace = true
 tree-sitter-haskell.workspace = true
 tree-sitter-heex.workspace = true
 tree-sitter-html.workspace = true
diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index 8fcb27a5ce..64bec543c2 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -124,6 +124,7 @@ pub fn init(
         vec![Arc::new(go::GoLspAdapter)],
     );
     language("gomod", tree_sitter_gomod::language(), vec![]);
+    language("gowork", tree_sitter_gowork::language(), vec![]);
     language(
         "zig",
         tree_sitter_zig::language(),
diff --git a/crates/zed/src/languages/gowork/config.toml b/crates/zed/src/languages/gowork/config.toml
new file mode 100644
index 0000000000..919f1db512
--- /dev/null
+++ b/crates/zed/src/languages/gowork/config.toml
@@ -0,0 +1,7 @@
+name = "Go Work"
+path_suffixes = ["work"]
+line_comments = ["//"]
+autoclose_before = ")"
+brackets = [
+    { start = "(", end = ")", close = true, newline = true}
+]
diff --git a/crates/zed/src/languages/gowork/highlights.scm b/crates/zed/src/languages/gowork/highlights.scm
new file mode 100644
index 0000000000..9c84bcc449
--- /dev/null
+++ b/crates/zed/src/languages/gowork/highlights.scm
@@ -0,0 +1,14 @@
+[
+  "replace"
+  "go"
+  "use"
+] @keyword
+
+"=>" @operator
+
+(comment) @comment
+
+[
+(version)
+(go_version)
+] @string

From 135bca262c997f952daa53275ebcff3eb4a332d5 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 31 Jan 2024 12:13:35 -0700
Subject: [PATCH 107/372] vim: Make H/M/L work in visual mode (#7166)

Release notes:
- N/A
---
 assets/keymaps/vim.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index bbf132232f..102e92511d 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -207,6 +207,9 @@
           "displayLines": true
         }
       ],
+      "shift-h": "vim::WindowTop",
+      "shift-m": "vim::WindowMiddle",
+      "shift-l": "vim::WindowBottom",
       // z commands
       "z t": "editor::ScrollCursorTop",
       "z z": "editor::ScrollCursorCenter",
@@ -337,9 +340,6 @@
       "shift-s": "vim::SubstituteLine",
       "> >": "editor::Indent",
       "< <": "editor::Outdent",
-      "shift-h": "vim::WindowTop",
-      "shift-m": "vim::WindowMiddle",
-      "shift-l": "vim::WindowBottom",
       "ctrl-pagedown": "pane::ActivateNextItem",
       "ctrl-pageup": "pane::ActivatePrevItem"
     }

From 5333eff0e4805a56f299c44e2d27354745b71f2c Mon Sep 17 00:00:00 2001
From: Ben Hamment <Otterpocket@users.noreply.github.com>
Date: Wed, 31 Jan 2024 19:18:21 +0000
Subject: [PATCH 108/372] Improve file finder by ignoring spaces in query
 (#7068)

Release Notes:

- Changed file finder to ignore spaces in queries ([#5324
](https://github.com/zed-industries/zed/issues/5324)).


![image](https://github.com/zed-industries/zed/assets/7274458/14f3d511-129d-4e73-b9d3-12ce1aaa892f)

---------

Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>
---
 crates/file_finder/src/file_finder.rs       | 1 +
 crates/file_finder/src/file_finder_tests.rs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index f97c059a22..ca2808afb2 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -666,6 +666,7 @@ impl PickerDelegate for FileFinderDelegate {
         raw_query: String,
         cx: &mut ViewContext<Picker<Self>>,
     ) -> Task<()> {
+        let raw_query = raw_query.replace(" ", "");
         let raw_query = raw_query.trim();
         if raw_query.is_empty() {
             let project = self.project.read(cx);
diff --git a/crates/file_finder/src/file_finder_tests.rs b/crates/file_finder/src/file_finder_tests.rs
index ca07cbf083..7702f71f46 100644
--- a/crates/file_finder/src/file_finder_tests.rs
+++ b/crates/file_finder/src/file_finder_tests.rs
@@ -53,6 +53,7 @@ async fn test_matching_paths(cx: &mut TestAppContext) {
         " bandana ",
         " ndan ",
         " band ",
+        "a bandana",
     ] {
         picker
             .update(cx, |picker, cx| {

From f98d63620327b9086371a341c743f79ca45566e4 Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Wed, 31 Jan 2024 11:42:09 -0800
Subject: [PATCH 109/372] WIP: Add a setting to visually redact enviroment
 variables (#7124)

Release Notes:

- Added bash syntax highlighting to `.env` files.
- Added a `private_files` setting for configuring which files should be
considered to contain environment variables or other sensitive
information.
- Added a `redact_private_values` setting to add or remove censor bars
over variable values in files matching the `private_files` patterns.
-(internal) added a new `redactions.scm` query to our language support,
allowing different config file formats to indicate where environment
variable values can be identified in the syntax tree, added this query
to `bash`, `json`, `toml`, and `yaml` files.

---------

Co-authored-by: Nathan <nathan@zed.dev>
---
 .zed/settings.json                           |   8 +-
 assets/settings/default.json                 |  11 ++
 crates/copilot/src/copilot.rs                |   4 +
 crates/copilot_ui/src/copilot_button.rs      |   5 +-
 crates/editor/src/editor.rs                  |  25 +++++
 crates/editor/src/editor_settings.rs         |   8 ++
 crates/editor/src/element.rs                 |  40 ++++++-
 crates/editor/src/items.rs                   |   4 +
 crates/language/src/buffer.rs                |  40 +++++++
 crates/language/src/language.rs              |  29 +++++
 crates/language/src/syntax_map.rs            |   2 +-
 crates/multi_buffer/src/multi_buffer.rs      |  52 +++++++++
 crates/project/src/project.rs                |   3 +
 crates/project/src/project_settings.rs       |   5 +
 crates/project/src/worktree.rs               | 111 +++++++++++++++----
 crates/project_panel/src/project_panel.rs    |   3 +
 crates/settings/src/settings_store.rs        |   1 +
 crates/zed/src/languages.rs                  |   1 +
 crates/zed/src/languages/bash/config.toml    |   2 +-
 crates/zed/src/languages/bash/redactions.scm |   2 +
 crates/zed/src/languages/json/redactions.scm |   4 +
 crates/zed/src/languages/toml/redactions.scm |   1 +
 crates/zed/src/languages/yaml/redactions.scm |   1 +
 23 files changed, 330 insertions(+), 32 deletions(-)
 create mode 100644 crates/zed/src/languages/bash/redactions.scm
 create mode 100644 crates/zed/src/languages/json/redactions.scm
 create mode 100644 crates/zed/src/languages/toml/redactions.scm
 create mode 100644 crates/zed/src/languages/yaml/redactions.scm

diff --git a/.zed/settings.json b/.zed/settings.json
index 205d610046..8cf61a17bd 100644
--- a/.zed/settings.json
+++ b/.zed/settings.json
@@ -1,6 +1,6 @@
 {
-    "JSON": {
-        "tab_size": 4
-    },
-    "formatter": "auto"
+  "JSON": {
+    "tab_size": 4
+  },
+  "formatter": "auto"
 }
diff --git a/assets/settings/default.json b/assets/settings/default.json
index 33efad6ceb..f78a4637e5 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -72,6 +72,17 @@
   "show_wrap_guides": true,
   // Character counts at which to show wrap guides in the editor.
   "wrap_guides": [],
+  // Hide the values of in variables from visual display in private files
+  "redact_private_values": false,
+  // Globs to match against file paths to determine if a file is private.
+  "private_files": [
+    "**/.env*",
+    "**/*.pem",
+    "**/*.key",
+    "**/*.cert",
+    "**/*.crt",
+    "**/secrets.yml"
+  ],
   // Whether to use additional LSP queries to format (and amend) the code after
   // every "trigger" symbol input, defined by LSP server capabilities.
   "use_on_type_format": true,
diff --git a/crates/copilot/src/copilot.rs b/crates/copilot/src/copilot.rs
index 6f5c523400..16f941d16f 100644
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -1251,6 +1251,10 @@ mod tests {
         fn worktree_id(&self) -> usize {
             0
         }
+
+        fn is_private(&self) -> bool {
+            false
+        }
     }
 
     impl language::LocalFile for File {
diff --git a/crates/copilot_ui/src/copilot_button.rs b/crates/copilot_ui/src/copilot_button.rs
index 28b28ffe9a..8ea106a3ff 100644
--- a/crates/copilot_ui/src/copilot_button.rs
+++ b/crates/copilot_ui/src/copilot_button.rs
@@ -225,8 +225,9 @@ impl CopilotButton {
         let file = snapshot.file_at(suggestion_anchor).cloned();
 
         self.editor_enabled = Some(
-            all_language_settings(self.file.as_ref(), cx)
-                .copilot_enabled(language, file.as_ref().map(|file| file.path().as_ref())),
+            file.as_ref().map(|file| !file.is_private()).unwrap_or(true)
+                && all_language_settings(self.file.as_ref(), cx)
+                    .copilot_enabled(language, file.as_ref().map(|file| file.path().as_ref())),
         );
         self.language = language.cloned();
         self.file = file;
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index c795eecb04..47731b510d 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -8493,6 +8493,31 @@ impl Editor {
         results
     }
 
+    /// Get the text ranges corresponding to the redaction query
+    pub fn redacted_ranges(
+        &self,
+        search_range: Range<Anchor>,
+        display_snapshot: &DisplaySnapshot,
+        cx: &mut ViewContext<Self>,
+    ) -> Vec<Range<DisplayPoint>> {
+        display_snapshot
+            .buffer_snapshot
+            .redacted_ranges(search_range, |file| {
+                if let Some(file) = file {
+                    file.is_private()
+                        && EditorSettings::get(Some((file.worktree_id(), file.path())), cx)
+                            .redact_private_values
+                } else {
+                    false
+                }
+            })
+            .map(|range| {
+                range.start.to_display_point(display_snapshot)
+                    ..range.end.to_display_point(display_snapshot)
+            })
+            .collect()
+    }
+
     pub fn highlight_text<T: 'static>(
         &mut self,
         ranges: Vec<Range<Anchor>>,
diff --git a/crates/editor/src/editor_settings.rs b/crates/editor/src/editor_settings.rs
index d4d71cd2bf..0cfc677e93 100644
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -13,6 +13,7 @@ pub struct EditorSettings {
     pub scrollbar: Scrollbar,
     pub relative_line_numbers: bool,
     pub seed_search_query_from_cursor: SeedQuerySetting,
+    pub redact_private_values: bool,
 }
 
 /// When to populate a new search's query based on the text under the cursor.
@@ -93,6 +94,13 @@ pub struct EditorSettingsContent {
     ///
     /// Default: always
     pub seed_search_query_from_cursor: Option<SeedQuerySetting>,
+
+    /// Hide the values of variables in `private` files, as defined by the
+    /// private_files setting. This only changes the visual representation,
+    /// the values are still present in the file and can be selected / copied / pasted
+    ///
+    /// Default: false
+    pub redact_private_values: Option<bool>,
 }
 
 /// Scrollbar related settings
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 7f37f539d3..57389fd8f9 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -1153,7 +1153,9 @@ impl EditorElement {
                     )
                 }
 
-                cx.with_z_index(0, |cx| {
+                cx.with_z_index(0, |cx| self.paint_redactions(text_bounds, &layout, cx));
+
+                cx.with_z_index(1, |cx| {
                     for cursor in cursors {
                         cursor.paint(content_origin, cx);
                     }
@@ -1162,6 +1164,32 @@ impl EditorElement {
         )
     }
 
+    fn paint_redactions(
+        &mut self,
+        text_bounds: Bounds<Pixels>,
+        layout: &LayoutState,
+        cx: &mut ElementContext,
+    ) {
+        let content_origin = text_bounds.origin + point(layout.gutter_margin, Pixels::ZERO);
+        let line_end_overshoot = layout.line_end_overshoot();
+
+        // A softer than perfect black
+        let redaction_color = gpui::rgb(0x0e1111);
+
+        for range in layout.redacted_ranges.iter() {
+            self.paint_highlighted_range(
+                range.clone(),
+                redaction_color.into(),
+                Pixels::ZERO,
+                line_end_overshoot,
+                layout,
+                content_origin,
+                text_bounds,
+                cx,
+            );
+        }
+    }
+
     fn paint_overlays(
         &mut self,
         text_bounds: Bounds<Pixels>,
@@ -1957,6 +1985,8 @@ impl EditorElement {
                 cx.theme().colors(),
             );
 
+            let redacted_ranges = editor.redacted_ranges(start_anchor..end_anchor, &snapshot.display_snapshot, cx);
+
             let mut newest_selection_head = None;
 
             if editor.show_local_selections {
@@ -2298,6 +2328,7 @@ impl EditorElement {
                 active_rows,
                 highlighted_rows,
                 highlighted_ranges,
+                redacted_ranges,
                 line_numbers,
                 display_hunks,
                 blocks,
@@ -3082,6 +3113,7 @@ pub struct LayoutState {
     display_hunks: Vec<DisplayDiffHunk>,
     blocks: Vec<BlockLayout>,
     highlighted_ranges: Vec<(Range<DisplayPoint>, Hsla)>,
+    redacted_ranges: Vec<Range<DisplayPoint>>,
     selections: Vec<(PlayerColor, Vec<SelectionLayout>)>,
     scrollbar_row_range: Range<f32>,
     show_scrollbars: bool,
@@ -3095,6 +3127,12 @@ pub struct LayoutState {
     space_invisible: ShapedLine,
 }
 
+impl LayoutState {
+    fn line_end_overshoot(&self) -> Pixels {
+        0.15 * self.position_map.line_height
+    }
+}
+
 struct CodeActionsIndicator {
     row: u32,
     button: IconButton,
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index d9ea6385cb..3a4a14da0e 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -1364,5 +1364,9 @@ mod tests {
         fn to_proto(&self) -> rpc::proto::File {
             unimplemented!()
         }
+
+        fn is_private(&self) -> bool {
+            false
+        }
     }
 }
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 7a658d1b03..0bb069729f 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -383,6 +383,9 @@ pub trait File: Send + Sync {
 
     /// Converts this file into a protobuf message.
     fn to_proto(&self) -> rpc::proto::File;
+
+    /// Return whether Zed considers this to be a dotenv file.
+    fn is_private(&self) -> bool;
 }
 
 /// The file associated with a buffer, in the case where the file is on the local disk.
@@ -2877,6 +2880,43 @@ impl BufferSnapshot {
         })
     }
 
+    /// Returns anchor ranges for any matches of the redaction query.
+    /// The buffer can be associated with multiple languages, and the redaction query associated with each
+    /// will be run on the relevant section of the buffer.
+    pub fn redacted_ranges<'a, T: ToOffset>(
+        &'a self,
+        range: Range<T>,
+    ) -> impl Iterator<Item = Range<usize>> + 'a {
+        let offset_range = range.start.to_offset(self)..range.end.to_offset(self);
+        let mut syntax_matches = self.syntax.matches(offset_range, self, |grammar| {
+            grammar
+                .redactions_config
+                .as_ref()
+                .map(|config| &config.query)
+        });
+
+        let configs = syntax_matches
+            .grammars()
+            .iter()
+            .map(|grammar| grammar.redactions_config.as_ref())
+            .collect::<Vec<_>>();
+
+        iter::from_fn(move || {
+            let redacted_range = syntax_matches
+                .peek()
+                .and_then(|mat| {
+                    configs[mat.grammar_index].and_then(|config| {
+                        mat.captures
+                            .iter()
+                            .find(|capture| capture.index == config.redaction_capture_ix)
+                    })
+                })
+                .map(|mat| mat.node.byte_range());
+            syntax_matches.advance();
+            redacted_range
+        })
+    }
+
     /// Returns selections for remote peers intersecting the given range.
     #[allow(clippy::type_complexity)]
     pub fn remote_selections_in_range(
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index bd4c7f5d93..70e85761d2 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -453,6 +453,7 @@ pub struct LanguageQueries {
     pub embedding: Option<Cow<'static, str>>,
     pub injections: Option<Cow<'static, str>>,
     pub overrides: Option<Cow<'static, str>>,
+    pub redactions: Option<Cow<'static, str>>,
 }
 
 /// Represents a language for the given range. Some languages (e.g. HTML)
@@ -623,6 +624,7 @@ pub struct Grammar {
     pub(crate) error_query: Query,
     pub(crate) highlights_query: Option<Query>,
     pub(crate) brackets_config: Option<BracketConfig>,
+    pub(crate) redactions_config: Option<RedactionConfig>,
     pub(crate) indents_config: Option<IndentConfig>,
     pub outline_config: Option<OutlineConfig>,
     pub embedding_config: Option<EmbeddingConfig>,
@@ -664,6 +666,11 @@ struct InjectionConfig {
     patterns: Vec<InjectionPatternConfig>,
 }
 
+struct RedactionConfig {
+    pub query: Query,
+    pub redaction_capture_ix: u32,
+}
+
 struct OverrideConfig {
     query: Query,
     values: HashMap<u32, (String, LanguageConfigOverride)>,
@@ -1303,6 +1310,7 @@ impl Language {
                     indents_config: None,
                     injection_config: None,
                     override_config: None,
+                    redactions_config: None,
                     error_query: Query::new(&ts_language, "(ERROR) @error").unwrap(),
                     ts_language,
                     highlight_map: Default::default(),
@@ -1359,6 +1367,11 @@ impl Language {
                 .with_override_query(query.as_ref())
                 .context("Error loading override query")?;
         }
+        if let Some(query) = queries.redactions {
+            self = self
+                .with_redaction_query(query.as_ref())
+                .context("Error loading redaction query")?;
+        }
         Ok(self)
     }
 
@@ -1589,6 +1602,22 @@ impl Language {
         Ok(self)
     }
 
+    pub fn with_redaction_query(mut self, source: &str) -> anyhow::Result<Self> {
+        let grammar = self.grammar_mut();
+        let query = Query::new(&grammar.ts_language, source)?;
+        let mut redaction_capture_ix = None;
+        get_capture_indices(&query, &mut [("redact", &mut redaction_capture_ix)]);
+
+        if let Some(redaction_capture_ix) = redaction_capture_ix {
+            grammar.redactions_config = Some(RedactionConfig {
+                query,
+                redaction_capture_ix,
+            });
+        }
+
+        Ok(self)
+    }
+
     fn grammar_mut(&mut self) -> &mut Grammar {
         Arc::get_mut(self.grammar.as_mut().unwrap()).unwrap()
     }
diff --git a/crates/language/src/syntax_map.rs b/crates/language/src/syntax_map.rs
index 6ca6a70e4a..4c20a32a12 100644
--- a/crates/language/src/syntax_map.rs
+++ b/crates/language/src/syntax_map.rs
@@ -1059,7 +1059,7 @@ impl<'a> SyntaxMapMatches<'a> {
                 .position(|later_layer| key < later_layer.sort_key())
                 .unwrap_or(self.active_layer_count - 1);
             self.layers[0..i].rotate_left(1);
-        } else {
+        } else if self.active_layer_count != 0 {
             self.layers[0..self.active_layer_count].rotate_left(1);
             self.active_layer_count -= 1;
         }
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index 0f90612358..e16fc3a504 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -36,6 +36,7 @@ use text::{
     BufferId, Edit, TextSummary,
 };
 use theme::SyntaxTheme;
+
 use util::post_inc;
 
 #[cfg(any(test, feature = "test-support"))]
@@ -2784,6 +2785,26 @@ impl MultiBufferSnapshot {
             .map(|excerpt| (excerpt.id, &excerpt.buffer, excerpt.range.clone()))
     }
 
+    fn excerpts_for_range<'a, T: ToOffset>(
+        &'a self,
+        range: Range<T>,
+    ) -> impl Iterator<Item = (&'a Excerpt, usize)> + 'a {
+        let range = range.start.to_offset(self)..range.end.to_offset(self);
+
+        let mut cursor = self.excerpts.cursor::<usize>();
+        cursor.seek(&range.start, Bias::Right, &());
+        cursor.prev(&());
+
+        iter::from_fn(move || {
+            cursor.next(&());
+            if cursor.start() < &range.end {
+                cursor.item().map(|item| (item, *cursor.start()))
+            } else {
+                None
+            }
+        })
+    }
+
     pub fn excerpt_boundaries_in_range<R, T>(
         &self,
         range: R,
@@ -2942,6 +2963,37 @@ impl MultiBufferSnapshot {
         })
     }
 
+    pub fn redacted_ranges<'a, T: ToOffset>(
+        &'a self,
+        range: Range<T>,
+        redaction_enabled: impl Fn(Option<&Arc<dyn File>>) -> bool + 'a,
+    ) -> impl Iterator<Item = Range<usize>> + 'a {
+        let range = range.start.to_offset(self)..range.end.to_offset(self);
+        self.excerpts_for_range(range.clone())
+            .filter_map(move |(excerpt, excerpt_offset)| {
+                redaction_enabled(excerpt.buffer.file()).then(move || {
+                    let excerpt_buffer_start =
+                        excerpt.range.context.start.to_offset(&excerpt.buffer);
+
+                    excerpt
+                        .buffer
+                        .redacted_ranges(excerpt.range.context.clone())
+                        .map(move |mut redacted_range| {
+                            // Re-base onto the excerpts coordinates in the multibuffer
+                            redacted_range.start =
+                                excerpt_offset + (redacted_range.start - excerpt_buffer_start);
+                            redacted_range.end =
+                                excerpt_offset + (redacted_range.end - excerpt_buffer_start);
+
+                            redacted_range
+                        })
+                        .skip_while(move |redacted_range| redacted_range.end < range.start)
+                        .take_while(move |redacted_range| redacted_range.start < range.end)
+                })
+            })
+            .flatten()
+    }
+
     pub fn diagnostics_update_count(&self) -> usize {
         self.diagnostics_update_count
     }
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index fc7c80c7f9..bc13c5cf31 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -6470,6 +6470,7 @@ impl Project {
                             path: entry.path.clone(),
                             worktree: worktree_handle.clone(),
                             is_deleted: false,
+                            is_private: entry.is_private,
                         }
                     } else if let Some(entry) = snapshot.entry_for_path(old_file.path().as_ref()) {
                         File {
@@ -6479,6 +6480,7 @@ impl Project {
                             path: entry.path.clone(),
                             worktree: worktree_handle.clone(),
                             is_deleted: false,
+                            is_private: entry.is_private,
                         }
                     } else {
                         File {
@@ -6488,6 +6490,7 @@ impl Project {
                             mtime: old_file.mtime(),
                             worktree: worktree_handle.clone(),
                             is_deleted: true,
+                            is_private: old_file.is_private,
                         }
                     };
 
diff --git a/crates/project/src/project_settings.rs b/crates/project/src/project_settings.rs
index 9ec07bc088..d26209043e 100644
--- a/crates/project/src/project_settings.rs
+++ b/crates/project/src/project_settings.rs
@@ -20,6 +20,7 @@ pub struct ProjectSettings {
     /// Configuration for Git-related features
     #[serde(default)]
     pub git: GitSettings,
+
     /// Completely ignore files matching globs from `file_scan_exclusions`
     ///
     /// Default: [
@@ -34,6 +35,10 @@ pub struct ProjectSettings {
     /// ]
     #[serde(default)]
     pub file_scan_exclusions: Option<Vec<String>>,
+
+    /// Treat the files matching these globs as `.env` files.
+    /// Default: [ "**/.env*" ]
+    pub private_files: Option<Vec<String>>,
 }
 
 #[derive(Copy, Clone, Debug, Default, Serialize, Deserialize, JsonSchema)]
diff --git a/crates/project/src/worktree.rs b/crates/project/src/worktree.rs
index 959a63a7c7..21994397fe 100644
--- a/crates/project/src/worktree.rs
+++ b/crates/project/src/worktree.rs
@@ -230,6 +230,7 @@ pub struct LocalSnapshot {
     /// id of their parent directory.
     git_repositories: TreeMap<ProjectEntryId, LocalRepositoryEntry>,
     file_scan_exclusions: Vec<PathMatcher>,
+    private_files: Vec<PathMatcher>,
 }
 
 struct BackgroundScannerState {
@@ -319,16 +320,34 @@ impl Worktree {
         cx.new_model(move |cx: &mut ModelContext<Worktree>| {
             cx.observe_global::<SettingsStore>(move |this, cx| {
                 if let Self::Local(this) = this {
-                    let new_file_scan_exclusions =
-                        file_scan_exclusions(ProjectSettings::get_global(cx));
-                    if new_file_scan_exclusions != this.snapshot.file_scan_exclusions {
+                    let new_file_scan_exclusions = path_matchers(
+                        ProjectSettings::get_global(cx)
+                            .file_scan_exclusions
+                            .as_deref(),
+                        "file_scan_exclusions",
+                    );
+                    let new_private_files = path_matchers(
+                        ProjectSettings::get(Some((cx.handle().entity_id().as_u64() as usize, &Path::new(""))), cx).private_files.as_deref(),
+                        "private_files",
+                    );
+
+                    if new_file_scan_exclusions != this.snapshot.file_scan_exclusions
+                        || new_private_files != this.snapshot.private_files
+                    {
                         this.snapshot.file_scan_exclusions = new_file_scan_exclusions;
+                        this.snapshot.private_files = new_private_files;
+
                         log::info!(
-                            "Re-scanning directories, new scan exclude files: {:?}",
+                            "Re-scanning directories, new scan exclude files: {:?}, new dotenv files: {:?}",
                             this.snapshot
                                 .file_scan_exclusions
                                 .iter()
                                 .map(ToString::to_string)
+                                .collect::<Vec<_>>(),
+                            this.snapshot
+                                .private_files
+                                .iter()
+                                .map(ToString::to_string)
                                 .collect::<Vec<_>>()
                         );
 
@@ -357,7 +376,16 @@ impl Worktree {
                 .map_or(String::new(), |f| f.to_string_lossy().to_string());
 
             let mut snapshot = LocalSnapshot {
-                file_scan_exclusions: file_scan_exclusions(ProjectSettings::get_global(cx)),
+                file_scan_exclusions: path_matchers(
+                    ProjectSettings::get_global(cx)
+                        .file_scan_exclusions
+                        .as_deref(),
+                    "file_scan_exclusions",
+                ),
+                private_files: path_matchers(
+                    ProjectSettings::get(Some((cx.handle().entity_id().as_u64() as usize, &Path::new(""))), cx).private_files.as_deref(),
+                    "private_files",
+                ),
                 ignores_by_parent_abs_path: Default::default(),
                 git_repositories: Default::default(),
                 snapshot: Snapshot {
@@ -650,20 +678,22 @@ fn start_background_scan_tasks(
     vec![background_scanner, scan_state_updater]
 }
 
-fn file_scan_exclusions(project_settings: &ProjectSettings) -> Vec<PathMatcher> {
-    project_settings.file_scan_exclusions.as_deref().unwrap_or(&[]).iter()
-    .sorted()
-    .filter_map(|pattern| {
-        PathMatcher::new(pattern)
-            .map(Some)
-            .unwrap_or_else(|e| {
-                log::error!(
-                    "Skipping pattern {pattern} in `file_scan_exclusions` project settings due to parsing error: {e:#}"
-                );
-                None
-            })
-    })
-    .collect()
+fn path_matchers(values: Option<&[String]>, context: &'static str) -> Vec<PathMatcher> {
+    values
+        .unwrap_or(&[])
+        .iter()
+        .sorted()
+        .filter_map(|pattern| {
+            PathMatcher::new(pattern)
+                .map(Some)
+                .unwrap_or_else(|e| {
+                    log::error!(
+                        "Skipping pattern {pattern} in `{}` project settings due to parsing error: {e:#}", context
+                    );
+                    None
+                })
+        })
+        .collect()
 }
 
 impl LocalWorktree {
@@ -1003,6 +1033,7 @@ impl LocalWorktree {
                         mtime: entry.mtime,
                         is_local: true,
                         is_deleted: false,
+                        is_private: entry.is_private,
                     },
                     text,
                     diff_base,
@@ -1017,6 +1048,7 @@ impl LocalWorktree {
                         .with_context(|| {
                             format!("Excluded file {abs_path:?} got removed during loading")
                         })?;
+                    let is_private = snapshot.is_path_private(path.as_ref());
                     Ok((
                         File {
                             entry_id: None,
@@ -1025,6 +1057,7 @@ impl LocalWorktree {
                             mtime: metadata.mtime,
                             is_local: true,
                             is_deleted: false,
+                            is_private,
                         },
                         text,
                         diff_base,
@@ -1053,14 +1086,15 @@ impl LocalWorktree {
         let save = self.write_file(path.as_ref(), text, buffer.line_ending(), cx);
         let fs = Arc::clone(&self.fs);
         let abs_path = self.absolutize(&path);
+        let is_private = self.snapshot.is_path_private(&path);
 
         cx.spawn(move |this, mut cx| async move {
             let entry = save.await?;
             let abs_path = abs_path?;
             let this = this.upgrade().context("worktree dropped")?;
 
-            let (entry_id, mtime, path) = match entry {
-                Some(entry) => (Some(entry.id), entry.mtime, entry.path),
+            let (entry_id, mtime, path, is_dotenv) = match entry {
+                Some(entry) => (Some(entry.id), entry.mtime, entry.path, entry.is_private),
                 None => {
                     let metadata = fs
                         .metadata(&abs_path)
@@ -1073,7 +1107,7 @@ impl LocalWorktree {
                         .with_context(|| {
                             format!("Excluded buffer {path:?} got removed during saving")
                         })?;
-                    (None, metadata.mtime, path)
+                    (None, metadata.mtime, path, is_private)
                 }
             };
 
@@ -1085,6 +1119,7 @@ impl LocalWorktree {
                     mtime,
                     is_local: true,
                     is_deleted: false,
+                    is_private: is_dotenv,
                 });
 
                 if let Some(project_id) = project_id {
@@ -2295,6 +2330,14 @@ impl LocalSnapshot {
         paths
     }
 
+    pub fn is_path_private(&self, path: &Path) -> bool {
+        path.ancestors().any(|ancestor| {
+            self.private_files
+                .iter()
+                .any(|exclude_matcher| exclude_matcher.is_match(&ancestor))
+        })
+    }
+
     pub fn is_path_excluded(&self, mut path: PathBuf) -> bool {
         loop {
             if self
@@ -2747,6 +2790,7 @@ pub struct File {
     pub(crate) entry_id: Option<ProjectEntryId>,
     pub(crate) is_local: bool,
     pub(crate) is_deleted: bool,
+    pub(crate) is_private: bool,
 }
 
 impl language::File for File {
@@ -2819,6 +2863,10 @@ impl language::File for File {
             is_deleted: self.is_deleted,
         }
     }
+
+    fn is_private(&self) -> bool {
+        self.is_private
+    }
 }
 
 impl language::LocalFile for File {
@@ -2874,6 +2922,7 @@ impl File {
             entry_id: Some(entry.id),
             is_local: true,
             is_deleted: false,
+            is_private: entry.is_private,
         })
     }
 
@@ -2899,6 +2948,7 @@ impl File {
             entry_id: proto.entry_id.map(ProjectEntryId::from_proto),
             is_local: false,
             is_deleted: proto.is_deleted,
+            is_private: false,
         })
     }
 
@@ -2943,6 +2993,8 @@ pub struct Entry {
     /// entries in that they are not included in searches.
     pub is_external: bool,
     pub git_status: Option<GitFileStatus>,
+    /// Whether this entry is considered to be a `.env` file.
+    pub is_private: bool,
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -2997,6 +3049,7 @@ impl Entry {
             is_symlink: metadata.is_symlink,
             is_ignored: false,
             is_external: false,
+            is_private: false,
             git_status: None,
         }
     }
@@ -3732,7 +3785,7 @@ impl BackgroundScanner {
                     ancestor_inodes.insert(child_entry.inode);
 
                     new_jobs.push(Some(ScanJob {
-                        abs_path: child_abs_path,
+                        abs_path: child_abs_path.clone(),
                         path: child_path,
                         is_external: child_entry.is_external,
                         ignore_stack: if child_entry.is_ignored {
@@ -3766,6 +3819,16 @@ impl BackgroundScanner {
                 }
             }
 
+            {
+                let relative_path = job.path.join(child_name);
+                let state = self.state.lock();
+                if state.snapshot.is_path_private(&relative_path) {
+                    log::debug!("detected private file: {relative_path:?}");
+                    child_entry.is_private = true;
+                }
+                drop(state)
+            }
+
             new_entries.push(child_entry);
         }
 
@@ -3866,6 +3929,7 @@ impl BackgroundScanner {
                     let is_dir = fs_entry.is_dir();
                     fs_entry.is_ignored = ignore_stack.is_abs_path_ignored(&abs_path, is_dir);
                     fs_entry.is_external = !canonical_path.starts_with(&root_canonical_path);
+                    fs_entry.is_private = state.snapshot.is_path_private(path);
 
                     if !is_dir && !fs_entry.is_ignored && !fs_entry.is_external {
                         if let Some((work_dir, repo)) = state.snapshot.local_repo_for_path(path) {
@@ -4548,6 +4612,7 @@ impl<'a> TryFrom<(&'a CharBag, proto::Entry)> for Entry {
                 is_ignored: entry.is_ignored,
                 is_external: entry.is_external,
                 git_status: git_status_from_proto(entry.git_status),
+                is_private: false,
             })
         } else {
             Err(anyhow!(
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 183f454d19..290969d0f4 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -101,6 +101,7 @@ pub struct EntryDetails {
     is_processing: bool,
     is_cut: bool,
     git_status: Option<GitFileStatus>,
+    is_dotenv: bool,
 }
 
 actions!(
@@ -1137,6 +1138,7 @@ impl ProjectPanel {
                         is_symlink: false,
                         is_ignored: false,
                         is_external: false,
+                        is_private: false,
                         git_status: entry.git_status,
                     });
                 }
@@ -1298,6 +1300,7 @@ impl ProjectPanel {
                             .clipboard_entry
                             .map_or(false, |e| e.is_cut() && e.entry_id() == entry.id),
                         git_status: status,
+                        is_dotenv: entry.is_private,
                     };
 
                     if let Some(edit_state) = &self.edit_state {
diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs
index 41dfa521ed..7398876137 100644
--- a/crates/settings/src/settings_store.rs
+++ b/crates/settings/src/settings_store.rs
@@ -86,6 +86,7 @@ pub trait Settings: 'static + Send + Sync {
         });
     }
 
+    /// path is a (worktree ID, Path)
     #[track_caller]
     fn get<'a>(path: Option<(usize, &Path)>, cx: &'a AppContext) -> &'a Self
     where
diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index 64bec543c2..f0217af1d9 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -357,6 +357,7 @@ const QUERY_FILENAME_PREFIXES: &[(
     ("embedding", |q| &mut q.embedding),
     ("injections", |q| &mut q.injections),
     ("overrides", |q| &mut q.overrides),
+    ("redactions", |q| &mut q.redactions),
 ];
 
 fn load_queries(name: &str) -> LanguageQueries {
diff --git a/crates/zed/src/languages/bash/config.toml b/crates/zed/src/languages/bash/config.toml
index cbf186fd3d..8b86318ecd 100644
--- a/crates/zed/src/languages/bash/config.toml
+++ b/crates/zed/src/languages/bash/config.toml
@@ -1,5 +1,5 @@
 name = "Shell Script"
-path_suffixes = ["sh", "bash", "bashrc", "bash_profile", "bash_aliases", "bash_logout", "profile", "zsh", "zshrc", "zshenv", "zsh_profile", "zsh_aliases", "zsh_histfile", "zlogin", "zprofile"]
+path_suffixes = ["sh", "bash", "bashrc", "bash_profile", "bash_aliases", "bash_logout", "profile", "zsh", "zshrc", "zshenv", "zsh_profile", "zsh_aliases", "zsh_histfile", "zlogin", "zprofile", ".env"]
 line_comments = ["# "]
 first_line_pattern = "^#!.*\\b(?:ba|z)?sh\\b"
 brackets = [
diff --git a/crates/zed/src/languages/bash/redactions.scm b/crates/zed/src/languages/bash/redactions.scm
new file mode 100644
index 0000000000..88b38f42fc
--- /dev/null
+++ b/crates/zed/src/languages/bash/redactions.scm
@@ -0,0 +1,2 @@
+(variable_assignment
+    value: (_) @redact)
\ No newline at end of file
diff --git a/crates/zed/src/languages/json/redactions.scm b/crates/zed/src/languages/json/redactions.scm
new file mode 100644
index 0000000000..be985f018c
--- /dev/null
+++ b/crates/zed/src/languages/json/redactions.scm
@@ -0,0 +1,4 @@
+(pair value: (number) @redact)
+(pair value: (string) @redact)
+(array (number) @redact)
+(array (string) @redact)
\ No newline at end of file
diff --git a/crates/zed/src/languages/toml/redactions.scm b/crates/zed/src/languages/toml/redactions.scm
new file mode 100644
index 0000000000..fd11a02927
--- /dev/null
+++ b/crates/zed/src/languages/toml/redactions.scm
@@ -0,0 +1 @@
+(pair (bare_key) "=" (_) @redact)
\ No newline at end of file
diff --git a/crates/zed/src/languages/yaml/redactions.scm b/crates/zed/src/languages/yaml/redactions.scm
new file mode 100644
index 0000000000..85fdbd26ea
--- /dev/null
+++ b/crates/zed/src/languages/yaml/redactions.scm
@@ -0,0 +1 @@
+(block_mapping_pair value: (flow_node) @redact)

From c983c9b6df85cdf99dddfb943c7a5a6928050698 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Wed, 31 Jan 2024 14:44:24 -0500
Subject: [PATCH 110/372] v0.122.x dev

---
 Cargo.lock            | 2 +-
 crates/zed/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cacc3cb91e..564da956df 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10261,7 +10261,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "0.121.0"
+version = "0.122.0"
 dependencies = [
  "activity_indicator",
  "ai",
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index d668aa30c6..64d4a59c2d 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -2,7 +2,7 @@
 description = "The fast, collaborative code editor."
 edition = "2021"
 name = "zed"
-version = "0.121.0"
+version = "0.122.0"
 publish = false
 license = "GPL-3.0-or-later"
 

From dcca48482bc40c9b104b7288c113c5d1dbbe1e9a Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 31 Jan 2024 13:05:51 -0700
Subject: [PATCH 111/372] disallow opening private files (#7165)

- Disallow sharing gitignored files through collab
- Show errors when failing to open files
- Show a warning to followers when view is unshared

/cc @mikaylamaki, let's update this to use your `private_files` config
before merge.


Release Notes:

- Added the ability to prevent sharing private files over collab.

---------

Co-authored-by: Piotr <piotr@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
---
 crates/collab/src/main.rs                 |  3 ++
 crates/editor/src/items.rs                |  8 ++++
 crates/language/src/buffer.rs             |  7 ++-
 crates/project/src/project.rs             | 54 ++++++++++++++++-------
 crates/project_panel/Cargo.toml           |  1 +
 crates/project_panel/src/project_panel.rs | 13 +++++-
 crates/rpc/proto/zed.proto                |  1 +
 crates/rpc/src/error.rs                   | 14 ++++++
 crates/workspace/src/pane_group.rs        | 19 +++++++-
 9 files changed, 101 insertions(+), 19 deletions(-)

diff --git a/crates/collab/src/main.rs b/crates/collab/src/main.rs
index 517a0589a8..32c69de690 100644
--- a/crates/collab/src/main.rs
+++ b/crates/collab/src/main.rs
@@ -28,6 +28,9 @@ async fn main() -> Result<()> {
         Some("version") => {
             println!("collab v{VERSION}");
         }
+        Some("migrate") => {
+            run_migrations().await?;
+        }
         Some("serve") => {
             let config = envy::from_env::<Config>().expect("error loading config");
             init_tracing(&config);
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index 3a4a14da0e..ac55ed8546 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -185,6 +185,14 @@ impl FollowableItem for Editor {
 
     fn to_state_proto(&self, cx: &WindowContext) -> Option<proto::view::Variant> {
         let buffer = self.buffer.read(cx);
+        if buffer
+            .as_singleton()
+            .and_then(|buffer| buffer.read(cx).file())
+            .map_or(false, |file| file.is_private())
+        {
+            return None;
+        }
+
         let scroll_anchor = self.scroll_manager.anchor();
         let excerpts = buffer
             .read(cx)
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 0bb069729f..cd8b239f5c 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -384,7 +384,7 @@ pub trait File: Send + Sync {
     /// Converts this file into a protobuf message.
     fn to_proto(&self) -> rpc::proto::File;
 
-    /// Return whether Zed considers this to be a dotenv file.
+    /// Return whether Zed considers this to be a private file.
     fn is_private(&self) -> bool;
 }
 
@@ -406,6 +406,11 @@ pub trait LocalFile: File {
         mtime: SystemTime,
         cx: &mut AppContext,
     );
+
+    /// Returns true if the file should not be shared with collaborators.
+    fn is_private(&self, _: &AppContext) -> bool {
+        false
+    }
 }
 
 /// The auto-indent behavior associated with an editing operation.
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index bc13c5cf31..fdd273059b 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -56,6 +56,7 @@ use postage::watch;
 use prettier_support::{DefaultPrettier, PrettierInstance};
 use project_settings::{LspSettings, ProjectSettings};
 use rand::prelude::*;
+use rpc::{ErrorCode, ErrorExt};
 use search::SearchQuery;
 use serde::Serialize;
 use settings::{Settings, SettingsStore};
@@ -1760,7 +1761,7 @@ impl Project {
         cx.background_executor().spawn(async move {
             wait_for_loading_buffer(loading_watch)
                 .await
-                .map_err(|error| anyhow!("{project_path:?} opening failure: {error:#}"))
+                .map_err(|e| e.cloned())
         })
     }
 
@@ -8011,11 +8012,20 @@ impl Project {
             .update(&mut cx, |this, cx| this.open_buffer_for_symbol(&symbol, cx))?
             .await?;
 
-        Ok(proto::OpenBufferForSymbolResponse {
-            buffer_id: this.update(&mut cx, |this, cx| {
-                this.create_buffer_for_peer(&buffer, peer_id, cx).into()
-            })?,
-        })
+        this.update(&mut cx, |this, cx| {
+            let is_private = buffer
+                .read(cx)
+                .file()
+                .map(|f| f.is_private())
+                .unwrap_or_default();
+            if is_private {
+                Err(anyhow!(ErrorCode::UnsharedItem))
+            } else {
+                Ok(proto::OpenBufferForSymbolResponse {
+                    buffer_id: this.create_buffer_for_peer(&buffer, peer_id, cx).into(),
+                })
+            }
+        })?
     }
 
     fn symbol_signature(&self, project_path: &ProjectPath) -> [u8; 32] {
@@ -8037,11 +8047,7 @@ impl Project {
         let buffer = this
             .update(&mut cx, |this, cx| this.open_buffer_by_id(buffer_id, cx))?
             .await?;
-        this.update(&mut cx, |this, cx| {
-            Ok(proto::OpenBufferResponse {
-                buffer_id: this.create_buffer_for_peer(&buffer, peer_id, cx).into(),
-            })
-        })?
+        Project::respond_to_open_buffer_request(this, buffer, peer_id, &mut cx)
     }
 
     async fn handle_open_buffer_by_path(
@@ -8063,10 +8069,28 @@ impl Project {
         })?;
 
         let buffer = open_buffer.await?;
-        this.update(&mut cx, |this, cx| {
-            Ok(proto::OpenBufferResponse {
-                buffer_id: this.create_buffer_for_peer(&buffer, peer_id, cx).into(),
-            })
+        Project::respond_to_open_buffer_request(this, buffer, peer_id, &mut cx)
+    }
+
+    fn respond_to_open_buffer_request(
+        this: Model<Self>,
+        buffer: Model<Buffer>,
+        peer_id: proto::PeerId,
+        cx: &mut AsyncAppContext,
+    ) -> Result<proto::OpenBufferResponse> {
+        this.update(cx, |this, cx| {
+            let is_private = buffer
+                .read(cx)
+                .file()
+                .map(|f| f.is_private())
+                .unwrap_or_default();
+            if is_private {
+                Err(anyhow!(ErrorCode::UnsharedItem))
+            } else {
+                Ok(proto::OpenBufferResponse {
+                    buffer_id: this.create_buffer_for_peer(&buffer, peer_id, cx).into(),
+                })
+            }
         })?
     }
 
diff --git a/crates/project_panel/Cargo.toml b/crates/project_panel/Cargo.toml
index d681b9b38c..a518a2c075 100644
--- a/crates/project_panel/Cargo.toml
+++ b/crates/project_panel/Cargo.toml
@@ -31,6 +31,7 @@ theme = { path = "../theme" }
 ui = { path = "../ui" }
 unicase = "2.6"
 util = { path = "../util" }
+client = { path = "../client" }
 workspace = { path = "../workspace", package = "workspace" }
 
 [dev-dependencies]
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 290969d0f4..f64099340c 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -1,5 +1,6 @@
 pub mod file_associations;
 mod project_panel_settings;
+use client::{ErrorCode, ErrorExt};
 use settings::Settings;
 
 use db::kvp::KEY_VALUE_STORE;
@@ -35,6 +36,7 @@ use unicase::UniCase;
 use util::{maybe, ResultExt, TryFutureExt};
 use workspace::{
     dock::{DockPosition, Panel, PanelEvent},
+    notifications::DetachAndPromptErr,
     Workspace,
 };
 
@@ -259,6 +261,7 @@ impl ProjectPanel {
                 } => {
                     if let Some(worktree) = project.read(cx).worktree_for_entry(entry_id, cx) {
                         if let Some(entry) = worktree.read(cx).entry_for_id(entry_id) {
+                            let file_path = entry.path.clone();
                             workspace
                                 .open_path(
                                     ProjectPath {
@@ -269,7 +272,15 @@ impl ProjectPanel {
                                     focus_opened_item,
                                     cx,
                                 )
-                                .detach_and_log_err(cx);
+                                .detach_and_prompt_err("Failed to open file", cx, move |e, _| {
+                                    match e.error_code() {
+                                        ErrorCode::UnsharedItem => Some(format!(
+                                            "{} is not shared by the host. This could be because it has been marked as `private`",
+                                            file_path.display()
+                                        )),
+                                        _ => None,
+                                    }
+                                });
                             if !focus_opened_item {
                                 if let Some(project_panel) = project_panel.upgrade() {
                                     let focus_handle = project_panel.read(cx).focus_handle.clone();
diff --git a/crates/rpc/proto/zed.proto b/crates/rpc/proto/zed.proto
index 18f9b1f1e8..3a513902e5 100644
--- a/crates/rpc/proto/zed.proto
+++ b/crates/rpc/proto/zed.proto
@@ -216,6 +216,7 @@ enum ErrorCode {
     BadPublicNesting = 9;
     CircularNesting = 10;
     WrongMoveTarget = 11;
+    UnsharedItem = 12;
 }
 
 message Test {
diff --git a/crates/rpc/src/error.rs b/crates/rpc/src/error.rs
index 97f93e7465..858029a02b 100644
--- a/crates/rpc/src/error.rs
+++ b/crates/rpc/src/error.rs
@@ -80,6 +80,8 @@ pub trait ErrorExt {
     fn error_tag(&self, k: &str) -> Option<&str>;
     /// to_proto() converts the error into a proto::Error
     fn to_proto(&self) -> proto::Error;
+    ///
+    fn cloned(&self) -> anyhow::Error;
 }
 
 impl ErrorExt for anyhow::Error {
@@ -106,6 +108,14 @@ impl ErrorExt for anyhow::Error {
             ErrorCode::Internal.message(format!("{}", self)).to_proto()
         }
     }
+
+    fn cloned(&self) -> anyhow::Error {
+        if let Some(rpc_error) = self.downcast_ref::<RpcError>() {
+            rpc_error.cloned()
+        } else {
+            anyhow::anyhow!("{}", self)
+        }
+    }
 }
 
 impl From<proto::ErrorCode> for anyhow::Error {
@@ -189,6 +199,10 @@ impl ErrorExt for RpcError {
             tags: self.tags.clone(),
         }
     }
+
+    fn cloned(&self) -> anyhow::Error {
+        self.clone().into()
+    }
 }
 
 impl std::error::Error for RpcError {
diff --git a/crates/workspace/src/pane_group.rs b/crates/workspace/src/pane_group.rs
index 6963ed3cae..75db85f4a9 100644
--- a/crates/workspace/src/pane_group.rs
+++ b/crates/workspace/src/pane_group.rs
@@ -176,11 +176,19 @@ impl Member {
                     return div().into_any();
                 }
 
-                let leader = follower_states.get(pane).and_then(|state| {
+                let follower_state = follower_states.get(pane);
+
+                let leader = follower_state.and_then(|state| {
                     let room = active_call?.read(cx).room()?.read(cx);
                     room.remote_participant_for_peer_id(state.leader_id)
                 });
 
+                let is_in_unshared_view = follower_state.map_or(false, |state| {
+                    state.active_view_id.is_some_and(|view_id| {
+                        !state.items_by_leader_view_id.contains_key(&view_id)
+                    })
+                });
+
                 let mut leader_border = None;
                 let mut leader_status_box = None;
                 let mut leader_join_data = None;
@@ -198,7 +206,14 @@ impl Member {
                             project_id: leader_project_id,
                         } => {
                             if Some(leader_project_id) == project.read(cx).remote_id() {
-                                None
+                                if is_in_unshared_view {
+                                    Some(Label::new(format!(
+                                        "{} is in an unshared pane",
+                                        leader.user.github_login
+                                    )))
+                                } else {
+                                    None
+                                }
                             } else {
                                 leader_join_data = Some((leader_project_id, leader.user.id));
                                 Some(Label::new(format!(

From a588a7dd4d1667592242642f9f965e0cdb41c950 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Wed, 31 Jan 2024 16:21:33 -0500
Subject: [PATCH 112/372] Fix some typos in comments (#7169)

This PR fixes a couple typos I found in some comments/doc comments.

Release Notes:

- N/A
---
 crates/command_palette/src/command_palette.rs | 2 +-
 crates/editor/src/editor.rs                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/command_palette/src/command_palette.rs b/crates/command_palette/src/command_palette.rs
index 6851f260e7..5e7f5938ef 100644
--- a/crates/command_palette/src/command_palette.rs
+++ b/crates/command_palette/src/command_palette.rs
@@ -137,7 +137,7 @@ impl Clone for Command {
 
 /// Hit count for each command in the palette.
 /// We only account for commands triggered directly via command palette and not by e.g. keystrokes because
-/// if an user already knows a keystroke for a command, they are unlikely to use a command palette to look for it.
+/// if a user already knows a keystroke for a command, they are unlikely to use a command palette to look for it.
 #[derive(Default)]
 struct HitCounts(HashMap<String, usize>);
 
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 47731b510d..decde1e8b8 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -2310,7 +2310,7 @@ impl Editor {
                 let mut bracket_pair = None;
                 let mut is_bracket_pair_start = false;
                 if !text.is_empty() {
-                    // `text` can be empty when an user is using IME (e.g. Chinese Wubi Simplified)
+                    // `text` can be empty when a user is using IME (e.g. Chinese Wubi Simplified)
                     //  and they are removing the character that triggered IME popup.
                     for (pair, enabled) in scope.brackets() {
                         if enabled && pair.close && pair.start.ends_with(text.as_ref()) {

From 5b7b5bfea59906ea76c7f5f02e0df39c0e630b79 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 31 Jan 2024 15:44:38 -0700
Subject: [PATCH 113/372] Add a checksum telemetry request (#7168)

We're seeing a bit of nonsense on telemetry. Although the checksum seed
isn't secret per-se, it does make sending nonsense a little more effort.

Release Notes:

- N/A
---
 .github/workflows/ci.yml       |  1 +
 Cargo.lock                     |  2 ++
 crates/client/Cargo.toml       |  2 ++
 crates/client/src/telemetry.rs | 38 +++++++++++++++++++++++++++++-----
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bbaa12ecdd..9d8cf6522e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -81,6 +81,7 @@ jobs:
       MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
       APPLE_NOTARIZATION_USERNAME: ${{ secrets.APPLE_NOTARIZATION_USERNAME }}
       APPLE_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
+      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
     steps:
       - name: Install Node
         uses: actions/setup-node@v3
diff --git a/Cargo.lock b/Cargo.lock
index 564da956df..ddb47a656a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1367,6 +1367,7 @@ dependencies = [
  "image",
  "lazy_static",
  "log",
+ "once_cell",
  "parking_lot 0.11.2",
  "postage",
  "rand 0.8.5",
@@ -1377,6 +1378,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "settings",
+ "sha2 0.10.7",
  "smol",
  "sum_tree",
  "sysinfo",
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
index 37d617821e..9bf04caa71 100644
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -32,6 +32,7 @@ futures.workspace = true
 image = "0.23"
 lazy_static.workspace = true
 log.workspace = true
+once_cell = "1.19.0"
 parking_lot.workspace = true
 postage.workspace = true
 rand.workspace = true
@@ -39,6 +40,7 @@ schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
+sha2 = "0.10"
 smol.workspace = true
 sysinfo.workspace = true
 tempfile.workspace = true
diff --git a/crates/client/src/telemetry.rs b/crates/client/src/telemetry.rs
index 1a8627f286..331683d5d1 100644
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -4,16 +4,19 @@ use crate::TelemetrySettings;
 use chrono::{DateTime, Utc};
 use futures::Future;
 use gpui::{AppContext, AppMetadata, BackgroundExecutor, Task};
+use once_cell::sync::Lazy;
 use parking_lot::Mutex;
 use release_channel::ReleaseChannel;
 use serde::Serialize;
 use settings::{Settings, SettingsStore};
-use std::{env, io::Write, mem, path::PathBuf, sync::Arc, time::Duration};
+use sha2::{Digest, Sha256};
+use std::io::Write;
+use std::{env, mem, path::PathBuf, sync::Arc, time::Duration};
 use sysinfo::{
     CpuRefreshKind, Pid, PidExt, ProcessExt, ProcessRefreshKind, RefreshKind, System, SystemExt,
 };
 use tempfile::NamedTempFile;
-use util::http::{HttpClient, ZedHttpClient};
+use util::http::{self, HttpClient, Method, ZedHttpClient};
 #[cfg(not(debug_assertions))]
 use util::ResultExt;
 use util::TryFutureExt;
@@ -142,6 +145,13 @@ const FLUSH_INTERVAL: Duration = Duration::from_secs(1);
 #[cfg(not(debug_assertions))]
 const FLUSH_INTERVAL: Duration = Duration::from_secs(60 * 5);
 
+static ZED_CLIENT_CHECKSUM_SEED: Lazy<Vec<u8>> = Lazy::new(|| {
+    option_env!("ZED_CLIENT_CHECKSUM_SEED")
+        .unwrap_or("development-checksum-seed")
+        .as_bytes()
+        .into()
+});
+
 impl Telemetry {
     pub fn new(client: Arc<ZedHttpClient>, cx: &mut AppContext) -> Arc<Self> {
         let release_channel =
@@ -540,9 +550,27 @@ impl Telemetry {
                         serde_json::to_writer(&mut json_bytes, &request_body)?;
                     }
 
-                    this.http_client
-                        .post_json(&this.http_client.zed_url("/api/events"), json_bytes.into())
-                        .await?;
+                    let mut summer = Sha256::new();
+                    summer.update(&*ZED_CLIENT_CHECKSUM_SEED);
+                    summer.update(&json_bytes);
+                    summer.update(&*ZED_CLIENT_CHECKSUM_SEED);
+                    let mut checksum = String::new();
+                    for byte in summer.finalize().as_slice() {
+                        use std::fmt::Write;
+                        write!(&mut checksum, "{:02x}", byte).unwrap();
+                    }
+
+                    let request = http::Request::builder()
+                        .method(Method::POST)
+                        .uri(&this.http_client.zed_url("/api/events"))
+                        .header("Content-Type", "text/plain")
+                        .header("x-zed-checksum", checksum)
+                        .body(json_bytes.into());
+
+                    let response = this.http_client.send(request?).await?;
+                    if response.status() != 200 {
+                        log::error!("Failed to send events: HTTP {:?}", response.status());
+                    }
                     anyhow::Ok(())
                 }
                 .log_err(),

From 21875130267189df0b0bf3e4a7d33acab165c84b Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 31 Jan 2024 15:46:24 -0700
Subject: [PATCH 114/372] app version to server (#7130)

- Send app version and release stage to collab on connect
- Read the new header on the server

Release Notes:

- Added the ability to collaborate with users on different releases of
Zed.
---
 Cargo.lock                                |  1 +
 crates/auto_update/src/auto_update.rs     | 39 ++++++++++---------
 crates/channel/src/channel_store_tests.rs |  1 +
 crates/client/src/client.rs               | 19 ++++++----
 crates/collab/Cargo.toml                  |  1 +
 crates/collab/src/rpc.rs                  | 30 +++++++++++++++
 crates/collab/src/tests/test_server.rs    |  1 +
 crates/feedback/src/system_specs.rs       | 22 ++++-------
 crates/gpui/src/platform.rs               | 45 ++--------------------
 crates/release_channel/src/lib.rs         | 37 +++++++++++++++---
 crates/settings/src/settings_store.rs     |  4 +-
 crates/util/src/semantic_version.rs       | 46 +++++++++++++++++++++++
 crates/util/src/util.rs                   |  2 +
 crates/zed/src/main.rs                    | 14 ++++---
 14 files changed, 166 insertions(+), 96 deletions(-)
 create mode 100644 crates/util/src/semantic_version.rs

diff --git a/Cargo.lock b/Cargo.lock
index ddb47a656a..ee03a44288 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1486,6 +1486,7 @@ dependencies = [
  "prometheus",
  "prost 0.8.0",
  "rand 0.8.5",
+ "release_channel",
  "reqwest",
  "rpc",
  "scrypt",
diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs
index d04acb10f1..cb08871c6d 100644
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -1,7 +1,7 @@
 mod update_notification;
 
 use anyhow::{anyhow, Context, Result};
-use client::{Client, TelemetrySettings, ZED_APP_PATH, ZED_APP_VERSION};
+use client::{Client, TelemetrySettings, ZED_APP_PATH};
 use db::kvp::KEY_VALUE_STORE;
 use db::RELEASE_CHANNEL;
 use gpui::{
@@ -108,29 +108,28 @@ pub fn init(http_client: Arc<ZedHttpClient>, cx: &mut AppContext) {
     })
     .detach();
 
-    if let Some(version) = ZED_APP_VERSION.or_else(|| cx.app_metadata().app_version) {
-        let auto_updater = cx.new_model(|cx| {
-            let updater = AutoUpdater::new(version, http_client);
+    let version = release_channel::AppVersion::global(cx);
+    let auto_updater = cx.new_model(|cx| {
+        let updater = AutoUpdater::new(version, http_client);
 
-            let mut update_subscription = AutoUpdateSetting::get_global(cx)
-                .0
-                .then(|| updater.start_polling(cx));
+        let mut update_subscription = AutoUpdateSetting::get_global(cx)
+            .0
+            .then(|| updater.start_polling(cx));
 
-            cx.observe_global::<SettingsStore>(move |updater, cx| {
-                if AutoUpdateSetting::get_global(cx).0 {
-                    if update_subscription.is_none() {
-                        update_subscription = Some(updater.start_polling(cx))
-                    }
-                } else {
-                    update_subscription.take();
+        cx.observe_global::<SettingsStore>(move |updater, cx| {
+            if AutoUpdateSetting::get_global(cx).0 {
+                if update_subscription.is_none() {
+                    update_subscription = Some(updater.start_polling(cx))
                 }
-            })
-            .detach();
+            } else {
+                update_subscription.take();
+            }
+        })
+        .detach();
 
-            updater
-        });
-        cx.set_global(GlobalAutoUpdate(Some(auto_updater)));
-    }
+        updater
+    });
+    cx.set_global(GlobalAutoUpdate(Some(auto_updater)));
 }
 
 pub fn check(_: &Check, cx: &mut WindowContext) {
diff --git a/crates/channel/src/channel_store_tests.rs b/crates/channel/src/channel_store_tests.rs
index 6450736d34..57b9d20710 100644
--- a/crates/channel/src/channel_store_tests.rs
+++ b/crates/channel/src/channel_store_tests.rs
@@ -329,6 +329,7 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
 fn init_test(cx: &mut AppContext) -> Model<ChannelStore> {
     let settings_store = SettingsStore::test(cx);
     cx.set_global(settings_store);
+    release_channel::init("0.0.0", cx);
     client::init_settings(cx);
 
     let http = FakeHttpClient::with_404_response();
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index 3b182e25ca..dc95d0ca67 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -15,14 +15,13 @@ use futures::{
     TryFutureExt as _, TryStreamExt,
 };
 use gpui::{
-    actions, AnyModel, AnyWeakModel, AppContext, AsyncAppContext, Global, Model, SemanticVersion,
-    Task, WeakModel,
+    actions, AnyModel, AnyWeakModel, AppContext, AsyncAppContext, Global, Model, Task, WeakModel,
 };
 use lazy_static::lazy_static;
 use parking_lot::RwLock;
 use postage::watch;
 use rand::prelude::*;
-use release_channel::ReleaseChannel;
+use release_channel::{AppVersion, ReleaseChannel};
 use rpc::proto::{AnyTypedEnvelope, EntityMessage, EnvelopedMessage, PeerId, RequestMessage};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -58,9 +57,6 @@ lazy_static! {
     pub static ref ADMIN_API_TOKEN: Option<String> = std::env::var("ZED_ADMIN_API_TOKEN")
         .ok()
         .and_then(|s| if s.is_empty() { None } else { Some(s) });
-    pub static ref ZED_APP_VERSION: Option<SemanticVersion> = std::env::var("ZED_APP_VERSION")
-        .ok()
-        .and_then(|v| v.parse().ok());
     pub static ref ZED_APP_PATH: Option<PathBuf> =
         std::env::var("ZED_APP_PATH").ok().map(PathBuf::from);
     pub static ref ZED_ALWAYS_ACTIVE: bool =
@@ -1011,13 +1007,22 @@ impl Client {
             .update(|cx| ReleaseChannel::try_global(cx))
             .ok()
             .flatten();
+        let app_version = cx
+            .update(|cx| AppVersion::global(cx).to_string())
+            .ok()
+            .unwrap_or_default();
 
         let request = Request::builder()
             .header(
                 "Authorization",
                 format!("{} {}", credentials.user_id, credentials.access_token),
             )
-            .header("x-zed-protocol-version", rpc::PROTOCOL_VERSION);
+            .header("x-zed-protocol-version", rpc::PROTOCOL_VERSION)
+            .header("x-zed-app-version", app_version)
+            .header(
+                "x-zed-release-channel",
+                release_channel.map(|r| r.dev_name()).unwrap_or("unknown"),
+            );
 
         let http = self.http.clone();
         cx.background_executor().spawn(async move {
diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml
index a271e1a8f3..c2809d30b7 100644
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -61,6 +61,7 @@ util = { path = "../util" }
 uuid.workspace = true
 
 [dev-dependencies]
+release_channel = { path = "../release_channel" }
 async-trait.workspace = true
 audio = { path = "../audio" }
 call = { path = "../call", features = ["test-support"] }
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index cb758f0cac..c97c283b2f 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -64,6 +64,7 @@ use time::OffsetDateTime;
 use tokio::sync::{watch, Semaphore};
 use tower::ServiceBuilder;
 use tracing::{field, info_span, instrument, Instrument};
+use util::SemanticVersion;
 
 pub const RECONNECT_TIMEOUT: Duration = Duration::from_secs(30);
 pub const CLEANUP_TIMEOUT: Duration = Duration::from_secs(10);
@@ -795,6 +796,7 @@ fn broadcast<F>(
 
 lazy_static! {
     static ref ZED_PROTOCOL_VERSION: HeaderName = HeaderName::from_static("x-zed-protocol-version");
+    static ref ZED_APP_VERSION: HeaderName = HeaderName::from_static("x-zed-app-version");
 }
 
 pub struct ProtocolVersion(u32);
@@ -824,6 +826,32 @@ impl Header for ProtocolVersion {
     }
 }
 
+pub struct AppVersionHeader(SemanticVersion);
+impl Header for AppVersionHeader {
+    fn name() -> &'static HeaderName {
+        &ZED_APP_VERSION
+    }
+
+    fn decode<'i, I>(values: &mut I) -> Result<Self, axum::headers::Error>
+    where
+        Self: Sized,
+        I: Iterator<Item = &'i axum::http::HeaderValue>,
+    {
+        let version = values
+            .next()
+            .ok_or_else(axum::headers::Error::invalid)?
+            .to_str()
+            .map_err(|_| axum::headers::Error::invalid())?
+            .parse()
+            .map_err(|_| axum::headers::Error::invalid())?;
+        Ok(Self(version))
+    }
+
+    fn encode<E: Extend<axum::http::HeaderValue>>(&self, values: &mut E) {
+        values.extend([self.0.to_string().parse().unwrap()]);
+    }
+}
+
 pub fn routes(server: Arc<Server>) -> Router<Body> {
     Router::new()
         .route("/rpc", get(handle_websocket_request))
@@ -838,6 +866,7 @@ pub fn routes(server: Arc<Server>) -> Router<Body> {
 
 pub async fn handle_websocket_request(
     TypedHeader(ProtocolVersion(protocol_version)): TypedHeader<ProtocolVersion>,
+    _app_version_header: Option<TypedHeader<AppVersionHeader>>,
     ConnectInfo(socket_address): ConnectInfo<SocketAddr>,
     Extension(server): Extension<Arc<Server>>,
     Extension(user): Extension<User>,
@@ -851,6 +880,7 @@ pub async fn handle_websocket_request(
         )
             .into_response();
     }
+
     let socket_address = socket_address.to_string();
     ws.on_upgrade(move |socket| {
         use util::ResultExt;
diff --git a/crates/collab/src/tests/test_server.rs b/crates/collab/src/tests/test_server.rs
index e10f03605a..13fd15e3f4 100644
--- a/crates/collab/src/tests/test_server.rs
+++ b/crates/collab/src/tests/test_server.rs
@@ -153,6 +153,7 @@ impl TestServer {
             }
             let settings = SettingsStore::test(cx);
             cx.set_global(settings);
+            release_channel::init("0.0.0", cx);
             client::init_settings(cx);
         });
 
diff --git a/crates/feedback/src/system_specs.rs b/crates/feedback/src/system_specs.rs
index 1d1fc93841..2e4535d189 100644
--- a/crates/feedback/src/system_specs.rs
+++ b/crates/feedback/src/system_specs.rs
@@ -1,14 +1,13 @@
-use client::ZED_APP_VERSION;
 use gpui::AppContext;
 use human_bytes::human_bytes;
-use release_channel::ReleaseChannel;
+use release_channel::{AppVersion, ReleaseChannel};
 use serde::Serialize;
 use std::{env, fmt::Display};
 use sysinfo::{RefreshKind, System, SystemExt};
 
 #[derive(Clone, Debug, Serialize)]
 pub struct SystemSpecs {
-    app_version: Option<String>,
+    app_version: String,
     release_channel: &'static str,
     os_name: &'static str,
     os_version: Option<String>,
@@ -18,9 +17,7 @@ pub struct SystemSpecs {
 
 impl SystemSpecs {
     pub fn new(cx: &AppContext) -> Self {
-        let app_version = ZED_APP_VERSION
-            .or_else(|| cx.app_metadata().app_version)
-            .map(|v| v.to_string());
+        let app_version = AppVersion::global(cx).to_string();
         let release_channel = ReleaseChannel::global(cx).display_name();
         let os_name = cx.app_metadata().os_name;
         let system = System::new_with_specifics(RefreshKind::new().with_memory());
@@ -48,18 +45,15 @@ impl Display for SystemSpecs {
             Some(os_version) => format!("OS: {} {}", self.os_name, os_version),
             None => format!("OS: {}", self.os_name),
         };
-        let app_version_information = self
-            .app_version
-            .as_ref()
-            .map(|app_version| format!("Zed: v{} ({})", app_version, self.release_channel));
+        let app_version_information =
+            format!("Zed: v{} ({})", self.app_version, self.release_channel);
         let system_specs = [
             app_version_information,
-            Some(os_information),
-            Some(format!("Memory: {}", human_bytes(self.memory as f64))),
-            Some(format!("Architecture: {}", self.architecture)),
+            os_information,
+            format!("Memory: {}", human_bytes(self.memory as f64)),
+            format!("Architecture: {}", self.architecture),
         ]
         .into_iter()
-        .flatten()
         .collect::<Vec<String>>()
         .join("\n");
 
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 67c3a70ccb..df886fc4d6 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -11,7 +11,7 @@ use crate::{
     Pixels, PlatformInput, Point, RenderGlyphParams, RenderImageParams, RenderSvgParams, Scene,
     SharedString, Size, Task, TaskLabel, WindowContext,
 };
-use anyhow::{anyhow, Result};
+use anyhow::Result;
 use async_task::Runnable;
 use futures::channel::oneshot;
 use parking::Unparker;
@@ -23,11 +23,10 @@ use std::hash::{Hash, Hasher};
 use std::time::Duration;
 use std::{
     any::Any,
-    fmt::{self, Debug, Display},
+    fmt::{self, Debug},
     ops::Range,
     path::{Path, PathBuf},
     rc::Rc,
-    str::FromStr,
     sync::Arc,
 };
 use uuid::Uuid;
@@ -39,6 +38,7 @@ pub(crate) use mac::*;
 #[cfg(any(test, feature = "test-support"))]
 pub(crate) use test::*;
 use time::UtcOffset;
+pub use util::SemanticVersion;
 
 #[cfg(target_os = "macos")]
 pub(crate) fn current_platform() -> Rc<dyn Platform> {
@@ -697,45 +697,6 @@ impl Default for CursorStyle {
     }
 }
 
-/// A datastructure representing a semantic version number
-#[derive(Clone, Copy, Debug, Default, Eq, Ord, PartialEq, PartialOrd, Serialize)]
-pub struct SemanticVersion {
-    major: usize,
-    minor: usize,
-    patch: usize,
-}
-
-impl FromStr for SemanticVersion {
-    type Err = anyhow::Error;
-
-    fn from_str(s: &str) -> Result<Self> {
-        let mut components = s.trim().split('.');
-        let major = components
-            .next()
-            .ok_or_else(|| anyhow!("missing major version number"))?
-            .parse()?;
-        let minor = components
-            .next()
-            .ok_or_else(|| anyhow!("missing minor version number"))?
-            .parse()?;
-        let patch = components
-            .next()
-            .ok_or_else(|| anyhow!("missing patch version number"))?
-            .parse()?;
-        Ok(Self {
-            major,
-            minor,
-            patch,
-        })
-    }
-}
-
-impl Display for SemanticVersion {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}.{}.{}", self.major, self.minor, self.patch)
-    }
-}
-
 /// A clipboard item that should be copied to the clipboard
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct ClipboardItem {
diff --git a/crates/release_channel/src/lib.rs b/crates/release_channel/src/lib.rs
index 410b02868e..e83ef0e069 100644
--- a/crates/release_channel/src/lib.rs
+++ b/crates/release_channel/src/lib.rs
@@ -1,9 +1,9 @@
-use gpui::{AppContext, Global};
+use gpui::{AppContext, Global, SemanticVersion};
 use once_cell::sync::Lazy;
 use std::env;
 
 #[doc(hidden)]
-pub static RELEASE_CHANNEL_NAME: Lazy<String> = if cfg!(debug_assertions) {
+static RELEASE_CHANNEL_NAME: Lazy<String> = if cfg!(debug_assertions) {
     Lazy::new(|| {
         env::var("ZED_RELEASE_CHANNEL")
             .unwrap_or_else(|_| include_str!("../../zed/RELEASE_CHANNEL").trim().to_string())
@@ -11,6 +11,7 @@ pub static RELEASE_CHANNEL_NAME: Lazy<String> = if cfg!(debug_assertions) {
 } else {
     Lazy::new(|| include_str!("../../zed/RELEASE_CHANNEL").trim().to_string())
 };
+
 #[doc(hidden)]
 pub static RELEASE_CHANNEL: Lazy<ReleaseChannel> =
     Lazy::new(|| match RELEASE_CHANNEL_NAME.as_str() {
@@ -39,6 +40,29 @@ impl AppCommitSha {
     }
 }
 
+struct GlobalAppVersion(SemanticVersion);
+
+impl Global for GlobalAppVersion {}
+
+pub struct AppVersion;
+
+impl AppVersion {
+    pub fn init(pkg_version: &str, cx: &mut AppContext) {
+        let version = if let Some(from_env) = env::var("ZED_APP_VERSION").ok() {
+            from_env.parse().expect("invalid ZED_APP_VERSION")
+        } else {
+            cx.app_metadata()
+                .app_version
+                .unwrap_or_else(|| pkg_version.parse().expect("invalid version in Cargo.toml"))
+        };
+        cx.set_global(GlobalAppVersion(version))
+    }
+
+    pub fn global(cx: &AppContext) -> SemanticVersion {
+        cx.global::<GlobalAppVersion>().0
+    }
+}
+
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Default)]
 pub enum ReleaseChannel {
     #[default]
@@ -52,11 +76,12 @@ struct GlobalReleaseChannel(ReleaseChannel);
 
 impl Global for GlobalReleaseChannel {}
 
-impl ReleaseChannel {
-    pub fn init(cx: &mut AppContext) {
-        cx.set_global(GlobalReleaseChannel(*RELEASE_CHANNEL))
-    }
+pub fn init(pkg_version: &str, cx: &mut AppContext) {
+    AppVersion::init(pkg_version, cx);
+    cx.set_global(GlobalReleaseChannel(*RELEASE_CHANNEL))
+}
 
+impl ReleaseChannel {
     pub fn global(cx: &AppContext) -> Self {
         cx.global::<GlobalReleaseChannel>().0
     }
diff --git a/crates/settings/src/settings_store.rs b/crates/settings/src/settings_store.rs
index 7398876137..116dc1520f 100644
--- a/crates/settings/src/settings_store.rs
+++ b/crates/settings/src/settings_store.rs
@@ -210,7 +210,7 @@ impl SettingsStore {
 
             if let Some(release_settings) = &self
                 .raw_user_settings
-                .get(&*release_channel::RELEASE_CHANNEL_NAME)
+                .get(&*release_channel::RELEASE_CHANNEL.dev_name())
             {
                 if let Some(release_settings) = setting_value
                     .deserialize_setting(&release_settings)
@@ -543,7 +543,7 @@ impl SettingsStore {
 
             if let Some(release_settings) = &self
                 .raw_user_settings
-                .get(&*release_channel::RELEASE_CHANNEL_NAME)
+                .get(&*release_channel::RELEASE_CHANNEL.dev_name())
             {
                 if let Some(release_settings) = setting_value
                     .deserialize_setting(&release_settings)
diff --git a/crates/util/src/semantic_version.rs b/crates/util/src/semantic_version.rs
new file mode 100644
index 0000000000..f5e4562adf
--- /dev/null
+++ b/crates/util/src/semantic_version.rs
@@ -0,0 +1,46 @@
+use std::{
+    fmt::{self, Display},
+    str::FromStr,
+};
+
+use anyhow::{anyhow, Result};
+use serde::Serialize;
+
+/// A datastructure representing a semantic version number
+#[derive(Clone, Copy, Debug, Default, Eq, Ord, PartialEq, PartialOrd, Serialize)]
+pub struct SemanticVersion {
+    pub major: usize,
+    pub minor: usize,
+    pub patch: usize,
+}
+
+impl FromStr for SemanticVersion {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self> {
+        let mut components = s.trim().split('.');
+        let major = components
+            .next()
+            .ok_or_else(|| anyhow!("missing major version number"))?
+            .parse()?;
+        let minor = components
+            .next()
+            .ok_or_else(|| anyhow!("missing minor version number"))?
+            .parse()?;
+        let patch = components
+            .next()
+            .ok_or_else(|| anyhow!("missing patch version number"))?
+            .parse()?;
+        Ok(Self {
+            major,
+            minor,
+            patch,
+        })
+    }
+}
+
+impl Display for SemanticVersion {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}.{}.{}", self.major, self.minor, self.patch)
+    }
+}
diff --git a/crates/util/src/util.rs b/crates/util/src/util.rs
index b1205aa109..30f2628482 100644
--- a/crates/util/src/util.rs
+++ b/crates/util/src/util.rs
@@ -3,6 +3,7 @@ pub mod fs;
 pub mod github;
 pub mod http;
 pub mod paths;
+mod semantic_version;
 #[cfg(any(test, feature = "test-support"))]
 pub mod test;
 
@@ -10,6 +11,7 @@ pub use backtrace::Backtrace;
 use futures::Future;
 use lazy_static::lazy_static;
 use rand::{seq::SliceRandom, Rng};
+pub use semantic_version::SemanticVersion;
 use std::{
     borrow::Cow,
     cmp::{self, Ordering},
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 97ee6d1c68..a7d7b42c91 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -120,7 +120,7 @@ fn main() {
     });
 
     app.run(move |cx| {
-        ReleaseChannel::init(cx);
+        release_channel::init(env!("CARGO_PKG_VERSION"), cx);
         if let Some(build_sha) = option_env!("ZED_COMMIT_SHA") {
             AppCommitSha::set_global(AppCommitSha(build_sha.into()), cx);
         }
@@ -608,9 +608,13 @@ fn init_panic_hook(app: &App, installation_id: Option<String>, session_id: Strin
             std::process::exit(-1);
         }
 
-        let app_version = client::ZED_APP_VERSION
-            .or(app_metadata.app_version)
-            .map_or("dev".to_string(), |v| v.to_string());
+        let app_version = if let Some(version) = app_metadata.app_version {
+            version.to_string()
+        } else {
+            option_env!("CARGO_PKG_VERSION")
+                .unwrap_or("dev")
+                .to_string()
+        };
 
         let backtrace = Backtrace::new();
         let mut backtrace = backtrace
@@ -639,7 +643,7 @@ fn init_panic_hook(app: &App, installation_id: Option<String>, session_id: Strin
                 file: location.file().into(),
                 line: location.line(),
             }),
-            app_version: app_version.clone(),
+            app_version: app_version.to_string(),
             release_channel: RELEASE_CHANNEL.display_name().into(),
             os_name: app_metadata.os_name.into(),
             os_version: app_metadata

From c4083c3cf6e603298f4048d07eb321867c4151b9 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Wed, 31 Jan 2024 18:17:31 -0500
Subject: [PATCH 115/372] Watch the themes directory for changes (#7173)

This PR makes Zed watch the themes directory for changes.

When theme files are added or modified, we reload the theme and apply
any changes to Zed.

Release Notes:

- Added live reloading for the themes directory.
---
 crates/theme/src/registry.rs |  22 ++++---
 crates/zed/src/main.rs       | 107 +++++++++++++++++++++++++----------
 2 files changed, 91 insertions(+), 38 deletions(-)

diff --git a/crates/theme/src/registry.rs b/crates/theme/src/registry.rs
index 2bbb5c6120..fac119ff1d 100644
--- a/crates/theme/src/registry.rs
+++ b/crates/theme/src/registry.rs
@@ -255,19 +255,23 @@ impl ThemeRegistry {
                 continue;
             };
 
-            let Some(reader) = fs.open_sync(&theme_path).await.log_err() else {
-                continue;
-            };
-
-            let Some(theme) = serde_json_lenient::from_reader(reader).log_err() else {
-                continue;
-            };
-
-            self.insert_user_theme_families([theme]);
+            self.load_user_theme(&theme_path, fs.clone())
+                .await
+                .log_err();
         }
 
         Ok(())
     }
+
+    /// Loads the user theme from the specified path and adds it to the registry.
+    pub async fn load_user_theme(&self, theme_path: &Path, fs: Arc<dyn Fs>) -> Result<()> {
+        let reader = fs.open_sync(&theme_path).await?;
+        let theme = serde_json_lenient::from_reader(reader)?;
+
+        self.insert_user_theme_families([theme]);
+
+        Ok(())
+    }
 }
 
 impl Default for ThemeRegistry {
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index a7d7b42c91..a2436ffb5d 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -11,6 +11,7 @@ use db::kvp::KEY_VALUE_STORE;
 use editor::Editor;
 use env_logger::Builder;
 use fs::RealFs;
+use fsevent::StreamFlags;
 use futures::StreamExt;
 use gpui::{App, AppContext, AsyncAppContext, Context, SemanticVersion, Task};
 use isahc::{prelude::Configurable, Request};
@@ -171,35 +172,8 @@ fn main() {
         );
         assistant::init(cx);
 
-        // TODO: Should we be loading the themes in a different spot?
-        cx.spawn({
-            let fs = fs.clone();
-            |cx| async move {
-                if let Some(theme_registry) =
-                    cx.update(|cx| ThemeRegistry::global(cx).clone()).log_err()
-                {
-                    if let Some(()) = theme_registry
-                        .load_user_themes(&paths::THEMES_DIR.clone(), fs)
-                        .await
-                        .log_err()
-                    {
-                        cx.update(|cx| {
-                            let mut theme_settings = ThemeSettings::get_global(cx).clone();
-
-                            if let Some(requested_theme) = theme_settings.requested_theme.clone() {
-                                if let Some(_theme) =
-                                    theme_settings.switch_theme(&requested_theme, cx)
-                                {
-                                    ThemeSettings::override_global(theme_settings, cx);
-                                }
-                            }
-                        })
-                        .log_err();
-                    }
-                }
-            }
-        })
-        .detach();
+        load_user_themes_in_background(fs.clone(), cx);
+        watch_themes(fs.clone(), cx);
 
         cx.spawn(|_| watch_languages(fs.clone(), languages.clone()))
             .detach();
@@ -903,6 +877,81 @@ fn load_embedded_fonts(cx: &AppContext) {
         .unwrap();
 }
 
+/// Spawns a background task to load the user themes from the themes directory.
+fn load_user_themes_in_background(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {
+    cx.spawn({
+        let fs = fs.clone();
+        |cx| async move {
+            if let Some(theme_registry) =
+                cx.update(|cx| ThemeRegistry::global(cx).clone()).log_err()
+            {
+                if let Some(()) = theme_registry
+                    .load_user_themes(&paths::THEMES_DIR.clone(), fs)
+                    .await
+                    .log_err()
+                {
+                    cx.update(|cx| {
+                        let mut theme_settings = ThemeSettings::get_global(cx).clone();
+
+                        if let Some(requested_theme) = theme_settings.requested_theme.clone() {
+                            if let Some(_theme) = theme_settings.switch_theme(&requested_theme, cx)
+                            {
+                                ThemeSettings::override_global(theme_settings, cx);
+                            }
+                        }
+                    })
+                    .log_err();
+                }
+            }
+        }
+    })
+    .detach();
+}
+
+/// Spawns a background task to watch the themes directory for changes.
+fn watch_themes(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {
+    cx.spawn(|cx| async move {
+        let mut events = fs
+            .watch(&paths::THEMES_DIR.clone(), Duration::from_millis(100))
+            .await;
+
+        while let Some(events) = events.next().await {
+            for event in events {
+                if event.flags.contains(StreamFlags::ITEM_REMOVED) {
+                    // Theme was removed, don't need to reload.
+                    // We may want to remove the theme from the registry, in this case.
+                } else {
+                    if let Some(theme_registry) =
+                        cx.update(|cx| ThemeRegistry::global(cx).clone()).log_err()
+                    {
+                        if let Some(()) = theme_registry
+                            .load_user_theme(&event.path, fs.clone())
+                            .await
+                            .log_err()
+                        {
+                            cx.update(|cx| {
+                                let mut theme_settings = ThemeSettings::get_global(cx).clone();
+
+                                if let Some(requested_theme) =
+                                    theme_settings.requested_theme.clone()
+                                {
+                                    if let Some(_theme) =
+                                        theme_settings.switch_theme(&requested_theme, cx)
+                                    {
+                                        ThemeSettings::override_global(theme_settings, cx);
+                                    }
+                                }
+                            })
+                            .log_err();
+                        }
+                    }
+                }
+            }
+        }
+    })
+    .detach()
+}
+
 async fn watch_languages(fs: Arc<dyn fs::Fs>, languages: Arc<LanguageRegistry>) {
     let reload_debounce = Duration::from_millis(250);
 

From 3025e5620d249da498043b125f8bb194c4bee1d2 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 31 Jan 2024 16:28:32 -0700
Subject: [PATCH 116/372] Tell the user when screen-sharing fails (#7171)

Release Notes:

- Added an alert when screen-sharing fails
---
 crates/collab_ui/src/collab_ui.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/collab_ui/src/collab_ui.rs b/crates/collab_ui/src/collab_ui.rs
index befdf5db74..76894ec17f 100644
--- a/crates/collab_ui/src/collab_ui.rs
+++ b/crates/collab_ui/src/collab_ui.rs
@@ -14,13 +14,13 @@ pub use collab_panel::CollabPanel;
 pub use collab_titlebar_item::CollabTitlebarItem;
 use gpui::{
     actions, point, AppContext, GlobalPixels, Pixels, PlatformDisplay, Size, Task, WindowBounds,
-    WindowKind, WindowOptions,
+    WindowContext, WindowKind, WindowOptions,
 };
 pub use panel_settings::{
     ChatPanelSettings, CollaborationPanelSettings, NotificationPanelSettings,
 };
 use settings::Settings;
-use workspace::AppState;
+use workspace::{notifications::DetachAndPromptErr, AppState};
 
 actions!(
     collab,
@@ -41,7 +41,7 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) {
     notifications::init(&app_state, cx);
 }
 
-pub fn toggle_screen_sharing(_: &ToggleScreenSharing, cx: &mut AppContext) {
+pub fn toggle_screen_sharing(_: &ToggleScreenSharing, cx: &mut WindowContext) {
     let call = ActiveCall::global(cx).read(cx);
     if let Some(room) = call.room().cloned() {
         let client = call.client();
@@ -64,7 +64,7 @@ pub fn toggle_screen_sharing(_: &ToggleScreenSharing, cx: &mut AppContext) {
                 room.share_screen(cx)
             }
         });
-        toggle_screen_sharing.detach_and_log_err(cx);
+        toggle_screen_sharing.detach_and_prompt_err("Sharing Screen Failed", cx, |e, _| Some(format!("{:?}\n\nPlease check that you have given Zed permissions to record your screen in Settings.", e)));
     }
 }
 

From 2cc2a61c776476ed5f08ade0bb69e553fa3e1772 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 31 Jan 2024 19:10:19 -0700
Subject: [PATCH 117/372] collab 0.44.0

---
 Cargo.lock               | 2 +-
 crates/collab/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ee03a44288..9fcd3a0292 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1440,7 +1440,7 @@ dependencies = [
 
 [[package]]
 name = "collab"
-version = "0.43.0"
+version = "0.44.0"
 dependencies = [
  "anyhow",
  "async-trait",
diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml
index c2809d30b7..0fb8cb929d 100644
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Nathan Sobo <nathan@zed.dev>"]
 default-run = "collab"
 edition = "2021"
 name = "collab"
-version = "0.43.0"
+version = "0.44.0"
 publish = false
 license = "AGPL-3.0-or-later"
 

From aaba98d8ecba934369d15f55d55688d569ca8fbe Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 31 Jan 2024 19:22:58 -0700
Subject: [PATCH 118/372] Debug build (#7176)

Release Notes:

- N/A
---
 script/bundle | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/script/bundle b/script/bundle
index 9c0dddbac4..d1fbeeb9a8 100755
--- a/script/bundle
+++ b/script/bundle
@@ -79,6 +79,11 @@ version_info=$(rustc --version --verbose)
 host_line=$(echo "$version_info" | grep host)
 local_target_triple=${host_line#*: }
 
+if [ -z "$ZED_CLIENT_CHECKSUM_SEED" ]; then
+    echo "Missing ZED_CLIENT_CHECKSUM_SEED environment variable"
+    exit 1
+fi
+
 if [ "$local_arch" = true ]; then
     echo "Building for local target only."
     cargo build ${build_flag} --package ${zed_crate}

From cbc2746d70c840d815894e1d69f6dfd5960f94a5 Mon Sep 17 00:00:00 2001
From: d1y <chenhonzhou@gmail.com>
Date: Thu, 1 Feb 2024 10:27:17 +0800
Subject: [PATCH 119/372] docs: add gitcommit language and update go language
 (#7181)

Release Notes:

- N/A
---
 docs/src/languages/gitcommit.md |  4 ++++
 docs/src/languages/go.md        | 15 +++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 docs/src/languages/gitcommit.md

diff --git a/docs/src/languages/gitcommit.md b/docs/src/languages/gitcommit.md
new file mode 100644
index 0000000000..09f3e3c9e8
--- /dev/null
+++ b/docs/src/languages/gitcommit.md
@@ -0,0 +1,4 @@
+# Git Commit
+
+- Tree Sitter: [tree-sitter-gitcommit](https://github.com/gbprod/tree-sitter-gitcommit)
+- Language Server: N/A
diff --git a/docs/src/languages/go.md b/docs/src/languages/go.md
index 3440d185ba..29924aa746 100644
--- a/docs/src/languages/go.md
+++ b/docs/src/languages/go.md
@@ -2,3 +2,18 @@
 
 - Tree Sitter: [tree-sitter-go](https://github.com/tree-sitter/tree-sitter-go)
 - Language Server: [gopls](https://github.com/golang/tools/tree/master/gopls)
+
+# Go Mod
+
+- Tree Sitter: [tree-sitter-gomod](https://github.com/camdencheek/tree-sitter-go-mod)
+- Language Server: N/A
+
+# Go Sum
+
+TODO: https://github.com/zed-industries/zed/pull/7139
+
+# Go Work
+
+- Tree Sitter:
+[tree-sitter-go-work](https://github.com/d1y/tree-sitter-go-work)
+- Language Server: N/A

From 5e81d780bd76666046681544a3f98bed3afde976 Mon Sep 17 00:00:00 2001
From: lichuan6 <74223747+lichuan6@users.noreply.github.com>
Date: Thu, 1 Feb 2024 11:57:09 +0800
Subject: [PATCH 120/372] Read HTTP proxy from env (#6765)

This PR will use http proxy from env for downloading files.
---
 crates/util/src/http.rs |  2 ++
 crates/util/src/util.rs | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/crates/util/src/http.rs b/crates/util/src/http.rs
index 6218c59c2b..eedb123917 100644
--- a/crates/util/src/http.rs
+++ b/crates/util/src/http.rs
@@ -1,3 +1,4 @@
+use crate::http_proxy_from_env;
 pub use anyhow::{anyhow, Result};
 use futures::future::BoxFuture;
 use isahc::config::{Configurable, RedirectPolicy};
@@ -95,6 +96,7 @@ pub fn client() -> Arc<dyn HttpClient> {
         isahc::HttpClient::builder()
             .connect_timeout(Duration::from_secs(5))
             .low_speed_timeout(100, Duration::from_secs(5))
+            .proxy(http_proxy_from_env())
             .build()
             .unwrap(),
     )
diff --git a/crates/util/src/util.rs b/crates/util/src/util.rs
index 30f2628482..8f7a6fffbd 100644
--- a/crates/util/src/util.rs
+++ b/crates/util/src/util.rs
@@ -44,6 +44,28 @@ pub fn truncate(s: &str, max_chars: usize) -> &str {
     }
 }
 
+pub fn http_proxy_from_env() -> Option<isahc::http::Uri> {
+    macro_rules! try_env {
+        ($($env:literal),+) => {
+            $(
+                if let Ok(env) = std::env::var($env) {
+                    return env.parse::<isahc::http::Uri>().ok();
+                }
+            )+
+        };
+    }
+
+    try_env!(
+        "ALL_PROXY",
+        "all_proxy",
+        "HTTPS_PROXY",
+        "https_proxy",
+        "HTTP_PROXY",
+        "http_proxy"
+    );
+    None
+}
+
 /// Removes characters from the end of the string if its length is greater than `max_chars` and
 /// appends "..." to the string. Returns string unchanged if its length is smaller than max_chars.
 pub fn truncate_and_trailoff(s: &str, max_chars: usize) -> String {

From 3df7da236d54c0011ae85297e76422bf5a5da486 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 31 Jan 2024 21:40:12 -0700
Subject: [PATCH 121/372] Also add proxy to zed http client (#7184)

Follow up to #6765 because I couldn't figure out how to add to that PR.

Release Notes:

- N/A
---
 crates/util/src/http.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/util/src/http.rs b/crates/util/src/http.rs
index eedb123917..aff5093b73 100644
--- a/crates/util/src/http.rs
+++ b/crates/util/src/http.rs
@@ -44,6 +44,7 @@ pub fn zed_client(zed_host: &str) -> Arc<ZedHttpClient> {
             isahc::HttpClient::builder()
                 .connect_timeout(Duration::from_secs(5))
                 .low_speed_timeout(100, Duration::from_secs(5))
+                .proxy(http_proxy_from_env())
                 .build()
                 .unwrap(),
         ),

From 5e64d45194e0cd41f36c62fef82bb7273c30e388 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 31 Jan 2024 22:26:15 -0700
Subject: [PATCH 122/372] Remove links to docs.zed.dev (#7187)

Release Notes:

- N/A
---
 assets/settings/initial_local_settings.json  | 2 +-
 docs/src/configuring_zed__configuring_vim.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/settings/initial_local_settings.json b/assets/settings/initial_local_settings.json
index 82ddf88042..2fc9a473ae 100644
--- a/assets/settings/initial_local_settings.json
+++ b/assets/settings/initial_local_settings.json
@@ -1,5 +1,5 @@
 // Folder-specific settings
 //
 // For a full list of overridable settings, and general information on folder-specific settings,
-// see the documentation: https://docs.zed.dev/configuration/configuring-zed#folder-specific-settings
+// see the documentation: https://zed.dev/docs/configuring-zed#folder-specific-settings
 {}
diff --git a/docs/src/configuring_zed__configuring_vim.md b/docs/src/configuring_zed__configuring_vim.md
index 69388f9c0b..a4ae1e6be5 100644
--- a/docs/src/configuring_zed__configuring_vim.md
+++ b/docs/src/configuring_zed__configuring_vim.md
@@ -50,7 +50,7 @@ Finally, Vim mode's search and replace functionality is backed by Zed's. This me
 
 ## Custom key bindings
 
-Zed does not yet have an equivalent to vim’s `map` command to convert one set of keystrokes into another, however you can bind any sequence of keys to fire any Action documented in the [Key bindings documentation](https://docs.zed.dev/configuration/key-bindings).
+Zed does not yet have an equivalent to vim’s `map` command to convert one set of keystrokes into another, however you can bind any sequence of keys to fire any Action documented in the [Key bindings documentation](https://zed.dev/docs/key-bindings).
 
 You can edit your personal key bindings with `:keymap`.
 For vim-specific shortcuts, you may find the following template a good place to start:

From 3b882918f72aa7b613f2323ebf23b418c628ef03 Mon Sep 17 00:00:00 2001
From: Ares Andrew <ttenx@pm.me>
Date: Thu, 1 Feb 2024 16:59:35 +0800
Subject: [PATCH 123/372] Filter LSP github releases that have no assets to
 properly download LSP servers (#7189)

Fixes https://github.com/zed-industries/zed/issues/7183

Release Notes:

- Filter lsp github releases that have no assets ([7189](https://github.com/zed-industries/zed/issues/7183))
---
 crates/util/src/github.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/util/src/github.rs b/crates/util/src/github.rs
index 720eec845d..fc250be32f 100644
--- a/crates/util/src/github.rs
+++ b/crates/util/src/github.rs
@@ -68,6 +68,6 @@ pub async fn latest_github_release(
 
     releases
         .into_iter()
-        .find(|release| release.pre_release == pre_release)
+        .find(|release| !release.assets.is_empty() && release.pre_release == pre_release)
         .ok_or(anyhow!("Failed to find a release"))
 }

From 8bafc61ef57f8f1807ced6f8b69891c4ee701a7d Mon Sep 17 00:00:00 2001
From: Kieran Gill <kierangilliam@users.noreply.github.com>
Date: Thu, 1 Feb 2024 04:03:09 -0500
Subject: [PATCH 124/372] Add initial markdown preview to Zed (#6958)

Adds a "markdown: open preview" action to open a markdown preview.

https://github.com/zed-industries/zed/assets/18583882/6fd7f009-53f7-4f98-84ea-7dd3f0dd11bf


This PR extends the work done in `crates/rich_text` to render markdown
to also support:

- Variable heading sizes
- Markdown tables
- Code blocks
- Block quotes

## Release Notes

- Added `Markdown: Open preview` action to partially close
([#6789](https://github.com/zed-industries/zed/issues/6789)).

## Known issues that will not be included in this PR

- Images.
- Nested block quotes.
- Footnote Reference.
- Headers highlighting.
- Inline code highlighting (this will need to be implemented in
`rich_text`)
- Checkboxes (`- [ ]` and `- [x]`)
- Syntax highlighting in code blocks.
- Markdown table text alignment.
- Inner markdown URL clicks
---
 Cargo.lock                                    |  21 ++
 Cargo.toml                                    |   2 +
 crates/collab_ui/src/chat_panel.rs            |   2 +-
 crates/language/Cargo.toml                    |   4 +-
 crates/markdown_preview/Cargo.toml            |  32 ++
 crates/markdown_preview/LICENSE-GPL           |   1 +
 .../markdown_preview/src/markdown_preview.rs  |  14 +
 .../src/markdown_preview_view.rs              | 134 +++++++
 .../markdown_preview/src/markdown_renderer.rs | 328 ++++++++++++++++++
 crates/multi_buffer/Cargo.toml                |   2 +-
 crates/rich_text/Cargo.toml                   |   2 +-
 crates/rich_text/src/rich_text.rs             |  11 +-
 crates/zed/Cargo.toml                         |   1 +
 crates/zed/src/main.rs                        |   1 +
 14 files changed, 547 insertions(+), 8 deletions(-)
 create mode 100644 crates/markdown_preview/Cargo.toml
 create mode 120000 crates/markdown_preview/LICENSE-GPL
 create mode 100644 crates/markdown_preview/src/markdown_preview.rs
 create mode 100644 crates/markdown_preview/src/markdown_preview_view.rs
 create mode 100644 crates/markdown_preview/src/markdown_renderer.rs

diff --git a/Cargo.lock b/Cargo.lock
index 9fcd3a0292..cd632175c1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4317,6 +4317,26 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "markdown_preview"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "editor",
+ "gpui",
+ "language",
+ "lazy_static",
+ "log",
+ "menu",
+ "project",
+ "pulldown-cmark",
+ "rich_text",
+ "theme",
+ "ui",
+ "util",
+ "workspace",
+]
+
 [[package]]
 name = "matchers"
 version = "0.1.0"
@@ -10315,6 +10335,7 @@ dependencies = [
  "libc",
  "log",
  "lsp",
+ "markdown_preview",
  "menu",
  "mimalloc",
  "node_runtime",
diff --git a/Cargo.toml b/Cargo.toml
index a954995ac2..00d69c8786 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,6 +42,7 @@ members = [
     "crates/live_kit_client",
     "crates/live_kit_server",
     "crates/lsp",
+    "crates/markdown_preview",
     "crates/media",
     "crates/menu",
     "crates/multi_buffer",
@@ -111,6 +112,7 @@ parking_lot = "0.11.1"
 postage = { version = "0.5", features = ["futures-traits"] }
 pretty_assertions = "1.3.0"
 prost = "0.8"
+pulldown-cmark = { version = "0.9.2", default-features = false }
 rand = "0.8.5"
 refineable = { path = "./crates/refineable" }
 regex = "1.5"
diff --git a/crates/collab_ui/src/chat_panel.rs b/crates/collab_ui/src/chat_panel.rs
index aad22a1e50..88ee461dee 100644
--- a/crates/collab_ui/src/chat_panel.rs
+++ b/crates/collab_ui/src/chat_panel.rs
@@ -453,7 +453,7 @@ impl ChatPanel {
             })
             .collect::<Vec<_>>();
 
-        rich_text::render_markdown(message.body.clone(), &mentions, language_registry, None)
+        rich_text::render_rich_text(message.body.clone(), &mentions, language_registry, None)
     }
 
     fn send(&mut self, _: &Confirm, cx: &mut ViewContext<Self>) {
diff --git a/crates/language/Cargo.toml b/crates/language/Cargo.toml
index cf8801e857..826a8287e5 100644
--- a/crates/language/Cargo.toml
+++ b/crates/language/Cargo.toml
@@ -29,7 +29,7 @@ async-trait.workspace = true
 clock = { path = "../clock" }
 collections = { path = "../collections" }
 futures.workspace = true
-fuzzy = {  path = "../fuzzy" }
+fuzzy = { path = "../fuzzy" }
 git = { path = "../git" }
 globset.workspace = true
 gpui = { path = "../gpui" }
@@ -38,7 +38,6 @@ log.workspace = true
 lsp = { path = "../lsp" }
 parking_lot.workspace = true
 postage.workspace = true
-pulldown-cmark = { version = "0.9.2", default-features = false }
 rand = { workspace = true, optional = true }
 regex.workspace = true
 rpc = { path = "../rpc" }
@@ -55,6 +54,7 @@ text = { path = "../text" }
 theme = { path = "../theme" }
 tree-sitter-rust = { workspace = true, optional = true }
 tree-sitter-typescript = { workspace = true, optional = true }
+pulldown-cmark.workspace = true
 tree-sitter.workspace = true
 unicase = "2.6"
 util = { path = "../util" }
diff --git a/crates/markdown_preview/Cargo.toml b/crates/markdown_preview/Cargo.toml
new file mode 100644
index 0000000000..bb52a64ed6
--- /dev/null
+++ b/crates/markdown_preview/Cargo.toml
@@ -0,0 +1,32 @@
+[package]
+name = "markdown_preview"
+version = "0.1.0"
+edition = "2021"
+publish = false
+license = "GPL-3.0-or-later"
+
+[lib]
+path = "src/markdown_preview.rs"
+
+[features]
+test-support = []
+
+[dependencies]
+editor = { path = "../editor" }
+gpui = { path = "../gpui" }
+language = { path = "../language" }
+menu = { path = "../menu" }
+project = { path = "../project" }
+theme = { path = "../theme" }
+ui = { path = "../ui" }
+util = { path = "../util" }
+workspace = { path = "../workspace" }
+rich_text = { path = "../rich_text" }
+
+anyhow.workspace = true
+lazy_static.workspace = true
+log.workspace = true
+pulldown-cmark.workspace = true
+
+[dev-dependencies]
+editor = { path = "../editor", features = ["test-support"] }
diff --git a/crates/markdown_preview/LICENSE-GPL b/crates/markdown_preview/LICENSE-GPL
new file mode 120000
index 0000000000..89e542f750
--- /dev/null
+++ b/crates/markdown_preview/LICENSE-GPL
@@ -0,0 +1 @@
+../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/markdown_preview/src/markdown_preview.rs b/crates/markdown_preview/src/markdown_preview.rs
new file mode 100644
index 0000000000..84c8ac6245
--- /dev/null
+++ b/crates/markdown_preview/src/markdown_preview.rs
@@ -0,0 +1,14 @@
+use gpui::{actions, AppContext};
+use workspace::Workspace;
+
+pub mod markdown_preview_view;
+pub mod markdown_renderer;
+
+actions!(markdown, [OpenPreview]);
+
+pub fn init(cx: &mut AppContext) {
+    cx.observe_new_views(|workspace: &mut Workspace, cx| {
+        markdown_preview_view::MarkdownPreviewView::register(workspace, cx);
+    })
+    .detach();
+}
diff --git a/crates/markdown_preview/src/markdown_preview_view.rs b/crates/markdown_preview/src/markdown_preview_view.rs
new file mode 100644
index 0000000000..475a9fbaa3
--- /dev/null
+++ b/crates/markdown_preview/src/markdown_preview_view.rs
@@ -0,0 +1,134 @@
+use editor::{Editor, EditorEvent};
+use gpui::{
+    canvas, AnyElement, AppContext, AvailableSpace, EventEmitter, FocusHandle, FocusableView,
+    InteractiveElement, IntoElement, ParentElement, Render, Styled, View, ViewContext,
+};
+use language::LanguageRegistry;
+use std::sync::Arc;
+use ui::prelude::*;
+use workspace::item::Item;
+use workspace::Workspace;
+
+use crate::{markdown_renderer::render_markdown, OpenPreview};
+
+pub struct MarkdownPreviewView {
+    focus_handle: FocusHandle,
+    languages: Arc<LanguageRegistry>,
+    contents: String,
+}
+
+impl MarkdownPreviewView {
+    pub fn register(workspace: &mut Workspace, _cx: &mut ViewContext<Workspace>) {
+        let languages = workspace.app_state().languages.clone();
+
+        workspace.register_action(move |workspace, _: &OpenPreview, cx| {
+            if workspace.has_active_modal(cx) {
+                cx.propagate();
+                return;
+            }
+            let languages = languages.clone();
+            if let Some(editor) = workspace.active_item_as::<Editor>(cx) {
+                let view: View<MarkdownPreviewView> =
+                    cx.new_view(|cx| MarkdownPreviewView::new(editor, languages, cx));
+                workspace.split_item(workspace::SplitDirection::Right, Box::new(view.clone()), cx);
+                cx.notify();
+            }
+        });
+    }
+
+    pub fn new(
+        active_editor: View<Editor>,
+        languages: Arc<LanguageRegistry>,
+        cx: &mut ViewContext<Self>,
+    ) -> Self {
+        let focus_handle = cx.focus_handle();
+
+        cx.subscribe(&active_editor, |this, editor, event: &EditorEvent, cx| {
+            if *event == EditorEvent::Edited {
+                let editor = editor.read(cx);
+                let contents = editor.buffer().read(cx).snapshot(cx).text();
+                this.contents = contents;
+                cx.notify();
+            }
+        })
+        .detach();
+
+        let editor = active_editor.read(cx);
+        let contents = editor.buffer().read(cx).snapshot(cx).text();
+
+        Self {
+            focus_handle,
+            languages,
+            contents,
+        }
+    }
+}
+
+impl FocusableView for MarkdownPreviewView {
+    fn focus_handle(&self, _: &AppContext) -> gpui::FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum PreviewEvent {}
+
+impl EventEmitter<PreviewEvent> for MarkdownPreviewView {}
+
+impl Item for MarkdownPreviewView {
+    type Event = PreviewEvent;
+
+    fn tab_content(
+        &self,
+        _detail: Option<usize>,
+        selected: bool,
+        _cx: &WindowContext,
+    ) -> AnyElement {
+        h_flex()
+            .gap_2()
+            .child(Icon::new(IconName::FileDoc).color(if selected {
+                Color::Default
+            } else {
+                Color::Muted
+            }))
+            .child(Label::new("Markdown preview").color(if selected {
+                Color::Default
+            } else {
+                Color::Muted
+            }))
+            .into_any()
+    }
+
+    fn telemetry_event_text(&self) -> Option<&'static str> {
+        Some("markdown preview")
+    }
+
+    fn to_item_events(_event: &Self::Event, _f: impl FnMut(workspace::item::ItemEvent)) {}
+}
+
+impl Render for MarkdownPreviewView {
+    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
+        let rendered_markdown = v_flex()
+            .items_start()
+            .justify_start()
+            .key_context("MarkdownPreview")
+            .track_focus(&self.focus_handle)
+            .id("MarkdownPreview")
+            .overflow_scroll()
+            .size_full()
+            .bg(cx.theme().colors().editor_background)
+            .p_4()
+            .children(render_markdown(&self.contents, &self.languages, cx));
+
+        div().flex_1().child(
+            canvas(move |bounds, cx| {
+                rendered_markdown.into_any().draw(
+                    bounds.origin,
+                    bounds.size.map(AvailableSpace::Definite),
+                    cx,
+                )
+            })
+            .size_full(),
+        )
+    }
+}
diff --git a/crates/markdown_preview/src/markdown_renderer.rs b/crates/markdown_preview/src/markdown_renderer.rs
new file mode 100644
index 0000000000..d40046863b
--- /dev/null
+++ b/crates/markdown_preview/src/markdown_renderer.rs
@@ -0,0 +1,328 @@
+use std::{ops::Range, sync::Arc};
+
+use gpui::{
+    div, px, rems, AnyElement, DefiniteLength, Div, ElementId, Hsla, ParentElement, SharedString,
+    Styled, StyledText, WindowContext,
+};
+use language::LanguageRegistry;
+use pulldown_cmark::{CodeBlockKind, Event, HeadingLevel, Options, Parser, Tag};
+use rich_text::render_rich_text;
+use theme::{ActiveTheme, Theme};
+use ui::{h_flex, v_flex};
+
+enum TableState {
+    Header,
+    Body,
+}
+
+struct MarkdownTable {
+    header: Vec<Div>,
+    body: Vec<Vec<Div>>,
+    current_row: Vec<Div>,
+    state: TableState,
+    border_color: Hsla,
+}
+
+impl MarkdownTable {
+    fn new(border_color: Hsla) -> Self {
+        Self {
+            header: Vec::new(),
+            body: Vec::new(),
+            current_row: Vec::new(),
+            state: TableState::Header,
+            border_color,
+        }
+    }
+
+    fn finish_row(&mut self) {
+        match self.state {
+            TableState::Header => {
+                self.header.extend(self.current_row.drain(..));
+                self.state = TableState::Body;
+            }
+            TableState::Body => {
+                self.body.push(self.current_row.drain(..).collect());
+            }
+        }
+    }
+
+    fn add_cell(&mut self, contents: AnyElement) {
+        let cell = div()
+            .child(contents)
+            .w_full()
+            .px_2()
+            .py_1()
+            .border_color(self.border_color);
+
+        let cell = match self.state {
+            TableState::Header => cell.border_2(),
+            TableState::Body => cell.border_1(),
+        };
+
+        self.current_row.push(cell);
+    }
+
+    fn finish(self) -> Div {
+        let mut table = v_flex().w_full();
+        let mut header = h_flex();
+
+        for cell in self.header {
+            header = header.child(cell);
+        }
+        table = table.child(header);
+        for row in self.body {
+            let mut row_div = h_flex();
+            for cell in row {
+                row_div = row_div.child(cell);
+            }
+            table = table.child(row_div);
+        }
+        table
+    }
+}
+
+struct Renderer<I> {
+    source_contents: String,
+    iter: I,
+    theme: Arc<Theme>,
+    finished: Vec<Div>,
+    language_registry: Arc<LanguageRegistry>,
+    table: Option<MarkdownTable>,
+    list_depth: usize,
+    block_quote_depth: usize,
+}
+
+impl<'a, I> Renderer<I>
+where
+    I: Iterator<Item = (Event<'a>, Range<usize>)>,
+{
+    fn new(
+        iter: I,
+        source_contents: String,
+        language_registry: &Arc<LanguageRegistry>,
+        theme: Arc<Theme>,
+    ) -> Self {
+        Self {
+            iter,
+            source_contents,
+            theme,
+            table: None,
+            finished: vec![],
+            language_registry: language_registry.clone(),
+            list_depth: 0,
+            block_quote_depth: 0,
+        }
+    }
+
+    fn run(mut self, cx: &WindowContext) -> Self {
+        while let Some((event, source_range)) = self.iter.next() {
+            match event {
+                Event::Start(tag) => {
+                    self.start_tag(tag);
+                }
+                Event::End(tag) => {
+                    self.end_tag(tag, source_range, cx);
+                }
+                Event::Rule => {
+                    let rule = div().w_full().h(px(2.)).bg(self.theme.colors().border);
+                    self.finished.push(div().mb_4().child(rule));
+                }
+                _ => {}
+            }
+        }
+        self
+    }
+
+    fn start_tag(&mut self, tag: Tag<'a>) {
+        match tag {
+            Tag::List(_) => {
+                self.list_depth += 1;
+            }
+            Tag::BlockQuote => {
+                self.block_quote_depth += 1;
+            }
+            Tag::Table(_text_alignments) => {
+                self.table = Some(MarkdownTable::new(self.theme.colors().border));
+            }
+            _ => {}
+        }
+    }
+
+    fn end_tag(&mut self, tag: Tag, source_range: Range<usize>, cx: &WindowContext) {
+        match tag {
+            Tag::Paragraph => {
+                if self.list_depth > 0 || self.block_quote_depth > 0 {
+                    return;
+                }
+
+                let element = self.render_md_from_range(source_range.clone(), cx);
+                let paragraph = h_flex().mb_3().child(element);
+
+                self.finished.push(paragraph);
+            }
+            Tag::Heading(level, _, _) => {
+                let mut headline = self.headline(level);
+                if source_range.start > 0 {
+                    headline = headline.mt_4();
+                }
+
+                let element = self.render_md_from_range(source_range.clone(), cx);
+                let headline = headline.child(element);
+
+                self.finished.push(headline);
+            }
+            Tag::List(_) => {
+                if self.list_depth == 1 {
+                    let element = self.render_md_from_range(source_range.clone(), cx);
+                    let list = div().mb_3().child(element);
+
+                    self.finished.push(list);
+                }
+
+                self.list_depth -= 1;
+            }
+            Tag::BlockQuote => {
+                let element = self.render_md_from_range(source_range.clone(), cx);
+
+                let block_quote = h_flex()
+                    .mb_3()
+                    .child(
+                        div()
+                            .w(px(4.))
+                            .bg(self.theme.colors().border)
+                            .h_full()
+                            .mr_2()
+                            .mt_1(),
+                    )
+                    .text_color(self.theme.colors().text_muted)
+                    .child(element);
+
+                self.finished.push(block_quote);
+
+                self.block_quote_depth -= 1;
+            }
+            Tag::CodeBlock(kind) => {
+                let contents = self.source_contents[source_range.clone()].trim();
+                let contents = contents.trim_start_matches("```");
+                let contents = contents.trim_end_matches("```");
+                let contents = match kind {
+                    CodeBlockKind::Fenced(language) => {
+                        contents.trim_start_matches(&language.to_string())
+                    }
+                    CodeBlockKind::Indented => contents,
+                };
+                let contents: String = contents.into();
+                let contents = SharedString::from(contents);
+
+                let code_block = div()
+                    .mb_3()
+                    .px_4()
+                    .py_0()
+                    .bg(self.theme.colors().surface_background)
+                    .child(StyledText::new(contents));
+
+                self.finished.push(code_block);
+            }
+            Tag::Table(_alignment) => {
+                if self.table.is_none() {
+                    log::error!("Table end without table ({:?})", source_range);
+                    return;
+                }
+
+                let table = self.table.take().unwrap();
+                let table = table.finish().mb_4();
+                self.finished.push(table);
+            }
+            Tag::TableHead => {
+                if self.table.is_none() {
+                    log::error!("Table head without table ({:?})", source_range);
+                    return;
+                }
+
+                self.table.as_mut().unwrap().finish_row();
+            }
+            Tag::TableRow => {
+                if self.table.is_none() {
+                    log::error!("Table row without table ({:?})", source_range);
+                    return;
+                }
+
+                self.table.as_mut().unwrap().finish_row();
+            }
+            Tag::TableCell => {
+                if self.table.is_none() {
+                    log::error!("Table cell without table ({:?})", source_range);
+                    return;
+                }
+
+                let contents = self.render_md_from_range(source_range.clone(), cx);
+                self.table.as_mut().unwrap().add_cell(contents);
+            }
+            _ => {}
+        }
+    }
+
+    fn render_md_from_range(
+        &self,
+        source_range: Range<usize>,
+        cx: &WindowContext,
+    ) -> gpui::AnyElement {
+        let mentions = &[];
+        let language = None;
+        let paragraph = &self.source_contents[source_range.clone()];
+        let rich_text = render_rich_text(
+            paragraph.into(),
+            mentions,
+            &self.language_registry,
+            language,
+        );
+        let id: ElementId = source_range.start.into();
+        rich_text.element(id, cx)
+    }
+
+    fn headline(&self, level: HeadingLevel) -> Div {
+        let size = match level {
+            HeadingLevel::H1 => rems(2.),
+            HeadingLevel::H2 => rems(1.5),
+            HeadingLevel::H3 => rems(1.25),
+            HeadingLevel::H4 => rems(1.),
+            HeadingLevel::H5 => rems(0.875),
+            HeadingLevel::H6 => rems(0.85),
+        };
+
+        let color = match level {
+            HeadingLevel::H6 => self.theme.colors().text_muted,
+            _ => self.theme.colors().text,
+        };
+
+        let line_height = DefiniteLength::from(rems(1.25));
+
+        let headline = h_flex()
+            .w_full()
+            .line_height(line_height)
+            .text_size(size)
+            .text_color(color)
+            .mb_4()
+            .pb(rems(0.15));
+
+        headline
+    }
+}
+
+pub fn render_markdown(
+    markdown_input: &str,
+    language_registry: &Arc<LanguageRegistry>,
+    cx: &WindowContext,
+) -> Vec<Div> {
+    let theme = cx.theme().clone();
+    let options = Options::all();
+    let parser = Parser::new_ext(markdown_input, options);
+    let renderer = Renderer::new(
+        parser.into_offset_iter(),
+        markdown_input.to_owned(),
+        language_registry,
+        theme,
+    );
+    let renderer = renderer.run(cx);
+    return renderer.finished;
+}
diff --git a/crates/multi_buffer/Cargo.toml b/crates/multi_buffer/Cargo.toml
index 87f36f3096..5fc7bdb254 100644
--- a/crates/multi_buffer/Cargo.toml
+++ b/crates/multi_buffer/Cargo.toml
@@ -39,7 +39,7 @@ lsp = { path = "../lsp" }
 ordered-float.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
-pulldown-cmark = { version = "0.9.2", default-features = false }
+pulldown-cmark.workspace = true
 rand.workspace = true
 rich_text = { path = "../rich_text" }
 schemars.workspace = true
diff --git a/crates/rich_text/Cargo.toml b/crates/rich_text/Cargo.toml
index a772407a83..bfd8cf70d1 100644
--- a/crates/rich_text/Cargo.toml
+++ b/crates/rich_text/Cargo.toml
@@ -22,7 +22,7 @@ futures.workspace = true
 gpui = { path = "../gpui" }
 language = { path = "../language" }
 lazy_static.workspace = true
-pulldown-cmark = { version = "0.9.2", default-features = false }
+pulldown-cmark.workspace = true
 smallvec.workspace = true
 smol.workspace = true
 sum_tree = { path = "../sum_tree" }
diff --git a/crates/rich_text/src/rich_text.rs b/crates/rich_text/src/rich_text.rs
index 12188c5031..f5ab38c4ce 100644
--- a/crates/rich_text/src/rich_text.rs
+++ b/crates/rich_text/src/rich_text.rs
@@ -47,7 +47,7 @@ pub struct Mention {
 }
 
 impl RichText {
-    pub fn element(&self, id: ElementId, cx: &mut WindowContext) -> AnyElement {
+    pub fn element(&self, id: ElementId, cx: &WindowContext) -> AnyElement {
         let theme = cx.theme();
         let code_background = theme.colors().surface_background;
 
@@ -83,7 +83,12 @@ impl RichText {
         )
         .on_click(self.link_ranges.clone(), {
             let link_urls = self.link_urls.clone();
-            move |ix, cx| cx.open_url(&link_urls[ix])
+            move |ix, cx| {
+                let url = &link_urls[ix];
+                if url.starts_with("http") {
+                    cx.open_url(url);
+                }
+            }
         })
         .tooltip({
             let link_ranges = self.link_ranges.clone();
@@ -256,7 +261,7 @@ pub fn render_markdown_mut(
     }
 }
 
-pub fn render_markdown(
+pub fn render_rich_text(
     block: String,
     mentions: &[Mention],
     language_registry: &Arc<LanguageRegistry>,
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 64d4a59c2d..f17d3053a0 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -65,6 +65,7 @@ lazy_static.workspace = true
 libc = "0.2"
 log.workspace = true
 lsp = { path = "../lsp" }
+markdown_preview = { path = "../markdown_preview" }
 menu = { path = "../menu" }
 mimalloc = "0.1"
 node_runtime = { path = "../node_runtime" }
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index a2436ffb5d..11e9667a8e 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -248,6 +248,7 @@ fn main() {
         notifications::init(app_state.client.clone(), app_state.user_store.clone(), cx);
         collab_ui::init(&app_state, cx);
         feedback::init(cx);
+        markdown_preview::init(cx);
         welcome::init(cx);
 
         cx.set_menus(app_menus());

From 6c93c4bd359a9dc7df511df48ddbb59b1551fb60 Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Thu, 1 Feb 2024 11:16:03 +0100
Subject: [PATCH 125/372] assistant: render api key editor if no credentials
 are set (#7197)

This hopefully reduces confusion for new users. I updated the docs just
this morning, but I figured it's probably better to fix the issue
itself.

So what this does is to render the API key editor whenever the assistant
panel is opened/focused and no credentials can be found.

See: https://github.com/zed-industries/zed/discussions/6943

Release Notes:

- Fixed assistant panel not showing dialog to enter API key when opened
without saved credentials.

---------

Co-authored-by: Piotr <piotr@zed.dev>
---
 crates/assistant/src/assistant_panel.rs | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/crates/assistant/src/assistant_panel.rs b/crates/assistant/src/assistant_panel.rs
index e04077d64e..42e4180add 100644
--- a/crates/assistant/src/assistant_panel.rs
+++ b/crates/assistant/src/assistant_panel.rs
@@ -199,9 +199,13 @@ impl AssistantPanel {
             .update(cx, |toolbar, cx| toolbar.focus_changed(true, cx));
         cx.notify();
         if self.focus_handle.is_focused(cx) {
-            if let Some(editor) = self.active_editor() {
-                cx.focus_view(editor);
-            } else if let Some(api_key_editor) = self.api_key_editor.as_ref() {
+            if self.has_credentials() {
+                if let Some(editor) = self.active_editor() {
+                    cx.focus_view(editor);
+                }
+            }
+
+            if let Some(api_key_editor) = self.api_key_editor.as_ref() {
                 cx.focus_view(api_key_editor);
             }
         }
@@ -777,6 +781,10 @@ impl AssistantPanel {
         });
     }
 
+    fn build_api_key_editor(&mut self, cx: &mut WindowContext<'_>) {
+        self.api_key_editor = Some(build_api_key_editor(cx));
+    }
+
     fn new_conversation(&mut self, cx: &mut ViewContext<Self>) -> View<ConversationEditor> {
         let editor = cx.new_view(|cx| {
             ConversationEditor::new(
@@ -870,7 +878,7 @@ impl AssistantPanel {
             cx.update(|cx| completion_provider.delete_credentials(cx))?
                 .await;
             this.update(&mut cx, |this, cx| {
-                this.api_key_editor = Some(build_api_key_editor(cx));
+                this.build_api_key_editor(cx);
                 this.focus_handle.focus(cx);
                 cx.notify();
             })
@@ -1136,7 +1144,7 @@ impl AssistantPanel {
     }
 }
 
-fn build_api_key_editor(cx: &mut ViewContext<AssistantPanel>) -> View<Editor> {
+fn build_api_key_editor(cx: &mut WindowContext) -> View<Editor> {
     cx.new_view(|cx| {
         let mut editor = Editor::single_line(cx);
         editor.set_placeholder_text("sk-000000000000000000000000000000000000000000000000", cx);
@@ -1147,9 +1155,10 @@ fn build_api_key_editor(cx: &mut ViewContext<AssistantPanel>) -> View<Editor> {
 impl Render for AssistantPanel {
     fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
         if let Some(api_key_editor) = self.api_key_editor.clone() {
-            const INSTRUCTIONS: [&'static str; 5] = [
+            const INSTRUCTIONS: [&'static str; 6] = [
                 "To use the assistant panel or inline assistant, you need to add your OpenAI API key.",
                 " - You can create an API key at: platform.openai.com/api-keys",
+                " - Make sure your OpenAI account has credits",
                 " - Having a subscription for another service like GitHub Copilot won't work.",
                 " ",
                 "Paste your OpenAI API key and press Enter to use the assistant:"
@@ -1342,7 +1351,9 @@ impl Panel for AssistantPanel {
             cx.spawn(|this, mut cx| async move {
                 load_credentials.await;
                 this.update(&mut cx, |this, cx| {
-                    if this.editors.is_empty() {
+                    if !this.has_credentials() {
+                        this.build_api_key_editor(cx);
+                    } else if this.editors.is_empty() {
                         this.new_conversation(cx);
                     }
                 })

From e65a76f0ec7b5e12028d4f0fa0cf538da896e47c Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Thu, 1 Feb 2024 12:18:12 +0100
Subject: [PATCH 126/372] Add ability to navigate to/from docks via keybindings
 (#7141)

This adds the ability to navigate to/from docks (Terminal, Project,
Collaboration, Assistant) via keybindings.

When using the `ActivatePaneInDirection` keybinding from the
left/bottom/right dock, we check whether the movement is towards the
center panel. If it is, we focus the last active pane.

Fixes https://github.com/zed-industries/zed/issues/6833 and it came up
in a few other tickes/discussions.

Release Notes:

- Added ability to navigate to docks and back to the editor using the
`workspace::ActivatePaneInDirection` action (by default bound to `Ctrl-w
[hjkl]` in Vim mode).
([#6833](https://github.com/zed-industries/zed/issues/6833)).

## Drawback

There's this weird behavior: if you start Zed and no files are opened,
you focus terminal, go left (project panel), then back to right to
terminal, the terminal isn't focused. Even though we focus it in the
code.

Maybe this is a bug in the current focus handling code?

## Demo


https://github.com/zed-industries/zed/assets/1185253/5d56db40-36aa-4758-a3bc-7a0de20ce5d7

---------

Co-authored-by: Piotr <piotr@zed.dev>
---
 assets/keymaps/vim.json           |  13 ++++
 crates/workspace/src/dock.rs      |  18 ++++-
 crates/workspace/src/workspace.rs | 116 +++++++++++++++++++++++++-----
 3 files changed, 127 insertions(+), 20 deletions(-)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 102e92511d..eb8bdb33ed 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -502,5 +502,18 @@
       "enter": "vim::SearchSubmit",
       "escape": "buffer_search::Dismiss"
     }
+  },
+  {
+    "context": "Dock",
+    "bindings": {
+      "ctrl-w h": ["workspace::ActivatePaneInDirection", "Left"],
+      "ctrl-w l": ["workspace::ActivatePaneInDirection", "Right"],
+      "ctrl-w k": ["workspace::ActivatePaneInDirection", "Up"],
+      "ctrl-w j": ["workspace::ActivatePaneInDirection", "Down"],
+      "ctrl-w ctrl-h": ["workspace::ActivatePaneInDirection", "Left"],
+      "ctrl-w ctrl-l": ["workspace::ActivatePaneInDirection", "Right"],
+      "ctrl-w ctrl-k": ["workspace::ActivatePaneInDirection", "Up"],
+      "ctrl-w ctrl-j": ["workspace::ActivatePaneInDirection", "Down"]
+    }
   }
 ]
diff --git a/crates/workspace/src/dock.rs b/crates/workspace/src/dock.rs
index 021383f73c..ffab5249e2 100644
--- a/crates/workspace/src/dock.rs
+++ b/crates/workspace/src/dock.rs
@@ -3,8 +3,9 @@ use crate::DraggedDock;
 use crate::{status_bar::StatusItemView, Workspace};
 use gpui::{
     div, px, Action, AnchorCorner, AnyView, AppContext, Axis, ClickEvent, Entity, EntityId,
-    EventEmitter, FocusHandle, FocusableView, IntoElement, MouseButton, ParentElement, Render,
-    SharedString, Styled, Subscription, View, ViewContext, VisualContext, WeakView, WindowContext,
+    EventEmitter, FocusHandle, FocusableView, IntoElement, KeyContext, MouseButton, ParentElement,
+    Render, SharedString, Styled, Subscription, View, ViewContext, VisualContext, WeakView,
+    WindowContext,
 };
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -534,10 +535,18 @@ impl Dock {
             DockPosition::Right => crate::ToggleRightDock.boxed_clone(),
         }
     }
+
+    fn dispatch_context() -> KeyContext {
+        let mut dispatch_context = KeyContext::default();
+        dispatch_context.add("Dock");
+
+        dispatch_context
+    }
 }
 
 impl Render for Dock {
     fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
+        let dispatch_context = Self::dispatch_context();
         if let Some(entry) = self.visible_entry() {
             let size = entry.panel.size(cx);
 
@@ -588,6 +597,7 @@ impl Render for Dock {
             }
 
             div()
+                .key_context(dispatch_context)
                 .track_focus(&self.focus_handle)
                 .flex()
                 .bg(cx.theme().colors().panel_background)
@@ -612,7 +622,9 @@ impl Render for Dock {
                 )
                 .child(handle)
         } else {
-            div().track_focus(&self.focus_handle)
+            div()
+                .key_context(dispatch_context)
+                .track_focus(&self.focus_handle)
         }
     }
 }
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 177d7384b6..19d203716b 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -2075,30 +2075,93 @@ impl Workspace {
         direction: SplitDirection,
         cx: &mut WindowContext,
     ) {
-        if let Some(pane) = self.find_pane_in_direction(direction, cx) {
-            cx.focus_view(pane);
+        use ActivateInDirectionTarget as Target;
+        enum Origin {
+            LeftDock,
+            RightDock,
+            BottomDock,
+            Center,
         }
-    }
 
-    pub fn swap_pane_in_direction(
-        &mut self,
-        direction: SplitDirection,
-        cx: &mut ViewContext<Self>,
-    ) {
-        if let Some(to) = self
-            .find_pane_in_direction(direction, cx)
-            .map(|pane| pane.clone())
-        {
-            self.center.swap(&self.active_pane.clone(), &to);
-            cx.notify();
+        let origin: Origin = [
+            (&self.left_dock, Origin::LeftDock),
+            (&self.right_dock, Origin::RightDock),
+            (&self.bottom_dock, Origin::BottomDock),
+        ]
+        .into_iter()
+        .find_map(|(dock, origin)| {
+            if dock.focus_handle(cx).contains_focused(cx) && dock.read(cx).is_open() {
+                Some(origin)
+            } else {
+                None
+            }
+        })
+        .unwrap_or(Origin::Center);
+
+        let get_last_active_pane = || {
+            self.last_active_center_pane.as_ref().and_then(|p| {
+                let p = p.upgrade()?;
+                (p.read(cx).items_len() != 0).then_some(p)
+            })
+        };
+
+        let try_dock =
+            |dock: &View<Dock>| dock.read(cx).is_open().then(|| Target::Dock(dock.clone()));
+
+        let target = match (origin, direction) {
+            // We're in the center, so we first try to go to a different pane,
+            // otherwise try to go to a dock.
+            (Origin::Center, direction) => {
+                if let Some(pane) = self.find_pane_in_direction(direction, cx) {
+                    Some(Target::Pane(pane))
+                } else {
+                    match direction {
+                        SplitDirection::Up => None,
+                        SplitDirection::Down => try_dock(&self.bottom_dock),
+                        SplitDirection::Left => try_dock(&self.left_dock),
+                        SplitDirection::Right => try_dock(&self.right_dock),
+                    }
+                }
+            }
+
+            (Origin::LeftDock, SplitDirection::Right) => {
+                if let Some(last_active_pane) = get_last_active_pane() {
+                    Some(Target::Pane(last_active_pane))
+                } else {
+                    try_dock(&self.bottom_dock).or_else(|| try_dock(&self.right_dock))
+                }
+            }
+
+            (Origin::LeftDock, SplitDirection::Down)
+            | (Origin::RightDock, SplitDirection::Down) => try_dock(&self.bottom_dock),
+
+            (Origin::BottomDock, SplitDirection::Up) => get_last_active_pane().map(Target::Pane),
+            (Origin::BottomDock, SplitDirection::Left) => try_dock(&self.left_dock),
+            (Origin::BottomDock, SplitDirection::Right) => try_dock(&self.right_dock),
+
+            (Origin::RightDock, SplitDirection::Left) => {
+                if let Some(last_active_pane) = get_last_active_pane() {
+                    Some(Target::Pane(last_active_pane))
+                } else {
+                    try_dock(&self.bottom_dock).or_else(|| try_dock(&self.left_dock))
+                }
+            }
+
+            _ => None,
+        };
+
+        match target {
+            Some(ActivateInDirectionTarget::Pane(pane)) => cx.focus_view(&pane),
+            Some(ActivateInDirectionTarget::Dock(dock)) => cx.focus_view(&dock),
+            None => {}
         }
     }
 
     fn find_pane_in_direction(
         &mut self,
         direction: SplitDirection,
-        cx: &AppContext,
-    ) -> Option<&View<Pane>> {
+        cx: &WindowContext,
+    ) -> Option<View<Pane>> {
         let Some(bounding_box) = self.center.bounding_box_for_pane(&self.active_pane) else {
             return None;
         };
@@ -2124,7 +2187,21 @@ impl Workspace {
                 Point::new(center.x, bounding_box.bottom() + distance_to_next.into())
             }
         };
-        self.center.pane_at_pixel_position(target)
+        self.center.pane_at_pixel_position(target).cloned()
+    }
+
+    pub fn swap_pane_in_direction(
+        &mut self,
+        direction: SplitDirection,
+        cx: &mut ViewContext<Self>,
+    ) {
+        if let Some(to) = self
+            .find_pane_in_direction(direction, cx)
+            .map(|pane| pane.clone())
+        {
+            self.center.swap(&self.active_pane.clone(), &to);
+            cx.notify();
+        }
     }
 
     fn handle_pane_focused(&mut self, pane: View<Pane>, cx: &mut ViewContext<Self>) {
@@ -3488,6 +3565,11 @@ fn open_items(
     })
 }
 
+enum ActivateInDirectionTarget {
+    Pane(View<Pane>),
+    Dock(View<Dock>),
+}
+
 fn notify_if_database_failed(workspace: WindowHandle<Workspace>, cx: &mut AsyncAppContext) {
     const REPORT_ISSUE_URL: &str ="https://github.com/zed-industries/zed/issues/new?assignees=&labels=defect%2Ctriage&template=2_bug_report.yml";
 

From 0edffd92484f3732f7ac65eb1c5bade6eccc4ca0 Mon Sep 17 00:00:00 2001
From: Andrew Lygin <alygin@gmail.com>
Date: Thu, 1 Feb 2024 15:21:59 +0300
Subject: [PATCH 127/372] Select the second item in the file finder by default
 (#6947)

This PR completes the first task of the Tabless editing feature (#6424).
It makes file finder select the previously opened file by default which
allows the user to quickly switch between two last opened files by
clicking `Cmd-P + Enter`.

This feature was also requested in #4663 comments.

Release Notes:
* Improved file finder selection: currently opened item is not selected now
---
 crates/file_finder/src/file_finder.rs       |  53 +++++--
 crates/file_finder/src/file_finder_tests.rs | 165 +++++++++++++++++++-
 2 files changed, 206 insertions(+), 12 deletions(-)

diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index ca2808afb2..a2d856760b 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -61,7 +61,7 @@ impl FileFinder {
                 let abs_path = project
                     .worktree_for_id(project_path.worktree_id, cx)
                     .map(|worktree| worktree.read(cx).abs_path().join(&project_path.path));
-                FoundPath::new(project_path, abs_path)
+                FoundPath::new_opened_file(project_path, abs_path)
             });
 
         // if exists, bubble the currently opened path to the top
@@ -139,7 +139,7 @@ pub struct FileFinderDelegate {
     latest_search_query: Option<PathLikeWithPosition<FileSearchQuery>>,
     currently_opened_path: Option<FoundPath>,
     matches: Matches,
-    selected_index: Option<usize>,
+    selected_index: usize,
     cancel_flag: Arc<AtomicBool>,
     history_items: Vec<FoundPath>,
 }
@@ -231,7 +231,15 @@ impl Matches {
             &mut self.history,
             history_items_to_show,
             100,
-            |(_, a), (_, b)| b.cmp(a),
+            |(ap, a), (bp, b)| {
+                if ap.opened_file {
+                    return cmp::Ordering::Less;
+                }
+                if bp.opened_file {
+                    return cmp::Ordering::Greater;
+                }
+                b.cmp(a)
+            },
         );
 
         if extend_old_matches {
@@ -305,11 +313,24 @@ fn matching_history_item_paths(
 struct FoundPath {
     project: ProjectPath,
     absolute: Option<PathBuf>,
+    opened_file: bool,
 }
 
 impl FoundPath {
     fn new(project: ProjectPath, absolute: Option<PathBuf>) -> Self {
-        Self { project, absolute }
+        Self {
+            project,
+            absolute,
+            opened_file: false,
+        }
+    }
+
+    fn new_opened_file(project: ProjectPath, absolute: Option<PathBuf>) -> Self {
+        Self {
+            project,
+            absolute,
+            opened_file: true,
+        }
     }
 }
 
@@ -372,7 +393,7 @@ impl FileFinderDelegate {
             latest_search_query: None,
             currently_opened_path,
             matches: Matches::default(),
-            selected_index: None,
+            selected_index: 0,
             cancel_flag: Arc::new(AtomicBool::new(false)),
             history_items,
         }
@@ -427,7 +448,6 @@ impl FileFinderDelegate {
             let did_cancel = cancel_flag.load(atomic::Ordering::Relaxed);
             picker
                 .update(&mut cx, |picker, cx| {
-                    picker.delegate.selected_index.take();
                     picker
                         .delegate
                         .set_search_matches(search_id, did_cancel, query, matches, cx)
@@ -460,6 +480,7 @@ impl FileFinderDelegate {
             );
             self.latest_search_query = Some(query);
             self.latest_search_did_cancel = did_cancel;
+            self.selected_index = self.calculate_selected_index();
             cx.notify();
         }
     }
@@ -630,6 +651,20 @@ impl FileFinderDelegate {
                 .log_err();
         })
     }
+
+    /// Calculates selection index after the user performed search.
+    /// Prefers to return 1 if the top visible item corresponds to the currently opened file, otherwise returns 0.
+    fn calculate_selected_index(&self) -> usize {
+        let first = self.matches.history.get(0);
+        if let Some(first) = first {
+            if !first.0.opened_file {
+                return 0;
+            }
+        } else {
+            return 0;
+        }
+        (self.matches.len() - 1).min(1)
+    }
 }
 
 impl PickerDelegate for FileFinderDelegate {
@@ -644,11 +679,11 @@ impl PickerDelegate for FileFinderDelegate {
     }
 
     fn selected_index(&self) -> usize {
-        self.selected_index.unwrap_or(0)
+        self.selected_index
     }
 
     fn set_selected_index(&mut self, ix: usize, cx: &mut ViewContext<Picker<Self>>) {
-        self.selected_index = Some(ix);
+        self.selected_index = ix;
         cx.notify();
     }
 
@@ -671,7 +706,6 @@ impl PickerDelegate for FileFinderDelegate {
         if raw_query.is_empty() {
             let project = self.project.read(cx);
             self.latest_search_id = post_inc(&mut self.search_count);
-            self.selected_index.take();
             self.matches = Matches {
                 history: self
                     .history_items
@@ -687,6 +721,7 @@ impl PickerDelegate for FileFinderDelegate {
                     .collect(),
                 search: Vec::new(),
             };
+            self.selected_index = self.calculate_selected_index();
             cx.notify();
             Task::ready(())
         } else {
diff --git a/crates/file_finder/src/file_finder_tests.rs b/crates/file_finder/src/file_finder_tests.rs
index 7702f71f46..66d1675227 100644
--- a/crates/file_finder/src/file_finder_tests.rs
+++ b/crates/file_finder/src/file_finder_tests.rs
@@ -1062,6 +1062,120 @@ async fn test_search_sorts_history_items(cx: &mut gpui::TestAppContext) {
     });
 }
 
+#[gpui::test]
+async fn test_select_current_open_file_when_no_history(cx: &mut gpui::TestAppContext) {
+    let app_state = init_test(cx);
+
+    app_state
+        .fs
+        .as_fake()
+        .insert_tree(
+            "/root",
+            json!({
+                "test": {
+                    "1_qw": "",
+                }
+            }),
+        )
+        .await;
+
+    let project = Project::test(app_state.fs.clone(), ["/root".as_ref()], cx).await;
+    let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
+    // Open new buffer
+    open_queried_buffer("1", 1, "1_qw", &workspace, cx).await;
+
+    let picker = open_file_picker(&workspace, cx);
+    picker.update(cx, |finder, _| {
+        assert_match_selection(&finder, 0, "1_qw");
+    });
+}
+
+#[gpui::test]
+async fn test_keep_opened_file_on_top_of_search_results_and_select_next_one(
+    cx: &mut TestAppContext,
+) {
+    let app_state = init_test(cx);
+
+    app_state
+        .fs
+        .as_fake()
+        .insert_tree(
+            "/src",
+            json!({
+                "test": {
+                    "bar.rs": "// Bar file",
+                    "lib.rs": "// Lib file",
+                    "maaa.rs": "// Maaaaaaa",
+                    "main.rs": "// Main file",
+                    "moo.rs": "// Moooooo",
+                }
+            }),
+        )
+        .await;
+
+    let project = Project::test(app_state.fs.clone(), ["/src".as_ref()], cx).await;
+    let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
+
+    open_close_queried_buffer("bar", 1, "bar.rs", &workspace, cx).await;
+    open_close_queried_buffer("lib", 1, "lib.rs", &workspace, cx).await;
+    open_queried_buffer("main", 1, "main.rs", &workspace, cx).await;
+
+    // main.rs is on top, previously used is selected
+    let picker = open_file_picker(&workspace, cx);
+    picker.update(cx, |finder, _| {
+        assert_eq!(finder.delegate.matches.len(), 3);
+        assert_match_at_position(finder, 0, "main.rs");
+        assert_match_selection(finder, 1, "lib.rs");
+    });
+
+    // all files match, main.rs is still on top
+    picker
+        .update(cx, |finder, cx| {
+            finder.delegate.update_matches(".rs".to_string(), cx)
+        })
+        .await;
+    picker.update(cx, |finder, _| {
+        assert_eq!(finder.delegate.matches.len(), 5);
+        assert_match_at_position(finder, 0, "main.rs");
+        assert_match_selection(finder, 1, "bar.rs");
+    });
+
+    // main.rs is not among matches, select top item
+    picker
+        .update(cx, |finder, cx| {
+            finder.delegate.update_matches("b".to_string(), cx)
+        })
+        .await;
+    picker.update(cx, |finder, _| {
+        assert_eq!(finder.delegate.matches.len(), 2);
+        assert_match_at_position(finder, 0, "bar.rs");
+    });
+
+    // main.rs is back, put it on top and select next item
+    picker
+        .update(cx, |finder, cx| {
+            finder.delegate.update_matches("m".to_string(), cx)
+        })
+        .await;
+    picker.update(cx, |finder, _| {
+        assert_eq!(finder.delegate.matches.len(), 3);
+        assert_match_at_position(finder, 0, "main.rs");
+        assert_match_selection(finder, 1, "moo.rs");
+    });
+
+    // get back to the initial state
+    picker
+        .update(cx, |finder, cx| {
+            finder.delegate.update_matches("".to_string(), cx)
+        })
+        .await;
+    picker.update(cx, |finder, _| {
+        assert_eq!(finder.delegate.matches.len(), 3);
+        assert_match_at_position(finder, 0, "main.rs");
+        assert_match_selection(finder, 1, "lib.rs");
+    });
+}
+
 #[gpui::test]
 async fn test_history_items_vs_very_good_external_match(cx: &mut gpui::TestAppContext) {
     let app_state = init_test(cx);
@@ -1172,6 +1286,27 @@ async fn open_close_queried_buffer(
     expected_editor_title: &str,
     workspace: &View<Workspace>,
     cx: &mut gpui::VisualTestContext,
+) -> Vec<FoundPath> {
+    let history_items = open_queried_buffer(
+        input,
+        expected_matches,
+        expected_editor_title,
+        workspace,
+        cx,
+    )
+    .await;
+
+    cx.dispatch_action(workspace::CloseActiveItem { save_intent: None });
+
+    history_items
+}
+
+async fn open_queried_buffer(
+    input: &str,
+    expected_matches: usize,
+    expected_editor_title: &str,
+    workspace: &View<Workspace>,
+    cx: &mut gpui::VisualTestContext,
 ) -> Vec<FoundPath> {
     let picker = open_file_picker(&workspace, cx);
     cx.simulate_input(input);
@@ -1186,7 +1321,6 @@ async fn open_close_queried_buffer(
         finder.delegate.history_items.clone()
     });
 
-    cx.dispatch_action(SelectNext);
     cx.dispatch_action(Confirm);
 
     cx.read(|cx| {
@@ -1198,8 +1332,6 @@ async fn open_close_queried_buffer(
         );
     });
 
-    cx.dispatch_action(workspace::CloseActiveItem { save_intent: None });
-
     history_items
 }
 
@@ -1313,3 +1445,30 @@ fn collect_search_matches(picker: &Picker<FileFinderDelegate>) -> SearchEntries
             .collect(),
     }
 }
+
+fn assert_match_selection(
+    finder: &Picker<FileFinderDelegate>,
+    expected_selection_index: usize,
+    expected_file_name: &str,
+) {
+    assert_eq!(finder.delegate.selected_index(), expected_selection_index);
+    assert_match_at_position(finder, expected_selection_index, expected_file_name);
+}
+
+fn assert_match_at_position(
+    finder: &Picker<FileFinderDelegate>,
+    match_index: usize,
+    expected_file_name: &str,
+) {
+    let match_item = finder
+        .delegate
+        .matches
+        .get(match_index)
+        .expect("Finder should have a match item with the given index");
+    let match_file_name = match match_item {
+        Match::History(found_path, _) => found_path.absolute.as_deref().unwrap().file_name(),
+        Match::Search(path_match) => path_match.0.path.file_name(),
+    };
+    let match_file_name = match_file_name.unwrap().to_string_lossy().to_string();
+    assert_eq!(match_file_name.as_str(), expected_file_name);
+}

From 0102ffbfcab7fd6f74474e46b8e8b1746daa1041 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Thu, 1 Feb 2024 14:35:42 +0200
Subject: [PATCH 128/372] Refactor file_finder send element open code (#7210)

Follow-up of https://github.com/zed-industries/zed/pull/6947 (cc
@alygin) that fixes a few style nits and refactors the code around:
* use already stored `currently_opened_path` to decide what to do with
the history item sorting
* use the same method to set history items, encapsulate the bubbling up
logic there
* ensure history elements are properly sorted before populating

The main reason to change all that is the new comparator in the previous
version:
https://github.com/zed-industries/zed/pull/6947/files#diff-eac7c8c99856f77cee39117708cd1467fd5bbc8805da2564f851951638020842R234
that almost violated `util::extend_sorted` contract, requiring both
collections to be sorted the same way as the comparator would be: it did
work, because we bubbled currently open item up in the history items
list manually, and that we have only one such item.

Release Notes:
- N/A
---
 Cargo.lock                                  |   1 +
 crates/file_finder/Cargo.toml               |   1 +
 crates/file_finder/src/file_finder.rs       | 175 ++++++++++----------
 crates/file_finder/src/file_finder_tests.rs |  18 +-
 4 files changed, 101 insertions(+), 94 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cd632175c1..14affc3281 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2661,6 +2661,7 @@ dependencies = [
  "env_logger",
  "fuzzy",
  "gpui",
+ "itertools 0.11.0",
  "language",
  "menu",
  "picker",
diff --git a/crates/file_finder/Cargo.toml b/crates/file_finder/Cargo.toml
index 56b644e7f8..e67997f97d 100644
--- a/crates/file_finder/Cargo.toml
+++ b/crates/file_finder/Cargo.toml
@@ -15,6 +15,7 @@ collections = { path = "../collections" }
 editor = { path = "../editor" }
 fuzzy = {  path = "../fuzzy" }
 gpui = { path = "../gpui" }
+itertools = "0.11"
 menu = { path = "../menu" }
 picker = { path = "../picker" }
 postage.workspace = true
diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index a2d856760b..5880ec465b 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -8,6 +8,7 @@ use gpui::{
     actions, rems, AppContext, DismissEvent, EventEmitter, FocusHandle, FocusableView, Model,
     ParentElement, Render, Styled, Task, View, ViewContext, VisualContext, WeakView,
 };
+use itertools::Itertools;
 use picker::{Picker, PickerDelegate};
 use project::{PathMatchCandidateSet, Project, ProjectPath, WorktreeId};
 use std::{
@@ -61,36 +62,18 @@ impl FileFinder {
                 let abs_path = project
                     .worktree_for_id(project_path.worktree_id, cx)
                     .map(|worktree| worktree.read(cx).abs_path().join(&project_path.path));
-                FoundPath::new_opened_file(project_path, abs_path)
+                FoundPath::new(project_path, abs_path)
             });
 
-        // if exists, bubble the currently opened path to the top
-        let history_items = currently_opened_path
-            .clone()
+        let history_items = workspace
+            .recent_navigation_history(Some(MAX_RECENT_SELECTIONS), cx)
             .into_iter()
-            .chain(
-                workspace
-                    .recent_navigation_history(Some(MAX_RECENT_SELECTIONS), cx)
-                    .into_iter()
-                    .filter(|(history_path, _)| {
-                        Some(history_path)
-                            != currently_opened_path
-                                .as_ref()
-                                .map(|found_path| &found_path.project)
-                    })
-                    .filter(|(_, history_abs_path)| {
-                        history_abs_path.as_ref()
-                            != currently_opened_path
-                                .as_ref()
-                                .and_then(|found_path| found_path.absolute.as_ref())
-                    })
-                    .filter(|(_, history_abs_path)| match history_abs_path {
-                        Some(abs_path) => history_file_exists(abs_path),
-                        None => true,
-                    })
-                    .map(|(history_path, abs_path)| FoundPath::new(history_path, abs_path)),
-            )
-            .collect();
+            .filter(|(_, history_abs_path)| match history_abs_path {
+                Some(abs_path) => history_file_exists(abs_path),
+                None => true,
+            })
+            .map(|(history_path, abs_path)| FoundPath::new(history_path, abs_path))
+            .collect::<Vec<_>>();
 
         let project = workspace.project().clone();
         let weak_workspace = cx.view().downgrade();
@@ -209,39 +192,21 @@ impl Matches {
     fn push_new_matches(
         &mut self,
         history_items: &Vec<FoundPath>,
+        currently_opened: Option<&FoundPath>,
         query: &PathLikeWithPosition<FileSearchQuery>,
         new_search_matches: impl Iterator<Item = ProjectPanelOrdMatch>,
         extend_old_matches: bool,
     ) {
-        let matching_history_paths = matching_history_item_paths(history_items, query);
+        let matching_history_paths =
+            matching_history_item_paths(history_items, currently_opened, query);
         let new_search_matches = new_search_matches
             .filter(|path_match| !matching_history_paths.contains_key(&path_match.0.path));
-        let history_items_to_show = history_items.iter().filter_map(|history_item| {
-            Some((
-                history_item.clone(),
-                Some(
-                    matching_history_paths
-                        .get(&history_item.project.path)?
-                        .clone(),
-                ),
-            ))
-        });
-        self.history.clear();
-        util::extend_sorted(
-            &mut self.history,
-            history_items_to_show,
-            100,
-            |(ap, a), (bp, b)| {
-                if ap.opened_file {
-                    return cmp::Ordering::Less;
-                }
-                if bp.opened_file {
-                    return cmp::Ordering::Greater;
-                }
-                b.cmp(a)
-            },
-        );
 
+        self.set_new_history(
+            currently_opened,
+            Some(&matching_history_paths),
+            history_items,
+        );
         if extend_old_matches {
             self.search
                 .retain(|path_match| !matching_history_paths.contains_key(&path_match.0.path));
@@ -250,14 +215,59 @@ impl Matches {
         }
         util::extend_sorted(&mut self.search, new_search_matches, 100, |a, b| b.cmp(a));
     }
+
+    fn set_new_history<'a>(
+        &mut self,
+        currently_opened: Option<&'a FoundPath>,
+        query_matches: Option<&'a HashMap<Arc<Path>, ProjectPanelOrdMatch>>,
+        history_items: impl IntoIterator<Item = &'a FoundPath> + 'a,
+    ) {
+        let history_items_to_show = history_items
+            .into_iter()
+            .chain(currently_opened)
+            .filter_map(|history_item| match &query_matches {
+                Some(query_matches) => Some((
+                    history_item.clone(),
+                    Some(query_matches.get(&history_item.project.path)?.clone()),
+                )),
+                None => Some((history_item.clone(), None)),
+            })
+            .sorted_by(|(path_a, match_a), (path_b, match_b)| {
+                match (
+                    Some(path_a) == currently_opened,
+                    Some(path_b) == currently_opened,
+                ) {
+                    (true, false) => cmp::Ordering::Less,
+                    (false, true) => cmp::Ordering::Greater,
+                    _ => match_b.cmp(match_a),
+                }
+            });
+
+        self.history.clear();
+        util::extend_sorted(
+            &mut self.history,
+            history_items_to_show.collect::<Vec<_>>(),
+            100,
+            |(path_a, match_a), (path_b, match_b)| match (
+                Some(path_a) == currently_opened,
+                Some(path_b) == currently_opened,
+            ) {
+                (true, false) => cmp::Ordering::Less,
+                (false, true) => cmp::Ordering::Greater,
+                _ => match_b.cmp(match_a).then(path_b.cmp(path_a)),
+            },
+        );
+    }
 }
 
 fn matching_history_item_paths(
     history_items: &Vec<FoundPath>,
+    currently_opened: Option<&FoundPath>,
     query: &PathLikeWithPosition<FileSearchQuery>,
 ) -> HashMap<Arc<Path>, ProjectPanelOrdMatch> {
     let history_items_by_worktrees = history_items
         .iter()
+        .chain(currently_opened)
         .filter_map(|found_path| {
             let candidate = PathMatchCandidate {
                 path: &found_path.project.path,
@@ -309,28 +319,15 @@ fn matching_history_item_paths(
     matching_history_paths
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 struct FoundPath {
     project: ProjectPath,
     absolute: Option<PathBuf>,
-    opened_file: bool,
 }
 
 impl FoundPath {
     fn new(project: ProjectPath, absolute: Option<PathBuf>) -> Self {
-        Self {
-            project,
-            absolute,
-            opened_file: false,
-        }
-    }
-
-    fn new_opened_file(project: ProjectPath, absolute: Option<PathBuf>) -> Self {
-        Self {
-            project,
-            absolute,
-            opened_file: true,
-        }
+        Self { project, absolute }
     }
 }
 
@@ -474,6 +471,7 @@ impl FileFinderDelegate {
                         .map(|query| query.path_like.path_query());
             self.matches.push_new_matches(
                 &self.history_items,
+                self.currently_opened_path.as_ref(),
                 &query,
                 matches.into_iter(),
                 extend_old_matches,
@@ -652,18 +650,17 @@ impl FileFinderDelegate {
         })
     }
 
-    /// Calculates selection index after the user performed search.
-    /// Prefers to return 1 if the top visible item corresponds to the currently opened file, otherwise returns 0.
+    /// Skips first history match (that is displayed topmost) if it's currently opened.
     fn calculate_selected_index(&self) -> usize {
-        let first = self.matches.history.get(0);
-        if let Some(first) = first {
-            if !first.0.opened_file {
-                return 0;
+        if let Some(Match::History(path, _)) = self.matches.get(0) {
+            if Some(path) == self.currently_opened_path.as_ref() {
+                let elements_after_first = self.matches.len() - 1;
+                if elements_after_first > 0 {
+                    return 1;
+                }
             }
-        } else {
-            return 0;
         }
-        (self.matches.len() - 1).min(1)
+        0
     }
 }
 
@@ -707,20 +704,20 @@ impl PickerDelegate for FileFinderDelegate {
             let project = self.project.read(cx);
             self.latest_search_id = post_inc(&mut self.search_count);
             self.matches = Matches {
-                history: self
-                    .history_items
-                    .iter()
-                    .filter(|history_item| {
-                        project
-                            .worktree_for_id(history_item.project.worktree_id, cx)
-                            .is_some()
-                            || (project.is_local() && history_item.absolute.is_some())
-                    })
-                    .cloned()
-                    .map(|p| (p, None))
-                    .collect(),
+                history: Vec::new(),
                 search: Vec::new(),
             };
+            self.matches.set_new_history(
+                self.currently_opened_path.as_ref(),
+                None,
+                self.history_items.iter().filter(|history_item| {
+                    project
+                        .worktree_for_id(history_item.project.worktree_id, cx)
+                        .is_some()
+                        || (project.is_local() && history_item.absolute.is_some())
+                }),
+            );
+
             self.selected_index = self.calculate_selected_index();
             cx.notify();
             Task::ready(())
diff --git a/crates/file_finder/src/file_finder_tests.rs b/crates/file_finder/src/file_finder_tests.rs
index 66d1675227..616437c26e 100644
--- a/crates/file_finder/src/file_finder_tests.rs
+++ b/crates/file_finder/src/file_finder_tests.rs
@@ -1126,6 +1126,7 @@ async fn test_keep_opened_file_on_top_of_search_results_and_select_next_one(
         assert_eq!(finder.delegate.matches.len(), 3);
         assert_match_at_position(finder, 0, "main.rs");
         assert_match_selection(finder, 1, "lib.rs");
+        assert_match_at_position(finder, 2, "bar.rs");
     });
 
     // all files match, main.rs is still on top
@@ -1446,15 +1447,21 @@ fn collect_search_matches(picker: &Picker<FileFinderDelegate>) -> SearchEntries
     }
 }
 
+#[track_caller]
 fn assert_match_selection(
     finder: &Picker<FileFinderDelegate>,
     expected_selection_index: usize,
     expected_file_name: &str,
 ) {
-    assert_eq!(finder.delegate.selected_index(), expected_selection_index);
+    assert_eq!(
+        finder.delegate.selected_index(),
+        expected_selection_index,
+        "Match is not selected"
+    );
     assert_match_at_position(finder, expected_selection_index, expected_file_name);
 }
 
+#[track_caller]
 fn assert_match_at_position(
     finder: &Picker<FileFinderDelegate>,
     match_index: usize,
@@ -1464,11 +1471,12 @@ fn assert_match_at_position(
         .delegate
         .matches
         .get(match_index)
-        .expect("Finder should have a match item with the given index");
+        .unwrap_or_else(|| panic!("Finder has no match for index {match_index}"));
     let match_file_name = match match_item {
         Match::History(found_path, _) => found_path.absolute.as_deref().unwrap().file_name(),
         Match::Search(path_match) => path_match.0.path.file_name(),
-    };
-    let match_file_name = match_file_name.unwrap().to_string_lossy().to_string();
-    assert_eq!(match_file_name.as_str(), expected_file_name);
+    }
+    .unwrap()
+    .to_string_lossy();
+    assert_eq!(match_file_name, expected_file_name);
 }

From 2d41a119b38a9e7d3d5c732ae2cf998f7412d5c9 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <53836821+bennetbo@users.noreply.github.com>
Date: Thu, 1 Feb 2024 14:43:04 +0100
Subject: [PATCH 129/372] markdown: Support alignment for table cells (#7201)

Just a small improvement as a follow up to @kierangilliam great work on
#6958

Rendering a table specified like this:
```markdown
| Left columns  | Center columns | Right columns |
| ------------- |:--------------:| -------------:|
| left foo      | center foo     | right foo     |
| left bar      | center bar     | right bar     |
| left baz      | center baz     | right baz     |
```
Does now look like this (notice the cell alignments):

![image](https://github.com/zed-industries/zed/assets/53836821/0f5b6a1e-a3c2-4fe9-bdcb-8654dbae7980)

Release Notes:
- N/A
---
 .../markdown_preview/src/markdown_renderer.rs | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/crates/markdown_preview/src/markdown_renderer.rs b/crates/markdown_preview/src/markdown_renderer.rs
index d40046863b..7b020a6d30 100644
--- a/crates/markdown_preview/src/markdown_renderer.rs
+++ b/crates/markdown_preview/src/markdown_renderer.rs
@@ -5,7 +5,7 @@ use gpui::{
     Styled, StyledText, WindowContext,
 };
 use language::LanguageRegistry;
-use pulldown_cmark::{CodeBlockKind, Event, HeadingLevel, Options, Parser, Tag};
+use pulldown_cmark::{Alignment, CodeBlockKind, Event, HeadingLevel, Options, Parser, Tag};
 use rich_text::render_rich_text;
 use theme::{ActiveTheme, Theme};
 use ui::{h_flex, v_flex};
@@ -16,6 +16,7 @@ enum TableState {
 }
 
 struct MarkdownTable {
+    column_alignments: Vec<Alignment>,
     header: Vec<Div>,
     body: Vec<Vec<Div>>,
     current_row: Vec<Div>,
@@ -24,8 +25,9 @@ struct MarkdownTable {
 }
 
 impl MarkdownTable {
-    fn new(border_color: Hsla) -> Self {
+    fn new(border_color: Hsla, column_alignments: Vec<Alignment>) -> Self {
         Self {
+            column_alignments,
             header: Vec::new(),
             body: Vec::new(),
             current_row: Vec::new(),
@@ -47,9 +49,15 @@ impl MarkdownTable {
     }
 
     fn add_cell(&mut self, contents: AnyElement) {
-        let cell = div()
-            .child(contents)
+        let container = match self.alignment_for_next_cell() {
+            Alignment::Left | Alignment::None => div(),
+            Alignment::Center => v_flex().items_center(),
+            Alignment::Right => v_flex().items_end(),
+        };
+
+        let cell = container
             .w_full()
+            .child(contents)
             .px_2()
             .py_1()
             .border_color(self.border_color);
@@ -79,6 +87,13 @@ impl MarkdownTable {
         }
         table
     }
+
+    fn alignment_for_next_cell(&self) -> Alignment {
+        self.column_alignments
+            .get(self.current_row.len())
+            .copied()
+            .unwrap_or(Alignment::None)
+    }
 }
 
 struct Renderer<I> {
@@ -141,8 +156,11 @@ where
             Tag::BlockQuote => {
                 self.block_quote_depth += 1;
             }
-            Tag::Table(_text_alignments) => {
-                self.table = Some(MarkdownTable::new(self.theme.colors().border));
+            Tag::Table(column_alignments) => {
+                self.table = Some(MarkdownTable::new(
+                    self.theme.colors().border,
+                    column_alignments,
+                ));
             }
             _ => {}
         }

From a853a80634149ad5d069c48c4a0ece0bd584b5b1 Mon Sep 17 00:00:00 2001
From: thurain <89703554+DevThurain@users.noreply.github.com>
Date: Thu, 1 Feb 2024 20:43:07 +0630
Subject: [PATCH 130/372] Add YAML file type icon (#7185)

Add YAML file type icon from
[file-icons/icons](https://github.com/file-icons/icons)

https://github.com/file-icons/icons/blob/master/svg/YAML.svg
Release Notes:
- Added YAML file type icon.

---------

Co-authored-by: d1y <chenhonzhou@gmail.com>
---
 assets/icons/file_icons/file_types.json | 7 +++++--
 assets/icons/file_icons/yaml.svg        | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 assets/icons/file_icons/yaml.svg

diff --git a/assets/icons/file_icons/file_types.json b/assets/icons/file_icons/file_types.json
index ce6c257fe6..993dfe53b0 100644
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -109,8 +109,8 @@
         "xls": "document",
         "xlsx": "document",
         "xml": "template",
-        "yaml": "settings",
-        "yml": "settings",
+        "yaml": "yaml",
+        "yml": "yaml",
         "zlogin": "terminal",
         "zsh": "terminal",
         "zsh_aliases": "terminal",
@@ -174,6 +174,9 @@
         "php": {
             "icon": "icons/file_icons/php.svg"
         },
+        "yaml": {
+            "icon": "icons/file_icons/yaml.svg"
+        },
         "prettier": {
             "icon": "icons/file_icons/prettier.svg"
         },
diff --git a/assets/icons/file_icons/yaml.svg b/assets/icons/file_icons/yaml.svg
new file mode 100644
index 0000000000..eb5987878b
--- /dev/null
+++ b/assets/icons/file_icons/yaml.svg
@@ -0,0 +1 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="457px" height="512px"><polygon points="342.0159302,0 457,0 114.9831009,512 0,512 171.0082092,256 0,0 114.9831009,0 228.4997559,169.9342041 "/></svg>
\ No newline at end of file

From adc7cfb0d3a19e53d4df250cccb753d1248a2a63 Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Thu, 1 Feb 2024 16:28:51 +0100
Subject: [PATCH 131/372] Fix moving focus to docks when navigating via
 keybinds (#7221)

This is a follow-up to #7141 and fixes the focus-switching to docks in
case they haven't been focused before.

We ran into issues when trying to focus a dock, that hasn't been focused
in the app's lifecycle: focus would only flip after the next re-render
(which could be triggered by moving the mouse, for example)

This changes the approach and uses the one we have for `toggle focus`
actions.

Release Notes:

- N/A

Co-authored-by: Piotr <piotr@zed.dev>
Co-authored-by: bennetbo <bennetbo@gmx.de>
---
 crates/workspace/src/pane_group.rs | 11 +++++++++++
 crates/workspace/src/workspace.rs  |  8 +++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/crates/workspace/src/pane_group.rs b/crates/workspace/src/pane_group.rs
index 75db85f4a9..8e129d5bca 100644
--- a/crates/workspace/src/pane_group.rs
+++ b/crates/workspace/src/pane_group.rs
@@ -522,6 +522,17 @@ pub enum SplitDirection {
     Right,
 }
 
+impl std::fmt::Display for SplitDirection {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            SplitDirection::Up => write!(f, "up"),
+            SplitDirection::Down => write!(f, "down"),
+            SplitDirection::Left => write!(f, "left"),
+            SplitDirection::Right => write!(f, "right"),
+        }
+    }
+}
+
 impl SplitDirection {
     pub fn all() -> [Self; 4] {
         [Self::Up, Self::Down, Self::Left, Self::Right]
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 19d203716b..ada4816753 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -2152,7 +2152,13 @@ impl Workspace {
 
         match target {
             Some(ActivateInDirectionTarget::Pane(pane)) => cx.focus_view(&pane),
-            Some(ActivateInDirectionTarget::Dock(dock)) => cx.focus_view(&dock),
+            Some(ActivateInDirectionTarget::Dock(dock)) => {
+                if let Some(panel) = dock.read(cx).active_panel() {
+                    panel.focus_handle(cx).focus(cx);
+                } else {
+                    log::error!("Could not find a focus target when in switching focus in {direction} direction for a {:?} dock", dock.read(cx).position());
+                }
+            }
             None => {}
         }
     }

From b9d5eb17a37d2b37f47d1914cdedbb58e909e328 Mon Sep 17 00:00:00 2001
From: d1y <chenhonzhou@gmail.com>
Date: Fri, 2 Feb 2024 00:05:51 +0800
Subject: [PATCH 132/372] Fix typo (#7223)

Release Notes:

- N/A
---
 crates/zed/src/languages/gitcommit/config.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/zed/src/languages/gitcommit/config.toml b/crates/zed/src/languages/gitcommit/config.toml
index 25eb2425df..70c68d9385 100644
--- a/crates/zed/src/languages/gitcommit/config.toml
+++ b/crates/zed/src/languages/gitcommit/config.toml
@@ -1,4 +1,4 @@
-name = "Git commit"
+name = "Git Commit"
 path_suffixes = [
   # Refer to https://github.com/neovim/neovim/blob/master/runtime/lua/vim/filetype.lua#L1286-L1290
   "TAG_EDITMSG",

From 47a1ff7df9d083e2538cc267ba45dd68771c3c1c Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Thu, 1 Feb 2024 11:26:50 -0500
Subject: [PATCH 133/372] markdown_preview: Sort dependencies in `Cargo.toml`
 (#7226)

This PR sorts the dependencies for the `markdown_preview` crate in
alphabetical order.

Release Notes:

- N/A
---
 crates/markdown_preview/Cargo.toml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/crates/markdown_preview/Cargo.toml b/crates/markdown_preview/Cargo.toml
index bb52a64ed6..df41f12d21 100644
--- a/crates/markdown_preview/Cargo.toml
+++ b/crates/markdown_preview/Cargo.toml
@@ -12,21 +12,20 @@ path = "src/markdown_preview.rs"
 test-support = []
 
 [dependencies]
+anyhow.workspace = true
 editor = { path = "../editor" }
 gpui = { path = "../gpui" }
 language = { path = "../language" }
+lazy_static.workspace = true
+log.workspace = true
 menu = { path = "../menu" }
 project = { path = "../project" }
+pulldown-cmark.workspace = true
+rich_text = { path = "../rich_text" }
 theme = { path = "../theme" }
 ui = { path = "../ui" }
 util = { path = "../util" }
 workspace = { path = "../workspace" }
-rich_text = { path = "../rich_text" }
-
-anyhow.workspace = true
-lazy_static.workspace = true
-log.workspace = true
-pulldown-cmark.workspace = true
 
 [dev-dependencies]
 editor = { path = "../editor", features = ["test-support"] }

From 944a1f8fb0f1d9e65bbcffc8ed064f0f32827828 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Thu, 1 Feb 2024 18:39:28 +0200
Subject: [PATCH 134/372] Send lsp_types::InitializeParams with Zed version
 (#7216)

Based on the great work in
https://github.com/zed-industries/zed/pull/7130 , now sends this data

```
[crates/lsp/src/lsp.rs:588] ClientInfo { name: name.to_string(), version: Some(version.to_string()) } = ClientInfo {
    name: "Zed Dev",
    version: Some(
        "0.122.0",
    ),
}
```

with every LSP server initialization.

Release Notes:

- Added Zed name and version to LSP InitializeParams requests
---
 Cargo.lock                                    |  6 ++++
 crates/copilot/src/copilot.rs                 |  2 +-
 crates/editor/Cargo.toml                      |  1 +
 crates/editor/src/editor_tests.rs             |  1 +
 crates/editor/src/inlay_hint_cache.rs         |  1 +
 crates/language_tools/Cargo.toml              |  1 +
 crates/language_tools/src/lsp_log_tests.rs    |  1 +
 crates/lsp/Cargo.toml                         |  1 +
 crates/lsp/src/lsp.rs                         | 36 +++++++++++++------
 crates/prettier/src/prettier.rs               |  6 ++--
 crates/project/Cargo.toml                     |  1 +
 crates/project/src/project.rs                 |  4 ++-
 crates/project/src/project_tests.rs           |  1 +
 crates/project_symbols/Cargo.toml             |  1 +
 crates/project_symbols/src/project_symbols.rs |  1 +
 crates/vim/Cargo.toml                         |  1 +
 crates/vim/src/test/vim_test_context.rs       |  1 +
 17 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 14affc3281..ed428585bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2425,6 +2425,7 @@ dependencies = [
  "postage",
  "project",
  "rand 0.8.5",
+ "release_channel",
  "rich_text",
  "rpc",
  "schemars",
@@ -4021,6 +4022,7 @@ dependencies = [
  "language",
  "lsp",
  "project",
+ "release_channel",
  "serde",
  "serde_json",
  "settings",
@@ -4265,6 +4267,7 @@ dependencies = [
  "lsp-types",
  "parking_lot 0.11.2",
  "postage",
+ "release_channel",
  "serde",
  "serde_derive",
  "serde_json",
@@ -5819,6 +5822,7 @@ dependencies = [
  "pretty_assertions",
  "rand 0.8.5",
  "regex",
+ "release_channel",
  "rpc",
  "schemars",
  "serde",
@@ -5883,6 +5887,7 @@ dependencies = [
  "picker",
  "postage",
  "project",
+ "release_channel",
  "serde_json",
  "settings",
  "smol",
@@ -9443,6 +9448,7 @@ dependencies = [
  "parking_lot 0.11.2",
  "project",
  "regex",
+ "release_channel",
  "search",
  "serde",
  "serde_derive",
diff --git a/crates/copilot/src/copilot.rs b/crates/copilot/src/copilot.rs
index 16f941d16f..d4d7539a05 100644
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -445,7 +445,7 @@ impl Copilot {
                     )
                     .detach();
 
-                let server = server.initialize(Default::default()).await?;
+                let server = cx.update(|cx| server.initialize(None, cx))?.await?;
 
                 let status = server
                     .request::<request::CheckStatus>(request::CheckStatusParams {
diff --git a/crates/editor/Cargo.toml b/crates/editor/Cargo.toml
index b5067afbf2..3e6b4d709c 100644
--- a/crates/editor/Cargo.toml
+++ b/crates/editor/Cargo.toml
@@ -79,6 +79,7 @@ language = { path = "../language", features = ["test-support"] }
 lsp = { path = "../lsp", features = ["test-support"] }
 multi_buffer = { path = "../multi_buffer", features = ["test-support"] }
 project = { path = "../project", features = ["test-support"] }
+release_channel = { path = "../release_channel" }
 rand.workspace = true
 settings = { path = "../settings", features = ["test-support"] }
 text = { path = "../text", features = ["test-support"] }
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 297ee0770b..6b23e13d15 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -8392,6 +8392,7 @@ pub(crate) fn init_test(cx: &mut TestAppContext, f: fn(&mut AllLanguageSettingsC
         let store = SettingsStore::test(cx);
         cx.set_global(store);
         theme::init(theme::LoadThemes::JustBase, cx);
+        release_channel::init("0.0.0", cx);
         client::init_settings(cx);
         language::init(cx);
         Project::init_settings(cx);
diff --git a/crates/editor/src/inlay_hint_cache.rs b/crates/editor/src/inlay_hint_cache.rs
index 71e039a843..ae5a0ef9a3 100644
--- a/crates/editor/src/inlay_hint_cache.rs
+++ b/crates/editor/src/inlay_hint_cache.rs
@@ -3216,6 +3216,7 @@ pub mod tests {
             let settings_store = SettingsStore::test(cx);
             cx.set_global(settings_store);
             theme::init(theme::LoadThemes::JustBase, cx);
+            release_channel::init("0.0.0", cx);
             client::init_settings(cx);
             language::init(cx);
             Project::init_settings(cx);
diff --git a/crates/language_tools/Cargo.toml b/crates/language_tools/Cargo.toml
index d32677fd6e..769509aa6b 100644
--- a/crates/language_tools/Cargo.toml
+++ b/crates/language_tools/Cargo.toml
@@ -30,6 +30,7 @@ workspace = { path = "../workspace" }
 [dev-dependencies]
 client = { path = "../client", features = ["test-support"] }
 editor = { path = "../editor", features = ["test-support"] }
+release_channel = { path = "../release_channel" }
 env_logger.workspace = true
 gpui = { path = "../gpui", features = ["test-support"] }
 unindent.workspace = true
diff --git a/crates/language_tools/src/lsp_log_tests.rs b/crates/language_tools/src/lsp_log_tests.rs
index 14683ae806..24b23df880 100644
--- a/crates/language_tools/src/lsp_log_tests.rs
+++ b/crates/language_tools/src/lsp_log_tests.rs
@@ -100,6 +100,7 @@ fn init_test(cx: &mut gpui::TestAppContext) {
         let settings_store = SettingsStore::test(cx);
         cx.set_global(settings_store);
         theme::init(theme::LoadThemes::JustBase, cx);
+        release_channel::init("0.0.0", cx);
         language::init(cx);
         client::init_settings(cx);
         Project::init_settings(cx);
diff --git a/crates/lsp/Cargo.toml b/crates/lsp/Cargo.toml
index f43c8a4bd8..c1fdd7b107 100644
--- a/crates/lsp/Cargo.toml
+++ b/crates/lsp/Cargo.toml
@@ -27,6 +27,7 @@ serde_derive.workspace = true
 serde_json.workspace = true
 smol.workspace = true
 util = { path = "../util" }
+release_channel = { path = "../release_channel" }
 
 [dev-dependencies]
 async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "82d00a04211cf4e1236029aa03e6b6ce2a74c553" }
diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index 65da2bc7dc..0d88e1507c 100644
--- a/crates/lsp/src/lsp.rs
+++ b/crates/lsp/src/lsp.rs
@@ -5,7 +5,7 @@ pub use lsp_types::*;
 use anyhow::{anyhow, Context, Result};
 use collections::HashMap;
 use futures::{channel::oneshot, io::BufWriter, AsyncRead, AsyncWrite, FutureExt};
-use gpui::{AsyncAppContext, BackgroundExecutor, Task};
+use gpui::{AppContext, AsyncAppContext, BackgroundExecutor, Task};
 use parking_lot::Mutex;
 use postage::{barrier, prelude::Stream};
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
@@ -450,7 +450,11 @@ impl LanguageServer {
     /// Note that `options` is used directly to construct [`InitializeParams`], which is why it is owned.
     ///
     /// [LSP Specification](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#initialize)
-    pub async fn initialize(mut self, options: Option<Value>) -> Result<Arc<Self>> {
+    pub fn initialize(
+        mut self,
+        options: Option<Value>,
+        cx: &AppContext,
+    ) -> Task<Result<Arc<Self>>> {
         let root_uri = Url::from_file_path(&self.root_path).unwrap();
         #[allow(deprecated)]
         let params = InitializeParams {
@@ -579,18 +583,25 @@ impl LanguageServer {
                 uri: root_uri,
                 name: Default::default(),
             }]),
-            client_info: None,
+            client_info: Some(ClientInfo {
+                name: release_channel::ReleaseChannel::global(cx)
+                    .display_name()
+                    .to_string(),
+                version: Some(release_channel::AppVersion::global(cx).to_string()),
+            }),
             locale: None,
         };
 
-        let response = self.request::<request::Initialize>(params).await?;
-        if let Some(info) = response.server_info {
-            self.name = info.name;
-        }
-        self.capabilities = response.capabilities;
+        cx.spawn(|_| async move {
+            let response = self.request::<request::Initialize>(params).await?;
+            if let Some(info) = response.server_info {
+                self.name = info.name;
+            }
+            self.capabilities = response.capabilities;
 
-        self.notify::<notification::Initialized>(InitializedParams {})?;
-        Ok(Arc::new(self))
+            self.notify::<notification::Initialized>(InitializedParams {})?;
+            Ok(Arc::new(self))
+        })
     }
 
     /// Sends a shutdown request to the language server process and prepares the [`LanguageServer`] to be dropped.
@@ -1213,6 +1224,9 @@ mod tests {
 
     #[gpui::test]
     async fn test_fake(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            release_channel::init("0.0.0", cx);
+        });
         let (server, mut fake) =
             FakeLanguageServer::new("the-lsp".to_string(), Default::default(), cx.to_async());
 
@@ -1229,7 +1243,7 @@ mod tests {
             })
             .detach();
 
-        let server = server.initialize(None).await.unwrap();
+        let server = cx.update(|cx| server.initialize(None, cx)).await.unwrap();
         server
             .notify::<notification::DidOpenTextDocument>(DidOpenTextDocumentParams {
                 text_document: TextDocumentItem::new(
diff --git a/crates/prettier/src/prettier.rs b/crates/prettier/src/prettier.rs
index 61bcf9c9b3..b029aefb70 100644
--- a/crates/prettier/src/prettier.rs
+++ b/crates/prettier/src/prettier.rs
@@ -195,11 +195,11 @@ impl Prettier {
             },
             Path::new("/"),
             None,
-            cx,
+            cx.clone(),
         )
         .context("prettier server creation")?;
-        let server = executor
-            .spawn(server.initialize(None))
+        let server = cx
+            .update(|cx| executor.spawn(server.initialize(None, cx)))?
             .await
             .context("prettier server initialization")?;
         Ok(Self::Real(RealPrettier {
diff --git a/crates/project/Cargo.toml b/crates/project/Cargo.toml
index 78e9625afb..1854feb8fe 100644
--- a/crates/project/Cargo.toml
+++ b/crates/project/Cargo.toml
@@ -75,6 +75,7 @@ fs = { path = "../fs",  features = ["test-support"] }
 git2.workspace = true
 gpui = { path = "../gpui", features = ["test-support"] }
 language = { path = "../language", features = ["test-support"] }
+release_channel = { path = "../release_channel" }
 lsp = { path = "../lsp", features = ["test-support"] }
 prettier = { path = "../prettier", features = ["test-support"] }
 pretty_assertions.workspace = true
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index fdd273059b..0788594222 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -3130,7 +3130,9 @@ impl Project {
             (None, override_options) => initialization_options = override_options,
             _ => {}
         }
-        let language_server = language_server.initialize(initialization_options).await?;
+        let language_server = cx
+            .update(|cx| language_server.initialize(initialization_options, cx))?
+            .await?;
 
         language_server
             .notify::<lsp::notification::DidChangeConfiguration>(
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index e90d323712..2e222c24fb 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -4380,6 +4380,7 @@ fn init_test(cx: &mut gpui::TestAppContext) {
     cx.update(|cx| {
         let settings_store = SettingsStore::test(cx);
         cx.set_global(settings_store);
+        release_channel::init("0.0.0", cx);
         language::init(cx);
         Project::init_settings(cx);
     });
diff --git a/crates/project_symbols/Cargo.toml b/crates/project_symbols/Cargo.toml
index 27d36ea99a..2b3027a089 100644
--- a/crates/project_symbols/Cargo.toml
+++ b/crates/project_symbols/Cargo.toml
@@ -33,6 +33,7 @@ gpui = { path = "../gpui", features = ["test-support"] }
 language = { path = "../language", features = ["test-support"] }
 lsp = { path = "../lsp", features = ["test-support"] }
 project = { path = "../project", features = ["test-support"] }
+release_channel = { path = "../release_channel" }
 settings = { path = "../settings", features = ["test-support"] }
 theme = { path = "../theme", features = ["test-support"] }
 workspace = { path = "../workspace", features = ["test-support"] }
diff --git a/crates/project_symbols/src/project_symbols.rs b/crates/project_symbols/src/project_symbols.rs
index 3d3e232895..8aa7fac359 100644
--- a/crates/project_symbols/src/project_symbols.rs
+++ b/crates/project_symbols/src/project_symbols.rs
@@ -392,6 +392,7 @@ mod tests {
             let store = SettingsStore::test(cx);
             cx.set_global(store);
             theme::init(theme::LoadThemes::JustBase, cx);
+            release_channel::init("0.0.0", cx);
             language::init(cx);
             Project::init_settings(cx);
             workspace::init_settings(cx);
diff --git a/crates/vim/Cargo.toml b/crates/vim/Cargo.toml
index c5b6ec0732..8415111849 100644
--- a/crates/vim/Cargo.toml
+++ b/crates/vim/Cargo.toml
@@ -43,6 +43,7 @@ zed_actions = { path = "../zed_actions" }
 editor = { path = "../editor", features = ["test-support"] }
 futures.workspace = true
 gpui = { path = "../gpui", features = ["test-support"] }
+release_channel = { path = "../release_channel" }
 indoc.workspace = true
 language = { path = "../language", features = ["test-support"] }
 lsp = { path = "../lsp", features = ["test-support"] }
diff --git a/crates/vim/src/test/vim_test_context.rs b/crates/vim/src/test/vim_test_context.rs
index 0e41f5a036..70334d70d4 100644
--- a/crates/vim/src/test/vim_test_context.rs
+++ b/crates/vim/src/test/vim_test_context.rs
@@ -23,6 +23,7 @@ impl VimTestContext {
             search::init(cx);
             let settings = SettingsStore::test(cx);
             cx.set_global(settings);
+            release_channel::init("0.0.0", cx);
             command_palette::init(cx);
             crate::init(cx);
         });

From 3107ed847a15dc74601fac33731f65a6fa5a9355 Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Thu, 1 Feb 2024 17:49:53 +0100
Subject: [PATCH 135/372] lsp: if language server closes stdout/stderr, break
 loop (#7229)

Previously we would run these loops indefinitely when a language server
closed its stdout/stderr and the `read_until` returned `0` bytes read.

Easy to reproduce: start Zed with LSP attached, `kill -9` the LSP, see
logs accumulate.

Release Notes:

- Fix high CPU usage when a language server crashes (or closes its
stdout/stderr on purpose).

Co-authored-by: Julia <julia@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
---
 crates/lsp/src/lsp.rs | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index 0d88e1507c..f9cd138217 100644
--- a/crates/lsp/src/lsp.rs
+++ b/crates/lsp/src/lsp.rs
@@ -322,8 +322,15 @@ impl LanguageServer {
         let mut buffer = Vec::new();
         loop {
             buffer.clear();
-            stdout.read_until(b'\n', &mut buffer).await?;
-            stdout.read_until(b'\n', &mut buffer).await?;
+
+            if stdout.read_until(b'\n', &mut buffer).await? == 0 {
+                break;
+            };
+
+            if stdout.read_until(b'\n', &mut buffer).await? == 0 {
+                break;
+            };
+
             let header = std::str::from_utf8(&buffer)?;
             let message_len: usize = header
                 .strip_prefix(CONTENT_LEN_HEADER)
@@ -378,6 +385,8 @@ impl LanguageServer {
             // Don't starve the main thread when receiving lots of messages at once.
             smol::future::yield_now().await;
         }
+
+        Ok(())
     }
 
     async fn handle_stderr<Stderr>(
@@ -393,7 +402,12 @@ impl LanguageServer {
 
         loop {
             buffer.clear();
-            stderr.read_until(b'\n', &mut buffer).await?;
+
+            let bytes_read = stderr.read_until(b'\n', &mut buffer).await?;
+            if bytes_read == 0 {
+                return Ok(());
+            }
+
             if let Ok(message) = str::from_utf8(&buffer) {
                 log::trace!("incoming stderr message:{message}");
                 for handler in io_handlers.lock().values_mut() {

From 97be0a930c2b22bdbbcc145c984526b21a0c4c8d Mon Sep 17 00:00:00 2001
From: Dairon M <dairon.medina@gmail.com>
Date: Thu, 1 Feb 2024 11:54:26 -0500
Subject: [PATCH 136/372] Add syntax highlighting and LSP (erlang_lsp) for
 Erlang (#7093)

This pull request implements support for the [Erlang
Language](https://erlang.org/).

**It adds:**

* [tree-sitter-erlang](https://github.com/WhatsApp/tree-sitter-erlang)
grammar
highlights (Licensed under Apache-2 from WhatsApp which is compatible
with Zed licensing model), folds and indents
* Erlang file icon based on the [official
one](https://www.erlang.org/doc/erlang-logo.png)
* [erlang_ls](https://github.com/erlang-ls/erlang_ls) support

Fixes https://github.com/zed-industries/zed/issues/4939, possibly a
duplicate of https://github.com/zed-industries/zed/pull/7085 with more
features. Suppose @wingyplus wants to join efforts here.

**To complete (out of scope for this PR):**

* Support for the ELP language server from WhatsApp. CC @robertoaloi
* Better indentation handling, need something like
`indentNextLinePattern` in VS Code

**Screenshots:**

![Screenshot 2024-01-30 at 11 03 51
AM](https://github.com/zed-industries/zed/assets/168440/5289c245-9edd-46b8-b443-d7b3210f6510)
![Screenshot 2024-01-30 at 11 01 19
AM](https://github.com/zed-industries/zed/assets/168440/bd22b322-5344-44e6-b5f7-6e352fb3deef)
![Screenshot 2024-01-30 at 11 01 37
AM](https://github.com/zed-industries/zed/assets/168440/f28f6a15-383e-4719-8a87-fceae5062436)
![Screenshot 2024-01-30 at 11 02 03
AM](https://github.com/zed-industries/zed/assets/168440/980d5213-0367-4a08-86eb-5743dfa628eb)
![Screenshot 2024-01-30 at 11 02 19
AM](https://github.com/zed-industries/zed/assets/168440/ea998891-604d-48d6-929f-ae4c1bb3fae1)

Outline:
![Screenshot 2024-01-31 at 9 09 36
AM](https://github.com/zed-industries/zed/assets/168440/46d56d94-21c3-414d-84fb-9251fa2506ab)



**Release Notes:**

* Added Erlang Support
([7093](https://github.com/zed-industries/zed/pull/7093)).

---------

Signed-off-by: Thanabodee Charoenpiriyakij <wingyminus@gmail.com>
Co-authored-by: Thanabodee Charoenpiriyakij <wingyminus@gmail.com>
---
 Cargo.lock                                    |  11 +
 Cargo.toml                                    |   1 +
 assets/icons/file_icons/erlang.svg            |   1 +
 assets/icons/file_icons/file_types.json       |  19 +-
 crates/zed/Cargo.toml                         |   1 +
 crates/zed/src/languages.rs                   |   7 +
 crates/zed/src/languages/erlang.rs            |  58 +++++
 crates/zed/src/languages/erlang/brackets.scm  |   3 +
 crates/zed/src/languages/erlang/config.toml   |  23 ++
 crates/zed/src/languages/erlang/folds.scm     |   9 +
 .../zed/src/languages/erlang/highlights.scm   | 231 ++++++++++++++++++
 crates/zed/src/languages/erlang/indents.scm   |   3 +
 crates/zed/src/languages/erlang/outline.scm   |  31 +++
 docs/src/languages/erlang.md                  |   4 +
 14 files changed, 398 insertions(+), 4 deletions(-)
 create mode 100644 assets/icons/file_icons/erlang.svg
 create mode 100644 crates/zed/src/languages/erlang.rs
 create mode 100644 crates/zed/src/languages/erlang/brackets.scm
 create mode 100644 crates/zed/src/languages/erlang/config.toml
 create mode 100644 crates/zed/src/languages/erlang/folds.scm
 create mode 100644 crates/zed/src/languages/erlang/highlights.scm
 create mode 100644 crates/zed/src/languages/erlang/indents.scm
 create mode 100644 crates/zed/src/languages/erlang/outline.scm
 create mode 100644 docs/src/languages/erlang.md

diff --git a/Cargo.lock b/Cargo.lock
index ed428585bf..7b3a5ba6f3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8812,6 +8812,16 @@ dependencies = [
  "tree-sitter",
 ]
 
+[[package]]
+name = "tree-sitter-erlang"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93ced5145ebb17f83243bf055b74e108da7cc129e12faab4166df03f59b287f4"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
 [[package]]
 name = "tree-sitter-gitcommit"
 version = "0.3.3"
@@ -10392,6 +10402,7 @@ dependencies = [
  "tree-sitter-elixir",
  "tree-sitter-elm",
  "tree-sitter-embedded-template",
+ "tree-sitter-erlang",
  "tree-sitter-gitcommit",
  "tree-sitter-gleam",
  "tree-sitter-glsl",
diff --git a/Cargo.toml b/Cargo.toml
index 00d69c8786..f46d32a53c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -142,6 +142,7 @@ tree-sitter-css = { git = "https://github.com/tree-sitter/tree-sitter-css", rev
 tree-sitter-elixir = { git = "https://github.com/elixir-lang/tree-sitter-elixir", rev = "a2861e88a730287a60c11ea9299c033c7d076e30" }
 tree-sitter-elm = { git = "https://github.com/elm-tooling/tree-sitter-elm", rev = "692c50c0b961364c40299e73c1306aecb5d20f40" }
 tree-sitter-embedded-template = "0.20.0"
+tree-sitter-erlang = "0.4.0"
 tree-sitter-gitcommit = { git = "https://github.com/gbprod/tree-sitter-gitcommit" }
 tree-sitter-gleam = { git = "https://github.com/gleam-lang/tree-sitter-gleam", rev = "58b7cac8fc14c92b0677c542610d8738c373fa81" }
 tree-sitter-glsl = { git = "https://github.com/theHamsta/tree-sitter-glsl", rev = "2a56fb7bc8bb03a1892b4741279dd0a8758b7fb3" }
diff --git a/assets/icons/file_icons/erlang.svg b/assets/icons/file_icons/erlang.svg
new file mode 100644
index 0000000000..2dd57910b8
--- /dev/null
+++ b/assets/icons/file_icons/erlang.svg
@@ -0,0 +1 @@
+<svg height="64" viewBox="0 0 128 128" width="64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="0" x2="128" y1="128" y2="0"><stop offset="0" stop-color="#333"/><stop offset="1" stop-color="#5d5d5d"/></linearGradient><path d="m12.239265 30.664279h14.960911c-5.59432 5.460938-7.654216 10.692785-10.342106 18.023379-3.200764 8.729348-.549141 29.987457 3.815534 37.55289 2.943384 5.101853 6.282685 8.994876 8.233522 11.095173h-16.667861zm89.614855 0h13.90661v66.671442h-13.55518c1.31391-1.750328 3.43934-4.534454 5.12085-6.426163 2.32782-2.618784 4.97023-6.978412 4.97023-6.978412l-16.015202-8.133112s-5.48977 11.600331-15.964999 15.964998c-10.475214 4.364666-19.784679-.838179-25.604243-7.530659-5.819578-6.692502-5.82371-22.14014-5.82371-22.14014h60.797524c1.16391-14.839892-2.63216-21.249816-4.66901-25.90547-.91799-2.098266-1.89261-3.810819-3.16287-5.522484zm-38.356164 1.757154c.35429-.01632.731685-.0092 1.104497 0 11.930114.290977 13.053143 12.802122 13.053143 12.802122h-27.311192s2.170772-12.298638 13.153552-12.802122z" fill="url(#a)"/></svg>
diff --git a/assets/icons/file_icons/file_types.json b/assets/icons/file_icons/file_types.json
index 993dfe53b0..8cf7b314c9 100644
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -1,7 +1,9 @@
 {
     "suffixes": {
+        "Emakefile": "erlang",
         "aac": "audio",
         "accdb": "storage",
+        "app.src": "erlang",
         "avif": "image",
         "bak": "backup",
         "bash": "terminal",
@@ -23,6 +25,8 @@
         "doc": "document",
         "docx": "document",
         "eex": "elixir",
+        "erl": "erlang",
+        "escript": "erlang",
         "eslintrc": "eslint",
         "eslintrc.js": "eslint",
         "eslintrc.json": "eslint",
@@ -37,17 +41,18 @@
         "gif": "image",
         "gitattributes": "vcs",
         "gitignore": "vcs",
-        "gitmodules": "vcs",
         "gitkeep": "vcs",
+        "gitmodules": "vcs",
         "go": "go",
         "h": "code",
         "handlebars": "code",
         "hbs": "template",
         "heex": "elixir",
         "heif": "image",
+        "hrl": "erlang",
+        "hs": "haskell",
         "htm": "template",
         "html": "template",
-        "hs": "haskell",
         "ib": "storage",
         "ico": "image",
         "ini": "settings",
@@ -85,6 +90,7 @@
         "psd": "image",
         "py": "python",
         "rb": "ruby",
+        "rebar.config": "erlang",
         "rkt": "code",
         "rs": "rust",
         "rtf": "document",
@@ -104,13 +110,15 @@
         "txt": "document",
         "vue": "vue",
         "wav": "audio",
-        "webp": "image",
         "webm": "video",
+        "webp": "image",
         "xls": "document",
         "xlsx": "document",
         "xml": "template",
+        "xrl": "erlang",
         "yaml": "yaml",
         "yml": "yaml",
+        "yrl": "erlang",
         "zlogin": "terminal",
         "zsh": "terminal",
         "zsh_aliases": "terminal",
@@ -133,7 +141,7 @@
             "icon": "icons/file_icons/folder.svg"
         },
         "css": {
-          "icon": "icons/file_icons/css.svg"
+            "icon": "icons/file_icons/css.svg"
         },
         "default": {
             "icon": "icons/file_icons/file.svg"
@@ -144,6 +152,9 @@
         "elixir": {
             "icon": "icons/file_icons/elixir.svg"
         },
+        "erlang": {
+            "icon": "icons/file_icons/erlang.svg"
+        },
         "eslint": {
             "icon": "icons/file_icons/eslint.svg"
         },
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index f17d3053a0..b87b79e2f0 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -114,6 +114,7 @@ tree-sitter-css.workspace = true
 tree-sitter-elixir.workspace = true
 tree-sitter-elm.workspace = true
 tree-sitter-embedded-template.workspace = true
+tree-sitter-erlang.workspace = true
 tree-sitter-gitcommit.workspace = true
 tree-sitter-gleam.workspace = true
 tree-sitter-glsl.workspace = true
diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index f0217af1d9..add9f9c192 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -15,6 +15,7 @@ mod css;
 mod deno;
 mod elixir;
 mod elm;
+mod erlang;
 mod gleam;
 mod go;
 mod haskell;
@@ -113,6 +114,12 @@ pub fn init(
         ),
     }
     language("gitcommit", tree_sitter_gitcommit::language(), vec![]);
+    language(
+        "erlang",
+        tree_sitter_erlang::language(),
+        vec![Arc::new(erlang::ErlangLspAdapter)],
+    );
+
     language(
         "gleam",
         tree_sitter_gleam::language(),
diff --git a/crates/zed/src/languages/erlang.rs b/crates/zed/src/languages/erlang.rs
new file mode 100644
index 0000000000..b50b6e7564
--- /dev/null
+++ b/crates/zed/src/languages/erlang.rs
@@ -0,0 +1,58 @@
+use anyhow::{anyhow, Result};
+use async_trait::async_trait;
+use language::{LanguageServerName, LspAdapter, LspAdapterDelegate};
+use lsp::LanguageServerBinary;
+use std::{any::Any, path::PathBuf};
+
+pub struct ErlangLspAdapter;
+
+#[async_trait]
+impl LspAdapter for ErlangLspAdapter {
+    fn name(&self) -> LanguageServerName {
+        LanguageServerName("erlang_ls".into())
+    }
+
+    fn short_name(&self) -> &'static str {
+        "erlang_ls"
+    }
+
+    async fn fetch_latest_server_version(
+        &self,
+        _: &dyn LspAdapterDelegate,
+    ) -> Result<Box<dyn 'static + Send + Any>> {
+        Ok(Box::new(()) as Box<_>)
+    }
+
+    async fn fetch_server_binary(
+        &self,
+        _version: Box<dyn 'static + Send + Any>,
+        _container_dir: PathBuf,
+        _: &dyn LspAdapterDelegate,
+    ) -> Result<LanguageServerBinary> {
+        Err(anyhow!(
+            "erlang_ls must be installed and available in your $PATH"
+        ))
+    }
+
+    async fn cached_server_binary(
+        &self,
+        _: PathBuf,
+        _: &dyn LspAdapterDelegate,
+    ) -> Option<LanguageServerBinary> {
+        Some(LanguageServerBinary {
+            path: "erlang_ls".into(),
+            arguments: vec![],
+        })
+    }
+
+    fn can_be_reinstalled(&self) -> bool {
+        false
+    }
+
+    async fn installation_test_binary(&self, _: PathBuf) -> Option<LanguageServerBinary> {
+        Some(LanguageServerBinary {
+            path: "erlang_ls".into(),
+            arguments: vec!["--version".into()],
+        })
+    }
+}
diff --git a/crates/zed/src/languages/erlang/brackets.scm b/crates/zed/src/languages/erlang/brackets.scm
new file mode 100644
index 0000000000..191fd9c084
--- /dev/null
+++ b/crates/zed/src/languages/erlang/brackets.scm
@@ -0,0 +1,3 @@
+("(" @open ")" @close)
+("[" @open "]" @close)
+("{" @open "}" @close)
diff --git a/crates/zed/src/languages/erlang/config.toml b/crates/zed/src/languages/erlang/config.toml
new file mode 100644
index 0000000000..5f92c0fe27
--- /dev/null
+++ b/crates/zed/src/languages/erlang/config.toml
@@ -0,0 +1,23 @@
+name = "Erlang"
+# TODO: support parsing rebar.config files
+# # https://github.com/WhatsApp/tree-sitter-erlang/issues/3
+path_suffixes = ["erl", "hrl", "app.src", "escript", "xrl", "yrl", "Emakefile", "rebar.config"]
+line_comments = ["% ", "%% ", "%%% "]
+autoclose_before = ";:.,=}])>"
+brackets = [
+    { start = "{", end = "}", close = true, newline = true },
+    { start = "[", end = "]", close = true, newline = true },
+    { start = "(", end = ")", close = true, newline = true },
+    { start = "<<", end = ">>", close = true, newline = false, not_in = ["string"] },
+    { start = "\"", end = "\"", close = true, newline = false, not_in = ["string"] },
+    { start = "'", end = "'", close = true, newline = false, not_in = ["string", "comment"] },
+]
+# Indent if a line ends brackets, "->" or most keywords. Also if prefixed
+# with "||". This should work with most formatting models.
+# The ([^%]).* is to ensure this doesn't match inside comments.
+increase_indent_pattern = "^([^%]).*([{(\\[]]|\\->|after|begin|case|catch|fun|if|of|try|when|maybe|else|(\\|\\|.*))\\s*$"
+
+# Dedent after brackets, end or lone "->". The latter happens in a spec
+# with indented types, typically after "when". Only do this if it's _only_
+# preceded by whitespace.
+decrease_indent_pattern = "^\\s*([)}\\]]|end|else|\\->\\s*$)"
diff --git a/crates/zed/src/languages/erlang/folds.scm b/crates/zed/src/languages/erlang/folds.scm
new file mode 100644
index 0000000000..65c2d8ed19
--- /dev/null
+++ b/crates/zed/src/languages/erlang/folds.scm
@@ -0,0 +1,9 @@
+[
+  (fun_decl)
+  (anonymous_fun)
+  (case_expr)
+  (maybe_expr)
+  (map_expr)
+  (export_attribute)
+  (export_type_attribute)
+] @fold
diff --git a/crates/zed/src/languages/erlang/highlights.scm b/crates/zed/src/languages/erlang/highlights.scm
new file mode 100644
index 0000000000..c4abf04776
--- /dev/null
+++ b/crates/zed/src/languages/erlang/highlights.scm
@@ -0,0 +1,231 @@
+;; Copyright (c) Facebook, Inc. and its affiliates.
+;;
+;; Licensed under the Apache License, Version 2.0 (the "License");
+;; you may not use this file except in compliance with the License.
+;; You may obtain a copy of the License at
+;;
+;;     http://www.apache.org/licenses/LICENSE-2.0
+;;
+;; Unless required by applicable law or agreed to in writing, software
+;; distributed under the License is distributed on an "AS IS" BASIS,
+;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+;; See the License for the specific language governing permissions and
+;; limitations under the License.
+;; ---------------------------------------------------------------------
+
+;; Based initially on the contents of https://github.com/WhatsApp/tree-sitter-erlang/issues/2 by @Wilfred
+;; and https://github.com/the-mikedavis/tree-sitter-erlang/blob/main/queries/highlights.scm
+;;
+;; The tests are also based on those in
+;; https://github.com/the-mikedavis/tree-sitter-erlang/tree/main/test/highlight
+;;
+
+
+;; First match wins in this file
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;; Attributes
+
+;; module attribute
+(module_attribute
+  name: (atom) @module)
+
+;; behaviour
+(behaviour_attribute name: (atom) @module)
+
+;; export
+
+;; Import attribute
+(import_attribute
+    module: (atom) @module)
+
+;; export_type
+
+;; optional_callbacks
+
+;; compile
+(compile_options_attribute
+    options: (tuple
+      expr: (atom)
+      expr: (list
+        exprs: (binary_op_expr
+          lhs: (atom)
+          rhs: (integer)))))
+
+;; file attribute
+
+;; record
+(record_decl name: (atom) @type)
+(record_decl name: (macro_call_expr name: (var) @constant))
+(record_field name: (atom) @property)
+
+;; type alias
+
+;; opaque
+
+;; Spec attribute
+(spec fun: (atom) @function)
+(spec
+  module: (module name: (atom) @module)
+  fun: (atom) @function)
+
+;; callback
+(callback fun: (atom) @function)
+
+;; fun decl
+
+;; include/include_lib
+
+;; ifdef/ifndef
+(pp_ifdef name: (_) @keyword.directive)
+(pp_ifndef name: (_) @keyword.directive)
+
+;; define
+(pp_define
+    lhs: (macro_lhs
+      name: (_) @keyword.directive
+      args: (var_args args: (var))))
+(pp_define
+    lhs: (macro_lhs
+      name: (var) @constant))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Functions
+(fa fun: (atom) @function)
+(type_name name: (atom) @function)
+(call expr: (atom) @function)
+(function_clause name: (atom) @function)
+(internal_fun fun: (atom) @function)
+
+;; This is a fudge, we should check that the operator is '/'
+;; But our grammar does not (currently) provide it
+(binary_op_expr lhs: (atom) @function rhs: (integer))
+
+;; Others
+(remote_module module: (atom) @module)
+(remote fun: (atom) @function)
+(macro_call_expr name: (var) @keyword.directive args: (_) )
+(macro_call_expr name: (var) @constant)
+(macro_call_expr name: (atom) @keyword.directive)
+(record_field_name name: (atom) @property)
+(record_name name: (atom) @type)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Reserved words
+[ "after"
+  "and"
+  "band"
+  "begin"
+  "behavior"
+  "behaviour"
+  "bnot"
+  "bor"
+  "bsl"
+  "bsr"
+  "bxor"
+  "callback"
+  "case"
+  "catch"
+  "compile"
+  "define"
+  "deprecated"
+  "div"
+  "elif"
+  "else"
+  "end"
+  "endif"
+  "export"
+  "export_type"
+  "file"
+  "fun"
+  "if"
+  "ifdef"
+  "ifndef"
+  "import"
+  "include"
+  "include_lib"
+  "maybe"
+  "module"
+  "of"
+  "opaque"
+  "optional_callbacks"
+  "or"
+  "receive"
+  "record"
+  "spec"
+  "try"
+  "type"
+  "undef"
+  "unit"
+  "when"
+  "xor"] @keyword
+
+["andalso" "orelse"] @keyword.operator
+
+;; Punctuation
+["," "." ";"] @punctuation.delimiter
+["(" ")" "{" "}" "[" "]" "<<" ">>"] @punctuation.bracket
+
+;; Operators
+["!"
+ "->"
+ "<-"
+ "#"
+ "::"
+ "|"
+ ":"
+ "="
+ "||"
+
+ "+"
+ "-"
+ "bnot"
+ "not"
+
+ "/"
+ "*"
+ "div"
+ "rem"
+ "band"
+ "and"
+
+ "+"
+ "-"
+ "bor"
+ "bxor"
+ "bsl"
+ "bsr"
+ "or"
+ "xor"
+
+ "++"
+ "--"
+
+ "=="
+ "/="
+ "=<"
+ "<"
+ ">="
+ ">"
+ "=:="
+ "=/="
+ ] @operator
+
+;;; Comments
+((var) @comment.discard
+ (#match? @comment.discard "^_"))
+
+(dotdotdot) @comment.discard
+(comment) @comment
+
+;; Primitive types
+(string) @string
+(char) @constant
+(integer) @number
+(var) @variable
+(atom) @string.special.symbol
+
+;; wild attribute (Should take precedence over atoms, otherwise they are highlighted as atoms)
+(wild_attribute name: (attr_name name: (_) @keyword))
diff --git a/crates/zed/src/languages/erlang/indents.scm b/crates/zed/src/languages/erlang/indents.scm
new file mode 100644
index 0000000000..112b414aa4
--- /dev/null
+++ b/crates/zed/src/languages/erlang/indents.scm
@@ -0,0 +1,3 @@
+(_ "[" "]" @end) @indent
+(_ "{" "}" @end) @indent
+(_ "(" ")" @end) @indent
diff --git a/crates/zed/src/languages/erlang/outline.scm b/crates/zed/src/languages/erlang/outline.scm
new file mode 100644
index 0000000000..294f109702
--- /dev/null
+++ b/crates/zed/src/languages/erlang/outline.scm
@@ -0,0 +1,31 @@
+(module_attribute
+    "module" @context
+    name: (_) @name) @item
+
+(behaviour_attribute
+    "behaviour" @context
+    (atom) @name) @item
+
+(type_alias
+    "type" @context
+    name: (_) @name) @item
+
+(opaque
+    "opaque" @context
+    name: (_) @name) @item
+
+(pp_define
+    "define" @context
+    lhs: (_) @name) @item
+
+(record_decl
+    "record" @context
+    name: (_) @name) @item
+
+(callback
+    "callback" @context
+    fun: (_) @function ( (_) @name)) @item
+
+(fun_decl (function_clause
+    name: (_) @name
+    args: (_) @context)) @item
diff --git a/docs/src/languages/erlang.md b/docs/src/languages/erlang.md
new file mode 100644
index 0000000000..3343168faf
--- /dev/null
+++ b/docs/src/languages/erlang.md
@@ -0,0 +1,4 @@
+# Erlang
+
+- Tree Sitter: [tree-sitter-erlang](https://github.com/WhatsApp/tree-sitter-erlang)
+- Language Server: [erlang_ls](https://github.com/erlang-ls/erlang_ls)

From d4264cbe4eb0274aa5a6d9fe5a43a414e2cd3f59 Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Thu, 1 Feb 2024 09:07:01 -0800
Subject: [PATCH 137/372] Fix scrolling and wrapping in the markdown preview
 renderer (#7234)

Release Notes:

- N/A
---
 crates/markdown_preview/src/markdown_preview_view.rs | 5 ++++-
 crates/markdown_preview/src/markdown_renderer.rs     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/crates/markdown_preview/src/markdown_preview_view.rs b/crates/markdown_preview/src/markdown_preview_view.rs
index 475a9fbaa3..f9e121e7ee 100644
--- a/crates/markdown_preview/src/markdown_preview_view.rs
+++ b/crates/markdown_preview/src/markdown_preview_view.rs
@@ -114,13 +114,16 @@ impl Render for MarkdownPreviewView {
             .key_context("MarkdownPreview")
             .track_focus(&self.focus_handle)
             .id("MarkdownPreview")
-            .overflow_scroll()
+            .overflow_y_scroll()
+            .overflow_x_hidden()
             .size_full()
             .bg(cx.theme().colors().editor_background)
             .p_4()
             .children(render_markdown(&self.contents, &self.languages, cx));
 
         div().flex_1().child(
+            // FIXME: This shouldn't be necessary
+            // but the overflow_scroll above doesn't seem to work without it
             canvas(move |bounds, cx| {
                 rendered_markdown.into_any().draw(
                     bounds.origin,
diff --git a/crates/markdown_preview/src/markdown_renderer.rs b/crates/markdown_preview/src/markdown_renderer.rs
index 7b020a6d30..60fab49478 100644
--- a/crates/markdown_preview/src/markdown_renderer.rs
+++ b/crates/markdown_preview/src/markdown_renderer.rs
@@ -174,7 +174,7 @@ where
                 }
 
                 let element = self.render_md_from_range(source_range.clone(), cx);
-                let paragraph = h_flex().mb_3().child(element);
+                let paragraph = div().mb_3().child(element);
 
                 self.finished.push(paragraph);
             }

From 3521b50405a6c35b78ef685f979e121a18809cf9 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 1 Feb 2024 10:13:30 -0700
Subject: [PATCH 138/372] vim: Fix , and ; in visual mode (#7230)

Release Notes:

- vim: Fixed , and ; in visual mode
([#7182](https://github.com/zed-industries/zed/issues/7182)).
---
 assets/keymaps/vim.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index eb8bdb33ed..70e900a75d 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -96,6 +96,8 @@
           }
         }
       ],
+      ";": "vim::RepeatFind",
+      ",": "vim::RepeatFindReversed",
       "ctrl-o": "pane::GoBack",
       "ctrl-i": "pane::GoForward",
       "ctrl-]": "editor::GoToDefinition",
@@ -333,8 +335,6 @@
       ],
       "*": "vim::MoveToNext",
       "#": "vim::MoveToPrev",
-      ";": "vim::RepeatFind",
-      ",": "vim::RepeatFindReversed",
       "r": ["vim::PushOperator", "Replace"],
       "s": "vim::Substitute",
       "shift-s": "vim::SubstituteLine",

From 5424c8bfd51d0101827f497ab43378eda45b8624 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Thu, 1 Feb 2024 09:49:27 -0800
Subject: [PATCH 139/372] Introduce a fast path for drawing quads with no
 borders / corner radii (#7231)

This will introduce an extra conditional but saves us from doing a bunch
of math in the simple case of drawing simple rectangles that aren't
rounded or don't have borders.


![Figure_1](https://github.com/zed-industries/zed/assets/482957/cba95ce2-2d9a-46ab-a142-35368334eb75)

Release Notes:

- Improved rendering performance.
---
 crates/gpui/src/platform/mac/shaders.metal | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/crates/gpui/src/platform/mac/shaders.metal b/crates/gpui/src/platform/mac/shaders.metal
index 264fa55134..beadd83021 100644
--- a/crates/gpui/src/platform/mac/shaders.metal
+++ b/crates/gpui/src/platform/mac/shaders.metal
@@ -61,6 +61,16 @@ fragment float4 quad_fragment(QuadFragmentInput input [[stage_in]],
                               constant Quad *quads
                               [[buffer(QuadInputIndex_Quads)]]) {
   Quad quad = quads[input.quad_id];
+
+  // Fast path when the quad is not rounded and doesn't have any border.
+  if (quad.corner_radii.top_left == 0. && quad.corner_radii.bottom_left == 0. &&
+      quad.corner_radii.top_right == 0. &&
+      quad.corner_radii.bottom_right == 0. && quad.border_widths.top == 0. &&
+      quad.border_widths.left == 0. && quad.border_widths.right == 0. &&
+      quad.border_widths.bottom == 0.) {
+    return input.background_color;
+  }
+
   float2 half_size =
       float2(quad.bounds.size.width, quad.bounds.size.height) / 2.;
   float2 center =

From 7b9d51929db5732242fa40c759a44562eca52a79 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 1 Feb 2024 11:54:49 -0700
Subject: [PATCH 140/372] Deploy collab like nightly (#7174)

After this change we'll be able to push a tag to github to deploy to
collab.

The advantages of this are that there's no longer a separate step to
first
build the image, and then deploy it.

In the future I'd like to make this happen more automatically (maybe as
part of
bump nightly).

Release Notes:

- N/A
---
 .github/workflows/deploy_collab.yml        | 107 +++++++++++++++++++++
 .github/workflows/publish_collab_image.yml |  49 ----------
 Dockerfile                                 |   3 +
 crates/collab/README.md                    |  32 ++++++
 crates/collab/src/main.rs                  |   5 +-
 script/bump-collab-version                 |   8 --
 script/deploy-collab                       |  25 +++--
 script/lib/deploy-helpers.sh               |  47 +++++----
 script/what-is-deployed                    |  27 ++----
 9 files changed, 188 insertions(+), 115 deletions(-)
 create mode 100644 .github/workflows/deploy_collab.yml
 delete mode 100644 .github/workflows/publish_collab_image.yml
 delete mode 100755 script/bump-collab-version

diff --git a/.github/workflows/deploy_collab.yml b/.github/workflows/deploy_collab.yml
new file mode 100644
index 0000000000..432bafb360
--- /dev/null
+++ b/.github/workflows/deploy_collab.yml
@@ -0,0 +1,107 @@
+name: Publish Collab Server Image
+
+on:
+  push:
+    tags:
+      - collab-production
+      - collab-staging
+
+env:
+  DOCKER_BUILDKIT: 1
+  DIGITALOCEAN_ACCESS_TOKEN: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
+
+jobs:
+  style:
+    name: Check formatting and Clippy lints
+    runs-on:
+      - self-hosted
+      - test
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          clean: false
+          submodules: "recursive"
+          fetch-depth: 0
+
+      - name: Run style checks
+        uses: ./.github/actions/check_style
+
+  tests:
+    name: Run tests
+    runs-on:
+      - self-hosted
+      - test
+    needs: style
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          clean: false
+          submodules: "recursive"
+          fetch-depth: 0
+
+      - name: Run tests
+        uses: ./.github/actions/run_tests
+
+  publish:
+    name: Publish collab server image
+    needs:
+      - style
+      - tests
+    runs-on:
+      - self-hosted
+      - deploy
+    steps:
+      - name: Add Rust to the PATH
+        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+
+      - name: Sign into DigitalOcean docker registry
+        run: doctl registry login
+
+      - name: Prune Docker system
+        run: docker system prune  --filter 'until=720h' -f
+
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          clean: false
+          submodules: "recursive"
+
+      - name: Build docker image
+        run: docker build . --build-arg GITHUB_SHA=$GITHUB_SHA --tag registry.digitalocean.com/zed/collab:$GITHUB_SHA
+
+      - name: Publish docker image
+        run: docker push registry.digitalocean.com/zed/collab:${GITHUB_SHA}
+
+  deploy:
+    name: Deploy new server image
+    needs:
+      - publish
+    runs-on:
+      - self-hosted
+      - deploy
+
+    steps:
+      - name: Sign into Kubernetes
+        run: doctl kubernetes cluster kubeconfig save --expiry-seconds 600 ${{ secrets.CLUSTER_NAME }}
+
+      - name: Determine namespace
+        run: |
+          set -eu
+          if [[ $GITHUB_REF_NAME = "collab-production" ]]; then
+            echo "Deploying collab:$GITHUB_SHA to production"
+            echo "KUBE_NAMESPACE=production" >> $GITHUB_ENV
+          elif [[ $GITHUB_REF_NAME = "collab-staging" ]]; then
+            echo "Deploying collab:$GITHUB_SHA to staging"
+            echo "KUBE_NAMESPACE=staging" >> $GITHUB_ENV
+          else
+            echo "cowardly refusing to deploy from an unknown branch"
+            exit 1
+          fi
+
+      - name: Start rollout
+        run: kubectl -n "$KUBE_NAMESPACE" set image deployment/collab collab=registry.digitalocean.com/zed/collab:${GITHUB_SHA}
+
+      - name: Wait for rollout to finish
+        run: kubectl -n "$KUBE_NAMESPACE" rollout status deployment/collab
diff --git a/.github/workflows/publish_collab_image.yml b/.github/workflows/publish_collab_image.yml
deleted file mode 100644
index 18289faf81..0000000000
--- a/.github/workflows/publish_collab_image.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-name: Publish Collab Server Image
-
-on:
-  push:
-    tags:
-      - collab-v*
-
-env:
-  DOCKER_BUILDKIT: 1
-  DIGITALOCEAN_ACCESS_TOKEN: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
-
-jobs:
-  publish:
-    name: Publish collab server image
-    runs-on:
-      - self-hosted
-      - deploy
-    steps:
-      - name: Add Rust to the PATH
-        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
-
-      - name: Sign into DigitalOcean docker registry
-        run: doctl registry login
-
-      - name: Prune Docker system
-        run: docker system prune
-
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: 'recursive'
-
-      - name: Determine version
-        run: |
-          set -eu
-          version=$(script/get-crate-version collab)
-          if [[ $GITHUB_REF_NAME != "collab-v${version}" ]]; then
-            echo "release tag ${GITHUB_REF_NAME} does not match version ${version}"
-            exit 1
-          fi
-          echo "Publishing collab version: ${version}"
-          echo "COLLAB_VERSION=${version}" >> $GITHUB_ENV
-
-      - name: Build docker image
-        run: docker build . --tag registry.digitalocean.com/zed/collab:v${COLLAB_VERSION}
-
-      - name: Publish docker image
-        run: docker push registry.digitalocean.com/zed/collab:v${COLLAB_VERSION}
diff --git a/Dockerfile b/Dockerfile
index ed6e4fac8e..b4d7b10d37 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,6 +6,9 @@ COPY . .
 
 # Compile collab server
 ARG CARGO_PROFILE_RELEASE_PANIC=abort
+ARG GITHUB_SHA
+
+ENV GITHUB_SHA=$GITHUB_SHA
 RUN --mount=type=cache,target=./script/node_modules \
     --mount=type=cache,target=/usr/local/cargo/registry \
     --mount=type=cache,target=./target \
diff --git a/crates/collab/README.md b/crates/collab/README.md
index d766324255..4c43407474 100644
--- a/crates/collab/README.md
+++ b/crates/collab/README.md
@@ -3,3 +3,35 @@
 This crate is what we run at https://collab.zed.dev.
 
 It contains our back-end logic for collaboration, to which we connect from the Zed client via a websocket after authenticating via https://zed.dev, which is a separate repo running on Vercel.
+
+# Local Development
+
+ Detailed instructions on getting started are [here](https://zed.dev/docs/local-collaboration).
+
+# Deployment
+
+We run two instances of collab:
+
+* Staging (https://staging-collab.zed.dev)
+* Production (https://collab.zed.dev)
+
+Both of these run on the Kubernetes cluster hosted in Digital Ocean.
+
+Deployment is triggered by pushing to the `collab-staging` (or `collab-production`) tag in Github. The best way to do this is:
+
+* `./script/deploy-collab staging`
+* `./script/deploy-collab production`
+
+You can tell what is currently deployed with `./script/what-is-deployed`.
+
+# Database Migrations
+
+To create a new migration:
+
+```
+./script/sqlx migrate add <name>
+```
+
+Migrations are run automatically on service start, so run `foreman start` again. The service will crash if the migrations fail.
+
+When you create a new migration, you also need to update the [SQLite schema](./migrations.sqlite/20221109000000_test_schema.sql) that is used for testing.
diff --git a/crates/collab/src/main.rs b/crates/collab/src/main.rs
index 32c69de690..a2fda0dd33 100644
--- a/crates/collab/src/main.rs
+++ b/crates/collab/src/main.rs
@@ -14,6 +14,7 @@ use tracing_subscriber::{filter::EnvFilter, fmt::format::JsonFields, Layer};
 use util::ResultExt;
 
 const VERSION: &'static str = env!("CARGO_PKG_VERSION");
+const REVISION: Option<&'static str> = option_env!("GITHUB_SHA");
 
 #[tokio::main]
 async fn main() -> Result<()> {
@@ -26,7 +27,7 @@ async fn main() -> Result<()> {
 
     match args().skip(1).next().as_deref() {
         Some("version") => {
-            println!("collab v{VERSION}");
+            println!("collab v{} ({})", VERSION, REVISION.unwrap_or("unknown"));
         }
         Some("migrate") => {
             run_migrations().await?;
@@ -105,7 +106,7 @@ async fn run_migrations() -> Result<()> {
 }
 
 async fn handle_root() -> String {
-    format!("collab v{VERSION}")
+    format!("collab v{} ({})", VERSION, REVISION.unwrap_or("unknown"))
 }
 
 async fn handle_liveness_probe(Extension(state): Extension<Arc<AppState>>) -> Result<String> {
diff --git a/script/bump-collab-version b/script/bump-collab-version
deleted file mode 100755
index ec64c42e2b..0000000000
--- a/script/bump-collab-version
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-if [[ $# < 1 ]]; then
-  echo "Missing version increment (major, minor, or patch)" >&2
-  exit 1
-fi
-
-exec script/lib/bump-version.sh collab collab-v '' $1
diff --git a/script/deploy-collab b/script/deploy-collab
index 7bda42c424..4caf0ae784 100755
--- a/script/deploy-collab
+++ b/script/deploy-collab
@@ -3,22 +3,19 @@
 set -eu
 source script/lib/deploy-helpers.sh
 
-if [[ $# < 2 ]]; then
-  echo "Usage: $0 <production|staging> <tag-name>"
+if [[ $# != 1 ]]; then
+  echo "Usage: $0 <production|staging>"
   exit 1
 fi
 environment=$1
-version=$2
+tag="$(tag_for_environment $environment)"
 
-export_vars_for_environment ${environment}
-image_id=$(image_id_for_version ${version})
+branch=$(git rev-parse --abbrev-ref HEAD)
+if [ "$branch" != "main" ]; then
+  echo "You must be on main to run this script"
+  exit 1
+fi
 
-export ZED_DO_CERTIFICATE_ID=$(doctl compute certificate list --format ID --no-header)
-export ZED_KUBE_NAMESPACE=${environment}
-export ZED_IMAGE_ID=${image_id}
-
-target_zed_kube_cluster
-envsubst < crates/collab/k8s/collab.template.yml | kubectl apply -f -
-kubectl -n "$environment" rollout status deployment/collab --watch
-
-echo "deployed collab v${version} to ${environment}"
+echo git pull --ff-only origin main
+echo git tag -f $tag
+echo git push -f origin $tag
diff --git a/script/lib/deploy-helpers.sh b/script/lib/deploy-helpers.sh
index 705ae6e80c..c0feb2f861 100644
--- a/script/lib/deploy-helpers.sh
+++ b/script/lib/deploy-helpers.sh
@@ -8,33 +8,30 @@ function export_vars_for_environment {
   export $(cat $env_file)
 }
 
-function image_id_for_version {
-  local version=$1
-
-  # Check that version is valid
-  if [[ ! ${version} =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-    echo "Invalid version number '${version}'" >&2
-    exit 1
-  fi
-
-  # Check that image exists for version
-  tag_names=$(doctl registry repository list-tags collab --no-header --format Tag)
-  if ! $(echo "${tag_names}" | grep -Fqx v${version}); then
-    echo "No docker image tagged for version '${version}'" >&2
-    echo "Found images with these tags:" ${tag_names} >&2
-    exit 1
-  fi
-  
-  echo "registry.digitalocean.com/zed/collab:v${version}"
-}
-
-function version_for_image_id {
-  local image_id=$1
-  echo $image_id | cut -d: -f2
-}
-
 function target_zed_kube_cluster {
   if [[ $(kubectl config current-context 2> /dev/null) != do-nyc1-zed-1 ]]; then
     doctl kubernetes cluster kubeconfig save zed-1
   fi
 }
+
+function tag_for_environment {
+  if [[ "$1" == "production" ]]; then
+    echo "collab-production"
+  elif [[ "$1" == "staging" ]]; then
+    echo "collab-staging"
+  else
+    echo "Invalid environment name '${environment}'" >&2
+    exit 1
+  fi
+}
+
+function url_for_environment {
+  if [[ "$1" == "production" ]]; then
+    echo "https://collab.zed.dev"
+  elif [[ "$1" == "staging" ]]; then
+    echo "https://collab-staging.zed.dev"
+  else
+    echo "Invalid environment name '${environment}'" >&2
+    exit 1
+  fi
+}
diff --git a/script/what-is-deployed b/script/what-is-deployed
index cbf73255dd..6af82acd2d 100755
--- a/script/what-is-deployed
+++ b/script/what-is-deployed
@@ -3,13 +3,15 @@
 set -eu
 source script/lib/deploy-helpers.sh
 
-if [[ $# < 1 ]]; then
+if [[ $# != 1 ]]; then
   echo "Usage: $0 <production|staging>"
   exit 1
 fi
-environment=$1
 
-export_vars_for_environment ${environment}
+environment=$1
+url="$(url_for_environment $environment)"
+tag="$(tag_for_environment $environment)"
+
 target_zed_kube_cluster
 
 deployed_image_id=$(
@@ -20,18 +22,9 @@ deployed_image_id=$(
     | cut -d: -f2
 )
 
-job_image_ids=$(
-  kubectl \
-    --namespace=${environment} \
-    get jobs \
-    -o 'jsonpath={range .items[0:5]}{.spec.template.spec.containers[0].image}{"\n"}{end}' \
-    2> /dev/null \
-    || true
-)
+echo "Deployed image version: $deployed_image_id"
 
-echo "Deployed image version:"
-echo "$deployed_image_id"
-echo
-echo "Migration job image versions:"
-echo "$job_image_ids"
-echo
+git fetch >/dev/null
+if [[ "$(git rev-parse tags/$tag)" != $deployed_image_id ]]; then
+    echo "NOTE: tags/$tag $(git rev-parse tags/$tag) is not yet deployed"
+fi;

From 0897c8eebd14de6223064fc2930a01bea1047156 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 1 Feb 2024 11:57:09 -0700
Subject: [PATCH 141/372] just kidding (#7241)

Release Notes:

- N/A
---
 script/deploy-collab | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/script/deploy-collab b/script/deploy-collab
index 4caf0ae784..d0139a084f 100755
--- a/script/deploy-collab
+++ b/script/deploy-collab
@@ -16,6 +16,6 @@ if [ "$branch" != "main" ]; then
   exit 1
 fi
 
-echo git pull --ff-only origin main
-echo git tag -f $tag
-echo git push -f origin $tag
+git pull --ff-only origin main
+git tag -f $tag
+git push -f origin $tag

From da44f637ed4187cff70272629a9d0f126aa91c11 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Thu, 1 Feb 2024 23:45:03 +0200
Subject: [PATCH 142/372] Order history items by open recency (#7248)

Closes https://github.com/zed-industries/zed/issues/7244

Follow-up of https://github.com/zed-industries/zed/pull/7210 that
returns back ordering of history items by open recency (last opened
history item should be on top)

Release Notes:

- N/A

---------

Co-authored-by: Andrew Lygin <alygin@gmail.com>
---
 crates/file_finder/src/file_finder.rs       | 39 ++++++--------
 crates/file_finder/src/file_finder_tests.rs | 56 +++++++++++++++++++++
 2 files changed, 72 insertions(+), 23 deletions(-)

diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index 5880ec465b..be3d2feb83 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -1,7 +1,7 @@
 #[cfg(test)]
 mod file_finder_tests;
 
-use collections::HashMap;
+use collections::{HashMap, HashSet};
 use editor::{scroll::Autoscroll, Bias, Editor};
 use fuzzy::{CharBag, PathMatch, PathMatchCandidate};
 use gpui::{
@@ -222,9 +222,11 @@ impl Matches {
         query_matches: Option<&'a HashMap<Arc<Path>, ProjectPanelOrdMatch>>,
         history_items: impl IntoIterator<Item = &'a FoundPath> + 'a,
     ) {
-        let history_items_to_show = history_items
+        let mut processed_paths = HashSet::default();
+        self.history = history_items
             .into_iter()
             .chain(currently_opened)
+            .filter(|&path| processed_paths.insert(path))
             .filter_map(|history_item| match &query_matches {
                 Some(query_matches) => Some((
                     history_item.clone(),
@@ -232,31 +234,22 @@ impl Matches {
                 )),
                 None => Some((history_item.clone(), None)),
             })
-            .sorted_by(|(path_a, match_a), (path_b, match_b)| {
-                match (
+            .enumerate()
+            .sorted_by(
+                |(index_a, (path_a, match_a)), (index_b, (path_b, match_b))| match (
                     Some(path_a) == currently_opened,
                     Some(path_b) == currently_opened,
                 ) {
+                    // bubble currently opened files to the top
                     (true, false) => cmp::Ordering::Less,
                     (false, true) => cmp::Ordering::Greater,
-                    _ => match_b.cmp(match_a),
-                }
-            });
-
-        self.history.clear();
-        util::extend_sorted(
-            &mut self.history,
-            history_items_to_show.collect::<Vec<_>>(),
-            100,
-            |(path_a, match_a), (path_b, match_b)| match (
-                Some(path_a) == currently_opened,
-                Some(path_b) == currently_opened,
-            ) {
-                (true, false) => cmp::Ordering::Less,
-                (false, true) => cmp::Ordering::Greater,
-                _ => match_b.cmp(match_a).then(path_b.cmp(path_a)),
-            },
-        );
+                    // arrange the files by their score (best score on top) and by their occurrence in the history
+                    // (history items visited later are on the top)
+                    _ => match_b.cmp(match_a).then(index_a.cmp(index_b)),
+                },
+            )
+            .map(|(_, paths)| paths)
+            .collect();
     }
 }
 
@@ -319,7 +312,7 @@ fn matching_history_item_paths(
     matching_history_paths
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 struct FoundPath {
     project: ProjectPath,
     absolute: Option<PathBuf>,
diff --git a/crates/file_finder/src/file_finder_tests.rs b/crates/file_finder/src/file_finder_tests.rs
index 616437c26e..450d034614 100644
--- a/crates/file_finder/src/file_finder_tests.rs
+++ b/crates/file_finder/src/file_finder_tests.rs
@@ -1177,6 +1177,62 @@ async fn test_keep_opened_file_on_top_of_search_results_and_select_next_one(
     });
 }
 
+#[gpui::test]
+async fn test_history_items_shown_in_order_of_open(cx: &mut TestAppContext) {
+    let app_state = init_test(cx);
+
+    app_state
+        .fs
+        .as_fake()
+        .insert_tree(
+            "/test",
+            json!({
+                "test": {
+                    "1.txt": "// One",
+                    "2.txt": "// Two",
+                    "3.txt": "// Three",
+                }
+            }),
+        )
+        .await;
+
+    let project = Project::test(app_state.fs.clone(), ["/test".as_ref()], cx).await;
+    let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
+
+    open_queried_buffer("1", 1, "1.txt", &workspace, cx).await;
+    open_queried_buffer("2", 1, "2.txt", &workspace, cx).await;
+    open_queried_buffer("3", 1, "3.txt", &workspace, cx).await;
+
+    let picker = open_file_picker(&workspace, cx);
+    picker.update(cx, |finder, _| {
+        assert_eq!(finder.delegate.matches.len(), 3);
+        assert_match_at_position(finder, 0, "3.txt");
+        assert_match_selection(finder, 1, "2.txt");
+        assert_match_at_position(finder, 2, "1.txt");
+    });
+
+    cx.dispatch_action(Confirm); // Open 2.txt
+
+    let picker = open_file_picker(&workspace, cx);
+    picker.update(cx, |finder, _| {
+        assert_eq!(finder.delegate.matches.len(), 3);
+        assert_match_at_position(finder, 0, "2.txt");
+        assert_match_selection(finder, 1, "3.txt");
+        assert_match_at_position(finder, 2, "1.txt");
+    });
+
+    cx.dispatch_action(SelectNext);
+    cx.dispatch_action(Confirm); // Open 1.txt
+
+    let picker = open_file_picker(&workspace, cx);
+    picker.update(cx, |finder, _| {
+        assert_eq!(finder.delegate.matches.len(), 3);
+        assert_match_at_position(finder, 0, "1.txt");
+        assert_match_selection(finder, 1, "2.txt");
+        assert_match_at_position(finder, 2, "3.txt");
+    });
+}
+
 #[gpui::test]
 async fn test_history_items_vs_very_good_external_match(cx: &mut gpui::TestAppContext) {
     let app_state = init_test(cx);

From 21f4da6bf203a6208b66ca6a1b3f13a9e9019c1f Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Thu, 1 Feb 2024 14:17:09 -0800
Subject: [PATCH 143/372] Correctly log LSP adapter name on LSP request error
 (#7232)

Previously, we were logging the language server's binary filename
instead.

Release Notes:

- N/A

Co-authored-by: Nathan <nathan@zed.dev>
Co-authored-by: Antonio <antonio@zed.dev>
---
 crates/editor/src/editor.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index decde1e8b8..1983cb5d82 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -74,7 +74,7 @@ use language::{
     language_settings::{self, all_language_settings, InlayHintSettings},
     markdown, point_from_lsp, AutoindentMode, BracketPair, Buffer, Capability, CodeAction,
     CodeLabel, Completion, CursorShape, Diagnostic, Documentation, IndentKind, IndentSize,
-    Language, LanguageServerName, OffsetRangeExt, Point, Selection, SelectionGoal, TransactionId,
+    Language, OffsetRangeExt, Point, Selection, SelectionGoal, TransactionId,
 };
 
 use link_go_to_definition::{GoToDefinitionLink, InlayHighlight, LinkGoToDefinitionState};
@@ -7289,9 +7289,7 @@ impl Editor {
                         editor.buffer.read(cx).as_singleton().and_then(|buffer| {
                             project
                                 .language_server_for_buffer(buffer.read(cx), server_id, cx)
-                                .map(|(_, lsp_adapter)| {
-                                    LanguageServerName(Arc::from(lsp_adapter.name()))
-                                })
+                                .map(|(lsp_adapter, _)| lsp_adapter.name.clone())
                         });
                     language_server_name.map(|language_server_name| {
                         project.open_local_buffer_via_lsp(

From 020c38a8916c063cba36c2c88a69b5e287269d5a Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Thu, 1 Feb 2024 15:39:41 -0800
Subject: [PATCH 144/372] Avoid excessive blocking of main thread when
 rendering in direct mode (#7253)

Release Notes:

- Fixed a bug that caused inconsistent frame rate when scrolling on
certain hardware.

Co-authored-by: Antonio Scandurra <me@as-cii.com>
Co-authored-by: Nathan Sobo <nathan@zed.dev>
---
 crates/gpui/src/platform/mac/metal_renderer.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/gpui/src/platform/mac/metal_renderer.rs b/crates/gpui/src/platform/mac/metal_renderer.rs
index 68027ceff6..b3512ad2e9 100644
--- a/crates/gpui/src/platform/mac/metal_renderer.rs
+++ b/crates/gpui/src/platform/mac/metal_renderer.rs
@@ -314,7 +314,7 @@ impl MetalRenderer {
         command_buffer.commit();
         self.sprite_atlas.clear_textures(AtlasTextureKind::Path);
 
-        command_buffer.wait_until_completed();
+        command_buffer.wait_until_scheduled();
         drawable.present();
     }
 

From b35a7223b61674123decab5e7a64859e600ec6b2 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Thu, 1 Feb 2024 15:45:53 -0800
Subject: [PATCH 145/372] Add missing secret in release nightly workflow

---
 .github/workflows/release_nightly.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
index 25a4c64a77..80a012e560 100644
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -59,6 +59,7 @@ jobs:
             APPLE_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
             DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
             DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
+            ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
         steps:
             - name: Install Node
               uses: actions/setup-node@v3

From 69e0ea92e400f4b37af289996f1af10b402a661e Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 1 Feb 2024 22:22:02 -0700
Subject: [PATCH 146/372] Links to channel notes (#7262)

Release Notes:

- Added outline support for Markdown files
- Added the ability to link to channel notes:
https://zed.dev/channel/zed-283/notes#Roadmap
---
 Cargo.lock                                    |   1 +
 crates/channel/src/channel_store.rs           |  15 +-
 .../collab/src/tests/channel_buffer_tests.rs  |   8 +-
 crates/collab/src/tests/following_tests.rs    |   4 +-
 crates/collab_ui/src/channel_view.rs          | 156 ++++++++++++++++--
 crates/collab_ui/src/collab_panel.rs          |   2 +-
 crates/editor/src/editor.rs                   |  15 ++
 crates/editor/src/mouse_context_menu.rs       |  55 +++---
 crates/editor/src/scroll/autoscroll.rs        |  15 ++
 crates/zed/Cargo.toml                         |   1 +
 crates/zed/src/languages/markdown/outline.scm |   5 +
 crates/zed/src/main.rs                        |  30 ++--
 crates/zed/src/open_listener.rs               |  18 +-
 13 files changed, 260 insertions(+), 65 deletions(-)
 create mode 100644 crates/zed/src/languages/markdown/outline.scm

diff --git a/Cargo.lock b/Cargo.lock
index 7b3a5ba6f3..4ae19e764c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10344,6 +10344,7 @@ dependencies = [
  "indexmap 1.9.3",
  "install_cli",
  "isahc",
+ "itertools 0.11.0",
  "journal",
  "language",
  "language_selector",
diff --git a/crates/channel/src/channel_store.rs b/crates/channel/src/channel_store.rs
index 0d0752aec8..8379a92aae 100644
--- a/crates/channel/src/channel_store.rs
+++ b/crates/channel/src/channel_store.rs
@@ -74,11 +74,19 @@ impl Channel {
     pub fn link(&self) -> String {
         RELEASE_CHANNEL.link_prefix().to_owned()
             + "channel/"
-            + &self.slug()
+            + &Self::slug(&self.name)
             + "-"
             + &self.id.to_string()
     }
 
+    pub fn notes_link(&self, heading: Option<String>) -> String {
+        self.link()
+            + "/notes"
+            + &heading
+                .map(|h| format!("#{}", Self::slug(&h)))
+                .unwrap_or_default()
+    }
+
     pub fn is_root_channel(&self) -> bool {
         self.parent_path.is_empty()
     }
@@ -90,9 +98,8 @@ impl Channel {
             .unwrap_or(self.id)
     }
 
-    pub fn slug(&self) -> String {
-        let slug: String = self
-            .name
+    pub fn slug(str: &str) -> String {
+        let slug: String = str
             .chars()
             .map(|c| if c.is_alphanumeric() { c } else { '-' })
             .collect();
diff --git a/crates/collab/src/tests/channel_buffer_tests.rs b/crates/collab/src/tests/channel_buffer_tests.rs
index cf5b999ef6..0ba7024683 100644
--- a/crates/collab/src/tests/channel_buffer_tests.rs
+++ b/crates/collab/src/tests/channel_buffer_tests.rs
@@ -161,15 +161,15 @@ async fn test_channel_notes_participant_indices(
 
     // Clients A, B, and C open the channel notes
     let channel_view_a = cx_a
-        .update(|cx| ChannelView::open(channel_id, workspace_a.clone(), cx))
+        .update(|cx| ChannelView::open(channel_id, None, workspace_a.clone(), cx))
         .await
         .unwrap();
     let channel_view_b = cx_b
-        .update(|cx| ChannelView::open(channel_id, workspace_b.clone(), cx))
+        .update(|cx| ChannelView::open(channel_id, None, workspace_b.clone(), cx))
         .await
         .unwrap();
     let channel_view_c = cx_c
-        .update(|cx| ChannelView::open(channel_id, workspace_c.clone(), cx))
+        .update(|cx| ChannelView::open(channel_id, None, workspace_c.clone(), cx))
         .await
         .unwrap();
 
@@ -644,7 +644,7 @@ async fn test_channel_buffer_changes(
     let project_b = client_b.build_empty_local_project(cx_b);
     let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
     let channel_view_b = cx_b
-        .update(|cx| ChannelView::open(channel_id, workspace_b.clone(), cx))
+        .update(|cx| ChannelView::open(channel_id, None, workspace_b.clone(), cx))
         .await
         .unwrap();
     deterministic.run_until_parked();
diff --git a/crates/collab/src/tests/following_tests.rs b/crates/collab/src/tests/following_tests.rs
index f4ec70d0a9..bfebd0d257 100644
--- a/crates/collab/src/tests/following_tests.rs
+++ b/crates/collab/src/tests/following_tests.rs
@@ -1905,7 +1905,7 @@ async fn test_following_to_channel_notes_without_a_shared_project(
 
     // Client A opens the notes for channel 1.
     let channel_notes_1_a = cx_a
-        .update(|cx| ChannelView::open(channel_1_id, workspace_a.clone(), cx))
+        .update(|cx| ChannelView::open(channel_1_id, None, workspace_a.clone(), cx))
         .await
         .unwrap();
     channel_notes_1_a.update(cx_a, |notes, cx| {
@@ -1951,7 +1951,7 @@ async fn test_following_to_channel_notes_without_a_shared_project(
 
     //  Client A opens the notes for channel 2.
     let channel_notes_2_a = cx_a
-        .update(|cx| ChannelView::open(channel_2_id, workspace_a.clone(), cx))
+        .update(|cx| ChannelView::open(channel_2_id, None, workspace_a.clone(), cx))
         .await
         .unwrap();
     channel_notes_2_a.update(cx_a, |notes, cx| {
diff --git a/crates/collab_ui/src/channel_view.rs b/crates/collab_ui/src/channel_view.rs
index 2c0ff77459..939276bf1b 100644
--- a/crates/collab_ui/src/channel_view.rs
+++ b/crates/collab_ui/src/channel_view.rs
@@ -6,11 +6,14 @@ use client::{
     Collaborator, ParticipantIndex,
 };
 use collections::HashMap;
-use editor::{CollaborationHub, Editor, EditorEvent};
+use editor::{
+    display_map::ToDisplayPoint, scroll::Autoscroll, CollaborationHub, DisplayPoint, Editor,
+    EditorEvent,
+};
 use gpui::{
-    actions, AnyElement, AnyView, AppContext, Entity as _, EventEmitter, FocusableView,
-    IntoElement as _, Model, Pixels, Point, Render, Subscription, Task, View, ViewContext,
-    VisualContext as _, WindowContext,
+    actions, AnyElement, AnyView, AppContext, ClipboardItem, Entity as _, EventEmitter,
+    FocusableView, IntoElement as _, Model, Pixels, Point, Render, Subscription, Task, View,
+    ViewContext, VisualContext as _, WeakView, WindowContext,
 };
 use project::Project;
 use std::{
@@ -23,10 +26,10 @@ use workspace::{
     item::{FollowableItem, Item, ItemEvent, ItemHandle},
     register_followable_item,
     searchable::SearchableItemHandle,
-    ItemNavHistory, Pane, SaveIntent, ViewId, Workspace, WorkspaceId,
+    ItemNavHistory, Pane, SaveIntent, Toast, ViewId, Workspace, WorkspaceId,
 };
 
-actions!(collab, [Deploy]);
+actions!(collab, [CopyLink]);
 
 pub fn init(cx: &mut AppContext) {
     register_followable_item::<ChannelView>(cx)
@@ -34,21 +37,30 @@ pub fn init(cx: &mut AppContext) {
 
 pub struct ChannelView {
     pub editor: View<Editor>,
+    workspace: WeakView<Workspace>,
     project: Model<Project>,
     channel_store: Model<ChannelStore>,
     channel_buffer: Model<ChannelBuffer>,
     remote_id: Option<ViewId>,
     _editor_event_subscription: Subscription,
+    _reparse_subscription: Option<Subscription>,
 }
 
 impl ChannelView {
     pub fn open(
         channel_id: ChannelId,
+        link_position: Option<String>,
         workspace: View<Workspace>,
         cx: &mut WindowContext,
     ) -> Task<Result<View<Self>>> {
         let pane = workspace.read(cx).active_pane().clone();
-        let channel_view = Self::open_in_pane(channel_id, pane.clone(), workspace.clone(), cx);
+        let channel_view = Self::open_in_pane(
+            channel_id,
+            link_position,
+            pane.clone(),
+            workspace.clone(),
+            cx,
+        );
         cx.spawn(|mut cx| async move {
             let channel_view = channel_view.await?;
             pane.update(&mut cx, |pane, cx| {
@@ -66,10 +78,12 @@ impl ChannelView {
 
     pub fn open_in_pane(
         channel_id: ChannelId,
+        link_position: Option<String>,
         pane: View<Pane>,
         workspace: View<Workspace>,
         cx: &mut WindowContext,
     ) -> Task<Result<View<Self>>> {
+        let weak_workspace = workspace.downgrade();
         let workspace = workspace.read(cx);
         let project = workspace.project().to_owned();
         let channel_store = ChannelStore::global(cx);
@@ -82,12 +96,13 @@ impl ChannelView {
             let channel_buffer = channel_buffer.await?;
             let markdown = markdown.await.log_err();
 
-            channel_buffer.update(&mut cx, |buffer, cx| {
-                buffer.buffer().update(cx, |buffer, cx| {
+            channel_buffer.update(&mut cx, |channel_buffer, cx| {
+                channel_buffer.buffer().update(cx, |buffer, cx| {
                     buffer.set_language_registry(language_registry);
-                    if let Some(markdown) = markdown {
-                        buffer.set_language(Some(markdown), cx);
-                    }
+                    let Some(markdown) = markdown else {
+                        return;
+                    };
+                    buffer.set_language(Some(markdown), cx);
                 })
             })?;
 
@@ -101,12 +116,18 @@ impl ChannelView {
                 // If this channel buffer is already open in this pane, just return it.
                 if let Some(existing_view) = existing_view.clone() {
                     if existing_view.read(cx).channel_buffer == channel_buffer {
+                        if let Some(link_position) = link_position {
+                            existing_view.update(cx, |channel_view, cx| {
+                                channel_view.focus_position_from_link(link_position, true, cx)
+                            });
+                        }
                         return existing_view;
                     }
                 }
 
                 let view = cx.new_view(|cx| {
-                    let mut this = Self::new(project, channel_store, channel_buffer, cx);
+                    let mut this =
+                        Self::new(project, weak_workspace, channel_store, channel_buffer, cx);
                     this.acknowledge_buffer_version(cx);
                     this
                 });
@@ -121,6 +142,12 @@ impl ChannelView {
                     }
                 }
 
+                if let Some(link_position) = link_position {
+                    view.update(cx, |channel_view, cx| {
+                        channel_view.focus_position_from_link(link_position, true, cx)
+                    });
+                }
+
                 view
             })
         })
@@ -128,16 +155,29 @@ impl ChannelView {
 
     pub fn new(
         project: Model<Project>,
+        workspace: WeakView<Workspace>,
         channel_store: Model<ChannelStore>,
         channel_buffer: Model<ChannelBuffer>,
         cx: &mut ViewContext<Self>,
     ) -> Self {
         let buffer = channel_buffer.read(cx).buffer();
+        let this = cx.view().downgrade();
         let editor = cx.new_view(|cx| {
             let mut editor = Editor::for_buffer(buffer, None, cx);
             editor.set_collaboration_hub(Box::new(ChannelBufferCollaborationHub(
                 channel_buffer.clone(),
             )));
+            editor.set_custom_context_menu(move |_, position, cx| {
+                let this = this.clone();
+                Some(ui::ContextMenu::build(cx, move |menu, _| {
+                    menu.entry("Copy link to section", None, move |cx| {
+                        this.update(cx, |this, cx| {
+                            this.copy_link_for_position(position.clone(), cx)
+                        })
+                        .ok();
+                    })
+                }))
+            });
             editor
         });
         let _editor_event_subscription =
@@ -148,14 +188,94 @@ impl ChannelView {
 
         Self {
             editor,
+            workspace,
             project,
             channel_store,
             channel_buffer,
             remote_id: None,
             _editor_event_subscription,
+            _reparse_subscription: None,
         }
     }
 
+    fn focus_position_from_link(
+        &mut self,
+        position: String,
+        first_attempt: bool,
+        cx: &mut ViewContext<Self>,
+    ) {
+        let position = Channel::slug(&position).to_lowercase();
+        let snapshot = self.editor.update(cx, |editor, cx| editor.snapshot(cx));
+
+        if let Some(outline) = snapshot.buffer_snapshot.outline(None) {
+            if let Some(item) = outline
+                .items
+                .iter()
+                .find(|item| &Channel::slug(&item.text).to_lowercase() == &position)
+            {
+                self.editor.update(cx, |editor, cx| {
+                    editor.change_selections(Some(Autoscroll::focused()), cx, |s| {
+                        s.replace_cursors_with(|map| vec![item.range.start.to_display_point(&map)])
+                    })
+                });
+                return;
+            }
+        }
+
+        if !first_attempt {
+            return;
+        }
+        self._reparse_subscription = Some(cx.subscribe(
+            &self.editor,
+            move |this, _, e: &EditorEvent, cx| {
+                match e {
+                    EditorEvent::Reparsed => {
+                        this.focus_position_from_link(position.clone(), false, cx);
+                        this._reparse_subscription.take();
+                    }
+                    EditorEvent::Edited | EditorEvent::SelectionsChanged { local: true } => {
+                        this._reparse_subscription.take();
+                    }
+                    _ => {}
+                };
+            },
+        ));
+    }
+
+    fn copy_link(&mut self, _: &CopyLink, cx: &mut ViewContext<Self>) {
+        let position = self
+            .editor
+            .update(cx, |editor, cx| editor.selections.newest_display(cx).start);
+        self.copy_link_for_position(position, cx)
+    }
+
+    fn copy_link_for_position(&self, position: DisplayPoint, cx: &mut ViewContext<Self>) {
+        let snapshot = self.editor.update(cx, |editor, cx| editor.snapshot(cx));
+
+        let mut closest_heading = None;
+
+        if let Some(outline) = snapshot.buffer_snapshot.outline(None) {
+            for item in outline.items {
+                if item.range.start.to_display_point(&snapshot) > position {
+                    break;
+                }
+                closest_heading = Some(item);
+            }
+        }
+
+        let Some(channel) = self.channel(cx) else {
+            return;
+        };
+
+        let link = channel.notes_link(closest_heading.map(|heading| heading.text));
+        cx.write_to_clipboard(ClipboardItem::new(link));
+        self.workspace
+            .update(cx, |workspace, cx| {
+                workspace.show_toast(Toast::new(0, "Link copied to clipboard"), cx);
+            })
+            .ok();
+    }
+
     pub fn channel(&self, cx: &AppContext) -> Option<Arc<Channel>> {
         self.channel_buffer.read(cx).channel(cx)
     }
@@ -215,8 +335,11 @@ impl ChannelView {
 impl EventEmitter<EditorEvent> for ChannelView {}
 
 impl Render for ChannelView {
-    fn render(&mut self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
-        self.editor.clone()
+    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
+        div()
+            .size_full()
+            .on_action(cx.listener(Self::copy_link))
+            .child(self.editor.clone())
     }
 }
 
@@ -274,6 +397,7 @@ impl Item for ChannelView {
         Some(cx.new_view(|cx| {
             Self::new(
                 self.project.clone(),
+                self.workspace.clone(),
                 self.channel_store.clone(),
                 self.channel_buffer.clone(),
                 cx,
@@ -356,7 +480,7 @@ impl FollowableItem for ChannelView {
             unreachable!()
         };
 
-        let open = ChannelView::open_in_pane(state.channel_id, pane, workspace, cx);
+        let open = ChannelView::open_in_pane(state.channel_id, None, pane, workspace, cx);
 
         Some(cx.spawn(|mut cx| async move {
             let this = open.await?;
diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index e9cd02620f..f33c6a13ef 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -1678,7 +1678,7 @@ impl CollabPanel {
 
     fn open_channel_notes(&mut self, channel_id: ChannelId, cx: &mut ViewContext<Self>) {
         if let Some(workspace) = self.workspace.upgrade() {
-            ChannelView::open(channel_id, workspace, cx).detach();
+            ChannelView::open(channel_id, None, workspace, cx).detach();
         }
     }
 
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 1983cb5d82..86090b0f05 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -413,6 +413,12 @@ pub struct Editor {
     editor_actions: Vec<Box<dyn Fn(&mut ViewContext<Self>)>>,
     show_copilot_suggestions: bool,
     use_autoclose: bool,
+    custom_context_menu: Option<
+        Box<
+            dyn 'static
+                + Fn(&mut Self, DisplayPoint, &mut ViewContext<Self>) -> Option<View<ui::ContextMenu>>,
+        >,
+    >,
 }
 
 pub struct EditorSnapshot {
@@ -1476,6 +1482,7 @@ impl Editor {
             hovered_cursors: Default::default(),
             editor_actions: Default::default(),
             show_copilot_suggestions: mode == EditorMode::Full,
+            custom_context_menu: None,
             _subscriptions: vec![
                 cx.observe(&buffer, Self::on_buffer_changed),
                 cx.subscribe(&buffer, Self::on_buffer_event),
@@ -1665,6 +1672,14 @@ impl Editor {
         self.collaboration_hub = Some(hub);
     }
 
+    pub fn set_custom_context_menu(
+        &mut self,
+        f: impl 'static
+            + Fn(&mut Self, DisplayPoint, &mut ViewContext<Self>) -> Option<View<ui::ContextMenu>>,
+    ) {
+        self.custom_context_menu = Some(Box::new(f))
+    }
+
     pub fn set_completion_provider(&mut self, hub: Box<dyn CompletionProvider>) {
         self.completion_provider = Some(hub);
     }
diff --git a/crates/editor/src/mouse_context_menu.rs b/crates/editor/src/mouse_context_menu.rs
index 24f3b22a5c..bda55e01ed 100644
--- a/crates/editor/src/mouse_context_menu.rs
+++ b/crates/editor/src/mouse_context_menu.rs
@@ -25,31 +25,40 @@ pub fn deploy_context_menu(
         return;
     }
 
-    // Don't show the context menu if there isn't a project associated with this editor
-    if editor.project.is_none() {
-        return;
-    }
+    let context_menu = if let Some(custom) = editor.custom_context_menu.take() {
+        let menu = custom(editor, point, cx);
+        editor.custom_context_menu = Some(custom);
+        if menu.is_none() {
+            return;
+        }
+        menu.unwrap()
+    } else {
+        // Don't show the context menu if there isn't a project associated with this editor
+        if editor.project.is_none() {
+            return;
+        }
 
-    // Move the cursor to the clicked location so that dispatched actions make sense
-    editor.change_selections(None, cx, |s| {
-        s.clear_disjoint();
-        s.set_pending_display_range(point..point, SelectMode::Character);
-    });
+        // Move the cursor to the clicked location so that dispatched actions make sense
+        editor.change_selections(None, cx, |s| {
+            s.clear_disjoint();
+            s.set_pending_display_range(point..point, SelectMode::Character);
+        });
 
-    let context_menu = ui::ContextMenu::build(cx, |menu, _cx| {
-        menu.action("Rename Symbol", Box::new(Rename))
-            .action("Go to Definition", Box::new(GoToDefinition))
-            .action("Go to Type Definition", Box::new(GoToTypeDefinition))
-            .action("Find All References", Box::new(FindAllReferences))
-            .action(
-                "Code Actions",
-                Box::new(ToggleCodeActions {
-                    deployed_from_indicator: false,
-                }),
-            )
-            .separator()
-            .action("Reveal in Finder", Box::new(RevealInFinder))
-    });
+        ui::ContextMenu::build(cx, |menu, _cx| {
+            menu.action("Rename Symbol", Box::new(Rename))
+                .action("Go to Definition", Box::new(GoToDefinition))
+                .action("Go to Type Definition", Box::new(GoToTypeDefinition))
+                .action("Find All References", Box::new(FindAllReferences))
+                .action(
+                    "Code Actions",
+                    Box::new(ToggleCodeActions {
+                        deployed_from_indicator: false,
+                    }),
+                )
+                .separator()
+                .action("Reveal in Finder", Box::new(RevealInFinder))
+        })
+    };
     let context_menu_focus = context_menu.focus_handle(cx);
     cx.focus(&context_menu_focus);
 
diff --git a/crates/editor/src/scroll/autoscroll.rs b/crates/editor/src/scroll/autoscroll.rs
index 955b970540..191dbd04dc 100644
--- a/crates/editor/src/scroll/autoscroll.rs
+++ b/crates/editor/src/scroll/autoscroll.rs
@@ -12,17 +12,26 @@ pub enum Autoscroll {
 }
 
 impl Autoscroll {
+    /// scrolls the minimal amount to (try) and fit all cursors onscreen
     pub fn fit() -> Self {
         Self::Strategy(AutoscrollStrategy::Fit)
     }
 
+    /// scrolls the minimal amount to fit the newest cursor
     pub fn newest() -> Self {
         Self::Strategy(AutoscrollStrategy::Newest)
     }
 
+    /// scrolls so the newest cursor is vertically centered
     pub fn center() -> Self {
         Self::Strategy(AutoscrollStrategy::Center)
     }
+
+    /// scrolls so the neweset cursor is near the top
+    /// (offset by vertical_scroll_margin)
+    pub fn focused() -> Self {
+        Self::Strategy(AutoscrollStrategy::Focused)
+    }
 }
 
 #[derive(PartialEq, Eq, Default, Clone, Copy)]
@@ -31,6 +40,7 @@ pub enum AutoscrollStrategy {
     Newest,
     #[default]
     Center,
+    Focused,
     Top,
     Bottom,
 }
@@ -155,6 +165,11 @@ impl Editor {
                 scroll_position.y = (target_top - margin).max(0.0);
                 self.set_scroll_position_internal(scroll_position, local, true, cx);
             }
+            AutoscrollStrategy::Focused => {
+                scroll_position.y =
+                    (target_top - self.scroll_manager.vertical_scroll_margin).max(0.0);
+                self.set_scroll_position_internal(scroll_position, local, true, cx);
+            }
             AutoscrollStrategy::Top => {
                 scroll_position.y = (target_top).max(0.0);
                 self.set_scroll_position_internal(scroll_position, local, true, cx);
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index b87b79e2f0..5b202aef43 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -57,6 +57,7 @@ image = "0.23"
 indexmap = "1.6.2"
 install_cli = { path = "../install_cli" }
 isahc.workspace = true
+itertools = "0.11"
 journal = { path = "../journal" }
 language = { path = "../language" }
 language_selector = { path = "../language_selector" }
diff --git a/crates/zed/src/languages/markdown/outline.scm b/crates/zed/src/languages/markdown/outline.scm
new file mode 100644
index 0000000000..3f8311136c
--- /dev/null
+++ b/crates/zed/src/languages/markdown/outline.scm
@@ -0,0 +1,5 @@
+(atx_heading
+    .
+    (_) @context
+    .
+    (_) @name ) @item
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 11e9667a8e..1666b23f07 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -314,7 +314,10 @@ fn main() {
                 })
                 .detach_and_log_err(cx);
             }
-            Ok(Some(OpenRequest::OpenChannelNotes { channel_id })) => {
+            Ok(Some(OpenRequest::OpenChannelNotes {
+                channel_id,
+                heading,
+            })) => {
                 triggered_authentication = true;
                 let app_state = app_state.clone();
                 let client = client.clone();
@@ -323,11 +326,11 @@ fn main() {
                     let _ = authenticate(client, &cx).await;
                     let workspace_window =
                         workspace::get_any_active_workspace(app_state, cx.clone()).await?;
-                    let _ = workspace_window
-                        .update(&mut cx, |_, cx| {
-                            ChannelView::open(channel_id, cx.view().clone(), cx)
-                        })?
-                        .await?;
+                    let workspace = workspace_window.root_view(&cx)?;
+                    cx.update_window(workspace_window.into(), |_, cx| {
+                        ChannelView::open(channel_id, heading, workspace, cx)
+                    })?
+                    .await?;
                     anyhow::Ok(())
                 })
                 .detach_and_log_err(cx);
@@ -369,16 +372,19 @@ fn main() {
                         })
                         .log_err();
                     }
-                    OpenRequest::OpenChannelNotes { channel_id } => {
+                    OpenRequest::OpenChannelNotes {
+                        channel_id,
+                        heading,
+                    } => {
                         let app_state = app_state.clone();
                         let open_notes_task = cx.spawn(|mut cx| async move {
                             let workspace_window =
                                 workspace::get_any_active_workspace(app_state, cx.clone()).await?;
-                            let _ = workspace_window
-                                .update(&mut cx, |_, cx| {
-                                    ChannelView::open(channel_id, cx.view().clone(), cx)
-                                })?
-                                .await?;
+                            let workspace = workspace_window.root_view(&cx)?;
+                            cx.update_window(workspace_window.into(), |_, cx| {
+                                ChannelView::open(channel_id, heading, workspace, cx)
+                            })?
+                            .await?;
                             anyhow::Ok(())
                         });
                         cx.update(|cx| open_notes_task.detach_and_log_err(cx))
diff --git a/crates/zed/src/open_listener.rs b/crates/zed/src/open_listener.rs
index 8ef5d61c6b..012b5a2413 100644
--- a/crates/zed/src/open_listener.rs
+++ b/crates/zed/src/open_listener.rs
@@ -7,6 +7,7 @@ use futures::channel::mpsc::{UnboundedReceiver, UnboundedSender};
 use futures::channel::{mpsc, oneshot};
 use futures::{FutureExt, SinkExt, StreamExt};
 use gpui::{AppContext, AsyncAppContext, Global};
+use itertools::Itertools;
 use language::{Bias, Point};
 use release_channel::parse_zed_link;
 use std::collections::HashMap;
@@ -34,6 +35,7 @@ pub enum OpenRequest {
     },
     OpenChannelNotes {
         channel_id: u64,
+        heading: Option<String>,
     },
 }
 
@@ -100,10 +102,20 @@ impl OpenListener {
             if let Some(slug) = parts.next() {
                 if let Some(id_str) = slug.split("-").last() {
                     if let Ok(channel_id) = id_str.parse::<u64>() {
-                        if Some("notes") == parts.next() {
-                            return Some(OpenRequest::OpenChannelNotes { channel_id });
-                        } else {
+                        let Some(next) = parts.next() else {
                             return Some(OpenRequest::JoinChannel { channel_id });
+                        };
+
+                        if let Some(heading) = next.strip_prefix("notes#") {
+                            return Some(OpenRequest::OpenChannelNotes {
+                                channel_id,
+                                heading: Some([heading].into_iter().chain(parts).join("/")),
+                            });
+                        } else if next == "notes" {
+                            return Some(OpenRequest::OpenChannelNotes {
+                                channel_id,
+                                heading: None,
+                            });
                         }
                     }
                 }

From ef4ef5f0e8448db07cf2423fc0adbb9b2ac773eb Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Wed, 24 Jan 2024 21:19:46 -0800
Subject: [PATCH 147/372] Add blade dependency

---
 Cargo.toml              |  4 ++++
 crates/cli/Cargo.toml   |  6 +++---
 crates/gpui/Cargo.toml  |  2 ++
 crates/gpui/build.rs    | 10 +++++-----
 crates/gpui/src/gpui.rs |  3 +--
 rust-toolchain.toml     |  2 +-
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index f46d32a53c..a3eeb2d653 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -181,6 +181,10 @@ wasmtime = "16"
 tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "1d8975319c2d5de1bf710e7e21db25b0eee4bc66" }
 wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "v16.0.0" }
 
+# TODO - Remove when corresponding Blade versions are published
+blade-graphics = { path = "/x/Code/blade/blade-graphics" }
+blade-macros = { path = "/x/Code/blade/blade-macros" }
+
 [profile.dev]
 split-debuginfo = "unpacked"
 debug = "limited"
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index d790644e99..aa5ff1dcc3 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -23,6 +23,6 @@ serde_derive.workspace = true
 util = { path = "../util" }
 
 [target.'cfg(target_os = "macos")'.dependencies]
-core-foundation = "0.9"
-core-services = "0.2"
-plist = "1.3"
+#core-foundation = "0.9"
+#core-services = "0.2"
+#plist = "1.3"
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 96c7b4b02c..15e3e8d5c9 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -26,6 +26,8 @@ anyhow.workspace = true
 async-task = "4.7"
 backtrace = { version = "0.3", optional = true }
 bitflags = "2.4.0"
+blade-graphics = "0.3"
+blade-macros = "0.2"
 collections = { path = "../collections" }
 ctor.workspace = true
 derive_more.workspace = true
diff --git a/crates/gpui/build.rs b/crates/gpui/build.rs
index 4c86fe9a62..a70f4fb637 100644
--- a/crates/gpui/build.rs
+++ b/crates/gpui/build.rs
@@ -6,12 +6,12 @@ use std::{
 use cbindgen::Config;
 
 fn main() {
-    generate_dispatch_bindings();
+    //generate_dispatch_bindings();
     let header_path = generate_shader_bindings();
-    #[cfg(feature = "runtime_shaders")]
-    emit_stitched_shaders(&header_path);
-    #[cfg(not(feature = "runtime_shaders"))]
-    compile_metal_shaders(&header_path);
+    //#[cfg(feature = "runtime_shaders")]
+    //emit_stitched_shaders(&header_path);
+    //#[cfg(not(feature = "runtime_shaders"))]
+    //compile_metal_shaders(&header_path);
 }
 
 fn generate_dispatch_bindings() {
diff --git a/crates/gpui/src/gpui.rs b/crates/gpui/src/gpui.rs
index 4fe5f62111..4fa2f525a7 100644
--- a/crates/gpui/src/gpui.rs
+++ b/crates/gpui/src/gpui.rs
@@ -6,8 +6,7 @@
 //! ## Getting Started
 //!
 //! GPUI is still in active development as we work on the Zed code editor and isn't yet on crates.io.
-//! You'll also need to use the latest version of stable rust and be on macOS. Add the following to your
-//! Cargo.toml:
+//! You'll also need to use the latest version of stable rust. Add the following to your Cargo.toml:
 //!
 //! ```
 //! gpui = { git = "https://github.com/zed-industries/zed" }
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 5cdc76def2..af32046cb1 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -2,4 +2,4 @@
 channel = "1.75"
 profile = "minimal"
 components = [ "rustfmt", "clippy" ]
-targets = [ "x86_64-apple-darwin", "aarch64-apple-darwin", "wasm32-wasi" ]
+targets = [ "x86_64-apple-darwin", "aarch64-apple-darwin", "x86_64-linux-gnu", "wasm32-wasi" ]

From d675abf70cf4eddce4ab44cf81c3891afe369512 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Wed, 24 Jan 2024 22:04:47 -0800
Subject: [PATCH 148/372] Add Linux platform, gate usage of CVImageBuffer by
 macOS

---
 crates/gpui/build.rs                       |   6 +-
 crates/gpui/src/elements/img.rs            |   4 +
 crates/gpui/src/platform.rs                |   8 +
 crates/gpui/src/platform/linux.rs          |   3 +
 crates/gpui/src/platform/linux/platform.rs | 242 +++++++++++++++++++++
 crates/gpui/src/scene.rs                   |   1 +
 crates/gpui/src/window/element_cx.rs       |   6 +-
 7 files changed, 265 insertions(+), 5 deletions(-)
 create mode 100644 crates/gpui/src/platform/linux.rs
 create mode 100644 crates/gpui/src/platform/linux/platform.rs

diff --git a/crates/gpui/build.rs b/crates/gpui/build.rs
index a70f4fb637..32da465007 100644
--- a/crates/gpui/build.rs
+++ b/crates/gpui/build.rs
@@ -7,14 +7,14 @@ use cbindgen::Config;
 
 fn main() {
     //generate_dispatch_bindings();
-    let header_path = generate_shader_bindings();
+    let _header_path = generate_shader_bindings();
     //#[cfg(feature = "runtime_shaders")]
     //emit_stitched_shaders(&header_path);
     //#[cfg(not(feature = "runtime_shaders"))]
     //compile_metal_shaders(&header_path);
 }
 
-fn generate_dispatch_bindings() {
+fn _generate_dispatch_bindings() {
     println!("cargo:rustc-link-lib=framework=System");
     println!("cargo:rerun-if-changed=src/platform/mac/dispatch.h");
 
@@ -116,7 +116,7 @@ fn emit_stitched_shaders(header_path: &Path) {
     println!("cargo:rerun-if-changed={}", &shader_source_path);
 }
 #[cfg(not(feature = "runtime_shaders"))]
-fn compile_metal_shaders(header_path: &Path) {
+fn _compile_metal_shaders(header_path: &Path) {
     use std::process::{self, Command};
     let shader_path = "./src/platform/mac/shaders.metal";
     let air_output_path = PathBuf::from(env::var("OUT_DIR").unwrap()).join("shaders.air");
diff --git a/crates/gpui/src/elements/img.rs b/crates/gpui/src/elements/img.rs
index cb97309d36..32009e04db 100644
--- a/crates/gpui/src/elements/img.rs
+++ b/crates/gpui/src/elements/img.rs
@@ -7,6 +7,7 @@ use crate::{
     StyleRefinement, Styled, UriOrPath,
 };
 use futures::FutureExt;
+#[cfg(target_os = "macos")]
 use media::core_video::CVImageBuffer;
 use util::ResultExt;
 
@@ -21,6 +22,7 @@ pub enum ImageSource {
     Data(Arc<ImageData>),
     // TODO: move surface definitions into mac platform module
     /// A CoreVideo image buffer
+    #[cfg(target_os = "macos")]
     Surface(CVImageBuffer),
 }
 
@@ -54,6 +56,7 @@ impl From<Arc<ImageData>> for ImageSource {
     }
 }
 
+#[cfg(target_os = "macos")]
 impl From<CVImageBuffer> for ImageSource {
     fn from(value: CVImageBuffer) -> Self {
         Self::Surface(value)
@@ -144,6 +147,7 @@ impl Element for Img {
                                 .log_err();
                         }
 
+                        #[cfg(target_os = "macos")]
                         ImageSource::Surface(surface) => {
                             let size = size(surface.width().into(), surface.height().into());
                             let new_bounds = preserve_aspect_ratio(bounds, size);
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index df886fc4d6..194dfe1c54 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -2,6 +2,8 @@ mod app_menu;
 mod keystroke;
 #[cfg(target_os = "macos")]
 mod mac;
+#[cfg(target_os = "linux")]
+mod linux;
 #[cfg(any(test, feature = "test-support"))]
 mod test;
 
@@ -35,6 +37,8 @@ pub use app_menu::*;
 pub use keystroke::*;
 #[cfg(target_os = "macos")]
 pub(crate) use mac::*;
+#[cfg(target_os = "linux")]
+pub(crate) use linux::*;
 #[cfg(any(test, feature = "test-support"))]
 pub(crate) use test::*;
 use time::UtcOffset;
@@ -44,6 +48,10 @@ pub use util::SemanticVersion;
 pub(crate) fn current_platform() -> Rc<dyn Platform> {
     Rc::new(MacPlatform::new())
 }
+#[cfg(target_os = "linux")]
+pub(crate) fn current_platform() -> Rc<dyn Platform> {
+    Rc::new(LinuxPlatform::new())
+}
 
 pub(crate) trait Platform: 'static {
     fn background_executor(&self) -> BackgroundExecutor;
diff --git a/crates/gpui/src/platform/linux.rs b/crates/gpui/src/platform/linux.rs
new file mode 100644
index 0000000000..a979749edd
--- /dev/null
+++ b/crates/gpui/src/platform/linux.rs
@@ -0,0 +1,3 @@
+mod platform;
+
+pub(crate) use platform::*;
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
new file mode 100644
index 0000000000..245cdbc11d
--- /dev/null
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -0,0 +1,242 @@
+#![allow(unused)]
+
+use crate::{
+    Action, AnyWindowHandle, BackgroundExecutor, ClipboardItem, CursorStyle, DisplayId,
+    Keymap, Menu, PathPromptOptions, Platform, PlatformDisplay, PlatformInput,
+    PlatformTextSystem, PlatformWindow, Result, SemanticVersion, Task, WindowOptions,
+};
+
+use futures::channel::oneshot;
+use parking_lot::Mutex;
+
+use std::{
+    path::{Path, PathBuf},
+    rc::Rc,
+    sync::Arc,
+    time::Duration,
+};
+use time::UtcOffset;
+
+
+pub(crate) struct LinuxPlatform(Mutex<LinuxPlatformState>);
+
+pub(crate) struct LinuxPlatformState {
+}
+
+impl Default for LinuxPlatform {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl LinuxPlatform {
+    pub(crate) fn new() -> Self {
+        Self(Mutex::new(LinuxPlatformState {
+        }))
+    }
+}
+
+impl Platform for LinuxPlatform {
+    fn background_executor(&self) -> BackgroundExecutor {
+        unimplemented!()
+    }
+
+    fn foreground_executor(&self) -> crate::ForegroundExecutor {
+        unimplemented!()
+    }
+
+    fn text_system(&self) -> Arc<dyn PlatformTextSystem> {
+        unimplemented!()
+    }
+
+    fn run(&self, on_finish_launching: Box<dyn FnOnce()>) {
+        unimplemented!()
+    }
+
+    fn quit(&self) {
+        unimplemented!()
+    }
+
+    fn restart(&self) {
+        unimplemented!()
+    }
+
+    fn activate(&self, ignoring_other_apps: bool) {
+        unimplemented!()
+    }
+
+    fn hide(&self) {
+        unimplemented!()
+    }
+
+    fn hide_other_apps(&self) {
+        unimplemented!()
+    }
+
+    fn unhide_other_apps(&self) {
+        unimplemented!()
+    }
+
+    fn displays(&self) -> Vec<Rc<dyn PlatformDisplay>> {
+        unimplemented!()
+    }
+
+    fn display(&self, id: DisplayId) -> Option<Rc<dyn PlatformDisplay>> {
+        unimplemented!()
+    }
+
+    fn active_window(&self) -> Option<AnyWindowHandle> {
+        unimplemented!()
+    }
+
+    fn open_window(
+        &self,
+        handle: AnyWindowHandle,
+        options: WindowOptions,
+    ) -> Box<dyn PlatformWindow> {
+        unimplemented!()
+    }
+
+    fn set_display_link_output_callback(
+        &self,
+        display_id: DisplayId,
+        callback: Box<dyn FnMut() + Send>,
+    ) {
+        unimplemented!()
+    }
+
+    fn start_display_link(&self, display_id: DisplayId) {
+        unimplemented!()
+    }
+
+    fn stop_display_link(&self, display_id: DisplayId) {
+        unimplemented!()
+    }
+
+    fn open_url(&self, url: &str) {
+        unimplemented!()
+    }
+
+    fn on_open_urls(&self, callback: Box<dyn FnMut(Vec<String>)>) {
+        unimplemented!()
+    }
+
+    fn prompt_for_paths(
+        &self,
+        options: PathPromptOptions,
+    ) -> oneshot::Receiver<Option<Vec<PathBuf>>> {
+        unimplemented!()
+    }
+
+    fn prompt_for_new_path(&self, directory: &Path) -> oneshot::Receiver<Option<PathBuf>> {
+        unimplemented!()
+    }
+
+    fn reveal_path(&self, path: &Path) {
+        unimplemented!()
+    }
+
+    fn on_become_active(&self, callback: Box<dyn FnMut()>) {
+        unimplemented!()
+    }
+
+    fn on_resign_active(&self, callback: Box<dyn FnMut()>) {
+        unimplemented!()
+    }
+
+    fn on_quit(&self, callback: Box<dyn FnMut()>) {
+        unimplemented!()
+    }
+
+    fn on_reopen(&self, callback: Box<dyn FnMut()>) {
+        unimplemented!()
+    }
+
+    fn on_event(&self, callback: Box<dyn FnMut(PlatformInput) -> bool>) {
+        unimplemented!()
+    }
+
+    fn on_app_menu_action(&self, callback: Box<dyn FnMut(&dyn Action)>) {
+        unimplemented!()
+    }
+
+    fn on_will_open_app_menu(&self, callback: Box<dyn FnMut()>) {
+        unimplemented!()
+    }
+
+    fn on_validate_app_menu_command(&self, callback: Box<dyn FnMut(&dyn Action) -> bool>) {
+        unimplemented!()
+    }
+
+    fn os_name(&self) -> &'static str {
+        "Linux"
+    }
+
+    fn double_click_interval(&self) -> Duration {
+        unimplemented!()
+    }
+
+    fn os_version(&self) -> Result<SemanticVersion> {
+        unimplemented!()
+    }
+
+    fn app_version(&self) -> Result<SemanticVersion> {
+        unimplemented!()
+    }
+
+    fn app_path(&self) -> Result<PathBuf> {
+        unimplemented!()
+    }
+
+    fn set_menus(&self, menus: Vec<Menu>, keymap: &Keymap) {
+        unimplemented!()
+    }
+
+    fn local_timezone(&self) -> UtcOffset {
+        unimplemented!()
+    }
+
+    fn path_for_auxiliary_executable(&self, name: &str) -> Result<PathBuf> {
+        unimplemented!()
+    }
+
+    fn set_cursor_style(&self, style: CursorStyle) {
+        unimplemented!()
+    }
+
+    fn should_auto_hide_scrollbars(&self) -> bool {
+        unimplemented!()
+    }
+
+    fn write_to_clipboard(&self, item: ClipboardItem) {
+        unimplemented!()
+    }
+
+    fn read_from_clipboard(&self) -> Option<ClipboardItem> {
+        unimplemented!()
+    }
+
+    fn write_credentials(&self, url: &str, username: &str, password: &[u8]) -> Task<Result<()>> {
+        unimplemented!()
+    }
+
+    fn read_credentials(&self, url: &str) -> Task<Result<Option<(String, Vec<u8>)>>> {
+        unimplemented!()
+    }
+
+    fn delete_credentials(&self, url: &str) -> Task<Result<()>> {
+        unimplemented!()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::ClipboardItem;
+
+    use super::*;
+
+    fn build_platform() -> LinuxPlatform {
+        let platform = LinuxPlatform::new();
+        platform
+    }
+}
diff --git a/crates/gpui/src/scene.rs b/crates/gpui/src/scene.rs
index 70e24030b1..e1aa7fda20 100644
--- a/crates/gpui/src/scene.rs
+++ b/crates/gpui/src/scene.rs
@@ -671,6 +671,7 @@ pub(crate) struct Surface {
     pub order: DrawOrder,
     pub bounds: Bounds<ScaledPixels>,
     pub content_mask: ContentMask<ScaledPixels>,
+    #[cfg(target_os = "macos")]
     pub image_buffer: media::core_video::CVImageBuffer,
 }
 
diff --git a/crates/gpui/src/window/element_cx.rs b/crates/gpui/src/window/element_cx.rs
index c7814fc101..4e21988a2e 100644
--- a/crates/gpui/src/window/element_cx.rs
+++ b/crates/gpui/src/window/element_cx.rs
@@ -23,6 +23,7 @@ use std::{
 use anyhow::Result;
 use collections::{FxHashMap, FxHashSet};
 use derive_more::{Deref, DerefMut};
+#[cfg(target_os = "macos")]
 use media::core_video::CVImageBuffer;
 use smallvec::SmallVec;
 use util::post_inc;
@@ -34,7 +35,7 @@ use crate::{
     InputHandler, IsZero, KeyContext, KeyEvent, KeymatchMode, LayoutId, MonochromeSprite,
     MouseEvent, PaintQuad, Path, Pixels, PlatformInputHandler, Point, PolychromeSprite, Quad,
     RenderGlyphParams, RenderImageParams, RenderSvgParams, Scene, Shadow, SharedString, Size,
-    StackingContext, StackingOrder, Style, Surface, TextStyleRefinement, Underline, UnderlineStyle,
+    StackingContext, StackingOrder, Style, TextStyleRefinement, Underline, UnderlineStyle,
     Window, WindowContext, SUBPIXEL_VARIANTS,
 };
 
@@ -962,6 +963,7 @@ impl<'a> ElementContext<'a> {
     }
 
     /// Paint a surface into the scene for the next frame at the current z-index.
+    #[cfg(target_os = "macos")]
     pub fn paint_surface(&mut self, bounds: Bounds<Pixels>, image_buffer: CVImageBuffer) {
         let scale_factor = self.scale_factor();
         let bounds = bounds.scale(scale_factor);
@@ -970,7 +972,7 @@ impl<'a> ElementContext<'a> {
         let window = &mut *self.window;
         window.next_frame.scene.insert(
             &window.next_frame.z_index_stack,
-            Surface {
+            crate::Surface {
                 view_id: view_id.into(),
                 layer_id: 0,
                 order: 0,

From ca62d22147377077418e9c2dc8ba626694a3c963 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Thu, 25 Jan 2024 23:08:48 -0800
Subject: [PATCH 149/372] linux: implement dispatcher, add dummy textsystem

---
 Cargo.lock                                   | 13 +++
 crates/gpui/Cargo.toml                       |  3 +
 crates/gpui/src/platform.rs                  |  8 +-
 crates/gpui/src/platform/linux.rs            |  2 +
 crates/gpui/src/platform/linux/dispatcher.rs | 97 ++++++++++++++++++++
 crates/gpui/src/platform/linux/platform.rs   | 15 ++-
 crates/gpui/src/platform/test.rs             |  2 +
 crates/gpui/src/platform/test/platform.rs    |  6 +-
 crates/gpui/src/platform/test/text_system.rs | 58 ++++++++++++
 crates/gpui/src/window/element_cx.rs         |  4 +-
 10 files changed, 194 insertions(+), 14 deletions(-)
 create mode 100644 crates/gpui/src/platform/linux/dispatcher.rs
 create mode 100644 crates/gpui/src/platform/test/text_system.rs

diff --git a/Cargo.lock b/Cargo.lock
index 4ae19e764c..9644e2b619 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2732,6 +2732,7 @@ checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
 dependencies = [
  "futures-core",
  "futures-sink",
+ "nanorand",
  "spin 0.9.8",
 ]
 
@@ -3105,8 +3106,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
 dependencies = [
  "cfg-if 1.0.0",
+ "js-sys",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -3232,6 +3235,7 @@ dependencies = [
  "dhat",
  "env_logger",
  "etagere",
+ "flume",
  "font-kit",
  "foreign-types 0.3.2",
  "futures 0.3.28",
@@ -4644,6 +4648,15 @@ dependencies = [
  "rand 0.8.5",
 ]
 
+[[package]]
+name = "nanorand"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
+dependencies = [
+ "getrandom 0.2.10",
+]
+
 [[package]]
 name = "native-tls"
 version = "0.2.11"
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 15e3e8d5c9..0a0a073829 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -94,3 +94,6 @@ log.workspace = true
 media = { path = "../media" }
 metal = "0.21.0"
 objc = "0.2"
+
+[target.'cfg(target_os = "linux")'.dependencies]
+flume = "0.11"
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 194dfe1c54..008baea333 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -1,9 +1,9 @@
 mod app_menu;
 mod keystroke;
-#[cfg(target_os = "macos")]
-mod mac;
 #[cfg(target_os = "linux")]
 mod linux;
+#[cfg(target_os = "macos")]
+mod mac;
 #[cfg(any(test, feature = "test-support"))]
 mod test;
 
@@ -35,10 +35,10 @@ use uuid::Uuid;
 
 pub use app_menu::*;
 pub use keystroke::*;
-#[cfg(target_os = "macos")]
-pub(crate) use mac::*;
 #[cfg(target_os = "linux")]
 pub(crate) use linux::*;
+#[cfg(target_os = "macos")]
+pub(crate) use mac::*;
 #[cfg(any(test, feature = "test-support"))]
 pub(crate) use test::*;
 use time::UtcOffset;
diff --git a/crates/gpui/src/platform/linux.rs b/crates/gpui/src/platform/linux.rs
index a979749edd..7a361c7034 100644
--- a/crates/gpui/src/platform/linux.rs
+++ b/crates/gpui/src/platform/linux.rs
@@ -1,3 +1,5 @@
+mod dispatcher;
 mod platform;
 
+pub(crate) use dispatcher::*;
 pub(crate) use platform::*;
diff --git a/crates/gpui/src/platform/linux/dispatcher.rs b/crates/gpui/src/platform/linux/dispatcher.rs
new file mode 100644
index 0000000000..14072f040a
--- /dev/null
+++ b/crates/gpui/src/platform/linux/dispatcher.rs
@@ -0,0 +1,97 @@
+#![allow(non_upper_case_globals)]
+#![allow(non_camel_case_types)]
+#![allow(non_snake_case)]
+
+use crate::{PlatformDispatcher, TaskLabel};
+use async_task::Runnable;
+use parking::{Parker, Unparker};
+use parking_lot::Mutex;
+use std::{
+    panic, thread,
+    time::{Duration, Instant},
+};
+
+pub(crate) struct LinuxDispatcher {
+    parker: Mutex<Parker>,
+    timed_tasks: Mutex<Vec<(Instant, Runnable)>>,
+    main_sender: flume::Sender<Runnable>,
+    main_receiver: flume::Receiver<Runnable>,
+    background_sender: flume::Sender<Runnable>,
+    background_thread: thread::JoinHandle<()>,
+    main_thread_id: thread::ThreadId,
+}
+
+impl Default for LinuxDispatcher {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl LinuxDispatcher {
+    pub fn new() -> Self {
+        let (main_sender, main_receiver) = flume::unbounded::<Runnable>();
+        let (background_sender, background_receiver) = flume::unbounded::<Runnable>();
+        let background_thread = thread::spawn(move || {
+            for runnable in background_receiver {
+                let _ignore_panic = panic::catch_unwind(|| runnable.run());
+            }
+        });
+        LinuxDispatcher {
+            parker: Mutex::new(Parker::new()),
+            timed_tasks: Mutex::new(Vec::new()),
+            main_sender,
+            main_receiver,
+            background_sender,
+            background_thread,
+            main_thread_id: thread::current().id(),
+        }
+    }
+}
+
+impl PlatformDispatcher for LinuxDispatcher {
+    fn is_main_thread(&self) -> bool {
+        thread::current().id() == self.main_thread_id
+    }
+
+    fn dispatch(&self, runnable: Runnable, _: Option<TaskLabel>) {
+        self.background_sender.send(runnable).unwrap();
+    }
+
+    fn dispatch_on_main_thread(&self, runnable: Runnable) {
+        self.main_sender.send(runnable).unwrap();
+    }
+
+    fn dispatch_after(&self, duration: Duration, runnable: Runnable) {
+        let moment = Instant::now() + duration;
+        let mut timed_tasks = self.timed_tasks.lock();
+        timed_tasks.push((moment, runnable));
+        timed_tasks.sort_unstable_by(|&(ref a, _), &(ref b, _)| b.cmp(a));
+    }
+
+    fn tick(&self, background_only: bool) -> bool {
+        let mut ran = false;
+        if self.is_main_thread() && !background_only {
+            for runnable in self.main_receiver.try_iter() {
+                runnable.run();
+                ran = true;
+            }
+        }
+        let mut timed_tasks = self.timed_tasks.lock();
+        while let Some(&(moment, _)) = timed_tasks.last() {
+            if moment <= Instant::now() {
+                let (_, runnable) = timed_tasks.pop().unwrap();
+                runnable.run();
+                ran = true;
+            }
+        }
+        ran
+    }
+
+    fn park(&self) {
+        self.parker.lock().park()
+    }
+
+    fn unparker(&self) -> Unparker {
+        self.parker.lock().unparker()
+    }
+}
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index 245cdbc11d..a2b87b7ea1 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -2,8 +2,9 @@
 
 use crate::{
     Action, AnyWindowHandle, BackgroundExecutor, ClipboardItem, CursorStyle, DisplayId,
-    Keymap, Menu, PathPromptOptions, Platform, PlatformDisplay, PlatformInput,
-    PlatformTextSystem, PlatformWindow, Result, SemanticVersion, Task, WindowOptions,
+    ForegroundExecutor, Keymap, LinuxDispatcher, Menu, PathPromptOptions, Platform,
+    PlatformDisplay, PlatformInput, PlatformTextSystem, PlatformWindow, Result, SemanticVersion,
+    Task, WindowOptions,
 };
 
 use futures::channel::oneshot;
@@ -17,10 +18,11 @@ use std::{
 };
 use time::UtcOffset;
 
-
 pub(crate) struct LinuxPlatform(Mutex<LinuxPlatformState>);
 
 pub(crate) struct LinuxPlatformState {
+    background_executor: BackgroundExecutor,
+    foreground_executor: ForegroundExecutor,
 }
 
 impl Default for LinuxPlatform {
@@ -31,18 +33,21 @@ impl Default for LinuxPlatform {
 
 impl LinuxPlatform {
     pub(crate) fn new() -> Self {
+        let dispatcher = Arc::new(LinuxDispatcher::new());
         Self(Mutex::new(LinuxPlatformState {
+            background_executor: BackgroundExecutor::new(dispatcher.clone()),
+            foreground_executor: ForegroundExecutor::new(dispatcher),
         }))
     }
 }
 
 impl Platform for LinuxPlatform {
     fn background_executor(&self) -> BackgroundExecutor {
-        unimplemented!()
+        self.0.lock().background_executor.clone()
     }
 
     fn foreground_executor(&self) -> crate::ForegroundExecutor {
-        unimplemented!()
+        self.0.lock().foreground_executor.clone()
     }
 
     fn text_system(&self) -> Arc<dyn PlatformTextSystem> {
diff --git a/crates/gpui/src/platform/test.rs b/crates/gpui/src/platform/test.rs
index d17739239e..6cd833b681 100644
--- a/crates/gpui/src/platform/test.rs
+++ b/crates/gpui/src/platform/test.rs
@@ -1,9 +1,11 @@
 mod dispatcher;
 mod display;
 mod platform;
+mod text_system;
 mod window;
 
 pub(crate) use dispatcher::*;
 pub(crate) use display::*;
 pub(crate) use platform::*;
+pub(crate) use text_system::*;
 pub(crate) use window::*;
diff --git a/crates/gpui/src/platform/test/platform.rs b/crates/gpui/src/platform/test/platform.rs
index 5aadc4b760..464e38b0c4 100644
--- a/crates/gpui/src/platform/test/platform.rs
+++ b/crates/gpui/src/platform/test/platform.rs
@@ -1,7 +1,7 @@
 use crate::{
     AnyWindowHandle, BackgroundExecutor, ClipboardItem, CursorStyle, DisplayId, ForegroundExecutor,
-    Keymap, Platform, PlatformDisplay, PlatformTextSystem, Task, TestDisplay, TestWindow,
-    WindowOptions,
+    Keymap, Platform, PlatformDisplay, PlatformTextSystem, Task, TestDisplay, TestTextSystem,
+    TestWindow, WindowOptions,
 };
 use anyhow::{anyhow, Result};
 use collections::VecDeque;
@@ -118,7 +118,7 @@ impl Platform for TestPlatform {
     }
 
     fn text_system(&self) -> Arc<dyn PlatformTextSystem> {
-        Arc::new(crate::platform::mac::MacTextSystem::new())
+        Arc::new(TestTextSystem {})
     }
 
     fn run(&self, _on_finish_launching: Box<dyn FnOnce()>) {
diff --git a/crates/gpui/src/platform/test/text_system.rs b/crates/gpui/src/platform/test/text_system.rs
new file mode 100644
index 0000000000..c72ee6f00c
--- /dev/null
+++ b/crates/gpui/src/platform/test/text_system.rs
@@ -0,0 +1,58 @@
+use crate::{
+    Bounds, DevicePixels, Font, FontId, FontMetrics, FontRun, GlyphId, LineLayout, Pixels,
+    PlatformTextSystem, RenderGlyphParams, Size,
+};
+use anyhow::Result;
+use std::sync::Arc;
+
+pub(crate) struct TestTextSystem {}
+
+#[allow(unused)]
+impl PlatformTextSystem for TestTextSystem {
+    fn add_fonts(&self, fonts: &[Arc<Vec<u8>>]) -> Result<()> {
+        unimplemented!()
+    }
+    fn all_font_names(&self) -> Vec<String> {
+        unimplemented!()
+    }
+    fn all_font_families(&self) -> Vec<String> {
+        unimplemented!()
+    }
+    fn font_id(&self, descriptor: &Font) -> Result<FontId> {
+        unimplemented!()
+    }
+    fn font_metrics(&self, font_id: FontId) -> FontMetrics {
+        unimplemented!()
+    }
+    fn typographic_bounds(&self, font_id: FontId, glyph_id: GlyphId) -> Result<Bounds<f32>> {
+        unimplemented!()
+    }
+    fn advance(&self, font_id: FontId, glyph_id: GlyphId) -> Result<Size<f32>> {
+        unimplemented!()
+    }
+    fn glyph_for_char(&self, font_id: FontId, ch: char) -> Option<GlyphId> {
+        unimplemented!()
+    }
+    fn glyph_raster_bounds(&self, params: &RenderGlyphParams) -> Result<Bounds<DevicePixels>> {
+        unimplemented!()
+    }
+    fn rasterize_glyph(
+        &self,
+        params: &RenderGlyphParams,
+        raster_bounds: Bounds<DevicePixels>,
+    ) -> Result<(Size<DevicePixels>, Vec<u8>)> {
+        unimplemented!()
+    }
+    fn layout_line(&self, text: &str, font_size: Pixels, runs: &[FontRun]) -> LineLayout {
+        unimplemented!()
+    }
+    fn wrap_line(
+        &self,
+        text: &str,
+        font_id: FontId,
+        font_size: Pixels,
+        width: Pixels,
+    ) -> Vec<usize> {
+        unimplemented!()
+    }
+}
diff --git a/crates/gpui/src/window/element_cx.rs b/crates/gpui/src/window/element_cx.rs
index 4e21988a2e..6e2e5bc725 100644
--- a/crates/gpui/src/window/element_cx.rs
+++ b/crates/gpui/src/window/element_cx.rs
@@ -35,8 +35,8 @@ use crate::{
     InputHandler, IsZero, KeyContext, KeyEvent, KeymatchMode, LayoutId, MonochromeSprite,
     MouseEvent, PaintQuad, Path, Pixels, PlatformInputHandler, Point, PolychromeSprite, Quad,
     RenderGlyphParams, RenderImageParams, RenderSvgParams, Scene, Shadow, SharedString, Size,
-    StackingContext, StackingOrder, Style, TextStyleRefinement, Underline, UnderlineStyle,
-    Window, WindowContext, SUBPIXEL_VARIANTS,
+    StackingContext, StackingOrder, Style, TextStyleRefinement, Underline, UnderlineStyle, Window,
+    WindowContext, SUBPIXEL_VARIANTS,
 };
 
 type AnyMouseListener = Box<dyn FnMut(&dyn Any, DispatchPhase, &mut ElementContext) + 'static>;

From b0376aaf8fe272e82552203f4d21e854bb1e34a1 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Fri, 26 Jan 2024 00:03:30 -0800
Subject: [PATCH 150/372] linux: start the text system

---
 crates/gpui/Cargo.toml                        |   1 -
 crates/gpui/src/platform/linux.rs             |   2 +
 crates/gpui/src/platform/linux/platform.rs    |  10 +-
 crates/gpui/src/platform/linux/text_system.rs | 103 ++++++++++++++++++
 4 files changed, 111 insertions(+), 5 deletions(-)
 create mode 100644 crates/gpui/src/platform/linux/text_system.rs

diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 0a0a073829..dbae48a5aa 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -88,7 +88,6 @@ cocoa = "0.25"
 core-foundation = { version = "0.9.3", features = ["with-uuid"] }
 core-graphics = "0.22.3"
 core-text = "19.2"
-font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "d97147f" }
 foreign-types = "0.3"
 log.workspace = true
 media = { path = "../media" }
diff --git a/crates/gpui/src/platform/linux.rs b/crates/gpui/src/platform/linux.rs
index 7a361c7034..c762c3135e 100644
--- a/crates/gpui/src/platform/linux.rs
+++ b/crates/gpui/src/platform/linux.rs
@@ -1,5 +1,7 @@
 mod dispatcher;
 mod platform;
+mod text_system;
 
 pub(crate) use dispatcher::*;
 pub(crate) use platform::*;
+pub(crate) use text_system::*;
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index a2b87b7ea1..327ec59d16 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -2,9 +2,9 @@
 
 use crate::{
     Action, AnyWindowHandle, BackgroundExecutor, ClipboardItem, CursorStyle, DisplayId,
-    ForegroundExecutor, Keymap, LinuxDispatcher, Menu, PathPromptOptions, Platform,
-    PlatformDisplay, PlatformInput, PlatformTextSystem, PlatformWindow, Result, SemanticVersion,
-    Task, WindowOptions,
+    ForegroundExecutor, Keymap, LinuxDispatcher, LinuxTextSystem, Menu, PathPromptOptions,
+    Platform, PlatformDisplay, PlatformInput, PlatformTextSystem, PlatformWindow, Result,
+    SemanticVersion, Task, WindowOptions,
 };
 
 use futures::channel::oneshot;
@@ -23,6 +23,7 @@ pub(crate) struct LinuxPlatform(Mutex<LinuxPlatformState>);
 pub(crate) struct LinuxPlatformState {
     background_executor: BackgroundExecutor,
     foreground_executor: ForegroundExecutor,
+    text_system: Arc<LinuxTextSystem>,
 }
 
 impl Default for LinuxPlatform {
@@ -37,6 +38,7 @@ impl LinuxPlatform {
         Self(Mutex::new(LinuxPlatformState {
             background_executor: BackgroundExecutor::new(dispatcher.clone()),
             foreground_executor: ForegroundExecutor::new(dispatcher),
+            text_system: Arc::new(LinuxTextSystem::new()),
         }))
     }
 }
@@ -51,7 +53,7 @@ impl Platform for LinuxPlatform {
     }
 
     fn text_system(&self) -> Arc<dyn PlatformTextSystem> {
-        unimplemented!()
+        self.0.lock().text_system.clone()
     }
 
     fn run(&self, on_finish_launching: Box<dyn FnOnce()>) {
diff --git a/crates/gpui/src/platform/linux/text_system.rs b/crates/gpui/src/platform/linux/text_system.rs
new file mode 100644
index 0000000000..30f65c0ece
--- /dev/null
+++ b/crates/gpui/src/platform/linux/text_system.rs
@@ -0,0 +1,103 @@
+use crate::{
+    Bounds, DevicePixels, Font, FontId, FontMetrics, FontRun, GlyphId, LineLayout, Pixels,
+    PlatformTextSystem, RenderGlyphParams, SharedString, Size,
+};
+use anyhow::Result;
+use collections::HashMap;
+use font_kit::{
+    font::Font as FontKitFont,
+    handle::Handle,
+    hinting::HintingOptions,
+    metrics::Metrics,
+    properties::{Style as FontkitStyle, Weight as FontkitWeight},
+    source::SystemSource,
+    sources::mem::MemSource,
+};
+use parking_lot::RwLock;
+use smallvec::SmallVec;
+use std::sync::Arc;
+
+pub(crate) struct LinuxTextSystem(RwLock<LinuxTextSystemState>);
+
+struct LinuxTextSystemState {
+    memory_source: MemSource,
+    system_source: SystemSource,
+    fonts: Vec<FontKitFont>,
+    font_selections: HashMap<Font, FontId>,
+    font_ids_by_postscript_name: HashMap<String, FontId>,
+    font_ids_by_family_name: HashMap<SharedString, SmallVec<[FontId; 4]>>,
+    postscript_names_by_font_id: HashMap<FontId, String>,
+}
+
+unsafe impl Send for LinuxTextSystemState {}
+unsafe impl Sync for LinuxTextSystemState {}
+
+impl LinuxTextSystem {
+    pub(crate) fn new() -> Self {
+        Self(RwLock::new(LinuxTextSystemState {
+            memory_source: MemSource::empty(),
+            system_source: SystemSource::new(),
+            fonts: Vec::new(),
+            font_selections: HashMap::default(),
+            font_ids_by_postscript_name: HashMap::default(),
+            font_ids_by_family_name: HashMap::default(),
+            postscript_names_by_font_id: HashMap::default(),
+        }))
+    }
+}
+
+impl Default for LinuxTextSystem {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+#[allow(unused)]
+impl PlatformTextSystem for LinuxTextSystem {
+    fn add_fonts(&self, fonts: &[Arc<Vec<u8>>]) -> Result<()> {
+        unimplemented!()
+    }
+    fn all_font_names(&self) -> Vec<String> {
+        unimplemented!()
+    }
+    fn all_font_families(&self) -> Vec<String> {
+        unimplemented!()
+    }
+    fn font_id(&self, descriptor: &Font) -> Result<FontId> {
+        unimplemented!()
+    }
+    fn font_metrics(&self, font_id: FontId) -> FontMetrics {
+        unimplemented!()
+    }
+    fn typographic_bounds(&self, font_id: FontId, glyph_id: GlyphId) -> Result<Bounds<f32>> {
+        unimplemented!()
+    }
+    fn advance(&self, font_id: FontId, glyph_id: GlyphId) -> Result<Size<f32>> {
+        unimplemented!()
+    }
+    fn glyph_for_char(&self, font_id: FontId, ch: char) -> Option<GlyphId> {
+        unimplemented!()
+    }
+    fn glyph_raster_bounds(&self, params: &RenderGlyphParams) -> Result<Bounds<DevicePixels>> {
+        unimplemented!()
+    }
+    fn rasterize_glyph(
+        &self,
+        params: &RenderGlyphParams,
+        raster_bounds: Bounds<DevicePixels>,
+    ) -> Result<(Size<DevicePixels>, Vec<u8>)> {
+        unimplemented!()
+    }
+    fn layout_line(&self, text: &str, font_size: Pixels, runs: &[FontRun]) -> LineLayout {
+        unimplemented!()
+    }
+    fn wrap_line(
+        &self,
+        text: &str,
+        font_id: FontId,
+        font_size: Pixels,
+        width: Pixels,
+    ) -> Vec<usize> {
+        unimplemented!()
+    }
+}

From e95bf24a1f8b6196fb423e886017bd2a121a08ec Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Fri, 26 Jan 2024 23:51:35 -0800
Subject: [PATCH 151/372] linux: basic window, display, and atlas

---
 crates/gpui/Cargo.toml                        |   2 +-
 crates/gpui/src/platform/linux.rs             |   9 +
 crates/gpui/src/platform/linux/blade_atlas.rs | 258 ++++++++++++++++++
 crates/gpui/src/platform/linux/blade_belt.rs  |  84 ++++++
 crates/gpui/src/platform/linux/display.rs     |  23 ++
 crates/gpui/src/platform/linux/platform.rs    | 141 +++++-----
 crates/gpui/src/platform/linux/text_system.rs |   6 +-
 crates/gpui/src/platform/linux/window.rs      | 143 ++++++++++
 8 files changed, 582 insertions(+), 84 deletions(-)
 create mode 100644 crates/gpui/src/platform/linux/blade_atlas.rs
 create mode 100644 crates/gpui/src/platform/linux/blade_belt.rs
 create mode 100644 crates/gpui/src/platform/linux/display.rs
 create mode 100644 crates/gpui/src/platform/linux/window.rs

diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index dbae48a5aa..42978e203b 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -26,7 +26,7 @@ anyhow.workspace = true
 async-task = "4.7"
 backtrace = { version = "0.3", optional = true }
 bitflags = "2.4.0"
-blade-graphics = "0.3"
+blade = { package = "blade-graphics", version = "0.3" }
 blade-macros = "0.2"
 collections = { path = "../collections" }
 ctor.workspace = true
diff --git a/crates/gpui/src/platform/linux.rs b/crates/gpui/src/platform/linux.rs
index c762c3135e..ba70c6fe67 100644
--- a/crates/gpui/src/platform/linux.rs
+++ b/crates/gpui/src/platform/linux.rs
@@ -1,7 +1,16 @@
+mod blade_atlas;
+mod blade_belt;
 mod dispatcher;
+mod display;
 mod platform;
 mod text_system;
+mod window;
 
+pub(crate) use blade_atlas::*;
 pub(crate) use dispatcher::*;
+pub(crate) use display::*;
 pub(crate) use platform::*;
 pub(crate) use text_system::*;
+pub(crate) use window::*;
+
+use blade_belt::*;
diff --git a/crates/gpui/src/platform/linux/blade_atlas.rs b/crates/gpui/src/platform/linux/blade_atlas.rs
new file mode 100644
index 0000000000..24a9bbde8d
--- /dev/null
+++ b/crates/gpui/src/platform/linux/blade_atlas.rs
@@ -0,0 +1,258 @@
+use super::{BladeBelt, BladeBeltDescriptor};
+use crate::{
+    AtlasKey, AtlasTextureId, AtlasTextureKind, AtlasTile, Bounds, DevicePixels, PlatformAtlas,
+    Point, Size,
+};
+use anyhow::Result;
+use collections::FxHashMap;
+use derive_more::{Deref, DerefMut};
+use etagere::BucketedAtlasAllocator;
+use parking_lot::Mutex;
+use std::{borrow::Cow, sync::Arc};
+
+pub(crate) struct BladeAtlas(Mutex<BladeAtlasState>);
+
+struct BladeAtlasState {
+    gpu: Arc<blade::Context>,
+    gpu_encoder: blade::CommandEncoder,
+    upload_belt: BladeBelt,
+    monochrome_textures: Vec<BladeAtlasTexture>,
+    polychrome_textures: Vec<BladeAtlasTexture>,
+    path_textures: Vec<BladeAtlasTexture>,
+    tiles_by_key: FxHashMap<AtlasKey, AtlasTile>,
+}
+
+impl BladeAtlas {
+    pub(crate) fn new(gpu: &Arc<blade::Context>) -> Self {
+        BladeAtlas(Mutex::new(BladeAtlasState {
+            gpu: Arc::clone(gpu),
+            gpu_encoder: gpu.create_command_encoder(blade::CommandEncoderDesc {
+                name: "atlas",
+                buffer_count: 3,
+            }),
+            upload_belt: BladeBelt::new(BladeBeltDescriptor {
+                memory: blade::Memory::Upload,
+                min_chunk_size: 0x10000,
+            }),
+            monochrome_textures: Default::default(),
+            polychrome_textures: Default::default(),
+            path_textures: Default::default(),
+            tiles_by_key: Default::default(),
+        }))
+    }
+
+    pub(crate) fn clear_textures(&self, texture_kind: AtlasTextureKind) {
+        let mut lock = self.0.lock();
+        let textures = match texture_kind {
+            AtlasTextureKind::Monochrome => &mut lock.monochrome_textures,
+            AtlasTextureKind::Polychrome => &mut lock.polychrome_textures,
+            AtlasTextureKind::Path => &mut lock.path_textures,
+        };
+        for texture in textures {
+            texture.clear();
+        }
+    }
+
+    pub fn start_frame(&self) {
+        let mut lock = self.0.lock();
+        lock.gpu_encoder.start();
+    }
+
+    pub fn finish_frame(&self) -> blade::SyncPoint {
+        let mut lock = self.0.lock();
+        let gpu = lock.gpu.clone();
+        let sync_point = gpu.submit(&mut lock.gpu_encoder);
+        lock.upload_belt.flush(&sync_point);
+        sync_point
+    }
+}
+
+impl PlatformAtlas for BladeAtlas {
+    fn get_or_insert_with<'a>(
+        &self,
+        key: &AtlasKey,
+        build: &mut dyn FnMut() -> Result<(Size<DevicePixels>, Cow<'a, [u8]>)>,
+    ) -> Result<AtlasTile> {
+        let mut lock = self.0.lock();
+        if let Some(tile) = lock.tiles_by_key.get(key) {
+            Ok(tile.clone())
+        } else {
+            let (size, bytes) = build()?;
+            let tile = lock.allocate(size, key.texture_kind());
+            lock.upload_texture(tile.texture_id, tile.bounds, &bytes);
+            lock.tiles_by_key.insert(key.clone(), tile.clone());
+            Ok(tile)
+        }
+    }
+}
+
+impl BladeAtlasState {
+    fn allocate(&mut self, size: Size<DevicePixels>, texture_kind: AtlasTextureKind) -> AtlasTile {
+        let textures = match texture_kind {
+            AtlasTextureKind::Monochrome => &mut self.monochrome_textures,
+            AtlasTextureKind::Polychrome => &mut self.polychrome_textures,
+            AtlasTextureKind::Path => &mut self.path_textures,
+        };
+        textures
+            .iter_mut()
+            .rev()
+            .find_map(|texture| texture.allocate(size))
+            .unwrap_or_else(|| {
+                let texture = self.push_texture(size, texture_kind);
+                texture.allocate(size).unwrap()
+            })
+    }
+
+    fn push_texture(
+        &mut self,
+        min_size: Size<DevicePixels>,
+        kind: AtlasTextureKind,
+    ) -> &mut BladeAtlasTexture {
+        const DEFAULT_ATLAS_SIZE: Size<DevicePixels> = Size {
+            width: DevicePixels(1024),
+            height: DevicePixels(1024),
+        };
+
+        let size = min_size.max(&DEFAULT_ATLAS_SIZE);
+        let format;
+        let usage;
+        match kind {
+            AtlasTextureKind::Monochrome => {
+                format = blade::TextureFormat::R8Unorm;
+                usage = blade::TextureUsage::COPY | blade::TextureUsage::RESOURCE;
+            }
+            AtlasTextureKind::Polychrome => {
+                format = blade::TextureFormat::Bgra8Unorm;
+                usage = blade::TextureUsage::COPY | blade::TextureUsage::RESOURCE;
+            }
+            AtlasTextureKind::Path => {
+                format = blade::TextureFormat::R16Float;
+                usage = blade::TextureUsage::COPY
+                    | blade::TextureUsage::RESOURCE
+                    | blade::TextureUsage::TARGET;
+            }
+        }
+
+        let raw = self.gpu.create_texture(blade::TextureDesc {
+            name: "",
+            format,
+            size: blade::Extent {
+                width: size.width.into(),
+                height: size.height.into(),
+                depth: 1,
+            },
+            array_layer_count: 1,
+            mip_level_count: 1,
+            dimension: blade::TextureDimension::D2,
+            usage,
+        });
+
+        let textures = match kind {
+            AtlasTextureKind::Monochrome => &mut self.monochrome_textures,
+            AtlasTextureKind::Polychrome => &mut self.polychrome_textures,
+            AtlasTextureKind::Path => &mut self.path_textures,
+        };
+        let atlas_texture = BladeAtlasTexture {
+            id: AtlasTextureId {
+                index: textures.len() as u32,
+                kind,
+            },
+            allocator: etagere::BucketedAtlasAllocator::new(size.into()),
+            format,
+            raw,
+        };
+        textures.push(atlas_texture);
+        textures.last_mut().unwrap()
+    }
+
+    fn upload_texture(&mut self, id: AtlasTextureId, bounds: Bounds<DevicePixels>, bytes: &[u8]) {
+        let textures = match id.kind {
+            crate::AtlasTextureKind::Monochrome => &self.monochrome_textures,
+            crate::AtlasTextureKind::Polychrome => &self.polychrome_textures,
+            crate::AtlasTextureKind::Path => &self.path_textures,
+        };
+        let texture = &textures[id.index as usize];
+
+        let src_data = self.upload_belt.alloc_data(bytes, &self.gpu);
+
+        let mut transfers = self.gpu_encoder.transfer();
+        transfers.copy_buffer_to_texture(
+            src_data,
+            bounds.size.width.to_bytes(texture.bytes_per_pixel()),
+            blade::TexturePiece {
+                texture: texture.raw,
+                mip_level: 0,
+                array_layer: 0,
+                origin: [bounds.origin.x.into(), bounds.origin.y.into(), 0],
+            },
+            blade::Extent {
+                width: bounds.size.width.into(),
+                height: bounds.size.height.into(),
+                depth: 1,
+            },
+        );
+    }
+}
+
+struct BladeAtlasTexture {
+    id: AtlasTextureId,
+    allocator: BucketedAtlasAllocator,
+    raw: blade::Texture,
+    format: blade::TextureFormat,
+}
+
+impl BladeAtlasTexture {
+    fn clear(&mut self) {
+        self.allocator.clear();
+    }
+
+    fn allocate(&mut self, size: Size<DevicePixels>) -> Option<AtlasTile> {
+        let allocation = self.allocator.allocate(size.into())?;
+        let tile = AtlasTile {
+            texture_id: self.id,
+            tile_id: allocation.id.into(),
+            bounds: Bounds {
+                origin: allocation.rectangle.min.into(),
+                size,
+            },
+        };
+        Some(tile)
+    }
+
+    fn bytes_per_pixel(&self) -> u8 {
+        self.format.block_info().size
+    }
+}
+
+impl From<Size<DevicePixels>> for etagere::Size {
+    fn from(size: Size<DevicePixels>) -> Self {
+        etagere::Size::new(size.width.into(), size.height.into())
+    }
+}
+
+impl From<etagere::Point> for Point<DevicePixels> {
+    fn from(value: etagere::Point) -> Self {
+        Point {
+            x: DevicePixels::from(value.x),
+            y: DevicePixels::from(value.y),
+        }
+    }
+}
+
+impl From<etagere::Size> for Size<DevicePixels> {
+    fn from(size: etagere::Size) -> Self {
+        Size {
+            width: DevicePixels::from(size.width),
+            height: DevicePixels::from(size.height),
+        }
+    }
+}
+
+impl From<etagere::Rectangle> for Bounds<DevicePixels> {
+    fn from(rectangle: etagere::Rectangle) -> Self {
+        Bounds {
+            origin: rectangle.min.into(),
+            size: rectangle.size().into(),
+        }
+    }
+}
diff --git a/crates/gpui/src/platform/linux/blade_belt.rs b/crates/gpui/src/platform/linux/blade_belt.rs
new file mode 100644
index 0000000000..ff3d5c6692
--- /dev/null
+++ b/crates/gpui/src/platform/linux/blade_belt.rs
@@ -0,0 +1,84 @@
+struct ReusableBuffer {
+    raw: blade::Buffer,
+    size: u64,
+}
+
+pub struct BladeBeltDescriptor {
+    pub memory: blade::Memory,
+    pub min_chunk_size: u64,
+}
+
+/// A belt of buffers, used by the BladeAtlas to cheaply
+/// find staging space for uploads.
+pub struct BladeBelt {
+    desc: BladeBeltDescriptor,
+    buffers: Vec<(ReusableBuffer, blade::SyncPoint)>,
+    active: Vec<(ReusableBuffer, u64)>,
+}
+
+impl BladeBelt {
+    pub fn new(desc: BladeBeltDescriptor) -> Self {
+        Self {
+            desc,
+            buffers: Vec::new(),
+            active: Vec::new(),
+        }
+    }
+
+    pub fn destroy(&mut self, gpu: &blade::Context) {
+        for (buffer, _) in self.buffers.drain(..) {
+            gpu.destroy_buffer(buffer.raw);
+        }
+        for (buffer, _) in self.active.drain(..) {
+            gpu.destroy_buffer(buffer.raw);
+        }
+    }
+
+    pub fn alloc(&mut self, size: u64, gpu: &blade::Context) -> blade::BufferPiece {
+        for &mut (ref rb, ref mut offset) in self.active.iter_mut() {
+            if *offset + size <= rb.size {
+                let piece = rb.raw.at(*offset);
+                *offset += size;
+                return piece;
+            }
+        }
+
+        let index_maybe = self
+            .buffers
+            .iter()
+            .position(|&(ref rb, ref sp)| size <= rb.size && gpu.wait_for(sp, 0));
+        if let Some(index) = index_maybe {
+            let (rb, _) = self.buffers.remove(index);
+            let piece = rb.raw.into();
+            self.active.push((rb, size));
+            return piece;
+        }
+
+        let chunk_index = self.buffers.len() + self.active.len();
+        let chunk_size = size.max(self.desc.min_chunk_size);
+        let chunk = gpu.create_buffer(blade::BufferDesc {
+            name: &format!("chunk-{}", chunk_index),
+            size: chunk_size,
+            memory: self.desc.memory,
+        });
+        let rb = ReusableBuffer {
+            raw: chunk,
+            size: chunk_size,
+        };
+        self.active.push((rb, size));
+        chunk.into()
+    }
+
+    pub fn alloc_data(&mut self, data: &[u8], gpu: &blade::Context) -> blade::BufferPiece {
+        let bp = self.alloc(data.len() as u64, gpu);
+        unsafe {
+            std::ptr::copy_nonoverlapping(data.as_ptr(), bp.data(), data.len());
+        }
+        bp
+    }
+
+    pub fn flush(&mut self, sp: &blade::SyncPoint) {
+        self.buffers
+            .extend(self.active.drain(..).map(|(rb, _)| (rb, sp.clone())));
+    }
+}
diff --git a/crates/gpui/src/platform/linux/display.rs b/crates/gpui/src/platform/linux/display.rs
new file mode 100644
index 0000000000..507edad3b0
--- /dev/null
+++ b/crates/gpui/src/platform/linux/display.rs
@@ -0,0 +1,23 @@
+use crate::{point, size, Bounds, DisplayId, GlobalPixels, PlatformDisplay};
+use anyhow::Result;
+use uuid::Uuid;
+
+#[derive(Debug)]
+pub(crate) struct LinuxDisplay;
+
+impl PlatformDisplay for LinuxDisplay {
+    fn id(&self) -> DisplayId {
+        DisplayId(0)
+    }
+
+    fn uuid(&self) -> Result<Uuid> {
+        Ok(Uuid::from_bytes([0; 16]))
+    }
+
+    fn bounds(&self) -> Bounds<GlobalPixels> {
+        Bounds {
+            origin: point(GlobalPixels(0.0), GlobalPixels(0.0)),
+            size: size(GlobalPixels(100.0), GlobalPixels(100.0)),
+        }
+    }
+}
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index 327ec59d16..8136b77292 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -2,9 +2,9 @@
 
 use crate::{
     Action, AnyWindowHandle, BackgroundExecutor, ClipboardItem, CursorStyle, DisplayId,
-    ForegroundExecutor, Keymap, LinuxDispatcher, LinuxTextSystem, Menu, PathPromptOptions,
-    Platform, PlatformDisplay, PlatformInput, PlatformTextSystem, PlatformWindow, Result,
-    SemanticVersion, Task, WindowOptions,
+    ForegroundExecutor, Keymap, LinuxDispatcher, LinuxDisplay, LinuxTextSystem, LinuxWindow, Menu,
+    PathPromptOptions, Platform, PlatformDisplay, PlatformInput, PlatformTextSystem,
+    PlatformWindow, Result, SemanticVersion, Task, WindowOptions,
 };
 
 use futures::channel::oneshot;
@@ -21,6 +21,7 @@ use time::UtcOffset;
 pub(crate) struct LinuxPlatform(Mutex<LinuxPlatformState>);
 
 pub(crate) struct LinuxPlatformState {
+    gpu: Arc<blade::Context>,
     background_executor: BackgroundExecutor,
     foreground_executor: ForegroundExecutor,
     text_system: Arc<LinuxTextSystem>,
@@ -35,7 +36,17 @@ impl Default for LinuxPlatform {
 impl LinuxPlatform {
     pub(crate) fn new() -> Self {
         let dispatcher = Arc::new(LinuxDispatcher::new());
+        let gpu = Arc::new(
+            unsafe {
+                blade::Context::init(blade::ContextDesc {
+                    validation: true, //FIXME
+                    capture: false,
+                })
+            }
+            .unwrap(),
+        );
         Self(Mutex::new(LinuxPlatformState {
+            gpu,
             background_executor: BackgroundExecutor::new(dispatcher.clone()),
             foreground_executor: ForegroundExecutor::new(dispatcher),
             text_system: Arc::new(LinuxTextSystem::new()),
@@ -57,43 +68,31 @@ impl Platform for LinuxPlatform {
     }
 
     fn run(&self, on_finish_launching: Box<dyn FnOnce()>) {
-        unimplemented!()
+        on_finish_launching()
     }
 
-    fn quit(&self) {
-        unimplemented!()
-    }
+    fn quit(&self) {}
 
-    fn restart(&self) {
-        unimplemented!()
-    }
+    fn restart(&self) {}
 
-    fn activate(&self, ignoring_other_apps: bool) {
-        unimplemented!()
-    }
+    fn activate(&self, ignoring_other_apps: bool) {}
 
-    fn hide(&self) {
-        unimplemented!()
-    }
+    fn hide(&self) {}
 
-    fn hide_other_apps(&self) {
-        unimplemented!()
-    }
+    fn hide_other_apps(&self) {}
 
-    fn unhide_other_apps(&self) {
-        unimplemented!()
-    }
+    fn unhide_other_apps(&self) {}
 
     fn displays(&self) -> Vec<Rc<dyn PlatformDisplay>> {
-        unimplemented!()
+        Vec::new()
     }
 
     fn display(&self, id: DisplayId) -> Option<Rc<dyn PlatformDisplay>> {
-        unimplemented!()
+        None
     }
 
     fn active_window(&self) -> Option<AnyWindowHandle> {
-        unimplemented!()
+        None
     }
 
     fn open_window(
@@ -101,7 +100,13 @@ impl Platform for LinuxPlatform {
         handle: AnyWindowHandle,
         options: WindowOptions,
     ) -> Box<dyn PlatformWindow> {
-        unimplemented!()
+        let lock = self.0.lock();
+        Box::new(LinuxWindow::new(
+            options,
+            handle,
+            Rc::new(LinuxDisplay),
+            &lock.gpu,
+        ))
     }
 
     fn set_display_link_output_callback(
@@ -112,21 +117,13 @@ impl Platform for LinuxPlatform {
         unimplemented!()
     }
 
-    fn start_display_link(&self, display_id: DisplayId) {
-        unimplemented!()
-    }
+    fn start_display_link(&self, display_id: DisplayId) {}
 
-    fn stop_display_link(&self, display_id: DisplayId) {
-        unimplemented!()
-    }
+    fn stop_display_link(&self, display_id: DisplayId) {}
 
-    fn open_url(&self, url: &str) {
-        unimplemented!()
-    }
+    fn open_url(&self, url: &str) {}
 
-    fn on_open_urls(&self, callback: Box<dyn FnMut(Vec<String>)>) {
-        unimplemented!()
-    }
+    fn on_open_urls(&self, callback: Box<dyn FnMut(Vec<String>)>) {}
 
     fn prompt_for_paths(
         &self,
@@ -139,88 +136,72 @@ impl Platform for LinuxPlatform {
         unimplemented!()
     }
 
-    fn reveal_path(&self, path: &Path) {
-        unimplemented!()
-    }
+    fn reveal_path(&self, path: &Path) {}
 
-    fn on_become_active(&self, callback: Box<dyn FnMut()>) {
-        unimplemented!()
-    }
+    fn on_become_active(&self, callback: Box<dyn FnMut()>) {}
 
-    fn on_resign_active(&self, callback: Box<dyn FnMut()>) {
-        unimplemented!()
-    }
+    fn on_resign_active(&self, callback: Box<dyn FnMut()>) {}
 
-    fn on_quit(&self, callback: Box<dyn FnMut()>) {
-        unimplemented!()
-    }
+    fn on_quit(&self, callback: Box<dyn FnMut()>) {}
 
-    fn on_reopen(&self, callback: Box<dyn FnMut()>) {
-        unimplemented!()
-    }
+    fn on_reopen(&self, callback: Box<dyn FnMut()>) {}
 
-    fn on_event(&self, callback: Box<dyn FnMut(PlatformInput) -> bool>) {
-        unimplemented!()
-    }
+    fn on_event(&self, callback: Box<dyn FnMut(PlatformInput) -> bool>) {}
 
-    fn on_app_menu_action(&self, callback: Box<dyn FnMut(&dyn Action)>) {
-        unimplemented!()
-    }
+    fn on_app_menu_action(&self, callback: Box<dyn FnMut(&dyn Action)>) {}
 
-    fn on_will_open_app_menu(&self, callback: Box<dyn FnMut()>) {
-        unimplemented!()
-    }
+    fn on_will_open_app_menu(&self, callback: Box<dyn FnMut()>) {}
 
-    fn on_validate_app_menu_command(&self, callback: Box<dyn FnMut(&dyn Action) -> bool>) {
-        unimplemented!()
-    }
+    fn on_validate_app_menu_command(&self, callback: Box<dyn FnMut(&dyn Action) -> bool>) {}
 
     fn os_name(&self) -> &'static str {
         "Linux"
     }
 
     fn double_click_interval(&self) -> Duration {
-        unimplemented!()
+        Duration::default()
     }
 
     fn os_version(&self) -> Result<SemanticVersion> {
-        unimplemented!()
+        Ok(SemanticVersion {
+            major: 1,
+            minor: 0,
+            patch: 0,
+        })
     }
 
     fn app_version(&self) -> Result<SemanticVersion> {
-        unimplemented!()
+        Ok(SemanticVersion {
+            major: 1,
+            minor: 0,
+            patch: 0,
+        })
     }
 
     fn app_path(&self) -> Result<PathBuf> {
         unimplemented!()
     }
 
-    fn set_menus(&self, menus: Vec<Menu>, keymap: &Keymap) {
-        unimplemented!()
-    }
+    fn set_menus(&self, menus: Vec<Menu>, keymap: &Keymap) {}
 
     fn local_timezone(&self) -> UtcOffset {
-        unimplemented!()
+        UtcOffset::UTC
     }
 
     fn path_for_auxiliary_executable(&self, name: &str) -> Result<PathBuf> {
         unimplemented!()
     }
 
-    fn set_cursor_style(&self, style: CursorStyle) {
-        unimplemented!()
-    }
+    fn set_cursor_style(&self, style: CursorStyle) {}
 
     fn should_auto_hide_scrollbars(&self) -> bool {
-        unimplemented!()
+        false
     }
 
-    fn write_to_clipboard(&self, item: ClipboardItem) {
-        unimplemented!()
-    }
+    fn write_to_clipboard(&self, item: ClipboardItem) {}
 
     fn read_from_clipboard(&self) -> Option<ClipboardItem> {
-        unimplemented!()
+        None
     }
 
     fn write_credentials(&self, url: &str, username: &str, password: &[u8]) -> Task<Result<()>> {
diff --git a/crates/gpui/src/platform/linux/text_system.rs b/crates/gpui/src/platform/linux/text_system.rs
index 30f65c0ece..09913b7077 100644
--- a/crates/gpui/src/platform/linux/text_system.rs
+++ b/crates/gpui/src/platform/linux/text_system.rs
@@ -55,13 +55,13 @@ impl Default for LinuxTextSystem {
 #[allow(unused)]
 impl PlatformTextSystem for LinuxTextSystem {
     fn add_fonts(&self, fonts: &[Arc<Vec<u8>>]) -> Result<()> {
-        unimplemented!()
+        Ok(()) //TODO
     }
     fn all_font_names(&self) -> Vec<String> {
-        unimplemented!()
+        Vec::new()
     }
     fn all_font_families(&self) -> Vec<String> {
-        unimplemented!()
+        Vec::new()
     }
     fn font_id(&self, descriptor: &Font) -> Result<FontId> {
         unimplemented!()
diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
new file mode 100644
index 0000000000..72155dacab
--- /dev/null
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -0,0 +1,143 @@
+use crate::{
+    px, AnyWindowHandle, AtlasKey, AtlasTextureId, AtlasTile, BladeAtlas, Bounds, KeyDownEvent,
+    Keystroke, Pixels, PlatformAtlas, PlatformDisplay, PlatformInput, PlatformInputHandler,
+    PlatformWindow, Point, Size, TileId, WindowAppearance, WindowBounds, WindowOptions,
+};
+use collections::HashMap;
+use parking_lot::Mutex;
+use std::{
+    rc::{Rc, Weak},
+    sync::{self, Arc},
+};
+
+pub(crate) struct LinuxWindowState {
+    display: Rc<dyn crate::PlatformDisplay>,
+    sprite_atlas: Arc<BladeAtlas>,
+}
+
+#[derive(Clone)]
+pub(crate) struct LinuxWindow(pub(crate) Arc<Mutex<LinuxWindowState>>);
+
+impl LinuxWindow {
+    pub fn new(
+        options: WindowOptions,
+        handle: AnyWindowHandle,
+        display: Rc<dyn PlatformDisplay>,
+        gpu: &Arc<blade::Context>,
+    ) -> Self {
+        Self(Arc::new(Mutex::new(LinuxWindowState {
+            display,
+            sprite_atlas: Arc::new(BladeAtlas::new(gpu)),
+        })))
+    }
+}
+
+impl PlatformWindow for LinuxWindow {
+    fn bounds(&self) -> WindowBounds {
+        unimplemented!()
+    }
+
+    fn content_size(&self) -> Size<Pixels> {
+        unimplemented!()
+    }
+
+    fn scale_factor(&self) -> f32 {
+        1.0
+    }
+
+    fn titlebar_height(&self) -> Pixels {
+        unimplemented!()
+    }
+
+    fn appearance(&self) -> WindowAppearance {
+        unimplemented!()
+    }
+
+    fn display(&self) -> Rc<dyn crate::PlatformDisplay> {
+        Rc::clone(&self.0.lock().display)
+    }
+
+    fn mouse_position(&self) -> Point<Pixels> {
+        Point::default()
+    }
+
+    fn modifiers(&self) -> crate::Modifiers {
+        crate::Modifiers::default()
+    }
+
+    fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
+        self
+    }
+
+    fn set_input_handler(&mut self, input_handler: PlatformInputHandler) {}
+
+    fn take_input_handler(&mut self) -> Option<PlatformInputHandler> {
+        None
+    }
+
+    fn prompt(
+        &self,
+        _level: crate::PromptLevel,
+        _msg: &str,
+        _detail: Option<&str>,
+        _answers: &[&str],
+    ) -> futures::channel::oneshot::Receiver<usize> {
+        unimplemented!()
+    }
+
+    fn activate(&self) {}
+
+    fn set_title(&mut self, title: &str) {}
+
+    fn set_edited(&mut self, edited: bool) {}
+
+    fn show_character_palette(&self) {
+        unimplemented!()
+    }
+
+    fn minimize(&self) {
+        unimplemented!()
+    }
+
+    fn zoom(&self) {
+        unimplemented!()
+    }
+
+    fn toggle_full_screen(&self) {
+        unimplemented!()
+    }
+
+    fn on_request_frame(&self, _callback: Box<dyn FnMut()>) {}
+
+    fn on_input(&self, callback: Box<dyn FnMut(crate::PlatformInput) -> bool>) {}
+
+    fn on_active_status_change(&self, callback: Box<dyn FnMut(bool)>) {}
+
+    fn on_resize(&self, callback: Box<dyn FnMut(Size<Pixels>, f32)>) {}
+
+    fn on_fullscreen(&self, _callback: Box<dyn FnMut(bool)>) {}
+
+    fn on_moved(&self, callback: Box<dyn FnMut()>) {}
+
+    fn on_should_close(&self, callback: Box<dyn FnMut() -> bool>) {}
+
+    fn on_close(&self, _callback: Box<dyn FnOnce()>) {
+        unimplemented!()
+    }
+
+    fn on_appearance_changed(&self, _callback: Box<dyn FnMut()>) {
+        unimplemented!()
+    }
+
+    fn is_topmost_for_position(&self, _position: crate::Point<Pixels>) -> bool {
+        unimplemented!()
+    }
+
+    fn invalidate(&self) {}
+
+    fn draw(&self, _scene: &crate::Scene) {}
+
+    fn sprite_atlas(&self) -> sync::Arc<dyn crate::PlatformAtlas> {
+        self.0.lock().sprite_atlas.clone()
+    }
+}

From cefc98258fe2d2f0963aac2321ba14ea7ff707b1 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sat, 27 Jan 2024 22:59:30 -0800
Subject: [PATCH 152/372] linux: hook up X11rb for Window creation

---
 Cargo.lock                                 |  28 ++++++
 crates/gpui/Cargo.toml                     |   1 +
 crates/gpui/src/platform/linux/display.rs  |  49 +++++++---
 crates/gpui/src/platform/linux/platform.rs |  27 +++++-
 crates/gpui/src/platform/linux/window.rs   | 101 +++++++++++++++++++--
 5 files changed, 181 insertions(+), 25 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9644e2b619..291e86f0b5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3088,6 +3088,16 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "gethostname"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
+dependencies = [
+ "libc",
+ "windows-targets 0.48.5",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.1.16"
@@ -3277,6 +3287,7 @@ dependencies = [
  "util",
  "uuid 1.4.1",
  "waker-fn",
+ "x11rb",
 ]
 
 [[package]]
@@ -10273,6 +10284,23 @@ dependencies = [
  "tap",
 ]
 
+[[package]]
+name = "x11rb"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a"
+dependencies = [
+ "gethostname",
+ "rustix 0.38.30",
+ "x11rb-protocol",
+]
+
+[[package]]
+name = "x11rb-protocol"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34"
+
 [[package]]
 name = "xattr"
 version = "0.2.3"
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 42978e203b..d5a901df4c 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -96,3 +96,4 @@ objc = "0.2"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 flume = "0.11"
+x11rb = "0.13"
diff --git a/crates/gpui/src/platform/linux/display.rs b/crates/gpui/src/platform/linux/display.rs
index 507edad3b0..7941daf6d0 100644
--- a/crates/gpui/src/platform/linux/display.rs
+++ b/crates/gpui/src/platform/linux/display.rs
@@ -1,23 +1,42 @@
-use crate::{point, size, Bounds, DisplayId, GlobalPixels, PlatformDisplay};
+use crate::{point, size, Bounds, DisplayId, GlobalPixels, PlatformDisplay, Size};
 use anyhow::Result;
 use uuid::Uuid;
+use x11rb::{connection::Connection as _, rust_connection::RustConnection};
 
 #[derive(Debug)]
-pub(crate) struct LinuxDisplay;
+pub(crate) struct LinuxDisplay {
+    x11_screen_index: usize,
+    bounds: Bounds<GlobalPixels>,
+    uuid: Uuid,
+}
 
-impl PlatformDisplay for LinuxDisplay {
-    fn id(&self) -> DisplayId {
-        DisplayId(0)
-    }
-
-    fn uuid(&self) -> Result<Uuid> {
-        Ok(Uuid::from_bytes([0; 16]))
-    }
-
-    fn bounds(&self) -> Bounds<GlobalPixels> {
-        Bounds {
-            origin: point(GlobalPixels(0.0), GlobalPixels(0.0)),
-            size: size(GlobalPixels(100.0), GlobalPixels(100.0)),
+impl LinuxDisplay {
+    pub(crate) fn new(xc: &RustConnection, x11_screen_index: usize) -> Self {
+        let screen = &xc.setup().roots[x11_screen_index];
+        Self {
+            x11_screen_index,
+            bounds: Bounds {
+                origin: Default::default(),
+                size: Size {
+                    width: GlobalPixels(screen.width_in_pixels as f32),
+                    height: GlobalPixels(screen.height_in_pixels as f32),
+                },
+            },
+            uuid: Uuid::from_bytes([0; 16]),
         }
     }
 }
+
+impl PlatformDisplay for LinuxDisplay {
+    fn id(&self) -> DisplayId {
+        DisplayId(self.x11_screen_index as u32)
+    }
+
+    fn uuid(&self) -> Result<Uuid> {
+        Ok(self.uuid)
+    }
+
+    fn bounds(&self) -> Bounds<GlobalPixels> {
+        self.bounds
+    }
+}
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index 8136b77292..18016358e6 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -17,10 +17,13 @@ use std::{
     time::Duration,
 };
 use time::UtcOffset;
+use x11rb::{connection::Connection as _, rust_connection::RustConnection};
 
 pub(crate) struct LinuxPlatform(Mutex<LinuxPlatformState>);
 
 pub(crate) struct LinuxPlatformState {
+    x11_connection: RustConnection,
+    x11_root_index: usize,
     gpu: Arc<blade::Context>,
     background_executor: BackgroundExecutor,
     foreground_executor: ForegroundExecutor,
@@ -35,17 +38,22 @@ impl Default for LinuxPlatform {
 
 impl LinuxPlatform {
     pub(crate) fn new() -> Self {
+        let (x11_connection, x11_root_index) = x11rb::connect(None).unwrap();
+
         let dispatcher = Arc::new(LinuxDispatcher::new());
         let gpu = Arc::new(
             unsafe {
                 blade::Context::init(blade::ContextDesc {
-                    validation: true, //FIXME
+                    validation: cfg!(debug_assertions),
                     capture: false,
                 })
             }
             .unwrap(),
         );
+
         Self(Mutex::new(LinuxPlatformState {
+            x11_connection,
+            x11_root_index,
             gpu,
             background_executor: BackgroundExecutor::new(dispatcher.clone()),
             foreground_executor: ForegroundExecutor::new(dispatcher),
@@ -84,11 +92,21 @@ impl Platform for LinuxPlatform {
     fn unhide_other_apps(&self) {}
 
     fn displays(&self) -> Vec<Rc<dyn PlatformDisplay>> {
-        Vec::new()
+        let lock = self.0.lock();
+        let setup = lock.x11_connection.setup();
+        (0..setup.roots.len())
+            .map(|id| {
+                Rc::new(LinuxDisplay::new(&lock.x11_connection, id)) as Rc<dyn PlatformDisplay>
+            })
+            .collect()
     }
 
     fn display(&self, id: DisplayId) -> Option<Rc<dyn PlatformDisplay>> {
-        None
+        let lock = self.0.lock();
+        Some(Rc::new(LinuxDisplay::new(
+            &lock.x11_connection,
+            id.0 as usize,
+        )))
     }
 
     fn active_window(&self) -> Option<AnyWindowHandle> {
@@ -104,7 +122,8 @@ impl Platform for LinuxPlatform {
         Box::new(LinuxWindow::new(
             options,
             handle,
-            Rc::new(LinuxDisplay),
+            &lock.x11_connection,
+            lock.x11_root_index,
             &lock.gpu,
         ))
     }
diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index 72155dacab..ffc8372dbd 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -1,7 +1,8 @@
 use crate::{
     px, AnyWindowHandle, AtlasKey, AtlasTextureId, AtlasTile, BladeAtlas, Bounds, KeyDownEvent,
-    Keystroke, Pixels, PlatformAtlas, PlatformDisplay, PlatformInput, PlatformInputHandler,
-    PlatformWindow, Point, Size, TileId, WindowAppearance, WindowBounds, WindowOptions,
+    Keystroke, LinuxDisplay, Pixels, PlatformAtlas, PlatformDisplay, PlatformInput,
+    PlatformInputHandler, PlatformWindow, Point, Size, TileId, WindowAppearance, WindowBounds,
+    WindowOptions,
 };
 use collections::HashMap;
 use parking_lot::Mutex;
@@ -9,9 +10,18 @@ use std::{
     rc::{Rc, Weak},
     sync::{self, Arc},
 };
+use x11rb::{
+    connection::Connection as _,
+    protocol::xproto::{
+        AtomEnum, ConnectionExt as _, CreateWindowAux, EventMask, PropMode, WindowClass,
+    },
+    rust_connection::RustConnection,
+    wrapper::ConnectionExt as _,
+};
 
 pub(crate) struct LinuxWindowState {
-    display: Rc<dyn crate::PlatformDisplay>,
+    display: Rc<dyn PlatformDisplay>,
+    win_id: u32,
     sprite_atlas: Arc<BladeAtlas>,
 }
 
@@ -22,11 +32,90 @@ impl LinuxWindow {
     pub fn new(
         options: WindowOptions,
         handle: AnyWindowHandle,
-        display: Rc<dyn PlatformDisplay>,
+        x11_connection: &RustConnection,
+        x11_main_screen_index: usize,
         gpu: &Arc<blade::Context>,
     ) -> Self {
+        let x11_screen_index = options
+            .display_id
+            .map_or(x11_main_screen_index, |did| did.0 as usize);
+        let screen = &x11_connection.setup().roots[x11_screen_index];
+
+        let win_id = x11_connection.generate_id().unwrap();
+        let win_aux = CreateWindowAux::new()
+            .event_mask(
+                EventMask::EXPOSURE | EventMask::STRUCTURE_NOTIFY | EventMask::POINTER_MOTION,
+            )
+            .background_pixel(screen.white_pixel);
+
+        let wm_protocols = x11_connection
+            .intern_atom(false, b"WM_PROTOCOLS")
+            .unwrap()
+            .reply()
+            .unwrap()
+            .atom;
+        let wm_delete_window = x11_connection
+            .intern_atom(false, b"WM_DELETE_WINDOW")
+            .unwrap()
+            .reply()
+            .unwrap()
+            .atom;
+        let (bound_x, bound_y, bound_width, bound_height) = match options.bounds {
+            WindowBounds::Fullscreen | WindowBounds::Maximized => {
+                (0, 0, screen.width_in_pixels, screen.height_in_pixels)
+            }
+            WindowBounds::Fixed(bounds) => (
+                bounds.origin.x.0 as i16,
+                bounds.origin.y.0 as i16,
+                bounds.size.width.0 as u16,
+                bounds.size.height.0 as u16,
+            ),
+        };
+
+        x11_connection
+            .create_window(
+                x11rb::COPY_DEPTH_FROM_PARENT,
+                win_id,
+                screen.root,
+                bound_x,
+                bound_y,
+                bound_width,
+                bound_height,
+                0,
+                WindowClass::INPUT_OUTPUT,
+                0,
+                &win_aux,
+            )
+            .unwrap();
+
+        if let Some(titlebar) = options.titlebar {
+            if let Some(title) = titlebar.title {
+                x11_connection
+                    .change_property8(
+                        PropMode::REPLACE,
+                        win_id,
+                        AtomEnum::WM_NAME,
+                        AtomEnum::STRING,
+                        title.as_bytes(),
+                    )
+                    .unwrap();
+            }
+        }
+        x11_connection
+            .change_property32(
+                PropMode::REPLACE,
+                win_id,
+                wm_protocols,
+                AtomEnum::ATOM,
+                &[wm_delete_window],
+            )
+            .unwrap();
+
+        x11_connection.map_window(win_id).unwrap();
+
         Self(Arc::new(Mutex::new(LinuxWindowState {
-            display,
+            display: Rc::new(LinuxDisplay::new(x11_connection, x11_screen_index)),
+            win_id,
             sprite_atlas: Arc::new(BladeAtlas::new(gpu)),
         })))
     }
@@ -53,7 +142,7 @@ impl PlatformWindow for LinuxWindow {
         unimplemented!()
     }
 
-    fn display(&self) -> Rc<dyn crate::PlatformDisplay> {
+    fn display(&self) -> Rc<dyn PlatformDisplay> {
         Rc::clone(&self.0.lock().display)
     }
 

From aed363d3c78182134ac41098b13d410263cea238 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sun, 28 Jan 2024 01:19:22 -0800
Subject: [PATCH 153/372] x11: create window and route events

---
 crates/gpui/src/platform/linux.rs             |   2 +
 crates/gpui/src/platform/linux/blade_atlas.rs |  20 +++
 .../gpui/src/platform/linux/blade_renderer.rs |  11 ++
 crates/gpui/src/platform/linux/platform.rs    | 123 +++++++++++++++---
 crates/gpui/src/platform/linux/window.rs      |  90 ++++++++-----
 5 files changed, 194 insertions(+), 52 deletions(-)
 create mode 100644 crates/gpui/src/platform/linux/blade_renderer.rs

diff --git a/crates/gpui/src/platform/linux.rs b/crates/gpui/src/platform/linux.rs
index ba70c6fe67..f76e791a56 100644
--- a/crates/gpui/src/platform/linux.rs
+++ b/crates/gpui/src/platform/linux.rs
@@ -1,5 +1,6 @@
 mod blade_atlas;
 mod blade_belt;
+mod blade_renderer;
 mod dispatcher;
 mod display;
 mod platform;
@@ -14,3 +15,4 @@ pub(crate) use text_system::*;
 pub(crate) use window::*;
 
 use blade_belt::*;
+use blade_renderer::*;
diff --git a/crates/gpui/src/platform/linux/blade_atlas.rs b/crates/gpui/src/platform/linux/blade_atlas.rs
index 24a9bbde8d..2ee2b6d548 100644
--- a/crates/gpui/src/platform/linux/blade_atlas.rs
+++ b/crates/gpui/src/platform/linux/blade_atlas.rs
@@ -22,6 +22,22 @@ struct BladeAtlasState {
     tiles_by_key: FxHashMap<AtlasKey, AtlasTile>,
 }
 
+impl BladeAtlasState {
+    fn destroy(&mut self) {
+        for texture in self.monochrome_textures.drain(..) {
+            self.gpu.destroy_texture(texture.raw);
+        }
+        for texture in self.polychrome_textures.drain(..) {
+            self.gpu.destroy_texture(texture.raw);
+        }
+        for texture in self.path_textures.drain(..) {
+            self.gpu.destroy_texture(texture.raw);
+        }
+        self.gpu.destroy_command_encoder(&mut self.gpu_encoder);
+        self.upload_belt.destroy(&self.gpu);
+    }
+}
+
 impl BladeAtlas {
     pub(crate) fn new(gpu: &Arc<blade::Context>) -> Self {
         BladeAtlas(Mutex::new(BladeAtlasState {
@@ -41,6 +57,10 @@ impl BladeAtlas {
         }))
     }
 
+    pub(crate) fn destroy(&self) {
+        self.0.lock().destroy();
+    }
+
     pub(crate) fn clear_textures(&self, texture_kind: AtlasTextureKind) {
         let mut lock = self.0.lock();
         let textures = match texture_kind {
diff --git a/crates/gpui/src/platform/linux/blade_renderer.rs b/crates/gpui/src/platform/linux/blade_renderer.rs
new file mode 100644
index 0000000000..1f87b30efe
--- /dev/null
+++ b/crates/gpui/src/platform/linux/blade_renderer.rs
@@ -0,0 +1,11 @@
+use std::sync::Arc;
+
+pub struct BladeRenderer {
+    gpu: Arc<blade::Context>,
+}
+
+impl BladeRenderer {
+    pub fn new(gpu: Arc<blade::Context>) -> Self {
+        Self { gpu }
+    }
+}
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index 18016358e6..3817eeff34 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -2,11 +2,13 @@
 
 use crate::{
     Action, AnyWindowHandle, BackgroundExecutor, ClipboardItem, CursorStyle, DisplayId,
-    ForegroundExecutor, Keymap, LinuxDispatcher, LinuxDisplay, LinuxTextSystem, LinuxWindow, Menu,
-    PathPromptOptions, Platform, PlatformDisplay, PlatformInput, PlatformTextSystem,
-    PlatformWindow, Result, SemanticVersion, Task, WindowOptions,
+    ForegroundExecutor, Keymap, LinuxDispatcher, LinuxDisplay, LinuxTextSystem, LinuxWindow,
+    LinuxWindowState, LinuxWindowStatePtr, Menu, PathPromptOptions, Platform, PlatformDisplay,
+    PlatformInput, PlatformTextSystem, PlatformWindow, Result, SemanticVersion, Task,
+    WindowOptions,
 };
 
+use collections::{HashMap, HashSet};
 use futures::channel::oneshot;
 use parking_lot::Mutex;
 
@@ -17,16 +19,48 @@ use std::{
     time::Duration,
 };
 use time::UtcOffset;
-use x11rb::{connection::Connection as _, rust_connection::RustConnection};
+use x11rb::{
+    connection::Connection as _,
+    protocol::{
+        xproto::{Atom, ConnectionExt as _},
+        Event,
+    },
+    rust_connection::RustConnection,
+};
 
 pub(crate) struct LinuxPlatform(Mutex<LinuxPlatformState>);
 
+pub(crate) struct WmAtoms {
+    pub protocols: Atom,
+    pub delete_window: Atom,
+}
+
+impl WmAtoms {
+    fn new(x11_connection: &RustConnection) -> Self {
+        Self {
+            protocols: x11_connection
+                .intern_atom(false, b"WM_PROTOCOLS")
+                .unwrap()
+                .reply()
+                .unwrap()
+                .atom,
+            delete_window: x11_connection
+                .intern_atom(false, b"WM_DELETE_WINDOW")
+                .unwrap()
+                .reply()
+                .unwrap()
+                .atom,
+        }
+    }
+}
+
 pub(crate) struct LinuxPlatformState {
     x11_connection: RustConnection,
     x11_root_index: usize,
-    gpu: Arc<blade::Context>,
+    atoms: WmAtoms,
     background_executor: BackgroundExecutor,
     foreground_executor: ForegroundExecutor,
+    windows: HashMap<u32, LinuxWindowStatePtr>,
     text_system: Arc<LinuxTextSystem>,
 }
 
@@ -39,24 +73,17 @@ impl Default for LinuxPlatform {
 impl LinuxPlatform {
     pub(crate) fn new() -> Self {
         let (x11_connection, x11_root_index) = x11rb::connect(None).unwrap();
+        let atoms = WmAtoms::new(&x11_connection);
 
         let dispatcher = Arc::new(LinuxDispatcher::new());
-        let gpu = Arc::new(
-            unsafe {
-                blade::Context::init(blade::ContextDesc {
-                    validation: cfg!(debug_assertions),
-                    capture: false,
-                })
-            }
-            .unwrap(),
-        );
 
         Self(Mutex::new(LinuxPlatformState {
             x11_connection,
             x11_root_index,
-            gpu,
+            atoms,
             background_executor: BackgroundExecutor::new(dispatcher.clone()),
             foreground_executor: ForegroundExecutor::new(dispatcher),
+            windows: HashMap::default(),
             text_system: Arc::new(LinuxTextSystem::new()),
         }))
     }
@@ -76,7 +103,58 @@ impl Platform for LinuxPlatform {
     }
 
     fn run(&self, on_finish_launching: Box<dyn FnOnce()>) {
-        on_finish_launching()
+        on_finish_launching();
+
+        let mut need_repaint = HashSet::<u32>::default();
+
+        while !self.0.lock().windows.is_empty() {
+            let event = self.0.lock().x11_connection.wait_for_event().unwrap();
+            let mut event_option = Some(event);
+            while let Some(event) = event_option {
+                match event {
+                    Event::Expose(event) => {
+                        if event.count == 0 {
+                            need_repaint.insert(event.window);
+                        }
+                    }
+                    Event::ConfigureNotify(event) => {
+                        let lock = self.0.lock();
+                        let mut window = lock.windows[&event.window].lock();
+                        window.resize(event.width, event.height);
+                    }
+                    Event::MotionNotify(_event) => {
+                        //mouse_position = (event.event_x, event.event_y);
+                        //need_repaint.insert(event.window);
+                    }
+                    Event::MapNotify(_) => {}
+                    Event::ClientMessage(event) => {
+                        let mut lock = self.0.lock();
+                        let data = event.data.as_data32();
+                        if data[0] == lock.atoms.delete_window {
+                            {
+                                let mut window = lock.windows[&event.window].lock();
+                                window.destroy();
+                            }
+                            lock.windows.remove(&event.window);
+                        }
+                    }
+                    Event::Error(error) => {
+                        log::error!("X11 error {:?}", error);
+                    }
+                    _ => {}
+                }
+
+                let lock = self.0.lock();
+                event_option = lock.x11_connection.poll_for_event().unwrap();
+            }
+
+            for x11_window in need_repaint.drain() {
+                let lock = self.0.lock();
+                let mut window = lock.windows[&x11_window].lock();
+                window.paint();
+                lock.x11_connection.flush().unwrap();
+            }
+        }
     }
 
     fn quit(&self) {}
@@ -118,14 +196,19 @@ impl Platform for LinuxPlatform {
         handle: AnyWindowHandle,
         options: WindowOptions,
     ) -> Box<dyn PlatformWindow> {
-        let lock = self.0.lock();
-        Box::new(LinuxWindow::new(
+        let mut lock = self.0.lock();
+        let win_id = lock.x11_connection.generate_id().unwrap();
+
+        let window_ptr = LinuxWindowState::new_ptr(
             options,
             handle,
             &lock.x11_connection,
             lock.x11_root_index,
-            &lock.gpu,
-        ))
+            win_id,
+            &lock.atoms,
+        );
+        lock.windows.insert(win_id, window_ptr.clone());
+        Box::new(LinuxWindow(window_ptr))
     }
 
     fn set_display_link_output_callback(
diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index ffc8372dbd..63cbb15e5a 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -1,8 +1,9 @@
+use super::BladeRenderer;
 use crate::{
     px, AnyWindowHandle, AtlasKey, AtlasTextureId, AtlasTile, BladeAtlas, Bounds, KeyDownEvent,
     Keystroke, LinuxDisplay, Pixels, PlatformAtlas, PlatformDisplay, PlatformInput,
     PlatformInputHandler, PlatformWindow, Point, Size, TileId, WindowAppearance, WindowBounds,
-    WindowOptions,
+    WindowOptions, WmAtoms,
 };
 use collections::HashMap;
 use parking_lot::Mutex;
@@ -21,45 +22,37 @@ use x11rb::{
 
 pub(crate) struct LinuxWindowState {
     display: Rc<dyn PlatformDisplay>,
-    win_id: u32,
+    x11_window: u32,
+    window_bounds: WindowBounds,
+    content_size: Size<Pixels>,
     sprite_atlas: Arc<BladeAtlas>,
+    renderer: BladeRenderer,
 }
 
+pub(crate) type LinuxWindowStatePtr = Arc<Mutex<LinuxWindowState>>;
 #[derive(Clone)]
-pub(crate) struct LinuxWindow(pub(crate) Arc<Mutex<LinuxWindowState>>);
+pub(crate) struct LinuxWindow(pub(crate) LinuxWindowStatePtr);
 
-impl LinuxWindow {
-    pub fn new(
+impl LinuxWindowState {
+    pub fn new_ptr(
         options: WindowOptions,
         handle: AnyWindowHandle,
         x11_connection: &RustConnection,
         x11_main_screen_index: usize,
-        gpu: &Arc<blade::Context>,
-    ) -> Self {
+        x11_window: u32,
+        atoms: &WmAtoms,
+    ) -> LinuxWindowStatePtr {
         let x11_screen_index = options
             .display_id
             .map_or(x11_main_screen_index, |did| did.0 as usize);
         let screen = &x11_connection.setup().roots[x11_screen_index];
 
-        let win_id = x11_connection.generate_id().unwrap();
         let win_aux = CreateWindowAux::new()
             .event_mask(
                 EventMask::EXPOSURE | EventMask::STRUCTURE_NOTIFY | EventMask::POINTER_MOTION,
             )
             .background_pixel(screen.white_pixel);
 
-        let wm_protocols = x11_connection
-            .intern_atom(false, b"WM_PROTOCOLS")
-            .unwrap()
-            .reply()
-            .unwrap()
-            .atom;
-        let wm_delete_window = x11_connection
-            .intern_atom(false, b"WM_DELETE_WINDOW")
-            .unwrap()
-            .reply()
-            .unwrap()
-            .atom;
         let (bound_x, bound_y, bound_width, bound_height) = match options.bounds {
             WindowBounds::Fullscreen | WindowBounds::Maximized => {
                 (0, 0, screen.width_in_pixels, screen.height_in_pixels)
@@ -75,7 +68,7 @@ impl LinuxWindow {
         x11_connection
             .create_window(
                 x11rb::COPY_DEPTH_FROM_PARENT,
-                win_id,
+                x11_window,
                 screen.root,
                 bound_x,
                 bound_y,
@@ -93,7 +86,7 @@ impl LinuxWindow {
                 x11_connection
                     .change_property8(
                         PropMode::REPLACE,
-                        win_id,
+                        x11_window,
                         AtomEnum::WM_NAME,
                         AtomEnum::STRING,
                         title.as_bytes(),
@@ -104,30 +97,63 @@ impl LinuxWindow {
         x11_connection
             .change_property32(
                 PropMode::REPLACE,
-                win_id,
-                wm_protocols,
+                x11_window,
+                atoms.protocols,
                 AtomEnum::ATOM,
-                &[wm_delete_window],
+                &[atoms.delete_window],
             )
             .unwrap();
 
-        x11_connection.map_window(win_id).unwrap();
+        x11_connection.map_window(x11_window).unwrap();
+        x11_connection.flush().unwrap();
 
-        Self(Arc::new(Mutex::new(LinuxWindowState {
+        let gpu = Arc::new(
+            unsafe {
+                blade::Context::init(blade::ContextDesc {
+                    validation: cfg!(debug_assertions),
+                    capture: false,
+                })
+            }
+            .unwrap(),
+        );
+
+        Arc::new(Mutex::new(Self {
             display: Rc::new(LinuxDisplay::new(x11_connection, x11_screen_index)),
-            win_id,
-            sprite_atlas: Arc::new(BladeAtlas::new(gpu)),
-        })))
+            x11_window,
+            window_bounds: options.bounds,
+            content_size: Size {
+                width: Pixels(bound_width as f32),
+                height: Pixels(bound_height as f32),
+            },
+            sprite_atlas: Arc::new(BladeAtlas::new(&gpu)),
+            renderer: BladeRenderer::new(gpu),
+        }))
+    }
+
+    pub fn resize(&mut self, width: u16, height: u16) {
+        self.content_size = Size {
+            width: Pixels(width as f32),
+            height: Pixels(height as f32),
+        };
+    }
+
+    pub fn destroy(&mut self) {
+        self.sprite_atlas.destroy();
+    }
+
+    pub fn paint(&mut self) {
+        //TODO
     }
 }
 
 impl PlatformWindow for LinuxWindow {
     fn bounds(&self) -> WindowBounds {
-        unimplemented!()
+        //TODO: update when window moves
+        self.0.lock().window_bounds
     }
 
     fn content_size(&self) -> Size<Pixels> {
-        unimplemented!()
+        self.0.lock().content_size
     }
 
     fn scale_factor(&self) -> f32 {

From 7f8c64aa6c6bcc012accdda69f7b858ea8deb4bd Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sun, 28 Jan 2024 21:50:58 -0800
Subject: [PATCH 154/372] linux: port from x11rb to xcb and hook up
 RawWindowHandle

---
 crates/gpui/Cargo.toml                        |   6 +-
 crates/gpui/src/platform/linux/blade_atlas.rs |   1 -
 crates/gpui/src/platform/linux/display.rs     |  17 +-
 crates/gpui/src/platform/linux/platform.rs    | 143 +++++++---------
 crates/gpui/src/platform/linux/text_system.rs |   4 +-
 crates/gpui/src/platform/linux/window.rs      | 157 ++++++++++--------
 6 files changed, 161 insertions(+), 167 deletions(-)

diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index d5a901df4c..08c5b609a2 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -36,6 +36,7 @@ env_logger = { version = "0.9", optional = true }
 etagere = "0.2"
 futures.workspace = true
 gpui_macros = { path = "../gpui_macros" }
+font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "d97147f" }
 image = "0.23"
 itertools = "0.10"
 lazy_static.workspace = true
@@ -48,7 +49,7 @@ parking_lot.workspace = true
 pathfinder_geometry = "0.5"
 postage.workspace = true
 rand.workspace = true
-raw-window-handle = "0.6.0"
+raw-window-handle = "0.5.0"
 refineable.workspace = true
 resvg = "0.14"
 schemars.workspace = true
@@ -96,4 +97,5 @@ objc = "0.2"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 flume = "0.11"
-x11rb = "0.13"
+xcb = { version = "1.3", features = ["as-raw-xcb-connection"] }
+as-raw-xcb-connection = "1"
diff --git a/crates/gpui/src/platform/linux/blade_atlas.rs b/crates/gpui/src/platform/linux/blade_atlas.rs
index 2ee2b6d548..b81b282925 100644
--- a/crates/gpui/src/platform/linux/blade_atlas.rs
+++ b/crates/gpui/src/platform/linux/blade_atlas.rs
@@ -5,7 +5,6 @@ use crate::{
 };
 use anyhow::Result;
 use collections::FxHashMap;
-use derive_more::{Deref, DerefMut};
 use etagere::BucketedAtlasAllocator;
 use parking_lot::Mutex;
 use std::{borrow::Cow, sync::Arc};
diff --git a/crates/gpui/src/platform/linux/display.rs b/crates/gpui/src/platform/linux/display.rs
index 7941daf6d0..cdca59c435 100644
--- a/crates/gpui/src/platform/linux/display.rs
+++ b/crates/gpui/src/platform/linux/display.rs
@@ -1,25 +1,24 @@
-use crate::{point, size, Bounds, DisplayId, GlobalPixels, PlatformDisplay, Size};
+use crate::{Bounds, DisplayId, GlobalPixels, PlatformDisplay, Size};
 use anyhow::Result;
 use uuid::Uuid;
-use x11rb::{connection::Connection as _, rust_connection::RustConnection};
 
 #[derive(Debug)]
 pub(crate) struct LinuxDisplay {
-    x11_screen_index: usize,
+    x_screen_index: i32,
     bounds: Bounds<GlobalPixels>,
     uuid: Uuid,
 }
 
 impl LinuxDisplay {
-    pub(crate) fn new(xc: &RustConnection, x11_screen_index: usize) -> Self {
-        let screen = &xc.setup().roots[x11_screen_index];
+    pub(crate) fn new(xc: &xcb::Connection, x_screen_index: i32) -> Self {
+        let screen = xc.get_setup().roots().nth(x_screen_index as usize).unwrap();
         Self {
-            x11_screen_index,
+            x_screen_index,
             bounds: Bounds {
                 origin: Default::default(),
                 size: Size {
-                    width: GlobalPixels(screen.width_in_pixels as f32),
-                    height: GlobalPixels(screen.height_in_pixels as f32),
+                    width: GlobalPixels(screen.width_in_pixels() as f32),
+                    height: GlobalPixels(screen.height_in_pixels() as f32),
                 },
             },
             uuid: Uuid::from_bytes([0; 16]),
@@ -29,7 +28,7 @@ impl LinuxDisplay {
 
 impl PlatformDisplay for LinuxDisplay {
     fn id(&self) -> DisplayId {
-        DisplayId(self.x11_screen_index as u32)
+        DisplayId(self.x_screen_index as u32)
     }
 
     fn uuid(&self) -> Result<Uuid> {
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index 3817eeff34..91eacc9d42 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -19,48 +19,28 @@ use std::{
     time::Duration,
 };
 use time::UtcOffset;
-use x11rb::{
-    connection::Connection as _,
-    protocol::{
-        xproto::{Atom, ConnectionExt as _},
-        Event,
-    },
-    rust_connection::RustConnection,
-};
+use xcb::{x, Xid as _};
 
-pub(crate) struct LinuxPlatform(Mutex<LinuxPlatformState>);
-
-pub(crate) struct WmAtoms {
-    pub protocols: Atom,
-    pub delete_window: Atom,
-}
-
-impl WmAtoms {
-    fn new(x11_connection: &RustConnection) -> Self {
-        Self {
-            protocols: x11_connection
-                .intern_atom(false, b"WM_PROTOCOLS")
-                .unwrap()
-                .reply()
-                .unwrap()
-                .atom,
-            delete_window: x11_connection
-                .intern_atom(false, b"WM_DELETE_WINDOW")
-                .unwrap()
-                .reply()
-                .unwrap()
-                .atom,
-        }
+xcb::atoms_struct! {
+    #[derive(Debug)]
+    pub(crate) struct XcbAtoms {
+        pub wm_protocols    => b"WM_PROTOCOLS",
+        pub wm_del_window   => b"WM_DELETE_WINDOW",
+        wm_state        => b"_NET_WM_STATE",
+        wm_state_maxv   => b"_NET_WM_STATE_MAXIMIZED_VERT",
+        wm_state_maxh   => b"_NET_WM_STATE_MAXIMIZED_HORZ",
     }
 }
 
+pub(crate) struct LinuxPlatform(Mutex<LinuxPlatformState>);
+
 pub(crate) struct LinuxPlatformState {
-    x11_connection: RustConnection,
-    x11_root_index: usize,
-    atoms: WmAtoms,
+    xcb_connection: xcb::Connection,
+    x_root_index: i32,
+    atoms: XcbAtoms,
     background_executor: BackgroundExecutor,
     foreground_executor: ForegroundExecutor,
-    windows: HashMap<u32, LinuxWindowStatePtr>,
+    windows: HashMap<x::Window, LinuxWindowStatePtr>,
     text_system: Arc<LinuxTextSystem>,
 }
 
@@ -72,14 +52,14 @@ impl Default for LinuxPlatform {
 
 impl LinuxPlatform {
     pub(crate) fn new() -> Self {
-        let (x11_connection, x11_root_index) = x11rb::connect(None).unwrap();
-        let atoms = WmAtoms::new(&x11_connection);
+        let (xcb_connection, x_root_index) = xcb::Connection::connect(None).unwrap();
+        let atoms = XcbAtoms::intern_all(&xcb_connection).unwrap();
 
         let dispatcher = Arc::new(LinuxDispatcher::new());
 
         Self(Mutex::new(LinuxPlatformState {
-            x11_connection,
-            x11_root_index,
+            xcb_connection,
+            x_root_index,
             atoms,
             background_executor: BackgroundExecutor::new(dispatcher.clone()),
             foreground_executor: ForegroundExecutor::new(dispatcher),
@@ -105,54 +85,44 @@ impl Platform for LinuxPlatform {
     fn run(&self, on_finish_launching: Box<dyn FnOnce()>) {
         on_finish_launching();
 
-        let mut need_repaint = HashSet::<u32>::default();
+        let mut need_repaint = HashSet::<x::Window>::default();
 
         while !self.0.lock().windows.is_empty() {
-            let event = self.0.lock().x11_connection.wait_for_event().unwrap();
-            let mut event_option = Some(event);
-            while let Some(event) = event_option {
-                match event {
-                    Event::Expose(event) => {
-                        if event.count == 0 {
-                            need_repaint.insert(event.window);
-                        }
-                    }
-                    Event::ConfigureNotify(event) => {
-                        let lock = self.0.lock();
-                        let mut window = lock.windows[&event.window].lock();
-                        window.resize(event.width, event.height);
-                    }
-                    Event::MotionNotify(_event) => {
-                        //mouse_position = (event.event_x, event.event_y);
-                        //need_repaint.insert(event.window);
-                    }
-                    Event::MapNotify(_) => {}
-                    Event::ClientMessage(event) => {
+            let event = self.0.lock().xcb_connection.wait_for_event().unwrap();
+            match event {
+                xcb::Event::X(x::Event::ClientMessage(ev)) => {
+                    if let x::ClientMessageData::Data32([atom, ..]) = ev.data() {
                         let mut lock = self.0.lock();
-                        let data = event.data.as_data32();
-                        if data[0] == lock.atoms.delete_window {
+                        if atom == lock.atoms.wm_del_window.resource_id() {
+                            // window "x" button clicked by user, we gracefully exit
                             {
-                                let mut window = lock.windows[&event.window].lock();
+                                let mut window = lock.windows[&ev.window()].lock();
                                 window.destroy();
                             }
-                            lock.windows.remove(&event.window);
+                            lock.windows.remove(&ev.window());
+                            break;
                         }
                     }
-                    Event::Error(error) => {
-                        log::error!("X11 error {:?}", error);
-                    }
-                    _ => {}
                 }
-
-                let lock = self.0.lock();
-                event_option = lock.x11_connection.poll_for_event().unwrap();
+                _ => {} /*
+                        Event::Expose(event) => {
+                            if event.count == 0 {
+                                need_repaint.insert(event.window);
+                            }
+                        }
+                        Event::ConfigureNotify(event) => {
+                            let lock = self.0.lock();
+                            let mut window = lock.windows[&event.window].lock();
+                            window.resize(event.width, event.height);
+                        }
+                        _ => {}*/
             }
 
-            for x11_window in need_repaint.drain() {
+            for x_window in need_repaint.drain() {
                 let lock = self.0.lock();
-                let mut window = lock.windows[&x11_window].lock();
+                let mut window = lock.windows[&x_window].lock();
                 window.paint();
-                lock.x11_connection.flush().unwrap();
+                lock.xcb_connection.flush();
             }
         }
     }
@@ -171,10 +141,13 @@ impl Platform for LinuxPlatform {
 
     fn displays(&self) -> Vec<Rc<dyn PlatformDisplay>> {
         let lock = self.0.lock();
-        let setup = lock.x11_connection.setup();
-        (0..setup.roots.len())
-            .map(|id| {
-                Rc::new(LinuxDisplay::new(&lock.x11_connection, id)) as Rc<dyn PlatformDisplay>
+        let setup = lock.xcb_connection.get_setup();
+        setup
+            .roots()
+            .enumerate()
+            .map(|(root_id, _)| {
+                Rc::new(LinuxDisplay::new(&lock.xcb_connection, root_id as i32))
+                    as Rc<dyn PlatformDisplay>
             })
             .collect()
     }
@@ -182,8 +155,8 @@ impl Platform for LinuxPlatform {
     fn display(&self, id: DisplayId) -> Option<Rc<dyn PlatformDisplay>> {
         let lock = self.0.lock();
         Some(Rc::new(LinuxDisplay::new(
-            &lock.x11_connection,
-            id.0 as usize,
+            &lock.xcb_connection,
+            id.0 as i32,
         )))
     }
 
@@ -197,17 +170,17 @@ impl Platform for LinuxPlatform {
         options: WindowOptions,
     ) -> Box<dyn PlatformWindow> {
         let mut lock = self.0.lock();
-        let win_id = lock.x11_connection.generate_id().unwrap();
+        let x_window = lock.xcb_connection.generate_id();
 
         let window_ptr = LinuxWindowState::new_ptr(
             options,
             handle,
-            &lock.x11_connection,
-            lock.x11_root_index,
-            win_id,
+            &lock.xcb_connection,
+            lock.x_root_index,
+            x_window,
             &lock.atoms,
         );
-        lock.windows.insert(win_id, window_ptr.clone());
+        lock.windows.insert(x_window, window_ptr.clone());
         Box::new(LinuxWindow(window_ptr))
     }
 
diff --git a/crates/gpui/src/platform/linux/text_system.rs b/crates/gpui/src/platform/linux/text_system.rs
index 09913b7077..c21c8adfd1 100644
--- a/crates/gpui/src/platform/linux/text_system.rs
+++ b/crates/gpui/src/platform/linux/text_system.rs
@@ -15,7 +15,7 @@ use font_kit::{
 };
 use parking_lot::RwLock;
 use smallvec::SmallVec;
-use std::sync::Arc;
+use std::{borrow::Cow};
 
 pub(crate) struct LinuxTextSystem(RwLock<LinuxTextSystemState>);
 
@@ -54,7 +54,7 @@ impl Default for LinuxTextSystem {
 
 #[allow(unused)]
 impl PlatformTextSystem for LinuxTextSystem {
-    fn add_fonts(&self, fonts: &[Arc<Vec<u8>>]) -> Result<()> {
+    fn add_fonts(&self, fonts: Vec<Cow<'static, [u8]>>) -> Result<()> {
         Ok(()) //TODO
     }
     fn all_font_names(&self) -> Vec<String> {
diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index 63cbb15e5a..9f6851ca93 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -1,28 +1,19 @@
 use super::BladeRenderer;
 use crate::{
-    px, AnyWindowHandle, AtlasKey, AtlasTextureId, AtlasTile, BladeAtlas, Bounds, KeyDownEvent,
-    Keystroke, LinuxDisplay, Pixels, PlatformAtlas, PlatformDisplay, PlatformInput,
-    PlatformInputHandler, PlatformWindow, Point, Size, TileId, WindowAppearance, WindowBounds,
-    WindowOptions, WmAtoms,
+    AnyWindowHandle, BladeAtlas, LinuxDisplay, Pixels, PlatformDisplay, PlatformInputHandler,
+    PlatformWindow, Point, Size, WindowAppearance, WindowBounds, WindowOptions, XcbAtoms,
 };
-use collections::HashMap;
 use parking_lot::Mutex;
 use std::{
-    rc::{Rc, Weak},
+    ffi::c_void,
+    rc::Rc,
     sync::{self, Arc},
 };
-use x11rb::{
-    connection::Connection as _,
-    protocol::xproto::{
-        AtomEnum, ConnectionExt as _, CreateWindowAux, EventMask, PropMode, WindowClass,
-    },
-    rust_connection::RustConnection,
-    wrapper::ConnectionExt as _,
-};
+use xcb::{x, Xid as _};
 
 pub(crate) struct LinuxWindowState {
     display: Rc<dyn PlatformDisplay>,
-    x11_window: u32,
+    x_window: x::Window,
     window_bounds: WindowBounds,
     content_size: Size<Pixels>,
     sprite_atlas: Arc<BladeAtlas>,
@@ -33,29 +24,53 @@ pub(crate) type LinuxWindowStatePtr = Arc<Mutex<LinuxWindowState>>;
 #[derive(Clone)]
 pub(crate) struct LinuxWindow(pub(crate) LinuxWindowStatePtr);
 
+struct RawWindow {
+    connection: *mut c_void,
+    screen_id: i32,
+    window_id: u32,
+}
+unsafe impl raw_window_handle::HasRawWindowHandle for RawWindow {
+    fn raw_window_handle(&self) -> raw_window_handle::RawWindowHandle {
+        let mut wh = raw_window_handle::XcbWindowHandle::empty();
+        wh.window = self.window_id;
+        wh.into()
+    }
+}
+unsafe impl raw_window_handle::HasRawDisplayHandle for RawWindow {
+    fn raw_display_handle(&self) -> raw_window_handle::RawDisplayHandle {
+        let mut dh = raw_window_handle::XcbDisplayHandle::empty();
+        dh.connection = self.connection;
+        dh.screen = self.screen_id;
+        dh.into()
+    }
+}
+
 impl LinuxWindowState {
     pub fn new_ptr(
         options: WindowOptions,
         handle: AnyWindowHandle,
-        x11_connection: &RustConnection,
-        x11_main_screen_index: usize,
-        x11_window: u32,
-        atoms: &WmAtoms,
+        xcb_connection: &xcb::Connection,
+        x_main_screen_index: i32,
+        x_window: x::Window,
+        atoms: &XcbAtoms,
     ) -> LinuxWindowStatePtr {
-        let x11_screen_index = options
+        let x_screen_index = options
             .display_id
-            .map_or(x11_main_screen_index, |did| did.0 as usize);
-        let screen = &x11_connection.setup().roots[x11_screen_index];
+            .map_or(x_main_screen_index, |did| did.0 as i32);
+        let screen = xcb_connection
+            .get_setup()
+            .roots()
+            .nth(x_screen_index as usize)
+            .unwrap();
 
-        let win_aux = CreateWindowAux::new()
-            .event_mask(
-                EventMask::EXPOSURE | EventMask::STRUCTURE_NOTIFY | EventMask::POINTER_MOTION,
-            )
-            .background_pixel(screen.white_pixel);
+        let xcb_values = [
+            x::Cw::BackPixel(screen.white_pixel()),
+            x::Cw::EventMask(x::EventMask::EXPOSURE | x::EventMask::KEY_PRESS),
+        ];
 
         let (bound_x, bound_y, bound_width, bound_height) = match options.bounds {
             WindowBounds::Fullscreen | WindowBounds::Maximized => {
-                (0, 0, screen.width_in_pixels, screen.height_in_pixels)
+                (0, 0, screen.width_in_pixels(), screen.height_in_pixels())
             }
             WindowBounds::Fixed(bounds) => (
                 bounds.origin.x.0 as i16,
@@ -65,61 +80,67 @@ impl LinuxWindowState {
             ),
         };
 
-        x11_connection
-            .create_window(
-                x11rb::COPY_DEPTH_FROM_PARENT,
-                x11_window,
-                screen.root,
-                bound_x,
-                bound_y,
-                bound_width,
-                bound_height,
-                0,
-                WindowClass::INPUT_OUTPUT,
-                0,
-                &win_aux,
-            )
-            .unwrap();
+        xcb_connection.send_request(&x::CreateWindow {
+            depth: x::COPY_FROM_PARENT as u8,
+            wid: x_window,
+            parent: screen.root(),
+            x: bound_x,
+            y: bound_y,
+            width: bound_width,
+            height: bound_height,
+            border_width: 0,
+            class: x::WindowClass::InputOutput,
+            visual: screen.root_visual(),
+            value_list: &xcb_values,
+        });
 
         if let Some(titlebar) = options.titlebar {
             if let Some(title) = titlebar.title {
-                x11_connection
-                    .change_property8(
-                        PropMode::REPLACE,
-                        x11_window,
-                        AtomEnum::WM_NAME,
-                        AtomEnum::STRING,
-                        title.as_bytes(),
-                    )
-                    .unwrap();
+                xcb_connection.send_request(&x::ChangeProperty {
+                    mode: x::PropMode::Replace,
+                    window: x_window,
+                    property: x::ATOM_WM_NAME,
+                    r#type: x::ATOM_STRING,
+                    data: title.as_bytes(),
+                });
             }
         }
-        x11_connection
-            .change_property32(
-                PropMode::REPLACE,
-                x11_window,
-                atoms.protocols,
-                AtomEnum::ATOM,
-                &[atoms.delete_window],
-            )
+        xcb_connection
+            .send_and_check_request(&x::ChangeProperty {
+                mode: x::PropMode::Replace,
+                window: x_window,
+                property: atoms.wm_protocols,
+                r#type: x::ATOM_ATOM,
+                data: &[atoms.wm_del_window],
+            })
             .unwrap();
 
-        x11_connection.map_window(x11_window).unwrap();
-        x11_connection.flush().unwrap();
+        xcb_connection.send_request(&x::MapWindow { window: x_window });
+        xcb_connection.flush().unwrap();
 
+        let raw_window = RawWindow {
+            connection: as_raw_xcb_connection::AsRawXcbConnection::as_raw_xcb_connection(
+                xcb_connection,
+            ) as *mut _,
+            screen_id: x_screen_index,
+            window_id: x_window.resource_id(),
+        };
         let gpu = Arc::new(
             unsafe {
-                blade::Context::init(blade::ContextDesc {
-                    validation: cfg!(debug_assertions),
-                    capture: false,
-                })
+                blade::Context::init_windowed(
+                    &raw_window,
+                    blade::ContextDesc {
+                        validation: cfg!(debug_assertions),
+                        capture: false,
+                    },
+                )
             }
             .unwrap(),
         );
 
         Arc::new(Mutex::new(Self {
-            display: Rc::new(LinuxDisplay::new(x11_connection, x11_screen_index)),
-            x11_window,
+            display: Rc::new(LinuxDisplay::new(xcb_connection, x_screen_index)),
+            x_window,
             window_bounds: options.bounds,
             content_size: Size {
                 width: Pixels(bound_width as f32),

From 74fde5967bd5b72f5636b92806cbacd371be4d4c Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sun, 28 Jan 2024 23:30:19 -0800
Subject: [PATCH 155/372] linux: hook up render event, basic renderer command
 buffer

---
 .../gpui/src/platform/linux/blade_renderer.rs | 51 +++++++++++++-
 crates/gpui/src/platform/linux/platform.rs    | 70 ++++++++++---------
 crates/gpui/src/platform/linux/window.rs      | 60 +++++++++++-----
 3 files changed, 129 insertions(+), 52 deletions(-)

diff --git a/crates/gpui/src/platform/linux/blade_renderer.rs b/crates/gpui/src/platform/linux/blade_renderer.rs
index 1f87b30efe..e37129d622 100644
--- a/crates/gpui/src/platform/linux/blade_renderer.rs
+++ b/crates/gpui/src/platform/linux/blade_renderer.rs
@@ -1,11 +1,58 @@
+use crate::Scene;
+
 use std::sync::Arc;
 
+const SURFACE_FRAME_COUNT: u32 = 3;
+const MAX_FRAME_TIME_MS: u32 = 1000;
+
 pub struct BladeRenderer {
     gpu: Arc<blade::Context>,
+    command_encoder: blade::CommandEncoder,
+    last_sync_point: Option<blade::SyncPoint>,
 }
 
 impl BladeRenderer {
-    pub fn new(gpu: Arc<blade::Context>) -> Self {
-        Self { gpu }
+    pub fn new(gpu: Arc<blade::Context>, size: blade::Extent) -> Self {
+        let _surface_format = gpu.resize(blade::SurfaceConfig {
+            size,
+            usage: blade::TextureUsage::TARGET,
+            frame_count: SURFACE_FRAME_COUNT,
+        });
+        let command_encoder = gpu.create_command_encoder(blade::CommandEncoderDesc {
+            name: "main",
+            buffer_count: 2,
+        });
+        Self {
+            gpu,
+            command_encoder,
+            last_sync_point: None,
+        }
+    }
+
+    pub fn destroy(&mut self) {
+        self.gpu.destroy_command_encoder(&mut self.command_encoder);
+    }
+
+    pub fn resize(&mut self, size: blade::Extent) {
+        self.gpu.resize(blade::SurfaceConfig {
+            size,
+            usage: blade::TextureUsage::TARGET,
+            frame_count: SURFACE_FRAME_COUNT,
+        });
+    }
+
+    pub fn draw(&mut self, scene: &Scene) {
+        let frame = self.gpu.acquire_frame();
+        self.command_encoder.start();
+
+        self.command_encoder.present(frame);
+
+        let sync_point = self.gpu.submit(&mut self.command_encoder);
+        if let Some(ref last_sp) = self.last_sync_point {
+            if !self.gpu.wait_for(last_sp, MAX_FRAME_TIME_MS) {
+                panic!("GPU hung");
+            }
+        }
+        self.last_sync_point = Some(sync_point);
     }
 }
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index 91eacc9d42..b708f28e4d 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -85,44 +85,46 @@ impl Platform for LinuxPlatform {
     fn run(&self, on_finish_launching: Box<dyn FnOnce()>) {
         on_finish_launching();
 
-        let mut need_repaint = HashSet::<x::Window>::default();
-
         while !self.0.lock().windows.is_empty() {
             let event = self.0.lock().xcb_connection.wait_for_event().unwrap();
+            let mut repaint_x_window = None;
             match event {
                 xcb::Event::X(x::Event::ClientMessage(ev)) => {
                     if let x::ClientMessageData::Data32([atom, ..]) = ev.data() {
-                        let mut lock = self.0.lock();
-                        if atom == lock.atoms.wm_del_window.resource_id() {
+                        let mut this = self.0.lock();
+                        if atom == this.atoms.wm_del_window.resource_id() {
                             // window "x" button clicked by user, we gracefully exit
                             {
-                                let mut window = lock.windows[&ev.window()].lock();
+                                let mut window = this.windows[&ev.window()].lock();
                                 window.destroy();
                             }
-                            lock.windows.remove(&ev.window());
+                            this.xcb_connection.send_request(&x::UnmapWindow {
+                                window: ev.window(),
+                            });
+                            this.xcb_connection.send_request(&x::DestroyWindow {
+                                window: ev.window(),
+                            });
+                            this.windows.remove(&ev.window());
                             break;
                         }
                     }
                 }
-                _ => {} /*
-                        Event::Expose(event) => {
-                            if event.count == 0 {
-                                need_repaint.insert(event.window);
-                            }
-                        }
-                        Event::ConfigureNotify(event) => {
-                            let lock = self.0.lock();
-                            let mut window = lock.windows[&event.window].lock();
-                            window.resize(event.width, event.height);
-                        }
-                        _ => {}*/
+                xcb::Event::X(x::Event::Expose(ev)) => {
+                    repaint_x_window = Some(ev.window());
+                }
+                xcb::Event::X(x::Event::ResizeRequest(ev)) => {
+                    let this = self.0.lock();
+                    let mut window = this.windows[&ev.window()].lock();
+                    window.resize(ev.width(), ev.height());
+                }
+                _ => {}
             }
 
-            for x_window in need_repaint.drain() {
-                let lock = self.0.lock();
-                let mut window = lock.windows[&x_window].lock();
-                window.paint();
-                lock.xcb_connection.flush();
+            if let Some(x_window) = repaint_x_window {
+                let this = self.0.lock();
+                let mut window = this.windows[&x_window].lock();
+                window.request_frame();
+                this.xcb_connection.flush();
             }
         }
     }
@@ -140,22 +142,22 @@ impl Platform for LinuxPlatform {
     fn unhide_other_apps(&self) {}
 
     fn displays(&self) -> Vec<Rc<dyn PlatformDisplay>> {
-        let lock = self.0.lock();
-        let setup = lock.xcb_connection.get_setup();
+        let this = self.0.lock();
+        let setup = this.xcb_connection.get_setup();
         setup
             .roots()
             .enumerate()
             .map(|(root_id, _)| {
-                Rc::new(LinuxDisplay::new(&lock.xcb_connection, root_id as i32))
+                Rc::new(LinuxDisplay::new(&this.xcb_connection, root_id as i32))
                     as Rc<dyn PlatformDisplay>
             })
             .collect()
     }
 
     fn display(&self, id: DisplayId) -> Option<Rc<dyn PlatformDisplay>> {
-        let lock = self.0.lock();
+        let this = self.0.lock();
         Some(Rc::new(LinuxDisplay::new(
-            &lock.xcb_connection,
+            &this.xcb_connection,
             id.0 as i32,
         )))
     }
@@ -169,18 +171,18 @@ impl Platform for LinuxPlatform {
         handle: AnyWindowHandle,
         options: WindowOptions,
     ) -> Box<dyn PlatformWindow> {
-        let mut lock = self.0.lock();
-        let x_window = lock.xcb_connection.generate_id();
+        let mut this = self.0.lock();
+        let x_window = this.xcb_connection.generate_id();
 
         let window_ptr = LinuxWindowState::new_ptr(
             options,
             handle,
-            &lock.xcb_connection,
-            lock.x_root_index,
+            &this.xcb_connection,
+            this.x_root_index,
             x_window,
-            &lock.atoms,
+            &this.atoms,
         );
-        lock.windows.insert(x_window, window_ptr.clone());
+        this.windows.insert(x_window, window_ptr.clone());
         Box::new(LinuxWindow(window_ptr))
     }
 
diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index 9f6851ca93..ce91b3523f 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -11,6 +11,12 @@ use std::{
 };
 use xcb::{x, Xid as _};
 
+#[derive(Default)]
+struct Callbacks {
+    request_frame: Option<Box<dyn FnMut()>>,
+    resize: Option<Box<dyn FnMut(Size<Pixels>, f32)>>,
+}
+
 pub(crate) struct LinuxWindowState {
     display: Rc<dyn PlatformDisplay>,
     x_window: x::Window,
@@ -18,6 +24,7 @@ pub(crate) struct LinuxWindowState {
     content_size: Size<Pixels>,
     sprite_atlas: Arc<BladeAtlas>,
     renderer: BladeRenderer,
+    callbacks: Callbacks,
 }
 
 pub(crate) type LinuxWindowStatePtr = Arc<Mutex<LinuxWindowState>>;
@@ -65,7 +72,9 @@ impl LinuxWindowState {
 
         let xcb_values = [
             x::Cw::BackPixel(screen.white_pixel()),
-            x::Cw::EventMask(x::EventMask::EXPOSURE | x::EventMask::KEY_PRESS),
+            x::Cw::EventMask(
+                x::EventMask::EXPOSURE | x::EventMask::RESIZE_REDIRECT | x::EventMask::KEY_PRESS,
+            ),
         ];
 
         let (bound_x, bound_y, bound_width, bound_height) = match options.bounds {
@@ -137,6 +146,11 @@ impl LinuxWindowState {
             }
             .unwrap(),
         );
+        let gpu_extent = blade::Extent {
+            width: bound_width as u32,
+            height: bound_height as u32,
+            depth: 1,
+        };
 
         Arc::new(Mutex::new(Self {
             display: Rc::new(LinuxDisplay::new(xcb_connection, x_screen_index)),
@@ -147,7 +161,8 @@ impl LinuxWindowState {
                 height: Pixels(bound_height as f32),
             },
             sprite_atlas: Arc::new(BladeAtlas::new(&gpu)),
-            renderer: BladeRenderer::new(gpu),
+            renderer: BladeRenderer::new(gpu, gpu_extent),
+            callbacks: Callbacks::default(),
         }))
     }
 
@@ -156,14 +171,25 @@ impl LinuxWindowState {
             width: Pixels(width as f32),
             height: Pixels(height as f32),
         };
+        self.renderer.resize(blade::Extent {
+            width: width as u32,
+            height: height as u32,
+            depth: 1,
+        });
+        if let Some(ref mut fun) = self.callbacks.resize {
+            fun(self.content_size, 1.0);
+        }
+    }
+
+    pub fn request_frame(&mut self) {
+        if let Some(ref mut fun) = self.callbacks.request_frame {
+            fun();
+        }
     }
 
     pub fn destroy(&mut self) {
         self.sprite_atlas.destroy();
-    }
-
-    pub fn paint(&mut self) {
-        //TODO
+        self.renderer.destroy();
     }
 }
 
@@ -243,27 +269,27 @@ impl PlatformWindow for LinuxWindow {
         unimplemented!()
     }
 
-    fn on_request_frame(&self, _callback: Box<dyn FnMut()>) {}
+    fn on_request_frame(&self, callback: Box<dyn FnMut()>) {
+        self.0.lock().callbacks.request_frame = Some(callback);
+    }
 
     fn on_input(&self, callback: Box<dyn FnMut(crate::PlatformInput) -> bool>) {}
 
     fn on_active_status_change(&self, callback: Box<dyn FnMut(bool)>) {}
 
-    fn on_resize(&self, callback: Box<dyn FnMut(Size<Pixels>, f32)>) {}
+    fn on_resize(&self, callback: Box<dyn FnMut(Size<Pixels>, f32)>) {
+        self.0.lock().callbacks.resize = Some(callback);
+    }
 
     fn on_fullscreen(&self, _callback: Box<dyn FnMut(bool)>) {}
 
     fn on_moved(&self, callback: Box<dyn FnMut()>) {}
 
-    fn on_should_close(&self, callback: Box<dyn FnMut() -> bool>) {}
+    fn on_should_close(&self, _callback: Box<dyn FnMut() -> bool>) {}
 
-    fn on_close(&self, _callback: Box<dyn FnOnce()>) {
-        unimplemented!()
-    }
+    fn on_close(&self, _callback: Box<dyn FnOnce()>) {}
 
-    fn on_appearance_changed(&self, _callback: Box<dyn FnMut()>) {
-        unimplemented!()
-    }
+    fn on_appearance_changed(&self, _callback: Box<dyn FnMut()>) {}
 
     fn is_topmost_for_position(&self, _position: crate::Point<Pixels>) -> bool {
         unimplemented!()
@@ -271,7 +297,9 @@ impl PlatformWindow for LinuxWindow {
 
     fn invalidate(&self) {}
 
-    fn draw(&self, _scene: &crate::Scene) {}
+    fn draw(&self, scene: &crate::Scene) {
+        self.0.lock().renderer.draw(scene);
+    }
 
     fn sprite_atlas(&self) -> sync::Arc<dyn crate::PlatformAtlas> {
         self.0.lock().sprite_atlas.clone()

From 503ac7a251db62f5743e5e0ff82d1635d1f5ef99 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sun, 28 Jan 2024 23:59:04 -0800
Subject: [PATCH 156/372] linux: work around the mutex locks for request_frame
 and resize

---
 .../gpui/src/platform/linux/blade_renderer.rs | 16 +++++---
 crates/gpui/src/platform/linux/platform.rs    |  6 +--
 crates/gpui/src/platform/linux/text_system.rs |  4 +-
 crates/gpui/src/platform/linux/window.rs      | 39 ++++++++++++-------
 4 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/crates/gpui/src/platform/linux/blade_renderer.rs b/crates/gpui/src/platform/linux/blade_renderer.rs
index e37129d622..59b95d7274 100644
--- a/crates/gpui/src/platform/linux/blade_renderer.rs
+++ b/crates/gpui/src/platform/linux/blade_renderer.rs
@@ -33,7 +33,16 @@ impl BladeRenderer {
         self.gpu.destroy_command_encoder(&mut self.command_encoder);
     }
 
+    fn wait_for_gpu(&mut self) {
+        if let Some(last_sp) = self.last_sync_point.take() {
+            if !self.gpu.wait_for(&last_sp, MAX_FRAME_TIME_MS) {
+                panic!("GPU hung");
+            }
+        }
+    }
+
     pub fn resize(&mut self, size: blade::Extent) {
+        self.wait_for_gpu();
         self.gpu.resize(blade::SurfaceConfig {
             size,
             usage: blade::TextureUsage::TARGET,
@@ -44,15 +53,12 @@ impl BladeRenderer {
     pub fn draw(&mut self, scene: &Scene) {
         let frame = self.gpu.acquire_frame();
         self.command_encoder.start();
+        self.command_encoder.init_texture(frame.texture());
 
         self.command_encoder.present(frame);
 
         let sync_point = self.gpu.submit(&mut self.command_encoder);
-        if let Some(ref last_sp) = self.last_sync_point {
-            if !self.gpu.wait_for(last_sp, MAX_FRAME_TIME_MS) {
-                panic!("GPU hung");
-            }
-        }
+        self.wait_for_gpu();
         self.last_sync_point = Some(sync_point);
     }
 }
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index b708f28e4d..5a5494cda8 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -114,16 +114,14 @@ impl Platform for LinuxPlatform {
                 }
                 xcb::Event::X(x::Event::ResizeRequest(ev)) => {
                     let this = self.0.lock();
-                    let mut window = this.windows[&ev.window()].lock();
-                    window.resize(ev.width(), ev.height());
+                    LinuxWindowState::resize(&this.windows[&ev.window()], ev.width(), ev.height());
                 }
                 _ => {}
             }
 
             if let Some(x_window) = repaint_x_window {
                 let this = self.0.lock();
-                let mut window = this.windows[&x_window].lock();
-                window.request_frame();
+                LinuxWindowState::request_frame(&this.windows[&x_window]);
                 this.xcb_connection.flush();
             }
         }
diff --git a/crates/gpui/src/platform/linux/text_system.rs b/crates/gpui/src/platform/linux/text_system.rs
index c21c8adfd1..36ed155f6a 100644
--- a/crates/gpui/src/platform/linux/text_system.rs
+++ b/crates/gpui/src/platform/linux/text_system.rs
@@ -64,7 +64,7 @@ impl PlatformTextSystem for LinuxTextSystem {
         Vec::new()
     }
     fn font_id(&self, descriptor: &Font) -> Result<FontId> {
-        unimplemented!()
+        Ok(FontId(0)) //TODO
     }
     fn font_metrics(&self, font_id: FontId) -> FontMetrics {
         unimplemented!()
@@ -89,7 +89,7 @@ impl PlatformTextSystem for LinuxTextSystem {
         unimplemented!()
     }
     fn layout_line(&self, text: &str, font_size: Pixels, runs: &[FontRun]) -> LineLayout {
-        unimplemented!()
+        LineLayout::default() //TODO
     }
     fn wrap_line(
         &self,
diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index ce91b3523f..85ede0ab5a 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -166,30 +166,41 @@ impl LinuxWindowState {
         }))
     }
 
-    pub fn resize(&mut self, width: u16, height: u16) {
-        self.content_size = Size {
+    pub fn destroy(&mut self) {
+        self.sprite_atlas.destroy();
+        self.renderer.destroy();
+    }
+
+    pub fn resize(self_ptr: &LinuxWindowStatePtr, width: u16, height: u16) {
+        let content_size = Size {
             width: Pixels(width as f32),
             height: Pixels(height as f32),
         };
-        self.renderer.resize(blade::Extent {
+
+        let mut fun = match self_ptr.lock().callbacks.resize.take() {
+            Some(fun) => fun,
+            None => return,
+        };
+        fun(content_size, 1.0);
+
+        let mut this = self_ptr.lock();
+        this.callbacks.resize = Some(fun);
+        this.content_size = content_size;
+        this.renderer.resize(blade::Extent {
             width: width as u32,
             height: height as u32,
             depth: 1,
         });
-        if let Some(ref mut fun) = self.callbacks.resize {
-            fun(self.content_size, 1.0);
-        }
     }
 
-    pub fn request_frame(&mut self) {
-        if let Some(ref mut fun) = self.callbacks.request_frame {
-            fun();
-        }
-    }
+    pub fn request_frame(self_ptr: &LinuxWindowStatePtr) {
+        let mut fun = match self_ptr.lock().callbacks.request_frame.take() {
+            Some(fun) => fun,
+            None => return,
+        };
+        fun();
 
-    pub fn destroy(&mut self) {
-        self.sprite_atlas.destroy();
-        self.renderer.destroy();
+        self_ptr.lock().callbacks.request_frame = Some(fun);
     }
 }
 

From 8aa768765f4e1b542fb3d42f7fab5d0fbd178f47 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Tue, 30 Jan 2024 00:32:30 -0800
Subject: [PATCH 157/372] linux: basic quad renderer logic

---
 Cargo.lock                                    |   1 +
 Cargo.toml                                    |   1 +
 crates/gpui/Cargo.toml                        |   3 +-
 crates/gpui/src/platform/linux/blade_atlas.rs |  43 ++--
 crates/gpui/src/platform/linux/blade_belt.rs  |  31 ++-
 .../gpui/src/platform/linux/blade_renderer.rs | 127 ++++++++++--
 crates/gpui/src/platform/linux/platform.rs    |   1 +
 crates/gpui/src/platform/linux/shaders.wgsl   | 183 ++++++++++++++++++
 crates/gpui/src/platform/linux/window.rs      |  15 +-
 9 files changed, 352 insertions(+), 53 deletions(-)
 create mode 100644 crates/gpui/src/platform/linux/shaders.wgsl

diff --git a/Cargo.lock b/Cargo.lock
index 291e86f0b5..c3df96e992 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3234,6 +3234,7 @@ dependencies = [
  "bindgen 0.65.1",
  "bitflags 2.4.1",
  "block",
+ "bytemuck",
  "cbindgen",
  "cocoa",
  "collections",
diff --git a/Cargo.toml b/Cargo.toml
index a3eeb2d653..847fc77d62 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -182,6 +182,7 @@ tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "1d897
 wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "v16.0.0" }
 
 # TODO - Remove when corresponding Blade versions are published
+# Currently in https://github.com/kvark/blade/tree/zed
 blade-graphics = { path = "/x/Code/blade/blade-graphics" }
 blade-macros = { path = "/x/Code/blade/blade-macros" }
 
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 08c5b609a2..72cc1bd253 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -26,8 +26,9 @@ anyhow.workspace = true
 async-task = "4.7"
 backtrace = { version = "0.3", optional = true }
 bitflags = "2.4.0"
-blade = { package = "blade-graphics", version = "0.3" }
+blade-graphics = "0.3"
 blade-macros = "0.2"
+bytemuck = "1"
 collections = { path = "../collections" }
 ctor.workspace = true
 derive_more.workspace = true
diff --git a/crates/gpui/src/platform/linux/blade_atlas.rs b/crates/gpui/src/platform/linux/blade_atlas.rs
index b81b282925..56bb745764 100644
--- a/crates/gpui/src/platform/linux/blade_atlas.rs
+++ b/crates/gpui/src/platform/linux/blade_atlas.rs
@@ -4,6 +4,7 @@ use crate::{
     Point, Size,
 };
 use anyhow::Result;
+use blade_graphics as gpu;
 use collections::FxHashMap;
 use etagere::BucketedAtlasAllocator;
 use parking_lot::Mutex;
@@ -12,8 +13,8 @@ use std::{borrow::Cow, sync::Arc};
 pub(crate) struct BladeAtlas(Mutex<BladeAtlasState>);
 
 struct BladeAtlasState {
-    gpu: Arc<blade::Context>,
-    gpu_encoder: blade::CommandEncoder,
+    gpu: Arc<gpu::Context>,
+    gpu_encoder: gpu::CommandEncoder,
     upload_belt: BladeBelt,
     monochrome_textures: Vec<BladeAtlasTexture>,
     polychrome_textures: Vec<BladeAtlasTexture>,
@@ -38,15 +39,15 @@ impl BladeAtlasState {
 }
 
 impl BladeAtlas {
-    pub(crate) fn new(gpu: &Arc<blade::Context>) -> Self {
+    pub(crate) fn new(gpu: &Arc<gpu::Context>) -> Self {
         BladeAtlas(Mutex::new(BladeAtlasState {
             gpu: Arc::clone(gpu),
-            gpu_encoder: gpu.create_command_encoder(blade::CommandEncoderDesc {
+            gpu_encoder: gpu.create_command_encoder(gpu::CommandEncoderDesc {
                 name: "atlas",
                 buffer_count: 3,
             }),
             upload_belt: BladeBelt::new(BladeBeltDescriptor {
-                memory: blade::Memory::Upload,
+                memory: gpu::Memory::Upload,
                 min_chunk_size: 0x10000,
             }),
             monochrome_textures: Default::default(),
@@ -77,7 +78,7 @@ impl BladeAtlas {
         lock.gpu_encoder.start();
     }
 
-    pub fn finish_frame(&self) -> blade::SyncPoint {
+    pub fn finish_frame(&self) -> gpu::SyncPoint {
         let mut lock = self.0.lock();
         let gpu = lock.gpu.clone();
         let sync_point = gpu.submit(&mut lock.gpu_encoder);
@@ -137,32 +138,32 @@ impl BladeAtlasState {
         let usage;
         match kind {
             AtlasTextureKind::Monochrome => {
-                format = blade::TextureFormat::R8Unorm;
-                usage = blade::TextureUsage::COPY | blade::TextureUsage::RESOURCE;
+                format = gpu::TextureFormat::R8Unorm;
+                usage = gpu::TextureUsage::COPY | gpu::TextureUsage::RESOURCE;
             }
             AtlasTextureKind::Polychrome => {
-                format = blade::TextureFormat::Bgra8Unorm;
-                usage = blade::TextureUsage::COPY | blade::TextureUsage::RESOURCE;
+                format = gpu::TextureFormat::Bgra8Unorm;
+                usage = gpu::TextureUsage::COPY | gpu::TextureUsage::RESOURCE;
             }
             AtlasTextureKind::Path => {
-                format = blade::TextureFormat::R16Float;
-                usage = blade::TextureUsage::COPY
-                    | blade::TextureUsage::RESOURCE
-                    | blade::TextureUsage::TARGET;
+                format = gpu::TextureFormat::R16Float;
+                usage = gpu::TextureUsage::COPY
+                    | gpu::TextureUsage::RESOURCE
+                    | gpu::TextureUsage::TARGET;
             }
         }
 
-        let raw = self.gpu.create_texture(blade::TextureDesc {
+        let raw = self.gpu.create_texture(gpu::TextureDesc {
             name: "",
             format,
-            size: blade::Extent {
+            size: gpu::Extent {
                 width: size.width.into(),
                 height: size.height.into(),
                 depth: 1,
             },
             array_layer_count: 1,
             mip_level_count: 1,
-            dimension: blade::TextureDimension::D2,
+            dimension: gpu::TextureDimension::D2,
             usage,
         });
 
@@ -198,13 +199,13 @@ impl BladeAtlasState {
         transfers.copy_buffer_to_texture(
             src_data,
             bounds.size.width.to_bytes(texture.bytes_per_pixel()),
-            blade::TexturePiece {
+            gpu::TexturePiece {
                 texture: texture.raw,
                 mip_level: 0,
                 array_layer: 0,
                 origin: [bounds.origin.x.into(), bounds.origin.y.into(), 0],
             },
-            blade::Extent {
+            gpu::Extent {
                 width: bounds.size.width.into(),
                 height: bounds.size.height.into(),
                 depth: 1,
@@ -216,8 +217,8 @@ impl BladeAtlasState {
 struct BladeAtlasTexture {
     id: AtlasTextureId,
     allocator: BucketedAtlasAllocator,
-    raw: blade::Texture,
-    format: blade::TextureFormat,
+    raw: gpu::Texture,
+    format: gpu::TextureFormat,
 }
 
 impl BladeAtlasTexture {
diff --git a/crates/gpui/src/platform/linux/blade_belt.rs b/crates/gpui/src/platform/linux/blade_belt.rs
index ff3d5c6692..17f100beb2 100644
--- a/crates/gpui/src/platform/linux/blade_belt.rs
+++ b/crates/gpui/src/platform/linux/blade_belt.rs
@@ -1,10 +1,13 @@
+use blade_graphics as gpu;
+use std::mem;
+
 struct ReusableBuffer {
-    raw: blade::Buffer,
+    raw: gpu::Buffer,
     size: u64,
 }
 
 pub struct BladeBeltDescriptor {
-    pub memory: blade::Memory,
+    pub memory: gpu::Memory,
     pub min_chunk_size: u64,
 }
 
@@ -12,7 +15,7 @@ pub struct BladeBeltDescriptor {
 /// find staging space for uploads.
 pub struct BladeBelt {
     desc: BladeBeltDescriptor,
-    buffers: Vec<(ReusableBuffer, blade::SyncPoint)>,
+    buffers: Vec<(ReusableBuffer, gpu::SyncPoint)>,
     active: Vec<(ReusableBuffer, u64)>,
 }
 
@@ -25,7 +28,7 @@ impl BladeBelt {
         }
     }
 
-    pub fn destroy(&mut self, gpu: &blade::Context) {
+    pub fn destroy(&mut self, gpu: &gpu::Context) {
         for (buffer, _) in self.buffers.drain(..) {
             gpu.destroy_buffer(buffer.raw);
         }
@@ -34,7 +37,7 @@ impl BladeBelt {
         }
     }
 
-    pub fn alloc(&mut self, size: u64, gpu: &blade::Context) -> blade::BufferPiece {
+    pub fn alloc(&mut self, size: u64, gpu: &gpu::Context) -> gpu::BufferPiece {
         for &mut (ref rb, ref mut offset) in self.active.iter_mut() {
             if *offset + size <= rb.size {
                 let piece = rb.raw.at(*offset);
@@ -56,7 +59,7 @@ impl BladeBelt {
 
         let chunk_index = self.buffers.len() + self.active.len();
         let chunk_size = size.max(self.desc.min_chunk_size);
-        let chunk = gpu.create_buffer(blade::BufferDesc {
+        let chunk = gpu.create_buffer(gpu::BufferDesc {
             name: &format!("chunk-{}", chunk_index),
             size: chunk_size,
             memory: self.desc.memory,
@@ -69,15 +72,23 @@ impl BladeBelt {
         chunk.into()
     }
 
-    pub fn alloc_data(&mut self, data: &[u8], gpu: &blade::Context) -> blade::BufferPiece {
-        let bp = self.alloc(data.len() as u64, gpu);
+    //Note: assuming T: bytemuck::Zeroable
+    pub fn alloc_data<T>(&mut self, data: &[T], gpu: &gpu::Context) -> gpu::BufferPiece {
+        assert!(!data.is_empty());
+        let alignment = mem::align_of::<T>() as u64;
+        let total_bytes = data.len() * mem::size_of::<T>();
+        let mut bp = self.alloc(alignment + (total_bytes - 1) as u64, gpu);
+        let rem = bp.offset % alignment;
+        if rem != 0 {
+            bp.offset += alignment - rem;
+        }
         unsafe {
-            std::ptr::copy_nonoverlapping(data.as_ptr(), bp.data(), data.len());
+            std::ptr::copy_nonoverlapping(data.as_ptr() as *const u8, bp.data(), total_bytes);
         }
         bp
     }
 
-    pub fn flush(&mut self, sp: &blade::SyncPoint) {
+    pub fn flush(&mut self, sp: &gpu::SyncPoint) {
         self.buffers
             .extend(self.active.drain(..).map(|(rb, _)| (rb, sp.clone())));
     }
diff --git a/crates/gpui/src/platform/linux/blade_renderer.rs b/crates/gpui/src/platform/linux/blade_renderer.rs
index 59b95d7274..095c652e95 100644
--- a/crates/gpui/src/platform/linux/blade_renderer.rs
+++ b/crates/gpui/src/platform/linux/blade_renderer.rs
@@ -1,38 +1,93 @@
-use crate::Scene;
+use super::{BladeBelt, BladeBeltDescriptor};
+use crate::{PrimitiveBatch, Quad, Scene};
+use bytemuck::{Pod, Zeroable};
 
+use blade_graphics as gpu;
 use std::sync::Arc;
 
 const SURFACE_FRAME_COUNT: u32 = 3;
 const MAX_FRAME_TIME_MS: u32 = 1000;
 
+#[repr(C)]
+#[derive(Clone, Copy, Pod, Zeroable)]
+struct GlobalParams {
+    viewport_size: [f32; 2],
+    pad: [u32; 2],
+}
+
+#[derive(blade_macros::ShaderData)]
+struct ShaderQuadsData {
+    globals: GlobalParams,
+    quads: gpu::BufferPiece,
+}
+
+struct BladePipelines {
+    quads: gpu::RenderPipeline,
+}
+
+impl BladePipelines {
+    fn new(gpu: &gpu::Context, surface_format: gpu::TextureFormat) -> Self {
+        let shader = gpu.create_shader(gpu::ShaderDesc {
+            source: include_str!("shaders.wgsl"),
+        });
+        shader.check_struct_size::<Quad>();
+        let layout = <ShaderQuadsData as gpu::ShaderData>::layout();
+        Self {
+            quads: gpu.create_render_pipeline(gpu::RenderPipelineDesc {
+                name: "quads",
+                data_layouts: &[&layout],
+                vertex: shader.at("vs_quads"),
+                primitive: gpu::PrimitiveState {
+                    topology: gpu::PrimitiveTopology::TriangleStrip,
+                    ..Default::default()
+                },
+                depth_stencil: None,
+                fragment: shader.at("fs_quads"),
+                color_targets: &[gpu::ColorTargetState {
+                    format: surface_format,
+                    blend: Some(gpu::BlendState::ALPHA_BLENDING),
+                    write_mask: gpu::ColorWrites::default(),
+                }],
+            }),
+        }
+    }
+}
+
 pub struct BladeRenderer {
-    gpu: Arc<blade::Context>,
-    command_encoder: blade::CommandEncoder,
-    last_sync_point: Option<blade::SyncPoint>,
+    gpu: Arc<gpu::Context>,
+    command_encoder: gpu::CommandEncoder,
+    last_sync_point: Option<gpu::SyncPoint>,
+    pipelines: BladePipelines,
+    instance_belt: BladeBelt,
+    viewport_size: gpu::Extent,
 }
 
 impl BladeRenderer {
-    pub fn new(gpu: Arc<blade::Context>, size: blade::Extent) -> Self {
-        let _surface_format = gpu.resize(blade::SurfaceConfig {
+    pub fn new(gpu: Arc<gpu::Context>, size: gpu::Extent) -> Self {
+        let surface_format = gpu.resize(gpu::SurfaceConfig {
             size,
-            usage: blade::TextureUsage::TARGET,
+            usage: gpu::TextureUsage::TARGET,
             frame_count: SURFACE_FRAME_COUNT,
         });
-        let command_encoder = gpu.create_command_encoder(blade::CommandEncoderDesc {
+        let command_encoder = gpu.create_command_encoder(gpu::CommandEncoderDesc {
             name: "main",
             buffer_count: 2,
         });
+        let pipelines = BladePipelines::new(&gpu, surface_format);
+        let instance_belt = BladeBelt::new(BladeBeltDescriptor {
+            memory: gpu::Memory::Shared,
+            min_chunk_size: 0x1000,
+        });
         Self {
             gpu,
             command_encoder,
             last_sync_point: None,
+            pipelines,
+            instance_belt,
+            viewport_size: size,
         }
     }
 
-    pub fn destroy(&mut self) {
-        self.gpu.destroy_command_encoder(&mut self.command_encoder);
-    }
-
     fn wait_for_gpu(&mut self) {
         if let Some(last_sp) = self.last_sync_point.take() {
             if !self.gpu.wait_for(&last_sp, MAX_FRAME_TIME_MS) {
@@ -41,13 +96,20 @@ impl BladeRenderer {
         }
     }
 
-    pub fn resize(&mut self, size: blade::Extent) {
+    pub fn destroy(&mut self) {
         self.wait_for_gpu();
-        self.gpu.resize(blade::SurfaceConfig {
+        self.instance_belt.destroy(&self.gpu);
+        self.gpu.destroy_command_encoder(&mut self.command_encoder);
+    }
+
+    pub fn resize(&mut self, size: gpu::Extent) {
+        self.wait_for_gpu();
+        self.gpu.resize(gpu::SurfaceConfig {
             size,
-            usage: blade::TextureUsage::TARGET,
+            usage: gpu::TextureUsage::TARGET,
             frame_count: SURFACE_FRAME_COUNT,
         });
+        self.viewport_size = size;
     }
 
     pub fn draw(&mut self, scene: &Scene) {
@@ -55,9 +117,42 @@ impl BladeRenderer {
         self.command_encoder.start();
         self.command_encoder.init_texture(frame.texture());
 
-        self.command_encoder.present(frame);
+        if let mut pass = self.command_encoder.render(gpu::RenderTargetSet {
+            colors: &[gpu::RenderTarget {
+                view: frame.texture_view(),
+                init_op: gpu::InitOp::Clear(gpu::TextureColor::TransparentBlack),
+                finish_op: gpu::FinishOp::Store,
+            }],
+            depth_stencil: None,
+        }) {
+            for batch in scene.batches() {
+                match batch {
+                    PrimitiveBatch::Quads(quads) => {
+                        let instances = self.instance_belt.alloc_data(quads, &self.gpu);
+                        let mut encoder = pass.with(&self.pipelines.quads);
+                        encoder.bind(
+                            0,
+                            &ShaderQuadsData {
+                                globals: GlobalParams {
+                                    viewport_size: [
+                                        self.viewport_size.width as f32,
+                                        self.viewport_size.height as f32,
+                                    ],
+                                    pad: [0; 2],
+                                },
+                                quads: instances,
+                            },
+                        );
+                        encoder.draw(0, 4, 0, quads.len() as u32);
+                    }
+                    _ => continue,
+                }
+            }
+        }
 
+        self.command_encoder.present(frame);
         let sync_point = self.gpu.submit(&mut self.command_encoder);
+        self.instance_belt.flush(&sync_point);
         self.wait_for_gpu();
         self.last_sync_point = Some(sync_point);
     }
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index 5a5494cda8..08bf081853 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -115,6 +115,7 @@ impl Platform for LinuxPlatform {
                 xcb::Event::X(x::Event::ResizeRequest(ev)) => {
                     let this = self.0.lock();
                     LinuxWindowState::resize(&this.windows[&ev.window()], ev.width(), ev.height());
+                    repaint_x_window = Some(ev.window());
                 }
                 _ => {}
             }
diff --git a/crates/gpui/src/platform/linux/shaders.wgsl b/crates/gpui/src/platform/linux/shaders.wgsl
new file mode 100644
index 0000000000..0cc70e5220
--- /dev/null
+++ b/crates/gpui/src/platform/linux/shaders.wgsl
@@ -0,0 +1,183 @@
+struct Bounds {
+    origin: vec2<f32>,
+    size: vec2<f32>,
+}
+struct Corners {
+    top_left: f32,
+    top_right: f32,
+    bottom_right: f32,
+    bottom_left: f32,
+}
+struct Edges {
+    top: f32,
+    right: f32,
+    bottom: f32,
+    left: f32,
+}
+struct Hsla {
+    h: f32,
+    s: f32,
+    l: f32,
+    a: f32,
+}
+
+struct Quad {
+    view_id: vec2<u32>,
+    layer_id: u32,
+    order: u32,
+    bounds: Bounds,
+    content_mask: Bounds,
+    background: Hsla,
+    border_color: Hsla,
+    corner_radii: Corners,
+    border_widths: Edges,
+}
+
+struct Globals {
+    viewport_size: vec2<f32>,
+    pad: vec2<u32>,
+}
+
+var<uniform> globals: Globals;
+var<storage, read> quads: array<Quad>;
+
+struct QuadsVarying {
+    @builtin(position) position: vec4<f32>,
+    @location(0) @interpolate(flat) background_color: vec4<f32>,
+    @location(1) @interpolate(flat) border_color: vec4<f32>,
+    @location(2) @interpolate(flat) quad_id: u32,
+    //TODO: use `clip_distance` once Naga supports it
+    @location(3) clip_distances: vec4<f32>,
+}
+
+fn to_device_position(unit_vertex: vec2<f32>, bounds: Bounds) -> vec4<f32> {
+    let position = unit_vertex * vec2<f32>(bounds.size) + bounds.origin;
+    let device_position = position / globals.viewport_size * vec2<f32>(2.0, -2.0) + vec2<f32>(-1.0, 1.0);
+    return vec4<f32>(device_position, 0.0, 1.0);
+}
+
+fn distance_from_clip_rect(unit_vertex: vec2<f32>, bounds: Bounds, clip_bounds: Bounds) -> vec4<f32> {
+    let position = unit_vertex * vec2<f32>(bounds.size) + bounds.origin;
+    let tl = position - clip_bounds.origin;
+    let br = clip_bounds.origin + clip_bounds.size - position;
+    return vec4<f32>(tl.x, br.x, tl.y, br.y);
+}
+
+fn hsla_to_rgba(hsla: Hsla) -> vec4<f32> {
+    let h = hsla.h * 6.0; // Now, it's an angle but scaled in [0, 6) range
+    let s = hsla.s;
+    let l = hsla.l;
+    let a = hsla.a;
+
+    let c = (1.0 - abs(2.0 * l - 1.0)) * s;
+    let x = c * (1.0 - abs(h % 2.0 - 1.0));
+    let m = l - c / 2.0;
+
+    var color = vec4<f32>(m, m, m, a);
+
+    if (h >= 0.0 && h < 1.0) {
+        color.r += c;
+        color.g += x;
+    } else if (h >= 1.0 && h < 2.0) {
+        color.r += x;
+        color.g += c;
+    } else if (h >= 2.0 && h < 3.0) {
+        color.g += c;
+        color.b += x;
+    } else if (h >= 3.0 && h < 4.0) {
+        color.g += x;
+        color.b += c;
+    } else if (h >= 4.0 && h < 5.0) {
+        color.r += x;
+        color.b += c;
+    } else {
+        color.r += c;
+        color.b += x;
+    }
+
+    return color;
+}
+
+fn over(below: vec4<f32>, above: vec4<f32>) -> vec4<f32> {
+  let alpha = above.a + below.a * (1.0 - above.a);
+  let color = (above.rgb * above.a + below.rgb * below.a * (1.0 - above.a)) / alpha;
+  return vec4<f32>(color, alpha);
+}
+
+@vertex
+fn vs_quads(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index) instance_id: u32) -> QuadsVarying {
+    let unit_vertex = vec2<f32>(f32(vertex_id & 1u), 0.5 * f32(vertex_id & 2u));
+    let quad = quads[instance_id];
+
+    var out = QuadsVarying();
+    out.position = to_device_position(unit_vertex, quad.bounds);
+    out.background_color = hsla_to_rgba(quad.background);
+    out.border_color = hsla_to_rgba(quad.border_color);
+    out.quad_id = instance_id;
+    out.clip_distances = distance_from_clip_rect(unit_vertex, quad.bounds, quad.content_mask);
+    return out;
+}
+
+@fragment
+fn fs_quads(input: QuadsVarying) -> @location(0) vec4<f32> {
+    // Alpha clip first, since we don't have `clip_distance`.
+    let min_distance = min(
+        min(input.clip_distances.x, input.clip_distances.y),
+        min(input.clip_distances.z, input.clip_distances.w)
+    );
+    if min_distance <= 0.0 {
+        return vec4<f32>(0.0);
+    }
+
+    let quad = quads[input.quad_id];
+    let half_size = quad.bounds.size / 2.0;
+    let center = quad.bounds.origin + half_size;
+    let center_to_point = input.position.xy - center;
+
+    var corner_radius = 0.0;
+    if (center_to_point.x < 0.0) {
+        if (center_to_point.y < 0.0) {
+            corner_radius = quad.corner_radii.top_left;
+        } else {
+            corner_radius = quad.corner_radii.bottom_left;
+        }
+    } else {
+        if (center_to_point.y < 0.) {
+            corner_radius = quad.corner_radii.top_right;
+        } else {
+            corner_radius = quad.corner_radii.bottom_right;
+        }
+    }
+
+    let rounded_edge_to_point = abs(center_to_point) - half_size + corner_radius;
+    let distance =
+      length(max(vec2<f32>(0.0), rounded_edge_to_point)) +
+      min(0.0, max(rounded_edge_to_point.x, rounded_edge_to_point.y)) -
+      corner_radius;
+
+    let vertical_border = select(quad.border_widths.left, quad.border_widths.right, center_to_point.x > 0.0);
+    let horizontal_border = select(quad.border_widths.top, quad.border_widths.bottom, center_to_point.y > 0.0);
+    let inset_size = half_size - corner_radius - vec2<f32>(vertical_border, horizontal_border);
+    let point_to_inset_corner = abs(center_to_point) - inset_size;
+
+    var border_width = 0.0;
+    if (point_to_inset_corner.x < 0.0 && point_to_inset_corner.y < 0.0) {
+        border_width = 0.0;
+    } else if (point_to_inset_corner.y > point_to_inset_corner.x) {
+        border_width = horizontal_border;
+    } else {
+        border_width = vertical_border;
+    }
+
+    var color = input.background_color;
+    if (border_width > 0.0) {
+        let inset_distance = distance + border_width;
+        // Blend the border on top of the background and then linearly interpolate
+        // between the two as we slide inside the background.
+        let blended_border = over(input.background_color, input.border_color);
+        color = mix(blended_border, input.background_color,
+                    saturate(0.5 - inset_distance));
+    }
+
+    return color * vec4<f32>(1.0, 1.0, 1.0, saturate(0.5 - distance));
+}
\ No newline at end of file
diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index 85ede0ab5a..a0d8157aab 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -3,6 +3,7 @@ use crate::{
     AnyWindowHandle, BladeAtlas, LinuxDisplay, Pixels, PlatformDisplay, PlatformInputHandler,
     PlatformWindow, Point, Size, WindowAppearance, WindowBounds, WindowOptions, XcbAtoms,
 };
+use blade_graphics as gpu;
 use parking_lot::Mutex;
 use std::{
     ffi::c_void,
@@ -15,6 +16,7 @@ use xcb::{x, Xid as _};
 struct Callbacks {
     request_frame: Option<Box<dyn FnMut()>>,
     resize: Option<Box<dyn FnMut(Size<Pixels>, f32)>>,
+    moved: Option<Box<dyn FnMut()>>,
 }
 
 pub(crate) struct LinuxWindowState {
@@ -24,6 +26,7 @@ pub(crate) struct LinuxWindowState {
     content_size: Size<Pixels>,
     sprite_atlas: Arc<BladeAtlas>,
     renderer: BladeRenderer,
+    //TODO: move out into a separate struct
     callbacks: Callbacks,
 }
 
@@ -136,9 +139,9 @@ impl LinuxWindowState {
         };
         let gpu = Arc::new(
             unsafe {
-                blade::Context::init_windowed(
+                gpu::Context::init_windowed(
                     &raw_window,
-                    blade::ContextDesc {
+                    gpu::ContextDesc {
                         validation: cfg!(debug_assertions),
                         capture: false,
                     },
@@ -146,7 +149,7 @@ impl LinuxWindowState {
             }
             .unwrap(),
         );
-        let gpu_extent = blade::Extent {
+        let gpu_extent = gpu::Extent {
             width: bound_width as u32,
             height: bound_height as u32,
             depth: 1,
@@ -186,7 +189,7 @@ impl LinuxWindowState {
         let mut this = self_ptr.lock();
         this.callbacks.resize = Some(fun);
         this.content_size = content_size;
-        this.renderer.resize(blade::Extent {
+        this.renderer.resize(gpu::Extent {
             width: width as u32,
             height: height as u32,
             depth: 1,
@@ -294,7 +297,9 @@ impl PlatformWindow for LinuxWindow {
 
     fn on_fullscreen(&self, _callback: Box<dyn FnMut(bool)>) {}
 
-    fn on_moved(&self, callback: Box<dyn FnMut()>) {}
+    fn on_moved(&self, callback: Box<dyn FnMut()>) {
+        self.0.lock().callbacks.moved = Some(callback);
+    }
 
     fn on_should_close(&self, _callback: Box<dyn FnMut() -> bool>) {}
 

From ecf4955899c97b44d57c21de58c33e684d35ba79 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Tue, 30 Jan 2024 21:37:54 -0800
Subject: [PATCH 158/372] hide MacOS dependencie of live_kit_client and media

---
 crates/live_kit_client/Cargo.toml | 8 +++++++-
 crates/media/Cargo.toml           | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/crates/live_kit_client/Cargo.toml b/crates/live_kit_client/Cargo.toml
index 32c180c48c..3aeba54af0 100644
--- a/crates/live_kit_client/Cargo.toml
+++ b/crates/live_kit_client/Cargo.toml
@@ -52,7 +52,6 @@ block = "0.1"
 byteorder = "1.4"
 bytes = "1.2"
 collections = { path = "../collections", features = ["test-support"] }
-foreign-types = "0.3"
 futures.workspace = true
 gpui = { path = "../gpui", features = ["test-support"] }
 hmac = "0.12"
@@ -66,6 +65,13 @@ serde_derive.workspace = true
 sha2 = "0.10"
 simplelog = "0.9"
 
+[target.'cfg(target_os = "macos")'.dev-dependencies]
+cocoa = "0.25"
+core-foundation = "0.9.3"
+core-graphics = "0.22.3"
+foreign-types = "0.3"
+objc = "0.2"
+
 [build-dependencies]
 serde.workspace = true
 serde_derive.workspace = true
diff --git a/crates/media/Cargo.toml b/crates/media/Cargo.toml
index 351ae37252..bb9751e9da 100644
--- a/crates/media/Cargo.toml
+++ b/crates/media/Cargo.toml
@@ -13,10 +13,10 @@ doctest = false
 anyhow.workspace = true
 block = "0.1"
 bytes = "1.2"
-foreign-types = "0.3"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation = "0.9.3"
+foreign-types = "0.3"
 metal = "0.21.0"
 objc = "0.2"
 

From 666b134d2067d4f1bb153908230e3e8e69d86535 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Wed, 31 Jan 2024 00:04:05 -0800
Subject: [PATCH 159/372] linux: shadow rendering

---
 Cargo.toml                                    |   7 +-
 crates/gpui/Cargo.toml                        |   4 +-
 crates/gpui/build.rs                          |   4 +-
 .../gpui/src/platform/linux/blade_renderer.rs |  70 ++++--
 crates/gpui/src/platform/linux/platform.rs    |   5 +-
 crates/gpui/src/platform/linux/shaders.wgsl   | 200 ++++++++++++++----
 crates/gpui/src/platform/linux/window.rs      |   6 +-
 crates/gpui/src/scene.rs                      |   1 +
 crates/gpui/src/window/element_cx.rs          |   1 +
 9 files changed, 236 insertions(+), 62 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 847fc77d62..019cb3f356 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -182,7 +182,7 @@ tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "1d897
 wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "v16.0.0" }
 
 # TODO - Remove when corresponding Blade versions are published
-# Currently in https://github.com/kvark/blade/tree/zed
+[patch."https://github.com/kvark/blade"]
 blade-graphics = { path = "/x/Code/blade/blade-graphics" }
 blade-macros = { path = "/x/Code/blade/blade-macros" }
 
@@ -190,6 +190,11 @@ blade-macros = { path = "/x/Code/blade/blade-macros" }
 split-debuginfo = "unpacked"
 debug = "limited"
 
+# TODO - Remove this
+[profile.dev.package.blade-graphics]
+split-debuginfo = "off"
+debug = "full"
+
 [profile.dev.package.taffy]
 opt-level = 3
 
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 72cc1bd253..6dd64752cc 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -26,8 +26,8 @@ anyhow.workspace = true
 async-task = "4.7"
 backtrace = { version = "0.3", optional = true }
 bitflags = "2.4.0"
-blade-graphics = "0.3"
-blade-macros = "0.2"
+blade-graphics = { git = "https://github.com/kvark/blade", branch = "zed" }
+blade-macros = { git = "https://github.com/kvark/blade", branch = "zed" }
 bytemuck = "1"
 collections = { path = "../collections" }
 ctor.workspace = true
diff --git a/crates/gpui/build.rs b/crates/gpui/build.rs
index 32da465007..70c3d8d8e4 100644
--- a/crates/gpui/build.rs
+++ b/crates/gpui/build.rs
@@ -7,7 +7,7 @@ use cbindgen::Config;
 
 fn main() {
     //generate_dispatch_bindings();
-    let _header_path = generate_shader_bindings();
+    //let header_path = generate_shader_bindings();
     //#[cfg(feature = "runtime_shaders")]
     //emit_stitched_shaders(&header_path);
     //#[cfg(not(feature = "runtime_shaders"))]
@@ -38,7 +38,7 @@ fn _generate_dispatch_bindings() {
         .expect("couldn't write dispatch bindings");
 }
 
-fn generate_shader_bindings() -> PathBuf {
+fn _generate_shader_bindings() -> PathBuf {
     let output_path = PathBuf::from(env::var("OUT_DIR").unwrap()).join("scene.h");
     let crate_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
     let mut config = Config::default();
diff --git a/crates/gpui/src/platform/linux/blade_renderer.rs b/crates/gpui/src/platform/linux/blade_renderer.rs
index 095c652e95..4d58cbd1e6 100644
--- a/crates/gpui/src/platform/linux/blade_renderer.rs
+++ b/crates/gpui/src/platform/linux/blade_renderer.rs
@@ -1,5 +1,8 @@
+// Doing `if let` gives you nice scoping with passes/encoders
+#![allow(irrefutable_let_patterns)]
+
 use super::{BladeBelt, BladeBeltDescriptor};
-use crate::{PrimitiveBatch, Quad, Scene};
+use crate::{PrimitiveBatch, Quad, Scene, Shadow};
 use bytemuck::{Pod, Zeroable};
 
 use blade_graphics as gpu;
@@ -18,11 +21,18 @@ struct GlobalParams {
 #[derive(blade_macros::ShaderData)]
 struct ShaderQuadsData {
     globals: GlobalParams,
-    quads: gpu::BufferPiece,
+    b_quads: gpu::BufferPiece,
+}
+
+#[derive(blade_macros::ShaderData)]
+struct ShaderShadowsData {
+    globals: GlobalParams,
+    b_shadows: gpu::BufferPiece,
 }
 
 struct BladePipelines {
     quads: gpu::RenderPipeline,
+    shadows: gpu::RenderPipeline,
 }
 
 impl BladePipelines {
@@ -31,18 +41,36 @@ impl BladePipelines {
             source: include_str!("shaders.wgsl"),
         });
         shader.check_struct_size::<Quad>();
-        let layout = <ShaderQuadsData as gpu::ShaderData>::layout();
+        shader.check_struct_size::<Shadow>();
+        let quads_layout = <ShaderQuadsData as gpu::ShaderData>::layout();
+        let shadows_layout = <ShaderShadowsData as gpu::ShaderData>::layout();
         Self {
             quads: gpu.create_render_pipeline(gpu::RenderPipelineDesc {
                 name: "quads",
-                data_layouts: &[&layout],
-                vertex: shader.at("vs_quads"),
+                data_layouts: &[&quads_layout],
+                vertex: shader.at("vs_quad"),
                 primitive: gpu::PrimitiveState {
                     topology: gpu::PrimitiveTopology::TriangleStrip,
                     ..Default::default()
                 },
                 depth_stencil: None,
-                fragment: shader.at("fs_quads"),
+                fragment: shader.at("fs_quad"),
+                color_targets: &[gpu::ColorTargetState {
+                    format: surface_format,
+                    blend: Some(gpu::BlendState::ALPHA_BLENDING),
+                    write_mask: gpu::ColorWrites::default(),
+                }],
+            }),
+            shadows: gpu.create_render_pipeline(gpu::RenderPipelineDesc {
+                name: "shadows",
+                data_layouts: &[&shadows_layout],
+                vertex: shader.at("vs_shadow"),
+                primitive: gpu::PrimitiveState {
+                    topology: gpu::PrimitiveTopology::TriangleStrip,
+                    ..Default::default()
+                },
+                depth_stencil: None,
+                fragment: shader.at("fs_shadow"),
                 color_targets: &[gpu::ColorTargetState {
                     format: surface_format,
                     blend: Some(gpu::BlendState::ALPHA_BLENDING),
@@ -117,6 +145,14 @@ impl BladeRenderer {
         self.command_encoder.start();
         self.command_encoder.init_texture(frame.texture());
 
+        let globals = GlobalParams {
+            viewport_size: [
+                self.viewport_size.width as f32,
+                self.viewport_size.height as f32,
+            ],
+            pad: [0; 2],
+        };
+
         if let mut pass = self.command_encoder.render(gpu::RenderTargetSet {
             colors: &[gpu::RenderTarget {
                 view: frame.texture_view(),
@@ -133,18 +169,24 @@ impl BladeRenderer {
                         encoder.bind(
                             0,
                             &ShaderQuadsData {
-                                globals: GlobalParams {
-                                    viewport_size: [
-                                        self.viewport_size.width as f32,
-                                        self.viewport_size.height as f32,
-                                    ],
-                                    pad: [0; 2],
-                                },
-                                quads: instances,
+                                globals,
+                                b_quads: instances,
                             },
                         );
                         encoder.draw(0, 4, 0, quads.len() as u32);
                     }
+                    PrimitiveBatch::Shadows(shadows) => {
+                        let instances = self.instance_belt.alloc_data(shadows, &self.gpu);
+                        let mut encoder = pass.with(&self.pipelines.shadows);
+                        encoder.bind(
+                            0,
+                            &ShaderShadowsData {
+                                globals,
+                                b_shadows: instances,
+                            },
+                        );
+                        encoder.draw(0, 4, 0, shadows.len() as u32);
+                    }
                     _ => continue,
                 }
             }
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index 08bf081853..398d741ff3 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -112,10 +112,10 @@ impl Platform for LinuxPlatform {
                 xcb::Event::X(x::Event::Expose(ev)) => {
                     repaint_x_window = Some(ev.window());
                 }
-                xcb::Event::X(x::Event::ResizeRequest(ev)) => {
+                xcb::Event::X(x::Event::ConfigureNotify(ev)) => {
                     let this = self.0.lock();
                     LinuxWindowState::resize(&this.windows[&ev.window()], ev.width(), ev.height());
-                    repaint_x_window = Some(ev.window());
+                    this.xcb_connection.flush();
                 }
                 _ => {}
             }
@@ -175,7 +175,6 @@ impl Platform for LinuxPlatform {
 
         let window_ptr = LinuxWindowState::new_ptr(
             options,
-            handle,
             &this.xcb_connection,
             this.x_root_index,
             x_window,
diff --git a/crates/gpui/src/platform/linux/shaders.wgsl b/crates/gpui/src/platform/linux/shaders.wgsl
index 0cc70e5220..a4e280cbef 100644
--- a/crates/gpui/src/platform/linux/shaders.wgsl
+++ b/crates/gpui/src/platform/linux/shaders.wgsl
@@ -1,3 +1,17 @@
+struct Globals {
+    viewport_size: vec2<f32>,
+    pad: vec2<u32>,
+}
+
+var<uniform> globals: Globals;
+
+const M_PI_F: f32 = 3.1415926;
+
+struct ViewId {
+	lo: u32,
+	hi: u32,
+}
+
 struct Bounds {
     origin: vec2<f32>,
     size: vec2<f32>,
@@ -21,35 +35,6 @@ struct Hsla {
     a: f32,
 }
 
-struct Quad {
-    view_id: vec2<u32>,
-    layer_id: u32,
-    order: u32,
-    bounds: Bounds,
-    content_mask: Bounds,
-    background: Hsla,
-    border_color: Hsla,
-    corner_radii: Corners,
-    border_widths: Edges,
-}
-
-struct Globals {
-    viewport_size: vec2<f32>,
-    pad: vec2<u32>,
-}
-
-var<uniform> globals: Globals;
-var<storage, read> quads: array<Quad>;
-
-struct QuadsVarying {
-    @builtin(position) position: vec4<f32>,
-    @location(0) @interpolate(flat) background_color: vec4<f32>,
-    @location(1) @interpolate(flat) border_color: vec4<f32>,
-    @location(2) @interpolate(flat) quad_id: u32,
-    //TODO: use `clip_distance` once Naga supports it
-    @location(3) clip_distances: vec4<f32>,
-}
-
 fn to_device_position(unit_vertex: vec2<f32>, bounds: Bounds) -> vec4<f32> {
     let position = unit_vertex * vec2<f32>(bounds.size) + bounds.origin;
     let device_position = position / globals.viewport_size * vec2<f32>(2.0, -2.0) + vec2<f32>(-1.0, 1.0);
@@ -99,17 +84,62 @@ fn hsla_to_rgba(hsla: Hsla) -> vec4<f32> {
 }
 
 fn over(below: vec4<f32>, above: vec4<f32>) -> vec4<f32> {
-  let alpha = above.a + below.a * (1.0 - above.a);
-  let color = (above.rgb * above.a + below.rgb * below.a * (1.0 - above.a)) / alpha;
-  return vec4<f32>(color, alpha);
+    let alpha = above.a + below.a * (1.0 - above.a);
+    let color = (above.rgb * above.a + below.rgb * below.a * (1.0 - above.a)) / alpha;
+    return vec4<f32>(color, alpha);
+}
+
+// A standard gaussian function, used for weighting samples
+fn gaussian(x: f32, sigma: f32) -> f32{
+    return exp(-(x * x) / (2.0 * sigma * sigma)) / (sqrt(2.0 * M_PI_F) * sigma);
+}
+
+// This approximates the error function, needed for the gaussian integral
+fn erf(v: vec2<f32>) -> vec2<f32> {
+    let s = sign(v);
+    let a = abs(v);
+    let r1 = 1.0 + (0.278393 + (0.230389 + 0.078108 * (a * a)) * a) * a;
+    let r2 = r1 * r1;
+    return s - s / (r2 * r2);
+}
+
+fn blur_along_x(x: f32, y: f32, sigma: f32, corner: f32, half_size: vec2<f32>) -> f32 {
+  let delta = min(half_size.y - corner - abs(y), 0.0);
+  let curved = half_size.x - corner + sqrt(max(0.0, corner * corner - delta * delta));
+  let integral = 0.5 + 0.5 * erf((x + vec2<f32>(-curved, curved)) * (sqrt(0.5) / sigma));
+  return integral.y - integral.x;
+}
+
+// --- quads --- //
+
+struct Quad {
+    view_id: ViewId,
+    layer_id: u32,
+    order: u32,
+    bounds: Bounds,
+    content_mask: Bounds,
+    background: Hsla,
+    border_color: Hsla,
+    corner_radii: Corners,
+    border_widths: Edges,
+}
+var<storage, read> b_quads: array<Quad>;
+
+struct QuadVarying {
+    @builtin(position) position: vec4<f32>,
+    @location(0) @interpolate(flat) background_color: vec4<f32>,
+    @location(1) @interpolate(flat) border_color: vec4<f32>,
+    @location(2) @interpolate(flat) quad_id: u32,
+    //TODO: use `clip_distance` once Naga supports it
+    @location(3) clip_distances: vec4<f32>,
 }
 
 @vertex
-fn vs_quads(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index) instance_id: u32) -> QuadsVarying {
+fn vs_quad(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index) instance_id: u32) -> QuadVarying {
     let unit_vertex = vec2<f32>(f32(vertex_id & 1u), 0.5 * f32(vertex_id & 2u));
-    let quad = quads[instance_id];
+    let quad = b_quads[instance_id];
 
-    var out = QuadsVarying();
+    var out = QuadVarying();
     out.position = to_device_position(unit_vertex, quad.bounds);
     out.background_color = hsla_to_rgba(quad.background);
     out.border_color = hsla_to_rgba(quad.border_color);
@@ -119,7 +149,7 @@ fn vs_quads(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index) inst
 }
 
 @fragment
-fn fs_quads(input: QuadsVarying) -> @location(0) vec4<f32> {
+fn fs_quad(input: QuadVarying) -> @location(0) vec4<f32> {
     // Alpha clip first, since we don't have `clip_distance`.
     let min_distance = min(
         min(input.clip_distances.x, input.clip_distances.y),
@@ -129,7 +159,7 @@ fn fs_quads(input: QuadsVarying) -> @location(0) vec4<f32> {
         return vec4<f32>(0.0);
     }
 
-    let quad = quads[input.quad_id];
+    let quad = b_quads[input.quad_id];
     let half_size = quad.bounds.size / 2.0;
     let center = quad.bounds.origin + half_size;
     let center_to_point = input.position.xy - center;
@@ -180,4 +210,98 @@ fn fs_quads(input: QuadsVarying) -> @location(0) vec4<f32> {
     }
 
     return color * vec4<f32>(1.0, 1.0, 1.0, saturate(0.5 - distance));
-}
\ No newline at end of file
+}
+
+// --- shadows --- //
+
+struct Shadow {
+    view_id: ViewId,
+    layer_id: u32,
+    order: u32,
+    bounds: Bounds,
+    corner_radii: Corners,
+    content_mask: Bounds,
+    color: Hsla,
+    blur_radius: f32,
+    pad: u32,
+}
+var<storage, read> b_shadows: array<Shadow>;
+
+struct ShadowVarying {
+    @builtin(position) position: vec4<f32>,
+    @location(0) @interpolate(flat) color: vec4<f32>,
+    @location(1) @interpolate(flat) shadow_id: u32,
+    //TODO: use `clip_distance` once Naga supports it
+    @location(3) clip_distances: vec4<f32>,
+}
+
+@vertex
+fn vs_shadow(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index) instance_id: u32) -> ShadowVarying {
+    let unit_vertex = vec2<f32>(f32(vertex_id & 1u), 0.5 * f32(vertex_id & 2u));
+    let shadow = b_shadows[instance_id];
+
+    let margin = 3.0 * shadow.blur_radius;
+    // Set the bounds of the shadow and adjust its size based on the shadow's
+    // spread radius to achieve the spreading effect
+    var bounds = shadow.bounds;
+    bounds.origin -= vec2<f32>(margin);
+    bounds.size += 2.0 * vec2<f32>(margin);
+
+    var out = ShadowVarying();
+    out.position = to_device_position(unit_vertex, shadow.bounds);
+    out.color = hsla_to_rgba(shadow.color);
+    out.shadow_id = instance_id;
+    out.clip_distances = distance_from_clip_rect(unit_vertex, shadow.bounds, shadow.content_mask);
+    return out;
+}
+
+@fragment
+fn fs_shadow(input: ShadowVarying) -> @location(0) vec4<f32> {
+    // Alpha clip first, since we don't have `clip_distance`.
+    let min_distance = min(
+        min(input.clip_distances.x, input.clip_distances.y),
+        min(input.clip_distances.z, input.clip_distances.w)
+    );
+    if min_distance <= 0.0 {
+        return vec4<f32>(0.0);
+    }
+
+    let shadow = b_shadows[input.shadow_id];
+    let half_size = shadow.bounds.size / 2.0;
+    let center = shadow.bounds.origin + half_size;
+    let center_to_point = input.position.xy - center;
+
+    var corner_radius = 0.0;
+    if (center_to_point.x < 0.0) {
+        if (center_to_point.y < 0.0) {
+            corner_radius = shadow.corner_radii.top_left;
+        } else {
+            corner_radius = shadow.corner_radii.bottom_left;
+        }
+    } else {
+        if (center_to_point.y < 0.) {
+            corner_radius = shadow.corner_radii.top_right;
+        } else {
+            corner_radius = shadow.corner_radii.bottom_right;
+        }
+    }
+
+    // The signal is only non-zero in a limited range, so don't waste samples
+    let low = center_to_point.y - half_size.y;
+    let high = center_to_point.y + half_size.y;
+    let start = clamp(-3.0 * shadow.blur_radius, low, high);
+    let end = clamp(3.0 * shadow.blur_radius, low, high);
+
+    // Accumulate samples (we can get away with surprisingly few samples)
+    let step = (end - start) / 4.0;
+    var y = start + step * 0.5;
+    var alpha = 0.0;
+    for (var i = 0; i < 4; i += 1) {
+        let blur = blur_along_x(center_to_point.x, center_to_point.y - y,
+            shadow.blur_radius, corner_radius, half_size);
+        alpha +=  blur * gaussian(y, shadow.blur_radius) * step;
+        y += step;
+    }
+
+    return input.color * vec4<f32>(1.0, 1.0, 1.0, alpha);
+}
diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index a0d8157aab..0f0916b0db 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -38,11 +38,13 @@ struct RawWindow {
     connection: *mut c_void,
     screen_id: i32,
     window_id: u32,
+    visual_id: u32,
 }
 unsafe impl raw_window_handle::HasRawWindowHandle for RawWindow {
     fn raw_window_handle(&self) -> raw_window_handle::RawWindowHandle {
         let mut wh = raw_window_handle::XcbWindowHandle::empty();
         wh.window = self.window_id;
+        wh.visual_id = self.visual_id;
         wh.into()
     }
 }
@@ -58,7 +60,6 @@ unsafe impl raw_window_handle::HasRawDisplayHandle for RawWindow {
 impl LinuxWindowState {
     pub fn new_ptr(
         options: WindowOptions,
-        handle: AnyWindowHandle,
         xcb_connection: &xcb::Connection,
         x_main_screen_index: i32,
         x_window: x::Window,
@@ -76,7 +77,7 @@ impl LinuxWindowState {
         let xcb_values = [
             x::Cw::BackPixel(screen.white_pixel()),
             x::Cw::EventMask(
-                x::EventMask::EXPOSURE | x::EventMask::RESIZE_REDIRECT | x::EventMask::KEY_PRESS,
+                x::EventMask::EXPOSURE | x::EventMask::STRUCTURE_NOTIFY | x::EventMask::KEY_PRESS,
             ),
         ];
 
@@ -136,6 +137,7 @@ impl LinuxWindowState {
             ) as *mut _,
             screen_id: x_screen_index,
             window_id: x_window.resource_id(),
+            visual_id: screen.root_visual(),
         };
         let gpu = Arc::new(
             unsafe {
diff --git a/crates/gpui/src/scene.rs b/crates/gpui/src/scene.rs
index e1aa7fda20..f5fcade711 100644
--- a/crates/gpui/src/scene.rs
+++ b/crates/gpui/src/scene.rs
@@ -577,6 +577,7 @@ pub(crate) struct Shadow {
     pub content_mask: ContentMask<ScaledPixels>,
     pub color: Hsla,
     pub blur_radius: ScaledPixels,
+    pub pad: u32, // align to 8 bytes
 }
 
 impl Ord for Shadow {
diff --git a/crates/gpui/src/window/element_cx.rs b/crates/gpui/src/window/element_cx.rs
index 6e2e5bc725..cde5f17b05 100644
--- a/crates/gpui/src/window/element_cx.rs
+++ b/crates/gpui/src/window/element_cx.rs
@@ -677,6 +677,7 @@ impl<'a> ElementContext<'a> {
                     corner_radii: corner_radii.scale(scale_factor),
                     color: shadow.color,
                     blur_radius: shadow.blur_radius.scale(scale_factor),
+                    pad: 0,
                 },
             );
         }

From c9ec3370349181c8aee6cc9eb1d8f94768073cf5 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Wed, 31 Jan 2024 00:12:44 -0800
Subject: [PATCH 160/372] linux: share corner picking code between shaders

---
 crates/gpui/src/platform/linux/shaders.wgsl | 62 ++++++++-------------
 1 file changed, 22 insertions(+), 40 deletions(-)

diff --git a/crates/gpui/src/platform/linux/shaders.wgsl b/crates/gpui/src/platform/linux/shaders.wgsl
index a4e280cbef..c25456ff3f 100644
--- a/crates/gpui/src/platform/linux/shaders.wgsl
+++ b/crates/gpui/src/platform/linux/shaders.wgsl
@@ -8,8 +8,8 @@ var<uniform> globals: Globals;
 const M_PI_F: f32 = 3.1415926;
 
 struct ViewId {
-	lo: u32,
-	hi: u32,
+    lo: u32,
+    hi: u32,
 }
 
 struct Bounds {
@@ -110,6 +110,22 @@ fn blur_along_x(x: f32, y: f32, sigma: f32, corner: f32, half_size: vec2<f32>) -
   return integral.y - integral.x;
 }
 
+fn pick_corner_radius(point: vec2<f32>, radii: Corners) -> f32 {
+    if (point.x < 0.0) {
+        if (point.y < 0.0) {
+            return radii.top_left;
+        } else {
+            return radii.bottom_left;
+        }
+    } else {
+        if (point.y < 0.0) {
+            return radii.top_right;
+        } else {
+            return radii.bottom_right;
+        }
+    }
+}
+
 // --- quads --- //
 
 struct Quad {
@@ -151,11 +167,7 @@ fn vs_quad(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index) insta
 @fragment
 fn fs_quad(input: QuadVarying) -> @location(0) vec4<f32> {
     // Alpha clip first, since we don't have `clip_distance`.
-    let min_distance = min(
-        min(input.clip_distances.x, input.clip_distances.y),
-        min(input.clip_distances.z, input.clip_distances.w)
-    );
-    if min_distance <= 0.0 {
+    if (any(input.clip_distances < vec4<f32>(0.0))) {
         return vec4<f32>(0.0);
     }
 
@@ -164,20 +176,7 @@ fn fs_quad(input: QuadVarying) -> @location(0) vec4<f32> {
     let center = quad.bounds.origin + half_size;
     let center_to_point = input.position.xy - center;
 
-    var corner_radius = 0.0;
-    if (center_to_point.x < 0.0) {
-        if (center_to_point.y < 0.0) {
-            corner_radius = quad.corner_radii.top_left;
-        } else {
-            corner_radius = quad.corner_radii.bottom_left;
-        }
-    } else {
-        if (center_to_point.y < 0.) {
-            corner_radius = quad.corner_radii.top_right;
-        } else {
-            corner_radius = quad.corner_radii.bottom_right;
-        }
-    }
+    let corner_radius = pick_corner_radius(center_to_point, quad.corner_radii);
 
     let rounded_edge_to_point = abs(center_to_point) - half_size + corner_radius;
     let distance =
@@ -258,11 +257,7 @@ fn vs_shadow(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index) ins
 @fragment
 fn fs_shadow(input: ShadowVarying) -> @location(0) vec4<f32> {
     // Alpha clip first, since we don't have `clip_distance`.
-    let min_distance = min(
-        min(input.clip_distances.x, input.clip_distances.y),
-        min(input.clip_distances.z, input.clip_distances.w)
-    );
-    if min_distance <= 0.0 {
+    if (any(input.clip_distances < vec4<f32>(0.0))) {
         return vec4<f32>(0.0);
     }
 
@@ -271,20 +266,7 @@ fn fs_shadow(input: ShadowVarying) -> @location(0) vec4<f32> {
     let center = shadow.bounds.origin + half_size;
     let center_to_point = input.position.xy - center;
 
-    var corner_radius = 0.0;
-    if (center_to_point.x < 0.0) {
-        if (center_to_point.y < 0.0) {
-            corner_radius = shadow.corner_radii.top_left;
-        } else {
-            corner_radius = shadow.corner_radii.bottom_left;
-        }
-    } else {
-        if (center_to_point.y < 0.) {
-            corner_radius = shadow.corner_radii.top_right;
-        } else {
-            corner_radius = shadow.corner_radii.bottom_right;
-        }
-    }
+    let corner_radius = pick_corner_radius(center_to_point, shadow.corner_radii);
 
     // The signal is only non-zero in a limited range, so don't waste samples
     let low = center_to_point.y - half_size.y;

From ce84a2a67196876dc5d1d76ecb1c0b37cd8cb9c4 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Thu, 1 Feb 2024 00:01:50 -0800
Subject: [PATCH 161/372] linux: refactor window structure, support move
 callback

---
 crates/gpui/examples/hello_world.rs        |   5 +-
 crates/gpui/src/platform/linux/platform.rs |  55 +++--
 crates/gpui/src/platform/linux/window.rs   | 227 +++++++++++++--------
 3 files changed, 171 insertions(+), 116 deletions(-)

diff --git a/crates/gpui/examples/hello_world.rs b/crates/gpui/examples/hello_world.rs
index 736fd14450..d0578e6681 100644
--- a/crates/gpui/examples/hello_world.rs
+++ b/crates/gpui/examples/hello_world.rs
@@ -9,9 +9,12 @@ impl Render for HelloWorld {
         div()
             .flex()
             .bg(rgb(0x2e7d32))
-            .size_full()
+            .size(Length::Definite(Pixels(300.0).into()))
             .justify_center()
             .items_center()
+            .shadow_lg()
+            .border()
+            .border_color(rgb(0x0000ff))
             .text_xl()
             .text_color(rgb(0xffffff))
             .child(format!("Hello, {}!", &self.text))
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index 398d741ff3..f5f251f1ef 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -1,11 +1,10 @@
 #![allow(unused)]
 
 use crate::{
-    Action, AnyWindowHandle, BackgroundExecutor, ClipboardItem, CursorStyle, DisplayId,
+    Action, AnyWindowHandle, BackgroundExecutor, Bounds, ClipboardItem, CursorStyle, DisplayId,
     ForegroundExecutor, Keymap, LinuxDispatcher, LinuxDisplay, LinuxTextSystem, LinuxWindow,
-    LinuxWindowState, LinuxWindowStatePtr, Menu, PathPromptOptions, Platform, PlatformDisplay,
-    PlatformInput, PlatformTextSystem, PlatformWindow, Result, SemanticVersion, Task,
-    WindowOptions,
+    LinuxWindowState, Menu, PathPromptOptions, Platform, PlatformDisplay, PlatformInput,
+    PlatformTextSystem, PlatformWindow, Point, Result, SemanticVersion, Size, Task, WindowOptions,
 };
 
 use collections::{HashMap, HashSet};
@@ -35,12 +34,12 @@ xcb::atoms_struct! {
 pub(crate) struct LinuxPlatform(Mutex<LinuxPlatformState>);
 
 pub(crate) struct LinuxPlatformState {
-    xcb_connection: xcb::Connection,
+    xcb_connection: Arc<xcb::Connection>,
     x_root_index: i32,
     atoms: XcbAtoms,
     background_executor: BackgroundExecutor,
     foreground_executor: ForegroundExecutor,
-    windows: HashMap<x::Window, LinuxWindowStatePtr>,
+    windows: HashMap<x::Window, Arc<LinuxWindowState>>,
     text_system: Arc<LinuxTextSystem>,
 }
 
@@ -58,7 +57,7 @@ impl LinuxPlatform {
         let dispatcher = Arc::new(LinuxDispatcher::new());
 
         Self(Mutex::new(LinuxPlatformState {
-            xcb_connection,
+            xcb_connection: Arc::new(xcb_connection),
             x_root_index,
             atoms,
             background_executor: BackgroundExecutor::new(dispatcher.clone()),
@@ -87,44 +86,38 @@ impl Platform for LinuxPlatform {
 
         while !self.0.lock().windows.is_empty() {
             let event = self.0.lock().xcb_connection.wait_for_event().unwrap();
-            let mut repaint_x_window = None;
             match event {
                 xcb::Event::X(x::Event::ClientMessage(ev)) => {
                     if let x::ClientMessageData::Data32([atom, ..]) = ev.data() {
                         let mut this = self.0.lock();
                         if atom == this.atoms.wm_del_window.resource_id() {
                             // window "x" button clicked by user, we gracefully exit
-                            {
-                                let mut window = this.windows[&ev.window()].lock();
-                                window.destroy();
-                            }
-                            this.xcb_connection.send_request(&x::UnmapWindow {
-                                window: ev.window(),
-                            });
-                            this.xcb_connection.send_request(&x::DestroyWindow {
-                                window: ev.window(),
-                            });
-                            this.windows.remove(&ev.window());
+                            let window = this.windows.remove(&ev.window()).unwrap();
+                            window.destroy();
                             break;
                         }
                     }
                 }
                 xcb::Event::X(x::Event::Expose(ev)) => {
-                    repaint_x_window = Some(ev.window());
+                    let this = self.0.lock();
+                    this.windows[&ev.window()].expose();
                 }
                 xcb::Event::X(x::Event::ConfigureNotify(ev)) => {
+                    let bounds = Bounds {
+                        origin: Point {
+                            x: ev.x().into(),
+                            y: ev.y().into(),
+                        },
+                        size: Size {
+                            width: ev.width().into(),
+                            height: ev.height().into(),
+                        },
+                    };
                     let this = self.0.lock();
-                    LinuxWindowState::resize(&this.windows[&ev.window()], ev.width(), ev.height());
-                    this.xcb_connection.flush();
+                    this.windows[&ev.window()].configure(bounds);
                 }
                 _ => {}
             }
-
-            if let Some(x_window) = repaint_x_window {
-                let this = self.0.lock();
-                LinuxWindowState::request_frame(&this.windows[&x_window]);
-                this.xcb_connection.flush();
-            }
         }
     }
 
@@ -173,14 +166,14 @@ impl Platform for LinuxPlatform {
         let mut this = self.0.lock();
         let x_window = this.xcb_connection.generate_id();
 
-        let window_ptr = LinuxWindowState::new_ptr(
+        let window_ptr = Arc::new(LinuxWindowState::new(
             options,
             &this.xcb_connection,
             this.x_root_index,
             x_window,
             &this.atoms,
-        );
-        this.windows.insert(x_window, window_ptr.clone());
+        ));
+        this.windows.insert(x_window, Arc::clone(&window_ptr));
         Box::new(LinuxWindow(window_ptr))
     }
 
diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index 0f0916b0db..71c80df1ba 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -1,12 +1,13 @@
 use super::BladeRenderer;
 use crate::{
-    AnyWindowHandle, BladeAtlas, LinuxDisplay, Pixels, PlatformDisplay, PlatformInputHandler,
+    BladeAtlas, Bounds, GlobalPixels, LinuxDisplay, Pixels, PlatformDisplay, PlatformInputHandler,
     PlatformWindow, Point, Size, WindowAppearance, WindowBounds, WindowOptions, XcbAtoms,
 };
 use blade_graphics as gpu;
 use parking_lot::Mutex;
 use std::{
     ffi::c_void,
+    mem,
     rc::Rc,
     sync::{self, Arc},
 };
@@ -15,24 +16,52 @@ use xcb::{x, Xid as _};
 #[derive(Default)]
 struct Callbacks {
     request_frame: Option<Box<dyn FnMut()>>,
+    input: Option<Box<dyn FnMut(crate::PlatformInput) -> bool>>,
+    active_status_change: Option<Box<dyn FnMut(bool)>>,
     resize: Option<Box<dyn FnMut(Size<Pixels>, f32)>>,
+    fullscreen: Option<Box<dyn FnMut(bool)>>,
     moved: Option<Box<dyn FnMut()>>,
+    should_close: Option<Box<dyn FnMut() -> bool>>,
+    close: Option<Box<dyn FnOnce()>>,
+    appearance_changed: Option<Box<dyn FnMut()>>,
+}
+
+struct LinuxWindowInner {
+    bounds: Bounds<i32>,
+    title_height: i32,
+    border_width: i32,
+    scale_factor: f32,
+    renderer: BladeRenderer,
+}
+
+impl LinuxWindowInner {
+    fn render_extent(&self) -> gpu::Extent {
+        gpu::Extent {
+            width: (self.bounds.size.width - 2 * self.border_width) as u32,
+            height: (self.bounds.size.height - 2 * self.border_width - self.title_height) as u32,
+            depth: 1,
+        }
+    }
+    fn content_size(&self) -> Size<Pixels> {
+        let extent = self.render_extent();
+        Size {
+            width: extent.width.into(),
+            height: extent.height.into(),
+        }
+    }
 }
 
 pub(crate) struct LinuxWindowState {
+    xcb_connection: Arc<xcb::Connection>,
     display: Rc<dyn PlatformDisplay>,
     x_window: x::Window,
-    window_bounds: WindowBounds,
-    content_size: Size<Pixels>,
+    callbacks: Mutex<Callbacks>,
+    inner: Mutex<LinuxWindowInner>,
     sprite_atlas: Arc<BladeAtlas>,
-    renderer: BladeRenderer,
-    //TODO: move out into a separate struct
-    callbacks: Callbacks,
 }
 
-pub(crate) type LinuxWindowStatePtr = Arc<Mutex<LinuxWindowState>>;
 #[derive(Clone)]
-pub(crate) struct LinuxWindow(pub(crate) LinuxWindowStatePtr);
+pub(crate) struct LinuxWindow(pub(crate) Arc<LinuxWindowState>);
 
 struct RawWindow {
     connection: *mut c_void,
@@ -58,13 +87,13 @@ unsafe impl raw_window_handle::HasRawDisplayHandle for RawWindow {
 }
 
 impl LinuxWindowState {
-    pub fn new_ptr(
+    pub fn new(
         options: WindowOptions,
-        xcb_connection: &xcb::Connection,
+        xcb_connection: &Arc<xcb::Connection>,
         x_main_screen_index: i32,
         x_window: x::Window,
         atoms: &XcbAtoms,
-    ) -> LinuxWindowStatePtr {
+    ) -> Self {
         let x_screen_index = options
             .display_id
             .map_or(x_main_screen_index, |did| did.0 as i32);
@@ -81,27 +110,27 @@ impl LinuxWindowState {
             ),
         ];
 
-        let (bound_x, bound_y, bound_width, bound_height) = match options.bounds {
-            WindowBounds::Fullscreen | WindowBounds::Maximized => {
-                (0, 0, screen.width_in_pixels(), screen.height_in_pixels())
-            }
-            WindowBounds::Fixed(bounds) => (
-                bounds.origin.x.0 as i16,
-                bounds.origin.y.0 as i16,
-                bounds.size.width.0 as u16,
-                bounds.size.height.0 as u16,
-            ),
+        let bounds = match options.bounds {
+            WindowBounds::Fullscreen | WindowBounds::Maximized => Bounds {
+                origin: Point::default(),
+                size: Size {
+                    width: screen.width_in_pixels() as i32,
+                    height: screen.height_in_pixels() as i32,
+                },
+            },
+            WindowBounds::Fixed(bounds) => bounds.map(|p| p.0 as i32),
         };
+        let border_width = 0i32;
 
         xcb_connection.send_request(&x::CreateWindow {
             depth: x::COPY_FROM_PARENT as u8,
             wid: x_window,
             parent: screen.root(),
-            x: bound_x,
-            y: bound_y,
-            width: bound_width,
-            height: bound_height,
-            border_width: 0,
+            x: bounds.origin.x as i16,
+            y: bounds.origin.y as i16,
+            width: bounds.size.width as u16,
+            height: bounds.size.height as u16,
+            border_width: border_width as u16,
             class: x::WindowClass::InputOutput,
             visual: screen.root_visual(),
             value_list: &xcb_values,
@@ -151,76 +180,93 @@ impl LinuxWindowState {
             }
             .unwrap(),
         );
+
         let gpu_extent = gpu::Extent {
-            width: bound_width as u32,
-            height: bound_height as u32,
+            width: bounds.size.width as u32,
+            height: bounds.size.height as u32,
             depth: 1,
         };
+        let sprite_atlas = Arc::new(BladeAtlas::new(&gpu));
 
-        Arc::new(Mutex::new(Self {
+        Self {
+            xcb_connection: Arc::clone(xcb_connection),
             display: Rc::new(LinuxDisplay::new(xcb_connection, x_screen_index)),
             x_window,
-            window_bounds: options.bounds,
-            content_size: Size {
-                width: Pixels(bound_width as f32),
-                height: Pixels(bound_height as f32),
-            },
-            sprite_atlas: Arc::new(BladeAtlas::new(&gpu)),
-            renderer: BladeRenderer::new(gpu, gpu_extent),
-            callbacks: Callbacks::default(),
-        }))
+            callbacks: Mutex::new(Callbacks::default()),
+            inner: Mutex::new(LinuxWindowInner {
+                bounds,
+                title_height: 0, //TODO
+                border_width,
+                scale_factor: 1.0,
+                renderer: BladeRenderer::new(gpu, gpu_extent),
+            }),
+            sprite_atlas,
+        }
     }
 
-    pub fn destroy(&mut self) {
+    pub fn destroy(&self) {
         self.sprite_atlas.destroy();
-        self.renderer.destroy();
-    }
-
-    pub fn resize(self_ptr: &LinuxWindowStatePtr, width: u16, height: u16) {
-        let content_size = Size {
-            width: Pixels(width as f32),
-            height: Pixels(height as f32),
-        };
-
-        let mut fun = match self_ptr.lock().callbacks.resize.take() {
-            Some(fun) => fun,
-            None => return,
-        };
-        fun(content_size, 1.0);
-
-        let mut this = self_ptr.lock();
-        this.callbacks.resize = Some(fun);
-        this.content_size = content_size;
-        this.renderer.resize(gpu::Extent {
-            width: width as u32,
-            height: height as u32,
-            depth: 1,
+        {
+            let mut inner = self.inner.lock();
+            inner.renderer.destroy();
+        }
+        self.xcb_connection.send_request(&x::UnmapWindow {
+            window: self.x_window,
         });
+        self.xcb_connection.send_request(&x::DestroyWindow {
+            window: self.x_window,
+        });
+        if let Some(fun) = self.callbacks.lock().close.take() {
+            fun();
+        }
     }
 
-    pub fn request_frame(self_ptr: &LinuxWindowStatePtr) {
-        let mut fun = match self_ptr.lock().callbacks.request_frame.take() {
-            Some(fun) => fun,
-            None => return,
-        };
-        fun();
+    pub fn expose(&self) {
+        let mut cb = self.callbacks.lock();
+        if let Some(ref mut fun) = cb.request_frame {
+            fun();
+        }
+    }
 
-        self_ptr.lock().callbacks.request_frame = Some(fun);
+    pub fn configure(&self, bounds: Bounds<i32>) {
+        let mut resize_args = None;
+        let mut do_move = false;
+        {
+            let mut inner = self.inner.lock();
+            let old_bounds = mem::replace(&mut inner.bounds, bounds);
+            do_move = old_bounds.origin != bounds.origin;
+            if old_bounds.size != bounds.size {
+                let extent = inner.render_extent();
+                inner.renderer.resize(extent);
+                resize_args = Some((inner.content_size(), inner.scale_factor));
+            }
+        }
+
+        let mut callbacks = self.callbacks.lock();
+        if let Some((content_size, scale_factor)) = resize_args {
+            if let Some(ref mut fun) = callbacks.resize {
+                fun(content_size, scale_factor)
+            }
+        }
+        if do_move {
+            if let Some(ref mut fun) = callbacks.moved {
+                fun()
+            }
+        }
     }
 }
 
 impl PlatformWindow for LinuxWindow {
     fn bounds(&self) -> WindowBounds {
-        //TODO: update when window moves
-        self.0.lock().window_bounds
+        WindowBounds::Fixed(self.0.inner.lock().bounds.map(|v| GlobalPixels(v as f32)))
     }
 
     fn content_size(&self) -> Size<Pixels> {
-        self.0.lock().content_size
+        self.0.inner.lock().content_size()
     }
 
     fn scale_factor(&self) -> f32 {
-        1.0
+        self.0.inner.lock().scale_factor
     }
 
     fn titlebar_height(&self) -> Pixels {
@@ -232,7 +278,7 @@ impl PlatformWindow for LinuxWindow {
     }
 
     fn display(&self) -> Rc<dyn PlatformDisplay> {
-        Rc::clone(&self.0.lock().display)
+        Rc::clone(&self.0.display)
     }
 
     fn mouse_position(&self) -> Point<Pixels> {
@@ -286,28 +332,40 @@ impl PlatformWindow for LinuxWindow {
     }
 
     fn on_request_frame(&self, callback: Box<dyn FnMut()>) {
-        self.0.lock().callbacks.request_frame = Some(callback);
+        self.0.callbacks.lock().request_frame = Some(callback);
     }
 
-    fn on_input(&self, callback: Box<dyn FnMut(crate::PlatformInput) -> bool>) {}
+    fn on_input(&self, callback: Box<dyn FnMut(crate::PlatformInput) -> bool>) {
+        self.0.callbacks.lock().input = Some(callback);
+    }
 
-    fn on_active_status_change(&self, callback: Box<dyn FnMut(bool)>) {}
+    fn on_active_status_change(&self, callback: Box<dyn FnMut(bool)>) {
+        self.0.callbacks.lock().active_status_change = Some(callback);
+    }
 
     fn on_resize(&self, callback: Box<dyn FnMut(Size<Pixels>, f32)>) {
-        self.0.lock().callbacks.resize = Some(callback);
+        self.0.callbacks.lock().resize = Some(callback);
     }
 
-    fn on_fullscreen(&self, _callback: Box<dyn FnMut(bool)>) {}
+    fn on_fullscreen(&self, callback: Box<dyn FnMut(bool)>) {
+        self.0.callbacks.lock().fullscreen = Some(callback);
+    }
 
     fn on_moved(&self, callback: Box<dyn FnMut()>) {
-        self.0.lock().callbacks.moved = Some(callback);
+        self.0.callbacks.lock().moved = Some(callback);
     }
 
-    fn on_should_close(&self, _callback: Box<dyn FnMut() -> bool>) {}
+    fn on_should_close(&self, callback: Box<dyn FnMut() -> bool>) {
+        self.0.callbacks.lock().should_close = Some(callback);
+    }
 
-    fn on_close(&self, _callback: Box<dyn FnOnce()>) {}
+    fn on_close(&self, callback: Box<dyn FnOnce()>) {
+        self.0.callbacks.lock().close = Some(callback);
+    }
 
-    fn on_appearance_changed(&self, _callback: Box<dyn FnMut()>) {}
+    fn on_appearance_changed(&self, callback: Box<dyn FnMut()>) {
+        self.0.callbacks.lock().appearance_changed = Some(callback);
+    }
 
     fn is_topmost_for_position(&self, _position: crate::Point<Pixels>) -> bool {
         unimplemented!()
@@ -316,10 +374,11 @@ impl PlatformWindow for LinuxWindow {
     fn invalidate(&self) {}
 
     fn draw(&self, scene: &crate::Scene) {
-        self.0.lock().renderer.draw(scene);
+        let mut inner = self.0.inner.lock();
+        inner.renderer.draw(scene);
     }
 
     fn sprite_atlas(&self) -> sync::Arc<dyn crate::PlatformAtlas> {
-        self.0.lock().sprite_atlas.clone()
+        self.0.sprite_atlas.clone()
     }
 }

From ed679c9347e2a790f11ad9b23d763e4fa41ffe01 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Thu, 1 Feb 2024 00:42:38 -0800
Subject: [PATCH 162/372] WIP path rasterization

---
 crates/gpui/src/platform/linux/blade_atlas.rs | 33 +++++++-
 .../gpui/src/platform/linux/blade_renderer.rs | 76 ++++++++++++++++++-
 crates/gpui/src/platform/linux/shaders.wgsl   |  2 +
 crates/gpui/src/platform/linux/window.rs      | 14 +---
 4 files changed, 113 insertions(+), 12 deletions(-)

diff --git a/crates/gpui/src/platform/linux/blade_atlas.rs b/crates/gpui/src/platform/linux/blade_atlas.rs
index 56bb745764..8de5a562ea 100644
--- a/crates/gpui/src/platform/linux/blade_atlas.rs
+++ b/crates/gpui/src/platform/linux/blade_atlas.rs
@@ -10,6 +10,8 @@ use etagere::BucketedAtlasAllocator;
 use parking_lot::Mutex;
 use std::{borrow::Cow, sync::Arc};
 
+pub(crate) const PATH_TEXTURE_FORMAT: gpu::TextureFormat = gpu::TextureFormat::R16Float;
+
 pub(crate) struct BladeAtlas(Mutex<BladeAtlasState>);
 
 struct BladeAtlasState {
@@ -32,6 +34,7 @@ impl BladeAtlasState {
         }
         for texture in self.path_textures.drain(..) {
             self.gpu.destroy_texture(texture.raw);
+            self.gpu.destroy_texture_view(texture.raw_view.unwrap());
         }
         self.gpu.destroy_command_encoder(&mut self.gpu_encoder);
         self.upload_belt.destroy(&self.gpu);
@@ -78,6 +81,11 @@ impl BladeAtlas {
         lock.gpu_encoder.start();
     }
 
+    pub fn allocate(&self, size: Size<DevicePixels>, texture_kind: AtlasTextureKind) -> AtlasTile {
+        let mut lock = self.0.lock();
+        lock.allocate(size, texture_kind)
+    }
+
     pub fn finish_frame(&self) -> gpu::SyncPoint {
         let mut lock = self.0.lock();
         let gpu = lock.gpu.clone();
@@ -85,6 +93,16 @@ impl BladeAtlas {
         lock.upload_belt.flush(&sync_point);
         sync_point
     }
+
+    pub fn get_texture_view(&self, id: AtlasTextureId) -> gpu::TextureView {
+        let lock = self.0.lock();
+        let textures = match id.kind {
+            crate::AtlasTextureKind::Monochrome => &lock.monochrome_textures,
+            crate::AtlasTextureKind::Polychrome => &lock.polychrome_textures,
+            crate::AtlasTextureKind::Path => &lock.path_textures,
+        };
+        textures[id.index as usize].raw_view.unwrap()
+    }
 }
 
 impl PlatformAtlas for BladeAtlas {
@@ -146,7 +164,7 @@ impl BladeAtlasState {
                 usage = gpu::TextureUsage::COPY | gpu::TextureUsage::RESOURCE;
             }
             AtlasTextureKind::Path => {
-                format = gpu::TextureFormat::R16Float;
+                format = PATH_TEXTURE_FORMAT;
                 usage = gpu::TextureUsage::COPY
                     | gpu::TextureUsage::RESOURCE
                     | gpu::TextureUsage::TARGET;
@@ -166,6 +184,17 @@ impl BladeAtlasState {
             dimension: gpu::TextureDimension::D2,
             usage,
         });
+        let raw_view = if usage.contains(gpu::TextureUsage::TARGET) {
+            Some(self.gpu.create_texture_view(gpu::TextureViewDesc {
+                name: "",
+                texture: raw,
+                format,
+                dimension: gpu::ViewDimension::D2,
+                subresources: &Default::default(),
+            }))
+        } else {
+            None
+        };
 
         let textures = match kind {
             AtlasTextureKind::Monochrome => &mut self.monochrome_textures,
@@ -180,6 +209,7 @@ impl BladeAtlasState {
             allocator: etagere::BucketedAtlasAllocator::new(size.into()),
             format,
             raw,
+            raw_view,
         };
         textures.push(atlas_texture);
         textures.last_mut().unwrap()
@@ -218,6 +248,7 @@ struct BladeAtlasTexture {
     id: AtlasTextureId,
     allocator: BucketedAtlasAllocator,
     raw: gpu::Texture,
+    raw_view: Option<gpu::TextureView>,
     format: gpu::TextureFormat,
 }
 
diff --git a/crates/gpui/src/platform/linux/blade_renderer.rs b/crates/gpui/src/platform/linux/blade_renderer.rs
index 4d58cbd1e6..0ade2b5df3 100644
--- a/crates/gpui/src/platform/linux/blade_renderer.rs
+++ b/crates/gpui/src/platform/linux/blade_renderer.rs
@@ -2,8 +2,12 @@
 #![allow(irrefutable_let_patterns)]
 
 use super::{BladeBelt, BladeBeltDescriptor};
-use crate::{PrimitiveBatch, Quad, Scene, Shadow};
+use crate::{
+    AtlasTextureKind, AtlasTile, BladeAtlas, ContentMask, Path, PathId, PathVertex, PrimitiveBatch,
+    Quad, ScaledPixels, Scene, Shadow, PATH_TEXTURE_FORMAT,
+};
 use bytemuck::{Pod, Zeroable};
+use collections::HashMap;
 
 use blade_graphics as gpu;
 use std::sync::Arc;
@@ -33,6 +37,7 @@ struct ShaderShadowsData {
 struct BladePipelines {
     quads: gpu::RenderPipeline,
     shadows: gpu::RenderPipeline,
+    path_rasterization: gpu::RenderPipeline,
 }
 
 impl BladePipelines {
@@ -77,6 +82,22 @@ impl BladePipelines {
                     write_mask: gpu::ColorWrites::default(),
                 }],
             }),
+            path_rasterization: gpu.create_render_pipeline(gpu::RenderPipelineDesc {
+                name: "path_rasterization",
+                data_layouts: &[&shadows_layout],
+                vertex: shader.at("vs_path_rasterization"),
+                primitive: gpu::PrimitiveState {
+                    topology: gpu::PrimitiveTopology::TriangleStrip,
+                    ..Default::default()
+                },
+                depth_stencil: None,
+                fragment: shader.at("fs_path_rasterization"),
+                color_targets: &[gpu::ColorTargetState {
+                    format: PATH_TEXTURE_FORMAT,
+                    blend: Some(gpu::BlendState::ALPHA_BLENDING),
+                    write_mask: gpu::ColorWrites::default(),
+                }],
+            }),
         }
     }
 }
@@ -88,6 +109,8 @@ pub struct BladeRenderer {
     pipelines: BladePipelines,
     instance_belt: BladeBelt,
     viewport_size: gpu::Extent,
+    path_tiles: HashMap<PathId, AtlasTile>,
+    atlas: Arc<BladeAtlas>,
 }
 
 impl BladeRenderer {
@@ -106,6 +129,8 @@ impl BladeRenderer {
             memory: gpu::Memory::Shared,
             min_chunk_size: 0x1000,
         });
+        let atlas = Arc::new(BladeAtlas::new(&gpu));
+
         Self {
             gpu,
             command_encoder,
@@ -113,6 +138,8 @@ impl BladeRenderer {
             pipelines,
             instance_belt,
             viewport_size: size,
+            path_tiles: HashMap::default(),
+            atlas,
         }
     }
 
@@ -126,6 +153,7 @@ impl BladeRenderer {
 
     pub fn destroy(&mut self) {
         self.wait_for_gpu();
+        self.atlas.destroy();
         self.instance_belt.destroy(&self.gpu);
         self.gpu.destroy_command_encoder(&mut self.command_encoder);
     }
@@ -140,11 +168,56 @@ impl BladeRenderer {
         self.viewport_size = size;
     }
 
+    pub fn atlas(&self) -> &Arc<BladeAtlas> {
+        &self.atlas
+    }
+
+    fn rasterize_paths(&mut self, paths: &[Path<ScaledPixels>]) {
+        self.path_tiles.clear();
+        let mut vertices_by_texture_id = HashMap::default();
+
+        for path in paths {
+            let clipped_bounds = path.bounds.intersect(&path.content_mask.bounds);
+            let tile = self
+                .atlas
+                .allocate(clipped_bounds.size.map(Into::into), AtlasTextureKind::Path);
+            vertices_by_texture_id
+                .entry(tile.texture_id)
+                .or_insert(Vec::new())
+                .extend(path.vertices.iter().map(|vertex| PathVertex {
+                    xy_position: vertex.xy_position - clipped_bounds.origin
+                        + tile.bounds.origin.map(Into::into),
+                    st_position: vertex.st_position,
+                    content_mask: ContentMask {
+                        bounds: tile.bounds.map(Into::into),
+                    },
+                }));
+            self.path_tiles.insert(path.id, tile);
+        }
+
+        for (texture_id, vertices) in vertices_by_texture_id {
+            let instances = self.instance_belt.alloc_data(&vertices, &self.gpu);
+            let mut pass = self.command_encoder.render(gpu::RenderTargetSet {
+                colors: &[gpu::RenderTarget {
+                    view: self.atlas.get_texture_view(texture_id),
+                    init_op: gpu::InitOp::Clear(gpu::TextureColor::OpaqueBlack),
+                    finish_op: gpu::FinishOp::Store,
+                }],
+                depth_stencil: None,
+            });
+
+            let mut encoder = pass.with(&self.pipelines.path_rasterization);
+            encoder.draw(0, vertices.len() as u32, 0, 1);
+        }
+    }
+
     pub fn draw(&mut self, scene: &Scene) {
         let frame = self.gpu.acquire_frame();
         self.command_encoder.start();
         self.command_encoder.init_texture(frame.texture());
 
+        self.rasterize_paths(scene.paths());
+
         let globals = GlobalParams {
             viewport_size: [
                 self.viewport_size.width as f32,
@@ -187,6 +260,7 @@ impl BladeRenderer {
                         );
                         encoder.draw(0, 4, 0, shadows.len() as u32);
                     }
+                    PrimitiveBatch::Paths(paths) => {}
                     _ => continue,
                 }
             }
diff --git a/crates/gpui/src/platform/linux/shaders.wgsl b/crates/gpui/src/platform/linux/shaders.wgsl
index c25456ff3f..4b943fcd55 100644
--- a/crates/gpui/src/platform/linux/shaders.wgsl
+++ b/crates/gpui/src/platform/linux/shaders.wgsl
@@ -287,3 +287,5 @@ fn fs_shadow(input: ShadowVarying) -> @location(0) vec4<f32> {
 
     return input.color * vec4<f32>(1.0, 1.0, 1.0, alpha);
 }
+
+// --- path rasterization --- //
diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index 71c80df1ba..87d4d01387 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -1,6 +1,6 @@
 use super::BladeRenderer;
 use crate::{
-    BladeAtlas, Bounds, GlobalPixels, LinuxDisplay, Pixels, PlatformDisplay, PlatformInputHandler,
+    Bounds, GlobalPixels, LinuxDisplay, Pixels, PlatformDisplay, PlatformInputHandler,
     PlatformWindow, Point, Size, WindowAppearance, WindowBounds, WindowOptions, XcbAtoms,
 };
 use blade_graphics as gpu;
@@ -57,7 +57,6 @@ pub(crate) struct LinuxWindowState {
     x_window: x::Window,
     callbacks: Mutex<Callbacks>,
     inner: Mutex<LinuxWindowInner>,
-    sprite_atlas: Arc<BladeAtlas>,
 }
 
 #[derive(Clone)]
@@ -186,7 +185,6 @@ impl LinuxWindowState {
             height: bounds.size.height as u32,
             depth: 1,
         };
-        let sprite_atlas = Arc::new(BladeAtlas::new(&gpu));
 
         Self {
             xcb_connection: Arc::clone(xcb_connection),
@@ -200,16 +198,11 @@ impl LinuxWindowState {
                 scale_factor: 1.0,
                 renderer: BladeRenderer::new(gpu, gpu_extent),
             }),
-            sprite_atlas,
         }
     }
 
     pub fn destroy(&self) {
-        self.sprite_atlas.destroy();
-        {
-            let mut inner = self.inner.lock();
-            inner.renderer.destroy();
-        }
+        self.inner.lock().renderer.destroy();
         self.xcb_connection.send_request(&x::UnmapWindow {
             window: self.x_window,
         });
@@ -379,6 +372,7 @@ impl PlatformWindow for LinuxWindow {
     }
 
     fn sprite_atlas(&self) -> sync::Arc<dyn crate::PlatformAtlas> {
-        self.0.sprite_atlas.clone()
+        let mut inner = self.0.inner.lock();
+        inner.renderer.atlas().clone()
     }
 }

From 05c42211fe2e88faa8e469a477141fd0687e41fc Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Thu, 1 Feb 2024 22:05:59 -0800
Subject: [PATCH 163/372] linux: implement RWH for LinuxWindow

---
 crates/gpui/src/platform/linux/window.rs | 49 +++++++++++++++++-------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index 87d4d01387..3efade0c89 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -5,6 +5,7 @@ use crate::{
 };
 use blade_graphics as gpu;
 use parking_lot::Mutex;
+use raw_window_handle as rwh;
 use std::{
     ffi::c_void,
     mem,
@@ -51,9 +52,17 @@ impl LinuxWindowInner {
     }
 }
 
+struct RawWindow {
+    connection: *mut c_void,
+    screen_id: i32,
+    window_id: u32,
+    visual_id: u32,
+}
+
 pub(crate) struct LinuxWindowState {
     xcb_connection: Arc<xcb::Connection>,
     display: Rc<dyn PlatformDisplay>,
+    raw: RawWindow,
     x_window: x::Window,
     callbacks: Mutex<Callbacks>,
     inner: Mutex<LinuxWindowInner>,
@@ -62,29 +71,40 @@ pub(crate) struct LinuxWindowState {
 #[derive(Clone)]
 pub(crate) struct LinuxWindow(pub(crate) Arc<LinuxWindowState>);
 
-struct RawWindow {
-    connection: *mut c_void,
-    screen_id: i32,
-    window_id: u32,
-    visual_id: u32,
-}
-unsafe impl raw_window_handle::HasRawWindowHandle for RawWindow {
-    fn raw_window_handle(&self) -> raw_window_handle::RawWindowHandle {
-        let mut wh = raw_window_handle::XcbWindowHandle::empty();
+unsafe impl rwh::HasRawWindowHandle for RawWindow {
+    fn raw_window_handle(&self) -> rwh::RawWindowHandle {
+        let mut wh = rwh::XcbWindowHandle::empty();
         wh.window = self.window_id;
         wh.visual_id = self.visual_id;
         wh.into()
     }
 }
-unsafe impl raw_window_handle::HasRawDisplayHandle for RawWindow {
-    fn raw_display_handle(&self) -> raw_window_handle::RawDisplayHandle {
-        let mut dh = raw_window_handle::XcbDisplayHandle::empty();
+unsafe impl rwh::HasRawDisplayHandle for RawWindow {
+    fn raw_display_handle(&self) -> rwh::RawDisplayHandle {
+        let mut dh = rwh::XcbDisplayHandle::empty();
         dh.connection = self.connection;
         dh.screen = self.screen_id;
         dh.into()
     }
 }
 
+impl rwh::HasWindowHandle for LinuxWindow {
+    fn window_handle(&self) -> Result<rwh::WindowHandle, rwh::HandleError> {
+        Ok(unsafe {
+            let raw_handle = rwh::HasRawWindowHandle::raw_window_handle(&self.0.raw);
+            rwh::WindowHandle::borrow_raw(raw_handle, rwh::ActiveHandle::new())
+        })
+    }
+}
+impl rwh::HasDisplayHandle for LinuxWindow {
+    fn display_handle(&self) -> Result<rwh::DisplayHandle, rwh::HandleError> {
+        Ok(unsafe {
+            let raw_handle = rwh::HasRawDisplayHandle::raw_display_handle(&self.0.raw);
+            rwh::DisplayHandle::borrow_raw(raw_handle)
+        })
+    }
+}
+
 impl LinuxWindowState {
     pub fn new(
         options: WindowOptions,
@@ -159,7 +179,7 @@ impl LinuxWindowState {
         xcb_connection.send_request(&x::MapWindow { window: x_window });
         xcb_connection.flush().unwrap();
 
-        let raw_window = RawWindow {
+        let raw = RawWindow {
             connection: as_raw_xcb_connection::AsRawXcbConnection::as_raw_xcb_connection(
                 xcb_connection,
             ) as *mut _,
@@ -170,7 +190,7 @@ impl LinuxWindowState {
         let gpu = Arc::new(
             unsafe {
                 gpu::Context::init_windowed(
-                    &raw_window,
+                    &raw,
                     gpu::ContextDesc {
                         validation: cfg!(debug_assertions),
                         capture: false,
@@ -189,6 +209,7 @@ impl LinuxWindowState {
         Self {
             xcb_connection: Arc::clone(xcb_connection),
             display: Rc::new(LinuxDisplay::new(xcb_connection, x_screen_index)),
+            raw,
             x_window,
             callbacks: Mutex::new(Callbacks::default()),
             inner: Mutex::new(LinuxWindowInner {

From fdaffdbfff0140251e4c51d64cf394f1f85360c2 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Thu, 1 Feb 2024 22:56:50 -0800
Subject: [PATCH 164/372] linux: path rasterization shader

---
 crates/gpui/src/platform/linux/blade_atlas.rs | 18 ++++++-
 .../gpui/src/platform/linux/blade_renderer.rs | 41 +++++++++++---
 crates/gpui/src/platform/linux/shaders.wgsl   | 53 +++++++++++++++++--
 crates/gpui/src/platform/linux/text_system.rs |  2 +-
 4 files changed, 100 insertions(+), 14 deletions(-)

diff --git a/crates/gpui/src/platform/linux/blade_atlas.rs b/crates/gpui/src/platform/linux/blade_atlas.rs
index 8de5a562ea..3c661c2191 100644
--- a/crates/gpui/src/platform/linux/blade_atlas.rs
+++ b/crates/gpui/src/platform/linux/blade_atlas.rs
@@ -41,6 +41,11 @@ impl BladeAtlasState {
     }
 }
 
+pub struct BladeTextureInfo {
+    pub size: gpu::Extent,
+    pub raw_view: Option<gpu::TextureView>,
+}
+
 impl BladeAtlas {
     pub(crate) fn new(gpu: &Arc<gpu::Context>) -> Self {
         BladeAtlas(Mutex::new(BladeAtlasState {
@@ -94,14 +99,23 @@ impl BladeAtlas {
         sync_point
     }
 
-    pub fn get_texture_view(&self, id: AtlasTextureId) -> gpu::TextureView {
+    pub fn get_texture_info(&self, id: AtlasTextureId) -> BladeTextureInfo {
         let lock = self.0.lock();
         let textures = match id.kind {
             crate::AtlasTextureKind::Monochrome => &lock.monochrome_textures,
             crate::AtlasTextureKind::Polychrome => &lock.polychrome_textures,
             crate::AtlasTextureKind::Path => &lock.path_textures,
         };
-        textures[id.index as usize].raw_view.unwrap()
+        let texture = &textures[id.index as usize];
+        let size = texture.allocator.size();
+        BladeTextureInfo {
+            size: gpu::Extent {
+                width: size.width as u32,
+                height: size.height as u32,
+                depth: 1,
+            },
+            raw_view: texture.raw_view,
+        }
     }
 }
 
diff --git a/crates/gpui/src/platform/linux/blade_renderer.rs b/crates/gpui/src/platform/linux/blade_renderer.rs
index 0ade2b5df3..ef2a9fead8 100644
--- a/crates/gpui/src/platform/linux/blade_renderer.rs
+++ b/crates/gpui/src/platform/linux/blade_renderer.rs
@@ -10,7 +10,7 @@ use bytemuck::{Pod, Zeroable};
 use collections::HashMap;
 
 use blade_graphics as gpu;
-use std::sync::Arc;
+use std::{mem, sync::Arc};
 
 const SURFACE_FRAME_COUNT: u32 = 3;
 const MAX_FRAME_TIME_MS: u32 = 1000;
@@ -34,6 +34,12 @@ struct ShaderShadowsData {
     b_shadows: gpu::BufferPiece,
 }
 
+#[derive(blade_macros::ShaderData)]
+struct ShaderPathRasterizationData {
+    globals: GlobalParams,
+    b_path_vertices: gpu::BufferPiece,
+}
+
 struct BladePipelines {
     quads: gpu::RenderPipeline,
     shadows: gpu::RenderPipeline,
@@ -47,8 +53,14 @@ impl BladePipelines {
         });
         shader.check_struct_size::<Quad>();
         shader.check_struct_size::<Shadow>();
+        assert_eq!(
+            mem::size_of::<PathVertex<ScaledPixels>>(),
+            shader.get_struct_size("PathVertex") as usize,
+        );
         let quads_layout = <ShaderQuadsData as gpu::ShaderData>::layout();
         let shadows_layout = <ShaderShadowsData as gpu::ShaderData>::layout();
+        let path_rasterization_layout = <ShaderPathRasterizationData as gpu::ShaderData>::layout();
+
         Self {
             quads: gpu.create_render_pipeline(gpu::RenderPipelineDesc {
                 name: "quads",
@@ -84,7 +96,7 @@ impl BladePipelines {
             }),
             path_rasterization: gpu.create_render_pipeline(gpu::RenderPipelineDesc {
                 name: "path_rasterization",
-                data_layouts: &[&shadows_layout],
+                data_layouts: &[&path_rasterization_layout],
                 vertex: shader.at("vs_path_rasterization"),
                 primitive: gpu::PrimitiveState {
                     topology: gpu::PrimitiveTopology::TriangleStrip,
@@ -196,10 +208,16 @@ impl BladeRenderer {
         }
 
         for (texture_id, vertices) in vertices_by_texture_id {
-            let instances = self.instance_belt.alloc_data(&vertices, &self.gpu);
+            let tex_info = self.atlas.get_texture_info(texture_id);
+            let globals = GlobalParams {
+                viewport_size: [tex_info.size.width as f32, tex_info.size.height as f32],
+                pad: [0; 2],
+            };
+
+            let vertex_buf = self.instance_belt.alloc_data(&vertices, &self.gpu);
             let mut pass = self.command_encoder.render(gpu::RenderTargetSet {
                 colors: &[gpu::RenderTarget {
-                    view: self.atlas.get_texture_view(texture_id),
+                    view: tex_info.raw_view.unwrap(),
                     init_op: gpu::InitOp::Clear(gpu::TextureColor::OpaqueBlack),
                     finish_op: gpu::FinishOp::Store,
                 }],
@@ -207,6 +225,13 @@ impl BladeRenderer {
             });
 
             let mut encoder = pass.with(&self.pipelines.path_rasterization);
+            encoder.bind(
+                0,
+                &ShaderPathRasterizationData {
+                    globals,
+                    b_path_vertices: vertex_buf,
+                },
+            );
             encoder.draw(0, vertices.len() as u32, 0, 1);
         }
     }
@@ -237,25 +262,25 @@ impl BladeRenderer {
             for batch in scene.batches() {
                 match batch {
                     PrimitiveBatch::Quads(quads) => {
-                        let instances = self.instance_belt.alloc_data(quads, &self.gpu);
+                        let instance_buf = self.instance_belt.alloc_data(quads, &self.gpu);
                         let mut encoder = pass.with(&self.pipelines.quads);
                         encoder.bind(
                             0,
                             &ShaderQuadsData {
                                 globals,
-                                b_quads: instances,
+                                b_quads: instance_buf,
                             },
                         );
                         encoder.draw(0, 4, 0, quads.len() as u32);
                     }
                     PrimitiveBatch::Shadows(shadows) => {
-                        let instances = self.instance_belt.alloc_data(shadows, &self.gpu);
+                        let instance_buf = self.instance_belt.alloc_data(shadows, &self.gpu);
                         let mut encoder = pass.with(&self.pipelines.shadows);
                         encoder.bind(
                             0,
                             &ShaderShadowsData {
                                 globals,
-                                b_shadows: instances,
+                                b_shadows: instance_buf,
                             },
                         );
                         encoder.draw(0, 4, 0, shadows.len() as u32);
diff --git a/crates/gpui/src/platform/linux/shaders.wgsl b/crates/gpui/src/platform/linux/shaders.wgsl
index 4b943fcd55..ddba4be846 100644
--- a/crates/gpui/src/platform/linux/shaders.wgsl
+++ b/crates/gpui/src/platform/linux/shaders.wgsl
@@ -35,19 +35,27 @@ struct Hsla {
     a: f32,
 }
 
-fn to_device_position(unit_vertex: vec2<f32>, bounds: Bounds) -> vec4<f32> {
-    let position = unit_vertex * vec2<f32>(bounds.size) + bounds.origin;
+fn to_device_position_impl(position: vec2<f32>) -> vec4<f32> {
     let device_position = position / globals.viewport_size * vec2<f32>(2.0, -2.0) + vec2<f32>(-1.0, 1.0);
     return vec4<f32>(device_position, 0.0, 1.0);
 }
 
-fn distance_from_clip_rect(unit_vertex: vec2<f32>, bounds: Bounds, clip_bounds: Bounds) -> vec4<f32> {
+fn to_device_position(unit_vertex: vec2<f32>, bounds: Bounds) -> vec4<f32> {
     let position = unit_vertex * vec2<f32>(bounds.size) + bounds.origin;
+    return to_device_position_impl(position);
+}
+
+fn distance_from_clip_rect_impl(position: vec2<f32>, clip_bounds: Bounds) -> vec4<f32> {
     let tl = position - clip_bounds.origin;
     let br = clip_bounds.origin + clip_bounds.size - position;
     return vec4<f32>(tl.x, br.x, tl.y, br.y);
 }
 
+fn distance_from_clip_rect(unit_vertex: vec2<f32>, bounds: Bounds, clip_bounds: Bounds) -> vec4<f32> {
+    let position = unit_vertex * vec2<f32>(bounds.size) + bounds.origin;
+    return distance_from_clip_rect_impl(position, clip_bounds);
+}
+
 fn hsla_to_rgba(hsla: Hsla) -> vec4<f32> {
     let h = hsla.h * 6.0; // Now, it's an angle but scaled in [0, 6) range
     let s = hsla.s;
@@ -289,3 +297,42 @@ fn fs_shadow(input: ShadowVarying) -> @location(0) vec4<f32> {
 }
 
 // --- path rasterization --- //
+
+struct PathVertex {
+    xy_position: vec2<f32>,
+    st_position: vec2<f32>,
+    content_mask: Bounds,
+}
+var<storage, read> b_path_vertices: array<PathVertex>;
+
+struct PathRasterizationVarying {
+    @builtin(position) position: vec4<f32>,
+    @location(0) st_position: vec2<f32>,
+    //TODO: use `clip_distance` once Naga supports it
+    @location(3) clip_distances: vec4<f32>,
+}
+
+@vertex
+fn vs_path_rasterization(@builtin(vertex_index) vertex_id: u32) -> PathRasterizationVarying {
+    let v = b_path_vertices[vertex_id];
+
+    var out = PathRasterizationVarying();
+    out.position = to_device_position_impl(v.xy_position);
+    out.st_position = v.st_position;
+    out.clip_distances = distance_from_clip_rect_impl(v.xy_position, v.content_mask);
+    return out;
+}
+
+@fragment
+fn fs_path_rasterization(input: PathRasterizationVarying) -> @location(0) f32 {
+	let dx = dpdx(input.st_position);
+	let dy = dpdy(input.st_position);
+    if (any(input.clip_distances < vec4<f32>(0.0))) {
+        return 0.0;
+    }
+
+	let gradient = 2.0 * input.st_position * vec2<f32>(dx.x, dy.x) - vec2<f32>(dx.y, dy.y);
+	let f = input.st_position.x * input.st_position.x - input.st_position.y;
+	let distance = f / length(gradient);
+	return saturate(0.5 - distance);
+}
diff --git a/crates/gpui/src/platform/linux/text_system.rs b/crates/gpui/src/platform/linux/text_system.rs
index 36ed155f6a..62935fc232 100644
--- a/crates/gpui/src/platform/linux/text_system.rs
+++ b/crates/gpui/src/platform/linux/text_system.rs
@@ -15,7 +15,7 @@ use font_kit::{
 };
 use parking_lot::RwLock;
 use smallvec::SmallVec;
-use std::{borrow::Cow};
+use std::borrow::Cow;
 
 pub(crate) struct LinuxTextSystem(RwLock<LinuxTextSystemState>);
 

From 5ed3b44686de6f3ed8cc8882ab576faafc269d2b Mon Sep 17 00:00:00 2001
From: Ocean <nocte55is@gmail.com>
Date: Fri, 2 Feb 2024 16:55:54 +0900
Subject: [PATCH 165/372] Add rename to JetBrains keymaps (#7263)

Add rename actions to JetBrains keymaps.

Closes #7261.

Release Notes:

- Added rename keybindings to JetBrains keymap ([#7261](https://github.com/zed-industries/zed/issues/7261)).
---
 assets/keymaps/jetbrains.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/assets/keymaps/jetbrains.json b/assets/keymaps/jetbrains.json
index 6be7289d8a..d2dcbddbc4 100644
--- a/assets/keymaps/jetbrains.json
+++ b/assets/keymaps/jetbrains.json
@@ -42,6 +42,7 @@
       "shift-alt-up": "editor::MoveLineUp",
       "shift-alt-down": "editor::MoveLineDown",
       "cmd-alt-l": "editor::Format",
+      "shift-f6": "editor::Rename",
       "cmd-[": "pane::GoBack",
       "cmd-]": "pane::GoForward",
       "alt-f7": "editor::FindAllReferences",
@@ -83,7 +84,8 @@
   {
     "context": "ProjectPanel",
     "bindings": {
-      "enter": "project_panel::Open"
+      "enter": "project_panel::Open",
+      "shift-f6": "project_panel::Rename"
     }
   }
 ]

From c000d2e16b9e1063c0ea43de1ef895f5bdec8989 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Fri, 2 Feb 2024 00:34:08 -0800
Subject: [PATCH 166/372] blade: path sprite rendering

---
 crates/gpui/src/platform.rs                   |  1 +
 crates/gpui/src/platform/linux/blade_atlas.rs |  1 +
 .../gpui/src/platform/linux/blade_renderer.rs | 78 ++++++++++++++++++-
 crates/gpui/src/platform/linux/shaders.wgsl   | 66 ++++++++++++++--
 crates/gpui/src/platform/test/window.rs       |  1 +
 5 files changed, 138 insertions(+), 9 deletions(-)

diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 008baea333..5bd985a74b 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -304,6 +304,7 @@ pub(crate) trait PlatformAtlas: Send + Sync {
 pub(crate) struct AtlasTile {
     pub(crate) texture_id: AtlasTextureId,
     pub(crate) tile_id: TileId,
+    pub(crate) padding: u32,
     pub(crate) bounds: Bounds<DevicePixels>,
 }
 
diff --git a/crates/gpui/src/platform/linux/blade_atlas.rs b/crates/gpui/src/platform/linux/blade_atlas.rs
index 3c661c2191..7f27bf68a4 100644
--- a/crates/gpui/src/platform/linux/blade_atlas.rs
+++ b/crates/gpui/src/platform/linux/blade_atlas.rs
@@ -276,6 +276,7 @@ impl BladeAtlasTexture {
         let tile = AtlasTile {
             texture_id: self.id,
             tile_id: allocation.id.into(),
+            padding: 0,
             bounds: Bounds {
                 origin: allocation.rectangle.min.into(),
                 size,
diff --git a/crates/gpui/src/platform/linux/blade_renderer.rs b/crates/gpui/src/platform/linux/blade_renderer.rs
index ef2a9fead8..4d64b184f0 100644
--- a/crates/gpui/src/platform/linux/blade_renderer.rs
+++ b/crates/gpui/src/platform/linux/blade_renderer.rs
@@ -3,8 +3,8 @@
 
 use super::{BladeBelt, BladeBeltDescriptor};
 use crate::{
-    AtlasTextureKind, AtlasTile, BladeAtlas, ContentMask, Path, PathId, PathVertex, PrimitiveBatch,
-    Quad, ScaledPixels, Scene, Shadow, PATH_TEXTURE_FORMAT,
+    AtlasTextureKind, AtlasTile, BladeAtlas, Bounds, ContentMask, Hsla, Path, PathId, PathVertex,
+    PrimitiveBatch, Quad, ScaledPixels, Scene, Shadow, PATH_TEXTURE_FORMAT,
 };
 use bytemuck::{Pod, Zeroable};
 use collections::HashMap;
@@ -40,10 +40,27 @@ struct ShaderPathRasterizationData {
     b_path_vertices: gpu::BufferPiece,
 }
 
+#[derive(blade_macros::ShaderData)]
+struct ShaderPathsData {
+    globals: GlobalParams,
+    t_tile: gpu::TextureView,
+    s_tile: gpu::Sampler,
+    b_path_sprites: gpu::BufferPiece,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+#[repr(C)]
+struct PathSprite {
+    bounds: Bounds<ScaledPixels>,
+    color: Hsla,
+    tile: AtlasTile,
+}
+
 struct BladePipelines {
     quads: gpu::RenderPipeline,
     shadows: gpu::RenderPipeline,
     path_rasterization: gpu::RenderPipeline,
+    paths: gpu::RenderPipeline,
 }
 
 impl BladePipelines {
@@ -57,9 +74,12 @@ impl BladePipelines {
             mem::size_of::<PathVertex<ScaledPixels>>(),
             shader.get_struct_size("PathVertex") as usize,
         );
+        shader.check_struct_size::<PathSprite>();
+
         let quads_layout = <ShaderQuadsData as gpu::ShaderData>::layout();
         let shadows_layout = <ShaderShadowsData as gpu::ShaderData>::layout();
         let path_rasterization_layout = <ShaderPathRasterizationData as gpu::ShaderData>::layout();
+        let paths_layout = <ShaderPathsData as gpu::ShaderData>::layout();
 
         Self {
             quads: gpu.create_render_pipeline(gpu::RenderPipelineDesc {
@@ -110,6 +130,22 @@ impl BladePipelines {
                     write_mask: gpu::ColorWrites::default(),
                 }],
             }),
+            paths: gpu.create_render_pipeline(gpu::RenderPipelineDesc {
+                name: "paths",
+                data_layouts: &[&paths_layout],
+                vertex: shader.at("vs_path"),
+                primitive: gpu::PrimitiveState {
+                    topology: gpu::PrimitiveTopology::TriangleStrip,
+                    ..Default::default()
+                },
+                depth_stencil: None,
+                fragment: shader.at("fs_path"),
+                color_targets: &[gpu::ColorTargetState {
+                    format: surface_format,
+                    blend: Some(gpu::BlendState::ALPHA_BLENDING),
+                    write_mask: gpu::ColorWrites::default(),
+                }],
+            }),
         }
     }
 }
@@ -123,6 +159,7 @@ pub struct BladeRenderer {
     viewport_size: gpu::Extent,
     path_tiles: HashMap<PathId, AtlasTile>,
     atlas: Arc<BladeAtlas>,
+    atlas_sampler: gpu::Sampler,
 }
 
 impl BladeRenderer {
@@ -142,6 +179,12 @@ impl BladeRenderer {
             min_chunk_size: 0x1000,
         });
         let atlas = Arc::new(BladeAtlas::new(&gpu));
+        let atlas_sampler = gpu.create_sampler(gpu::SamplerDesc {
+            name: "atlas",
+            mag_filter: gpu::FilterMode::Linear,
+            min_filter: gpu::FilterMode::Linear,
+            ..Default::default()
+        });
 
         Self {
             gpu,
@@ -152,6 +195,7 @@ impl BladeRenderer {
             viewport_size: size,
             path_tiles: HashMap::default(),
             atlas,
+            atlas_sampler,
         }
     }
 
@@ -285,7 +329,35 @@ impl BladeRenderer {
                         );
                         encoder.draw(0, 4, 0, shadows.len() as u32);
                     }
-                    PrimitiveBatch::Paths(paths) => {}
+                    PrimitiveBatch::Paths(paths) => {
+                        let mut encoder = pass.with(&self.pipelines.paths);
+                        //TODO: group by texture ID
+                        for path in paths {
+                            let tile = &self.path_tiles[&path.id];
+                            let tex_info = self.atlas.get_texture_info(tile.texture_id);
+                            let origin = path.bounds.intersect(&path.content_mask.bounds).origin;
+                            let sprites = [PathSprite {
+                                bounds: Bounds {
+                                    origin: origin.map(|p| p.floor()),
+                                    size: tile.bounds.size.map(Into::into),
+                                },
+                                color: path.color,
+                                tile: (*tile).clone(),
+                            }];
+
+                            let instance_buf = self.instance_belt.alloc_data(&sprites, &self.gpu);
+                            encoder.bind(
+                                0,
+                                &ShaderPathsData {
+                                    globals,
+                                    t_tile: tex_info.raw_view.unwrap(),
+                                    s_tile: self.atlas_sampler,
+                                    b_path_sprites: instance_buf,
+                                },
+                            );
+                            encoder.draw(0, 4, 0, sprites.len() as u32);
+                        }
+                    }
                     _ => continue,
                 }
             }
diff --git a/crates/gpui/src/platform/linux/shaders.wgsl b/crates/gpui/src/platform/linux/shaders.wgsl
index ddba4be846..3a7853142a 100644
--- a/crates/gpui/src/platform/linux/shaders.wgsl
+++ b/crates/gpui/src/platform/linux/shaders.wgsl
@@ -4,6 +4,8 @@ struct Globals {
 }
 
 var<uniform> globals: Globals;
+var t_tile: texture_2d<f32>;
+var s_tile: sampler;
 
 const M_PI_F: f32 = 3.1415926;
 
@@ -35,6 +37,18 @@ struct Hsla {
     a: f32,
 }
 
+struct AtlasTextureId {
+    index: u32,
+    kind: u32,
+}
+
+struct AtlasTile {
+    texture_id: AtlasTextureId,
+    tile_id: u32,
+    padding: u32,
+    bounds: Bounds,
+}
+
 fn to_device_position_impl(position: vec2<f32>) -> vec4<f32> {
     let device_position = position / globals.viewport_size * vec2<f32>(2.0, -2.0) + vec2<f32>(-1.0, 1.0);
     return vec4<f32>(device_position, 0.0, 1.0);
@@ -45,6 +59,11 @@ fn to_device_position(unit_vertex: vec2<f32>, bounds: Bounds) -> vec4<f32> {
     return to_device_position_impl(position);
 }
 
+fn to_tile_position(unit_vertex: vec2<f32>, tile: AtlasTile) -> vec2<f32> {
+  let atlas_size = vec2<f32>(textureDimensions(t_tile, 0));
+  return (tile.bounds.origin + unit_vertex * tile.bounds.size) / atlas_size;
+}
+
 fn distance_from_clip_rect_impl(position: vec2<f32>, clip_bounds: Bounds) -> vec4<f32> {
     let tl = position - clip_bounds.origin;
     let br = clip_bounds.origin + clip_bounds.size - position;
@@ -325,14 +344,49 @@ fn vs_path_rasterization(@builtin(vertex_index) vertex_id: u32) -> PathRasteriza
 
 @fragment
 fn fs_path_rasterization(input: PathRasterizationVarying) -> @location(0) f32 {
-	let dx = dpdx(input.st_position);
-	let dy = dpdy(input.st_position);
+    let dx = dpdx(input.st_position);
+    let dy = dpdy(input.st_position);
     if (any(input.clip_distances < vec4<f32>(0.0))) {
         return 0.0;
     }
 
-	let gradient = 2.0 * input.st_position * vec2<f32>(dx.x, dy.x) - vec2<f32>(dx.y, dy.y);
-	let f = input.st_position.x * input.st_position.x - input.st_position.y;
-	let distance = f / length(gradient);
-	return saturate(0.5 - distance);
+    let gradient = 2.0 * input.st_position * vec2<f32>(dx.x, dy.x) - vec2<f32>(dx.y, dy.y);
+    let f = input.st_position.x * input.st_position.x - input.st_position.y;
+    let distance = f / length(gradient);
+    return saturate(0.5 - distance);
+}
+
+// --- paths --- //
+
+struct PathSprite {
+    bounds: Bounds,
+    color: Hsla,
+    tile: AtlasTile,
+}
+var<storage, read> b_path_sprites: array<PathSprite>;
+
+struct PathVarying {
+    @builtin(position) position: vec4<f32>,
+    @location(0) tile_position: vec2<f32>,
+    @location(1) color: vec4<f32>,
+}
+
+@vertex
+fn vs_path(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index) instance_id: u32) -> PathVarying {
+	let unit_vertex = vec2<f32>(f32(vertex_id & 1u), 0.5 * f32(vertex_id & 2u));
+    let sprite = b_path_sprites[instance_id];
+    // Don't apply content mask because it was already accounted for when rasterizing the path.
+
+    var out = PathVarying();
+    out.position = to_device_position(unit_vertex, sprite.bounds);
+    out.tile_position = to_tile_position(unit_vertex, sprite.tile);
+    out.color = hsla_to_rgba(sprite.color);
+    return out;
+}
+
+@fragment
+fn fs_path(input: PathVarying) -> @location(0) vec4<f32> {
+	let sample = textureSample(t_tile, s_tile, input.tile_position).r;
+	let mask = 1.0 - abs(1.0 - sample % 2.0);
+	return input.color * mask;
 }
diff --git a/crates/gpui/src/platform/test/window.rs b/crates/gpui/src/platform/test/window.rs
index b310084fc4..f7e52f8c16 100644
--- a/crates/gpui/src/platform/test/window.rs
+++ b/crates/gpui/src/platform/test/window.rs
@@ -344,6 +344,7 @@ impl PlatformAtlas for TestAtlas {
                     kind: crate::AtlasTextureKind::Path,
                 },
                 tile_id: TileId(tile_id),
+                padding: 0,
                 bounds: crate::Bounds {
                     origin: Point::default(),
                     size,

From 8fed9aaec29607e2719ee0a863eb75c9f44c39b7 Mon Sep 17 00:00:00 2001
From: Alfred Kristal Ern <83819096+KristalAlfred@users.noreply.github.com>
Date: Fri, 2 Feb 2024 10:17:46 +0100
Subject: [PATCH 167/372] Fix project panel selection related issues (#7245)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #7003 and #7005.

Selecting as a reaction to actually opening a new item doesn’t seem
robust in all cases, the PR improves that.

Release Notes:

- Fixed missing project panel file selection in certain cases
---
 crates/project_panel/src/project_panel.rs | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index f64099340c..b43b5d8413 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -262,11 +262,14 @@ impl ProjectPanel {
                     if let Some(worktree) = project.read(cx).worktree_for_entry(entry_id, cx) {
                         if let Some(entry) = worktree.read(cx).entry_for_id(entry_id) {
                             let file_path = entry.path.clone();
+                            let worktree_id = worktree.read(cx).id();
+                            let entry_id = entry.id;
+
                             workspace
                                 .open_path(
                                     ProjectPath {
-                                        worktree_id: worktree.read(cx).id(),
-                                        path: entry.path.clone(),
+                                        worktree_id,
+                                        path: file_path.clone(),
                                     },
                                     None,
                                     focus_opened_item,
@@ -281,8 +284,16 @@ impl ProjectPanel {
                                         _ => None,
                                     }
                                 });
-                            if !focus_opened_item {
-                                if let Some(project_panel) = project_panel.upgrade() {
+
+                            if let Some(project_panel) = project_panel.upgrade() {
+                                // Always select the entry, regardless of whether it is opened or not.
+                                project_panel.update(cx, |project_panel, _| {
+                                    project_panel.selection = Some(Selection {
+                                        worktree_id,
+                                        entry_id
+                                    });
+                                });
+                                if !focus_opened_item {
                                     let focus_handle = project_panel.read(cx).focus_handle.clone();
                                     cx.focus(&focus_handle);
                                 }

From 2940a0ebd8a15b27d854215b38ca10d6b64567af Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Fri, 2 Feb 2024 10:33:08 +0100
Subject: [PATCH 168/372] Revert "Avoid excessive blocking of main thread when
 rendering in direct mode (#7253)" (#7272)

This reverts commit 020c38a8916c063cba36c2c88a69b5e287269d5a because it
leads to glitches when selecting text.



https://github.com/zed-industries/zed/assets/1185253/78c2c184-bc15-4b04-8c80-a23ca5c96afa



Release Notes:

- N/A
---
 crates/gpui/src/platform/mac/metal_renderer.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/gpui/src/platform/mac/metal_renderer.rs b/crates/gpui/src/platform/mac/metal_renderer.rs
index b3512ad2e9..68027ceff6 100644
--- a/crates/gpui/src/platform/mac/metal_renderer.rs
+++ b/crates/gpui/src/platform/mac/metal_renderer.rs
@@ -314,7 +314,7 @@ impl MetalRenderer {
         command_buffer.commit();
         self.sprite_atlas.clear_textures(AtlasTextureKind::Path);
 
-        command_buffer.wait_until_scheduled();
+        command_buffer.wait_until_completed();
         drawable.present();
     }
 

From ce4c15dca6f3885ddc7f2df64ca259b282b5a769 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <53836821+bennetbo@users.noreply.github.com>
Date: Fri, 2 Feb 2024 11:10:42 +0100
Subject: [PATCH 169/372] Show diagnostics in scrollbar (#7175)

This PR implements support for displaying diagnostics in the scrollbar,
similar to what is already done for search results, symbols, git diff,
...

For example, changing a field name (`text`) without changing the
references looks like this in `buffer.rs` (note the red lines in the
scrollbar):

![image](https://github.com/zed-industries/zed/assets/53836821/c46f0d55-32e3-4334-8ad7-66d1578d5725)

As you can see, the errors, warnings, ... are displayed in the scroll
bar, which helps to identify possible problems with the current file.

Relevant issues: #4866, #6819

Release Notes:

- Added diagnostic indicators to the scrollbar
---
 assets/settings/default.json            |  4 +-
 crates/editor/src/editor_settings.rs    |  5 ++
 crates/editor/src/element.rs            | 62 +++++++++++++++++++++++++
 crates/language/src/buffer.rs           |  5 ++
 crates/multi_buffer/src/multi_buffer.rs |  6 +++
 5 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index f78a4637e5..74dfa6de2c 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -127,7 +127,9 @@
     // Whether to show selections in the scrollbar.
     "selections": true,
     // Whether to show symbols selections in the scrollbar.
-    "symbols_selections": true
+    "symbols_selections": true,
+    // Whether to show diagnostic indicators in the scrollbar.
+    "diagnostics": true
   },
   "relative_line_numbers": false,
   // When to populate a new search's query based on the text under the cursor.
diff --git a/crates/editor/src/editor_settings.rs b/crates/editor/src/editor_settings.rs
index 0cfc677e93..e9ecbe13d4 100644
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -34,6 +34,7 @@ pub struct Scrollbar {
     pub git_diff: bool,
     pub selections: bool,
     pub symbols_selections: bool,
+    pub diagnostics: bool,
 }
 
 /// When to show the scrollbar in the editor.
@@ -122,6 +123,10 @@ pub struct ScrollbarContent {
     ///
     /// Default: true
     pub symbols_selections: Option<bool>,
+    /// Whether to show diagnostic indicators in the scrollbar.
+    ///
+    /// Default: true
+    pub diagnostics: Option<bool>,
 }
 
 impl Settings for EditorSettings {
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 57389fd8f9..b96ec9e068 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -35,6 +35,7 @@ use gpui::{
 };
 use itertools::Itertools;
 use language::language_settings::ShowWhitespaceSetting;
+use lsp::DiagnosticSeverity;
 use multi_buffer::Anchor;
 use project::{
     project_settings::{GitGutterSetting, ProjectSettings},
@@ -1477,6 +1478,64 @@ impl EditorElement {
                 }
             }
 
+            if layout.is_singleton && scrollbar_settings.diagnostics {
+                let max_point = layout
+                    .position_map
+                    .snapshot
+                    .display_snapshot
+                    .buffer_snapshot
+                    .max_point();
+
+                let diagnostics = layout
+                    .position_map
+                    .snapshot
+                    .buffer_snapshot
+                    .diagnostics_in_range::<_, Point>(Point::zero()..max_point, false)
+                    // We want to sort by severity, in order to paint the most severe diagnostics last.
+                    .sorted_by_key(|diagnostic| std::cmp::Reverse(diagnostic.diagnostic.severity));
+
+                for diagnostic in diagnostics {
+                    let start_display = diagnostic
+                        .range
+                        .start
+                        .to_display_point(&layout.position_map.snapshot.display_snapshot);
+                    let end_display = diagnostic
+                        .range
+                        .end
+                        .to_display_point(&layout.position_map.snapshot.display_snapshot);
+                    let start_y = y_for_row(start_display.row() as f32);
+                    let mut end_y = if diagnostic.range.start == diagnostic.range.end {
+                        y_for_row((end_display.row() + 1) as f32)
+                    } else {
+                        y_for_row((end_display.row()) as f32)
+                    };
+
+                    if end_y - start_y < px(1.) {
+                        end_y = start_y + px(1.);
+                    }
+                    let bounds = Bounds::from_corners(point(left, start_y), point(right, end_y));
+
+                    let color = match diagnostic.diagnostic.severity {
+                        DiagnosticSeverity::ERROR => cx.theme().status().error,
+                        DiagnosticSeverity::WARNING => cx.theme().status().warning,
+                        DiagnosticSeverity::INFORMATION => cx.theme().status().info,
+                        _ => cx.theme().status().hint,
+                    };
+                    cx.paint_quad(quad(
+                        bounds,
+                        Corners::default(),
+                        color,
+                        Edges {
+                            top: Pixels::ZERO,
+                            right: px(1.),
+                            bottom: Pixels::ZERO,
+                            left: px(1.),
+                        },
+                        cx.theme().colors().scrollbar_thumb_border,
+                    ));
+                }
+            }
+
             cx.paint_quad(quad(
                 thumb_bounds,
                 Corners::default(),
@@ -2106,6 +2165,9 @@ impl EditorElement {
                     // Symbols Selections
                     (is_singleton && scrollbar_settings.symbols_selections && (editor.has_background_highlights::<DocumentHighlightRead>() || editor.has_background_highlights::<DocumentHighlightWrite>()))
                     ||
+                    // Diagnostics
+                    (is_singleton && scrollbar_settings.diagnostics && snapshot.buffer_snapshot.has_diagnostics())
+                    ||
                     // Scrollmanager
                     editor.scroll_manager.scrollbars_visible()
                 }
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index cd8b239f5c..b42ea1f12d 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -2993,6 +2993,11 @@ impl BufferSnapshot {
         self.git_diff.hunks_intersecting_range_rev(range, self)
     }
 
+    /// Returns if the buffer contains any diagnostics.
+    pub fn has_diagnostics(&self) -> bool {
+        !self.diagnostics.is_empty()
+    }
+
     /// Returns all the diagnostics intersecting the given range.
     pub fn diagnostics_in_range<'a, T, O>(
         &'a self,
diff --git a/crates/multi_buffer/src/multi_buffer.rs b/crates/multi_buffer/src/multi_buffer.rs
index e16fc3a504..6d182a11ea 100644
--- a/crates/multi_buffer/src/multi_buffer.rs
+++ b/crates/multi_buffer/src/multi_buffer.rs
@@ -3052,6 +3052,12 @@ impl MultiBufferSnapshot {
         self.has_conflict
     }
 
+    pub fn has_diagnostics(&self) -> bool {
+        self.excerpts
+            .iter()
+            .any(|excerpt| excerpt.buffer.has_diagnostics())
+    }
+
     pub fn diagnostic_group<'a, O>(
         &'a self,
         group_id: usize,

From 10cd978e932bac789910353b27cad3e440ada5c2 Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Fri, 2 Feb 2024 11:24:04 +0100
Subject: [PATCH 170/372] go: improve outline queries to get rid of whitespace
 (#7273)

This changes the Go `outline.scm` queries a bit so that we don't have
these stray whitespaces floating around. I'm sure there's more
improvements possible, but for now I think this makes it look less
wrong.

Release Notes:

- Improved outline and breadcrumbs for Go code.

## Before

![before](https://github.com/zed-industries/zed/assets/1185253/d2b93c41-639b-4819-b87e-d8456960c5a7)

## After

![after](https://github.com/zed-industries/zed/assets/1185253/1ff6efb1-75a4-487b-8947-f070073887d4)
---
 crates/zed/src/languages/go/outline.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/crates/zed/src/languages/go/outline.scm b/crates/zed/src/languages/go/outline.scm
index 2ff7ef25a0..8823b7beb8 100644
--- a/crates/zed/src/languages/go/outline.scm
+++ b/crates/zed/src/languages/go/outline.scm
@@ -7,20 +7,21 @@
     "func" @context
     name: (identifier) @name
     parameters: (parameter_list
-      "(" @context
-      ")" @context)) @item
+      "("
+      ")")) @item
 
 (method_declaration
     "func" @context
     receiver: (parameter_list
         "(" @context
         (parameter_declaration
+            name: (_) @name
             type: (_) @context)
         ")" @context)
     name: (field_identifier) @name
     parameters: (parameter_list
-      "(" @context
-      ")" @context)) @item
+      "("
+      ")")) @item
 
 (const_declaration
     "const" @context
@@ -40,4 +41,4 @@
       ")" @context)) @item
 
 (field_declaration
-    name: (_) @name) @item
\ No newline at end of file
+    name: (_) @name) @item

From d576cda7892d5b0407aad4147f0787ca51bf62ce Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Fri, 2 Feb 2024 01:04:27 +0100
Subject: [PATCH 171/372] project: Do not inline LSP related methods

The way Rust generics works, having a generic argument puts the burden of codegen on the crate that instantiates a generic function, which in our case is an editor.
---
 crates/project/src/project.rs | 172 ++++++++++++++++++++++++++--------
 1 file changed, 134 insertions(+), 38 deletions(-)

diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 0788594222..eedfa16e70 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -4414,13 +4414,13 @@ impl Project {
         }
     }
 
-    pub fn definition<T: ToPointUtf16>(
+    #[inline(never)]
+    fn definition_impl(
         &self,
         buffer: &Model<Buffer>,
-        position: T,
+        position: PointUtf16,
         cx: &mut ModelContext<Self>,
     ) -> Task<Result<Vec<LocationLink>>> {
-        let position = position.to_point_utf16(buffer.read(cx));
         self.request_lsp(
             buffer.clone(),
             LanguageServerToQuery::Primary,
@@ -4428,14 +4428,22 @@ impl Project {
             cx,
         )
     }
-
-    pub fn type_definition<T: ToPointUtf16>(
+    pub fn definition<T: ToPointUtf16>(
         &self,
         buffer: &Model<Buffer>,
         position: T,
         cx: &mut ModelContext<Self>,
     ) -> Task<Result<Vec<LocationLink>>> {
         let position = position.to_point_utf16(buffer.read(cx));
+        self.definition_impl(buffer, position, cx)
+    }
+
+    fn type_definition_impl(
+        &self,
+        buffer: &Model<Buffer>,
+        position: PointUtf16,
+        cx: &mut ModelContext<Self>,
+    ) -> Task<Result<Vec<LocationLink>>> {
         self.request_lsp(
             buffer.clone(),
             LanguageServerToQuery::Primary,
@@ -4443,7 +4451,30 @@ impl Project {
             cx,
         )
     }
+    pub fn type_definition<T: ToPointUtf16>(
+        &self,
+        buffer: &Model<Buffer>,
+        position: T,
+        cx: &mut ModelContext<Self>,
+    ) -> Task<Result<Vec<LocationLink>>> {
+        let position = position.to_point_utf16(buffer.read(cx));
 
+        self.type_definition_impl(buffer, position, cx)
+    }
+
+    fn references_impl(
+        &self,
+        buffer: &Model<Buffer>,
+        position: PointUtf16,
+        cx: &mut ModelContext<Self>,
+    ) -> Task<Result<Vec<Location>>> {
+        self.request_lsp(
+            buffer.clone(),
+            LanguageServerToQuery::Primary,
+            GetReferences { position },
+            cx,
+        )
+    }
     pub fn references<T: ToPointUtf16>(
         &self,
         buffer: &Model<Buffer>,
@@ -4451,10 +4482,19 @@ impl Project {
         cx: &mut ModelContext<Self>,
     ) -> Task<Result<Vec<Location>>> {
         let position = position.to_point_utf16(buffer.read(cx));
+        self.references_impl(buffer, position, cx)
+    }
+
+    fn document_highlights_impl(
+        &self,
+        buffer: &Model<Buffer>,
+        position: PointUtf16,
+        cx: &mut ModelContext<Self>,
+    ) -> Task<Result<Vec<DocumentHighlight>>> {
         self.request_lsp(
             buffer.clone(),
             LanguageServerToQuery::Primary,
-            GetReferences { position },
+            GetDocumentHighlights { position },
             cx,
         )
     }
@@ -4466,12 +4506,7 @@ impl Project {
         cx: &mut ModelContext<Self>,
     ) -> Task<Result<Vec<DocumentHighlight>>> {
         let position = position.to_point_utf16(buffer.read(cx));
-        self.request_lsp(
-            buffer.clone(),
-            LanguageServerToQuery::Primary,
-            GetDocumentHighlights { position },
-            cx,
-        )
+        self.document_highlights_impl(buffer, position, cx)
     }
 
     pub fn symbols(&self, query: &str, cx: &mut ModelContext<Self>) -> Task<Result<Vec<Symbol>>> {
@@ -4694,13 +4729,12 @@ impl Project {
         }
     }
 
-    pub fn hover<T: ToPointUtf16>(
+    fn hover_impl(
         &self,
         buffer: &Model<Buffer>,
-        position: T,
+        position: PointUtf16,
         cx: &mut ModelContext<Self>,
     ) -> Task<Result<Option<Hover>>> {
-        let position = position.to_point_utf16(buffer.read(cx));
         self.request_lsp(
             buffer.clone(),
             LanguageServerToQuery::Primary,
@@ -4708,14 +4742,23 @@ impl Project {
             cx,
         )
     }
-
-    pub fn completions<T: ToOffset + ToPointUtf16>(
+    pub fn hover<T: ToPointUtf16>(
         &self,
         buffer: &Model<Buffer>,
         position: T,
         cx: &mut ModelContext<Self>,
-    ) -> Task<Result<Vec<Completion>>> {
+    ) -> Task<Result<Option<Hover>>> {
         let position = position.to_point_utf16(buffer.read(cx));
+        self.hover_impl(buffer, position, cx)
+    }
+
+    #[inline(never)]
+    fn completions_impl(
+        &self,
+        buffer: &Model<Buffer>,
+        position: PointUtf16,
+        cx: &mut ModelContext<Self>,
+    ) -> Task<Result<Vec<Completion>>> {
         if self.is_local() {
             let snapshot = buffer.read(cx).snapshot();
             let offset = position.to_offset(&snapshot);
@@ -4762,6 +4805,15 @@ impl Project {
             Task::ready(Ok(Default::default()))
         }
     }
+    pub fn completions<T: ToOffset + ToPointUtf16>(
+        &self,
+        buffer: &Model<Buffer>,
+        position: T,
+        cx: &mut ModelContext<Self>,
+    ) -> Task<Result<Vec<Completion>>> {
+        let position = position.to_point_utf16(buffer.read(cx));
+        self.completions_impl(buffer, position, cx)
+    }
 
     pub fn resolve_completions(
         &self,
@@ -5038,6 +5090,20 @@ impl Project {
         }
     }
 
+    fn code_actions_impl(
+        &self,
+        buffer_handle: &Model<Buffer>,
+        range: Range<Anchor>,
+        cx: &mut ModelContext<Self>,
+    ) -> Task<Result<Vec<CodeAction>>> {
+        self.request_lsp(
+            buffer_handle.clone(),
+            LanguageServerToQuery::Primary,
+            GetCodeActions { range },
+            cx,
+        )
+    }
+
     pub fn code_actions<T: Clone + ToOffset>(
         &self,
         buffer_handle: &Model<Buffer>,
@@ -5046,12 +5112,7 @@ impl Project {
     ) -> Task<Result<Vec<CodeAction>>> {
         let buffer = buffer_handle.read(cx);
         let range = buffer.anchor_before(range.start)..buffer.anchor_before(range.end);
-        self.request_lsp(
-            buffer_handle.clone(),
-            LanguageServerToQuery::Primary,
-            GetCodeActions { range },
-            cx,
-        )
+        self.code_actions_impl(buffer_handle, range, cx)
     }
 
     pub fn apply_code_action(
@@ -5420,13 +5481,12 @@ impl Project {
         Ok(project_transaction)
     }
 
-    pub fn prepare_rename<T: ToPointUtf16>(
+    fn prepare_rename_impl(
         &self,
         buffer: Model<Buffer>,
-        position: T,
+        position: PointUtf16,
         cx: &mut ModelContext<Self>,
     ) -> Task<Result<Option<Range<Anchor>>>> {
-        let position = position.to_point_utf16(buffer.read(cx));
         self.request_lsp(
             buffer,
             LanguageServerToQuery::Primary,
@@ -5434,11 +5494,20 @@ impl Project {
             cx,
         )
     }
-
-    pub fn perform_rename<T: ToPointUtf16>(
+    pub fn prepare_rename<T: ToPointUtf16>(
         &self,
         buffer: Model<Buffer>,
         position: T,
+        cx: &mut ModelContext<Self>,
+    ) -> Task<Result<Option<Range<Anchor>>>> {
+        let position = position.to_point_utf16(buffer.read(cx));
+        self.prepare_rename_impl(buffer, position, cx)
+    }
+
+    fn perform_rename_impl(
+        &self,
+        buffer: Model<Buffer>,
+        position: PointUtf16,
         new_name: String,
         push_to_history: bool,
         cx: &mut ModelContext<Self>,
@@ -5455,22 +5524,28 @@ impl Project {
             cx,
         )
     }
-
-    pub fn on_type_format<T: ToPointUtf16>(
+    pub fn perform_rename<T: ToPointUtf16>(
         &self,
         buffer: Model<Buffer>,
         position: T,
+        new_name: String,
+        push_to_history: bool,
+        cx: &mut ModelContext<Self>,
+    ) -> Task<Result<ProjectTransaction>> {
+        let position = position.to_point_utf16(buffer.read(cx));
+        self.perform_rename_impl(buffer, position, new_name, push_to_history, cx)
+    }
+
+    pub fn on_type_format_impl(
+        &self,
+        buffer: Model<Buffer>,
+        position: PointUtf16,
         trigger: String,
         push_to_history: bool,
         cx: &mut ModelContext<Self>,
     ) -> Task<Result<Option<Transaction>>> {
-        let (position, tab_size) = buffer.update(cx, |buffer, cx| {
-            let position = position.to_point_utf16(buffer);
-            (
-                position,
-                language_settings(buffer.language_at(position).as_ref(), buffer.file(), cx)
-                    .tab_size,
-            )
+        let tab_size = buffer.update(cx, |buffer, cx| {
+            language_settings(buffer.language_at(position).as_ref(), buffer.file(), cx).tab_size
         });
         self.request_lsp(
             buffer.clone(),
@@ -5485,6 +5560,18 @@ impl Project {
         )
     }
 
+    pub fn on_type_format<T: ToPointUtf16>(
+        &self,
+        buffer: Model<Buffer>,
+        position: T,
+        trigger: String,
+        push_to_history: bool,
+        cx: &mut ModelContext<Self>,
+    ) -> Task<Result<Option<Transaction>>> {
+        let position = position.to_point_utf16(buffer.read(cx));
+        self.on_type_format_impl(buffer, position, trigger, push_to_history, cx)
+    }
+
     pub fn inlay_hints<T: ToOffset>(
         &self,
         buffer_handle: Model<Buffer>,
@@ -5493,6 +5580,15 @@ impl Project {
     ) -> Task<anyhow::Result<Vec<InlayHint>>> {
         let buffer = buffer_handle.read(cx);
         let range = buffer.anchor_before(range.start)..buffer.anchor_before(range.end);
+        self.inlay_hints_impl(buffer_handle, range, cx)
+    }
+    fn inlay_hints_impl(
+        &self,
+        buffer_handle: Model<Buffer>,
+        range: Range<Anchor>,
+        cx: &mut ModelContext<Self>,
+    ) -> Task<anyhow::Result<Vec<InlayHint>>> {
+        let buffer = buffer_handle.read(cx);
         let range_start = range.start;
         let range_end = range.end;
         let buffer_id = buffer.remote_id().into();

From 79c1003b344ee513cf97ee8313c38c7c3f02c916 Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Fri, 2 Feb 2024 11:44:28 +0100
Subject: [PATCH 172/372] go: fix highlighting of brackets, variables, fields
 (#7276)

This changes the highlighting of Go code to make it more similar to how
we highlight Rust

* normal variables have the normal color, vs. being highlighted. This
really stuck out.
* brackets are properly highlighted

It also brings it closer to Neovim's tree-sitter highlighting by
changing how struct fields are highlighted.



Release Notes:

- Improved highlighting of Go code by tuning highlighting of variables,
brackets, and struct fields.

## Before & After

![screenshot-2024-02-02-11 38
08@2x](https://github.com/zed-industries/zed/assets/1185253/a754f166-89c1-40e8-a8da-b63155180896)
---
 crates/zed/src/languages/go/highlights.scm | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/crates/zed/src/languages/go/highlights.scm b/crates/zed/src/languages/go/highlights.scm
index 6a9be8aae0..8cbf976fb8 100644
--- a/crates/zed/src/languages/go/highlights.scm
+++ b/crates/zed/src/languages/go/highlights.scm
@@ -1,6 +1,10 @@
-(identifier) @variable
 (type_identifier) @type
-(field_identifier) @property
+(field_identifier) @variable.member
+
+(keyed_element
+  .
+  (literal_element
+    (identifier) @variable.member))
 
 (call_expression
   function: (identifier) @function)
@@ -15,6 +19,15 @@
 (method_declaration
   name: (field_identifier) @function.method)
 
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
+
 [
   "--"
   "-"

From 980d4f1003e8bee5d9117440334aaf4eb97fc4f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robin=20Pf=C3=A4ffle?=
 <67913738+rpfaeffle@users.noreply.github.com>
Date: Fri, 2 Feb 2024 15:51:05 +0100
Subject: [PATCH 173/372] Add inline code blocks in markdown preview (#7277)

Fixes #7236.

The reason why the code was not displayed correctly is due to missing
background color for the inline code block.

Previously to this PR:

<img width="1840" alt="SCR-20240202-mclv"
src="https://github.com/zed-industries/zed/assets/67913738/92f63e72-db86-4de9-bb42-40549679e159"
alt="Screenshot showing that inline code blocks are not highlighted in
Markdown preview">

After this PR:

<img width="1796" alt="SCR-20240202-mccs"
src="https://github.com/zed-industries/zed/assets/67913738/5cf039af-82d7-41b8-b461-f79dec5ddf6a"
alt="Screenshot showing that inline code blocks are now highlighted in
Markdown preview">



Release Notes:

- Fixed inline code block not shown in markdown preview
([#7236](https://github.com/zed-industries/zed/issues/7236)).
---
 crates/rich_text/src/rich_text.rs | 34 ++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/crates/rich_text/src/rich_text.rs b/crates/rich_text/src/rich_text.rs
index f5ab38c4ce..1063d89db3 100644
--- a/crates/rich_text/src/rich_text.rs
+++ b/crates/rich_text/src/rich_text.rs
@@ -13,6 +13,7 @@ use util::RangeExt;
 pub enum Highlight {
     Code,
     Id(HighlightId),
+    InlineCode(bool),
     Highlight(HighlightStyle),
     Mention,
     SelfMention,
@@ -67,6 +68,23 @@ impl RichText {
                                 background_color: Some(code_background),
                                 ..id.style(theme.syntax()).unwrap_or_default()
                             },
+                            Highlight::InlineCode(link) => {
+                                if !*link {
+                                    HighlightStyle {
+                                        background_color: Some(code_background),
+                                        ..Default::default()
+                                    }
+                                } else {
+                                    HighlightStyle {
+                                        background_color: Some(code_background),
+                                        underline: Some(UnderlineStyle {
+                                            thickness: 1.0.into(),
+                                            ..Default::default()
+                                        }),
+                                        ..Default::default()
+                                    }
+                                }
+                            }
                             Highlight::Highlight(highlight) => *highlight,
                             Highlight::Mention => HighlightStyle {
                                 font_weight: Some(FontWeight::BOLD),
@@ -184,22 +202,14 @@ pub fn render_markdown_mut(
             }
             Event::Code(t) => {
                 text.push_str(t.as_ref());
-                if link_url.is_some() {
-                    highlights.push((
-                        prev_len..text.len(),
-                        Highlight::Highlight(HighlightStyle {
-                            underline: Some(UnderlineStyle {
-                                thickness: 1.0.into(),
-                                ..Default::default()
-                            }),
-                            ..Default::default()
-                        }),
-                    ));
-                }
+                let is_link = link_url.is_some();
+
                 if let Some(link_url) = link_url.clone() {
                     link_ranges.push(prev_len..text.len());
                     link_urls.push(link_url);
                 }
+
+                highlights.push((prev_len..text.len(), Highlight::InlineCode(is_link)))
             }
             Event::Start(tag) => match tag {
                 Tag::Paragraph => new_paragraph(text, &mut list_stack),

From 998f6cf80d3de4c289869edfa20e847605465776 Mon Sep 17 00:00:00 2001
From: Rashid Almheiri <69181766+huwaireb@users.noreply.github.com>
Date: Fri, 2 Feb 2024 18:58:07 +0400
Subject: [PATCH 174/372] Add OCaml support (#6929)

This pull request implements support for the [OCaml
Language](https://ocaml.org/).

### Additions
- [x]
[tree-sitter-ocaml](https://github.com/tree-sitter/tree-sitter-ocaml)
grammar
- [x] Highlight, Indents, Outline queries
- [x] A new file icon for .ml(i) files. Based on
[ocaml/ocaml-logo](https://github.com/ocaml/ocaml-logo/blob/master/Colour/SVG/colour-transparent-icon.svg)
- [x] LSP Integration with
[ocaml-language-server](https://github.com/ocaml/ocaml-lsp)
- [x] Completion Labels
- [x] Symbol Labels

### Bug Fixes
- [x] Improper parsing of LSP headers.

### Missing [will file a separate issue]
- Documentation on completionItem, requires: `completionItem/resolve`
with support for `documentation` as a provider.

### Screenshots

<details><summary>Zed</summary>
<img width="1800" alt="Screenshot 2024-02-01 at 03 33 20"
src="https://github.com/zed-industries/zed/assets/69181766/e17c184e-203e-40c3-a08f-4de46226b79c">
</details>

Release Notes:
- Added OCaml Support
([#5316](https://github.com/zed-industries/zed/issues/5316)).

> [!NOTE]
> Partially completes #5316
> To complete #5316:
> 1. addition of a reason tree-sitter grammar.
> 2. opam/esy integration, however it may be better as it's own plugin.
---
 Cargo.lock                                    |  10 +
 Cargo.toml                                    |  17 +-
 assets/icons/file_icons/file_types.json       |   5 +
 assets/icons/file_icons/ocaml.svg             |   5 +
 crates/lsp/src/lsp.rs                         |  33 +-
 crates/zed/Cargo.toml                         |   1 +
 crates/zed/src/languages.rs                   |  11 +
 .../languages/ocaml-interface/brackets.scm    |   6 +
 .../src/languages/ocaml-interface/config.toml |  13 +
 .../languages/ocaml-interface/highlights.scm  |   1 +
 .../src/languages/ocaml-interface/indents.scm |  21 ++
 .../src/languages/ocaml-interface/outline.scm |  48 +++
 crates/zed/src/languages/ocaml.rs             | 317 ++++++++++++++++++
 crates/zed/src/languages/ocaml/brackets.scm   |  12 +
 crates/zed/src/languages/ocaml/config.toml    |  18 +
 crates/zed/src/languages/ocaml/highlights.scm | 142 ++++++++
 crates/zed/src/languages/ocaml/indents.scm    |  43 +++
 crates/zed/src/languages/ocaml/outline.scm    |  59 ++++
 docs/src/languages/ocaml.md                   |  31 ++
 19 files changed, 784 insertions(+), 9 deletions(-)
 create mode 100644 assets/icons/file_icons/ocaml.svg
 create mode 100644 crates/zed/src/languages/ocaml-interface/brackets.scm
 create mode 100644 crates/zed/src/languages/ocaml-interface/config.toml
 create mode 120000 crates/zed/src/languages/ocaml-interface/highlights.scm
 create mode 100644 crates/zed/src/languages/ocaml-interface/indents.scm
 create mode 100644 crates/zed/src/languages/ocaml-interface/outline.scm
 create mode 100644 crates/zed/src/languages/ocaml.rs
 create mode 100644 crates/zed/src/languages/ocaml/brackets.scm
 create mode 100644 crates/zed/src/languages/ocaml/config.toml
 create mode 100644 crates/zed/src/languages/ocaml/highlights.scm
 create mode 100644 crates/zed/src/languages/ocaml/indents.scm
 create mode 100644 crates/zed/src/languages/ocaml/outline.scm
 create mode 100644 docs/src/languages/ocaml.md

diff --git a/Cargo.lock b/Cargo.lock
index 4ae19e764c..5d735cac63 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8960,6 +8960,15 @@ dependencies = [
  "tree-sitter",
 ]
 
+[[package]]
+name = "tree-sitter-ocaml"
+version = "0.20.4"
+source = "git+https://github.com/tree-sitter/tree-sitter-ocaml?rev=4abfdc1c7af2c6c77a370aee974627be1c285b3b#4abfdc1c7af2c6c77a370aee974627be1c285b3b"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
 [[package]]
 name = "tree-sitter-php"
 version = "0.21.1"
@@ -10418,6 +10427,7 @@ dependencies = [
  "tree-sitter-markdown",
  "tree-sitter-nix",
  "tree-sitter-nu",
+ "tree-sitter-ocaml",
  "tree-sitter-php",
  "tree-sitter-proto",
  "tree-sitter-purescript",
diff --git a/Cargo.toml b/Cargo.toml
index f46d32a53c..5a276ef8b3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -100,11 +100,14 @@ ctor = "0.2.6"
 derive_more = "0.99.17"
 env_logger = "0.9"
 futures = "0.3"
-git2 = { version = "0.15", default-features = false}
+git2 = { version = "0.15", default-features = false }
 globset = "0.4"
 indoc = "1"
 # We explicitly disable a http2 support in isahc.
-isahc = { version = "1.7.2", default-features = false, features = ["static-curl", "text-decoding"] }
+isahc = { version = "1.7.2", default-features = false, features = [
+    "static-curl",
+    "text-decoding",
+] }
 lazy_static = "1.4.0"
 log = { version = "0.4.16", features = ["kv_unstable_serde"] }
 ordered-float = "2.1.1"
@@ -122,7 +125,10 @@ schemars = "0.8"
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_derive = { version = "1.0", features = ["deserialize_in_place"] }
 serde_json = { version = "1.0", features = ["preserve_order", "raw_value"] }
-serde_json_lenient = { version = "0.1", features = ["preserve_order", "raw_value"] }
+serde_json_lenient = { version = "0.1", features = [
+    "preserve_order",
+    "raw_value",
+] }
 serde_repr = "0.1"
 smallvec = { version = "1.6", features = ["union"] }
 smol = "1.2"
@@ -137,7 +143,7 @@ tree-sitter = { version = "0.20", features = ["wasm"] }
 tree-sitter-bash = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "7331995b19b8f8aba2d5e26deb51d2195c18bc94" }
 tree-sitter-c = "0.20.1"
 tree-sitter-c-sharp = { git = "https://github.com/tree-sitter/tree-sitter-c-sharp", rev = "dd5e59721a5f8dae34604060833902b882023aaf" }
-tree-sitter-cpp = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev="f44509141e7e483323d2ec178f2d2e6c0fc041c1" }
+tree-sitter-cpp = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "f44509141e7e483323d2ec178f2d2e6c0fc041c1" }
 tree-sitter-css = { git = "https://github.com/tree-sitter/tree-sitter-css", rev = "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51" }
 tree-sitter-elixir = { git = "https://github.com/elixir-lang/tree-sitter-elixir", rev = "a2861e88a730287a60c11ea9299c033c7d076e30" }
 tree-sitter-elm = { git = "https://github.com/elm-tooling/tree-sitter-elm", rev = "692c50c0b961364c40299e73c1306aecb5d20f40" }
@@ -157,8 +163,9 @@ tree-sitter-lua = "0.0.14"
 tree-sitter-markdown = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "330ecab87a3e3a7211ac69bbadc19eabecdb1cca" }
 tree-sitter-nix = { git = "https://github.com/nix-community/tree-sitter-nix", rev = "66e3e9ce9180ae08fc57372061006ef83f0abde7" }
 tree-sitter-nu = { git = "https://github.com/nushell/tree-sitter-nu", rev = "26bbaecda0039df4067861ab38ea8ea169f7f5aa" }
+tree-sitter-ocaml = { git = "https://github.com/tree-sitter/tree-sitter-ocaml", rev = "4abfdc1c7af2c6c77a370aee974627be1c285b3b" }
 tree-sitter-php = "0.21.1"
-tree-sitter-proto = {git = "https://github.com/rewinfrey/tree-sitter-proto", rev = "36d54f288aee112f13a67b550ad32634d0c2cb52" }
+tree-sitter-proto = { git = "https://github.com/rewinfrey/tree-sitter-proto", rev = "36d54f288aee112f13a67b550ad32634d0c2cb52" }
 tree-sitter-purescript = { git = "https://github.com/ivanmoreau/tree-sitter-purescript", rev = "a37140f0c7034977b90faa73c94fcb8a5e45ed08" }
 tree-sitter-python = "0.20.2"
 tree-sitter-racket = { git = "https://github.com/zed-industries/tree-sitter-racket", rev = "eb010cf2c674c6fd9a6316a84e28ef90190fe51a" }
diff --git a/assets/icons/file_icons/file_types.json b/assets/icons/file_icons/file_types.json
index 8cf7b314c9..29967deb8d 100644
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -69,6 +69,8 @@
         "mdb": "storage",
         "mdf": "storage",
         "mdx": "document",
+        "ml": "ocaml",
+        "mli": "ocaml",
         "mp3": "audio",
         "mp4": "video",
         "myd": "storage",
@@ -179,6 +181,9 @@
         "log": {
             "icon": "icons/file_icons/info.svg"
         },
+        "ocaml": {
+          "icon": "icons/file_icons/ocaml.svg"
+        },
         "phoenix": {
             "icon": "icons/file_icons/phoenix.svg"
         },
diff --git a/assets/icons/file_icons/ocaml.svg b/assets/icons/file_icons/ocaml.svg
new file mode 100644
index 0000000000..457844f49a
--- /dev/null
+++ b/assets/icons/file_icons/ocaml.svg
@@ -0,0 +1,5 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.73843 11.709C6.70584 11.6334 6.60683 11.4367 6.55712 11.3736C6.44917 11.2362 6.42396 11.2258 6.39221 11.0523C6.33703 10.7501 6.19094 10.202 6.01879 9.82381C5.92987 9.62863 5.78201 9.46467 5.64665 9.32312C5.52847 9.19895 5.26214 8.99002 5.2157 9.00037C4.7807 9.09487 4.64576 9.55902 4.44115 9.92673C4.32795 10.1301 4.208 10.3031 4.1188 10.5195C4.03641 10.7184 4.04373 10.9387 3.90268 11.1095C3.75801 11.2849 3.66398 11.4715 3.59311 11.6981C3.57968 11.7412 3.54148 12.1939 3.5 12.3006L4.14649 12.2511C4.74896 12.2958 4.57496 12.547 5.51526 12.4922L7 12.4423C6.95398 12.2942 6.89056 12.1228 6.86613 12.067C6.82472 11.9732 6.77267 11.7897 6.73843 11.709Z" fill="black"/>
+<path d="M8.72454 8.42043C8.61775 8.50889 8.40904 8.72165 7.95506 8.8021C7.75133 8.83825 7.56076 8.84122 7.35158 8.82925C7.24918 8.8236 7.15263 8.81758 7.04997 8.81605C6.9895 8.81552 6.78663 8.80812 6.79667 8.83039L6.77408 8.89506C6.7776 8.91633 6.78497 8.96949 6.78703 8.98237C6.79534 9.03461 6.79766 9.07617 6.79939 9.12421C6.80252 9.22297 6.79228 9.32592 6.79667 9.42559C6.80577 9.63232 6.87262 9.82076 6.88106 10.0293C6.89029 10.2615 6.99037 10.5072 7.08718 10.6969C7.12393 10.7691 7.17988 10.7773 7.20426 10.8663C7.23284 10.9681 7.20579 11.0762 7.21968 11.1848C7.27417 11.6058 7.37982 12.0459 7.54501 12.4259C7.54621 12.4291 7.54747 12.4325 7.54893 12.4354C7.75293 12.3961 7.95732 12.3119 8.22239 12.2669C8.70839 12.1841 9.3843 12.2268 9.81848 12.1801C10.9171 12.0616 11.5133 12.6972 12.5 12.4367V3.09052C12.5 2.21217 11.8798 1.5 11.1142 1.5H2.88578C2.1205 1.5 1.5 2.21217 1.5 3.09052V6.5608C1.69828 6.47851 1.98348 5.99435 2.07285 5.87661C2.2292 5.67071 2.25758 5.40808 2.33546 5.24267C2.51281 4.86596 2.54331 4.60691 2.94645 4.60691C3.13436 4.60691 3.20899 4.65663 3.3361 4.85238C3.42454 4.98851 3.57731 5.24 3.64881 5.40815C3.73134 5.60215 3.86583 5.86464 3.92497 5.91763C3.96876 5.95698 4.01221 5.9865 4.05275 6.00396C4.11813 6.0321 4.17222 5.98047 4.21595 5.94051C4.27176 5.8895 4.29582 5.78556 4.34751 5.64692C4.422 5.44689 4.5032 5.20721 4.54938 5.12356C4.62932 4.97897 4.65656 4.80739 4.74288 4.72427C4.8702 4.60172 5.03632 4.59311 5.08203 4.58274C5.33779 4.52478 5.45408 4.72419 5.58006 4.85315C5.66253 4.93764 5.77522 5.10785 5.85523 5.33594C5.91776 5.51408 5.99736 5.67887 6.03065 5.78174C6.06281 5.88103 6.14222 6.04018 6.18926 6.23098C6.23199 6.40424 6.34635 6.537 6.3898 6.61936C6.3898 6.61936 6.45632 6.83319 6.86079 7.02864C6.9485 7.07104 7.12579 7.13998 7.23157 7.18413C7.40733 7.25741 7.57757 7.24788 7.79432 7.21807C7.94888 7.21807 8.03261 6.96123 8.10284 6.75556C8.14437 6.634 8.18418 6.28566 8.21129 6.18675C8.23754 6.09051 8.17614 6.01608 8.22843 5.93174C8.28956 5.83329 8.32591 5.82796 8.3612 5.69961C8.43701 5.42478 8.87524 5.4109 9.12156 5.4109C9.32689 5.4109 9.30078 5.63967 9.6491 5.56143C9.84858 5.51652 10.0408 5.59094 10.2526 5.65531C10.4309 5.7096 10.5986 5.77145 10.699 5.90642C10.764 5.99382 10.9254 6.43169 10.761 6.45037C10.7768 6.47257 10.7884 6.5126 10.8179 6.53456C10.7813 6.69974 10.622 6.58207 10.5335 6.56087C10.4142 6.5325 10.33 6.56514 10.2133 6.6244C10.0138 6.72635 9.72206 6.71446 9.5483 6.88055C9.40085 7.02132 9.40111 7.33558 9.33234 7.51166C9.33234 7.51166 9.14137 8.07551 8.72454 8.42043Z" fill="black"/>
+<path d="M3.6514 8.80413C3.57333 8.79137 3.50083 8.77702 3.425 8.75238C3.28339 8.70644 3.12867 8.66165 2.9892 8.60788C2.90451 8.57488 2.62239 8.41409 2.5611 8.36877C2.41737 8.26211 2.32191 7.97231 2.20955 8.00214C2.13782 8.02098 2.06795 8.06058 2.02333 8.17701C1.98692 8.27196 1.97457 8.43521 1.94936 8.54469C1.92011 8.67177 1.86959 8.7904 1.82536 8.91149C1.74401 9.13362 1.59759 9.33453 1.5345 9.55093C1.52181 9.59546 1.51055 9.64527 1.5 9.6972V10.5274V11.9637V12.1713C1.57359 12.1915 1.65057 12.2164 1.73674 12.2535C2.37264 12.5265 2.52781 12.5497 3.15152 12.4348L3.21002 12.4223C3.25775 12.2625 3.2946 11.718 3.32555 11.5494C3.34966 11.4202 3.38279 11.3173 3.39537 11.1853C3.40723 11.06 3.39427 10.9406 3.3876 10.8267C3.37011 10.5414 3.51669 10.4395 3.58667 10.1945C3.64976 9.97283 3.68617 9.7206 3.73839 9.49399C3.78847 9.27653 3.86665 8.96922 4 8.85975C3.98382 8.82938 3.72144 8.81539 3.6514 8.80413Z" fill="black"/>
+</svg>
diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index f9cd138217..ee5fb3a1d2 100644
--- a/crates/lsp/src/lsp.rs
+++ b/crates/lsp/src/lsp.rs
@@ -332,11 +332,36 @@ impl LanguageServer {
             };
 
             let header = std::str::from_utf8(&buffer)?;
-            let message_len: usize = header
+            let mut segments = header.lines();
+
+            let message_len: usize = segments
+                .next()
+                .context("unable to find the first line of the LSP message header")?
                 .strip_prefix(CONTENT_LEN_HEADER)
-                .ok_or_else(|| anyhow!("invalid LSP message header {header:?}"))?
-                .trim_end()
-                .parse()?;
+                .context("invalid LSP message header")?
+                .parse()
+                .with_context(|| {
+                    format!(
+                        "failed to parse Content-Length of LSP message header: {}",
+                        header
+                    )
+                })?;
+
+            if let Some(second_segment) = segments.next() {
+                match second_segment {
+                    "" => (), // Header end
+                    header_field if header_field.starts_with("Content-Type:") => {
+                        stdout.read_until(b'\n', &mut buffer).await?;
+                    }
+                    _ => {
+                        anyhow::bail!(
+                            "expected a Content-Type header field or a header ending CRLF, got {second_segment:?}"
+                        );
+                    }
+                }
+            } else {
+                anyhow::bail!("unable to find the second line of the LSP message header");
+            }
 
             buffer.resize(message_len, 0);
             stdout.read_exact(&mut buffer).await?;
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 5b202aef43..61df53a9fb 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -130,6 +130,7 @@ tree-sitter-lua.workspace = true
 tree-sitter-markdown.workspace = true
 tree-sitter-nix.workspace = true
 tree-sitter-nu.workspace = true
+tree-sitter-ocaml.workspace = true
 tree-sitter-php.workspace = true
 tree-sitter-proto.workspace = true
 tree-sitter-purescript.workspace = true
diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index add9f9c192..15bd180a2e 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -25,6 +25,7 @@ mod json;
 mod language_plugin;
 mod lua;
 mod nu;
+mod ocaml;
 mod php;
 mod purescript;
 mod python;
@@ -299,6 +300,16 @@ pub fn init(
         tree_sitter_nu::language(),
         vec![Arc::new(nu::NuLanguageServer {})],
     );
+    language(
+        "ocaml",
+        tree_sitter_ocaml::language_ocaml(),
+        vec![Arc::new(ocaml::OCamlLspAdapter)],
+    );
+    language(
+        "ocaml-interface",
+        tree_sitter_ocaml::language_ocaml_interface(),
+        vec![Arc::new(ocaml::OCamlLspAdapter)],
+    );
     language(
         "vue",
         tree_sitter_vue::language(),
diff --git a/crates/zed/src/languages/ocaml-interface/brackets.scm b/crates/zed/src/languages/ocaml-interface/brackets.scm
new file mode 100644
index 0000000000..0929a696fd
--- /dev/null
+++ b/crates/zed/src/languages/ocaml-interface/brackets.scm
@@ -0,0 +1,6 @@
+("(" @open ")" @close)
+("{" @open "}" @close)
+("<" @open ">" @close)
+
+("sig" @open "end" @close)
+("object" @open "end" @close)
diff --git a/crates/zed/src/languages/ocaml-interface/config.toml b/crates/zed/src/languages/ocaml-interface/config.toml
new file mode 100644
index 0000000000..f7401f774c
--- /dev/null
+++ b/crates/zed/src/languages/ocaml-interface/config.toml
@@ -0,0 +1,13 @@
+name = "OCaml Interface"
+path_suffixes = ["mli"]
+block_comment = ["(* ", "*)"]
+autoclose_before = ";,=)}"
+brackets = [
+  { start = "{", end = "}", close = true, newline = true },
+  { start = "<", end = ">", close = true, newline = true },
+  { start = "[", end = "]", close = true, newline = true },
+  { start = "(", end = ")", close = true, newline = true },
+  { start = "sig", end = " end", close = true, newline = true },
+  # HACK: For some reason `object` alone does not work  
+  { start = "object ", end = "end", close = true, newline = true },
+]
diff --git a/crates/zed/src/languages/ocaml-interface/highlights.scm b/crates/zed/src/languages/ocaml-interface/highlights.scm
new file mode 120000
index 0000000000..e6f0d00d1d
--- /dev/null
+++ b/crates/zed/src/languages/ocaml-interface/highlights.scm
@@ -0,0 +1 @@
+../ocaml/highlights.scm
\ No newline at end of file
diff --git a/crates/zed/src/languages/ocaml-interface/indents.scm b/crates/zed/src/languages/ocaml-interface/indents.scm
new file mode 100644
index 0000000000..0de50a48bb
--- /dev/null
+++ b/crates/zed/src/languages/ocaml-interface/indents.scm
@@ -0,0 +1,21 @@
+[
+  (type_binding)
+
+  (value_specification)
+  (method_specification)
+
+  (external)
+  (field_declaration)
+] @indent
+
+(_ "<" ">" @end) @indent
+(_ "{" "}" @end) @indent
+(_ "(" ")" @end) @indent
+
+(_ "object" @start "end" @end) @indent
+
+(signature
+  "sig" @start
+  "end" @end) @indent
+
+";;" @outdent
diff --git a/crates/zed/src/languages/ocaml-interface/outline.scm b/crates/zed/src/languages/ocaml-interface/outline.scm
new file mode 100644
index 0000000000..b8539d4cd0
--- /dev/null
+++ b/crates/zed/src/languages/ocaml-interface/outline.scm
@@ -0,0 +1,48 @@
+(module_type_definition
+  "module" @context
+  "type" @context
+  name: (_) @name) @item
+
+(module_definition
+    "module" @context
+    (module_binding name: (_) @name)) @item
+
+(type_definition
+    "type" @context
+    (type_binding name: (_) @name)) @item
+
+(class_definition
+    "class" @context
+    (class_binding
+      "virtual"? @context
+      name: (_) @name)) @item
+
+(class_type_definition
+  "class" @context
+  "type" @context
+  (class_type_binding
+    "virtual"? @context
+    name: (_) @name)) @item
+
+(instance_variable_definition
+  "val" @context
+  "method"? @context
+  name: (_) @name) @item
+
+(method_specification
+  "method" @context
+  "virtual"? @context
+   (method_name) @name) @item
+
+(value_specification
+    "val" @context
+    (value_name) @name) @item
+
+(external
+  "external" @context
+  (value_name) @name) @item
+
+(exception_definition
+    "exception" @context
+    (constructor_declaration
+      (constructor_name) @name)) @item
diff --git a/crates/zed/src/languages/ocaml.rs b/crates/zed/src/languages/ocaml.rs
new file mode 100644
index 0000000000..9878b89e33
--- /dev/null
+++ b/crates/zed/src/languages/ocaml.rs
@@ -0,0 +1,317 @@
+use std::{any::Any, ops::Range, path::PathBuf, sync::Arc};
+
+use anyhow::{anyhow, Result};
+use async_trait::async_trait;
+use language::{CodeLabel, LanguageServerName, LspAdapter, LspAdapterDelegate};
+use lsp::{CompletionItemKind, LanguageServerBinary, SymbolKind};
+use rope::Rope;
+
+const OPERATOR_CHAR: [char; 17] = [
+    '~', '!', '?', '%', '<', ':', '.', '$', '&', '*', '+', '-', '/', '=', '>', '@', '^',
+];
+
+pub struct OCamlLspAdapter;
+
+#[async_trait]
+impl LspAdapter for OCamlLspAdapter {
+    fn name(&self) -> LanguageServerName {
+        LanguageServerName("ocamllsp".into())
+    }
+
+    fn short_name(&self) -> &'static str {
+        "ocaml"
+    }
+
+    async fn fetch_latest_server_version(
+        &self,
+        _: &dyn LspAdapterDelegate,
+    ) -> Result<Box<dyn 'static + Send + Any>> {
+        Ok(Box::new(()))
+    }
+
+    async fn fetch_server_binary(
+        &self,
+        _: Box<dyn 'static + Send + Any>,
+        _: PathBuf,
+        _: &dyn LspAdapterDelegate,
+    ) -> Result<LanguageServerBinary> {
+        Err(anyhow!(
+            "ocamllsp (ocaml-language-server) must be installed manually."
+        ))
+    }
+
+    async fn cached_server_binary(
+        &self,
+        _: PathBuf,
+        _: &dyn LspAdapterDelegate,
+    ) -> Option<LanguageServerBinary> {
+        Some(LanguageServerBinary {
+            path: "ocamllsp".into(),
+            arguments: vec![],
+        })
+    }
+
+    fn can_be_reinstalled(&self) -> bool {
+        false
+    }
+
+    async fn installation_test_binary(&self, _: PathBuf) -> Option<LanguageServerBinary> {
+        None
+    }
+
+    async fn label_for_completion(
+        &self,
+        completion: &lsp::CompletionItem,
+        language: &Arc<language::Language>,
+    ) -> Option<CodeLabel> {
+        let name = &completion.label;
+        let detail = completion.detail.as_ref().map(|s| s.replace("\n", " "));
+
+        match completion.kind.zip(detail) {
+            // Error of 'b : ('a, 'b) result
+            // Stack_overflow : exn
+            Some((CompletionItemKind::CONSTRUCTOR | CompletionItemKind::ENUM_MEMBER, detail)) => {
+                let (argument, return_t) = detail
+                    .split_once("->")
+                    .map_or((None, detail.as_str()), |(arg, typ)| {
+                        (Some(arg.trim()), typ.trim())
+                    });
+
+                let constr_decl = argument.map_or(name.to_string(), |argument| {
+                    format!("{} of {}", name, argument)
+                });
+
+                let constr_host = if return_t.ends_with("exn") {
+                    "exception "
+                } else {
+                    "type t = "
+                };
+
+                let source_host = Rope::from([constr_host, &constr_decl].join(" "));
+                let mut source_highlight = {
+                    let constr_host_len = constr_host.len() + 1;
+
+                    language.highlight_text(
+                        &source_host,
+                        Range {
+                            start: constr_host_len,
+                            end: constr_host_len + constr_decl.len(),
+                        },
+                    )
+                };
+
+                let signature_host: Rope = Rope::from(format!("let _ : {} = ()", return_t));
+
+                // We include the ': ' in the range as we use it later
+                let mut signature_highlight =
+                    language.highlight_text(&signature_host, 6..8 + return_t.len());
+
+                if let Some(last) = source_highlight.last() {
+                    let offset = last.0.end + 1;
+
+                    signature_highlight.iter_mut().for_each(|(r, _)| {
+                        r.start += offset;
+                        r.end += offset;
+                    });
+                };
+
+                Some(CodeLabel {
+                    text: format!("{} : {}", constr_decl, return_t),
+                    runs: {
+                        source_highlight.append(&mut signature_highlight);
+                        source_highlight
+                    },
+                    filter_range: 0..name.len(),
+                })
+            }
+            // version : string
+            // NOTE: (~|?) are omitted as we don't use them in the fuzzy filtering
+            Some((CompletionItemKind::FIELD, detail))
+                if name.starts_with("~") || name.starts_with("?") =>
+            {
+                let label = name.trim_start_matches(&['~', '?']);
+                let text = format!("{} : {}", label, detail);
+
+                let signature_host = Rope::from(format!("let _ : {} = ()", detail));
+                let signature_highlight =
+                    &mut language.highlight_text(&signature_host, 6..8 + detail.len());
+
+                let offset = label.len() + 1;
+                for (r, _) in signature_highlight.iter_mut() {
+                    r.start += offset;
+                    r.end += offset;
+                }
+
+                let mut label_highlight = vec![(
+                    0..0 + label.len(),
+                    language.grammar()?.highlight_id_for_name("property")?,
+                )];
+
+                Some(CodeLabel {
+                    text,
+                    runs: {
+                        label_highlight.append(signature_highlight);
+                        label_highlight
+                    },
+                    filter_range: 0..label.len(),
+                })
+            }
+            // version: string;
+            Some((CompletionItemKind::FIELD, detail)) => {
+                let (_record_t, field_t) = detail.split_once("->")?;
+
+                let text = format!("{}: {};", name, field_t);
+                let source_host: Rope = Rope::from(format!("type t = {{ {} }}", text));
+
+                let runs: Vec<(Range<usize>, language::HighlightId)> =
+                    language.highlight_text(&source_host, 11..11 + text.len());
+
+                Some(CodeLabel {
+                    text,
+                    runs,
+                    filter_range: 0..name.len(),
+                })
+            }
+            // let* : 'a t -> ('a -> 'b t) -> 'b t
+            Some((CompletionItemKind::VALUE, detail))
+                if name.contains(OPERATOR_CHAR)
+                    || (name.starts_with("let") && name.contains(OPERATOR_CHAR)) =>
+            {
+                let text = format!("{} : {}", name, detail);
+
+                let source_host = Rope::from(format!("let ({}) : {} = ()", name, detail));
+                let mut runs = language.highlight_text(&source_host, 5..6 + text.len());
+
+                if runs.len() > 1 {
+                    // ')'
+                    runs.remove(1);
+
+                    for run in &mut runs[1..] {
+                        run.0.start -= 1;
+                        run.0.end -= 1;
+                    }
+                }
+
+                Some(CodeLabel {
+                    text,
+                    runs,
+                    filter_range: 0..name.len(),
+                })
+            }
+            // version : Version.t list -> Version.t option Lwt.t
+            Some((CompletionItemKind::VALUE, detail)) => {
+                let text = format!("{} : {}", name, detail);
+
+                let source_host = Rope::from(format!("let {} = ()", text));
+                let runs = language.highlight_text(&source_host, 4..4 + text.len());
+
+                Some(CodeLabel {
+                    text,
+                    runs,
+                    filter_range: 0..name.len(),
+                })
+            }
+            // status : string
+            Some((CompletionItemKind::METHOD, detail)) => {
+                let text = format!("{} : {}", name, detail);
+
+                let method_host = Rope::from(format!("class c : object method {} end", text));
+                let runs = language.highlight_text(&method_host, 24..24 + text.len());
+
+                Some(CodeLabel {
+                    text,
+                    runs,
+                    filter_range: 0..name.len(),
+                })
+            }
+            Some((kind, _)) => {
+                let highlight_name = match kind {
+                    CompletionItemKind::MODULE | CompletionItemKind::INTERFACE => "title",
+                    CompletionItemKind::KEYWORD => "keyword",
+                    CompletionItemKind::TYPE_PARAMETER => "type",
+                    _ => return None,
+                };
+
+                Some(CodeLabel {
+                    text: name.clone(),
+                    runs: vec![(
+                        0..name.len(),
+                        language.grammar()?.highlight_id_for_name(highlight_name)?,
+                    )],
+                    filter_range: 0..name.len(),
+                })
+            }
+            _ => None,
+        }
+    }
+
+    async fn label_for_symbol(
+        &self,
+        name: &str,
+        kind: SymbolKind,
+        language: &Arc<language::Language>,
+    ) -> Option<CodeLabel> {
+        let (text, filter_range, display_range) = match kind {
+            SymbolKind::PROPERTY => {
+                let text = format!("type t = {{ {}: (); }}", name);
+                let filter_range: Range<usize> = 0..name.len();
+                let display_range = 11..11 + name.len();
+                (text, filter_range, display_range)
+            }
+            SymbolKind::FUNCTION
+                if name.contains(OPERATOR_CHAR)
+                    || (name.starts_with("let") && name.contains(OPERATOR_CHAR)) =>
+            {
+                let text = format!("let ({}) () = ()", name);
+
+                let filter_range = 5..5 + name.len();
+                let display_range = 0..filter_range.end + 1;
+                (text, filter_range, display_range)
+            }
+            SymbolKind::FUNCTION => {
+                let text = format!("let {} () = ()", name);
+
+                let filter_range = 4..4 + name.len();
+                let display_range = 0..filter_range.end;
+                (text, filter_range, display_range)
+            }
+            SymbolKind::CONSTRUCTOR => {
+                let text = format!("type t = {}", name);
+                let filter_range = 0..name.len();
+                let display_range = 9..9 + name.len();
+                (text, filter_range, display_range)
+            }
+            SymbolKind::MODULE => {
+                let text = format!("module {} = struct end", name);
+                let filter_range = 7..7 + name.len();
+                let display_range = 0..filter_range.end;
+                (text, filter_range, display_range)
+            }
+            SymbolKind::CLASS => {
+                let text = format!("class {} = object end", name);
+                let filter_range = 6..6 + name.len();
+                let display_range = 0..filter_range.end;
+                (text, filter_range, display_range)
+            }
+            SymbolKind::METHOD => {
+                let text = format!("class c = object method {} = () end", name);
+                let filter_range = 0..name.len();
+                let display_range = 17..24 + name.len();
+                (text, filter_range, display_range)
+            }
+            SymbolKind::STRING => {
+                let text = format!("type {} = T", name);
+                let filter_range = 5..5 + name.len();
+                let display_range = 0..filter_range.end;
+                (text, filter_range, display_range)
+            }
+            _ => return None,
+        };
+
+        Some(CodeLabel {
+            runs: language.highlight_text(&text.as_str().into(), display_range.clone()),
+            text: text[display_range].to_string(),
+            filter_range,
+        })
+    }
+}
diff --git a/crates/zed/src/languages/ocaml/brackets.scm b/crates/zed/src/languages/ocaml/brackets.scm
new file mode 100644
index 0000000000..8aa7be2eaf
--- /dev/null
+++ b/crates/zed/src/languages/ocaml/brackets.scm
@@ -0,0 +1,12 @@
+("(" @open ")" @close)
+("[" @open "]" @close)
+("[|" @open "|]" @close)
+("{" @open "}" @close)
+("<" @open ">" @close)
+("\"" @open "\"" @close)
+
+("begin" @open "end" @close)
+("struct" @open "end" @close)
+("sig" @open "end" @close)
+("object" @open "end" @close)
+("do" @open "done" @close)
diff --git a/crates/zed/src/languages/ocaml/config.toml b/crates/zed/src/languages/ocaml/config.toml
new file mode 100644
index 0000000000..522db6dae1
--- /dev/null
+++ b/crates/zed/src/languages/ocaml/config.toml
@@ -0,0 +1,18 @@
+name = "OCaml"
+path_suffixes = ["ml"]
+block_comment = ["(* ", "*)"]
+autoclose_before = ";,=)}]"
+brackets = [ 
+  { start = "{", end = "}", close = true, newline = true },
+  { start = "<", end = ">", close = true, newline = true },
+  { start = "[", end = "]", close = true, newline = true },
+  { start = "[|", end = "|", close = true, newline = true, not_in = ["string"] },
+  { start = "(", end = ")", close = true, newline = true },
+  { start = "\"", end = "\"", close = true, newline = false, not_in = ["string"] },
+  { start = "begin", end = " end", close = true, newline = true },
+  { start = "struct", end = " end", close = true, newline = true },
+  { start = "sig", end = " end", close = true, newline = true },
+  # HACK: For some reason `object` alone does not work
+  { start = "object ", end = "end", close = true, newline = true },
+  { start = "do", end = " done", close = true, newline = true }
+]
diff --git a/crates/zed/src/languages/ocaml/highlights.scm b/crates/zed/src/languages/ocaml/highlights.scm
new file mode 100644
index 0000000000..e5125b912e
--- /dev/null
+++ b/crates/zed/src/languages/ocaml/highlights.scm
@@ -0,0 +1,142 @@
+; Modules
+;--------
+
+[(module_name) (module_type_name)] @title
+
+; Types
+;------
+
+[(class_name) (class_type_name) (type_constructor)] @type
+
+[(constructor_name) (tag)] @constructor
+
+; Functions
+;----------
+
+(let_binding
+  pattern: (value_name) @function
+  (parameter))
+
+(let_binding
+  pattern: (value_name) @function
+  body: [(fun_expression) (function_expression)])
+
+(value_specification (value_name) @function)
+
+(external (value_name) @function)
+
+(method_name) @function
+
+(infix_expression
+  left: (value_path (value_name) @function)
+  operator: (concat_operator) @operator
+  (#eq? @operator "@@"))
+
+(infix_expression
+  operator: (rel_operator) @operator
+  right: (value_path (value_name) @function)
+  (#eq? @operator "|>"))
+
+(application_expression
+  function: (value_path (value_name) @function))
+
+; Variables
+;----------
+
+[(type_variable) (value_pattern)] @variable
+
+; Properties
+;-----------
+
+[(label_name) (field_name) (instance_variable_name)] @property
+
+; Constants
+;----------
+
+(boolean) @boolean
+
+[(number) (signed_number)] @number
+
+[(string) (character)] @string
+
+(quoted_string "{" @string "}" @string) @string
+(quoted_string_content) @string
+
+
+(escape_sequence) @string.escape
+
+[
+  (conversion_specification)
+  (pretty_printing_indication)
+] @punctuation.special
+
+; Operators
+;----------
+
+(match_expression (match_operator) @keyword)
+
+(value_definition [(let_operator) (let_and_operator)] @keyword)
+
+[
+  (prefix_operator)
+  (sign_operator)
+  (pow_operator)
+  (mult_operator)
+  (add_operator)
+  (concat_operator)
+  (rel_operator)
+  (and_operator)
+  (or_operator)
+  (assign_operator)
+  (hash_operator)
+  (indexing_operator)
+  (let_operator)
+  (let_and_operator)
+  (match_operator)
+] @operator
+
+["*" "#" "::" "<-"] @operator
+
+; Keywords
+;---------
+
+[
+  "and" "as" "assert" "begin" "class" "constraint" "do" "done" "downto" "else"
+  "end" "exception" "external" "for" "fun" "function" "functor" "if" "in"
+  "include" "inherit" "initializer" "lazy" "let" "match" "method" "module"
+  "mutable" "new" "nonrec" "object" "of" "open" "private" "rec" "sig" "struct"
+  "then" "to" "try" "type" "val" "virtual" "when" "while" "with"
+] @keyword
+
+; Punctuation
+;------------
+
+["(" ")" "[" "]" "{" "}" "[|" "|]" "[<" "[>"] @punctuation.bracket
+
+(object_type ["<" ">"] @punctuation.bracket)
+
+[
+  "," "." ";" ":" "=" "|" "~" "?" "+" "-" "!" ">" "&"
+  "->" ";;" ":>" "+=" ":=" ".."
+] @punctuation.delimiter
+
+; Attributes
+;-----------
+
+[
+  (attribute)
+  (item_attribute)
+  (floating_attribute)
+  (extension)
+  (item_extension)
+  (quoted_extension)
+  (quoted_item_extension) 
+  "%"
+] @attribute
+
+(attribute_id) @tag
+
+; Comments
+;---------
+
+[(comment) (line_number_directive) (directive) (shebang)] @comment
diff --git a/crates/zed/src/languages/ocaml/indents.scm b/crates/zed/src/languages/ocaml/indents.scm
new file mode 100644
index 0000000000..807495dae1
--- /dev/null
+++ b/crates/zed/src/languages/ocaml/indents.scm
@@ -0,0 +1,43 @@
+[
+  (let_binding)
+  (type_binding)
+
+  (method_definition)
+  
+  (external)
+  (value_specification)
+  (method_specification)
+
+  (match_case)
+
+  (function_expression)
+
+  (field_declaration)
+  (field_expression)
+] @indent
+
+(_ "[" "]" @end) @indent
+(_ "[|" "|]" @end) @indent
+(_ "<" ">" @end) @indent
+(_ "{" "}" @end) @indent
+(_ "(" ")" @end) @indent
+
+(_ "object" @start "end" @end) @indent
+
+(structure
+  "struct" @start
+  "end" @end) @indent
+
+(signature
+  "sig" @start
+  "end" @end) @indent
+
+(parenthesized_expression
+  "begin" @start
+  "end") @indent
+
+(do_clause
+  "do" @start
+  "done" @end) @indent
+
+";;" @outdent
diff --git a/crates/zed/src/languages/ocaml/outline.scm b/crates/zed/src/languages/ocaml/outline.scm
new file mode 100644
index 0000000000..16f449664a
--- /dev/null
+++ b/crates/zed/src/languages/ocaml/outline.scm
@@ -0,0 +1,59 @@
+(_structure_item/value_definition
+    "let" @context
+    (let_binding
+      pattern: (_) @name)) @item
+
+(_structure_item/exception_definition
+  "exception" @context
+  (constructor_declaration
+    (constructor_name) @name)) @item
+
+(_structure_item/module_definition
+  "module" @context
+  (module_binding
+    name: (module_name) @name)) @item
+
+(module_type_definition
+  "module" @context
+  "type" @context
+  name: (_) @name) @item
+ 
+(type_definition
+  "type" @context
+  (type_binding name: (_) @name)) @item
+
+(value_specification
+  "val" @context
+  (value_name) @name) @item
+  
+(class_definition
+  "class" @context
+  (class_binding
+    "virtual"? @context
+    name: (_) @name)) @item
+
+(class_type_definition
+  "class" @context
+  "type" @context
+  (class_type_binding
+    "virtual"? @context
+    name: (_) @name)) @item
+
+(instance_variable_definition
+  "val" @context
+  "method"? @context
+  name: (_) @name) @item
+
+(method_specification
+  "method" @context
+  "virtual"? @context
+   (method_name) @name) @item
+
+(method_definition
+  "method" @context
+  "virtual"? @context
+  name: (_) @name) @item
+
+(external
+  "external" @context
+  (value_name) @name) @item
diff --git a/docs/src/languages/ocaml.md b/docs/src/languages/ocaml.md
new file mode 100644
index 0000000000..553b5dbdd3
--- /dev/null
+++ b/docs/src/languages/ocaml.md
@@ -0,0 +1,31 @@
+# OCaml
+
+- Tree Sitter: [tree-sitter-ocaml](https://github.com/tree-sitter/tree-sitter-ocaml)
+- Language Server: [ocamllsp](https://github.com/ocaml/ocaml-lsp)
+
+## Setup Instructions
+If you have the development environment already setup, you can skip to [Launching Zed](#launching-zed)
+
+### Using OPAM
+Opam is the official package manager for OCaml and is highly recommended for getting started with OCaml. To get started using Opam, please follow the instructions provided [here](https://opam.ocaml.org/doc/Install.html). 
+
+Once you install opam and setup a switch with your development environment as per the instructions, you can proceed.
+
+### Launching Zed
+By now you should have `ocamllsp` installed, you can verify so by running
+
+```sh
+$ ocamllsp --help
+```
+
+in your terminal. If you get a help message, you're good to go. If not, please revisit the installation instructions for `ocamllsp` and ensure it's properly installed.
+
+With that aside, we can now launch Zed. Given how the OCaml package manager works, we require you to run Zed from the terminal, so please make sure you install the [Zed cli](https://zed.dev/features#cli) if you haven't already.
+
+Once you have the cli, simply from a terminal, navigate to your project and run 
+
+```sh
+$ zed .
+```
+
+Voila! You should have Zed running with OCaml support, no additional setup required.

From ec9f44727e2d5ed8e735583746006bfa60712212 Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Fri, 2 Feb 2024 16:35:58 +0100
Subject: [PATCH 175/372] Fix Go tests failing on main (#7285)

Follow-up to #7276 in which I broke tests.

Release Notes:

- N/A
---
 crates/zed/src/languages/go.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/crates/zed/src/languages/go.rs b/crates/zed/src/languages/go.rs
index 12a63c3efe..2fb0d35cf0 100644
--- a/crates/zed/src/languages/go.rs
+++ b/crates/zed/src/languages/go.rs
@@ -398,7 +398,6 @@ mod tests {
         let highlight_type = grammar.highlight_id_for_name("type").unwrap();
         let highlight_keyword = grammar.highlight_id_for_name("keyword").unwrap();
         let highlight_number = grammar.highlight_id_for_name("number").unwrap();
-        let highlight_field = grammar.highlight_id_for_name("property").unwrap();
 
         assert_eq!(
             language
@@ -454,7 +453,7 @@ mod tests {
             Some(CodeLabel {
                 text: "two.Three a.Bcd".to_string(),
                 filter_range: 0..9,
-                runs: vec![(4..9, highlight_field), (12..15, highlight_type)],
+                runs: vec![(12..15, highlight_type)],
             })
         );
     }

From 01ddf840f5516d90980288c24abb8b3e6e445744 Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Fri, 2 Feb 2024 16:42:43 +0100
Subject: [PATCH 176/372] completions: do not render empty multi-line
 documentation (#7279)

I ran into this a lot with Go code: the documentation would be empty so
we'd display a big box with nothing in it.

I think it's better if we only display the box if we have documentation.

Release Notes:

- Fixed documentation box in showing up when using auto-complete even if
documentation was empty.

## Before

![screenshot-2024-02-02-14 00
18@2x](https://github.com/zed-industries/zed/assets/1185253/e4915d51-a573-41f4-aa5d-21de6d1b0ff1)

## After

![screenshot-2024-02-02-14 01
58@2x](https://github.com/zed-industries/zed/assets/1185253/74b244af-3fc7-45e9-8cb3-7264e34b7ab7)
---
 crates/editor/src/editor.rs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 86090b0f05..b244ba6d12 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -857,9 +857,15 @@ impl CompletionsMenu {
                 Some(Documentation::MultiLinePlainText(text)) => {
                     Some(div().child(SharedString::from(text.clone())))
                 }
-                Some(Documentation::MultiLineMarkdown(parsed)) => Some(div().child(
-                    render_parsed_markdown("completions_markdown", parsed, &style, workspace, cx),
-                )),
+                Some(Documentation::MultiLineMarkdown(parsed)) if !parsed.text.is_empty() => {
+                    Some(div().child(render_parsed_markdown(
+                        "completions_markdown",
+                        parsed,
+                        &style,
+                        workspace,
+                        cx,
+                    )))
+                }
                 _ => None,
             };
             multiline_docs.map(|div| {

From 11bd28870aa41876eea178e9d65ffd3df1f0ad6d Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Fri, 2 Feb 2024 16:48:04 +0100
Subject: [PATCH 177/372] editor: Add MoveUpByLines and MoveDownByLines actions
 (#7208)

This adds four new actions:

- `editor::MoveUpByLines`
- `editor::MoveDownByLines`
- `editor::SelectUpByLines`
- `editor::SelectDownByLines`

They all take a count by which to move the cursor up and down.
(Requested by Adam here:
https://twitter.com/adamwathan/status/1753017094248018302)


Example `keymap.json` entries:

```json
{
  "context": "Editor",
  "bindings": [
    "alt-up":         [ "editor::MoveUpByLines",     { "lines": 3 } ],
    "alt-down":       [ "editor::MoveDownByLines",   { "lines": 3 } ],
    "alt-shift-up":   [ "editor::SelectUpByLines",   { "lines": 3 } ],
    "alt-shift-down": [ "editor::SelectDownByLines", { "lines": 3 } ]
  ]
}
```

They are *not* bound by default, so as to not conflict with the
`alt-up/down` bindings that already exist.

Release Notes:

- Added four new actions: `editor::MoveUpByLines`,
`editor::MoveDownByLines`, `editor::SelectUpByLines`,
`editor::SelectDownByLines` that can take a line count configuration and
move the cursor up by the count.

### Demo



https://github.com/zed-industries/zed/assets/1185253/e78d4077-5bd5-4d72-a806-67695698af5d




https://github.com/zed-industries/zed/assets/1185253/0b086ec9-eb90-40a2-9009-844a215e6378
---
 crates/editor/src/actions.rs | 30 +++++++++++++-
 crates/editor/src/editor.rs  | 80 ++++++++++++++++++++++++++++++++++++
 crates/editor/src/element.rs |  4 ++
 3 files changed, 113 insertions(+), 1 deletion(-)

diff --git a/crates/editor/src/actions.rs b/crates/editor/src/actions.rs
index dd3735c6a9..049c152e2c 100644
--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -70,6 +70,30 @@ pub struct FoldAt {
 pub struct UnfoldAt {
     pub buffer_row: u32,
 }
+
+#[derive(PartialEq, Clone, Deserialize, Default)]
+pub struct MoveUpByLines {
+    #[serde(default)]
+    pub(super) lines: u32,
+}
+
+#[derive(PartialEq, Clone, Deserialize, Default)]
+pub struct MoveDownByLines {
+    #[serde(default)]
+    pub(super) lines: u32,
+}
+#[derive(PartialEq, Clone, Deserialize, Default)]
+pub struct SelectUpByLines {
+    #[serde(default)]
+    pub(super) lines: u32,
+}
+
+#[derive(PartialEq, Clone, Deserialize, Default)]
+pub struct SelectDownByLines {
+    #[serde(default)]
+    pub(super) lines: u32,
+}
+
 impl_actions!(
     editor,
     [
@@ -84,7 +108,11 @@ impl_actions!(
         ConfirmCodeAction,
         ToggleComments,
         FoldAt,
-        UnfoldAt
+        UnfoldAt,
+        MoveUpByLines,
+        MoveDownByLines,
+        SelectUpByLines,
+        SelectDownByLines,
     ]
 );
 
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index b244ba6d12..21092ca085 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -5379,6 +5379,86 @@ impl Editor {
         })
     }
 
+    pub fn move_up_by_lines(&mut self, action: &MoveUpByLines, cx: &mut ViewContext<Self>) {
+        if self.take_rename(true, cx).is_some() {
+            return;
+        }
+
+        if matches!(self.mode, EditorMode::SingleLine) {
+            cx.propagate();
+            return;
+        }
+
+        let text_layout_details = &self.text_layout_details(cx);
+
+        self.change_selections(Some(Autoscroll::fit()), cx, |s| {
+            let line_mode = s.line_mode;
+            s.move_with(|map, selection| {
+                if !selection.is_empty() && !line_mode {
+                    selection.goal = SelectionGoal::None;
+                }
+                let (cursor, goal) = movement::up_by_rows(
+                    map,
+                    selection.start,
+                    action.lines,
+                    selection.goal,
+                    false,
+                    &text_layout_details,
+                );
+                selection.collapse_to(cursor, goal);
+            });
+        })
+    }
+
+    pub fn move_down_by_lines(&mut self, action: &MoveDownByLines, cx: &mut ViewContext<Self>) {
+        if self.take_rename(true, cx).is_some() {
+            return;
+        }
+
+        if matches!(self.mode, EditorMode::SingleLine) {
+            cx.propagate();
+            return;
+        }
+
+        let text_layout_details = &self.text_layout_details(cx);
+
+        self.change_selections(Some(Autoscroll::fit()), cx, |s| {
+            let line_mode = s.line_mode;
+            s.move_with(|map, selection| {
+                if !selection.is_empty() && !line_mode {
+                    selection.goal = SelectionGoal::None;
+                }
+                let (cursor, goal) = movement::down_by_rows(
+                    map,
+                    selection.start,
+                    action.lines,
+                    selection.goal,
+                    false,
+                    &text_layout_details,
+                );
+                selection.collapse_to(cursor, goal);
+            });
+        })
+    }
+
+    pub fn select_down_by_lines(&mut self, action: &SelectDownByLines, cx: &mut ViewContext<Self>) {
+        let text_layout_details = &self.text_layout_details(cx);
+        self.change_selections(Some(Autoscroll::fit()), cx, |s| {
+            s.move_heads_with(|map, head, goal| {
+                movement::down_by_rows(map, head, action.lines, goal, false, &text_layout_details)
+            })
+        })
+    }
+
+    pub fn select_up_by_lines(&mut self, action: &SelectUpByLines, cx: &mut ViewContext<Self>) {
+        let text_layout_details = &self.text_layout_details(cx);
+        self.change_selections(Some(Autoscroll::fit()), cx, |s| {
+            s.move_heads_with(|map, head, goal| {
+                movement::up_by_rows(map, head, action.lines, goal, false, &text_layout_details)
+            })
+        })
+    }
+
     pub fn move_page_up(&mut self, action: &MovePageUp, cx: &mut ViewContext<Self>) {
         if self.take_rename(true, cx).is_some() {
             return;
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index b96ec9e068..7e546cc272 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -147,7 +147,11 @@ impl EditorElement {
         register_action(view, cx, Editor::move_left);
         register_action(view, cx, Editor::move_right);
         register_action(view, cx, Editor::move_down);
+        register_action(view, cx, Editor::move_down_by_lines);
+        register_action(view, cx, Editor::select_down_by_lines);
         register_action(view, cx, Editor::move_up);
+        register_action(view, cx, Editor::move_up_by_lines);
+        register_action(view, cx, Editor::select_up_by_lines);
         register_action(view, cx, Editor::cancel);
         register_action(view, cx, Editor::newline);
         register_action(view, cx, Editor::newline_above);

From 33e5ba6278a9f202f28e6065551f6816324fa98f Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Fri, 2 Feb 2024 11:02:10 -0500
Subject: [PATCH 178/372] Revert "Add YAML file type icon (#7185)" (#7286)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR reverts the addition of the YAML icon, as it doesn't look good
at the moment:

<img width="305" alt="Screenshot 2024-02-02 at 10 55 16 AM"
src="https://github.com/zed-industries/zed/assets/1486634/2fe2ddd5-5b73-4c52-a121-562d07352005">

This reverts commit a853a80634149ad5d069c48c4a0ece0bd584b5b1.

Release Notes:

- N/A
---
 assets/icons/file_icons/file_types.json | 7 ++-----
 assets/icons/file_icons/yaml.svg        | 1 -
 2 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 assets/icons/file_icons/yaml.svg

diff --git a/assets/icons/file_icons/file_types.json b/assets/icons/file_icons/file_types.json
index 29967deb8d..5dd0cbb915 100644
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -118,8 +118,8 @@
         "xlsx": "document",
         "xml": "template",
         "xrl": "erlang",
-        "yaml": "yaml",
-        "yml": "yaml",
+        "yaml": "settings",
+        "yml": "settings",
         "yrl": "erlang",
         "zlogin": "terminal",
         "zsh": "terminal",
@@ -190,9 +190,6 @@
         "php": {
             "icon": "icons/file_icons/php.svg"
         },
-        "yaml": {
-            "icon": "icons/file_icons/yaml.svg"
-        },
         "prettier": {
             "icon": "icons/file_icons/prettier.svg"
         },
diff --git a/assets/icons/file_icons/yaml.svg b/assets/icons/file_icons/yaml.svg
deleted file mode 100644
index eb5987878b..0000000000
--- a/assets/icons/file_icons/yaml.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="457px" height="512px"><polygon points="342.0159302,0 457,0 114.9831009,512 0,512 171.0082092,256 0,0 114.9831009,0 228.4997559,169.9342041 "/></svg>
\ No newline at end of file

From bacb2a266ae47de0dd5ded9d8f33f7a7ab13d283 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 2 Feb 2024 18:04:23 +0200
Subject: [PATCH 179/372] Add more data into LSP header parsing error contexts
 (#7282)

Follow-up of https://github.com/zed-industries/zed/pull/6929

Release Notes:

- N/A
---
 crates/lsp/src/lsp.rs | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index ee5fb3a1d2..b1582fbd8d 100644
--- a/crates/lsp/src/lsp.rs
+++ b/crates/lsp/src/lsp.rs
@@ -336,38 +336,40 @@ impl LanguageServer {
 
             let message_len: usize = segments
                 .next()
-                .context("unable to find the first line of the LSP message header")?
+                .with_context(|| {
+                    format!("unable to find the first line of the LSP message header `{header}`")
+                })?
                 .strip_prefix(CONTENT_LEN_HEADER)
-                .context("invalid LSP message header")?
+                .with_context(|| format!("invalid LSP message header `{header}`"))?
                 .parse()
                 .with_context(|| {
-                    format!(
-                        "failed to parse Content-Length of LSP message header: {}",
-                        header
-                    )
+                    format!("failed to parse Content-Length of LSP message header: `{header}`")
                 })?;
 
             if let Some(second_segment) = segments.next() {
                 match second_segment {
                     "" => (), // Header end
-                    header_field if header_field.starts_with("Content-Type:") => {
-                        stdout.read_until(b'\n', &mut buffer).await?;
-                    }
-                    _ => {
-                        anyhow::bail!(
-                            "expected a Content-Type header field or a header ending CRLF, got {second_segment:?}"
-                        );
+                    header_field => {
+                        if header_field.starts_with("Content-Type:") {
+                            stdout.read_until(b'\n', &mut buffer).await?;
+                        } else {
+                            anyhow::bail!(
+                                "inside `{header}`, expected a Content-Type header field or a header ending CRLF, got `{second_segment:?}`"
+                            )
+                        }
                     }
                 }
             } else {
-                anyhow::bail!("unable to find the second line of the LSP message header");
+                anyhow::bail!(
+                    "unable to find the second line of the LSP message header `{header}`"
+                );
             }
 
             buffer.resize(message_len, 0);
             stdout.read_exact(&mut buffer).await?;
 
             if let Ok(message) = str::from_utf8(&buffer) {
-                log::trace!("incoming message: {}", message);
+                log::trace!("incoming message: {message}");
                 for handler in io_handlers.lock().values_mut() {
                     handler(IoKind::StdOut, message);
                 }

From cf4f3ed79acc361e470ad8cff11ea1d98e20ae81 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <53836821+bennetbo@users.noreply.github.com>
Date: Fri, 2 Feb 2024 17:04:43 +0100
Subject: [PATCH 180/372] Fix padding for notes label (#7280)

Fixes the padding of the "notes" button in collab-ui. I'm not sure why
the previous code used `div().h_7().w_full()`. Am I missing something
here?

### Before
![Screenshot 2024-02-02 at 15 26
44](https://github.com/zed-industries/zed/assets/53836821/0577b706-b433-4e02-802b-b6eccefb3acd)

### After
![Screenshot 2024-02-02 at 15 27
26](https://github.com/zed-industries/zed/assets/53836821/00fd81d8-82a1-4936-829c-022554259fd5)



Release Notes:
- Fixed padding of the "notes" button in the collaboration panel.

Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>
---
 crates/collab_ui/src/collab_panel.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index f33c6a13ef..ed5f426c14 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -957,7 +957,7 @@ impl CollabPanel {
                     .child(render_tree_branch(false, true, cx))
                     .child(IconButton::new(0, IconName::File)),
             )
-            .child(div().h_7().w_full().child(Label::new("notes")))
+            .child(Label::new("notes"))
             .tooltip(move |cx| Tooltip::text("Open Channel Notes", cx))
     }
 

From 3d76ed96f5e7837e410a6d11da3ff2cc237c9cb0 Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Fri, 2 Feb 2024 17:09:58 +0100
Subject: [PATCH 181/372] Use `command_buffer.wait_until_scheduled` in metal
 renderer (#7283)

This commit goes back to using `wait_until_scheduled` as opposed to
`wait_until_completed`. What this means, however, is that another draw
could take place before the previous one finished. When that happens we
don't want to reuse the same instance buffer because the GPU is actively
reading from it, so we use a pool instead.

Release Notes:

- Fixed a bug that caused inconsistent frame rate when scrolling on
certain hardware.

---------

Co-authored-by: Antonio Scandurra <me@as-cii.com>
Co-authored-by: Antonio <antonio@zed.dev>
---
 .../gpui/src/platform/mac/metal_renderer.rs   | 219 +++++++++++-------
 1 file changed, 134 insertions(+), 85 deletions(-)

diff --git a/crates/gpui/src/platform/mac/metal_renderer.rs b/crates/gpui/src/platform/mac/metal_renderer.rs
index 68027ceff6..0100559d4b 100644
--- a/crates/gpui/src/platform/mac/metal_renderer.rs
+++ b/crates/gpui/src/platform/mac/metal_renderer.rs
@@ -3,6 +3,7 @@ use crate::{
     Hsla, MetalAtlas, MonochromeSprite, Path, PathId, PathVertex, PolychromeSprite, PrimitiveBatch,
     Quad, ScaledPixels, Scene, Shadow, Size, Surface, Underline,
 };
+use block::ConcreteBlock;
 use cocoa::{
     base::{NO, YES},
     foundation::NSUInteger,
@@ -15,7 +16,13 @@ use media::core_video::CVMetalTextureCache;
 use metal::{CommandQueue, MTLPixelFormat, MTLResourceOptions, NSRange};
 use objc::{self, msg_send, sel, sel_impl};
 use smallvec::SmallVec;
-use std::{ffi::c_void, mem, ptr, sync::Arc};
+use std::{
+    cell::{Cell, RefCell},
+    ffi::c_void,
+    mem, ptr,
+    rc::Rc,
+    sync::Arc,
+};
 
 #[cfg(not(feature = "runtime_shaders"))]
 const SHADERS_METALLIB: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/shaders.metallib"));
@@ -25,6 +32,7 @@ const SHADERS_SOURCE_FILE: &'static str =
 const INSTANCE_BUFFER_SIZE: usize = 32 * 1024 * 1024; // This is an arbitrary decision. There's probably a more optimal value (maybe even we could adjust dynamically...)
 
 pub(crate) struct MetalRenderer {
+    device: metal::Device,
     layer: metal::MetalLayer,
     command_queue: CommandQueue,
     paths_rasterization_pipeline_state: metal::RenderPipelineState,
@@ -36,7 +44,7 @@ pub(crate) struct MetalRenderer {
     polychrome_sprites_pipeline_state: metal::RenderPipelineState,
     surfaces_pipeline_state: metal::RenderPipelineState,
     unit_vertices: metal::Buffer,
-    instances: metal::Buffer,
+    instance_buffers: Rc<RefCell<Vec<metal::Buffer>>>,
     sprite_atlas: Arc<MetalAtlas>,
     core_video_texture_cache: CVMetalTextureCache,
 }
@@ -93,10 +101,6 @@ impl MetalRenderer {
             mem::size_of_val(&unit_vertices) as u64,
             MTLResourceOptions::StorageModeManaged,
         );
-        let instances = device.new_buffer(
-            INSTANCE_BUFFER_SIZE as u64,
-            MTLResourceOptions::StorageModeManaged,
-        );
 
         let paths_rasterization_pipeline_state = build_path_rasterization_pipeline_state(
             &device,
@@ -165,8 +169,11 @@ impl MetalRenderer {
 
         let command_queue = device.new_command_queue();
         let sprite_atlas = Arc::new(MetalAtlas::new(device.clone()));
+        let core_video_texture_cache =
+            unsafe { CVMetalTextureCache::new(device.as_ptr()).unwrap() };
 
         Self {
+            device,
             layer,
             command_queue,
             paths_rasterization_pipeline_state,
@@ -178,9 +185,9 @@ impl MetalRenderer {
             polychrome_sprites_pipeline_state,
             surfaces_pipeline_state,
             unit_vertices,
-            instances,
+            instance_buffers: Rc::default(),
             sprite_atlas,
-            core_video_texture_cache: unsafe { CVMetalTextureCache::new(device.as_ptr()).unwrap() },
+            core_video_texture_cache,
         }
     }
 
@@ -208,13 +215,22 @@ impl MetalRenderer {
             );
             return;
         };
+        let mut instance_buffer = self.instance_buffers.borrow_mut().pop().unwrap_or_else(|| {
+            self.device.new_buffer(
+                INSTANCE_BUFFER_SIZE as u64,
+                MTLResourceOptions::StorageModeManaged,
+            )
+        });
         let command_queue = self.command_queue.clone();
         let command_buffer = command_queue.new_command_buffer();
         let mut instance_offset = 0;
 
-        let Some(path_tiles) =
-            self.rasterize_paths(scene.paths(), &mut instance_offset, command_buffer)
-        else {
+        let Some(path_tiles) = self.rasterize_paths(
+            scene.paths(),
+            &mut instance_buffer,
+            &mut instance_offset,
+            command_buffer,
+        ) else {
             panic!("failed to rasterize {} paths", scene.paths().len());
         };
 
@@ -243,22 +259,29 @@ impl MetalRenderer {
             let ok = match batch {
                 PrimitiveBatch::Shadows(shadows) => self.draw_shadows(
                     shadows,
+                    &mut instance_buffer,
+                    &mut instance_offset,
+                    viewport_size,
+                    command_encoder,
+                ),
+                PrimitiveBatch::Quads(quads) => self.draw_quads(
+                    quads,
+                    &mut instance_buffer,
                     &mut instance_offset,
                     viewport_size,
                     command_encoder,
                 ),
-                PrimitiveBatch::Quads(quads) => {
-                    self.draw_quads(quads, &mut instance_offset, viewport_size, command_encoder)
-                }
                 PrimitiveBatch::Paths(paths) => self.draw_paths(
                     paths,
                     &path_tiles,
+                    &mut instance_buffer,
                     &mut instance_offset,
                     viewport_size,
                     command_encoder,
                 ),
                 PrimitiveBatch::Underlines(underlines) => self.draw_underlines(
                     underlines,
+                    &mut instance_buffer,
                     &mut instance_offset,
                     viewport_size,
                     command_encoder,
@@ -269,6 +292,7 @@ impl MetalRenderer {
                 } => self.draw_monochrome_sprites(
                     texture_id,
                     sprites,
+                    &mut instance_buffer,
                     &mut instance_offset,
                     viewport_size,
                     command_encoder,
@@ -279,12 +303,14 @@ impl MetalRenderer {
                 } => self.draw_polychrome_sprites(
                     texture_id,
                     sprites,
+                    &mut instance_buffer,
                     &mut instance_offset,
                     viewport_size,
                     command_encoder,
                 ),
                 PrimitiveBatch::Surfaces(surfaces) => self.draw_surfaces(
                     surfaces,
+                    &mut instance_buffer,
                     &mut instance_offset,
                     viewport_size,
                     command_encoder,
@@ -306,22 +332,32 @@ impl MetalRenderer {
 
         command_encoder.end_encoding();
 
-        self.instances.did_modify_range(NSRange {
+        instance_buffer.did_modify_range(NSRange {
             location: 0,
             length: instance_offset as NSUInteger,
         });
 
+        let instance_buffers = self.instance_buffers.clone();
+        let instance_buffer = Cell::new(Some(instance_buffer));
+        let block = ConcreteBlock::new(move |_| {
+            if let Some(instance_buffer) = instance_buffer.take() {
+                instance_buffers.borrow_mut().push(instance_buffer);
+            }
+        });
+        let block = block.copy();
+        command_buffer.add_completed_handler(&block);
         command_buffer.commit();
         self.sprite_atlas.clear_textures(AtlasTextureKind::Path);
 
-        command_buffer.wait_until_completed();
+        command_buffer.wait_until_scheduled();
         drawable.present();
     }
 
     fn rasterize_paths(
         &mut self,
         paths: &[Path<ScaledPixels>],
-        offset: &mut usize,
+        instance_buffer: &mut metal::Buffer,
+        instance_offset: &mut usize,
         command_buffer: &metal::CommandBufferRef,
     ) -> Option<HashMap<PathId, AtlasTile>> {
         let mut tiles = HashMap::default();
@@ -347,9 +383,9 @@ impl MetalRenderer {
         }
 
         for (texture_id, vertices) in vertices_by_texture_id {
-            align_offset(offset);
+            align_offset(instance_offset);
             let vertices_bytes_len = mem::size_of_val(vertices.as_slice());
-            let next_offset = *offset + vertices_bytes_len;
+            let next_offset = *instance_offset + vertices_bytes_len;
             if next_offset > INSTANCE_BUFFER_SIZE {
                 return None;
             }
@@ -369,8 +405,8 @@ impl MetalRenderer {
             command_encoder.set_render_pipeline_state(&self.paths_rasterization_pipeline_state);
             command_encoder.set_vertex_buffer(
                 PathRasterizationInputIndex::Vertices as u64,
-                Some(&self.instances),
-                *offset as u64,
+                Some(instance_buffer),
+                *instance_offset as u64,
             );
             let texture_size = Size {
                 width: DevicePixels::from(texture.width()),
@@ -382,7 +418,8 @@ impl MetalRenderer {
                 &texture_size as *const Size<DevicePixels> as *const _,
             );
 
-            let buffer_contents = unsafe { (self.instances.contents() as *mut u8).add(*offset) };
+            let buffer_contents =
+                unsafe { (instance_buffer.contents() as *mut u8).add(*instance_offset) };
             unsafe {
                 ptr::copy_nonoverlapping(
                     vertices.as_ptr() as *const u8,
@@ -397,7 +434,7 @@ impl MetalRenderer {
                 vertices.len() as u64,
             );
             command_encoder.end_encoding();
-            *offset = next_offset;
+            *instance_offset = next_offset;
         }
 
         Some(tiles)
@@ -406,14 +443,15 @@ impl MetalRenderer {
     fn draw_shadows(
         &mut self,
         shadows: &[Shadow],
-        offset: &mut usize,
+        instance_buffer: &mut metal::Buffer,
+        instance_offset: &mut usize,
         viewport_size: Size<DevicePixels>,
         command_encoder: &metal::RenderCommandEncoderRef,
     ) -> bool {
         if shadows.is_empty() {
             return true;
         }
-        align_offset(offset);
+        align_offset(instance_offset);
 
         command_encoder.set_render_pipeline_state(&self.shadows_pipeline_state);
         command_encoder.set_vertex_buffer(
@@ -423,13 +461,13 @@ impl MetalRenderer {
         );
         command_encoder.set_vertex_buffer(
             ShadowInputIndex::Shadows as u64,
-            Some(&self.instances),
-            *offset as u64,
+            Some(instance_buffer),
+            *instance_offset as u64,
         );
         command_encoder.set_fragment_buffer(
             ShadowInputIndex::Shadows as u64,
-            Some(&self.instances),
-            *offset as u64,
+            Some(instance_buffer),
+            *instance_offset as u64,
         );
 
         command_encoder.set_vertex_bytes(
@@ -439,9 +477,10 @@ impl MetalRenderer {
         );
 
         let shadow_bytes_len = mem::size_of_val(shadows);
-        let buffer_contents = unsafe { (self.instances.contents() as *mut u8).add(*offset) };
+        let buffer_contents =
+            unsafe { (instance_buffer.contents() as *mut u8).add(*instance_offset) };
 
-        let next_offset = *offset + shadow_bytes_len;
+        let next_offset = *instance_offset + shadow_bytes_len;
         if next_offset > INSTANCE_BUFFER_SIZE {
             return false;
         }
@@ -460,21 +499,22 @@ impl MetalRenderer {
             6,
             shadows.len() as u64,
         );
-        *offset = next_offset;
+        *instance_offset = next_offset;
         true
     }
 
     fn draw_quads(
         &mut self,
         quads: &[Quad],
-        offset: &mut usize,
+        instance_buffer: &mut metal::Buffer,
+        instance_offset: &mut usize,
         viewport_size: Size<DevicePixels>,
         command_encoder: &metal::RenderCommandEncoderRef,
     ) -> bool {
         if quads.is_empty() {
             return true;
         }
-        align_offset(offset);
+        align_offset(instance_offset);
 
         command_encoder.set_render_pipeline_state(&self.quads_pipeline_state);
         command_encoder.set_vertex_buffer(
@@ -484,13 +524,13 @@ impl MetalRenderer {
         );
         command_encoder.set_vertex_buffer(
             QuadInputIndex::Quads as u64,
-            Some(&self.instances),
-            *offset as u64,
+            Some(instance_buffer),
+            *instance_offset as u64,
         );
         command_encoder.set_fragment_buffer(
             QuadInputIndex::Quads as u64,
-            Some(&self.instances),
-            *offset as u64,
+            Some(instance_buffer),
+            *instance_offset as u64,
         );
 
         command_encoder.set_vertex_bytes(
@@ -500,9 +540,10 @@ impl MetalRenderer {
         );
 
         let quad_bytes_len = mem::size_of_val(quads);
-        let buffer_contents = unsafe { (self.instances.contents() as *mut u8).add(*offset) };
+        let buffer_contents =
+            unsafe { (instance_buffer.contents() as *mut u8).add(*instance_offset) };
 
-        let next_offset = *offset + quad_bytes_len;
+        let next_offset = *instance_offset + quad_bytes_len;
         if next_offset > INSTANCE_BUFFER_SIZE {
             return false;
         }
@@ -517,7 +558,7 @@ impl MetalRenderer {
             6,
             quads.len() as u64,
         );
-        *offset = next_offset;
+        *instance_offset = next_offset;
         true
     }
 
@@ -525,7 +566,8 @@ impl MetalRenderer {
         &mut self,
         paths: &[Path<ScaledPixels>],
         tiles_by_path_id: &HashMap<PathId, AtlasTile>,
-        offset: &mut usize,
+        instance_buffer: &mut metal::Buffer,
+        instance_offset: &mut usize,
         viewport_size: Size<DevicePixels>,
         command_encoder: &metal::RenderCommandEncoderRef,
     ) -> bool {
@@ -573,7 +615,7 @@ impl MetalRenderer {
             if sprites.is_empty() {
                 break;
             } else {
-                align_offset(offset);
+                align_offset(instance_offset);
                 let texture_id = prev_texture_id.take().unwrap();
                 let texture: metal::Texture = self.sprite_atlas.metal_texture(texture_id);
                 let texture_size = size(
@@ -583,8 +625,8 @@ impl MetalRenderer {
 
                 command_encoder.set_vertex_buffer(
                     SpriteInputIndex::Sprites as u64,
-                    Some(&self.instances),
-                    *offset as u64,
+                    Some(instance_buffer),
+                    *instance_offset as u64,
                 );
                 command_encoder.set_vertex_bytes(
                     SpriteInputIndex::AtlasTextureSize as u64,
@@ -593,20 +635,20 @@ impl MetalRenderer {
                 );
                 command_encoder.set_fragment_buffer(
                     SpriteInputIndex::Sprites as u64,
-                    Some(&self.instances),
-                    *offset as u64,
+                    Some(instance_buffer),
+                    *instance_offset as u64,
                 );
                 command_encoder
                     .set_fragment_texture(SpriteInputIndex::AtlasTexture as u64, Some(&texture));
 
                 let sprite_bytes_len = mem::size_of_val(sprites.as_slice());
-                let next_offset = *offset + sprite_bytes_len;
+                let next_offset = *instance_offset + sprite_bytes_len;
                 if next_offset > INSTANCE_BUFFER_SIZE {
                     return false;
                 }
 
                 let buffer_contents =
-                    unsafe { (self.instances.contents() as *mut u8).add(*offset) };
+                    unsafe { (instance_buffer.contents() as *mut u8).add(*instance_offset) };
 
                 unsafe {
                     ptr::copy_nonoverlapping(
@@ -622,7 +664,7 @@ impl MetalRenderer {
                     6,
                     sprites.len() as u64,
                 );
-                *offset = next_offset;
+                *instance_offset = next_offset;
                 sprites.clear();
             }
         }
@@ -632,14 +674,15 @@ impl MetalRenderer {
     fn draw_underlines(
         &mut self,
         underlines: &[Underline],
-        offset: &mut usize,
+        instance_buffer: &mut metal::Buffer,
+        instance_offset: &mut usize,
         viewport_size: Size<DevicePixels>,
         command_encoder: &metal::RenderCommandEncoderRef,
     ) -> bool {
         if underlines.is_empty() {
             return true;
         }
-        align_offset(offset);
+        align_offset(instance_offset);
 
         command_encoder.set_render_pipeline_state(&self.underlines_pipeline_state);
         command_encoder.set_vertex_buffer(
@@ -649,13 +692,13 @@ impl MetalRenderer {
         );
         command_encoder.set_vertex_buffer(
             UnderlineInputIndex::Underlines as u64,
-            Some(&self.instances),
-            *offset as u64,
+            Some(instance_buffer),
+            *instance_offset as u64,
         );
         command_encoder.set_fragment_buffer(
             UnderlineInputIndex::Underlines as u64,
-            Some(&self.instances),
-            *offset as u64,
+            Some(instance_buffer),
+            *instance_offset as u64,
         );
 
         command_encoder.set_vertex_bytes(
@@ -665,9 +708,10 @@ impl MetalRenderer {
         );
 
         let underline_bytes_len = mem::size_of_val(underlines);
-        let buffer_contents = unsafe { (self.instances.contents() as *mut u8).add(*offset) };
+        let buffer_contents =
+            unsafe { (instance_buffer.contents() as *mut u8).add(*instance_offset) };
 
-        let next_offset = *offset + underline_bytes_len;
+        let next_offset = *instance_offset + underline_bytes_len;
         if next_offset > INSTANCE_BUFFER_SIZE {
             return false;
         }
@@ -686,7 +730,7 @@ impl MetalRenderer {
             6,
             underlines.len() as u64,
         );
-        *offset = next_offset;
+        *instance_offset = next_offset;
         true
     }
 
@@ -694,14 +738,15 @@ impl MetalRenderer {
         &mut self,
         texture_id: AtlasTextureId,
         sprites: &[MonochromeSprite],
-        offset: &mut usize,
+        instance_buffer: &mut metal::Buffer,
+        instance_offset: &mut usize,
         viewport_size: Size<DevicePixels>,
         command_encoder: &metal::RenderCommandEncoderRef,
     ) -> bool {
         if sprites.is_empty() {
             return true;
         }
-        align_offset(offset);
+        align_offset(instance_offset);
 
         let texture = self.sprite_atlas.metal_texture(texture_id);
         let texture_size = size(
@@ -716,8 +761,8 @@ impl MetalRenderer {
         );
         command_encoder.set_vertex_buffer(
             SpriteInputIndex::Sprites as u64,
-            Some(&self.instances),
-            *offset as u64,
+            Some(instance_buffer),
+            *instance_offset as u64,
         );
         command_encoder.set_vertex_bytes(
             SpriteInputIndex::ViewportSize as u64,
@@ -731,15 +776,16 @@ impl MetalRenderer {
         );
         command_encoder.set_fragment_buffer(
             SpriteInputIndex::Sprites as u64,
-            Some(&self.instances),
-            *offset as u64,
+            Some(instance_buffer),
+            *instance_offset as u64,
         );
         command_encoder.set_fragment_texture(SpriteInputIndex::AtlasTexture as u64, Some(&texture));
 
         let sprite_bytes_len = mem::size_of_val(sprites);
-        let buffer_contents = unsafe { (self.instances.contents() as *mut u8).add(*offset) };
+        let buffer_contents =
+            unsafe { (instance_buffer.contents() as *mut u8).add(*instance_offset) };
 
-        let next_offset = *offset + sprite_bytes_len;
+        let next_offset = *instance_offset + sprite_bytes_len;
         if next_offset > INSTANCE_BUFFER_SIZE {
             return false;
         }
@@ -758,7 +804,7 @@ impl MetalRenderer {
             6,
             sprites.len() as u64,
         );
-        *offset = next_offset;
+        *instance_offset = next_offset;
         true
     }
 
@@ -766,14 +812,15 @@ impl MetalRenderer {
         &mut self,
         texture_id: AtlasTextureId,
         sprites: &[PolychromeSprite],
-        offset: &mut usize,
+        instance_buffer: &mut metal::Buffer,
+        instance_offset: &mut usize,
         viewport_size: Size<DevicePixels>,
         command_encoder: &metal::RenderCommandEncoderRef,
     ) -> bool {
         if sprites.is_empty() {
             return true;
         }
-        align_offset(offset);
+        align_offset(instance_offset);
 
         let texture = self.sprite_atlas.metal_texture(texture_id);
         let texture_size = size(
@@ -788,8 +835,8 @@ impl MetalRenderer {
         );
         command_encoder.set_vertex_buffer(
             SpriteInputIndex::Sprites as u64,
-            Some(&self.instances),
-            *offset as u64,
+            Some(instance_buffer),
+            *instance_offset as u64,
         );
         command_encoder.set_vertex_bytes(
             SpriteInputIndex::ViewportSize as u64,
@@ -803,15 +850,16 @@ impl MetalRenderer {
         );
         command_encoder.set_fragment_buffer(
             SpriteInputIndex::Sprites as u64,
-            Some(&self.instances),
-            *offset as u64,
+            Some(instance_buffer),
+            *instance_offset as u64,
         );
         command_encoder.set_fragment_texture(SpriteInputIndex::AtlasTexture as u64, Some(&texture));
 
         let sprite_bytes_len = mem::size_of_val(sprites);
-        let buffer_contents = unsafe { (self.instances.contents() as *mut u8).add(*offset) };
+        let buffer_contents =
+            unsafe { (instance_buffer.contents() as *mut u8).add(*instance_offset) };
 
-        let next_offset = *offset + sprite_bytes_len;
+        let next_offset = *instance_offset + sprite_bytes_len;
         if next_offset > INSTANCE_BUFFER_SIZE {
             return false;
         }
@@ -830,14 +878,15 @@ impl MetalRenderer {
             6,
             sprites.len() as u64,
         );
-        *offset = next_offset;
+        *instance_offset = next_offset;
         true
     }
 
     fn draw_surfaces(
         &mut self,
         surfaces: &[Surface],
-        offset: &mut usize,
+        instance_buffer: &mut metal::Buffer,
+        instance_offset: &mut usize,
         viewport_size: Size<DevicePixels>,
         command_encoder: &metal::RenderCommandEncoderRef,
     ) -> bool {
@@ -889,16 +938,16 @@ impl MetalRenderer {
                     .unwrap()
             };
 
-            align_offset(offset);
-            let next_offset = *offset + mem::size_of::<Surface>();
+            align_offset(instance_offset);
+            let next_offset = *instance_offset + mem::size_of::<Surface>();
             if next_offset > INSTANCE_BUFFER_SIZE {
                 return false;
             }
 
             command_encoder.set_vertex_buffer(
                 SurfaceInputIndex::Surfaces as u64,
-                Some(&self.instances),
-                *offset as u64,
+                Some(instance_buffer),
+                *instance_offset as u64,
             );
             command_encoder.set_vertex_bytes(
                 SurfaceInputIndex::TextureSize as u64,
@@ -915,8 +964,8 @@ impl MetalRenderer {
             );
 
             unsafe {
-                let buffer_contents =
-                    (self.instances.contents() as *mut u8).add(*offset) as *mut SurfaceBounds;
+                let buffer_contents = (instance_buffer.contents() as *mut u8).add(*instance_offset)
+                    as *mut SurfaceBounds;
                 ptr::write(
                     buffer_contents,
                     SurfaceBounds {
@@ -927,7 +976,7 @@ impl MetalRenderer {
             }
 
             command_encoder.draw_primitives(metal::MTLPrimitiveType::Triangle, 0, 6);
-            *offset = next_offset;
+            *instance_offset = next_offset;
         }
         true
     }

From 6f6cb53fad43892d9529e5a970d958d503d9c395 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Fri, 2 Feb 2024 11:41:47 -0500
Subject: [PATCH 182/372] Tweak pull request template to (hopefully) make it
 clearer (#7287)

I keep seeing people leave the wrapping parentheses, like `(Added)` in
their release notes.

This PR tries making it clearer that we only want *one* of "Added",
"Fixed", or "Improved".

Release Notes:

- N/A
---
 .github/pull_request_template.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 443e1b58da..ce8a08f5b8 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -2,4 +2,8 @@
 
 Release Notes:
 
-- (Added|Fixed|Improved) ... ([#<public_issue_number_if_exists>](https://github.com/zed-industries/zed/issues/<public_issue_number_if_exists>)).
+- Added/Fixed/Improved ... ([#<public_issue_number_if_exists>](https://github.com/zed-industries/zed/issues/<public_issue_number_if_exists>)).
+
+**or**
+
+- N/A

From 074acacdf70962b2a96f2f92f50a9e42f0ff4119 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Fri, 2 Feb 2024 09:52:30 -0700
Subject: [PATCH 183/372] Do more on channel join (#7268)

This change makes it so that if you are the first to join a channel,
your project is automatically shared.

It also makes it so that if you join a channel via a link and there are
no shared projects, you open the notes instead of an empty workspace
with nothing.

This is to try and address the discoverability of project sharing: we've
had
two reviews that have talked about channels, but not talked about
sharing
projects into them, which makes me suspect they didn't know about the
feature.

Release Notes:

- Added a setting `share_on_join` (defaulting to true). When set, and
you join an empty channel, your project is automatically shared.
---
 assets/settings/default.json         |  6 +++--
 crates/call/src/call_settings.rs     |  6 +++++
 crates/call/src/room.rs              |  6 ++++-
 crates/collab_ui/src/collab_panel.rs | 15 ++++++++++-
 crates/workspace/src/workspace.rs    | 40 +++++++++++++++++++++++++++-
 5 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 74dfa6de2c..4345be1b50 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -104,8 +104,10 @@
   "show_whitespaces": "selection",
   // Settings related to calls in Zed
   "calls": {
-    // Join calls with the microphone muted by default
-    "mute_on_join": false
+    // Join calls with the microphone live by default
+    "mute_on_join": false,
+    // Share your project when you are the first to join a channel
+    "share_on_join": true
   },
   // Scrollbar related settings
   "scrollbar": {
diff --git a/crates/call/src/call_settings.rs b/crates/call/src/call_settings.rs
index 441323ad5f..6aa4253689 100644
--- a/crates/call/src/call_settings.rs
+++ b/crates/call/src/call_settings.rs
@@ -7,6 +7,7 @@ use settings::Settings;
 #[derive(Deserialize, Debug)]
 pub struct CallSettings {
     pub mute_on_join: bool,
+    pub share_on_join: bool,
 }
 
 /// Configuration of voice calls in Zed.
@@ -16,6 +17,11 @@ pub struct CallSettingsContent {
     ///
     /// Default: false
     pub mute_on_join: Option<bool>,
+
+    /// Whether your current project should be shared when joining an empty channel.
+    ///
+    /// Default: true
+    pub share_on_join: Option<bool>,
 }
 
 impl Settings for CallSettings {
diff --git a/crates/call/src/room.rs b/crates/call/src/room.rs
index 3e89238b0c..cd8af385ed 100644
--- a/crates/call/src/room.rs
+++ b/crates/call/src/room.rs
@@ -617,6 +617,10 @@ impl Room {
         self.local_participant.role == proto::ChannelRole::Admin
     }
 
+    pub fn local_participant_is_guest(&self) -> bool {
+        self.local_participant.role == proto::ChannelRole::Guest
+    }
+
     pub fn set_participant_role(
         &mut self,
         user_id: u64,
@@ -1202,7 +1206,7 @@ impl Room {
         })
     }
 
-    pub(crate) fn share_project(
+    pub fn share_project(
         &mut self,
         project: Model<Project>,
         cx: &mut ModelContext<Self>,
diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index ed5f426c14..6730203eca 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -40,7 +40,7 @@ use util::{maybe, ResultExt, TryFutureExt};
 use workspace::{
     dock::{DockPosition, Panel, PanelEvent},
     notifications::{DetachAndPromptErr, NotifyResultExt, NotifyTaskExt},
-    Workspace,
+    OpenChannelNotes, Workspace,
 };
 
 actions!(
@@ -69,6 +69,19 @@ pub fn init(cx: &mut AppContext) {
         workspace.register_action(|workspace, _: &ToggleFocus, cx| {
             workspace.toggle_panel_focus::<CollabPanel>(cx);
         });
+        workspace.register_action(|_, _: &OpenChannelNotes, cx| {
+            let channel_id = ActiveCall::global(cx)
+                .read(cx)
+                .room()
+                .and_then(|room| room.read(cx).channel_id());
+
+            if let Some(channel_id) = channel_id {
+                let workspace = cx.view().clone();
+                cx.window_context().defer(move |cx| {
+                    ChannelView::open(channel_id, workspace, cx).detach_and_log_err(cx)
+                });
+            }
+        });
     })
     .detach();
 }
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index ada4816753..af8608776f 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -12,7 +12,7 @@ mod toolbar;
 mod workspace_settings;
 
 use anyhow::{anyhow, Context as _, Result};
-use call::ActiveCall;
+use call::{call_settings::CallSettings, ActiveCall};
 use client::{
     proto::{self, ErrorCode, PeerId},
     Client, ErrorExt, Status, TypedEnvelope, UserStore,
@@ -3974,6 +3974,8 @@ pub async fn last_opened_workspace_paths() -> Option<WorkspaceLocation> {
     DB.last_workspace().await.log_err().flatten()
 }
 
+actions!(collab, [OpenChannelNotes]);
+
 async fn join_channel_internal(
     channel_id: u64,
     app_state: &Arc<AppState>,
@@ -4075,6 +4077,36 @@ async fn join_channel_internal(
             return Some(join_remote_project(project, host, app_state.clone(), cx));
         }
 
+        // if you are the first to join a channel, share your project
+        if room.remote_participants().len() == 0 && !room.local_participant_is_guest() {
+            if let Some(workspace) = requesting_window {
+                let project = workspace.update(cx, |workspace, cx| {
+                    if !CallSettings::get_global(cx).share_on_join {
+                        return None;
+                    }
+                    let project = workspace.project.read(cx);
+                    if project.is_local()
+                        && project.visible_worktrees(cx).any(|tree| {
+                            tree.read(cx)
+                                .root_entry()
+                                .map_or(false, |entry| entry.is_dir())
+                        })
+                    {
+                        Some(workspace.project.clone())
+                    } else {
+                        None
+                    }
+                });
+                if let Ok(Some(project)) = project {
+                    return Some(cx.spawn(|room, mut cx| async move {
+                        room.update(&mut cx, |room, cx| room.share_project(project, cx))?
+                            .await?;
+                        Ok(())
+                    }));
+                }
+            }
+        }
+
         None
     })?;
     if let Some(task) = task {
@@ -4117,6 +4149,12 @@ pub fn join_channel(
                 })?
                 .await?;
 
+            if result.is_ok() {
+                cx.update(|cx| {
+                    cx.dispatch_action(&OpenChannelNotes);
+                }).log_err();
+            }
+
             active_window = Some(window_handle);
         }
 

From 659423a4a1fabc7a0e5af10a2f5954b9e2d27089 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Fri, 2 Feb 2024 09:53:07 -0700
Subject: [PATCH 184/372] Use `Mutex` instead of a `RefCell` to acquire/release
 instance buffers (#7291)

This fixes a panic happening when releasing an instance buffer.
Releasing the buffer happens on a different thread but the borrow
checker was not catching it because the metal buffer completion handler
API doesn't have a `Send` marker on it.

Release Notes:

- N/A
---
 crates/gpui/src/platform/mac/metal_renderer.rs | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/crates/gpui/src/platform/mac/metal_renderer.rs b/crates/gpui/src/platform/mac/metal_renderer.rs
index 0100559d4b..aa9992dfda 100644
--- a/crates/gpui/src/platform/mac/metal_renderer.rs
+++ b/crates/gpui/src/platform/mac/metal_renderer.rs
@@ -15,14 +15,9 @@ use foreign_types::ForeignType;
 use media::core_video::CVMetalTextureCache;
 use metal::{CommandQueue, MTLPixelFormat, MTLResourceOptions, NSRange};
 use objc::{self, msg_send, sel, sel_impl};
+use parking_lot::Mutex;
 use smallvec::SmallVec;
-use std::{
-    cell::{Cell, RefCell},
-    ffi::c_void,
-    mem, ptr,
-    rc::Rc,
-    sync::Arc,
-};
+use std::{cell::Cell, ffi::c_void, mem, ptr, sync::Arc};
 
 #[cfg(not(feature = "runtime_shaders"))]
 const SHADERS_METALLIB: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/shaders.metallib"));
@@ -44,7 +39,8 @@ pub(crate) struct MetalRenderer {
     polychrome_sprites_pipeline_state: metal::RenderPipelineState,
     surfaces_pipeline_state: metal::RenderPipelineState,
     unit_vertices: metal::Buffer,
-    instance_buffers: Rc<RefCell<Vec<metal::Buffer>>>,
+    #[allow(clippy::arc_with_non_send_sync)]
+    instance_buffers: Arc<Mutex<Vec<metal::Buffer>>>,
     sprite_atlas: Arc<MetalAtlas>,
     core_video_texture_cache: CVMetalTextureCache,
 }
@@ -185,7 +181,7 @@ impl MetalRenderer {
             polychrome_sprites_pipeline_state,
             surfaces_pipeline_state,
             unit_vertices,
-            instance_buffers: Rc::default(),
+            instance_buffers: Arc::default(),
             sprite_atlas,
             core_video_texture_cache,
         }
@@ -215,7 +211,7 @@ impl MetalRenderer {
             );
             return;
         };
-        let mut instance_buffer = self.instance_buffers.borrow_mut().pop().unwrap_or_else(|| {
+        let mut instance_buffer = self.instance_buffers.lock().pop().unwrap_or_else(|| {
             self.device.new_buffer(
                 INSTANCE_BUFFER_SIZE as u64,
                 MTLResourceOptions::StorageModeManaged,
@@ -341,7 +337,7 @@ impl MetalRenderer {
         let instance_buffer = Cell::new(Some(instance_buffer));
         let block = ConcreteBlock::new(move |_| {
             if let Some(instance_buffer) = instance_buffer.take() {
-                instance_buffers.borrow_mut().push(instance_buffer);
+                instance_buffers.lock().push(instance_buffer);
             }
         });
         let block = block.copy();

From 3995c22414d9103f1816bdf50d718cafea7e1cba Mon Sep 17 00:00:00 2001
From: James Roberts <82052595+contrast-jproberts@users.noreply.github.com>
Date: Fri, 2 Feb 2024 12:08:15 -0500
Subject: [PATCH 185/372] Use async-native-tls for websockets (#7254)

This change switches from using async_tungstenite::async_tls to
async_tungstenite::async_std with the async-native-tls feature.

The previous feature, async_tls, used async-tls which wraps rustls.
rustls bundles webpki-roots, which is a copy of Mozilla's root
certificates. These certificates are used by default, and manual
configuration is required to support custom certificates, such as those
required by web security gateways in enterprise environments.

Instead of introducing a new configuration option to Zed,
async-native-tls integrates with the platform-native certificate store
to support enterprise environments out-of-the-box. For MacOS, this adds
support for Security.framework TLS. This integration is provided through
openssl-sys, which is also the SSL certificate provider for isahc, the
library underlying Zed's HTTP client. Making websockets and HTTP
communications use the same SSL provider should keep Zed consistent
operations and make the project easier to maintain.



Release Notes:

- Fixed WebSocket communications using custom TLS certificates
([#4759](https://github.com/zed-industries/zed/issues/4759)).
---
 Cargo.lock                  | 77 +++++++++----------------------------
 crates/client/Cargo.toml    |  2 +-
 crates/client/src/client.rs |  2 +-
 3 files changed, 20 insertions(+), 61 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5d735cac63..b5751e0560 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -441,6 +441,18 @@ dependencies = [
  "event-listener",
 ]
 
+[[package]]
+name = "async-native-tls"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e9e7a929bd34c68a82d58a4de7f86fffdaf97fb2af850162a7bb19dd7269b33"
+dependencies = [
+ "async-std",
+ "native-tls",
+ "thiserror",
+ "url",
+]
+
 [[package]]
 name = "async-net"
 version = "1.7.0"
@@ -570,19 +582,6 @@ version = "4.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799"
 
-[[package]]
-name = "async-tls"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f23d769dbf1838d5df5156e7b1ad404f4c463d1ac2c6aeb6cd943630f8a8400"
-dependencies = [
- "futures-core",
- "futures-io",
- "rustls 0.19.1",
- "webpki",
- "webpki-roots 0.21.1",
-]
-
 [[package]]
 name = "async-trait"
 version = "0.1.73"
@@ -600,7 +599,8 @@ version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5682ea0913e5c20780fe5785abacb85a411e7437bf52a1bedb93ddb3972cb8dd"
 dependencies = [
- "async-tls",
+ "async-native-tls",
+ "async-std",
  "futures-io",
  "futures-util",
  "log",
@@ -6731,19 +6731,6 @@ dependencies = [
  "rustix 0.38.30",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
-dependencies = [
- "base64 0.13.1",
- "log",
- "ring",
- "sct 0.6.1",
- "webpki",
-]
-
 [[package]]
 name = "rustls"
 version = "0.21.7"
@@ -6752,7 +6739,7 @@ checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
 dependencies = [
  "ring",
  "rustls-webpki",
- "sct 0.7.0",
+ "sct",
 ]
 
 [[package]]
@@ -6895,16 +6882,6 @@ dependencies = [
  "sha2 0.9.9",
 ]
 
-[[package]]
-name = "sct"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
-dependencies = [
- "ring",
- "untrusted",
-]
-
 [[package]]
 name = "sct"
 version = "0.7.0"
@@ -7626,7 +7603,7 @@ dependencies = [
  "paste",
  "percent-encoding",
  "rust_decimal",
- "rustls 0.21.7",
+ "rustls",
  "rustls-pemfile",
  "serde",
  "serde_json",
@@ -7640,7 +7617,7 @@ dependencies = [
  "tracing",
  "url",
  "uuid 1.4.1",
- "webpki-roots 0.24.0",
+ "webpki-roots",
 ]
 
 [[package]]
@@ -9138,6 +9115,7 @@ dependencies = [
  "http",
  "httparse",
  "log",
+ "native-tls",
  "rand 0.8.5",
  "sha-1 0.9.8",
  "thiserror",
@@ -9845,25 +9823,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "webpki"
-version = "0.21.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
-dependencies = [
- "webpki",
-]
-
 [[package]]
 name = "webpki-roots"
 version = "0.24.0"
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
index 9bf04caa71..f405b1a74d 100644
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -27,7 +27,7 @@ sum_tree = { path = "../sum_tree" }
 
 anyhow.workspace = true
 async-recursion = "0.3"
-async-tungstenite = { version = "0.16", features = ["async-tls"] }
+async-tungstenite = { version = "0.16", features = ["async-std", "async-native-tls"] }
 futures.workspace = true
 image = "0.23"
 lazy_static.workspace = true
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index dc95d0ca67..ff8adc9660 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -1040,7 +1040,7 @@ impl Client {
                     rpc_url.set_scheme("wss").unwrap();
                     let request = request.uri(rpc_url.as_str()).body(())?;
                     let (stream, _) =
-                        async_tungstenite::async_tls::client_async_tls(request, stream).await?;
+                        async_tungstenite::async_std::client_async_tls(request, stream).await?;
                     Ok(Connection::new(
                         stream
                             .map_err(|error| anyhow!(error))

From 5360c0ea285329e0a79a6e214b6aa82725ac9165 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Fri, 2 Feb 2024 12:09:05 -0500
Subject: [PATCH 186/372] theme_importer: Make VS Code theme parsing more
 lenient (#7292)

This PR updates the `theme_importer` to use `serde_json_lenient` to
parse VS Code themes.

This should allow us to parse themes that have trailing commas and such,
in addition to the comment support that we already had.

Release Notes:

- N/A
---
 Cargo.lock                        | 8 +-------
 crates/theme_importer/Cargo.toml  | 2 +-
 crates/theme_importer/src/main.rs | 4 +---
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b5751e0560..6500eacea5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3867,12 +3867,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "json_comments"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dbbfed4e59ba9750e15ba154fdfd9329cee16ff3df539c2666b70f58cc32105"
-
 [[package]]
 name = "jwt"
 version = "0.16.0"
@@ -8228,7 +8222,6 @@ dependencies = [
  "gpui",
  "indexmap 1.9.3",
  "indoc",
- "json_comments",
  "log",
  "palette",
  "pathfinder_color",
@@ -8236,6 +8229,7 @@ dependencies = [
  "schemars",
  "serde",
  "serde_json",
+ "serde_json_lenient",
  "simplelog",
  "strum",
  "theme",
diff --git a/crates/theme_importer/Cargo.toml b/crates/theme_importer/Cargo.toml
index 2214af85c7..ddb9433f16 100644
--- a/crates/theme_importer/Cargo.toml
+++ b/crates/theme_importer/Cargo.toml
@@ -13,7 +13,6 @@ convert_case = "0.6.0"
 gpui = { path = "../gpui" }
 indexmap = { version = "1.6.2", features = ["serde"] }
 indoc.workspace = true
-json_comments = "0.2.2"
 log.workspace = true
 palette = { version = "0.7.3", default-features = false, features = ["std"] }
 pathfinder_color = "0.5"
@@ -21,6 +20,7 @@ rust-embed.workspace = true
 schemars = { workspace = true, features = ["indexmap"] }
 serde.workspace = true
 serde_json.workspace = true
+serde_json_lenient.workspace = true
 simplelog = "0.9"
 strum = { version = "0.25.0", features = ["derive"] }
 theme = { path = "../theme" }
diff --git a/crates/theme_importer/src/main.rs b/crates/theme_importer/src/main.rs
index a8cc8a1bdf..c689d7f7f9 100644
--- a/crates/theme_importer/src/main.rs
+++ b/crates/theme_importer/src/main.rs
@@ -9,7 +9,6 @@ use std::path::PathBuf;
 use anyhow::{Context, Result};
 use clap::{Parser, Subcommand};
 use indexmap::IndexMap;
-use json_comments::StripComments;
 use log::LevelFilter;
 use schemars::schema_for;
 use serde::Deserialize;
@@ -132,8 +131,7 @@ fn main() -> Result<()> {
         }
     };
 
-    let theme_without_comments = StripComments::new(theme_file);
-    let vscode_theme: VsCodeTheme = serde_json::from_reader(theme_without_comments)
+    let vscode_theme: VsCodeTheme = serde_json_lenient::from_reader(theme_file)
         .context(format!("failed to parse theme {theme_file_path:?}"))?;
 
     let theme_metadata = ThemeMetadata {

From a0b52cc69a2dee14e0d3139a8e6132549ab5a71b Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Fri, 2 Feb 2024 10:11:20 -0700
Subject: [PATCH 187/372] Scope line layout cache to each window (#7235)

This improves a performance problem we were observing when having
multiple windows updating at the same time, where each window would
invalidate the other window's layout cache.

Release Notes:

- Improved performance when having multiple Zed windows open.

Co-authored-by: Max Brunsfeld <max@zed.dev>
---
 crates/editor/src/movement.rs                |   4 +-
 crates/gpui/src/text_system.rs               | 158 +++++++++++--------
 crates/gpui/src/text_system/line_wrapper.rs  |   4 +-
 crates/gpui/src/window.rs                    |  10 +-
 crates/terminal_view/src/terminal_element.rs |   6 +-
 5 files changed, 104 insertions(+), 78 deletions(-)

diff --git a/crates/editor/src/movement.rs b/crates/editor/src/movement.rs
index fa5e5f1655..5e37cb8be2 100644
--- a/crates/editor/src/movement.rs
+++ b/crates/editor/src/movement.rs
@@ -3,7 +3,7 @@
 
 use super::{Bias, DisplayPoint, DisplaySnapshot, SelectionGoal, ToDisplayPoint};
 use crate::{char_kind, CharKind, EditorStyle, ToOffset, ToPoint};
-use gpui::{px, Pixels, TextSystem};
+use gpui::{px, Pixels, WindowTextSystem};
 use language::Point;
 
 use std::{ops::Range, sync::Arc};
@@ -22,7 +22,7 @@ pub enum FindRange {
 /// TextLayoutDetails encompasses everything we need to move vertically
 /// taking into account variable width characters.
 pub struct TextLayoutDetails {
-    pub(crate) text_system: Arc<TextSystem>,
+    pub(crate) text_system: Arc<WindowTextSystem>,
     pub(crate) editor_style: EditorStyle,
     pub(crate) rem_size: Pixels,
     pub anchor: Anchor,
diff --git a/crates/gpui/src/text_system.rs b/crates/gpui/src/text_system.rs
index d5180e30c0..12242e26c2 100644
--- a/crates/gpui/src/text_system.rs
+++ b/crates/gpui/src/text_system.rs
@@ -15,6 +15,7 @@ use crate::{
 use anyhow::anyhow;
 use collections::{BTreeSet, FxHashMap, FxHashSet};
 use core::fmt;
+use derive_more::Deref;
 use itertools::Itertools;
 use parking_lot::{Mutex, RwLock, RwLockUpgradableReadGuard};
 use smallvec::{smallvec, SmallVec};
@@ -38,9 +39,8 @@ pub struct FontFamilyId(pub usize);
 
 pub(crate) const SUBPIXEL_VARIANTS: u8 = 4;
 
-/// The GPUI text layout and rendering sub system.
+/// The GPUI text rendering sub system.
 pub struct TextSystem {
-    line_layout_cache: Arc<LineLayoutCache>,
     platform_text_system: Arc<dyn PlatformTextSystem>,
     font_ids_by_font: RwLock<FxHashMap<Font, Result<FontId>>>,
     font_metrics: RwLock<FxHashMap<FontId, FontMetrics>>,
@@ -53,7 +53,6 @@ pub struct TextSystem {
 impl TextSystem {
     pub(crate) fn new(platform_text_system: Arc<dyn PlatformTextSystem>) -> Self {
         TextSystem {
-            line_layout_cache: Arc::new(LineLayoutCache::new(platform_text_system.clone())),
             platform_text_system,
             font_metrics: RwLock::default(),
             raster_bounds: RwLock::default(),
@@ -234,43 +233,66 @@ impl TextSystem {
         }
     }
 
-    pub(crate) fn with_view<R>(&self, view_id: EntityId, f: impl FnOnce() -> R) -> R {
-        self.line_layout_cache.with_view(view_id, f)
+    /// Returns a handle to a line wrapper, for the given font and font size.
+    pub fn line_wrapper(self: &Arc<Self>, font: Font, font_size: Pixels) -> LineWrapperHandle {
+        let lock = &mut self.wrapper_pool.lock();
+        let font_id = self.resolve_font(&font);
+        let wrappers = lock
+            .entry(FontIdWithSize { font_id, font_size })
+            .or_default();
+        let wrapper = wrappers.pop().unwrap_or_else(|| {
+            LineWrapper::new(font_id, font_size, self.platform_text_system.clone())
+        });
+
+        LineWrapperHandle {
+            wrapper: Some(wrapper),
+            text_system: self.clone(),
+        }
     }
 
-    /// Layout the given line of text, at the given font_size.
-    /// Subsets of the line can be styled independently with the `runs` parameter.
-    /// Generally, you should prefer to use `TextLayout::shape_line` instead, which
-    /// can be painted directly.
-    pub fn layout_line(
-        &self,
-        text: &str,
-        font_size: Pixels,
-        runs: &[TextRun],
-    ) -> Result<Arc<LineLayout>> {
-        let mut font_runs = self.font_runs_pool.lock().pop().unwrap_or_default();
-        for run in runs.iter() {
-            let font_id = self.resolve_font(&run.font);
-            if let Some(last_run) = font_runs.last_mut() {
-                if last_run.font_id == font_id {
-                    last_run.len += run.len;
-                    continue;
-                }
-            }
-            font_runs.push(FontRun {
-                len: run.len,
-                font_id,
-            });
+    /// Get the rasterized size and location of a specific, rendered glyph.
+    pub(crate) fn raster_bounds(&self, params: &RenderGlyphParams) -> Result<Bounds<DevicePixels>> {
+        let raster_bounds = self.raster_bounds.upgradable_read();
+        if let Some(bounds) = raster_bounds.get(params) {
+            Ok(*bounds)
+        } else {
+            let mut raster_bounds = RwLockUpgradableReadGuard::upgrade(raster_bounds);
+            let bounds = self.platform_text_system.glyph_raster_bounds(params)?;
+            raster_bounds.insert(params.clone(), bounds);
+            Ok(bounds)
         }
+    }
 
-        let layout = self
-            .line_layout_cache
-            .layout_line(text, font_size, &font_runs);
+    pub(crate) fn rasterize_glyph(
+        &self,
+        params: &RenderGlyphParams,
+    ) -> Result<(Size<DevicePixels>, Vec<u8>)> {
+        let raster_bounds = self.raster_bounds(params)?;
+        self.platform_text_system
+            .rasterize_glyph(params, raster_bounds)
+    }
+}
 
-        font_runs.clear();
-        self.font_runs_pool.lock().push(font_runs);
+/// The GPUI text layout subsystem.
+#[derive(Deref)]
+pub struct WindowTextSystem {
+    line_layout_cache: Arc<LineLayoutCache>,
+    #[deref]
+    text_system: Arc<TextSystem>,
+}
 
-        Ok(layout)
+impl WindowTextSystem {
+    pub(crate) fn new(text_system: Arc<TextSystem>) -> Self {
+        Self {
+            line_layout_cache: Arc::new(LineLayoutCache::new(
+                text_system.platform_text_system.clone(),
+            )),
+            text_system,
+        }
+    }
+
+    pub(crate) fn with_view<R>(&self, view_id: EntityId, f: impl FnOnce() -> R) -> R {
+        self.line_layout_cache.with_view(view_id, f)
     }
 
     /// Shape the given line, at the given font_size, for painting to the screen.
@@ -429,43 +451,39 @@ impl TextSystem {
         self.line_layout_cache.finish_frame(reused_views)
     }
 
-    /// Returns a handle to a line wrapper, for the given font and font size.
-    pub fn line_wrapper(self: &Arc<Self>, font: Font, font_size: Pixels) -> LineWrapperHandle {
-        let lock = &mut self.wrapper_pool.lock();
-        let font_id = self.resolve_font(&font);
-        let wrappers = lock
-            .entry(FontIdWithSize { font_id, font_size })
-            .or_default();
-        let wrapper = wrappers.pop().unwrap_or_else(|| {
-            LineWrapper::new(font_id, font_size, self.platform_text_system.clone())
-        });
-
-        LineWrapperHandle {
-            wrapper: Some(wrapper),
-            text_system: self.clone(),
-        }
-    }
-
-    /// Get the rasterized size and location of a specific, rendered glyph.
-    pub(crate) fn raster_bounds(&self, params: &RenderGlyphParams) -> Result<Bounds<DevicePixels>> {
-        let raster_bounds = self.raster_bounds.upgradable_read();
-        if let Some(bounds) = raster_bounds.get(params) {
-            Ok(*bounds)
-        } else {
-            let mut raster_bounds = RwLockUpgradableReadGuard::upgrade(raster_bounds);
-            let bounds = self.platform_text_system.glyph_raster_bounds(params)?;
-            raster_bounds.insert(params.clone(), bounds);
-            Ok(bounds)
-        }
-    }
-
-    pub(crate) fn rasterize_glyph(
+    /// Layout the given line of text, at the given font_size.
+    /// Subsets of the line can be styled independently with the `runs` parameter.
+    /// Generally, you should prefer to use `TextLayout::shape_line` instead, which
+    /// can be painted directly.
+    pub fn layout_line(
         &self,
-        params: &RenderGlyphParams,
-    ) -> Result<(Size<DevicePixels>, Vec<u8>)> {
-        let raster_bounds = self.raster_bounds(params)?;
-        self.platform_text_system
-            .rasterize_glyph(params, raster_bounds)
+        text: &str,
+        font_size: Pixels,
+        runs: &[TextRun],
+    ) -> Result<Arc<LineLayout>> {
+        let mut font_runs = self.font_runs_pool.lock().pop().unwrap_or_default();
+        for run in runs.iter() {
+            let font_id = self.resolve_font(&run.font);
+            if let Some(last_run) = font_runs.last_mut() {
+                if last_run.font_id == font_id {
+                    last_run.len += run.len;
+                    continue;
+                }
+            }
+            font_runs.push(FontRun {
+                len: run.len,
+                font_id,
+            });
+        }
+
+        let layout = self
+            .line_layout_cache
+            .layout_line(text, font_size, &font_runs);
+
+        font_runs.clear();
+        self.font_runs_pool.lock().push(font_runs);
+
+        Ok(layout)
     }
 }
 
diff --git a/crates/gpui/src/text_system/line_wrapper.rs b/crates/gpui/src/text_system/line_wrapper.rs
index 4950d7e20e..0abe31352d 100644
--- a/crates/gpui/src/text_system/line_wrapper.rs
+++ b/crates/gpui/src/text_system/line_wrapper.rs
@@ -143,7 +143,7 @@ impl Boundary {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{font, TestAppContext, TestDispatcher, TextRun, WrapBoundary};
+    use crate::{font, TestAppContext, TestDispatcher, TextRun, WindowTextSystem, WrapBoundary};
     use rand::prelude::*;
 
     #[test]
@@ -218,7 +218,7 @@ mod tests {
     #[crate::test]
     fn test_wrap_shaped_line(cx: &mut TestAppContext) {
         cx.update(|cx| {
-            let text_system = cx.text_system().clone();
+            let text_system = WindowTextSystem::new(cx.text_system().clone());
 
             let normal = TextRun {
                 len: 0,
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index d64feb56a4..c1be692542 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -7,7 +7,7 @@ use crate::{
     MouseMoveEvent, MouseUpEvent, Pixels, PlatformAtlas, PlatformDisplay, PlatformInput,
     PlatformWindow, Point, PromptLevel, Render, ScaledPixels, SharedString, Size, SubscriberSet,
     Subscription, TaffyLayoutEngine, Task, View, VisualContext, WeakView, WindowBounds,
-    WindowOptions,
+    WindowOptions, WindowTextSystem,
 };
 use anyhow::{anyhow, Context as _, Result};
 use collections::FxHashSet;
@@ -251,6 +251,7 @@ pub struct Window {
     pub(crate) platform_window: Box<dyn PlatformWindow>,
     display_id: DisplayId,
     sprite_atlas: Arc<dyn PlatformAtlas>,
+    text_system: Arc<WindowTextSystem>,
     pub(crate) rem_size: Pixels,
     pub(crate) viewport_size: Size<Pixels>,
     layout_engine: Option<TaffyLayoutEngine>,
@@ -337,6 +338,7 @@ impl Window {
         let content_size = platform_window.content_size();
         let scale_factor = platform_window.scale_factor();
         let bounds = platform_window.bounds();
+        let text_system = Arc::new(WindowTextSystem::new(cx.text_system().clone()));
 
         platform_window.on_request_frame(Box::new({
             let mut cx = cx.to_async();
@@ -393,6 +395,7 @@ impl Window {
             platform_window,
             display_id,
             sprite_atlas,
+            text_system,
             rem_size: px(16.),
             viewport_size: content_size,
             layout_engine: Some(TaffyLayoutEngine::new()),
@@ -530,6 +533,11 @@ impl<'a> WindowContext<'a> {
         self.window.focus_enabled = false;
     }
 
+    /// Accessor for the text system.
+    pub fn text_system(&self) -> &Arc<WindowTextSystem> {
+        &self.window.text_system
+    }
+
     /// Dispatch the given action on the currently focused element.
     pub fn dispatch_action(&mut self, action: Box<dyn Action>) {
         let focus_handle = self.focused();
diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index c691d74754..73d9bb27f5 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -4,8 +4,8 @@ use gpui::{
     ElementContext, ElementId, FocusHandle, Font, FontStyle, FontWeight, HighlightStyle, Hsla,
     InputHandler, InteractiveBounds, InteractiveElement, InteractiveElementState, Interactivity,
     IntoElement, LayoutId, Model, ModelContext, ModifiersChangedEvent, MouseButton, MouseMoveEvent,
-    Pixels, Point, ShapedLine, StatefulInteractiveElement, Styled, TextRun, TextStyle, TextSystem,
-    UnderlineStyle, WeakView, WhiteSpace, WindowContext,
+    Pixels, Point, ShapedLine, StatefulInteractiveElement, Styled, TextRun, TextStyle,
+    UnderlineStyle, WeakView, WhiteSpace, WindowContext, WindowTextSystem,
 };
 use itertools::Itertools;
 use language::CursorShape;
@@ -185,7 +185,7 @@ impl TerminalElement {
         grid: &Vec<IndexedCell>,
         text_style: &TextStyle,
         // terminal_theme: &TerminalStyle,
-        text_system: &TextSystem,
+        text_system: &WindowTextSystem,
         hyperlink: Option<(HighlightStyle, &RangeInclusive<AlacPoint>)>,
         cx: &WindowContext<'_>,
     ) -> (Vec<LayoutCell>, Vec<LayoutRect>) {

From 1f6bd6760fec123000321096819d211d8bd4bed4 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Fri, 2 Feb 2024 10:21:45 -0700
Subject: [PATCH 188/372] Fix main (#7293)

Release Notes:

- N/A
---
 crates/collab_ui/src/collab_panel.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index 6730203eca..9460be3e95 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -78,7 +78,7 @@ pub fn init(cx: &mut AppContext) {
             if let Some(channel_id) = channel_id {
                 let workspace = cx.view().clone();
                 cx.window_context().defer(move |cx| {
-                    ChannelView::open(channel_id, workspace, cx).detach_and_log_err(cx)
+                    ChannelView::open(channel_id, None, workspace, cx).detach_and_log_err(cx)
                 });
             }
         });

From 115f0672fb4c67675e46d1fd99d4e4489c3672de Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Fri, 2 Feb 2024 13:13:35 -0500
Subject: [PATCH 189/372] gpui: Add support for observing window appearance
 (#7294)

This PR adds support to GPUI for observing when the appearance of a
window changes.

Based on the initial work done in
https://github.com/zed-industries/zed/pull/6881.

Release Notes:

- N/A
---
 crates/gpui/src/platform/test/window.rs |  6 ++--
 crates/gpui/src/window.rs               | 45 +++++++++++++++++++++++--
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/crates/gpui/src/platform/test/window.rs b/crates/gpui/src/platform/test/window.rs
index b310084fc4..d5d62e0155 100644
--- a/crates/gpui/src/platform/test/window.rs
+++ b/crates/gpui/src/platform/test/window.rs
@@ -171,7 +171,7 @@ impl PlatformWindow for TestWindow {
     }
 
     fn appearance(&self) -> WindowAppearance {
-        unimplemented!()
+        WindowAppearance::Light
     }
 
     fn display(&self) -> std::rc::Rc<dyn crate::PlatformDisplay> {
@@ -276,9 +276,7 @@ impl PlatformWindow for TestWindow {
         unimplemented!()
     }
 
-    fn on_appearance_changed(&self, _callback: Box<dyn FnMut()>) {
-        unimplemented!()
-    }
+    fn on_appearance_changed(&self, _callback: Box<dyn FnMut()>) {}
 
     fn is_topmost_for_position(&self, _position: crate::Point<Pixels>) -> bool {
         unimplemented!()
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index c1be692542..fbea1ba8dd 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -6,8 +6,8 @@ use crate::{
     KeymatchResult, Keystroke, KeystrokeEvent, Model, ModelContext, Modifiers, MouseButton,
     MouseMoveEvent, MouseUpEvent, Pixels, PlatformAtlas, PlatformDisplay, PlatformInput,
     PlatformWindow, Point, PromptLevel, Render, ScaledPixels, SharedString, Size, SubscriberSet,
-    Subscription, TaffyLayoutEngine, Task, View, VisualContext, WeakView, WindowBounds,
-    WindowOptions, WindowTextSystem,
+    Subscription, TaffyLayoutEngine, Task, View, VisualContext, WeakView, WindowAppearance,
+    WindowBounds, WindowOptions, WindowTextSystem,
 };
 use anyhow::{anyhow, Context as _, Result};
 use collections::FxHashSet;
@@ -269,6 +269,8 @@ pub struct Window {
     scale_factor: f32,
     bounds: WindowBounds,
     bounds_observers: SubscriberSet<(), AnyObserver>,
+    appearance: WindowAppearance,
+    appearance_observers: SubscriberSet<(), AnyObserver>,
     active: bool,
     pub(crate) dirty: bool,
     pub(crate) refreshing: bool,
@@ -338,6 +340,7 @@ impl Window {
         let content_size = platform_window.content_size();
         let scale_factor = platform_window.scale_factor();
         let bounds = platform_window.bounds();
+        let appearance = platform_window.appearance();
         let text_system = Arc::new(WindowTextSystem::new(cx.text_system().clone()));
 
         platform_window.on_request_frame(Box::new({
@@ -364,6 +367,14 @@ impl Window {
                     .log_err();
             }
         }));
+        platform_window.on_appearance_changed(Box::new({
+            let mut cx = cx.to_async();
+            move || {
+                handle
+                    .update(&mut cx, |_, cx| cx.appearance_changed())
+                    .log_err();
+            }
+        }));
         platform_window.on_active_status_change(Box::new({
             let mut cx = cx.to_async();
             move |active| {
@@ -413,6 +424,8 @@ impl Window {
             scale_factor,
             bounds,
             bounds_observers: SubscriberSet::new(),
+            appearance,
+            appearance_observers: SubscriberSet::new(),
             active: false,
             dirty: false,
             refreshing: false,
@@ -742,6 +755,20 @@ impl<'a> WindowContext<'a> {
         self.window.bounds
     }
 
+    fn appearance_changed(&mut self) {
+        self.window.appearance = self.window.platform_window.appearance();
+
+        self.window
+            .appearance_observers
+            .clone()
+            .retain(&(), |callback| callback(self));
+    }
+
+    /// Returns the appearance of the current window.
+    pub fn appearance(&self) -> WindowAppearance {
+        self.window.appearance
+    }
+
     /// Returns the size of the drawable area within the window.
     pub fn viewport_size(&self) -> Size<Pixels> {
         self.window.viewport_size
@@ -2066,6 +2093,20 @@ impl<'a, V: 'static> ViewContext<'a, V> {
         subscription
     }
 
+    /// Registers a callback to be invoked when the window appearance changes.
+    pub fn observe_window_appearance(
+        &mut self,
+        mut callback: impl FnMut(&mut V, &mut ViewContext<V>) + 'static,
+    ) -> Subscription {
+        let view = self.view.downgrade();
+        let (subscription, activate) = self.window.appearance_observers.insert(
+            (),
+            Box::new(move |cx| view.update(cx, |view, cx| callback(view, cx)).is_ok()),
+        );
+        activate();
+        subscription
+    }
+
     /// Register a listener to be called when the given focus handle receives focus.
     /// Returns a subscription and persists until the subscription is dropped.
     pub fn on_focus(

From 2d58226a9b90bef9bc46c0a8e6d32bc34418f5bb Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 2 Feb 2024 20:47:45 +0200
Subject: [PATCH 190/372] Avoid logging errors about missing themes dir (#7290)

---
 crates/zed/src/main.rs | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 1666b23f07..2f5db82dd6 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -892,27 +892,37 @@ fn load_user_themes_in_background(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {
             if let Some(theme_registry) =
                 cx.update(|cx| ThemeRegistry::global(cx).clone()).log_err()
             {
-                if let Some(()) = theme_registry
-                    .load_user_themes(&paths::THEMES_DIR.clone(), fs)
+                let themes_dir = paths::THEMES_DIR.as_ref();
+                match fs
+                    .metadata(themes_dir)
                     .await
-                    .log_err()
+                    .ok()
+                    .flatten()
+                    .map(|m| m.is_dir)
                 {
-                    cx.update(|cx| {
-                        let mut theme_settings = ThemeSettings::get_global(cx).clone();
-
-                        if let Some(requested_theme) = theme_settings.requested_theme.clone() {
-                            if let Some(_theme) = theme_settings.switch_theme(&requested_theme, cx)
-                            {
-                                ThemeSettings::override_global(theme_settings, cx);
-                            }
-                        }
-                    })
-                    .log_err();
+                    Some(is_dir) => {
+                        anyhow::ensure!(is_dir, "Themes dir path {themes_dir:?} is not a directory")
+                    }
+                    None => {
+                        fs.create_dir(themes_dir).await.with_context(|| {
+                            format!("Failed to create themes dir at path {themes_dir:?}")
+                        })?;
+                    }
                 }
+                theme_registry.load_user_themes(themes_dir, fs).await?;
+                cx.update(|cx| {
+                    let mut theme_settings = ThemeSettings::get_global(cx).clone();
+                    if let Some(requested_theme) = theme_settings.requested_theme.clone() {
+                        if let Some(_theme) = theme_settings.switch_theme(&requested_theme, cx) {
+                            ThemeSettings::override_global(theme_settings, cx);
+                        }
+                    }
+                })?;
             }
+            anyhow::Ok(())
         }
     })
-    .detach();
+    .detach_and_log_err(cx);
 }
 
 /// Spawns a background task to watch the themes directory for changes.

From f2ba969d5b409d3ed5637ae36b49ed1f6a542d3e Mon Sep 17 00:00:00 2001
From: tomholford <16504501+tomholford@users.noreply.github.com>
Date: Fri, 2 Feb 2024 12:52:28 -0800
Subject: [PATCH 191/372] Dismiss update notification when viewing releases
 notes (#7297)

After updating zed, a notification is shown in the bottom right with the
new version number, a link to the release notes, and an 'x' to dismiss
the dialog.

Before this PR, clicking the link to the release notes would not dismiss
the modal. So, a user returning to the IDE after viewing the notes in
the browser would still see the notification. With this change, clicking
'View release notes' also dismisses the notification.

Co-authored-by: tomholford <tomholford@users.noreply.github.com>

Release Notes:

- Made update notification to dismiss when viewing releases notes
---
 crates/auto_update/src/update_notification.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/crates/auto_update/src/update_notification.rs b/crates/auto_update/src/update_notification.rs
index eece0c105a..1dbee71806 100644
--- a/crates/auto_update/src/update_notification.rs
+++ b/crates/auto_update/src/update_notification.rs
@@ -40,10 +40,11 @@ impl Render for UpdateNotification {
                     .id("notes")
                     .child(Label::new("View the release notes"))
                     .cursor_pointer()
-                    .on_click(|_, cx| {
+                    .on_click(cx.listener(|this, _, cx| {
                         crate::view_release_notes(&Default::default(), cx);
-                    }),
-            )
+                        this.dismiss(&menu::Cancel, cx)
+                    })),
+            );
     }
 }
 

From 15edc46827a08f4befeaecf0a7f6be692b8391a4 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Fri, 2 Feb 2024 16:42:46 -0700
Subject: [PATCH 192/372] Maintain smooth frame rates when ProMotion and direct
 mode are enabled (#7305)

This is achieved by starting a `CADisplayLink` that will invoke the
`on_request_frame` callback at the refresh interval of the display.

We only actually draw frames when the window was dirty, or for 2 extra
seconds after the last input event to ensure ProMotion doesn't downclock
the refresh rate when the user is actively interacting with the window.

Release Notes:

- Improved performance when using a ProMotion display with fast key
repeat rates.

---------

Co-authored-by: Nathan Sobo <nathan@zed.dev>
---
 crates/gpui/src/app.rs                  | 13 ++-----
 crates/gpui/src/platform.rs             |  1 -
 crates/gpui/src/platform/mac/window.rs  | 20 +++++-----
 crates/gpui/src/platform/test/window.rs |  2 -
 crates/gpui/src/window.rs               | 51 +++++++++++++++++--------
 5 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 9f92445045..56d66f9b0b 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -652,27 +652,20 @@ impl AppContext {
                     }
                 }
             } else {
-                for window in self.windows.values() {
-                    if let Some(window) = window.as_ref() {
-                        if window.dirty {
-                            window.platform_window.invalidate();
-                        }
-                    }
-                }
-
                 #[cfg(any(test, feature = "test-support"))]
                 for window in self
                     .windows
                     .values()
                     .filter_map(|window| {
                         let window = window.as_ref()?;
-                        (window.dirty || window.focus_invalidated).then_some(window.handle)
+                        (window.dirty.get() || window.focus_invalidated).then_some(window.handle)
                     })
                     .collect::<Vec<_>>()
                 {
                     self.update_window(window, |_, cx| cx.draw()).unwrap();
                 }
 
+                #[allow(clippy::collapsible_else_if)]
                 if self.pending_effects.is_empty() {
                     break;
                 }
@@ -749,7 +742,7 @@ impl AppContext {
     fn apply_refresh_effect(&mut self) {
         for window in self.windows.values_mut() {
             if let Some(window) = window.as_mut() {
-                window.dirty = true;
+                window.dirty.set(true);
             }
         }
     }
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index df886fc4d6..62ac543319 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -175,7 +175,6 @@ pub(crate) trait PlatformWindow: HasWindowHandle + HasDisplayHandle {
     fn on_close(&self, callback: Box<dyn FnOnce()>);
     fn on_appearance_changed(&self, callback: Box<dyn FnMut()>);
     fn is_topmost_for_position(&self, position: Point<Pixels>) -> bool;
-    fn invalidate(&self);
     fn draw(&self, scene: &Scene);
 
     fn sprite_atlas(&self) -> Arc<dyn PlatformAtlas>;
diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index ce25c4d6eb..0e12dc4af0 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -16,8 +16,8 @@ use cocoa::{
     },
     base::{id, nil},
     foundation::{
-        NSArray, NSAutoreleasePool, NSDictionary, NSFastEnumeration, NSInteger, NSPoint, NSRect,
-        NSSize, NSString, NSUInteger,
+        NSArray, NSAutoreleasePool, NSDefaultRunLoopMode, NSDictionary, NSFastEnumeration,
+        NSInteger, NSPoint, NSRect, NSSize, NSString, NSUInteger,
     },
 };
 use core_graphics::display::CGRect;
@@ -321,6 +321,7 @@ struct MacWindowState {
     executor: ForegroundExecutor,
     native_window: id,
     native_view: NonNull<id>,
+    display_link: id,
     renderer: MetalRenderer,
     kind: WindowKind,
     request_frame_callback: Option<Box<dyn FnMut()>>,
@@ -522,6 +523,10 @@ impl MacWindow {
             let native_view: id = msg_send![VIEW_CLASS, alloc];
             let native_view = NSView::init(native_view);
 
+            let display_link: id = msg_send![class!(CADisplayLink), displayLinkWithTarget: native_view selector: sel!(displayLayer:)];
+            let main_run_loop: id = msg_send![class!(NSRunLoop), mainRunLoop];
+            let _: () =
+                msg_send![display_link, addToRunLoop: main_run_loop forMode: NSDefaultRunLoopMode];
             assert!(!native_view.is_null());
 
             let window = Self(Arc::new(Mutex::new(MacWindowState {
@@ -529,6 +534,7 @@ impl MacWindow {
                 executor,
                 native_window,
                 native_view: NonNull::new_unchecked(native_view as *mut _),
+                display_link,
                 renderer: MetalRenderer::new(true),
                 kind: options.kind,
                 request_frame_callback: None,
@@ -687,6 +693,9 @@ impl Drop for MacWindow {
     fn drop(&mut self) {
         let this = self.0.lock();
         let window = this.native_window;
+        unsafe {
+            let _: () = msg_send![this.display_link, invalidate];
+        }
         this.executor
             .spawn(async move {
                 unsafe {
@@ -1000,13 +1009,6 @@ impl PlatformWindow for MacWindow {
         }
     }
 
-    fn invalidate(&self) {
-        let this = self.0.lock();
-        unsafe {
-            let _: () = msg_send![this.native_window.contentView(), setNeedsDisplay: YES];
-        }
-    }
-
     fn draw(&self, scene: &crate::Scene) {
         let mut this = self.0.lock();
         this.renderer.draw(scene);
diff --git a/crates/gpui/src/platform/test/window.rs b/crates/gpui/src/platform/test/window.rs
index d5d62e0155..d56851c8b9 100644
--- a/crates/gpui/src/platform/test/window.rs
+++ b/crates/gpui/src/platform/test/window.rs
@@ -282,8 +282,6 @@ impl PlatformWindow for TestWindow {
         unimplemented!()
     }
 
-    fn invalidate(&self) {}
-
     fn draw(&self, _scene: &crate::Scene) {}
 
     fn sprite_atlas(&self) -> sync::Arc<dyn crate::PlatformAtlas> {
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index fbea1ba8dd..afc2235fe6 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -22,7 +22,7 @@ use smallvec::SmallVec;
 use std::{
     any::{Any, TypeId},
     borrow::{Borrow, BorrowMut},
-    cell::RefCell,
+    cell::{Cell, RefCell},
     collections::hash_map::Entry,
     fmt::{Debug, Display},
     future::Future,
@@ -34,7 +34,7 @@ use std::{
         atomic::{AtomicUsize, Ordering::SeqCst},
         Arc,
     },
-    time::Duration,
+    time::{Duration, Instant},
 };
 use util::{measure, ResultExt};
 
@@ -272,7 +272,8 @@ pub struct Window {
     appearance: WindowAppearance,
     appearance_observers: SubscriberSet<(), AnyObserver>,
     active: bool,
-    pub(crate) dirty: bool,
+    pub(crate) dirty: Rc<Cell<bool>>,
+    pub(crate) last_input_timestamp: Rc<Cell<Instant>>,
     pub(crate) refreshing: bool,
     pub(crate) drawing: bool,
     activation_observers: SubscriberSet<(), AnyObserver>,
@@ -342,13 +343,28 @@ impl Window {
         let bounds = platform_window.bounds();
         let appearance = platform_window.appearance();
         let text_system = Arc::new(WindowTextSystem::new(cx.text_system().clone()));
+        let dirty = Rc::new(Cell::new(false));
+        let last_input_timestamp = Rc::new(Cell::new(Instant::now()));
 
         platform_window.on_request_frame(Box::new({
             let mut cx = cx.to_async();
+            let dirty = dirty.clone();
+            let last_input_timestamp = last_input_timestamp.clone();
             move || {
-                measure("frame duration", || {
-                    handle.update(&mut cx, |_, cx| cx.draw()).log_err();
-                })
+                if dirty.get() {
+                    measure("frame duration", || {
+                        handle
+                            .update(&mut cx, |_, cx| {
+                                cx.draw();
+                                cx.present();
+                            })
+                            .log_err();
+                    })
+                } else if last_input_timestamp.get().elapsed() < Duration::from_secs(2) {
+                    // Keep presenting the current scene for 2 extra seconds since the
+                    // last input to prevent the display from underclocking the refresh rate.
+                    handle.update(&mut cx, |_, cx| cx.present()).log_err();
+                }
             }
         }));
         platform_window.on_resize(Box::new({
@@ -427,7 +443,8 @@ impl Window {
             appearance,
             appearance_observers: SubscriberSet::new(),
             active: false,
-            dirty: false,
+            dirty,
+            last_input_timestamp,
             refreshing: false,
             drawing: false,
             activation_observers: SubscriberSet::new(),
@@ -488,7 +505,7 @@ impl<'a> WindowContext<'a> {
     pub fn refresh(&mut self) {
         if !self.window.drawing {
             self.window.refreshing = true;
-            self.window.dirty = true;
+            self.window.dirty.set(true);
         }
     }
 
@@ -962,9 +979,10 @@ impl<'a> WindowContext<'a> {
         &self.window.next_frame.z_index_stack
     }
 
-    /// Draw pixels to the display for this window based on the contents of its scene.
+    /// Produces a new frame and assigns it to `rendered_frame`. To actually show
+    /// the contents of the new [Scene], use [present].
     pub(crate) fn draw(&mut self) {
-        self.window.dirty = false;
+        self.window.dirty.set(false);
         self.window.drawing = true;
 
         #[cfg(any(test, feature = "test-support"))]
@@ -1105,16 +1123,19 @@ impl<'a> WindowContext<'a> {
                 .clone()
                 .retain(&(), |listener| listener(&event, self));
         }
-
-        self.window
-            .platform_window
-            .draw(&self.window.rendered_frame.scene);
         self.window.refreshing = false;
         self.window.drawing = false;
     }
 
+    fn present(&self) {
+        self.window
+            .platform_window
+            .draw(&self.window.rendered_frame.scene);
+    }
+
     /// Dispatch a mouse or keyboard event on the window.
     pub fn dispatch_event(&mut self, event: PlatformInput) -> bool {
+        self.window.last_input_timestamp.set(Instant::now());
         // Handlers may set this to false by calling `stop_propagation`.
         self.app.propagate_event = true;
         // Handlers may set this to true by calling `prevent_default`.
@@ -2058,7 +2079,7 @@ impl<'a, V: 'static> ViewContext<'a, V> {
         }
 
         if !self.window.drawing {
-            self.window_cx.window.dirty = true;
+            self.window_cx.window.dirty.set(true);
             self.window_cx.app.push_effect(Effect::Notify {
                 emitter: self.view.model.entity_id,
             });

From 430f5d5d535f1a65a98c9839d09388551709e430 Mon Sep 17 00:00:00 2001
From: WindSoilder <WindSoilder@outlook.com>
Date: Sat, 3 Feb 2024 07:44:47 +0800
Subject: [PATCH 193/372] vim: Convert from visual mode to normal mode with a
 single click (#6985)

Release Notes:

- Fixed #4319

Here is a demo after the fix:

https://github.com/zed-industries/zed/assets/22256154/a690f146-73c9-4b0e-8527-e4faf690cca2

Actually I'm not really sure should I submit my idea to discussion,
since it's not a large change, and it's something like a bug fix. So I
directly create a pr here.

---------

Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 crates/vim/src/vim.rs | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index d35a2b9a6f..41ae6c4f4c 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -204,7 +204,8 @@ impl Vim {
                 let editor = editor.read(cx);
                 if editor.leader_peer_id().is_none() {
                     let newest = editor.selections.newest::<usize>(cx);
-                    local_selections_changed(newest, cx);
+                    let is_multicursor = editor.selections.count() > 1;
+                    local_selections_changed(newest, is_multicursor, cx);
                 }
             }
             EditorEvent::InputIgnored { text } => {
@@ -626,13 +627,24 @@ impl Settings for VimModeSetting {
     }
 }
 
-fn local_selections_changed(newest: Selection<usize>, cx: &mut WindowContext) {
+fn local_selections_changed(
+    newest: Selection<usize>,
+    is_multicursor: bool,
+    cx: &mut WindowContext,
+) {
     Vim::update(cx, |vim, cx| {
-        if vim.enabled && vim.state().mode == Mode::Normal && !newest.is_empty() {
-            if matches!(newest.goal, SelectionGoal::HorizontalRange { .. }) {
-                vim.switch_mode(Mode::VisualBlock, false, cx);
-            } else {
-                vim.switch_mode(Mode::Visual, false, cx)
+        if vim.enabled {
+            if vim.state().mode == Mode::Normal && !newest.is_empty() {
+                if matches!(newest.goal, SelectionGoal::HorizontalRange { .. }) {
+                    vim.switch_mode(Mode::VisualBlock, false, cx);
+                } else {
+                    vim.switch_mode(Mode::Visual, false, cx)
+                }
+            } else if newest.is_empty()
+                && !is_multicursor
+                && [Mode::Visual, Mode::VisualLine, Mode::VisualBlock].contains(&vim.state().mode)
+            {
+                vim.switch_mode(Mode::Normal, true, cx)
             }
         }
     })

From e1efa7298e1bbf48fdbc8b9149b70943040b2b85 Mon Sep 17 00:00:00 2001
From: Tom Planche <58936594+TomPlanche@users.noreply.github.com>
Date: Sat, 3 Feb 2024 01:15:31 +0100
Subject: [PATCH 194/372] Update configuring_zed__key_bindings.md (#7310)

Added explanations for binding `null` to a keyboard binding.

Release Notes:

- N/A
---
 docs/src/configuring_zed__key_bindings.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/docs/src/configuring_zed__key_bindings.md b/docs/src/configuring_zed__key_bindings.md
index 27728e9761..1e493691d0 100644
--- a/docs/src/configuring_zed__key_bindings.md
+++ b/docs/src/configuring_zed__key_bindings.md
@@ -33,6 +33,25 @@ You can see more examples in Zed's [`default.json`](https://zed.dev/ref/default.
 
 _There are some key bindings that can't be overridden; we are working on an issue surrounding this._
 
+## Special Keyboard Layouts
+Some people have unique and custom keyboard layouts.
+
+For example, [@TomPlanche](https://github.com/TomPlanche) having a [French keyboard](https%3A%2F%2Fcdn.shopify.com%2Fs%2Ffiles%2F1%2F0810%2F3669%2Ffiles%2Ffrench-azerty-mac-keyboard-layout-2021-keyshorts.png&f=1&nofb=1&ipt=f53a06c5e60a20b621082410aa699c8cceff269a11ff90b3b5a35c6124dbf827&ipo=images), had to type `Shift-Alt-(` in order to have a simple `[` so he made a simple layout with those 'rules':
+`ù -> [`, `backtick -> ]`, `Alt-[ (where [ is the old ù) -> {`, `Alt-] -> }`.
+But, it was impossible to take into account the `{` and `}` when he was typing so now, in order to ignore a binding, he can add `null` to the binding: 
+```json
+[
+    {
+        "context": "Editor",
+        "bindings": {
+          "alt-[": null,
+          "alt-]": null,
+        }
+    }
+]
+```
+
+
 ## All key bindings
 
 ### Global

From f09da1a1c8f94d01c358817f00d9e49bb88dc3e8 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Fri, 2 Feb 2024 19:24:36 -0700
Subject: [PATCH 195/372] vim hml (#7298)

- Add a setting for `vertical_scroll_offset`
- Fix H/M/L in vim with scrolloff



Release Notes:

- Added a settings for `vertical_scroll_offset`
- vim: Fix H/M/L with various values of vertical_scroll_offset

---------

Co-authored-by: Vbhavsar <vbhavsar@gmail.com>
Co-authored-by: fdionisi <code@fdionisi.me>
---
 assets/settings/default.json                  |  2 ++
 crates/editor/src/display_map.rs              |  3 +-
 crates/editor/src/editor.rs                   |  7 ++--
 crates/editor/src/editor_settings.rs          |  6 ++++
 crates/editor/src/movement.rs                 |  7 ++--
 crates/editor/src/scroll.rs                   | 12 +++----
 crates/vim/src/motion.rs                      | 32 +++++++++++++++----
 crates/vim/src/normal/scroll.rs               | 10 +++---
 .../src/test/neovim_backed_test_context.rs    |  6 ++--
 9 files changed, 57 insertions(+), 28 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 4345be1b50..4a81cfbe69 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -133,6 +133,8 @@
     // Whether to show diagnostic indicators in the scrollbar.
     "diagnostics": true
   },
+  // The number of lines to keep above/below the cursor when scrolling.
+  "vertical_scroll_margin": 3,
   "relative_line_numbers": false,
   // When to populate a new search's query based on the text under the cursor.
   // This setting can take the following three values:
diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
index 787fb4590f..4ad43ef0cf 100644
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -586,8 +586,9 @@ impl DisplaySnapshot {
             text_system,
             editor_style,
             rem_size,
-            anchor: _,
+            scroll_anchor: _,
             visible_rows: _,
+            vertical_scroll_margin: _,
         }: &TextLayoutDetails,
     ) -> Arc<LineLayout> {
         let mut runs = Vec::new();
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 21092ca085..40f385be9b 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -1430,7 +1430,7 @@ impl Editor {
             buffer: buffer.clone(),
             display_map: display_map.clone(),
             selections,
-            scroll_manager: ScrollManager::new(),
+            scroll_manager: ScrollManager::new(cx),
             columnar_selection_tail: None,
             add_selections_state: None,
             select_next_state: None,
@@ -3086,8 +3086,9 @@ impl Editor {
             text_system: cx.text_system().clone(),
             editor_style: self.style.clone().unwrap(),
             rem_size: cx.rem_size(),
-            anchor: self.scroll_manager.anchor().anchor,
+            scroll_anchor: self.scroll_manager.anchor(),
             visible_rows: self.visible_line_count(),
+            vertical_scroll_margin: self.scroll_manager.vertical_scroll_margin,
         }
     }
 
@@ -8762,6 +8763,8 @@ impl Editor {
             )),
             cx,
         );
+        self.scroll_manager.vertical_scroll_margin =
+            EditorSettings::get_global(cx).vertical_scroll_margin;
         cx.notify();
     }
 
diff --git a/crates/editor/src/editor_settings.rs b/crates/editor/src/editor_settings.rs
index e9ecbe13d4..ddbcd6e4a0 100644
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -11,6 +11,7 @@ pub struct EditorSettings {
     pub completion_documentation_secondary_query_debounce: u64,
     pub use_on_type_format: bool,
     pub scrollbar: Scrollbar,
+    pub vertical_scroll_margin: f32,
     pub relative_line_numbers: bool,
     pub seed_search_query_from_cursor: SeedQuerySetting,
     pub redact_private_values: bool,
@@ -87,6 +88,11 @@ pub struct EditorSettingsContent {
     pub use_on_type_format: Option<bool>,
     /// Scrollbar related settings
     pub scrollbar: Option<ScrollbarContent>,
+
+    /// The number of lines to keep above/below the cursor when auto-scrolling.
+    ///
+    /// Default: 3.
+    pub vertical_scroll_margin: Option<f32>,
     /// Whether the line numbers on editors gutter are relative or not.
     ///
     /// Default: false
diff --git a/crates/editor/src/movement.rs b/crates/editor/src/movement.rs
index 5e37cb8be2..4aacc7e4e7 100644
--- a/crates/editor/src/movement.rs
+++ b/crates/editor/src/movement.rs
@@ -2,14 +2,12 @@
 //! in editor given a given motion (e.g. it handles converting a "move left" command into coordinates in editor). It is exposed mostly for use by vim crate.
 
 use super::{Bias, DisplayPoint, DisplaySnapshot, SelectionGoal, ToDisplayPoint};
-use crate::{char_kind, CharKind, EditorStyle, ToOffset, ToPoint};
+use crate::{char_kind, scroll::ScrollAnchor, CharKind, EditorStyle, ToOffset, ToPoint};
 use gpui::{px, Pixels, WindowTextSystem};
 use language::Point;
 
 use std::{ops::Range, sync::Arc};
 
-use multi_buffer::Anchor;
-
 /// Defines search strategy for items in `movement` module.
 /// `FindRange::SingeLine` only looks for a match on a single line at a time, whereas
 /// `FindRange::MultiLine` keeps going until the end of a string.
@@ -25,8 +23,9 @@ pub struct TextLayoutDetails {
     pub(crate) text_system: Arc<WindowTextSystem>,
     pub(crate) editor_style: EditorStyle,
     pub(crate) rem_size: Pixels,
-    pub anchor: Anchor,
+    pub scroll_anchor: ScrollAnchor,
     pub visible_rows: Option<f32>,
+    pub vertical_scroll_margin: f32,
 }
 
 /// Returns a column to the left of the current point, wrapping
diff --git a/crates/editor/src/scroll.rs b/crates/editor/src/scroll.rs
index 46af2da371..c354f98150 100644
--- a/crates/editor/src/scroll.rs
+++ b/crates/editor/src/scroll.rs
@@ -6,13 +6,14 @@ use crate::{
     display_map::{DisplaySnapshot, ToDisplayPoint},
     hover_popover::hide_hover,
     persistence::DB,
-    Anchor, DisplayPoint, Editor, EditorEvent, EditorMode, InlayHintRefreshReason,
+    Anchor, DisplayPoint, Editor, EditorEvent, EditorMode, EditorSettings, InlayHintRefreshReason,
     MultiBufferSnapshot, ToPoint,
 };
 pub use autoscroll::{Autoscroll, AutoscrollStrategy};
-use gpui::{point, px, AppContext, Entity, Global, Pixels, Task, ViewContext};
+use gpui::{point, px, AppContext, Entity, Global, Pixels, Task, ViewContext, WindowContext};
 use language::{Bias, Point};
 pub use scroll_amount::ScrollAmount;
+use settings::Settings;
 use std::{
     cmp::Ordering,
     time::{Duration, Instant},
@@ -21,7 +22,6 @@ use util::ResultExt;
 use workspace::{ItemId, WorkspaceId};
 
 pub const SCROLL_EVENT_SEPARATION: Duration = Duration::from_millis(28);
-pub const VERTICAL_SCROLL_MARGIN: f32 = 3.;
 const SCROLLBAR_SHOW_INTERVAL: Duration = Duration::from_secs(1);
 
 #[derive(Default)]
@@ -128,7 +128,7 @@ impl OngoingScroll {
 }
 
 pub struct ScrollManager {
-    vertical_scroll_margin: f32,
+    pub(crate) vertical_scroll_margin: f32,
     anchor: ScrollAnchor,
     ongoing: OngoingScroll,
     autoscroll_request: Option<(Autoscroll, bool)>,
@@ -140,9 +140,9 @@ pub struct ScrollManager {
 }
 
 impl ScrollManager {
-    pub fn new() -> Self {
+    pub fn new(cx: &mut WindowContext) -> Self {
         ScrollManager {
-            vertical_scroll_margin: VERTICAL_SCROLL_MARGIN,
+            vertical_scroll_margin: EditorSettings::get_global(cx).vertical_scroll_margin,
             anchor: ScrollAnchor::new(),
             ongoing: OngoingScroll::new(),
             autoscroll_request: None,
diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
index 944db88a7c..67abd5836c 100644
--- a/crates/vim/src/motion.rs
+++ b/crates/vim/src/motion.rs
@@ -1044,9 +1044,17 @@ fn window_top(
     map: &DisplaySnapshot,
     point: DisplayPoint,
     text_layout_details: &TextLayoutDetails,
-    times: usize,
+    mut times: usize,
 ) -> (DisplayPoint, SelectionGoal) {
-    let first_visible_line = text_layout_details.anchor.to_display_point(map);
+    let first_visible_line = text_layout_details
+        .scroll_anchor
+        .anchor
+        .to_display_point(map);
+
+    if first_visible_line.row() != 0 && text_layout_details.vertical_scroll_margin as usize > times
+    {
+        times = text_layout_details.vertical_scroll_margin.ceil() as usize;
+    }
 
     if let Some(visible_rows) = text_layout_details.visible_rows {
         let bottom_row = first_visible_line.row() + visible_rows as u32;
@@ -1070,7 +1078,10 @@ fn window_middle(
     text_layout_details: &TextLayoutDetails,
 ) -> (DisplayPoint, SelectionGoal) {
     if let Some(visible_rows) = text_layout_details.visible_rows {
-        let first_visible_line = text_layout_details.anchor.to_display_point(map);
+        let first_visible_line = text_layout_details
+            .scroll_anchor
+            .anchor
+            .to_display_point(map);
         let max_rows = (visible_rows as u32).min(map.max_buffer_row());
         let new_row = first_visible_line.row() + (max_rows.div_euclid(2));
         let new_col = point.column().min(map.line_len(new_row));
@@ -1085,11 +1096,20 @@ fn window_bottom(
     map: &DisplaySnapshot,
     point: DisplayPoint,
     text_layout_details: &TextLayoutDetails,
-    times: usize,
+    mut times: usize,
 ) -> (DisplayPoint, SelectionGoal) {
     if let Some(visible_rows) = text_layout_details.visible_rows {
-        let first_visible_line = text_layout_details.anchor.to_display_point(map);
-        let bottom_row = first_visible_line.row() + (visible_rows) as u32;
+        let first_visible_line = text_layout_details
+            .scroll_anchor
+            .anchor
+            .to_display_point(map);
+        let bottom_row = first_visible_line.row()
+            + (visible_rows + text_layout_details.scroll_anchor.offset.y - 1.).floor() as u32;
+        if bottom_row < map.max_buffer_row()
+            && text_layout_details.vertical_scroll_margin as usize > times
+        {
+            times = text_layout_details.vertical_scroll_margin.ceil() as usize;
+        }
         let bottom_row_capped = bottom_row.min(map.max_buffer_row());
         let new_row = if bottom_row_capped.saturating_sub(times as u32) < first_visible_line.row() {
             first_visible_line.row()
diff --git a/crates/vim/src/normal/scroll.rs b/crates/vim/src/normal/scroll.rs
index 8c06158231..0bccf24977 100644
--- a/crates/vim/src/normal/scroll.rs
+++ b/crates/vim/src/normal/scroll.rs
@@ -1,11 +1,10 @@
 use crate::Vim;
 use editor::{
-    display_map::ToDisplayPoint,
-    scroll::{ScrollAmount, VERTICAL_SCROLL_MARGIN},
-    DisplayPoint, Editor,
+    display_map::ToDisplayPoint, scroll::ScrollAmount, DisplayPoint, Editor, EditorSettings,
 };
 use gpui::{actions, ViewContext};
 use language::Bias;
+use settings::Settings;
 use workspace::Workspace;
 
 actions!(
@@ -77,6 +76,7 @@ fn scroll_editor(
         };
 
         let top_anchor = editor.scroll_manager.anchor().anchor;
+        let vertical_scroll_margin = EditorSettings::get_global(cx).vertical_scroll_margin;
 
         editor.change_selections(None, cx, |s| {
             s.move_with(|map, selection| {
@@ -88,8 +88,8 @@ fn scroll_editor(
                     let new_row = top.row() + selection.head().row() - old_top.row();
                     head = map.clip_point(DisplayPoint::new(new_row, head.column()), Bias::Left)
                 }
-                let min_row = top.row() + VERTICAL_SCROLL_MARGIN as u32;
-                let max_row = top.row() + visible_rows - VERTICAL_SCROLL_MARGIN as u32 - 1;
+                let min_row = top.row() + vertical_scroll_margin as u32;
+                let max_row = top.row() + visible_rows - vertical_scroll_margin as u32 - 1;
 
                 let new_head = if head.row() < min_row {
                     map.clip_point(DisplayPoint::new(min_row, head.column()), Bias::Left)
diff --git a/crates/vim/src/test/neovim_backed_test_context.rs b/crates/vim/src/test/neovim_backed_test_context.rs
index 977d6aa7c6..0c12d64f58 100644
--- a/crates/vim/src/test/neovim_backed_test_context.rs
+++ b/crates/vim/src/test/neovim_backed_test_context.rs
@@ -1,4 +1,4 @@
-use editor::{scroll::VERTICAL_SCROLL_MARGIN, test::editor_test_context::ContextHandle};
+use editor::test::editor_test_context::ContextHandle;
 use gpui::{px, size, Context};
 use indoc::indoc;
 use settings::SettingsStore;
@@ -155,9 +155,7 @@ impl NeovimBackedTestContext {
 
     pub async fn set_scroll_height(&mut self, rows: u32) {
         // match Zed's scrolling behavior
-        self.neovim
-            .set_option(&format!("scrolloff={}", VERTICAL_SCROLL_MARGIN))
-            .await;
+        self.neovim.set_option(&format!("scrolloff={}", 3)).await;
         // +2 to account for the vim command UI at the bottom.
         self.neovim.set_option(&format!("lines={}", rows + 2)).await;
         let (line_height, visible_line_count) = self.editor(|editor, cx| {

From fcbc220408ab13e04910f33fe0a20addd8737542 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Fri, 2 Feb 2024 19:24:49 -0700
Subject: [PATCH 196/372] Don't log errors on main (#7289)

Release Notes:

- N/A
---
 crates/client/src/telemetry.rs | 19 +++++++++++++------
 script/zed-local               |  1 +
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/crates/client/src/telemetry.rs b/crates/client/src/telemetry.rs
index 331683d5d1..9bdf038b26 100644
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -145,11 +145,14 @@ const FLUSH_INTERVAL: Duration = Duration::from_secs(1);
 #[cfg(not(debug_assertions))]
 const FLUSH_INTERVAL: Duration = Duration::from_secs(60 * 5);
 
-static ZED_CLIENT_CHECKSUM_SEED: Lazy<Vec<u8>> = Lazy::new(|| {
+static ZED_CLIENT_CHECKSUM_SEED: Lazy<Option<Vec<u8>>> = Lazy::new(|| {
     option_env!("ZED_CLIENT_CHECKSUM_SEED")
-        .unwrap_or("development-checksum-seed")
-        .as_bytes()
-        .into()
+        .map(|s| s.as_bytes().into())
+        .or_else(|| {
+            env::var("ZED_CLIENT_CHECKSUM_SEED")
+                .ok()
+                .map(|s| s.as_bytes().into())
+        })
 });
 
 impl Telemetry {
@@ -510,6 +513,10 @@ impl Telemetry {
             return;
         }
 
+        let Some(checksum_seed) = &*ZED_CLIENT_CHECKSUM_SEED else {
+            return;
+        };
+
         let this = self.clone();
         self.executor
             .spawn(
@@ -551,9 +558,9 @@ impl Telemetry {
                     }
 
                     let mut summer = Sha256::new();
-                    summer.update(&*ZED_CLIENT_CHECKSUM_SEED);
+                    summer.update(checksum_seed);
                     summer.update(&json_bytes);
-                    summer.update(&*ZED_CLIENT_CHECKSUM_SEED);
+                    summer.update(checksum_seed);
                     let mut checksum = String::new();
                     for byte in summer.finalize().as_slice() {
                         use std::fmt::Write;
diff --git a/script/zed-local b/script/zed-local
index 068235730d..1b1852043b 100755
--- a/script/zed-local
+++ b/script/zed-local
@@ -142,6 +142,7 @@ setTimeout(() => {
         ZED_RPC_URL: "http://localhost:8080/rpc",
         ZED_ADMIN_API_TOKEN: "secret",
         ZED_WINDOW_SIZE: size,
+        ZED_CLIENT_CHECKSUM_SEED: "development-checksum-seed",
         PATH: process.env.PATH,
         RUST_LOG: process.env.RUST_LOG || "info",
       },

From 583273b6ee67a477a5a4e834d53a3eaa0c773c23 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Fri, 2 Feb 2024 20:39:51 -0700
Subject: [PATCH 197/372] Bump alacritty to fix some panics (#7313)

Release Notes:

- Fixed some panics in the Terminal
([#6835](https://github.com/zed-industries/zed/issues/6835)).
---
 Cargo.lock                      | 5 ++---
 crates/terminal/Cargo.toml      | 3 ++-
 crates/terminal/src/terminal.rs | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6500eacea5..2604753f71 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -103,9 +103,8 @@ dependencies = [
 
 [[package]]
 name = "alacritty_terminal"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35229555d7cc7e83392dfc27c96bec560b1076d756184893296cd60125f4a264"
+version = "0.20.1-dev"
+source = "git+https://github.com/alacritty/alacritty?rev=2d2b894c3b869fadc78fce9d72cb5c8d2b764cac#2d2b894c3b869fadc78fce9d72cb5c8d2b764cac"
 dependencies = [
  "base64 0.21.4",
  "bitflags 2.4.1",
diff --git a/crates/terminal/Cargo.toml b/crates/terminal/Cargo.toml
index baad46b261..670510356d 100644
--- a/crates/terminal/Cargo.toml
+++ b/crates/terminal/Cargo.toml
@@ -11,7 +11,8 @@ doctest = false
 
 
 [dependencies]
-alacritty_terminal = "0.21"
+# needed for "a few weeks" until alacritty 0.13.2 is out
+alacritty_terminal = { git = "https://github.com/alacritty/alacritty", rev = "2d2b894c3b869fadc78fce9d72cb5c8d2b764cac" }
 anyhow.workspace = true
 db = { path = "../db" }
 dirs = "4.0.0"
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index be8dc9ed01..5bc8d00e52 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -364,7 +364,7 @@ impl TerminalBuilder {
             pty,
             pty_options.hold,
             false,
-        );
+        )?;
 
         //Kick things off
         let pty_tx = event_loop.channel();

From 1a82470897c141ef320e1ec0eb60f55d799141bb Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Fri, 2 Feb 2024 22:05:28 -0700
Subject: [PATCH 198/372] Open URLs with cmd-click (#7312)

Release Notes:

- Added ability to cmd-click on URLs in all buffers

---------

Co-authored-by: fdionisi <code@fdionisi.me>
---
 Cargo.lock                                    |  10 +
 crates/editor/Cargo.toml                      |   5 +-
 crates/editor/src/display_map.rs              |   4 +-
 crates/editor/src/display_map/inlay_map.rs    |   2 +-
 crates/editor/src/editor.rs                   |  57 +-
 crates/editor/src/element.rs                  | 128 +--
 ...ink_go_to_definition.rs => hover_links.rs} | 825 ++++++++----------
 crates/editor/src/hover_popover.rs            |   4 +-
 crates/editor/src/items.rs                    |   9 +-
 crates/editor/src/test/editor_test_context.rs |  30 +-
 crates/gpui/src/app/test_context.rs           |  42 +-
 crates/gpui/src/platform/keystroke.rs         |  30 +
 crates/gpui/src/platform/test/platform.rs     |   6 +-
 13 files changed, 551 insertions(+), 601 deletions(-)
 rename crates/editor/src/{link_go_to_definition.rs => hover_links.rs} (63%)

diff --git a/Cargo.lock b/Cargo.lock
index 2604753f71..14b5882ff9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2416,6 +2416,7 @@ dependencies = [
  "itertools 0.10.5",
  "language",
  "lazy_static",
+ "linkify",
  "log",
  "lsp",
  "multi_buffer",
@@ -4134,6 +4135,15 @@ dependencies = [
  "safemem",
 ]
 
+[[package]]
+name = "linkify"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1dfa36d52c581e9ec783a7ce2a5e0143da6237be5811a0b3153fedfdbe9f780"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "linkme"
 version = "0.3.17"
diff --git a/crates/editor/Cargo.toml b/crates/editor/Cargo.toml
index 3e6b4d709c..be8745e4c2 100644
--- a/crates/editor/Cargo.toml
+++ b/crates/editor/Cargo.toml
@@ -20,7 +20,7 @@ test-support = [
     "util/test-support",
     "workspace/test-support",
     "tree-sitter-rust",
-    "tree-sitter-typescript"
+    "tree-sitter-typescript",
 ]
 
 [dependencies]
@@ -33,13 +33,14 @@ convert_case = "0.6.0"
 copilot = { path = "../copilot" }
 db = { path = "../db" }
 futures.workspace = true
-fuzzy = {  path = "../fuzzy" }
+fuzzy = { path = "../fuzzy" }
 git = { path = "../git" }
 gpui = { path = "../gpui" }
 indoc = "1.0.4"
 itertools = "0.10"
 language = { path = "../language" }
 lazy_static.workspace = true
+linkify = "0.10.0"
 log.workspace = true
 lsp = { path = "../lsp" }
 multi_buffer = { path = "../multi_buffer" }
diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
index 4ad43ef0cf..23507eab3e 100644
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -25,8 +25,8 @@ mod wrap_map;
 
 use crate::EditorStyle;
 use crate::{
-    link_go_to_definition::InlayHighlight, movement::TextLayoutDetails, Anchor, AnchorRangeExt,
-    InlayId, MultiBuffer, MultiBufferSnapshot, ToOffset, ToPoint,
+    hover_links::InlayHighlight, movement::TextLayoutDetails, Anchor, AnchorRangeExt, InlayId,
+    MultiBuffer, MultiBufferSnapshot, ToOffset, ToPoint,
 };
 pub use block_map::{BlockMap, BlockPoint};
 use collections::{BTreeMap, HashMap, HashSet};
diff --git a/crates/editor/src/display_map/inlay_map.rs b/crates/editor/src/display_map/inlay_map.rs
index c0d5198ddd..f1f52b4927 100644
--- a/crates/editor/src/display_map/inlay_map.rs
+++ b/crates/editor/src/display_map/inlay_map.rs
@@ -1168,7 +1168,7 @@ mod tests {
     use super::*;
     use crate::{
         display_map::{InlayHighlights, TextHighlights},
-        link_go_to_definition::InlayHighlight,
+        hover_links::InlayHighlight,
         InlayId, MultiBuffer,
     };
     use gpui::AppContext;
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 40f385be9b..9c84dd0fe9 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -22,9 +22,9 @@ mod inlay_hint_cache;
 mod debounced_delay;
 mod git;
 mod highlight_matching_bracket;
+mod hover_links;
 mod hover_popover;
 pub mod items;
-mod link_go_to_definition;
 mod mouse_context_menu;
 pub mod movement;
 mod persistence;
@@ -77,7 +77,7 @@ use language::{
     Language, OffsetRangeExt, Point, Selection, SelectionGoal, TransactionId,
 };
 
-use link_go_to_definition::{GoToDefinitionLink, InlayHighlight, LinkGoToDefinitionState};
+use hover_links::{HoverLink, HoveredLinkState, InlayHighlight};
 use lsp::{DiagnosticSeverity, LanguageServerId};
 use mouse_context_menu::MouseContextMenu;
 use movement::TextLayoutDetails;
@@ -402,7 +402,7 @@ pub struct Editor {
     remote_id: Option<ViewId>,
     hover_state: HoverState,
     gutter_hovered: bool,
-    link_go_to_definition_state: LinkGoToDefinitionState,
+    hovered_link_state: Option<HoveredLinkState>,
     copilot_state: CopilotState,
     inlay_hint_cache: InlayHintCache,
     next_inlay_id: usize,
@@ -1477,7 +1477,7 @@ impl Editor {
             leader_peer_id: None,
             remote_id: None,
             hover_state: Default::default(),
-            link_go_to_definition_state: Default::default(),
+            hovered_link_state: Default::default(),
             copilot_state: Default::default(),
             inlay_hint_cache: InlayHintCache::new(inlay_hint_settings),
             gutter_hovered: false,
@@ -7243,11 +7243,8 @@ impl Editor {
         cx.spawn(|editor, mut cx| async move {
             let definitions = definitions.await?;
             editor.update(&mut cx, |editor, cx| {
-                editor.navigate_to_definitions(
-                    definitions
-                        .into_iter()
-                        .map(GoToDefinitionLink::Text)
-                        .collect(),
+                editor.navigate_to_hover_links(
+                    definitions.into_iter().map(HoverLink::Text).collect(),
                     split,
                     cx,
                 );
@@ -7257,9 +7254,9 @@ impl Editor {
         .detach_and_log_err(cx);
     }
 
-    pub fn navigate_to_definitions(
+    pub fn navigate_to_hover_links(
         &mut self,
-        mut definitions: Vec<GoToDefinitionLink>,
+        mut definitions: Vec<HoverLink>,
         split: bool,
         cx: &mut ViewContext<Editor>,
     ) {
@@ -7271,10 +7268,14 @@ impl Editor {
         if definitions.len() == 1 {
             let definition = definitions.pop().unwrap();
             let target_task = match definition {
-                GoToDefinitionLink::Text(link) => Task::Ready(Some(Ok(Some(link.target)))),
-                GoToDefinitionLink::InlayHint(lsp_location, server_id) => {
+                HoverLink::Text(link) => Task::Ready(Some(Ok(Some(link.target)))),
+                HoverLink::InlayHint(lsp_location, server_id) => {
                     self.compute_target_location(lsp_location, server_id, cx)
                 }
+                HoverLink::Url(url) => {
+                    cx.open_url(&url);
+                    Task::ready(Ok(None))
+                }
             };
             cx.spawn(|editor, mut cx| async move {
                 let target = target_task.await.context("target resolution task")?;
@@ -7325,29 +7326,27 @@ impl Editor {
                         let title = definitions
                             .iter()
                             .find_map(|definition| match definition {
-                                GoToDefinitionLink::Text(link) => {
-                                    link.origin.as_ref().map(|origin| {
-                                        let buffer = origin.buffer.read(cx);
-                                        format!(
-                                            "Definitions for {}",
-                                            buffer
-                                                .text_for_range(origin.range.clone())
-                                                .collect::<String>()
-                                        )
-                                    })
-                                }
-                                GoToDefinitionLink::InlayHint(_, _) => None,
+                                HoverLink::Text(link) => link.origin.as_ref().map(|origin| {
+                                    let buffer = origin.buffer.read(cx);
+                                    format!(
+                                        "Definitions for {}",
+                                        buffer
+                                            .text_for_range(origin.range.clone())
+                                            .collect::<String>()
+                                    )
+                                }),
+                                HoverLink::InlayHint(_, _) => None,
+                                HoverLink::Url(_) => None,
                             })
                             .unwrap_or("Definitions".to_string());
                         let location_tasks = definitions
                             .into_iter()
                             .map(|definition| match definition {
-                                GoToDefinitionLink::Text(link) => {
-                                    Task::Ready(Some(Ok(Some(link.target))))
-                                }
-                                GoToDefinitionLink::InlayHint(lsp_location, server_id) => {
+                                HoverLink::Text(link) => Task::Ready(Some(Ok(Some(link.target)))),
+                                HoverLink::InlayHint(lsp_location, server_id) => {
                                     editor.compute_target_location(lsp_location, server_id, cx)
                                 }
+                                HoverLink::Url(_) => Task::ready(Ok(None)),
                             })
                             .collect::<Vec<_>>();
                         (title, location_tasks)
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 7e546cc272..46c85ddd10 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -9,11 +9,6 @@ use crate::{
         self, hover_at, HOVER_POPOVER_GAP, MIN_POPOVER_CHARACTER_WIDTH, MIN_POPOVER_LINE_HEIGHT,
     },
     items::BufferSearchHighlights,
-    link_go_to_definition::{
-        go_to_fetched_definition, go_to_fetched_type_definition, show_link_definition,
-        update_go_to_definition_link, update_inlay_link_and_hover_points, GoToDefinitionTrigger,
-        LinkGoToDefinitionState,
-    },
     mouse_context_menu,
     scroll::scroll_amount::ScrollAmount,
     CursorShape, DisplayPoint, DocumentHighlightRead, DocumentHighlightWrite, Editor, EditorMode,
@@ -337,7 +332,14 @@ impl EditorElement {
         register_action(view, cx, Editor::display_cursor_names);
     }
 
-    fn register_key_listeners(&self, cx: &mut ElementContext) {
+    fn register_key_listeners(
+        &self,
+        cx: &mut ElementContext,
+        text_bounds: Bounds<Pixels>,
+        layout: &LayoutState,
+    ) {
+        let position_map = layout.position_map.clone();
+        let stacking_order = cx.stacking_order().clone();
         cx.on_key_event({
             let editor = self.editor.clone();
             move |event: &ModifiersChangedEvent, phase, cx| {
@@ -345,46 +347,41 @@ impl EditorElement {
                     return;
                 }
 
-                if editor.update(cx, |editor, cx| Self::modifiers_changed(editor, event, cx)) {
-                    cx.stop_propagation();
-                }
+                editor.update(cx, |editor, cx| {
+                    Self::modifiers_changed(
+                        editor,
+                        event,
+                        &position_map,
+                        text_bounds,
+                        &stacking_order,
+                        cx,
+                    )
+                })
             }
         });
     }
 
-    pub(crate) fn modifiers_changed(
+    fn modifiers_changed(
         editor: &mut Editor,
         event: &ModifiersChangedEvent,
+        position_map: &PositionMap,
+        text_bounds: Bounds<Pixels>,
+        stacking_order: &StackingOrder,
         cx: &mut ViewContext<Editor>,
-    ) -> bool {
-        let pending_selection = editor.has_pending_selection();
-
-        if let Some(point) = &editor.link_go_to_definition_state.last_trigger_point {
-            if event.command && !pending_selection {
-                let point = point.clone();
-                let snapshot = editor.snapshot(cx);
-                let kind = point.definition_kind(event.shift);
-
-                show_link_definition(kind, editor, point, snapshot, cx);
-                return false;
-            }
-        }
-
+    ) {
+        let mouse_position = cx.mouse_position();
+        if !text_bounds.contains(&mouse_position)
+            || !cx.was_top_layer(&mouse_position, stacking_order)
         {
-            if editor.link_go_to_definition_state.symbol_range.is_some()
-                || !editor.link_go_to_definition_state.definitions.is_empty()
-            {
-                editor.link_go_to_definition_state.symbol_range.take();
-                editor.link_go_to_definition_state.definitions.clear();
-                cx.notify();
-            }
-
-            editor.link_go_to_definition_state.task = None;
-
-            editor.clear_highlights::<LinkGoToDefinitionState>(cx);
+            return;
         }
 
-        false
+        editor.update_hovered_link(
+            position_map.point_for_position(text_bounds, mouse_position),
+            &position_map.snapshot,
+            event.modifiers,
+            cx,
+        )
     }
 
     fn mouse_left_down(
@@ -485,13 +482,7 @@ impl EditorElement {
             && cx.was_top_layer(&event.position, stacking_order)
         {
             let point = position_map.point_for_position(text_bounds, event.position);
-            let could_be_inlay = point.as_valid().is_none();
-            let split = event.modifiers.alt;
-            if event.modifiers.shift || could_be_inlay {
-                go_to_fetched_type_definition(editor, point, split, cx);
-            } else {
-                go_to_fetched_definition(editor, point, split, cx);
-            }
+            editor.handle_click_hovered_link(point, event.modifiers, cx);
 
             cx.stop_propagation();
         } else if end_selection {
@@ -564,31 +555,14 @@ impl EditorElement {
         if text_hovered && was_top {
             let point_for_position = position_map.point_for_position(text_bounds, event.position);
 
-            match point_for_position.as_valid() {
-                Some(point) => {
-                    update_go_to_definition_link(
-                        editor,
-                        Some(GoToDefinitionTrigger::Text(point)),
-                        modifiers.command,
-                        modifiers.shift,
-                        cx,
-                    );
-                    hover_at(editor, Some(point), cx);
-                    Self::update_visible_cursor(editor, point, position_map, cx);
-                }
-                None => {
-                    update_inlay_link_and_hover_points(
-                        &position_map.snapshot,
-                        point_for_position,
-                        editor,
-                        modifiers.command,
-                        modifiers.shift,
-                        cx,
-                    );
-                }
+            editor.update_hovered_link(point_for_position, &position_map.snapshot, modifiers, cx);
+
+            if let Some(point) = point_for_position.as_valid() {
+                hover_at(editor, Some(point), cx);
+                Self::update_visible_cursor(editor, point, position_map, cx);
             }
         } else {
-            update_go_to_definition_link(editor, None, modifiers.command, modifiers.shift, cx);
+            editor.hide_hovered_link(cx);
             hover_at(editor, None, cx);
             if gutter_hovered && was_top {
                 cx.stop_propagation();
@@ -930,13 +904,13 @@ impl EditorElement {
                     if self
                         .editor
                         .read(cx)
-                        .link_go_to_definition_state
-                        .definitions
-                        .is_empty()
+                        .hovered_link_state
+                        .as_ref()
+                        .is_some_and(|hovered_link_state| !hovered_link_state.links.is_empty())
                     {
-                        cx.set_cursor_style(CursorStyle::IBeam);
-                    } else {
                         cx.set_cursor_style(CursorStyle::PointingHand);
+                    } else {
+                        cx.set_cursor_style(CursorStyle::IBeam);
                     }
                 }
 
@@ -3105,9 +3079,9 @@ impl Element for EditorElement {
                     let key_context = self.editor.read(cx).key_context(cx);
                     cx.with_key_dispatch(Some(key_context), Some(focus_handle.clone()), |_, cx| {
                         self.register_actions(cx);
-                        self.register_key_listeners(cx);
 
                         cx.with_content_mask(Some(ContentMask { bounds }), |cx| {
+                            self.register_key_listeners(cx, text_bounds, &layout);
                             cx.handle_input(
                                 &focus_handle,
                                 ElementInputHandler::new(bounds, self.editor.clone()),
@@ -3224,16 +3198,6 @@ pub struct PointForPosition {
 }
 
 impl PointForPosition {
-    #[cfg(test)]
-    pub fn valid(valid: DisplayPoint) -> Self {
-        Self {
-            previous_valid: valid,
-            next_valid: valid,
-            exact_unclipped: valid,
-            column_overshoot_after_line_end: 0,
-        }
-    }
-
     pub fn as_valid(&self) -> Option<DisplayPoint> {
         if self.previous_valid == self.exact_unclipped && self.next_valid == self.exact_unclipped {
             Some(self.previous_valid)
diff --git a/crates/editor/src/link_go_to_definition.rs b/crates/editor/src/hover_links.rs
similarity index 63%
rename from crates/editor/src/link_go_to_definition.rs
rename to crates/editor/src/hover_links.rs
index c4da7fcd38..955aafde24 100644
--- a/crates/editor/src/link_go_to_definition.rs
+++ b/crates/editor/src/hover_links.rs
@@ -1,12 +1,11 @@
 use crate::{
-    display_map::DisplaySnapshot,
     element::PointForPosition,
     hover_popover::{self, InlayHover},
-    Anchor, DisplayPoint, Editor, EditorSnapshot, GoToDefinition, GoToTypeDefinition, InlayId,
-    SelectPhase,
+    Anchor, Editor, EditorSnapshot, GoToDefinition, GoToTypeDefinition, InlayId, SelectPhase,
 };
-use gpui::{px, Task, ViewContext};
+use gpui::{px, AsyncWindowContext, Model, Modifiers, Task, ViewContext};
 use language::{Bias, ToOffset};
+use linkify::{LinkFinder, LinkKind};
 use lsp::LanguageServerId;
 use project::{
     HoverBlock, HoverBlockKind, InlayHintLabelPartTooltip, InlayHintTooltip, LocationLink,
@@ -16,12 +15,12 @@ use std::ops::Range;
 use theme::ActiveTheme as _;
 use util::TryFutureExt;
 
-#[derive(Debug, Default)]
-pub struct LinkGoToDefinitionState {
-    pub last_trigger_point: Option<TriggerPoint>,
+#[derive(Debug)]
+pub struct HoveredLinkState {
+    pub last_trigger_point: TriggerPoint,
+    pub preferred_kind: LinkDefinitionKind,
     pub symbol_range: Option<RangeInEditor>,
-    pub kind: Option<LinkDefinitionKind>,
-    pub definitions: Vec<GoToDefinitionLink>,
+    pub links: Vec<HoverLink>,
     pub task: Option<Task<Option<()>>>,
 }
 
@@ -56,14 +55,9 @@ impl RangeInEditor {
     }
 }
 
-#[derive(Debug)]
-pub enum GoToDefinitionTrigger {
-    Text(DisplayPoint),
-    InlayHint(InlayHighlight, lsp::Location, LanguageServerId),
-}
-
 #[derive(Debug, Clone)]
-pub enum GoToDefinitionLink {
+pub enum HoverLink {
+    Url(String),
     Text(LocationLink),
     InlayHint(lsp::Location, LanguageServerId),
 }
@@ -75,26 +69,13 @@ pub(crate) struct InlayHighlight {
     pub range: Range<usize>,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub enum TriggerPoint {
     Text(Anchor),
     InlayHint(InlayHighlight, lsp::Location, LanguageServerId),
 }
 
 impl TriggerPoint {
-    pub fn definition_kind(&self, shift: bool) -> LinkDefinitionKind {
-        match self {
-            TriggerPoint::Text(_) => {
-                if shift {
-                    LinkDefinitionKind::Type
-                } else {
-                    LinkDefinitionKind::Symbol
-                }
-            }
-            TriggerPoint::InlayHint(_, _, _) => LinkDefinitionKind::Type,
-        }
-    }
-
     fn anchor(&self) -> &Anchor {
         match self {
             TriggerPoint::Text(anchor) => anchor,
@@ -103,69 +84,88 @@ impl TriggerPoint {
     }
 }
 
-pub fn update_go_to_definition_link(
-    editor: &mut Editor,
-    origin: Option<GoToDefinitionTrigger>,
-    cmd_held: bool,
-    shift_held: bool,
-    cx: &mut ViewContext<Editor>,
-) {
-    let pending_nonempty_selection = editor.has_pending_nonempty_selection();
-
-    // Store new mouse point as an anchor
-    let snapshot = editor.snapshot(cx);
-    let trigger_point = match origin {
-        Some(GoToDefinitionTrigger::Text(p)) => {
-            Some(TriggerPoint::Text(snapshot.buffer_snapshot.anchor_before(
-                p.to_offset(&snapshot.display_snapshot, Bias::Left),
-            )))
-        }
-        Some(GoToDefinitionTrigger::InlayHint(p, lsp_location, language_server_id)) => {
-            Some(TriggerPoint::InlayHint(p, lsp_location, language_server_id))
-        }
-        None => None,
-    };
-
-    // If the new point is the same as the previously stored one, return early
-    if let (Some(a), Some(b)) = (
-        &trigger_point,
-        &editor.link_go_to_definition_state.last_trigger_point,
+impl Editor {
+    pub(crate) fn update_hovered_link(
+        &mut self,
+        point_for_position: PointForPosition,
+        snapshot: &EditorSnapshot,
+        modifiers: Modifiers,
+        cx: &mut ViewContext<Self>,
     ) {
-        match (a, b) {
-            (TriggerPoint::Text(anchor_a), TriggerPoint::Text(anchor_b)) => {
-                if anchor_a.cmp(anchor_b, &snapshot.buffer_snapshot).is_eq() {
-                    return;
-                }
-            }
-            (TriggerPoint::InlayHint(range_a, _, _), TriggerPoint::InlayHint(range_b, _, _)) => {
-                if range_a == range_b {
-                    return;
-                }
-            }
-            _ => {}
-        }
-    }
-
-    editor.link_go_to_definition_state.last_trigger_point = trigger_point.clone();
-
-    if pending_nonempty_selection {
-        hide_link_definition(editor, cx);
-        return;
-    }
-
-    if cmd_held {
-        if let Some(trigger_point) = trigger_point {
-            let kind = trigger_point.definition_kind(shift_held);
-            show_link_definition(kind, editor, trigger_point, snapshot, cx);
+        if !modifiers.command || self.has_pending_selection() {
+            self.hide_hovered_link(cx);
             return;
         }
+
+        match point_for_position.as_valid() {
+            Some(point) => {
+                let trigger_point = TriggerPoint::Text(
+                    snapshot
+                        .buffer_snapshot
+                        .anchor_before(point.to_offset(&snapshot.display_snapshot, Bias::Left)),
+                );
+
+                show_link_definition(modifiers.shift, self, trigger_point, snapshot, cx);
+            }
+            None => {
+                update_inlay_link_and_hover_points(
+                    &snapshot,
+                    point_for_position,
+                    self,
+                    modifiers.command,
+                    modifiers.shift,
+                    cx,
+                );
+            }
+        }
     }
 
-    hide_link_definition(editor, cx);
+    pub(crate) fn hide_hovered_link(&mut self, cx: &mut ViewContext<Self>) {
+        self.hovered_link_state.take();
+        self.clear_highlights::<HoveredLinkState>(cx);
+    }
+
+    pub(crate) fn handle_click_hovered_link(
+        &mut self,
+        point: PointForPosition,
+        modifiers: Modifiers,
+        cx: &mut ViewContext<Editor>,
+    ) {
+        if let Some(hovered_link_state) = self.hovered_link_state.take() {
+            self.hide_hovered_link(cx);
+            if !hovered_link_state.links.is_empty() {
+                if !self.focus_handle.is_focused(cx) {
+                    cx.focus(&self.focus_handle);
+                }
+
+                self.navigate_to_hover_links(hovered_link_state.links, modifiers.alt, cx);
+                return;
+            }
+        }
+
+        // We don't have the correct kind of link cached, set the selection on
+        // click and immediately trigger GoToDefinition.
+        self.select(
+            SelectPhase::Begin {
+                position: point.next_valid,
+                add: false,
+                click_count: 1,
+            },
+            cx,
+        );
+
+        if point.as_valid().is_some() {
+            if modifiers.shift {
+                self.go_to_type_definition(&GoToTypeDefinition, cx)
+            } else {
+                self.go_to_definition(&GoToDefinition, cx)
+            }
+        }
+    }
 }
 
 pub fn update_inlay_link_and_hover_points(
-    snapshot: &DisplaySnapshot,
+    snapshot: &EditorSnapshot,
     point_for_position: PointForPosition,
     editor: &mut Editor,
     cmd_held: bool,
@@ -306,18 +306,20 @@ pub fn update_inlay_link_and_hover_points(
                                     if let Some((language_server_id, location)) =
                                         hovered_hint_part.location
                                     {
-                                        go_to_definition_updated = true;
-                                        update_go_to_definition_link(
-                                            editor,
-                                            Some(GoToDefinitionTrigger::InlayHint(
-                                                highlight,
-                                                location,
-                                                language_server_id,
-                                            )),
-                                            cmd_held,
-                                            shift_held,
-                                            cx,
-                                        );
+                                        if cmd_held && !editor.has_pending_nonempty_selection() {
+                                            go_to_definition_updated = true;
+                                            show_link_definition(
+                                                shift_held,
+                                                editor,
+                                                TriggerPoint::InlayHint(
+                                                    highlight,
+                                                    location,
+                                                    language_server_id,
+                                                ),
+                                                snapshot,
+                                                cx,
+                                            );
+                                        }
                                     }
                                 }
                             }
@@ -330,7 +332,7 @@ pub fn update_inlay_link_and_hover_points(
     }
 
     if !go_to_definition_updated {
-        update_go_to_definition_link(editor, None, cmd_held, shift_held, cx);
+        editor.hide_hovered_link(cx)
     }
     if !hover_updated {
         hover_popover::hover_at(editor, None, cx);
@@ -344,113 +346,149 @@ pub enum LinkDefinitionKind {
 }
 
 pub fn show_link_definition(
-    definition_kind: LinkDefinitionKind,
+    shift_held: bool,
     editor: &mut Editor,
     trigger_point: TriggerPoint,
-    snapshot: EditorSnapshot,
+    snapshot: &EditorSnapshot,
     cx: &mut ViewContext<Editor>,
 ) {
-    let same_kind = editor.link_go_to_definition_state.kind == Some(definition_kind);
-    if !same_kind {
-        hide_link_definition(editor, cx);
-    }
+    let preferred_kind = match trigger_point {
+        TriggerPoint::Text(_) if !shift_held => LinkDefinitionKind::Symbol,
+        _ => LinkDefinitionKind::Type,
+    };
+
+    let (mut hovered_link_state, is_cached) =
+        if let Some(existing) = editor.hovered_link_state.take() {
+            (existing, true)
+        } else {
+            (
+                HoveredLinkState {
+                    last_trigger_point: trigger_point.clone(),
+                    symbol_range: None,
+                    preferred_kind,
+                    links: vec![],
+                    task: None,
+                },
+                false,
+            )
+        };
 
     if editor.pending_rename.is_some() {
         return;
     }
 
     let trigger_anchor = trigger_point.anchor();
-    let (buffer, buffer_position) = if let Some(output) = editor
+    let Some((buffer, buffer_position)) = editor
         .buffer
         .read(cx)
         .text_anchor_for_position(trigger_anchor.clone(), cx)
-    {
-        output
-    } else {
+    else {
         return;
     };
 
-    let excerpt_id = if let Some((excerpt_id, _, _)) = editor
+    let Some((excerpt_id, _, _)) = editor
         .buffer()
         .read(cx)
         .excerpt_containing(trigger_anchor.clone(), cx)
-    {
-        excerpt_id
-    } else {
+    else {
         return;
     };
 
-    let project = if let Some(project) = editor.project.clone() {
-        project
-    } else {
+    let Some(project) = editor.project.clone() else {
         return;
     };
 
-    // Don't request again if the location is within the symbol region of a previous request with the same kind
-    if let Some(symbol_range) = &editor.link_go_to_definition_state.symbol_range {
-        if same_kind && symbol_range.point_within_range(&trigger_point, &snapshot) {
+    let same_kind = hovered_link_state.preferred_kind == preferred_kind
+        || hovered_link_state
+            .links
+            .first()
+            .is_some_and(|d| matches!(d, HoverLink::Url(_)));
+
+    if same_kind {
+        if is_cached && (&hovered_link_state.last_trigger_point == &trigger_point)
+            || hovered_link_state
+                .symbol_range
+                .as_ref()
+                .is_some_and(|symbol_range| {
+                    symbol_range.point_within_range(&trigger_point, &snapshot)
+                })
+        {
+            editor.hovered_link_state = Some(hovered_link_state);
             return;
         }
+    } else {
+        editor.hide_hovered_link(cx)
     }
 
-    let task = cx.spawn(|this, mut cx| {
+    let snapshot = snapshot.buffer_snapshot.clone();
+    hovered_link_state.task = Some(cx.spawn(|this, mut cx| {
         async move {
             let result = match &trigger_point {
                 TriggerPoint::Text(_) => {
-                    // query the LSP for definition info
-                    project
-                        .update(&mut cx, |project, cx| match definition_kind {
-                            LinkDefinitionKind::Symbol => {
-                                project.definition(&buffer, buffer_position, cx)
-                            }
-
-                            LinkDefinitionKind::Type => {
-                                project.type_definition(&buffer, buffer_position, cx)
-                            }
-                        })?
-                        .await
-                        .ok()
-                        .map(|definition_result| {
+                    if let Some((url_range, url)) = find_url(&buffer, buffer_position, cx.clone()) {
+                        this.update(&mut cx, |_, _| {
+                            let start =
+                                snapshot.anchor_in_excerpt(excerpt_id.clone(), url_range.start);
+                            let end = snapshot.anchor_in_excerpt(excerpt_id.clone(), url_range.end);
                             (
-                                definition_result.iter().find_map(|link| {
-                                    link.origin.as_ref().map(|origin| {
-                                        let start = snapshot.buffer_snapshot.anchor_in_excerpt(
-                                            excerpt_id.clone(),
-                                            origin.range.start,
-                                        );
-                                        let end = snapshot.buffer_snapshot.anchor_in_excerpt(
-                                            excerpt_id.clone(),
-                                            origin.range.end,
-                                        );
-                                        RangeInEditor::Text(start..end)
-                                    })
-                                }),
-                                definition_result
-                                    .into_iter()
-                                    .map(GoToDefinitionLink::Text)
-                                    .collect(),
+                                Some(RangeInEditor::Text(start..end)),
+                                vec![HoverLink::Url(url)],
                             )
                         })
+                        .ok()
+                    } else {
+                        // query the LSP for definition info
+                        project
+                            .update(&mut cx, |project, cx| match preferred_kind {
+                                LinkDefinitionKind::Symbol => {
+                                    project.definition(&buffer, buffer_position, cx)
+                                }
+
+                                LinkDefinitionKind::Type => {
+                                    project.type_definition(&buffer, buffer_position, cx)
+                                }
+                            })?
+                            .await
+                            .ok()
+                            .map(|definition_result| {
+                                (
+                                    definition_result.iter().find_map(|link| {
+                                        link.origin.as_ref().map(|origin| {
+                                            let start = snapshot.anchor_in_excerpt(
+                                                excerpt_id.clone(),
+                                                origin.range.start,
+                                            );
+                                            let end = snapshot.anchor_in_excerpt(
+                                                excerpt_id.clone(),
+                                                origin.range.end,
+                                            );
+                                            RangeInEditor::Text(start..end)
+                                        })
+                                    }),
+                                    definition_result.into_iter().map(HoverLink::Text).collect(),
+                                )
+                            })
+                    }
                 }
                 TriggerPoint::InlayHint(highlight, lsp_location, server_id) => Some((
                     Some(RangeInEditor::Inlay(highlight.clone())),
-                    vec![GoToDefinitionLink::InlayHint(
-                        lsp_location.clone(),
-                        *server_id,
-                    )],
+                    vec![HoverLink::InlayHint(lsp_location.clone(), *server_id)],
                 )),
             };
 
             this.update(&mut cx, |this, cx| {
                 // Clear any existing highlights
-                this.clear_highlights::<LinkGoToDefinitionState>(cx);
-                this.link_go_to_definition_state.kind = Some(definition_kind);
-                this.link_go_to_definition_state.symbol_range = result
+                this.clear_highlights::<HoveredLinkState>(cx);
+                let Some(hovered_link_state) = this.hovered_link_state.as_mut() else {
+                    return;
+                };
+                hovered_link_state.preferred_kind = preferred_kind;
+                hovered_link_state.symbol_range = result
                     .as_ref()
                     .and_then(|(symbol_range, _)| symbol_range.clone());
 
                 if let Some((symbol_range, definitions)) = result {
-                    this.link_go_to_definition_state.definitions = definitions.clone();
+                    hovered_link_state.links = definitions.clone();
 
                     let buffer_snapshot = buffer.read(cx).snapshot();
 
@@ -459,7 +497,7 @@ pub fn show_link_definition(
                     let any_definition_does_not_contain_current_location =
                         definitions.iter().any(|definition| {
                             match &definition {
-                                GoToDefinitionLink::Text(link) => {
+                                HoverLink::Text(link) => {
                                     if link.target.buffer == buffer {
                                         let range = &link.target.range;
                                         // Expand range by one character as lsp definition ranges include positions adjacent
@@ -481,7 +519,8 @@ pub fn show_link_definition(
                                         true
                                     }
                                 }
-                                GoToDefinitionLink::InlayHint(_, _) => true,
+                                HoverLink::InlayHint(_, _) => true,
+                                HoverLink::Url(_) => true,
                             }
                         });
 
@@ -497,7 +536,6 @@ pub fn show_link_definition(
                         let highlight_range =
                             symbol_range.unwrap_or_else(|| match &trigger_point {
                                 TriggerPoint::Text(trigger_anchor) => {
-                                    let snapshot = &snapshot.buffer_snapshot;
                                     // If no symbol range returned from language server, use the surrounding word.
                                     let (offset_range, _) =
                                         snapshot.surrounding_word(*trigger_anchor);
@@ -512,21 +550,14 @@ pub fn show_link_definition(
                             });
 
                         match highlight_range {
-                            RangeInEditor::Text(text_range) => this
-                                .highlight_text::<LinkGoToDefinitionState>(
-                                    vec![text_range],
-                                    style,
-                                    cx,
-                                ),
+                            RangeInEditor::Text(text_range) => {
+                                this.highlight_text::<HoveredLinkState>(vec![text_range], style, cx)
+                            }
                             RangeInEditor::Inlay(highlight) => this
-                                .highlight_inlays::<LinkGoToDefinitionState>(
-                                    vec![highlight],
-                                    style,
-                                    cx,
-                                ),
+                                .highlight_inlays::<HoveredLinkState>(vec![highlight], style, cx),
                         }
                     } else {
-                        hide_link_definition(this, cx);
+                        this.hide_hovered_link(cx);
                     }
                 }
             })?;
@@ -534,78 +565,68 @@ pub fn show_link_definition(
             Ok::<_, anyhow::Error>(())
         }
         .log_err()
-    });
+    }));
 
-    editor.link_go_to_definition_state.task = Some(task);
+    editor.hovered_link_state = Some(hovered_link_state);
 }
 
-pub fn hide_link_definition(editor: &mut Editor, cx: &mut ViewContext<Editor>) {
-    if editor.link_go_to_definition_state.symbol_range.is_some()
-        || !editor.link_go_to_definition_state.definitions.is_empty()
+fn find_url(
+    buffer: &Model<language::Buffer>,
+    position: text::Anchor,
+    mut cx: AsyncWindowContext,
+) -> Option<(Range<text::Anchor>, String)> {
+    const LIMIT: usize = 2048;
+
+    let Ok(snapshot) = buffer.update(&mut cx, |buffer, _| buffer.snapshot()) else {
+        return None;
+    };
+
+    let offset = position.to_offset(&snapshot);
+    let mut token_start = offset;
+    let mut token_end = offset;
+    let mut found_start = false;
+    let mut found_end = false;
+
+    for ch in snapshot.reversed_chars_at(offset).take(LIMIT) {
+        if ch.is_whitespace() {
+            found_start = true;
+            break;
+        }
+        token_start -= ch.len_utf8();
+    }
+    if !found_start {
+        return None;
+    }
+
+    for ch in snapshot
+        .chars_at(offset)
+        .take(LIMIT - (offset - token_start))
     {
-        editor.link_go_to_definition_state.symbol_range.take();
-        editor.link_go_to_definition_state.definitions.clear();
-        cx.notify();
+        if ch.is_whitespace() {
+            found_end = true;
+            break;
+        }
+        token_end += ch.len_utf8();
+    }
+    if !found_end {
+        return None;
     }
 
-    editor.link_go_to_definition_state.task = None;
+    let mut finder = LinkFinder::new();
+    finder.kinds(&[LinkKind::Url]);
+    let input = snapshot
+        .text_for_range(token_start..token_end)
+        .collect::<String>();
 
-    editor.clear_highlights::<LinkGoToDefinitionState>(cx);
-}
-
-pub fn go_to_fetched_definition(
-    editor: &mut Editor,
-    point: PointForPosition,
-    split: bool,
-    cx: &mut ViewContext<Editor>,
-) {
-    go_to_fetched_definition_of_kind(LinkDefinitionKind::Symbol, editor, point, split, cx);
-}
-
-pub fn go_to_fetched_type_definition(
-    editor: &mut Editor,
-    point: PointForPosition,
-    split: bool,
-    cx: &mut ViewContext<Editor>,
-) {
-    go_to_fetched_definition_of_kind(LinkDefinitionKind::Type, editor, point, split, cx);
-}
-
-fn go_to_fetched_definition_of_kind(
-    kind: LinkDefinitionKind,
-    editor: &mut Editor,
-    point: PointForPosition,
-    split: bool,
-    cx: &mut ViewContext<Editor>,
-) {
-    let cached_definitions = editor.link_go_to_definition_state.definitions.clone();
-    hide_link_definition(editor, cx);
-    let cached_definitions_kind = editor.link_go_to_definition_state.kind;
-
-    let is_correct_kind = cached_definitions_kind == Some(kind);
-    if !cached_definitions.is_empty() && is_correct_kind {
-        if !editor.focus_handle.is_focused(cx) {
-            cx.focus(&editor.focus_handle);
-        }
-
-        editor.navigate_to_definitions(cached_definitions, split, cx);
-    } else {
-        editor.select(
-            SelectPhase::Begin {
-                position: point.next_valid,
-                add: false,
-                click_count: 1,
-            },
-            cx,
-        );
-
-        if point.as_valid().is_some() {
-            match kind {
-                LinkDefinitionKind::Symbol => editor.go_to_definition(&GoToDefinition, cx),
-                LinkDefinitionKind::Type => editor.go_to_type_definition(&GoToTypeDefinition, cx),
-            }
+    let relative_offset = offset - token_start;
+    for link in finder.links(&input) {
+        if link.start() <= relative_offset && link.end() >= relative_offset {
+            let range = snapshot.anchor_before(token_start + link.start())
+                ..snapshot.anchor_after(token_start + link.end());
+            return Some((range, link.as_str().to_string()));
         }
     }
+    None
 }
 
 #[cfg(test)]
@@ -616,16 +637,18 @@ mod tests {
         editor_tests::init_test,
         inlay_hint_cache::tests::{cached_hint_labels, visible_hint_labels},
         test::editor_lsp_test_context::EditorLspTestContext,
+        DisplayPoint,
     };
     use futures::StreamExt;
-    use gpui::{Modifiers, ModifiersChangedEvent};
+    use gpui::Modifiers;
     use indoc::indoc;
     use language::language_settings::InlayHintSettings;
     use lsp::request::{GotoDefinition, GotoTypeDefinition};
     use util::assert_set_eq;
+    use workspace::item::Item;
 
     #[gpui::test]
-    async fn test_link_go_to_type_definition(cx: &mut gpui::TestAppContext) {
+    async fn test_hover_type_links(cx: &mut gpui::TestAppContext) {
         init_test(cx, |_| {});
 
         let mut cx = EditorLspTestContext::new_rust(
@@ -642,12 +665,9 @@ mod tests {
             struct A;
             let vˇariable = A;
         "});
+        let screen_coord = cx.editor(|editor, cx| editor.pixel_position_of_cursor(cx));
 
         // Basic hold cmd+shift, expect highlight in region if response contains type definition
-        let hover_point = cx.display_point(indoc! {"
-            struct A;
-            let vˇariable = A;
-        "});
         let symbol_range = cx.lsp_range(indoc! {"
             struct A;
             let «variable» = A;
@@ -657,6 +677,8 @@ mod tests {
             let variable = A;
         "});
 
+        cx.run_until_parked();
+
         let mut requests =
             cx.handle_request::<GotoTypeDefinition, _, _>(move |url, _, _| async move {
                 Ok(Some(lsp::GotoTypeDefinitionResponse::Link(vec![
@@ -669,70 +691,28 @@ mod tests {
                 ])))
             });
 
-        // Press cmd+shift to trigger highlight
-        cx.update_editor(|editor, cx| {
-            update_go_to_definition_link(
-                editor,
-                Some(GoToDefinitionTrigger::Text(hover_point)),
-                true,
-                true,
-                cx,
-            );
-        });
+        cx.cx
+            .cx
+            .simulate_mouse_move(screen_coord.unwrap(), Modifiers::command_shift());
+
         requests.next().await;
-        cx.background_executor.run_until_parked();
-        cx.assert_editor_text_highlights::<LinkGoToDefinitionState>(indoc! {"
+        cx.run_until_parked();
+        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
             struct A;
             let «variable» = A;
         "});
 
-        // Unpress shift causes highlight to go away (normal goto-definition is not valid here)
-        cx.update_editor(|editor, cx| {
-            crate::element::EditorElement::modifiers_changed(
-                editor,
-                &ModifiersChangedEvent {
-                    modifiers: Modifiers {
-                        command: true,
-                        ..Default::default()
-                    },
-                    ..Default::default()
-                },
-                cx,
-            );
-        });
+        cx.simulate_modifiers_change(Modifiers::command());
+        cx.run_until_parked();
         // Assert no link highlights
-        cx.assert_editor_text_highlights::<LinkGoToDefinitionState>(indoc! {"
+        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
             struct A;
             let variable = A;
         "});
 
-        // Cmd+shift click without existing definition requests and jumps
-        let hover_point = cx.display_point(indoc! {"
-            struct A;
-            let vˇariable = A;
-        "});
-        let target_range = cx.lsp_range(indoc! {"
-            struct «A»;
-            let variable = A;
-        "});
-
-        let mut requests =
-            cx.handle_request::<GotoTypeDefinition, _, _>(move |url, _, _| async move {
-                Ok(Some(lsp::GotoTypeDefinitionResponse::Link(vec![
-                    lsp::LocationLink {
-                        origin_selection_range: None,
-                        target_uri: url,
-                        target_range,
-                        target_selection_range: target_range,
-                    },
-                ])))
-            });
-
-        cx.update_editor(|editor, cx| {
-            go_to_fetched_type_definition(editor, PointForPosition::valid(hover_point), false, cx);
-        });
-        requests.next().await;
-        cx.background_executor.run_until_parked();
+        cx.cx
+            .cx
+            .simulate_click(screen_coord.unwrap(), Modifiers::command_shift());
 
         cx.assert_editor_state(indoc! {"
             struct «Aˇ»;
@@ -741,7 +721,7 @@ mod tests {
     }
 
     #[gpui::test]
-    async fn test_link_go_to_definition(cx: &mut gpui::TestAppContext) {
+    async fn test_hover_links(cx: &mut gpui::TestAppContext) {
         init_test(cx, |_| {});
 
         let mut cx = EditorLspTestContext::new_rust(
@@ -759,7 +739,7 @@ mod tests {
             "});
 
         // Basic hold cmd, expect highlight in region if response contains definition
-        let hover_point = cx.display_point(indoc! {"
+        let hover_point = cx.pixel_position(indoc! {"
                 fn test() { do_wˇork(); }
                 fn do_work() { test(); }
             "});
@@ -783,65 +763,42 @@ mod tests {
             ])))
         });
 
-        cx.update_editor(|editor, cx| {
-            update_go_to_definition_link(
-                editor,
-                Some(GoToDefinitionTrigger::Text(hover_point)),
-                true,
-                false,
-                cx,
-            );
-        });
+        cx.simulate_mouse_move(hover_point, Modifiers::command());
         requests.next().await;
         cx.background_executor.run_until_parked();
-        cx.assert_editor_text_highlights::<LinkGoToDefinitionState>(indoc! {"
+        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
                 fn test() { «do_work»(); }
                 fn do_work() { test(); }
             "});
 
         // Unpress cmd causes highlight to go away
-        cx.update_editor(|editor, cx| {
-            crate::element::EditorElement::modifiers_changed(editor, &Default::default(), cx);
-        });
-
-        // Assert no link highlights
-        cx.assert_editor_text_highlights::<LinkGoToDefinitionState>(indoc! {"
+        cx.simulate_modifiers_change(Modifiers::none());
+        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
                 fn test() { do_work(); }
                 fn do_work() { test(); }
             "});
 
-        // Response without source range still highlights word
-        cx.update_editor(|editor, _| editor.link_go_to_definition_state.last_trigger_point = None);
         let mut requests = cx.handle_request::<GotoDefinition, _, _>(move |url, _, _| async move {
             Ok(Some(lsp::GotoDefinitionResponse::Link(vec![
                 lsp::LocationLink {
-                    // No origin range
-                    origin_selection_range: None,
+                    origin_selection_range: Some(symbol_range),
                     target_uri: url.clone(),
                     target_range,
                     target_selection_range: target_range,
                 },
             ])))
         });
-        cx.update_editor(|editor, cx| {
-            update_go_to_definition_link(
-                editor,
-                Some(GoToDefinitionTrigger::Text(hover_point)),
-                true,
-                false,
-                cx,
-            );
-        });
+
+        cx.simulate_mouse_move(hover_point, Modifiers::command());
         requests.next().await;
         cx.background_executor.run_until_parked();
-
-        cx.assert_editor_text_highlights::<LinkGoToDefinitionState>(indoc! {"
+        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
                 fn test() { «do_work»(); }
                 fn do_work() { test(); }
             "});
 
         // Moving mouse to location with no response dismisses highlight
-        let hover_point = cx.display_point(indoc! {"
+        let hover_point = cx.pixel_position(indoc! {"
                 fˇn test() { do_work(); }
                 fn do_work() { test(); }
             "});
@@ -851,42 +808,26 @@ mod tests {
                 // No definitions returned
                 Ok(Some(lsp::GotoDefinitionResponse::Link(vec![])))
             });
-        cx.update_editor(|editor, cx| {
-            update_go_to_definition_link(
-                editor,
-                Some(GoToDefinitionTrigger::Text(hover_point)),
-                true,
-                false,
-                cx,
-            );
-        });
+        cx.simulate_mouse_move(hover_point, Modifiers::command());
+
         requests.next().await;
         cx.background_executor.run_until_parked();
 
         // Assert no link highlights
-        cx.assert_editor_text_highlights::<LinkGoToDefinitionState>(indoc! {"
+        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
                 fn test() { do_work(); }
                 fn do_work() { test(); }
             "});
 
-        // Move mouse without cmd and then pressing cmd triggers highlight
-        let hover_point = cx.display_point(indoc! {"
+        // // Move mouse without cmd and then pressing cmd triggers highlight
+        let hover_point = cx.pixel_position(indoc! {"
                 fn test() { do_work(); }
                 fn do_work() { teˇst(); }
             "});
-        cx.update_editor(|editor, cx| {
-            update_go_to_definition_link(
-                editor,
-                Some(GoToDefinitionTrigger::Text(hover_point)),
-                false,
-                false,
-                cx,
-            );
-        });
-        cx.background_executor.run_until_parked();
+        cx.simulate_mouse_move(hover_point, Modifiers::none());
 
         // Assert no link highlights
-        cx.assert_editor_text_highlights::<LinkGoToDefinitionState>(indoc! {"
+        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
                 fn test() { do_work(); }
                 fn do_work() { test(); }
             "});
@@ -910,73 +851,44 @@ mod tests {
                 },
             ])))
         });
-        cx.update_editor(|editor, cx| {
-            crate::element::EditorElement::modifiers_changed(
-                editor,
-                &ModifiersChangedEvent {
-                    modifiers: Modifiers {
-                        command: true,
-                        ..Default::default()
-                    },
-                },
-                cx,
-            );
-        });
+
+        cx.simulate_modifiers_change(Modifiers::command());
+
         requests.next().await;
         cx.background_executor.run_until_parked();
 
-        cx.assert_editor_text_highlights::<LinkGoToDefinitionState>(indoc! {"
+        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
                 fn test() { do_work(); }
                 fn do_work() { «test»(); }
             "});
 
-        cx.cx.cx.deactivate_window();
-        cx.assert_editor_text_highlights::<LinkGoToDefinitionState>(indoc! {"
+        cx.deactivate_window();
+        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
                 fn test() { do_work(); }
                 fn do_work() { test(); }
             "});
 
-        // Moving the mouse restores the highlights.
-        cx.update_editor(|editor, cx| {
-            update_go_to_definition_link(
-                editor,
-                Some(GoToDefinitionTrigger::Text(hover_point)),
-                true,
-                false,
-                cx,
-            );
-        });
+        cx.simulate_mouse_move(hover_point, Modifiers::command());
         cx.background_executor.run_until_parked();
-        cx.assert_editor_text_highlights::<LinkGoToDefinitionState>(indoc! {"
+        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
                 fn test() { do_work(); }
                 fn do_work() { «test»(); }
             "});
 
         // Moving again within the same symbol range doesn't re-request
-        let hover_point = cx.display_point(indoc! {"
+        let hover_point = cx.pixel_position(indoc! {"
                 fn test() { do_work(); }
                 fn do_work() { tesˇt(); }
             "});
-        cx.update_editor(|editor, cx| {
-            update_go_to_definition_link(
-                editor,
-                Some(GoToDefinitionTrigger::Text(hover_point)),
-                true,
-                false,
-                cx,
-            );
-        });
+        cx.simulate_mouse_move(hover_point, Modifiers::command());
         cx.background_executor.run_until_parked();
-        cx.assert_editor_text_highlights::<LinkGoToDefinitionState>(indoc! {"
+        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
                 fn test() { do_work(); }
                 fn do_work() { «test»(); }
             "});
 
         // Cmd click with existing definition doesn't re-request and dismisses highlight
-        cx.update_editor(|editor, cx| {
-            go_to_fetched_definition(editor, PointForPosition::valid(hover_point), false, cx);
-        });
-        // Assert selection moved to to definition
+        cx.simulate_click(hover_point, Modifiers::command());
         cx.lsp
             .handle_request::<GotoDefinition, _, _>(move |_, _| async move {
                 // Empty definition response to make sure we aren't hitting the lsp and using
@@ -990,13 +902,13 @@ mod tests {
             "});
 
         // Assert no link highlights after jump
-        cx.assert_editor_text_highlights::<LinkGoToDefinitionState>(indoc! {"
+        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
                 fn test() { do_work(); }
                 fn do_work() { test(); }
             "});
 
         // Cmd click without existing definition requests and jumps
-        let hover_point = cx.display_point(indoc! {"
+        let hover_point = cx.pixel_position(indoc! {"
                 fn test() { do_wˇork(); }
                 fn do_work() { test(); }
             "});
@@ -1015,9 +927,7 @@ mod tests {
                 },
             ])))
         });
-        cx.update_editor(|editor, cx| {
-            go_to_fetched_definition(editor, PointForPosition::valid(hover_point), false, cx);
-        });
+        cx.simulate_click(hover_point, Modifiers::command());
         requests.next().await;
         cx.background_executor.run_until_parked();
         cx.assert_editor_state(indoc! {"
@@ -1027,7 +937,7 @@ mod tests {
 
         // 1. We have a pending selection, mouse point is over a symbol that we have a response for, hitting cmd and nothing happens
         // 2. Selection is completed, hovering
-        let hover_point = cx.display_point(indoc! {"
+        let hover_point = cx.pixel_position(indoc! {"
                 fn test() { do_wˇork(); }
                 fn do_work() { test(); }
             "});
@@ -1060,18 +970,10 @@ mod tests {
                 s.set_pending_anchor_range(anchor_range, crate::SelectMode::Character)
             });
         });
-        cx.update_editor(|editor, cx| {
-            update_go_to_definition_link(
-                editor,
-                Some(GoToDefinitionTrigger::Text(hover_point)),
-                true,
-                false,
-                cx,
-            );
-        });
+        cx.simulate_mouse_move(hover_point, Modifiers::command());
         cx.background_executor.run_until_parked();
         assert!(requests.try_next().is_err());
-        cx.assert_editor_text_highlights::<LinkGoToDefinitionState>(indoc! {"
+        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
                 fn test() { do_work(); }
                 fn do_work() { test(); }
             "});
@@ -1079,7 +981,7 @@ mod tests {
     }
 
     #[gpui::test]
-    async fn test_link_go_to_inlay(cx: &mut gpui::TestAppContext) {
+    async fn test_inlay_hover_links(cx: &mut gpui::TestAppContext) {
         init_test(cx, |settings| {
             settings.defaults.inlay_hints = Some(InlayHintSettings {
                 enabled: true,
@@ -1167,39 +1069,25 @@ mod tests {
             .get(0)
             .cloned()
             .unwrap();
-        let hint_hover_position = cx.update_editor(|editor, cx| {
+        let midpoint = cx.update_editor(|editor, cx| {
             let snapshot = editor.snapshot(cx);
             let previous_valid = inlay_range.start.to_display_point(&snapshot);
             let next_valid = inlay_range.end.to_display_point(&snapshot);
             assert_eq!(previous_valid.row(), next_valid.row());
             assert!(previous_valid.column() < next_valid.column());
-            let exact_unclipped = DisplayPoint::new(
+            DisplayPoint::new(
                 previous_valid.row(),
                 previous_valid.column() + (hint_label.len() / 2) as u32,
-            );
-            PointForPosition {
-                previous_valid,
-                next_valid,
-                exact_unclipped,
-                column_overshoot_after_line_end: 0,
-            }
+            )
         });
         // Press cmd to trigger highlight
-        cx.update_editor(|editor, cx| {
-            update_inlay_link_and_hover_points(
-                &editor.snapshot(cx),
-                hint_hover_position,
-                editor,
-                true,
-                false,
-                cx,
-            );
-        });
+        let hover_point = cx.pixel_position_for(midpoint);
+        cx.simulate_mouse_move(hover_point, Modifiers::command());
         cx.background_executor.run_until_parked();
         cx.update_editor(|editor, cx| {
             let snapshot = editor.snapshot(cx);
             let actual_highlights = snapshot
-                .inlay_highlights::<LinkGoToDefinitionState>()
+                .inlay_highlights::<HoveredLinkState>()
                 .into_iter()
                 .flat_map(|highlights| highlights.values().map(|(_, highlight)| highlight))
                 .collect::<Vec<_>>();
@@ -1213,57 +1101,21 @@ mod tests {
             assert_set_eq!(actual_highlights, vec![&expected_highlight]);
         });
 
-        // Unpress cmd causes highlight to go away
-        cx.update_editor(|editor, cx| {
-            crate::element::EditorElement::modifiers_changed(
-                editor,
-                &ModifiersChangedEvent {
-                    modifiers: Modifiers {
-                        command: false,
-                        ..Default::default()
-                    },
-                    ..Default::default()
-                },
-                cx,
-            );
-        });
+        cx.simulate_mouse_move(hover_point, Modifiers::none());
         // Assert no link highlights
         cx.update_editor(|editor, cx| {
                 let snapshot = editor.snapshot(cx);
                 let actual_ranges = snapshot
-                    .text_highlight_ranges::<LinkGoToDefinitionState>()
+                    .text_highlight_ranges::<HoveredLinkState>()
                     .map(|ranges| ranges.as_ref().clone().1)
                     .unwrap_or_default();
 
                 assert!(actual_ranges.is_empty(), "When no cmd is pressed, should have no hint label selected, but got: {actual_ranges:?}");
             });
 
-        // Cmd+click without existing definition requests and jumps
-        cx.update_editor(|editor, cx| {
-            crate::element::EditorElement::modifiers_changed(
-                editor,
-                &ModifiersChangedEvent {
-                    modifiers: Modifiers {
-                        command: true,
-                        ..Default::default()
-                    },
-                    ..Default::default()
-                },
-                cx,
-            );
-            update_inlay_link_and_hover_points(
-                &editor.snapshot(cx),
-                hint_hover_position,
-                editor,
-                true,
-                false,
-                cx,
-            );
-        });
+        cx.simulate_modifiers_change(Modifiers::command());
         cx.background_executor.run_until_parked();
-        cx.update_editor(|editor, cx| {
-            go_to_fetched_type_definition(editor, hint_hover_position, false, cx);
-        });
+        cx.simulate_click(hover_point, Modifiers::command());
         cx.background_executor.run_until_parked();
         cx.assert_editor_state(indoc! {"
                 struct «TestStructˇ»;
@@ -1273,4 +1125,35 @@ mod tests {
                 }
             "});
     }
+
+    #[gpui::test]
+    async fn test_urls(cx: &mut gpui::TestAppContext) {
+        init_test(cx, |_| {});
+        let mut cx = EditorLspTestContext::new_rust(
+            lsp::ServerCapabilities {
+                ..Default::default()
+            },
+            cx,
+        )
+        .await;
+
+        cx.set_state(indoc! {"
+            Let's test a [complex](https://zed.dev/channel/had-(oops)) caseˇ.
+        "});
+
+        let screen_coord = cx.pixel_position(indoc! {"
+            Let's test a [complex](https://zed.dev/channel/had-(ˇoops)) case.
+            "});
+
+        cx.simulate_mouse_move(screen_coord, Modifiers::command());
+        cx.assert_editor_text_highlights::<HoveredLinkState>(indoc! {"
+            Let's test a [complex](«https://zed.dev/channel/had-(oops)ˇ») case.
+        "});
+
+        cx.simulate_click(screen_coord, Modifiers::command());
+        assert_eq!(
+            cx.opened_url(),
+            Some("https://zed.dev/channel/had-(oops)".into())
+        );
+    }
 }
diff --git a/crates/editor/src/hover_popover.rs b/crates/editor/src/hover_popover.rs
index 668d00f1aa..b4253e074b 100644
--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -1,6 +1,6 @@
 use crate::{
     display_map::{InlayOffset, ToDisplayPoint},
-    link_go_to_definition::{InlayHighlight, RangeInEditor},
+    hover_links::{InlayHighlight, RangeInEditor},
     Anchor, AnchorRangeExt, DisplayPoint, Editor, EditorSettings, EditorSnapshot, EditorStyle,
     ExcerptId, Hover, RangeToAnchorExt,
 };
@@ -605,8 +605,8 @@ mod tests {
     use crate::{
         editor_tests::init_test,
         element::PointForPosition,
+        hover_links::update_inlay_link_and_hover_points,
         inlay_hint_cache::tests::{cached_hint_labels, visible_hint_labels},
-        link_go_to_definition::update_inlay_link_and_hover_points,
         test::editor_lsp_test_context::EditorLspTestContext,
         InlayId,
     };
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index ac55ed8546..e95d958db5 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -1,7 +1,7 @@
 use crate::{
-    editor_settings::SeedQuerySetting, link_go_to_definition::hide_link_definition,
-    persistence::DB, scroll::ScrollAnchor, Anchor, Autoscroll, Editor, EditorEvent, EditorSettings,
-    ExcerptId, ExcerptRange, MultiBuffer, MultiBufferSnapshot, NavigationData, ToPoint as _,
+    editor_settings::SeedQuerySetting, persistence::DB, scroll::ScrollAnchor, Anchor, Autoscroll,
+    Editor, EditorEvent, EditorSettings, ExcerptId, ExcerptRange, MultiBuffer, MultiBufferSnapshot,
+    NavigationData, ToPoint as _,
 };
 use anyhow::{anyhow, Context as _, Result};
 use collections::HashSet;
@@ -682,8 +682,7 @@ impl Item for Editor {
     }
 
     fn workspace_deactivated(&mut self, cx: &mut ViewContext<Self>) {
-        hide_link_definition(self, cx);
-        self.link_go_to_definition_state.last_trigger_point = None;
+        self.hide_hovered_link(cx);
     }
 
     fn is_dirty(&self, cx: &AppContext) -> bool {
diff --git a/crates/editor/src/test/editor_test_context.rs b/crates/editor/src/test/editor_test_context.rs
index 3289471e81..9ad0839088 100644
--- a/crates/editor/src/test/editor_test_context.rs
+++ b/crates/editor/src/test/editor_test_context.rs
@@ -4,7 +4,8 @@ use crate::{
 use collections::BTreeMap;
 use futures::Future;
 use gpui::{
-    AnyWindowHandle, AppContext, Keystroke, ModelContext, View, ViewContext, VisualTestContext,
+    AnyWindowHandle, AppContext, Keystroke, ModelContext, Pixels, Point, View, ViewContext,
+    VisualTestContext,
 };
 use indoc::indoc;
 use itertools::Itertools;
@@ -187,6 +188,31 @@ impl EditorTestContext {
         ranges[0].start.to_display_point(&snapshot)
     }
 
+    pub fn pixel_position(&mut self, marked_text: &str) -> Point<Pixels> {
+        let display_point = self.display_point(marked_text);
+        self.pixel_position_for(display_point)
+    }
+
+    pub fn pixel_position_for(&mut self, display_point: DisplayPoint) -> Point<Pixels> {
+        self.update_editor(|editor, cx| {
+            let newest_point = editor.selections.newest_display(cx).head();
+            let pixel_position = editor.pixel_position_of_newest_cursor.unwrap();
+            let line_height = editor
+                .style()
+                .unwrap()
+                .text
+                .line_height_in_pixels(cx.rem_size());
+            let snapshot = editor.snapshot(cx);
+            let details = editor.text_layout_details(cx);
+
+            let y = pixel_position.y
+                + line_height * (display_point.row() as f32 - newest_point.row() as f32);
+            let x = pixel_position.x + snapshot.x_for_display_point(display_point, &details)
+                - snapshot.x_for_display_point(newest_point, &details);
+            Point::new(x, y)
+        })
+    }
+
     // Returns anchors for the current buffer using `«` and `»`
     pub fn text_anchor_range(&mut self, marked_text: &str) -> Range<language::Anchor> {
         let ranges = self.ranges(marked_text);
@@ -343,7 +369,7 @@ impl EditorTestContext {
 }
 
 impl Deref for EditorTestContext {
-    type Target = gpui::TestAppContext;
+    type Target = gpui::VisualTestContext;
 
     fn deref(&self) -> &Self::Target {
         &self.cx
diff --git a/crates/gpui/src/app/test_context.rs b/crates/gpui/src/app/test_context.rs
index bf213e2818..0f64a0690f 100644
--- a/crates/gpui/src/app/test_context.rs
+++ b/crates/gpui/src/app/test_context.rs
@@ -1,9 +1,10 @@
 use crate::{
     Action, AnyElement, AnyView, AnyWindowHandle, AppCell, AppContext, AsyncAppContext,
     AvailableSpace, BackgroundExecutor, Bounds, ClipboardItem, Context, Entity, EventEmitter,
-    ForegroundExecutor, Global, InputEvent, Keystroke, Model, ModelContext, Pixels, Platform,
-    Point, Render, Result, Size, Task, TestDispatcher, TestPlatform, TestWindow, TextSystem, View,
-    ViewContext, VisualContext, WindowContext, WindowHandle, WindowOptions,
+    ForegroundExecutor, Global, InputEvent, Keystroke, Model, ModelContext, Modifiers,
+    ModifiersChangedEvent, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, Pixels,
+    Platform, Point, Render, Result, Size, Task, TestDispatcher, TestPlatform, TestWindow,
+    TextSystem, View, ViewContext, VisualContext, WindowContext, WindowHandle, WindowOptions,
 };
 use anyhow::{anyhow, bail};
 use futures::{Stream, StreamExt};
@@ -236,6 +237,11 @@ impl TestAppContext {
         self.test_platform.has_pending_prompt()
     }
 
+    /// All the urls that have been opened with cx.open_url() during this test.
+    pub fn opened_url(&self) -> Option<String> {
+        self.test_platform.opened_url.borrow().clone()
+    }
+
     /// Simulates the user resizing the window to the new size.
     pub fn simulate_window_resize(&self, window_handle: AnyWindowHandle, size: Size<Pixels>) {
         self.test_window(window_handle).simulate_resize(size);
@@ -625,6 +631,36 @@ impl<'a> VisualTestContext {
         self.cx.simulate_input(self.window, input)
     }
 
+    /// Simulate a mouse move event to the given point
+    pub fn simulate_mouse_move(&mut self, position: Point<Pixels>, modifiers: Modifiers) {
+        self.simulate_event(MouseMoveEvent {
+            position,
+            modifiers,
+            pressed_button: None,
+        })
+    }
+
+    /// Simulate a primary mouse click at the given point
+    pub fn simulate_click(&mut self, position: Point<Pixels>, modifiers: Modifiers) {
+        self.simulate_event(MouseDownEvent {
+            position,
+            modifiers,
+            button: MouseButton::Left,
+            click_count: 1,
+        });
+        self.simulate_event(MouseUpEvent {
+            position,
+            modifiers,
+            button: MouseButton::Left,
+            click_count: 1,
+        });
+    }
+
+    /// Simulate a modifiers changed event
+    pub fn simulate_modifiers_change(&mut self, modifiers: Modifiers) {
+        self.simulate_event(ModifiersChangedEvent { modifiers })
+    }
+
     /// Simulates the user resizing the window to the new size.
     pub fn simulate_resize(&self, size: Size<Pixels>) {
         self.simulate_window_resize(self.window, size)
diff --git a/crates/gpui/src/platform/keystroke.rs b/crates/gpui/src/platform/keystroke.rs
index 2e1acfa630..9cdffd5e61 100644
--- a/crates/gpui/src/platform/keystroke.rs
+++ b/crates/gpui/src/platform/keystroke.rs
@@ -170,4 +170,34 @@ impl Modifiers {
     pub fn modified(&self) -> bool {
         self.control || self.alt || self.shift || self.command || self.function
     }
+
+    /// helper method for Modifiers with no modifiers
+    pub fn none() -> Modifiers {
+        Default::default()
+    }
+
+    /// helper method for Modifiers with just command
+    pub fn command() -> Modifiers {
+        Modifiers {
+            command: true,
+            ..Default::default()
+        }
+    }
+
+    /// helper method for Modifiers with just shift
+    pub fn shift() -> Modifiers {
+        Modifiers {
+            shift: true,
+            ..Default::default()
+        }
+    }
+
+    /// helper method for Modifiers with command + shift
+    pub fn command_shift() -> Modifiers {
+        Modifiers {
+            shift: true,
+            command: true,
+            ..Default::default()
+        }
+    }
 }
diff --git a/crates/gpui/src/platform/test/platform.rs b/crates/gpui/src/platform/test/platform.rs
index 5aadc4b760..4d954b3266 100644
--- a/crates/gpui/src/platform/test/platform.rs
+++ b/crates/gpui/src/platform/test/platform.rs
@@ -25,6 +25,7 @@ pub(crate) struct TestPlatform {
     active_cursor: Mutex<CursorStyle>,
     current_clipboard_item: Mutex<Option<ClipboardItem>>,
     pub(crate) prompts: RefCell<TestPrompts>,
+    pub opened_url: RefCell<Option<String>>,
     weak: Weak<Self>,
 }
 
@@ -45,6 +46,7 @@ impl TestPlatform {
             active_window: Default::default(),
             current_clipboard_item: Mutex::new(None),
             weak: weak.clone(),
+            opened_url: Default::default(),
         })
     }
 
@@ -188,8 +190,8 @@ impl Platform for TestPlatform {
 
     fn stop_display_link(&self, _display_id: DisplayId) {}
 
-    fn open_url(&self, _url: &str) {
-        unimplemented!()
+    fn open_url(&self, url: &str) {
+        *self.opened_url.borrow_mut() = Some(url.to_string())
     }
 
     fn on_open_urls(&self, _callback: Box<dyn FnMut(Vec<String>)>) {

From 04e49dc4931f8e20742dc2e80b54f1d13fdfb000 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Fri, 2 Feb 2024 22:22:18 -0800
Subject: [PATCH 199/372] blade: refactor the atlas to not own the command
 encoder

---
 crates/gpui/src/platform/linux/blade_atlas.rs | 87 ++++++++++---------
 .../gpui/src/platform/linux/blade_renderer.rs |  5 ++
 crates/gpui/src/platform/linux/window.rs      |  4 +-
 3 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/crates/gpui/src/platform/linux/blade_atlas.rs b/crates/gpui/src/platform/linux/blade_atlas.rs
index 7f27bf68a4..6f5b3da255 100644
--- a/crates/gpui/src/platform/linux/blade_atlas.rs
+++ b/crates/gpui/src/platform/linux/blade_atlas.rs
@@ -14,14 +14,20 @@ pub(crate) const PATH_TEXTURE_FORMAT: gpu::TextureFormat = gpu::TextureFormat::R
 
 pub(crate) struct BladeAtlas(Mutex<BladeAtlasState>);
 
+struct PendingUpload {
+    id: AtlasTextureId,
+    bounds: Bounds<DevicePixels>,
+    data: gpu::BufferPiece,
+}
+
 struct BladeAtlasState {
     gpu: Arc<gpu::Context>,
-    gpu_encoder: gpu::CommandEncoder,
     upload_belt: BladeBelt,
     monochrome_textures: Vec<BladeAtlasTexture>,
     polychrome_textures: Vec<BladeAtlasTexture>,
     path_textures: Vec<BladeAtlasTexture>,
     tiles_by_key: FxHashMap<AtlasKey, AtlasTile>,
+    uploads: Vec<PendingUpload>,
 }
 
 impl BladeAtlasState {
@@ -36,7 +42,6 @@ impl BladeAtlasState {
             self.gpu.destroy_texture(texture.raw);
             self.gpu.destroy_texture_view(texture.raw_view.unwrap());
         }
-        self.gpu.destroy_command_encoder(&mut self.gpu_encoder);
         self.upload_belt.destroy(&self.gpu);
     }
 }
@@ -50,10 +55,6 @@ impl BladeAtlas {
     pub(crate) fn new(gpu: &Arc<gpu::Context>) -> Self {
         BladeAtlas(Mutex::new(BladeAtlasState {
             gpu: Arc::clone(gpu),
-            gpu_encoder: gpu.create_command_encoder(gpu::CommandEncoderDesc {
-                name: "atlas",
-                buffer_count: 3,
-            }),
             upload_belt: BladeBelt::new(BladeBeltDescriptor {
                 memory: gpu::Memory::Upload,
                 min_chunk_size: 0x10000,
@@ -62,6 +63,7 @@ impl BladeAtlas {
             polychrome_textures: Default::default(),
             path_textures: Default::default(),
             tiles_by_key: Default::default(),
+            uploads: Vec::new(),
         }))
     }
 
@@ -81,22 +83,19 @@ impl BladeAtlas {
         }
     }
 
-    pub fn start_frame(&self) {
-        let mut lock = self.0.lock();
-        lock.gpu_encoder.start();
-    }
-
     pub fn allocate(&self, size: Size<DevicePixels>, texture_kind: AtlasTextureKind) -> AtlasTile {
         let mut lock = self.0.lock();
         lock.allocate(size, texture_kind)
     }
 
-    pub fn finish_frame(&self) -> gpu::SyncPoint {
+    pub fn before_frame(&self, gpu_encoder: &mut gpu::CommandEncoder) {
         let mut lock = self.0.lock();
-        let gpu = lock.gpu.clone();
-        let sync_point = gpu.submit(&mut lock.gpu_encoder);
-        lock.upload_belt.flush(&sync_point);
-        sync_point
+        lock.flush(gpu_encoder.transfer());
+    }
+
+    pub fn after_frame(&self, sync_point: &gpu::SyncPoint) {
+        let mut lock = self.0.lock();
+        lock.upload_belt.flush(sync_point);
     }
 
     pub fn get_texture_info(&self, id: AtlasTextureId) -> BladeTextureInfo {
@@ -186,7 +185,7 @@ impl BladeAtlasState {
         }
 
         let raw = self.gpu.create_texture(gpu::TextureDesc {
-            name: "",
+            name: "atlas",
             format,
             size: gpu::Extent {
                 width: size.width.into(),
@@ -230,31 +229,39 @@ impl BladeAtlasState {
     }
 
     fn upload_texture(&mut self, id: AtlasTextureId, bounds: Bounds<DevicePixels>, bytes: &[u8]) {
-        let textures = match id.kind {
-            crate::AtlasTextureKind::Monochrome => &self.monochrome_textures,
-            crate::AtlasTextureKind::Polychrome => &self.polychrome_textures,
-            crate::AtlasTextureKind::Path => &self.path_textures,
-        };
-        let texture = &textures[id.index as usize];
+        let data = self.upload_belt.alloc_data(bytes, &self.gpu);
+        self.uploads.push(PendingUpload { id, bounds, data });
+    }
 
-        let src_data = self.upload_belt.alloc_data(bytes, &self.gpu);
+    fn flush(&mut self, mut transfers: gpu::TransferCommandEncoder) {
+        for upload in self.uploads.drain(..) {
+            let textures = match upload.id.kind {
+                crate::AtlasTextureKind::Monochrome => &self.monochrome_textures,
+                crate::AtlasTextureKind::Polychrome => &self.polychrome_textures,
+                crate::AtlasTextureKind::Path => &self.path_textures,
+            };
+            let texture = &textures[upload.id.index as usize];
 
-        let mut transfers = self.gpu_encoder.transfer();
-        transfers.copy_buffer_to_texture(
-            src_data,
-            bounds.size.width.to_bytes(texture.bytes_per_pixel()),
-            gpu::TexturePiece {
-                texture: texture.raw,
-                mip_level: 0,
-                array_layer: 0,
-                origin: [bounds.origin.x.into(), bounds.origin.y.into(), 0],
-            },
-            gpu::Extent {
-                width: bounds.size.width.into(),
-                height: bounds.size.height.into(),
-                depth: 1,
-            },
-        );
+            transfers.copy_buffer_to_texture(
+                upload.data,
+                upload.bounds.size.width.to_bytes(texture.bytes_per_pixel()),
+                gpu::TexturePiece {
+                    texture: texture.raw,
+                    mip_level: 0,
+                    array_layer: 0,
+                    origin: [
+                        upload.bounds.origin.x.into(),
+                        upload.bounds.origin.y.into(),
+                        0,
+                    ],
+                },
+                gpu::Extent {
+                    width: upload.bounds.size.width.into(),
+                    height: upload.bounds.size.height.into(),
+                    depth: 1,
+                },
+            );
+        }
     }
 }
 
diff --git a/crates/gpui/src/platform/linux/blade_renderer.rs b/crates/gpui/src/platform/linux/blade_renderer.rs
index 4d64b184f0..184b607ca6 100644
--- a/crates/gpui/src/platform/linux/blade_renderer.rs
+++ b/crates/gpui/src/platform/linux/blade_renderer.rs
@@ -285,6 +285,7 @@ impl BladeRenderer {
         self.command_encoder.start();
         self.command_encoder.init_texture(frame.texture());
 
+        self.atlas.before_frame(&mut self.command_encoder);
         self.rasterize_paths(scene.paths());
 
         let globals = GlobalParams {
@@ -365,7 +366,11 @@ impl BladeRenderer {
 
         self.command_encoder.present(frame);
         let sync_point = self.gpu.submit(&mut self.command_encoder);
+
         self.instance_belt.flush(&sync_point);
+        self.atlas.after_frame(&sync_point);
+        self.atlas.clear_textures(AtlasTextureKind::Path);
+
         self.wait_for_gpu();
         self.last_sync_point = Some(sync_point);
     }
diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index 3efade0c89..4e136da3d6 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -244,7 +244,7 @@ impl LinuxWindowState {
 
     pub fn configure(&self, bounds: Bounds<i32>) {
         let mut resize_args = None;
-        let mut do_move = false;
+        let do_move;
         {
             let mut inner = self.inner.lock();
             let old_bounds = mem::replace(&mut inner.bounds, bounds);
@@ -393,7 +393,7 @@ impl PlatformWindow for LinuxWindow {
     }
 
     fn sprite_atlas(&self) -> sync::Arc<dyn crate::PlatformAtlas> {
-        let mut inner = self.0.inner.lock();
+        let inner = self.0.inner.lock();
         inner.renderer.atlas().clone()
     }
 }

From 7c7aad5e76a99ed6d20ca12d80ddf3ea750c729d Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Fri, 2 Feb 2024 23:04:56 -0800
Subject: [PATCH 200/372] blade: port underline shader

---
 .../gpui/src/platform/linux/blade_renderer.rs | 39 ++++++++++-
 crates/gpui/src/platform/linux/shaders.wgsl   | 70 +++++++++++++++++--
 crates/gpui/src/scene.rs                      |  2 +-
 crates/gpui/src/window/element_cx.rs          |  2 +-
 4 files changed, 106 insertions(+), 7 deletions(-)

diff --git a/crates/gpui/src/platform/linux/blade_renderer.rs b/crates/gpui/src/platform/linux/blade_renderer.rs
index 184b607ca6..0a143f7976 100644
--- a/crates/gpui/src/platform/linux/blade_renderer.rs
+++ b/crates/gpui/src/platform/linux/blade_renderer.rs
@@ -4,7 +4,7 @@
 use super::{BladeBelt, BladeBeltDescriptor};
 use crate::{
     AtlasTextureKind, AtlasTile, BladeAtlas, Bounds, ContentMask, Hsla, Path, PathId, PathVertex,
-    PrimitiveBatch, Quad, ScaledPixels, Scene, Shadow, PATH_TEXTURE_FORMAT,
+    PrimitiveBatch, Quad, ScaledPixels, Scene, Shadow, Underline, PATH_TEXTURE_FORMAT,
 };
 use bytemuck::{Pod, Zeroable};
 use collections::HashMap;
@@ -48,6 +48,12 @@ struct ShaderPathsData {
     b_path_sprites: gpu::BufferPiece,
 }
 
+#[derive(blade_macros::ShaderData)]
+struct ShaderUnderlinesData {
+    globals: GlobalParams,
+    b_underlines: gpu::BufferPiece,
+}
+
 #[derive(Clone, Debug, Eq, PartialEq)]
 #[repr(C)]
 struct PathSprite {
@@ -61,6 +67,7 @@ struct BladePipelines {
     shadows: gpu::RenderPipeline,
     path_rasterization: gpu::RenderPipeline,
     paths: gpu::RenderPipeline,
+    underlines: gpu::RenderPipeline,
 }
 
 impl BladePipelines {
@@ -75,11 +82,13 @@ impl BladePipelines {
             shader.get_struct_size("PathVertex") as usize,
         );
         shader.check_struct_size::<PathSprite>();
+        shader.check_struct_size::<Underline>();
 
         let quads_layout = <ShaderQuadsData as gpu::ShaderData>::layout();
         let shadows_layout = <ShaderShadowsData as gpu::ShaderData>::layout();
         let path_rasterization_layout = <ShaderPathRasterizationData as gpu::ShaderData>::layout();
         let paths_layout = <ShaderPathsData as gpu::ShaderData>::layout();
+        let underlines_layout = <ShaderUnderlinesData as gpu::ShaderData>::layout();
 
         Self {
             quads: gpu.create_render_pipeline(gpu::RenderPipelineDesc {
@@ -146,6 +155,22 @@ impl BladePipelines {
                     write_mask: gpu::ColorWrites::default(),
                 }],
             }),
+            underlines: gpu.create_render_pipeline(gpu::RenderPipelineDesc {
+                name: "underlines",
+                data_layouts: &[&underlines_layout],
+                vertex: shader.at("vs_underline"),
+                primitive: gpu::PrimitiveState {
+                    topology: gpu::PrimitiveTopology::TriangleStrip,
+                    ..Default::default()
+                },
+                depth_stencil: None,
+                fragment: shader.at("fs_underline"),
+                color_targets: &[gpu::ColorTargetState {
+                    format: surface_format,
+                    blend: Some(gpu::BlendState::ALPHA_BLENDING),
+                    write_mask: gpu::ColorWrites::default(),
+                }],
+            }),
         }
     }
 }
@@ -359,6 +384,18 @@ impl BladeRenderer {
                             encoder.draw(0, 4, 0, sprites.len() as u32);
                         }
                     }
+                    PrimitiveBatch::Underlines(underlines) => {
+                        let instance_buf = self.instance_belt.alloc_data(underlines, &self.gpu);
+                        let mut encoder = pass.with(&self.pipelines.underlines);
+                        encoder.bind(
+                            0,
+                            &ShaderUnderlinesData {
+                                globals,
+                                b_underlines: instance_buf,
+                            },
+                        );
+                        encoder.draw(0, 4, 0, underlines.len() as u32);
+                    }
                     _ => continue,
                 }
             }
diff --git a/crates/gpui/src/platform/linux/shaders.wgsl b/crates/gpui/src/platform/linux/shaders.wgsl
index 3a7853142a..e0990c6c1b 100644
--- a/crates/gpui/src/platform/linux/shaders.wgsl
+++ b/crates/gpui/src/platform/linux/shaders.wgsl
@@ -373,7 +373,7 @@ struct PathVarying {
 
 @vertex
 fn vs_path(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index) instance_id: u32) -> PathVarying {
-	let unit_vertex = vec2<f32>(f32(vertex_id & 1u), 0.5 * f32(vertex_id & 2u));
+    let unit_vertex = vec2<f32>(f32(vertex_id & 1u), 0.5 * f32(vertex_id & 2u));
     let sprite = b_path_sprites[instance_id];
     // Don't apply content mask because it was already accounted for when rasterizing the path.
 
@@ -386,7 +386,69 @@ fn vs_path(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index) insta
 
 @fragment
 fn fs_path(input: PathVarying) -> @location(0) vec4<f32> {
-	let sample = textureSample(t_tile, s_tile, input.tile_position).r;
-	let mask = 1.0 - abs(1.0 - sample % 2.0);
-	return input.color * mask;
+    let sample = textureSample(t_tile, s_tile, input.tile_position).r;
+    let mask = 1.0 - abs(1.0 - sample % 2.0);
+    return input.color * mask;
+}
+
+// --- underlines --- //
+
+struct Underline {
+    view_id: ViewId,
+    layer_id: u32,
+    order: u32,
+    bounds: Bounds,
+    content_mask: Bounds,
+    color: Hsla,
+    thickness: f32,
+    wavy: u32,
+}
+var<storage, read> b_underlines: array<Underline>;
+
+struct UnderlineVarying {
+    @builtin(position) position: vec4<f32>,
+    @location(0) @interpolate(flat) color: vec4<f32>,
+    @location(1) @interpolate(flat) underline_id: u32,
+    //TODO: use `clip_distance` once Naga supports it
+    @location(3) clip_distances: vec4<f32>,
+}
+
+@vertex
+fn vs_underline(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index) instance_id: u32) -> UnderlineVarying {
+    let unit_vertex = vec2<f32>(f32(vertex_id & 1u), 0.5 * f32(vertex_id & 2u));
+    let underline = b_underlines[instance_id];
+
+    var out = UnderlineVarying();
+    out.position = to_device_position(unit_vertex, underline.bounds);
+    out.color = hsla_to_rgba(underline.color);
+    out.underline_id = instance_id;
+    out.clip_distances = distance_from_clip_rect(unit_vertex, underline.bounds, underline.content_mask);
+    return out;
+}
+
+@fragment
+fn fs_underline(input: UnderlineVarying) -> @location(0) vec4<f32> {
+    // Alpha clip first, since we don't have `clip_distance`.
+    if (any(input.clip_distances < vec4<f32>(0.0))) {
+        return vec4<f32>(0.0);
+    }
+
+    let underline = b_underlines[input.underline_id];
+    if (underline.wavy == 0u)
+    {
+        return vec4<f32>(0.0);
+    }
+
+    let half_thickness = underline.thickness * 0.5;
+    let st = (input.position.xy - underline.bounds.origin) / underline.bounds.size.y - vec2<f32>(0.0, 0.5);
+    let frequency = M_PI_F * 3.0 * underline.thickness / 8.0;
+    let amplitude = 1.0 / (2.0 * underline.thickness);
+    let sine = sin(st.x * frequency) * amplitude;
+    let dSine = cos(st.x * frequency) * amplitude * frequency;
+    let distance = (st.y - sine) / sqrt(1.0 + dSine * dSine);
+    let distance_in_pixels = distance * underline.bounds.size.y;
+    let distance_from_top_border = distance_in_pixels - half_thickness;
+    let distance_from_bottom_border = distance_in_pixels + half_thickness;
+    let alpha = saturate(0.5 - max(-distance_from_bottom_border, distance_from_top_border));
+    return input.color * vec4<f32>(1.0, 1.0, 1.0, alpha);
 }
diff --git a/crates/gpui/src/scene.rs b/crates/gpui/src/scene.rs
index f5fcade711..dcf3f2cbea 100644
--- a/crates/gpui/src/scene.rs
+++ b/crates/gpui/src/scene.rs
@@ -543,8 +543,8 @@ pub(crate) struct Underline {
     pub order: DrawOrder,
     pub bounds: Bounds<ScaledPixels>,
     pub content_mask: ContentMask<ScaledPixels>,
-    pub thickness: ScaledPixels,
     pub color: Hsla,
+    pub thickness: ScaledPixels,
     pub wavy: bool,
 }
 
diff --git a/crates/gpui/src/window/element_cx.rs b/crates/gpui/src/window/element_cx.rs
index cde5f17b05..bc38db3ab5 100644
--- a/crates/gpui/src/window/element_cx.rs
+++ b/crates/gpui/src/window/element_cx.rs
@@ -753,8 +753,8 @@ impl<'a> ElementContext<'a> {
                 order: 0,
                 bounds: bounds.scale(scale_factor),
                 content_mask: content_mask.scale(scale_factor),
-                thickness: style.thickness.scale(scale_factor),
                 color: style.color.unwrap_or_default(),
+                thickness: style.thickness.scale(scale_factor),
                 wavy: style.wavy,
             },
         );

From 2e32f5867ef13dfe0c1cd17e046e85e07eb5bb0f Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sat, 3 Feb 2024 00:06:20 -0800
Subject: [PATCH 201/372] linux: various fixes across the crates to make it
 compile

---
 crates/gpui/src/platform/test/text_system.rs | 4 ++--
 crates/live_kit_client/Cargo.toml            | 4 ++--
 crates/live_kit_client/src/test.rs           | 5 ++---
 crates/media/src/media.rs                    | 1 +
 crates/project/src/terminals.rs              | 2 +-
 crates/zed/src/app_menus.rs                  | 1 -
 crates/zed/src/main.rs                       | 3 +++
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/crates/gpui/src/platform/test/text_system.rs b/crates/gpui/src/platform/test/text_system.rs
index c72ee6f00c..d7847f1012 100644
--- a/crates/gpui/src/platform/test/text_system.rs
+++ b/crates/gpui/src/platform/test/text_system.rs
@@ -3,13 +3,13 @@ use crate::{
     PlatformTextSystem, RenderGlyphParams, Size,
 };
 use anyhow::Result;
-use std::sync::Arc;
+use std::borrow::Cow;
 
 pub(crate) struct TestTextSystem {}
 
 #[allow(unused)]
 impl PlatformTextSystem for TestTextSystem {
-    fn add_fonts(&self, fonts: &[Arc<Vec<u8>>]) -> Result<()> {
+    fn add_fonts(&self, fonts: Vec<Cow<'static, [u8]>>) -> Result<()> {
         unimplemented!()
     }
     fn all_font_names(&self) -> Vec<String> {
diff --git a/crates/live_kit_client/Cargo.toml b/crates/live_kit_client/Cargo.toml
index 3aeba54af0..a187a17292 100644
--- a/crates/live_kit_client/Cargo.toml
+++ b/crates/live_kit_client/Cargo.toml
@@ -19,7 +19,7 @@ test-support = [
     "collections/test-support",
     "gpui/test-support",
     "live_kit_server",
-    "nanoid",
+    #"nanoid",
 ]
 
 [dependencies]
@@ -32,7 +32,7 @@ gpui = { path = "../gpui", optional = true }
 live_kit_server = { path = "../live_kit_server", optional = true }
 log.workspace = true
 media = { path = "../media" }
-nanoid = { version ="0.4", optional = true}
+nanoid = "0.4" #TODO: optional
 parking_lot.workspace = true
 postage.workspace = true
 
diff --git a/crates/live_kit_client/src/test.rs b/crates/live_kit_client/src/test.rs
index 0de5bada34..aa2c91febb 100644
--- a/crates/live_kit_client/src/test.rs
+++ b/crates/live_kit_client/src/test.rs
@@ -3,7 +3,7 @@ use anyhow::{anyhow, Context, Result};
 use async_trait::async_trait;
 use collections::{BTreeMap, HashMap, HashSet};
 use futures::Stream;
-use gpui::BackgroundExecutor;
+use gpui::{BackgroundExecutor, ImageSource};
 use live_kit_server::{proto, token};
 #[cfg(target_os = "macos")]
 use media::core_video::CVImageBuffer;
@@ -846,8 +846,7 @@ impl Frame {
         self.height
     }
 
-    #[cfg(target_os = "macos")]
-    pub fn image(&self) -> CVImageBuffer {
+    pub fn image(&self) -> ImageSource {
         unimplemented!("you can't call this in test mode")
     }
 }
diff --git a/crates/media/src/media.rs b/crates/media/src/media.rs
index 8d24e45cf2..8757249c31 100644
--- a/crates/media/src/media.rs
+++ b/crates/media/src/media.rs
@@ -8,6 +8,7 @@ use core_foundation::{
     base::{CFTypeID, TCFType},
     declare_TCFType, impl_CFTypeDescription, impl_TCFType,
 };
+#[cfg(target_os = "macos")]
 use std::ffi::c_void;
 
 #[cfg(target_os = "macos")]
diff --git a/crates/project/src/terminals.rs b/crates/project/src/terminals.rs
index 0f314f5033..8c5156f3cb 100644
--- a/crates/project/src/terminals.rs
+++ b/crates/project/src/terminals.rs
@@ -124,7 +124,7 @@ impl Project {
             // Paths are not strings so we need to jump through some hoops to format the command without `format!`
             let mut command = Vec::from(activate_command.as_bytes());
             command.push(b' ');
-            command.extend_from_slice(activate_script.as_os_str().as_bytes());
+            command.extend_from_slice(activate_script.as_os_str().as_encoded_bytes());
             command.push(b'\n');
 
             terminal_handle.update(cx, |this, _| this.input_bytes(command));
diff --git a/crates/zed/src/app_menus.rs b/crates/zed/src/app_menus.rs
index fc063a620f..40d20d61ef 100644
--- a/crates/zed/src/app_menus.rs
+++ b/crates/zed/src/app_menus.rs
@@ -1,6 +1,5 @@
 use gpui::{Menu, MenuItem, OsAction};
 
-#[cfg(target_os = "macos")]
 pub fn app_menus() -> Vec<Menu<'static>> {
     use zed_actions::Quit;
 
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 1666b23f07..1ae1feffde 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -11,6 +11,7 @@ use db::kvp::KEY_VALUE_STORE;
 use editor::Editor;
 use env_logger::Builder;
 use fs::RealFs;
+#[cfg(target_os = "macos")]
 use fsevent::StreamFlags;
 use futures::StreamExt;
 use gpui::{App, AppContext, AsyncAppContext, Context, SemanticVersion, Task};
@@ -173,6 +174,7 @@ fn main() {
         assistant::init(cx);
 
         load_user_themes_in_background(fs.clone(), cx);
+        #[cfg(target_os = "macos")]
         watch_themes(fs.clone(), cx);
 
         cx.spawn(|_| watch_languages(fs.clone(), languages.clone()))
@@ -916,6 +918,7 @@ fn load_user_themes_in_background(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {
 }
 
 /// Spawns a background task to watch the themes directory for changes.
+#[cfg(target_os = "macos")]
 fn watch_themes(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {
     cx.spawn(|cx| async move {
         let mut events = fs

From d08d4174a59b0b09d1295ee065ee48ff2b216212 Mon Sep 17 00:00:00 2001
From: Rashid Almheiri <69181766+huwaireb@users.noreply.github.com>
Date: Sat, 3 Feb 2024 14:04:15 +0400
Subject: [PATCH 202/372] Modify the default tab size of OCaml & OCaml
 Interface to 2 (#7315)

Thanks @pseudomata for the heads up.

Release Notes:
- N/A
---
 assets/settings/default.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 4a81cfbe69..3e1e35cc47 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -502,6 +502,12 @@
     },
     "JSON": {
       "tab_size": 2
+    },
+    "OCaml": {
+      "tab_size": 2
+    },
+    "OCaml Interface": {
+      "tab_size": 2
     }
   },
   // Zed's Prettier integration settings.

From c906fd232df79799f0f416229f428b19b5ed9992 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Sat, 3 Feb 2024 05:27:08 -0700
Subject: [PATCH 203/372] Reduce GPU memory usage  (#7319)

This pull request decreases the size of each instance buffer and shares
instance buffers across windows.

Release Notes:

- Improved GPU memory usage.

---------

Co-authored-by: Nathan Sobo <nathan@zed.dev>
---
 .../gpui/src/platform/mac/metal_renderer.rs   | 24 ++++++++++---------
 crates/gpui/src/platform/mac/platform.rs      | 10 +++++++-
 crates/gpui/src/platform/mac/window.rs        |  3 ++-
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/crates/gpui/src/platform/mac/metal_renderer.rs b/crates/gpui/src/platform/mac/metal_renderer.rs
index aa9992dfda..13db1bfff1 100644
--- a/crates/gpui/src/platform/mac/metal_renderer.rs
+++ b/crates/gpui/src/platform/mac/metal_renderer.rs
@@ -24,7 +24,7 @@ const SHADERS_METALLIB: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/shader
 #[cfg(feature = "runtime_shaders")]
 const SHADERS_SOURCE_FILE: &'static str =
     include_str!(concat!(env!("OUT_DIR"), "/stitched_shaders.metal"));
-const INSTANCE_BUFFER_SIZE: usize = 32 * 1024 * 1024; // This is an arbitrary decision. There's probably a more optimal value (maybe even we could adjust dynamically...)
+const INSTANCE_BUFFER_SIZE: usize = 2 * 1024 * 1024; // This is an arbitrary decision. There's probably a more optimal value (maybe even we could adjust dynamically...)
 
 pub(crate) struct MetalRenderer {
     device: metal::Device,
@@ -40,13 +40,13 @@ pub(crate) struct MetalRenderer {
     surfaces_pipeline_state: metal::RenderPipelineState,
     unit_vertices: metal::Buffer,
     #[allow(clippy::arc_with_non_send_sync)]
-    instance_buffers: Arc<Mutex<Vec<metal::Buffer>>>,
+    instance_buffer_pool: Arc<Mutex<Vec<metal::Buffer>>>,
     sprite_atlas: Arc<MetalAtlas>,
     core_video_texture_cache: CVMetalTextureCache,
 }
 
 impl MetalRenderer {
-    pub fn new(is_opaque: bool) -> Self {
+    pub fn new(instance_buffer_pool: Arc<Mutex<Vec<metal::Buffer>>>) -> Self {
         let device: metal::Device = if let Some(device) = metal::Device::system_default() {
             device
         } else {
@@ -58,7 +58,7 @@ impl MetalRenderer {
         layer.set_device(&device);
         layer.set_pixel_format(MTLPixelFormat::BGRA8Unorm);
         layer.set_presents_with_transaction(true);
-        layer.set_opaque(is_opaque);
+        layer.set_opaque(true);
         unsafe {
             let _: () = msg_send![&*layer, setAllowsNextDrawableTimeout: NO];
             let _: () = msg_send![&*layer, setNeedsDisplayOnBoundsChange: YES];
@@ -181,7 +181,7 @@ impl MetalRenderer {
             polychrome_sprites_pipeline_state,
             surfaces_pipeline_state,
             unit_vertices,
-            instance_buffers: Arc::default(),
+            instance_buffer_pool,
             sprite_atlas,
             core_video_texture_cache,
         }
@@ -211,7 +211,7 @@ impl MetalRenderer {
             );
             return;
         };
-        let mut instance_buffer = self.instance_buffers.lock().pop().unwrap_or_else(|| {
+        let mut instance_buffer = self.instance_buffer_pool.lock().pop().unwrap_or_else(|| {
             self.device.new_buffer(
                 INSTANCE_BUFFER_SIZE as u64,
                 MTLResourceOptions::StorageModeManaged,
@@ -227,7 +227,8 @@ impl MetalRenderer {
             &mut instance_offset,
             command_buffer,
         ) else {
-            panic!("failed to rasterize {} paths", scene.paths().len());
+            log::error!("failed to rasterize {} paths", scene.paths().len());
+            return;
         };
 
         let render_pass_descriptor = metal::RenderPassDescriptor::new();
@@ -314,7 +315,7 @@ impl MetalRenderer {
             };
 
             if !ok {
-                panic!("scene too large: {} paths, {} shadows, {} quads, {} underlines, {} mono, {} poly, {} surfaces",
+                log::error!("scene too large: {} paths, {} shadows, {} quads, {} underlines, {} mono, {} poly, {} surfaces",
                     scene.paths.len(),
                     scene.shadows.len(),
                     scene.quads.len(),
@@ -322,7 +323,8 @@ impl MetalRenderer {
                     scene.monochrome_sprites.len(),
                     scene.polychrome_sprites.len(),
                     scene.surfaces.len(),
-                )
+                );
+                break;
             }
         }
 
@@ -333,11 +335,11 @@ impl MetalRenderer {
             length: instance_offset as NSUInteger,
         });
 
-        let instance_buffers = self.instance_buffers.clone();
+        let instance_buffer_pool = self.instance_buffer_pool.clone();
         let instance_buffer = Cell::new(Some(instance_buffer));
         let block = ConcreteBlock::new(move |_| {
             if let Some(instance_buffer) = instance_buffer.take() {
-                instance_buffers.lock().push(instance_buffer);
+                instance_buffer_pool.lock().push(instance_buffer);
             }
         });
         let block = block.copy();
diff --git a/crates/gpui/src/platform/mac/platform.rs b/crates/gpui/src/platform/mac/platform.rs
index 7c6f3df266..0e3864065f 100644
--- a/crates/gpui/src/platform/mac/platform.rs
+++ b/crates/gpui/src/platform/mac/platform.rs
@@ -146,6 +146,7 @@ pub(crate) struct MacPlatformState {
     foreground_executor: ForegroundExecutor,
     text_system: Arc<MacTextSystem>,
     display_linker: MacDisplayLinker,
+    instance_buffer_pool: Arc<Mutex<Vec<metal::Buffer>>>,
     pasteboard: id,
     text_hash_pasteboard_type: id,
     metadata_pasteboard_type: id,
@@ -176,6 +177,7 @@ impl MacPlatform {
             foreground_executor: ForegroundExecutor::new(dispatcher),
             text_system: Arc::new(MacTextSystem::new()),
             display_linker: MacDisplayLinker::new(),
+            instance_buffer_pool: Arc::default(),
             pasteboard: unsafe { NSPasteboard::generalPasteboard(nil) },
             text_hash_pasteboard_type: unsafe { ns_string("zed-text-hash") },
             metadata_pasteboard_type: unsafe { ns_string("zed-metadata") },
@@ -494,7 +496,13 @@ impl Platform for MacPlatform {
         handle: AnyWindowHandle,
         options: WindowOptions,
     ) -> Box<dyn PlatformWindow> {
-        Box::new(MacWindow::open(handle, options, self.foreground_executor()))
+        let instance_buffer_pool = self.0.lock().instance_buffer_pool.clone();
+        Box::new(MacWindow::open(
+            handle,
+            options,
+            self.foreground_executor(),
+            instance_buffer_pool,
+        ))
     }
 
     fn set_display_link_output_callback(
diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index 0e12dc4af0..bb8c08a879 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -459,6 +459,7 @@ impl MacWindow {
         handle: AnyWindowHandle,
         options: WindowOptions,
         executor: ForegroundExecutor,
+        instance_buffer_pool: Arc<Mutex<Vec<metal::Buffer>>>,
     ) -> Self {
         unsafe {
             let pool = NSAutoreleasePool::new(nil);
@@ -535,7 +536,7 @@ impl MacWindow {
                 native_window,
                 native_view: NonNull::new_unchecked(native_view as *mut _),
                 display_link,
-                renderer: MetalRenderer::new(true),
+                renderer: MetalRenderer::new(instance_buffer_pool),
                 kind: options.kind,
                 request_frame_callback: None,
                 event_callback: None,

From 54aecd21ecc80642eed28a897b5e4760a69e89cd Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Sat, 3 Feb 2024 05:41:58 -0700
Subject: [PATCH 204/372] Remove unnecessary `focus_invalidated` field (#7320)

I believe at some point this was used for tests but it doesn't seem
necessary anymore.

Release Notes:

- N/A
---
 crates/gpui/src/app.rs    |  2 +-
 crates/gpui/src/window.rs | 17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 56d66f9b0b..8d6f70f27e 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -658,7 +658,7 @@ impl AppContext {
                     .values()
                     .filter_map(|window| {
                         let window = window.as_ref()?;
-                        (window.dirty.get() || window.focus_invalidated).then_some(window.handle)
+                        window.dirty.get().then_some(window.handle)
                     })
                     .collect::<Vec<_>>()
                 {
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index afc2235fe6..19ed1c9099 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -280,9 +280,6 @@ pub struct Window {
     pub(crate) focus: Option<FocusId>,
     focus_enabled: bool,
     pending_input: Option<PendingInput>,
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub(crate) focus_invalidated: bool,
 }
 
 #[derive(Default, Debug)]
@@ -451,9 +448,6 @@ impl Window {
             focus: None,
             focus_enabled: true,
             pending_input: None,
-
-            #[cfg(any(test, feature = "test-support"))]
-            focus_invalidated: false,
         }
     }
 }
@@ -538,12 +532,6 @@ impl<'a> WindowContext<'a> {
             .rendered_frame
             .dispatch_tree
             .clear_pending_keystrokes();
-
-        #[cfg(any(test, feature = "test-support"))]
-        {
-            self.window.focus_invalidated = true;
-        }
-
         self.refresh();
     }
 
@@ -985,11 +973,6 @@ impl<'a> WindowContext<'a> {
         self.window.dirty.set(false);
         self.window.drawing = true;
 
-        #[cfg(any(test, feature = "test-support"))]
-        {
-            self.window.focus_invalidated = false;
-        }
-
         if let Some(requested_handler) = self.window.rendered_frame.requested_input_handler.as_mut()
         {
             let input_handler = self.window.platform_window.take_input_handler();

From 06674a21f9fd891e22a1130a17f27a04a06fc2c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robin=20Pf=C3=A4ffle?=
 <67913738+rpfaeffle@users.noreply.github.com>
Date: Sat, 3 Feb 2024 16:04:27 +0100
Subject: [PATCH 205/372] Add support for relative terminal links (#7303)

Allow opening file paths relative to terminal's cwd


https://github.com/zed-industries/zed/assets/67913738/413a1107-541e-4c25-ae7c-cbe45469d452


Release Notes:

- Added support for opening file paths relative to terminal's cwd
([#7144](https://github.com/zed-industries/zed/issues/7144)).

---------

Co-authored-by: Kirill <kirill@zed.dev>
---
 Cargo.lock                                |   1 +
 crates/terminal/src/terminal.rs           |  27 ++-
 crates/terminal_view/Cargo.toml           |   1 +
 crates/terminal_view/src/terminal_view.rs | 216 ++++++++++++++--------
 crates/util/src/paths.rs                  |   2 +-
 5 files changed, 168 insertions(+), 79 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 14b5882ff9..242e3d4704 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8133,6 +8133,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "client",
+ "collections",
  "db",
  "dirs 4.0.0",
  "editor",
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index 5bc8d00e52..ad9587a326 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -86,6 +86,15 @@ pub enum Event {
     Open(MaybeNavigationTarget),
 }
 
+#[derive(Clone, Debug)]
+pub struct PathLikeTarget {
+    /// File system path, absolute or relative, existing or not.
+    /// Might have line and column number(s) attached as `file.rs:1:23`
+    pub maybe_path: String,
+    /// Current working directory of the terminal
+    pub terminal_dir: Option<PathBuf>,
+}
+
 /// A string inside terminal, potentially useful as a URI that can be opened.
 #[derive(Clone, Debug)]
 pub enum MaybeNavigationTarget {
@@ -93,7 +102,7 @@ pub enum MaybeNavigationTarget {
     Url(String),
     /// File system path, absolute or relative, existing or not.
     /// Might have line and column number(s) attached as `file.rs:1:23`
-    PathLike(String),
+    PathLike(PathLikeTarget),
 }
 
 #[derive(Clone)]
@@ -626,6 +635,12 @@ impl Terminal {
         }
     }
 
+    fn get_cwd(&self) -> Option<PathBuf> {
+        self.foreground_process_info
+            .as_ref()
+            .map(|info| info.cwd.clone())
+    }
+
     ///Takes events from Alacritty and translates them to behavior on this view
     fn process_terminal_event(
         &mut self,
@@ -800,7 +815,10 @@ impl Terminal {
                             let target = if is_url {
                                 MaybeNavigationTarget::Url(maybe_url_or_path)
                             } else {
-                                MaybeNavigationTarget::PathLike(maybe_url_or_path)
+                                MaybeNavigationTarget::PathLike(PathLikeTarget {
+                                    maybe_path: maybe_url_or_path,
+                                    terminal_dir: self.get_cwd(),
+                                })
                             };
                             cx.emit(Event::Open(target));
                         } else {
@@ -852,7 +870,10 @@ impl Terminal {
         let navigation_target = if is_url {
             MaybeNavigationTarget::Url(word)
         } else {
-            MaybeNavigationTarget::PathLike(word)
+            MaybeNavigationTarget::PathLike(PathLikeTarget {
+                maybe_path: word,
+                terminal_dir: self.get_cwd(),
+            })
         };
         cx.emit(Event::NewNavigationTarget(Some(navigation_target)));
     }
diff --git a/crates/terminal_view/Cargo.toml b/crates/terminal_view/Cargo.toml
index dfffe3824f..134f9f08dd 100644
--- a/crates/terminal_view/Cargo.toml
+++ b/crates/terminal_view/Cargo.toml
@@ -12,6 +12,7 @@ doctest = false
 [dependencies]
 anyhow.workspace = true
 db = { path = "../db" }
+collections = { path = "../collections" }
 dirs = "4.0.0"
 editor = { path = "../editor" }
 futures.workspace = true
diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index c0074cf53a..6c7270d9b4 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -2,7 +2,9 @@ mod persistence;
 pub mod terminal_element;
 pub mod terminal_panel;
 
+use collections::HashSet;
 use editor::{scroll::Autoscroll, Editor};
+use futures::{stream::FuturesUnordered, StreamExt};
 use gpui::{
     div, impl_actions, overlay, AnyElement, AppContext, DismissEvent, EventEmitter, FocusHandle,
     FocusableView, KeyContext, KeyDownEvent, Keystroke, Model, MouseButton, MouseDownEvent, Pixels,
@@ -10,7 +12,7 @@ use gpui::{
 };
 use language::Bias;
 use persistence::TERMINAL_DB;
-use project::{search::SearchQuery, LocalWorktree, Project};
+use project::{search::SearchQuery, Fs, LocalWorktree, Metadata, Project};
 use terminal::{
     alacritty_terminal::{
         index::Point,
@@ -177,8 +179,21 @@ impl TerminalView {
             Event::NewNavigationTarget(maybe_navigation_target) => {
                 this.can_navigate_to_selected_word = match maybe_navigation_target {
                     Some(MaybeNavigationTarget::Url(_)) => true,
-                    Some(MaybeNavigationTarget::PathLike(maybe_path)) => {
-                        !possible_open_targets(&workspace, maybe_path, cx).is_empty()
+                    Some(MaybeNavigationTarget::PathLike(path_like_target)) => {
+                        if let Ok(fs) = workspace.update(cx, |workspace, cx| {
+                            workspace.project().read(cx).fs().clone()
+                        }) {
+                            let valid_files_to_open_task = possible_open_targets(
+                                fs,
+                                &workspace,
+                                &path_like_target.terminal_dir,
+                                &path_like_target.maybe_path,
+                                cx,
+                            );
+                            smol::block_on(valid_files_to_open_task).len() > 0
+                        } else {
+                            false
+                        }
                     }
                     None => false,
                 }
@@ -187,57 +202,60 @@ impl TerminalView {
             Event::Open(maybe_navigation_target) => match maybe_navigation_target {
                 MaybeNavigationTarget::Url(url) => cx.open_url(url),
 
-                MaybeNavigationTarget::PathLike(maybe_path) => {
+                MaybeNavigationTarget::PathLike(path_like_target) => {
                     if !this.can_navigate_to_selected_word {
                         return;
                     }
-                    let potential_abs_paths = possible_open_targets(&workspace, maybe_path, cx);
-                    if let Some(path) = potential_abs_paths.into_iter().next() {
-                        let task_workspace = workspace.clone();
-                        cx.spawn(|_, mut cx| async move {
-                            let fs = task_workspace.update(&mut cx, |workspace, cx| {
-                                workspace.project().read(cx).fs().clone()
-                            })?;
-                            let is_dir = fs
-                                .metadata(&path.path_like)
-                                .await?
-                                .with_context(|| {
-                                    format!("Missing metadata for file {:?}", path.path_like)
-                                })?
-                                .is_dir;
-                            let opened_items = task_workspace
-                                .update(&mut cx, |workspace, cx| {
-                                    workspace.open_paths(
-                                        vec![path.path_like],
-                                        OpenVisible::OnlyDirectories,
-                                        None,
-                                        cx,
-                                    )
-                                })
-                                .context("workspace update")?
-                                .await;
-                            anyhow::ensure!(
-                                opened_items.len() == 1,
-                                "For a single path open, expected single opened item"
-                            );
-                            let opened_item = opened_items
-                                .into_iter()
-                                .next()
-                                .unwrap()
-                                .transpose()
-                                .context("path open")?;
-                            if is_dir {
-                                task_workspace.update(&mut cx, |workspace, cx| {
-                                    workspace.project().update(cx, |_, cx| {
-                                        cx.emit(project::Event::ActivateProjectPanel);
-                                    })
-                                })?;
-                            } else {
+                    let task_workspace = workspace.clone();
+                    let Some(fs) = workspace
+                        .update(cx, |workspace, cx| {
+                            workspace.project().read(cx).fs().clone()
+                        })
+                        .ok()
+                    else {
+                        return;
+                    };
+
+                    let path_like_target = path_like_target.clone();
+                    cx.spawn(|terminal_view, mut cx| async move {
+                        let valid_files_to_open = terminal_view
+                            .update(&mut cx, |_, cx| {
+                                possible_open_targets(
+                                    fs,
+                                    &task_workspace,
+                                    &path_like_target.terminal_dir,
+                                    &path_like_target.maybe_path,
+                                    cx,
+                                )
+                            })?
+                            .await;
+                        let paths_to_open = valid_files_to_open
+                            .iter()
+                            .map(|(p, _)| p.path_like.clone())
+                            .collect();
+                        let opened_items = task_workspace
+                            .update(&mut cx, |workspace, cx| {
+                                workspace.open_paths(
+                                    paths_to_open,
+                                    OpenVisible::OnlyDirectories,
+                                    None,
+                                    cx,
+                                )
+                            })
+                            .context("workspace update")?
+                            .await;
+
+                        let mut has_dirs = false;
+                        for ((path, metadata), opened_item) in valid_files_to_open
+                            .into_iter()
+                            .zip(opened_items.into_iter())
+                        {
+                            if metadata.is_dir {
+                                has_dirs = true;
+                            } else if let Some(Ok(opened_item)) = opened_item {
                                 if let Some(row) = path.row {
                                     let col = path.column.unwrap_or(0);
-                                    if let Some(active_editor) =
-                                        opened_item.and_then(|item| item.downcast::<Editor>())
-                                    {
+                                    if let Some(active_editor) = opened_item.downcast::<Editor>() {
                                         active_editor
                                             .downgrade()
                                             .update(&mut cx, |editor, cx| {
@@ -259,10 +277,19 @@ impl TerminalView {
                                     }
                                 }
                             }
-                            anyhow::Ok(())
-                        })
-                        .detach_and_log_err(cx);
-                    }
+                        }
+
+                        if has_dirs {
+                            task_workspace.update(&mut cx, |workspace, cx| {
+                                workspace.project().update(cx, |_, cx| {
+                                    cx.emit(project::Event::ActivateProjectPanel);
+                                })
+                            })?;
+                        }
+
+                        anyhow::Ok(())
+                    })
+                    .detach_and_log_err(cx)
                 }
             },
             Event::BreadcrumbsChanged => cx.emit(ItemEvent::UpdateBreadcrumbs),
@@ -554,48 +581,87 @@ impl TerminalView {
     }
 }
 
+fn possible_open_paths_metadata(
+    fs: Arc<dyn Fs>,
+    row: Option<u32>,
+    column: Option<u32>,
+    potential_paths: HashSet<PathBuf>,
+    cx: &mut ViewContext<TerminalView>,
+) -> Task<Vec<(PathLikeWithPosition<PathBuf>, Metadata)>> {
+    cx.background_executor().spawn(async move {
+        let mut paths_with_metadata = Vec::with_capacity(potential_paths.len());
+
+        let mut fetch_metadata_tasks = potential_paths
+            .into_iter()
+            .map(|potential_path| async {
+                let metadata = fs.metadata(&potential_path).await.ok().flatten();
+                (
+                    PathLikeWithPosition {
+                        path_like: potential_path,
+                        row,
+                        column,
+                    },
+                    metadata,
+                )
+            })
+            .collect::<FuturesUnordered<_>>();
+
+        while let Some((path, metadata)) = fetch_metadata_tasks.next().await {
+            if let Some(metadata) = metadata {
+                paths_with_metadata.push((path, metadata));
+            }
+        }
+
+        paths_with_metadata
+    })
+}
+
 fn possible_open_targets(
+    fs: Arc<dyn Fs>,
     workspace: &WeakView<Workspace>,
+    cwd: &Option<PathBuf>,
     maybe_path: &String,
-    cx: &mut ViewContext<'_, TerminalView>,
-) -> Vec<PathLikeWithPosition<PathBuf>> {
+    cx: &mut ViewContext<TerminalView>,
+) -> Task<Vec<(PathLikeWithPosition<PathBuf>, Metadata)>> {
     let path_like = PathLikeWithPosition::parse_str(maybe_path.as_str(), |path_str| {
         Ok::<_, std::convert::Infallible>(Path::new(path_str).to_path_buf())
     })
     .expect("infallible");
+    let row = path_like.row;
+    let column = path_like.column;
     let maybe_path = path_like.path_like;
     let potential_abs_paths = if maybe_path.is_absolute() {
-        vec![maybe_path]
+        HashSet::from_iter([maybe_path])
     } else if maybe_path.starts_with("~") {
         if let Some(abs_path) = maybe_path
             .strip_prefix("~")
             .ok()
             .and_then(|maybe_path| Some(dirs::home_dir()?.join(maybe_path)))
         {
-            vec![abs_path]
+            HashSet::from_iter([abs_path])
         } else {
-            Vec::new()
+            HashSet::default()
         }
-    } else if let Some(workspace) = workspace.upgrade() {
-        workspace.update(cx, |workspace, cx| {
-            workspace
-                .worktrees(cx)
-                .map(|worktree| worktree.read(cx).abs_path().join(&maybe_path))
-                .collect()
-        })
     } else {
-        Vec::new()
+        // First check cwd and then workspace
+        let mut potential_cwd_and_workspace_paths = HashSet::default();
+        if let Some(cwd) = cwd {
+            potential_cwd_and_workspace_paths.insert(Path::join(cwd, &maybe_path));
+        }
+        if let Some(workspace) = workspace.upgrade() {
+            workspace.update(cx, |workspace, cx| {
+                for potential_worktree_path in workspace
+                    .worktrees(cx)
+                    .map(|worktree| worktree.read(cx).abs_path().join(&maybe_path))
+                {
+                    potential_cwd_and_workspace_paths.insert(potential_worktree_path);
+                }
+            });
+        }
+        potential_cwd_and_workspace_paths
     };
 
-    potential_abs_paths
-        .into_iter()
-        .filter(|path| path.exists())
-        .map(|path| PathLikeWithPosition {
-            path_like: path,
-            row: path_like.row,
-            column: path_like.column,
-        })
-        .collect()
+    possible_open_paths_metadata(fs, row, column, potential_abs_paths, cx)
 }
 
 pub fn regex_search_for_query(query: &project::search::SearchQuery) -> Option<RegexSearch> {
diff --git a/crates/util/src/paths.rs b/crates/util/src/paths.rs
index 6e7fc3f653..cd839ae50e 100644
--- a/crates/util/src/paths.rs
+++ b/crates/util/src/paths.rs
@@ -121,7 +121,7 @@ pub const FILE_ROW_COLUMN_DELIMITER: char = ':';
 
 /// A representation of a path-like string with optional row and column numbers.
 /// Matching values example: `te`, `test.rs:22`, `te:22:5`, etc.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Hash)]
 pub struct PathLikeWithPosition<P> {
     pub path_like: P,
     pub row: Option<u32>,

From 1ab0af2fa35d1a576ea1094089f9cd3ba3eceeda Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Sat, 3 Feb 2024 18:32:56 +0200
Subject: [PATCH 206/372] Revert the commit that broke Zed display capabilities
 (#7326)

---
 crates/gpui/src/app.rs                  | 13 +++++--
 crates/gpui/src/platform.rs             |  1 +
 crates/gpui/src/platform/mac/window.rs  | 20 +++++-----
 crates/gpui/src/platform/test/window.rs |  2 +
 crates/gpui/src/window.rs               | 51 ++++++++-----------------
 5 files changed, 37 insertions(+), 50 deletions(-)

diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 8d6f70f27e..9f92445045 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -652,20 +652,27 @@ impl AppContext {
                     }
                 }
             } else {
+                for window in self.windows.values() {
+                    if let Some(window) = window.as_ref() {
+                        if window.dirty {
+                            window.platform_window.invalidate();
+                        }
+                    }
+                }
+
                 #[cfg(any(test, feature = "test-support"))]
                 for window in self
                     .windows
                     .values()
                     .filter_map(|window| {
                         let window = window.as_ref()?;
-                        window.dirty.get().then_some(window.handle)
+                        (window.dirty || window.focus_invalidated).then_some(window.handle)
                     })
                     .collect::<Vec<_>>()
                 {
                     self.update_window(window, |_, cx| cx.draw()).unwrap();
                 }
 
-                #[allow(clippy::collapsible_else_if)]
                 if self.pending_effects.is_empty() {
                     break;
                 }
@@ -742,7 +749,7 @@ impl AppContext {
     fn apply_refresh_effect(&mut self) {
         for window in self.windows.values_mut() {
             if let Some(window) = window.as_mut() {
-                window.dirty.set(true);
+                window.dirty = true;
             }
         }
     }
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 62ac543319..df886fc4d6 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -175,6 +175,7 @@ pub(crate) trait PlatformWindow: HasWindowHandle + HasDisplayHandle {
     fn on_close(&self, callback: Box<dyn FnOnce()>);
     fn on_appearance_changed(&self, callback: Box<dyn FnMut()>);
     fn is_topmost_for_position(&self, position: Point<Pixels>) -> bool;
+    fn invalidate(&self);
     fn draw(&self, scene: &Scene);
 
     fn sprite_atlas(&self) -> Arc<dyn PlatformAtlas>;
diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index bb8c08a879..ac3ce4c575 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -16,8 +16,8 @@ use cocoa::{
     },
     base::{id, nil},
     foundation::{
-        NSArray, NSAutoreleasePool, NSDefaultRunLoopMode, NSDictionary, NSFastEnumeration,
-        NSInteger, NSPoint, NSRect, NSSize, NSString, NSUInteger,
+        NSArray, NSAutoreleasePool, NSDictionary, NSFastEnumeration, NSInteger, NSPoint, NSRect,
+        NSSize, NSString, NSUInteger,
     },
 };
 use core_graphics::display::CGRect;
@@ -321,7 +321,6 @@ struct MacWindowState {
     executor: ForegroundExecutor,
     native_window: id,
     native_view: NonNull<id>,
-    display_link: id,
     renderer: MetalRenderer,
     kind: WindowKind,
     request_frame_callback: Option<Box<dyn FnMut()>>,
@@ -524,10 +523,6 @@ impl MacWindow {
             let native_view: id = msg_send![VIEW_CLASS, alloc];
             let native_view = NSView::init(native_view);
 
-            let display_link: id = msg_send![class!(CADisplayLink), displayLinkWithTarget: native_view selector: sel!(displayLayer:)];
-            let main_run_loop: id = msg_send![class!(NSRunLoop), mainRunLoop];
-            let _: () =
-                msg_send![display_link, addToRunLoop: main_run_loop forMode: NSDefaultRunLoopMode];
             assert!(!native_view.is_null());
 
             let window = Self(Arc::new(Mutex::new(MacWindowState {
@@ -535,7 +530,6 @@ impl MacWindow {
                 executor,
                 native_window,
                 native_view: NonNull::new_unchecked(native_view as *mut _),
-                display_link,
                 renderer: MetalRenderer::new(instance_buffer_pool),
                 kind: options.kind,
                 request_frame_callback: None,
@@ -694,9 +688,6 @@ impl Drop for MacWindow {
     fn drop(&mut self) {
         let this = self.0.lock();
         let window = this.native_window;
-        unsafe {
-            let _: () = msg_send![this.display_link, invalidate];
-        }
         this.executor
             .spawn(async move {
                 unsafe {
@@ -1010,6 +1001,13 @@ impl PlatformWindow for MacWindow {
         }
     }
 
+    fn invalidate(&self) {
+        let this = self.0.lock();
+        unsafe {
+            let _: () = msg_send![this.native_window.contentView(), setNeedsDisplay: YES];
+        }
+    }
+
     fn draw(&self, scene: &crate::Scene) {
         let mut this = self.0.lock();
         this.renderer.draw(scene);
diff --git a/crates/gpui/src/platform/test/window.rs b/crates/gpui/src/platform/test/window.rs
index d56851c8b9..d5d62e0155 100644
--- a/crates/gpui/src/platform/test/window.rs
+++ b/crates/gpui/src/platform/test/window.rs
@@ -282,6 +282,8 @@ impl PlatformWindow for TestWindow {
         unimplemented!()
     }
 
+    fn invalidate(&self) {}
+
     fn draw(&self, _scene: &crate::Scene) {}
 
     fn sprite_atlas(&self) -> sync::Arc<dyn crate::PlatformAtlas> {
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 19ed1c9099..8b10f5d8f4 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -22,7 +22,7 @@ use smallvec::SmallVec;
 use std::{
     any::{Any, TypeId},
     borrow::{Borrow, BorrowMut},
-    cell::{Cell, RefCell},
+    cell::RefCell,
     collections::hash_map::Entry,
     fmt::{Debug, Display},
     future::Future,
@@ -34,7 +34,7 @@ use std::{
         atomic::{AtomicUsize, Ordering::SeqCst},
         Arc,
     },
-    time::{Duration, Instant},
+    time::Duration,
 };
 use util::{measure, ResultExt};
 
@@ -272,8 +272,7 @@ pub struct Window {
     appearance: WindowAppearance,
     appearance_observers: SubscriberSet<(), AnyObserver>,
     active: bool,
-    pub(crate) dirty: Rc<Cell<bool>>,
-    pub(crate) last_input_timestamp: Rc<Cell<Instant>>,
+    pub(crate) dirty: bool,
     pub(crate) refreshing: bool,
     pub(crate) drawing: bool,
     activation_observers: SubscriberSet<(), AnyObserver>,
@@ -340,28 +339,13 @@ impl Window {
         let bounds = platform_window.bounds();
         let appearance = platform_window.appearance();
         let text_system = Arc::new(WindowTextSystem::new(cx.text_system().clone()));
-        let dirty = Rc::new(Cell::new(false));
-        let last_input_timestamp = Rc::new(Cell::new(Instant::now()));
 
         platform_window.on_request_frame(Box::new({
             let mut cx = cx.to_async();
-            let dirty = dirty.clone();
-            let last_input_timestamp = last_input_timestamp.clone();
             move || {
-                if dirty.get() {
-                    measure("frame duration", || {
-                        handle
-                            .update(&mut cx, |_, cx| {
-                                cx.draw();
-                                cx.present();
-                            })
-                            .log_err();
-                    })
-                } else if last_input_timestamp.get().elapsed() < Duration::from_secs(2) {
-                    // Keep presenting the current scene for 2 extra seconds since the
-                    // last input to prevent the display from underclocking the refresh rate.
-                    handle.update(&mut cx, |_, cx| cx.present()).log_err();
-                }
+                measure("frame duration", || {
+                    handle.update(&mut cx, |_, cx| cx.draw()).log_err();
+                })
             }
         }));
         platform_window.on_resize(Box::new({
@@ -440,8 +424,7 @@ impl Window {
             appearance,
             appearance_observers: SubscriberSet::new(),
             active: false,
-            dirty,
-            last_input_timestamp,
+            dirty: false,
             refreshing: false,
             drawing: false,
             activation_observers: SubscriberSet::new(),
@@ -499,7 +482,7 @@ impl<'a> WindowContext<'a> {
     pub fn refresh(&mut self) {
         if !self.window.drawing {
             self.window.refreshing = true;
-            self.window.dirty.set(true);
+            self.window.dirty = true;
         }
     }
 
@@ -967,10 +950,9 @@ impl<'a> WindowContext<'a> {
         &self.window.next_frame.z_index_stack
     }
 
-    /// Produces a new frame and assigns it to `rendered_frame`. To actually show
-    /// the contents of the new [Scene], use [present].
+    /// Draw pixels to the display for this window based on the contents of its scene.
     pub(crate) fn draw(&mut self) {
-        self.window.dirty.set(false);
+        self.window.dirty = false;
         self.window.drawing = true;
 
         if let Some(requested_handler) = self.window.rendered_frame.requested_input_handler.as_mut()
@@ -1106,19 +1088,16 @@ impl<'a> WindowContext<'a> {
                 .clone()
                 .retain(&(), |listener| listener(&event, self));
         }
+
+        self.window
+            .platform_window
+            .draw(&self.window.rendered_frame.scene);
         self.window.refreshing = false;
         self.window.drawing = false;
     }
 
-    fn present(&self) {
-        self.window
-            .platform_window
-            .draw(&self.window.rendered_frame.scene);
-    }
-
     /// Dispatch a mouse or keyboard event on the window.
     pub fn dispatch_event(&mut self, event: PlatformInput) -> bool {
-        self.window.last_input_timestamp.set(Instant::now());
         // Handlers may set this to false by calling `stop_propagation`.
         self.app.propagate_event = true;
         // Handlers may set this to true by calling `prevent_default`.
@@ -2062,7 +2041,7 @@ impl<'a, V: 'static> ViewContext<'a, V> {
         }
 
         if !self.window.drawing {
-            self.window_cx.window.dirty.set(true);
+            self.window_cx.window.dirty = true;
             self.window_cx.app.push_effect(Effect::Notify {
                 emitter: self.view.model.entity_id,
             });

From c9a53b63a762ac6ca4a8bacfa3ff09409228bff2 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Sat, 3 Feb 2024 18:52:03 +0200
Subject: [PATCH 207/372] Fix the compilation error (#7328)

Follow-up of https://github.com/zed-industries/zed/pull/7326

Release Notes:

- N/A
---
 crates/gpui/src/app.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 9f92445045..4101c0b4cf 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -666,7 +666,7 @@ impl AppContext {
                     .values()
                     .filter_map(|window| {
                         let window = window.as_ref()?;
-                        (window.dirty || window.focus_invalidated).then_some(window.handle)
+                        window.dirty.then_some(window.handle)
                     })
                     .collect::<Vec<_>>()
                 {

From 55185c159ba236a8b071fa4d915091343267731a Mon Sep 17 00:00:00 2001
From: Rashid Almheiri <69181766+huwaireb@users.noreply.github.com>
Date: Sun, 4 Feb 2024 00:35:57 +0400
Subject: [PATCH 208/372] Support documentation as a resolvable property
 (#7306)

Closes #7288

<img width="1800" alt="Screenshot 2024-02-03 at 01 56 14"
src="https://github.com/zed-industries/zed/assets/69181766/ed97ef30-c958-45c8-812c-a59bbbd02b19">

Release Notes:
- Improved LSP `completionItem/resolve` request by supporting `documentation` as a resolvable property
---
 crates/lsp/src/lsp.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index b1582fbd8d..e4b95bfb21 100644
--- a/crates/lsp/src/lsp.rs
+++ b/crates/lsp/src/lsp.rs
@@ -560,7 +560,10 @@ impl LanguageServer {
                         completion_item: Some(CompletionItemCapability {
                             snippet_support: Some(true),
                             resolve_support: Some(CompletionItemCapabilityResolveSupport {
-                                properties: vec!["additionalTextEdits".to_string()],
+                                properties: vec![
+                                    "documentation".to_string(),
+                                    "additionalTextEdits".to_string(),
+                                ],
                             }),
                             ..Default::default()
                         }),

From 8da6e629143715196cb4755b4969c24a30623373 Mon Sep 17 00:00:00 2001
From: Andrew Lygin <alygin@gmail.com>
Date: Sat, 3 Feb 2024 23:40:54 +0300
Subject: [PATCH 209/372] Editor toolbar configuration (#7338)

Adds settings for hiding breadcrumbs and quick action bar from
the editor toolbar. If both elements are hidden, the toolbar disappears
completely.

Example:

```json
"toolbar": {
  "breadcrumbs": true,
  "quick_actions": false
}
```

- It intentionally doesn't hide breadcrumbs in other views (for
instance, in the search result window) because their usage there differ
from the main editor.
- The editor controls how breadcrumbs are displayed in the toolbar, so
implementation differs a bit for breadcrumbs and quick actions bar.

Release Notes:

- Added support for configuring the editor toolbar ([4756](https://github.com/zed-industries/zed/issues/4756))
---
 Cargo.lock                                    |  1 +
 assets/settings/default.json                  |  7 ++
 crates/editor/src/editor.rs                   |  7 +-
 crates/editor/src/editor_settings.rs          | 22 +++++
 crates/editor/src/items.rs                    |  6 +-
 crates/quick_action_bar/Cargo.toml            |  1 +
 .../quick_action_bar/src/quick_action_bar.rs  | 86 ++++++++++++-------
 crates/workspace/src/toolbar.rs               |  2 +-
 crates/zed/src/zed.rs                         |  2 +-
 docs/src/configuring_zed.md                   | 17 ++++
 10 files changed, 113 insertions(+), 38 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 242e3d4704..ad58e44425 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6064,6 +6064,7 @@ dependencies = [
  "editor",
  "gpui",
  "search",
+ "settings",
  "ui",
  "workspace",
 ]
diff --git a/assets/settings/default.json b/assets/settings/default.json
index 3e1e35cc47..9387c58f1d 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -109,6 +109,13 @@
     // Share your project when you are the first to join a channel
     "share_on_join": true
   },
+  // Toolbar related settings
+  "toolbar": {
+    // Whether to show breadcrumbs.
+    "breadcrumbs": true,
+    // Whether to show quick action buttons.
+    "quick_actions": true
+  },
   // Scrollbar related settings
   "scrollbar": {
     // When to show the scrollbar in the editor.
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 9c84dd0fe9..9039cc4cf0 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -374,6 +374,7 @@ pub struct Editor {
     hovered_cursors: HashMap<HoveredCursor, Task<()>>,
     pub show_local_selections: bool,
     mode: EditorMode,
+    show_breadcrumbs: bool,
     show_gutter: bool,
     show_wrap_guides: Option<bool>,
     placeholder_text: Option<Arc<str>>,
@@ -1448,6 +1449,7 @@ impl Editor {
             blink_manager: blink_manager.clone(),
             show_local_selections: true,
             mode,
+            show_breadcrumbs: EditorSettings::get_global(cx).toolbar.breadcrumbs,
             show_gutter: mode == EditorMode::Full,
             show_wrap_guides: None,
             placeholder_text: None,
@@ -8762,8 +8764,9 @@ impl Editor {
             )),
             cx,
         );
-        self.scroll_manager.vertical_scroll_margin =
-            EditorSettings::get_global(cx).vertical_scroll_margin;
+        let editor_settings = EditorSettings::get_global(cx);
+        self.scroll_manager.vertical_scroll_margin = editor_settings.vertical_scroll_margin;
+        self.show_breadcrumbs = editor_settings.toolbar.breadcrumbs;
         cx.notify();
     }
 
diff --git a/crates/editor/src/editor_settings.rs b/crates/editor/src/editor_settings.rs
index ddbcd6e4a0..074003492f 100644
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -10,6 +10,7 @@ pub struct EditorSettings {
     pub show_completion_documentation: bool,
     pub completion_documentation_secondary_query_debounce: u64,
     pub use_on_type_format: bool,
+    pub toolbar: Toolbar,
     pub scrollbar: Scrollbar,
     pub vertical_scroll_margin: f32,
     pub relative_line_numbers: bool,
@@ -29,6 +30,12 @@ pub enum SeedQuerySetting {
     Never,
 }
 
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
+pub struct Toolbar {
+    pub breadcrumbs: bool,
+    pub quick_actions: bool,
+}
+
 #[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
 pub struct Scrollbar {
     pub show: ShowScrollbar,
@@ -86,6 +93,8 @@ pub struct EditorSettingsContent {
     ///
     /// Default: true
     pub use_on_type_format: Option<bool>,
+    /// Toolbar related settings
+    pub toolbar: Option<ToolbarContent>,
     /// Scrollbar related settings
     pub scrollbar: Option<ScrollbarContent>,
 
@@ -110,6 +119,19 @@ pub struct EditorSettingsContent {
     pub redact_private_values: Option<bool>,
 }
 
+// Toolbar related settings
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
+pub struct ToolbarContent {
+    /// Whether to display breadcrumbs in the editor toolbar.
+    ///
+    /// Default: true
+    pub breadcrumbs: Option<bool>,
+    /// Whether to display quik action buttons in the editor toolbar.
+    ///
+    /// Default: true
+    pub quick_actions: Option<bool>,
+}
+
 /// Scrollbar related settings
 #[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
 pub struct ScrollbarContent {
diff --git a/crates/editor/src/items.rs b/crates/editor/src/items.rs
index e95d958db5..418307df82 100644
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -800,7 +800,11 @@ impl Item for Editor {
     }
 
     fn breadcrumb_location(&self) -> ToolbarItemLocation {
-        ToolbarItemLocation::PrimaryLeft
+        if self.show_breadcrumbs {
+            ToolbarItemLocation::PrimaryLeft
+        } else {
+            ToolbarItemLocation::Hidden
+        }
     }
 
     fn breadcrumbs(&self, variant: &Theme, cx: &AppContext) -> Option<Vec<BreadcrumbText>> {
diff --git a/crates/quick_action_bar/Cargo.toml b/crates/quick_action_bar/Cargo.toml
index 56c92be8a1..07e081acd3 100644
--- a/crates/quick_action_bar/Cargo.toml
+++ b/crates/quick_action_bar/Cargo.toml
@@ -14,6 +14,7 @@ assistant = { path = "../assistant" }
 editor = { path = "../editor" }
 gpui = { path = "../gpui" }
 search = { path = "../search" }
+settings = { path = "../settings" }
 ui = { path = "../ui" }
 workspace = { path = "../workspace" }
 
diff --git a/crates/quick_action_bar/src/quick_action_bar.rs b/crates/quick_action_bar/src/quick_action_bar.rs
index 3e49328c13..b7c783b344 100644
--- a/crates/quick_action_bar/src/quick_action_bar.rs
+++ b/crates/quick_action_bar/src/quick_action_bar.rs
@@ -1,11 +1,12 @@
 use assistant::{AssistantPanel, InlineAssist};
-use editor::Editor;
+use editor::{Editor, EditorSettings};
 
 use gpui::{
     Action, ClickEvent, ElementId, EventEmitter, InteractiveElement, ParentElement, Render, Styled,
     Subscription, View, ViewContext, WeakView,
 };
 use search::{buffer_search, BufferSearchBar};
+use settings::{Settings, SettingsStore};
 use ui::{prelude::*, ButtonSize, ButtonStyle, IconButton, IconName, IconSize, Tooltip};
 use workspace::{
     item::ItemHandle, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, Workspace,
@@ -16,16 +17,26 @@ pub struct QuickActionBar {
     active_item: Option<Box<dyn ItemHandle>>,
     _inlay_hints_enabled_subscription: Option<Subscription>,
     workspace: WeakView<Workspace>,
+    show: bool,
 }
 
 impl QuickActionBar {
-    pub fn new(buffer_search_bar: View<BufferSearchBar>, workspace: &Workspace) -> Self {
-        Self {
+    pub fn new(
+        buffer_search_bar: View<BufferSearchBar>,
+        workspace: &Workspace,
+        cx: &mut ViewContext<Self>,
+    ) -> Self {
+        let mut this = Self {
             buffer_search_bar,
             active_item: None,
             _inlay_hints_enabled_subscription: None,
             workspace: workspace.weak_handle(),
-        }
+            show: true,
+        };
+        this.apply_settings(cx);
+        cx.observe_global::<SettingsStore>(|this, cx| this.apply_settings(cx))
+            .detach();
+        this
     }
 
     fn active_editor(&self) -> Option<View<Editor>> {
@@ -33,6 +44,24 @@ impl QuickActionBar {
             .as_ref()
             .and_then(|item| item.downcast::<Editor>())
     }
+
+    fn apply_settings(&mut self, cx: &mut ViewContext<Self>) {
+        let new_show = EditorSettings::get_global(cx).toolbar.quick_actions;
+        if new_show != self.show {
+            self.show = new_show;
+            cx.emit(ToolbarItemEvent::ChangeLocation(
+                self.get_toolbar_item_location(),
+            ));
+        }
+    }
+
+    fn get_toolbar_item_location(&self) -> ToolbarItemLocation {
+        if self.show && self.active_editor().is_some() {
+            ToolbarItemLocation::PrimaryRight
+        } else {
+            ToolbarItemLocation::Hidden
+        }
+    }
 }
 
 impl Render for QuickActionBar {
@@ -40,7 +69,6 @@ impl Render for QuickActionBar {
         let Some(editor) = self.active_editor() else {
             return div().id("empty quick action bar");
         };
-
         let inlay_hints_button = Some(QuickActionBarButton::new(
             "toggle inlay hints",
             IconName::InlayHint,
@@ -155,36 +183,28 @@ impl ToolbarItemView for QuickActionBar {
         active_pane_item: Option<&dyn ItemHandle>,
         cx: &mut ViewContext<Self>,
     ) -> ToolbarItemLocation {
-        match active_pane_item {
-            Some(active_item) => {
-                self.active_item = Some(active_item.boxed_clone());
-                self._inlay_hints_enabled_subscription.take();
+        self.active_item = active_pane_item.map(ItemHandle::boxed_clone);
+        if let Some(active_item) = active_pane_item {
+            self._inlay_hints_enabled_subscription.take();
 
-                if let Some(editor) = active_item.downcast::<Editor>() {
-                    let mut inlay_hints_enabled = editor.read(cx).inlay_hints_enabled();
-                    let mut supports_inlay_hints = editor.read(cx).supports_inlay_hints(cx);
-                    self._inlay_hints_enabled_subscription =
-                        Some(cx.observe(&editor, move |_, editor, cx| {
-                            let editor = editor.read(cx);
-                            let new_inlay_hints_enabled = editor.inlay_hints_enabled();
-                            let new_supports_inlay_hints = editor.supports_inlay_hints(cx);
-                            let should_notify = inlay_hints_enabled != new_inlay_hints_enabled
-                                || supports_inlay_hints != new_supports_inlay_hints;
-                            inlay_hints_enabled = new_inlay_hints_enabled;
-                            supports_inlay_hints = new_supports_inlay_hints;
-                            if should_notify {
-                                cx.notify()
-                            }
-                        }));
-                    ToolbarItemLocation::PrimaryRight
-                } else {
-                    ToolbarItemLocation::Hidden
-                }
-            }
-            None => {
-                self.active_item = None;
-                ToolbarItemLocation::Hidden
+            if let Some(editor) = active_item.downcast::<Editor>() {
+                let mut inlay_hints_enabled = editor.read(cx).inlay_hints_enabled();
+                let mut supports_inlay_hints = editor.read(cx).supports_inlay_hints(cx);
+                self._inlay_hints_enabled_subscription =
+                    Some(cx.observe(&editor, move |_, editor, cx| {
+                        let editor = editor.read(cx);
+                        let new_inlay_hints_enabled = editor.inlay_hints_enabled();
+                        let new_supports_inlay_hints = editor.supports_inlay_hints(cx);
+                        let should_notify = inlay_hints_enabled != new_inlay_hints_enabled
+                            || supports_inlay_hints != new_supports_inlay_hints;
+                        inlay_hints_enabled = new_inlay_hints_enabled;
+                        supports_inlay_hints = new_supports_inlay_hints;
+                        if should_notify {
+                            cx.notify()
+                        }
+                    }));
             }
         }
+        self.get_toolbar_item_location()
     }
 }
diff --git a/crates/workspace/src/toolbar.rs b/crates/workspace/src/toolbar.rs
index b127de8de5..d2b042668e 100644
--- a/crates/workspace/src/toolbar.rs
+++ b/crates/workspace/src/toolbar.rs
@@ -127,7 +127,7 @@ impl Render for Toolbar {
                             h_flex()
                                 // We're using `flex_none` here to prevent some flickering that can occur when the
                                 // size of the left items container changes.
-                                .flex_none()
+                                .when_else(has_left_items, Div::flex_none, Div::flex_auto)
                                 .justify_end()
                                 .children(self.right_items().map(|item| item.to_any())),
                         )
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index d48b943822..443adac50d 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -353,7 +353,7 @@ fn initialize_pane(workspace: &mut Workspace, pane: &View<Pane>, cx: &mut ViewCo
             toolbar.add_item(buffer_search_bar.clone(), cx);
 
             let quick_action_bar =
-                cx.new_view(|_| QuickActionBar::new(buffer_search_bar, workspace));
+                cx.new_view(|cx| QuickActionBar::new(buffer_search_bar, workspace, cx));
             toolbar.add_item(quick_action_bar, cx);
             let diagnostic_editor_controls = cx.new_view(|_| diagnostics::ToolbarControls::new());
             toolbar.add_item(diagnostic_editor_controls, cx);
diff --git a/docs/src/configuring_zed.md b/docs/src/configuring_zed.md
index 173fab8d69..0a72e384ce 100644
--- a/docs/src/configuring_zed.md
+++ b/docs/src/configuring_zed.md
@@ -190,6 +190,23 @@ List of `string` values
 2. Position the dock to the right of the workspace like a side panel: `right`
 3. Position the dock full screen over the entire workspace: `expanded`
 
+## Editor Toolbar
+
+- Description: Whether or not to show various elements in the editor toolbar.
+- Setting: `toolbar`
+- Default:
+
+```json
+"toolbar": {
+  "breadcrumbs": true,
+  "quick_actions": true
+},
+```
+
+**Options**
+
+Each option controls displaying of a particular toolbar element. If all elements are hidden, the editor toolbar is not displayed.
+
 ## Enable Language Server
 
 - Description: Whether or not to use language servers to provide code intelligence.

From 59642bf29a1763898d0a48f8a771caa26e94eae0 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sat, 3 Feb 2024 14:13:36 -0800
Subject: [PATCH 210/372] blade: point to master, remove the override

---
 Cargo.toml             | 5 -----
 crates/gpui/Cargo.toml | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 019cb3f356..26cd9ab039 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -181,11 +181,6 @@ wasmtime = "16"
 tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "1d8975319c2d5de1bf710e7e21db25b0eee4bc66" }
 wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "v16.0.0" }
 
-# TODO - Remove when corresponding Blade versions are published
-[patch."https://github.com/kvark/blade"]
-blade-graphics = { path = "/x/Code/blade/blade-graphics" }
-blade-macros = { path = "/x/Code/blade/blade-macros" }
-
 [profile.dev]
 split-debuginfo = "unpacked"
 debug = "limited"
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 6dd64752cc..9a6530eeef 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -26,8 +26,8 @@ anyhow.workspace = true
 async-task = "4.7"
 backtrace = { version = "0.3", optional = true }
 bitflags = "2.4.0"
-blade-graphics = { git = "https://github.com/kvark/blade", branch = "zed" }
-blade-macros = { git = "https://github.com/kvark/blade", branch = "zed" }
+blade-graphics = { git = "https://github.com/kvark/blade", rev = "62eb18d312f720a5aac8f508fe223146a24fc7f0" }
+blade-macros = { git = "https://github.com/kvark/blade", rev = "62eb18d312f720a5aac8f508fe223146a24fc7f0" }
 bytemuck = "1"
 collections = { path = "../collections" }
 ctor.workspace = true

From ae2c23bd8e6a5bc34d9e87f1429b31187c97d8de Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Sat, 3 Feb 2024 16:33:08 -0700
Subject: [PATCH 211/372] Reintroduce ProMotion support (#7347)

This re-introduces the changes of #7305 but this time we create a
display link using the `NSScreen` associated with the window. We're
hoping we'll get these frame requests more reliably, and this seems
supported by the fact that awakening my laptop restores the frame
requests.

Release Notes:

- See #7305.

Co-authored-by: Nathan <nathan@zed.dev>
---
 crates/gpui/src/app.rs                  | 13 ++---
 crates/gpui/src/platform.rs             |  1 -
 crates/gpui/src/platform/mac/window.rs  | 66 ++++++++++++++++++++-----
 crates/gpui/src/platform/test/window.rs |  2 -
 crates/gpui/src/window.rs               | 51 +++++++++++++------
 5 files changed, 92 insertions(+), 41 deletions(-)

diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 4101c0b4cf..8d6f70f27e 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -652,27 +652,20 @@ impl AppContext {
                     }
                 }
             } else {
-                for window in self.windows.values() {
-                    if let Some(window) = window.as_ref() {
-                        if window.dirty {
-                            window.platform_window.invalidate();
-                        }
-                    }
-                }
-
                 #[cfg(any(test, feature = "test-support"))]
                 for window in self
                     .windows
                     .values()
                     .filter_map(|window| {
                         let window = window.as_ref()?;
-                        window.dirty.then_some(window.handle)
+                        window.dirty.get().then_some(window.handle)
                     })
                     .collect::<Vec<_>>()
                 {
                     self.update_window(window, |_, cx| cx.draw()).unwrap();
                 }
 
+                #[allow(clippy::collapsible_else_if)]
                 if self.pending_effects.is_empty() {
                     break;
                 }
@@ -749,7 +742,7 @@ impl AppContext {
     fn apply_refresh_effect(&mut self) {
         for window in self.windows.values_mut() {
             if let Some(window) = window.as_mut() {
-                window.dirty = true;
+                window.dirty.set(true);
             }
         }
     }
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index df886fc4d6..62ac543319 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -175,7 +175,6 @@ pub(crate) trait PlatformWindow: HasWindowHandle + HasDisplayHandle {
     fn on_close(&self, callback: Box<dyn FnOnce()>);
     fn on_appearance_changed(&self, callback: Box<dyn FnMut()>);
     fn is_topmost_for_position(&self, position: Point<Pixels>) -> bool;
-    fn invalidate(&self);
     fn draw(&self, scene: &Scene);
 
     fn sprite_atlas(&self) -> Arc<dyn PlatformAtlas>;
diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index ac3ce4c575..eb66954f44 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -16,8 +16,8 @@ use cocoa::{
     },
     base::{id, nil},
     foundation::{
-        NSArray, NSAutoreleasePool, NSDictionary, NSFastEnumeration, NSInteger, NSPoint, NSRect,
-        NSSize, NSString, NSUInteger,
+        NSArray, NSAutoreleasePool, NSDefaultRunLoopMode, NSDictionary, NSFastEnumeration,
+        NSInteger, NSPoint, NSRect, NSSize, NSString, NSUInteger,
     },
 };
 use core_graphics::display::CGRect;
@@ -168,6 +168,7 @@ unsafe fn build_classes() {
             sel!(displayLayer:),
             display_layer as extern "C" fn(&Object, Sel, id),
         );
+        decl.add_method(sel!(step:), step as extern "C" fn(&Object, Sel, id));
 
         decl.add_protocol(Protocol::get("NSTextInputClient").unwrap());
         decl.add_method(
@@ -260,6 +261,10 @@ unsafe fn build_window_class(name: &'static str, superclass: &Class) -> *const C
         sel!(windowDidMove:),
         window_did_move as extern "C" fn(&Object, Sel, id),
     );
+    decl.add_method(
+        sel!(windowDidChangeScreen:),
+        window_did_change_screen as extern "C" fn(&Object, Sel, id),
+    );
     decl.add_method(
         sel!(windowDidBecomeKey:),
         window_did_change_key_status as extern "C" fn(&Object, Sel, id),
@@ -320,7 +325,8 @@ struct MacWindowState {
     handle: AnyWindowHandle,
     executor: ForegroundExecutor,
     native_window: id,
-    native_view: NonNull<id>,
+    native_view: NonNull<Object>,
+    display_link: id,
     renderer: MetalRenderer,
     kind: WindowKind,
     request_frame_callback: Option<Box<dyn FnMut()>>,
@@ -522,14 +528,16 @@ impl MacWindow {
 
             let native_view: id = msg_send![VIEW_CLASS, alloc];
             let native_view = NSView::init(native_view);
-
             assert!(!native_view.is_null());
 
+            let display_link = start_display_link(native_window, native_view);
+
             let window = Self(Arc::new(Mutex::new(MacWindowState {
                 handle,
                 executor,
                 native_window,
-                native_view: NonNull::new_unchecked(native_view as *mut _),
+                native_view: NonNull::new_unchecked(native_view),
+                display_link,
                 renderer: MetalRenderer::new(instance_buffer_pool),
                 kind: options.kind,
                 request_frame_callback: None,
@@ -664,6 +672,7 @@ impl MacWindow {
             }
 
             window.0.lock().move_traffic_light();
+
             pool.drain();
 
             window
@@ -684,10 +693,19 @@ impl MacWindow {
     }
 }
 
+unsafe fn start_display_link(native_screen: id, native_view: id) -> id {
+    let display_link: id =
+        msg_send![native_screen, displayLinkWithTarget: native_view selector: sel!(step:)];
+    let main_run_loop: id = msg_send![class!(NSRunLoop), mainRunLoop];
+    let _: () = msg_send![display_link, addToRunLoop: main_run_loop forMode: NSDefaultRunLoopMode];
+    display_link
+}
+
 impl Drop for MacWindow {
     fn drop(&mut self) {
-        let this = self.0.lock();
+        let mut this = self.0.lock();
         let window = this.native_window;
+        this.display_link = nil;
         this.executor
             .spawn(async move {
                 unsafe {
@@ -1001,13 +1019,6 @@ impl PlatformWindow for MacWindow {
         }
     }
 
-    fn invalidate(&self) {
-        let this = self.0.lock();
-        unsafe {
-            let _: () = msg_send![this.native_window.contentView(), setNeedsDisplay: YES];
-        }
-    }
-
     fn draw(&self, scene: &crate::Scene) {
         let mut this = self.0.lock();
         this.renderer.draw(scene);
@@ -1354,6 +1365,19 @@ extern "C" fn window_did_move(this: &Object, _: Sel, _: id) {
     }
 }
 
+extern "C" fn window_did_change_screen(this: &Object, _: Sel, _: id) {
+    let window_state = unsafe { get_window_state(this) };
+    let mut lock = window_state.as_ref().lock();
+    unsafe {
+        let screen = lock.native_window.screen();
+        if screen != nil {
+            lock.display_link = start_display_link(screen, lock.native_view.as_ptr());
+        } else {
+            lock.display_link = nil;
+        }
+    }
+}
+
 extern "C" fn window_did_change_key_status(this: &Object, selector: Sel, _: id) {
     let window_state = unsafe { get_window_state(this) };
     let lock = window_state.lock();
@@ -1503,6 +1527,22 @@ extern "C" fn display_layer(this: &Object, _: Sel, _: id) {
     }
 }
 
+extern "C" fn step(this: &Object, _: Sel, display_link: id) {
+    let window_state = unsafe { get_window_state(this) };
+    let mut lock = window_state.lock();
+    if lock.display_link == display_link {
+        if let Some(mut callback) = lock.request_frame_callback.take() {
+            drop(lock);
+            callback();
+            window_state.lock().request_frame_callback = Some(callback);
+        }
+    } else {
+        unsafe {
+            let _: () = msg_send![display_link, invalidate];
+        }
+    }
+}
+
 extern "C" fn valid_attributes_for_marked_text(_: &Object, _: Sel) -> id {
     unsafe { msg_send![class!(NSArray), array] }
 }
diff --git a/crates/gpui/src/platform/test/window.rs b/crates/gpui/src/platform/test/window.rs
index d5d62e0155..d56851c8b9 100644
--- a/crates/gpui/src/platform/test/window.rs
+++ b/crates/gpui/src/platform/test/window.rs
@@ -282,8 +282,6 @@ impl PlatformWindow for TestWindow {
         unimplemented!()
     }
 
-    fn invalidate(&self) {}
-
     fn draw(&self, _scene: &crate::Scene) {}
 
     fn sprite_atlas(&self) -> sync::Arc<dyn crate::PlatformAtlas> {
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 8b10f5d8f4..1cfd01b52e 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -22,7 +22,7 @@ use smallvec::SmallVec;
 use std::{
     any::{Any, TypeId},
     borrow::{Borrow, BorrowMut},
-    cell::RefCell,
+    cell::{Cell, RefCell},
     collections::hash_map::Entry,
     fmt::{Debug, Display},
     future::Future,
@@ -34,7 +34,7 @@ use std::{
         atomic::{AtomicUsize, Ordering::SeqCst},
         Arc,
     },
-    time::Duration,
+    time::{Duration, Instant},
 };
 use util::{measure, ResultExt};
 
@@ -272,7 +272,8 @@ pub struct Window {
     appearance: WindowAppearance,
     appearance_observers: SubscriberSet<(), AnyObserver>,
     active: bool,
-    pub(crate) dirty: bool,
+    pub(crate) dirty: Rc<Cell<bool>>,
+    pub(crate) last_input_timestamp: Rc<Cell<Instant>>,
     pub(crate) refreshing: bool,
     pub(crate) drawing: bool,
     activation_observers: SubscriberSet<(), AnyObserver>,
@@ -339,13 +340,28 @@ impl Window {
         let bounds = platform_window.bounds();
         let appearance = platform_window.appearance();
         let text_system = Arc::new(WindowTextSystem::new(cx.text_system().clone()));
+        let dirty = Rc::new(Cell::new(false));
+        let last_input_timestamp = Rc::new(Cell::new(Instant::now()));
 
         platform_window.on_request_frame(Box::new({
             let mut cx = cx.to_async();
+            let dirty = dirty.clone();
+            let last_input_timestamp = last_input_timestamp.clone();
             move || {
-                measure("frame duration", || {
-                    handle.update(&mut cx, |_, cx| cx.draw()).log_err();
-                })
+                if dirty.get() {
+                    measure("frame duration", || {
+                        handle
+                            .update(&mut cx, |_, cx| {
+                                cx.draw();
+                                cx.present();
+                            })
+                            .log_err();
+                    })
+                } else if last_input_timestamp.get().elapsed() < Duration::from_secs(1) {
+                    // Keep presenting the current scene for 1 extra second since the
+                    // last input to prevent the display from underclocking the refresh rate.
+                    handle.update(&mut cx, |_, cx| cx.present()).log_err();
+                }
             }
         }));
         platform_window.on_resize(Box::new({
@@ -424,7 +440,8 @@ impl Window {
             appearance,
             appearance_observers: SubscriberSet::new(),
             active: false,
-            dirty: false,
+            dirty,
+            last_input_timestamp,
             refreshing: false,
             drawing: false,
             activation_observers: SubscriberSet::new(),
@@ -482,7 +499,7 @@ impl<'a> WindowContext<'a> {
     pub fn refresh(&mut self) {
         if !self.window.drawing {
             self.window.refreshing = true;
-            self.window.dirty = true;
+            self.window.dirty.set(true);
         }
     }
 
@@ -950,9 +967,10 @@ impl<'a> WindowContext<'a> {
         &self.window.next_frame.z_index_stack
     }
 
-    /// Draw pixels to the display for this window based on the contents of its scene.
+    /// Produces a new frame and assigns it to `rendered_frame`. To actually show
+    /// the contents of the new [Scene], use [present].
     pub(crate) fn draw(&mut self) {
-        self.window.dirty = false;
+        self.window.dirty.set(false);
         self.window.drawing = true;
 
         if let Some(requested_handler) = self.window.rendered_frame.requested_input_handler.as_mut()
@@ -1088,16 +1106,19 @@ impl<'a> WindowContext<'a> {
                 .clone()
                 .retain(&(), |listener| listener(&event, self));
         }
-
-        self.window
-            .platform_window
-            .draw(&self.window.rendered_frame.scene);
         self.window.refreshing = false;
         self.window.drawing = false;
     }
 
+    fn present(&self) {
+        self.window
+            .platform_window
+            .draw(&self.window.rendered_frame.scene);
+    }
+
     /// Dispatch a mouse or keyboard event on the window.
     pub fn dispatch_event(&mut self, event: PlatformInput) -> bool {
+        self.window.last_input_timestamp.set(Instant::now());
         // Handlers may set this to false by calling `stop_propagation`.
         self.app.propagate_event = true;
         // Handlers may set this to true by calling `prevent_default`.
@@ -2041,7 +2062,7 @@ impl<'a, V: 'static> ViewContext<'a, V> {
         }
 
         if !self.window.drawing {
-            self.window_cx.window.dirty = true;
+            self.window_cx.window.dirty.set(true);
             self.window_cx.app.push_effect(Effect::Notify {
                 emitter: self.view.model.entity_id,
             });

From ac74a72a9ef80a6cc50e7b001e163e76fbd9fa3d Mon Sep 17 00:00:00 2001
From: Andrey Kuzmin <hi@unsoundscapes.com>
Date: Sun, 4 Feb 2024 00:57:24 +0100
Subject: [PATCH 212/372] Improve elm-language-server configuration (#7342)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Hi folks! @absynce and I paired a bit to improve the
`elm-language-server` configuration. We have realised that sometimes
`elm-language-server` settings were being reset to default. We had been
configuring `elm-language-server` like this:

```json
"lsp": {
  "elm-language-server": {
    "initialization_options": {
      "disableElmLSDiagnostics": true,
      "onlyUpdateDiagnosticsOnSave": true,
      "elmReviewDiagnostics": "warning"
    }
  }
}
```

And then we noticed that the following communication happened:

```
// Send:
{"jsonrpc":"2.0","method":"workspace/didChangeConfiguration","params":{"settings":{}}}
// Receive:
{"jsonrpc":"2.0","id":5,"method":"workspace/configuration","params":{"items":[{"section":"elmLS"}]}}
// Send:
{"jsonrpc":"2.0","id":5,"result":[null],"error":null}
```

In `elm-language-server` the settings from `didChangeConfiguration`
[replace the initial
settings](https://github.com/elm-tooling/elm-language-server/blob/edd68133883f3902f8940a6e5e2834a9cd627dc1/src/common/providers/diagnostics/diagnosticsProvider.ts#L188).
Setting the value to `{}` effectively resets the configuration options
to defaults.

In Zed, `initialization_options` and `workspace_configuration` are two
different things, but in `elm-language-server` they are coupled.
Additionally, `elm-language-server` is requesting workspace
configuration for the `elmLS` section that doesn't exist.

This PR:

1. Fixes settings reset on `didChangeConfiguration` by populating
`workspace_configuration` from `initialization_options`
2. Makes workspace configuration requests work by inserting an extra
copy of the settings under the `elmLS` key in `workspace_configuration`
— this is a bit ugly, but we're not sure how to make both kinds of
configuration messages work in the current setup.

This is how communication looks like after the proposed changes:

```
// Send:
{
  "jsonrpc": "2.0",
  "method": "workspace/didChangeConfiguration",
  "params": {
    "settings": {
      "disableElmLSDiagnostics": true,
      "onlyUpdateDiagnosticsOnSave": true,
      "elmReviewDiagnostics": "warning",
      "elmLS": {
        "disableElmLSDiagnostics": true,
        "onlyUpdateDiagnosticsOnSave": true,
        "elmReviewDiagnostics": "warning"
      }
    }
  }
}
// Receive:
{
  "jsonrpc": "2.0",
  "id": 4,
  "method": "workspace/configuration",
  "params": {
    "items": [
      {
        "section": "elmLS"
      }
    ]
  }
}
// Send:
{
  "jsonrpc": "2.0",
  "id": 4,
  "result": [
    {
      "disableElmLSDiagnostics": true,
      "onlyUpdateDiagnosticsOnSave": true,
      "elmReviewDiagnostics": "warning"
    }
  ],
  "error": null
}
```

Things we have considered:

1. Extracting the `elm-language-server` settings into a separate
section: we haven't found this being widely used in Zed, seems that all
language server configuration should fall under the top level `lsp`
section
2. Changing the way `elm-language-server` configuration works:
`elm-language-server` has got integrations with multiple editors,
changing the configuration behaviour would mean updating all the
existing integrations. Plus we are not exactly sure if it's doing
anything wrong.

Release Notes:

- Improved elm-language-server configuration options

Co-authored-by: Jared M. Smith <absynce@gmail.com>
---
 crates/zed/src/languages/elm.rs | 28 +++++++++++++++++++++++++++-
 docs/src/languages/elm.md       | 21 +++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/crates/zed/src/languages/elm.rs b/crates/zed/src/languages/elm.rs
index 6eb5645102..9c50184498 100644
--- a/crates/zed/src/languages/elm.rs
+++ b/crates/zed/src/languages/elm.rs
@@ -1,9 +1,13 @@
 use anyhow::{anyhow, Result};
 use async_trait::async_trait;
 use futures::StreamExt;
+use gpui::AppContext;
 use language::{LanguageServerName, LspAdapter, LspAdapterDelegate};
 use lsp::LanguageServerBinary;
 use node_runtime::NodeRuntime;
+use project::project_settings::ProjectSettings;
+use serde_json::Value;
+use settings::Settings;
 use smol::fs;
 use std::{
     any::Any,
@@ -13,6 +17,7 @@ use std::{
 };
 use util::ResultExt;
 
+const SERVER_NAME: &'static str = "elm-language-server";
 const SERVER_PATH: &'static str = "node_modules/@elm-tooling/elm-language-server/out/node/index.js";
 
 fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
@@ -32,7 +37,7 @@ impl ElmLspAdapter {
 #[async_trait]
 impl LspAdapter for ElmLspAdapter {
     fn name(&self) -> LanguageServerName {
-        LanguageServerName("elm-language-server".into())
+        LanguageServerName(SERVER_NAME.into())
     }
 
     fn short_name(&self) -> &'static str {
@@ -88,6 +93,27 @@ impl LspAdapter for ElmLspAdapter {
     ) -> Option<LanguageServerBinary> {
         get_cached_server_binary(container_dir, &*self.node).await
     }
+
+    fn workspace_configuration(&self, _workspace_root: &Path, cx: &mut AppContext) -> Value {
+        // elm-language-server expects workspace didChangeConfiguration notification
+        // params to be the same as lsp initialization_options
+        let override_options = ProjectSettings::get_global(cx)
+            .lsp
+            .get(SERVER_NAME)
+            .and_then(|s| s.initialization_options.clone())
+            .unwrap_or_default();
+
+        match override_options.clone().as_object_mut() {
+            Some(op) => {
+                // elm-language-server requests workspace configuration
+                // for the `elmLS` section, so we have to nest
+                // another copy of initialization_options there
+                op.insert("elmLS".into(), override_options);
+                serde_json::to_value(op).unwrap_or_default()
+            }
+            None => override_options,
+        }
+    }
 }
 
 async fn get_cached_server_binary(
diff --git a/docs/src/languages/elm.md b/docs/src/languages/elm.md
index ec6aa46c7a..02bd4a88a6 100644
--- a/docs/src/languages/elm.md
+++ b/docs/src/languages/elm.md
@@ -2,3 +2,24 @@
 
 - Tree Sitter: [tree-sitter-elm](https://github.com/elm-tooling/tree-sitter-elm)
 - Language Server: [elm-language-server](https://github.com/elm-tooling/elm-language-server)
+
+### Setting up `elm-language-server`
+
+Elm language server can be configured in your `settings.json`, e.g.:
+
+```json
+{
+  "lsp": {
+    "elm-language-server": {
+      "initialization_options": {
+        "disableElmLSDiagnostics": true,
+        "onlyUpdateDiagnosticsOnSave": false,
+        "elmReviewDiagnostics": "warning"
+      }
+    }
+  }
+}
+```
+
+`elm-format`, `elm-review` and `elm` need to be installed and made available in the environment
+or configured in the settings. See the [full list of server settings here](https://github.com/elm-tooling/elm-language-server?tab=readme-ov-file#server-settings).

From d0a0ce18851c0d50e12d309d3a5bfe23e0fbe06b Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sat, 3 Feb 2024 21:30:47 -0800
Subject: [PATCH 213/372] blade: mono/poly chrome sprite rendering

---
 .../gpui/src/platform/linux/blade_renderer.rs | 114 +++++++++++++++---
 crates/gpui/src/platform/linux/shaders.wgsl   | 113 ++++++++++++++++-
 crates/gpui/src/scene.rs                      |   1 +
 crates/gpui/src/window/element_cx.rs          |   2 +
 4 files changed, 208 insertions(+), 22 deletions(-)

diff --git a/crates/gpui/src/platform/linux/blade_renderer.rs b/crates/gpui/src/platform/linux/blade_renderer.rs
index 0a143f7976..7ac3acda19 100644
--- a/crates/gpui/src/platform/linux/blade_renderer.rs
+++ b/crates/gpui/src/platform/linux/blade_renderer.rs
@@ -4,7 +4,7 @@
 use super::{BladeBelt, BladeBeltDescriptor};
 use crate::{
     AtlasTextureKind, AtlasTile, BladeAtlas, Bounds, ContentMask, Hsla, Path, PathId, PathVertex,
-    PrimitiveBatch, Quad, ScaledPixels, Scene, Shadow, Underline, PATH_TEXTURE_FORMAT,
+    PrimitiveBatch, Quad, ScaledPixels, Scene, Shadow, Underline, MonochromeSprite, PolychromeSprite, PATH_TEXTURE_FORMAT,
 };
 use bytemuck::{Pod, Zeroable};
 use collections::HashMap;
@@ -43,8 +43,8 @@ struct ShaderPathRasterizationData {
 #[derive(blade_macros::ShaderData)]
 struct ShaderPathsData {
     globals: GlobalParams,
-    t_tile: gpu::TextureView,
-    s_tile: gpu::Sampler,
+    t_sprite: gpu::TextureView,
+    s_sprite: gpu::Sampler,
     b_path_sprites: gpu::BufferPiece,
 }
 
@@ -54,6 +54,22 @@ struct ShaderUnderlinesData {
     b_underlines: gpu::BufferPiece,
 }
 
+#[derive(blade_macros::ShaderData)]
+struct ShaderMonoSpritesData {
+    globals: GlobalParams,
+    t_sprite: gpu::TextureView,
+    s_sprite: gpu::Sampler,
+    b_mono_sprites: gpu::BufferPiece,
+}
+
+#[derive(blade_macros::ShaderData)]
+struct ShaderPolySpritesData {
+    globals: GlobalParams,
+    t_sprite: gpu::TextureView,
+    s_sprite: gpu::Sampler,
+    b_poly_sprites: gpu::BufferPiece,
+}
+
 #[derive(Clone, Debug, Eq, PartialEq)]
 #[repr(C)]
 struct PathSprite {
@@ -68,10 +84,14 @@ struct BladePipelines {
     path_rasterization: gpu::RenderPipeline,
     paths: gpu::RenderPipeline,
     underlines: gpu::RenderPipeline,
+    mono_sprites: gpu::RenderPipeline,
+    poly_sprites: gpu::RenderPipeline,
 }
 
 impl BladePipelines {
     fn new(gpu: &gpu::Context, surface_format: gpu::TextureFormat) -> Self {
+        use gpu::ShaderData as _;
+
         let shader = gpu.create_shader(gpu::ShaderDesc {
             source: include_str!("shaders.wgsl"),
         });
@@ -83,17 +103,13 @@ impl BladePipelines {
         );
         shader.check_struct_size::<PathSprite>();
         shader.check_struct_size::<Underline>();
-
-        let quads_layout = <ShaderQuadsData as gpu::ShaderData>::layout();
-        let shadows_layout = <ShaderShadowsData as gpu::ShaderData>::layout();
-        let path_rasterization_layout = <ShaderPathRasterizationData as gpu::ShaderData>::layout();
-        let paths_layout = <ShaderPathsData as gpu::ShaderData>::layout();
-        let underlines_layout = <ShaderUnderlinesData as gpu::ShaderData>::layout();
+        shader.check_struct_size::<MonochromeSprite>();
+        shader.check_struct_size::<PolychromeSprite>();
 
         Self {
             quads: gpu.create_render_pipeline(gpu::RenderPipelineDesc {
                 name: "quads",
-                data_layouts: &[&quads_layout],
+                data_layouts: &[&ShaderQuadsData::layout()],
                 vertex: shader.at("vs_quad"),
                 primitive: gpu::PrimitiveState {
                     topology: gpu::PrimitiveTopology::TriangleStrip,
@@ -109,7 +125,7 @@ impl BladePipelines {
             }),
             shadows: gpu.create_render_pipeline(gpu::RenderPipelineDesc {
                 name: "shadows",
-                data_layouts: &[&shadows_layout],
+                data_layouts: &[&ShaderShadowsData::layout()],
                 vertex: shader.at("vs_shadow"),
                 primitive: gpu::PrimitiveState {
                     topology: gpu::PrimitiveTopology::TriangleStrip,
@@ -125,7 +141,7 @@ impl BladePipelines {
             }),
             path_rasterization: gpu.create_render_pipeline(gpu::RenderPipelineDesc {
                 name: "path_rasterization",
-                data_layouts: &[&path_rasterization_layout],
+                data_layouts: &[&ShaderPathRasterizationData::layout()],
                 vertex: shader.at("vs_path_rasterization"),
                 primitive: gpu::PrimitiveState {
                     topology: gpu::PrimitiveTopology::TriangleStrip,
@@ -141,7 +157,7 @@ impl BladePipelines {
             }),
             paths: gpu.create_render_pipeline(gpu::RenderPipelineDesc {
                 name: "paths",
-                data_layouts: &[&paths_layout],
+                data_layouts: &[&ShaderPathsData::layout()],
                 vertex: shader.at("vs_path"),
                 primitive: gpu::PrimitiveState {
                     topology: gpu::PrimitiveTopology::TriangleStrip,
@@ -157,7 +173,7 @@ impl BladePipelines {
             }),
             underlines: gpu.create_render_pipeline(gpu::RenderPipelineDesc {
                 name: "underlines",
-                data_layouts: &[&underlines_layout],
+                data_layouts: &[&ShaderUnderlinesData::layout()],
                 vertex: shader.at("vs_underline"),
                 primitive: gpu::PrimitiveState {
                     topology: gpu::PrimitiveTopology::TriangleStrip,
@@ -171,6 +187,38 @@ impl BladePipelines {
                     write_mask: gpu::ColorWrites::default(),
                 }],
             }),
+            mono_sprites: gpu.create_render_pipeline(gpu::RenderPipelineDesc {
+                name: "mono-sprites",
+                data_layouts: &[&ShaderMonoSpritesData::layout()],
+                vertex: shader.at("vs_mono_sprite"),
+                primitive: gpu::PrimitiveState {
+                    topology: gpu::PrimitiveTopology::TriangleStrip,
+                    ..Default::default()
+                },
+                depth_stencil: None,
+                fragment: shader.at("fs_mono_sprite"),
+                color_targets: &[gpu::ColorTargetState {
+                    format: surface_format,
+                    blend: Some(gpu::BlendState::ALPHA_BLENDING),
+                    write_mask: gpu::ColorWrites::default(),
+                }],
+            }),
+            poly_sprites: gpu.create_render_pipeline(gpu::RenderPipelineDesc {
+                name: "poly-sprites",
+                data_layouts: &[&ShaderPolySpritesData::layout()],
+                vertex: shader.at("vs_poly_sprite"),
+                primitive: gpu::PrimitiveState {
+                    topology: gpu::PrimitiveTopology::TriangleStrip,
+                    ..Default::default()
+                },
+                depth_stencil: None,
+                fragment: shader.at("fs_poly_sprite"),
+                color_targets: &[gpu::ColorTargetState {
+                    format: surface_format,
+                    blend: Some(gpu::BlendState::ALPHA_BLENDING),
+                    write_mask: gpu::ColorWrites::default(),
+                }],
+            }),
         }
     }
 }
@@ -376,8 +424,8 @@ impl BladeRenderer {
                                 0,
                                 &ShaderPathsData {
                                     globals,
-                                    t_tile: tex_info.raw_view.unwrap(),
-                                    s_tile: self.atlas_sampler,
+                                    t_sprite: tex_info.raw_view.unwrap(),
+                                    s_sprite: self.atlas_sampler,
                                     b_path_sprites: instance_buf,
                                 },
                             );
@@ -396,7 +444,39 @@ impl BladeRenderer {
                         );
                         encoder.draw(0, 4, 0, underlines.len() as u32);
                     }
-                    _ => continue,
+                    PrimitiveBatch::MonochromeSprites { texture_id, sprites } => {
+                        let tex_info = self.atlas.get_texture_info(texture_id);
+                        let instance_buf = self.instance_belt.alloc_data(&sprites, &self.gpu);
+                        let mut encoder = pass.with(&self.pipelines.mono_sprites);
+                        encoder.bind(
+                            0,
+                            &ShaderMonoSpritesData {
+                                globals,
+                                t_sprite: tex_info.raw_view.unwrap(),
+                                s_sprite: self.atlas_sampler,
+                                b_mono_sprites: instance_buf,
+                            },
+                        );
+                        encoder.draw(0, 4, 0, sprites.len() as u32);
+                    }
+                    PrimitiveBatch::PolychromeSprites { texture_id, sprites } => {
+                        let tex_info = self.atlas.get_texture_info(texture_id);
+                        let instance_buf = self.instance_belt.alloc_data(&sprites, &self.gpu);
+                        let mut encoder = pass.with(&self.pipelines.poly_sprites);
+                        encoder.bind(
+                            0,
+                            &ShaderPolySpritesData {
+                                globals,
+                                t_sprite: tex_info.raw_view.unwrap(),
+                                s_sprite: self.atlas_sampler,
+                                b_poly_sprites: instance_buf,
+                            },
+                        );
+                        encoder.draw(0, 4, 0, sprites.len() as u32);
+                    }
+                    PrimitiveBatch::Surfaces {..} => {
+                        unimplemented!()
+                    }
                 }
             }
         }
diff --git a/crates/gpui/src/platform/linux/shaders.wgsl b/crates/gpui/src/platform/linux/shaders.wgsl
index e0990c6c1b..7d0c9d53ae 100644
--- a/crates/gpui/src/platform/linux/shaders.wgsl
+++ b/crates/gpui/src/platform/linux/shaders.wgsl
@@ -4,10 +4,11 @@ struct Globals {
 }
 
 var<uniform> globals: Globals;
-var t_tile: texture_2d<f32>;
-var s_tile: sampler;
+var t_sprite: texture_2d<f32>;
+var s_sprite: sampler;
 
 const M_PI_F: f32 = 3.1415926;
+const GRAYSCALE_FACTORS: vec3<f32> = vec3<f32>(0.2126, 0.7152, 0.0722);
 
 struct ViewId {
     lo: u32,
@@ -60,7 +61,7 @@ fn to_device_position(unit_vertex: vec2<f32>, bounds: Bounds) -> vec4<f32> {
 }
 
 fn to_tile_position(unit_vertex: vec2<f32>, tile: AtlasTile) -> vec2<f32> {
-  let atlas_size = vec2<f32>(textureDimensions(t_tile, 0));
+  let atlas_size = vec2<f32>(textureDimensions(t_sprite, 0));
   return (tile.bounds.origin + unit_vertex * tile.bounds.size) / atlas_size;
 }
 
@@ -153,6 +154,17 @@ fn pick_corner_radius(point: vec2<f32>, radii: Corners) -> f32 {
     }
 }
 
+fn quad_sdf(point: vec2<f32>, bounds: Bounds, corner_radii: Corners) -> f32 {
+    let half_size = bounds.size / 2.0;
+    let center = bounds.origin + half_size;
+    let center_to_point = point - center;
+    let corner_radius = pick_corner_radius(center_to_point, corner_radii);
+    let rounded_edge_to_point = abs(center_to_point) - half_size + corner_radius;
+    return length(max(vec2<f32>(0.0), rounded_edge_to_point)) +
+        min(0.0, max(rounded_edge_to_point.x, rounded_edge_to_point.y)) -
+        corner_radius;
+}
+
 // --- quads --- //
 
 struct Quad {
@@ -386,7 +398,7 @@ fn vs_path(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index) insta
 
 @fragment
 fn fs_path(input: PathVarying) -> @location(0) vec4<f32> {
-    let sample = textureSample(t_tile, s_tile, input.tile_position).r;
+    let sample = textureSample(t_sprite, s_sprite, input.tile_position).r;
     let mask = 1.0 - abs(1.0 - sample % 2.0);
     return input.color * mask;
 }
@@ -434,7 +446,7 @@ fn fs_underline(input: UnderlineVarying) -> @location(0) vec4<f32> {
     }
 
     let underline = b_underlines[input.underline_id];
-    if (underline.wavy == 0u)
+    if ((underline.wavy & 0xFFu) == 0u)
     {
         return vec4<f32>(0.0);
     }
@@ -452,3 +464,94 @@ fn fs_underline(input: UnderlineVarying) -> @location(0) vec4<f32> {
     let alpha = saturate(0.5 - max(-distance_from_bottom_border, distance_from_top_border));
     return input.color * vec4<f32>(1.0, 1.0, 1.0, alpha);
 }
+
+// --- monochrome sprites --- //
+
+struct MonochromeSprite {
+    view_id: ViewId,
+    layer_id: u32,
+    order: u32,
+    bounds: Bounds,
+    content_mask: Bounds,
+    color: Hsla,
+    tile: AtlasTile,
+}
+var<storage, read> b_mono_sprites: array<MonochromeSprite>;
+
+struct MonoSpriteVarying {
+    @builtin(position) position: vec4<f32>,
+    @location(0) tile_position: vec2<f32>,
+    @location(1) @interpolate(flat) color: vec4<f32>,
+    @location(3) clip_distances: vec4<f32>,
+}
+
+@vertex
+fn vs_mono_sprite(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index) instance_id: u32) -> MonoSpriteVarying {
+    let unit_vertex = vec2<f32>(f32(vertex_id & 1u), 0.5 * f32(vertex_id & 2u));
+    let sprite = b_mono_sprites[instance_id];
+
+    var out = MonoSpriteVarying();
+    out.position = to_device_position(unit_vertex, sprite.bounds);
+    out.tile_position = to_tile_position(unit_vertex, sprite.tile);
+    out.color = hsla_to_rgba(sprite.color);
+    out.clip_distances = distance_from_clip_rect(unit_vertex, sprite.bounds, sprite.content_mask);
+    return out;
+}
+
+@fragment
+fn fs_mono_sprite(input: MonoSpriteVarying) -> @location(0) vec4<f32> {
+    let sample = textureSample(t_sprite, s_sprite, input.tile_position).r;
+    return input.color * vec4<f32>(1.0, 1.0, 1.0, sample);
+}
+
+// --- polychrome sprites --- //
+
+struct PolychromeSprite {
+    view_id: ViewId,
+    layer_id: u32,
+    order: u32,
+    bounds: Bounds,
+    content_mask: Bounds,
+    corner_radii: Corners,
+    tile: AtlasTile,
+    grayscale: u32,
+    pad: u32,
+}
+var<storage, read> b_poly_sprites: array<PolychromeSprite>;
+
+struct PolySpriteVarying {
+    @builtin(position) position: vec4<f32>,
+    @location(0) tile_position: vec2<f32>,
+    @location(1) @interpolate(flat) sprite_id: u32,
+    @location(3) clip_distances: vec4<f32>,
+}
+
+@vertex
+fn vs_poly_sprite(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index) instance_id: u32) -> PolySpriteVarying {
+    let unit_vertex = vec2<f32>(f32(vertex_id & 1u), 0.5 * f32(vertex_id & 2u));
+    let sprite = b_poly_sprites[instance_id];
+
+    var out = PolySpriteVarying();
+    out.position = to_device_position(unit_vertex, sprite.bounds);
+    out.tile_position = to_tile_position(unit_vertex, sprite.tile);
+    out.sprite_id = instance_id;
+    out.clip_distances = distance_from_clip_rect(unit_vertex, sprite.bounds, sprite.content_mask);
+    return out;
+}
+
+@fragment
+fn fs_poly_sprite(input: PolySpriteVarying) -> @location(0) vec4<f32> {
+    let sample = textureSample(t_sprite, s_sprite, input.tile_position);
+    let sprite = b_poly_sprites[input.sprite_id];
+    let distance = quad_sdf(input.position.xy, sprite.bounds, sprite.corner_radii);
+
+    var color = sample;
+    if ((sprite.grayscale & 0xFFu) != 0u) {
+        let grayscale = dot(color.rgb, GRAYSCALE_FACTORS);
+        color = vec4<f32>(vec3<f32>(grayscale), sample.a);
+    }
+    color.a *= saturate(0.5 - distance);
+    return color;;
+}
+
+// --- surface sprites --- //
diff --git a/crates/gpui/src/scene.rs b/crates/gpui/src/scene.rs
index dcf3f2cbea..4b16e2075f 100644
--- a/crates/gpui/src/scene.rs
+++ b/crates/gpui/src/scene.rs
@@ -642,6 +642,7 @@ pub(crate) struct PolychromeSprite {
     pub corner_radii: Corners<ScaledPixels>,
     pub tile: AtlasTile,
     pub grayscale: bool,
+    pub pad: u32, // align to 8 bytes
 }
 
 impl Ord for PolychromeSprite {
diff --git a/crates/gpui/src/window/element_cx.rs b/crates/gpui/src/window/element_cx.rs
index bc38db3ab5..8b321b3377 100644
--- a/crates/gpui/src/window/element_cx.rs
+++ b/crates/gpui/src/window/element_cx.rs
@@ -874,6 +874,7 @@ impl<'a> ElementContext<'a> {
                     content_mask,
                     tile,
                     grayscale: false,
+                    pad: 0,
                 },
             );
         }
@@ -958,6 +959,7 @@ impl<'a> ElementContext<'a> {
                 corner_radii,
                 tile,
                 grayscale,
+                pad: 0,
             },
         );
         Ok(())

From cf71fe8bf1945f51d96c977cf717ede69b33c63b Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sat, 3 Feb 2024 22:39:44 -0800
Subject: [PATCH 214/372] fix MacOS build, switch external RWH to 0.6

leaving blade-internal RWH as 0.5 until this is fixed:
https://github.com/ash-rs/ash/issues/864
---
 crates/gpui/Cargo.toml                        |  3 ++-
 crates/gpui/build.rs                          | 24 ++++++++++++-------
 .../gpui/src/platform/linux/blade_renderer.rs | 17 +++++++++----
 crates/gpui/src/platform/linux/window.rs      | 24 +++++++++++--------
 crates/gpui/src/platform/mac/metal_atlas.rs   |  1 +
 5 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 9a6530eeef..cc14ee4dfe 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -50,7 +50,8 @@ parking_lot.workspace = true
 pathfinder_geometry = "0.5"
 postage.workspace = true
 rand.workspace = true
-raw-window-handle = "0.5.0"
+raw-window-handle = "0.6"
+blade-rwh = { package = "raw-window-handle", version = "0.5" }
 refineable.workspace = true
 resvg = "0.14"
 schemars.workspace = true
diff --git a/crates/gpui/build.rs b/crates/gpui/build.rs
index 70c3d8d8e4..802185ac85 100644
--- a/crates/gpui/build.rs
+++ b/crates/gpui/build.rs
@@ -1,3 +1,5 @@
+#![cfg_attr(not(target_os = "macos"), allow(unused))]
+
 use std::{
     env,
     path::{Path, PathBuf},
@@ -6,15 +8,19 @@ use std::{
 use cbindgen::Config;
 
 fn main() {
-    //generate_dispatch_bindings();
-    //let header_path = generate_shader_bindings();
-    //#[cfg(feature = "runtime_shaders")]
-    //emit_stitched_shaders(&header_path);
-    //#[cfg(not(feature = "runtime_shaders"))]
-    //compile_metal_shaders(&header_path);
+    #[cfg(target_os = "macos")]
+    generate_dispatch_bindings();
+    #[cfg(target_os = "macos")]
+    let header_path = generate_shader_bindings();
+    #[cfg(target_os = "macos")]
+    #[cfg(feature = "runtime_shaders")]
+    emit_stitched_shaders(&header_path);
+    #[cfg(target_os = "macos")]
+    #[cfg(not(feature = "runtime_shaders"))]
+    compile_metal_shaders(&header_path);
 }
 
-fn _generate_dispatch_bindings() {
+fn generate_dispatch_bindings() {
     println!("cargo:rustc-link-lib=framework=System");
     println!("cargo:rerun-if-changed=src/platform/mac/dispatch.h");
 
@@ -38,7 +44,7 @@ fn _generate_dispatch_bindings() {
         .expect("couldn't write dispatch bindings");
 }
 
-fn _generate_shader_bindings() -> PathBuf {
+fn generate_shader_bindings() -> PathBuf {
     let output_path = PathBuf::from(env::var("OUT_DIR").unwrap()).join("scene.h");
     let crate_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
     let mut config = Config::default();
@@ -116,7 +122,7 @@ fn emit_stitched_shaders(header_path: &Path) {
     println!("cargo:rerun-if-changed={}", &shader_source_path);
 }
 #[cfg(not(feature = "runtime_shaders"))]
-fn _compile_metal_shaders(header_path: &Path) {
+fn compile_metal_shaders(header_path: &Path) {
     use std::process::{self, Command};
     let shader_path = "./src/platform/mac/shaders.metal";
     let air_output_path = PathBuf::from(env::var("OUT_DIR").unwrap()).join("shaders.air");
diff --git a/crates/gpui/src/platform/linux/blade_renderer.rs b/crates/gpui/src/platform/linux/blade_renderer.rs
index 7ac3acda19..1b7db6bcd4 100644
--- a/crates/gpui/src/platform/linux/blade_renderer.rs
+++ b/crates/gpui/src/platform/linux/blade_renderer.rs
@@ -3,8 +3,9 @@
 
 use super::{BladeBelt, BladeBeltDescriptor};
 use crate::{
-    AtlasTextureKind, AtlasTile, BladeAtlas, Bounds, ContentMask, Hsla, Path, PathId, PathVertex,
-    PrimitiveBatch, Quad, ScaledPixels, Scene, Shadow, Underline, MonochromeSprite, PolychromeSprite, PATH_TEXTURE_FORMAT,
+    AtlasTextureKind, AtlasTile, BladeAtlas, Bounds, ContentMask, Hsla, MonochromeSprite, Path,
+    PathId, PathVertex, PolychromeSprite, PrimitiveBatch, Quad, ScaledPixels, Scene, Shadow,
+    Underline, PATH_TEXTURE_FORMAT,
 };
 use bytemuck::{Pod, Zeroable};
 use collections::HashMap;
@@ -444,7 +445,10 @@ impl BladeRenderer {
                         );
                         encoder.draw(0, 4, 0, underlines.len() as u32);
                     }
-                    PrimitiveBatch::MonochromeSprites { texture_id, sprites } => {
+                    PrimitiveBatch::MonochromeSprites {
+                        texture_id,
+                        sprites,
+                    } => {
                         let tex_info = self.atlas.get_texture_info(texture_id);
                         let instance_buf = self.instance_belt.alloc_data(&sprites, &self.gpu);
                         let mut encoder = pass.with(&self.pipelines.mono_sprites);
@@ -459,7 +463,10 @@ impl BladeRenderer {
                         );
                         encoder.draw(0, 4, 0, sprites.len() as u32);
                     }
-                    PrimitiveBatch::PolychromeSprites { texture_id, sprites } => {
+                    PrimitiveBatch::PolychromeSprites {
+                        texture_id,
+                        sprites,
+                    } => {
                         let tex_info = self.atlas.get_texture_info(texture_id);
                         let instance_buf = self.instance_belt.alloc_data(&sprites, &self.gpu);
                         let mut encoder = pass.with(&self.pipelines.poly_sprites);
@@ -474,7 +481,7 @@ impl BladeRenderer {
                         );
                         encoder.draw(0, 4, 0, sprites.len() as u32);
                     }
-                    PrimitiveBatch::Surfaces {..} => {
+                    PrimitiveBatch::Surfaces { .. } => {
                         unimplemented!()
                     }
                 }
diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index 4e136da3d6..3818ec2c65 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -9,6 +9,8 @@ use raw_window_handle as rwh;
 use std::{
     ffi::c_void,
     mem,
+    num::NonZeroU32,
+    ptr::NonNull,
     rc::Rc,
     sync::{self, Arc},
 };
@@ -71,17 +73,17 @@ pub(crate) struct LinuxWindowState {
 #[derive(Clone)]
 pub(crate) struct LinuxWindow(pub(crate) Arc<LinuxWindowState>);
 
-unsafe impl rwh::HasRawWindowHandle for RawWindow {
-    fn raw_window_handle(&self) -> rwh::RawWindowHandle {
-        let mut wh = rwh::XcbWindowHandle::empty();
+unsafe impl blade_rwh::HasRawWindowHandle for RawWindow {
+    fn raw_window_handle(&self) -> blade_rwh::RawWindowHandle {
+        let mut wh = blade_rwh::XcbWindowHandle::empty();
         wh.window = self.window_id;
         wh.visual_id = self.visual_id;
         wh.into()
     }
 }
-unsafe impl rwh::HasRawDisplayHandle for RawWindow {
-    fn raw_display_handle(&self) -> rwh::RawDisplayHandle {
-        let mut dh = rwh::XcbDisplayHandle::empty();
+unsafe impl blade_rwh::HasRawDisplayHandle for RawWindow {
+    fn raw_display_handle(&self) -> blade_rwh::RawDisplayHandle {
+        let mut dh = blade_rwh::XcbDisplayHandle::empty();
         dh.connection = self.connection;
         dh.screen = self.screen_id;
         dh.into()
@@ -91,16 +93,18 @@ unsafe impl rwh::HasRawDisplayHandle for RawWindow {
 impl rwh::HasWindowHandle for LinuxWindow {
     fn window_handle(&self) -> Result<rwh::WindowHandle, rwh::HandleError> {
         Ok(unsafe {
-            let raw_handle = rwh::HasRawWindowHandle::raw_window_handle(&self.0.raw);
-            rwh::WindowHandle::borrow_raw(raw_handle, rwh::ActiveHandle::new())
+            let non_zero = NonZeroU32::new(self.0.raw.window_id).unwrap();
+            let handle = rwh::XcbWindowHandle::new(non_zero);
+            rwh::WindowHandle::borrow_raw(handle.into())
         })
     }
 }
 impl rwh::HasDisplayHandle for LinuxWindow {
     fn display_handle(&self) -> Result<rwh::DisplayHandle, rwh::HandleError> {
         Ok(unsafe {
-            let raw_handle = rwh::HasRawDisplayHandle::raw_display_handle(&self.0.raw);
-            rwh::DisplayHandle::borrow_raw(raw_handle)
+            let non_zero = NonNull::new(self.0.raw.connection).unwrap();
+            let handle = rwh::XcbDisplayHandle::new(Some(non_zero), self.0.raw.screen_id);
+            rwh::DisplayHandle::borrow_raw(handle.into())
         })
     }
 }
diff --git a/crates/gpui/src/platform/mac/metal_atlas.rs b/crates/gpui/src/platform/mac/metal_atlas.rs
index 95f78a4465..7c23fafcba 100644
--- a/crates/gpui/src/platform/mac/metal_atlas.rs
+++ b/crates/gpui/src/platform/mac/metal_atlas.rs
@@ -174,6 +174,7 @@ impl MetalAtlasTexture {
                 origin: allocation.rectangle.min.into(),
                 size,
             },
+            padding: 0,
         };
         Some(tile)
     }

From c5ff46e14f8d3510a67fdc40f0c85c6940326bd5 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sat, 3 Feb 2024 23:50:17 -0800
Subject: [PATCH 215/372] blade: fix shadow vertex bounds

---
 crates/gpui/src/platform/linux/shaders.wgsl | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/crates/gpui/src/platform/linux/shaders.wgsl b/crates/gpui/src/platform/linux/shaders.wgsl
index 7d0c9d53ae..05174c0d7f 100644
--- a/crates/gpui/src/platform/linux/shaders.wgsl
+++ b/crates/gpui/src/platform/linux/shaders.wgsl
@@ -276,14 +276,13 @@ struct ShadowVarying {
 @vertex
 fn vs_shadow(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index) instance_id: u32) -> ShadowVarying {
     let unit_vertex = vec2<f32>(f32(vertex_id & 1u), 0.5 * f32(vertex_id & 2u));
-    let shadow = b_shadows[instance_id];
+    var shadow = b_shadows[instance_id];
 
     let margin = 3.0 * shadow.blur_radius;
     // Set the bounds of the shadow and adjust its size based on the shadow's
     // spread radius to achieve the spreading effect
-    var bounds = shadow.bounds;
-    bounds.origin -= vec2<f32>(margin);
-    bounds.size += 2.0 * vec2<f32>(margin);
+    shadow.bounds.origin -= vec2<f32>(margin);
+    shadow.bounds.size += 2.0 * vec2<f32>(margin);
 
     var out = ShadowVarying();
     out.position = to_device_position(unit_vertex, shadow.bounds);

From d6bbcf503b7c687a909d74ec6f2c47c78c71a8cb Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sun, 4 Feb 2024 00:09:32 -0800
Subject: [PATCH 216/372] blade: enforce alignment in the belt

---
 crates/gpui/src/platform/linux/blade_atlas.rs |  1 +
 crates/gpui/src/platform/linux/blade_belt.rs  | 23 +++++++++++--------
 .../gpui/src/platform/linux/blade_renderer.rs |  1 +
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/crates/gpui/src/platform/linux/blade_atlas.rs b/crates/gpui/src/platform/linux/blade_atlas.rs
index 6f5b3da255..f664694508 100644
--- a/crates/gpui/src/platform/linux/blade_atlas.rs
+++ b/crates/gpui/src/platform/linux/blade_atlas.rs
@@ -58,6 +58,7 @@ impl BladeAtlas {
             upload_belt: BladeBelt::new(BladeBeltDescriptor {
                 memory: gpu::Memory::Upload,
                 min_chunk_size: 0x10000,
+                alignment: 4,
             }),
             monochrome_textures: Default::default(),
             polychrome_textures: Default::default(),
diff --git a/crates/gpui/src/platform/linux/blade_belt.rs b/crates/gpui/src/platform/linux/blade_belt.rs
index 17f100beb2..b0e4be5893 100644
--- a/crates/gpui/src/platform/linux/blade_belt.rs
+++ b/crates/gpui/src/platform/linux/blade_belt.rs
@@ -9,6 +9,7 @@ struct ReusableBuffer {
 pub struct BladeBeltDescriptor {
     pub memory: gpu::Memory,
     pub min_chunk_size: u64,
+    pub alignment: u64,
 }
 
 /// A belt of buffers, used by the BladeAtlas to cheaply
@@ -21,6 +22,7 @@ pub struct BladeBelt {
 
 impl BladeBelt {
     pub fn new(desc: BladeBeltDescriptor) -> Self {
+        assert_ne!(desc.alignment, 0);
         Self {
             desc,
             buffers: Vec::new(),
@@ -39,9 +41,10 @@ impl BladeBelt {
 
     pub fn alloc(&mut self, size: u64, gpu: &gpu::Context) -> gpu::BufferPiece {
         for &mut (ref rb, ref mut offset) in self.active.iter_mut() {
-            if *offset + size <= rb.size {
-                let piece = rb.raw.at(*offset);
-                *offset += size;
+            let aligned = offset.next_multiple_of(self.desc.alignment);
+            if aligned + size <= rb.size {
+                let piece = rb.raw.at(aligned);
+                *offset = aligned + size;
                 return piece;
             }
         }
@@ -75,13 +78,15 @@ impl BladeBelt {
     //Note: assuming T: bytemuck::Zeroable
     pub fn alloc_data<T>(&mut self, data: &[T], gpu: &gpu::Context) -> gpu::BufferPiece {
         assert!(!data.is_empty());
-        let alignment = mem::align_of::<T>() as u64;
+        let type_alignment = mem::align_of::<T>() as u64;
+        assert_eq!(
+            self.desc.alignment % type_alignment,
+            0,
+            "Type alignment {} is too big",
+            type_alignment
+        );
         let total_bytes = data.len() * mem::size_of::<T>();
-        let mut bp = self.alloc(alignment + (total_bytes - 1) as u64, gpu);
-        let rem = bp.offset % alignment;
-        if rem != 0 {
-            bp.offset += alignment - rem;
-        }
+        let bp = self.alloc(total_bytes as u64, gpu);
         unsafe {
             std::ptr::copy_nonoverlapping(data.as_ptr() as *const u8, bp.data(), total_bytes);
         }
diff --git a/crates/gpui/src/platform/linux/blade_renderer.rs b/crates/gpui/src/platform/linux/blade_renderer.rs
index 1b7db6bcd4..0e6a9f980a 100644
--- a/crates/gpui/src/platform/linux/blade_renderer.rs
+++ b/crates/gpui/src/platform/linux/blade_renderer.rs
@@ -251,6 +251,7 @@ impl BladeRenderer {
         let instance_belt = BladeBelt::new(BladeBeltDescriptor {
             memory: gpu::Memory::Shared,
             min_chunk_size: 0x1000,
+            alignment: 0x100, // required by DX12
         });
         let atlas = Arc::new(BladeAtlas::new(&gpu));
         let atlas_sampler = gpu.create_sampler(gpu::SamplerDesc {

From 13ba8b6b54fac0324e86cd707cc8f2ccd850cfad Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sun, 4 Feb 2024 11:34:57 -0800
Subject: [PATCH 217/372] Fix linux target in rust-toolchain.toml

Co-authored-by: Ilia <43654815+istudyatuni@users.noreply.github.com>
---
 rust-toolchain.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index af32046cb1..cda3826601 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -2,4 +2,4 @@
 channel = "1.75"
 profile = "minimal"
 components = [ "rustfmt", "clippy" ]
-targets = [ "x86_64-apple-darwin", "aarch64-apple-darwin", "x86_64-linux-gnu", "wasm32-wasi" ]
+targets = [ "x86_64-apple-darwin", "aarch64-apple-darwin", "x86_64-unknown-linux-gnu", "wasm32-wasi" ]

From aae532987f003b1850c8ff9e7a5518f02bed1657 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sun, 4 Feb 2024 10:18:00 -0800
Subject: [PATCH 218/372] blade: tune belt alignment to match Intel Iris Xe

---
 crates/gpui/src/platform/linux/blade_atlas.rs    | 2 +-
 crates/gpui/src/platform/linux/blade_renderer.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/gpui/src/platform/linux/blade_atlas.rs b/crates/gpui/src/platform/linux/blade_atlas.rs
index f664694508..2abb28fd64 100644
--- a/crates/gpui/src/platform/linux/blade_atlas.rs
+++ b/crates/gpui/src/platform/linux/blade_atlas.rs
@@ -58,7 +58,7 @@ impl BladeAtlas {
             upload_belt: BladeBelt::new(BladeBeltDescriptor {
                 memory: gpu::Memory::Upload,
                 min_chunk_size: 0x10000,
-                alignment: 4,
+                alignment: 64, // Vulkan `optimalBufferCopyOffsetAlignment` on Intel XE
             }),
             monochrome_textures: Default::default(),
             polychrome_textures: Default::default(),
diff --git a/crates/gpui/src/platform/linux/blade_renderer.rs b/crates/gpui/src/platform/linux/blade_renderer.rs
index 0e6a9f980a..05cb84850d 100644
--- a/crates/gpui/src/platform/linux/blade_renderer.rs
+++ b/crates/gpui/src/platform/linux/blade_renderer.rs
@@ -251,7 +251,7 @@ impl BladeRenderer {
         let instance_belt = BladeBelt::new(BladeBeltDescriptor {
             memory: gpu::Memory::Shared,
             min_chunk_size: 0x1000,
-            alignment: 0x100, // required by DX12
+            alignment: 0x40, // Vulkan `minStorageBufferOffsetAlignment` on Intel Xe
         });
         let atlas = Arc::new(BladeAtlas::new(&gpu));
         let atlas_sampler = gpu.create_sampler(gpu::SamplerDesc {

From 61fa5e93a8e9f73d585626ebb67af329332d4ea7 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sun, 4 Feb 2024 12:15:41 -0800
Subject: [PATCH 219/372] blade: always create texture views for atlas tiles

---
 crates/gpui/src/platform/linux/blade_atlas.rs | 40 +++++++++----------
 .../gpui/src/platform/linux/blade_renderer.rs |  8 ++--
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/crates/gpui/src/platform/linux/blade_atlas.rs b/crates/gpui/src/platform/linux/blade_atlas.rs
index 2abb28fd64..949599d4fd 100644
--- a/crates/gpui/src/platform/linux/blade_atlas.rs
+++ b/crates/gpui/src/platform/linux/blade_atlas.rs
@@ -32,15 +32,14 @@ struct BladeAtlasState {
 
 impl BladeAtlasState {
     fn destroy(&mut self) {
-        for texture in self.monochrome_textures.drain(..) {
-            self.gpu.destroy_texture(texture.raw);
+        for mut texture in self.monochrome_textures.drain(..) {
+            texture.destroy(&self.gpu);
         }
-        for texture in self.polychrome_textures.drain(..) {
-            self.gpu.destroy_texture(texture.raw);
+        for mut texture in self.polychrome_textures.drain(..) {
+            texture.destroy(&self.gpu);
         }
-        for texture in self.path_textures.drain(..) {
-            self.gpu.destroy_texture(texture.raw);
-            self.gpu.destroy_texture_view(texture.raw_view.unwrap());
+        for mut texture in self.path_textures.drain(..) {
+            texture.destroy(&self.gpu);
         }
         self.upload_belt.destroy(&self.gpu);
     }
@@ -48,7 +47,7 @@ impl BladeAtlasState {
 
 pub struct BladeTextureInfo {
     pub size: gpu::Extent,
-    pub raw_view: Option<gpu::TextureView>,
+    pub raw_view: gpu::TextureView,
 }
 
 impl BladeAtlas {
@@ -198,17 +197,13 @@ impl BladeAtlasState {
             dimension: gpu::TextureDimension::D2,
             usage,
         });
-        let raw_view = if usage.contains(gpu::TextureUsage::TARGET) {
-            Some(self.gpu.create_texture_view(gpu::TextureViewDesc {
-                name: "",
-                texture: raw,
-                format,
-                dimension: gpu::ViewDimension::D2,
-                subresources: &Default::default(),
-            }))
-        } else {
-            None
-        };
+        let raw_view = self.gpu.create_texture_view(gpu::TextureViewDesc {
+            name: "",
+            texture: raw,
+            format,
+            dimension: gpu::ViewDimension::D2,
+            subresources: &Default::default(),
+        });
 
         let textures = match kind {
             AtlasTextureKind::Monochrome => &mut self.monochrome_textures,
@@ -270,7 +265,7 @@ struct BladeAtlasTexture {
     id: AtlasTextureId,
     allocator: BucketedAtlasAllocator,
     raw: gpu::Texture,
-    raw_view: Option<gpu::TextureView>,
+    raw_view: gpu::TextureView,
     format: gpu::TextureFormat,
 }
 
@@ -293,6 +288,11 @@ impl BladeAtlasTexture {
         Some(tile)
     }
 
+    fn destroy(&mut self, gpu: &gpu::Context) {
+        gpu.destroy_texture(self.raw);
+        gpu.destroy_texture_view(self.raw_view);
+    }
+
     fn bytes_per_pixel(&self) -> u8 {
         self.format.block_info().size
     }
diff --git a/crates/gpui/src/platform/linux/blade_renderer.rs b/crates/gpui/src/platform/linux/blade_renderer.rs
index 05cb84850d..1e3853b475 100644
--- a/crates/gpui/src/platform/linux/blade_renderer.rs
+++ b/crates/gpui/src/platform/linux/blade_renderer.rs
@@ -336,7 +336,7 @@ impl BladeRenderer {
             let vertex_buf = self.instance_belt.alloc_data(&vertices, &self.gpu);
             let mut pass = self.command_encoder.render(gpu::RenderTargetSet {
                 colors: &[gpu::RenderTarget {
-                    view: tex_info.raw_view.unwrap(),
+                    view: tex_info.raw_view,
                     init_op: gpu::InitOp::Clear(gpu::TextureColor::OpaqueBlack),
                     finish_op: gpu::FinishOp::Store,
                 }],
@@ -426,7 +426,7 @@ impl BladeRenderer {
                                 0,
                                 &ShaderPathsData {
                                     globals,
-                                    t_sprite: tex_info.raw_view.unwrap(),
+                                    t_sprite: tex_info.raw_view,
                                     s_sprite: self.atlas_sampler,
                                     b_path_sprites: instance_buf,
                                 },
@@ -457,7 +457,7 @@ impl BladeRenderer {
                             0,
                             &ShaderMonoSpritesData {
                                 globals,
-                                t_sprite: tex_info.raw_view.unwrap(),
+                                t_sprite: tex_info.raw_view,
                                 s_sprite: self.atlas_sampler,
                                 b_mono_sprites: instance_buf,
                             },
@@ -475,7 +475,7 @@ impl BladeRenderer {
                             0,
                             &ShaderPolySpritesData {
                                 globals,
-                                t_sprite: tex_info.raw_view.unwrap(),
+                                t_sprite: tex_info.raw_view,
                                 s_sprite: self.atlas_sampler,
                                 b_poly_sprites: instance_buf,
                             },

From 26ca79870750790caf842126cdce4316754a3fde Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sun, 4 Feb 2024 12:45:18 -0800
Subject: [PATCH 220/372] blade: initialize atlas textures

---
 crates/gpui/src/platform/linux/blade_atlas.rs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/crates/gpui/src/platform/linux/blade_atlas.rs b/crates/gpui/src/platform/linux/blade_atlas.rs
index 949599d4fd..ca57b4cb01 100644
--- a/crates/gpui/src/platform/linux/blade_atlas.rs
+++ b/crates/gpui/src/platform/linux/blade_atlas.rs
@@ -27,6 +27,7 @@ struct BladeAtlasState {
     polychrome_textures: Vec<BladeAtlasTexture>,
     path_textures: Vec<BladeAtlasTexture>,
     tiles_by_key: FxHashMap<AtlasKey, AtlasTile>,
+    initializations: Vec<AtlasTextureId>,
     uploads: Vec<PendingUpload>,
 }
 
@@ -63,6 +64,7 @@ impl BladeAtlas {
             polychrome_textures: Default::default(),
             path_textures: Default::default(),
             tiles_by_key: Default::default(),
+            initializations: Vec::new(),
             uploads: Vec::new(),
         }))
     }
@@ -90,7 +92,7 @@ impl BladeAtlas {
 
     pub fn before_frame(&self, gpu_encoder: &mut gpu::CommandEncoder) {
         let mut lock = self.0.lock();
-        lock.flush(gpu_encoder.transfer());
+        lock.flush(gpu_encoder);
     }
 
     pub fn after_frame(&self, sync_point: &gpu::SyncPoint) {
@@ -220,6 +222,8 @@ impl BladeAtlasState {
             raw,
             raw_view,
         };
+
+        self.initializations.push(atlas_texture.id);
         textures.push(atlas_texture);
         textures.last_mut().unwrap()
     }
@@ -229,7 +233,18 @@ impl BladeAtlasState {
         self.uploads.push(PendingUpload { id, bounds, data });
     }
 
-    fn flush(&mut self, mut transfers: gpu::TransferCommandEncoder) {
+    fn flush(&mut self, encoder: &mut gpu::CommandEncoder) {
+        for id in self.initializations.drain(..) {
+            let textures = match id.kind {
+                crate::AtlasTextureKind::Monochrome => &self.monochrome_textures,
+                crate::AtlasTextureKind::Polychrome => &self.polychrome_textures,
+                crate::AtlasTextureKind::Path => &self.path_textures,
+            };
+            let texture = &textures[id.index as usize];
+            encoder.init_texture(texture.raw);
+        }
+
+        let mut transfers = encoder.transfer();
         for upload in self.uploads.drain(..) {
             let textures = match upload.id.kind {
                 crate::AtlasTextureKind::Monochrome => &self.monochrome_textures,

From 0a5ebee9e560fdf4e508ec5caefad6e6ef804626 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sun, 4 Feb 2024 13:03:16 -0800
Subject: [PATCH 221/372] blade: encapsulate BladeAtlasStorage for indexing

---
 crates/gpui/src/platform/linux/blade_atlas.rs | 114 ++++++++++--------
 1 file changed, 64 insertions(+), 50 deletions(-)

diff --git a/crates/gpui/src/platform/linux/blade_atlas.rs b/crates/gpui/src/platform/linux/blade_atlas.rs
index ca57b4cb01..188a554dbe 100644
--- a/crates/gpui/src/platform/linux/blade_atlas.rs
+++ b/crates/gpui/src/platform/linux/blade_atlas.rs
@@ -8,7 +8,7 @@ use blade_graphics as gpu;
 use collections::FxHashMap;
 use etagere::BucketedAtlasAllocator;
 use parking_lot::Mutex;
-use std::{borrow::Cow, sync::Arc};
+use std::{borrow::Cow, ops, sync::Arc};
 
 pub(crate) const PATH_TEXTURE_FORMAT: gpu::TextureFormat = gpu::TextureFormat::R16Float;
 
@@ -23,9 +23,7 @@ struct PendingUpload {
 struct BladeAtlasState {
     gpu: Arc<gpu::Context>,
     upload_belt: BladeBelt,
-    monochrome_textures: Vec<BladeAtlasTexture>,
-    polychrome_textures: Vec<BladeAtlasTexture>,
-    path_textures: Vec<BladeAtlasTexture>,
+    storage: BladeAtlasStorage,
     tiles_by_key: FxHashMap<AtlasKey, AtlasTile>,
     initializations: Vec<AtlasTextureId>,
     uploads: Vec<PendingUpload>,
@@ -33,15 +31,7 @@ struct BladeAtlasState {
 
 impl BladeAtlasState {
     fn destroy(&mut self) {
-        for mut texture in self.monochrome_textures.drain(..) {
-            texture.destroy(&self.gpu);
-        }
-        for mut texture in self.polychrome_textures.drain(..) {
-            texture.destroy(&self.gpu);
-        }
-        for mut texture in self.path_textures.drain(..) {
-            texture.destroy(&self.gpu);
-        }
+        self.storage.destroy(&self.gpu);
         self.upload_belt.destroy(&self.gpu);
     }
 }
@@ -60,9 +50,7 @@ impl BladeAtlas {
                 min_chunk_size: 0x10000,
                 alignment: 64, // Vulkan `optimalBufferCopyOffsetAlignment` on Intel XE
             }),
-            monochrome_textures: Default::default(),
-            polychrome_textures: Default::default(),
-            path_textures: Default::default(),
+            storage: BladeAtlasStorage::default(),
             tiles_by_key: Default::default(),
             initializations: Vec::new(),
             uploads: Vec::new(),
@@ -75,11 +63,7 @@ impl BladeAtlas {
 
     pub(crate) fn clear_textures(&self, texture_kind: AtlasTextureKind) {
         let mut lock = self.0.lock();
-        let textures = match texture_kind {
-            AtlasTextureKind::Monochrome => &mut lock.monochrome_textures,
-            AtlasTextureKind::Polychrome => &mut lock.polychrome_textures,
-            AtlasTextureKind::Path => &mut lock.path_textures,
-        };
+        let textures = &mut lock.storage[texture_kind];
         for texture in textures {
             texture.clear();
         }
@@ -102,12 +86,7 @@ impl BladeAtlas {
 
     pub fn get_texture_info(&self, id: AtlasTextureId) -> BladeTextureInfo {
         let lock = self.0.lock();
-        let textures = match id.kind {
-            crate::AtlasTextureKind::Monochrome => &lock.monochrome_textures,
-            crate::AtlasTextureKind::Polychrome => &lock.polychrome_textures,
-            crate::AtlasTextureKind::Path => &lock.path_textures,
-        };
-        let texture = &textures[id.index as usize];
+        let texture = &lock.storage[id];
         let size = texture.allocator.size();
         BladeTextureInfo {
             size: gpu::Extent {
@@ -141,11 +120,7 @@ impl PlatformAtlas for BladeAtlas {
 
 impl BladeAtlasState {
     fn allocate(&mut self, size: Size<DevicePixels>, texture_kind: AtlasTextureKind) -> AtlasTile {
-        let textures = match texture_kind {
-            AtlasTextureKind::Monochrome => &mut self.monochrome_textures,
-            AtlasTextureKind::Polychrome => &mut self.polychrome_textures,
-            AtlasTextureKind::Path => &mut self.path_textures,
-        };
+        let textures = &mut self.storage[texture_kind];
         textures
             .iter_mut()
             .rev()
@@ -207,11 +182,7 @@ impl BladeAtlasState {
             subresources: &Default::default(),
         });
 
-        let textures = match kind {
-            AtlasTextureKind::Monochrome => &mut self.monochrome_textures,
-            AtlasTextureKind::Polychrome => &mut self.polychrome_textures,
-            AtlasTextureKind::Path => &mut self.path_textures,
-        };
+        let textures = &mut self.storage[kind];
         let atlas_texture = BladeAtlasTexture {
             id: AtlasTextureId {
                 index: textures.len() as u32,
@@ -235,24 +206,13 @@ impl BladeAtlasState {
 
     fn flush(&mut self, encoder: &mut gpu::CommandEncoder) {
         for id in self.initializations.drain(..) {
-            let textures = match id.kind {
-                crate::AtlasTextureKind::Monochrome => &self.monochrome_textures,
-                crate::AtlasTextureKind::Polychrome => &self.polychrome_textures,
-                crate::AtlasTextureKind::Path => &self.path_textures,
-            };
-            let texture = &textures[id.index as usize];
+            let texture = &self.storage[id];
             encoder.init_texture(texture.raw);
         }
 
         let mut transfers = encoder.transfer();
         for upload in self.uploads.drain(..) {
-            let textures = match upload.id.kind {
-                crate::AtlasTextureKind::Monochrome => &self.monochrome_textures,
-                crate::AtlasTextureKind::Polychrome => &self.polychrome_textures,
-                crate::AtlasTextureKind::Path => &self.path_textures,
-            };
-            let texture = &textures[upload.id.index as usize];
-
+            let texture = &self.storage[upload.id];
             transfers.copy_buffer_to_texture(
                 upload.data,
                 upload.bounds.size.width.to_bytes(texture.bytes_per_pixel()),
@@ -276,6 +236,60 @@ impl BladeAtlasState {
     }
 }
 
+#[derive(Default)]
+struct BladeAtlasStorage {
+    monochrome_textures: Vec<BladeAtlasTexture>,
+    polychrome_textures: Vec<BladeAtlasTexture>,
+    path_textures: Vec<BladeAtlasTexture>,
+}
+
+impl ops::Index<AtlasTextureKind> for BladeAtlasStorage {
+    type Output = Vec<BladeAtlasTexture>;
+    fn index(&self, kind: AtlasTextureKind) -> &Self::Output {
+        match kind {
+            crate::AtlasTextureKind::Monochrome => &self.monochrome_textures,
+            crate::AtlasTextureKind::Polychrome => &self.polychrome_textures,
+            crate::AtlasTextureKind::Path => &self.path_textures,
+        }
+    }
+}
+
+impl ops::IndexMut<AtlasTextureKind> for BladeAtlasStorage {
+    fn index_mut(&mut self, kind: AtlasTextureKind) -> &mut Self::Output {
+        match kind {
+            crate::AtlasTextureKind::Monochrome => &mut self.monochrome_textures,
+            crate::AtlasTextureKind::Polychrome => &mut self.polychrome_textures,
+            crate::AtlasTextureKind::Path => &mut self.path_textures,
+        }
+    }
+}
+
+impl ops::Index<AtlasTextureId> for BladeAtlasStorage {
+    type Output = BladeAtlasTexture;
+    fn index(&self, id: AtlasTextureId) -> &Self::Output {
+        let textures = match id.kind {
+            crate::AtlasTextureKind::Monochrome => &self.monochrome_textures,
+            crate::AtlasTextureKind::Polychrome => &self.polychrome_textures,
+            crate::AtlasTextureKind::Path => &self.path_textures,
+        };
+        &textures[id.index as usize]
+    }
+}
+
+impl BladeAtlasStorage {
+    fn destroy(&mut self, gpu: &gpu::Context) {
+        for mut texture in self.monochrome_textures.drain(..) {
+            texture.destroy(gpu);
+        }
+        for mut texture in self.polychrome_textures.drain(..) {
+            texture.destroy(gpu);
+        }
+        for mut texture in self.path_textures.drain(..) {
+            texture.destroy(gpu);
+        }
+    }
+}
+
 struct BladeAtlasTexture {
     id: AtlasTextureId,
     allocator: BucketedAtlasAllocator,

From 224fe13f9f7c8052c381456ebf297f88fcd04001 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sun, 4 Feb 2024 13:59:41 -0800
Subject: [PATCH 222/372] blade: fix tile bounds shader FFI

---
 crates/gpui/src/platform/linux/platform.rs  | 12 ++++++++----
 crates/gpui/src/platform/linux/shaders.wgsl |  8 ++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index f5f251f1ef..b7d51971a1 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -3,8 +3,9 @@
 use crate::{
     Action, AnyWindowHandle, BackgroundExecutor, Bounds, ClipboardItem, CursorStyle, DisplayId,
     ForegroundExecutor, Keymap, LinuxDispatcher, LinuxDisplay, LinuxTextSystem, LinuxWindow,
-    LinuxWindowState, Menu, PathPromptOptions, Platform, PlatformDisplay, PlatformInput,
-    PlatformTextSystem, PlatformWindow, Point, Result, SemanticVersion, Size, Task, WindowOptions,
+    LinuxWindowState, Menu, PathPromptOptions, Platform, PlatformDispatcher as _, PlatformDisplay,
+    PlatformInput, PlatformTextSystem, PlatformWindow, Point, Result, SemanticVersion, Size, Task,
+    WindowOptions,
 };
 
 use collections::{HashMap, HashSet};
@@ -39,6 +40,7 @@ pub(crate) struct LinuxPlatformState {
     atoms: XcbAtoms,
     background_executor: BackgroundExecutor,
     foreground_executor: ForegroundExecutor,
+    dispatcher: Arc<LinuxDispatcher>,
     windows: HashMap<x::Window, Arc<LinuxWindowState>>,
     text_system: Arc<LinuxTextSystem>,
 }
@@ -61,7 +63,8 @@ impl LinuxPlatform {
             x_root_index,
             atoms,
             background_executor: BackgroundExecutor::new(dispatcher.clone()),
-            foreground_executor: ForegroundExecutor::new(dispatcher),
+            foreground_executor: ForegroundExecutor::new(dispatcher.clone()),
+            dispatcher,
             windows: HashMap::default(),
             text_system: Arc::new(LinuxTextSystem::new()),
         }))
@@ -118,6 +121,7 @@ impl Platform for LinuxPlatform {
                 }
                 _ => {}
             }
+            self.0.lock().dispatcher.tick(false);
         }
     }
 
@@ -182,7 +186,7 @@ impl Platform for LinuxPlatform {
         display_id: DisplayId,
         callback: Box<dyn FnMut() + Send>,
     ) {
-        unimplemented!()
+        log::warn!("unimplemented: set_display_link_output_callback");
     }
 
     fn start_display_link(&self, display_id: DisplayId) {}
diff --git a/crates/gpui/src/platform/linux/shaders.wgsl b/crates/gpui/src/platform/linux/shaders.wgsl
index 05174c0d7f..58dd3265bf 100644
--- a/crates/gpui/src/platform/linux/shaders.wgsl
+++ b/crates/gpui/src/platform/linux/shaders.wgsl
@@ -43,11 +43,15 @@ struct AtlasTextureId {
     kind: u32,
 }
 
+struct AtlasBounds {
+    origin: vec2<i32>,
+    size: vec2<i32>,
+}
 struct AtlasTile {
     texture_id: AtlasTextureId,
     tile_id: u32,
     padding: u32,
-    bounds: Bounds,
+    bounds: AtlasBounds,
 }
 
 fn to_device_position_impl(position: vec2<f32>) -> vec4<f32> {
@@ -62,7 +66,7 @@ fn to_device_position(unit_vertex: vec2<f32>, bounds: Bounds) -> vec4<f32> {
 
 fn to_tile_position(unit_vertex: vec2<f32>, tile: AtlasTile) -> vec2<f32> {
   let atlas_size = vec2<f32>(textureDimensions(t_sprite, 0));
-  return (tile.bounds.origin + unit_vertex * tile.bounds.size) / atlas_size;
+  return (vec2<f32>(tile.bounds.origin) + unit_vertex * vec2<f32>(tile.bounds.size)) / atlas_size;
 }
 
 fn distance_from_clip_rect_impl(position: vec2<f32>, clip_bounds: Bounds) -> vec4<f32> {

From b13b5726c56da3653043fa76775b8f65d36de699 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sun, 4 Feb 2024 15:58:29 -0800
Subject: [PATCH 223/372] linux: disable mac-os specific build commands

---
 crates/zed/build.rs | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/crates/zed/build.rs b/crates/zed/build.rs
index 0b13f5bd2f..6905d492e1 100644
--- a/crates/zed/build.rs
+++ b/crates/zed/build.rs
@@ -1,26 +1,28 @@
 use std::process::Command;
 
 fn main() {
-    println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.15.7");
+    if cfg!(target_os = "macos") {
+        println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.15.7");
 
-    println!("cargo:rerun-if-env-changed=ZED_BUNDLE");
-    if std::env::var("ZED_BUNDLE").ok().as_deref() == Some("true") {
-        // Find WebRTC.framework in the Frameworks folder when running as part of an application bundle.
-        println!("cargo:rustc-link-arg=-Wl,-rpath,@executable_path/../Frameworks");
-    } else {
-        // Find WebRTC.framework as a sibling of the executable when running outside of an application bundle.
-        println!("cargo:rustc-link-arg=-Wl,-rpath,@executable_path");
+        println!("cargo:rerun-if-env-changed=ZED_BUNDLE");
+        if std::env::var("ZED_BUNDLE").ok().as_deref() == Some("true") {
+            // Find WebRTC.framework in the Frameworks folder when running as part of an application bundle.
+            println!("cargo:rustc-link-arg=-Wl,-rpath,@executable_path/../Frameworks");
+        } else {
+            // Find WebRTC.framework as a sibling of the executable when running outside of an application bundle.
+            println!("cargo:rustc-link-arg=-Wl,-rpath,@executable_path");
+        }
+
+        // Weakly link ReplayKit to ensure Zed can be used on macOS 10.15+.
+        println!("cargo:rustc-link-arg=-Wl,-weak_framework,ReplayKit");
+
+        // Seems to be required to enable Swift concurrency
+        println!("cargo:rustc-link-arg=-Wl,-rpath,/usr/lib/swift");
+
+        // Register exported Objective-C selectors, protocols, etc
+        println!("cargo:rustc-link-arg=-Wl,-ObjC");
     }
 
-    // Weakly link ReplayKit to ensure Zed can be used on macOS 10.15+.
-    println!("cargo:rustc-link-arg=-Wl,-weak_framework,ReplayKit");
-
-    // Seems to be required to enable Swift concurrency
-    println!("cargo:rustc-link-arg=-Wl,-rpath,/usr/lib/swift");
-
-    // Register exported Objective-C selectors, protocols, etc
-    println!("cargo:rustc-link-arg=-Wl,-ObjC");
-
     // Populate git sha environment variable if git is available
     println!("cargo:rerun-if-changed=../../.git/logs/HEAD");
     if let Ok(output) = Command::new("git").args(["rev-parse", "HEAD"]).output() {

From f92be4b817c2fe05ad456d5cc26d6826e6a2e5a3 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sun, 4 Feb 2024 15:59:07 -0800
Subject: [PATCH 224/372] linux: temporarily disable purescript tree sitter

Link error:
  = note: /nix/store/idiaraknw071d20nlqp49s18gbvw4wa0-binutils-2.40/bin/ld: /x/Code/zed/target/x86_64-unknown-linux-gnu/debug/deps/libtree_sitter_haskell-7323f782ad886c6d.rlib(scanner.o): in function `state_new':
          /home/kvark/.cargo/git/checkouts/tree-sitter-haskell-74c278e7a2ef8d7d/cf98de2/src/scanner.c:218: multiple definition of `state_new'; /x/Code/zed/target/x86_64-unknown-linux-gnu/debug/deps/libtree_sitter_purescript-b0a95fb604a5817c.rlib(scanner.o):/home/kvark/.cargo/git/checkouts/tree-sitter-purescript-88dd3ec656c48026/a37140f/src/scanner.c:218: first defined here
---
 crates/zed/src/languages.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index add9f9c192..0448cb8ec6 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -280,6 +280,8 @@ pub fn init(
         ],
     );
 
+    /// Produces a link error on linux due to duplicated `state_new` symbol
+    #[cfg(not(target_os = "linux"))]
     language(
         "purescript",
         tree_sitter_purescript::language(),

From 1c410c1b996020a7138bb6468f561238fe632a70 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sun, 4 Feb 2024 19:36:58 -0800
Subject: [PATCH 225/372] linux: only tick the main thread tasks and one at a
 time in the event loop

---
 crates/gpui/screenshot.png                   | Bin 0 -> 9562 bytes
 crates/gpui/src/platform/linux/dispatcher.rs |   7 +++++++
 crates/gpui/src/platform/linux/platform.rs   |   7 +++----
 3 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 crates/gpui/screenshot.png

diff --git a/crates/gpui/screenshot.png b/crates/gpui/screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..50597680f03024039943557738252f4270e19c3f
GIT binary patch
literal 9562
zcmaKSbyQT}7w;XqYv>k5Qc6091__657*a*LOBgyVqyzyOKw#()6{I_*yFp5j5@CQL
z-r)DG-+%ATT4(mzpL2HJd)7MV>>Cf&RVO84Bmw|{R8vDm9{{j0T`YhA8$&t@@AYB`
z$Xj1s38)xi{)J(1o+#=l0zma!;!9gx0Kf*I+J>sPlRzLsLP8=UA_4*ee0+RtY-}tn
zEHD_nx3~A_&!3~Cqn|&2wzsz@CnrC9_Dn}dM_yiDLPA17K!BB%m7JU$4-ao=XXobT
z=KTD8Yip~&zrVb^JS{CPHa0dQA|fy_P)|=!Qd08Xy?b<YbYx^?xVX4DI5>lYgV)#B
zXf*ot^mKoJe{F4TX=!O;VPSD`ab#rV#fukED3qU{pPHJwtgP(ImoIPLyz%t(w6n9b
zwzjshv4O#0=H}*FT3Vu_qAV;dmzS5v$H(L2<DH$I_4V~%zkaQ$smaaF4Gs<#6cl7)
zVxpj+NJvPyxVS)}P$wrRhlhvp@$rt1j@sJV5C}w0PEJ-<Rz^lfTwI)zl9H2?)6C4Q
zq@-kKW@dMHmxP35b91w|xA*1CmvM1%QBhI)`uZXwBBZ3G4<9~!_wHR^U*FZ$)%yDS
z>gwvs%F6QcGCMmvGcz*>2L~S?pQ57TlP6EIva&`;N8i7HpPHJQn3xz65@KOtK}<}%
zv9a;v$B&|-B5!YRXJ=<0AD`0F(!YQI{{H=&ii&D`d;8a~UvqPFEiEmDg@te5zAY{;
z?&#=XU|`_o<!x?me)Q;3c6RpU<YYiVfV#T6u(0sN#DtZVm6Vj!<HwH+3JRp9rTzW=
zGcq#H&d&V&{7g+vb8>Q~rlx3UXy)hVhlhuIdV12+)48~~yu7?JGc$#RglK7L-Q3)2
zYiku06dD^FtE#Hh)YR_ZzyIyqHwOm?BobLsQ6VNKR##US9v*&haFCam_x=0#*RNmS
zy?Zw-EbP^*SB8d$)6>(sy1J2(k)J<*=H}*ZXlU^D^+g~MmX?-AMn*h5Ja_KgVPs@{
z`t+%jlaq;w2^$;Rg9i^jeE1L@9c^oC8x#~YFfh>C+8PrR<Lc_Fp`r2V)2F1Qq_MFv
zdU|?gW#x|_KUP*&Dk&+owY7zYhN`Nny1Tp2&dzFTYBn`BxwyCt4GkF>7(9ReysN7#
zKR@5z-rm^QxVyXC!^0ybB}GL=1rCQ-S64f(WlCYz0HKG5nKuBCb=)>kk2}%<0Pgf@
zswf%;Snn<3!>A{x@DB&?&vJrPagwYOI1;U#zzIsN5$uE-S{kiNbP))=87LMvQIs>c
zVu5U8US6OQ5-Sg$fX7D5%1sM}7RwX=0SdMaCJyEonb{rZvt%3(2G4VO8oUqohpx7C
z8y<oc3GPHuDE+_wvZ=K18+=0F4CLkgpbbc%S1d@M@!~b9-<&I%Hfm@Ndi}wZRuTRy
zPFJ<d;;Lq{#HwhYRAQ<$$lwZ(6s+y(7dsoNl*^T-HZm6;Kh*ij{B@?N>*n?J-%aUn
zqVDg0@3SJv+J$pDMXMdY-Y<7++B=mo|K|2$E8G8jON5NY^6K@EtI4aDErkO*6wb%x
zgQw%C6@G-CPN<}=#n%DXl;woJxpI?9N#+GFVjE=qTsEePz29$IjgRS&J&N#&fW<#l
z#R?$FXA*s-)|v8Za9{3&U*pyidjDXy)TDBW^#$YKf|JK#INm<Xp_3QOe_G+`GloJ!
z#2-~gB!N&#e7Q5oVw>{5=dRzd@;A9l4RfWG#Z@apu|wk$&fuq$w!Sgs{qTApRVOU%
za3PW%0{4o+{v)ZoYNBqkHAl$IU7u(2waeR#dtT3Ly$61{Ze3Y-l&>>|ME5kwKDK_b
zfF_U)K3~<xZEOi-LtT2EtR_`1{nBEMB9xPToXSJK+;lK(u<}RQq&Z+Yc8lw+eoK8z
zO30_N)Cu~Behc|;UqAM0zvSk6$Yc&y-17zU03vvs9zgO23+6!$MCJqZ%vu0ztTaK7
zDb^v*gra13&E2P1w{#3!JL(@Sq#5;ypv4r+qbX-`AnGpvE+F<@nKR0UUk<X&3ME{n
z(;`o#gBfzK;%Jdmh!ODKxwIpMzYsB0I_s(-@PGnm>L4LWa~zBzatLSyl*S6D1xZ6N
zSRpVH3S8@v|IZWL))iAM2pZ%A$9PvuAS5YG@8F>=2ka57v0=uZvb3&n19-RU(r!gr
z5R{5|>Sz$jn<-2y#z$NMm-(#!n}Z3o8V7!gy$#&TQo=kYu%C9MiaPF)ju)CdaJ_id
z_V~@gY6OpAI~9D}97;&|ZhJ6Cs{ROhN?ywf-Z);0kKlAOJ`s;RU=?amFO=4V&4THr
z@Oek0=q-d$#XYe)=|Zc&irB&mJK|IVWclm$GY5m6+FxaU9~yq+l^(e~p&eIRi#S&%
z{+ZfBbytfV`jC)U@BNmar*H??X@=3xwMT>$?;hJrHOH9wFIrX%8JaJ10{!~Zab(uq
ziX)oF#xy&mJ0)o@P5D8{cjT!^)xoT$GNW%B!v!1X&7dsDsbj%cHEo@9pI<u%&L=p?
z?COx<2G9M`m7>{4-3O-u6DB)4=WAIDM_ta(-YGT=Z(j&b62*ohJT4W`U2VZh;Z5BG
zd?q}ej>c&~t===WB13Cqe@#6CtsyEU>l>bEs3ExGa&o#N&f%(~ve(Xe)KSMj<B7Bu
z@G)ANIz{-&-uJ0p9sMVTBOV<;c%accYc{jnaMT?I+wo1K8aLJ|oE2lFGNs*WoJrA1
zag=q$+_%QUwyr?~r<UePoC64tQlv>x?=)!@4x~C5FFyXYO_RUq?p$)cYxs9Q?5|x`
zUyHpZywP=g#fN!i?Lt8H{PGO#gMkq3(1+k1L&a+gnUvjgK8iWgQWC+z7)SLHX{55+
z(5yjE-%RveEb@zZ`q`AY(e<g;Gt?($3tJL7coo4;qR#caRvyAD!*ogSiGlAd?U&5u
z9}8+Rq}DNjsksu12v61=<hq{QN6)qg>M1AFnALy5@3h1LBY+38PTYApll=@@IoLg9
zaK;_JyC{69zr!>~vV_B^4CJNTT$ZfaszOUIf1}8tUOA987=!<rCTH#I=x^a&6mT;y
z*LYL#G^cWQzp1oIy%pB^cnI5jX#7u`S8T8E09Ouk{X=Ery1&GbR`aQk;Ky=0^9mex
z+Mq`8y%^wc6z@zO;{zjG+@Lm(=u^VU(W)DiNXziov;hh@If96m=SykvA3BF~NJbmq
z7r!>*r$tYM8|j#10PR@b!%lMl%v_OzjR*R9#2V+{@G@^U?p4M}M0QkhRWTWcr-i*7
zY<PiXmV{l&Tg1F41CQ(7J9P3m1W}wqXf*8do1n?ONeU6usRmj!sB1L%il~u+`H}+y
zv$(32D_qNI$@D0{WWwUf%=LPpssK8`!)F8V$NSZ<dz{_nUDI5@b<tG+M7TZ3IBjca
zYr|)My8(T^!&Oo#_d*(MZ6O~iANl=DN;Ab0DVaP_Ptr5%@~yPxbRmSju`Wa{l*~7u
zz!M#O8uk}JUUa>e^Dme$K)tjtX~n3j#94}7Zrf)pYnvLscRp-KU(LFcrX<wENzKB1
z@drIUD9~b@^iI_IEcqa0gu|-6j>A@J-qbdPe1xsVwn>O_2ga%5E?w(5kedfJ?%wTF
zKn4xbB4w!4>ddZ!zW(}Si0+S%k7nSx-uk%xNYm<ck|p*cM)bZwC3v0^qvcR+g5Byj
z782{Rkb2?dP2qkdc2k%NgVckTGHM66S^xg93ahnzXdp~!=>kor;O$V;d7S1F`G%G0
zJ*z_o`$A_xfdEDeFu}e!&QA=qeGIue%6{#Y(C{SXV@}2X&z8Oj&5#`vroxnWbplVP
z?@q`b8IJdFgXOHM+2lw4LbGld{0^<UEq`Lem#Xy}*_;#msb&v0zDuAL!lX~;&4e6P
z)8@^{v(O^)hfs=vt&_rDA$~E=XM2e>&F??Fxap9d!)+p<c%wv`Bo{f04bx<kaM97O
zB7J)%FBFJd|L8YC?c5u*LfV~sY-hU7FCN?d&a~$n`u0dUJr=K&4R~UKyrZHtfodvh
zlCKf^RN<DGGbw_$b;OH%i~7vM9&+<z!8C(hq2Sd`p^Lp#x1ZC&)W}P~2f%wof9a@s
zV>?5s$<@cTxLO)UdH+YumSftV{7MCOgC?VX64lpI=i{m4>v_}e*7rL~SAyXN&`87Q
z%Cc~diOXLK&+RxX*Jh+mB8V!yWGiQ+l)7%pJv5Y`TB{bDcncEQvDSS<E#W=TeO$>m
zJo|PB1)!D8a48bLm$mOd%d+~iKxA-{(fz8lA9SzDz|fCHE-<IP=x%+2dYPNFM#bl-
zNgMpSJ5fOG^FAN7;or|bSBNGge(`;~P-OW2-I?~Ve)vFh6QsV1NAZevB^MS6kMdit
zahs1jdVof0No3S`@8;B7eDvPF)RID<4flCEz3gKCvUg^A{#J@t>k614Z6sqCmE;*9
zN-0%ui<~AAM3$|y-8eEtPH8u-9zO65dsgBzvtASmgvLiPhDgt7j=u~>)Mqg;=r&8=
zQ0?HeKarnU=_phU5m)G$Acy=ex;}N`Y83pLDyZ>vf*gMAyF37_lAf!(Bq9zo!@YCy
z`tbH*c>5{d9M|D&uzkm`f&~Mmbxn8^dI?oV@%g^@xI+MG2<e!kycL+YUJ0f!nvFnU
zub5(su~U=td~2~b75->^QyWeOF$5z)`2nL5V`%Kp`z~sGm6Se!lQ3zGZ@CnT!G*-s
zDLYhaUwP}E!!{raW8O>hypG2%igmN}Ty1)LHXl}UcN<tBr&)<FHX8cKVy0~o_CX0B
zL23v&iy?y;A>oIlO<ac@7*-85qVZ@mjx6}}a!#^#bf{lZ5Q`h&C(7ji4t=5RwqNm@
zE|fWUXyert1Rs7yrPs~b9X81Y!c)umTzW-Yx#~u-1DfEfxUjKFe`)=hOmxys3Ic*=
z*ZnT^GI=j*MUOCJgYboyJiiQ%emS7Nm^*6~P>c_?K>3f^(x&Nu&NTLKE=Yx>#<PT2
zo0X{E4X}2dz((?)%H?o%OD^f5<s0Exh#IF8Tf8)b7GZ6K2pRT@HnZ@7L$(dkAF&1r
zZtSC!9EK&6V&XacHY>m-Upj2g?(gL}zJkorU%T?DtV4a;^Li!ob>g|-#4G&3+F*8*
z;DIt&+luSex~r&S_v=tMA=*iuOtRONKwSP%3WF}=d0XI68ur)tP%Mfo3S4&X>R+F{
zrhitspGQ{8v)jkz1P`j{AOIYi8@1@q{mfkQQC#PVB9p_}p2xalk6=O>kI(8FEY}NI
z4@KDuMWZCFbsHRo!utb=T5DJi=Nu=Vc1@=L=?kq$LIulW0>W$$(c@cd;~|ji0XSdp
zR{`>+0ER%cC?jqA=xA$(R)~!$>_u=ooczhnpCe&@1&QdQ$!<OJkx+1>kJM;z-5do)
zPJekie3a|UT-F8`u%@YyoqBGpgFmU67FO2YH~OoGy7?<2j2U-@Fo*cDKT1mZbA9Z?
zt)?0YiK>vWS9|+8{E|eiLSdk~PBWlP&f47EIX3NA#So)gpBFWp?W)n}_`!meIsZm)
z42xJ(6C8ScLDw_jZxr|oBi1gW{H)T8f6NPygJ$V+zH@3=VfiA>y=B~wG$scyRTqc9
z7brTAO@|BGg@))3wW^e(>~c}qNQL`V>d%+apliE&<M>t232aH3^G43ZU#v@0pbjE+
zP}P+4PkY&dkzJX953oaOU{}zdPXMPm?A7NxcWh%yftk=UkKA9q@jl_2_bqW-&FlBK
zYtSRSlbP6$DVdwGV0%k7=1Y?VovxM=$)#<8EddMM8yeo<8Dal3N$WJ%@!;%?AhrSC
zP9hC3A+RQ;hCecUt)R%=ZqUU?wO2i4O?S7|kPvJ;C+%|chcrzz>7JOCY|Hj<{j^p>
zL90yS09mwKx0YcHDdgT>*f_omkbsa~WflkUbN><hTh31bz=d!j@r5K^06)dRb}7tG
zd6eUS`{p?kQOO<5h8nX6p8-ak5V|nz5%PZUkS%r<-9K_jkiwNUQ08$oIg$nc6XhKr
zT4BXJ=*0b4QeqsXN*7^HxIwtZ+KCHE$HH`)mGEHqFaq<y1KxMpy2K;#g1M@k{V&5Y
zlA#sWY}(4N-Mlr{{jkgp^QuFvax%`MNm^g{xP8@S$A+N8|6(z~D|01RSwsLZ;vbn-
z@@$uJ0IspS2oG+9_`e4l%o$)`@Tp!rHxMLDZEnax1lRqvuJrPe3TPz$-a66)!<W@4
z|Hn`BkK|G50X}Oy{|z+akn+-Ca`F+5mzr>jvx6fJOki*0V9pJg^F}Obs}Lr(SW@6M
z;RK-z@clMrE<g+fLmYr8i~lk!b4x^kGy~{I4>ATI*#1_81fnA?W66~WLJ)WDbmd@-
zp2Vz0`Aa}vKKe^X&DGdI@PK#p8Mm$^mq0jeY8(~<Jk<1`XB?j3TBORYZcFm@z&jXk
zR6?jR2sMz6q#?yfQQfASAh02B6JyYg;?G2@`hSkxL|_uz3lOmV=Vr-&ZZi9P1G4GY
z;rCO!QwT6mB~cE7g$Xzjw4HhTv=Tv2P5;5588v$)Urf$h^lx7k5rAnsO;0+Uq!k;Q
zbx1}B9P@JP2E-CWlz1`jckB^bJ}w1<!goPWHIQyASXIoA!27FMP?}pZ1-d3IAVfjs
z;E?IKaZ*dbI(jTB7zvmfD?e+OGX(N}!K&O4SWrSD@OAE2EcwXxs4yh!3J&%COJ!Ub
z_CK;B!L4n`IY-sNHRm8t7E9F1h~Xz*w0;a02=%VEC_0r}p)`YGv5SVctB5hQ=-M2(
z^0qbmA1g87Z`fn4^kQJnHH5&jO;cNuqfgVjng;|zAfYa0+dQ(Pj&i4T6sI;Dzh9eo
znGgtRMiLz_O~e{56&AhG3=%m3rL!oCZFfS9XiyOhHVNma8HfCLwSk~<vpddS&7k9^
zSHDyLWMxGYwt~2|3`hG=q}P=>B*UMJ*BVYCQSQ0?ddg!cq2+=21$=PTvoPOX4nrT~
zxDxSJ7s1D8R%x6^nn>LU4QW0V)t6Upg|20|$wKE$&dKcWhlupv{<zt=9Cw(#d&4tv
zU(tm7kzv)yjkNiXd?C_g8fYd?6M|dMy8B9K{6%jjF<AH+=!+(lG@*v~729N)C)J(-
z!6!fX>)J9NA<AS|%ybI`H@Lblb2t?0+GSH7+o&d!cI9;%9=NYH%ATH}sesgpK<9Et
zrcg%u-%FWr(w(>BN;Bqr5iB>NcA;<Phbs=By9aAAg759+JX$PLLi!ZOTlReYTYwHp
zSC#((FP`}wF?a8bDj{#yn%+u$cJu21H;AVGn)JAbtA|a9fk_20O@4nABrxF<?Ga{R
zPGktBIP{bE?`n5&p#YsxCfF^85b*M<nhFf}j3&R@g>9bQYs5_!PGSXC38+<fu45|2
zn0o9FMeBbX&gwxn__xXa4Gu7KC*1XePu_SXY?I+QN=dY59cfD9CRbwwW#+5dx9CE}
zU57@4U<}!?=CjjeOPP^R_^q9^@HIy0<3P{5wnS@`HaN#!T*m?FuQL7u>(#g`amz;Y
zyD*})`>gQ#HH)xW@ehXNt@fcNuKdq!sqDUdB$qT4^rF`8);$5V|AqzRvn|GLi&(g)
zb2YOhyH^r&04_g7AGGf8wF!~Vf<2I%Aq+SApYYjVmg5I-Lx8-@HWjrkOTfF6Yt=Pf
zo2*0-%N(!&RPFm&;`BV|`Vj|*d2fANSrEC0_{v`Y@W>D#VIh;wB5&rvK<JaPBL@jx
zp(L=8v6a3XjPDfVZsC}%T7utt!awmdQz$A8YZ+J8cDkD6esb&%s7ipWjwG&1Tj+wc
zF9?UV(7&NkOY;PKg+zpEv3ht#8T&q-CH7#_IU-|+FWh){M-tgbew-X*4R)dOpx5Xu
z7s{}t0KpcC@94&UxD;-&TM<*7c1tI2-b+P)Y}ygTDx1pqjNlE6(&}!)QO$>=0hTRW
zk=dt|fG3;b#<JTc-Kt^C+as@n-iK6mqNG!xvZ;0!==(4xN2%R#1wkB3Z0)qLb%$us
zcSYe!>^f3{&}Stv%WbtWB3vtDdWknN<#y5&EYhc{a0@vkKO8C7J<m*16W?fZo$XMp
zDBc&6$O#Bv<He+MWIddNdQLaPiGkd^+FbeM*cILv_q2dAHeBXo5>^I~0aK^{yTi5@
z7P+nRW4fTbTgkE@54?GXl~h!insl(N*b3w@PBM@jD}_FW05031r$4Ry0z^2T3=6sf
zKWU9U{i&9&Yixz^B6OG``RnW+L4@6~EHodfjx9)2IuDaJvx=DGOngGQLUuVZGNmw=
z9gQVz!g+|7k<X*eRrwRzgyVGr7$12&9mv_vR+AKk%Hqjau#Kn8a;xD$Dp*^c_nKvE
zaR`P7yi^-K?u(Oo6{j_eSTTK<)xn09Gw-PGBz@ZrE`s(S#vE#1QS7v*c#Vq#Q<s^D
zF&O`QhbBGUbWhje$l+hZ0vWn^m5`r+X~PZh1@B~5WYG_6tsfSv7WEdUKl_XYcz#KX
z6z3lQCcVgGD0z3gWaL?wyfg<;<BFR?Une&4LQl!4;6m|1{F8?Et>fWO3u!|40g;dC
zo9}jxlZ53bB?}t5Al*6Pu|N>PO+-8m;+&(k{BSPuz}&80^GR&1(>~dqt6`oR@+uWc
zoK|N!whLrbqlK@iCDan!ACSe*`8Y!rhyBqtW(OAS<It-$<7q570GjWIs@W5`x34Ea
za9XVy`ulk{xsY-=g+mt_kfTqD#-X9cKI)PjK!mJ+DKFQtWp8Q3ezYAZWi9=zC-h7-
zynq~z)epg8Ut{Fv6WsbjwQtKP5s7*}NM}Q`XNnAbSF^}+9|%)2%cz%jiJ&9sN>>Pw
z597BFZrz33aJoPPmhtZc<GE$OolsFG1kpc}u=w(KD7-IXrKykQGyK0B!U<b#pvIwJ
zTMAz3l?%Tg)@}VFxL&>_pTLIIfrAM5(&C(M2=D1ia|}%B&}DZFSV?YqB!e7bhwBT0
zw)s$mB?Z|h-uZ^h3HzJB0lm<oid^?SLvzvs>L@};EysNLdm}R<K`_;7{qZF~e%5m`
z4Jk@K#n*gAc37}t(&$v-V@FM{(sVZC)dLl>Xm?kV4Tp5Tn$6<s7Gf~4>dRf0*j`z)
zlBxv0@;rM>`zZd#V65f=hn+FL(RXoefWtbxJt5=rbJSvl+iXWWnm}*o^lNzKE2Gi2
zgNfPY*F>#osHqgsV_c?tCPQT?{O|221d40lBgg*yp5ntN;v=PjlR`~3?_w`L9H;Av
zAPp{wnkU3zz@GML7OZ`Uc=XWS*cDAn1CO0NvluwD7~@TjrTFqQHGrEHud@$5=azJN
zXQ9T%NU#?P^m-4E!7PJ6*)(EGPy4ZNd1Jd`a=mB6o0Eb=D|aVlN%3glSG>MZqmPkv
zDJs38*FSiP$nuE7OMB*S+>&dBgHz929_>FV1!&;18z^X66)B;--58g5`;4Yww%`;j
z6*7oy{5_)&-gjSio#OFD3mO8<&gFUL<xfg;pEyQQNd1j*EOBG|?z|`EuW=!5!!um`
zg7zLS5JC06<gnw5T(6mTIN`f|^yS~Tu{S7G=F8($D_<I`;_@_y)t@`IQWbwkmx-XD
zIOvL<>b0Y8N15h(E&|W`AF-}%*DIAQy4e@`SL-Tf!E=`p$xJ0Z)n7tYqJHU|kh`v8
zd61_V$4W}9$We1rF7VTOTl$&jJQiH~YTGUPjnw+Rz>5%<tvPe5Y1Xbm-ecAV!}8w2
zxidFnW5ojJcH9*(cR7{tmhC$47eiY0r9!LSMOx;dPbTy3Zh?;I^ZQbf&Z%NgoIIU#
z$2rX((kaLZ%(}hH-CN{;FIvw?B>+q!YMottKfR($dDqY)B*X02ASWO&bTx@q_DSIp
zY1k}lHX{rCu*A2QB7T?21N0PBU^HQG-n;eIvo}QZ<ck8FxK)6=yrgS#b<$UTrgSLR
z#>NBG8$Gte`#Wag0re&a{_}t&Yym(lx3<4?a=5Q<f)u<d_@tv}yfgn${FCQXF~;e7
z5vHXG>sr&&J)xN8)fXCfxn+2T5_ubp<~R(yu8T`p&yQ?z8^Q5Q;cJW<W_4PE1L1i+
zVhWXQ=TePy@n4@xF)vR^&FB;bz-CVZ=oiTDd=+eDi65(NvK$`_(vDqdhbY}lx39U;
zOZAeLYLr(l&ebaPpriR?ceq2Iia3-eejcs(ZA7f(c`7eOM&-;Ngqk~KXfS7z0{`g9
z#UhO_o%=IQOn{&Bkwv#-dh5=&Vt(~pES>n$_gYdJronH}m4u%kn(E%cMs!}4LN^<4
zGO~KsQ|{f%F=NpUyR<H<dU#-ggai*2zVw@p@~3J3P5Ne7i?m_$2|;VM$AwT{`3mtm
zeTdP_x7tTU<Gb{hk=d>}QS<l-&rUr2Or2V*_jV_3Jqr^aZ)5K4H`duTJJ<Gdev?<y
zVC5bp^?cxru^kS>4Wc}(zx1z84NsT)vtG}lI@sa80qfgoa#Kn7yEMrShI5p^wL9n9
zl-L)l3;mRKhvMR+ytq4iV@{PHwM?dS%y|=&rKY+~NJVZRKQaefYp&KPe#m1VrG>d$
zsgbG+RDWc5IctNuH1_X30^4&;GN`gUkY=08Se_ooDoum9IrG)q`Z|UcYD%r<uCGYJ
z>x}(2A7H|J=FQ%-tt4;Emq}URI0EkT>}j>SYqQCV0#}v3yHox_buGc67Y?YAh2N4W
zk$jwxA!s@{ZAq%me!R+h9);gTm0pmK_OpEVZsK=u`<rs}rnwUP(&U!K@2l+zP0#v%
z5t;=CzIzwAAI7PzH+owubP>+nD>Sp`D(5FyrddObfP_3Rb2%vtT;hw1tBb9x50y7q
zA3l)~FqI9}K~F~VdQWY<kF~~;JTu2<4@Cq6j&4j!6EREV6vA}Q?3T)cSR576j0Dq%
zpgICEii%Zi56~@KiKCVU{|C<y-NJOBqFlUou@G{^LU~7A!lphs%!N%4c(o_-RQDG*
z@EuD2!9bb_&KlQ{D^-vWY==L;D_Z1JOM}24@*Bw-JBi{Y7#2A+S+N3)C_c^}npp4>
zp_8pOJj4fI)IU<`hOk80lYl&s0rT{E)J)g?MD2@E{8iIC%78T-Q-z}sg2(w{0D3JT
zr6pQY4^y<eCiJCvQ;oA?&^#Q^!O9P!XACtV<j}9iVb?i+z6f?A$qc6?tmR7#;|Il!
zT_hYuu?%pq>ox`Vf(xo}T6IAyY+3*_HE=DA3m2elQ@B0xa{`;)w*|ccCj=Bor3kJ5
z3s4pzsM-Y!flERRFO0iFjEp*b$pa`rFa<zu&<w#p6ef3D?DMdOsB{Wo#!D#zQ2~|1
zxm4|yuN<CgzY@h@eD(^W_tm6d6Kz=cKN(4<9}Q}J7S|S6lq)RE{{unWUilCMw$Ed%
zPn(RSbNk*38;_)MgE1Y!%Ln!g0*V-m$EN$pATmsa@gkKI@R_E+o)lNMx5JbezYUVT
zj#qpMTpPtlb$23w!%8no(fi#_x0WL}V896=-RdQTAjK3mrx+Q*`5%ZeN~G~$#|z(Q
zyH!We2)>&=M83I9f$?|S=++Ixn0&=ItG7MMm`G4sAf{(R($NeX(8DMlNX0FWXCEP4
zlOCZk2j}0#=oQCf1pnkiMtYR7VJtI9i$#SIBZP%@$IE}7eZyu1+q>VvWXYEWGl*Ke
z4UYj6@h>0IxG+J8z1=-1d25Rr2ATB<6}nLqW+v$!x-GkIswh6^fC4@UFV3erQ8+}v
zjYyBuKZJb)j6pt711zS5<?#?XI4kwaFnIwhgq+Cx_7!A>&^5z1Q{G@9h!67c@y0nI
zbWZswTzzr`vG`vx%ysJb6=z_NhXEHt*GW9`F=@0KcyY!!XHcU-1Q*bbK26b{Ih?FK
zGQp2Y5O}ZgGfK)wqJuCmLaIc+BPKH;LEP0@vZXsWOnX-r)tka&FqC8S*=aH^U8x_N
zoVLbN@GFO6RY3aQC}F*_`}eao+qXfnyOS~tUFb;kb2$|GNB8}ng`3nv+12y&CVSuI
zlI-NiCTx0d2SG3{Q|5Q6&Sf?p$e@#*ShD(?<3Ay&%g}R+KJO(#6V{`Ule#~Vv8b)m
zw{=ClS7n(fN>t0hm%y;Uv`4xD=bi`lRtF`1t3NS?lq5Sl*_*(wl#8|wbkq9#f#JZg
zqq++)_puAlEAoc02Z5aiE$E`~{7u~e``r_*h9G&J6WXQ6Aq)evwrZS`Yk5s;D-CG;
zvr+Vep{wEJNi=-xPQcXh_(qOa02|MF?nM5Qz6tBGHukW!K-kGUs->QOS<{`OZOI0y
zh3kI8|KBGQ|GuTjgU7|);Aeb(a;0Ywnuqz)gUr!X(@94M;KlR_Fzxm?W{`YKG*xv~
JDwJRm{|DkQwW$CA

literal 0
HcmV?d00001

diff --git a/crates/gpui/src/platform/linux/dispatcher.rs b/crates/gpui/src/platform/linux/dispatcher.rs
index 14072f040a..d669e56ab6 100644
--- a/crates/gpui/src/platform/linux/dispatcher.rs
+++ b/crates/gpui/src/platform/linux/dispatcher.rs
@@ -46,6 +46,13 @@ impl LinuxDispatcher {
             main_thread_id: thread::current().id(),
         }
     }
+
+    pub fn tick_main(&self) {
+        assert!(self.is_main_thread());
+        if let Ok(runnable) = self.main_receiver.try_recv() {
+            runnable.run();
+        }
+    }
 }
 
 impl PlatformDispatcher for LinuxDispatcher {
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index b7d51971a1..e1d21ef69d 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -3,9 +3,8 @@
 use crate::{
     Action, AnyWindowHandle, BackgroundExecutor, Bounds, ClipboardItem, CursorStyle, DisplayId,
     ForegroundExecutor, Keymap, LinuxDispatcher, LinuxDisplay, LinuxTextSystem, LinuxWindow,
-    LinuxWindowState, Menu, PathPromptOptions, Platform, PlatformDispatcher as _, PlatformDisplay,
-    PlatformInput, PlatformTextSystem, PlatformWindow, Point, Result, SemanticVersion, Size, Task,
-    WindowOptions,
+    LinuxWindowState, Menu, PathPromptOptions, Platform, PlatformDisplay, PlatformInput,
+    PlatformTextSystem, PlatformWindow, Point, Result, SemanticVersion, Size, Task, WindowOptions,
 };
 
 use collections::{HashMap, HashSet};
@@ -121,7 +120,7 @@ impl Platform for LinuxPlatform {
                 }
                 _ => {}
             }
-            self.0.lock().dispatcher.tick(false);
+            self.0.lock().dispatcher.tick_main();
         }
     }
 

From d03f3b9f181ab33c6585c712f61226f0db7eaa8c Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sun, 4 Feb 2024 20:14:11 -0800
Subject: [PATCH 226/372] linux: switch folders to use CONFIG_DIR

---
 crates/util/src/paths.rs | 60 ++++++++++++++++++++++++++++++++--------
 1 file changed, 48 insertions(+), 12 deletions(-)

diff --git a/crates/util/src/paths.rs b/crates/util/src/paths.rs
index 6e7fc3f653..1b276854ce 100644
--- a/crates/util/src/paths.rs
+++ b/crates/util/src/paths.rs
@@ -9,18 +9,54 @@ use serde::{Deserialize, Serialize};
 lazy_static::lazy_static! {
     pub static ref HOME: PathBuf = dirs::home_dir().expect("failed to determine home directory");
     pub static ref CONFIG_DIR: PathBuf = HOME.join(".config").join("zed");
-    pub static ref CONVERSATIONS_DIR: PathBuf = HOME.join(".config/zed/conversations");
-    pub static ref EMBEDDINGS_DIR: PathBuf = HOME.join(".config/zed/embeddings");
-    pub static ref THEMES_DIR: PathBuf = HOME.join(".config/zed/themes");
-    pub static ref LOGS_DIR: PathBuf = HOME.join("Library/Logs/Zed");
-    pub static ref SUPPORT_DIR: PathBuf = HOME.join("Library/Application Support/Zed");
-    pub static ref PLUGINS_DIR: PathBuf = HOME.join("Library/Application Support/Zed/plugins");
-    pub static ref LANGUAGES_DIR: PathBuf = HOME.join("Library/Application Support/Zed/languages");
-    pub static ref COPILOT_DIR: PathBuf = HOME.join("Library/Application Support/Zed/copilot");
-    pub static ref DEFAULT_PRETTIER_DIR: PathBuf = HOME.join("Library/Application Support/Zed/prettier");
-    pub static ref DB_DIR: PathBuf = HOME.join("Library/Application Support/Zed/db");
-    pub static ref CRASHES_DIR: PathBuf = HOME.join("Library/Logs/DiagnosticReports");
-    pub static ref CRASHES_RETIRED_DIR: PathBuf = HOME.join("Library/Logs/DiagnosticReports/Retired");
+    pub static ref CONVERSATIONS_DIR: PathBuf = CONFIG_DIR.join("conversations");
+    pub static ref EMBEDDINGS_DIR: PathBuf = CONFIG_DIR.join("embeddings");
+    pub static ref THEMES_DIR: PathBuf = CONFIG_DIR.join("themes");
+    pub static ref LOGS_DIR: PathBuf = if cfg!(target_os="macos") {
+        HOME.join("Library/Logs/Zed")
+    } else {
+        CONFIG_DIR.join("logs")
+    };
+    pub static ref SUPPORT_DIR: PathBuf = if cfg!(target_os="macos") {
+        HOME.join("Library/Application Support/Zed")
+    } else {
+        CONFIG_DIR.join("support")
+    };
+    pub static ref PLUGINS_DIR: PathBuf = if cfg!(target_os="macos") {
+        HOME.join("Library/Application Support/Zed/plugins")
+    } else {
+        CONFIG_DIR.join("plugins")
+    };
+    pub static ref LANGUAGES_DIR: PathBuf = if cfg!(target_os="macos") {
+        HOME.join("Library/Application Support/Zed/languages")
+    } else {
+        CONFIG_DIR.join("languages")
+    };
+    pub static ref COPILOT_DIR: PathBuf = if cfg!(target_os="macos") {
+        HOME.join("Library/Application Support/Zed/copilot")
+    } else {
+        CONFIG_DIR.join("copilot")
+    };
+    pub static ref DEFAULT_PRETTIER_DIR: PathBuf = if cfg!(target_os="macos") {
+        HOME.join("Library/Application Support/Zed/prettier")
+    } else {
+        CONFIG_DIR.join("prettier")
+    };
+    pub static ref DB_DIR: PathBuf = if cfg!(target_os="macos") {
+        HOME.join("Library/Application Support/Zed/db")
+    } else {
+        CONFIG_DIR.join("db")
+    };
+    pub static ref CRASHES_DIR: PathBuf = if cfg!(target_os="macos") {
+        HOME.join("Library/Logs/DiagnosticReports")
+    } else {
+        CONFIG_DIR.join("crashes")
+    };
+    pub static ref CRASHES_RETIRED_DIR: PathBuf = if cfg!(target_os="macos") {
+        HOME.join("Library/Logs/DiagnosticReports/Retired")
+    } else {
+        CRASHES_DIR.join("retired")
+    };
     pub static ref SETTINGS: PathBuf = CONFIG_DIR.join("settings.json");
     pub static ref KEYMAP: PathBuf = CONFIG_DIR.join("keymap.json");
     pub static ref LAST_USERNAME: PathBuf = CONFIG_DIR.join("last-username.txt");

From 8d339ede1c3aa62f6abb018f3eab43203fc552bc Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sun, 4 Feb 2024 20:23:06 -0800
Subject: [PATCH 227/372] linux: HACK disable watcher and crash uploader
 temporarily

---
 crates/fs/src/fs.rs    | 2 ++
 crates/zed/src/main.rs | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index edd3da101c..05c961c4cf 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -301,6 +301,8 @@ impl Fs for RealFs {
             .configure(Config::default().with_poll_interval(latency))
             .unwrap();
 
+        //TODO: unblock this
+        #[cfg(not(target_os = "linux"))]
         watcher
             .watch(path, notify::RecursiveMode::Recursive)
             .unwrap();
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 1ae1feffde..73acfdef34 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -257,6 +257,8 @@ fn main() {
         initialize_workspace(app_state.clone(), cx);
 
         if stdout_is_a_pty() {
+            //TODO: unblock this
+            #[cfg(not(target_os = "linux"))]
             upload_panics_and_crashes(http.clone(), cx);
             cx.activate(true);
             let urls = collect_url_args();

From 282cc71df9ccc4aac1d635ec643d278fa6e12820 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sun, 4 Feb 2024 22:37:34 -0800
Subject: [PATCH 228/372] linux: refactor LinuxPlatform to avoid recursive
 locking from the window callbacks

---
 crates/gpui/src/platform/linux/dispatcher.rs |  2 +
 crates/gpui/src/platform/linux/platform.rs   | 81 ++++++++++++--------
 2 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/crates/gpui/src/platform/linux/dispatcher.rs b/crates/gpui/src/platform/linux/dispatcher.rs
index d669e56ab6..49f10449f8 100644
--- a/crates/gpui/src/platform/linux/dispatcher.rs
+++ b/crates/gpui/src/platform/linux/dispatcher.rs
@@ -89,6 +89,8 @@ impl PlatformDispatcher for LinuxDispatcher {
                 let (_, runnable) = timed_tasks.pop().unwrap();
                 runnable.run();
                 ran = true;
+            } else {
+                break;
             }
         }
         ran
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index e1d21ef69d..3ce7666246 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -31,17 +31,19 @@ xcb::atoms_struct! {
     }
 }
 
-pub(crate) struct LinuxPlatform(Mutex<LinuxPlatformState>);
-
-pub(crate) struct LinuxPlatformState {
+pub(crate) struct LinuxPlatform {
     xcb_connection: Arc<xcb::Connection>,
     x_root_index: i32,
     atoms: XcbAtoms,
     background_executor: BackgroundExecutor,
     foreground_executor: ForegroundExecutor,
     dispatcher: Arc<LinuxDispatcher>,
-    windows: HashMap<x::Window, Arc<LinuxWindowState>>,
     text_system: Arc<LinuxTextSystem>,
+    state: Mutex<LinuxPlatformState>,
+}
+
+pub(crate) struct LinuxPlatformState {
+    windows: HashMap<x::Window, Arc<LinuxWindowState>>,
 }
 
 impl Default for LinuxPlatform {
@@ -57,52 +59,58 @@ impl LinuxPlatform {
 
         let dispatcher = Arc::new(LinuxDispatcher::new());
 
-        Self(Mutex::new(LinuxPlatformState {
+        Self {
             xcb_connection: Arc::new(xcb_connection),
             x_root_index,
             atoms,
             background_executor: BackgroundExecutor::new(dispatcher.clone()),
             foreground_executor: ForegroundExecutor::new(dispatcher.clone()),
             dispatcher,
-            windows: HashMap::default(),
             text_system: Arc::new(LinuxTextSystem::new()),
-        }))
+            state: Mutex::new(LinuxPlatformState {
+                windows: HashMap::default(),
+            }),
+        }
     }
 }
 
 impl Platform for LinuxPlatform {
     fn background_executor(&self) -> BackgroundExecutor {
-        self.0.lock().background_executor.clone()
+        self.background_executor.clone()
     }
 
-    fn foreground_executor(&self) -> crate::ForegroundExecutor {
-        self.0.lock().foreground_executor.clone()
+    fn foreground_executor(&self) -> ForegroundExecutor {
+        self.foreground_executor.clone()
     }
 
     fn text_system(&self) -> Arc<dyn PlatformTextSystem> {
-        self.0.lock().text_system.clone()
+        self.text_system.clone()
     }
 
     fn run(&self, on_finish_launching: Box<dyn FnOnce()>) {
         on_finish_launching();
+        //Note: here and below, don't keep the lock() open when calling
+        // into window functions as they may invoke callbacks that need
+        // to immediately access the platform (self).
 
-        while !self.0.lock().windows.is_empty() {
-            let event = self.0.lock().xcb_connection.wait_for_event().unwrap();
+        while !self.state.lock().windows.is_empty() {
+            let event = self.xcb_connection.wait_for_event().unwrap();
             match event {
                 xcb::Event::X(x::Event::ClientMessage(ev)) => {
                     if let x::ClientMessageData::Data32([atom, ..]) = ev.data() {
-                        let mut this = self.0.lock();
-                        if atom == this.atoms.wm_del_window.resource_id() {
+                        if atom == self.atoms.wm_del_window.resource_id() {
                             // window "x" button clicked by user, we gracefully exit
-                            let window = this.windows.remove(&ev.window()).unwrap();
+                            let window = self.state.lock().windows.remove(&ev.window()).unwrap();
                             window.destroy();
-                            break;
                         }
                     }
                 }
                 xcb::Event::X(x::Event::Expose(ev)) => {
-                    let this = self.0.lock();
-                    this.windows[&ev.window()].expose();
+                    let window = {
+                        let state = self.state.lock();
+                        Arc::clone(&state.windows[&ev.window()])
+                    };
+                    window.expose();
                 }
                 xcb::Event::X(x::Event::ConfigureNotify(ev)) => {
                     let bounds = Bounds {
@@ -115,12 +123,17 @@ impl Platform for LinuxPlatform {
                             height: ev.height().into(),
                         },
                     };
-                    let this = self.0.lock();
-                    this.windows[&ev.window()].configure(bounds);
+                    let window = {
+                        let state = self.state.lock();
+                        Arc::clone(&state.windows[&ev.window()])
+                    };
+                    window.configure(bounds)
+                }
+                ref other => {
+                    println!("Other event {:?}", other);
                 }
-                _ => {}
             }
-            self.0.lock().dispatcher.tick_main();
+            self.dispatcher.tick_main();
         }
     }
 
@@ -137,22 +150,20 @@ impl Platform for LinuxPlatform {
     fn unhide_other_apps(&self) {}
 
     fn displays(&self) -> Vec<Rc<dyn PlatformDisplay>> {
-        let this = self.0.lock();
-        let setup = this.xcb_connection.get_setup();
+        let setup = self.xcb_connection.get_setup();
         setup
             .roots()
             .enumerate()
             .map(|(root_id, _)| {
-                Rc::new(LinuxDisplay::new(&this.xcb_connection, root_id as i32))
+                Rc::new(LinuxDisplay::new(&self.xcb_connection, root_id as i32))
                     as Rc<dyn PlatformDisplay>
             })
             .collect()
     }
 
     fn display(&self, id: DisplayId) -> Option<Rc<dyn PlatformDisplay>> {
-        let this = self.0.lock();
         Some(Rc::new(LinuxDisplay::new(
-            &this.xcb_connection,
+            &self.xcb_connection,
             id.0 as i32,
         )))
     }
@@ -166,17 +177,19 @@ impl Platform for LinuxPlatform {
         handle: AnyWindowHandle,
         options: WindowOptions,
     ) -> Box<dyn PlatformWindow> {
-        let mut this = self.0.lock();
-        let x_window = this.xcb_connection.generate_id();
+        let x_window = self.xcb_connection.generate_id();
 
         let window_ptr = Arc::new(LinuxWindowState::new(
             options,
-            &this.xcb_connection,
-            this.x_root_index,
+            &self.xcb_connection,
+            self.x_root_index,
             x_window,
-            &this.atoms,
+            &self.atoms,
         ));
-        this.windows.insert(x_window, Arc::clone(&window_ptr));
+        self.state
+            .lock()
+            .windows
+            .insert(x_window, Arc::clone(&window_ptr));
         Box::new(LinuxWindow(window_ptr))
     }
 

From 521b2b12e463e0d7aa0cd713198b7adf771407ed Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sun, 4 Feb 2024 23:52:22 -0800
Subject: [PATCH 229/372] linux: create a hidden window inside the platform

It allows us to receive messages from the dispatcher,
which breaks us out of waiting and lets us execute
main thread runnables as a part of the main loop.
---
 crates/gpui/src/platform/linux/dispatcher.rs  | 82 +++++++++++++------
 crates/gpui/src/platform/linux/platform.rs    | 34 +++++---
 crates/gpui/src/platform/linux/text_system.rs |  2 +-
 crates/gpui/src/platform/linux/window.rs      |  1 +
 4 files changed, 80 insertions(+), 39 deletions(-)

diff --git a/crates/gpui/src/platform/linux/dispatcher.rs b/crates/gpui/src/platform/linux/dispatcher.rs
index 49f10449f8..28526d360a 100644
--- a/crates/gpui/src/platform/linux/dispatcher.rs
+++ b/crates/gpui/src/platform/linux/dispatcher.rs
@@ -7,29 +7,50 @@ use async_task::Runnable;
 use parking::{Parker, Unparker};
 use parking_lot::Mutex;
 use std::{
-    panic, thread,
+    panic,
+    sync::Arc,
+    thread,
     time::{Duration, Instant},
 };
+use xcb::x;
 
 pub(crate) struct LinuxDispatcher {
+    xcb_connection: Arc<xcb::Connection>,
+    x_listener_window: x::Window,
     parker: Mutex<Parker>,
     timed_tasks: Mutex<Vec<(Instant, Runnable)>>,
     main_sender: flume::Sender<Runnable>,
-    main_receiver: flume::Receiver<Runnable>,
     background_sender: flume::Sender<Runnable>,
-    background_thread: thread::JoinHandle<()>,
+    _background_thread: thread::JoinHandle<()>,
     main_thread_id: thread::ThreadId,
 }
 
-impl Default for LinuxDispatcher {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
 impl LinuxDispatcher {
-    pub fn new() -> Self {
-        let (main_sender, main_receiver) = flume::unbounded::<Runnable>();
+    pub fn new(
+        main_sender: flume::Sender<Runnable>,
+        xcb_connection: &Arc<xcb::Connection>,
+        x_root_index: i32,
+    ) -> Self {
+        let x_listener_window = xcb_connection.generate_id();
+        let screen = xcb_connection
+            .get_setup()
+            .roots()
+            .nth(x_root_index as usize)
+            .unwrap();
+        xcb_connection.send_request(&x::CreateWindow {
+            depth: 0,
+            wid: x_listener_window,
+            parent: screen.root(),
+            x: 0,
+            y: 0,
+            width: 1,
+            height: 1,
+            border_width: 0,
+            class: x::WindowClass::InputOnly,
+            visual: screen.root_visual(),
+            value_list: &[],
+        });
+
         let (background_sender, background_receiver) = flume::unbounded::<Runnable>();
         let background_thread = thread::spawn(move || {
             for runnable in background_receiver {
@@ -37,21 +58,23 @@ impl LinuxDispatcher {
             }
         });
         LinuxDispatcher {
+            xcb_connection: Arc::clone(xcb_connection),
+            x_listener_window,
             parker: Mutex::new(Parker::new()),
             timed_tasks: Mutex::new(Vec::new()),
             main_sender,
-            main_receiver,
             background_sender,
-            background_thread,
+            _background_thread: background_thread,
             main_thread_id: thread::current().id(),
         }
     }
+}
 
-    pub fn tick_main(&self) {
-        assert!(self.is_main_thread());
-        if let Ok(runnable) = self.main_receiver.try_recv() {
-            runnable.run();
-        }
+impl Drop for LinuxDispatcher {
+    fn drop(&mut self) {
+        self.xcb_connection.send_request(&x::DestroyWindow {
+            window: self.x_listener_window,
+        });
     }
 }
 
@@ -66,6 +89,18 @@ impl PlatformDispatcher for LinuxDispatcher {
 
     fn dispatch_on_main_thread(&self, runnable: Runnable) {
         self.main_sender.send(runnable).unwrap();
+        // Send a message to the invisible window, forcing
+        // tha main loop to wake up and dispatch the runnable.
+        self.xcb_connection.send_request(&x::SendEvent {
+            propagate: false,
+            destination: x::SendEventDest::Window(self.x_listener_window),
+            event_mask: x::EventMask::NO_EVENT,
+            event: &x::VisibilityNotifyEvent::new(
+                self.x_listener_window,
+                x::Visibility::Unobscured,
+            ),
+        });
+        self.xcb_connection.flush().unwrap();
     }
 
     fn dispatch_after(&self, duration: Duration, runnable: Runnable) {
@@ -76,24 +111,17 @@ impl PlatformDispatcher for LinuxDispatcher {
     }
 
     fn tick(&self, background_only: bool) -> bool {
-        let mut ran = false;
-        if self.is_main_thread() && !background_only {
-            for runnable in self.main_receiver.try_iter() {
-                runnable.run();
-                ran = true;
-            }
-        }
         let mut timed_tasks = self.timed_tasks.lock();
+        let old_count = timed_tasks.len();
         while let Some(&(moment, _)) = timed_tasks.last() {
             if moment <= Instant::now() {
                 let (_, runnable) = timed_tasks.pop().unwrap();
                 runnable.run();
-                ran = true;
             } else {
                 break;
             }
         }
-        ran
+        timed_tasks.len() != old_count
     }
 
     fn park(&self) {
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index 3ce7666246..60cf135412 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -7,6 +7,7 @@ use crate::{
     PlatformTextSystem, PlatformWindow, Point, Result, SemanticVersion, Size, Task, WindowOptions,
 };
 
+use async_task::Runnable;
 use collections::{HashMap, HashSet};
 use futures::channel::oneshot;
 use parking_lot::Mutex;
@@ -37,12 +38,13 @@ pub(crate) struct LinuxPlatform {
     atoms: XcbAtoms,
     background_executor: BackgroundExecutor,
     foreground_executor: ForegroundExecutor,
-    dispatcher: Arc<LinuxDispatcher>,
+    main_receiver: flume::Receiver<Runnable>,
     text_system: Arc<LinuxTextSystem>,
     state: Mutex<LinuxPlatformState>,
 }
 
 pub(crate) struct LinuxPlatformState {
+    quit_requested: bool,
     windows: HashMap<x::Window, Arc<LinuxWindowState>>,
 }
 
@@ -57,17 +59,24 @@ impl LinuxPlatform {
         let (xcb_connection, x_root_index) = xcb::Connection::connect(None).unwrap();
         let atoms = XcbAtoms::intern_all(&xcb_connection).unwrap();
 
-        let dispatcher = Arc::new(LinuxDispatcher::new());
+        let xcb_connection = Arc::new(xcb_connection);
+        let (main_sender, main_receiver) = flume::unbounded::<Runnable>();
+        let dispatcher = Arc::new(LinuxDispatcher::new(
+            main_sender,
+            &xcb_connection,
+            x_root_index,
+        ));
 
         Self {
-            xcb_connection: Arc::new(xcb_connection),
+            xcb_connection,
             x_root_index,
             atoms,
             background_executor: BackgroundExecutor::new(dispatcher.clone()),
             foreground_executor: ForegroundExecutor::new(dispatcher.clone()),
-            dispatcher,
+            main_receiver,
             text_system: Arc::new(LinuxTextSystem::new()),
             state: Mutex::new(LinuxPlatformState {
+                quit_requested: false,
                 windows: HashMap::default(),
             }),
         }
@@ -92,8 +101,7 @@ impl Platform for LinuxPlatform {
         //Note: here and below, don't keep the lock() open when calling
         // into window functions as they may invoke callbacks that need
         // to immediately access the platform (self).
-
-        while !self.state.lock().windows.is_empty() {
+        while !self.state.lock().quit_requested {
             let event = self.xcb_connection.wait_for_event().unwrap();
             match event {
                 xcb::Event::X(x::Event::ClientMessage(ev)) => {
@@ -129,15 +137,18 @@ impl Platform for LinuxPlatform {
                     };
                     window.configure(bounds)
                 }
-                ref other => {
-                    println!("Other event {:?}", other);
-                }
+                _ => {}
+            }
+
+            if let Ok(runnable) = self.main_receiver.try_recv() {
+                runnable.run();
             }
-            self.dispatcher.tick_main();
         }
     }
 
-    fn quit(&self) {}
+    fn quit(&self) {
+        self.state.lock().quit_requested = true;
+    }
 
     fn restart(&self) {}
 
@@ -186,6 +197,7 @@ impl Platform for LinuxPlatform {
             x_window,
             &self.atoms,
         ));
+
         self.state
             .lock()
             .windows
diff --git a/crates/gpui/src/platform/linux/text_system.rs b/crates/gpui/src/platform/linux/text_system.rs
index 62935fc232..187ffb526a 100644
--- a/crates/gpui/src/platform/linux/text_system.rs
+++ b/crates/gpui/src/platform/linux/text_system.rs
@@ -76,7 +76,7 @@ impl PlatformTextSystem for LinuxTextSystem {
         unimplemented!()
     }
     fn glyph_for_char(&self, font_id: FontId, ch: char) -> Option<GlyphId> {
-        unimplemented!()
+        None
     }
     fn glyph_raster_bounds(&self, params: &RenderGlyphParams) -> Result<Bounds<DevicePixels>> {
         unimplemented!()
diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index 3818ec2c65..031dcb0cd6 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -237,6 +237,7 @@ impl LinuxWindowState {
         if let Some(fun) = self.callbacks.lock().close.take() {
             fun();
         }
+        self.xcb_connection.flush().unwrap();
     }
 
     pub fn expose(&self) {

From fde159fea1887f7175384d50fdc0be7b79959be4 Mon Sep 17 00:00:00 2001
From: Amin Yahyaabadi <aminyahyaabadi74@gmail.com>
Date: Sun, 4 Feb 2024 23:08:05 -0800
Subject: [PATCH 230/372] build: add Blade font-config sys deps on Linux

---
 Cargo.lock   | 325 +++++++++++++++++++++++++++++++++++++++------------
 script/linux |  24 ++--
 2 files changed, 267 insertions(+), 82 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c3df96e992..37f3b09130 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -267,12 +267,38 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
+[[package]]
+name = "as-raw-xcb-connection"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"
+
 [[package]]
 name = "ascii"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16"
 
+[[package]]
+name = "ash"
+version = "0.37.3+1.3.251"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a"
+dependencies = [
+ "libloading 0.7.4",
+]
+
+[[package]]
+name = "ash-window"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b912285a7c29f3a8f87ca6f55afc48768624e5e33ec17dbd2f2075903f5e35ab"
+dependencies = [
+ "ash",
+ "raw-window-handle 0.5.2",
+ "raw-window-metal",
+]
+
 [[package]]
 name = "assets"
 version = "0.1.0"
@@ -908,6 +934,46 @@ dependencies = [
  "wyz",
 ]
 
+[[package]]
+name = "blade-graphics"
+version = "0.3.0"
+source = "git+https://github.com/kvark/blade?rev=62eb18d312f720a5aac8f508fe223146a24fc7f0#62eb18d312f720a5aac8f508fe223146a24fc7f0"
+dependencies = [
+ "ash",
+ "ash-window",
+ "bitflags 2.4.1",
+ "block",
+ "bytemuck",
+ "codespan-reporting",
+ "core-graphics-types",
+ "glow",
+ "gpu-alloc",
+ "gpu-alloc-ash",
+ "hidden-trait",
+ "js-sys",
+ "khronos-egl",
+ "libloading 0.8.0",
+ "log",
+ "metal 0.25.0",
+ "mint",
+ "naga",
+ "objc",
+ "raw-window-handle 0.5.2",
+ "slab",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "blade-macros"
+version = "0.2.1"
+source = "git+https://github.com/kvark/blade?rev=62eb18d312f720a5aac8f508fe223146a24fc7f0#62eb18d312f720a5aac8f508fe223146a24fc7f0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "block"
 version = "0.1.6"
@@ -1065,6 +1131,20 @@ name = "bytemuck"
 version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
+dependencies = [
+ "bytemuck_derive",
+]
+
+[[package]]
+name = "bytemuck_derive"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
 
 [[package]]
 name = "byteorder"
@@ -1341,11 +1421,8 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap 3.2.25",
- "core-foundation",
- "core-services",
  "dirs 3.0.2",
  "ipc-channel",
- "plist",
  "serde",
  "serde_derive",
  "util",
@@ -1438,6 +1515,16 @@ dependencies = [
  "objc",
 ]
 
+[[package]]
+name = "codespan-reporting"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+dependencies = [
+ "termcolor",
+ "unicode-width",
+]
+
 [[package]]
 name = "collab"
 version = "0.44.0"
@@ -1786,15 +1873,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "core-services"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92567e81db522550ebaf742c5d875624ec7820c2c7ee5f8c60e4ce7c2ae3c0fd"
-dependencies = [
- "core-foundation",
-]
-
 [[package]]
 name = "core-text"
 version = "19.2.0"
@@ -3088,16 +3166,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "gethostname"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
-dependencies = [
- "libc",
- "windows-targets 0.48.5",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.1.16"
@@ -3207,6 +3275,18 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "glow"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1"
+dependencies = [
+ "js-sys",
+ "slotmap",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "go_to_line"
 version = "0.1.0"
@@ -3224,15 +3304,48 @@ dependencies = [
  "workspace",
 ]
 
+[[package]]
+name = "gpu-alloc"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
+dependencies = [
+ "bitflags 2.4.1",
+ "gpu-alloc-types",
+]
+
+[[package]]
+name = "gpu-alloc-ash"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2424bc9be88170e1a56e57c25d3d0e2dfdd22e8f328e892786aeb4da1415732"
+dependencies = [
+ "ash",
+ "gpu-alloc-types",
+ "tinyvec",
+]
+
+[[package]]
+name = "gpu-alloc-types"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
+dependencies = [
+ "bitflags 2.4.1",
+]
+
 [[package]]
 name = "gpui"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "as-raw-xcb-connection",
  "async-task",
  "backtrace",
  "bindgen 0.65.1",
  "bitflags 2.4.1",
+ "blade-graphics",
+ "blade-macros",
  "block",
  "bytemuck",
  "cbindgen",
@@ -3257,7 +3370,7 @@ dependencies = [
  "linkme",
  "log",
  "media",
- "metal",
+ "metal 0.21.0",
  "num_cpus",
  "objc",
  "ordered-float 2.10.0",
@@ -3267,6 +3380,7 @@ dependencies = [
  "png",
  "postage",
  "rand 0.8.5",
+ "raw-window-handle 0.5.2",
  "raw-window-handle 0.6.0",
  "refineable",
  "resvg",
@@ -3288,7 +3402,7 @@ dependencies = [
  "util",
  "uuid 1.4.1",
  "waker-fn",
- "x11rb",
+ "xcb",
 ]
 
 [[package]]
@@ -3425,6 +3539,23 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hexf-parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
+
+[[package]]
+name = "hidden-trait"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68ed9e850438ac849bec07e7d09fbe9309cbd396a5988c30b010580ce08860df"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "hkdf"
 version = "0.12.3"
@@ -3914,6 +4045,16 @@ dependencies = [
  "winapi-build",
 ]
 
+[[package]]
+name = "khronos-egl"
+version = "5.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1382b16c04aeb821453d6215a3c80ba78f24c6595c5aa85653378aabe0c83e3"
+dependencies = [
+ "libc",
+ "libloading 0.8.0",
+]
+
 [[package]]
 name = "kqueue"
 version = "1.0.8"
@@ -4148,15 +4289,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "line-wrap"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9"
-dependencies = [
- "safemem",
-]
-
 [[package]]
 name = "linkme"
 version = "0.3.17"
@@ -4209,8 +4341,10 @@ dependencies = [
  "block",
  "byteorder",
  "bytes 1.5.0",
+ "cocoa",
  "collections",
  "core-foundation",
+ "core-graphics 0.22.3",
  "foreign-types 0.3.2",
  "futures 0.3.28",
  "gpui",
@@ -4220,6 +4354,7 @@ dependencies = [
  "log",
  "media",
  "nanoid",
+ "objc",
  "parking_lot 0.11.2",
  "postage",
  "serde",
@@ -4407,7 +4542,7 @@ dependencies = [
  "bytes 1.5.0",
  "core-foundation",
  "foreign-types 0.3.2",
- "metal",
+ "metal 0.21.0",
  "objc",
 ]
 
@@ -4475,6 +4610,21 @@ dependencies = [
  "objc",
 ]
 
+[[package]]
+name = "metal"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "550b24b0cd4cf923f36bae78eca457b3a10d8a6a14a9c84cb2687b527e6a84af"
+dependencies = [
+ "bitflags 1.3.2",
+ "block",
+ "core-graphics-types",
+ "foreign-types 0.5.0",
+ "log",
+ "objc",
+ "paste",
+]
+
 [[package]]
 name = "mimalloc"
 version = "0.1.39"
@@ -4524,6 +4674,12 @@ dependencies = [
  "adler",
 ]
 
+[[package]]
+name = "mint"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+
 [[package]]
 name = "mintex"
 version = "0.1.2"
@@ -4651,6 +4807,26 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
+[[package]]
+name = "naga"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae585df4b6514cf8842ac0f1ab4992edc975892704835b549cf818dc0191249e"
+dependencies = [
+ "bit-set",
+ "bitflags 2.4.1",
+ "codespan-reporting",
+ "hexf-parse",
+ "indexmap 2.0.0",
+ "log",
+ "num-traits",
+ "rustc-hash",
+ "spirv",
+ "termcolor",
+ "thiserror",
+ "unicode-xid",
+]
+
 [[package]]
 name = "nanoid"
 version = "0.4.0"
@@ -5600,20 +5776,6 @@ version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
-[[package]]
-name = "plist"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06"
-dependencies = [
- "base64 0.21.4",
- "indexmap 1.9.3",
- "line-wrap",
- "quick-xml",
- "serde",
- "time",
-]
-
 [[package]]
 name = "plugin"
 version = "0.1.0"
@@ -6071,9 +6233,9 @@ dependencies = [
 
 [[package]]
 name = "quick-xml"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51"
+checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956"
 dependencies = [
  "memchr",
 ]
@@ -6188,6 +6350,18 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544"
 
+[[package]]
+name = "raw-window-metal"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac4ea493258d54c24cb46aa9345d099e58e2ea3f30dd63667fc54fc892f18e76"
+dependencies = [
+ "cocoa",
+ "core-graphics 0.23.1",
+ "objc",
+ "raw-window-handle 0.5.2",
+]
+
 [[package]]
 name = "rawpointer"
 version = "0.2.1"
@@ -6836,12 +7010,6 @@ dependencies = [
  "bytemuck",
 ]
 
-[[package]]
-name = "safemem"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
-
 [[package]]
 name = "salsa20"
 version = "0.8.1"
@@ -7552,6 +7720,16 @@ dependencies = [
  "lock_api",
 ]
 
+[[package]]
+name = "spirv"
+version = "0.2.0+1.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830"
+dependencies = [
+ "bitflags 1.3.2",
+ "num-traits",
+]
+
 [[package]]
 name = "spki"
 version = "0.7.2"
@@ -9276,6 +9454,12 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 
+[[package]]
+name = "unicode-xid"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+
 [[package]]
 name = "unicode_categories"
 version = "0.1.1"
@@ -10285,23 +10469,6 @@ dependencies = [
  "tap",
 ]
 
-[[package]]
-name = "x11rb"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a"
-dependencies = [
- "gethostname",
- "rustix 0.38.30",
- "x11rb-protocol",
-]
-
-[[package]]
-name = "x11rb-protocol"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34"
-
 [[package]]
 name = "xattr"
 version = "0.2.3"
@@ -10311,6 +10478,18 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "xcb"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d27b37e69b8c05bfadcd968eb1a4fe27c9c52565b727f88512f43b89567e262"
+dependencies = [
+ "as-raw-xcb-connection",
+ "bitflags 1.3.2",
+ "libc",
+ "quick-xml",
+]
+
 [[package]]
 name = "xmlparser"
 version = "0.13.5"
diff --git a/script/linux b/script/linux
index 1acf7a6e16..7a3865bce1 100755
--- a/script/linux
+++ b/script/linux
@@ -8,31 +8,37 @@ maysudo=$(command -v sudo || true)
 export maysudo
 
 # Ubuntu, Debian, etc.
+# https://packages.ubuntu.com/
 apt=$(command -v apt-get || true)
-deps=(
-  libasound2-dev
-)
 if [[ -n $apt ]]; then
+  deps=(
+    libasound2-dev
+    libfontconfig-dev
+  )
   $maysudo "$apt" install -y "${deps[@]}"
   exit 0
 fi
 
 # Fedora, CentOS, RHEL, etc.
+# https://packages.fedoraproject.org/
 dnf=$(command -v dnf || true)
-deps=(
-  alsa-lib-devel
-)
 if [[ -n $dnf ]]; then
+  deps=(
+    alsa-lib-devel
+    fontconfig-devel
+  )
   $maysudo "$dnf" install -y "${deps[@]}"
   exit 0
 fi
 
 # Arch, Manjaro, etc.
+# https://archlinux.org/packages
 pacman=$(command -v pacman || true)
-deps=(
-  alsa-lib
-)
 if [[ -n $pacman ]]; then
+  deps=(
+    alsa-lib
+    fontconfig
+  )
   $maysudo "$pacman" -S --noconfirm "${deps[@]}"
   exit 0
 fi

From 81bfa5fac432acfff5710bf2ea17786ac4ea20ca Mon Sep 17 00:00:00 2001
From: Amin Yahyaabadi <aminyahyaabadi74@gmail.com>
Date: Sun, 4 Feb 2024 23:32:51 -0800
Subject: [PATCH 231/372] fix: create the settings and keymaps to unblock file
 watching

---
 crates/fs/src/fs.rs | 2 --
 script/linux        | 9 ++++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index 05c961c4cf..edd3da101c 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -301,8 +301,6 @@ impl Fs for RealFs {
             .configure(Config::default().with_poll_interval(latency))
             .unwrap();
 
-        //TODO: unblock this
-        #[cfg(not(target_os = "linux"))]
         watcher
             .watch(path, notify::RecursiveMode::Recursive)
             .unwrap();
diff --git a/script/linux b/script/linux
index 7a3865bce1..209c254f1b 100755
--- a/script/linux
+++ b/script/linux
@@ -1,8 +1,15 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash -e
 
 # if not on Linux, do nothing
 [[ $(uname) == "Linux" ]] || exit 0
 
+# Copy settings and keymap to the user's home directory if they don't exist
+mkdir -p "$HOME/.config/zed"
+test -f "$HOME/.config/zed/settings.json" ||
+  cp -uL ./assets/settings/initial_user_settings.json "$HOME/.config/zed/settings.json"
+test -f "$HOME/.config/zed/keymap.json" ||
+  cp -uL ./assets/keymaps/default.json "$HOME/.config/zed/keymap.json"
+
 # if sudo is not installed, define an empty alias
 maysudo=$(command -v sudo || true)
 export maysudo

From 87d3f5951529fd41aaabadad8c8aeaddd33422ec Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Mon, 5 Feb 2024 11:43:16 +0100
Subject: [PATCH 232/372] Do not show completion documentation if disabled
 (#7372)

This fixes #7348 by not rendering completions if they are disabled in
the settings. Previously we only checked that setting when starting or
not starting background threads to fetch documentation. But in case we
already have documentation, this stops it from being rendered.

Release Notes:

- Fixed documentation in completions showing up even when disabled via
`show_completion_documentation`
([#7348](https://github.com/zed-industries/zed/issues/7348))
---
 crates/editor/src/editor.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 9039cc4cf0..e5e5ae9c28 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -852,7 +852,7 @@ impl CompletionsMenu {
         let selected_item = self.selected_item;
         let style = style.clone();
 
-        let multiline_docs = {
+        let multiline_docs = if show_completion_documentation {
             let mat = &self.matches[selected_item];
             let multiline_docs = match &self.completions.read()[mat.candidate_id].documentation {
                 Some(Documentation::MultiLinePlainText(text)) => {
@@ -883,6 +883,8 @@ impl CompletionsMenu {
                     // because that would move the cursor.
                     .on_mouse_down(MouseButton::Left, |_, cx| cx.stop_propagation())
             })
+        } else {
+            None
         };
 
         let list = uniform_list(

From 0755ce64869ca0a9f2241fe4dc4b08353ef0c575 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Mon, 5 Feb 2024 13:40:12 +0100
Subject: [PATCH 233/372] picker: Outline Editor::new

That way crates that use Picker::new do not have to codegen constructor of Editor; tl;dr, 10% of LLVM shaved off of crates like vcs_menu or theme_selector in release mode.
---
 crates/picker/src/picker.rs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/crates/picker/src/picker.rs b/crates/picker/src/picker.rs
index 3b8788246f..3db2f135c2 100644
--- a/crates/picker/src/picker.rs
+++ b/crates/picker/src/picker.rs
@@ -58,13 +58,16 @@ impl<D: PickerDelegate> FocusableView for Picker<D> {
     }
 }
 
+fn create_editor(placeholder: Arc<str>, cx: &mut WindowContext<'_>) -> View<Editor> {
+    cx.new_view(|cx| {
+        let mut editor = Editor::single_line(cx);
+        editor.set_placeholder_text(placeholder, cx);
+        editor
+    })
+}
 impl<D: PickerDelegate> Picker<D> {
     pub fn new(delegate: D, cx: &mut ViewContext<Self>) -> Self {
-        let editor = cx.new_view(|cx| {
-            let mut editor = Editor::single_line(cx);
-            editor.set_placeholder_text(delegate.placeholder_text(), cx);
-            editor
-        });
+        let editor = create_editor(delegate.placeholder_text(), cx);
         cx.subscribe(&editor, Self::on_input_editor_event).detach();
         let mut this = Self {
             delegate,

From 45429a452883da56b87e8238b20bd347f9f0d7ba Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Mon, 5 Feb 2024 15:46:48 +0200
Subject: [PATCH 234/372] Fix inlay hints using stale editor data (#7376)

Refactor the hint query code to pass along an actual `cx` instead of its
potentially stale, cloned version.

Release Notes:

- Fixed occasional duplicate hints inserted and offset-related panics
when concurrently editing the buffer and querying multiple its ranges
for hints
---
 crates/editor/src/inlay_hint_cache.rs | 409 +++++++++++++-------------
 1 file changed, 204 insertions(+), 205 deletions(-)

diff --git a/crates/editor/src/inlay_hint_cache.rs b/crates/editor/src/inlay_hint_cache.rs
index ae5a0ef9a3..714f3d1789 100644
--- a/crates/editor/src/inlay_hint_cache.rs
+++ b/crates/editor/src/inlay_hint_cache.rs
@@ -19,7 +19,7 @@ use crate::{
 use anyhow::Context;
 use clock::Global;
 use futures::future;
-use gpui::{Model, ModelContext, Task, ViewContext};
+use gpui::{AsyncWindowContext, Model, ModelContext, Task, ViewContext};
 use language::{language_settings::InlayHintKind, Buffer, BufferSnapshot};
 use parking_lot::RwLock;
 use project::{InlayHint, ResolveState};
@@ -29,7 +29,7 @@ use language::language_settings::InlayHintSettings;
 use smol::lock::Semaphore;
 use sum_tree::Bias;
 use text::{BufferId, ToOffset, ToPoint};
-use util::post_inc;
+use util::{post_inc, ResultExt};
 
 pub struct InlayHintCache {
     hints: HashMap<ExcerptId, Arc<RwLock<CachedExcerptHints>>>,
@@ -78,6 +78,7 @@ pub(super) enum InvalidationStrategy {
 /// "Visible" inlays may not be displayed in the buffer right away, but those are ready to be displayed on further buffer scroll, pane item activations, etc. right away without additional LSP queries or settings changes.
 /// The data in the cache is never used directly for displaying inlays on the screen, to avoid races with updates from LSP queries and sync overhead.
 /// Splice is picked to help avoid extra hint flickering and "jumps" on the screen.
+#[derive(Debug)]
 pub(super) struct InlaySplice {
     pub to_remove: Vec<InlayId>,
     pub to_insert: Vec<Inlay>,
@@ -619,7 +620,6 @@ fn spawn_new_update_tasks(
     update_cache_version: usize,
     cx: &mut ViewContext<'_, Editor>,
 ) {
-    let visible_hints = Arc::new(editor.visible_inlay_hints(cx));
     for (excerpt_id, (excerpt_buffer, new_task_buffer_version, excerpt_visible_range)) in
         excerpts_to_query
     {
@@ -636,8 +636,7 @@ fn spawn_new_update_tasks(
             continue;
         }
 
-        let cached_excerpt_hints = editor.inlay_hint_cache.hints.get(&excerpt_id).cloned();
-        if let Some(cached_excerpt_hints) = &cached_excerpt_hints {
+        if let Some(cached_excerpt_hints) = editor.inlay_hint_cache.hints.get(&excerpt_id) {
             let cached_excerpt_hints = cached_excerpt_hints.read();
             let cached_buffer_version = &cached_excerpt_hints.buffer_version;
             if cached_excerpt_hints.version > update_cache_version
@@ -647,20 +646,15 @@ fn spawn_new_update_tasks(
             }
         };
 
-        let (multi_buffer_snapshot, Some(query_ranges)) =
-            editor.buffer.update(cx, |multi_buffer, cx| {
-                (
-                    multi_buffer.snapshot(cx),
-                    determine_query_ranges(
-                        multi_buffer,
-                        excerpt_id,
-                        &excerpt_buffer,
-                        excerpt_visible_range,
-                        cx,
-                    ),
-                )
-            })
-        else {
+        let Some(query_ranges) = editor.buffer.update(cx, |multi_buffer, cx| {
+            determine_query_ranges(
+                multi_buffer,
+                excerpt_id,
+                &excerpt_buffer,
+                excerpt_visible_range,
+                cx,
+            )
+        }) else {
             return;
         };
         let query = ExcerptQuery {
@@ -671,18 +665,8 @@ fn spawn_new_update_tasks(
             reason,
         };
 
-        let new_update_task = |query_ranges| {
-            new_update_task(
-                query,
-                query_ranges,
-                multi_buffer_snapshot,
-                buffer_snapshot.clone(),
-                Arc::clone(&visible_hints),
-                cached_excerpt_hints,
-                Arc::clone(&editor.inlay_hint_cache.lsp_request_limiter),
-                cx,
-            )
-        };
+        let mut new_update_task =
+            |query_ranges| new_update_task(query, query_ranges, excerpt_buffer.clone(), cx);
 
         match editor.inlay_hint_cache.update_tasks.entry(excerpt_id) {
             hash_map::Entry::Occupied(mut o) => {
@@ -790,62 +774,55 @@ const INVISIBLE_RANGES_HINTS_REQUEST_DELAY_MILLIS: u64 = 400;
 fn new_update_task(
     query: ExcerptQuery,
     query_ranges: QueryRanges,
-    multi_buffer_snapshot: MultiBufferSnapshot,
-    buffer_snapshot: BufferSnapshot,
-    visible_hints: Arc<Vec<Inlay>>,
-    cached_excerpt_hints: Option<Arc<RwLock<CachedExcerptHints>>>,
-    lsp_request_limiter: Arc<Semaphore>,
+    excerpt_buffer: Model<Buffer>,
     cx: &mut ViewContext<'_, Editor>,
 ) -> Task<()> {
-    cx.spawn(|editor, mut cx| async move {
-        let closure_cx = cx.clone();
-        let fetch_and_update_hints = |invalidate, range| {
-            fetch_and_update_hints(
-                editor.clone(),
-                multi_buffer_snapshot.clone(),
-                buffer_snapshot.clone(),
-                Arc::clone(&visible_hints),
-                cached_excerpt_hints.as_ref().map(Arc::clone),
-                query,
-                invalidate,
-                range,
-                Arc::clone(&lsp_request_limiter),
-                closure_cx.clone(),
-            )
-        };
-        let visible_range_update_results = future::join_all(query_ranges.visible.into_iter().map(
-            |visible_range| async move {
-                (
-                    visible_range.clone(),
-                    fetch_and_update_hints(query.invalidate.should_invalidate(), visible_range)
-                        .await,
-                )
-            },
-        ))
+    cx.spawn(move |editor, mut cx| async move {
+        let visible_range_update_results = future::join_all(
+            query_ranges
+                .visible
+                .into_iter()
+                .filter_map(|visible_range| {
+                    let fetch_task = editor
+                        .update(&mut cx, |_, cx| {
+                            fetch_and_update_hints(
+                                excerpt_buffer.clone(),
+                                query,
+                                visible_range.clone(),
+                                query.invalidate.should_invalidate(),
+                                cx,
+                            )
+                        })
+                        .log_err()?;
+                    Some(async move { (visible_range, fetch_task.await) })
+                }),
+        )
         .await;
 
         let hint_delay = cx.background_executor().timer(Duration::from_millis(
             INVISIBLE_RANGES_HINTS_REQUEST_DELAY_MILLIS,
         ));
 
-        let mut query_range_failed = |range: &Range<language::Anchor>, e: anyhow::Error| {
-            log::error!("inlay hint update task for range {range:?} failed: {e:#}");
-            editor
-                .update(&mut cx, |editor, _| {
-                    if let Some(task_ranges) = editor
-                        .inlay_hint_cache
-                        .update_tasks
-                        .get_mut(&query.excerpt_id)
-                    {
-                        task_ranges.invalidate_range(&buffer_snapshot, &range);
-                    }
-                })
-                .ok()
-        };
+        let query_range_failed =
+            |range: &Range<language::Anchor>, e: anyhow::Error, cx: &mut AsyncWindowContext| {
+                log::error!("inlay hint update task for range {range:?} failed: {e:#}");
+                editor
+                    .update(cx, |editor, cx| {
+                        if let Some(task_ranges) = editor
+                            .inlay_hint_cache
+                            .update_tasks
+                            .get_mut(&query.excerpt_id)
+                        {
+                            let buffer_snapshot = excerpt_buffer.read(cx).snapshot();
+                            task_ranges.invalidate_range(&buffer_snapshot, &range);
+                        }
+                    })
+                    .ok()
+            };
 
         for (range, result) in visible_range_update_results {
             if let Err(e) = result {
-                query_range_failed(&range, e);
+                query_range_failed(&range, e, &mut cx);
             }
         }
 
@@ -855,149 +832,171 @@ fn new_update_task(
                 .before_visible
                 .into_iter()
                 .chain(query_ranges.after_visible.into_iter())
-                .map(|invisible_range| async move {
-                    (
-                        invisible_range.clone(),
-                        fetch_and_update_hints(false, invisible_range).await,
-                    )
+                .filter_map(|invisible_range| {
+                    let fetch_task = editor
+                        .update(&mut cx, |_, cx| {
+                            fetch_and_update_hints(
+                                excerpt_buffer.clone(),
+                                query,
+                                invisible_range.clone(),
+                                false, // visible screen request already invalidated the entries
+                                cx,
+                            )
+                        })
+                        .log_err()?;
+                    Some(async move { (invisible_range, fetch_task.await) })
                 }),
         )
         .await;
         for (range, result) in invisible_range_update_results {
             if let Err(e) = result {
-                query_range_failed(&range, e);
+                query_range_failed(&range, e, &mut cx);
             }
         }
     })
 }
 
-async fn fetch_and_update_hints(
-    editor: gpui::WeakView<Editor>,
-    multi_buffer_snapshot: MultiBufferSnapshot,
-    buffer_snapshot: BufferSnapshot,
-    visible_hints: Arc<Vec<Inlay>>,
-    cached_excerpt_hints: Option<Arc<RwLock<CachedExcerptHints>>>,
+fn fetch_and_update_hints(
+    excerpt_buffer: Model<Buffer>,
     query: ExcerptQuery,
-    invalidate: bool,
     fetch_range: Range<language::Anchor>,
-    lsp_request_limiter: Arc<Semaphore>,
-    mut cx: gpui::AsyncWindowContext,
-) -> anyhow::Result<()> {
-    let (lsp_request_guard, got_throttled) = if query.invalidate.should_invalidate() {
-        (None, false)
-    } else {
-        match lsp_request_limiter.try_acquire() {
-            Some(guard) => (Some(guard), false),
-            None => (Some(lsp_request_limiter.acquire().await), true),
-        }
-    };
-    let fetch_range_to_log =
-        fetch_range.start.to_point(&buffer_snapshot)..fetch_range.end.to_point(&buffer_snapshot);
-    let inlay_hints_fetch_task = editor
-        .update(&mut cx, |editor, cx| {
-            if got_throttled {
-                let query_not_around_visible_range = match editor.excerpts_for_inlay_hints_query(None, cx).remove(&query.excerpt_id) {
-                    Some((_, _, current_visible_range)) => {
-                        let visible_offset_length = current_visible_range.len();
-                        let double_visible_range = current_visible_range
-                            .start
-                            .saturating_sub(visible_offset_length)
-                            ..current_visible_range
-                                .end
-                                .saturating_add(visible_offset_length)
-                                .min(buffer_snapshot.len());
-                        !double_visible_range
-                            .contains(&fetch_range.start.to_offset(&buffer_snapshot))
-                            && !double_visible_range
-                                .contains(&fetch_range.end.to_offset(&buffer_snapshot))
-                    },
-                    None => true,
-                };
-                if query_not_around_visible_range {
-                    log::trace!("Fetching inlay hints for range {fetch_range_to_log:?} got throttled and fell off the current visible range, skipping.");
-                    if let Some(task_ranges) = editor
-                        .inlay_hint_cache
-                        .update_tasks
-                        .get_mut(&query.excerpt_id)
-                    {
-                        task_ranges.invalidate_range(&buffer_snapshot, &fetch_range);
-                    }
-                    return None;
-                }
-            }
-            editor
-                .buffer()
-                .read(cx)
-                .buffer(query.buffer_id)
-                .and_then(|buffer| {
-                    let project = editor.project.as_ref()?;
-                    Some(project.update(cx, |project, cx| {
-                        project.inlay_hints(buffer, fetch_range.clone(), cx)
-                    }))
-                })
-        })
-        .ok()
-        .flatten();
-    let new_hints = match inlay_hints_fetch_task {
-        Some(fetch_task) => {
-            log::debug!(
-                "Fetching inlay hints for range {fetch_range_to_log:?}, reason: {query_reason}, invalidate: {invalidate}",
-                query_reason = query.reason,
-            );
-            log::trace!(
-                "Currently visible hints: {visible_hints:?}, cached hints present: {}",
-                cached_excerpt_hints.is_some(),
-            );
-            fetch_task.await.context("inlay hint fetch task")?
-        }
-        None => return Ok(()),
-    };
-    drop(lsp_request_guard);
-    log::debug!(
-        "Fetched {} hints for range {fetch_range_to_log:?}",
-        new_hints.len()
-    );
-    log::trace!("Fetched hints: {new_hints:?}");
+    invalidate: bool,
+    cx: &mut ViewContext<Editor>,
+) -> Task<anyhow::Result<()>> {
+    cx.spawn(|editor, mut cx| async move {
+        let buffer_snapshot = excerpt_buffer.update(&mut cx, |buffer, _| buffer.snapshot())?;
+        let (lsp_request_limiter, multi_buffer_snapshot) = editor.update(&mut cx, |editor, cx| {
+            let multi_buffer_snapshot  = editor.buffer().update(cx, |buffer, cx| buffer.snapshot(cx));
+            let lsp_request_limiter = Arc::clone(&editor.inlay_hint_cache.lsp_request_limiter);
+            (lsp_request_limiter, multi_buffer_snapshot)
+        })?;
 
-    let background_task_buffer_snapshot = buffer_snapshot.clone();
-    let background_fetch_range = fetch_range.clone();
-    let new_update = cx
-        .background_executor()
-        .spawn(async move {
-            calculate_hint_updates(
-                query.excerpt_id,
-                invalidate,
-                background_fetch_range,
-                new_hints,
-                &background_task_buffer_snapshot,
-                cached_excerpt_hints,
-                &visible_hints,
-            )
-        })
-        .await;
-    if let Some(new_update) = new_update {
-        log::debug!(
-            "Applying update for range {fetch_range_to_log:?}: remove from editor: {}, remove from cache: {}, add to cache: {}",
-            new_update.remove_from_visible.len(),
-            new_update.remove_from_cache.len(),
-            new_update.add_to_cache.len()
-        );
-        log::trace!("New update: {new_update:?}");
-        editor
+        let (lsp_request_guard, got_throttled) = if query.invalidate.should_invalidate() {
+            (None, false)
+        } else {
+            match lsp_request_limiter.try_acquire() {
+                Some(guard) => (Some(guard), false),
+                None => (Some(lsp_request_limiter.acquire().await), true),
+            }
+        };
+        let fetch_range_to_log =
+            fetch_range.start.to_point(&buffer_snapshot)..fetch_range.end.to_point(&buffer_snapshot);
+        let inlay_hints_fetch_task = editor
             .update(&mut cx, |editor, cx| {
-                apply_hint_update(
-                    editor,
-                    new_update,
-                    query,
-                    invalidate,
-                    buffer_snapshot,
-                    multi_buffer_snapshot,
-                    cx,
-                );
+                if got_throttled {
+                    let query_not_around_visible_range = match editor.excerpts_for_inlay_hints_query(None, cx).remove(&query.excerpt_id) {
+                        Some((_, _, current_visible_range)) => {
+                            let visible_offset_length = current_visible_range.len();
+                            let double_visible_range = current_visible_range
+                                .start
+                                .saturating_sub(visible_offset_length)
+                                ..current_visible_range
+                                    .end
+                                    .saturating_add(visible_offset_length)
+                                    .min(buffer_snapshot.len());
+                            !double_visible_range
+                                .contains(&fetch_range.start.to_offset(&buffer_snapshot))
+                                && !double_visible_range
+                                    .contains(&fetch_range.end.to_offset(&buffer_snapshot))
+                        },
+                        None => true,
+                    };
+                    if query_not_around_visible_range {
+                        log::trace!("Fetching inlay hints for range {fetch_range_to_log:?} got throttled and fell off the current visible range, skipping.");
+                        if let Some(task_ranges) = editor
+                            .inlay_hint_cache
+                            .update_tasks
+                            .get_mut(&query.excerpt_id)
+                        {
+                            task_ranges.invalidate_range(&buffer_snapshot, &fetch_range);
+                        }
+                        return None;
+                    }
+                }
+                editor
+                    .buffer()
+                    .read(cx)
+                    .buffer(query.buffer_id)
+                    .and_then(|buffer| {
+                        let project = editor.project.as_ref()?;
+                        Some(project.update(cx, |project, cx| {
+                            project.inlay_hints(buffer, fetch_range.clone(), cx)
+                        }))
+                    })
             })
-            .ok();
-    }
-    Ok(())
+            .ok()
+            .flatten();
+
+        let cached_excerpt_hints = editor.update(&mut cx, |editor, _| {
+            editor
+                .inlay_hint_cache
+                .hints
+                .get(&query.excerpt_id)
+                .cloned()
+        })?;
+
+        let visible_hints = editor.update(&mut cx, |editor, cx| editor.visible_inlay_hints(cx))?;
+        let new_hints = match inlay_hints_fetch_task {
+            Some(fetch_task) => {
+                log::debug!(
+                    "Fetching inlay hints for range {fetch_range_to_log:?}, reason: {query_reason}, invalidate: {invalidate}",
+                    query_reason = query.reason,
+                );
+                log::trace!(
+                    "Currently visible hints: {visible_hints:?}, cached hints present: {}",
+                    cached_excerpt_hints.is_some(),
+                );
+                fetch_task.await.context("inlay hint fetch task")?
+            }
+            None => return Ok(()),
+        };
+        drop(lsp_request_guard);
+        log::debug!(
+            "Fetched {} hints for range {fetch_range_to_log:?}",
+            new_hints.len()
+        );
+        log::trace!("Fetched hints: {new_hints:?}");
+
+        let background_task_buffer_snapshot = buffer_snapshot.clone();
+        let background_fetch_range = fetch_range.clone();
+        let new_update = cx
+            .background_executor()
+            .spawn(async move {
+                calculate_hint_updates(
+                    query.excerpt_id,
+                    invalidate,
+                    background_fetch_range,
+                    new_hints,
+                    &background_task_buffer_snapshot,
+                    cached_excerpt_hints,
+                    &visible_hints,
+                )
+            })
+            .await;
+        if let Some(new_update) = new_update {
+            log::debug!(
+                "Applying update for range {fetch_range_to_log:?}: remove from editor: {}, remove from cache: {}, add to cache: {}",
+                new_update.remove_from_visible.len(),
+                new_update.remove_from_cache.len(),
+                new_update.add_to_cache.len()
+            );
+            log::trace!("New update: {new_update:?}");
+            editor
+                .update(&mut cx, |editor, cx| {
+                    apply_hint_update(
+                        editor,
+                        new_update,
+                        query,
+                        invalidate,
+                        buffer_snapshot,
+                        multi_buffer_snapshot,
+                        cx,
+                    );
+                })
+                .ok();
+        }
+        anyhow::Ok(())
+    })
 }
 
 fn calculate_hint_updates(
@@ -2436,7 +2435,7 @@ pub mod tests {
         });
     }
 
-    #[gpui::test(iterations = 10)]
+    #[gpui::test(iterations = 30)]
     async fn test_multiple_excerpts_large_multibuffer(cx: &mut gpui::TestAppContext) {
         init_test(cx, |settings| {
             settings.defaults.inlay_hints = Some(InlayHintSettings {

From 8030e8cf4751bb6f930aeacbce3f95e824c8bea9 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Mon, 5 Feb 2024 10:45:41 -0500
Subject: [PATCH 235/372] Improve the contrast of the default
 `search_match_background` colors (#7382)

This PR improves the contrast of the default `search_match_background`
colors.

Release Notes:

- Improved the contrast of the default `search.match_background` colors.
---
 crates/theme/src/default_colors.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/theme/src/default_colors.rs b/crates/theme/src/default_colors.rs
index 755ece62f9..4e369e917d 100644
--- a/crates/theme/src/default_colors.rs
+++ b/crates/theme/src/default_colors.rs
@@ -54,7 +54,7 @@ impl ThemeColors {
             tab_bar_background: neutral().light().step_2(),
             tab_inactive_background: neutral().light().step_2(),
             tab_active_background: neutral().light().step_1(),
-            search_match_background: neutral().light().step_2(),
+            search_match_background: neutral().light().step_5(),
             panel_background: neutral().light().step_2(),
             panel_focused_border: blue().light().step_5(),
             pane_focused_border: blue().light().step_5(),
@@ -148,7 +148,7 @@ impl ThemeColors {
             tab_bar_background: neutral().dark().step_2(),
             tab_inactive_background: neutral().dark().step_2(),
             tab_active_background: neutral().dark().step_1(),
-            search_match_background: neutral().dark().step_2(),
+            search_match_background: neutral().dark().step_5(),
             panel_background: neutral().dark().step_2(),
             panel_focused_border: blue().dark().step_5(),
             pane_focused_border: blue().dark().step_5(),

From 3bf412feff7d2d5c7c8609289eb5b521a1befa27 Mon Sep 17 00:00:00 2001
From: Julia <floc@unpromptedtirade.com>
Date: Mon, 5 Feb 2024 10:46:07 -0500
Subject: [PATCH 236/372] Use window's screen rather than window itself to
 start display link

Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
---
 crates/gpui/src/platform/mac/window.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index eb66954f44..ca6a3f8d62 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -530,7 +530,7 @@ impl MacWindow {
             let native_view = NSView::init(native_view);
             assert!(!native_view.is_null());
 
-            let display_link = start_display_link(native_window, native_view);
+            let display_link = start_display_link(native_window.screen(), native_view);
 
             let window = Self(Arc::new(Mutex::new(MacWindowState {
                 handle,

From d742b3bfac0c4e11590dd2d57b101099ac280f6e Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Mon, 5 Feb 2024 09:09:49 -0700
Subject: [PATCH 237/372] Mark the window as dirty when first opening it
 (#7384)

Otherwise we won't display anything if the window never notifies.

Release Notes:

- N/A

Co-authored-by: Nathan <nathan@zed.dev>
---
 crates/gpui/src/platform/mac/window.rs | 6 +++---
 crates/gpui/src/window.rs              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index ca6a3f8d62..946e608a7a 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -1370,10 +1370,10 @@ extern "C" fn window_did_change_screen(this: &Object, _: Sel, _: id) {
     let mut lock = window_state.as_ref().lock();
     unsafe {
         let screen = lock.native_window.screen();
-        if screen != nil {
-            lock.display_link = start_display_link(screen, lock.native_view.as_ptr());
-        } else {
+        if screen == nil {
             lock.display_link = nil;
+        } else {
+            lock.display_link = start_display_link(screen, lock.native_view.as_ptr());
         }
     }
 }
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 1cfd01b52e..c9c672557f 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -340,7 +340,7 @@ impl Window {
         let bounds = platform_window.bounds();
         let appearance = platform_window.appearance();
         let text_system = Arc::new(WindowTextSystem::new(cx.text_system().clone()));
-        let dirty = Rc::new(Cell::new(false));
+        let dirty = Rc::new(Cell::new(true));
         let last_input_timestamp = Rc::new(Cell::new(Instant::now()));
 
         platform_window.on_request_frame(Box::new({

From 223f45c65bac52dc783ca01038c85218826ed40b Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Mon, 5 Feb 2024 17:12:35 +0100
Subject: [PATCH 238/372] Remove default keybinds for navigating between
 docks/editors (#7381)

Turns out that these keybindings are active in Vim *and* in non-Vim mode
and they shadow `Ctrl-w` in terminals.

We should fix `Ctrl-w` being shadowed, but until then let's remove the
default keybindings.

Release Notes:

- N/A

Co-authored-by: Kirill <kirill@zed.dev>
Co-authored-by: Conrad <Conrad@zed.dev>
---
 assets/keymaps/vim.json | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 70e900a75d..bf68ee10e4 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -502,18 +502,5 @@
       "enter": "vim::SearchSubmit",
       "escape": "buffer_search::Dismiss"
     }
-  },
-  {
-    "context": "Dock",
-    "bindings": {
-      "ctrl-w h": ["workspace::ActivatePaneInDirection", "Left"],
-      "ctrl-w l": ["workspace::ActivatePaneInDirection", "Right"],
-      "ctrl-w k": ["workspace::ActivatePaneInDirection", "Up"],
-      "ctrl-w j": ["workspace::ActivatePaneInDirection", "Down"],
-      "ctrl-w ctrl-h": ["workspace::ActivatePaneInDirection", "Left"],
-      "ctrl-w ctrl-l": ["workspace::ActivatePaneInDirection", "Right"],
-      "ctrl-w ctrl-k": ["workspace::ActivatePaneInDirection", "Up"],
-      "ctrl-w ctrl-j": ["workspace::ActivatePaneInDirection", "Down"]
-    }
   }
 ]

From 47329f4489a001a8938bf83e6fa9e9e1d83859f9 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Mon, 5 Feb 2024 11:13:38 -0500
Subject: [PATCH 239/372] Add `search.match_background` colors to bundled
 themes (#7385)

This PR populates the `search.match_background` colors in the bundled
themes, using the values from the Zed1 themes.

Release Notes:

- Added theme-specific `search.match_background` colors to built-in
themes.
---
 assets/themes/andromeda/andromeda.json   |  2 +-
 assets/themes/atelier/atelier.json       | 40 ++++++++++++------------
 assets/themes/ayu/ayu.json               |  6 ++--
 assets/themes/gruvbox/gruvbox.json       | 12 +++----
 assets/themes/one/one.json               |  4 +--
 assets/themes/rose_pine/rose_pine.json   |  6 ++--
 assets/themes/sandcastle/sandcastle.json |  2 +-
 assets/themes/solarized/solarized.json   |  4 +--
 assets/themes/summercamp/summercamp.json |  2 +-
 9 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/assets/themes/andromeda/andromeda.json b/assets/themes/andromeda/andromeda.json
index 2fd3417150..a9144907cd 100644
--- a/assets/themes/andromeda/andromeda.json
+++ b/assets/themes/andromeda/andromeda.json
@@ -42,7 +42,7 @@
         "tab_bar.background": "#21242bff",
         "tab.inactive_background": "#21242bff",
         "tab.active_background": "#1e2025ff",
-        "search.match_background": null,
+        "search.match_background": "#11a79366",
         "panel.background": "#21242bff",
         "panel.focused_border": null,
         "pane.focused_border": null,
diff --git a/assets/themes/atelier/atelier.json b/assets/themes/atelier/atelier.json
index 2a857c69b3..7f8bdfbaf3 100644
--- a/assets/themes/atelier/atelier.json
+++ b/assets/themes/atelier/atelier.json
@@ -42,7 +42,7 @@
         "tab_bar.background": "#221f26ff",
         "tab.inactive_background": "#221f26ff",
         "tab.active_background": "#19171cff",
-        "search.match_background": null,
+        "search.match_background": "#576dda66",
         "panel.background": "#221f26ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -426,7 +426,7 @@
         "tab_bar.background": "#e6e3ebff",
         "tab.inactive_background": "#e6e3ebff",
         "tab.active_background": "#efecf4ff",
-        "search.match_background": null,
+        "search.match_background": "#586dda66",
         "panel.background": "#e6e3ebff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -810,7 +810,7 @@
         "tab_bar.background": "#262622ff",
         "tab.inactive_background": "#262622ff",
         "tab.active_background": "#20201dff",
-        "search.match_background": null,
+        "search.match_background": "#6684e066",
         "panel.background": "#262622ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -1194,7 +1194,7 @@
         "tab_bar.background": "#eeebd7ff",
         "tab.inactive_background": "#eeebd7ff",
         "tab.active_background": "#fefbecff",
-        "search.match_background": null,
+        "search.match_background": "#6784e066",
         "panel.background": "#eeebd7ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -1578,7 +1578,7 @@
         "tab_bar.background": "#2c2b23ff",
         "tab.inactive_background": "#2c2b23ff",
         "tab.active_background": "#22221bff",
-        "search.match_background": null,
+        "search.match_background": "#37a16666",
         "panel.background": "#2c2b23ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -1962,7 +1962,7 @@
         "tab_bar.background": "#ebeae3ff",
         "tab.inactive_background": "#ebeae3ff",
         "tab.active_background": "#f4f3ecff",
-        "search.match_background": null,
+        "search.match_background": "#38a16666",
         "panel.background": "#ebeae3ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -2346,7 +2346,7 @@
         "tab_bar.background": "#27211eff",
         "tab.inactive_background": "#27211eff",
         "tab.active_background": "#1b1918ff",
-        "search.match_background": null,
+        "search.match_background": "#417ee666",
         "panel.background": "#27211eff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -2730,7 +2730,7 @@
         "tab_bar.background": "#e9e6e4ff",
         "tab.inactive_background": "#e9e6e4ff",
         "tab.active_background": "#f0eeedff",
-        "search.match_background": null,
+        "search.match_background": "#417ee666",
         "panel.background": "#e9e6e4ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -3114,7 +3114,7 @@
         "tab_bar.background": "#252025ff",
         "tab.inactive_background": "#252025ff",
         "tab.active_background": "#1b181bff",
-        "search.match_background": null,
+        "search.match_background": "#526aeb66",
         "panel.background": "#252025ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -3498,7 +3498,7 @@
         "tab_bar.background": "#e0d5e0ff",
         "tab.inactive_background": "#e0d5e0ff",
         "tab.active_background": "#f7f3f7ff",
-        "search.match_background": null,
+        "search.match_background": "#526aeb66",
         "panel.background": "#e0d5e0ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -3882,7 +3882,7 @@
         "tab_bar.background": "#1c2529ff",
         "tab.inactive_background": "#1c2529ff",
         "tab.active_background": "#161b1dff",
-        "search.match_background": null,
+        "search.match_background": "#277fad66",
         "panel.background": "#1c2529ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -4266,7 +4266,7 @@
         "tab_bar.background": "#cdeaf9ff",
         "tab.inactive_background": "#cdeaf9ff",
         "tab.active_background": "#ebf8ffff",
-        "search.match_background": null,
+        "search.match_background": "#277fad66",
         "panel.background": "#cdeaf9ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -4650,7 +4650,7 @@
         "tab_bar.background": "#252020ff",
         "tab.inactive_background": "#252020ff",
         "tab.active_background": "#1b1818ff",
-        "search.match_background": null,
+        "search.match_background": "#7272ca66",
         "panel.background": "#252020ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -5034,7 +5034,7 @@
         "tab_bar.background": "#ebe3e3ff",
         "tab.inactive_background": "#ebe3e3ff",
         "tab.active_background": "#f4ececff",
-        "search.match_background": null,
+        "search.match_background": "#7372ca66",
         "panel.background": "#ebe3e3ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -5418,7 +5418,7 @@
         "tab_bar.background": "#1f2621ff",
         "tab.inactive_background": "#1f2621ff",
         "tab.active_background": "#171c19ff",
-        "search.match_background": null,
+        "search.match_background": "#478c9066",
         "panel.background": "#1f2621ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -5802,7 +5802,7 @@
         "tab_bar.background": "#e3ebe6ff",
         "tab.inactive_background": "#e3ebe6ff",
         "tab.active_background": "#ecf4eeff",
-        "search.match_background": null,
+        "search.match_background": "#488c9066",
         "panel.background": "#e3ebe6ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -6186,7 +6186,7 @@
         "tab_bar.background": "#1f231fff",
         "tab.inactive_background": "#1f231fff",
         "tab.active_background": "#131513ff",
-        "search.match_background": null,
+        "search.match_background": "#3e62f466",
         "panel.background": "#1f231fff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -6570,7 +6570,7 @@
         "tab_bar.background": "#daeedaff",
         "tab.inactive_background": "#daeedaff",
         "tab.active_background": "#f3faf3ff",
-        "search.match_background": null,
+        "search.match_background": "#3f62f466",
         "panel.background": "#daeedaff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -6954,7 +6954,7 @@
         "tab_bar.background": "#262f51ff",
         "tab.inactive_background": "#262f51ff",
         "tab.active_background": "#202646ff",
-        "search.match_background": null,
+        "search.match_background": "#3e8fd066",
         "panel.background": "#262f51ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -7338,7 +7338,7 @@
         "tab_bar.background": "#e5e8f5ff",
         "tab.inactive_background": "#e5e8f5ff",
         "tab.active_background": "#f5f7ffff",
-        "search.match_background": null,
+        "search.match_background": "#3f8fd066",
         "panel.background": "#e5e8f5ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
diff --git a/assets/themes/ayu/ayu.json b/assets/themes/ayu/ayu.json
index 0a3f5f776e..40b4262204 100644
--- a/assets/themes/ayu/ayu.json
+++ b/assets/themes/ayu/ayu.json
@@ -42,7 +42,7 @@
         "tab_bar.background": "#1f2127ff",
         "tab.inactive_background": "#1f2127ff",
         "tab.active_background": "#0d1016ff",
-        "search.match_background": null,
+        "search.match_background": "#5ac2fe66",
         "panel.background": "#1f2127ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -411,7 +411,7 @@
         "tab_bar.background": "#ececedff",
         "tab.inactive_background": "#ececedff",
         "tab.active_background": "#fcfcfcff",
-        "search.match_background": null,
+        "search.match_background": "#3b9ee566",
         "panel.background": "#ececedff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -780,7 +780,7 @@
         "tab_bar.background": "#353944ff",
         "tab.inactive_background": "#353944ff",
         "tab.active_background": "#242835ff",
-        "search.match_background": null,
+        "search.match_background": "#73cffe66",
         "panel.background": "#353944ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
diff --git a/assets/themes/gruvbox/gruvbox.json b/assets/themes/gruvbox/gruvbox.json
index f32387c3ab..eddcae6ff8 100644
--- a/assets/themes/gruvbox/gruvbox.json
+++ b/assets/themes/gruvbox/gruvbox.json
@@ -42,7 +42,7 @@
         "tab_bar.background": "#3a3735ff",
         "tab.inactive_background": "#3a3735ff",
         "tab.active_background": "#282828ff",
-        "search.match_background": null,
+        "search.match_background": "#83a59866",
         "panel.background": "#3a3735ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -416,7 +416,7 @@
         "tab_bar.background": "#393634ff",
         "tab.inactive_background": "#393634ff",
         "tab.active_background": "#1d2021ff",
-        "search.match_background": null,
+        "search.match_background": "#83a59866",
         "panel.background": "#393634ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -790,7 +790,7 @@
         "tab_bar.background": "#3b3735ff",
         "tab.inactive_background": "#3b3735ff",
         "tab.active_background": "#32302fff",
-        "search.match_background": null,
+        "search.match_background": "#83a59866",
         "panel.background": "#3b3735ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -1164,7 +1164,7 @@
         "tab_bar.background": "#ecddb4ff",
         "tab.inactive_background": "#ecddb4ff",
         "tab.active_background": "#fbf1c7ff",
-        "search.match_background": null,
+        "search.match_background": "#0b667866",
         "panel.background": "#ecddb4ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -1538,7 +1538,7 @@
         "tab_bar.background": "#ecddb5ff",
         "tab.inactive_background": "#ecddb5ff",
         "tab.active_background": "#f9f5d7ff",
-        "search.match_background": null,
+        "search.match_background": "#0b667866",
         "panel.background": "#ecddb5ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -1912,7 +1912,7 @@
         "tab_bar.background": "#ecdcb3ff",
         "tab.inactive_background": "#ecdcb3ff",
         "tab.active_background": "#f2e5bcff",
-        "search.match_background": null,
+        "search.match_background": "#0b667866",
         "panel.background": "#ecdcb3ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
diff --git a/assets/themes/one/one.json b/assets/themes/one/one.json
index 8be973677a..b8953f95f4 100644
--- a/assets/themes/one/one.json
+++ b/assets/themes/one/one.json
@@ -42,7 +42,7 @@
         "tab_bar.background": "#2f343eff",
         "tab.inactive_background": "#2f343eff",
         "tab.active_background": "#282c33ff",
-        "search.match_background": null,
+        "search.match_background": "#74ade866",
         "panel.background": "#2f343eff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -416,7 +416,7 @@
         "tab_bar.background": "#ebebecff",
         "tab.inactive_background": "#ebebecff",
         "tab.active_background": "#fafafaff",
-        "search.match_background": null,
+        "search.match_background": "#5c79e266",
         "panel.background": "#ebebecff",
         "panel.focused_border": null,
         "pane.focused_border": null,
diff --git a/assets/themes/rose_pine/rose_pine.json b/assets/themes/rose_pine/rose_pine.json
index 5878f1125a..69b89f8005 100644
--- a/assets/themes/rose_pine/rose_pine.json
+++ b/assets/themes/rose_pine/rose_pine.json
@@ -42,7 +42,7 @@
         "tab_bar.background": "#1c1b2aff",
         "tab.inactive_background": "#1c1b2aff",
         "tab.active_background": "#191724ff",
-        "search.match_background": null,
+        "search.match_background": "#57949f66",
         "panel.background": "#1c1b2aff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -421,7 +421,7 @@
         "tab_bar.background": "#fef9f2ff",
         "tab.inactive_background": "#fef9f2ff",
         "tab.active_background": "#faf4edff",
-        "search.match_background": null,
+        "search.match_background": "#9cced766",
         "panel.background": "#fef9f2ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -800,7 +800,7 @@
         "tab_bar.background": "#28253cff",
         "tab.inactive_background": "#28253cff",
         "tab.active_background": "#232136ff",
-        "search.match_background": null,
+        "search.match_background": "#9cced766",
         "panel.background": "#28253cff",
         "panel.focused_border": null,
         "pane.focused_border": null,
diff --git a/assets/themes/sandcastle/sandcastle.json b/assets/themes/sandcastle/sandcastle.json
index 502723c92a..6c42fee3c6 100644
--- a/assets/themes/sandcastle/sandcastle.json
+++ b/assets/themes/sandcastle/sandcastle.json
@@ -42,7 +42,7 @@
         "tab_bar.background": "#2b3038ff",
         "tab.inactive_background": "#2b3038ff",
         "tab.active_background": "#282c33ff",
-        "search.match_background": null,
+        "search.match_background": "#528b8b66",
         "panel.background": "#2b3038ff",
         "panel.focused_border": null,
         "pane.focused_border": null,
diff --git a/assets/themes/solarized/solarized.json b/assets/themes/solarized/solarized.json
index 84811aa714..217dddf4f7 100644
--- a/assets/themes/solarized/solarized.json
+++ b/assets/themes/solarized/solarized.json
@@ -42,7 +42,7 @@
         "tab_bar.background": "#04313bff",
         "tab.inactive_background": "#04313bff",
         "tab.active_background": "#002a35ff",
-        "search.match_background": null,
+        "search.match_background": "#288bd166",
         "panel.background": "#04313bff",
         "panel.focused_border": null,
         "pane.focused_border": null,
@@ -411,7 +411,7 @@
         "tab_bar.background": "#f3eddaff",
         "tab.inactive_background": "#f3eddaff",
         "tab.active_background": "#fdf6e3ff",
-        "search.match_background": null,
+        "search.match_background": "#298bd166",
         "panel.background": "#f3eddaff",
         "panel.focused_border": null,
         "pane.focused_border": null,
diff --git a/assets/themes/summercamp/summercamp.json b/assets/themes/summercamp/summercamp.json
index fff6108a71..187d1fd23f 100644
--- a/assets/themes/summercamp/summercamp.json
+++ b/assets/themes/summercamp/summercamp.json
@@ -42,7 +42,7 @@
         "tab_bar.background": "#231f16ff",
         "tab.inactive_background": "#231f16ff",
         "tab.active_background": "#1b1810ff",
-        "search.match_background": null,
+        "search.match_background": "#499bef66",
         "panel.background": "#231f16ff",
         "panel.focused_border": null,
         "pane.focused_border": null,

From 583ce443592ac2bd2f92001a795c64bfefe53f54 Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Mon, 5 Feb 2024 18:55:27 +0100
Subject: [PATCH 240/372] Fix cmd+k in terminal and fix sporadic keybind misses
 (#7388)

This fixes `cmd+k` in the terminal taking 1s to have an effect. It is
now immediate.

It also fixes #7270 by ensuring that we don't set a bad state when
matching keybindings.

It matches keybindings per context and if it finds a match on a lower
context it doesn't keep pending keystrokes. If it finds two matches on
the same context level, requiring more keystrokes, then it waits.



Release Notes:

- Fixed `cmd-k` in terminal taking 1s to have an effect. Also fixed
sporadic non-matching of keybindings if there are overlapping
keybindings.
([#7270](https://github.com/zed-industries/zed/issues/7270)).

---------

Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 assets/keymaps/default.json                  | 22 ++---
 crates/collab/src/tests/integration_tests.rs |  2 +-
 crates/gpui/src/key_dispatch.rs              | 20 ++---
 crates/gpui/src/window.rs                    | 89 +++++++++++---------
 crates/gpui/src/window/element_cx.rs         | 19 ++---
 crates/terminal_view/src/terminal_element.rs |  1 -
 6 files changed, 71 insertions(+), 82 deletions(-)

diff --git a/assets/keymaps/default.json b/assets/keymaps/default.json
index 8679296733..06358dab22 100644
--- a/assets/keymaps/default.json
+++ b/assets/keymaps/default.json
@@ -415,7 +415,15 @@
       "cmd-?": "assistant::ToggleFocus",
       "cmd-alt-s": "workspace::SaveAll",
       "cmd-k m": "language_selector::Toggle",
-      "escape": "workspace::Unfollow"
+      "escape": "workspace::Unfollow",
+      "cmd-k cmd-left": ["workspace::ActivatePaneInDirection", "Left"],
+      "cmd-k cmd-right": ["workspace::ActivatePaneInDirection", "Right"],
+      "cmd-k cmd-up": ["workspace::ActivatePaneInDirection", "Up"],
+      "cmd-k cmd-down": ["workspace::ActivatePaneInDirection", "Down"],
+      "cmd-k shift-left": ["workspace::SwapPaneInDirection", "Left"],
+      "cmd-k shift-right": ["workspace::SwapPaneInDirection", "Right"],
+      "cmd-k shift-up": ["workspace::SwapPaneInDirection", "Up"],
+      "cmd-k shift-down": ["workspace::SwapPaneInDirection", "Down"]
     }
   },
   // Bindings from Sublime Text
@@ -441,18 +449,6 @@
       "ctrl-alt-shift-f": "editor::SelectToNextSubwordEnd"
     }
   },
-  {
-    "bindings": {
-      "cmd-k cmd-left": ["workspace::ActivatePaneInDirection", "Left"],
-      "cmd-k cmd-right": ["workspace::ActivatePaneInDirection", "Right"],
-      "cmd-k cmd-up": ["workspace::ActivatePaneInDirection", "Up"],
-      "cmd-k cmd-down": ["workspace::ActivatePaneInDirection", "Down"],
-      "cmd-k shift-left": ["workspace::SwapPaneInDirection", "Left"],
-      "cmd-k shift-right": ["workspace::SwapPaneInDirection", "Right"],
-      "cmd-k shift-up": ["workspace::SwapPaneInDirection", "Up"],
-      "cmd-k shift-down": ["workspace::SwapPaneInDirection", "Down"]
-    }
-  },
   // Bindings from Atom
   {
     "context": "Pane",
diff --git a/crates/collab/src/tests/integration_tests.rs b/crates/collab/src/tests/integration_tests.rs
index 625544e4a1..eb0beb6f66 100644
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -5967,6 +5967,6 @@ async fn test_cmd_k_left(cx: &mut TestAppContext) {
     cx.executor().advance_clock(Duration::from_secs(2));
     cx.simulate_keystrokes("left");
     workspace.update(cx, |workspace, cx| {
-        assert!(workspace.items(cx).collect::<Vec<_>>().len() == 3);
+        assert!(workspace.items(cx).collect::<Vec<_>>().len() == 2);
     });
 }
diff --git a/crates/gpui/src/key_dispatch.rs b/crates/gpui/src/key_dispatch.rs
index c6a2e17884..8f9eb16a62 100644
--- a/crates/gpui/src/key_dispatch.rs
+++ b/crates/gpui/src/key_dispatch.rs
@@ -62,16 +62,6 @@ use std::{
     rc::Rc,
 };
 
-/// KeymatchMode controls how keybindings are resolved in the case of conflicting pending keystrokes.
-/// When `Sequenced`, gpui will wait for 1s for sequences to complete.
-/// When `Immediate`, gpui will immediately resolve the keybinding.
-#[derive(Default, PartialEq)]
-pub enum KeymatchMode {
-    #[default]
-    Sequenced,
-    Immediate,
-}
-
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
 pub(crate) struct DispatchNodeId(usize);
 
@@ -84,7 +74,6 @@ pub(crate) struct DispatchTree {
     keystroke_matchers: FxHashMap<SmallVec<[KeyContext; 4]>, KeystrokeMatcher>,
     keymap: Rc<RefCell<Keymap>>,
     action_registry: Rc<ActionRegistry>,
-    pub(crate) keymatch_mode: KeymatchMode,
 }
 
 #[derive(Default)]
@@ -116,7 +105,6 @@ impl DispatchTree {
             keystroke_matchers: FxHashMap::default(),
             keymap,
             action_registry,
-            keymatch_mode: KeymatchMode::Sequenced,
         }
     }
 
@@ -127,7 +115,6 @@ impl DispatchTree {
         self.focusable_node_ids.clear();
         self.view_node_ids.clear();
         self.keystroke_matchers.clear();
-        self.keymatch_mode = KeymatchMode::Sequenced;
     }
 
     pub fn push_node(
@@ -335,7 +322,7 @@ impl DispatchTree {
             .collect()
     }
 
-    // dispatch_key pushses the next keystroke into any key binding matchers.
+    // dispatch_key pushes the next keystroke into any key binding matchers.
     // any matching bindings are returned in the order that they should be dispatched:
     // * First by length of binding (so if you have a binding for "b" and "ab", the "ab" binding fires first)
     // * Secondly by depth in the tree (so if Editor has a binding for "b" and workspace a
@@ -364,6 +351,11 @@ impl DispatchTree {
                 .or_insert_with(|| KeystrokeMatcher::new(self.keymap.clone()));
 
             let result = keystroke_matcher.match_keystroke(keystroke, &context_stack);
+            if result.pending && !pending && !bindings.is_empty() {
+                context_stack.pop();
+                continue;
+            }
+
             pending = result.pending || pending;
             for new_binding in result.bindings {
                 match bindings
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index c9c672557f..69982cce68 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -2,12 +2,12 @@ use crate::{
     px, size, transparent_black, Action, AnyDrag, AnyView, AppContext, Arena, AsyncWindowContext,
     AvailableSpace, Bounds, Context, Corners, CursorStyle, DispatchActionListener, DispatchNodeId,
     DispatchTree, DisplayId, Edges, Effect, Entity, EntityId, EventEmitter, FileDropEvent, Flatten,
-    Global, GlobalElementId, Hsla, KeyBinding, KeyContext, KeyDownEvent, KeyMatch, KeymatchMode,
-    KeymatchResult, Keystroke, KeystrokeEvent, Model, ModelContext, Modifiers, MouseButton,
-    MouseMoveEvent, MouseUpEvent, Pixels, PlatformAtlas, PlatformDisplay, PlatformInput,
-    PlatformWindow, Point, PromptLevel, Render, ScaledPixels, SharedString, Size, SubscriberSet,
-    Subscription, TaffyLayoutEngine, Task, View, VisualContext, WeakView, WindowAppearance,
-    WindowBounds, WindowOptions, WindowTextSystem,
+    Global, GlobalElementId, Hsla, KeyBinding, KeyContext, KeyDownEvent, KeyMatch, KeymatchResult,
+    Keystroke, KeystrokeEvent, Model, ModelContext, Modifiers, MouseButton, MouseMoveEvent,
+    MouseUpEvent, Pixels, PlatformAtlas, PlatformDisplay, PlatformInput, PlatformWindow, Point,
+    PromptLevel, Render, ScaledPixels, SharedString, Size, SubscriberSet, Subscription,
+    TaffyLayoutEngine, Task, View, VisualContext, WeakView, WindowAppearance, WindowBounds,
+    WindowOptions, WindowTextSystem,
 };
 use anyhow::{anyhow, Context as _, Result};
 use collections::FxHashSet;
@@ -291,10 +291,6 @@ struct PendingInput {
 }
 
 impl PendingInput {
-    fn is_noop(&self) -> bool {
-        self.bindings.is_empty() && (self.keystrokes.iter().all(|k| k.ime_key.is_none()))
-    }
-
     fn input(&self) -> String {
         self.keystrokes
             .iter()
@@ -1282,21 +1278,12 @@ impl<'a> WindowContext<'a> {
             .dispatch_path(node_id);
 
         if let Some(key_down_event) = event.downcast_ref::<KeyDownEvent>() {
-            let KeymatchResult {
-                bindings,
-                mut pending,
-            } = self
+            let KeymatchResult { bindings, pending } = self
                 .window
                 .rendered_frame
                 .dispatch_tree
                 .dispatch_key(&key_down_event.keystroke, &dispatch_path);
 
-            if self.window.rendered_frame.dispatch_tree.keymatch_mode == KeymatchMode::Immediate
-                && !bindings.is_empty()
-            {
-                pending = false;
-            }
-
             if pending {
                 let mut currently_pending = self.window.pending_input.take().unwrap_or_default();
                 if currently_pending.focus.is_some() && currently_pending.focus != self.window.focus
@@ -1311,22 +1298,17 @@ impl<'a> WindowContext<'a> {
                     currently_pending.bindings.push(binding);
                 }
 
-                // for vim compatibility, we also should check "is input handler enabled"
-                if !currently_pending.is_noop() {
-                    currently_pending.timer = Some(self.spawn(|mut cx| async move {
-                        cx.background_executor.timer(Duration::from_secs(1)).await;
-                        cx.update(move |cx| {
-                            cx.clear_pending_keystrokes();
-                            let Some(currently_pending) = cx.window.pending_input.take() else {
-                                return;
-                            };
-                            cx.replay_pending_input(currently_pending)
-                        })
-                        .log_err();
-                    }));
-                } else {
-                    currently_pending.timer = None;
-                }
+                currently_pending.timer = Some(self.spawn(|mut cx| async move {
+                    cx.background_executor.timer(Duration::from_secs(1)).await;
+                    cx.update(move |cx| {
+                        cx.clear_pending_keystrokes();
+                        let Some(currently_pending) = cx.window.pending_input.take() else {
+                            return;
+                        };
+                        cx.replay_pending_input(currently_pending)
+                    })
+                    .log_err();
+                }));
                 self.window.pending_input = Some(currently_pending);
 
                 self.propagate_event = false;
@@ -1354,8 +1336,21 @@ impl<'a> WindowContext<'a> {
             }
         }
 
+        self.dispatch_key_down_up_event(event, &dispatch_path);
+        if !self.propagate_event {
+            return;
+        }
+
+        self.dispatch_keystroke_observers(event, None);
+    }
+
+    fn dispatch_key_down_up_event(
+        &mut self,
+        event: &dyn Any,
+        dispatch_path: &SmallVec<[DispatchNodeId; 32]>,
+    ) {
         // Capture phase
-        for node_id in &dispatch_path {
+        for node_id in dispatch_path {
             let node = self.window.rendered_frame.dispatch_tree.node(*node_id);
 
             for key_listener in node.key_listeners.clone() {
@@ -1381,8 +1376,6 @@ impl<'a> WindowContext<'a> {
                 }
             }
         }
-
-        self.dispatch_keystroke_observers(event, None);
     }
 
     /// Determine whether a potential multi-stroke key binding is in progress on this window.
@@ -1419,6 +1412,24 @@ impl<'a> WindowContext<'a> {
             }
         }
 
+        let dispatch_path = self
+            .window
+            .rendered_frame
+            .dispatch_tree
+            .dispatch_path(node_id);
+
+        for keystroke in currently_pending.keystrokes {
+            let event = KeyDownEvent {
+                keystroke,
+                is_held: false,
+            };
+
+            self.dispatch_key_down_up_event(&event, &dispatch_path);
+            if !self.propagate_event {
+                return;
+            }
+        }
+
         if !input.is_empty() {
             if let Some(mut input_handler) = self.window.platform_window.take_input_handler() {
                 input_handler.flush_pending_input(&input, self);
diff --git a/crates/gpui/src/window/element_cx.rs b/crates/gpui/src/window/element_cx.rs
index c7814fc101..8ba3fc5c4f 100644
--- a/crates/gpui/src/window/element_cx.rs
+++ b/crates/gpui/src/window/element_cx.rs
@@ -31,11 +31,11 @@ use crate::{
     prelude::*, size, AnyTooltip, AppContext, AvailableSpace, Bounds, BoxShadow, ContentMask,
     Corners, CursorStyle, DevicePixels, DispatchPhase, DispatchTree, ElementId, ElementStateBox,
     EntityId, FocusHandle, FocusId, FontId, GlobalElementId, GlyphId, Hsla, ImageData,
-    InputHandler, IsZero, KeyContext, KeyEvent, KeymatchMode, LayoutId, MonochromeSprite,
-    MouseEvent, PaintQuad, Path, Pixels, PlatformInputHandler, Point, PolychromeSprite, Quad,
-    RenderGlyphParams, RenderImageParams, RenderSvgParams, Scene, Shadow, SharedString, Size,
-    StackingContext, StackingOrder, Style, Surface, TextStyleRefinement, Underline, UnderlineStyle,
-    Window, WindowContext, SUBPIXEL_VARIANTS,
+    InputHandler, IsZero, KeyContext, KeyEvent, LayoutId, MonochromeSprite, MouseEvent, PaintQuad,
+    Path, Pixels, PlatformInputHandler, Point, PolychromeSprite, Quad, RenderGlyphParams,
+    RenderImageParams, RenderSvgParams, Scene, Shadow, SharedString, Size, StackingContext,
+    StackingOrder, Style, Surface, TextStyleRefinement, Underline, UnderlineStyle, Window,
+    WindowContext, SUBPIXEL_VARIANTS,
 };
 
 type AnyMouseListener = Box<dyn FnMut(&dyn Any, DispatchPhase, &mut ElementContext) + 'static>;
@@ -1143,15 +1143,6 @@ impl<'a> ElementContext<'a> {
         }
     }
 
-    /// keymatch mode immediate instructs GPUI to prefer shorter action bindings.
-    /// In the case that you have a keybinding of `"cmd-k": "terminal::Clear"` and
-    /// `"cmd-k left": "workspace::MoveLeft"`, GPUI will by default wait for 1s after
-    /// you type cmd-k to see if you're going to type left.
-    /// This is problematic in the terminal
-    pub fn keymatch_mode_immediate(&mut self) {
-        self.window.next_frame.dispatch_tree.keymatch_mode = KeymatchMode::Immediate;
-    }
-
     /// Register a mouse event listener on the window for the next frame. The type of event
     /// is determined by the first parameter of the given listener. When the next frame is rendered
     /// the listener will be cleared.
diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index 73d9bb27f5..66ef42bc46 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -776,7 +776,6 @@ impl Element for TerminalElement {
         self.interactivity
             .paint(bounds, bounds.size, state, cx, |_, _, cx| {
                 cx.handle_input(&self.focus, terminal_input_handler);
-                cx.keymatch_mode_immediate();
 
                 cx.on_key_event({
                     let this = self.terminal.clone();

From 4195f27964aa85470209dfbe061b7c935b90993b Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 5 Feb 2024 10:57:53 -0700
Subject: [PATCH 241/372] Fix hover links in channel buffers (#7393)

Release Notes:

- N/A
---
 crates/editor/src/editor.rs      | 17 +++++++++++------
 crates/editor/src/hover_links.rs |  9 ++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index e5e5ae9c28..4ed8f13700 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -7264,10 +7264,6 @@ impl Editor {
         split: bool,
         cx: &mut ViewContext<Editor>,
     ) {
-        let Some(workspace) = self.workspace() else {
-            return;
-        };
-        let pane = workspace.read(cx).active_pane().clone();
         // If there is one definition, just open it directly
         if definitions.len() == 1 {
             let definition = definitions.pop().unwrap();
@@ -7285,6 +7281,11 @@ impl Editor {
                 let target = target_task.await.context("target resolution task")?;
                 if let Some(target) = target {
                     editor.update(&mut cx, |editor, cx| {
+                        let Some(workspace) = editor.workspace() else {
+                            return;
+                        };
+                        let pane = workspace.read(cx).active_pane().clone();
+
                         let range = target.range.to_offset(target.buffer.read(cx));
                         let range = editor.range_for_match(&range);
                         if Some(&target.buffer) == editor.buffer.read(cx).as_singleton().as_ref() {
@@ -7325,7 +7326,7 @@ impl Editor {
         } else if !definitions.is_empty() {
             let replica_id = self.replica_id(cx);
             cx.spawn(|editor, mut cx| async move {
-                let (title, location_tasks) = editor
+                let (title, location_tasks, workspace) = editor
                     .update(&mut cx, |editor, cx| {
                         let title = definitions
                             .iter()
@@ -7353,7 +7354,7 @@ impl Editor {
                                 HoverLink::Url(_) => Task::ready(Ok(None)),
                             })
                             .collect::<Vec<_>>();
-                        (title, location_tasks)
+                        (title, location_tasks, editor.workspace().clone())
                     })
                     .context("location tasks preparation")?;
 
@@ -7363,6 +7364,10 @@ impl Editor {
                     .filter_map(|location| location.transpose())
                     .collect::<Result<_>>()
                     .context("location tasks")?;
+
+                let Some(workspace) = workspace else {
+                    return Ok(());
+                };
                 workspace
                     .update(&mut cx, |workspace, cx| {
                         Self::open_locations_in_multibuffer(
diff --git a/crates/editor/src/hover_links.rs b/crates/editor/src/hover_links.rs
index 955aafde24..5834ae5a2b 100644
--- a/crates/editor/src/hover_links.rs
+++ b/crates/editor/src/hover_links.rs
@@ -394,10 +394,6 @@ pub fn show_link_definition(
         return;
     };
 
-    let Some(project) = editor.project.clone() else {
-        return;
-    };
-
     let same_kind = hovered_link_state.preferred_kind == preferred_kind
         || hovered_link_state
             .links
@@ -419,6 +415,7 @@ pub fn show_link_definition(
     } else {
         editor.hide_hovered_link(cx)
     }
+    let project = editor.project.clone();
 
     let snapshot = snapshot.buffer_snapshot.clone();
     hovered_link_state.task = Some(cx.spawn(|this, mut cx| {
@@ -436,7 +433,7 @@ pub fn show_link_definition(
                             )
                         })
                         .ok()
-                    } else {
+                    } else if let Some(project) = project {
                         // query the LSP for definition info
                         project
                             .update(&mut cx, |project, cx| match preferred_kind {
@@ -468,6 +465,8 @@ pub fn show_link_definition(
                                     definition_result.into_iter().map(HoverLink::Text).collect(),
                                 )
                             })
+                    } else {
+                        None
                     }
                 }
                 TriggerPoint::InlayHint(highlight, lsp_location, server_id) => Some((

From e2e8e52ec4eb4c053b4148c063a775bed30c7d94 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 5 Feb 2024 11:07:26 -0700
Subject: [PATCH 242/372] Beancount syntax highlighting (#7389)

Release Notes:

- Added syntax highlighting for [Beancount](https://beancount.github.io)
---
 Cargo.lock                                    | 10 +++++++++
 Cargo.toml                                    |  1 +
 crates/zed/Cargo.toml                         |  1 +
 crates/zed/src/languages.rs                   |  1 +
 .../zed/src/languages/beancount/config.toml   |  3 +++
 .../src/languages/beancount/highlights.scm    | 21 +++++++++++++++++++
 6 files changed, 37 insertions(+)
 create mode 100644 crates/zed/src/languages/beancount/config.toml
 create mode 100644 crates/zed/src/languages/beancount/highlights.scm

diff --git a/Cargo.lock b/Cargo.lock
index ad58e44425..40d594ff42 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8729,6 +8729,15 @@ dependencies = [
  "tree-sitter",
 ]
 
+[[package]]
+name = "tree-sitter-beancount"
+version = "2.2.0"
+source = "git+https://github.com/polarmutex/tree-sitter-beancount?rev=da1bf8c6eb0ae7a97588affde7227630bcd678b6#da1bf8c6eb0ae7a97588affde7227630bcd678b6"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
 [[package]]
 name = "tree-sitter-c"
 version = "0.20.6"
@@ -10369,6 +10378,7 @@ dependencies = [
  "toml",
  "tree-sitter",
  "tree-sitter-bash",
+ "tree-sitter-beancount",
  "tree-sitter-c",
  "tree-sitter-c-sharp",
  "tree-sitter-cpp",
diff --git a/Cargo.toml b/Cargo.toml
index 5a276ef8b3..edfc968ffb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -141,6 +141,7 @@ time = { version = "0.3", features = ["serde", "serde-well-known"] }
 toml = "0.5"
 tree-sitter = { version = "0.20", features = ["wasm"] }
 tree-sitter-bash = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "7331995b19b8f8aba2d5e26deb51d2195c18bc94" }
+tree-sitter-beancount = { git = "https://github.com/polarmutex/tree-sitter-beancount", rev = "da1bf8c6eb0ae7a97588affde7227630bcd678b6" }
 tree-sitter-c = "0.20.1"
 tree-sitter-c-sharp = { git = "https://github.com/tree-sitter/tree-sitter-c-sharp", rev = "dd5e59721a5f8dae34604060833902b882023aaf" }
 tree-sitter-cpp = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "f44509141e7e483323d2ec178f2d2e6c0fc041c1" }
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 61df53a9fb..f3ba0825c7 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -108,6 +108,7 @@ thiserror.workspace = true
 tiny_http = "0.8"
 toml.workspace = true
 tree-sitter-bash.workspace = true
+tree-sitter-beancount.workspace = true
 tree-sitter-c-sharp.workspace = true
 tree-sitter-c.workspace = true
 tree-sitter-cpp.workspace = true
diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index 15bd180a2e..248ff3c7fd 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -67,6 +67,7 @@ pub fn init(
     };
 
     language("bash", tree_sitter_bash::language(), vec![]);
+    language("beancount", tree_sitter_beancount::language(), vec![]);
     language(
         "c",
         tree_sitter_c::language(),
diff --git a/crates/zed/src/languages/beancount/config.toml b/crates/zed/src/languages/beancount/config.toml
new file mode 100644
index 0000000000..722b8a39b7
--- /dev/null
+++ b/crates/zed/src/languages/beancount/config.toml
@@ -0,0 +1,3 @@
+name = "Beancount"
+path_suffixes = ["beancount"]
+brackets = [{ start = "\"", end = "\"", close = false, newline = false }]
diff --git a/crates/zed/src/languages/beancount/highlights.scm b/crates/zed/src/languages/beancount/highlights.scm
new file mode 100644
index 0000000000..87a383ddbf
--- /dev/null
+++ b/crates/zed/src/languages/beancount/highlights.scm
@@ -0,0 +1,21 @@
+(comment) @comment
+(headline) @comment
+[
+    (payee)
+    (narration)
+    (string)
+] @string
+
+(number) @number
+(date) @function
+(currency) @constant
+(account) @identifier
+
+[
+    (option)
+    (include)
+    (open)
+    (balance)
+    (pad)
+    (close)
+] @keyword

From 91303a50210aecba7e7f5baffb29a0b521ec6c88 Mon Sep 17 00:00:00 2001
From: Dairon M <dairon.medina@gmail.com>
Date: Mon, 5 Feb 2024 13:12:29 -0500
Subject: [PATCH 243/372] Do not run scheduled CI jobs on forks (#7394)

Runs scheduled CI jobs only on the main repository, not on forks. These
jobs fail on forks and generate unnecessary noise on contributor emails.



Release Notes:

- N/A
---
 .github/workflows/release_nightly.yml                  | 3 +++
 .github/workflows/update_all_top_ranking_issues.yml    | 1 +
 .github/workflows/update_weekly_top_ranking_issues.yml | 1 +
 3 files changed, 5 insertions(+)

diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
index 80a012e560..b7221c97fd 100644
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -16,6 +16,7 @@ env:
 jobs:
     style:
         name: Check formatting and Clippy lints
+        if: github.repository_owner == 'zed-industries'
         runs-on:
             - self-hosted
             - test
@@ -32,6 +33,7 @@ jobs:
 
     tests:
         name: Run tests
+        if: github.repository_owner == 'zed-industries'
         runs-on:
             - self-hosted
             - test
@@ -48,6 +50,7 @@ jobs:
 
     bundle:
         name: Bundle app
+        if: github.repository_owner == 'zed-industries'
         runs-on:
             - self-hosted
             - bundle
diff --git a/.github/workflows/update_all_top_ranking_issues.yml b/.github/workflows/update_all_top_ranking_issues.yml
index 0ffdb6aeb2..32941ea220 100644
--- a/.github/workflows/update_all_top_ranking_issues.yml
+++ b/.github/workflows/update_all_top_ranking_issues.yml
@@ -6,6 +6,7 @@ on:
 jobs:
     update_top_ranking_issues:
         runs-on: ubuntu-latest
+        if: github.repository_owner == 'zed-industries'
         steps:
             - uses: actions/checkout@v4
             - uses: actions/setup-python@v4
diff --git a/.github/workflows/update_weekly_top_ranking_issues.yml b/.github/workflows/update_weekly_top_ranking_issues.yml
index fa9a33bdf5..de1b4d21bc 100644
--- a/.github/workflows/update_weekly_top_ranking_issues.yml
+++ b/.github/workflows/update_weekly_top_ranking_issues.yml
@@ -6,6 +6,7 @@ on:
 jobs:
     update_top_ranking_issues:
         runs-on: ubuntu-latest
+        if: github.repository_owner == 'zed-industries'
         steps:
             - uses: actions/checkout@v4
             - uses: actions/setup-python@v4

From 2ed45d72d8aa8f6e9e64ea41982b01dbc2d4c1a1 Mon Sep 17 00:00:00 2001
From: Andrew Lygin <alygin@gmail.com>
Date: Mon, 5 Feb 2024 21:12:47 +0300
Subject: [PATCH 244/372] File finder UI enhancement (#7364)

File finder looks and feels a little bulky now. It duplicates file names
and consumes too much space for each file.

This PR makes it more compact:
- File name is trimmed from the path, removing duplication
- Path is placed to the right of the file name, improving space usage
- Path is muted and printed in small size to not distract attention from
the main information (file names)

It makes search results easier to look through, consistent with the
editor tabs, and closer in terms of usage to mature editors.

Release Notes:

- File finder UI enhancement
---
 crates/file_finder/src/file_finder.rs         | 19 ++++++++++++++++---
 crates/file_finder/src/file_finder_tests.rs   |  4 ++--
 .../src/components/label/highlighted_label.rs |  4 +++-
 crates/ui/src/components/label/label_like.rs  |  2 +-
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index be3d2feb83..d222682e80 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -566,7 +566,7 @@ impl FileFinderDelegate {
         let path = &path_match.path;
         let path_string = path.to_string_lossy();
         let full_path = [path_match.path_prefix.as_ref(), path_string.as_ref()].join("");
-        let path_positions = path_match.positions.clone();
+        let mut path_positions = path_match.positions.clone();
 
         let file_name = path.file_name().map_or_else(
             || path_match.path_prefix.to_string(),
@@ -584,6 +584,14 @@ impl FileFinderDelegate {
             })
             .collect();
 
+        // Trim file name from the full path
+        let full_path = if full_path.len() > file_name.len() {
+            full_path[..full_path.len() - file_name.len() - 1].to_string()
+        } else {
+            "".to_string()
+        };
+        path_positions.retain(|idx| *idx < full_path.len());
+
         (file_name, file_name_positions, full_path, path_positions)
     }
 
@@ -868,9 +876,14 @@ impl PickerDelegate for FileFinderDelegate {
                 .inset(true)
                 .selected(selected)
                 .child(
-                    v_flex()
+                    h_flex()
+                        .gap_2()
                         .child(HighlightedLabel::new(file_name, file_name_positions))
-                        .child(HighlightedLabel::new(full_path, full_path_positions)),
+                        .child(
+                            HighlightedLabel::new(full_path, full_path_positions)
+                                .size(LabelSize::Small)
+                                .color(Color::Muted),
+                        ),
                 ),
         )
     }
diff --git a/crates/file_finder/src/file_finder_tests.rs b/crates/file_finder/src/file_finder_tests.rs
index 450d034614..f0e1626bd4 100644
--- a/crates/file_finder/src/file_finder_tests.rs
+++ b/crates/file_finder/src/file_finder_tests.rs
@@ -490,8 +490,8 @@ async fn test_single_file_worktrees(cx: &mut TestAppContext) {
             delegate.labels_for_path_match(&matches[0].0);
         assert_eq!(file_name, "the-file");
         assert_eq!(file_name_positions, &[0, 1, 4]);
-        assert_eq!(full_path, "the-file");
-        assert_eq!(full_path_positions, &[0, 1, 4]);
+        assert_eq!(full_path, "");
+        assert_eq!(full_path_positions, &[0; 0]);
     });
 
     // Since the worktree root is a file, searching for its name followed by a slash does
diff --git a/crates/ui/src/components/label/highlighted_label.rs b/crates/ui/src/components/label/highlighted_label.rs
index d70c2d1b51..41866bd10a 100644
--- a/crates/ui/src/components/label/highlighted_label.rs
+++ b/crates/ui/src/components/label/highlighted_label.rs
@@ -79,6 +79,8 @@ impl RenderOnce for HighlightedLabel {
         let mut text_style = cx.text_style().clone();
         text_style.color = self.base.color.color(cx);
 
-        LabelLike::new().child(StyledText::new(self.label).with_highlights(&text_style, highlights))
+        LabelLike::new()
+            .size(self.base.size)
+            .child(StyledText::new(self.label).with_highlights(&text_style, highlights))
     }
 }
diff --git a/crates/ui/src/components/label/label_like.rs b/crates/ui/src/components/label/label_like.rs
index cddd849b89..f08ff1bf83 100644
--- a/crates/ui/src/components/label/label_like.rs
+++ b/crates/ui/src/components/label/label_like.rs
@@ -36,7 +36,7 @@ pub trait LabelCommon {
 
 #[derive(IntoElement)]
 pub struct LabelLike {
-    size: LabelSize,
+    pub(crate) size: LabelSize,
     line_height_style: LineHeightStyle,
     pub(crate) color: Color,
     strikethrough: bool,

From 8911e1b365d2c731c8c3747020f3b9f6e40d054b Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Mon, 5 Feb 2024 20:19:50 +0200
Subject: [PATCH 245/372] Make inlay hints test less flacky (#7396)

Suppresses a flacky inlay hints test failures like
https://github.com/zed-industries/zed/actions/runs/7788741514a for now.

Release Notes:

- N/A
---
 crates/editor/src/inlay_hint_cache.rs | 1132 +++++++++++++------------
 1 file changed, 611 insertions(+), 521 deletions(-)

diff --git a/crates/editor/src/inlay_hint_cache.rs b/crates/editor/src/inlay_hint_cache.rs
index 714f3d1789..1f34bdde20 100644
--- a/crates/editor/src/inlay_hint_cache.rs
+++ b/crates/editor/src/inlay_hint_cache.rs
@@ -1307,49 +1307,55 @@ pub mod tests {
         cx.executor().run_until_parked();
 
         let mut edits_made = 1;
-        _ = editor.update(cx, |editor, cx| {
-            let expected_hints = vec!["0".to_string()];
-            assert_eq!(
-                expected_hints,
-                cached_hint_labels(editor),
-                "Should get its first hints when opening the editor"
-            );
-            assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            let inlay_cache = editor.inlay_hint_cache();
-            assert_eq!(
-                inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
-                "Cache should use editor settings to get the allowed hint kinds"
-            );
-            assert_eq!(
-                inlay_cache.version, edits_made,
-                "The editor update the cache version after every cache/view change"
-            );
-        });
+        editor
+            .update(cx, |editor, cx| {
+                let expected_hints = vec!["0".to_string()];
+                assert_eq!(
+                    expected_hints,
+                    cached_hint_labels(editor),
+                    "Should get its first hints when opening the editor"
+                );
+                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
+                let inlay_cache = editor.inlay_hint_cache();
+                assert_eq!(
+                    inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
+                    "Cache should use editor settings to get the allowed hint kinds"
+                );
+                assert_eq!(
+                    inlay_cache.version, edits_made,
+                    "The editor update the cache version after every cache/view change"
+                );
+            })
+            .unwrap();
 
-        _ = editor.update(cx, |editor, cx| {
-            editor.change_selections(None, cx, |s| s.select_ranges([13..13]));
-            editor.handle_input("some change", cx);
-            edits_made += 1;
-        });
+        editor
+            .update(cx, |editor, cx| {
+                editor.change_selections(None, cx, |s| s.select_ranges([13..13]));
+                editor.handle_input("some change", cx);
+                edits_made += 1;
+            })
+            .unwrap();
         cx.executor().run_until_parked();
-        _ = editor.update(cx, |editor, cx| {
-            let expected_hints = vec!["0".to_string(), "1".to_string()];
-            assert_eq!(
-                expected_hints,
-                cached_hint_labels(editor),
-                "Should get new hints after an edit"
-            );
-            assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            let inlay_cache = editor.inlay_hint_cache();
-            assert_eq!(
-                inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
-                "Cache should use editor settings to get the allowed hint kinds"
-            );
-            assert_eq!(
-                inlay_cache.version, edits_made,
-                "The editor update the cache version after every cache/view change"
-            );
-        });
+        editor
+            .update(cx, |editor, cx| {
+                let expected_hints = vec!["0".to_string(), "1".to_string()];
+                assert_eq!(
+                    expected_hints,
+                    cached_hint_labels(editor),
+                    "Should get new hints after an edit"
+                );
+                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
+                let inlay_cache = editor.inlay_hint_cache();
+                assert_eq!(
+                    inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
+                    "Cache should use editor settings to get the allowed hint kinds"
+                );
+                assert_eq!(
+                    inlay_cache.version, edits_made,
+                    "The editor update the cache version after every cache/view change"
+                );
+            })
+            .unwrap();
 
         fake_server
             .request::<lsp::request::InlayHintRefreshRequest>(())
@@ -1357,24 +1363,26 @@ pub mod tests {
             .expect("inlay refresh request failed");
         edits_made += 1;
         cx.executor().run_until_parked();
-        _ = editor.update(cx, |editor, cx| {
-            let expected_hints = vec!["0".to_string(), "1".to_string(), "2".to_string()];
-            assert_eq!(
-                expected_hints,
-                cached_hint_labels(editor),
-                "Should get new hints after hint refresh/ request"
-            );
-            assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            let inlay_cache = editor.inlay_hint_cache();
-            assert_eq!(
-                inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
-                "Cache should use editor settings to get the allowed hint kinds"
-            );
-            assert_eq!(
-                inlay_cache.version, edits_made,
-                "The editor update the cache version after every cache/view change"
-            );
-        });
+        editor
+            .update(cx, |editor, cx| {
+                let expected_hints = vec!["0".to_string(), "1".to_string(), "2".to_string()];
+                assert_eq!(
+                    expected_hints,
+                    cached_hint_labels(editor),
+                    "Should get new hints after hint refresh/ request"
+                );
+                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
+                let inlay_cache = editor.inlay_hint_cache();
+                assert_eq!(
+                    inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
+                    "Cache should use editor settings to get the allowed hint kinds"
+                );
+                assert_eq!(
+                    inlay_cache.version, edits_made,
+                    "The editor update the cache version after every cache/view change"
+                );
+            })
+            .unwrap();
     }
 
     #[gpui::test]
@@ -1417,20 +1425,22 @@ pub mod tests {
         cx.executor().run_until_parked();
 
         let mut edits_made = 1;
-        _ = editor.update(cx, |editor, cx| {
-            let expected_hints = vec!["0".to_string()];
-            assert_eq!(
-                expected_hints,
-                cached_hint_labels(editor),
-                "Should get its first hints when opening the editor"
-            );
-            assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            assert_eq!(
-                editor.inlay_hint_cache().version,
-                edits_made,
-                "The editor update the cache version after every cache/view change"
-            );
-        });
+        editor
+            .update(cx, |editor, cx| {
+                let expected_hints = vec!["0".to_string()];
+                assert_eq!(
+                    expected_hints,
+                    cached_hint_labels(editor),
+                    "Should get its first hints when opening the editor"
+                );
+                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
+                assert_eq!(
+                    editor.inlay_hint_cache().version,
+                    edits_made,
+                    "The editor update the cache version after every cache/view change"
+                );
+            })
+            .unwrap();
 
         let progress_token = "test_progress_token";
         fake_server
@@ -1448,20 +1458,22 @@ pub mod tests {
         });
         cx.executor().run_until_parked();
 
-        _ = editor.update(cx, |editor, cx| {
-            let expected_hints = vec!["0".to_string()];
-            assert_eq!(
-                expected_hints,
-                cached_hint_labels(editor),
-                "Should not update hints while the work task is running"
-            );
-            assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            assert_eq!(
-                editor.inlay_hint_cache().version,
-                edits_made,
-                "Should not update the cache while the work task is running"
-            );
-        });
+        editor
+            .update(cx, |editor, cx| {
+                let expected_hints = vec!["0".to_string()];
+                assert_eq!(
+                    expected_hints,
+                    cached_hint_labels(editor),
+                    "Should not update hints while the work task is running"
+                );
+                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
+                assert_eq!(
+                    editor.inlay_hint_cache().version,
+                    edits_made,
+                    "Should not update the cache while the work task is running"
+                );
+            })
+            .unwrap();
 
         fake_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
             token: lsp::ProgressToken::String(progress_token.to_string()),
@@ -1472,20 +1484,22 @@ pub mod tests {
         cx.executor().run_until_parked();
 
         edits_made += 1;
-        _ = editor.update(cx, |editor, cx| {
-            let expected_hints = vec!["1".to_string()];
-            assert_eq!(
-                expected_hints,
-                cached_hint_labels(editor),
-                "New hints should be queried after the work task is done"
-            );
-            assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            assert_eq!(
-                editor.inlay_hint_cache().version,
-                edits_made,
-                "Cache version should update once after the work task is done"
-            );
-        });
+        editor
+            .update(cx, |editor, cx| {
+                let expected_hints = vec!["1".to_string()];
+                assert_eq!(
+                    expected_hints,
+                    cached_hint_labels(editor),
+                    "New hints should be queried after the work task is done"
+                );
+                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
+                assert_eq!(
+                    editor.inlay_hint_cache().version,
+                    edits_made,
+                    "Cache version should update once after the work task is done"
+                );
+            })
+            .unwrap();
     }
 
     #[gpui::test]
@@ -1577,20 +1591,22 @@ pub mod tests {
             .next()
             .await;
         cx.executor().run_until_parked();
-        _ = rs_editor.update(cx, |editor, cx| {
-            let expected_hints = vec!["0".to_string()];
-            assert_eq!(
-                expected_hints,
-                cached_hint_labels(editor),
-                "Should get its first hints when opening the editor"
-            );
-            assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            assert_eq!(
-                editor.inlay_hint_cache().version,
-                1,
-                "Rust editor update the cache version after every cache/view change"
-            );
-        });
+        rs_editor
+            .update(cx, |editor, cx| {
+                let expected_hints = vec!["0".to_string()];
+                assert_eq!(
+                    expected_hints,
+                    cached_hint_labels(editor),
+                    "Should get its first hints when opening the editor"
+                );
+                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
+                assert_eq!(
+                    editor.inlay_hint_cache().version,
+                    1,
+                    "Rust editor update the cache version after every cache/view change"
+                );
+            })
+            .unwrap();
 
         cx.executor().run_until_parked();
         let md_buffer = project
@@ -1628,72 +1644,86 @@ pub mod tests {
             .next()
             .await;
         cx.executor().run_until_parked();
-        _ = md_editor.update(cx, |editor, cx| {
-            let expected_hints = vec!["0".to_string()];
-            assert_eq!(
-                expected_hints,
-                cached_hint_labels(editor),
-                "Markdown editor should have a separate version, repeating Rust editor rules"
-            );
-            assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            assert_eq!(editor.inlay_hint_cache().version, 1);
-        });
+        md_editor
+            .update(cx, |editor, cx| {
+                let expected_hints = vec!["0".to_string()];
+                assert_eq!(
+                    expected_hints,
+                    cached_hint_labels(editor),
+                    "Markdown editor should have a separate version, repeating Rust editor rules"
+                );
+                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
+                assert_eq!(editor.inlay_hint_cache().version, 1);
+            })
+            .unwrap();
 
-        _ = rs_editor.update(cx, |editor, cx| {
-            editor.change_selections(None, cx, |s| s.select_ranges([13..13]));
-            editor.handle_input("some rs change", cx);
-        });
+        rs_editor
+            .update(cx, |editor, cx| {
+                editor.change_selections(None, cx, |s| s.select_ranges([13..13]));
+                editor.handle_input("some rs change", cx);
+            })
+            .unwrap();
         cx.executor().run_until_parked();
-        _ = rs_editor.update(cx, |editor, cx| {
-            let expected_hints = vec!["1".to_string()];
-            assert_eq!(
-                expected_hints,
-                cached_hint_labels(editor),
-                "Rust inlay cache should change after the edit"
-            );
-            assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            assert_eq!(
-                editor.inlay_hint_cache().version,
-                2,
-                "Every time hint cache changes, cache version should be incremented"
-            );
-        });
-        _ = md_editor.update(cx, |editor, cx| {
-            let expected_hints = vec!["0".to_string()];
-            assert_eq!(
-                expected_hints,
-                cached_hint_labels(editor),
-                "Markdown editor should not be affected by Rust editor changes"
-            );
-            assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            assert_eq!(editor.inlay_hint_cache().version, 1);
-        });
+        rs_editor
+            .update(cx, |editor, cx| {
+                let expected_hints = vec!["1".to_string()];
+                assert_eq!(
+                    expected_hints,
+                    cached_hint_labels(editor),
+                    "Rust inlay cache should change after the edit"
+                );
+                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
+                assert_eq!(
+                    editor.inlay_hint_cache().version,
+                    2,
+                    "Every time hint cache changes, cache version should be incremented"
+                );
+            })
+            .unwrap();
+        md_editor
+            .update(cx, |editor, cx| {
+                let expected_hints = vec!["0".to_string()];
+                assert_eq!(
+                    expected_hints,
+                    cached_hint_labels(editor),
+                    "Markdown editor should not be affected by Rust editor changes"
+                );
+                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
+                assert_eq!(editor.inlay_hint_cache().version, 1);
+            })
+            .unwrap();
 
-        _ = md_editor.update(cx, |editor, cx| {
-            editor.change_selections(None, cx, |s| s.select_ranges([13..13]));
-            editor.handle_input("some md change", cx);
-        });
+        md_editor
+            .update(cx, |editor, cx| {
+                editor.change_selections(None, cx, |s| s.select_ranges([13..13]));
+                editor.handle_input("some md change", cx);
+            })
+            .unwrap();
         cx.executor().run_until_parked();
-        _ = md_editor.update(cx, |editor, cx| {
-            let expected_hints = vec!["1".to_string()];
-            assert_eq!(
-                expected_hints,
-                cached_hint_labels(editor),
-                "Rust editor should not be affected by Markdown editor changes"
-            );
-            assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            assert_eq!(editor.inlay_hint_cache().version, 2);
-        });
-        _ = rs_editor.update(cx, |editor, cx| {
-            let expected_hints = vec!["1".to_string()];
-            assert_eq!(
-                expected_hints,
-                cached_hint_labels(editor),
-                "Markdown editor should also change independently"
-            );
-            assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            assert_eq!(editor.inlay_hint_cache().version, 2);
-        });
+        md_editor
+            .update(cx, |editor, cx| {
+                let expected_hints = vec!["1".to_string()];
+                assert_eq!(
+                    expected_hints,
+                    cached_hint_labels(editor),
+                    "Rust editor should not be affected by Markdown editor changes"
+                );
+                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
+                assert_eq!(editor.inlay_hint_cache().version, 2);
+            })
+            .unwrap();
+        rs_editor
+            .update(cx, |editor, cx| {
+                let expected_hints = vec!["1".to_string()];
+                assert_eq!(
+                    expected_hints,
+                    cached_hint_labels(editor),
+                    "Markdown editor should also change independently"
+                );
+                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
+                assert_eq!(editor.inlay_hint_cache().version, 2);
+            })
+            .unwrap();
     }
 
     #[gpui::test]
@@ -1759,66 +1789,70 @@ pub mod tests {
         cx.executor().run_until_parked();
 
         let mut edits_made = 1;
-        _ = editor.update(cx, |editor, cx| {
-            assert_eq!(
-                lsp_request_count.load(Ordering::Relaxed),
-                1,
-                "Should query new hints once"
-            );
-            assert_eq!(
-                vec![
-                    "other hint".to_string(),
-                    "parameter hint".to_string(),
-                    "type hint".to_string(),
-                ],
-                cached_hint_labels(editor),
-                "Should get its first hints when opening the editor"
-            );
-            assert_eq!(
-                vec!["other hint".to_string(), "type hint".to_string()],
-                visible_hint_labels(editor, cx)
-            );
-            let inlay_cache = editor.inlay_hint_cache();
-            assert_eq!(
-                inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
-                "Cache should use editor settings to get the allowed hint kinds"
-            );
-            assert_eq!(
-                inlay_cache.version, edits_made,
-                "The editor update the cache version after every cache/view change"
-            );
-        });
+        editor
+            .update(cx, |editor, cx| {
+                assert_eq!(
+                    lsp_request_count.load(Ordering::Relaxed),
+                    1,
+                    "Should query new hints once"
+                );
+                assert_eq!(
+                    vec![
+                        "other hint".to_string(),
+                        "parameter hint".to_string(),
+                        "type hint".to_string(),
+                    ],
+                    cached_hint_labels(editor),
+                    "Should get its first hints when opening the editor"
+                );
+                assert_eq!(
+                    vec!["other hint".to_string(), "type hint".to_string()],
+                    visible_hint_labels(editor, cx)
+                );
+                let inlay_cache = editor.inlay_hint_cache();
+                assert_eq!(
+                    inlay_cache.allowed_hint_kinds, allowed_hint_kinds,
+                    "Cache should use editor settings to get the allowed hint kinds"
+                );
+                assert_eq!(
+                    inlay_cache.version, edits_made,
+                    "The editor update the cache version after every cache/view change"
+                );
+            })
+            .unwrap();
 
         fake_server
             .request::<lsp::request::InlayHintRefreshRequest>(())
             .await
             .expect("inlay refresh request failed");
         cx.executor().run_until_parked();
-        _ = editor.update(cx, |editor, cx| {
-            assert_eq!(
-                lsp_request_count.load(Ordering::Relaxed),
-                2,
-                "Should load new hints twice"
-            );
-            assert_eq!(
-                vec![
-                    "other hint".to_string(),
-                    "parameter hint".to_string(),
-                    "type hint".to_string(),
-                ],
-                cached_hint_labels(editor),
-                "Cached hints should not change due to allowed hint kinds settings update"
-            );
-            assert_eq!(
-                vec!["other hint".to_string(), "type hint".to_string()],
-                visible_hint_labels(editor, cx)
-            );
-            assert_eq!(
-                editor.inlay_hint_cache().version,
-                edits_made,
-                "Should not update cache version due to new loaded hints being the same"
-            );
-        });
+        editor
+            .update(cx, |editor, cx| {
+                assert_eq!(
+                    lsp_request_count.load(Ordering::Relaxed),
+                    2,
+                    "Should load new hints twice"
+                );
+                assert_eq!(
+                    vec![
+                        "other hint".to_string(),
+                        "parameter hint".to_string(),
+                        "type hint".to_string(),
+                    ],
+                    cached_hint_labels(editor),
+                    "Cached hints should not change due to allowed hint kinds settings update"
+                );
+                assert_eq!(
+                    vec!["other hint".to_string(), "type hint".to_string()],
+                    visible_hint_labels(editor, cx)
+                );
+                assert_eq!(
+                    editor.inlay_hint_cache().version,
+                    edits_made,
+                    "Should not update cache version due to new loaded hints being the same"
+                );
+            })
+            .unwrap();
 
         for (new_allowed_hint_kinds, expected_visible_hints) in [
             (HashSet::from_iter([None]), vec!["other hint".to_string()]),
@@ -1866,7 +1900,7 @@ pub mod tests {
                 })
             });
             cx.executor().run_until_parked();
-            _ = editor.update(cx, |editor, cx| {
+            editor.update(cx, |editor, cx| {
                 assert_eq!(
                     lsp_request_count.load(Ordering::Relaxed),
                     2,
@@ -1895,7 +1929,7 @@ pub mod tests {
                     inlay_cache.version, edits_made,
                     "The editor should update the cache version after every cache/view change for hint kinds {new_allowed_hint_kinds:?} due to visible hints change"
                 );
-            });
+            }).unwrap();
         }
 
         edits_made += 1;
@@ -1910,37 +1944,39 @@ pub mod tests {
             })
         });
         cx.executor().run_until_parked();
-        _ = editor.update(cx, |editor, cx| {
-            assert_eq!(
-                lsp_request_count.load(Ordering::Relaxed),
-                2,
-                "Should not load new hints when hints got disabled"
-            );
-            assert!(
-                cached_hint_labels(editor).is_empty(),
-                "Should clear the cache when hints got disabled"
-            );
-            assert!(
-                visible_hint_labels(editor, cx).is_empty(),
-                "Should clear visible hints when hints got disabled"
-            );
-            let inlay_cache = editor.inlay_hint_cache();
-            assert_eq!(
-                inlay_cache.allowed_hint_kinds, another_allowed_hint_kinds,
-                "Should update its allowed hint kinds even when hints got disabled"
-            );
-            assert_eq!(
-                inlay_cache.version, edits_made,
-                "The editor should update the cache version after hints got disabled"
-            );
-        });
+        editor
+            .update(cx, |editor, cx| {
+                assert_eq!(
+                    lsp_request_count.load(Ordering::Relaxed),
+                    2,
+                    "Should not load new hints when hints got disabled"
+                );
+                assert!(
+                    cached_hint_labels(editor).is_empty(),
+                    "Should clear the cache when hints got disabled"
+                );
+                assert!(
+                    visible_hint_labels(editor, cx).is_empty(),
+                    "Should clear visible hints when hints got disabled"
+                );
+                let inlay_cache = editor.inlay_hint_cache();
+                assert_eq!(
+                    inlay_cache.allowed_hint_kinds, another_allowed_hint_kinds,
+                    "Should update its allowed hint kinds even when hints got disabled"
+                );
+                assert_eq!(
+                    inlay_cache.version, edits_made,
+                    "The editor should update the cache version after hints got disabled"
+                );
+            })
+            .unwrap();
 
         fake_server
             .request::<lsp::request::InlayHintRefreshRequest>(())
             .await
             .expect("inlay refresh request failed");
         cx.executor().run_until_parked();
-        _ = editor.update(cx, |editor, cx| {
+        editor.update(cx, |editor, cx| {
             assert_eq!(
                 lsp_request_count.load(Ordering::Relaxed),
                 2,
@@ -1952,7 +1988,7 @@ pub mod tests {
                 editor.inlay_hint_cache().version, edits_made,
                 "The editor should not update the cache version after /refresh query without updates"
             );
-        });
+        }).unwrap();
 
         let final_allowed_hint_kinds = HashSet::from_iter([Some(InlayHintKind::Parameter)]);
         edits_made += 1;
@@ -1966,62 +2002,66 @@ pub mod tests {
             })
         });
         cx.executor().run_until_parked();
-        _ = editor.update(cx, |editor, cx| {
-            assert_eq!(
-                lsp_request_count.load(Ordering::Relaxed),
-                3,
-                "Should query for new hints when they got re-enabled"
-            );
-            assert_eq!(
-                vec![
-                    "other hint".to_string(),
-                    "parameter hint".to_string(),
-                    "type hint".to_string(),
-                ],
-                cached_hint_labels(editor),
-                "Should get its cached hints fully repopulated after the hints got re-enabled"
-            );
-            assert_eq!(
-                vec!["parameter hint".to_string()],
-                visible_hint_labels(editor, cx),
-                "Should get its visible hints repopulated and filtered after the h"
-            );
-            let inlay_cache = editor.inlay_hint_cache();
-            assert_eq!(
-                inlay_cache.allowed_hint_kinds, final_allowed_hint_kinds,
-                "Cache should update editor settings when hints got re-enabled"
-            );
-            assert_eq!(
-                inlay_cache.version, edits_made,
-                "Cache should update its version after hints got re-enabled"
-            );
-        });
+        editor
+            .update(cx, |editor, cx| {
+                assert_eq!(
+                    lsp_request_count.load(Ordering::Relaxed),
+                    3,
+                    "Should query for new hints when they got re-enabled"
+                );
+                assert_eq!(
+                    vec![
+                        "other hint".to_string(),
+                        "parameter hint".to_string(),
+                        "type hint".to_string(),
+                    ],
+                    cached_hint_labels(editor),
+                    "Should get its cached hints fully repopulated after the hints got re-enabled"
+                );
+                assert_eq!(
+                    vec!["parameter hint".to_string()],
+                    visible_hint_labels(editor, cx),
+                    "Should get its visible hints repopulated and filtered after the h"
+                );
+                let inlay_cache = editor.inlay_hint_cache();
+                assert_eq!(
+                    inlay_cache.allowed_hint_kinds, final_allowed_hint_kinds,
+                    "Cache should update editor settings when hints got re-enabled"
+                );
+                assert_eq!(
+                    inlay_cache.version, edits_made,
+                    "Cache should update its version after hints got re-enabled"
+                );
+            })
+            .unwrap();
 
         fake_server
             .request::<lsp::request::InlayHintRefreshRequest>(())
             .await
             .expect("inlay refresh request failed");
         cx.executor().run_until_parked();
-        _ = editor.update(cx, |editor, cx| {
-            assert_eq!(
-                lsp_request_count.load(Ordering::Relaxed),
-                4,
-                "Should query for new hints again"
-            );
-            assert_eq!(
-                vec![
-                    "other hint".to_string(),
-                    "parameter hint".to_string(),
-                    "type hint".to_string(),
-                ],
-                cached_hint_labels(editor),
-            );
-            assert_eq!(
-                vec!["parameter hint".to_string()],
-                visible_hint_labels(editor, cx),
-            );
-            assert_eq!(editor.inlay_hint_cache().version, edits_made);
-        });
+        editor
+            .update(cx, |editor, cx| {
+                assert_eq!(
+                    lsp_request_count.load(Ordering::Relaxed),
+                    4,
+                    "Should query for new hints again"
+                );
+                assert_eq!(
+                    vec![
+                        "other hint".to_string(),
+                        "parameter hint".to_string(),
+                        "type hint".to_string(),
+                    ],
+                    cached_hint_labels(editor),
+                );
+                assert_eq!(
+                    vec!["parameter hint".to_string()],
+                    visible_hint_labels(editor, cx),
+                );
+                assert_eq!(editor.inlay_hint_cache().version, edits_made);
+            })
+            .unwrap();
     }
 
     #[gpui::test]
@@ -2069,16 +2109,18 @@ pub mod tests {
             "initial change #2",
             "initial change #3",
         ] {
-            _ = editor.update(cx, |editor, cx| {
-                editor.change_selections(None, cx, |s| s.select_ranges([13..13]));
-                editor.handle_input(change_after_opening, cx);
-            });
+            editor
+                .update(cx, |editor, cx| {
+                    editor.change_selections(None, cx, |s| s.select_ranges([13..13]));
+                    editor.handle_input(change_after_opening, cx);
+                })
+                .unwrap();
             expected_changes.push(change_after_opening);
         }
 
         cx.executor().run_until_parked();
 
-        _ = editor.update(cx, |editor, cx| {
+        editor.update(cx, |editor, cx| {
             let current_text = editor.text(cx);
             for change in &expected_changes {
                 assert!(
@@ -2102,7 +2144,7 @@ pub mod tests {
                 editor.inlay_hint_cache().version, 1,
                 "Only one update should be registered in the cache after all cancellations"
             );
-        });
+        }).unwrap();
 
         let mut edits = Vec::new();
         for async_later_change in [
@@ -2113,41 +2155,45 @@ pub mod tests {
             expected_changes.push(async_later_change);
             let task_editor = editor.clone();
             edits.push(cx.spawn(|mut cx| async move {
-                _ = task_editor.update(&mut cx, |editor, cx| {
-                    editor.change_selections(None, cx, |s| s.select_ranges([13..13]));
-                    editor.handle_input(async_later_change, cx);
-                });
+                task_editor
+                    .update(&mut cx, |editor, cx| {
+                        editor.change_selections(None, cx, |s| s.select_ranges([13..13]));
+                        editor.handle_input(async_later_change, cx);
+                    })
+                    .unwrap();
             }));
         }
         let _ = future::join_all(edits).await;
         cx.executor().run_until_parked();
 
-        _ = editor.update(cx, |editor, cx| {
-            let current_text = editor.text(cx);
-            for change in &expected_changes {
-                assert!(
-                    current_text.contains(change),
-                    "Should apply all changes made"
+        editor
+            .update(cx, |editor, cx| {
+                let current_text = editor.text(cx);
+                for change in &expected_changes {
+                    assert!(
+                        current_text.contains(change),
+                        "Should apply all changes made"
+                    );
+                }
+                assert_eq!(
+                    lsp_request_count.load(Ordering::SeqCst),
+                    3,
+                    "Should query new hints one more time, for the last edit only"
                 );
-            }
-            assert_eq!(
-                lsp_request_count.load(Ordering::SeqCst),
-                3,
-                "Should query new hints one more time, for the last edit only"
-            );
-            let expected_hints = vec!["3".to_string()];
-            assert_eq!(
-                expected_hints,
-                cached_hint_labels(editor),
-                "Should get hints from the last edit landed only"
-            );
-            assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            assert_eq!(
-                editor.inlay_hint_cache().version,
-                2,
-                "Should update the cache version once more, for the new change"
-            );
-        });
+                let expected_hints = vec!["3".to_string()];
+                assert_eq!(
+                    expected_hints,
+                    cached_hint_labels(editor),
+                    "Should get hints from the last edit landed only"
+                );
+                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
+                assert_eq!(
+                    editor.inlay_hint_cache().version,
+                    2,
+                    "Should update the cache version once more, for the new change"
+                );
+            })
+            .unwrap();
     }
 
     #[gpui::test(iterations = 10)]
@@ -2280,7 +2326,7 @@ pub mod tests {
             lsp::Position::new(initial_visible_range.end.row * 2, 2);
         let mut expected_invisible_query_start = lsp_initial_visible_range.end;
         expected_invisible_query_start.character += 1;
-        _ = editor.update(cx, |editor, cx| {
+        editor.update(cx, |editor, cx| {
             let ranges = lsp_request_ranges.lock().drain(..).collect::<Vec<_>>();
             assert_eq!(ranges.len(), 2,
                 "When scroll is at the edge of a big document, its visible part and the same range further should be queried in order, but got: {ranges:?}");
@@ -2305,12 +2351,14 @@ pub mod tests {
                 editor.inlay_hint_cache().version, requests_count,
                 "LSP queries should've bumped the cache version"
             );
-        });
+        }).unwrap();
 
-        _ = editor.update(cx, |editor, cx| {
-            editor.scroll_screen(&ScrollAmount::Page(1.0), cx);
-            editor.scroll_screen(&ScrollAmount::Page(1.0), cx);
-        });
+        editor
+            .update(cx, |editor, cx| {
+                editor.scroll_screen(&ScrollAmount::Page(1.0), cx);
+                editor.scroll_screen(&ScrollAmount::Page(1.0), cx);
+            })
+            .unwrap();
         cx.executor().advance_clock(Duration::from_millis(
             INVISIBLE_RANGES_HINTS_REQUEST_DELAY_MILLIS + 100,
         ));
@@ -2377,16 +2425,18 @@ pub mod tests {
             })
             .unwrap();
 
-        _ = editor.update(cx, |editor, cx| {
-            editor.change_selections(Some(Autoscroll::center()), cx, |s| {
-                s.select_ranges([selection_in_cached_range..selection_in_cached_range])
-            });
-        });
+        editor
+            .update(cx, |editor, cx| {
+                editor.change_selections(Some(Autoscroll::center()), cx, |s| {
+                    s.select_ranges([selection_in_cached_range..selection_in_cached_range])
+                });
+            })
+            .unwrap();
         cx.executor().advance_clock(Duration::from_millis(
             INVISIBLE_RANGES_HINTS_REQUEST_DELAY_MILLIS + 100,
         ));
         cx.executor().run_until_parked();
-        _ = editor.update(cx, |_, _| {
+        editor.update(cx, |_, _| {
             let ranges = lsp_request_ranges
                 .lock()
                 .drain(..)
@@ -2394,16 +2444,18 @@ pub mod tests {
                 .collect::<Vec<_>>();
             assert!(ranges.is_empty(), "No new ranges or LSP queries should be made after returning to the selection with cached hints");
             assert_eq!(lsp_request_count.load(Ordering::Acquire), 4);
-        });
+        }).unwrap();
 
-        _ = editor.update(cx, |editor, cx| {
-            editor.handle_input("++++more text++++", cx);
-        });
+        editor
+            .update(cx, |editor, cx| {
+                editor.handle_input("++++more text++++", cx);
+            })
+            .unwrap();
         cx.executor().advance_clock(Duration::from_millis(
             INVISIBLE_RANGES_HINTS_REQUEST_DELAY_MILLIS + 100,
         ));
         cx.executor().run_until_parked();
-        _ = editor.update(cx, |editor, cx| {
+        editor.update(cx, |editor, cx| {
             let mut ranges = lsp_request_ranges.lock().drain(..).collect::<Vec<_>>();
             ranges.sort_by_key(|r| r.start);
 
@@ -2432,7 +2484,7 @@ pub mod tests {
                 "Should have hints from the new LSP response after the edit");
             assert_eq!(expected_hints, visible_hint_labels(editor, cx));
             assert_eq!(editor.inlay_hint_cache().version, lsp_requests, "Should update the cache for every LSP response with hints added");
-        });
+        }).unwrap();
     }
 
     #[gpui::test(iterations = 30)]
@@ -2631,7 +2683,7 @@ pub mod tests {
             .await;
         cx.executor().run_until_parked();
 
-        _ = editor.update(cx, |editor, cx| {
+        editor.update(cx, |editor, cx| {
                 let expected_hints = vec![
                     "main hint #0".to_string(),
                     "main hint #1".to_string(),
@@ -2647,21 +2699,23 @@ pub mod tests {
                 );
                 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
                 assert_eq!(editor.inlay_hint_cache().version, expected_hints.len(), "Every visible excerpt hints should bump the version");
-            });
+            }).unwrap();
 
-        _ = editor.update(cx, |editor, cx| {
-            editor.change_selections(Some(Autoscroll::Next), cx, |s| {
-                s.select_ranges([Point::new(4, 0)..Point::new(4, 0)])
-            });
-            editor.change_selections(Some(Autoscroll::Next), cx, |s| {
-                s.select_ranges([Point::new(22, 0)..Point::new(22, 0)])
-            });
-            editor.change_selections(Some(Autoscroll::Next), cx, |s| {
-                s.select_ranges([Point::new(50, 0)..Point::new(50, 0)])
-            });
-        });
+        editor
+            .update(cx, |editor, cx| {
+                editor.change_selections(Some(Autoscroll::Next), cx, |s| {
+                    s.select_ranges([Point::new(4, 0)..Point::new(4, 0)])
+                });
+                editor.change_selections(Some(Autoscroll::Next), cx, |s| {
+                    s.select_ranges([Point::new(22, 0)..Point::new(22, 0)])
+                });
+                editor.change_selections(Some(Autoscroll::Next), cx, |s| {
+                    s.select_ranges([Point::new(50, 0)..Point::new(50, 0)])
+                });
+            })
+            .unwrap();
         cx.executor().run_until_parked();
-        _ = editor.update(cx, |editor, cx| {
+        editor.update(cx, |editor, cx| {
                 let expected_hints = vec![
                     "main hint #0".to_string(),
                     "main hint #1".to_string(),
@@ -2678,13 +2732,15 @@ pub mod tests {
                 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
                 assert_eq!(editor.inlay_hint_cache().version, expected_hints.len(),
                     "Due to every excerpt having one hint, we update cache per new excerpt scrolled");
-            });
+            }).unwrap();
 
-        _ = editor.update(cx, |editor, cx| {
-            editor.change_selections(Some(Autoscroll::Next), cx, |s| {
-                s.select_ranges([Point::new(100, 0)..Point::new(100, 0)])
-            });
-        });
+        editor
+            .update(cx, |editor, cx| {
+                editor.change_selections(Some(Autoscroll::Next), cx, |s| {
+                    s.select_ranges([Point::new(100, 0)..Point::new(100, 0)])
+                });
+            })
+            .unwrap();
         cx.executor().advance_clock(Duration::from_millis(
             INVISIBLE_RANGES_HINTS_REQUEST_DELAY_MILLIS + 100,
         ));
@@ -2711,13 +2767,15 @@ pub mod tests {
                 expected_hints.len()
             }).unwrap();
 
-        _ = editor.update(cx, |editor, cx| {
-            editor.change_selections(Some(Autoscroll::Next), cx, |s| {
-                s.select_ranges([Point::new(4, 0)..Point::new(4, 0)])
-            });
-        });
+        editor
+            .update(cx, |editor, cx| {
+                editor.change_selections(Some(Autoscroll::Next), cx, |s| {
+                    s.select_ranges([Point::new(4, 0)..Point::new(4, 0)])
+                });
+            })
+            .unwrap();
         cx.executor().run_until_parked();
-        _ = editor.update(cx, |editor, cx| {
+        editor.update(cx, |editor, cx| {
                 let expected_hints = vec![
                     "main hint #0".to_string(),
                     "main hint #1".to_string(),
@@ -2736,18 +2794,19 @@ pub mod tests {
                     "After multibuffer was scrolled to the end, further scrolls up should not bring more hints");
                 assert_eq!(expected_hints, visible_hint_labels(editor, cx));
                 assert_eq!(editor.inlay_hint_cache().version, last_scroll_update_version, "No updates should happen during scrolling already scrolled buffer");
-            });
+            }).unwrap();
 
         editor_edited.store(true, Ordering::Release);
-        _ = editor.update(cx, |editor, cx| {
-            editor.change_selections(None, cx, |s| {
-                // TODO if this gets set to hint boundary (e.g. 56) we sometimes get an extra cache version bump, why?
-                s.select_ranges([Point::new(57, 0)..Point::new(57, 0)])
-            });
-            editor.handle_input("++++more text++++", cx);
-        });
+        editor
+            .update(cx, |editor, cx| {
+                editor.change_selections(None, cx, |s| {
+                    s.select_ranges([Point::new(57, 0)..Point::new(57, 0)])
+                });
+                editor.handle_input("++++more text++++", cx);
+            })
+            .unwrap();
         cx.executor().run_until_parked();
-        _ = editor.update(cx, |editor, cx| {
+        editor.update(cx, |editor, cx| {
             let expected_hints = vec![
                 "main hint(edited) #0".to_string(),
                 "main hint(edited) #1".to_string(),
@@ -2767,12 +2826,13 @@ pub mod tests {
             assert_eq!(expected_hints, visible_hint_labels(editor, cx));
 
             let current_cache_version = editor.inlay_hint_cache().version;
-            assert_eq!(
-                current_cache_version,
-                last_scroll_update_version + expected_hints.len(),
-                "We should have updated cache N times == N of new hints arrived (separately from each excerpt)"
+            let expected_version = last_scroll_update_version + expected_hints.len();
+            assert!(
+                current_cache_version == expected_version || current_cache_version == expected_version + 1 ,
+                // TODO we sometimes get an extra cache version bump, why?
+                "We should have updated cache N times == N of new hints arrived (separately from each excerpt), or hit a bug and do that one extra time"
             );
-        });
+        }).unwrap();
     }
 
     #[gpui::test]
@@ -2929,45 +2989,51 @@ pub mod tests {
             .await;
         cx.executor().run_until_parked();
 
-        _ = editor.update(cx, |editor, cx| {
-            assert_eq!(
-                vec!["main hint #0".to_string(), "other hint #0".to_string()],
-                cached_hint_labels(editor),
-                "Cache should update for both excerpts despite hints display was disabled"
-            );
-            assert!(
+        editor
+            .update(cx, |editor, cx| {
+                assert_eq!(
+                    vec!["main hint #0".to_string(), "other hint #0".to_string()],
+                    cached_hint_labels(editor),
+                    "Cache should update for both excerpts despite hints display was disabled"
+                );
+                assert!(
                 visible_hint_labels(editor, cx).is_empty(),
                 "All hints are disabled and should not be shown despite being present in the cache"
             );
-            assert_eq!(
-                editor.inlay_hint_cache().version,
-                2,
-                "Cache should update once per excerpt query"
-            );
-        });
-
-        _ = editor.update(cx, |editor, cx| {
-            editor.buffer().update(cx, |multibuffer, cx| {
-                multibuffer.remove_excerpts(buffer_2_excerpts, cx)
+                assert_eq!(
+                    editor.inlay_hint_cache().version,
+                    2,
+                    "Cache should update once per excerpt query"
+                );
             })
-        });
+            .unwrap();
+
+        editor
+            .update(cx, |editor, cx| {
+                editor.buffer().update(cx, |multibuffer, cx| {
+                    multibuffer.remove_excerpts(buffer_2_excerpts, cx)
+                })
+            })
+            .unwrap();
         cx.executor().run_until_parked();
-        _ = editor.update(cx, |editor, cx| {
-            assert_eq!(
-                vec!["main hint #0".to_string()],
-                cached_hint_labels(editor),
-                "For the removed excerpt, should clean corresponding cached hints"
-            );
-            assert!(
+        editor
+            .update(cx, |editor, cx| {
+                assert_eq!(
+                    vec!["main hint #0".to_string()],
+                    cached_hint_labels(editor),
+                    "For the removed excerpt, should clean corresponding cached hints"
+                );
+                assert!(
                 visible_hint_labels(editor, cx).is_empty(),
                 "All hints are disabled and should not be shown despite being present in the cache"
             );
-            assert_eq!(
-                editor.inlay_hint_cache().version,
-                3,
-                "Excerpt removal should trigger a cache update"
-            );
-        });
+                assert_eq!(
+                    editor.inlay_hint_cache().version,
+                    3,
+                    "Excerpt removal should trigger a cache update"
+                );
+            })
+            .unwrap();
 
         update_test_language_settings(cx, |settings| {
             settings.defaults.inlay_hints = Some(InlayHintSettings {
@@ -2978,24 +3044,26 @@ pub mod tests {
             })
         });
         cx.executor().run_until_parked();
-        _ = editor.update(cx, |editor, cx| {
-            let expected_hints = vec!["main hint #0".to_string()];
-            assert_eq!(
-                expected_hints,
-                cached_hint_labels(editor),
-                "Hint display settings change should not change the cache"
-            );
-            assert_eq!(
-                expected_hints,
-                visible_hint_labels(editor, cx),
-                "Settings change should make cached hints visible"
-            );
-            assert_eq!(
-                editor.inlay_hint_cache().version,
-                4,
-                "Settings change should trigger a cache update"
-            );
-        });
+        editor
+            .update(cx, |editor, cx| {
+                let expected_hints = vec!["main hint #0".to_string()];
+                assert_eq!(
+                    expected_hints,
+                    cached_hint_labels(editor),
+                    "Hint display settings change should not change the cache"
+                );
+                assert_eq!(
+                    expected_hints,
+                    visible_hint_labels(editor, cx),
+                    "Settings change should make cached hints visible"
+                );
+                assert_eq!(
+                    editor.inlay_hint_cache().version,
+                    4,
+                    "Settings change should trigger a cache update"
+                );
+            })
+            .unwrap();
     }
 
     #[gpui::test]
@@ -3075,18 +3143,22 @@ pub mod tests {
             .await;
 
         cx.executor().run_until_parked();
-        _ = editor.update(cx, |editor, cx| {
-            editor.change_selections(None, cx, |s| {
-                s.select_ranges([Point::new(10, 0)..Point::new(10, 0)])
+        editor
+            .update(cx, |editor, cx| {
+                editor.change_selections(None, cx, |s| {
+                    s.select_ranges([Point::new(10, 0)..Point::new(10, 0)])
+                })
             })
-        });
+            .unwrap();
         cx.executor().run_until_parked();
-        _ = editor.update(cx, |editor, cx| {
-            let expected_hints = vec!["1".to_string()];
-            assert_eq!(expected_hints, cached_hint_labels(editor));
-            assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            assert_eq!(editor.inlay_hint_cache().version, 1);
-        });
+        editor
+            .update(cx, |editor, cx| {
+                let expected_hints = vec!["1".to_string()];
+                assert_eq!(expected_hints, cached_hint_labels(editor));
+                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
+                assert_eq!(editor.inlay_hint_cache().version, 1);
+            })
+            .unwrap();
     }
 
     #[gpui::test]
@@ -3102,9 +3174,11 @@ pub mod tests {
 
         let (file_with_hints, editor, fake_server) = prepare_test_objects(cx).await;
 
-        _ = editor.update(cx, |editor, cx| {
-            editor.toggle_inlay_hints(&crate::ToggleInlayHints, cx)
-        });
+        editor
+            .update(cx, |editor, cx| {
+                editor.toggle_inlay_hints(&crate::ToggleInlayHints, cx)
+            })
+            .unwrap();
         cx.executor().start_waiting();
         let lsp_request_count = Arc::new(AtomicU32::new(0));
         let closure_lsp_request_count = Arc::clone(&lsp_request_count);
@@ -3133,33 +3207,39 @@ pub mod tests {
             .next()
             .await;
         cx.executor().run_until_parked();
-        _ = editor.update(cx, |editor, cx| {
-            let expected_hints = vec!["1".to_string()];
-            assert_eq!(
-                expected_hints,
-                cached_hint_labels(editor),
-                "Should display inlays after toggle despite them disabled in settings"
-            );
-            assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            assert_eq!(
-                editor.inlay_hint_cache().version,
-                1,
-                "First toggle should be cache's first update"
-            );
-        });
+        editor
+            .update(cx, |editor, cx| {
+                let expected_hints = vec!["1".to_string()];
+                assert_eq!(
+                    expected_hints,
+                    cached_hint_labels(editor),
+                    "Should display inlays after toggle despite them disabled in settings"
+                );
+                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
+                assert_eq!(
+                    editor.inlay_hint_cache().version,
+                    1,
+                    "First toggle should be cache's first update"
+                );
+            })
+            .unwrap();
 
-        _ = editor.update(cx, |editor, cx| {
-            editor.toggle_inlay_hints(&crate::ToggleInlayHints, cx)
-        });
+        editor
+            .update(cx, |editor, cx| {
+                editor.toggle_inlay_hints(&crate::ToggleInlayHints, cx)
+            })
+            .unwrap();
         cx.executor().run_until_parked();
-        _ = editor.update(cx, |editor, cx| {
-            assert!(
-                cached_hint_labels(editor).is_empty(),
-                "Should clear hints after 2nd toggle"
-            );
-            assert!(visible_hint_labels(editor, cx).is_empty());
-            assert_eq!(editor.inlay_hint_cache().version, 2);
-        });
+        editor
+            .update(cx, |editor, cx| {
+                assert!(
+                    cached_hint_labels(editor).is_empty(),
+                    "Should clear hints after 2nd toggle"
+                );
+                assert!(visible_hint_labels(editor, cx).is_empty());
+                assert_eq!(editor.inlay_hint_cache().version, 2);
+            })
+            .unwrap();
 
         update_test_language_settings(cx, |settings| {
             settings.defaults.inlay_hints = Some(InlayHintSettings {
@@ -3170,35 +3250,43 @@ pub mod tests {
             })
         });
         cx.executor().run_until_parked();
-        _ = editor.update(cx, |editor, cx| {
-            let expected_hints = vec!["2".to_string()];
-            assert_eq!(
-                expected_hints,
-                cached_hint_labels(editor),
-                "Should query LSP hints for the 2nd time after enabling hints in settings"
-            );
-            assert_eq!(expected_hints, visible_hint_labels(editor, cx));
-            assert_eq!(editor.inlay_hint_cache().version, 3);
-        });
+        editor
+            .update(cx, |editor, cx| {
+                let expected_hints = vec!["2".to_string()];
+                assert_eq!(
+                    expected_hints,
+                    cached_hint_labels(editor),
+                    "Should query LSP hints for the 2nd time after enabling hints in settings"
+                );
+                assert_eq!(expected_hints, visible_hint_labels(editor, cx));
+                assert_eq!(editor.inlay_hint_cache().version, 3);
+            })
+            .unwrap();
 
-        _ = editor.update(cx, |editor, cx| {
-            editor.toggle_inlay_hints(&crate::ToggleInlayHints, cx)
-        });
+        editor
+            .update(cx, |editor, cx| {
+                editor.toggle_inlay_hints(&crate::ToggleInlayHints, cx)
+            })
+            .unwrap();
         cx.executor().run_until_parked();
-        _ = editor.update(cx, |editor, cx| {
-            assert!(
-                cached_hint_labels(editor).is_empty(),
-                "Should clear hints after enabling in settings and a 3rd toggle"
-            );
-            assert!(visible_hint_labels(editor, cx).is_empty());
-            assert_eq!(editor.inlay_hint_cache().version, 4);
-        });
+        editor
+            .update(cx, |editor, cx| {
+                assert!(
+                    cached_hint_labels(editor).is_empty(),
+                    "Should clear hints after enabling in settings and a 3rd toggle"
+                );
+                assert!(visible_hint_labels(editor, cx).is_empty());
+                assert_eq!(editor.inlay_hint_cache().version, 4);
+            })
+            .unwrap();
 
-        _ = editor.update(cx, |editor, cx| {
-            editor.toggle_inlay_hints(&crate::ToggleInlayHints, cx)
-        });
+        editor
+            .update(cx, |editor, cx| {
+                editor.toggle_inlay_hints(&crate::ToggleInlayHints, cx)
+            })
+            .unwrap();
         cx.executor().run_until_parked();
-        _ = editor.update(cx, |editor, cx| {
+        editor.update(cx, |editor, cx| {
             let expected_hints = vec!["3".to_string()];
             assert_eq!(
                 expected_hints,
@@ -3207,7 +3295,7 @@ pub mod tests {
             );
             assert_eq!(expected_hints, visible_hint_labels(editor, cx));
             assert_eq!(editor.inlay_hint_cache().version, 5);
-        });
+        }).unwrap();
     }
 
     pub(crate) fn init_test(cx: &mut TestAppContext, f: impl Fn(&mut AllLanguageSettingsContent)) {
@@ -3258,7 +3346,7 @@ pub mod tests {
         .await;
 
         let project = Project::test(fs, ["/a".as_ref()], cx).await;
-        _ = project.update(cx, |project, _| project.languages().add(Arc::new(language)));
+        project.update(cx, |project, _| project.languages().add(Arc::new(language)));
         let buffer = project
             .update(cx, |project, cx| {
                 project.open_local_buffer("/a/main.rs", cx)
@@ -3270,11 +3358,13 @@ pub mod tests {
         let fake_server = fake_servers.next().await.unwrap();
         let editor = cx.add_window(|cx| Editor::for_buffer(buffer, Some(project), cx));
 
-        _ = editor.update(cx, |editor, cx| {
-            assert!(cached_hint_labels(editor).is_empty());
-            assert!(visible_hint_labels(editor, cx).is_empty());
-            assert_eq!(editor.inlay_hint_cache().version, 0);
-        });
+        editor
+            .update(cx, |editor, cx| {
+                assert!(cached_hint_labels(editor).is_empty());
+                assert!(visible_hint_labels(editor, cx).is_empty());
+                assert_eq!(editor.inlay_hint_cache().version, 0);
+            })
+            .unwrap();
 
         ("/a/main.rs", editor, fake_server)
     }

From ce62404e24e019247538220af42748de28b93038 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Mon, 5 Feb 2024 13:21:07 -0500
Subject: [PATCH 246/372] Correctly use the base element in `HighlightedLabel`
 (#7397)

This PR updates the `HighlightedLabel` to correctly render its base
element, which is the one that receives the styling properties, instead
of rendering a new `LabelLike`.

Release Notes:

- N/A
---
 crates/ui/src/components/label/highlighted_label.rs | 3 +--
 crates/ui/src/components/label/label_like.rs        | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/crates/ui/src/components/label/highlighted_label.rs b/crates/ui/src/components/label/highlighted_label.rs
index 41866bd10a..88174f4895 100644
--- a/crates/ui/src/components/label/highlighted_label.rs
+++ b/crates/ui/src/components/label/highlighted_label.rs
@@ -79,8 +79,7 @@ impl RenderOnce for HighlightedLabel {
         let mut text_style = cx.text_style().clone();
         text_style.color = self.base.color.color(cx);
 
-        LabelLike::new()
-            .size(self.base.size)
+        self.base
             .child(StyledText::new(self.label).with_highlights(&text_style, highlights))
     }
 }
diff --git a/crates/ui/src/components/label/label_like.rs b/crates/ui/src/components/label/label_like.rs
index f08ff1bf83..cddd849b89 100644
--- a/crates/ui/src/components/label/label_like.rs
+++ b/crates/ui/src/components/label/label_like.rs
@@ -36,7 +36,7 @@ pub trait LabelCommon {
 
 #[derive(IntoElement)]
 pub struct LabelLike {
-    pub(crate) size: LabelSize,
+    size: LabelSize,
     line_height_style: LineHeightStyle,
     pub(crate) color: Color,
     strikethrough: bool,

From 21797bad4d939af85b10fba9f615b07cd4cb5f5f Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Mon, 5 Feb 2024 13:26:42 -0500
Subject: [PATCH 247/372] file_finder: Simplify removal of file name from file
 path (#7398)

This PR simplifies the removal of the file name from the file path when
computing the file finder matches.

Release Notes:

- N/A
---
 crates/file_finder/src/file_finder.rs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index d222682e80..521682e6b3 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -584,12 +584,7 @@ impl FileFinderDelegate {
             })
             .collect();
 
-        // Trim file name from the full path
-        let full_path = if full_path.len() > file_name.len() {
-            full_path[..full_path.len() - file_name.len() - 1].to_string()
-        } else {
-            "".to_string()
-        };
+        let full_path = full_path.trim_end_matches(&file_name).to_string();
         path_positions.retain(|idx| *idx < full_path.len());
 
         (file_name, file_name_positions, full_path, path_positions)

From 6863b9263ec31ef20406ae381ab63ce2bf493e7b Mon Sep 17 00:00:00 2001
From: Caius Durling <dev@caius.name>
Date: Mon, 5 Feb 2024 19:38:30 +0000
Subject: [PATCH 248/372] Add Terraform & HCL syntax highlighting (#6882)

Terraform and HCL are almost the same language, but not quite so
proposing them as separate languages within Zed. (Terraform is an
extension of HCL, with a different formatter.)

This is just adding the language definition, parsing and highlighting
functionality, not any LSP or formatting beyond that for either
language.

I've taken a bunch of inspiration from Neovim for having the separate
languages, and also lifted some of their `scm` files (with attribution
comments in this codebase) as the tree-sitter repo doesn't contain them.
(Neovim's code is Apache-2.0 licensed, so should be fine here with
attribution from reading Zed's licenses files.) I've then amended to
make sure the capture groups are named for things Zed understands. I'd
love someone from Zed to confirm that's okay, or if I should clean-room
implement the `scm` files.

Highlighting in Terraform & HCL with a moderate amount of syntax in a
file (Terraform on left, HCL on right.)

<img width="1392" alt="Screenshot 2024-01-31 at 18 07 45"
src="https://github.com/zed-industries/zed/assets/696/1d3c9a08-588e-4b8f-ad92-98ce1e419659">

Release Notes:

- (|Improved) ...
([#5098](https://github.com/zed-industries/zed/issues/5098)).
---
 Cargo.lock                                    |  10 ++
 Cargo.toml                                    |   1 +
 assets/settings/default.json                  |   3 +
 crates/zed/Cargo.toml                         |   1 +
 crates/zed/src/languages.rs                   |   2 +
 crates/zed/src/languages/hcl/config.toml      |  13 ++
 crates/zed/src/languages/hcl/highlights.scm   | 117 +++++++++++++
 crates/zed/src/languages/hcl/indents.scm      |  11 ++
 crates/zed/src/languages/hcl/injections.scm   |   6 +
 .../zed/src/languages/terraform/config.toml   |  13 ++
 .../src/languages/terraform/highlights.scm    | 159 ++++++++++++++++++
 .../zed/src/languages/terraform/indents.scm   |  14 ++
 .../src/languages/terraform/injections.scm    |   9 +
 13 files changed, 359 insertions(+)
 create mode 100644 crates/zed/src/languages/hcl/config.toml
 create mode 100644 crates/zed/src/languages/hcl/highlights.scm
 create mode 100644 crates/zed/src/languages/hcl/indents.scm
 create mode 100644 crates/zed/src/languages/hcl/injections.scm
 create mode 100644 crates/zed/src/languages/terraform/config.toml
 create mode 100644 crates/zed/src/languages/terraform/highlights.scm
 create mode 100644 crates/zed/src/languages/terraform/indents.scm
 create mode 100644 crates/zed/src/languages/terraform/injections.scm

diff --git a/Cargo.lock b/Cargo.lock
index 40d594ff42..ef68faac45 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8876,6 +8876,15 @@ dependencies = [
  "tree-sitter",
 ]
 
+[[package]]
+name = "tree-sitter-hcl"
+version = "0.0.1"
+source = "git+https://github.com/MichaHoffmann/tree-sitter-hcl?rev=v1.1.0#636dbe70301ecbab8f353c8c78b3406fe4f185f5"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
 [[package]]
 name = "tree-sitter-heex"
 version = "0.0.1"
@@ -10394,6 +10403,7 @@ dependencies = [
  "tree-sitter-gomod",
  "tree-sitter-gowork",
  "tree-sitter-haskell",
+ "tree-sitter-hcl",
  "tree-sitter-heex",
  "tree-sitter-html",
  "tree-sitter-json 0.20.0",
diff --git a/Cargo.toml b/Cargo.toml
index edfc968ffb..2676f5b658 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -157,6 +157,7 @@ tree-sitter-go = { git = "https://github.com/tree-sitter/tree-sitter-go", rev =
 tree-sitter-gomod = { git = "https://github.com/camdencheek/tree-sitter-go-mod" }
 tree-sitter-gowork = { git = "https://github.com/d1y/tree-sitter-go-work" }
 tree-sitter-haskell = { git = "https://github.com/tree-sitter/tree-sitter-haskell", rev = "cf98de23e4285b8e6bcb57b050ef2326e2cc284b" }
+tree-sitter-hcl = {git = "https://github.com/MichaHoffmann/tree-sitter-hcl", rev = "v1.1.0"}
 tree-sitter-heex = { git = "https://github.com/phoenixframework/tree-sitter-heex", rev = "2e1348c3cf2c9323e87c2744796cf3f3868aa82a" }
 tree-sitter-html = "0.19.0"
 tree-sitter-json = { git = "https://github.com/tree-sitter/tree-sitter-json", rev = "40a81c01a40ac48744e0c8ccabbaba1920441199" }
diff --git a/assets/settings/default.json b/assets/settings/default.json
index 9387c58f1d..3cb6082991 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -498,6 +498,9 @@
     "JavaScript": {
       "tab_size": 2
     },
+    "Terraform": {
+      "tab_size": 2
+    },
     "TypeScript": {
       "tab_size": 2
     },
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index f3ba0825c7..46025a59bb 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -124,6 +124,7 @@ tree-sitter-go.workspace = true
 tree-sitter-gomod.workspace = true
 tree-sitter-gowork.workspace = true
 tree-sitter-haskell.workspace = true
+tree-sitter-hcl.workspace = true
 tree-sitter-heex.workspace = true
 tree-sitter-html.workspace = true
 tree-sitter-json.workspace = true
diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index 248ff3c7fd..1250aa92c7 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -322,6 +322,8 @@ pub fn init(
         vec![Arc::new(uiua::UiuaLanguageServer {})],
     );
     language("proto", tree_sitter_proto::language(), vec![]);
+    language("terraform", tree_sitter_hcl::language(), vec![]);
+    language("hcl", tree_sitter_hcl::language(), vec![]);
 
     if let Ok(children) = std::fs::read_dir(&*PLUGINS_DIR) {
         for child in children {
diff --git a/crates/zed/src/languages/hcl/config.toml b/crates/zed/src/languages/hcl/config.toml
new file mode 100644
index 0000000000..c7c2ebf6ba
--- /dev/null
+++ b/crates/zed/src/languages/hcl/config.toml
@@ -0,0 +1,13 @@
+name = "HCL"
+path_suffixes = ["hcl"]
+line_comments = ["# ", "// "]
+block_comment = ["/*", "*/"]
+autoclose_before = ",}])"
+brackets = [
+    { start = "{", end = "}", close = true, newline = true },
+    { start = "[", end = "]", close = true, newline = true },
+    { start = "(", end = ")", close = true, newline = true },
+    { start = "\"", end = "\"", close = true, newline = false, not_in = ["comment", "string"] },
+    { start = "'", end = "'", close = true, newline = false, not_in = ["comment", "string"] },
+    { start = "/*", end = " */", close = true, newline = false, not_in = ["comment", "string"] },
+]
diff --git a/crates/zed/src/languages/hcl/highlights.scm b/crates/zed/src/languages/hcl/highlights.scm
new file mode 100644
index 0000000000..a1713b3e3f
--- /dev/null
+++ b/crates/zed/src/languages/hcl/highlights.scm
@@ -0,0 +1,117 @@
+; https://github.com/nvim-treesitter/nvim-treesitter/blob/cb79d2446196d25607eb1d982c96939abdf67b8e/queries/hcl/highlights.scm
+; highlights.scm
+[
+  "!"
+  "\*"
+  "/"
+  "%"
+  "\+"
+  "-"
+  ">"
+  ">="
+  "<"
+  "<="
+  "=="
+  "!="
+  "&&"
+  "||"
+] @operator
+
+[
+  "{"
+  "}"
+  "["
+  "]"
+  "("
+  ")"
+] @punctuation.bracket
+
+[
+  "."
+  ".*"
+  ","
+  "[*]"
+] @punctuation.delimiter
+
+[
+  (ellipsis)
+  "\?"
+  "=>"
+] @punctuation.special
+
+[
+  ":"
+  "="
+] @punctuation
+
+[
+  "for"
+  "endfor"
+  "in"
+  "if"
+  "else"
+  "endif"
+] @keyword
+
+[
+  (quoted_template_start) ; "
+  (quoted_template_end) ; "
+  (template_literal) ; non-interpolation/directive content
+] @string
+
+[
+  (heredoc_identifier) ; END
+  (heredoc_start) ; << or <<-
+] @punctuation.delimiter
+
+[
+  (template_interpolation_start) ; ${
+  (template_interpolation_end) ; }
+  (template_directive_start) ; %{
+  (template_directive_end) ; }
+  (strip_marker) ; ~
+] @punctuation.special
+
+(numeric_lit) @number
+
+(bool_lit) @boolean
+
+(null_lit) @constant
+
+(comment) @comment
+
+(identifier) @variable
+
+(body
+  (block
+    (identifier) @keyword))
+
+(body
+  (block
+    (body
+      (block
+        (identifier) @type))))
+
+(function_call
+  (identifier) @function)
+
+(attribute
+  (identifier) @variable)
+
+; { key: val }
+;
+; highlight identifier keys as though they were block attributes
+(object_elem
+  key:
+    (expression
+      (variable_expr
+        (identifier) @variable)))
+
+; var.foo, data.bar
+;
+; first element in get_attr is a variable.builtin or a reference to a variable.builtin
+(expression
+  (variable_expr
+    (identifier) @variable)
+  (get_attr
+    (identifier) @variable))
diff --git a/crates/zed/src/languages/hcl/indents.scm b/crates/zed/src/languages/hcl/indents.scm
new file mode 100644
index 0000000000..74edb66bdf
--- /dev/null
+++ b/crates/zed/src/languages/hcl/indents.scm
@@ -0,0 +1,11 @@
+; https://github.com/nvim-treesitter/nvim-treesitter/blob/ce4adf11cfe36fc5b0e5bcdce0c7c6e8fbc9798a/queries/hcl/indents.scm
+[
+  (block)
+  (object)
+  (tuple)
+  (function_call)
+] @indent
+
+(_ "[" "]" @end) @indent
+(_ "(" ")" @end) @indent
+(_ "{" "}" @end) @indent
diff --git a/crates/zed/src/languages/hcl/injections.scm b/crates/zed/src/languages/hcl/injections.scm
new file mode 100644
index 0000000000..8617e9fc2e
--- /dev/null
+++ b/crates/zed/src/languages/hcl/injections.scm
@@ -0,0 +1,6 @@
+; https://github.com/nvim-treesitter/nvim-treesitter/blob/ce4adf11cfe36fc5b0e5bcdce0c7c6e8fbc9798a/queries/hcl/injections.scm
+
+(heredoc_template
+  (template_literal) @content
+  (heredoc_identifier) @language
+  (#downcase! @language))
diff --git a/crates/zed/src/languages/terraform/config.toml b/crates/zed/src/languages/terraform/config.toml
new file mode 100644
index 0000000000..9ea5896001
--- /dev/null
+++ b/crates/zed/src/languages/terraform/config.toml
@@ -0,0 +1,13 @@
+name = "Terraform"
+path_suffixes = ["tf", "tfvars"]
+line_comments = ["# ", "// "]
+block_comment = ["/*", "*/"]
+autoclose_before = ",}])"
+brackets = [
+    { start = "{", end = "}", close = true, newline = true },
+    { start = "[", end = "]", close = true, newline = true },
+    { start = "(", end = ")", close = true, newline = true },
+    { start = "\"", end = "\"", close = true, newline = false, not_in = ["comment", "string"] },
+    { start = "'", end = "'", close = true, newline = false, not_in = ["comment", "string"] },
+    { start = "/*", end = " */", close = true, newline = false, not_in = ["comment", "string"] },
+]
diff --git a/crates/zed/src/languages/terraform/highlights.scm b/crates/zed/src/languages/terraform/highlights.scm
new file mode 100644
index 0000000000..f123c3232d
--- /dev/null
+++ b/crates/zed/src/languages/terraform/highlights.scm
@@ -0,0 +1,159 @@
+; https://github.com/nvim-treesitter/nvim-treesitter/blob/cb79d2446196d25607eb1d982c96939abdf67b8e/queries/hcl/highlights.scm
+; highlights.scm
+[
+  "!"
+  "\*"
+  "/"
+  "%"
+  "\+"
+  "-"
+  ">"
+  ">="
+  "<"
+  "<="
+  "=="
+  "!="
+  "&&"
+  "||"
+] @operator
+
+[
+  "{"
+  "}"
+  "["
+  "]"
+  "("
+  ")"
+] @punctuation.bracket
+
+[
+  "."
+  ".*"
+  ","
+  "[*]"
+] @punctuation.delimiter
+
+[
+  (ellipsis)
+  "\?"
+  "=>"
+] @punctuation.special
+
+[
+  ":"
+  "="
+] @punctuation
+
+[
+  "for"
+  "endfor"
+  "in"
+  "if"
+  "else"
+  "endif"
+] @keyword
+
+[
+  (quoted_template_start) ; "
+  (quoted_template_end) ; "
+  (template_literal) ; non-interpolation/directive content
+] @string
+
+[
+  (heredoc_identifier) ; END
+  (heredoc_start) ; << or <<-
+] @punctuation.delimiter
+
+[
+  (template_interpolation_start) ; ${
+  (template_interpolation_end) ; }
+  (template_directive_start) ; %{
+  (template_directive_end) ; }
+  (strip_marker) ; ~
+] @punctuation.special
+
+(numeric_lit) @number
+
+(bool_lit) @boolean
+
+(null_lit) @constant
+
+(comment) @comment
+
+(identifier) @variable
+
+(body
+  (block
+    (identifier) @keyword))
+
+(body
+  (block
+    (body
+      (block
+        (identifier) @type))))
+
+(function_call
+  (identifier) @function)
+
+(attribute
+  (identifier) @variable)
+
+; { key: val }
+;
+; highlight identifier keys as though they were block attributes
+(object_elem
+  key:
+    (expression
+      (variable_expr
+        (identifier) @variable)))
+
+; var.foo, data.bar
+;
+; first element in get_attr is a variable.builtin or a reference to a variable.builtin
+(expression
+  (variable_expr
+    (identifier) @variable)
+  (get_attr
+    (identifier) @variable))
+
+; https://github.com/nvim-treesitter/nvim-treesitter/blob/cb79d2446196d25607eb1d982c96939abdf67b8e/queries/terraform/highlights.scm
+; Terraform specific references
+;
+;
+; local/module/data/var/output
+(expression
+  (variable_expr
+    (identifier) @variable
+    (#any-of? @variable "data" "var" "local" "module" "output"))
+  (get_attr
+    (identifier) @variable))
+
+; path.root/cwd/module
+(expression
+  (variable_expr
+    (identifier) @type
+    (#eq? @type "path"))
+  (get_attr
+    (identifier) @variable
+    (#any-of? @variable "root" "cwd" "module")))
+
+; terraform.workspace
+(expression
+  (variable_expr
+    (identifier) @type
+    (#eq? @type "terraform"))
+  (get_attr
+    (identifier) @variable
+    (#any-of? @variable "workspace")))
+
+; Terraform specific keywords
+; FIXME: ideally only for identifiers under a `variable` block to minimize false positives
+((identifier) @type
+  (#any-of? @type "bool" "string" "number" "object" "tuple" "list" "map" "set" "any"))
+
+(object_elem
+  val:
+    (expression
+      (variable_expr
+        (identifier) @type
+        (#any-of? @type "bool" "string" "number" "object" "tuple" "list" "map" "set" "any"))))
diff --git a/crates/zed/src/languages/terraform/indents.scm b/crates/zed/src/languages/terraform/indents.scm
new file mode 100644
index 0000000000..95ad93df1d
--- /dev/null
+++ b/crates/zed/src/languages/terraform/indents.scm
@@ -0,0 +1,14 @@
+; https://github.com/nvim-treesitter/nvim-treesitter/blob/ce4adf11cfe36fc5b0e5bcdce0c7c6e8fbc9798a/queries/hcl/indents.scm
+[
+  (block)
+  (object)
+  (tuple)
+  (function_call)
+] @indent
+
+(_ "[" "]" @end) @indent
+(_ "(" ")" @end) @indent
+(_ "{" "}" @end) @indent
+
+; https://github.com/nvim-treesitter/nvim-treesitter/blob/ce4adf11cfe36fc5b0e5bcdce0c7c6e8fbc9798a/queries/terraform/indents.scm
+; inherits: hcl
diff --git a/crates/zed/src/languages/terraform/injections.scm b/crates/zed/src/languages/terraform/injections.scm
new file mode 100644
index 0000000000..b41ee95d40
--- /dev/null
+++ b/crates/zed/src/languages/terraform/injections.scm
@@ -0,0 +1,9 @@
+; https://github.com/nvim-treesitter/nvim-treesitter/blob/ce4adf11cfe36fc5b0e5bcdce0c7c6e8fbc9798a/queries/hcl/injections.scm
+
+(heredoc_template
+  (template_literal) @content
+  (heredoc_identifier) @language
+  (#downcase! @language))
+
+; https://github.com/nvim-treesitter/nvim-treesitter/blob/ce4adf11cfe36fc5b0e5bcdce0c7c6e8fbc9798a/queries/terraform/injections.scm
+; inherits: hcl

From 28a62affe4c0bc50c0ca6189776bfbd3f8871dea Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Mon, 5 Feb 2024 22:03:44 +0200
Subject: [PATCH 249/372] Clean up visible inlay hints that got removed from
 the cache (#7399)

Fixes another flack in the inlay hint cache.
Now that test does not fail after 500 iterations and seems to be stable
at last.

Release Notes:

- N/A
---
 crates/editor/src/inlay_hint_cache.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/crates/editor/src/inlay_hint_cache.rs b/crates/editor/src/inlay_hint_cache.rs
index 1f34bdde20..bc90b6face 100644
--- a/crates/editor/src/inlay_hint_cache.rs
+++ b/crates/editor/src/inlay_hint_cache.rs
@@ -78,7 +78,7 @@ pub(super) enum InvalidationStrategy {
 /// "Visible" inlays may not be displayed in the buffer right away, but those are ready to be displayed on further buffer scroll, pane item activations, etc. right away without additional LSP queries or settings changes.
 /// The data in the cache is never used directly for displaying inlays on the screen, to avoid races with updates from LSP queries and sync overhead.
 /// Splice is picked to help avoid extra hint flickering and "jumps" on the screen.
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub(super) struct InlaySplice {
     pub to_remove: Vec<InlayId>,
     pub to_insert: Vec<Inlay>,
@@ -87,7 +87,7 @@ pub(super) struct InlaySplice {
 #[derive(Debug)]
 struct ExcerptHintsUpdate {
     excerpt_id: ExcerptId,
-    remove_from_visible: Vec<InlayId>,
+    remove_from_visible: HashSet<InlayId>,
     remove_from_cache: HashSet<InlayId>,
     add_to_cache: Vec<InlayHint>,
 }
@@ -1052,7 +1052,7 @@ fn calculate_hint_updates(
         }
     }
 
-    let mut remove_from_visible = Vec::new();
+    let mut remove_from_visible = HashSet::default();
     let mut remove_from_cache = HashSet::default();
     if invalidate {
         remove_from_visible.extend(
@@ -1074,6 +1074,7 @@ fn calculate_hint_updates(
                     })
                     .copied(),
             );
+            remove_from_visible.extend(remove_from_cache.iter().cloned());
         }
     }
 
@@ -1135,10 +1136,8 @@ fn apply_hint_update(
     cached_excerpt_hints
         .hints_by_id
         .retain(|hint_id, _| !new_update.remove_from_cache.contains(hint_id));
-    let mut splice = InlaySplice {
-        to_remove: new_update.remove_from_visible,
-        to_insert: Vec::new(),
-    };
+    let mut splice = InlaySplice::default();
+    splice.to_remove.extend(new_update.remove_from_visible);
     for new_hint in new_update.add_to_cache {
         let insert_position = match cached_excerpt_hints
             .ordered_hints

From 46464ebe87057d46175c8baf813fd20c91a72717 Mon Sep 17 00:00:00 2001
From: N8th8n8el <nathanael97@protonmail.com>
Date: Mon, 5 Feb 2024 21:06:43 +0100
Subject: [PATCH 250/372] terminal: Fix copy to clipboard lag (#7323)

Fixes #7322

Release Notes:

- Fixed terminal's copy to clipboard being non-instant ([7322](https://github.com/zed-industries/zed/issues/7322))
---
 crates/terminal_view/src/terminal_view.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index 6c7270d9b4..006ffb9d79 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -478,7 +478,8 @@ impl TerminalView {
 
     ///Attempt to paste the clipboard into the terminal
     fn copy(&mut self, _: &Copy, cx: &mut ViewContext<Self>) {
-        self.terminal.update(cx, |term, _| term.copy())
+        self.terminal.update(cx, |term, _| term.copy());
+        cx.notify();
     }
 
     ///Attempt to paste the clipboard into the terminal

From b59f92593386ce58ae9df03ad66a089d313d6ecf Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Mon, 5 Feb 2024 22:26:56 +0200
Subject: [PATCH 251/372] Upgrade GH actions to reduce CI warnings (#7403)

Deals with one of the warnings GH shows on our actions run:

https://github.com/zed-industries/zed/actions/runs/7790218555
<img width="1383" alt="image"
src="https://github.com/zed-industries/zed/assets/2690773/e523ec7c-bf43-4b0d-8c36-8540aef6fae9">

bufbuild/* actions seem to have no new major versions so there's nothing
new to upgrade to.

Release Notes:

- N/A
---
 .github/actions/check_style/action.yml |  46 ++---
 .github/actions/run_tests/action.yml   |   2 +-
 .github/workflows/ci.yml               | 262 ++++++++++++-------------
 .github/workflows/danger.yml           |  50 ++---
 .github/workflows/randomized_tests.yml |  52 ++---
 .github/workflows/release_nightly.yml  |   2 +-
 6 files changed, 207 insertions(+), 207 deletions(-)

diff --git a/.github/actions/check_style/action.yml b/.github/actions/check_style/action.yml
index d4e5d62f2c..39601e8c25 100644
--- a/.github/actions/check_style/action.yml
+++ b/.github/actions/check_style/action.yml
@@ -2,29 +2,29 @@ name: "Check formatting"
 description: "Checks code formatting use cargo fmt"
 
 runs:
-  using: "composite"
-  steps:
-    - name: cargo fmt
-      shell: bash -euxo pipefail {0}
-      run: cargo fmt --all -- --check
+    using: "composite"
+    steps:
+        - name: cargo fmt
+          shell: bash -euxo pipefail {0}
+          run: cargo fmt --all -- --check
 
-    - name: cargo clippy
-      shell: bash -euxo pipefail {0}
-      # clippy.toml is not currently supporting specifying allowed lints
-      # so specify those here, and disable the rest until Zed's workspace
-      # will have more fixes & suppression for the standard lint set
-      run: |
-        cargo clippy --release --workspace --all-features --all-targets -- -A clippy::all -D clippy::dbg_macro -D clippy::todo
-        cargo clippy -p gpui
+        - name: cargo clippy
+          shell: bash -euxo pipefail {0}
+          # clippy.toml is not currently supporting specifying allowed lints
+          # so specify those here, and disable the rest until Zed's workspace
+          # will have more fixes & suppression for the standard lint set
+          run: |
+              cargo clippy --release --workspace --all-features --all-targets -- -A clippy::all -D clippy::dbg_macro -D clippy::todo
+              cargo clippy -p gpui
 
-    - name: Find modified migrations
-      shell: bash -euxo pipefail {0}
-      run: |
-        export SQUAWK_GITHUB_TOKEN=${{ github.token }}
-        . ./script/squawk
+        - name: Find modified migrations
+          shell: bash -euxo pipefail {0}
+          run: |
+              export SQUAWK_GITHUB_TOKEN=${{ github.token }}
+              . ./script/squawk
 
-    - uses: bufbuild/buf-setup-action@v1
-    - uses: bufbuild/buf-breaking-action@v1
-      with:
-        input: "crates/rpc/proto/"
-        against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=main,subdir=crates/rpc/proto/"
+        - uses: bufbuild/buf-setup-action@v1
+        - uses: bufbuild/buf-breaking-action@v1
+          with:
+              input: "crates/rpc/proto/"
+              against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=main,subdir=crates/rpc/proto/"
diff --git a/.github/actions/run_tests/action.yml b/.github/actions/run_tests/action.yml
index 4e6664a6fb..a37c2759d6 100644
--- a/.github/actions/run_tests/action.yml
+++ b/.github/actions/run_tests/action.yml
@@ -10,7 +10,7 @@ runs:
               cargo install cargo-nextest
 
         - name: Install Node
-          uses: actions/setup-node@v3
+          uses: actions/setup-node@v4
           with:
               node-version: "18"
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9d8cf6522e..8ad9f57fd1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,149 +1,149 @@
 name: CI
 
 on:
-  push:
-    branches:
-      - main
-      - "v[0-9]+.[0-9]+.x"
-    tags:
-      - "v*"
-  pull_request:
-    branches:
-      - "**"
+    push:
+        branches:
+            - main
+            - "v[0-9]+.[0-9]+.x"
+        tags:
+            - "v*"
+    pull_request:
+        branches:
+            - "**"
 
 concurrency:
-  # Allow only one workflow per any non-`main` branch.
-  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }}
-  cancel-in-progress: true
+    # Allow only one workflow per any non-`main` branch.
+    group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }}
+    cancel-in-progress: true
 
 env:
-  CARGO_TERM_COLOR: always
-  CARGO_INCREMENTAL: 0
-  RUST_BACKTRACE: 1
+    CARGO_TERM_COLOR: always
+    CARGO_INCREMENTAL: 0
+    RUST_BACKTRACE: 1
 
 jobs:
-  style:
-    name: Check formatting, Clippy lints, and spelling
-    runs-on:
-      - self-hosted
-      - test
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: "recursive"
-          fetch-depth: 0
+    style:
+        name: Check formatting, Clippy lints, and spelling
+        runs-on:
+            - self-hosted
+            - test
+        steps:
+            - name: Checkout repo
+              uses: actions/checkout@v4
+              with:
+                  clean: false
+                  submodules: "recursive"
+                  fetch-depth: 0
 
-      - name: Set up default .cargo/config.toml
-        run: cp ./.cargo/ci-config.toml ~/.cargo/config.toml
+            - name: Set up default .cargo/config.toml
+              run: cp ./.cargo/ci-config.toml ~/.cargo/config.toml
 
-      - name: Check spelling
-        run: |
-          if ! which typos > /dev/null; then
-            cargo install typos-cli
-          fi
-          typos
+            - name: Check spelling
+              run: |
+                  if ! which typos > /dev/null; then
+                    cargo install typos-cli
+                  fi
+                  typos
 
-      - name: Run style checks
-        uses: ./.github/actions/check_style
+            - name: Run style checks
+              uses: ./.github/actions/check_style
 
-  tests:
-    name: Run tests
-    runs-on:
-      - self-hosted
-      - test
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: "recursive"
+    tests:
+        name: Run tests
+        runs-on:
+            - self-hosted
+            - test
+        steps:
+            - name: Checkout repo
+              uses: actions/checkout@v4
+              with:
+                  clean: false
+                  submodules: "recursive"
 
-      - name: Run tests
-        uses: ./.github/actions/run_tests
+            - name: Run tests
+              uses: ./.github/actions/run_tests
 
-      - name: Build collab
-        run: cargo build -p collab
+            - name: Build collab
+              run: cargo build -p collab
 
-      - name: Build other binaries
-        run: cargo build --workspace --bins --all-features
+            - name: Build other binaries
+              run: cargo build --workspace --bins --all-features
 
-  bundle:
-    name: Bundle app
-    runs-on:
-      - self-hosted
-      - bundle
-    if: ${{ startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'run-build-dmg') }}
-    needs: tests
-    env:
-      MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
-      MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
-      APPLE_NOTARIZATION_USERNAME: ${{ secrets.APPLE_NOTARIZATION_USERNAME }}
-      APPLE_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-    steps:
-      - name: Install Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: "18"
-
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: "recursive"
-
-      - name: Limit target directory size
-        run: script/clear-target-dir-if-larger-than 100
-
-      - name: Determine version and release channel
-        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
-        run: |
-          set -eu
-
-          version=$(script/get-crate-version zed)
-          channel=$(cat crates/zed/RELEASE_CHANNEL)
-          echo "Publishing version: ${version} on release channel ${channel}"
-          echo "RELEASE_CHANNEL=${channel}" >> $GITHUB_ENV
-
-          expected_tag_name=""
-          case ${channel} in
-            stable)
-              expected_tag_name="v${version}";;
-            preview)
-              expected_tag_name="v${version}-pre";;
-            nightly)
-              expected_tag_name="v${version}-nightly";;
-            *)
-              echo "can't publish a release on channel ${channel}"
-              exit 1;;
-          esac
-          if [[ $GITHUB_REF_NAME != $expected_tag_name ]]; then
-            echo "invalid release tag ${GITHUB_REF_NAME}. expected ${expected_tag_name}"
-            exit 1
-          fi
-
-      - name: Generate license file
-        run: script/generate-licenses
-
-      - name: Create app bundle
-        run: script/bundle
-
-      - name: Upload app bundle to workflow run if main branch or specific label
-        uses: actions/upload-artifact@v3
-        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-build-dmg') }}
-        with:
-          name: Zed_${{ github.event.pull_request.head.sha || github.sha }}.dmg
-          path: target/release/Zed.dmg
-
-      - uses: softprops/action-gh-release@v1
-        name: Upload app bundle to release
-        if: ${{ env.RELEASE_CHANNEL == 'preview' || env.RELEASE_CHANNEL == 'stable' }}
-        with:
-          draft: true
-          prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}
-          files: target/release/Zed.dmg
-          body: ""
+    bundle:
+        name: Bundle app
+        runs-on:
+            - self-hosted
+            - bundle
+        if: ${{ startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'run-build-dmg') }}
+        needs: tests
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
+            MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
+            APPLE_NOTARIZATION_USERNAME: ${{ secrets.APPLE_NOTARIZATION_USERNAME }}
+            APPLE_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
+            ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
+        steps:
+            - name: Install Node
+              uses: actions/setup-node@v4
+              with:
+                  node-version: "18"
+
+            - name: Checkout repo
+              uses: actions/checkout@v4
+              with:
+                  clean: false
+                  submodules: "recursive"
+
+            - name: Limit target directory size
+              run: script/clear-target-dir-if-larger-than 100
+
+            - name: Determine version and release channel
+              if: ${{ startsWith(github.ref, 'refs/tags/v') }}
+              run: |
+                  set -eu
+
+                  version=$(script/get-crate-version zed)
+                  channel=$(cat crates/zed/RELEASE_CHANNEL)
+                  echo "Publishing version: ${version} on release channel ${channel}"
+                  echo "RELEASE_CHANNEL=${channel}" >> $GITHUB_ENV
+
+                  expected_tag_name=""
+                  case ${channel} in
+                    stable)
+                      expected_tag_name="v${version}";;
+                    preview)
+                      expected_tag_name="v${version}-pre";;
+                    nightly)
+                      expected_tag_name="v${version}-nightly";;
+                    *)
+                      echo "can't publish a release on channel ${channel}"
+                      exit 1;;
+                  esac
+                  if [[ $GITHUB_REF_NAME != $expected_tag_name ]]; then
+                    echo "invalid release tag ${GITHUB_REF_NAME}. expected ${expected_tag_name}"
+                    exit 1
+                  fi
+
+            - name: Generate license file
+              run: script/generate-licenses
+
+            - name: Create app bundle
+              run: script/bundle
+
+            - name: Upload app bundle to workflow run if main branch or specific label
+              uses: actions/upload-artifact@v3
+              if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-build-dmg') }}
+              with:
+                  name: Zed_${{ github.event.pull_request.head.sha || github.sha }}.dmg
+                  path: target/release/Zed.dmg
+
+            - uses: softprops/action-gh-release@v1
+              name: Upload app bundle to release
+              if: ${{ env.RELEASE_CHANNEL == 'preview' || env.RELEASE_CHANNEL == 'stable' }}
+              with:
+                  draft: true
+                  prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}
+                  files: target/release/Zed.dmg
+                  body: ""
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
index 92d73171ea..ac04d3dfa2 100644
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -1,35 +1,35 @@
 name: Danger
 
 on:
-  pull_request:
-    branches: [main]
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - edited
+    pull_request:
+        branches: [main]
+        types:
+            - opened
+            - synchronize
+            - reopened
+            - edited
 
 jobs:
-  danger:
-    runs-on: ubuntu-latest
+    danger:
+        runs-on: ubuntu-latest
 
-    steps:
-      - uses: actions/checkout@v4
+        steps:
+            - uses: actions/checkout@v4
 
-      - uses: pnpm/action-setup@v2.2.4
-        with:
-          version: 8
+            - uses: pnpm/action-setup@v2.2.4
+              with:
+                  version: 8
 
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: "20"
-          cache: "pnpm"
-          cache-dependency-path: "script/danger/pnpm-lock.yaml"
+            - name: Setup Node
+              uses: actions/setup-node@v4
+              with:
+                  node-version: "20"
+                  cache: "pnpm"
+                  cache-dependency-path: "script/danger/pnpm-lock.yaml"
 
-      - run: pnpm install --dir script/danger
+            - run: pnpm install --dir script/danger
 
-      - name: Run Danger
-        run: pnpm run --dir script/danger danger ci
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
+            - name: Run Danger
+              run: pnpm run --dir script/danger danger ci
+              env:
+                  GITHUB_TOKEN: ${{ github.token }}
diff --git a/.github/workflows/randomized_tests.yml b/.github/workflows/randomized_tests.yml
index b629b1a806..3b41a9fef2 100644
--- a/.github/workflows/randomized_tests.yml
+++ b/.github/workflows/randomized_tests.yml
@@ -3,35 +3,35 @@ name: Randomized Tests
 concurrency: randomized-tests
 
 on:
-  push:
-    branches:
-      - randomized-tests-runner
-  # schedule:
-  #    - cron: '0 * * * *'
+    push:
+        branches:
+            - randomized-tests-runner
+    # schedule:
+    #    - cron: '0 * * * *'
 
 env:
-  CARGO_TERM_COLOR: always
-  CARGO_INCREMENTAL: 0
-  RUST_BACKTRACE: 1
-  ZED_SERVER_URL: https://zed.dev
+    CARGO_TERM_COLOR: always
+    CARGO_INCREMENTAL: 0
+    RUST_BACKTRACE: 1
+    ZED_SERVER_URL: https://zed.dev
 
 jobs:
-  tests:
-    name: Run randomized tests
-    runs-on:
-      - self-hosted
-      - randomized-tests
-    steps:
-      - name: Install Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: "18"
+    tests:
+        name: Run randomized tests
+        runs-on:
+            - self-hosted
+            - randomized-tests
+        steps:
+            - name: Install Node
+              uses: actions/setup-node@v4
+              with:
+                  node-version: "18"
 
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          clean: false
-          submodules: "recursive"
+            - name: Checkout repo
+              uses: actions/checkout@v4
+              with:
+                  clean: false
+                  submodules: "recursive"
 
-      - name: Run randomized tests
-        run: script/randomized-test-ci
+            - name: Run randomized tests
+              run: script/randomized-test-ci
diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
index b7221c97fd..c9b4097265 100644
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -65,7 +65,7 @@ jobs:
             ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
         steps:
             - name: Install Node
-              uses: actions/setup-node@v3
+              uses: actions/setup-node@v4
               with:
                   node-version: "18"
 

From a80a3b8706b83e70476ed4a89252b3324edfb391 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Mon, 5 Feb 2024 15:39:01 -0500
Subject: [PATCH 252/372] Add support for specifying both light and dark themes
 in `settings.json` (#7404)

This PR adds support for configuring both a light and dark theme in
`settings.json`.

In addition to accepting just a theme name, the `theme` field now also
accepts an object in the following form:

```jsonc
{
  "theme": {
    "mode": "system",
    "light": "One Light",
    "dark": "One Dark"
  }
}
```

Both `light` and `dark` are required, and indicate which theme should be
used when the system is in light mode and dark mode, respectively.

The `mode` field is optional and indicates which theme should be used:
- `"system"` - Use the theme that corresponds to the system's
appearance.
- `"light"` - Use the theme indicated by the `light` field.
- `"dark"` - Use the theme indicated by the `dark` field.

Thank you to @Yesterday17 for taking a first stab at this in #6881!

Release Notes:

- Added support for configuring both a light and dark theme and
switching between them based on system preference.
---
 .../incoming_call_notification.rs             |   4 +-
 .../project_shared_notification.rs            |   4 +-
 crates/theme/src/settings.rs                  | 112 ++++++++++++++++--
 crates/theme/src/theme.rs                     |  11 +-
 crates/theme_selector/src/theme_selector.rs   |  24 +++-
 crates/workspace/src/workspace.rs             |  19 ++-
 crates/zed/src/main.rs                        |  17 ++-
 7 files changed, 167 insertions(+), 24 deletions(-)

diff --git a/crates/collab_ui/src/notifications/incoming_call_notification.rs b/crates/collab_ui/src/notifications/incoming_call_notification.rs
index f66194c52a..12662fe6cb 100644
--- a/crates/collab_ui/src/notifications/incoming_call_notification.rs
+++ b/crates/collab_ui/src/notifications/incoming_call_notification.rs
@@ -5,7 +5,7 @@ use futures::StreamExt;
 use gpui::{prelude::*, AppContext, WindowHandle};
 use settings::Settings;
 use std::sync::{Arc, Weak};
-use theme::ThemeSettings;
+use theme::{SystemAppearance, ThemeSettings};
 use ui::{prelude::*, Button, Label};
 use util::ResultExt;
 use workspace::AppState;
@@ -35,6 +35,8 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) {
                     let options = notification_window_options(screen, window_size);
                     let window = cx
                         .open_window(options, |cx| {
+                            SystemAppearance::init_for_window(cx);
+
                             cx.new_view(|_| {
                                 IncomingCallNotification::new(
                                     incoming_call.clone(),
diff --git a/crates/collab_ui/src/notifications/project_shared_notification.rs b/crates/collab_ui/src/notifications/project_shared_notification.rs
index b8ceefcd76..bb70fc9571 100644
--- a/crates/collab_ui/src/notifications/project_shared_notification.rs
+++ b/crates/collab_ui/src/notifications/project_shared_notification.rs
@@ -6,7 +6,7 @@ use collections::HashMap;
 use gpui::{AppContext, Size};
 use settings::Settings;
 use std::sync::{Arc, Weak};
-use theme::ThemeSettings;
+use theme::{SystemAppearance, ThemeSettings};
 use ui::{prelude::*, Button, Label};
 use workspace::AppState;
 
@@ -28,6 +28,8 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) {
             for screen in cx.displays() {
                 let options = notification_window_options(screen, window_size);
                 let window = cx.open_window(options, |cx| {
+                    SystemAppearance::init_for_window(cx);
+
                     cx.new_view(|_| {
                         ProjectSharedNotification::new(
                             owner.clone(),
diff --git a/crates/theme/src/settings.rs b/crates/theme/src/settings.rs
index f7157fa139..17404d7c67 100644
--- a/crates/theme/src/settings.rs
+++ b/crates/theme/src/settings.rs
@@ -1,9 +1,10 @@
 use crate::one_themes::one_dark;
-use crate::{SyntaxTheme, Theme, ThemeRegistry, ThemeStyleContent};
+use crate::{Appearance, SyntaxTheme, Theme, ThemeRegistry, ThemeStyleContent};
 use anyhow::Result;
+use derive_more::{Deref, DerefMut};
 use gpui::{
     px, AppContext, Font, FontFeatures, FontStyle, FontWeight, Global, Pixels, Subscription,
-    ViewContext,
+    ViewContext, WindowContext,
 };
 use refineable::Refineable;
 use schemars::{
@@ -27,16 +28,104 @@ pub struct ThemeSettings {
     pub buffer_font: Font,
     pub buffer_font_size: Pixels,
     pub buffer_line_height: BufferLineHeight,
-    pub requested_theme: Option<String>,
+    pub theme_selection: Option<ThemeSelection>,
     pub active_theme: Arc<Theme>,
     pub theme_overrides: Option<ThemeStyleContent>,
 }
 
+/// The appearance of the system.
+#[derive(Debug, Clone, Copy, Deref)]
+pub struct SystemAppearance(pub Appearance);
+
+impl Default for SystemAppearance {
+    fn default() -> Self {
+        Self(Appearance::Dark)
+    }
+}
+
+#[derive(Deref, DerefMut, Default)]
+struct GlobalSystemAppearance(SystemAppearance);
+
+impl Global for GlobalSystemAppearance {}
+
+impl SystemAppearance {
+    /// Returns the global [`SystemAppearance`].
+    ///
+    /// Inserts a default [`SystemAppearance`] if one does not yet exist.
+    pub(crate) fn default_global(cx: &mut AppContext) -> Self {
+        cx.default_global::<GlobalSystemAppearance>().0
+    }
+
+    /// Initializes the [`SystemAppearance`] for the current window.
+    pub fn init_for_window(cx: &mut WindowContext) {
+        *cx.default_global::<GlobalSystemAppearance>() =
+            GlobalSystemAppearance(SystemAppearance(cx.appearance().into()));
+    }
+
+    /// Returns the global [`SystemAppearance`].
+    pub fn global(cx: &AppContext) -> Self {
+        cx.global::<GlobalSystemAppearance>().0
+    }
+
+    /// Returns a mutable reference to the global [`SystemAppearance`].
+    pub fn global_mut(cx: &mut AppContext) -> &mut Self {
+        cx.global_mut::<GlobalSystemAppearance>()
+    }
+}
+
 #[derive(Default)]
 pub(crate) struct AdjustedBufferFontSize(Pixels);
 
 impl Global for AdjustedBufferFontSize {}
 
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[serde(untagged)]
+pub enum ThemeSelection {
+    Static(#[schemars(schema_with = "theme_name_ref")] String),
+    Dynamic {
+        #[serde(default)]
+        mode: ThemeMode,
+        #[schemars(schema_with = "theme_name_ref")]
+        light: String,
+        #[schemars(schema_with = "theme_name_ref")]
+        dark: String,
+    },
+}
+
+fn theme_name_ref(_: &mut SchemaGenerator) -> Schema {
+    Schema::new_ref("#/definitions/ThemeName".into())
+}
+
+#[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum ThemeMode {
+    /// Use the specified `light` theme.
+    Light,
+
+    /// Use the specified `dark` theme.
+    Dark,
+
+    /// Use the theme based on the system's appearance.
+    #[default]
+    System,
+}
+
+impl ThemeSelection {
+    pub fn theme(&self, system_appearance: Appearance) -> &str {
+        match self {
+            Self::Static(theme) => theme,
+            Self::Dynamic { mode, light, dark } => match mode {
+                ThemeMode::Light => light,
+                ThemeMode::Dark => dark,
+                ThemeMode::System => match system_appearance {
+                    Appearance::Light => light,
+                    Appearance::Dark => dark,
+                },
+            },
+        }
+    }
+}
+
 #[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema)]
 pub struct ThemeSettingsContent {
     #[serde(default)]
@@ -54,7 +143,7 @@ pub struct ThemeSettingsContent {
     #[serde(default)]
     pub buffer_font_features: Option<FontFeatures>,
     #[serde(default)]
-    pub theme: Option<String>,
+    pub theme: Option<ThemeSelection>,
 
     /// EXPERIMENTAL: Overrides for the current theme.
     ///
@@ -188,6 +277,7 @@ impl settings::Settings for ThemeSettings {
         cx: &mut AppContext,
     ) -> Result<Self> {
         let themes = ThemeRegistry::default_global(cx);
+        let system_appearance = SystemAppearance::default_global(cx);
 
         let mut this = Self {
             ui_font_size: defaults.ui_font_size.unwrap().into(),
@@ -205,9 +295,9 @@ impl settings::Settings for ThemeSettings {
             },
             buffer_font_size: defaults.buffer_font_size.unwrap().into(),
             buffer_line_height: defaults.buffer_line_height.unwrap(),
-            requested_theme: defaults.theme.clone(),
+            theme_selection: defaults.theme.clone(),
             active_theme: themes
-                .get(defaults.theme.as_ref().unwrap())
+                .get(defaults.theme.as_ref().unwrap().theme(*system_appearance))
                 .or(themes.get(&one_dark().name))
                 .unwrap(),
             theme_overrides: None,
@@ -229,9 +319,11 @@ impl settings::Settings for ThemeSettings {
             }
 
             if let Some(value) = &value.theme {
-                this.requested_theme = Some(value.clone());
+                this.theme_selection = Some(value.clone());
 
-                if let Some(theme) = themes.get(value).log_err() {
+                let theme_name = value.theme(*system_appearance);
+
+                if let Some(theme) = themes.get(theme_name).log_err() {
                     this.active_theme = theme;
                 }
             }
@@ -291,10 +383,6 @@ impl settings::Settings for ThemeSettings {
             .unwrap()
             .properties
             .extend([
-                (
-                    "theme".to_owned(),
-                    Schema::new_ref("#/definitions/ThemeName".into()),
-                ),
                 (
                     "buffer_font_family".to_owned(),
                     Schema::new_ref("#/definitions/FontFamilies".into()),
diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs
index 8161217c8f..14cddafa7a 100644
--- a/crates/theme/src/theme.rs
+++ b/crates/theme/src/theme.rs
@@ -27,7 +27,7 @@ pub use schema::*;
 pub use settings::*;
 pub use styles::*;
 
-use gpui::{AppContext, AssetSource, Hsla, SharedString};
+use gpui::{AppContext, AssetSource, Hsla, SharedString, WindowAppearance};
 use serde::Deserialize;
 
 #[derive(Debug, PartialEq, Clone, Copy, Deserialize)]
@@ -45,6 +45,15 @@ impl Appearance {
     }
 }
 
+impl From<WindowAppearance> for Appearance {
+    fn from(value: WindowAppearance) -> Self {
+        match value {
+            WindowAppearance::Dark | WindowAppearance::VibrantDark => Self::Dark,
+            WindowAppearance::Light | WindowAppearance::VibrantLight => Self::Light,
+        }
+    }
+}
+
 pub enum LoadThemes {
     /// Only load the base theme.
     ///
diff --git a/crates/theme_selector/src/theme_selector.rs b/crates/theme_selector/src/theme_selector.rs
index 21d9073570..f82a0c5ac7 100644
--- a/crates/theme_selector/src/theme_selector.rs
+++ b/crates/theme_selector/src/theme_selector.rs
@@ -9,7 +9,9 @@ use gpui::{
 use picker::{Picker, PickerDelegate};
 use settings::{update_settings_file, SettingsStore};
 use std::sync::Arc;
-use theme::{Theme, ThemeMeta, ThemeRegistry, ThemeSettings};
+use theme::{
+    Appearance, Theme, ThemeMeta, ThemeMode, ThemeRegistry, ThemeSelection, ThemeSettings,
+};
 use ui::{prelude::*, v_flex, ListItem, ListItemSpacing};
 use util::ResultExt;
 use workspace::{ui::HighlightedLabel, ModalView, Workspace};
@@ -167,8 +169,26 @@ impl PickerDelegate for ThemeSelectorDelegate {
         self.telemetry
             .report_setting_event("theme", theme_name.to_string());
 
+        let appearance = Appearance::from(cx.appearance());
+
         update_settings_file::<ThemeSettings>(self.fs.clone(), cx, move |settings| {
-            settings.theme = Some(theme_name.to_string());
+            if let Some(selection) = settings.theme.as_mut() {
+                let theme_to_update = match selection {
+                    ThemeSelection::Static(theme) => theme,
+                    ThemeSelection::Dynamic { mode, light, dark } => match mode {
+                        ThemeMode::Light => light,
+                        ThemeMode::Dark => dark,
+                        ThemeMode::System => match appearance {
+                            Appearance::Light => light,
+                            Appearance::Dark => dark,
+                        },
+                    },
+                };
+
+                *theme_to_update = theme_name.to_string();
+            } else {
+                settings.theme = Some(ThemeSelection::Static(theme_name.to_string()));
+            }
         });
 
         self.view
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index af8608776f..23c9b84f01 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -64,7 +64,7 @@ use std::{
     sync::{atomic::AtomicUsize, Arc},
     time::Duration,
 };
-use theme::{ActiveTheme, ThemeSettings};
+use theme::{ActiveTheme, SystemAppearance, ThemeSettings};
 pub use toolbar::{Toolbar, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView};
 pub use ui;
 use ui::Label;
@@ -682,6 +682,21 @@ impl Workspace {
                 }
                 cx.notify();
             }),
+            cx.observe_window_appearance(|_, cx| {
+                let window_appearance = cx.appearance();
+
+                *SystemAppearance::global_mut(cx) = SystemAppearance(window_appearance.into());
+
+                let mut theme_settings = ThemeSettings::get_global(cx).clone();
+
+                if let Some(theme_selection) = theme_settings.theme_selection.clone() {
+                    let theme_name = theme_selection.theme(window_appearance.into());
+
+                    if let Some(_theme) = theme_settings.switch_theme(&theme_name, cx) {
+                        ThemeSettings::override_global(theme_settings, cx);
+                    }
+                }
+            }),
             cx.observe(&left_dock, |this, _, cx| {
                 this.serialize_workspace(cx);
                 cx.notify();
@@ -840,6 +855,8 @@ impl Workspace {
                     let workspace_id = workspace_id.clone();
                     let project_handle = project_handle.clone();
                     move |cx| {
+                        SystemAppearance::init_for_window(cx);
+
                         cx.new_view(|cx| {
                             Workspace::new(workspace_id, project_handle, app_state, cx)
                         })
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 2f5db82dd6..ee17b16e4c 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -43,7 +43,7 @@ use std::{
     thread,
     time::Duration,
 };
-use theme::{ActiveTheme, ThemeRegistry, ThemeSettings};
+use theme::{ActiveTheme, SystemAppearance, ThemeRegistry, ThemeSettings};
 use util::{
     async_maybe,
     http::{self, HttpClient, ZedHttpClient},
@@ -912,8 +912,10 @@ fn load_user_themes_in_background(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {
                 theme_registry.load_user_themes(themes_dir, fs).await?;
                 cx.update(|cx| {
                     let mut theme_settings = ThemeSettings::get_global(cx).clone();
-                    if let Some(requested_theme) = theme_settings.requested_theme.clone() {
-                        if let Some(_theme) = theme_settings.switch_theme(&requested_theme, cx) {
+                    if let Some(theme_selection) = theme_settings.theme_selection.clone() {
+                        let theme_name = theme_selection.theme(*SystemAppearance::global(cx));
+
+                        if let Some(_theme) = theme_settings.switch_theme(&theme_name, cx) {
                             ThemeSettings::override_global(theme_settings, cx);
                         }
                     }
@@ -949,11 +951,14 @@ fn watch_themes(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {
                             cx.update(|cx| {
                                 let mut theme_settings = ThemeSettings::get_global(cx).clone();
 
-                                if let Some(requested_theme) =
-                                    theme_settings.requested_theme.clone()
+                                if let Some(theme_selection) =
+                                    theme_settings.theme_selection.clone()
                                 {
+                                    let theme_name =
+                                        theme_selection.theme(*SystemAppearance::global(cx));
+
                                     if let Some(_theme) =
-                                        theme_settings.switch_theme(&requested_theme, cx)
+                                        theme_settings.switch_theme(&theme_name, cx)
                                     {
                                         ThemeSettings::override_global(theme_settings, cx);
                                     }

From 0c34bd893530ab7d57e4648f7212dfb025ae1c89 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 5 Feb 2024 15:12:25 -0700
Subject: [PATCH 253/372] fix following bugs (#7406)

- Another broken following test
- Fix following between two windows

Release Notes:

- Fixed following when the leader has multiple Zed windows open
---
 crates/collab/src/tests/following_tests.rs   | 81 ++++++++++++++++++++
 crates/collab/src/tests/test_server.rs       |  7 +-
 crates/collab_ui/src/collab_titlebar_item.rs | 25 ++++--
 crates/workspace/src/item.rs                 |  1 +
 crates/workspace/src/workspace.rs            | 26 ++++---
 5 files changed, 119 insertions(+), 21 deletions(-)

diff --git a/crates/collab/src/tests/following_tests.rs b/crates/collab/src/tests/following_tests.rs
index bfebd0d257..28fcc99271 100644
--- a/crates/collab/src/tests/following_tests.rs
+++ b/crates/collab/src/tests/following_tests.rs
@@ -22,6 +22,8 @@ use workspace::{
     SplitDirection, Workspace,
 };
 
+use super::TestClient;
+
 #[gpui::test(iterations = 10)]
 async fn test_basic_following(
     cx_a: &mut TestAppContext,
@@ -1996,3 +1998,82 @@ async fn test_following_to_channel_notes_without_a_shared_project(
         );
     });
 }
+
+async fn join_channel(
+    channel_id: u64,
+    client: &TestClient,
+    cx: &mut TestAppContext,
+) -> anyhow::Result<()> {
+    cx.update(|cx| workspace::join_channel(channel_id, client.app_state.clone(), None, cx))
+        .await
+}
+
+async fn share_workspace(
+    workspace: &View<Workspace>,
+    cx: &mut VisualTestContext,
+) -> anyhow::Result<u64> {
+    let project = workspace.update(cx, |workspace, _| workspace.project().clone());
+    cx.read(ActiveCall::global)
+        .update(cx, |call, cx| call.share_project(project, cx))
+        .await
+}
+
+#[gpui::test]
+async fn test_following_to_channel_notes_other_workspace(
+    cx_a: &mut TestAppContext,
+    cx_b: &mut TestAppContext,
+) {
+    let (_, client_a, client_b, channel) = TestServer::start2(cx_a, cx_b).await;
+
+    let mut cx_a2 = cx_a.clone();
+    let (workspace_a, cx_a) = client_a.build_test_workspace(cx_a).await;
+    join_channel(channel, &client_a, cx_a).await.unwrap();
+    share_workspace(&workspace_a, cx_a).await.unwrap();
+
+    // a opens 1.txt
+    cx_a.simulate_keystrokes("cmd-p 1 enter");
+    cx_a.run_until_parked();
+    workspace_a.update(cx_a, |workspace, cx| {
+        let editor = workspace.active_item(cx).unwrap();
+        assert_eq!(editor.tab_description(0, cx).unwrap(), "1.txt");
+    });
+
+    // b joins channel and is following a
+    join_channel(channel, &client_b, cx_b).await.unwrap();
+    cx_b.run_until_parked();
+    let (workspace_b, cx_b) = client_b.active_workspace(cx_b);
+    workspace_b.update(cx_b, |workspace, cx| {
+        let editor = workspace.active_item(cx).unwrap();
+        assert_eq!(editor.tab_description(0, cx).unwrap(), "1.txt");
+    });
+
+    // a opens a second workspace and the channel notes
+    let (workspace_a2, cx_a2) = client_a.build_test_workspace(&mut cx_a2).await;
+    cx_a2.update(|cx| cx.activate_window());
+    cx_a2
+        .update(|cx| ChannelView::open(channel, None, workspace_a2, cx))
+        .await
+        .unwrap();
+    cx_a2.run_until_parked();
+
+    // b should follow a to the channel notes
+    workspace_b.update(cx_b, |workspace, cx| {
+        let editor = workspace.active_item_as::<ChannelView>(cx).unwrap();
+        assert_eq!(editor.read(cx).channel(cx).unwrap().id, channel);
+    });
+
+    // a returns to the shared project
+    cx_a.update(|cx| cx.activate_window());
+    cx_a.run_until_parked();
+
+    workspace_a.update(cx_a, |workspace, cx| {
+        let editor = workspace.active_item(cx).unwrap();
+        assert_eq!(editor.tab_description(0, cx).unwrap(), "1.txt");
+    });
+
+    // b should follow a back
+    workspace_b.update(cx_b, |workspace, cx| {
+        let editor = workspace.active_item_as::<Editor>(cx).unwrap();
+        assert_eq!(editor.tab_description(0, cx).unwrap(), "1.txt");
+    });
+}
diff --git a/crates/collab/src/tests/test_server.rs b/crates/collab/src/tests/test_server.rs
index 13fd15e3f4..69e338b6ea 100644
--- a/crates/collab/src/tests/test_server.rs
+++ b/crates/collab/src/tests/test_server.rs
@@ -123,7 +123,12 @@ impl TestServer {
         let client_a = server.create_client(cx_a, "user_a").await;
         let client_b = server.create_client(cx_b, "user_b").await;
         let channel_id = server
-            .make_channel("a", None, (&client_a, cx_a), &mut [(&client_b, cx_b)])
+            .make_channel(
+                "test-channel",
+                None,
+                (&client_a, cx_a),
+                &mut [(&client_b, cx_b)],
+            )
             .await;
         cx_a.run_until_parked();
 
diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs
index 29175983d3..2d0177c343 100644
--- a/crates/collab_ui/src/collab_titlebar_item.rs
+++ b/crates/collab_ui/src/collab_titlebar_item.rs
@@ -562,14 +562,23 @@ impl CollabTitlebarItem {
     }
 
     fn window_activation_changed(&mut self, cx: &mut ViewContext<Self>) {
-        let project = if cx.is_window_active() {
-            Some(self.project.clone())
-        } else {
-            None
-        };
-        ActiveCall::global(cx)
-            .update(cx, |call, cx| call.set_location(project.as_ref(), cx))
-            .detach_and_log_err(cx);
+        if cx.is_window_active() {
+            ActiveCall::global(cx)
+                .update(cx, |call, cx| call.set_location(Some(&self.project), cx))
+                .detach_and_log_err(cx);
+            return;
+        }
+
+        if cx.active_window().is_none() {
+            ActiveCall::global(cx)
+                .update(cx, |call, cx| call.set_location(None, cx))
+                .detach_and_log_err(cx);
+        }
+        self.workspace
+            .update(cx, |workspace, cx| {
+                workspace.update_active_view_for_followers(cx);
+            })
+            .ok();
     }
 
     fn active_call_changed(&mut self, cx: &mut ViewContext<Self>) {
diff --git a/crates/workspace/src/item.rs b/crates/workspace/src/item.rs
index 908ea1d168..d5d8aed39d 100644
--- a/crates/workspace/src/item.rs
+++ b/crates/workspace/src/item.rs
@@ -666,6 +666,7 @@ pub trait ProjectItem: Item {
         Self: Sized;
 }
 
+#[derive(Debug)]
 pub enum FollowEvent {
     Unfollow,
 }
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 23c9b84f01..6ca74875b7 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -2910,25 +2910,27 @@ impl Workspace {
         Ok(())
     }
 
-    fn update_active_view_for_followers(&mut self, cx: &mut WindowContext) {
+    pub fn update_active_view_for_followers(&mut self, cx: &mut WindowContext) {
         let mut is_project_item = true;
         let mut update = proto::UpdateActiveView::default();
 
-        if let Some(item) = self.active_item(cx) {
-            if item.focus_handle(cx).contains_focused(cx) {
-                if let Some(item) = item.to_followable_item_handle(cx) {
-                    is_project_item = item.is_project_item(cx);
-                    update = proto::UpdateActiveView {
-                        id: item
-                            .remote_id(&self.app_state.client, cx)
-                            .map(|id| id.to_proto()),
-                        leader_id: self.leader_for_pane(&self.active_pane),
-                    };
+        if cx.is_window_active() {
+            if let Some(item) = self.active_item(cx) {
+                if item.focus_handle(cx).contains_focused(cx) {
+                    if let Some(item) = item.to_followable_item_handle(cx) {
+                        is_project_item = item.is_project_item(cx);
+                        update = proto::UpdateActiveView {
+                            id: item
+                                .remote_id(&self.app_state.client, cx)
+                                .map(|id| id.to_proto()),
+                            leader_id: self.leader_for_pane(&self.active_pane),
+                        };
+                    }
                 }
             }
         }
 
-        if update.id != self.last_active_view_id {
+        if &update.id != &self.last_active_view_id {
             self.last_active_view_id = update.id.clone();
             self.update_followers(
                 is_project_item,

From 1a40c9f0f2cacf2981b0f0ab6f6deec3935deca0 Mon Sep 17 00:00:00 2001
From: Pseudomata <pseudomata@proton.me>
Date: Mon, 5 Feb 2024 17:20:40 -0500
Subject: [PATCH 254/372] Add Haskell buffer symbol search (#7331)

This PR is a follow-up from
https://github.com/zed-industries/zed/pull/6786#issuecomment-1912912550
and adds an `outline.scm` file for buffer symbol search support in
Haskell.

Release Notes:

- Added buffer symbol search support for Haskell
---
 crates/zed/src/languages/haskell/outline.scm | 26 ++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 crates/zed/src/languages/haskell/outline.scm

diff --git a/crates/zed/src/languages/haskell/outline.scm b/crates/zed/src/languages/haskell/outline.scm
new file mode 100644
index 0000000000..db744eca6d
--- /dev/null
+++ b/crates/zed/src/languages/haskell/outline.scm
@@ -0,0 +1,26 @@
+(adt
+  "data" @context
+  name: (type) @name) @item
+
+(type_alias
+  "type" @context
+  name: (type) @name) @item
+
+(newtype
+  "newtype" @context
+  name: (type) @name) @item
+
+(signature
+  name: (variable) @name) @item
+
+(class
+  "class" @context
+  (class_head) @name) @item
+
+(instance
+  "instance" @context
+  (instance_head) @name) @item
+
+(foreign_import
+  "foreign" @context
+  (impent) @name) @item

From d04a2866342565583d38f54929200c4bcbb6d4c9 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 5 Feb 2024 15:21:18 -0700
Subject: [PATCH 255/372] Fix prompting the user to hang up when opening a
 workspace (#7408)

Before this change if you had joined a call with an empty workspace,
then we'd prompt you to hang up when you tried to open a recent project.



Release Notes:

- Fixed an erroneous prompt to "hang up" when opening a new project from
an empty workspace.
---
 crates/workspace/src/workspace.rs | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 6ca74875b7..181f14386d 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -1345,22 +1345,14 @@ impl Workspace {
         let is_remote = self.project.read(cx).is_remote();
         let has_worktree = self.project.read(cx).worktrees().next().is_some();
         let has_dirty_items = self.items(cx).any(|item| item.is_dirty(cx));
-        let close_task = if is_remote || has_worktree || has_dirty_items {
+        let window_to_replace = if is_remote || has_worktree || has_dirty_items {
             None
         } else {
-            Some(self.prepare_to_close(false, cx))
+            window
         };
         let app_state = self.app_state.clone();
 
         cx.spawn(|_, mut cx| async move {
-            let window_to_replace = if let Some(close_task) = close_task {
-                if !close_task.await? {
-                    return Ok(());
-                }
-                window
-            } else {
-                None
-            };
             cx.update(|cx| open_paths(&paths, &app_state, window_to_replace, cx))?
                 .await?;
             Ok(())

From c7c4166724a0542d5f0487abce11094080f53a2d Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Mon, 5 Feb 2024 14:48:54 -0800
Subject: [PATCH 256/372] Disable extra frames for ProMotion when screen is not
 active. (#7410)

This was causing an issue where windows about 1/10 of the way across the
display would hang for a fully second after being deactivated.

Release Notes:

- N/A

Co-authored-by: max <max@zed.dev>
Co-authored-by: nathan <nathan@zed.dev>
Co-authored-by: antonio <antonio@zed.dev>
---
 crates/gpui/src/platform/mac/window.rs |  1 +
 crates/gpui/src/window.rs              | 23 ++++++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index 946e608a7a..b15e8c8de5 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -1530,6 +1530,7 @@ extern "C" fn display_layer(this: &Object, _: Sel, _: id) {
 extern "C" fn step(this: &Object, _: Sel, display_link: id) {
     let window_state = unsafe { get_window_state(this) };
     let mut lock = window_state.lock();
+
     if lock.display_link == display_link {
         if let Some(mut callback) = lock.request_frame_callback.take() {
             drop(lock);
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 69982cce68..47068eacc7 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -271,7 +271,7 @@ pub struct Window {
     bounds_observers: SubscriberSet<(), AnyObserver>,
     appearance: WindowAppearance,
     appearance_observers: SubscriberSet<(), AnyObserver>,
-    active: bool,
+    active: Rc<Cell<bool>>,
     pub(crate) dirty: Rc<Cell<bool>>,
     pub(crate) last_input_timestamp: Rc<Cell<Instant>>,
     pub(crate) refreshing: bool,
@@ -337,11 +337,13 @@ impl Window {
         let appearance = platform_window.appearance();
         let text_system = Arc::new(WindowTextSystem::new(cx.text_system().clone()));
         let dirty = Rc::new(Cell::new(true));
+        let active = Rc::new(Cell::new(false));
         let last_input_timestamp = Rc::new(Cell::new(Instant::now()));
 
         platform_window.on_request_frame(Box::new({
             let mut cx = cx.to_async();
             let dirty = dirty.clone();
+            let active = active.clone();
             let last_input_timestamp = last_input_timestamp.clone();
             move || {
                 if dirty.get() {
@@ -353,9 +355,12 @@ impl Window {
                             })
                             .log_err();
                     })
-                } else if last_input_timestamp.get().elapsed() < Duration::from_secs(1) {
-                    // Keep presenting the current scene for 1 extra second since the
-                    // last input to prevent the display from underclocking the refresh rate.
+                }
+                // Keep presenting the current scene for 1 extra second since the
+                // last input to prevent the display from underclocking the refresh rate.
+                else if active.get()
+                    && last_input_timestamp.get().elapsed() < Duration::from_secs(1)
+                {
                     handle.update(&mut cx, |_, cx| cx.present()).log_err();
                 }
             }
@@ -389,7 +394,7 @@ impl Window {
             move |active| {
                 handle
                     .update(&mut cx, |_, cx| {
-                        cx.window.active = active;
+                        cx.window.active.set(active);
                         cx.window
                             .activation_observers
                             .clone()
@@ -435,7 +440,7 @@ impl Window {
             bounds_observers: SubscriberSet::new(),
             appearance,
             appearance_observers: SubscriberSet::new(),
-            active: false,
+            active,
             dirty,
             last_input_timestamp,
             refreshing: false,
@@ -777,7 +782,7 @@ impl<'a> WindowContext<'a> {
 
     /// Returns whether this window is focused by the operating system (receiving key events).
     pub fn is_window_active(&self) -> bool {
-        self.window.active
+        self.window.active.get()
     }
 
     /// Toggle zoom on the window.
@@ -1033,7 +1038,7 @@ impl<'a> WindowContext<'a> {
                 self.window.focus,
             );
         self.window.next_frame.focus = self.window.focus;
-        self.window.next_frame.window_active = self.window.active;
+        self.window.next_frame.window_active = self.window.active.get();
         self.window.root_view = Some(root_view);
 
         // Set the cursor only if we're the active window.
@@ -2553,7 +2558,7 @@ impl<V: 'static + Render> WindowHandle<V> {
     pub fn is_active(&self, cx: &AppContext) -> Option<bool> {
         cx.windows
             .get(self.id)
-            .and_then(|window| window.as_ref().map(|window| window.active))
+            .and_then(|window| window.as_ref().map(|window| window.active.get()))
     }
 }
 

From 7721b55808d6fa8f9b1c74ec4820661a30e4aebc Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Mon, 5 Feb 2024 21:49:00 -0800
Subject: [PATCH 257/372] Refactor cli and gpui dependnecies based on PR review
 feedback

---
 Cargo.lock             | 41 +++++++++++++++++++++++++++++++++++++++++
 crates/cli/Cargo.toml  |  6 +++---
 crates/gpui/Cargo.toml |  7 ++++---
 3 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 37f3b09130..5b1b221dda 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1421,8 +1421,11 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap 3.2.25",
+ "core-foundation",
+ "core-services",
  "dirs 3.0.2",
  "ipc-channel",
+ "plist",
  "serde",
  "serde_derive",
  "util",
@@ -1873,6 +1876,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "core-services"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92567e81db522550ebaf742c5d875624ec7820c2c7ee5f8c60e4ce7c2ae3c0fd"
+dependencies = [
+ "core-foundation",
+]
+
 [[package]]
 name = "core-text"
 version = "19.2.0"
@@ -4289,6 +4301,15 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "line-wrap"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9"
+dependencies = [
+ "safemem",
+]
+
 [[package]]
 name = "linkme"
 version = "0.3.17"
@@ -5776,6 +5797,20 @@ version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
+[[package]]
+name = "plist"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa"
+dependencies = [
+ "base64 0.21.4",
+ "indexmap 1.9.3",
+ "line-wrap",
+ "quick-xml",
+ "serde",
+ "time",
+]
+
 [[package]]
 name = "plugin"
 version = "0.1.0"
@@ -7010,6 +7045,12 @@ dependencies = [
  "bytemuck",
 ]
 
+[[package]]
+name = "safemem"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
+
 [[package]]
 name = "salsa20"
 version = "0.8.1"
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index aa5ff1dcc3..d790644e99 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -23,6 +23,6 @@ serde_derive.workspace = true
 util = { path = "../util" }
 
 [target.'cfg(target_os = "macos")'.dependencies]
-#core-foundation = "0.9"
-#core-services = "0.2"
-#plist = "1.3"
+core-foundation = "0.9"
+core-services = "0.2"
+plist = "1.3"
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index cc14ee4dfe..2ba8a1f6f0 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -26,9 +26,6 @@ anyhow.workspace = true
 async-task = "4.7"
 backtrace = { version = "0.3", optional = true }
 bitflags = "2.4.0"
-blade-graphics = { git = "https://github.com/kvark/blade", rev = "62eb18d312f720a5aac8f508fe223146a24fc7f0" }
-blade-macros = { git = "https://github.com/kvark/blade", rev = "62eb18d312f720a5aac8f508fe223146a24fc7f0" }
-bytemuck = "1"
 collections = { path = "../collections" }
 ctor.workspace = true
 derive_more.workspace = true
@@ -101,3 +98,7 @@ objc = "0.2"
 flume = "0.11"
 xcb = { version = "1.3", features = ["as-raw-xcb-connection"] }
 as-raw-xcb-connection = "1"
+#TODO: use these on all platforms
+blade-graphics = { git = "https://github.com/kvark/blade", rev = "62eb18d312f720a5aac8f508fe223146a24fc7f0" }
+blade-macros = { git = "https://github.com/kvark/blade", rev = "62eb18d312f720a5aac8f508fe223146a24fc7f0" }
+bytemuck = "1"

From 78f32f30f57d39d95589549daae55547c6c7687f Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Mon, 5 Feb 2024 21:49:19 -0800
Subject: [PATCH 258/372] linux: introduce platform callbacks

---
 crates/gpui/src/platform/linux/platform.rs | 72 ++++++++++++++++++----
 1 file changed, 59 insertions(+), 13 deletions(-)

diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index 60cf135412..eae7893054 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -32,6 +32,19 @@ xcb::atoms_struct! {
     }
 }
 
+#[derive(Default)]
+struct Callbacks {
+    open_urls: Option<Box<dyn FnMut(Vec<String>)>>,
+    become_active: Option<Box<dyn FnMut()>>,
+    resign_active: Option<Box<dyn FnMut()>>,
+    quit: Option<Box<dyn FnMut()>>,
+    reopen: Option<Box<dyn FnMut()>>,
+    event: Option<Box<dyn FnMut(PlatformInput) -> bool>>,
+    app_menu_action: Option<Box<dyn FnMut(&dyn Action)>>,
+    will_open_app_menu: Option<Box<dyn FnMut()>>,
+    validate_app_menu_command: Option<Box<dyn FnMut(&dyn Action) -> bool>>,
+}
+
 pub(crate) struct LinuxPlatform {
     xcb_connection: Arc<xcb::Connection>,
     x_root_index: i32,
@@ -40,6 +53,7 @@ pub(crate) struct LinuxPlatform {
     foreground_executor: ForegroundExecutor,
     main_receiver: flume::Receiver<Runnable>,
     text_system: Arc<LinuxTextSystem>,
+    callbacks: Mutex<Callbacks>,
     state: Mutex<LinuxPlatformState>,
 }
 
@@ -75,6 +89,7 @@ impl LinuxPlatform {
             foreground_executor: ForegroundExecutor::new(dispatcher.clone()),
             main_receiver,
             text_system: Arc::new(LinuxTextSystem::new()),
+            callbacks: Mutex::new(Callbacks::default()),
             state: Mutex::new(LinuxPlatformState {
                 quit_requested: false,
                 windows: HashMap::default(),
@@ -110,6 +125,11 @@ impl Platform for LinuxPlatform {
                             // window "x" button clicked by user, we gracefully exit
                             let window = self.state.lock().windows.remove(&ev.window()).unwrap();
                             window.destroy();
+                            if self.state.lock().windows.is_empty() {
+                                if let Some(ref mut fun) = self.callbacks.lock().quit {
+                                    fun();
+                                }
+                            }
                         }
                     }
                 }
@@ -213,13 +233,21 @@ impl Platform for LinuxPlatform {
         log::warn!("unimplemented: set_display_link_output_callback");
     }
 
-    fn start_display_link(&self, display_id: DisplayId) {}
+    fn start_display_link(&self, display_id: DisplayId) {
+        unimplemented!()
+    }
 
-    fn stop_display_link(&self, display_id: DisplayId) {}
+    fn stop_display_link(&self, display_id: DisplayId) {
+        unimplemented!()
+    }
 
-    fn open_url(&self, url: &str) {}
+    fn open_url(&self, url: &str) {
+        unimplemented!()
+    }
 
-    fn on_open_urls(&self, callback: Box<dyn FnMut(Vec<String>)>) {}
+    fn on_open_urls(&self, callback: Box<dyn FnMut(Vec<String>)>) {
+        self.callbacks.lock().open_urls = Some(callback);
+    }
 
     fn prompt_for_paths(
         &self,
@@ -232,23 +260,41 @@ impl Platform for LinuxPlatform {
         unimplemented!()
     }
 
-    fn reveal_path(&self, path: &Path) {}
+    fn reveal_path(&self, path: &Path) {
+        unimplemented!()
+    }
 
-    fn on_become_active(&self, callback: Box<dyn FnMut()>) {}
+    fn on_become_active(&self, callback: Box<dyn FnMut()>) {
+        self.callbacks.lock().become_active = Some(callback);
+    }
 
-    fn on_resign_active(&self, callback: Box<dyn FnMut()>) {}
+    fn on_resign_active(&self, callback: Box<dyn FnMut()>) {
+        self.callbacks.lock().resign_active = Some(callback);
+    }
 
-    fn on_quit(&self, callback: Box<dyn FnMut()>) {}
+    fn on_quit(&self, callback: Box<dyn FnMut()>) {
+        self.callbacks.lock().quit = Some(callback);
+    }
 
-    fn on_reopen(&self, callback: Box<dyn FnMut()>) {}
+    fn on_reopen(&self, callback: Box<dyn FnMut()>) {
+        self.callbacks.lock().reopen = Some(callback);
+    }
 
-    fn on_event(&self, callback: Box<dyn FnMut(PlatformInput) -> bool>) {}
+    fn on_event(&self, callback: Box<dyn FnMut(PlatformInput) -> bool>) {
+        self.callbacks.lock().event = Some(callback);
+    }
 
-    fn on_app_menu_action(&self, callback: Box<dyn FnMut(&dyn Action)>) {}
+    fn on_app_menu_action(&self, callback: Box<dyn FnMut(&dyn Action)>) {
+        self.callbacks.lock().app_menu_action = Some(callback);
+    }
 
-    fn on_will_open_app_menu(&self, callback: Box<dyn FnMut()>) {}
+    fn on_will_open_app_menu(&self, callback: Box<dyn FnMut()>) {
+        self.callbacks.lock().will_open_app_menu = Some(callback);
+    }
 
-    fn on_validate_app_menu_command(&self, callback: Box<dyn FnMut(&dyn Action) -> bool>) {}
+    fn on_validate_app_menu_command(&self, callback: Box<dyn FnMut(&dyn Action) -> bool>) {
+        self.callbacks.lock().validate_app_menu_command = Some(callback);
+    }
 
     fn os_name(&self) -> &'static str {
         "Linux"

From 7509677003da3398d0df796eca9c5435a12f576e Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Mon, 5 Feb 2024 21:51:22 -0800
Subject: [PATCH 259/372] add a few more libraries to the linux script

---
 script/linux | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/script/linux b/script/linux
index 209c254f1b..2dee0ac9fe 100755
--- a/script/linux
+++ b/script/linux
@@ -21,6 +21,13 @@ if [[ -n $apt ]]; then
   deps=(
     libasound2-dev
     libfontconfig-dev
+    libxcb-dev
+    alsa-base
+    cmake
+    fontconfig
+    libssl-dev
+    build-essential
+
   )
   $maysudo "$apt" install -y "${deps[@]}"
   exit 0

From 11964dc731fd08c679f1a59d7d8ab78bfc478dd1 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Mon, 5 Feb 2024 22:50:25 -0800
Subject: [PATCH 260/372] blade: cull mask support for sprites

---
 Cargo.lock                                  | 3 +--
 crates/gpui/Cargo.toml                      | 4 ++--
 crates/gpui/src/platform/linux/shaders.wgsl | 9 +++++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5b1b221dda..817eca20f6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -937,7 +937,6 @@ dependencies = [
 [[package]]
 name = "blade-graphics"
 version = "0.3.0"
-source = "git+https://github.com/kvark/blade?rev=62eb18d312f720a5aac8f508fe223146a24fc7f0#62eb18d312f720a5aac8f508fe223146a24fc7f0"
 dependencies = [
  "ash",
  "ash-window",
@@ -967,7 +966,7 @@ dependencies = [
 [[package]]
 name = "blade-macros"
 version = "0.2.1"
-source = "git+https://github.com/kvark/blade?rev=62eb18d312f720a5aac8f508fe223146a24fc7f0#62eb18d312f720a5aac8f508fe223146a24fc7f0"
+source = "git+https://github.com/kvark/blade?rev=f35bc605154e210ab6190291235889b6ddad73f1#f35bc605154e210ab6190291235889b6ddad73f1"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 2ba8a1f6f0..864ed76935 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -99,6 +99,6 @@ flume = "0.11"
 xcb = { version = "1.3", features = ["as-raw-xcb-connection"] }
 as-raw-xcb-connection = "1"
 #TODO: use these on all platforms
-blade-graphics = { git = "https://github.com/kvark/blade", rev = "62eb18d312f720a5aac8f508fe223146a24fc7f0" }
-blade-macros = { git = "https://github.com/kvark/blade", rev = "62eb18d312f720a5aac8f508fe223146a24fc7f0" }
+blade-graphics = { git = "https://github.com/kvark/blade", rev = "f35bc605154e210ab6190291235889b6ddad73f1" }
+blade-macros = { git = "https://github.com/kvark/blade", rev = "f35bc605154e210ab6190291235889b6ddad73f1" }
 bytemuck = "1"
diff --git a/crates/gpui/src/platform/linux/shaders.wgsl b/crates/gpui/src/platform/linux/shaders.wgsl
index 58dd3265bf..8a9fd31e96 100644
--- a/crates/gpui/src/platform/linux/shaders.wgsl
+++ b/crates/gpui/src/platform/linux/shaders.wgsl
@@ -504,6 +504,10 @@ fn vs_mono_sprite(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index
 @fragment
 fn fs_mono_sprite(input: MonoSpriteVarying) -> @location(0) vec4<f32> {
     let sample = textureSample(t_sprite, s_sprite, input.tile_position).r;
+    // Alpha clip after using the derivatives.
+    if (any(input.clip_distances < vec4<f32>(0.0))) {
+        return vec4<f32>(0.0);
+    }
     return input.color * vec4<f32>(1.0, 1.0, 1.0, sample);
 }
 
@@ -545,6 +549,11 @@ fn vs_poly_sprite(@builtin(vertex_index) vertex_id: u32, @builtin(instance_index
 @fragment
 fn fs_poly_sprite(input: PolySpriteVarying) -> @location(0) vec4<f32> {
     let sample = textureSample(t_sprite, s_sprite, input.tile_position);
+    // Alpha clip after using the derivatives.
+    if (any(input.clip_distances < vec4<f32>(0.0))) {
+        return vec4<f32>(0.0);
+    }
+
     let sprite = b_poly_sprites[input.sprite_id];
     let distance = quad_sdf(input.position.xy, sprite.bounds, sprite.corner_radii);
 

From 038d2a84e85a13444f0c4578a7d7cdf33d8a8692 Mon Sep 17 00:00:00 2001
From: Oliver N <olvrng@gmail.com>
Date: Tue, 6 Feb 2024 15:14:50 +0700
Subject: [PATCH 261/372] Respect RUST_LOG when started in terminal (#7425)

Release Notes:

- N/A
---
 crates/zed/src/main.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index ee17b16e4c..136ebe2642 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -471,6 +471,7 @@ fn init_paths() {
 fn init_logger() {
     if stdout_is_a_pty() {
         Builder::new()
+            .parse_default_env()
             .format(|buf, record| {
                 use env_logger::fmt::Color;
 

From c591681bad394ee8d956b7a1940036c4791b4910 Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Tue, 6 Feb 2024 10:31:01 +0100
Subject: [PATCH 262/372] Fix Terminal focus handlers not being called (#7428)

This fixes #7401 and probably a few other things that seemed odd with
the terminal.

Turns out that `TerminalView` has `focus_in` and `focus_out` callbacks,
but they were never called. The `focus_handle` on which they were set
was not passed in to `TerminalView`.

That meant that the `impl FocusableView for TerminalView` never returned
the focus handle with the right callbacks.

This change here uses the already created focus handle and passes it in,
so that `focus_in` and `focus_out` are now correctly called.

Release Notes:

- Fixed terminal not handling focus-state correctly and, for example,
not restoring cursor blinking state correctly.
([#7401](https://github.com/zed-industries/zed/issues/7401)).
---
 crates/terminal_view/src/terminal_view.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index 006ffb9d79..3b9f4333bf 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -311,7 +311,7 @@ impl TerminalView {
             workspace: workspace_handle,
             has_new_content: true,
             has_bell: false,
-            focus_handle: cx.focus_handle(),
+            focus_handle,
             context_menu: None,
             blink_state: true,
             blinking_on: false,

From 1446fb7632d93c9cee5a43ff8b801edf2a1a7382 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Tue, 6 Feb 2024 11:10:15 +0100
Subject: [PATCH 263/372] Outline a bunch of methods in gpui that leaked
 SubscriberSet types (#7430)

This takes down LLVM IR size of theme_selector from 316k to ~250k. Note
that I do not care about theme_selector in particular, though it acts as
a benchmark for smaller crates to me ("how much static overhead in
compile time does gpui have").

The title is a bit dramatic, so just to shed some light: by leaking a
type I mean forcing downstream crates to codegen it's methods/know about
it's drop code. Since SubscriberSet is no longer used directly in the
generic (==inlineable) methods, users no longer have to codegen `insert`
and co.

Release Notes:

- N/A
---
 crates/gpui/src/app.rs    | 53 ++++++++++++++++++++---------
 crates/gpui/src/window.rs | 70 ++++++++++++++++++---------------------
 2 files changed, 70 insertions(+), 53 deletions(-)

diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 8d6f70f27e..45c26b0ba8 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -380,6 +380,11 @@ impl AppContext {
         })
     }
 
+    pub(crate) fn new_observer(&mut self, key: EntityId, value: Handler) -> Subscription {
+        let (subscription, activate) = self.observers.insert(key, value);
+        self.defer(move |_| activate());
+        subscription
+    }
     pub(crate) fn observe_internal<W, E>(
         &mut self,
         entity: &E,
@@ -391,7 +396,7 @@ impl AppContext {
     {
         let entity_id = entity.entity_id();
         let handle = entity.downgrade();
-        let (subscription, activate) = self.observers.insert(
+        self.new_observer(
             entity_id,
             Box::new(move |cx| {
                 if let Some(handle) = E::upgrade_from(&handle) {
@@ -400,9 +405,7 @@ impl AppContext {
                     false
                 }
             }),
-        );
-        self.defer(move |_| activate());
-        subscription
+        )
     }
 
     /// Arrange for the given callback to be invoked whenever the given model or view emits an event of a given type.
@@ -423,6 +426,15 @@ impl AppContext {
         })
     }
 
+    pub(crate) fn new_subscription(
+        &mut self,
+        key: EntityId,
+        value: (TypeId, Listener),
+    ) -> Subscription {
+        let (subscription, activate) = self.event_listeners.insert(key, value);
+        self.defer(move |_| activate());
+        subscription
+    }
     pub(crate) fn subscribe_internal<T, E, Evt>(
         &mut self,
         entity: &E,
@@ -435,7 +447,7 @@ impl AppContext {
     {
         let entity_id = entity.entity_id();
         let entity = entity.downgrade();
-        let (subscription, activate) = self.event_listeners.insert(
+        self.new_subscription(
             entity_id,
             (
                 TypeId::of::<Evt>(),
@@ -448,9 +460,7 @@ impl AppContext {
                     }
                 }),
             ),
-        );
-        self.defer(move |_| activate());
-        subscription
+        )
     }
 
     /// Returns handles to all open windows in the application.
@@ -930,13 +940,22 @@ impl AppContext {
         self.globals_by_type.insert(global_type, lease.global);
     }
 
+    pub(crate) fn new_view_observer(
+        &mut self,
+        key: TypeId,
+        value: NewViewListener,
+    ) -> Subscription {
+        let (subscription, activate) = self.new_view_observers.insert(key, value);
+        activate();
+        subscription
+    }
     /// Arrange for the given function to be invoked whenever a view of the specified type is created.
     /// The function will be passed a mutable reference to the view along with an appropriate context.
     pub fn observe_new_views<V: 'static>(
         &mut self,
         on_new: impl 'static + Fn(&mut V, &mut ViewContext<V>),
     ) -> Subscription {
-        let (subscription, activate) = self.new_view_observers.insert(
+        self.new_view_observer(
             TypeId::of::<V>(),
             Box::new(move |any_view: AnyView, cx: &mut WindowContext| {
                 any_view
@@ -946,9 +965,7 @@ impl AppContext {
                         on_new(view_state, cx);
                     })
             }),
-        );
-        activate();
-        subscription
+        )
     }
 
     /// Observe the release of a model or view. The callback is invoked after the model or view
@@ -980,9 +997,15 @@ impl AppContext {
         &mut self,
         f: impl FnMut(&KeystrokeEvent, &mut WindowContext) + 'static,
     ) -> Subscription {
-        let (subscription, activate) = self.keystroke_observers.insert((), Box::new(f));
-        activate();
-        subscription
+        fn inner(
+            keystroke_observers: &mut SubscriberSet<(), KeystrokeObserver>,
+            handler: KeystrokeObserver,
+        ) -> Subscription {
+            let (subscription, activate) = keystroke_observers.insert((), handler);
+            activate();
+            subscription
+        }
+        inner(&mut self.keystroke_observers, Box::new(f))
     }
 
     pub(crate) fn push_text_style(&mut self, text_style: TextStyleRefinement) {
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 47068eacc7..4b7c43e113 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -451,6 +451,12 @@ impl Window {
             pending_input: None,
         }
     }
+    fn new_focus_listener(
+        &mut self,
+        value: AnyWindowFocusListener,
+    ) -> (Subscription, impl FnOnce()) {
+        self.focus_listeners.insert((), value)
+    }
 }
 
 /// Indicates which region of the window is visible. Content falling outside of this mask will not be
@@ -635,7 +641,7 @@ impl<'a> WindowContext<'a> {
         let entity_id = entity.entity_id();
         let entity = entity.downgrade();
         let window_handle = self.window.handle;
-        let (subscription, activate) = self.app.event_listeners.insert(
+        self.app.new_subscription(
             entity_id,
             (
                 TypeId::of::<Evt>(),
@@ -653,9 +659,7 @@ impl<'a> WindowContext<'a> {
                         .unwrap_or(false)
                 }),
             ),
-        );
-        self.app.defer(move |_| activate());
-        subscription
+        )
     }
 
     /// Creates an [`AsyncWindowContext`], which has a static lifetime and can be held across
@@ -1747,13 +1751,15 @@ impl VisualContext for WindowContext<'_> {
         let entity = build_view_state(&mut cx);
         cx.entities.insert(slot, entity);
 
-        cx.new_view_observers
-            .clone()
-            .retain(&TypeId::of::<V>(), |observer| {
-                let any_view = AnyView::from(view.clone());
-                (observer)(any_view, self);
+        // Non-generic part to avoid leaking SubscriberSet to invokers of `new_view`.
+        fn notify_observers(cx: &mut WindowContext, tid: TypeId, view: AnyView) {
+            cx.new_view_observers.clone().retain(&tid, |observer| {
+                let any_view = view.clone();
+                (observer)(any_view, cx);
                 true
             });
+        }
+        notify_observers(self, TypeId::of::<V>(), AnyView::from(view.clone()));
 
         view
     }
@@ -1955,7 +1961,7 @@ impl<'a, V: 'static> ViewContext<'a, V> {
         let entity_id = entity.entity_id();
         let entity = entity.downgrade();
         let window_handle = self.window.handle;
-        let (subscription, activate) = self.app.observers.insert(
+        self.app.new_observer(
             entity_id,
             Box::new(move |cx| {
                 window_handle
@@ -1969,9 +1975,7 @@ impl<'a, V: 'static> ViewContext<'a, V> {
                     })
                     .unwrap_or(false)
             }),
-        );
-        self.app.defer(move |_| activate());
-        subscription
+        )
     }
 
     /// Subscribe to events emitted by another model or view.
@@ -1991,7 +1995,7 @@ impl<'a, V: 'static> ViewContext<'a, V> {
         let entity_id = entity.entity_id();
         let handle = entity.downgrade();
         let window_handle = self.window.handle;
-        let (subscription, activate) = self.app.event_listeners.insert(
+        self.app.new_subscription(
             entity_id,
             (
                 TypeId::of::<Evt>(),
@@ -2009,9 +2013,7 @@ impl<'a, V: 'static> ViewContext<'a, V> {
                         .unwrap_or(false)
                 }),
             ),
-        );
-        self.app.defer(move |_| activate());
-        subscription
+        )
     }
 
     /// Register a callback to be invoked when the view is released.
@@ -2136,9 +2138,8 @@ impl<'a, V: 'static> ViewContext<'a, V> {
     ) -> Subscription {
         let view = self.view.downgrade();
         let focus_id = handle.id;
-        let (subscription, activate) = self.window.focus_listeners.insert(
-            (),
-            Box::new(move |event, cx| {
+        let (subscription, activate) =
+            self.window.new_focus_listener(Box::new(move |event, cx| {
                 view.update(cx, |view, cx| {
                     if event.previous_focus_path.last() != Some(&focus_id)
                         && event.current_focus_path.last() == Some(&focus_id)
@@ -2147,9 +2148,8 @@ impl<'a, V: 'static> ViewContext<'a, V> {
                     }
                 })
                 .is_ok()
-            }),
-        );
-        self.app.defer(move |_| activate());
+            }));
+        self.app.defer(|_| activate());
         subscription
     }
 
@@ -2162,9 +2162,8 @@ impl<'a, V: 'static> ViewContext<'a, V> {
     ) -> Subscription {
         let view = self.view.downgrade();
         let focus_id = handle.id;
-        let (subscription, activate) = self.window.focus_listeners.insert(
-            (),
-            Box::new(move |event, cx| {
+        let (subscription, activate) =
+            self.window.new_focus_listener(Box::new(move |event, cx| {
                 view.update(cx, |view, cx| {
                     if !event.previous_focus_path.contains(&focus_id)
                         && event.current_focus_path.contains(&focus_id)
@@ -2173,8 +2172,7 @@ impl<'a, V: 'static> ViewContext<'a, V> {
                     }
                 })
                 .is_ok()
-            }),
-        );
+            }));
         self.app.defer(move |_| activate());
         subscription
     }
@@ -2188,9 +2186,8 @@ impl<'a, V: 'static> ViewContext<'a, V> {
     ) -> Subscription {
         let view = self.view.downgrade();
         let focus_id = handle.id;
-        let (subscription, activate) = self.window.focus_listeners.insert(
-            (),
-            Box::new(move |event, cx| {
+        let (subscription, activate) =
+            self.window.new_focus_listener(Box::new(move |event, cx| {
                 view.update(cx, |view, cx| {
                     if event.previous_focus_path.last() == Some(&focus_id)
                         && event.current_focus_path.last() != Some(&focus_id)
@@ -2199,8 +2196,7 @@ impl<'a, V: 'static> ViewContext<'a, V> {
                     }
                 })
                 .is_ok()
-            }),
-        );
+            }));
         self.app.defer(move |_| activate());
         subscription
     }
@@ -2231,9 +2227,8 @@ impl<'a, V: 'static> ViewContext<'a, V> {
     ) -> Subscription {
         let view = self.view.downgrade();
         let focus_id = handle.id;
-        let (subscription, activate) = self.window.focus_listeners.insert(
-            (),
-            Box::new(move |event, cx| {
+        let (subscription, activate) =
+            self.window.new_focus_listener(Box::new(move |event, cx| {
                 view.update(cx, |view, cx| {
                     if event.previous_focus_path.contains(&focus_id)
                         && !event.current_focus_path.contains(&focus_id)
@@ -2242,8 +2237,7 @@ impl<'a, V: 'static> ViewContext<'a, V> {
                     }
                 })
                 .is_ok()
-            }),
-        );
+            }));
         self.app.defer(move |_| activate());
         subscription
     }

From dad2df365c99559bff757532419349ab3e3ce614 Mon Sep 17 00:00:00 2001
From: Josh Taylor <joshuataylorx@gmail.com>
Date: Tue, 6 Feb 2024 18:25:46 +0800
Subject: [PATCH 264/372] Add notes about XCode also being on the Apple
 Developer website (#7431)

Super minor edit about XCode being on the Apple Developer website, which
can be easier to download and install without needing to go through the
App Store.

Release Notes:
- N/A

---------

Co-authored-by: Kirill Bulatov <mail4score@gmail.com>
---
 docs/src/developing_zed__building_zed.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/src/developing_zed__building_zed.md b/docs/src/developing_zed__building_zed.md
index ba648f7d2d..e04e01029a 100644
--- a/docs/src/developing_zed__building_zed.md
+++ b/docs/src/developing_zed__building_zed.md
@@ -11,7 +11,9 @@ git submodule update --init --recursive
 ## Dependencies
 
 - Install [Rust](https://www.rust-lang.org/tools/install)
-- Install [Xcode](https://apps.apple.com/us/app/xcode/id497799835?mt=12) from the macOS App Store
+- Install [Xcode](https://apps.apple.com/us/app/xcode/id497799835?mt=12) from the macOS App Store, or from the [Apple Developer](https://developer.apple.com/download/all/) website. Note this requires a developer account.
+
+> Ensure you launch XCode after installing, and install the MacOS components, which is the default option.
 
 - Install [Xcode command line tools](https://developer.apple.com/xcode/resources/)
 
@@ -74,7 +76,7 @@ error: failed to run custom build command for gpui v0.1.0 (/Users/path/to/zed)`*
 xcrun: error: unable to find utility "metal", not a developer tool or in PATH
 ```
 
-Try `xcode-select --switch /Applications/Xcode.app/Contents/Developer`
+Try `sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer`
 
 ### Cargo errors claiming that a dependency is using unstable features
 

From b2ce515593e2154d99b8e43462a0fea43fe80b01 Mon Sep 17 00:00:00 2001
From: Guillem Arias Fauste <accounts@gariasf.com>
Date: Tue, 6 Feb 2024 13:34:46 +0100
Subject: [PATCH 265/372] Add Prisma file icon (#7207)

Add Prisma icon from https://github.com/file-icons/icons

![CleanShot 2024-02-06 at 13 17
01@2x](https://github.com/zed-industries/zed/assets/5864275/55ce9286-4e15-4125-b7f7-003e2e8d8bd5)


Release Notes:

- Added Prisma icon.
---
 assets/icons/file_icons/file_types.json | 4 ++++
 assets/icons/file_icons/prisma.svg      | 6 ++++++
 2 files changed, 10 insertions(+)
 create mode 100644 assets/icons/file_icons/prisma.svg

diff --git a/assets/icons/file_icons/file_types.json b/assets/icons/file_icons/file_types.json
index 5dd0cbb915..916ccc89cb 100644
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -87,6 +87,7 @@
         "pptx": "document",
         "prettierignore": "prettier",
         "prettierrc": "prettier",
+        "prisma": "prisma",
         "profile": "terminal",
         "ps1": "terminal",
         "psd": "image",
@@ -193,6 +194,9 @@
         "prettier": {
             "icon": "icons/file_icons/prettier.svg"
         },
+        "prisma": {
+            "icon": "icons/file_icons/prisma.svg"
+        },
         "python": {
             "icon": "icons/file_icons/python.svg"
         },
diff --git a/assets/icons/file_icons/prisma.svg b/assets/icons/file_icons/prisma.svg
new file mode 100644
index 0000000000..8cf1a0e84b
--- /dev/null
+++ b/assets/icons/file_icons/prisma.svg
@@ -0,0 +1,6 @@
+<svg width="14" height="14" viewBox="
+0 0 425 512" xmlns="http://www.w3.org/2000/svg" fill="#000000
+">
+    <path
+        d="m381.38934 405.88714-229.67062 67.92744c-7.01651 2.07778-13.74132-3.99173-12.2669-11.07217l82.04834-392.9335c1.53436-7.352147 11.69152-8.514905 14.89609-1.710173l151.9177 322.59543c2.86494 6.08949-.40357 13.26702-6.92461 15.19297zm39.38512-16.02808-175.89887-373.53306c-11.59465-21.691431-39.0351-20.904032-49.75484-2.749064l-190.77231 308.99c-5.9096786 9.63371-5.7938027 21.50903.3356409 31.01887l93.252489 144.4589c9.615412 11.46292 18.506512 16.87006 33.692012 12.37878l270.68561-80.05849c18.03265-5.40039 26.72265-22.82202 18.46027-40.50593z" />
+</svg>
\ No newline at end of file

From 56f7f18033039b789aabb5f6b661b4fb77a2b4a6 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Tue, 6 Feb 2024 10:18:17 -0500
Subject: [PATCH 266/372] Hide the chat message editor when there is no active
 chat (#7441)

This PR makes it so the chat message editor is hidden when not in an
active chat.

Release Notes:

- Changed the chat message editor to be hidden when not in an active
chat.
---
 crates/collab_ui/src/chat_panel.rs | 41 ++++++++++++++++--------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/crates/collab_ui/src/chat_panel.rs b/crates/collab_ui/src/chat_panel.rs
index 88ee461dee..804bd3acf8 100644
--- a/crates/collab_ui/src/chat_panel.rs
+++ b/crates/collab_ui/src/chat_panel.rs
@@ -589,25 +589,28 @@ impl Render for ChatPanel {
                     )
                 }
             }))
-            .child(
-                h_flex()
-                    .when(!self.is_scrolled_to_bottom, |el| {
-                        el.border_t_1().border_color(cx.theme().colors().border)
-                    })
-                    .p_2()
-                    .map(|el| {
-                        if self.active_chat.is_some() {
-                            el.child(self.message_editor.clone())
-                        } else {
-                            el.child(
-                                div()
-                                    .rounded_md()
-                                    .h_6()
-                                    .w_full()
-                                    .bg(cx.theme().colors().editor_background),
-                            )
-                        }
-                    }),
+            .children(
+                Some(
+                    h_flex()
+                        .when(!self.is_scrolled_to_bottom, |el| {
+                            el.border_t_1().border_color(cx.theme().colors().border)
+                        })
+                        .p_2()
+                        .map(|el| {
+                            if self.active_chat.is_some() {
+                                el.child(self.message_editor.clone())
+                            } else {
+                                el.child(
+                                    div()
+                                        .rounded_md()
+                                        .h_6()
+                                        .w_full()
+                                        .bg(cx.theme().colors().editor_background),
+                                )
+                            }
+                        }),
+                )
+                .filter(|_| self.active_chat.is_some()),
             )
             .into_any()
     }

From 33d982b08aa5c6dbcce5dfb164fa2c84086a11c8 Mon Sep 17 00:00:00 2001
From: Andrey Kuzmin <hi@unsoundscapes.com>
Date: Tue, 6 Feb 2024 16:25:38 +0100
Subject: [PATCH 267/372] Add Elm file icon (#7440)

Tried to match the existing file icons in Zed as much as possible. This
is how it looks:

|  dark  | light  |
|---|----|
| <img width="183" alt="Screenshot 2024-02-06 at 15 03 57"
src="https://github.com/zed-industries/zed/assets/43472/bd862753-41bb-4ca6-9a44-16b9b1c9591c">
| <img width="180" alt="Screenshot 2024-02-06 at 15 03 14"
src="https://github.com/zed-industries/zed/assets/43472/9df8c589-64b6-49f2-8e15-b43126579a9f">
|

The main challenge is that the tangram is visually quite heavy and
detailed. The existing icons in Zed are designed in a 14px bounding box,
but are a bit smaller themselves. I guess the extra space is reserved
for hanging elements, it probably doesn't make sense to occupy the whole
area.

Simply scaling down an available SVG of the tangram didn't work well.
The individual shapes were not recognizable because the spacing between
them was too thin. I tried removing the spacing and applying different
opacities for each shape, but that didn't yield enough contrast between
the shapes either.

The second approach was to just use the outlines. It sort of worked, but
looked a bit messy in the places when the outlines are denser than the
tangram shapes:

|  dark  | light  |
|---|----|
| <img width="192" alt="Screenshot 2024-02-05 at 22 55 46"
src="https://github.com/zed-industries/zed/assets/43472/d0029f49-675d-40ac-96d8-788a29706bad">
| <img width="195" alt="Screenshot 2024-02-05 at 22 56 05"
src="https://github.com/zed-industries/zed/assets/43472/d2de922a-70ec-4bd1-9033-db9a5201e9bd">
|

I then tried to remove the main outline and use the maximum space for
the tangram. That let me increase the spacing between the shapes. I also
rounded them a little bit, to make them look similar to other icons from
Zed. The end result looks clean and the shapes are still recognisable.

Approaches I tried next to an existing icon from Zed:

<img width="711" alt="Screenshot 2024-02-06 at 15 15 33"
src="https://github.com/zed-industries/zed/assets/43472/a3e4b0db-4b98-4072-91e8-fe71cff19adf">


Release Notes:

- Added file type icon for Elm
---
 assets/icons/file_icons/elm.svg         | 9 +++++++++
 assets/icons/file_icons/file_types.json | 4 ++++
 2 files changed, 13 insertions(+)
 create mode 100644 assets/icons/file_icons/elm.svg

diff --git a/assets/icons/file_icons/elm.svg b/assets/icons/file_icons/elm.svg
new file mode 100644
index 0000000000..3e05cf9d5c
--- /dev/null
+++ b/assets/icons/file_icons/elm.svg
@@ -0,0 +1,9 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.7295 12.1981L7.17677 7.64544C7.07914 7.5478 6.92085 7.5478 6.82322 7.64544L2.27053 12.1981C2.11304 12.3556 2.22458 12.6249 2.4473 12.6249H11.5527C11.7754 12.6249 11.887 12.3556 11.7295 12.1981Z" fill="black" fill-opacity="0.9"/>
+<path d="M1.80178 11.7294L6.35447 7.17668C6.4521 7.07905 6.4521 6.92076 6.35447 6.82312L1.80178 2.27043C1.64429 2.11294 1.375 2.22448 1.375 2.44721L1.375 11.5526C1.375 11.7753 1.64428 11.8869 1.80178 11.7294Z" fill="black" fill-opacity="0.9"/>
+<path d="M9.98928 9.16694L11.9794 7.17751C12.0771 7.0799 12.0771 6.92161 11.9795 6.82396L9.98928 4.833C9.89165 4.73534 9.73333 4.73532 9.63569 4.83297L7.64553 6.82313C7.5479 6.92076 7.5479 7.07905 7.64553 7.17668L9.63575 9.16691C9.73337 9.26453 9.89164 9.26455 9.98928 9.16694Z" fill="black" fill-opacity="0.9"/>
+<path d="M7.89553 1.80168L12.1982 6.10438C12.3557 6.26187 12.625 6.15033 12.625 5.9276V2.37491C12.625 1.82262 12.1773 1.37491 11.625 1.37491H8.0723C7.84958 1.37491 7.73804 1.64419 7.89553 1.80168Z" fill="black" fill-opacity="0.6"/>
+<path d="M8.73976 4.18772L5.25981 4.1895C5.03708 4.18962 4.92567 4.45896 5.08325 4.61637L6.82322 6.35456C6.92087 6.45211 7.07909 6.45207 7.17669 6.35447L8.91666 4.61449C9.0742 4.45696 8.96255 4.1876 8.73976 4.18772Z" fill="black" fill-opacity="0.6"/>
+<path d="M8.1147 3.55936L4.13431 3.55936C4.06801 3.55936 4.00442 3.53302 3.95753 3.48614L2.27057 1.79918C2.11308 1.64169 2.22462 1.37241 2.44735 1.37241L6.42774 1.37241C6.49405 1.37241 6.55763 1.39874 6.60452 1.44563L8.29148 3.13258C8.44897 3.29007 8.33743 3.55936 8.1147 3.55936Z" fill="black" fill-opacity="0.6"/>
+<path d="M12.625 8.07221V11.5526C12.625 11.7753 12.3557 11.8869 12.1982 11.7294L10.458 9.98918C10.3604 9.89155 10.3604 9.73326 10.458 9.63563L12.1982 7.89544C12.3557 7.73794 12.625 7.84949 12.625 8.07221Z" fill="black" fill-opacity="0.6"/>
+</svg>
diff --git a/assets/icons/file_icons/file_types.json b/assets/icons/file_icons/file_types.json
index 916ccc89cb..88c1c65023 100644
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -25,6 +25,7 @@
         "doc": "document",
         "docx": "document",
         "eex": "elixir",
+        "elm": "elm",
         "erl": "erlang",
         "escript": "erlang",
         "eslintrc": "eslint",
@@ -155,6 +156,9 @@
         "elixir": {
             "icon": "icons/file_icons/elixir.svg"
         },
+        "elm": {
+            "icon": "icons/file_icons/elm.svg"
+        },
         "erlang": {
             "icon": "icons/file_icons/erlang.svg"
         },

From 068c1415597fc1bcc71f5bc1f29dd039ae104245 Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Tue, 6 Feb 2024 16:44:24 +0100
Subject: [PATCH 268/372] Fix shell environment not loading for Nushell (#7442)

Turns out that Nushell doesn't like `-lic` and `&&`, but works perfectly
fine with `-l -i -c` and `;`, which the other shells do too.

These all work:

    bash -l -i -c 'echo lol; /usr/bin/env -0'
    nu -l -i -c 'echo lol; /usr/bin/env -0'
    zsh -l -i -c 'echo lol; /usr/bin/env -0'
    fish -l -i -c 'echo lol; /usr/bin/env -0'

Release Notes:

- Fixed shell environment not being loaded if Nushell was set as
`$SHELL`.
---
 crates/zed/src/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 136ebe2642..33fcfc040f 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -811,7 +811,7 @@ async fn load_login_shell_environment() -> Result<()> {
         "SHELL environment variable is not assigned so we can't source login environment variables",
     )?;
     let output = Command::new(&shell)
-        .args(["-lic", &format!("echo {marker} && /usr/bin/env -0")])
+        .args(["-l", "-i", "-c", &format!("echo {marker}; /usr/bin/env -0")])
         .output()
         .await
         .context("failed to spawn login shell to source login environment variables")?;

From 960eaf6245c6ece12d42847db47373535b5a0acf Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Tue, 6 Feb 2024 16:58:10 +0100
Subject: [PATCH 269/372] Remove unused TerminalView.has_new_content (#7429)

Found this last week with @osiewicz and we realized that it's unused. So
I think it's fine to remove it, but I want to hear whether @mikayla-maki
has some thoughts here.



Release Notes:

- N/A
---
 crates/terminal_view/src/terminal_view.rs | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index 3b9f4333bf..b1e12ae6da 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -77,7 +77,6 @@ pub struct TerminalView {
     terminal: Model<Terminal>,
     workspace: WeakView<Workspace>,
     focus_handle: FocusHandle,
-    has_new_content: bool,
     //Currently using iTerm bell, show bell emoji in tab until input is received
     has_bell: bool,
     context_menu: Option<(View<ContextMenu>, gpui::Point<Pixels>, Subscription)>,
@@ -142,9 +141,6 @@ impl TerminalView {
         cx.observe(&terminal, |_, _, cx| cx.notify()).detach();
         cx.subscribe(&terminal, move |this, _, event, cx| match event {
             Event::Wakeup => {
-                if !this.focus_handle.is_focused(cx) {
-                    this.has_new_content = true;
-                }
                 cx.notify();
                 cx.emit(Event::Wakeup);
                 cx.emit(ItemEvent::UpdateTab);
@@ -309,7 +305,6 @@ impl TerminalView {
         Self {
             terminal,
             workspace: workspace_handle,
-            has_new_content: true,
             has_bell: false,
             focus_handle,
             context_menu: None,
@@ -327,10 +322,6 @@ impl TerminalView {
         &self.terminal
     }
 
-    pub fn has_new_content(&self) -> bool {
-        self.has_new_content
-    }
-
     pub fn has_bell(&self) -> bool {
         self.has_bell
     }
@@ -688,7 +679,6 @@ impl TerminalView {
     }
 
     fn focus_in(&mut self, cx: &mut ViewContext<Self>) {
-        self.has_new_content = false;
         self.terminal.read(cx).focus_in();
         self.blink_cursors(self.blink_epoch, cx);
         cx.notify();

From 0b2a9d2bea5620e0e7d99097054f7a5879122dab Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Tue, 6 Feb 2024 11:37:08 -0500
Subject: [PATCH 270/372] Remove empty message editor placeholder (#7444)

This PR removes the placeholder that we previously displayed for the
chat message editor.

With the changes in #7441 we can no longer hit this codepath.

Release Notes:

- N/A
---
 crates/collab_ui/src/chat_panel.rs | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/crates/collab_ui/src/chat_panel.rs b/crates/collab_ui/src/chat_panel.rs
index 804bd3acf8..0ee4805a74 100644
--- a/crates/collab_ui/src/chat_panel.rs
+++ b/crates/collab_ui/src/chat_panel.rs
@@ -596,19 +596,7 @@ impl Render for ChatPanel {
                             el.border_t_1().border_color(cx.theme().colors().border)
                         })
                         .p_2()
-                        .map(|el| {
-                            if self.active_chat.is_some() {
-                                el.child(self.message_editor.clone())
-                            } else {
-                                el.child(
-                                    div()
-                                        .rounded_md()
-                                        .h_6()
-                                        .w_full()
-                                        .bg(cx.theme().colors().editor_background),
-                                )
-                            }
-                        }),
+                        .child(self.message_editor.clone()),
                 )
                 .filter(|_| self.active_chat.is_some()),
             )

From 792c832205e20943041bfbad2dc3427143e3ecb8 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Tue, 6 Feb 2024 12:08:11 -0500
Subject: [PATCH 271/372] Improve error handling when copying a permalink fails
 (#7447)

This PR improves the error handling when the `editor: copy permalink to
line` action fails.

Right now if something goes wrong nothing happens, and we don't write
anything to the logs.

This PR makes it so we display a toast when the operation fails with the
error message, as well as write it to the Zed logs.

Release Notes:

- Improved error behavior for `editor: copy permalink to line` action.
---
 crates/editor/src/editor.rs | 51 +++++++++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 11 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 4ed8f13700..ad4ebd2655 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -120,6 +120,7 @@ use ui::{
     Tooltip,
 };
 use util::{maybe, post_inc, RangeExt, ResultExt, TryFutureExt};
+use workspace::Toast;
 use workspace::{searchable::SearchEvent, ItemNavHistory, Pane, SplitDirection, ViewId, Workspace};
 
 const CURSOR_BLINK_INTERVAL: Duration = Duration::from_millis(500);
@@ -8354,21 +8355,37 @@ impl Editor {
         use git::permalink::{build_permalink, BuildPermalinkParams};
 
         let permalink = maybe!({
-            let project = self.project.clone()?;
+            let project = self.project.clone().ok_or_else(|| anyhow!("no project"))?;
             let project = project.read(cx);
 
-            let worktree = project.visible_worktrees(cx).next()?;
+            let worktree = project
+                .visible_worktrees(cx)
+                .next()
+                .ok_or_else(|| anyhow!("no worktree"))?;
 
             let mut cwd = worktree.read(cx).abs_path().to_path_buf();
             cwd.push(".git");
 
-            let repo = project.fs().open_repo(&cwd)?;
-            let origin_url = repo.lock().remote_url("origin")?;
-            let sha = repo.lock().head_sha()?;
+            const REMOTE_NAME: &'static str = "origin";
+            let repo = project
+                .fs()
+                .open_repo(&cwd)
+                .ok_or_else(|| anyhow!("no Git repo"))?;
+            let origin_url = repo
+                .lock()
+                .remote_url(REMOTE_NAME)
+                .ok_or_else(|| anyhow!("remote \"{REMOTE_NAME}\" not found"))?;
+            let sha = repo
+                .lock()
+                .head_sha()
+                .ok_or_else(|| anyhow!("failed to read HEAD SHA"))?;
 
-            let buffer = self.buffer().read(cx).as_singleton()?;
-            let file = buffer.read(cx).file().and_then(|f| f.as_local())?;
-            let path = file.path().to_str().map(|path| path.to_string())?;
+            let path = maybe!({
+                let buffer = self.buffer().read(cx).as_singleton()?;
+                let file = buffer.read(cx).file().and_then(|f| f.as_local())?;
+                file.path().to_str().map(|path| path.to_string())
+            })
+            .ok_or_else(|| anyhow!("failed to determine file path"))?;
 
             let selections = self.selections.all::<Point>(cx);
             let selection = selections.iter().peekable().next();
@@ -8379,11 +8396,23 @@ impl Editor {
                 path: &path,
                 selection: selection.map(|selection| selection.range()),
             })
-            .log_err()
         });
 
-        if let Some(permalink) = permalink {
-            cx.write_to_clipboard(ClipboardItem::new(permalink.to_string()));
+        match permalink {
+            Ok(permalink) => {
+                cx.write_to_clipboard(ClipboardItem::new(permalink.to_string()));
+            }
+            Err(err) => {
+                let message = format!("Failed to copy permalink: {err}");
+
+                Err::<(), anyhow::Error>(err).log_err();
+
+                if let Some(workspace) = self.workspace() {
+                    workspace.update(cx, |workspace, cx| {
+                        workspace.show_toast(Toast::new(0x156a5f9ee, message), cx)
+                    })
+                }
+            }
         }
     }
 

From 70e7ea365ce633988d69e01afc997fb66eb56404 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Tue, 6 Feb 2024 20:36:02 +0100
Subject: [PATCH 272/372] chore: Fix up warnings from cargo +beta check.
 (#7453)

With upcoming release of 1.76 I did a check of current +beta (which
seems to already be at 1.77). These would cause CI pipeline failures
once 1.77 is out.

Release Notes:

- N/A
---
 crates/gpui/src/platform/mac/dispatcher.rs | 9 +++++++--
 crates/gpui/src/scene.rs                   | 3 ---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/crates/gpui/src/platform/mac/dispatcher.rs b/crates/gpui/src/platform/mac/dispatcher.rs
index 72daa8c440..46afc14ba8 100644
--- a/crates/gpui/src/platform/mac/dispatcher.rs
+++ b/crates/gpui/src/platform/mac/dispatcher.rs
@@ -11,7 +11,12 @@ use objc::{
 };
 use parking::{Parker, Unparker};
 use parking_lot::Mutex;
-use std::{ffi::c_void, ptr::NonNull, sync::Arc, time::Duration};
+use std::{
+    ffi::c_void,
+    ptr::{addr_of, NonNull},
+    sync::Arc,
+    time::Duration,
+};
 
 /// All items in the generated file are marked as pub, so we're gonna wrap it in a separate mod to prevent
 /// these pub items from leaking into public API.
@@ -21,7 +26,7 @@ pub(crate) mod dispatch_sys {
 
 use dispatch_sys::*;
 pub(crate) fn dispatch_get_main_queue() -> dispatch_queue_t {
-    unsafe { &_dispatch_main_q as *const _ as dispatch_queue_t }
+    unsafe { addr_of!(_dispatch_main_q) as *const _ as dispatch_queue_t }
 }
 
 pub(crate) struct MacDispatcher {
diff --git a/crates/gpui/src/scene.rs b/crates/gpui/src/scene.rs
index 70e24030b1..d5d717e278 100644
--- a/crates/gpui/src/scene.rs
+++ b/crates/gpui/src/scene.rs
@@ -863,6 +863,3 @@ impl PathVertex<Pixels> {
         }
     }
 }
-
-#[derive(Copy, Clone, Debug)]
-pub(crate) struct AtlasId(pub(crate) usize);

From 743f9b345f56c5457cf678ef3371c2da04531a01 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Tue, 6 Feb 2024 20:41:36 +0100
Subject: [PATCH 273/372] chore: Move workspace dependencies to
 workspace.dependencies (#7454)

We should prefer referring to local deps via `.workspace = true` from
now on.

Release Notes:

- N/A
---
 Cargo.toml                           |  86 +++++++++++++++++-
 crates/activity_indicator/Cargo.toml |  22 ++---
 crates/ai/Cargo.toml                 |   8 +-
 crates/assets/Cargo.toml             |   2 +-
 crates/assistant/Cargo.toml          |  40 ++++-----
 crates/audio/Cargo.toml              |   6 +-
 crates/auto_update/Cargo.toml        |  20 ++---
 crates/breadcrumbs/Cargo.toml        |  28 +++---
 crates/call/Cargo.toml               |  38 ++++----
 crates/channel/Cargo.toml            |  38 ++++----
 crates/cli/Cargo.toml                |   2 +-
 crates/client/Cargo.toml             |  30 +++----
 crates/collab/Cargo.toml             |  60 ++++++-------
 crates/collab_ui/Cargo.toml          |  80 ++++++++---------
 crates/color/Cargo.toml              |   2 +-
 crates/command_palette/Cargo.toml    |  44 ++++-----
 crates/copilot/Cargo.toml            |  34 +++----
 crates/copilot_ui/Cargo.toml         |  24 ++---
 crates/db/Cargo.toml                 |  14 +--
 crates/diagnostics/Cargo.toml        |  36 ++++----
 crates/editor/Cargo.toml             |  68 +++++++-------
 crates/feature_flags/Cargo.toml      |   2 +-
 crates/feedback/Cargo.toml           |  28 +++---
 crates/file_finder/Cargo.toml        |  36 ++++----
 crates/fs/Cargo.toml                 |  16 ++--
 crates/fuzzy/Cargo.toml              |   4 +-
 crates/git/Cargo.toml                |  10 +--
 crates/go_to_line/Cargo.toml         |  20 ++---
 crates/gpui/Cargo.toml               |  14 +--
 crates/install_cli/Cargo.toml        |   4 +-
 crates/journal/Cargo.toml            |  12 +--
 crates/language/Cargo.toml           |  38 ++++----
 crates/language_selector/Cargo.toml  |  24 ++---
 crates/language_tools/Cargo.toml     |  32 +++----
 crates/live_kit_client/Cargo.toml    |  22 ++---
 crates/lsp/Cargo.toml                |  12 +--
 crates/markdown_preview/Cargo.toml   |  22 ++---
 crates/menu/Cargo.toml               |   2 +-
 crates/multi_buffer/Cargo.toml       |  44 ++++-----
 crates/node_runtime/Cargo.toml       |   2 +-
 crates/notifications/Cargo.toml      |  36 ++++----
 crates/outline/Cargo.toml            |  24 ++---
 crates/picker/Cargo.toml             |  20 ++---
 crates/plugin/Cargo.toml             |   2 +-
 crates/prettier/Cargo.toml           |  22 ++---
 crates/project/Cargo.toml            |  64 ++++++-------
 crates/project_panel/Cargo.toml      |  36 ++++----
 crates/project_symbols/Cargo.toml    |  38 ++++----
 crates/quick_action_bar/Cargo.toml   |  20 ++---
 crates/recent_projects/Cargo.toml    |  24 ++---
 crates/release_channel/Cargo.toml    |   2 +-
 crates/rich_text/Cargo.toml          |  14 +--
 crates/rope/Cargo.toml               |   8 +-
 crates/rpc/Cargo.toml                |  12 +--
 crates/search/Cargo.toml             |  32 +++----
 crates/semantic_index/Cargo.toml     |  40 ++++-----
 crates/settings/Cargo.toml           |  16 ++--
 crates/sqlez/Cargo.toml              |   2 +-
 crates/sqlez_macros/Cargo.toml       |   2 +-
 crates/story/Cargo.toml              |   2 +-
 crates/storybook/Cargo.toml          |  26 +++---
 crates/terminal/Cargo.toml           |  10 +--
 crates/terminal_view/Cargo.toml      |  36 ++++----
 crates/text/Cargo.toml               |  16 ++--
 crates/theme/Cargo.toml              |  18 ++--
 crates/theme_importer/Cargo.toml     |   4 +-
 crates/theme_selector/Cargo.toml     |  26 +++---
 crates/ui/Cargo.toml                 |  10 +--
 crates/vcs_menu/Cargo.toml           |  14 +--
 crates/vim/Cargo.toml                |  46 +++++-----
 crates/welcome/Cargo.toml            |  34 +++----
 crates/workspace/Cargo.toml          |  46 +++++-----
 crates/zed/Cargo.toml                | 130 +++++++++++++--------------
 crates/zed_actions/Cargo.toml        |   2 +-
 74 files changed, 972 insertions(+), 888 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 2676f5b658..4587e947c6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -92,6 +92,90 @@ default-members = ["crates/zed"]
 resolver = "2"
 
 [workspace.dependencies]
+activity_indicator = { path = "crates/activity_indicator" }
+ai = { path = "crates/ai" }
+assets = { path = "crates/assets" }
+assistant = { path = "crates/assistant" }
+audio = { path = "crates/audio" }
+auto_update = { path = "crates/auto_update" }
+breadcrumbs = { path = "crates/breadcrumbs" }
+call = { path = "crates/call" }
+channel = { path = "crates/channel" }
+cli = { path = "crates/cli" }
+client = { path = "crates/client" }
+clock = { path = "crates/clock" }
+collab = { path = "crates/collab" }
+collab_ui = { path = "crates/collab_ui" }
+collections = { path = "crates/collections" }
+color = { path = "crates/color" }
+command_palette = { path = "crates/command_palette" }
+copilot = { path = "crates/copilot" }
+copilot_ui = { path = "crates/copilot_ui" }
+db = { path = "crates/db" }
+diagnostics = { path = "crates/diagnostics" }
+editor = { path = "crates/editor" }
+feature_flags = { path = "crates/feature_flags" }
+feedback = { path = "crates/feedback" }
+file_finder = { path = "crates/file_finder" }
+fs = { path = "crates/fs" }
+fsevent = { path = "crates/fsevent" }
+fuzzy = { path = "crates/fuzzy" }
+git = { path = "crates/git" }
+go_to_line = { path = "crates/go_to_line" }
+gpui = { path = "crates/gpui" }
+gpui_macros = { path = "crates/gpui_macros" }
+install_cli = { path = "crates/install_cli" }
+journal = { path = "crates/journal" }
+language = { path = "crates/language" }
+language_selector = { path = "crates/language_selector" }
+language_tools = { path = "crates/language_tools" }
+live_kit_client = { path = "crates/live_kit_client" }
+live_kit_server = { path = "crates/live_kit_server" }
+lsp = { path = "crates/lsp" }
+markdown_preview = { path = "crates/markdown_preview" }
+media = { path = "crates/media" }
+menu = { path = "crates/menu" }
+multi_buffer = { path = "crates/multi_buffer" }
+node_runtime = { path = "crates/node_runtime" }
+notifications = { path = "crates/notifications" }
+outline = { path = "crates/outline" }
+picker = { path = "crates/picker" }
+plugin = { path = "crates/plugin" }
+plugin_macros = { path = "crates/plugin_macros" }
+prettier = { path = "crates/prettier" }
+project = { path = "crates/project" }
+project_panel = { path = "crates/project_panel" }
+project_symbols = { path = "crates/project_symbols" }
+quick_action_bar = { path = "crates/quick_action_bar" }
+recent_projects = { path = "crates/recent_projects" }
+release_channel = { path = "crates/release_channel" }
+rich_text = { path = "crates/rich_text" }
+rope = { path = "crates/rope" }
+rpc = { path = "crates/rpc" }
+search = { path = "crates/search" }
+semantic_index = { path = "crates/semantic_index" }
+settings = { path = "crates/settings" }
+snippet = { path = "crates/snippet" }
+sqlez = { path = "crates/sqlez" }
+sqlez_macros = { path = "crates/sqlez_macros" }
+story = { path = "crates/story" }
+storybook = { path = "crates/storybook" }
+sum_tree = { path = "crates/sum_tree" }
+terminal = { path = "crates/terminal" }
+terminal_view = { path = "crates/terminal_view" }
+text = { path = "crates/text" }
+theme = { path = "crates/theme" }
+theme_importer = { path = "crates/theme_importer" }
+theme_selector = { path = "crates/theme_selector" }
+ui = { path = "crates/ui" }
+util = { path = "crates/util" }
+vcs_menu = { path = "crates/vcs_menu" }
+vim = { path = "crates/vim" }
+welcome = { path = "crates/welcome" }
+workspace = { path = "crates/workspace" }
+zed = { path = "crates/zed" }
+zed_actions = { path = "crates/zed_actions" }
+
 anyhow = "1.0.57"
 async-compression = { version = "0.4", features = ["gzip", "futures-io"] }
 async-trait = "0.1"
@@ -157,7 +241,7 @@ tree-sitter-go = { git = "https://github.com/tree-sitter/tree-sitter-go", rev =
 tree-sitter-gomod = { git = "https://github.com/camdencheek/tree-sitter-go-mod" }
 tree-sitter-gowork = { git = "https://github.com/d1y/tree-sitter-go-work" }
 tree-sitter-haskell = { git = "https://github.com/tree-sitter/tree-sitter-haskell", rev = "cf98de23e4285b8e6bcb57b050ef2326e2cc284b" }
-tree-sitter-hcl = {git = "https://github.com/MichaHoffmann/tree-sitter-hcl", rev = "v1.1.0"}
+tree-sitter-hcl = { git = "https://github.com/MichaHoffmann/tree-sitter-hcl", rev = "v1.1.0" }
 tree-sitter-heex = { git = "https://github.com/phoenixframework/tree-sitter-heex", rev = "2e1348c3cf2c9323e87c2744796cf3f3868aa82a" }
 tree-sitter-html = "0.19.0"
 tree-sitter-json = { git = "https://github.com/tree-sitter/tree-sitter-json", rev = "40a81c01a40ac48744e0c8ccabbaba1920441199" }
diff --git a/crates/activity_indicator/Cargo.toml b/crates/activity_indicator/Cargo.toml
index 8c438db31d..325c9be6e0 100644
--- a/crates/activity_indicator/Cargo.toml
+++ b/crates/activity_indicator/Cargo.toml
@@ -11,18 +11,18 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
-auto_update = { path = "../auto_update" }
-editor = { path = "../editor" }
+auto_update.workspace = true
+editor.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
-language = { path = "../language" }
-project = { path = "../project" }
-settings = { path = "../settings" }
+gpui.workspace = true
+language.workspace = true
+project.workspace = true
+settings.workspace = true
 smallvec.workspace = true
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace", package = "workspace" }
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
diff --git a/crates/ai/Cargo.toml b/crates/ai/Cargo.toml
index 516514e768..de21b2b501 100644
--- a/crates/ai/Cargo.toml
+++ b/crates/ai/Cargo.toml
@@ -17,9 +17,9 @@ anyhow.workspace = true
 async-trait.workspace = true
 bincode = "1.3.3"
 futures.workspace = true
-gpui = { path = "../gpui" }
+gpui.workspace = true
 isahc.workspace = true
-language = { path = "../language" }
+language.workspace = true
 lazy_static.workspace = true
 log.workspace = true
 matrixmultiply = "0.3.7"
@@ -33,7 +33,7 @@ rusqlite = { version = "0.29.0", features = ["blob", "array", "modern_sqlite"] }
 serde.workspace = true
 serde_json.workspace = true
 tiktoken-rs.workspace = true
-util = { path = "../util" }
+util.workspace = true
 
 [dev-dependencies]
-gpui = { path = "../gpui", features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
diff --git a/crates/assets/Cargo.toml b/crates/assets/Cargo.toml
index ad9cd25b83..19eef955dc 100644
--- a/crates/assets/Cargo.toml
+++ b/crates/assets/Cargo.toml
@@ -7,5 +7,5 @@ license = "GPL-3.0-or-later"
 
 [dependencies]
 anyhow.workspace = true
-gpui = { path = "../gpui" }
+gpui.workspace = true
 rust-embed.workspace = true
diff --git a/crates/assistant/Cargo.toml b/crates/assistant/Cargo.toml
index dba31674b0..97e1a13765 100644
--- a/crates/assistant/Cargo.toml
+++ b/crates/assistant/Cargo.toml
@@ -10,44 +10,44 @@ path = "src/assistant.rs"
 doctest = false
 
 [dependencies]
-ai = { path = "../ai" }
+ai.workspace = true
 anyhow.workspace = true
 chrono.workspace = true
-client = { path = "../client" }
-collections = { path = "../collections" }
-editor = { path = "../editor" }
-fs = { path = "../fs" }
+client.workspace = true
+collections.workspace = true
+editor.workspace = true
+fs.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
+gpui.workspace = true
 indoc.workspace = true
 isahc.workspace = true
-language = { path = "../language" }
+language.workspace = true
 log.workspace = true
-menu = { path = "../menu" }
-multi_buffer = { path = "../multi_buffer" }
+menu.workspace = true
+multi_buffer.workspace = true
 ordered-float.workspace = true
 parking_lot.workspace = true
-project = { path = "../project" }
+project.workspace = true
 regex.workspace = true
 schemars.workspace = true
-search = { path = "../search" }
-semantic_index = { path = "../semantic_index" }
+search.workspace = true
+semantic_index.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smol.workspace = true
-theme = { path = "../theme" }
+theme.workspace = true
 tiktoken-rs.workspace = true
-ui = { path = "../ui" }
-util = { path = "../util" }
+ui.workspace = true
+util.workspace = true
 uuid.workspace = true
-workspace = { path = "../workspace" }
+workspace.workspace = true
 
 [dev-dependencies]
-ai = { path = "../ai", features = ["test-support"] }
+ai = { workspace = true, features = ["test-support"] }
 ctor.workspace = true
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
 env_logger.workspace = true
 log.workspace = true
-project = { path = "../project", features = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
 rand.workspace = true
diff --git a/crates/audio/Cargo.toml b/crates/audio/Cargo.toml
index 7b9b76b635..58ab15d910 100644
--- a/crates/audio/Cargo.toml
+++ b/crates/audio/Cargo.toml
@@ -11,11 +11,11 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
-collections = { path = "../collections" }
+collections.workspace = true
 derive_more.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
+gpui.workspace = true
 log.workspace = true
 parking_lot.workspace = true
 rodio = { version = "0.17.1", default-features = false, features = ["wav"] }
-util = { path = "../util" }
+util.workspace = true
diff --git a/crates/auto_update/Cargo.toml b/crates/auto_update/Cargo.toml
index c89f1d40fe..9341fbe369 100644
--- a/crates/auto_update/Cargo.toml
+++ b/crates/auto_update/Cargo.toml
@@ -11,22 +11,22 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
-client = { path = "../client" }
-db = { path = "../db" }
-gpui = { path = "../gpui" }
+client.workspace = true
+db.workspace = true
+gpui.workspace = true
 isahc.workspace = true
 lazy_static.workspace = true
 log.workspace = true
-menu = { path = "../menu" }
-project = { path = "../project" }
-release_channel = { path = "../release_channel" }
+menu.workspace = true
+project.workspace = true
+release_channel.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smol.workspace = true
 tempfile.workspace = true
-theme = { path = "../theme" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
+theme.workspace = true
+util.workspace = true
+workspace.workspace = true
diff --git a/crates/breadcrumbs/Cargo.toml b/crates/breadcrumbs/Cargo.toml
index a2048084fe..57724663ca 100644
--- a/crates/breadcrumbs/Cargo.toml
+++ b/crates/breadcrumbs/Cargo.toml
@@ -10,20 +10,20 @@ path = "src/breadcrumbs.rs"
 doctest = false
 
 [dependencies]
-collections = { path = "../collections" }
-editor = { path = "../editor" }
-gpui = { path = "../gpui" }
+collections.workspace = true
+editor.workspace = true
+gpui.workspace = true
 itertools = "0.10"
-language = { path = "../language" }
-outline = { path = "../outline" }
-project = { path = "../project" }
-search = { path = "../search" }
-settings = { path = "../settings" }
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-workspace = { path = "../workspace" }
+language.workspace = true
+outline.workspace = true
+project.workspace = true
+search.workspace = true
+settings.workspace = true
+theme.workspace = true
+ui.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-workspace = { path = "../workspace", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/call/Cargo.toml b/crates/call/Cargo.toml
index 9d4b51e659..74726a57a3 100644
--- a/crates/call/Cargo.toml
+++ b/crates/call/Cargo.toml
@@ -22,33 +22,33 @@ test-support = [
 [dependencies]
 anyhow.workspace = true
 async-broadcast = "0.4"
-audio = { path = "../audio" }
-client = { path = "../client" }
-collections = { path = "../collections" }
-fs = { path = "../fs" }
+audio.workspace = true
+client.workspace = true
+collections.workspace = true
+fs.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
+gpui.workspace = true
 image = "0.23"
-language = { path = "../language" }
-live_kit_client = { path = "../live_kit_client" }
+language.workspace = true
+live_kit_client.workspace = true
 log.workspace = true
-media = { path = "../media" }
+media.workspace = true
 postage.workspace = true
-project = { path = "../project" }
+project.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smallvec.workspace = true
-util = { path = "../util" }
+util.workspace = true
 
 [dev-dependencies]
-client = { path = "../client", features = ["test-support"] }
-collections = { path = "../collections", features = ["test-support"] }
-fs = { path = "../fs", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
-live_kit_client = { path = "../live_kit_client", features = ["test-support"] }
-project = { path = "../project", features = ["test-support"] }
-util = { path = "../util", features = ["test-support"] }
+client = { workspace = true, features = ["test-support"] }
+collections = { workspace = true, features = ["test-support"] }
+fs = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
+live_kit_client = { workspace = true, features = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
+util = { workspace = true, features = ["test-support"] }
diff --git a/crates/channel/Cargo.toml b/crates/channel/Cargo.toml
index afb5799b61..f922e8c6d0 100644
--- a/crates/channel/Cargo.toml
+++ b/crates/channel/Cargo.toml
@@ -14,42 +14,42 @@ test-support = ["collections/test-support", "gpui/test-support", "rpc/test-suppo
 
 [dependencies]
 anyhow.workspace = true
-client = { path = "../client" }
-clock = { path = "../clock" }
-collections = { path = "../collections" }
-db = { path = "../db" }
-feature_flags = { path = "../feature_flags" }
+client.workspace = true
+clock.workspace = true
+collections.workspace = true
+db.workspace = true
+feature_flags.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
+gpui.workspace = true
 image = "0.23"
-language = { path = "../language" }
+language.workspace = true
 lazy_static.workspace = true
 log.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
 rand.workspace = true
-release_channel = { path = "../release_channel" }
-rpc = { path = "../rpc" }
+release_channel.workspace = true
+rpc.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smallvec.workspace = true
 smol.workspace = true
-sum_tree = { path = "../sum_tree" }
+sum_tree.workspace = true
 tempfile.workspace = true
-text = { path = "../text" }
+text.workspace = true
 thiserror.workspace = true
 time.workspace = true
 tiny_http = "0.8"
 url.workspace = true
-util = { path = "../util" }
+util.workspace = true
 uuid.workspace = true
 
 [dev-dependencies]
-collections = { path = "../collections", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-rpc = { path = "../rpc", features = ["test-support"] }
-client = { path = "../client", features = ["test-support"] }
-settings = { path = "../settings", features = ["test-support"] }
-util = { path = "../util", features = ["test-support"] }
+collections = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+rpc = { workspace = true, features = ["test-support"] }
+client = { workspace = true, features = ["test-support"] }
+settings = { workspace = true, features = ["test-support"] }
+util = { workspace = true, features = ["test-support"] }
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index d790644e99..6156520034 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -20,7 +20,7 @@ dirs = "3.0"
 ipc-channel = "0.16"
 serde.workspace = true
 serde_derive.workspace = true
-util = { path = "../util" }
+util.workspace = true
 
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation = "0.9"
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
index f405b1a74d..9770ee9b8e 100644
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -14,16 +14,16 @@ test-support = ["collections/test-support", "gpui/test-support", "rpc/test-suppo
 
 [dependencies]
 chrono = { version = "0.4", features = ["serde"] }
-collections = { path = "../collections" }
-db = { path = "../db" }
-gpui = { path = "../gpui" }
-util = { path = "../util" }
-release_channel = { path = "../release_channel" }
-rpc = { path = "../rpc" }
-text = { path = "../text" }
-settings = { path = "../settings" }
-feature_flags = { path = "../feature_flags" }
-sum_tree = { path = "../sum_tree" }
+collections.workspace = true
+db.workspace = true
+gpui.workspace = true
+util.workspace = true
+release_channel.workspace = true
+rpc.workspace = true
+text.workspace = true
+settings.workspace = true
+feature_flags.workspace = true
+sum_tree.workspace = true
 
 anyhow.workspace = true
 async-recursion = "0.3"
@@ -51,8 +51,8 @@ uuid.workspace = true
 url.workspace = true
 
 [dev-dependencies]
-collections = { path = "../collections", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-rpc = { path = "../rpc", features = ["test-support"] }
-settings = { path = "../settings", features = ["test-support"] }
-util = { path = "../util", features = ["test-support"] }
+collections = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+rpc = { workspace = true, features = ["test-support"] }
+settings = { workspace = true, features = ["test-support"] }
+util = { workspace = true, features = ["test-support"] }
diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml
index 0fb8cb929d..02b2e5eb48 100644
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -22,15 +22,15 @@ axum-extra = { version = "0.3", features = ["erased-json"] }
 base64 = "0.13"
 chrono.workspace = true
 clap = { version = "3.1", features = ["derive"], optional = true }
-clock = { path = "../clock" }
-collections = { path = "../collections" }
+clock.workspace = true
+collections.workspace = true
 dashmap = "5.4"
 envy = "0.4.2"
 futures.workspace = true
 hyper = "0.14"
 lazy_static.workspace = true
 lipsum = { version = "0.8", optional = true }
-live_kit_server = { path = "../live_kit_server" }
+live_kit_server.workspace = true
 log.workspace = true
 nanoid = "0.4"
 parking_lot.workspace = true
@@ -38,7 +38,7 @@ prometheus = "0.13"
 prost.workspace = true
 rand.workspace = true
 reqwest = { version = "0.11", features = ["json"], optional = true }
-rpc = { path = "../rpc" }
+rpc.workspace = true
 scrypt = "0.7"
 sea-orm = { version = "0.12.x", features = ["sqlx-postgres", "postgres-array", "runtime-tokio-rustls", "with-uuid"] }
 serde.workspace = true
@@ -47,7 +47,7 @@ serde_json.workspace = true
 sha-1 = "0.9"
 smallvec.workspace = true
 sqlx = { version = "0.7", features = ["runtime-tokio-rustls", "postgres", "json", "time", "uuid", "any"] }
-text = { path = "../text" }
+text.workspace = true
 time.workspace = true
 tokio = { version = "1", features = ["full"] }
 tokio-tungstenite = "0.17"
@@ -57,44 +57,44 @@ tower = "0.4"
 tracing = "0.1.34"
 tracing-log = "0.1.3"
 tracing-subscriber = { version = "0.3.11", features = ["env-filter", "json"] }
-util = { path = "../util" }
+util.workspace = true
 uuid.workspace = true
 
 [dev-dependencies]
-release_channel = { path = "../release_channel" }
+release_channel.workspace = true
 async-trait.workspace = true
-audio = { path = "../audio" }
-call = { path = "../call", features = ["test-support"] }
-channel = { path = "../channel" }
-client = { path = "../client", features = ["test-support"] }
-collab_ui = { path = "../collab_ui", features = ["test-support"] }
-collections = { path = "../collections", features = ["test-support"] }
+audio.workspace = true
+call = { workspace = true, features = ["test-support"] }
+channel.workspace = true
+client = { workspace = true, features = ["test-support"] }
+collab_ui = { workspace = true, features = ["test-support"] }
+collections = { workspace = true, features = ["test-support"] }
 ctor.workspace = true
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
 env_logger.workspace = true
-file_finder = { path = "../file_finder" }
-fs = { path = "../fs", features = ["test-support"] }
-git = { path = "../git", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
+file_finder.workspace = true
+fs = { workspace = true, features = ["test-support"] }
+git = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
 indoc.workspace = true
-language = { path = "../language", features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
 lazy_static.workspace = true
-live_kit_client = { path = "../live_kit_client", features = ["test-support"] }
-lsp = { path = "../lsp", features = ["test-support"] }
-menu = { path = "../menu" }
-node_runtime = { path = "../node_runtime" }
-notifications = { path = "../notifications", features = ["test-support"] }
+live_kit_client = { workspace = true, features = ["test-support"] }
+lsp = { workspace = true, features = ["test-support"] }
+menu.workspace = true
+node_runtime.workspace = true
+notifications = { workspace = true, features = ["test-support"] }
 pretty_assertions.workspace = true
-project = { path = "../project", features = ["test-support"] }
-rpc = { path = "../rpc", features = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
+rpc = { workspace = true, features = ["test-support"] }
 sea-orm = { version = "0.12.x", features = ["sqlx-sqlite"] }
 serde_json.workspace = true
-settings = { path = "../settings", features = ["test-support"] }
+settings = { workspace = true, features = ["test-support"] }
 sqlx = { version = "0.7", features = ["sqlite"] }
-theme = { path = "../theme" }
+theme.workspace = true
 unindent.workspace = true
-util = { path = "../util" }
-workspace = { path = "../workspace", features = ["test-support"] }
+util.workspace = true
+workspace = { workspace = true, features = ["test-support"] }
 
 [features]
 seed-support = ["clap", "lipsum", "reqwest"]
diff --git a/crates/collab_ui/Cargo.toml b/crates/collab_ui/Cargo.toml
index 82de5384b3..e1e1aa7798 100644
--- a/crates/collab_ui/Cargo.toml
+++ b/crates/collab_ui/Cargo.toml
@@ -26,58 +26,58 @@ test-support = [
 
 [dependencies]
 anyhow.workspace = true
-auto_update = { path = "../auto_update" }
-call = { path = "../call" }
-channel = { path = "../channel" }
-client = { path = "../client" }
-clock = { path = "../clock" }
-collections = { path = "../collections" }
-db = { path = "../db" }
-editor = { path = "../editor" }
-feature_flags = { path = "../feature_flags" }
-feedback = { path = "../feedback" }
+auto_update.workspace = true
+call.workspace = true
+channel.workspace = true
+client.workspace = true
+clock.workspace = true
+collections.workspace = true
+db.workspace = true
+editor.workspace = true
+feature_flags.workspace = true
+feedback.workspace = true
 futures.workspace = true
-fuzzy = { path = "../fuzzy" }
-gpui = { path = "../gpui" }
-language = { path = "../language" }
+fuzzy.workspace = true
+gpui.workspace = true
+language.workspace = true
 lazy_static.workspace = true
 log.workspace = true
-menu = { path = "../menu" }
-notifications = { path = "../notifications" }
+menu.workspace = true
+notifications.workspace = true
 parking_lot.workspace = true
-picker = { path = "../picker" }
+picker.workspace = true
 postage.workspace = true
-project = { path = "../project" }
-recent_projects = { path = "../recent_projects" }
-rich_text = { path = "../rich_text" }
-rpc = { path = "../rpc" }
+project.workspace = true
+recent_projects.workspace = true
+rich_text.workspace = true
+rpc.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smallvec.workspace = true
-story = { path = "../story", optional = true }
-theme = { path = "../theme" }
-theme_selector = { path = "../theme_selector" }
+story = { workspace = true, optional = true }
+theme.workspace = true
+theme_selector.workspace = true
 time.workspace = true
-ui = { path = "../ui" }
-util = { path = "../util" }
-vcs_menu = { path = "../vcs_menu" }
-workspace = { path = "../workspace" }
-zed_actions = { path = "../zed_actions" }
+ui.workspace = true
+util.workspace = true
+vcs_menu.workspace = true
+workspace.workspace = true
+zed_actions.workspace = true
 
 [dev-dependencies]
-call = { path = "../call", features = ["test-support"] }
-client = { path = "../client", features = ["test-support"] }
-collections = { path = "../collections", features = ["test-support"] }
-editor = { path = "../editor", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-notifications = { path = "../notifications", features = ["test-support"] }
+call = { workspace = true, features = ["test-support"] }
+client = { workspace = true, features = ["test-support"] }
+collections = { workspace = true, features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+notifications = { workspace = true, features = ["test-support"] }
 pretty_assertions.workspace = true
-project = { path = "../project", features = ["test-support"] }
-rpc = { path = "../rpc", features = ["test-support"] }
-settings = { path = "../settings", features = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
+rpc = { workspace = true, features = ["test-support"] }
+settings = { workspace = true, features = ["test-support"] }
 tree-sitter-markdown.workspace = true
-util = { path = "../util", features = ["test-support"] }
-workspace = { path = "../workspace", features = ["test-support"] }
+util = { workspace = true, features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/color/Cargo.toml b/crates/color/Cargo.toml
index 84fe609703..e8530befdf 100644
--- a/crates/color/Cargo.toml
+++ b/crates/color/Cargo.toml
@@ -16,4 +16,4 @@ doctest = true
 [dependencies]
 itertools = { version = "0.11.0", optional = true }
 palette = "0.7.3"
-story = { path = "../story", optional = true }
+story = { workspace = true, optional = true }
diff --git a/crates/command_palette/Cargo.toml b/crates/command_palette/Cargo.toml
index 6665193403..cf11502741 100644
--- a/crates/command_palette/Cargo.toml
+++ b/crates/command_palette/Cargo.toml
@@ -11,32 +11,32 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
-client = { path = "../client" }
-collections = { path = "../collections" }
+client.workspace = true
+collections.workspace = true
 # HACK: We're only depending on `copilot` here for `CommandPaletteFilter`.  See the attached comment on that type.
-copilot = { path = "../copilot" }
-editor = { path = "../editor" }
-fuzzy = {  path = "../fuzzy" }
-gpui = { path = "../gpui" }
-picker = { path = "../picker" }
-project = { path = "../project" }
-release_channel = { path = "../release_channel" }
+copilot.workspace = true
+editor.workspace = true
+fuzzy.workspace = true
+gpui.workspace = true
+picker.workspace = true
+project.workspace = true
+release_channel.workspace = true
 serde.workspace = true
-settings = { path = "../settings" }
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
-zed_actions = { path = "../zed_actions" }
+settings.workspace = true
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
+zed_actions.workspace = true
 
 [dev-dependencies]
 ctor.workspace = true
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
 env_logger.workspace = true
-go_to_line = { path = "../go_to_line" }
-gpui = { path = "../gpui", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
-menu = { path = "../menu" }
-project = { path = "../project", features = ["test-support"] }
+go_to_line.workspace = true
+gpui = { workspace = true, features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
+menu.workspace = true
+project = { workspace = true, features = ["test-support"] }
 serde_json.workspace = true
-workspace = { path = "../workspace", features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/copilot/Cargo.toml b/crates/copilot/Cargo.toml
index 73ce1c4df4..8ad50e898a 100644
--- a/crates/copilot/Cargo.toml
+++ b/crates/copilot/Cargo.toml
@@ -23,28 +23,28 @@ test-support = [
 anyhow.workspace = true
 async-compression.workspace = true
 async-tar = "0.4.2"
-collections = { path = "../collections" }
+collections.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
-language = { path = "../language" }
+gpui.workspace = true
+language.workspace = true
 log.workspace = true
-lsp = { path = "../lsp" }
-node_runtime = { path = "../node_runtime" }
+lsp.workspace = true
+node_runtime.workspace = true
 parking_lot.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smol.workspace = true
-theme = { path = "../theme" }
-util = { path = "../util" }
+theme.workspace = true
+util.workspace = true
 
 [dev-dependencies]
-clock = { path = "../clock" }
-collections = { path = "../collections", features = ["test-support"] }
-fs = { path = "../fs", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
-lsp = { path = "../lsp", features = ["test-support"] }
-rpc = { path = "../rpc", features = ["test-support"] }
-settings = { path = "../settings", features = ["test-support"] }
-util = { path = "../util", features = ["test-support"] }
+clock.workspace = true
+collections = { workspace = true, features = ["test-support"] }
+fs = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
+lsp = { workspace = true, features = ["test-support"] }
+rpc = { workspace = true, features = ["test-support"] }
+settings = { workspace = true, features = ["test-support"] }
+util = { workspace = true, features = ["test-support"] }
diff --git a/crates/copilot_ui/Cargo.toml b/crates/copilot_ui/Cargo.toml
index 6d9f87ddce..9ce26eef4c 100644
--- a/crates/copilot_ui/Cargo.toml
+++ b/crates/copilot_ui/Cargo.toml
@@ -11,19 +11,19 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
-copilot = { path = "../copilot" }
-editor = { path = "../editor" }
-fs = { path = "../fs" }
+copilot.workspace = true
+editor.workspace = true
+fs.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
-language = { path = "../language" }
-settings = { path = "../settings" }
+gpui.workspace = true
+language.workspace = true
+settings.workspace = true
 smol.workspace = true
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
-zed_actions = { path = "../zed_actions" }
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
+zed_actions.workspace = true
 
 [dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
diff --git a/crates/db/Cargo.toml b/crates/db/Cargo.toml
index 5a70f2a937..138eba776a 100644
--- a/crates/db/Cargo.toml
+++ b/crates/db/Cargo.toml
@@ -15,21 +15,21 @@ test-support = []
 [dependencies]
 anyhow.workspace = true
 async-trait.workspace = true
-collections = { path = "../collections" }
-gpui = { path = "../gpui" }
+collections.workspace = true
+gpui.workspace = true
 indoc.workspace = true
 lazy_static.workspace = true
 log.workspace = true
 parking_lot.workspace = true
-release_channel = { path = "../release_channel" }
+release_channel.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 smol.workspace = true
-sqlez = { path = "../sqlez" }
-sqlez_macros = { path = "../sqlez_macros" }
-util = { path = "../util" }
+sqlez.workspace = true
+sqlez_macros.workspace = true
+util.workspace = true
 
 [dev-dependencies]
 env_logger.workspace = true
-gpui = { path = "../gpui", features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
 tempfile.workspace = true
diff --git a/crates/diagnostics/Cargo.toml b/crates/diagnostics/Cargo.toml
index 79a7a717c7..8a7980e10c 100644
--- a/crates/diagnostics/Cargo.toml
+++ b/crates/diagnostics/Cargo.toml
@@ -11,32 +11,32 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
-collections = { path = "../collections" }
-editor = { path = "../editor" }
+collections.workspace = true
+editor.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
-language = { path = "../language" }
+gpui.workspace = true
+language.workspace = true
 log.workspace = true
-lsp = { path = "../lsp" }
+lsp.workspace = true
 postage.workspace = true
-project = { path = "../project" }
+project.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smallvec.workspace = true
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-client = { path = "../client", features = ["test-support"] }
-editor = { path = "../editor", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
-lsp = { path = "../lsp", features = ["test-support"] }
+client = { workspace = true, features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
+lsp = { workspace = true, features = ["test-support"] }
 serde_json.workspace = true
-theme = { path = "../theme", features = ["test-support"] }
+theme = { workspace = true, features = ["test-support"] }
 unindent.workspace = true
-workspace = { path = "../workspace", features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/editor/Cargo.toml b/crates/editor/Cargo.toml
index be8745e4c2..a838dd6572 100644
--- a/crates/editor/Cargo.toml
+++ b/crates/editor/Cargo.toml
@@ -26,68 +26,68 @@ test-support = [
 [dependencies]
 aho-corasick = "1.1"
 anyhow.workspace = true
-client = { path = "../client" }
-clock = { path = "../clock" }
-collections = { path = "../collections" }
+client.workspace = true
+clock.workspace = true
+collections.workspace = true
 convert_case = "0.6.0"
-copilot = { path = "../copilot" }
-db = { path = "../db" }
+copilot.workspace = true
+db.workspace = true
 futures.workspace = true
-fuzzy = { path = "../fuzzy" }
-git = { path = "../git" }
-gpui = { path = "../gpui" }
+fuzzy.workspace = true
+git.workspace = true
+gpui.workspace = true
 indoc = "1.0.4"
 itertools = "0.10"
-language = { path = "../language" }
+language.workspace = true
 lazy_static.workspace = true
 linkify = "0.10.0"
 log.workspace = true
-lsp = { path = "../lsp" }
-multi_buffer = { path = "../multi_buffer" }
+lsp.workspace = true
+multi_buffer.workspace = true
 ordered-float.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
-project = { path = "../project" }
+project.workspace = true
 rand.workspace = true
-rich_text = { path = "../rich_text" }
-rpc = { path = "../rpc" }
+rich_text.workspace = true
+rpc.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smallvec.workspace = true
 smol.workspace = true
-snippet = { path = "../snippet" }
-sqlez = { path = "../sqlez" }
-sum_tree = { path = "../sum_tree" }
-text = { path = "../text" }
-theme = { path = "../theme" }
+snippet.workspace = true
+sqlez.workspace = true
+sum_tree.workspace = true
+text.workspace = true
+theme.workspace = true
 tree-sitter-html = { workspace = true, optional = true }
 tree-sitter-rust = { workspace = true, optional = true }
 tree-sitter-typescript = { workspace = true, optional = true }
-ui = { path = "../ui" }
+ui.workspace = true
 url.workspace = true
-util = { path = "../util" }
-workspace = { path = "../workspace" }
+util.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-copilot = { path = "../copilot", features = ["test-support"] }
+copilot = { workspace = true, features = ["test-support"] }
 ctor.workspace = true
 env_logger.workspace = true
-gpui = { path = "../gpui", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
-lsp = { path = "../lsp", features = ["test-support"] }
-multi_buffer = { path = "../multi_buffer", features = ["test-support"] }
-project = { path = "../project", features = ["test-support"] }
-release_channel = { path = "../release_channel" }
+gpui = { workspace = true, features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
+lsp = { workspace = true, features = ["test-support"] }
+multi_buffer = { workspace = true, features = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
+release_channel.workspace = true
 rand.workspace = true
-settings = { path = "../settings", features = ["test-support"] }
-text = { path = "../text", features = ["test-support"] }
+settings = { workspace = true, features = ["test-support"] }
+text = { workspace = true, features = ["test-support"] }
 tree-sitter-html.workspace = true
 tree-sitter-rust.workspace = true
 tree-sitter-typescript.workspace = true
 tree-sitter.workspace = true
 unindent.workspace = true
-util = { path = "../util", features = ["test-support"] }
-workspace = { path = "../workspace", features = ["test-support"] }
+util = { workspace = true, features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/feature_flags/Cargo.toml b/crates/feature_flags/Cargo.toml
index 20c106393f..78caa1dc72 100644
--- a/crates/feature_flags/Cargo.toml
+++ b/crates/feature_flags/Cargo.toml
@@ -10,4 +10,4 @@ path = "src/feature_flags.rs"
 
 [dependencies]
 anyhow.workspace = true
-gpui = { path = "../gpui" }
+gpui.workspace = true
diff --git a/crates/feedback/Cargo.toml b/crates/feedback/Cargo.toml
index 59344eebec..30b4773d6f 100644
--- a/crates/feedback/Cargo.toml
+++ b/crates/feedback/Cargo.toml
@@ -14,34 +14,34 @@ test-support = []
 [dependencies]
 anyhow.workspace = true
 bitflags = "2.4.1"
-client = { path = "../client" }
-db = { path = "../db" }
-editor = { path = "../editor" }
+client.workspace = true
+db.workspace = true
+editor.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
+gpui.workspace = true
 human_bytes = "0.4.1"
 isahc.workspace = true
-language = { path = "../language" }
+language.workspace = true
 lazy_static.workspace = true
 log.workspace = true
-menu = { path = "../menu" }
+menu.workspace = true
 postage.workspace = true
-project = { path = "../project" }
+project.workspace = true
 regex.workspace = true
-release_channel = { path = "../release_channel" }
+release_channel.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smallvec.workspace = true
 smol.workspace = true
 sysinfo.workspace = true
-theme = { path = "../theme" }
+theme.workspace = true
 tree-sitter-markdown = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "330ecab87a3e3a7211ac69bbadc19eabecdb1cca" }
-ui = { path = "../ui" }
+ui.workspace = true
 urlencoding = "2.1.2"
-util = { path = "../util" }
-workspace = { path = "../workspace" }
+util.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
diff --git a/crates/file_finder/Cargo.toml b/crates/file_finder/Cargo.toml
index e67997f97d..25e77d4dab 100644
--- a/crates/file_finder/Cargo.toml
+++ b/crates/file_finder/Cargo.toml
@@ -11,29 +11,29 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
-collections = { path = "../collections" }
-editor = { path = "../editor" }
-fuzzy = {  path = "../fuzzy" }
-gpui = { path = "../gpui" }
+collections.workspace = true
+editor.workspace = true
+fuzzy.workspace = true
+gpui.workspace = true
 itertools = "0.11"
-menu = { path = "../menu" }
-picker = { path = "../picker" }
+menu.workspace = true
+picker.workspace = true
 postage.workspace = true
-project = { path = "../project" }
+project.workspace = true
 serde.workspace = true
-settings = { path = "../settings" }
-text = { path = "../text" }
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
+settings.workspace = true
+text.workspace = true
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
 ctor.workspace = true
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
 env_logger.workspace = true
-gpui = { path = "../gpui", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
 serde_json.workspace = true
-theme = { path = "../theme", features = ["test-support"] }
-workspace = { path = "../workspace", features = ["test-support"] }
+theme = { workspace = true, features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/fs/Cargo.toml b/crates/fs/Cargo.toml
index debdefe3ce..ea18ec1fb3 100644
--- a/crates/fs/Cargo.toml
+++ b/crates/fs/Cargo.toml
@@ -9,11 +9,11 @@ license = "GPL-3.0-or-later"
 path = "src/fs.rs"
 
 [dependencies]
-collections = { path = "../collections" }
-rope = { path = "../rope" }
-text = { path = "../text" }
-util = { path = "../util" }
-sum_tree = { path = "../sum_tree" }
+collections.workspace = true
+rope.workspace = true
+text.workspace = true
+util.workspace = true
+sum_tree.workspace = true
 
 anyhow.workspace = true
 async-trait.workspace = true
@@ -31,16 +31,16 @@ log.workspace = true
 libc = "0.2"
 time.workspace = true
 
-gpui = { path = "../gpui", optional = true}
+gpui = { workspace = true, optional = true}
 
 [target.'cfg(target_os = "macos")'.dependencies]
-fsevent = { path = "../fsevent" }
+fsevent.workspace = true
 
 [target.'cfg(not(target_os = "macos"))'.dependencies]
 notify = "6.1.1"
 
 [dev-dependencies]
-gpui = { path = "../gpui", features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
 
 [features]
 test-support = ["gpui/test-support"]
diff --git a/crates/fuzzy/Cargo.toml b/crates/fuzzy/Cargo.toml
index 5fc2e3de63..3b323afdaa 100644
--- a/crates/fuzzy/Cargo.toml
+++ b/crates/fuzzy/Cargo.toml
@@ -10,5 +10,5 @@ path = "src/fuzzy.rs"
 doctest = false
 
 [dependencies]
-gpui = { path = "../gpui" }
-util = { path = "../util" }
+gpui.workspace = true
+util.workspace = true
diff --git a/crates/git/Cargo.toml b/crates/git/Cargo.toml
index 2d4b652069..648ea336c2 100644
--- a/crates/git/Cargo.toml
+++ b/crates/git/Cargo.toml
@@ -11,17 +11,17 @@ path = "src/git.rs"
 [dependencies]
 anyhow.workspace = true
 async-trait.workspace = true
-clock = { path = "../clock" }
-collections = { path = "../collections" }
+clock.workspace = true
+collections.workspace = true
 futures.workspace = true
 git2.workspace = true
 lazy_static.workspace = true
 log.workspace = true
 parking_lot.workspace = true
 smol.workspace = true
-sum_tree = { path = "../sum_tree" }
-text = { path = "../text" }
-util = { path = "../util" }
+sum_tree.workspace = true
+text.workspace = true
+util.workspace = true
 
 [dev-dependencies]
 unindent.workspace = true
diff --git a/crates/go_to_line/Cargo.toml b/crates/go_to_line/Cargo.toml
index 1968e2dadf..e75ed95ad5 100644
--- a/crates/go_to_line/Cargo.toml
+++ b/crates/go_to_line/Cargo.toml
@@ -10,17 +10,17 @@ path = "src/go_to_line.rs"
 doctest = false
 
 [dependencies]
-editor = { path = "../editor" }
-gpui = { path = "../gpui" }
-menu = { path = "../menu" }
+editor.workspace = true
+gpui.workspace = true
+menu.workspace = true
 postage.workspace = true
 serde.workspace = true
-settings = { path = "../settings" }
-text = { path = "../text" }
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
+settings.workspace = true
+text.workspace = true
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 96c7b4b02c..9e250acda9 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -26,14 +26,14 @@ anyhow.workspace = true
 async-task = "4.7"
 backtrace = { version = "0.3", optional = true }
 bitflags = "2.4.0"
-collections = { path = "../collections" }
+collections.workspace = true
 ctor.workspace = true
 derive_more.workspace = true
 dhat = { version = "0.3", optional = true }
 env_logger = { version = "0.9", optional = true }
 etagere = "0.2"
 futures.workspace = true
-gpui_macros = { path = "../gpui_macros" }
+gpui_macros.workspace = true
 image = "0.23"
 itertools = "0.10"
 lazy_static.workspace = true
@@ -57,24 +57,24 @@ serde_json.workspace = true
 slotmap = "1.0.6"
 smallvec.workspace = true
 smol.workspace = true
-sum_tree = { path = "../sum_tree" }
+sum_tree.workspace = true
 taffy = { git = "https://github.com/DioxusLabs/taffy", rev = "1876f72bee5e376023eaa518aa7b8a34c769bd1b" }
 thiserror.workspace = true
 time.workspace = true
 tiny-skia = "0.5"
 usvg = { version = "0.14", features = [] }
-util = { path = "../util" }
+util.workspace = true
 uuid = { version = "1.1.2", features = ["v4"] }
 waker-fn = "1.1.0"
 
 [dev-dependencies]
 backtrace = "0.3"
-collections = { path = "../collections", features = ["test-support"] }
+collections = { workspace = true, features = ["test-support"] }
 dhat = "0.3"
 env_logger.workspace = true
 png = "0.16"
 simplelog = "0.9"
-util = { path = "../util", features = ["test-support"] }
+util = { workspace = true, features = ["test-support"] }
 
 [build-dependencies]
 bindgen = "0.65.1"
@@ -89,6 +89,6 @@ core-text = "19.2"
 font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "d97147f" }
 foreign-types = "0.3"
 log.workspace = true
-media = { path = "../media" }
+media.workspace = true
 metal = "0.21.0"
 objc = "0.2"
diff --git a/crates/install_cli/Cargo.toml b/crates/install_cli/Cargo.toml
index d50ab5191a..73bec50a16 100644
--- a/crates/install_cli/Cargo.toml
+++ b/crates/install_cli/Cargo.toml
@@ -13,7 +13,7 @@ test-support = []
 
 [dependencies]
 anyhow.workspace = true
-gpui = { path = "../gpui" }
+gpui.workspace = true
 log.workspace = true
 smol.workspace = true
-util = { path = "../util" }
+util.workspace = true
diff --git a/crates/journal/Cargo.toml b/crates/journal/Cargo.toml
index 9330a2efff..1b8fb44bc5 100644
--- a/crates/journal/Cargo.toml
+++ b/crates/journal/Cargo.toml
@@ -13,15 +13,15 @@ doctest = false
 anyhow.workspace = true
 chrono = "0.4"
 dirs = "4.0"
-editor = { path = "../editor" }
-gpui = { path = "../gpui" }
+editor.workspace = true
+gpui.workspace = true
 log.workspace = true
 schemars.workspace = true
 serde.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 shellexpand = "2.1.0"
-util = { path = "../util" }
-workspace = { path = "../workspace" }
+util.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
diff --git a/crates/language/Cargo.toml b/crates/language/Cargo.toml
index 826a8287e5..821fa80840 100644
--- a/crates/language/Cargo.toml
+++ b/crates/language/Cargo.toml
@@ -26,50 +26,50 @@ test-support = [
 anyhow.workspace = true
 async-broadcast = "0.4"
 async-trait.workspace = true
-clock = { path = "../clock" }
-collections = { path = "../collections" }
+clock.workspace = true
+collections.workspace = true
 futures.workspace = true
-fuzzy = { path = "../fuzzy" }
-git = { path = "../git" }
+fuzzy.workspace = true
+git.workspace = true
 globset.workspace = true
-gpui = { path = "../gpui" }
+gpui.workspace = true
 lazy_static.workspace = true
 log.workspace = true
-lsp = { path = "../lsp" }
+lsp.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
 rand = { workspace = true, optional = true }
 regex.workspace = true
-rpc = { path = "../rpc" }
+rpc.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 similar = "1.3"
 smallvec.workspace = true
 smol.workspace = true
-sum_tree = { path = "../sum_tree" }
-text = { path = "../text" }
-theme = { path = "../theme" }
+sum_tree.workspace = true
+text.workspace = true
+theme.workspace = true
 tree-sitter-rust = { workspace = true, optional = true }
 tree-sitter-typescript = { workspace = true, optional = true }
 pulldown-cmark.workspace = true
 tree-sitter.workspace = true
 unicase = "2.6"
-util = { path = "../util" }
+util.workspace = true
 
 [dev-dependencies]
-client = { path = "../client", features = ["test-support"] }
-collections = { path = "../collections", features = ["test-support"] }
+client = { workspace = true, features = ["test-support"] }
+collections = { workspace = true, features = ["test-support"] }
 ctor.workspace = true
 env_logger.workspace = true
-gpui = { path = "../gpui", features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
 indoc.workspace = true
-lsp = { path = "../lsp", features = ["test-support"] }
+lsp = { workspace = true, features = ["test-support"] }
 rand.workspace = true
-settings = { path = "../settings", features = ["test-support"] }
-text = { path = "../text", features = ["test-support"] }
+settings = { workspace = true, features = ["test-support"] }
+text = { workspace = true, features = ["test-support"] }
 tree-sitter-elixir.workspace = true
 tree-sitter-embedded-template.workspace = true
 tree-sitter-heex.workspace = true
@@ -81,4 +81,4 @@ tree-sitter-ruby.workspace = true
 tree-sitter-rust.workspace = true
 tree-sitter-typescript.workspace = true
 unindent.workspace = true
-util = { path = "../util", features = ["test-support"] }
+util = { workspace = true, features = ["test-support"] }
diff --git a/crates/language_selector/Cargo.toml b/crates/language_selector/Cargo.toml
index adeb9359d2..dc31046054 100644
--- a/crates/language_selector/Cargo.toml
+++ b/crates/language_selector/Cargo.toml
@@ -11,17 +11,17 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
-editor = { path = "../editor" }
-fuzzy = {  path = "../fuzzy" }
-gpui = { path = "../gpui" }
-language = { path = "../language" }
-picker = { path = "../picker" }
-project = { path = "../project" }
-settings = { path = "../settings" }
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
+editor.workspace = true
+fuzzy.workspace = true
+gpui.workspace = true
+language.workspace = true
+picker.workspace = true
+project.workspace = true
+settings.workspace = true
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
diff --git a/crates/language_tools/Cargo.toml b/crates/language_tools/Cargo.toml
index 769509aa6b..06884fe455 100644
--- a/crates/language_tools/Cargo.toml
+++ b/crates/language_tools/Cargo.toml
@@ -11,27 +11,27 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
-collections = { path = "../collections" }
-editor = { path = "../editor" }
+collections.workspace = true
+editor.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
-language = { path = "../language" }
-lsp = { path = "../lsp" }
-project = { path = "../project" }
+gpui.workspace = true
+language.workspace = true
+lsp.workspace = true
+project.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
-theme = { path = "../theme" }
+settings.workspace = true
+theme.workspace = true
 tree-sitter.workspace = true
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-client = { path = "../client", features = ["test-support"] }
-editor = { path = "../editor", features = ["test-support"] }
-release_channel = { path = "../release_channel" }
+client = { workspace = true, features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
+release_channel.workspace = true
 env_logger.workspace = true
-gpui = { path = "../gpui", features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
 unindent.workspace = true
-util = { path = "../util", features = ["test-support"] }
+util = { workspace = true, features = ["test-support"] }
diff --git a/crates/live_kit_client/Cargo.toml b/crates/live_kit_client/Cargo.toml
index 32c180c48c..732cbde338 100644
--- a/crates/live_kit_client/Cargo.toml
+++ b/crates/live_kit_client/Cargo.toml
@@ -26,12 +26,12 @@ test-support = [
 anyhow.workspace = true
 async-broadcast = "0.4"
 async-trait = { workspace = true, optional = true }
-collections = { path = "../collections", optional = true }
+collections = { workspace = true, optional = true }
 futures.workspace = true
-gpui = { path = "../gpui", optional = true }
-live_kit_server = { path = "../live_kit_server", optional = true }
+gpui = { workspace = true, optional = true }
+live_kit_server = { workspace = true, optional = true }
 log.workspace = true
-media = { path = "../media" }
+media.workspace = true
 nanoid = { version ="0.4", optional = true}
 parking_lot.workspace = true
 postage.workspace = true
@@ -41,9 +41,9 @@ core-foundation = "0.9.3"
 
 [target.'cfg(not(target_os = "macos"))'.dependencies]
 async-trait = { workspace = true }
-collections = { path = "../collections", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-live_kit_server = { path = "../live_kit_server" }
+collections = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+live_kit_server.workspace = true
 
 [dev-dependencies]
 anyhow.workspace = true
@@ -51,14 +51,14 @@ async-trait.workspace = true
 block = "0.1"
 byteorder = "1.4"
 bytes = "1.2"
-collections = { path = "../collections", features = ["test-support"] }
+collections = { workspace = true, features = ["test-support"] }
 foreign-types = "0.3"
 futures.workspace = true
-gpui = { path = "../gpui", features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
 hmac = "0.12"
 jwt = "0.16"
-live_kit_server = { path = "../live_kit_server" }
-media = { path = "../media" }
+live_kit_server.workspace = true
+media.workspace = true
 nanoid = "0.4"
 parking_lot.workspace = true
 serde.workspace = true
diff --git a/crates/lsp/Cargo.toml b/crates/lsp/Cargo.toml
index c1fdd7b107..5f218aea6c 100644
--- a/crates/lsp/Cargo.toml
+++ b/crates/lsp/Cargo.toml
@@ -15,9 +15,9 @@ test-support = ["async-pipe"]
 [dependencies]
 anyhow.workspace = true
 async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "82d00a04211cf4e1236029aa03e6b6ce2a74c553", optional = true }
-collections = { path = "../collections" }
+collections.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
+gpui.workspace = true
 log.workspace = true
 lsp-types = { git = "https://github.com/zed-industries/lsp-types", branch = "updated-completion-list-item-defaults" }
 parking_lot.workspace = true
@@ -26,13 +26,13 @@ serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
 smol.workspace = true
-util = { path = "../util" }
-release_channel = { path = "../release_channel" }
+util.workspace = true
+release_channel.workspace = true
 
 [dev-dependencies]
 async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "82d00a04211cf4e1236029aa03e6b6ce2a74c553" }
 ctor.workspace = true
 env_logger.workspace = true
-gpui = { path = "../gpui", features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
 unindent.workspace = true
-util = { path = "../util", features = ["test-support"] }
+util = { workspace = true, features = ["test-support"] }
diff --git a/crates/markdown_preview/Cargo.toml b/crates/markdown_preview/Cargo.toml
index df41f12d21..ba23a82259 100644
--- a/crates/markdown_preview/Cargo.toml
+++ b/crates/markdown_preview/Cargo.toml
@@ -13,19 +13,19 @@ test-support = []
 
 [dependencies]
 anyhow.workspace = true
-editor = { path = "../editor" }
-gpui = { path = "../gpui" }
-language = { path = "../language" }
+editor.workspace = true
+gpui.workspace = true
+language.workspace = true
 lazy_static.workspace = true
 log.workspace = true
-menu = { path = "../menu" }
-project = { path = "../project" }
+menu.workspace = true
+project.workspace = true
 pulldown-cmark.workspace = true
-rich_text = { path = "../rich_text" }
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
+rich_text.workspace = true
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
diff --git a/crates/menu/Cargo.toml b/crates/menu/Cargo.toml
index 5492570b6b..cf17727242 100644
--- a/crates/menu/Cargo.toml
+++ b/crates/menu/Cargo.toml
@@ -10,5 +10,5 @@ path = "src/menu.rs"
 doctest = false
 
 [dependencies]
-gpui = { path = "../gpui" }
+gpui.workspace = true
 serde = { workspace = true }
diff --git a/crates/multi_buffer/Cargo.toml b/crates/multi_buffer/Cargo.toml
index 5fc7bdb254..ed3993400a 100644
--- a/crates/multi_buffer/Cargo.toml
+++ b/crates/multi_buffer/Cargo.toml
@@ -23,54 +23,54 @@ test-support = [
 [dependencies]
 aho-corasick = "1.1"
 anyhow.workspace = true
-client = { path = "../client" }
-clock = { path = "../clock" }
-collections = { path = "../collections" }
+client.workspace = true
+clock.workspace = true
+collections.workspace = true
 convert_case = "0.6.0"
 futures.workspace = true
-git = { path = "../git" }
-gpui = { path = "../gpui" }
+git.workspace = true
+gpui.workspace = true
 indoc = "1.0.4"
 itertools = "0.10"
-language = { path = "../language" }
+language.workspace = true
 lazy_static.workspace = true
 log.workspace = true
-lsp = { path = "../lsp" }
+lsp.workspace = true
 ordered-float.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
 pulldown-cmark.workspace = true
 rand.workspace = true
-rich_text = { path = "../rich_text" }
+rich_text.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smallvec.workspace = true
 smol.workspace = true
-snippet = { path = "../snippet" }
-sum_tree = { path = "../sum_tree" }
-text = { path = "../text" }
-theme = { path = "../theme" }
+snippet.workspace = true
+sum_tree.workspace = true
+text.workspace = true
+theme.workspace = true
 tree-sitter-html = { workspace = true, optional = true }
 tree-sitter-rust = { workspace = true, optional = true }
 tree-sitter-typescript = { workspace = true, optional = true }
-util = { path = "../util" }
+util.workspace = true
 
 [dev-dependencies]
-copilot = { path = "../copilot", features = ["test-support"] }
+copilot = { workspace = true, features = ["test-support"] }
 ctor.workspace = true
 env_logger.workspace = true
-gpui = { path = "../gpui", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
-lsp = { path = "../lsp", features = ["test-support"] }
-project = { path = "../project", features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
+lsp = { workspace = true, features = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
 rand.workspace = true
-settings = { path = "../settings", features = ["test-support"] }
-text = { path = "../text", features = ["test-support"] }
+settings = { workspace = true, features = ["test-support"] }
+text = { workspace = true, features = ["test-support"] }
 tree-sitter-html.workspace = true
 tree-sitter-rust.workspace = true
 tree-sitter-typescript.workspace = true
 tree-sitter.workspace = true
 unindent.workspace = true
-util = { path = "../util", features = ["test-support"] }
+util = { workspace = true, features = ["test-support"] }
diff --git a/crates/node_runtime/Cargo.toml b/crates/node_runtime/Cargo.toml
index b111cf5752..891dcd9e48 100644
--- a/crates/node_runtime/Cargo.toml
+++ b/crates/node_runtime/Cargo.toml
@@ -21,4 +21,4 @@ serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
 smol.workspace = true
-util = { path = "../util" }
+util.workspace = true
diff --git a/crates/notifications/Cargo.toml b/crates/notifications/Cargo.toml
index 134bda415b..269766dcce 100644
--- a/crates/notifications/Cargo.toml
+++ b/crates/notifications/Cargo.toml
@@ -19,24 +19,24 @@ test-support = [
 
 [dependencies]
 anyhow.workspace = true
-channel = { path = "../channel" }
-client = { path = "../client" }
-clock = { path = "../clock" }
-collections = { path = "../collections" }
-db = { path = "../db" }
-feature_flags = { path = "../feature_flags" }
-gpui = { path = "../gpui" }
-rpc = { path = "../rpc" }
-settings = { path = "../settings" }
-sum_tree = { path = "../sum_tree" }
-text = { path = "../text" }
+channel.workspace = true
+client.workspace = true
+clock.workspace = true
+collections.workspace = true
+db.workspace = true
+feature_flags.workspace = true
+gpui.workspace = true
+rpc.workspace = true
+settings.workspace = true
+sum_tree.workspace = true
+text.workspace = true
 time.workspace = true
-util = { path = "../util" }
+util.workspace = true
 
 [dev-dependencies]
-client = { path = "../client", features = ["test-support"] }
-collections = { path = "../collections", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-rpc = { path = "../rpc", features = ["test-support"] }
-settings = { path = "../settings", features = ["test-support"] }
-util = { path = "../util", features = ["test-support"] }
+client = { workspace = true, features = ["test-support"] }
+collections = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+rpc = { workspace = true, features = ["test-support"] }
+settings = { workspace = true, features = ["test-support"] }
+util = { workspace = true, features = ["test-support"] }
diff --git a/crates/outline/Cargo.toml b/crates/outline/Cargo.toml
index 9dbd540797..a67371847a 100644
--- a/crates/outline/Cargo.toml
+++ b/crates/outline/Cargo.toml
@@ -10,20 +10,20 @@ path = "src/outline.rs"
 doctest = false
 
 [dependencies]
-editor = { path = "../editor" }
-fuzzy = {  path = "../fuzzy" }
-gpui = { path = "../gpui" }
-language = { path = "../language" }
+editor.workspace = true
+fuzzy.workspace = true
+gpui.workspace = true
+language.workspace = true
 ordered-float.workspace = true
-picker = { path = "../picker" }
+picker.workspace = true
 postage.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smol.workspace = true
-text = { path = "../text" }
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
+text.workspace = true
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
diff --git a/crates/picker/Cargo.toml b/crates/picker/Cargo.toml
index 480911fe47..63c408fb2f 100644
--- a/crates/picker/Cargo.toml
+++ b/crates/picker/Cargo.toml
@@ -10,19 +10,19 @@ path = "src/picker.rs"
 doctest = false
 
 [dependencies]
-editor = { path = "../editor" }
-gpui = { path = "../gpui" }
-menu = { path = "../menu" }
+editor.workspace = true
+gpui.workspace = true
+menu.workspace = true
 parking_lot.workspace = true
-settings = { path = "../settings" }
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
+settings.workspace = true
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
 ctor.workspace = true
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
 env_logger.workspace = true
-gpui = { path = "../gpui", features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
 serde_json.workspace = true
diff --git a/crates/plugin/Cargo.toml b/crates/plugin/Cargo.toml
index c07da5d7c7..859ec0467b 100644
--- a/crates/plugin/Cargo.toml
+++ b/crates/plugin/Cargo.toml
@@ -7,6 +7,6 @@ license = "GPL-3.0-or-later"
 
 [dependencies]
 bincode = "1.3"
-plugin_macros = { path = "../plugin_macros" }
+plugin_macros.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
diff --git a/crates/prettier/Cargo.toml b/crates/prettier/Cargo.toml
index 565a43ded7..451ef78306 100644
--- a/crates/prettier/Cargo.toml
+++ b/crates/prettier/Cargo.toml
@@ -14,22 +14,22 @@ test-support = []
 
 [dependencies]
 anyhow.workspace = true
-client = { path = "../client" }
-collections = { path = "../collections" }
-fs = { path = "../fs" }
+client.workspace = true
+collections.workspace = true
+fs.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
-language = { path = "../language" }
+gpui.workspace = true
+language.workspace = true
 log.workspace = true
-lsp = { path = "../lsp" }
-node_runtime = { path = "../node_runtime" }
+lsp.workspace = true
+node_runtime.workspace = true
 parking_lot.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-util = { path = "../util" }
+util.workspace = true
 
 [dev-dependencies]
-fs = { path = "../fs",  features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
+fs = { workspace = true,  features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
diff --git a/crates/project/Cargo.toml b/crates/project/Cargo.toml
index 1854feb8fe..8f36511c64 100644
--- a/crates/project/Cargo.toml
+++ b/crates/project/Cargo.toml
@@ -25,62 +25,62 @@ aho-corasick = "1.1"
 anyhow.workspace = true
 async-trait.workspace = true
 backtrace = "0.3"
-client = { path = "../client" }
-clock = { path = "../clock" }
-collections = { path = "../collections" }
-copilot = { path = "../copilot" }
-db = { path = "../db" }
-fs = { path = "../fs" }
-fsevent = { path = "../fsevent" }
+client.workspace = true
+clock.workspace = true
+collections.workspace = true
+copilot.workspace = true
+db.workspace = true
+fs.workspace = true
+fsevent.workspace = true
 futures.workspace = true
-fuzzy = {  path = "../fuzzy" }
-git = { path = "../git" }
+fuzzy.workspace = true
+git.workspace = true
 globset.workspace = true
-gpui = { path = "../gpui" }
+gpui.workspace = true
 ignore = "0.4"
 itertools = "0.10"
-language = { path = "../language" }
+language.workspace = true
 lazy_static.workspace = true
 log.workspace = true
-lsp = { path = "../lsp" }
-node_runtime = { path = "../node_runtime" }
+lsp.workspace = true
+node_runtime.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
-prettier = { path = "../prettier" }
+prettier.workspace = true
 rand.workspace = true
 regex.workspace = true
-rpc = { path = "../rpc" }
+rpc.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 sha2 = "0.10"
 similar = "1.3"
 smol.workspace = true
-sum_tree = { path = "../sum_tree" }
-terminal = { path = "../terminal" }
-text = { path = "../text" }
+sum_tree.workspace = true
+terminal.workspace = true
+text.workspace = true
 thiserror.workspace = true
 toml.workspace = true
-util = { path = "../util" }
+util.workspace = true
 
 [dev-dependencies]
-client = { path = "../client", features = ["test-support"] }
-collections = { path = "../collections", features = ["test-support"] }
+client = { workspace = true, features = ["test-support"] }
+collections = { workspace = true, features = ["test-support"] }
 ctor.workspace = true
-db = { path = "../db", features = ["test-support"] }
+db = { workspace = true, features = ["test-support"] }
 env_logger.workspace = true
-fs = { path = "../fs",  features = ["test-support"] }
+fs = { workspace = true,  features = ["test-support"] }
 git2.workspace = true
-gpui = { path = "../gpui", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
-release_channel = { path = "../release_channel" }
-lsp = { path = "../lsp", features = ["test-support"] }
-prettier = { path = "../prettier", features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
+release_channel.workspace = true
+lsp = { workspace = true, features = ["test-support"] }
+prettier = { workspace = true, features = ["test-support"] }
 pretty_assertions.workspace = true
-rpc = { path = "../rpc", features = ["test-support"] }
-settings = { path = "../settings", features = ["test-support"] }
+rpc = { workspace = true, features = ["test-support"] }
+settings = { workspace = true, features = ["test-support"] }
 tempfile.workspace = true
 unindent.workspace = true
-util = { path = "../util", features = ["test-support"] }
+util = { workspace = true, features = ["test-support"] }
diff --git a/crates/project_panel/Cargo.toml b/crates/project_panel/Cargo.toml
index a518a2c075..8946ca7d15 100644
--- a/crates/project_panel/Cargo.toml
+++ b/crates/project_panel/Cargo.toml
@@ -11,33 +11,33 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
-collections = { path = "../collections" }
-db = { path = "../db" }
-editor = { path = "../editor" }
+collections.workspace = true
+db.workspace = true
+editor.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
-menu = {  path = "../menu" }
+gpui.workspace = true
+menu.workspace = true
 postage.workspace = true
 pretty_assertions.workspace = true
-project = { path = "../project" }
+project.workspace = true
 schemars.workspace = true
-search = { path = "../search" }
+search.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smallvec.workspace = true
-theme = { path = "../theme" }
-ui = { path = "../ui" }
+theme.workspace = true
+ui.workspace = true
 unicase = "2.6"
-util = { path = "../util" }
-client = { path = "../client" }
-workspace = { path = "../workspace", package = "workspace" }
+util.workspace = true
+client.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-client = { path = "../client", features = ["test-support"] }
-editor = { path = "../editor", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
+client = { workspace = true, features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
 serde_json.workspace = true
-workspace = { path = "../workspace", features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/project_symbols/Cargo.toml b/crates/project_symbols/Cargo.toml
index 2b3027a089..078d09f0a1 100644
--- a/crates/project_symbols/Cargo.toml
+++ b/crates/project_symbols/Cargo.toml
@@ -11,29 +11,29 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
-editor = { path = "../editor" }
-fuzzy = {   path = "../fuzzy" }
-gpui = { path = "../gpui" }
+editor.workspace = true
+fuzzy.workspace = true
+gpui.workspace = true
 ordered-float.workspace = true
-picker = { path = "../picker" }
+picker.workspace = true
 postage.workspace = true
-project = { path = "../project" }
+project.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smol.workspace = true
-text = { path = "../text" }
-theme = { path = "../theme" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
+text.workspace = true
+theme.workspace = true
+util.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
 futures.workspace = true
-gpui = { path = "../gpui", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
-lsp = { path = "../lsp", features = ["test-support"] }
-project = { path = "../project", features = ["test-support"] }
-release_channel = { path = "../release_channel" }
-settings = { path = "../settings", features = ["test-support"] }
-theme = { path = "../theme", features = ["test-support"] }
-workspace = { path = "../workspace", features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
+lsp = { workspace = true, features = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
+release_channel.workspace = true
+settings = { workspace = true, features = ["test-support"] }
+theme = { workspace = true, features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/quick_action_bar/Cargo.toml b/crates/quick_action_bar/Cargo.toml
index 07e081acd3..e1f8c66d10 100644
--- a/crates/quick_action_bar/Cargo.toml
+++ b/crates/quick_action_bar/Cargo.toml
@@ -10,15 +10,15 @@ path = "src/quick_action_bar.rs"
 doctest = false
 
 [dependencies]
-assistant = { path = "../assistant" }
-editor = { path = "../editor" }
-gpui = { path = "../gpui" }
-search = { path = "../search" }
-settings = { path = "../settings" }
-ui = { path = "../ui" }
-workspace = { path = "../workspace" }
+assistant.workspace = true
+editor.workspace = true
+gpui.workspace = true
+search.workspace = true
+settings.workspace = true
+ui.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-workspace = { path = "../workspace", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/recent_projects/Cargo.toml b/crates/recent_projects/Cargo.toml
index 333bb107a4..48e3cff72d 100644
--- a/crates/recent_projects/Cargo.toml
+++ b/crates/recent_projects/Cargo.toml
@@ -10,21 +10,21 @@ path = "src/recent_projects.rs"
 doctest = false
 
 [dependencies]
-editor = { path = "../editor" }
+editor.workspace = true
 futures.workspace = true
-fuzzy = {  path = "../fuzzy" }
-gpui = { path = "../gpui" }
-language = { path = "../language" }
+fuzzy.workspace = true
+gpui.workspace = true
+language.workspace = true
 ordered-float.workspace = true
-picker = { path = "../picker" }
+picker.workspace = true
 postage.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smol.workspace = true
-text = { path = "../text" }
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
+text.workspace = true
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
diff --git a/crates/release_channel/Cargo.toml b/crates/release_channel/Cargo.toml
index 243ea5ace3..b40ce36346 100644
--- a/crates/release_channel/Cargo.toml
+++ b/crates/release_channel/Cargo.toml
@@ -6,5 +6,5 @@ publish = false
 license = "GPL-3.0-or-later"
 
 [dependencies]
-gpui = { path = "../gpui" }
+gpui.workspace = true
 once_cell = "1.19.0"
diff --git a/crates/rich_text/Cargo.toml b/crates/rich_text/Cargo.toml
index bfd8cf70d1..b9f765d123 100644
--- a/crates/rich_text/Cargo.toml
+++ b/crates/rich_text/Cargo.toml
@@ -17,15 +17,15 @@ test-support = [
 
 [dependencies]
 anyhow.workspace = true
-collections = { path = "../collections" }
+collections.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
-language = { path = "../language" }
+gpui.workspace = true
+language.workspace = true
 lazy_static.workspace = true
 pulldown-cmark.workspace = true
 smallvec.workspace = true
 smol.workspace = true
-sum_tree = { path = "../sum_tree" }
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
+sum_tree.workspace = true
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
diff --git a/crates/rope/Cargo.toml b/crates/rope/Cargo.toml
index 60d6e8f40b..9190341f53 100644
--- a/crates/rope/Cargo.toml
+++ b/crates/rope/Cargo.toml
@@ -13,10 +13,10 @@ arrayvec = "0.7.1"
 bromberg_sl2 = { git = "https://github.com/zed-industries/bromberg_sl2", rev = "950bc5482c216c395049ae33ae4501e08975f17f" }
 log.workspace = true
 smallvec.workspace = true
-sum_tree = { path = "../sum_tree" }
-util = { path = "../util" }
+sum_tree.workspace = true
+util.workspace = true
 
 [dev-dependencies]
-gpui = { path = "../gpui", features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
 rand.workspace = true
-util = { path = "../util", features = ["test-support"] }
+util = { workspace = true, features = ["test-support"] }
diff --git a/crates/rpc/Cargo.toml b/crates/rpc/Cargo.toml
index fe213be68c..0f2772b3d7 100644
--- a/crates/rpc/Cargo.toml
+++ b/crates/rpc/Cargo.toml
@@ -18,10 +18,10 @@ anyhow.workspace = true
 async-lock = "2.4"
 async-tungstenite = "0.16"
 base64 = "0.13"
-clock = { path = "../clock" }
-collections = { path = "../collections" }
+clock.workspace = true
+collections.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui", optional = true }
+gpui = { workspace = true, optional = true }
 parking_lot.workspace = true
 prost.workspace = true
 rand.workspace = true
@@ -32,16 +32,16 @@ serde_json.workspace = true
 smol-timeout = "0.6"
 strum.workspace = true
 tracing = { version = "0.1.34", features = ["log"] }
-util = { path = "../util" }
+util.workspace = true
 zstd = "0.11"
 
 [build-dependencies]
 prost-build = "0.9"
 
 [dev-dependencies]
-collections = { path = "../collections", features = ["test-support"] }
+collections = { workspace = true, features = ["test-support"] }
 ctor.workspace = true
 env_logger.workspace = true
-gpui = { path = "../gpui", features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
 smol.workspace = true
 tempfile.workspace = true
diff --git a/crates/search/Cargo.toml b/crates/search/Cargo.toml
index 0266770d10..d4e2c70a23 100644
--- a/crates/search/Cargo.toml
+++ b/crates/search/Cargo.toml
@@ -12,30 +12,30 @@ doctest = false
 [dependencies]
 anyhow.workspace = true
 bitflags = "1"
-collections = { path = "../collections" }
-editor = { path = "../editor" }
+collections.workspace = true
+editor.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
-language = { path = "../language" }
+gpui.workspace = true
+language.workspace = true
 log.workspace = true
-menu = { path = "../menu" }
+menu.workspace = true
 postage.workspace = true
-project = { path = "../project" }
-semantic_index = { path = "../semantic_index" }
+project.workspace = true
+semantic_index.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smallvec.workspace = true
 smol.workspace = true
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-client = { path = "../client", features = ["test-support"] }
-editor = { path = "../editor", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
+client = { workspace = true, features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
 unindent.workspace = true
-workspace = { path = "../workspace", features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/semantic_index/Cargo.toml b/crates/semantic_index/Cargo.toml
index 7e8717a78e..4ee5baa662 100644
--- a/crates/semantic_index/Cargo.toml
+++ b/crates/semantic_index/Cargo.toml
@@ -10,51 +10,51 @@ path = "src/semantic_index.rs"
 doctest = false
 
 [dependencies]
-ai = { path = "../ai" }
+ai.workspace = true
 anyhow.workspace = true
 async-trait.workspace = true
-collections = { path = "../collections" }
+collections.workspace = true
 futures.workspace = true
 globset.workspace = true
-gpui = { path = "../gpui" }
-language = { path = "../language" }
+gpui.workspace = true
+language.workspace = true
 lazy_static.workspace = true
 log.workspace = true
 ndarray = { version = "0.15.0" }
 ordered-float.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
-project = { path = "../project" }
+project.workspace = true
 rand.workspace = true
-release_channel = { path = "../release_channel" }
-rpc = { path = "../rpc" }
+release_channel.workspace = true
+rpc.workspace = true
 rusqlite.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 sha1 = "0.10.5"
 smol.workspace = true
 tiktoken-rs.workspace = true
 tree-sitter.workspace = true
-util = { path = "../util" }
-workspace = { path = "../workspace" }
+util.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-ai = { path = "../ai", features = ["test-support"] }
-client = { path = "../client" }
-collections = { path = "../collections", features = ["test-support"] }
+ai = { workspace = true, features = ["test-support"] }
+client.workspace = true
+collections = { workspace = true, features = ["test-support"] }
 ctor.workspace = true
 env_logger.workspace = true
-gpui = { path = "../gpui", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
-node_runtime = { path = "../node_runtime" }
+gpui = { workspace = true, features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
+node_runtime.workspace = true
 pretty_assertions.workspace = true
-project = { path = "../project", features = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
 rand.workspace = true
-rpc = { path = "../rpc", features = ["test-support"] }
+rpc = { workspace = true, features = ["test-support"] }
 rust-embed.workspace = true
-settings = { path = "../settings", features = ["test-support"]}
+settings = { workspace = true, features = ["test-support"]}
 tempfile.workspace = true
 tree-sitter-cpp.workspace = true
 tree-sitter-elixir.workspace = true
@@ -66,4 +66,4 @@ tree-sitter-rust.workspace = true
 tree-sitter-toml.workspace = true
 tree-sitter-typescript.workspace = true
 unindent.workspace = true
-workspace = { path = "../workspace", features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/settings/Cargo.toml b/crates/settings/Cargo.toml
index 2d0669cada..459bcf6703 100644
--- a/crates/settings/Cargo.toml
+++ b/crates/settings/Cargo.toml
@@ -14,14 +14,14 @@ test-support = ["gpui/test-support", "fs/test-support"]
 
 [dependencies]
 anyhow.workspace = true
-collections = { path = "../collections" }
-feature_flags = { path = "../feature_flags" }
-fs = { path = "../fs" }
+collections.workspace = true
+feature_flags.workspace = true
+fs.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
+gpui.workspace = true
 lazy_static.workspace = true
 postage.workspace = true
-release_channel = { path = "../release_channel" }
+release_channel.workspace = true
 rust-embed.workspace = true
 schemars.workspace = true
 serde.workspace = true
@@ -32,11 +32,11 @@ smallvec.workspace = true
 toml.workspace = true
 tree-sitter-json = "*"
 tree-sitter.workspace = true
-util = { path = "../util" }
+util.workspace = true
 
 [dev-dependencies]
-fs = { path = "../fs", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
+fs = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
 indoc.workspace = true
 pretty_assertions.workspace = true
 unindent.workspace = true
diff --git a/crates/sqlez/Cargo.toml b/crates/sqlez/Cargo.toml
index 0d5f9dba54..2ee5e6cbf3 100644
--- a/crates/sqlez/Cargo.toml
+++ b/crates/sqlez/Cargo.toml
@@ -14,5 +14,5 @@ libsqlite3-sys = { version = "0.26", features = ["bundled"] }
 parking_lot.workspace = true
 smol.workspace = true
 thread_local = "1.1.4"
-util = { path = "../util" }
+util.workspace = true
 uuid.workspace = true
diff --git a/crates/sqlez_macros/Cargo.toml b/crates/sqlez_macros/Cargo.toml
index a6e3881b7f..8b9b29dd57 100644
--- a/crates/sqlez_macros/Cargo.toml
+++ b/crates/sqlez_macros/Cargo.toml
@@ -14,6 +14,6 @@ doctest = false
 lazy_static.workspace = true
 proc-macro2 = "1.0"
 quote = "1.0"
-sqlez = { path = "../sqlez" }
+sqlez.workspace = true
 sqlformat = "0.2"
 syn = "1.0"
diff --git a/crates/story/Cargo.toml b/crates/story/Cargo.toml
index 9b17a04096..fc1754c253 100644
--- a/crates/story/Cargo.toml
+++ b/crates/story/Cargo.toml
@@ -6,6 +6,6 @@ publish = false
 license = "GPL-3.0-or-later"
 
 [dependencies]
-gpui = { path = "../gpui" }
+gpui.workspace = true
 itertools = { package = "itertools", version = "0.10" }
 smallvec.workspace = true
diff --git a/crates/storybook/Cargo.toml b/crates/storybook/Cargo.toml
index 6177609d94..c95ca3c2e9 100644
--- a/crates/storybook/Cargo.toml
+++ b/crates/storybook/Cargo.toml
@@ -15,28 +15,28 @@ anyhow.workspace = true
 backtrace-on-stack-overflow = "0.3.0"
 chrono = "0.4"
 clap = { version = "4.4", features = ["derive", "string"] }
-collab_ui = { path = "../collab_ui", features = ["stories"] }
+collab_ui = { workspace = true, features = ["stories"] }
 ctrlc = "3.4"
 dialoguer = { version = "0.11.0", features = ["fuzzy-select"] }
-editor = { path = "../editor" }
-fuzzy = {  path = "../fuzzy" }
-gpui = { path = "../gpui" }
+editor.workspace = true
+fuzzy.workspace = true
+gpui.workspace = true
 indoc.workspace = true
 itertools = "0.11.0"
-language = { path = "../language" }
+language.workspace = true
 log.workspace = true
-menu = { path = "../menu" }
-picker = { path = "../picker" }
+menu.workspace = true
+picker.workspace = true
 rust-embed.workspace = true
 serde.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 simplelog = "0.9"
 smallvec.workspace = true
-story = { path = "../story" }
+story.workspace = true
 strum = { version = "0.25.0", features = ["derive"] }
-theme = { path = "../theme" }
-ui = { path = "../ui", features = ["stories"] }
-util = { path = "../util" }
+theme.workspace = true
+ui = { workspace = true, features = ["stories"] }
+util.workspace = true
 
 [dev-dependencies]
-gpui = { path = "../gpui", features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
diff --git a/crates/terminal/Cargo.toml b/crates/terminal/Cargo.toml
index 670510356d..d4eefd861f 100644
--- a/crates/terminal/Cargo.toml
+++ b/crates/terminal/Cargo.toml
@@ -14,10 +14,10 @@ doctest = false
 # needed for "a few weeks" until alacritty 0.13.2 is out
 alacritty_terminal = { git = "https://github.com/alacritty/alacritty", rev = "2d2b894c3b869fadc78fce9d72cb5c8d2b764cac" }
 anyhow.workspace = true
-db = { path = "../db" }
+db.workspace = true
 dirs = "4.0.0"
 futures.workspace = true
-gpui = { path = "../gpui" }
+gpui.workspace = true
 itertools = "0.10"
 lazy_static.workspace = true
 libc = "0.2"
@@ -28,13 +28,13 @@ schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 shellexpand = "2.1.0"
 smallvec.workspace = true
 smol.workspace = true
-theme = { path = "../theme" }
+theme.workspace = true
 thiserror.workspace = true
-util = { path = "../util" }
+util.workspace = true
 
 [dev-dependencies]
 rand.workspace = true
diff --git a/crates/terminal_view/Cargo.toml b/crates/terminal_view/Cargo.toml
index 134f9f08dd..55eaa70589 100644
--- a/crates/terminal_view/Cargo.toml
+++ b/crates/terminal_view/Cargo.toml
@@ -11,39 +11,39 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
-db = { path = "../db" }
-collections = { path = "../collections" }
+db.workspace = true
+collections.workspace = true
 dirs = "4.0.0"
-editor = { path = "../editor" }
+editor.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
+gpui.workspace = true
 itertools = "0.10"
-language = { path = "../language" }
+language.workspace = true
 lazy_static.workspace = true
 libc = "0.2"
 mio-extras = "2.0.6"
 ordered-float.workspace = true
 procinfo = { git = "https://github.com/zed-industries/wezterm", rev = "5cd757e5f2eb039ed0c6bb6512223e69d5efc64d", default-features = false }
-project = { path = "../project" }
-search = { path = "../search" }
+project.workspace = true
+search.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 shellexpand = "2.1.0"
 smallvec.workspace = true
 smol.workspace = true
-terminal = { path = "../terminal" }
-theme = { path = "../theme" }
+terminal.workspace = true
+theme.workspace = true
 thiserror.workspace = true
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-client = { path = "../client", features = ["test-support"] }
-editor = { path = "../editor", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-project = { path = "../project", features = ["test-support"] }
+client = { workspace = true, features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
 rand.workspace = true
-workspace = { path = "../workspace", features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/text/Cargo.toml b/crates/text/Cargo.toml
index e3cf4b0238..1a7f8177a9 100644
--- a/crates/text/Cargo.toml
+++ b/crates/text/Cargo.toml
@@ -14,8 +14,8 @@ test-support = ["rand"]
 
 [dependencies]
 anyhow.workspace = true
-clock = { path = "../clock" }
-collections = { path = "../collections" }
+clock.workspace = true
+collections.workspace = true
 digest = { version = "0.9", features = ["std"] }
 lazy_static.workspace = true
 log.workspace = true
@@ -23,15 +23,15 @@ parking_lot.workspace = true
 postage.workspace = true
 rand = { workspace = true, optional = true }
 regex.workspace = true
-rope = { path = "../rope" }
+rope.workspace = true
 smallvec.workspace = true
-sum_tree = { path = "../sum_tree" }
-util = { path = "../util" }
+sum_tree.workspace = true
+util.workspace = true
 
 [dev-dependencies]
-collections = { path = "../collections", features = ["test-support"] }
+collections = { workspace = true, features = ["test-support"] }
 ctor.workspace = true
 env_logger.workspace = true
-gpui = { path = "../gpui", features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
 rand.workspace = true
-util = { path = "../util", features = ["test-support"] }
+util = { workspace = true, features = ["test-support"] }
diff --git a/crates/theme/Cargo.toml b/crates/theme/Cargo.toml
index b29ac5d2fe..8970cfbacf 100644
--- a/crates/theme/Cargo.toml
+++ b/crates/theme/Cargo.toml
@@ -20,11 +20,11 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
-color = { path = "../color" }
+color.workspace = true
 derive_more.workspace = true
-fs = { path = "../fs" }
+fs.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
+gpui.workspace = true
 indexmap = { version = "1.6.2", features = ["serde"] }
 itertools = { version = "0.11.0", optional = true }
 palette = { version = "0.7.3", default-features = false, features = ["std"] }
@@ -36,13 +36,13 @@ serde_derive.workspace = true
 serde_json.workspace = true
 serde_json_lenient.workspace = true
 serde_repr.workspace = true
-settings = { path = "../settings" }
-story = { path = "../story", optional = true }
+settings.workspace = true
+story = { workspace = true, optional = true }
 toml.workspace = true
-util = { path = "../util" }
+util.workspace = true
 uuid.workspace = true
 
 [dev-dependencies]
-fs = { path = "../fs", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-settings = { path = "../settings", features = ["test-support"] }
+fs = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+settings = { workspace = true, features = ["test-support"] }
diff --git a/crates/theme_importer/Cargo.toml b/crates/theme_importer/Cargo.toml
index ddb9433f16..9e2052e2bb 100644
--- a/crates/theme_importer/Cargo.toml
+++ b/crates/theme_importer/Cargo.toml
@@ -10,7 +10,7 @@ any_ascii = "0.3.2"
 anyhow.workspace = true
 clap = { version = "4.4", features = ["derive"] }
 convert_case = "0.6.0"
-gpui = { path = "../gpui" }
+gpui.workspace = true
 indexmap = { version = "1.6.2", features = ["serde"] }
 indoc.workspace = true
 log.workspace = true
@@ -23,6 +23,6 @@ serde_json.workspace = true
 serde_json_lenient.workspace = true
 simplelog = "0.9"
 strum = { version = "0.25.0", features = ["derive"] }
-theme = { path = "../theme" }
+theme.workspace = true
 uuid.workspace = true
 vscode_theme = "0.2.0"
diff --git a/crates/theme_selector/Cargo.toml b/crates/theme_selector/Cargo.toml
index b3727092ea..869204be07 100644
--- a/crates/theme_selector/Cargo.toml
+++ b/crates/theme_selector/Cargo.toml
@@ -10,22 +10,22 @@ path = "src/theme_selector.rs"
 doctest = false
 
 [dependencies]
-client = { path = "../client" }
-editor = { path = "../editor" }
-feature_flags = { path = "../feature_flags" }
-fs = { path = "../fs" }
-fuzzy = {  path = "../fuzzy" }
-gpui = { path = "../gpui" }
+client.workspace = true
+editor.workspace = true
+feature_flags.workspace = true
+fs.workspace = true
+fuzzy.workspace = true
+gpui.workspace = true
 log.workspace = true
 parking_lot.workspace = true
-picker = { path = "../picker" }
+picker.workspace = true
 postage.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smol.workspace = true
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
diff --git a/crates/ui/Cargo.toml b/crates/ui/Cargo.toml
index 4b1d2d7c86..26fece87a2 100644
--- a/crates/ui/Cargo.toml
+++ b/crates/ui/Cargo.toml
@@ -12,16 +12,16 @@ path = "src/ui.rs"
 [dependencies]
 anyhow.workspace = true
 chrono = "0.4"
-gpui = { path = "../gpui" }
+gpui.workspace = true
 itertools = { version = "0.11.0", optional = true }
-menu = { path = "../menu" }
+menu.workspace = true
 rand = "0.8"
 serde.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smallvec.workspace = true
-story = { path = "../story", optional = true }
+story = { workspace = true, optional = true }
 strum = { version = "0.25.0", features = ["derive"] }
-theme = { path = "../theme" }
+theme.workspace = true
 
 [features]
 default = []
diff --git a/crates/vcs_menu/Cargo.toml b/crates/vcs_menu/Cargo.toml
index 88cbbb0a84..3258c229dd 100644
--- a/crates/vcs_menu/Cargo.toml
+++ b/crates/vcs_menu/Cargo.toml
@@ -7,10 +7,10 @@ license = "GPL-3.0-or-later"
 
 [dependencies]
 anyhow.workspace = true
-fs = { path = "../fs" }
-fuzzy = {  path = "../fuzzy" }
-gpui = { path = "../gpui" }
-picker = { path = "../picker" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-workspace = { path = "../workspace" }
+fs.workspace = true
+fuzzy.workspace = true
+gpui.workspace = true
+picker.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
diff --git a/crates/vim/Cargo.toml b/crates/vim/Cargo.toml
index 8415111849..d5cd23420a 100644
--- a/crates/vim/Cargo.toml
+++ b/crates/vim/Cargo.toml
@@ -16,40 +16,40 @@ neovim = ["nvim-rs", "async-compat", "async-trait", "tokio"]
 anyhow.workspace = true
 async-compat = { version = "0.2.1", "optional" = true }
 async-trait = { workspace = true, "optional" = true }
-collections = { path = "../collections" }
-command_palette = { path = "../command_palette" }
+collections.workspace = true
+command_palette.workspace = true
 # HACK: We're only depending on `copilot` here for `CommandPaletteFilter`.  See the attached comment on that type.
-copilot = { path = "../copilot" }
-diagnostics = { path = "../diagnostics" }
-editor = { path = "../editor" }
-gpui = { path = "../gpui" }
+copilot.workspace = true
+diagnostics.workspace = true
+editor.workspace = true
+gpui.workspace = true
 itertools = "0.10"
-language = { path = "../language" }
+language.workspace = true
 log.workspace = true
 nvim-rs = { git = "https://github.com/KillTheMule/nvim-rs", branch = "master", features = ["use_tokio"], optional = true }
 regex.workspace = true
-search = { path = "../search" }
+search.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
-theme = { path = "../theme" }
+settings.workspace = true
+theme.workspace = true
 tokio = { version = "1.15", "optional" = true }
-ui = { path = "../ui" }
-workspace = { path = "../workspace" }
-zed_actions = { path = "../zed_actions" }
+ui.workspace = true
+workspace.workspace = true
+zed_actions.workspace = true
 
 [dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
 futures.workspace = true
-gpui = { path = "../gpui", features = ["test-support"] }
-release_channel = { path = "../release_channel" }
+gpui = { workspace = true, features = ["test-support"] }
+release_channel.workspace = true
 indoc.workspace = true
-language = { path = "../language", features = ["test-support"] }
-lsp = { path = "../lsp", features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
+lsp = { workspace = true, features = ["test-support"] }
 parking_lot.workspace = true
-project = { path = "../project", features = ["test-support"] }
-settings = { path = "../settings" }
-theme = { path = "../theme", features = ["test-support"] }
-util = { path = "../util", features = ["test-support"] }
-workspace = { path = "../workspace", features = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
+settings.workspace = true
+theme = { workspace = true, features = ["test-support"] }
+util = { workspace = true, features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }
diff --git a/crates/welcome/Cargo.toml b/crates/welcome/Cargo.toml
index e915581f64..6b8012e0fe 100644
--- a/crates/welcome/Cargo.toml
+++ b/crates/welcome/Cargo.toml
@@ -13,25 +13,25 @@ test-support = []
 
 [dependencies]
 anyhow.workspace = true
-client = { path = "../client" }
-db = { path = "../db" }
-editor = { path = "../editor" }
-fs = { path = "../fs" }
-fuzzy = {  path = "../fuzzy" }
-gpui = { path = "../gpui" }
-install_cli = { path = "../install_cli" }
+client.workspace = true
+db.workspace = true
+editor.workspace = true
+fs.workspace = true
+fuzzy.workspace = true
+gpui.workspace = true
+install_cli.workspace = true
 log.workspace = true
-picker = { path = "../picker" }
-project = { path = "../project" }
+picker.workspace = true
+project.workspace = true
 schemars.workspace = true
 serde.workspace = true
-settings = { path = "../settings" }
-theme = { path = "../theme" }
-theme_selector = { path = "../theme_selector" }
-ui = { path = "../ui" }
-util = { path = "../util" }
-vim = { path = "../vim" }
-workspace = { path = "../workspace" }
+settings.workspace = true
+theme.workspace = true
+theme_selector.workspace = true
+ui.workspace = true
+util.workspace = true
+vim.workspace = true
+workspace.workspace = true
 
 [dev-dependencies]
-editor = { path = "../editor", features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
diff --git a/crates/workspace/Cargo.toml b/crates/workspace/Cargo.toml
index bbba42e9af..6e0d4d4c53 100644
--- a/crates/workspace/Cargo.toml
+++ b/crates/workspace/Cargo.toml
@@ -23,43 +23,43 @@ test-support = [
 anyhow.workspace = true
 async-recursion = "1.0.0"
 bincode = "1.2.1"
-call = { path = "../call" }
-client = { path = "../client" }
-collections = { path = "../collections" }
-db = { path = "../db" }
+call.workspace = true
+client.workspace = true
+collections.workspace = true
+db.workspace = true
 derive_more.workspace = true
-fs = { path = "../fs" }
+fs.workspace = true
 futures.workspace = true
-gpui = { path = "../gpui" }
-install_cli = { path = "../install_cli" }
+gpui.workspace = true
+install_cli.workspace = true
 itertools = "0.10"
-language = { path = "../language" }
+language.workspace = true
 lazy_static.workspace = true
 log.workspace = true
-node_runtime = { path = "../node_runtime" }
+node_runtime.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
-project = { path = "../project" }
+project.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 smallvec.workspace = true
-sqlez = { path = "../sqlez" }
-terminal = { path = "../terminal" }
-theme = { path = "../theme" }
-ui = { path = "../ui" }
-util = { path = "../util" }
+sqlez.workspace = true
+terminal.workspace = true
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
 uuid.workspace = true
 
 [dev-dependencies]
-call = { path = "../call", features = ["test-support"] }
-client = { path = "../client", features = ["test-support"] }
-db = { path = "../db", features = ["test-support"] }
+call = { workspace = true, features = ["test-support"] }
+client = { workspace = true, features = ["test-support"] }
+db = { workspace = true, features = ["test-support"] }
 env_logger.workspace = true
-fs = { path = "../fs", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
+fs = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
 indoc.workspace = true
-project = { path = "../project", features = ["test-support"] }
-settings = { path = "../settings", features = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
+settings = { workspace = true, features = ["test-support"] }
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 46025a59bb..fda5391ac2 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -16,94 +16,94 @@ name = "Zed"
 path = "src/main.rs"
 
 [dependencies]
-activity_indicator = { path = "../activity_indicator" }
-ai = { path = "../ai" }
+activity_indicator.workspace = true
+ai.workspace = true
 anyhow.workspace = true
-assets = { path = "../assets" }
-assistant = { path = "../assistant" }
+assets.workspace = true
+assistant.workspace = true
 async-compression.workspace = true
 async-recursion = "0.3"
 async-tar = "0.4.2"
 async-trait.workspace = true
-audio = { path = "../audio" }
-auto_update = { path = "../auto_update" }
+audio.workspace = true
+auto_update.workspace = true
 backtrace = "0.3"
-breadcrumbs = { path = "../breadcrumbs" }
-call = { path = "../call" }
-channel = { path = "../channel" }
+breadcrumbs.workspace = true
+call.workspace = true
+channel.workspace = true
 chrono = "0.4"
-cli = { path = "../cli" }
-client = { path = "../client" }
-collab_ui = { path = "../collab_ui" }
-collections = { path = "../collections" }
-command_palette = { path = "../command_palette" }
-copilot = { path = "../copilot" }
-copilot_ui = { path = "../copilot_ui" }
+cli.workspace = true
+client.workspace = true
+collab_ui.workspace = true
+collections.workspace = true
+command_palette.workspace = true
+copilot.workspace = true
+copilot_ui.workspace = true
 ctor.workspace = true
-db = { path = "../db" }
-diagnostics = { path = "../diagnostics" }
-editor = { path = "../editor" }
+db.workspace = true
+diagnostics.workspace = true
+editor.workspace = true
 env_logger.workspace = true
-feature_flags = { path = "../feature_flags" }
-feedback = { path = "../feedback" }
-file_finder = { path = "../file_finder" }
-fs = { path = "../fs" }
-fsevent = { path = "../fsevent" }
+feature_flags.workspace = true
+feedback.workspace = true
+file_finder.workspace = true
+fs.workspace = true
+fsevent.workspace = true
 futures.workspace = true
-go_to_line = { path = "../go_to_line" }
-gpui = { path = "../gpui" }
+go_to_line.workspace = true
+gpui.workspace = true
 ignore = "0.4"
 image = "0.23"
 indexmap = "1.6.2"
-install_cli = { path = "../install_cli" }
+install_cli.workspace = true
 isahc.workspace = true
 itertools = "0.11"
-journal = { path = "../journal" }
-language = { path = "../language" }
-language_selector = { path = "../language_selector" }
-language_tools = { path = "../language_tools" }
+journal.workspace = true
+language.workspace = true
+language_selector.workspace = true
+language_tools.workspace = true
 lazy_static.workspace = true
 libc = "0.2"
 log.workspace = true
-lsp = { path = "../lsp" }
-markdown_preview = { path = "../markdown_preview" }
-menu = { path = "../menu" }
+lsp.workspace = true
+markdown_preview.workspace = true
+menu.workspace = true
 mimalloc = "0.1"
-node_runtime = { path = "../node_runtime" }
-notifications = { path = "../notifications" }
+node_runtime.workspace = true
+notifications.workspace = true
 num_cpus = "1.13.0"
-outline = { path = "../outline" }
+outline.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
-project = { path = "../project" }
-project_panel = { path = "../project_panel" }
-project_symbols = { path = "../project_symbols" }
-quick_action_bar = { path = "../quick_action_bar" }
+project.workspace = true
+project_panel.workspace = true
+project_symbols.workspace = true
+quick_action_bar.workspace = true
 rand.workspace = true
-recent_projects = { path = "../recent_projects" }
+recent_projects.workspace = true
 regex.workspace = true
-release_channel = { path = "../release_channel" }
-rope = { path = "../rope" }
-rpc = { path = "../rpc" }
+release_channel.workspace = true
+rope.workspace = true
+rpc.workspace = true
 rsa = "0.4"
 rust-embed.workspace = true
 schemars.workspace = true
-search = { path = "../search" }
-semantic_index = { path = "../semantic_index" }
+search.workspace = true
+semantic_index.workspace = true
 serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
-settings = { path = "../settings" }
+settings.workspace = true
 shellexpand = "2.1.0"
 simplelog = "0.9"
 smallvec.workspace = true
 smol.workspace = true
-sum_tree = { path = "../sum_tree" }
+sum_tree.workspace = true
 tempfile.workspace = true
-terminal_view = { path = "../terminal_view" }
-text = { path = "../text" }
-theme = { path = "../theme" }
-theme_selector = { path = "../theme_selector" }
+terminal_view.workspace = true
+text.workspace = true
+theme.workspace = true
+theme_selector.workspace = true
 thiserror.workspace = true
 tiny_http = "0.8"
 toml.workspace = true
@@ -151,22 +151,22 @@ tree-sitter-zig.workspace = true
 tree-sitter.workspace = true
 url.workspace = true
 urlencoding = "2.1.2"
-util = { path = "../util" }
+util.workspace = true
 uuid.workspace = true
-vim = { path = "../vim" }
-welcome = { path = "../welcome" }
-workspace = { path = "../workspace" }
-zed_actions = { path = "../zed_actions" }
+vim.workspace = true
+welcome.workspace = true
+workspace.workspace = true
+zed_actions.workspace = true
 
 [dev-dependencies]
-call = { path = "../call", features = ["test-support"] }
-editor = { path = "../editor", features = ["test-support"] }
-gpui = { path = "../gpui", features = ["test-support"] }
-language = { path = "../language", features = ["test-support"] }
-project = { path = "../project", features = ["test-support"] }
-text = { path = "../text", features = ["test-support"] }
+call = { workspace = true, features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
+text = { workspace = true, features = ["test-support"] }
 unindent.workspace = true
-workspace = { path = "../workspace", features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }
 
 [package.metadata.bundle-dev]
 icon = ["resources/app-icon-preview@2x.png", "resources/app-icon-preview.png"]
diff --git a/crates/zed_actions/Cargo.toml b/crates/zed_actions/Cargo.toml
index 5e98793f8b..19c9415514 100644
--- a/crates/zed_actions/Cargo.toml
+++ b/crates/zed_actions/Cargo.toml
@@ -6,5 +6,5 @@ publish = false
 license = "GPL-3.0-or-later"
 
 [dependencies]
-gpui = { path = "../gpui" }
+gpui.workspace = true
 serde.workspace = true

From 6c4b96ec7609e5431193e86e5959a7985da3ddfc Mon Sep 17 00:00:00 2001
From: Remco Smits <djsmits12@gmail.com>
Date: Tue, 6 Feb 2024 21:22:54 +0100
Subject: [PATCH 274/372] Add the ability to reply to a message (#7170)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Feature
- [x] Allow to click on reply to go to the real message
    - [x] In chat
- [x] Show only a part of the message that you reply to
    - [x] In chat
    - [x] In reply preview

TODO’s
- [x] Fix migration
    - [x] timestamp(in filename)
    - [x] remove the reference to the reply_message_id
- [x] Fix markdown cache for reply message
- [x] Fix spacing when first message is a reply to you and you want to
reply to that message.
- [x] Fetch message that you replied to
    - [x] allow fetching messages that are not inside the current view
- [x] When message is deleted, we should show a text like `message
deleted` or something
    - [x] Show correct GitHub username + icon after `Replied to: `
    - [x] Show correct message(now it's hard-coded)
- [x] Add icon to reply + add the onClick logic
- [x] Show message that you want to reply to
  - [x] Allow to click away the message that you want to reply to
  - [x] Fix hard-coded GitHub user + icon after `Reply tp:`
  - [x] Add tests

<img width="242" alt="Screenshot 2024-02-06 at 20 51 40"
src="https://github.com/zed-industries/zed/assets/62463826/a7a5f3e0-dee3-4d38-95db-258b169e4498">
<img width="240" alt="Screenshot 2024-02-06 at 20 52 02"
src="https://github.com/zed-industries/zed/assets/62463826/3e136de3-4135-4c07-bd43-30089b677c0a">


Release Notes:

- Added the ability to reply to a message.
- Added highlight message when you click on mention notifications or a
reply message.

---------

Co-authored-by: Bennet Bo Fenner <53836821+bennetbo@users.noreply.github.com>
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
---
 crates/channel/src/channel_chat.rs            | 169 ++++++---
 crates/channel/src/channel_store_tests.rs     |   5 +
 .../20221109000000_test_schema.sql            |   3 +-
 .../20240203113741_add_reply_to_message.sql   |   1 +
 crates/collab/src/db/queries/messages.rs      |   3 +
 .../collab/src/db/tables/channel_message.rs   |   1 +
 crates/collab/src/db/tests/message_tests.rs   |  50 ++-
 crates/collab/src/rpc.rs                      |   5 +
 .../collab/src/tests/channel_message_tests.rs |  64 ++++
 crates/collab_ui/src/chat_panel.rs            | 352 +++++++++++++++---
 .../src/chat_panel/message_editor.rs          |  22 +-
 crates/rpc/proto/zed.proto                    |   2 +
 12 files changed, 568 insertions(+), 109 deletions(-)
 create mode 100644 crates/collab/migrations/20240203113741_add_reply_to_message.sql

diff --git a/crates/channel/src/channel_chat.rs b/crates/channel/src/channel_chat.rs
index e9353a1441..ad843470be 100644
--- a/crates/channel/src/channel_chat.rs
+++ b/crates/channel/src/channel_chat.rs
@@ -6,11 +6,12 @@ use client::{
     Client, Subscription, TypedEnvelope, UserId,
 };
 use futures::lock::Mutex;
-use gpui::{AppContext, AsyncAppContext, Context, EventEmitter, Model, ModelContext, Task};
+use gpui::{
+    AppContext, AsyncAppContext, Context, EventEmitter, Model, ModelContext, Task, WeakModel,
+};
 use rand::prelude::*;
 use std::{
     collections::HashSet,
-    mem,
     ops::{ControlFlow, Range},
     sync::Arc,
 };
@@ -26,6 +27,7 @@ pub struct ChannelChat {
     loaded_all_messages: bool,
     last_acknowledged_id: Option<u64>,
     next_pending_message_id: usize,
+    first_loaded_message_id: Option<u64>,
     user_store: Model<UserStore>,
     rpc: Arc<Client>,
     outgoing_messages_lock: Arc<Mutex<()>>,
@@ -37,6 +39,7 @@ pub struct ChannelChat {
 pub struct MessageParams {
     pub text: String,
     pub mentions: Vec<(Range<usize>, UserId)>,
+    pub reply_to_message_id: Option<u64>,
 }
 
 #[derive(Clone, Debug)]
@@ -47,6 +50,7 @@ pub struct ChannelMessage {
     pub sender: Arc<User>,
     pub nonce: u128,
     pub mentions: Vec<(Range<usize>, UserId)>,
+    pub reply_to_message_id: Option<u64>,
 }
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -55,6 +59,15 @@ pub enum ChannelMessageId {
     Pending(usize),
 }
 
+impl Into<Option<u64>> for ChannelMessageId {
+    fn into(self) -> Option<u64> {
+        match self {
+            ChannelMessageId::Saved(id) => Some(id),
+            ChannelMessageId::Pending(_) => None,
+        }
+    }
+}
+
 #[derive(Clone, Debug, Default)]
 pub struct ChannelMessageSummary {
     max_id: ChannelMessageId,
@@ -96,28 +109,35 @@ impl ChannelChat {
         let response = client
             .request(proto::JoinChannelChat { channel_id })
             .await?;
-        let messages = messages_from_proto(response.messages, &user_store, &mut cx).await?;
-        let loaded_all_messages = response.done;
 
-        Ok(cx.new_model(|cx| {
+        let handle = cx.new_model(|cx| {
             cx.on_release(Self::release).detach();
-            let mut this = Self {
+            Self {
                 channel_id: channel.id,
-                user_store,
+                user_store: user_store.clone(),
                 channel_store,
-                rpc: client,
+                rpc: client.clone(),
                 outgoing_messages_lock: Default::default(),
                 messages: Default::default(),
                 acknowledged_message_ids: Default::default(),
-                loaded_all_messages,
+                loaded_all_messages: false,
                 next_pending_message_id: 0,
                 last_acknowledged_id: None,
                 rng: StdRng::from_entropy(),
+                first_loaded_message_id: None,
                 _subscription: subscription.set_model(&cx.handle(), &mut cx.to_async()),
-            };
-            this.insert_messages(messages, cx);
-            this
-        })?)
+            }
+        })?;
+        Self::handle_loaded_messages(
+            handle.downgrade(),
+            user_store,
+            client,
+            response.messages,
+            response.done,
+            &mut cx,
+        )
+        .await?;
+        Ok(handle)
     }
 
     fn release(&mut self, _: &mut AppContext) {
@@ -166,6 +186,7 @@ impl ChannelChat {
                     timestamp: OffsetDateTime::now_utc(),
                     mentions: message.mentions.clone(),
                     nonce,
+                    reply_to_message_id: message.reply_to_message_id,
                 },
                 &(),
             ),
@@ -183,6 +204,7 @@ impl ChannelChat {
                 body: message.text,
                 nonce: Some(nonce.into()),
                 mentions: mentions_to_proto(&message.mentions),
+                reply_to_message_id: message.reply_to_message_id,
             });
             let response = request.await?;
             drop(outgoing_message_guard);
@@ -227,12 +249,16 @@ impl ChannelChat {
                         before_message_id,
                     })
                     .await?;
-                let loaded_all_messages = response.done;
-                let messages = messages_from_proto(response.messages, &user_store, &mut cx).await?;
-                this.update(&mut cx, |this, cx| {
-                    this.loaded_all_messages = loaded_all_messages;
-                    this.insert_messages(messages, cx);
-                })?;
+                Self::handle_loaded_messages(
+                    this,
+                    user_store,
+                    rpc,
+                    response.messages,
+                    response.done,
+                    &mut cx,
+                )
+                .await?;
+
                 anyhow::Ok(())
             }
             .log_err()
@@ -240,9 +266,14 @@ impl ChannelChat {
     }
 
     pub fn first_loaded_message_id(&mut self) -> Option<u64> {
-        self.messages.first().and_then(|message| match message.id {
-            ChannelMessageId::Saved(id) => Some(id),
-            ChannelMessageId::Pending(_) => None,
+        self.first_loaded_message_id
+    }
+
+    /// Load a message by its id, if it's already stored locally.
+    pub fn find_loaded_message(&self, id: u64) -> Option<&ChannelMessage> {
+        self.messages.iter().find(|message| match message.id {
+            ChannelMessageId::Saved(message_id) => message_id == id,
+            ChannelMessageId::Pending(_) => false,
         })
     }
 
@@ -304,6 +335,66 @@ impl ChannelChat {
         }
     }
 
+    async fn handle_loaded_messages(
+        this: WeakModel<Self>,
+        user_store: Model<UserStore>,
+        rpc: Arc<Client>,
+        proto_messages: Vec<proto::ChannelMessage>,
+        loaded_all_messages: bool,
+        cx: &mut AsyncAppContext,
+    ) -> Result<()> {
+        let loaded_messages = messages_from_proto(proto_messages, &user_store, cx).await?;
+
+        let first_loaded_message_id = loaded_messages.first().map(|m| m.id);
+        let loaded_message_ids = this.update(cx, |this, _| {
+            let mut loaded_message_ids: HashSet<u64> = HashSet::default();
+            for message in loaded_messages.iter() {
+                if let Some(saved_message_id) = message.id.into() {
+                    loaded_message_ids.insert(saved_message_id);
+                }
+            }
+            for message in this.messages.iter() {
+                if let Some(saved_message_id) = message.id.into() {
+                    loaded_message_ids.insert(saved_message_id);
+                }
+            }
+            loaded_message_ids
+        })?;
+
+        let missing_ancestors = loaded_messages
+            .iter()
+            .filter_map(|message| {
+                if let Some(ancestor_id) = message.reply_to_message_id {
+                    if !loaded_message_ids.contains(&ancestor_id) {
+                        return Some(ancestor_id);
+                    }
+                }
+                None
+            })
+            .collect::<Vec<_>>();
+
+        let loaded_ancestors = if missing_ancestors.is_empty() {
+            None
+        } else {
+            let response = rpc
+                .request(proto::GetChannelMessagesById {
+                    message_ids: missing_ancestors,
+                })
+                .await?;
+            Some(messages_from_proto(response.messages, &user_store, cx).await?)
+        };
+        this.update(cx, |this, cx| {
+            this.first_loaded_message_id = first_loaded_message_id.and_then(|msg_id| msg_id.into());
+            this.loaded_all_messages = loaded_all_messages;
+            this.insert_messages(loaded_messages, cx);
+            if let Some(loaded_ancestors) = loaded_ancestors {
+                this.insert_messages(loaded_ancestors, cx);
+            }
+        })?;
+
+        Ok(())
+    }
+
     pub fn rejoin(&mut self, cx: &mut ModelContext<Self>) {
         let user_store = self.user_store.clone();
         let rpc = self.rpc.clone();
@@ -311,28 +402,17 @@ impl ChannelChat {
         cx.spawn(move |this, mut cx| {
             async move {
                 let response = rpc.request(proto::JoinChannelChat { channel_id }).await?;
-                let messages = messages_from_proto(response.messages, &user_store, &mut cx).await?;
-                let loaded_all_messages = response.done;
-
-                let pending_messages = this.update(&mut cx, |this, cx| {
-                    if let Some((first_new_message, last_old_message)) =
-                        messages.first().zip(this.messages.last())
-                    {
-                        if first_new_message.id > last_old_message.id {
-                            let old_messages = mem::take(&mut this.messages);
-                            cx.emit(ChannelChatEvent::MessagesUpdated {
-                                old_range: 0..old_messages.summary().count,
-                                new_count: 0,
-                            });
-                            this.loaded_all_messages = loaded_all_messages;
-                        }
-                    }
-
-                    this.insert_messages(messages, cx);
-                    if loaded_all_messages {
-                        this.loaded_all_messages = loaded_all_messages;
-                    }
+                Self::handle_loaded_messages(
+                    this.clone(),
+                    user_store.clone(),
+                    rpc.clone(),
+                    response.messages,
+                    response.done,
+                    &mut cx,
+                )
+                .await?;
 
+                let pending_messages = this.update(&mut cx, |this, _| {
                     this.pending_messages().cloned().collect::<Vec<_>>()
                 })?;
 
@@ -342,6 +422,7 @@ impl ChannelChat {
                         body: pending_message.body,
                         mentions: mentions_to_proto(&pending_message.mentions),
                         nonce: Some(pending_message.nonce.into()),
+                        reply_to_message_id: pending_message.reply_to_message_id,
                     });
                     let response = request.await?;
                     let message = ChannelMessage::from_proto(
@@ -553,6 +634,7 @@ impl ChannelMessage {
                 .nonce
                 .ok_or_else(|| anyhow!("nonce is required"))?
                 .into(),
+            reply_to_message_id: message.reply_to_message_id,
         })
     }
 
@@ -642,6 +724,7 @@ impl<'a> From<&'a str> for MessageParams {
         Self {
             text: value.into(),
             mentions: Vec::new(),
+            reply_to_message_id: None,
         }
     }
 }
diff --git a/crates/channel/src/channel_store_tests.rs b/crates/channel/src/channel_store_tests.rs
index 57b9d20710..c668b72022 100644
--- a/crates/channel/src/channel_store_tests.rs
+++ b/crates/channel/src/channel_store_tests.rs
@@ -184,6 +184,7 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
                     sender_id: 5,
                     mentions: vec![],
                     nonce: Some(1.into()),
+                    reply_to_message_id: None,
                 },
                 proto::ChannelMessage {
                     id: 11,
@@ -192,6 +193,7 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
                     sender_id: 6,
                     mentions: vec![],
                     nonce: Some(2.into()),
+                    reply_to_message_id: None,
                 },
             ],
             done: false,
@@ -239,6 +241,7 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
             sender_id: 7,
             mentions: vec![],
             nonce: Some(3.into()),
+            reply_to_message_id: None,
         }),
     });
 
@@ -292,6 +295,7 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
                     sender_id: 5,
                     nonce: Some(4.into()),
                     mentions: vec![],
+                    reply_to_message_id: None,
                 },
                 proto::ChannelMessage {
                     id: 9,
@@ -300,6 +304,7 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
                     sender_id: 6,
                     nonce: Some(5.into()),
                     mentions: vec![],
+                    reply_to_message_id: None,
                 },
             ],
         },
diff --git a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
index 0467610608..7be5725b68 100644
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -217,7 +217,8 @@ CREATE TABLE IF NOT EXISTS "channel_messages" (
     "sender_id" INTEGER NOT NULL REFERENCES users (id),
     "body" TEXT NOT NULL,
     "sent_at" TIMESTAMP,
-    "nonce" BLOB NOT NULL
+    "nonce" BLOB NOT NULL,
+    "reply_to_message_id" INTEGER DEFAULT NULL
 );
 CREATE INDEX "index_channel_messages_on_channel_id" ON "channel_messages" ("channel_id");
 CREATE UNIQUE INDEX "index_channel_messages_on_sender_id_nonce" ON "channel_messages" ("sender_id", "nonce");
diff --git a/crates/collab/migrations/20240203113741_add_reply_to_message.sql b/crates/collab/migrations/20240203113741_add_reply_to_message.sql
new file mode 100644
index 0000000000..6f40b62822
--- /dev/null
+++ b/crates/collab/migrations/20240203113741_add_reply_to_message.sql
@@ -0,0 +1 @@
+ALTER TABLE channel_messages ADD reply_to_message_id INTEGER DEFAULT NULL
diff --git a/crates/collab/src/db/queries/messages.rs b/crates/collab/src/db/queries/messages.rs
index 9baa7162c5..38a828efa4 100644
--- a/crates/collab/src/db/queries/messages.rs
+++ b/crates/collab/src/db/queries/messages.rs
@@ -161,6 +161,7 @@ impl Database {
                         upper_half: nonce.0,
                         lower_half: nonce.1,
                     }),
+                    reply_to_message_id: row.reply_to_message_id.map(|id| id.to_proto()),
                 }
             })
             .collect::<Vec<_>>();
@@ -207,6 +208,7 @@ impl Database {
         mentions: &[proto::ChatMention],
         timestamp: OffsetDateTime,
         nonce: u128,
+        reply_to_message_id: Option<MessageId>,
     ) -> Result<CreatedChannelMessage> {
         self.transaction(|tx| async move {
             let channel = self.get_channel_internal(channel_id, &*tx).await?;
@@ -245,6 +247,7 @@ impl Database {
                 sent_at: ActiveValue::Set(timestamp),
                 nonce: ActiveValue::Set(Uuid::from_u128(nonce)),
                 id: ActiveValue::NotSet,
+                reply_to_message_id: ActiveValue::Set(reply_to_message_id),
             })
             .on_conflict(
                 OnConflict::columns([
diff --git a/crates/collab/src/db/tables/channel_message.rs b/crates/collab/src/db/tables/channel_message.rs
index ff49c63ba7..b2493d2ead 100644
--- a/crates/collab/src/db/tables/channel_message.rs
+++ b/crates/collab/src/db/tables/channel_message.rs
@@ -12,6 +12,7 @@ pub struct Model {
     pub body: String,
     pub sent_at: PrimitiveDateTime,
     pub nonce: Uuid,
+    pub reply_to_message_id: Option<MessageId>,
 }
 
 impl ActiveModelBehavior for ActiveModel {}
diff --git a/crates/collab/src/db/tests/message_tests.rs b/crates/collab/src/db/tests/message_tests.rs
index e0467b08f3..c785e3cb73 100644
--- a/crates/collab/src/db/tests/message_tests.rs
+++ b/crates/collab/src/db/tests/message_tests.rs
@@ -32,6 +32,7 @@ async fn test_channel_message_retrieval(db: &Arc<Database>) {
                 &[],
                 OffsetDateTime::now_utc(),
                 i,
+                None,
             )
             .await
             .unwrap()
@@ -106,6 +107,7 @@ async fn test_channel_message_nonces(db: &Arc<Database>) {
             &mentions_to_proto(&[(3..10, user_b.to_proto())]),
             OffsetDateTime::now_utc(),
             100,
+            None,
         )
         .await
         .unwrap()
@@ -118,6 +120,7 @@ async fn test_channel_message_nonces(db: &Arc<Database>) {
             &mentions_to_proto(&[]),
             OffsetDateTime::now_utc(),
             200,
+            None,
         )
         .await
         .unwrap()
@@ -130,6 +133,7 @@ async fn test_channel_message_nonces(db: &Arc<Database>) {
             &mentions_to_proto(&[(4..11, user_c.to_proto())]),
             OffsetDateTime::now_utc(),
             100,
+            None,
         )
         .await
         .unwrap()
@@ -142,6 +146,7 @@ async fn test_channel_message_nonces(db: &Arc<Database>) {
             &mentions_to_proto(&[]),
             OffsetDateTime::now_utc(),
             200,
+            None,
         )
         .await
         .unwrap()
@@ -157,6 +162,7 @@ async fn test_channel_message_nonces(db: &Arc<Database>) {
             &mentions_to_proto(&[(4..11, user_a.to_proto())]),
             OffsetDateTime::now_utc(),
             100,
+            None,
         )
         .await
         .unwrap()
@@ -231,17 +237,41 @@ async fn test_unseen_channel_messages(db: &Arc<Database>) {
         .unwrap();
 
     let _ = db
-        .create_channel_message(channel_1, user, "1_1", &[], OffsetDateTime::now_utc(), 1)
+        .create_channel_message(
+            channel_1,
+            user,
+            "1_1",
+            &[],
+            OffsetDateTime::now_utc(),
+            1,
+            None,
+        )
         .await
         .unwrap();
 
     let _ = db
-        .create_channel_message(channel_1, user, "1_2", &[], OffsetDateTime::now_utc(), 2)
+        .create_channel_message(
+            channel_1,
+            user,
+            "1_2",
+            &[],
+            OffsetDateTime::now_utc(),
+            2,
+            None,
+        )
         .await
         .unwrap();
 
     let third_message = db
-        .create_channel_message(channel_1, user, "1_3", &[], OffsetDateTime::now_utc(), 3)
+        .create_channel_message(
+            channel_1,
+            user,
+            "1_3",
+            &[],
+            OffsetDateTime::now_utc(),
+            3,
+            None,
+        )
         .await
         .unwrap()
         .message_id;
@@ -251,7 +281,15 @@ async fn test_unseen_channel_messages(db: &Arc<Database>) {
         .unwrap();
 
     let fourth_message = db
-        .create_channel_message(channel_2, user, "2_1", &[], OffsetDateTime::now_utc(), 4)
+        .create_channel_message(
+            channel_2,
+            user,
+            "2_1",
+            &[],
+            OffsetDateTime::now_utc(),
+            4,
+            None,
+        )
         .await
         .unwrap()
         .message_id;
@@ -317,6 +355,7 @@ async fn test_channel_message_mentions(db: &Arc<Database>) {
         &mentions_to_proto(&[(3..10, user_b.to_proto()), (15..22, user_c.to_proto())]),
         OffsetDateTime::now_utc(),
         1,
+        None,
     )
     .await
     .unwrap();
@@ -327,6 +366,7 @@ async fn test_channel_message_mentions(db: &Arc<Database>) {
         &mentions_to_proto(&[(4..11, user_c.to_proto())]),
         OffsetDateTime::now_utc(),
         2,
+        None,
     )
     .await
     .unwrap();
@@ -337,6 +377,7 @@ async fn test_channel_message_mentions(db: &Arc<Database>) {
         &mentions_to_proto(&[]),
         OffsetDateTime::now_utc(),
         3,
+        None,
     )
     .await
     .unwrap();
@@ -347,6 +388,7 @@ async fn test_channel_message_mentions(db: &Arc<Database>) {
         &mentions_to_proto(&[(0..7, user_b.to_proto())]),
         OffsetDateTime::now_utc(),
         4,
+        None,
     )
     .await
     .unwrap();
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index c97c283b2f..2861449db0 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -3019,6 +3019,10 @@ async fn send_channel_message(
             &request.mentions,
             timestamp,
             nonce.clone().into(),
+            match request.reply_to_message_id {
+                Some(reply_to_message_id) => Some(MessageId::from_proto(reply_to_message_id)),
+                None => None,
+            },
         )
         .await?;
     let message = proto::ChannelMessage {
@@ -3028,6 +3032,7 @@ async fn send_channel_message(
         mentions: request.mentions,
         timestamp: timestamp.unix_timestamp() as u64,
         nonce: Some(nonce),
+        reply_to_message_id: request.reply_to_message_id,
     };
     broadcast(
         Some(session.connection_id),
diff --git a/crates/collab/src/tests/channel_message_tests.rs b/crates/collab/src/tests/channel_message_tests.rs
index 270ba04f7e..081ac8d19a 100644
--- a/crates/collab/src/tests/channel_message_tests.rs
+++ b/crates/collab/src/tests/channel_message_tests.rs
@@ -43,6 +43,7 @@ async fn test_basic_channel_messages(
                 MessageParams {
                     text: "hi @user_c!".into(),
                     mentions: vec![(3..10, client_c.id())],
+                    reply_to_message_id: None,
                 },
                 cx,
             )
@@ -402,3 +403,66 @@ async fn test_channel_message_changes(
 
     assert!(b_has_messages);
 }
+
+#[gpui::test]
+async fn test_chat_replies(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
+    let mut server = TestServer::start(cx_a.executor()).await;
+    let client_a = server.create_client(cx_a, "user_a").await;
+    let client_b = server.create_client(cx_b, "user_b").await;
+
+    let channel_id = server
+        .make_channel(
+            "the-channel",
+            None,
+            (&client_a, cx_a),
+            &mut [(&client_b, cx_b)],
+        )
+        .await;
+
+    // Client A sends a message, client B should see that there is a new message.
+    let channel_chat_a = client_a
+        .channel_store()
+        .update(cx_a, |store, cx| store.open_channel_chat(channel_id, cx))
+        .await
+        .unwrap();
+
+    let channel_chat_b = client_b
+        .channel_store()
+        .update(cx_b, |store, cx| store.open_channel_chat(channel_id, cx))
+        .await
+        .unwrap();
+
+    let msg_id = channel_chat_a
+        .update(cx_a, |c, cx| c.send_message("one".into(), cx).unwrap())
+        .await
+        .unwrap();
+
+    cx_a.run_until_parked();
+
+    let reply_id = channel_chat_b
+        .update(cx_b, |c, cx| {
+            c.send_message(
+                MessageParams {
+                    text: "reply".into(),
+                    reply_to_message_id: Some(msg_id),
+                    mentions: Vec::new(),
+                },
+                cx,
+            )
+            .unwrap()
+        })
+        .await
+        .unwrap();
+
+    cx_a.run_until_parked();
+
+    channel_chat_a.update(cx_a, |channel_chat, _| {
+        assert_eq!(
+            channel_chat
+                .find_loaded_message(reply_id)
+                .unwrap()
+                .reply_to_message_id,
+            Some(msg_id),
+        )
+    });
+}
diff --git a/crates/collab_ui/src/chat_panel.rs b/crates/collab_ui/src/chat_panel.rs
index 0ee4805a74..9a751335fa 100644
--- a/crates/collab_ui/src/chat_panel.rs
+++ b/crates/collab_ui/src/chat_panel.rs
@@ -1,16 +1,16 @@
 use crate::{collab_panel, ChatPanelSettings};
 use anyhow::Result;
 use call::{room, ActiveCall};
-use channel::{ChannelChat, ChannelChatEvent, ChannelMessageId, ChannelStore};
+use channel::{ChannelChat, ChannelChatEvent, ChannelMessage, ChannelMessageId, ChannelStore};
 use client::Client;
 use collections::HashMap;
 use db::kvp::KEY_VALUE_STORE;
 use editor::Editor;
 use gpui::{
-    actions, div, list, prelude::*, px, Action, AppContext, AsyncWindowContext, DismissEvent,
-    ElementId, EventEmitter, Fill, FocusHandle, FocusableView, FontWeight, ListOffset,
-    ListScrollEvent, ListState, Model, Render, Subscription, Task, View, ViewContext,
-    VisualContext, WeakView,
+    actions, div, list, prelude::*, px, Action, AppContext, AsyncWindowContext, CursorStyle,
+    DismissEvent, ElementId, EventEmitter, FocusHandle, FocusableView, FontStyle, FontWeight,
+    HighlightStyle, ListOffset, ListScrollEvent, ListState, Model, Render, StyledText,
+    Subscription, Task, View, ViewContext, VisualContext, WeakView,
 };
 use language::LanguageRegistry;
 use menu::Confirm;
@@ -23,7 +23,7 @@ use std::{sync::Arc, time::Duration};
 use time::{OffsetDateTime, UtcOffset};
 use ui::{
     popover_menu, prelude::*, Avatar, Button, ContextMenu, IconButton, IconName, KeyBinding, Label,
-    TabBar,
+    TabBar, Tooltip,
 };
 use util::{ResultExt, TryFutureExt};
 use workspace::{
@@ -62,6 +62,7 @@ pub struct ChatPanel {
     markdown_data: HashMap<ChannelMessageId, RichText>,
     focus_handle: FocusHandle,
     open_context_menu: Option<(u64, Subscription)>,
+    highlighted_message: Option<(u64, Task<()>)>,
 }
 
 #[derive(Serialize, Deserialize)]
@@ -124,6 +125,7 @@ impl ChatPanel {
                 markdown_data: Default::default(),
                 focus_handle: cx.focus_handle(),
                 open_context_menu: None,
+                highlighted_message: None,
             };
 
             if let Some(channel_id) = ActiveCall::global(cx)
@@ -236,6 +238,7 @@ impl ChatPanel {
                 let channel_name = chat.channel(cx).map(|channel| channel.name.clone());
                 self.message_editor.update(cx, |editor, cx| {
                     editor.set_channel(channel_id, channel_name, cx);
+                    editor.clear_reply_to_message_id();
                 });
             };
             let subscription = cx.subscribe(&chat, Self::channel_did_change);
@@ -285,6 +288,99 @@ impl ChatPanel {
         }
     }
 
+    fn render_replied_to_message(
+        &mut self,
+        message_id: Option<ChannelMessageId>,
+        reply_to_message: &ChannelMessage,
+        cx: &mut ViewContext<Self>,
+    ) -> impl IntoElement {
+        let body_element_id: ElementId = match message_id {
+            Some(ChannelMessageId::Saved(id)) => ("reply-to-saved-message", id).into(),
+            Some(ChannelMessageId::Pending(id)) => ("reply-to-pending-message", id).into(), // This should never happen
+            None => ("composing-reply").into(),
+        };
+
+        let message_element_id: ElementId = match message_id {
+            Some(ChannelMessageId::Saved(id)) => ("reply-to-saved-message-container", id).into(),
+            Some(ChannelMessageId::Pending(id)) => {
+                ("reply-to-pending-message-container", id).into()
+            } // This should never happen
+            None => ("composing-reply-container").into(),
+        };
+
+        let current_channel_id = self.channel_id(cx);
+        let reply_to_message_id = reply_to_message.id;
+
+        let reply_to_message_body = self
+            .markdown_data
+            .entry(reply_to_message.id)
+            .or_insert_with(|| {
+                Self::render_markdown_with_mentions(
+                    &self.languages,
+                    self.client.id(),
+                    reply_to_message,
+                )
+            });
+
+        const REPLY_TO_PREFIX: &str = "Reply to @";
+
+        div().flex_grow().child(
+            v_flex()
+                .id(message_element_id)
+                .text_ui_xs()
+                .child(
+                    h_flex()
+                        .gap_x_1()
+                        .items_center()
+                        .justify_start()
+                        .overflow_x_hidden()
+                        .whitespace_nowrap()
+                        .child(
+                            StyledText::new(format!(
+                                "{}{}",
+                                REPLY_TO_PREFIX,
+                                reply_to_message.sender.github_login.clone()
+                            ))
+                            .with_highlights(
+                                &cx.text_style(),
+                                vec![(
+                                    (REPLY_TO_PREFIX.len() - 1)
+                                        ..(reply_to_message.sender.github_login.len()
+                                            + REPLY_TO_PREFIX.len()),
+                                    HighlightStyle {
+                                        font_weight: Some(FontWeight::BOLD),
+                                        ..Default::default()
+                                    },
+                                )],
+                            ),
+                        ),
+                )
+                .child(
+                    div()
+                        .border_l_2()
+                        .border_color(cx.theme().colors().border)
+                        .px_1()
+                        .py_0p5()
+                        .mb_1()
+                        .overflow_hidden()
+                        .child(
+                            div()
+                                .max_h_12()
+                                .child(reply_to_message_body.element(body_element_id, cx)),
+                        ),
+                )
+                .cursor(CursorStyle::PointingHand)
+                .tooltip(|cx| Tooltip::text("Go to message", cx))
+                .on_click(cx.listener(move |chat_panel, _, cx| {
+                    if let Some(channel_id) = current_channel_id {
+                        chat_panel
+                            .select_channel(channel_id, reply_to_message_id.into(), cx)
+                            .detach_and_log_err(cx)
+                    }
+                })),
+        )
+    }
+
     fn render_message(&mut self, ix: usize, cx: &mut ViewContext<Self>) -> impl IntoElement {
         let active_chat = &self.active_chat.as_ref().unwrap().0;
         let (message, is_continuation_from_previous, is_admin) =
@@ -317,18 +413,9 @@ impl ChatPanel {
             });
 
         let _is_pending = message.is_pending();
-        let text = self.markdown_data.entry(message.id).or_insert_with(|| {
-            Self::render_markdown_with_mentions(&self.languages, self.client.id(), &message)
-        });
 
         let belongs_to_user = Some(message.sender.id) == self.client.user_id();
-        let message_id_to_remove = if let (ChannelMessageId::Saved(id), true) =
-            (message.id, belongs_to_user || is_admin)
-        {
-            Some(id)
-        } else {
-            None
-        };
+        let can_delete_message = belongs_to_user || is_admin;
 
         let element_id: ElementId = match message.id {
             ChannelMessageId::Saved(id) => ("saved-message", id).into(),
@@ -341,19 +428,41 @@ impl ChatPanel {
             .iter()
             .any(|m| Some(m.1) == self.client.user_id());
 
+        let message_id = match message.id {
+            ChannelMessageId::Saved(id) => Some(id),
+            ChannelMessageId::Pending(_) => None,
+        };
+
+        let reply_to_message = message
+            .reply_to_message_id
+            .map(|id| active_chat.read(cx).find_loaded_message(id))
+            .flatten()
+            .cloned();
+
+        let replied_to_you =
+            reply_to_message.as_ref().map(|m| m.sender.id) == self.client.user_id();
+
+        let is_highlighted_message = self
+            .highlighted_message
+            .as_ref()
+            .is_some_and(|(id, _)| Some(id) == message_id.as_ref());
+        let background = if is_highlighted_message {
+            cx.theme().status().info_background
+        } else if mentioning_you || replied_to_you {
+            cx.theme().colors().background
+        } else {
+            cx.theme().colors().panel_background
+        };
+
         v_flex().w_full().relative().child(
             div()
-                .bg(if mentioning_you {
-                    Fill::from(cx.theme().colors().background)
-                } else {
-                    Fill::default()
-                })
+                .bg(background)
                 .rounded_md()
                 .overflow_hidden()
                 .px_1()
                 .py_0p5()
                 .when(!is_continuation_from_previous, |this| {
-                    this.mt_1().child(
+                    this.mt_2().child(
                         h_flex()
                             .text_ui_sm()
                             .child(div().absolute().child(
@@ -377,36 +486,86 @@ impl ChatPanel {
                             ),
                     )
                 })
-                .when(mentioning_you, |this| this.mt_1())
-                .child(
-                    v_flex()
-                        .w_full()
-                        .text_ui_sm()
-                        .id(element_id)
-                        .group("")
-                        .child(text.element("body".into(), cx))
-                        .child(
+                .when(
+                    message.reply_to_message_id.is_some() && reply_to_message.is_none(),
+                    |this| {
+                        const MESSAGE_DELETED: &str = "Message has been deleted";
+
+                        let body_text = StyledText::new(MESSAGE_DELETED).with_highlights(
+                            &cx.text_style(),
+                            vec![(
+                                0..MESSAGE_DELETED.len(),
+                                HighlightStyle {
+                                    font_style: Some(FontStyle::Italic),
+                                    ..Default::default()
+                                },
+                            )],
+                        );
+
+                        this.child(
                             div()
-                                .absolute()
-                                .z_index(1)
-                                .right_0()
-                                .w_6()
-                                .bg(cx.theme().colors().panel_background)
-                                .when(!self.has_open_menu(message_id_to_remove), |el| {
-                                    el.visible_on_hover("")
-                                })
-                                .children(message_id_to_remove.map(|message_id| {
-                                    popover_menu(("menu", message_id))
-                                        .trigger(IconButton::new(
-                                            ("trigger", message_id),
-                                            IconName::Ellipsis,
-                                        ))
-                                        .menu(move |cx| {
-                                            Some(Self::render_message_menu(&this, message_id, cx))
-                                        })
-                                })),
-                        ),
-                ),
+                                .border_l_2()
+                                .text_ui_xs()
+                                .border_color(cx.theme().colors().border)
+                                .px_1()
+                                .py_0p5()
+                                .child(body_text),
+                        )
+                    },
+                )
+                .when_some(reply_to_message, |el, reply_to_message| {
+                    el.child(self.render_replied_to_message(
+                        Some(message.id),
+                        &reply_to_message,
+                        cx,
+                    ))
+                })
+                .when(mentioning_you || replied_to_you, |this| this.my_0p5())
+                .map(|el| {
+                    let text = self.markdown_data.entry(message.id).or_insert_with(|| {
+                        Self::render_markdown_with_mentions(
+                            &self.languages,
+                            self.client.id(),
+                            &message,
+                        )
+                    });
+                    el.child(
+                        v_flex()
+                            .w_full()
+                            .text_ui_sm()
+                            .id(element_id)
+                            .group("")
+                            .child(text.element("body".into(), cx))
+                            .child(
+                                div()
+                                    .absolute()
+                                    .z_index(1)
+                                    .right_0()
+                                    .w_6()
+                                    .bg(background)
+                                    .when(!self.has_open_menu(message_id), |el| {
+                                        el.visible_on_hover("")
+                                    })
+                                    .when_some(message_id, |el, message_id| {
+                                        el.child(
+                                            popover_menu(("menu", message_id))
+                                                .trigger(IconButton::new(
+                                                    ("trigger", message_id),
+                                                    IconName::Ellipsis,
+                                                ))
+                                                .menu(move |cx| {
+                                                    Some(Self::render_message_menu(
+                                                        &this,
+                                                        message_id,
+                                                        can_delete_message,
+                                                        cx,
+                                                    ))
+                                                }),
+                                        )
+                                    }),
+                            ),
+                    )
+                }),
         )
     }
 
@@ -420,13 +579,27 @@ impl ChatPanel {
     fn render_message_menu(
         this: &View<Self>,
         message_id: u64,
+        can_delete_message: bool,
         cx: &mut WindowContext,
     ) -> View<ContextMenu> {
         let menu = {
-            let this = this.clone();
-            ContextMenu::build(cx, move |menu, _| {
-                menu.entry("Delete message", None, move |cx| {
-                    this.update(cx, |this, cx| this.remove_message(message_id, cx))
+            ContextMenu::build(cx, move |menu, cx| {
+                menu.entry(
+                    "Reply to message",
+                    None,
+                    cx.handler_for(&this, move |this, cx| {
+                        this.message_editor.update(cx, |editor, cx| {
+                            editor.set_reply_to_message_id(message_id);
+                            editor.focus_handle(cx).focus(cx);
+                        })
+                    }),
+                )
+                .when(can_delete_message, move |menu| {
+                    menu.entry(
+                        "Delete message",
+                        None,
+                        cx.handler_for(&this, move |this, cx| this.remove_message(message_id, cx)),
+                    )
                 })
             })
         };
@@ -517,7 +690,21 @@ impl ChatPanel {
                     ChannelChat::load_history_since_message(chat.clone(), message_id, (*cx).clone())
                         .await
                 {
+                    let task = cx.spawn({
+                        let this = this.clone();
+
+                        |mut cx| async move {
+                            cx.background_executor().timer(Duration::from_secs(2)).await;
+                            this.update(&mut cx, |this, cx| {
+                                this.highlighted_message.take();
+                                cx.notify();
+                            })
+                            .ok();
+                        }
+                    });
+
                     this.update(&mut cx, |this, cx| {
+                        this.highlighted_message = Some((message_id, task));
                         if this.active_chat.as_ref().map_or(false, |(c, _)| *c == chat) {
                             this.message_list.scroll_to(ListOffset {
                                 item_ix,
@@ -536,6 +723,8 @@ impl ChatPanel {
 
 impl Render for ChatPanel {
     fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
+        let reply_to_message_id = self.message_editor.read(cx).reply_to_message_id();
+
         v_flex()
             .track_focus(&self.focus_handle)
             .full()
@@ -558,7 +747,7 @@ impl Render for ChatPanel {
                     ),
                 ),
             )
-            .child(div().flex_grow().px_2().pt_1().map(|this| {
+            .child(div().flex_grow().px_2().map(|this| {
                 if self.active_chat.is_some() {
                     this.child(list(self.message_list.clone()).full())
                 } else {
@@ -589,14 +778,56 @@ impl Render for ChatPanel {
                     )
                 }
             }))
+            .when_some(reply_to_message_id, |el, reply_to_message_id| {
+                let reply_message = self
+                    .active_chat()
+                    .map(|active_chat| {
+                        active_chat.read(cx).messages().iter().find_map(|m| {
+                            if m.id == ChannelMessageId::Saved(reply_to_message_id) {
+                                Some(m)
+                            } else {
+                                None
+                            }
+                        })
+                    })
+                    .flatten()
+                    .cloned();
+
+                el.when_some(reply_message, |el, reply_message| {
+                    el.child(
+                        div()
+                            .when(!self.is_scrolled_to_bottom, |el| {
+                                el.border_t_1().border_color(cx.theme().colors().border)
+                            })
+                            .flex()
+                            .w_full()
+                            .items_start()
+                            .overflow_hidden()
+                            .py_1()
+                            .px_2()
+                            .bg(cx.theme().colors().background)
+                            .child(self.render_replied_to_message(None, &reply_message, cx))
+                            .child(
+                                IconButton::new("close-reply-preview", IconName::Close)
+                                    .shape(ui::IconButtonShape::Square)
+                                    .on_click(cx.listener(move |this, _, cx| {
+                                        this.message_editor.update(cx, |editor, _| {
+                                            editor.clear_reply_to_message_id()
+                                        });
+                                    })),
+                            ),
+                    )
+                })
+            })
             .children(
                 Some(
                     h_flex()
-                        .when(!self.is_scrolled_to_bottom, |el| {
-                            el.border_t_1().border_color(cx.theme().colors().border)
-                        })
+                        .when(
+                            !self.is_scrolled_to_bottom && reply_to_message_id.is_none(),
+                            |el| el.border_t_1().border_color(cx.theme().colors().border),
+                        )
                         .p_2()
-                        .child(self.message_editor.clone()),
+                        .map(|el| el.child(self.message_editor.clone())),
                 )
                 .filter(|_| self.active_chat.is_some()),
             )
@@ -738,6 +969,7 @@ mod tests {
             }),
             nonce: 5,
             mentions: vec![(ranges[0].clone(), 101), (ranges[1].clone(), 102)],
+            reply_to_message_id: None,
         };
 
         let message = ChatPanel::render_markdown_with_mentions(&language_registry, 102, &message);
diff --git a/crates/collab_ui/src/chat_panel/message_editor.rs b/crates/collab_ui/src/chat_panel/message_editor.rs
index 06501fe3fc..d29929e1a2 100644
--- a/crates/collab_ui/src/chat_panel/message_editor.rs
+++ b/crates/collab_ui/src/chat_panel/message_editor.rs
@@ -34,6 +34,7 @@ pub struct MessageEditor {
     mentions: Vec<UserId>,
     mentions_task: Option<Task<()>>,
     channel_id: Option<ChannelId>,
+    reply_to_message_id: Option<u64>,
 }
 
 struct MessageEditorCompletionProvider(WeakView<MessageEditor>);
@@ -112,9 +113,22 @@ impl MessageEditor {
             channel_id: None,
             mentions: Vec::new(),
             mentions_task: None,
+            reply_to_message_id: None,
         }
     }
 
+    pub fn reply_to_message_id(&self) -> Option<u64> {
+        self.reply_to_message_id
+    }
+
+    pub fn set_reply_to_message_id(&mut self, reply_to_message_id: u64) {
+        self.reply_to_message_id = Some(reply_to_message_id);
+    }
+
+    pub fn clear_reply_to_message_id(&mut self) {
+        self.reply_to_message_id = None;
+    }
+
     pub fn set_channel(
         &mut self,
         channel_id: u64,
@@ -172,8 +186,13 @@ impl MessageEditor {
 
             editor.clear(cx);
             self.mentions.clear();
+            let reply_to_message_id = std::mem::take(&mut self.reply_to_message_id);
 
-            MessageParams { text, mentions }
+            MessageParams {
+                text,
+                mentions,
+                reply_to_message_id,
+            }
         })
     }
 
@@ -424,6 +443,7 @@ mod tests {
                 MessageParams {
                     text,
                     mentions: vec![(ranges[0].clone(), 101), (ranges[1].clone(), 102)],
+                    reply_to_message_id: None
                 }
             );
         });
diff --git a/crates/rpc/proto/zed.proto b/crates/rpc/proto/zed.proto
index 3a513902e5..1823b9b6c5 100644
--- a/crates/rpc/proto/zed.proto
+++ b/crates/rpc/proto/zed.proto
@@ -1122,6 +1122,7 @@ message SendChannelMessage {
     string body = 2;
     Nonce nonce = 3;
     repeated ChatMention mentions = 4;
+    optional uint64 reply_to_message_id = 5;
 }
 
 message RemoveChannelMessage {
@@ -1173,6 +1174,7 @@ message ChannelMessage {
     uint64 sender_id = 4;
     Nonce nonce = 5;
     repeated ChatMention mentions = 6;
+    optional uint64 reply_to_message_id = 7;
 }
 
 message ChatMention {

From 4e519e3af7e7cfa5db68dceb5938025dbca3b61b Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Tue, 6 Feb 2024 12:38:54 -0800
Subject: [PATCH 275/372] Make diagnostics with empty messages take up one line
 (#7456)

When a supporting diagnostic had an empty message, we were accidentally
giving the corresponding block a height of zero lines.

Release Notes:

- Fixed an issue where an editors' lines were not laid out correctly
when showing certain diagnostics.

Co-authored-by: Marshall <marshall@zed.dev>
---
 crates/editor/src/editor.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index ad4ebd2655..4cbd8965df 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -7907,7 +7907,7 @@ impl Editor {
                 .insert_blocks(
                     diagnostic_group.iter().map(|entry| {
                         let diagnostic = entry.diagnostic.clone();
-                        let message_height = diagnostic.message.lines().count() as u8;
+                        let message_height = diagnostic.message.matches('\n').count() as u8 + 1;
                         BlockProperties {
                             style: BlockStyle::Fixed,
                             position: buffer.anchor_after(entry.range.start),

From 1264e36429fcc715d1778341c775388dcab7e8a0 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Tue, 6 Feb 2024 12:45:15 -0800
Subject: [PATCH 276/372] Remove Default impl for ConnectionId (#7452)

We noticed the following message in my logs when trying to debug some
lag when collaborating:

```
2024-02-06T09:42:09-08:00 [ERROR] error handling message. client_id:3, sender_id:Some(PeerId { owner_id: 327, id: 1123430 }), type:GetCompletions, error:no such connection: 0/0
```

That `0/0` looks like a bogus connection id, constructed via a derived
`Default`. We didn't ever find a code path that would *use* a default
`ConnectionId` and lead to this error, but it did seem like an
improvement to not have a `Default` for that type.

Release Notes:

- N/A

Co-authored-by: Marshall <marshall@zed.dev>
---
 crates/collab/src/db.rs                  | 2 +-
 crates/collab/src/db/queries/projects.rs | 2 +-
 crates/collab/src/db/queries/rooms.rs    | 4 ++--
 crates/collab/src/rpc.rs                 | 2 +-
 crates/rpc/src/peer.rs                   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/crates/collab/src/db.rs b/crates/collab/src/db.rs
index 2e8540641b..6f6a95ebc2 100644
--- a/crates/collab/src/db.rs
+++ b/crates/collab/src/db.rs
@@ -692,7 +692,7 @@ impl ProjectCollaborator {
 pub struct LeftProject {
     pub id: ProjectId,
     pub host_user_id: UserId,
-    pub host_connection_id: ConnectionId,
+    pub host_connection_id: Option<ConnectionId>,
     pub connection_ids: Vec<ConnectionId>,
 }
 
diff --git a/crates/collab/src/db/queries/projects.rs b/crates/collab/src/db/queries/projects.rs
index f81403a796..3fdb94b343 100644
--- a/crates/collab/src/db/queries/projects.rs
+++ b/crates/collab/src/db/queries/projects.rs
@@ -778,7 +778,7 @@ impl Database {
             let left_project = LeftProject {
                 id: project_id,
                 host_user_id: project.host_user_id,
-                host_connection_id: project.host_connection()?,
+                host_connection_id: Some(project.host_connection()?),
                 connection_ids,
             };
             Ok((room, left_project))
diff --git a/crates/collab/src/db/queries/rooms.rs b/crates/collab/src/db/queries/rooms.rs
index c6aa5da125..f8afbeab38 100644
--- a/crates/collab/src/db/queries/rooms.rs
+++ b/crates/collab/src/db/queries/rooms.rs
@@ -862,7 +862,7 @@ impl Database {
                                 id: collaborator.project_id,
                                 host_user_id: Default::default(),
                                 connection_ids: Default::default(),
-                                host_connection_id: Default::default(),
+                                host_connection_id: None,
                             });
 
                     let collaborator_connection_id = collaborator.connection();
@@ -872,7 +872,7 @@ impl Database {
 
                     if collaborator.is_host {
                         left_project.host_user_id = collaborator.user_id;
-                        left_project.host_connection_id = collaborator_connection_id;
+                        left_project.host_connection_id = Some(collaborator_connection_id);
                     }
                 }
                 drop(collaborators);
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 2861449db0..e37681cd32 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -1691,7 +1691,7 @@ async fn leave_project(request: proto::LeaveProject, session: Session) -> Result
     tracing::info!(
         %project_id,
         host_user_id = %project.host_user_id,
-        host_connection_id = %project.host_connection_id,
+        host_connection_id = ?project.host_connection_id,
         "leave project"
     );
 
diff --git a/crates/rpc/src/peer.rs b/crates/rpc/src/peer.rs
index 9d789bd3d0..f3f74899b9 100644
--- a/crates/rpc/src/peer.rs
+++ b/crates/rpc/src/peer.rs
@@ -25,7 +25,7 @@ use std::{
 };
 use tracing::instrument;
 
-#[derive(Clone, Copy, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Serialize)]
+#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Serialize)]
 pub struct ConnectionId {
     pub owner_id: u32,
     pub id: u32,

From 90cd3b5e874907782756b7f12b30ae0f7e1697de Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 6 Feb 2024 20:25:02 -0700
Subject: [PATCH 277/372] Prevent terminal being a single column wide (#7471)

Fixes: #2750
Fixes: #7457



Release Notes:

- Fixed a hang/panic that could happen rendering a double-width
character in a single-width terminal
([#2750](https://github.com/zed-industries/zed/issues/2750),
[#7457](https://github.com/zed-industries/zed/issues/7457)).
---
 crates/terminal_view/src/terminal_element.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index 66ef42bc46..7ddb5ad988 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -450,6 +450,13 @@ impl TerminalElement {
             let mut size = bounds.size.clone();
             size.width -= gutter;
 
+            // https://github.com/zed-industries/zed/issues/2750
+            // if the terminal is one column wide, rendering 🦀
+            // causes alacritty to misbehave.
+            if size.width < cell_width * 2.0 {
+                size.width = cell_width * 2.0;
+            }
+
             TerminalSize::new(line_height, cell_width, size)
         };
 

From 3aa4e0c90b82db0a9cf542e56c2efae22500d8fc Mon Sep 17 00:00:00 2001
From: Andrew Marek <andwmarek@gmail.com>
Date: Tue, 6 Feb 2024 19:25:56 -0800
Subject: [PATCH 278/372] Fix Vim 'e' Behavior When Boundary Is Last Point on
 Line (#7424)

This was originally just to fix
https://github.com/zed-industries/zed/issues/4354, which I did by just
returning the previous offset in `find_boundary`.. but `find_boundary`
is used in the "insert mode" / normal editor too, so returning the
previous boundary breaks existing functionality in that case.

I was considering a new `find_boundary` function just for some of the
vim motions like this, but I thought that this is straightforward enough
and future Vim functions might need similar logic too.

Release Notes:

- Fixed https://github.com/zed-industries/zed/issues/4354
---
 crates/editor/src/movement.rs                 | 35 ++++++++++++++++---
 crates/vim/src/motion.rs                      | 30 ++++++++--------
 .../test_next_word_end_newline_last_char.json |  3 ++
 3 files changed, 48 insertions(+), 20 deletions(-)
 create mode 100644 crates/vim/test_data/test_next_word_end_newline_last_char.json

diff --git a/crates/editor/src/movement.rs b/crates/editor/src/movement.rs
index 4aacc7e4e7..81c6c8c21f 100644
--- a/crates/editor/src/movement.rs
+++ b/crates/editor/src/movement.rs
@@ -395,14 +395,17 @@ pub fn find_preceding_boundary(
 /// Scans for a boundary following the given start point until a boundary is found, indicated by the
 /// given predicate returning true. The predicate is called with the character to the left and right
 /// of the candidate boundary location, and will be called with `\n` characters indicating the start
-/// or end of a line.
-pub fn find_boundary(
+/// or end of a line. The function supports optionally returning the point just before the boundary
+/// is found via return_point_before_boundary.
+pub fn find_boundary_point(
     map: &DisplaySnapshot,
     from: DisplayPoint,
     find_range: FindRange,
     mut is_boundary: impl FnMut(char, char) -> bool,
+    return_point_before_boundary: bool,
 ) -> DisplayPoint {
     let mut offset = from.to_offset(&map, Bias::Right);
+    let mut prev_offset = offset;
     let mut prev_ch = None;
 
     for ch in map.buffer_snapshot.chars_at(offset) {
@@ -411,16 +414,38 @@ pub fn find_boundary(
         }
         if let Some(prev_ch) = prev_ch {
             if is_boundary(prev_ch, ch) {
-                break;
+                if return_point_before_boundary {
+                    return map.clip_point(prev_offset.to_display_point(map), Bias::Right);
+                } else {
+                    break;
+                }
             }
         }
-
+        prev_offset = offset;
         offset += ch.len_utf8();
         prev_ch = Some(ch);
     }
     map.clip_point(offset.to_display_point(map), Bias::Right)
 }
 
+pub fn find_boundary(
+    map: &DisplaySnapshot,
+    from: DisplayPoint,
+    find_range: FindRange,
+    is_boundary: impl FnMut(char, char) -> bool,
+) -> DisplayPoint {
+    return find_boundary_point(map, from, find_range, is_boundary, false);
+}
+
+pub fn find_boundary_exclusive(
+    map: &DisplaySnapshot,
+    from: DisplayPoint,
+    find_range: FindRange,
+    is_boundary: impl FnMut(char, char) -> bool,
+) -> DisplayPoint {
+    return find_boundary_point(map, from, find_range, is_boundary, true);
+}
+
 /// Returns an iterator over the characters following a given offset in the [`DisplaySnapshot`].
 /// The returned value also contains a range of the start/end of a returned character in
 /// the [`DisplaySnapshot`]. The offsets are relative to the start of a buffer.
@@ -763,7 +788,7 @@ mod tests {
                     &snapshot,
                     display_points[0],
                     FindRange::MultiLine,
-                    is_boundary
+                    is_boundary,
                 ),
                 display_points[1]
             );
diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
index 67abd5836c..99472dd1c8 100644
--- a/crates/vim/src/motion.rs
+++ b/crates/vim/src/motion.rs
@@ -798,23 +798,14 @@ fn next_word_end(
             *point.row_mut() += 1;
             *point.column_mut() = 0;
         }
-        point = movement::find_boundary(map, point, FindRange::MultiLine, |left, right| {
-            let left_kind = coerce_punctuation(char_kind(&scope, left), ignore_punctuation);
-            let right_kind = coerce_punctuation(char_kind(&scope, right), ignore_punctuation);
 
-            left_kind != right_kind && left_kind != CharKind::Whitespace
-        });
+        point =
+            movement::find_boundary_exclusive(map, point, FindRange::MultiLine, |left, right| {
+                let left_kind = coerce_punctuation(char_kind(&scope, left), ignore_punctuation);
+                let right_kind = coerce_punctuation(char_kind(&scope, right), ignore_punctuation);
 
-        // find_boundary clips, so if the character after the next character is a newline or at the end of the document, we know
-        // we have backtracked already
-        if !map
-            .chars_at(point)
-            .nth(1)
-            .map(|(c, _)| c == '\n')
-            .unwrap_or(true)
-        {
-            *point.column_mut() = point.column().saturating_sub(1);
-        }
+                left_kind != right_kind && left_kind != CharKind::Whitespace
+            });
         point = map.clip_point(point, Bias::Left);
     }
     point
@@ -1285,6 +1276,15 @@ mod test {
         cx.assert_shared_state("one two thˇree four").await;
     }
 
+    #[gpui::test]
+    async fn test_next_word_end_newline_last_char(cx: &mut gpui::TestAppContext) {
+        let mut cx = NeovimBackedTestContext::new(cx).await;
+        let initial_state = indoc! {r"something(ˇfoo)"};
+        cx.set_shared_state(initial_state).await;
+        cx.simulate_shared_keystrokes(["}"]).await;
+        cx.assert_shared_state(indoc! {r"something(fooˇ)"}).await;
+    }
+
     #[gpui::test]
     async fn test_next_line_start(cx: &mut gpui::TestAppContext) {
         let mut cx = NeovimBackedTestContext::new(cx).await;
diff --git a/crates/vim/test_data/test_next_word_end_newline_last_char.json b/crates/vim/test_data/test_next_word_end_newline_last_char.json
new file mode 100644
index 0000000000..9dac2979f5
--- /dev/null
+++ b/crates/vim/test_data/test_next_word_end_newline_last_char.json
@@ -0,0 +1,3 @@
+{"Put":{"state":"something(ˇfoo)"}}
+{"Key":"}"}
+{"Get":{"state":"something(fooˇ)","mode":"Normal"}}

From 9fd221271a1f72a7dd6b37a6fae29ba7b035276f Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 6 Feb 2024 20:58:38 -0700
Subject: [PATCH 279/372] Go back to an alacritty release (#7474)

Release Notes:

- N/A
---
 Cargo.lock                 | 5 +++--
 crates/terminal/Cargo.toml | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ef68faac45..78a47cc604 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -103,8 +103,9 @@ dependencies = [
 
 [[package]]
 name = "alacritty_terminal"
-version = "0.20.1-dev"
-source = "git+https://github.com/alacritty/alacritty?rev=2d2b894c3b869fadc78fce9d72cb5c8d2b764cac#2d2b894c3b869fadc78fce9d72cb5c8d2b764cac"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc7ceabf6fc76511f616ca216b51398a2511f19ba9f71bcbd977999edff1b0d1"
 dependencies = [
  "base64 0.21.4",
  "bitflags 2.4.1",
diff --git a/crates/terminal/Cargo.toml b/crates/terminal/Cargo.toml
index d4eefd861f..7f12fc6eb7 100644
--- a/crates/terminal/Cargo.toml
+++ b/crates/terminal/Cargo.toml
@@ -11,8 +11,7 @@ doctest = false
 
 
 [dependencies]
-# needed for "a few weeks" until alacritty 0.13.2 is out
-alacritty_terminal = { git = "https://github.com/alacritty/alacritty", rev = "2d2b894c3b869fadc78fce9d72cb5c8d2b764cac" }
+alacritty_terminal = "0.22.0"
 anyhow.workspace = true
 db.workspace = true
 dirs = "4.0.0"

From d3562d4c9c8d95ee9f029a20349c1b0f5fbd0f7c Mon Sep 17 00:00:00 2001
From: Amin Yahyaabadi <aminyahyaabadi74@gmail.com>
Date: Tue, 6 Feb 2024 22:54:40 -0800
Subject: [PATCH 280/372] Fixes for file-watching, user assets, and system
 dependencies (#2)

* fix: avoid panics in case of non-existing path for watching

* fix: copy the themes and plugins

* Revert "add a few more libraries to the linux script"

This reverts commit 7509677003da3398d0df796eca9c5435a12f576e.

* fix: add vulkan validation layers to the system deps

* fix: fix the themes paths
---
 Cargo.lock          |  1 +
 crates/fs/src/fs.rs |  7 ++++++-
 script/linux        | 19 +++++++++++--------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 817eca20f6..1a1cc787d5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -937,6 +937,7 @@ dependencies = [
 [[package]]
 name = "blade-graphics"
 version = "0.3.0"
+source = "git+https://github.com/kvark/blade?rev=f35bc605154e210ab6190291235889b6ddad73f1#f35bc605154e210ab6190291235889b6ddad73f1"
 dependencies = [
  "ash",
  "ash-window",
diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index edd3da101c..bdb32d7d76 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -287,12 +287,17 @@ impl Fs for RealFs {
     ) -> Pin<Box<dyn Send + Stream<Item = Vec<Event>>>> {
         let (tx, rx) = smol::channel::unbounded();
 
+        if !path.exists() {
+            log::error!("watch path does not exist: {}", path.display());
+            return Box::pin(rx);
+        }
+
         let mut watcher = notify::recommended_watcher(move |res| match res {
             Ok(event) => {
                 let _ = tx.try_send(vec![event]);
             }
             Err(err) => {
-                eprintln!("watch error: {:?}", err);
+                log::error!("watch error: {}", err);
             }
         })
         .unwrap();
diff --git a/script/linux b/script/linux
index 2dee0ac9fe..f672ed8b85 100755
--- a/script/linux
+++ b/script/linux
@@ -3,10 +3,17 @@
 # if not on Linux, do nothing
 [[ $(uname) == "Linux" ]] || exit 0
 
-# Copy settings and keymap to the user's home directory if they don't exist
+# Copy assets to the user's home directory if they don't exist
 mkdir -p "$HOME/.config/zed"
+
+mkdir -p "$HOME/.config/zed/plugins"
+
+mkdir -p "$HOME/.config/zed/themes"
+cp -ruL ./assets/themes/*/*.json "$HOME/.config/zed/themes"
+
 test -f "$HOME/.config/zed/settings.json" ||
   cp -uL ./assets/settings/initial_user_settings.json "$HOME/.config/zed/settings.json"
+
 test -f "$HOME/.config/zed/keymap.json" ||
   cp -uL ./assets/keymaps/default.json "$HOME/.config/zed/keymap.json"
 
@@ -21,13 +28,7 @@ if [[ -n $apt ]]; then
   deps=(
     libasound2-dev
     libfontconfig-dev
-    libxcb-dev
-    alsa-base
-    cmake
-    fontconfig
-    libssl-dev
-    build-essential
-
+    vulkan-validationlayers*
   )
   $maysudo "$apt" install -y "${deps[@]}"
   exit 0
@@ -40,6 +41,7 @@ if [[ -n $dnf ]]; then
   deps=(
     alsa-lib-devel
     fontconfig-devel
+    vulkan-validation-layers
   )
   $maysudo "$dnf" install -y "${deps[@]}"
   exit 0
@@ -52,6 +54,7 @@ if [[ -n $pacman ]]; then
   deps=(
     alsa-lib
     fontconfig
+    vulkan-validation-layers
   )
   $maysudo "$pacman" -S --noconfirm "${deps[@]}"
   exit 0

From 7939673a7de935a3a58de1ef85dc9dd26a30d1aa Mon Sep 17 00:00:00 2001
From: James Gee <1285296+geemanjs@users.noreply.github.com>
Date: Wed, 7 Feb 2024 07:12:34 +0000
Subject: [PATCH 281/372] Jetbrains keymap - Movement between panes (#7464)

Release Notes:

- Improved Jetbrains keybindings to include cmd+alt+left/right to go
back and forwards between panes rather than the default previous / next
pane

Signed-off-by: James Gee <1285296+geemanjs@users.noreply.github.com>
---
 assets/keymaps/jetbrains.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/assets/keymaps/jetbrains.json b/assets/keymaps/jetbrains.json
index d2dcbddbc4..5fb9bf7e32 100644
--- a/assets/keymaps/jetbrains.json
+++ b/assets/keymaps/jetbrains.json
@@ -81,6 +81,13 @@
       "cmd-6": "diagnostics::Deploy"
     }
   },
+  {
+    "context": "Pane",
+    "bindings": {
+      "cmd-alt-left": "pane::GoBack",
+      "cmd-alt-right": "pane::GoForward"
+    }
+  },
   {
     "context": "ProjectPanel",
     "bindings": {

From eb236302c2cd4d50b7e54fdbbb00a1298f8056ca Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Wed, 7 Feb 2024 09:45:37 +0200
Subject: [PATCH 282/372] Use Fx* variants of HashMap and HashSet everywhere in
 Zed (#7481)

Release Notes:

- N/A
---
 Cargo.lock                                  |  4 ++++
 crates/channel/src/channel_chat.rs          |  2 +-
 crates/client/src/client.rs                 |  2 +-
 crates/gpui/src/app.rs                      | 26 ++++++++++-----------
 crates/gpui/src/key_dispatch.rs             | 14 +++++------
 crates/gpui/src/keymap.rs                   |  7 ++----
 crates/gpui/src/platform/mac/metal_atlas.rs |  4 ++--
 crates/gpui/src/scene.rs                    |  4 ++--
 crates/gpui/src/taffy.rs                    | 22 ++++++++---------
 crates/gpui/src/text_system.rs              | 12 +++++-----
 crates/gpui/src/text_system/line_layout.rs  | 12 +++++-----
 crates/gpui/src/window.rs                   |  6 ++---
 crates/gpui/src/window/element_cx.rs        | 22 ++++++++---------
 crates/project_panel/src/project_panel.rs   | 18 ++++----------
 crates/search/src/project_search.rs         |  4 ++--
 crates/semantic_index/src/parsing.rs        |  4 ++--
 crates/sqlez/Cargo.toml                     |  1 +
 crates/sqlez/src/thread_safe_connection.rs  |  3 ++-
 crates/terminal/Cargo.toml                  |  1 +
 crates/terminal/src/terminal.rs             |  2 +-
 crates/terminal/src/terminal_settings.rs    |  3 ++-
 crates/theme/Cargo.toml                     |  7 ++----
 crates/theme/src/registry.rs                |  4 ++--
 crates/util/Cargo.toml                      |  1 +
 crates/util/src/test/marked_text.rs         |  3 ++-
 crates/zed/src/open_listener.rs             |  4 ++--
 crates/zed/src/zed.rs                       |  6 ++---
 27 files changed, 96 insertions(+), 102 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 78a47cc604..8e72a590de 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7530,6 +7530,7 @@ name = "sqlez"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "collections",
  "futures 0.3.28",
  "indoc",
  "lazy_static",
@@ -8105,6 +8106,7 @@ version = "0.1.0"
 dependencies = [
  "alacritty_terminal",
  "anyhow",
+ "collections",
  "db",
  "dirs 4.0.0",
  "futures 0.3.28",
@@ -8200,6 +8202,7 @@ name = "theme"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "collections",
  "color",
  "derive_more",
  "fs",
@@ -9343,6 +9346,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "backtrace",
+ "collections",
  "dirs 3.0.2",
  "futures 0.3.28",
  "git2",
diff --git a/crates/channel/src/channel_chat.rs b/crates/channel/src/channel_chat.rs
index ad843470be..e6ed013ade 100644
--- a/crates/channel/src/channel_chat.rs
+++ b/crates/channel/src/channel_chat.rs
@@ -5,13 +5,13 @@ use client::{
     user::{User, UserStore},
     Client, Subscription, TypedEnvelope, UserId,
 };
+use collections::HashSet;
 use futures::lock::Mutex;
 use gpui::{
     AppContext, AsyncAppContext, Context, EventEmitter, Model, ModelContext, Task, WeakModel,
 };
 use rand::prelude::*;
 use std::{
-    collections::HashSet,
     ops::{ControlFlow, Range},
     sync::Arc,
 };
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index ff8adc9660..e454d3ddaf 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -10,6 +10,7 @@ use async_tungstenite::tungstenite::{
     error::Error as WebsocketError,
     http::{Request, StatusCode},
 };
+use collections::HashMap;
 use futures::{
     channel::oneshot, future::LocalBoxFuture, AsyncReadExt, FutureExt, SinkExt, StreamExt,
     TryFutureExt as _, TryStreamExt,
@@ -29,7 +30,6 @@ use serde_json;
 use settings::{Settings, SettingsStore};
 use std::{
     any::TypeId,
-    collections::HashMap,
     convert::TryFrom,
     fmt::Write as _,
     future::Future,
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 45c26b0ba8..ec4bf83d54 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -23,7 +23,7 @@ use crate::{
     TextSystem, View, ViewContext, Window, WindowContext, WindowHandle, WindowId,
 };
 use anyhow::{anyhow, Result};
-use collections::{FxHashMap, FxHashSet, VecDeque};
+use collections::{HashMap, HashSet, VecDeque};
 use futures::{channel::oneshot, future::LocalBoxFuture, Future};
 
 use slotmap::SlotMap;
@@ -212,24 +212,24 @@ pub struct AppContext {
     pending_updates: usize,
     pub(crate) actions: Rc<ActionRegistry>,
     pub(crate) active_drag: Option<AnyDrag>,
-    pub(crate) next_frame_callbacks: FxHashMap<DisplayId, Vec<FrameCallback>>,
-    pub(crate) frame_consumers: FxHashMap<DisplayId, Task<()>>,
+    pub(crate) next_frame_callbacks: HashMap<DisplayId, Vec<FrameCallback>>,
+    pub(crate) frame_consumers: HashMap<DisplayId, Task<()>>,
     pub(crate) background_executor: BackgroundExecutor,
     pub(crate) foreground_executor: ForegroundExecutor,
     pub(crate) svg_renderer: SvgRenderer,
     asset_source: Arc<dyn AssetSource>,
     pub(crate) image_cache: ImageCache,
     pub(crate) text_style_stack: Vec<TextStyleRefinement>,
-    pub(crate) globals_by_type: FxHashMap<TypeId, Box<dyn Any>>,
+    pub(crate) globals_by_type: HashMap<TypeId, Box<dyn Any>>,
     pub(crate) entities: EntityMap,
     pub(crate) new_view_observers: SubscriberSet<TypeId, NewViewListener>,
     pub(crate) windows: SlotMap<WindowId, Option<Window>>,
     pub(crate) keymap: Rc<RefCell<Keymap>>,
     pub(crate) global_action_listeners:
-        FxHashMap<TypeId, Vec<Rc<dyn Fn(&dyn Any, DispatchPhase, &mut Self)>>>,
+        HashMap<TypeId, Vec<Rc<dyn Fn(&dyn Any, DispatchPhase, &mut Self)>>>,
     pending_effects: VecDeque<Effect>,
-    pub(crate) pending_notifications: FxHashSet<EntityId>,
-    pub(crate) pending_global_notifications: FxHashSet<TypeId>,
+    pub(crate) pending_notifications: HashSet<EntityId>,
+    pub(crate) pending_global_notifications: HashSet<TypeId>,
     pub(crate) observers: SubscriberSet<EntityId, Handler>,
     // TypeId is the type of the event that the listener callback expects
     pub(crate) event_listeners: SubscriberSet<EntityId, (TypeId, Listener)>,
@@ -274,23 +274,23 @@ impl AppContext {
                 flushing_effects: false,
                 pending_updates: 0,
                 active_drag: None,
-                next_frame_callbacks: FxHashMap::default(),
-                frame_consumers: FxHashMap::default(),
+                next_frame_callbacks: HashMap::default(),
+                frame_consumers: HashMap::default(),
                 background_executor: executor,
                 foreground_executor,
                 svg_renderer: SvgRenderer::new(asset_source.clone()),
                 asset_source,
                 image_cache: ImageCache::new(http_client),
                 text_style_stack: Vec::new(),
-                globals_by_type: FxHashMap::default(),
+                globals_by_type: HashMap::default(),
                 entities,
                 new_view_observers: SubscriberSet::new(),
                 windows: SlotMap::with_key(),
                 keymap: Rc::new(RefCell::new(Keymap::default())),
-                global_action_listeners: FxHashMap::default(),
+                global_action_listeners: HashMap::default(),
                 pending_effects: VecDeque::new(),
-                pending_notifications: FxHashSet::default(),
-                pending_global_notifications: FxHashSet::default(),
+                pending_notifications: HashSet::default(),
+                pending_global_notifications: HashSet::default(),
                 observers: SubscriberSet::new(),
                 event_listeners: SubscriberSet::new(),
                 release_listeners: SubscriberSet::new(),
diff --git a/crates/gpui/src/key_dispatch.rs b/crates/gpui/src/key_dispatch.rs
index 8f9eb16a62..894f3b7d84 100644
--- a/crates/gpui/src/key_dispatch.rs
+++ b/crates/gpui/src/key_dispatch.rs
@@ -53,7 +53,7 @@ use crate::{
     Action, ActionRegistry, DispatchPhase, ElementContext, EntityId, FocusId, KeyBinding,
     KeyContext, Keymap, KeymatchResult, Keystroke, KeystrokeMatcher, WindowContext,
 };
-use collections::FxHashMap;
+use collections::HashMap;
 use smallvec::{smallvec, SmallVec};
 use std::{
     any::{Any, TypeId},
@@ -69,9 +69,9 @@ pub(crate) struct DispatchTree {
     node_stack: Vec<DispatchNodeId>,
     pub(crate) context_stack: Vec<KeyContext>,
     nodes: Vec<DispatchNode>,
-    focusable_node_ids: FxHashMap<FocusId, DispatchNodeId>,
-    view_node_ids: FxHashMap<EntityId, DispatchNodeId>,
-    keystroke_matchers: FxHashMap<SmallVec<[KeyContext; 4]>, KeystrokeMatcher>,
+    focusable_node_ids: HashMap<FocusId, DispatchNodeId>,
+    view_node_ids: HashMap<EntityId, DispatchNodeId>,
+    keystroke_matchers: HashMap<SmallVec<[KeyContext; 4]>, KeystrokeMatcher>,
     keymap: Rc<RefCell<Keymap>>,
     action_registry: Rc<ActionRegistry>,
 }
@@ -100,9 +100,9 @@ impl DispatchTree {
             node_stack: Vec::new(),
             context_stack: Vec::new(),
             nodes: Vec::new(),
-            focusable_node_ids: FxHashMap::default(),
-            view_node_ids: FxHashMap::default(),
-            keystroke_matchers: FxHashMap::default(),
+            focusable_node_ids: HashMap::default(),
+            view_node_ids: HashMap::default(),
+            keystroke_matchers: HashMap::default(),
             keymap,
             action_registry,
         }
diff --git a/crates/gpui/src/keymap.rs b/crates/gpui/src/keymap.rs
index 45e0ebbe95..e2a6bdfc4b 100644
--- a/crates/gpui/src/keymap.rs
+++ b/crates/gpui/src/keymap.rs
@@ -7,12 +7,9 @@ pub use context::*;
 pub(crate) use matcher::*;
 
 use crate::{Action, Keystroke, NoAction};
-use collections::HashSet;
+use collections::{HashMap, HashSet};
 use smallvec::SmallVec;
-use std::{
-    any::{Any, TypeId},
-    collections::HashMap,
-};
+use std::any::{Any, TypeId};
 
 /// An opaque identifier of which version of the keymap is currently active.
 /// The keymap's version is changed whenever bindings are added or removed.
diff --git a/crates/gpui/src/platform/mac/metal_atlas.rs b/crates/gpui/src/platform/mac/metal_atlas.rs
index 95f78a4465..c029ec9be7 100644
--- a/crates/gpui/src/platform/mac/metal_atlas.rs
+++ b/crates/gpui/src/platform/mac/metal_atlas.rs
@@ -3,7 +3,7 @@ use crate::{
     Point, Size,
 };
 use anyhow::Result;
-use collections::FxHashMap;
+use collections::HashMap;
 use derive_more::{Deref, DerefMut};
 use etagere::BucketedAtlasAllocator;
 use metal::Device;
@@ -53,7 +53,7 @@ struct MetalAtlasState {
     monochrome_textures: Vec<MetalAtlasTexture>,
     polychrome_textures: Vec<MetalAtlasTexture>,
     path_textures: Vec<MetalAtlasTexture>,
-    tiles_by_key: FxHashMap<AtlasKey, AtlasTile>,
+    tiles_by_key: HashMap<AtlasKey, AtlasTile>,
 }
 
 impl PlatformAtlas for MetalAtlas {
diff --git a/crates/gpui/src/scene.rs b/crates/gpui/src/scene.rs
index d5d717e278..dfd51c7bc7 100644
--- a/crates/gpui/src/scene.rs
+++ b/crates/gpui/src/scene.rs
@@ -2,7 +2,7 @@ use crate::{
     point, AtlasTextureId, AtlasTile, Bounds, ContentMask, Corners, Edges, EntityId, Hsla, Pixels,
     Point, ScaledPixels, StackingOrder,
 };
-use collections::{BTreeMap, FxHashSet};
+use collections::{BTreeMap, HashSet};
 use std::{fmt::Debug, iter::Peekable, slice};
 
 // Exported to metal
@@ -159,7 +159,7 @@ impl Scene {
         layer_id
     }
 
-    pub fn reuse_views(&mut self, views: &FxHashSet<EntityId>, prev_scene: &mut Self) {
+    pub fn reuse_views(&mut self, views: &HashSet<EntityId>, prev_scene: &mut Self) {
         for shadow in prev_scene.shadows.drain(..) {
             if views.contains(&shadow.view_id.into()) {
                 let order = &prev_scene.orders_by_layer[&shadow.layer_id];
diff --git a/crates/gpui/src/taffy.rs b/crates/gpui/src/taffy.rs
index 0797c8f3b4..3536d3fa59 100644
--- a/crates/gpui/src/taffy.rs
+++ b/crates/gpui/src/taffy.rs
@@ -2,7 +2,7 @@ use crate::{
     AbsoluteLength, Bounds, DefiniteLength, Edges, Length, Pixels, Point, Size, Style,
     WindowContext,
 };
-use collections::{FxHashMap, FxHashSet};
+use collections::{HashMap, HashSet};
 use smallvec::SmallVec;
 use std::fmt::Debug;
 use taffy::{
@@ -17,11 +17,11 @@ type NodeMeasureFn =
 
 pub struct TaffyLayoutEngine {
     taffy: Taffy,
-    styles: FxHashMap<LayoutId, Style>,
-    children_to_parents: FxHashMap<LayoutId, LayoutId>,
-    absolute_layout_bounds: FxHashMap<LayoutId, Bounds<Pixels>>,
-    computed_layouts: FxHashSet<LayoutId>,
-    nodes_to_measure: FxHashMap<LayoutId, NodeMeasureFn>,
+    styles: HashMap<LayoutId, Style>,
+    children_to_parents: HashMap<LayoutId, LayoutId>,
+    absolute_layout_bounds: HashMap<LayoutId, Bounds<Pixels>>,
+    computed_layouts: HashSet<LayoutId>,
+    nodes_to_measure: HashMap<LayoutId, NodeMeasureFn>,
 }
 
 static EXPECT_MESSAGE: &str = "we should avoid taffy layout errors by construction if possible";
@@ -30,11 +30,11 @@ impl TaffyLayoutEngine {
     pub fn new() -> Self {
         TaffyLayoutEngine {
             taffy: Taffy::new(),
-            styles: FxHashMap::default(),
-            children_to_parents: FxHashMap::default(),
-            absolute_layout_bounds: FxHashMap::default(),
-            computed_layouts: FxHashSet::default(),
-            nodes_to_measure: FxHashMap::default(),
+            styles: HashMap::default(),
+            children_to_parents: HashMap::default(),
+            absolute_layout_bounds: HashMap::default(),
+            computed_layouts: HashSet::default(),
+            nodes_to_measure: HashMap::default(),
         }
     }
 
diff --git a/crates/gpui/src/text_system.rs b/crates/gpui/src/text_system.rs
index 12242e26c2..75d98a8305 100644
--- a/crates/gpui/src/text_system.rs
+++ b/crates/gpui/src/text_system.rs
@@ -13,7 +13,7 @@ use crate::{
     SharedString, Size, UnderlineStyle,
 };
 use anyhow::anyhow;
-use collections::{BTreeSet, FxHashMap, FxHashSet};
+use collections::{BTreeSet, HashMap, HashSet};
 use core::fmt;
 use derive_more::Deref;
 use itertools::Itertools;
@@ -42,10 +42,10 @@ pub(crate) const SUBPIXEL_VARIANTS: u8 = 4;
 /// The GPUI text rendering sub system.
 pub struct TextSystem {
     platform_text_system: Arc<dyn PlatformTextSystem>,
-    font_ids_by_font: RwLock<FxHashMap<Font, Result<FontId>>>,
-    font_metrics: RwLock<FxHashMap<FontId, FontMetrics>>,
-    raster_bounds: RwLock<FxHashMap<RenderGlyphParams, Bounds<DevicePixels>>>,
-    wrapper_pool: Mutex<FxHashMap<FontIdWithSize, Vec<LineWrapper>>>,
+    font_ids_by_font: RwLock<HashMap<Font, Result<FontId>>>,
+    font_metrics: RwLock<HashMap<FontId, FontMetrics>>,
+    raster_bounds: RwLock<HashMap<RenderGlyphParams, Bounds<DevicePixels>>>,
+    wrapper_pool: Mutex<HashMap<FontIdWithSize, Vec<LineWrapper>>>,
     font_runs_pool: Mutex<Vec<Vec<FontRun>>>,
     fallback_font_stack: SmallVec<[Font; 2]>,
 }
@@ -447,7 +447,7 @@ impl WindowTextSystem {
         Ok(lines)
     }
 
-    pub(crate) fn finish_frame(&self, reused_views: &FxHashSet<EntityId>) {
+    pub(crate) fn finish_frame(&self, reused_views: &HashSet<EntityId>) {
         self.line_layout_cache.finish_frame(reused_views)
     }
 
diff --git a/crates/gpui/src/text_system/line_layout.rs b/crates/gpui/src/text_system/line_layout.rs
index 014c2bb1ec..144f855c56 100644
--- a/crates/gpui/src/text_system/line_layout.rs
+++ b/crates/gpui/src/text_system/line_layout.rs
@@ -1,5 +1,5 @@
 use crate::{px, EntityId, FontId, GlyphId, Pixels, PlatformTextSystem, Point, Size};
-use collections::{FxHashMap, FxHashSet};
+use collections::{HashMap, HashSet};
 use parking_lot::{Mutex, RwLock, RwLockUpgradableReadGuard};
 use smallvec::SmallVec;
 use std::{
@@ -277,10 +277,10 @@ impl WrappedLineLayout {
 
 pub(crate) struct LineLayoutCache {
     view_stack: Mutex<Vec<EntityId>>,
-    previous_frame: Mutex<FxHashMap<CacheKey, Arc<LineLayout>>>,
-    current_frame: RwLock<FxHashMap<CacheKey, Arc<LineLayout>>>,
-    previous_frame_wrapped: Mutex<FxHashMap<CacheKey, Arc<WrappedLineLayout>>>,
-    current_frame_wrapped: RwLock<FxHashMap<CacheKey, Arc<WrappedLineLayout>>>,
+    previous_frame: Mutex<HashMap<CacheKey, Arc<LineLayout>>>,
+    current_frame: RwLock<HashMap<CacheKey, Arc<LineLayout>>>,
+    previous_frame_wrapped: Mutex<HashMap<CacheKey, Arc<WrappedLineLayout>>>,
+    current_frame_wrapped: RwLock<HashMap<CacheKey, Arc<WrappedLineLayout>>>,
     platform_text_system: Arc<dyn PlatformTextSystem>,
 }
 
@@ -296,7 +296,7 @@ impl LineLayoutCache {
         }
     }
 
-    pub fn finish_frame(&self, reused_views: &FxHashSet<EntityId>) {
+    pub fn finish_frame(&self, reused_views: &HashSet<EntityId>) {
         debug_assert_eq!(self.view_stack.lock().len(), 0);
 
         let mut prev_frame = self.previous_frame.lock();
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 4b7c43e113..429ea0dbe2 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -10,7 +10,7 @@ use crate::{
     WindowOptions, WindowTextSystem,
 };
 use anyhow::{anyhow, Context as _, Result};
-use collections::FxHashSet;
+use collections::HashSet;
 use derive_more::{Deref, DerefMut};
 use futures::{
     channel::{mpsc, oneshot},
@@ -259,7 +259,7 @@ pub struct Window {
     pub(crate) element_id_stack: GlobalElementId,
     pub(crate) rendered_frame: Frame,
     pub(crate) next_frame: Frame,
-    pub(crate) dirty_views: FxHashSet<EntityId>,
+    pub(crate) dirty_views: HashSet<EntityId>,
     pub(crate) focus_handles: Arc<RwLock<SlotMap<FocusId, AtomicUsize>>>,
     focus_listeners: SubscriberSet<(), AnyWindowFocusListener>,
     focus_lost_listeners: SubscriberSet<(), AnyObserver>,
@@ -428,7 +428,7 @@ impl Window {
             element_id_stack: GlobalElementId::default(),
             rendered_frame: Frame::new(DispatchTree::new(cx.keymap.clone(), cx.actions.clone())),
             next_frame: Frame::new(DispatchTree::new(cx.keymap.clone(), cx.actions.clone())),
-            dirty_views: FxHashSet::default(),
+            dirty_views: HashSet::default(),
             focus_handles: Arc::new(RwLock::new(SlotMap::with_key())),
             focus_listeners: SubscriberSet::new(),
             focus_lost_listeners: SubscriberSet::new(),
diff --git a/crates/gpui/src/window/element_cx.rs b/crates/gpui/src/window/element_cx.rs
index 8ba3fc5c4f..a1e96af5ff 100644
--- a/crates/gpui/src/window/element_cx.rs
+++ b/crates/gpui/src/window/element_cx.rs
@@ -21,7 +21,7 @@ use std::{
 };
 
 use anyhow::Result;
-use collections::{FxHashMap, FxHashSet};
+use collections::{HashMap, HashSet};
 use derive_more::{Deref, DerefMut};
 use media::core_video::CVImageBuffer;
 use smallvec::SmallVec;
@@ -53,8 +53,8 @@ pub(crate) struct TooltipRequest {
 pub(crate) struct Frame {
     pub(crate) focus: Option<FocusId>,
     pub(crate) window_active: bool,
-    pub(crate) element_states: FxHashMap<GlobalElementId, ElementStateBox>,
-    pub(crate) mouse_listeners: FxHashMap<TypeId, Vec<(StackingOrder, EntityId, AnyMouseListener)>>,
+    pub(crate) element_states: HashMap<GlobalElementId, ElementStateBox>,
+    pub(crate) mouse_listeners: HashMap<TypeId, Vec<(StackingOrder, EntityId, AnyMouseListener)>>,
     pub(crate) dispatch_tree: DispatchTree,
     pub(crate) scene: Scene,
     pub(crate) depth_map: Vec<(StackingOrder, EntityId, Bounds<Pixels>)>,
@@ -65,13 +65,13 @@ pub(crate) struct Frame {
     pub(crate) element_offset_stack: Vec<Point<Pixels>>,
     pub(crate) requested_input_handler: Option<RequestedInputHandler>,
     pub(crate) tooltip_request: Option<TooltipRequest>,
-    pub(crate) cursor_styles: FxHashMap<EntityId, CursorStyle>,
+    pub(crate) cursor_styles: HashMap<EntityId, CursorStyle>,
     pub(crate) requested_cursor_style: Option<CursorStyle>,
     pub(crate) view_stack: Vec<EntityId>,
-    pub(crate) reused_views: FxHashSet<EntityId>,
+    pub(crate) reused_views: HashSet<EntityId>,
 
     #[cfg(any(test, feature = "test-support"))]
-    pub(crate) debug_bounds: collections::FxHashMap<String, Bounds<Pixels>>,
+    pub(crate) debug_bounds: collections::HashMap<String, Bounds<Pixels>>,
 }
 
 impl Frame {
@@ -79,8 +79,8 @@ impl Frame {
         Frame {
             focus: None,
             window_active: false,
-            element_states: FxHashMap::default(),
-            mouse_listeners: FxHashMap::default(),
+            element_states: HashMap::default(),
+            mouse_listeners: HashMap::default(),
             dispatch_tree,
             scene: Scene::default(),
             depth_map: Vec::new(),
@@ -91,13 +91,13 @@ impl Frame {
             element_offset_stack: Vec::new(),
             requested_input_handler: None,
             tooltip_request: None,
-            cursor_styles: FxHashMap::default(),
+            cursor_styles: HashMap::default(),
             requested_cursor_style: None,
             view_stack: Vec::new(),
-            reused_views: FxHashSet::default(),
+            reused_views: HashSet::default(),
 
             #[cfg(any(test, feature = "test-support"))]
-            debug_bounds: FxHashMap::default(),
+            debug_bounds: HashMap::default(),
         }
     }
 
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index b43b5d8413..3744a36c00 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -8,6 +8,7 @@ use editor::{actions::Cancel, scroll::Autoscroll, Editor};
 use file_associations::FileAssociations;
 
 use anyhow::{anyhow, Result};
+use collections::{hash_map, HashMap};
 use gpui::{
     actions, div, overlay, px, uniform_list, Action, AppContext, AssetSource, AsyncWindowContext,
     ClipboardItem, DismissEvent, Div, EventEmitter, FocusHandle, FocusableView, InteractiveElement,
@@ -22,14 +23,7 @@ use project::{
 };
 use project_panel_settings::{ProjectPanelDockPosition, ProjectPanelSettings};
 use serde::{Deserialize, Serialize};
-use std::{
-    cmp::Ordering,
-    collections::{hash_map, HashMap},
-    ffi::OsStr,
-    ops::Range,
-    path::Path,
-    sync::Arc,
-};
+use std::{cmp::Ordering, ffi::OsStr, ops::Range, path::Path, sync::Arc};
 use theme::ThemeSettings;
 use ui::{prelude::*, v_flex, ContextMenu, Icon, KeyBinding, Label, ListItem};
 use unicase::UniCase;
@@ -1699,15 +1693,13 @@ impl ClipboardEntry {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use collections::HashSet;
     use gpui::{TestAppContext, View, VisualTestContext, WindowHandle};
     use pretty_assertions::assert_eq;
     use project::{project_settings::ProjectSettings, FakeFs};
     use serde_json::json;
     use settings::SettingsStore;
-    use std::{
-        collections::HashSet,
-        path::{Path, PathBuf},
-    };
+    use std::path::{Path, PathBuf};
     use workspace::AppState;
 
     #[gpui::test]
@@ -3509,7 +3501,7 @@ mod tests {
         cx: &mut VisualTestContext,
     ) -> Vec<String> {
         let mut result = Vec::new();
-        let mut project_entries = HashSet::new();
+        let mut project_entries = HashSet::default();
         let mut has_editor = false;
 
         panel.update(cx, |panel, cx| {
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 89f94ad6c4..c450293945 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -25,11 +25,11 @@ use project::{
 };
 use semantic_index::{SemanticIndex, SemanticIndexStatus};
 
+use collections::HashSet;
 use settings::Settings;
 use smol::stream::StreamExt;
 use std::{
     any::{Any, TypeId},
-    collections::HashSet,
     mem,
     ops::{Not, Range},
     path::PathBuf,
@@ -955,7 +955,7 @@ impl ProjectSearchView {
             semantic_state: None,
             semantic_permissioned: None,
             search_options: options,
-            panels_with_errors: HashSet::new(),
+            panels_with_errors: HashSet::default(),
             active_match_index: None,
             query_editor_was_focused: false,
             included_files_editor,
diff --git a/crates/semantic_index/src/parsing.rs b/crates/semantic_index/src/parsing.rs
index 9f2db711ae..e6f4a37d10 100644
--- a/crates/semantic_index/src/parsing.rs
+++ b/crates/semantic_index/src/parsing.rs
@@ -3,6 +3,7 @@ use ai::{
     models::TruncationDirection,
 };
 use anyhow::{anyhow, Result};
+use collections::HashSet;
 use language::{Grammar, Language};
 use rusqlite::{
     types::{FromSql, FromSqlResult, ToSqlOutput, ValueRef},
@@ -12,7 +13,6 @@ use sha1::{Digest, Sha1};
 use std::{
     borrow::Cow,
     cmp::{self, Reverse},
-    collections::HashSet,
     ops::Range,
     path::Path,
     sync::Arc,
@@ -267,7 +267,7 @@ impl CodeContextRetriever {
 
         let mut spans = Vec::new();
         let mut collapsed_ranges_within = Vec::new();
-        let mut parsed_name_ranges = HashSet::new();
+        let mut parsed_name_ranges = HashSet::default();
         for (i, context_match) in matches.iter().enumerate() {
             // Items which are collapsible but not embeddable have no item range
             let item_range = if let Some(item_range) = context_match.item_range.clone() {
diff --git a/crates/sqlez/Cargo.toml b/crates/sqlez/Cargo.toml
index 2ee5e6cbf3..71c67af095 100644
--- a/crates/sqlez/Cargo.toml
+++ b/crates/sqlez/Cargo.toml
@@ -7,6 +7,7 @@ license = "GPL-3.0-or-later"
 
 [dependencies]
 anyhow.workspace = true
+collections.workspace = true
 futures.workspace = true
 indoc.workspace = true
 lazy_static.workspace = true
diff --git a/crates/sqlez/src/thread_safe_connection.rs b/crates/sqlez/src/thread_safe_connection.rs
index 98402df108..cd4664c9ae 100644
--- a/crates/sqlez/src/thread_safe_connection.rs
+++ b/crates/sqlez/src/thread_safe_connection.rs
@@ -1,8 +1,9 @@
 use anyhow::Context;
+use collections::HashMap;
 use futures::{channel::oneshot, Future, FutureExt};
 use lazy_static::lazy_static;
 use parking_lot::{Mutex, RwLock};
-use std::{collections::HashMap, marker::PhantomData, ops::Deref, sync::Arc, thread};
+use std::{marker::PhantomData, ops::Deref, sync::Arc, thread};
 use thread_local::ThreadLocal;
 
 use crate::{connection::Connection, domain::Migrator, util::UnboundedSyncSender};
diff --git a/crates/terminal/Cargo.toml b/crates/terminal/Cargo.toml
index 7f12fc6eb7..a52a7c6f93 100644
--- a/crates/terminal/Cargo.toml
+++ b/crates/terminal/Cargo.toml
@@ -13,6 +13,7 @@ doctest = false
 [dependencies]
 alacritty_terminal = "0.22.0"
 anyhow.workspace = true
+collections.workspace = true
 db.workspace = true
 dirs = "4.0.0"
 futures.workspace = true
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index ad9587a326..46c7cb0c19 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -30,6 +30,7 @@ use mappings::mouse::{
     scroll_report,
 };
 
+use collections::{HashMap, VecDeque};
 use procinfo::LocalProcessInfo;
 use serde::{Deserialize, Serialize};
 use settings::Settings;
@@ -39,7 +40,6 @@ use util::truncate_and_trailoff;
 
 use std::{
     cmp::{self, min},
-    collections::{HashMap, VecDeque},
     fmt::Display,
     ops::{Deref, Index, RangeInclusive},
     os::unix::prelude::AsRawFd,
diff --git a/crates/terminal/src/terminal_settings.rs b/crates/terminal/src/terminal_settings.rs
index 7b3d97145c..1a072ca8bc 100644
--- a/crates/terminal/src/terminal_settings.rs
+++ b/crates/terminal/src/terminal_settings.rs
@@ -1,3 +1,4 @@
+use collections::HashMap;
 use gpui::{px, AbsoluteLength, AppContext, FontFeatures, Pixels};
 use schemars::{
     gen::SchemaGenerator,
@@ -7,7 +8,7 @@ use schemars::{
 use serde_derive::{Deserialize, Serialize};
 use serde_json::Value;
 use settings::SettingsJsonSchemaParams;
-use std::{collections::HashMap, path::PathBuf};
+use std::path::PathBuf;
 
 #[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
 #[serde(rename_all = "snake_case")]
diff --git a/crates/theme/Cargo.toml b/crates/theme/Cargo.toml
index 8970cfbacf..c060627ad6 100644
--- a/crates/theme/Cargo.toml
+++ b/crates/theme/Cargo.toml
@@ -8,11 +8,7 @@ license = "GPL-3.0-or-later"
 [features]
 default = []
 stories = ["dep:itertools", "dep:story"]
-test-support = [
-    "gpui/test-support",
-    "fs/test-support",
-    "settings/test-support"
-]
+test-support = ["gpui/test-support", "fs/test-support", "settings/test-support"]
 
 [lib]
 path = "src/theme.rs"
@@ -20,6 +16,7 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
+collections.workspace = true
 color.workspace = true
 derive_more.workspace = true
 fs.workspace = true
diff --git a/crates/theme/src/registry.rs b/crates/theme/src/registry.rs
index fac119ff1d..2cc4d902a2 100644
--- a/crates/theme/src/registry.rs
+++ b/crates/theme/src/registry.rs
@@ -1,8 +1,8 @@
-use std::collections::HashMap;
 use std::path::Path;
 use std::sync::Arc;
 
 use anyhow::{anyhow, Context, Result};
+use collections::HashMap;
 use derive_more::{Deref, DerefMut};
 use fs::Fs;
 use futures::StreamExt;
@@ -64,7 +64,7 @@ impl ThemeRegistry {
     pub fn new(assets: Box<dyn AssetSource>) -> Self {
         let registry = Self {
             state: RwLock::new(ThemeRegistryState {
-                themes: HashMap::new(),
+                themes: HashMap::default(),
             }),
             assets,
         };
diff --git a/crates/util/Cargo.toml b/crates/util/Cargo.toml
index c510d6f557..fc06ebeb4a 100644
--- a/crates/util/Cargo.toml
+++ b/crates/util/Cargo.toml
@@ -15,6 +15,7 @@ test-support = ["tempfile", "git2"]
 [dependencies]
 anyhow.workspace = true
 backtrace = "0.3"
+collections.workspace = true
 dirs = "3.0"
 futures.workspace = true
 git2 = { workspace = true, optional = true }
diff --git a/crates/util/src/test/marked_text.rs b/crates/util/src/test/marked_text.rs
index dadf78622d..cf85a806e4 100644
--- a/crates/util/src/test/marked_text.rs
+++ b/crates/util/src/test/marked_text.rs
@@ -1,4 +1,5 @@
-use std::{cmp::Ordering, collections::HashMap, ops::Range};
+use collections::HashMap;
+use std::{cmp::Ordering, ops::Range};
 
 /// Construct a string and a list of offsets within that string using a single
 /// string containing embedded position markers.
diff --git a/crates/zed/src/open_listener.rs b/crates/zed/src/open_listener.rs
index 012b5a2413..d3ccf753d1 100644
--- a/crates/zed/src/open_listener.rs
+++ b/crates/zed/src/open_listener.rs
@@ -1,6 +1,7 @@
 use anyhow::{anyhow, Context, Result};
 use cli::{ipc, IpcHandshake};
 use cli::{ipc::IpcSender, CliRequest, CliResponse};
+use collections::HashMap;
 use editor::scroll::Autoscroll;
 use editor::Editor;
 use futures::channel::mpsc::{UnboundedReceiver, UnboundedSender};
@@ -10,7 +11,6 @@ use gpui::{AppContext, AsyncAppContext, Global};
 use itertools::Itertools;
 use language::{Bias, Point};
 use release_channel::parse_zed_link;
-use std::collections::HashMap;
 use std::ffi::OsStr;
 use std::os::unix::prelude::OsStrExt;
 use std::path::Path;
@@ -176,7 +176,7 @@ pub async fn handle_cli_connection(
     if let Some(request) = requests.next().await {
         match request {
             CliRequest::Open { paths, wait } => {
-                let mut caret_positions = HashMap::new();
+                let mut caret_positions = HashMap::default();
 
                 let paths = if paths.is_empty() {
                     workspace::last_opened_workspace_paths()
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 443adac50d..b4ec471113 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -733,6 +733,7 @@ fn open_settings_file(
 mod tests {
     use super::*;
     use assets::Assets;
+    use collections::HashSet;
     use editor::{scroll::Autoscroll, DisplayPoint, Editor};
     use gpui::{
         actions, Action, AnyWindowHandle, AppContext, AssetSource, Entity, TestAppContext,
@@ -742,10 +743,7 @@ mod tests {
     use project::{project_settings::ProjectSettings, Project, ProjectPath};
     use serde_json::json;
     use settings::{handle_settings_file_changes, watch_config_file, SettingsStore};
-    use std::{
-        collections::HashSet,
-        path::{Path, PathBuf},
-    };
+    use std::path::{Path, PathBuf};
     use theme::{ThemeRegistry, ThemeSettings};
     use workspace::{
         item::{Item, ItemHandle},

From e3ae7c4fe089d35e342a74d62563548977f14821 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Wed, 7 Feb 2024 00:33:40 -0800
Subject: [PATCH 283/372] linux: query window geometry for determining the
 surface extents

---
 .../gpui/src/platform/linux/blade_renderer.rs |  4 ++
 crates/gpui/src/platform/linux/window.rs      | 51 +++++++++----------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/crates/gpui/src/platform/linux/blade_renderer.rs b/crates/gpui/src/platform/linux/blade_renderer.rs
index 1e3853b475..492b135cde 100644
--- a/crates/gpui/src/platform/linux/blade_renderer.rs
+++ b/crates/gpui/src/platform/linux/blade_renderer.rs
@@ -299,6 +299,10 @@ impl BladeRenderer {
         self.viewport_size = size;
     }
 
+    pub fn viewport_size(&self) -> gpu::Extent {
+        self.viewport_size
+    }
+
     pub fn atlas(&self) -> &Arc<BladeAtlas> {
         &self.atlas
     }
diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index 031dcb0cd6..7ac7ebf9b4 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -31,26 +31,30 @@ struct Callbacks {
 
 struct LinuxWindowInner {
     bounds: Bounds<i32>,
-    title_height: i32,
-    border_width: i32,
     scale_factor: f32,
     renderer: BladeRenderer,
 }
 
 impl LinuxWindowInner {
-    fn render_extent(&self) -> gpu::Extent {
-        gpu::Extent {
-            width: (self.bounds.size.width - 2 * self.border_width) as u32,
-            height: (self.bounds.size.height - 2 * self.border_width - self.title_height) as u32,
-            depth: 1,
+    fn content_size(&self) -> Size<Pixels> {
+        let size = self.renderer.viewport_size();
+        Size {
+            width: size.width.into(),
+            height: size.height.into(),
         }
     }
-    fn content_size(&self) -> Size<Pixels> {
-        let extent = self.render_extent();
-        Size {
-            width: extent.width.into(),
-            height: extent.height.into(),
-        }
+}
+
+fn query_render_extent(xcb_connection: &xcb::Connection, x_window: x::Window) -> gpu::Extent {
+    let cookie = xcb_connection.send_request(&x::GetGeometry {
+        drawable: x::Drawable::Window(x_window),
+    });
+    let reply = xcb_connection.wait_for_reply(cookie).unwrap();
+    println!("Got geometry {:?}", reply);
+    gpu::Extent {
+        width: reply.width() as u32,
+        height: reply.height() as u32,
+        depth: 1,
     }
 }
 
@@ -143,7 +147,6 @@ impl LinuxWindowState {
             },
             WindowBounds::Fixed(bounds) => bounds.map(|p| p.0 as i32),
         };
-        let border_width = 0i32;
 
         xcb_connection.send_request(&x::CreateWindow {
             depth: x::COPY_FROM_PARENT as u8,
@@ -153,7 +156,7 @@ impl LinuxWindowState {
             y: bounds.origin.y as i16,
             width: bounds.size.width as u16,
             height: bounds.size.height as u16,
-            border_width: border_width as u16,
+            border_width: 0,
             class: x::WindowClass::InputOutput,
             visual: screen.root_visual(),
             value_list: &xcb_values,
@@ -183,6 +186,10 @@ impl LinuxWindowState {
         xcb_connection.send_request(&x::MapWindow { window: x_window });
         xcb_connection.flush().unwrap();
 
+        //Warning: it looks like this reported size is immediately invalidated
+        // on some platforms, followed by a "ConfigureNotify" event.
+        let gpu_extent = query_render_extent(&xcb_connection, x_window);
+
         let raw = RawWindow {
             connection: as_raw_xcb_connection::AsRawXcbConnection::as_raw_xcb_connection(
                 xcb_connection,
@@ -204,12 +211,6 @@ impl LinuxWindowState {
             .unwrap(),
         );
 
-        let gpu_extent = gpu::Extent {
-            width: bounds.size.width as u32,
-            height: bounds.size.height as u32,
-            depth: 1,
-        };
-
         Self {
             xcb_connection: Arc::clone(xcb_connection),
             display: Rc::new(LinuxDisplay::new(xcb_connection, x_screen_index)),
@@ -218,8 +219,6 @@ impl LinuxWindowState {
             callbacks: Mutex::new(Callbacks::default()),
             inner: Mutex::new(LinuxWindowInner {
                 bounds,
-                title_height: 0, //TODO
-                border_width,
                 scale_factor: 1.0,
                 renderer: BladeRenderer::new(gpu, gpu_extent),
             }),
@@ -254,9 +253,9 @@ impl LinuxWindowState {
             let mut inner = self.inner.lock();
             let old_bounds = mem::replace(&mut inner.bounds, bounds);
             do_move = old_bounds.origin != bounds.origin;
-            if old_bounds.size != bounds.size {
-                let extent = inner.render_extent();
-                inner.renderer.resize(extent);
+            let gpu_size = query_render_extent(&self.xcb_connection, self.x_window);
+            if inner.renderer.viewport_size() != gpu_size {
+                inner.renderer.resize(gpu_size);
                 resize_args = Some((inner.content_size(), inner.scale_factor));
             }
         }

From 2aa8ccd6b16a902ac94f8c1b34fe0fe1c8ac102d Mon Sep 17 00:00:00 2001
From: Todsaporn Banjerdkit <katopz@gmail.com>
Date: Wed, 7 Feb 2024 16:13:52 +0700
Subject: [PATCH 284/372] fix: use OPEN_AI_API_URL (#7484)

Release Notes:

- N/A
---
 crates/ai/src/providers/open_ai/embedding.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/ai/src/providers/open_ai/embedding.rs b/crates/ai/src/providers/open_ai/embedding.rs
index 4a8b051df3..29ee8fac9b 100644
--- a/crates/ai/src/providers/open_ai/embedding.rs
+++ b/crates/ai/src/providers/open_ai/embedding.rs
@@ -134,7 +134,7 @@ impl OpenAiEmbeddingProvider {
         spans: Vec<&str>,
         request_timeout: u64,
     ) -> Result<Response<AsyncBody>> {
-        let request = Request::post("https://api.openai.com/v1/embeddings")
+        let request = Request::post(format!("{OPEN_AI_API_URL}/embeddings"))
             .redirect_policy(isahc::config::RedirectPolicy::Follow)
             .timeout(Duration::from_secs(request_timeout))
             .header("Content-Type", "application/json")

From db39b9dadc4cb60bf579cd0be2ab8dabc4da7994 Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Wed, 7 Feb 2024 12:50:22 +0100
Subject: [PATCH 285/372] Add ability to bind to pane::RevealInProjectPanel
 (#7487)

Previously it wasn't possible to create a keybinding for this action
because it required an argument.

Now the action takes the active item of the pane and if it's a
multi-buffer the first one.

This also adds a default keybinding for Vim mode: `-` will reveal the
file in the project panel.

Fixes #7485.

Release Notes:

- Added `pane::RevealInProjectPanel` as an action in the command
palette. ([#7485](https://github.com/zed-industries/zed/issues/7485)).

Co-authored-by: Antonio <antonio@zed.dev>
---
 assets/keymaps/vim.json      |  3 ++-
 crates/editor/src/actions.rs |  2 +-
 crates/workspace/src/pane.rs | 22 ++++++++++++++--------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index bf68ee10e4..9c95b352a5 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -284,7 +284,8 @@
       "ctrl-w o": "workspace::CloseInactiveTabsAndPanes",
       "ctrl-w ctrl-o": "workspace::CloseInactiveTabsAndPanes",
       "ctrl-w n": ["workspace::NewFileInDirection", "Up"],
-      "ctrl-w ctrl-n": ["workspace::NewFileInDirection", "Up"]
+      "ctrl-w ctrl-n": ["workspace::NewFileInDirection", "Up"],
+      "-": "pane::RevealInProjectPanel"
     }
   },
   {
diff --git a/crates/editor/src/actions.rs b/crates/editor/src/actions.rs
index 049c152e2c..ec8113a985 100644
--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -112,7 +112,7 @@ impl_actions!(
         MoveUpByLines,
         MoveDownByLines,
         SelectUpByLines,
-        SelectDownByLines,
+        SelectDownByLines
     ]
 );
 
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index 55ae875fef..55389cf8d0 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -72,10 +72,10 @@ pub struct CloseAllItems {
     pub save_intent: Option<SaveIntent>,
 }
 
-#[derive(Clone, PartialEq, Debug, Deserialize)]
+#[derive(Clone, PartialEq, Debug, Deserialize, Default)]
 #[serde(rename_all = "camelCase")]
 pub struct RevealInProjectPanel {
-    pub entry_id: u64,
+    pub entry_id: Option<u64>,
 }
 
 impl_actions!(
@@ -1442,7 +1442,9 @@ impl Pane {
                         let entry_id = entry.to_proto();
                         menu = menu.separator().entry(
                             "Reveal In Project Panel",
-                            Some(Box::new(RevealInProjectPanel { entry_id })),
+                            Some(Box::new(RevealInProjectPanel {
+                                entry_id: Some(entry_id),
+                            })),
                             cx.handler_for(&pane, move |pane, cx| {
                                 pane.project.update(cx, |_, cx| {
                                     cx.emit(project::Event::RevealInProjectPanel(
@@ -1807,11 +1809,15 @@ impl Render for Pane {
             )
             .on_action(
                 cx.listener(|pane: &mut Self, action: &RevealInProjectPanel, cx| {
-                    pane.project.update(cx, |_, cx| {
-                        cx.emit(project::Event::RevealInProjectPanel(
-                            ProjectEntryId::from_proto(action.entry_id),
-                        ))
-                    })
+                    let entry_id = action
+                        .entry_id
+                        .map(ProjectEntryId::from_proto)
+                        .or_else(|| pane.active_item()?.project_entry_ids(cx).first().copied());
+                    if let Some(entry_id) = entry_id {
+                        pane.project.update(cx, |_, cx| {
+                            cx.emit(project::Event::RevealInProjectPanel(entry_id))
+                        });
+                    }
                 }),
             )
             .when(self.active_item().is_some(), |pane| {

From 5c8073d3444eb17254e59f6740e48256079dbf38 Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Wed, 7 Feb 2024 12:52:49 +0100
Subject: [PATCH 286/372] Underline text if in dead key state (#7488)

This highlights dead keys. Example: when in Brazilian keyboard layout
and typing `"` it's now underlined.



https://github.com/zed-industries/zed/assets/1185253/a6b65f7b-1007-473d-ab0f-5d658faa191b



Release Notes:

- Fixed dead keys not being underlined.

Co-authored-by: Antonio <antonio@zed.dev>
---
 crates/editor/src/editor.rs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 4cbd8965df..d37ba5f3c7 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -61,8 +61,8 @@ use gpui::{
     DispatchPhase, ElementId, EventEmitter, FocusHandle, FocusableView, FontId, FontStyle,
     FontWeight, HighlightStyle, Hsla, InteractiveText, KeyContext, Model, MouseButton,
     ParentElement, Pixels, Render, SharedString, Styled, StyledText, Subscription, Task, TextStyle,
-    UniformListScrollHandle, View, ViewContext, ViewInputHandler, VisualContext, WeakView,
-    WhiteSpace, WindowContext,
+    UnderlineStyle, UniformListScrollHandle, View, ViewContext, ViewInputHandler, VisualContext,
+    WeakView, WhiteSpace, WindowContext,
 };
 use highlight_matching_bracket::refresh_matching_bracket_highlights;
 use hover_popover::{hide_hover, HoverState};
@@ -9714,7 +9714,14 @@ impl ViewInputHandler for Editor {
             } else {
                 this.highlight_text::<InputComposition>(
                     marked_ranges.clone(),
-                    HighlightStyle::default(), // todo!() this.style(cx).composition_mark,
+                    HighlightStyle {
+                        underline: Some(UnderlineStyle {
+                            thickness: px(1.),
+                            color: None,
+                            wavy: false,
+                        }),
+                        ..Default::default()
+                    },
                     cx,
                 );
             }

From 55129d4d6c1b9750bf46dcbac82d3d4083a392f0 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Wed, 7 Feb 2024 13:16:22 +0100
Subject: [PATCH 287/372] Revert "Use Fx* variants of HashMap and HashSet
 everywhere in Zed" (#7492)

Reverts zed-industries/zed#7481

This would regress performance because we'd be using the standard
library's hash maps everywhere, so reverting for now.
---
 Cargo.lock                                  |  4 ----
 crates/channel/src/channel_chat.rs          |  2 +-
 crates/client/src/client.rs                 |  2 +-
 crates/gpui/src/app.rs                      | 26 ++++++++++-----------
 crates/gpui/src/key_dispatch.rs             | 14 +++++------
 crates/gpui/src/keymap.rs                   |  7 ++++--
 crates/gpui/src/platform/mac/metal_atlas.rs |  4 ++--
 crates/gpui/src/scene.rs                    |  4 ++--
 crates/gpui/src/taffy.rs                    | 22 ++++++++---------
 crates/gpui/src/text_system.rs              | 12 +++++-----
 crates/gpui/src/text_system/line_layout.rs  | 12 +++++-----
 crates/gpui/src/window.rs                   |  6 ++---
 crates/gpui/src/window/element_cx.rs        | 22 ++++++++---------
 crates/project_panel/src/project_panel.rs   | 18 ++++++++++----
 crates/search/src/project_search.rs         |  4 ++--
 crates/semantic_index/src/parsing.rs        |  4 ++--
 crates/sqlez/Cargo.toml                     |  1 -
 crates/sqlez/src/thread_safe_connection.rs  |  3 +--
 crates/terminal/Cargo.toml                  |  1 -
 crates/terminal/src/terminal.rs             |  2 +-
 crates/terminal/src/terminal_settings.rs    |  3 +--
 crates/theme/Cargo.toml                     |  7 ++++--
 crates/theme/src/registry.rs                |  4 ++--
 crates/util/Cargo.toml                      |  1 -
 crates/util/src/test/marked_text.rs         |  3 +--
 crates/zed/src/open_listener.rs             |  4 ++--
 crates/zed/src/zed.rs                       |  6 +++--
 27 files changed, 102 insertions(+), 96 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8e72a590de..78a47cc604 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7530,7 +7530,6 @@ name = "sqlez"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "collections",
  "futures 0.3.28",
  "indoc",
  "lazy_static",
@@ -8106,7 +8105,6 @@ version = "0.1.0"
 dependencies = [
  "alacritty_terminal",
  "anyhow",
- "collections",
  "db",
  "dirs 4.0.0",
  "futures 0.3.28",
@@ -8202,7 +8200,6 @@ name = "theme"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "collections",
  "color",
  "derive_more",
  "fs",
@@ -9346,7 +9343,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "backtrace",
- "collections",
  "dirs 3.0.2",
  "futures 0.3.28",
  "git2",
diff --git a/crates/channel/src/channel_chat.rs b/crates/channel/src/channel_chat.rs
index e6ed013ade..ad843470be 100644
--- a/crates/channel/src/channel_chat.rs
+++ b/crates/channel/src/channel_chat.rs
@@ -5,13 +5,13 @@ use client::{
     user::{User, UserStore},
     Client, Subscription, TypedEnvelope, UserId,
 };
-use collections::HashSet;
 use futures::lock::Mutex;
 use gpui::{
     AppContext, AsyncAppContext, Context, EventEmitter, Model, ModelContext, Task, WeakModel,
 };
 use rand::prelude::*;
 use std::{
+    collections::HashSet,
     ops::{ControlFlow, Range},
     sync::Arc,
 };
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index e454d3ddaf..ff8adc9660 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -10,7 +10,6 @@ use async_tungstenite::tungstenite::{
     error::Error as WebsocketError,
     http::{Request, StatusCode},
 };
-use collections::HashMap;
 use futures::{
     channel::oneshot, future::LocalBoxFuture, AsyncReadExt, FutureExt, SinkExt, StreamExt,
     TryFutureExt as _, TryStreamExt,
@@ -30,6 +29,7 @@ use serde_json;
 use settings::{Settings, SettingsStore};
 use std::{
     any::TypeId,
+    collections::HashMap,
     convert::TryFrom,
     fmt::Write as _,
     future::Future,
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index ec4bf83d54..45c26b0ba8 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -23,7 +23,7 @@ use crate::{
     TextSystem, View, ViewContext, Window, WindowContext, WindowHandle, WindowId,
 };
 use anyhow::{anyhow, Result};
-use collections::{HashMap, HashSet, VecDeque};
+use collections::{FxHashMap, FxHashSet, VecDeque};
 use futures::{channel::oneshot, future::LocalBoxFuture, Future};
 
 use slotmap::SlotMap;
@@ -212,24 +212,24 @@ pub struct AppContext {
     pending_updates: usize,
     pub(crate) actions: Rc<ActionRegistry>,
     pub(crate) active_drag: Option<AnyDrag>,
-    pub(crate) next_frame_callbacks: HashMap<DisplayId, Vec<FrameCallback>>,
-    pub(crate) frame_consumers: HashMap<DisplayId, Task<()>>,
+    pub(crate) next_frame_callbacks: FxHashMap<DisplayId, Vec<FrameCallback>>,
+    pub(crate) frame_consumers: FxHashMap<DisplayId, Task<()>>,
     pub(crate) background_executor: BackgroundExecutor,
     pub(crate) foreground_executor: ForegroundExecutor,
     pub(crate) svg_renderer: SvgRenderer,
     asset_source: Arc<dyn AssetSource>,
     pub(crate) image_cache: ImageCache,
     pub(crate) text_style_stack: Vec<TextStyleRefinement>,
-    pub(crate) globals_by_type: HashMap<TypeId, Box<dyn Any>>,
+    pub(crate) globals_by_type: FxHashMap<TypeId, Box<dyn Any>>,
     pub(crate) entities: EntityMap,
     pub(crate) new_view_observers: SubscriberSet<TypeId, NewViewListener>,
     pub(crate) windows: SlotMap<WindowId, Option<Window>>,
     pub(crate) keymap: Rc<RefCell<Keymap>>,
     pub(crate) global_action_listeners:
-        HashMap<TypeId, Vec<Rc<dyn Fn(&dyn Any, DispatchPhase, &mut Self)>>>,
+        FxHashMap<TypeId, Vec<Rc<dyn Fn(&dyn Any, DispatchPhase, &mut Self)>>>,
     pending_effects: VecDeque<Effect>,
-    pub(crate) pending_notifications: HashSet<EntityId>,
-    pub(crate) pending_global_notifications: HashSet<TypeId>,
+    pub(crate) pending_notifications: FxHashSet<EntityId>,
+    pub(crate) pending_global_notifications: FxHashSet<TypeId>,
     pub(crate) observers: SubscriberSet<EntityId, Handler>,
     // TypeId is the type of the event that the listener callback expects
     pub(crate) event_listeners: SubscriberSet<EntityId, (TypeId, Listener)>,
@@ -274,23 +274,23 @@ impl AppContext {
                 flushing_effects: false,
                 pending_updates: 0,
                 active_drag: None,
-                next_frame_callbacks: HashMap::default(),
-                frame_consumers: HashMap::default(),
+                next_frame_callbacks: FxHashMap::default(),
+                frame_consumers: FxHashMap::default(),
                 background_executor: executor,
                 foreground_executor,
                 svg_renderer: SvgRenderer::new(asset_source.clone()),
                 asset_source,
                 image_cache: ImageCache::new(http_client),
                 text_style_stack: Vec::new(),
-                globals_by_type: HashMap::default(),
+                globals_by_type: FxHashMap::default(),
                 entities,
                 new_view_observers: SubscriberSet::new(),
                 windows: SlotMap::with_key(),
                 keymap: Rc::new(RefCell::new(Keymap::default())),
-                global_action_listeners: HashMap::default(),
+                global_action_listeners: FxHashMap::default(),
                 pending_effects: VecDeque::new(),
-                pending_notifications: HashSet::default(),
-                pending_global_notifications: HashSet::default(),
+                pending_notifications: FxHashSet::default(),
+                pending_global_notifications: FxHashSet::default(),
                 observers: SubscriberSet::new(),
                 event_listeners: SubscriberSet::new(),
                 release_listeners: SubscriberSet::new(),
diff --git a/crates/gpui/src/key_dispatch.rs b/crates/gpui/src/key_dispatch.rs
index 894f3b7d84..8f9eb16a62 100644
--- a/crates/gpui/src/key_dispatch.rs
+++ b/crates/gpui/src/key_dispatch.rs
@@ -53,7 +53,7 @@ use crate::{
     Action, ActionRegistry, DispatchPhase, ElementContext, EntityId, FocusId, KeyBinding,
     KeyContext, Keymap, KeymatchResult, Keystroke, KeystrokeMatcher, WindowContext,
 };
-use collections::HashMap;
+use collections::FxHashMap;
 use smallvec::{smallvec, SmallVec};
 use std::{
     any::{Any, TypeId},
@@ -69,9 +69,9 @@ pub(crate) struct DispatchTree {
     node_stack: Vec<DispatchNodeId>,
     pub(crate) context_stack: Vec<KeyContext>,
     nodes: Vec<DispatchNode>,
-    focusable_node_ids: HashMap<FocusId, DispatchNodeId>,
-    view_node_ids: HashMap<EntityId, DispatchNodeId>,
-    keystroke_matchers: HashMap<SmallVec<[KeyContext; 4]>, KeystrokeMatcher>,
+    focusable_node_ids: FxHashMap<FocusId, DispatchNodeId>,
+    view_node_ids: FxHashMap<EntityId, DispatchNodeId>,
+    keystroke_matchers: FxHashMap<SmallVec<[KeyContext; 4]>, KeystrokeMatcher>,
     keymap: Rc<RefCell<Keymap>>,
     action_registry: Rc<ActionRegistry>,
 }
@@ -100,9 +100,9 @@ impl DispatchTree {
             node_stack: Vec::new(),
             context_stack: Vec::new(),
             nodes: Vec::new(),
-            focusable_node_ids: HashMap::default(),
-            view_node_ids: HashMap::default(),
-            keystroke_matchers: HashMap::default(),
+            focusable_node_ids: FxHashMap::default(),
+            view_node_ids: FxHashMap::default(),
+            keystroke_matchers: FxHashMap::default(),
             keymap,
             action_registry,
         }
diff --git a/crates/gpui/src/keymap.rs b/crates/gpui/src/keymap.rs
index e2a6bdfc4b..45e0ebbe95 100644
--- a/crates/gpui/src/keymap.rs
+++ b/crates/gpui/src/keymap.rs
@@ -7,9 +7,12 @@ pub use context::*;
 pub(crate) use matcher::*;
 
 use crate::{Action, Keystroke, NoAction};
-use collections::{HashMap, HashSet};
+use collections::HashSet;
 use smallvec::SmallVec;
-use std::any::{Any, TypeId};
+use std::{
+    any::{Any, TypeId},
+    collections::HashMap,
+};
 
 /// An opaque identifier of which version of the keymap is currently active.
 /// The keymap's version is changed whenever bindings are added or removed.
diff --git a/crates/gpui/src/platform/mac/metal_atlas.rs b/crates/gpui/src/platform/mac/metal_atlas.rs
index c029ec9be7..95f78a4465 100644
--- a/crates/gpui/src/platform/mac/metal_atlas.rs
+++ b/crates/gpui/src/platform/mac/metal_atlas.rs
@@ -3,7 +3,7 @@ use crate::{
     Point, Size,
 };
 use anyhow::Result;
-use collections::HashMap;
+use collections::FxHashMap;
 use derive_more::{Deref, DerefMut};
 use etagere::BucketedAtlasAllocator;
 use metal::Device;
@@ -53,7 +53,7 @@ struct MetalAtlasState {
     monochrome_textures: Vec<MetalAtlasTexture>,
     polychrome_textures: Vec<MetalAtlasTexture>,
     path_textures: Vec<MetalAtlasTexture>,
-    tiles_by_key: HashMap<AtlasKey, AtlasTile>,
+    tiles_by_key: FxHashMap<AtlasKey, AtlasTile>,
 }
 
 impl PlatformAtlas for MetalAtlas {
diff --git a/crates/gpui/src/scene.rs b/crates/gpui/src/scene.rs
index dfd51c7bc7..d5d717e278 100644
--- a/crates/gpui/src/scene.rs
+++ b/crates/gpui/src/scene.rs
@@ -2,7 +2,7 @@ use crate::{
     point, AtlasTextureId, AtlasTile, Bounds, ContentMask, Corners, Edges, EntityId, Hsla, Pixels,
     Point, ScaledPixels, StackingOrder,
 };
-use collections::{BTreeMap, HashSet};
+use collections::{BTreeMap, FxHashSet};
 use std::{fmt::Debug, iter::Peekable, slice};
 
 // Exported to metal
@@ -159,7 +159,7 @@ impl Scene {
         layer_id
     }
 
-    pub fn reuse_views(&mut self, views: &HashSet<EntityId>, prev_scene: &mut Self) {
+    pub fn reuse_views(&mut self, views: &FxHashSet<EntityId>, prev_scene: &mut Self) {
         for shadow in prev_scene.shadows.drain(..) {
             if views.contains(&shadow.view_id.into()) {
                 let order = &prev_scene.orders_by_layer[&shadow.layer_id];
diff --git a/crates/gpui/src/taffy.rs b/crates/gpui/src/taffy.rs
index 3536d3fa59..0797c8f3b4 100644
--- a/crates/gpui/src/taffy.rs
+++ b/crates/gpui/src/taffy.rs
@@ -2,7 +2,7 @@ use crate::{
     AbsoluteLength, Bounds, DefiniteLength, Edges, Length, Pixels, Point, Size, Style,
     WindowContext,
 };
-use collections::{HashMap, HashSet};
+use collections::{FxHashMap, FxHashSet};
 use smallvec::SmallVec;
 use std::fmt::Debug;
 use taffy::{
@@ -17,11 +17,11 @@ type NodeMeasureFn =
 
 pub struct TaffyLayoutEngine {
     taffy: Taffy,
-    styles: HashMap<LayoutId, Style>,
-    children_to_parents: HashMap<LayoutId, LayoutId>,
-    absolute_layout_bounds: HashMap<LayoutId, Bounds<Pixels>>,
-    computed_layouts: HashSet<LayoutId>,
-    nodes_to_measure: HashMap<LayoutId, NodeMeasureFn>,
+    styles: FxHashMap<LayoutId, Style>,
+    children_to_parents: FxHashMap<LayoutId, LayoutId>,
+    absolute_layout_bounds: FxHashMap<LayoutId, Bounds<Pixels>>,
+    computed_layouts: FxHashSet<LayoutId>,
+    nodes_to_measure: FxHashMap<LayoutId, NodeMeasureFn>,
 }
 
 static EXPECT_MESSAGE: &str = "we should avoid taffy layout errors by construction if possible";
@@ -30,11 +30,11 @@ impl TaffyLayoutEngine {
     pub fn new() -> Self {
         TaffyLayoutEngine {
             taffy: Taffy::new(),
-            styles: HashMap::default(),
-            children_to_parents: HashMap::default(),
-            absolute_layout_bounds: HashMap::default(),
-            computed_layouts: HashSet::default(),
-            nodes_to_measure: HashMap::default(),
+            styles: FxHashMap::default(),
+            children_to_parents: FxHashMap::default(),
+            absolute_layout_bounds: FxHashMap::default(),
+            computed_layouts: FxHashSet::default(),
+            nodes_to_measure: FxHashMap::default(),
         }
     }
 
diff --git a/crates/gpui/src/text_system.rs b/crates/gpui/src/text_system.rs
index 75d98a8305..12242e26c2 100644
--- a/crates/gpui/src/text_system.rs
+++ b/crates/gpui/src/text_system.rs
@@ -13,7 +13,7 @@ use crate::{
     SharedString, Size, UnderlineStyle,
 };
 use anyhow::anyhow;
-use collections::{BTreeSet, HashMap, HashSet};
+use collections::{BTreeSet, FxHashMap, FxHashSet};
 use core::fmt;
 use derive_more::Deref;
 use itertools::Itertools;
@@ -42,10 +42,10 @@ pub(crate) const SUBPIXEL_VARIANTS: u8 = 4;
 /// The GPUI text rendering sub system.
 pub struct TextSystem {
     platform_text_system: Arc<dyn PlatformTextSystem>,
-    font_ids_by_font: RwLock<HashMap<Font, Result<FontId>>>,
-    font_metrics: RwLock<HashMap<FontId, FontMetrics>>,
-    raster_bounds: RwLock<HashMap<RenderGlyphParams, Bounds<DevicePixels>>>,
-    wrapper_pool: Mutex<HashMap<FontIdWithSize, Vec<LineWrapper>>>,
+    font_ids_by_font: RwLock<FxHashMap<Font, Result<FontId>>>,
+    font_metrics: RwLock<FxHashMap<FontId, FontMetrics>>,
+    raster_bounds: RwLock<FxHashMap<RenderGlyphParams, Bounds<DevicePixels>>>,
+    wrapper_pool: Mutex<FxHashMap<FontIdWithSize, Vec<LineWrapper>>>,
     font_runs_pool: Mutex<Vec<Vec<FontRun>>>,
     fallback_font_stack: SmallVec<[Font; 2]>,
 }
@@ -447,7 +447,7 @@ impl WindowTextSystem {
         Ok(lines)
     }
 
-    pub(crate) fn finish_frame(&self, reused_views: &HashSet<EntityId>) {
+    pub(crate) fn finish_frame(&self, reused_views: &FxHashSet<EntityId>) {
         self.line_layout_cache.finish_frame(reused_views)
     }
 
diff --git a/crates/gpui/src/text_system/line_layout.rs b/crates/gpui/src/text_system/line_layout.rs
index 144f855c56..014c2bb1ec 100644
--- a/crates/gpui/src/text_system/line_layout.rs
+++ b/crates/gpui/src/text_system/line_layout.rs
@@ -1,5 +1,5 @@
 use crate::{px, EntityId, FontId, GlyphId, Pixels, PlatformTextSystem, Point, Size};
-use collections::{HashMap, HashSet};
+use collections::{FxHashMap, FxHashSet};
 use parking_lot::{Mutex, RwLock, RwLockUpgradableReadGuard};
 use smallvec::SmallVec;
 use std::{
@@ -277,10 +277,10 @@ impl WrappedLineLayout {
 
 pub(crate) struct LineLayoutCache {
     view_stack: Mutex<Vec<EntityId>>,
-    previous_frame: Mutex<HashMap<CacheKey, Arc<LineLayout>>>,
-    current_frame: RwLock<HashMap<CacheKey, Arc<LineLayout>>>,
-    previous_frame_wrapped: Mutex<HashMap<CacheKey, Arc<WrappedLineLayout>>>,
-    current_frame_wrapped: RwLock<HashMap<CacheKey, Arc<WrappedLineLayout>>>,
+    previous_frame: Mutex<FxHashMap<CacheKey, Arc<LineLayout>>>,
+    current_frame: RwLock<FxHashMap<CacheKey, Arc<LineLayout>>>,
+    previous_frame_wrapped: Mutex<FxHashMap<CacheKey, Arc<WrappedLineLayout>>>,
+    current_frame_wrapped: RwLock<FxHashMap<CacheKey, Arc<WrappedLineLayout>>>,
     platform_text_system: Arc<dyn PlatformTextSystem>,
 }
 
@@ -296,7 +296,7 @@ impl LineLayoutCache {
         }
     }
 
-    pub fn finish_frame(&self, reused_views: &HashSet<EntityId>) {
+    pub fn finish_frame(&self, reused_views: &FxHashSet<EntityId>) {
         debug_assert_eq!(self.view_stack.lock().len(), 0);
 
         let mut prev_frame = self.previous_frame.lock();
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 429ea0dbe2..4b7c43e113 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -10,7 +10,7 @@ use crate::{
     WindowOptions, WindowTextSystem,
 };
 use anyhow::{anyhow, Context as _, Result};
-use collections::HashSet;
+use collections::FxHashSet;
 use derive_more::{Deref, DerefMut};
 use futures::{
     channel::{mpsc, oneshot},
@@ -259,7 +259,7 @@ pub struct Window {
     pub(crate) element_id_stack: GlobalElementId,
     pub(crate) rendered_frame: Frame,
     pub(crate) next_frame: Frame,
-    pub(crate) dirty_views: HashSet<EntityId>,
+    pub(crate) dirty_views: FxHashSet<EntityId>,
     pub(crate) focus_handles: Arc<RwLock<SlotMap<FocusId, AtomicUsize>>>,
     focus_listeners: SubscriberSet<(), AnyWindowFocusListener>,
     focus_lost_listeners: SubscriberSet<(), AnyObserver>,
@@ -428,7 +428,7 @@ impl Window {
             element_id_stack: GlobalElementId::default(),
             rendered_frame: Frame::new(DispatchTree::new(cx.keymap.clone(), cx.actions.clone())),
             next_frame: Frame::new(DispatchTree::new(cx.keymap.clone(), cx.actions.clone())),
-            dirty_views: HashSet::default(),
+            dirty_views: FxHashSet::default(),
             focus_handles: Arc::new(RwLock::new(SlotMap::with_key())),
             focus_listeners: SubscriberSet::new(),
             focus_lost_listeners: SubscriberSet::new(),
diff --git a/crates/gpui/src/window/element_cx.rs b/crates/gpui/src/window/element_cx.rs
index a1e96af5ff..8ba3fc5c4f 100644
--- a/crates/gpui/src/window/element_cx.rs
+++ b/crates/gpui/src/window/element_cx.rs
@@ -21,7 +21,7 @@ use std::{
 };
 
 use anyhow::Result;
-use collections::{HashMap, HashSet};
+use collections::{FxHashMap, FxHashSet};
 use derive_more::{Deref, DerefMut};
 use media::core_video::CVImageBuffer;
 use smallvec::SmallVec;
@@ -53,8 +53,8 @@ pub(crate) struct TooltipRequest {
 pub(crate) struct Frame {
     pub(crate) focus: Option<FocusId>,
     pub(crate) window_active: bool,
-    pub(crate) element_states: HashMap<GlobalElementId, ElementStateBox>,
-    pub(crate) mouse_listeners: HashMap<TypeId, Vec<(StackingOrder, EntityId, AnyMouseListener)>>,
+    pub(crate) element_states: FxHashMap<GlobalElementId, ElementStateBox>,
+    pub(crate) mouse_listeners: FxHashMap<TypeId, Vec<(StackingOrder, EntityId, AnyMouseListener)>>,
     pub(crate) dispatch_tree: DispatchTree,
     pub(crate) scene: Scene,
     pub(crate) depth_map: Vec<(StackingOrder, EntityId, Bounds<Pixels>)>,
@@ -65,13 +65,13 @@ pub(crate) struct Frame {
     pub(crate) element_offset_stack: Vec<Point<Pixels>>,
     pub(crate) requested_input_handler: Option<RequestedInputHandler>,
     pub(crate) tooltip_request: Option<TooltipRequest>,
-    pub(crate) cursor_styles: HashMap<EntityId, CursorStyle>,
+    pub(crate) cursor_styles: FxHashMap<EntityId, CursorStyle>,
     pub(crate) requested_cursor_style: Option<CursorStyle>,
     pub(crate) view_stack: Vec<EntityId>,
-    pub(crate) reused_views: HashSet<EntityId>,
+    pub(crate) reused_views: FxHashSet<EntityId>,
 
     #[cfg(any(test, feature = "test-support"))]
-    pub(crate) debug_bounds: collections::HashMap<String, Bounds<Pixels>>,
+    pub(crate) debug_bounds: collections::FxHashMap<String, Bounds<Pixels>>,
 }
 
 impl Frame {
@@ -79,8 +79,8 @@ impl Frame {
         Frame {
             focus: None,
             window_active: false,
-            element_states: HashMap::default(),
-            mouse_listeners: HashMap::default(),
+            element_states: FxHashMap::default(),
+            mouse_listeners: FxHashMap::default(),
             dispatch_tree,
             scene: Scene::default(),
             depth_map: Vec::new(),
@@ -91,13 +91,13 @@ impl Frame {
             element_offset_stack: Vec::new(),
             requested_input_handler: None,
             tooltip_request: None,
-            cursor_styles: HashMap::default(),
+            cursor_styles: FxHashMap::default(),
             requested_cursor_style: None,
             view_stack: Vec::new(),
-            reused_views: HashSet::default(),
+            reused_views: FxHashSet::default(),
 
             #[cfg(any(test, feature = "test-support"))]
-            debug_bounds: HashMap::default(),
+            debug_bounds: FxHashMap::default(),
         }
     }
 
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index 3744a36c00..b43b5d8413 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -8,7 +8,6 @@ use editor::{actions::Cancel, scroll::Autoscroll, Editor};
 use file_associations::FileAssociations;
 
 use anyhow::{anyhow, Result};
-use collections::{hash_map, HashMap};
 use gpui::{
     actions, div, overlay, px, uniform_list, Action, AppContext, AssetSource, AsyncWindowContext,
     ClipboardItem, DismissEvent, Div, EventEmitter, FocusHandle, FocusableView, InteractiveElement,
@@ -23,7 +22,14 @@ use project::{
 };
 use project_panel_settings::{ProjectPanelDockPosition, ProjectPanelSettings};
 use serde::{Deserialize, Serialize};
-use std::{cmp::Ordering, ffi::OsStr, ops::Range, path::Path, sync::Arc};
+use std::{
+    cmp::Ordering,
+    collections::{hash_map, HashMap},
+    ffi::OsStr,
+    ops::Range,
+    path::Path,
+    sync::Arc,
+};
 use theme::ThemeSettings;
 use ui::{prelude::*, v_flex, ContextMenu, Icon, KeyBinding, Label, ListItem};
 use unicase::UniCase;
@@ -1693,13 +1699,15 @@ impl ClipboardEntry {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use collections::HashSet;
     use gpui::{TestAppContext, View, VisualTestContext, WindowHandle};
     use pretty_assertions::assert_eq;
     use project::{project_settings::ProjectSettings, FakeFs};
     use serde_json::json;
     use settings::SettingsStore;
-    use std::path::{Path, PathBuf};
+    use std::{
+        collections::HashSet,
+        path::{Path, PathBuf},
+    };
     use workspace::AppState;
 
     #[gpui::test]
@@ -3501,7 +3509,7 @@ mod tests {
         cx: &mut VisualTestContext,
     ) -> Vec<String> {
         let mut result = Vec::new();
-        let mut project_entries = HashSet::default();
+        let mut project_entries = HashSet::new();
         let mut has_editor = false;
 
         panel.update(cx, |panel, cx| {
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index c450293945..89f94ad6c4 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -25,11 +25,11 @@ use project::{
 };
 use semantic_index::{SemanticIndex, SemanticIndexStatus};
 
-use collections::HashSet;
 use settings::Settings;
 use smol::stream::StreamExt;
 use std::{
     any::{Any, TypeId},
+    collections::HashSet,
     mem,
     ops::{Not, Range},
     path::PathBuf,
@@ -955,7 +955,7 @@ impl ProjectSearchView {
             semantic_state: None,
             semantic_permissioned: None,
             search_options: options,
-            panels_with_errors: HashSet::default(),
+            panels_with_errors: HashSet::new(),
             active_match_index: None,
             query_editor_was_focused: false,
             included_files_editor,
diff --git a/crates/semantic_index/src/parsing.rs b/crates/semantic_index/src/parsing.rs
index e6f4a37d10..9f2db711ae 100644
--- a/crates/semantic_index/src/parsing.rs
+++ b/crates/semantic_index/src/parsing.rs
@@ -3,7 +3,6 @@ use ai::{
     models::TruncationDirection,
 };
 use anyhow::{anyhow, Result};
-use collections::HashSet;
 use language::{Grammar, Language};
 use rusqlite::{
     types::{FromSql, FromSqlResult, ToSqlOutput, ValueRef},
@@ -13,6 +12,7 @@ use sha1::{Digest, Sha1};
 use std::{
     borrow::Cow,
     cmp::{self, Reverse},
+    collections::HashSet,
     ops::Range,
     path::Path,
     sync::Arc,
@@ -267,7 +267,7 @@ impl CodeContextRetriever {
 
         let mut spans = Vec::new();
         let mut collapsed_ranges_within = Vec::new();
-        let mut parsed_name_ranges = HashSet::default();
+        let mut parsed_name_ranges = HashSet::new();
         for (i, context_match) in matches.iter().enumerate() {
             // Items which are collapsible but not embeddable have no item range
             let item_range = if let Some(item_range) = context_match.item_range.clone() {
diff --git a/crates/sqlez/Cargo.toml b/crates/sqlez/Cargo.toml
index 71c67af095..2ee5e6cbf3 100644
--- a/crates/sqlez/Cargo.toml
+++ b/crates/sqlez/Cargo.toml
@@ -7,7 +7,6 @@ license = "GPL-3.0-or-later"
 
 [dependencies]
 anyhow.workspace = true
-collections.workspace = true
 futures.workspace = true
 indoc.workspace = true
 lazy_static.workspace = true
diff --git a/crates/sqlez/src/thread_safe_connection.rs b/crates/sqlez/src/thread_safe_connection.rs
index cd4664c9ae..98402df108 100644
--- a/crates/sqlez/src/thread_safe_connection.rs
+++ b/crates/sqlez/src/thread_safe_connection.rs
@@ -1,9 +1,8 @@
 use anyhow::Context;
-use collections::HashMap;
 use futures::{channel::oneshot, Future, FutureExt};
 use lazy_static::lazy_static;
 use parking_lot::{Mutex, RwLock};
-use std::{marker::PhantomData, ops::Deref, sync::Arc, thread};
+use std::{collections::HashMap, marker::PhantomData, ops::Deref, sync::Arc, thread};
 use thread_local::ThreadLocal;
 
 use crate::{connection::Connection, domain::Migrator, util::UnboundedSyncSender};
diff --git a/crates/terminal/Cargo.toml b/crates/terminal/Cargo.toml
index a52a7c6f93..7f12fc6eb7 100644
--- a/crates/terminal/Cargo.toml
+++ b/crates/terminal/Cargo.toml
@@ -13,7 +13,6 @@ doctest = false
 [dependencies]
 alacritty_terminal = "0.22.0"
 anyhow.workspace = true
-collections.workspace = true
 db.workspace = true
 dirs = "4.0.0"
 futures.workspace = true
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index 46c7cb0c19..ad9587a326 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -30,7 +30,6 @@ use mappings::mouse::{
     scroll_report,
 };
 
-use collections::{HashMap, VecDeque};
 use procinfo::LocalProcessInfo;
 use serde::{Deserialize, Serialize};
 use settings::Settings;
@@ -40,6 +39,7 @@ use util::truncate_and_trailoff;
 
 use std::{
     cmp::{self, min},
+    collections::{HashMap, VecDeque},
     fmt::Display,
     ops::{Deref, Index, RangeInclusive},
     os::unix::prelude::AsRawFd,
diff --git a/crates/terminal/src/terminal_settings.rs b/crates/terminal/src/terminal_settings.rs
index 1a072ca8bc..7b3d97145c 100644
--- a/crates/terminal/src/terminal_settings.rs
+++ b/crates/terminal/src/terminal_settings.rs
@@ -1,4 +1,3 @@
-use collections::HashMap;
 use gpui::{px, AbsoluteLength, AppContext, FontFeatures, Pixels};
 use schemars::{
     gen::SchemaGenerator,
@@ -8,7 +7,7 @@ use schemars::{
 use serde_derive::{Deserialize, Serialize};
 use serde_json::Value;
 use settings::SettingsJsonSchemaParams;
-use std::path::PathBuf;
+use std::{collections::HashMap, path::PathBuf};
 
 #[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
 #[serde(rename_all = "snake_case")]
diff --git a/crates/theme/Cargo.toml b/crates/theme/Cargo.toml
index c060627ad6..8970cfbacf 100644
--- a/crates/theme/Cargo.toml
+++ b/crates/theme/Cargo.toml
@@ -8,7 +8,11 @@ license = "GPL-3.0-or-later"
 [features]
 default = []
 stories = ["dep:itertools", "dep:story"]
-test-support = ["gpui/test-support", "fs/test-support", "settings/test-support"]
+test-support = [
+    "gpui/test-support",
+    "fs/test-support",
+    "settings/test-support"
+]
 
 [lib]
 path = "src/theme.rs"
@@ -16,7 +20,6 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
-collections.workspace = true
 color.workspace = true
 derive_more.workspace = true
 fs.workspace = true
diff --git a/crates/theme/src/registry.rs b/crates/theme/src/registry.rs
index 2cc4d902a2..fac119ff1d 100644
--- a/crates/theme/src/registry.rs
+++ b/crates/theme/src/registry.rs
@@ -1,8 +1,8 @@
+use std::collections::HashMap;
 use std::path::Path;
 use std::sync::Arc;
 
 use anyhow::{anyhow, Context, Result};
-use collections::HashMap;
 use derive_more::{Deref, DerefMut};
 use fs::Fs;
 use futures::StreamExt;
@@ -64,7 +64,7 @@ impl ThemeRegistry {
     pub fn new(assets: Box<dyn AssetSource>) -> Self {
         let registry = Self {
             state: RwLock::new(ThemeRegistryState {
-                themes: HashMap::default(),
+                themes: HashMap::new(),
             }),
             assets,
         };
diff --git a/crates/util/Cargo.toml b/crates/util/Cargo.toml
index fc06ebeb4a..c510d6f557 100644
--- a/crates/util/Cargo.toml
+++ b/crates/util/Cargo.toml
@@ -15,7 +15,6 @@ test-support = ["tempfile", "git2"]
 [dependencies]
 anyhow.workspace = true
 backtrace = "0.3"
-collections.workspace = true
 dirs = "3.0"
 futures.workspace = true
 git2 = { workspace = true, optional = true }
diff --git a/crates/util/src/test/marked_text.rs b/crates/util/src/test/marked_text.rs
index cf85a806e4..dadf78622d 100644
--- a/crates/util/src/test/marked_text.rs
+++ b/crates/util/src/test/marked_text.rs
@@ -1,5 +1,4 @@
-use collections::HashMap;
-use std::{cmp::Ordering, ops::Range};
+use std::{cmp::Ordering, collections::HashMap, ops::Range};
 
 /// Construct a string and a list of offsets within that string using a single
 /// string containing embedded position markers.
diff --git a/crates/zed/src/open_listener.rs b/crates/zed/src/open_listener.rs
index d3ccf753d1..012b5a2413 100644
--- a/crates/zed/src/open_listener.rs
+++ b/crates/zed/src/open_listener.rs
@@ -1,7 +1,6 @@
 use anyhow::{anyhow, Context, Result};
 use cli::{ipc, IpcHandshake};
 use cli::{ipc::IpcSender, CliRequest, CliResponse};
-use collections::HashMap;
 use editor::scroll::Autoscroll;
 use editor::Editor;
 use futures::channel::mpsc::{UnboundedReceiver, UnboundedSender};
@@ -11,6 +10,7 @@ use gpui::{AppContext, AsyncAppContext, Global};
 use itertools::Itertools;
 use language::{Bias, Point};
 use release_channel::parse_zed_link;
+use std::collections::HashMap;
 use std::ffi::OsStr;
 use std::os::unix::prelude::OsStrExt;
 use std::path::Path;
@@ -176,7 +176,7 @@ pub async fn handle_cli_connection(
     if let Some(request) = requests.next().await {
         match request {
             CliRequest::Open { paths, wait } => {
-                let mut caret_positions = HashMap::default();
+                let mut caret_positions = HashMap::new();
 
                 let paths = if paths.is_empty() {
                     workspace::last_opened_workspace_paths()
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index b4ec471113..443adac50d 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -733,7 +733,6 @@ fn open_settings_file(
 mod tests {
     use super::*;
     use assets::Assets;
-    use collections::HashSet;
     use editor::{scroll::Autoscroll, DisplayPoint, Editor};
     use gpui::{
         actions, Action, AnyWindowHandle, AppContext, AssetSource, Entity, TestAppContext,
@@ -743,7 +742,10 @@ mod tests {
     use project::{project_settings::ProjectSettings, Project, ProjectPath};
     use serde_json::json;
     use settings::{handle_settings_file_changes, watch_config_file, SettingsStore};
-    use std::path::{Path, PathBuf};
+    use std::{
+        collections::HashSet,
+        path::{Path, PathBuf},
+    };
     use theme::{ThemeRegistry, ThemeSettings};
     use workspace::{
         item::{Item, ItemHandle},

From ad3940c66f49ab6d6f62500b11a7751097006dbf Mon Sep 17 00:00:00 2001
From: Kieran Gill <kierangilliam@users.noreply.github.com>
Date: Wed, 7 Feb 2024 09:51:27 -0500
Subject: [PATCH 288/372] text rendering: support strikethroughs (#7363)

<img width="1269" alt="image"
src="https://github.com/zed-industries/zed/assets/18583882/d4c93033-b2ac-4ae0-8e12-457f256ee869">

Release Notes:

- Added support for styling text with strikethrough.

Related:
- https://github.com/zed-industries/zed/issues/5364
- https://github.com/zed-industries/zed/pull/7345
---
 crates/assistant/src/assistant_panel.rs       |  2 +
 .../src/chat_panel/message_editor.rs          |  1 +
 crates/collab_ui/src/collab_panel.rs          |  1 +
 crates/editor/src/editor.rs                   |  2 +
 crates/editor/src/element.rs                  |  8 +++
 crates/gpui/src/style.rs                      | 28 ++++++++++
 crates/gpui/src/text_system.rs                |  9 +++-
 crates/gpui/src/text_system/line.rs           | 53 ++++++++++++++++++-
 crates/gpui/src/text_system/line_wrapper.rs   |  2 +
 crates/gpui/src/window/element_cx.rs          | 36 ++++++++++++-
 crates/outline/src/outline.rs                 |  1 +
 crates/search/src/buffer_search.rs            |  1 +
 crates/search/src/project_search.rs           |  1 +
 crates/terminal_view/src/terminal_element.rs  |  4 ++
 14 files changed, 145 insertions(+), 4 deletions(-)

diff --git a/crates/assistant/src/assistant_panel.rs b/crates/assistant/src/assistant_panel.rs
index 42e4180add..3bd928961d 100644
--- a/crates/assistant/src/assistant_panel.rs
+++ b/crates/assistant/src/assistant_panel.rs
@@ -962,6 +962,7 @@ impl AssistantPanel {
             line_height: relative(1.3).into(),
             background_color: None,
             underline: None,
+            strikethrough: None,
             white_space: WhiteSpace::Normal,
         };
         EditorElement::new(
@@ -3166,6 +3167,7 @@ impl InlineAssistant {
             line_height: relative(1.3).into(),
             background_color: None,
             underline: None,
+            strikethrough: None,
             white_space: WhiteSpace::Normal,
         };
         EditorElement::new(
diff --git a/crates/collab_ui/src/chat_panel/message_editor.rs b/crates/collab_ui/src/chat_panel/message_editor.rs
index d29929e1a2..ed47c7a54a 100644
--- a/crates/collab_ui/src/chat_panel/message_editor.rs
+++ b/crates/collab_ui/src/chat_panel/message_editor.rs
@@ -360,6 +360,7 @@ impl Render for MessageEditor {
             line_height: relative(1.3).into(),
             background_color: None,
             underline: None,
+            strikethrough: None,
             white_space: WhiteSpace::Normal,
         };
 
diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index 9460be3e95..a010abdbcb 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -2068,6 +2068,7 @@ impl CollabPanel {
             line_height: relative(1.3).into(),
             background_color: None,
             underline: None,
+            strikethrough: None,
             white_space: WhiteSpace::Normal,
         };
 
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index d37ba5f3c7..b30c9dd848 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -9495,6 +9495,7 @@ impl Render for Editor {
                 line_height: relative(settings.buffer_line_height.value()),
                 background_color: None,
                 underline: None,
+                strikethrough: None,
                 white_space: WhiteSpace::Normal,
             },
 
@@ -9508,6 +9509,7 @@ impl Render for Editor {
                 line_height: relative(settings.buffer_line_height.value()),
                 background_color: None,
                 underline: None,
+                strikethrough: None,
                 white_space: WhiteSpace::Normal,
             },
         };
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 46c85ddd10..24b0a06bcb 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -1073,6 +1073,7 @@ impl EditorElement {
                                                         font: self.style.text.font(),
                                                         color: self.style.background,
                                                         background_color: None,
+                                                        strikethrough: None,
                                                         underline: None,
                                                     }],
                                                 )
@@ -1713,6 +1714,7 @@ impl EditorElement {
                     color: Hsla::default(),
                     background_color: None,
                     underline: None,
+                    strikethrough: None,
                 }],
             )
             .unwrap();
@@ -1849,6 +1851,7 @@ impl EditorElement {
                         color,
                         background_color: None,
                         underline: None,
+                        strikethrough: None,
                     };
                     let shaped_line = cx
                         .text_system()
@@ -1906,6 +1909,7 @@ impl EditorElement {
                         color: placeholder_color,
                         background_color: None,
                         underline: Default::default(),
+                        strikethrough: None,
                     };
                     cx.text_system()
                         .shape_line(line.to_string().into(), font_size, &[run])
@@ -2321,6 +2325,7 @@ impl EditorElement {
                         color: cx.theme().colors().editor_invisible,
                         background_color: None,
                         underline: None,
+                        strikethrough: None,
                     }],
                 )
                 .unwrap();
@@ -2335,6 +2340,7 @@ impl EditorElement {
                         color: cx.theme().colors().editor_invisible,
                         background_color: None,
                         underline: None,
+                        strikethrough: None,
                     }],
                 )
                 .unwrap();
@@ -2868,6 +2874,7 @@ impl LineWithInvisibles {
                         color: text_style.color,
                         background_color: text_style.background_color,
                         underline: text_style.underline,
+                        strikethrough: text_style.strikethrough,
                     });
 
                     if editor_mode == EditorMode::Full {
@@ -3281,6 +3288,7 @@ fn layout_line(
             color: Hsla::default(),
             background_color: None,
             underline: None,
+            strikethrough: None,
         }],
     )
 }
diff --git a/crates/gpui/src/style.rs b/crates/gpui/src/style.rs
index 6118a0ae96..c7054b98c5 100644
--- a/crates/gpui/src/style.rs
+++ b/crates/gpui/src/style.rs
@@ -197,6 +197,9 @@ pub struct TextStyle {
     /// The underline style of the text
     pub underline: Option<UnderlineStyle>,
 
+    /// The strikethrough style of the text
+    pub strikethrough: Option<StrikethroughStyle>,
+
     /// How to handle whitespace in the text
     pub white_space: WhiteSpace,
 }
@@ -214,6 +217,7 @@ impl Default for TextStyle {
             font_style: FontStyle::default(),
             background_color: None,
             underline: None,
+            strikethrough: None,
             white_space: WhiteSpace::Normal,
         }
     }
@@ -246,6 +250,10 @@ impl TextStyle {
             self.underline = Some(underline);
         }
 
+        if let Some(strikethrough) = style.strikethrough {
+            self.strikethrough = Some(strikethrough);
+        }
+
         self
     }
 
@@ -277,6 +285,7 @@ impl TextStyle {
             color: self.color,
             background_color: self.background_color,
             underline: self.underline,
+            strikethrough: self.strikethrough,
         }
     }
 }
@@ -300,6 +309,9 @@ pub struct HighlightStyle {
     /// The underline style of the text
     pub underline: Option<UnderlineStyle>,
 
+    /// The underline style of the text
+    pub strikethrough: Option<StrikethroughStyle>,
+
     /// Similar to the CSS `opacity` property, this will cause the text to be less vibrant.
     pub fade_out: Option<f32>,
 }
@@ -553,6 +565,17 @@ pub struct UnderlineStyle {
     pub wavy: bool,
 }
 
+/// The properties that can be applied to a strikethrough.
+#[derive(Refineable, Copy, Clone, Default, Debug, PartialEq, Eq)]
+#[refineable(Debug)]
+pub struct StrikethroughStyle {
+    /// The thickness of the strikethrough.
+    pub thickness: Pixels,
+
+    /// The color of the strikethrough.
+    pub color: Option<Hsla>,
+}
+
 /// The kinds of fill that can be applied to a shape.
 #[derive(Clone, Debug)]
 pub enum Fill {
@@ -601,6 +624,7 @@ impl From<&TextStyle> for HighlightStyle {
             font_style: Some(other.font_style),
             background_color: other.background_color,
             underline: other.underline,
+            strikethrough: other.strikethrough,
             fade_out: None,
         }
     }
@@ -636,6 +660,10 @@ impl HighlightStyle {
             self.underline = other.underline;
         }
 
+        if other.strikethrough.is_some() {
+            self.strikethrough = other.strikethrough;
+        }
+
         match (other.fade_out, self.fade_out) {
             (Some(source_fade), None) => self.fade_out = Some(source_fade),
             (Some(source_fade), Some(dest_fade)) => {
diff --git a/crates/gpui/src/text_system.rs b/crates/gpui/src/text_system.rs
index 12242e26c2..43d7b2bb1b 100644
--- a/crates/gpui/src/text_system.rs
+++ b/crates/gpui/src/text_system.rs
@@ -10,7 +10,7 @@ pub use line_wrapper::*;
 
 use crate::{
     px, Bounds, DevicePixels, EntityId, Hsla, Pixels, PlatformTextSystem, Point, Result,
-    SharedString, Size, UnderlineStyle,
+    SharedString, Size, StrikethroughStyle, UnderlineStyle,
 };
 use anyhow::anyhow;
 use collections::{BTreeSet, FxHashMap, FxHashSet};
@@ -317,6 +317,7 @@ impl WindowTextSystem {
             if let Some(last_run) = decoration_runs.last_mut() {
                 if last_run.color == run.color
                     && last_run.underline == run.underline
+                    && last_run.strikethrough == run.strikethrough
                     && last_run.background_color == run.background_color
                 {
                     last_run.len += run.len as u32;
@@ -328,6 +329,7 @@ impl WindowTextSystem {
                 color: run.color,
                 background_color: run.background_color,
                 underline: run.underline,
+                strikethrough: run.strikethrough,
             });
         }
 
@@ -382,6 +384,7 @@ impl WindowTextSystem {
                 if decoration_runs.last().map_or(false, |last_run| {
                     last_run.color == run.color
                         && last_run.underline == run.underline
+                        && last_run.strikethrough == run.strikethrough
                         && last_run.background_color == run.background_color
                 }) {
                     decoration_runs.last_mut().unwrap().len += run_len_within_line as u32;
@@ -391,6 +394,7 @@ impl WindowTextSystem {
                         color: run.color,
                         background_color: run.background_color,
                         underline: run.underline,
+                        strikethrough: run.strikethrough,
                     });
                 }
 
@@ -406,6 +410,7 @@ impl WindowTextSystem {
             let layout = self
                 .line_layout_cache
                 .layout_wrapped_line(&line_text, font_size, &font_runs, wrap_width);
+
             lines.push(WrappedLine {
                 layout,
                 decoration_runs,
@@ -599,6 +604,8 @@ pub struct TextRun {
     pub background_color: Option<Hsla>,
     /// The underline style (if any)
     pub underline: Option<UnderlineStyle>,
+    /// The strikethrough style (if any)
+    pub strikethrough: Option<StrikethroughStyle>,
 }
 
 /// An identifier for a specific glyph, as returned by [`TextSystem::layout_line`].
diff --git a/crates/gpui/src/text_system/line.rs b/crates/gpui/src/text_system/line.rs
index e4fe5aad04..fbf34d39b2 100644
--- a/crates/gpui/src/text_system/line.rs
+++ b/crates/gpui/src/text_system/line.rs
@@ -1,6 +1,6 @@
 use crate::{
     black, fill, point, px, size, Bounds, ElementContext, Hsla, LineLayout, Pixels, Point, Result,
-    SharedString, UnderlineStyle, WrapBoundary, WrappedLineLayout,
+    SharedString, StrikethroughStyle, UnderlineStyle, WrapBoundary, WrappedLineLayout,
 };
 use derive_more::{Deref, DerefMut};
 use smallvec::SmallVec;
@@ -20,6 +20,9 @@ pub struct DecorationRun {
 
     /// The underline style for this run
     pub underline: Option<UnderlineStyle>,
+
+    /// The strikethrough style for this run
+    pub strikethrough: Option<StrikethroughStyle>,
 }
 
 /// A line of text that has been shaped and decorated.
@@ -113,6 +116,7 @@ fn paint_line(
     let mut run_end = 0;
     let mut color = black();
     let mut current_underline: Option<(Point<Pixels>, UnderlineStyle)> = None;
+    let mut current_strikethrough: Option<(Point<Pixels>, StrikethroughStyle)> = None;
     let mut current_background: Option<(Point<Pixels>, Hsla)> = None;
     let text_system = cx.text_system().clone();
     let mut glyph_origin = origin;
@@ -145,6 +149,17 @@ fn paint_line(
                     underline_origin.x = origin.x;
                     underline_origin.y += line_height;
                 }
+                if let Some((strikethrough_origin, strikethrough_style)) =
+                    current_strikethrough.as_mut()
+                {
+                    cx.paint_strikethrough(
+                        *strikethrough_origin,
+                        glyph_origin.x - strikethrough_origin.x,
+                        strikethrough_style,
+                    );
+                    strikethrough_origin.x = origin.x;
+                    strikethrough_origin.y += line_height;
+                }
 
                 glyph_origin.x = origin.x;
                 glyph_origin.y += line_height;
@@ -153,6 +168,7 @@ fn paint_line(
 
             let mut finished_background: Option<(Point<Pixels>, Hsla)> = None;
             let mut finished_underline: Option<(Point<Pixels>, UnderlineStyle)> = None;
+            let mut finished_strikethrough: Option<(Point<Pixels>, StrikethroughStyle)> = None;
             if glyph.index >= run_end {
                 if let Some(style_run) = decoration_runs.next() {
                     if let Some((_, background_color)) = &mut current_background {
@@ -183,6 +199,24 @@ fn paint_line(
                             },
                         ));
                     }
+                    if let Some((_, strikethrough_style)) = &mut current_strikethrough {
+                        if style_run.strikethrough.as_ref() != Some(strikethrough_style) {
+                            finished_strikethrough = current_strikethrough.take();
+                        }
+                    }
+                    if let Some(run_strikethrough) = style_run.strikethrough.as_ref() {
+                        current_strikethrough.get_or_insert((
+                            point(
+                                glyph_origin.x,
+                                glyph_origin.y
+                                    + (((layout.ascent * 0.5) + baseline_offset.y) * 0.5),
+                            ),
+                            StrikethroughStyle {
+                                color: Some(run_strikethrough.color.unwrap_or(style_run.color)),
+                                thickness: run_strikethrough.thickness,
+                            },
+                        ));
+                    }
 
                     run_end += style_run.len as usize;
                     color = style_run.color;
@@ -190,6 +224,7 @@ fn paint_line(
                     run_end = layout.len;
                     finished_background = current_background.take();
                     finished_underline = current_underline.take();
+                    finished_strikethrough = current_strikethrough.take();
                 }
             }
 
@@ -211,6 +246,14 @@ fn paint_line(
                 );
             }
 
+            if let Some((strikethrough_origin, strikethrough_style)) = finished_strikethrough {
+                cx.paint_strikethrough(
+                    strikethrough_origin,
+                    glyph_origin.x - strikethrough_origin.x,
+                    &strikethrough_style,
+                );
+            }
+
             let max_glyph_bounds = Bounds {
                 origin: glyph_origin,
                 size: max_glyph_size,
@@ -263,5 +306,13 @@ fn paint_line(
         );
     }
 
+    if let Some((strikethrough_start, strikethrough_style)) = current_strikethrough.take() {
+        cx.paint_strikethrough(
+            strikethrough_start,
+            last_line_end_x - strikethrough_start.x,
+            &strikethrough_style,
+        );
+    }
+
     Ok(())
 }
diff --git a/crates/gpui/src/text_system/line_wrapper.rs b/crates/gpui/src/text_system/line_wrapper.rs
index 0abe31352d..56f18ea48e 100644
--- a/crates/gpui/src/text_system/line_wrapper.rs
+++ b/crates/gpui/src/text_system/line_wrapper.rs
@@ -225,6 +225,7 @@ mod tests {
                 font: font("Helvetica"),
                 color: Default::default(),
                 underline: Default::default(),
+                strikethrough: None,
                 background_color: None,
             };
             let bold = TextRun {
@@ -232,6 +233,7 @@ mod tests {
                 font: font("Helvetica").bold(),
                 color: Default::default(),
                 underline: Default::default(),
+                strikethrough: None,
                 background_color: None,
             };
 
diff --git a/crates/gpui/src/window/element_cx.rs b/crates/gpui/src/window/element_cx.rs
index 8ba3fc5c4f..2f05e71673 100644
--- a/crates/gpui/src/window/element_cx.rs
+++ b/crates/gpui/src/window/element_cx.rs
@@ -34,8 +34,8 @@ use crate::{
     InputHandler, IsZero, KeyContext, KeyEvent, LayoutId, MonochromeSprite, MouseEvent, PaintQuad,
     Path, Pixels, PlatformInputHandler, Point, PolychromeSprite, Quad, RenderGlyphParams,
     RenderImageParams, RenderSvgParams, Scene, Shadow, SharedString, Size, StackingContext,
-    StackingOrder, Style, Surface, TextStyleRefinement, Underline, UnderlineStyle, Window,
-    WindowContext, SUBPIXEL_VARIANTS,
+    StackingOrder, StrikethroughStyle, Style, Surface, TextStyleRefinement, Underline,
+    UnderlineStyle, Window, WindowContext, SUBPIXEL_VARIANTS,
 };
 
 type AnyMouseListener = Box<dyn FnMut(&dyn Any, DispatchPhase, &mut ElementContext) + 'static>;
@@ -758,6 +758,38 @@ impl<'a> ElementContext<'a> {
         );
     }
 
+    /// Paint a strikethrough into the scene for the next frame at the current z-index.
+    pub fn paint_strikethrough(
+        &mut self,
+        origin: Point<Pixels>,
+        width: Pixels,
+        style: &StrikethroughStyle,
+    ) {
+        let scale_factor = self.scale_factor();
+        let height = style.thickness;
+        let bounds = Bounds {
+            origin,
+            size: size(width, height),
+        };
+        let content_mask = self.content_mask();
+        let view_id = self.parent_view_id();
+
+        let window = &mut *self.window;
+        window.next_frame.scene.insert(
+            &window.next_frame.z_index_stack,
+            Underline {
+                view_id: view_id.into(),
+                layer_id: 0,
+                order: 0,
+                bounds: bounds.scale(scale_factor),
+                content_mask: content_mask.scale(scale_factor),
+                thickness: style.thickness.scale(scale_factor),
+                color: style.color.unwrap_or_default(),
+                wavy: false,
+            },
+        );
+    }
+
     /// Paints a monochrome (non-emoji) glyph into the scene for the next frame at the current z-index.
     ///
     /// The y component of the origin is the baseline of the glyph.
diff --git a/crates/outline/src/outline.rs b/crates/outline/src/outline.rs
index 53f78b8fbd..e670aa550a 100644
--- a/crates/outline/src/outline.rs
+++ b/crates/outline/src/outline.rs
@@ -282,6 +282,7 @@ impl PickerDelegate for OutlineViewDelegate {
             line_height: relative(1.).into(),
             background_color: None,
             underline: None,
+            strikethrough: None,
             white_space: WhiteSpace::Normal,
         };
 
diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs
index bf01347ce8..e09080e6b2 100644
--- a/crates/search/src/buffer_search.rs
+++ b/crates/search/src/buffer_search.rs
@@ -88,6 +88,7 @@ impl BufferSearchBar {
             line_height: relative(1.3).into(),
             background_color: None,
             underline: None,
+            strikethrough: None,
             white_space: WhiteSpace::Normal,
         };
 
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index 89f94ad6c4..f79e2556a3 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -1632,6 +1632,7 @@ impl ProjectSearchBar {
             line_height: relative(1.3).into(),
             background_color: None,
             underline: None,
+            strikethrough: None,
             white_space: WhiteSpace::Normal,
         };
 
diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index 7ddb5ad988..eaac6069c2 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -362,6 +362,7 @@ impl TerminalElement {
                 ..text_style.font()
             },
             underline,
+            strikethrough: None,
         };
 
         if let Some((style, range)) = hyperlink {
@@ -414,6 +415,7 @@ impl TerminalElement {
                 color: Some(theme.colors().link_text_hover),
                 wavy: false,
             }),
+            strikethrough: None,
             fade_out: None,
         };
 
@@ -427,6 +429,7 @@ impl TerminalElement {
             white_space: WhiteSpace::Normal,
             // These are going to be overridden per-cell
             underline: None,
+            strikethrough: None,
             color: theme.colors().text,
             font_weight: FontWeight::NORMAL,
         };
@@ -545,6 +548,7 @@ impl TerminalElement {
                             color: theme.colors().terminal_background,
                             background_color: None,
                             underline: Default::default(),
+                            strikethrough: None,
                         }],
                     )
                     .unwrap()

From c7b022144f8e10ec34388c963d1764e3d500c5cd Mon Sep 17 00:00:00 2001
From: d1y <chenhonzhou@gmail.com>
Date: Wed, 7 Feb 2024 23:13:46 +0800
Subject: [PATCH 289/372] theme_importer: Read theme name from VS Code theme
 (#7489)

apply theme_name(fallback use "")

Release Notes:

- N/A
---
 crates/theme_importer/src/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/theme_importer/src/main.rs b/crates/theme_importer/src/main.rs
index c689d7f7f9..be470e6833 100644
--- a/crates/theme_importer/src/main.rs
+++ b/crates/theme_importer/src/main.rs
@@ -135,7 +135,7 @@ fn main() -> Result<()> {
         .context(format!("failed to parse theme {theme_file_path:?}"))?;
 
     let theme_metadata = ThemeMetadata {
-        name: "".to_string(),
+        name: vscode_theme.name.clone().unwrap_or("".to_string()),
         appearance: ThemeAppearanceJson::Dark,
         file_name: "".to_string(),
     };

From 42a5081aff91e07fdea5a19cc3d92da750f5704a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B1=B1=E9=A2=A8=E9=9C=B2?=
 <shirayama.kazatsuyu@gmail.com>
Date: Thu, 8 Feb 2024 01:27:26 +0900
Subject: [PATCH 290/372] Use try_from_bytes for windows build (#7500)

Reduce windows build error.

Release Notes:

- N/A
---
 crates/fs/src/repository.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/crates/fs/src/repository.rs b/crates/fs/src/repository.rs
index 4bd666381c..66dd0503cf 100644
--- a/crates/fs/src/repository.rs
+++ b/crates/fs/src/repository.rs
@@ -5,14 +5,12 @@ use parking_lot::Mutex;
 use serde_derive::{Deserialize, Serialize};
 use std::{
     cmp::Ordering,
-    ffi::OsStr,
-    os::unix::prelude::OsStrExt,
     path::{Component, Path, PathBuf},
     sync::Arc,
     time::SystemTime,
 };
 use sum_tree::{MapSeekTarget, TreeMap};
-use util::ResultExt;
+use util::{paths::PathExt, ResultExt};
 
 pub use git2::Repository as LibGitRepository;
 
@@ -119,7 +117,7 @@ impl GitRepository for LibGitRepository {
 
         if let Some(statuses) = self.statuses(Some(&mut options)).log_err() {
             for status in statuses.iter() {
-                let path = RepoPath(PathBuf::from(OsStr::from_bytes(status.path_bytes())));
+                let path = RepoPath(PathBuf::try_from_bytes(status.path_bytes()).unwrap());
                 let status = status.status();
                 if !status.contains(git2::Status::IGNORED) {
                     if let Some(status) = read_status(status) {

From b59e110c5996cc503a1b1cc63a3dfcd99b527709 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 7 Feb 2024 09:45:49 -0700
Subject: [PATCH 291/372] Attempt to fix random lag (#7506)

Co-Authored-By: Antonio <antonio@zed.dev>
Co-Authored-By: Thorsten <thorsten@zed.dev>
Co-Authored-By: Mikayla <mikayla@zed.dev>

Release Notes:

- N/A

**or**

- N/A

Co-authored-by: Antonio <antonio@zed.dev>
Co-authored-by: Thorsten <thorsten@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
---
 crates/gpui/build.rs                       | 1 +
 crates/gpui/src/platform/mac/dispatcher.rs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/gpui/build.rs b/crates/gpui/build.rs
index 4c86fe9a62..41505ec678 100644
--- a/crates/gpui/build.rs
+++ b/crates/gpui/build.rs
@@ -22,6 +22,7 @@ fn generate_dispatch_bindings() {
         .header("src/platform/mac/dispatch.h")
         .allowlist_var("_dispatch_main_q")
         .allowlist_var("DISPATCH_QUEUE_PRIORITY_DEFAULT")
+        .allowlist_var("DISPATCH_QUEUE_PRIORITY_HIGH")
         .allowlist_var("DISPATCH_TIME_NOW")
         .allowlist_function("dispatch_get_global_queue")
         .allowlist_function("dispatch_async_f")
diff --git a/crates/gpui/src/platform/mac/dispatcher.rs b/crates/gpui/src/platform/mac/dispatcher.rs
index 46afc14ba8..58375a7e48 100644
--- a/crates/gpui/src/platform/mac/dispatcher.rs
+++ b/crates/gpui/src/platform/mac/dispatcher.rs
@@ -56,7 +56,7 @@ impl PlatformDispatcher for MacDispatcher {
     fn dispatch(&self, runnable: Runnable, _: Option<TaskLabel>) {
         unsafe {
             dispatch_async_f(
-                dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT.try_into().unwrap(), 0),
+                dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH.try_into().unwrap(), 0),
                 runnable.into_raw().as_ptr() as *mut c_void,
                 Some(trampoline),
             );

From c322179bb99fe98b2b5be281cfd23d0cbef9a3c6 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Wed, 7 Feb 2024 11:51:18 -0500
Subject: [PATCH 292/372] Initialize the `SystemAppearance` using the app's
 global window appearance (#7508)

This PR changes our approach to initializing the `SystemAppearance` so
that we can do it earlier in the startup process.

Previously we were using the appearance from the window, meaning that we
couldn't initialize the value until we first opened the window.

Now we read the `window_appearance` from the `AppContext`. On macOS this
is backed by the
[`effectiveAppearance`](https://developer.apple.com/documentation/appkit/nsapplication/2967171-effectiveappearance)
on the `NSApplication`.

We currently still watch for changes to the appearance at the window
level, as the only hook I could find in the documentation is
[`viewDidChangeEffectiveAppearance`](https://developer.apple.com/documentation/appkit/nsview/2977088-viewdidchangeeffectiveappearance),
which is at the `NSView` level.

In my testing this makes it so Zed appropriately chooses the correct
light/dark theme on startup.

Release Notes:

- N/A
---
 .../incoming_call_notification.rs             |  4 +--
 .../project_shared_notification.rs            |  4 +--
 crates/gpui/src/app.rs                        |  6 +++++
 crates/gpui/src/platform.rs                   | 26 +++++++++++--------
 crates/gpui/src/platform/mac/platform.rs      | 11 +++++++-
 crates/gpui/src/platform/test/platform.rs     |  6 ++++-
 crates/theme/src/settings.rs                  | 14 +++++-----
 crates/workspace/src/workspace.rs             |  2 --
 crates/zed/src/main.rs                        |  1 +
 9 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/crates/collab_ui/src/notifications/incoming_call_notification.rs b/crates/collab_ui/src/notifications/incoming_call_notification.rs
index 12662fe6cb..f66194c52a 100644
--- a/crates/collab_ui/src/notifications/incoming_call_notification.rs
+++ b/crates/collab_ui/src/notifications/incoming_call_notification.rs
@@ -5,7 +5,7 @@ use futures::StreamExt;
 use gpui::{prelude::*, AppContext, WindowHandle};
 use settings::Settings;
 use std::sync::{Arc, Weak};
-use theme::{SystemAppearance, ThemeSettings};
+use theme::ThemeSettings;
 use ui::{prelude::*, Button, Label};
 use util::ResultExt;
 use workspace::AppState;
@@ -35,8 +35,6 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) {
                     let options = notification_window_options(screen, window_size);
                     let window = cx
                         .open_window(options, |cx| {
-                            SystemAppearance::init_for_window(cx);
-
                             cx.new_view(|_| {
                                 IncomingCallNotification::new(
                                     incoming_call.clone(),
diff --git a/crates/collab_ui/src/notifications/project_shared_notification.rs b/crates/collab_ui/src/notifications/project_shared_notification.rs
index bb70fc9571..b8ceefcd76 100644
--- a/crates/collab_ui/src/notifications/project_shared_notification.rs
+++ b/crates/collab_ui/src/notifications/project_shared_notification.rs
@@ -6,7 +6,7 @@ use collections::HashMap;
 use gpui::{AppContext, Size};
 use settings::Settings;
 use std::sync::{Arc, Weak};
-use theme::{SystemAppearance, ThemeSettings};
+use theme::ThemeSettings;
 use ui::{prelude::*, Button, Label};
 use workspace::AppState;
 
@@ -28,8 +28,6 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) {
             for screen in cx.displays() {
                 let options = notification_window_options(screen, window_size);
                 let window = cx.open_window(options, |cx| {
-                    SystemAppearance::init_for_window(cx);
-
                     cx.new_view(|_| {
                         ProjectSharedNotification::new(
                             owner.clone(),
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 45c26b0ba8..85d76bb3fa 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -14,6 +14,7 @@ use smol::future::FutureExt;
 pub use test_context::*;
 use time::UtcOffset;
 
+use crate::WindowAppearance;
 use crate::{
     current_platform, image_cache::ImageCache, init_app_menus, Action, ActionRegistry, Any,
     AnyView, AnyWindowHandle, AppMetadata, AssetSource, BackgroundExecutor, ClipboardItem, Context,
@@ -522,6 +523,11 @@ impl AppContext {
         self.platform.displays()
     }
 
+    /// Returns the appearance of the application's windows.
+    pub fn window_appearance(&self) -> WindowAppearance {
+        self.platform.window_appearance()
+    }
+
     /// Writes data to the platform clipboard.
     pub fn write_to_clipboard(&self, item: ClipboardItem) {
         self.platform.write_to_clipboard(item)
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index 62ac543319..612a271111 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -67,6 +67,9 @@ pub(crate) trait Platform: 'static {
         options: WindowOptions,
     ) -> Box<dyn PlatformWindow>;
 
+    /// Returns the appearance of the application's windows.
+    fn window_appearance(&self) -> WindowAppearance;
+
     fn set_display_link_output_callback(
         &self,
         display_id: DisplayId,
@@ -559,29 +562,30 @@ pub enum WindowBounds {
     Fixed(Bounds<GlobalPixels>),
 }
 
-/// The appearance of the window, as defined by the operating system
-/// On macOS, this corresponds to named [NSAppearance](https://developer.apple.com/documentation/appkit/nsappearance)
-/// values
+/// The appearance of the window, as defined by the operating system.
+///
+/// On macOS, this corresponds to named [`NSAppearance`](https://developer.apple.com/documentation/appkit/nsappearance)
+/// values.
 #[derive(Copy, Clone, Debug)]
 pub enum WindowAppearance {
-    /// A light appearance
+    /// A light appearance.
     ///
-    /// on macOS, this corresponds to the `aqua` appearance
+    /// On macOS, this corresponds to the `aqua` appearance.
     Light,
 
-    /// A light appearance with vibrant colors
+    /// A light appearance with vibrant colors.
     ///
-    /// on macOS, this corresponds to the `NSAppearanceNameVibrantLight` appearance
+    /// On macOS, this corresponds to the `NSAppearanceNameVibrantLight` appearance.
     VibrantLight,
 
-    /// A dark appearance
+    /// A dark appearance.
     ///
-    /// on macOS, this corresponds to the `darkAqua` appearance
+    /// On macOS, this corresponds to the `darkAqua` appearance.
     Dark,
 
-    /// A dark appearance with vibrant colors
+    /// A dark appearance with vibrant colors.
     ///
-    /// on macOS, this corresponds to the `NSAppearanceNameVibrantDark` appearance
+    /// On macOS, this corresponds to the `NSAppearanceNameVibrantDark` appearance.
     VibrantDark,
 }
 
diff --git a/crates/gpui/src/platform/mac/platform.rs b/crates/gpui/src/platform/mac/platform.rs
index 0e3864065f..d2cbd52574 100644
--- a/crates/gpui/src/platform/mac/platform.rs
+++ b/crates/gpui/src/platform/mac/platform.rs
@@ -3,7 +3,8 @@ use crate::{
     Action, AnyWindowHandle, BackgroundExecutor, ClipboardItem, CursorStyle, DisplayId,
     ForegroundExecutor, Keymap, MacDispatcher, MacDisplay, MacDisplayLinker, MacTextSystem,
     MacWindow, Menu, MenuItem, PathPromptOptions, Platform, PlatformDisplay, PlatformInput,
-    PlatformTextSystem, PlatformWindow, Result, SemanticVersion, Task, WindowOptions,
+    PlatformTextSystem, PlatformWindow, Result, SemanticVersion, Task, WindowAppearance,
+    WindowOptions,
 };
 use anyhow::anyhow;
 use block::ConcreteBlock;
@@ -505,6 +506,14 @@ impl Platform for MacPlatform {
         ))
     }
 
+    fn window_appearance(&self) -> WindowAppearance {
+        unsafe {
+            let app = NSApplication::sharedApplication(nil);
+            let appearance: id = msg_send![app, effectiveAppearance];
+            WindowAppearance::from_native(appearance)
+        }
+    }
+
     fn set_display_link_output_callback(
         &self,
         display_id: DisplayId,
diff --git a/crates/gpui/src/platform/test/platform.rs b/crates/gpui/src/platform/test/platform.rs
index 4d954b3266..b7e1c99f30 100644
--- a/crates/gpui/src/platform/test/platform.rs
+++ b/crates/gpui/src/platform/test/platform.rs
@@ -1,7 +1,7 @@
 use crate::{
     AnyWindowHandle, BackgroundExecutor, ClipboardItem, CursorStyle, DisplayId, ForegroundExecutor,
     Keymap, Platform, PlatformDisplay, PlatformTextSystem, Task, TestDisplay, TestWindow,
-    WindowOptions,
+    WindowAppearance, WindowOptions,
 };
 use anyhow::{anyhow, Result};
 use collections::VecDeque;
@@ -178,6 +178,10 @@ impl Platform for TestPlatform {
         Box::new(window)
     }
 
+    fn window_appearance(&self) -> WindowAppearance {
+        WindowAppearance::Light
+    }
+
     fn set_display_link_output_callback(
         &self,
         _display_id: DisplayId,
diff --git a/crates/theme/src/settings.rs b/crates/theme/src/settings.rs
index 17404d7c67..dd16239708 100644
--- a/crates/theme/src/settings.rs
+++ b/crates/theme/src/settings.rs
@@ -4,7 +4,7 @@ use anyhow::Result;
 use derive_more::{Deref, DerefMut};
 use gpui::{
     px, AppContext, Font, FontFeatures, FontStyle, FontWeight, Global, Pixels, Subscription,
-    ViewContext, WindowContext,
+    ViewContext,
 };
 use refineable::Refineable;
 use schemars::{
@@ -49,6 +49,12 @@ struct GlobalSystemAppearance(SystemAppearance);
 impl Global for GlobalSystemAppearance {}
 
 impl SystemAppearance {
+    /// Initializes the [`SystemAppearance`] for the application.
+    pub fn init(cx: &mut AppContext) {
+        *cx.default_global::<GlobalSystemAppearance>() =
+            GlobalSystemAppearance(SystemAppearance(cx.window_appearance().into()));
+    }
+
     /// Returns the global [`SystemAppearance`].
     ///
     /// Inserts a default [`SystemAppearance`] if one does not yet exist.
@@ -56,12 +62,6 @@ impl SystemAppearance {
         cx.default_global::<GlobalSystemAppearance>().0
     }
 
-    /// Initializes the [`SystemAppearance`] for the current window.
-    pub fn init_for_window(cx: &mut WindowContext) {
-        *cx.default_global::<GlobalSystemAppearance>() =
-            GlobalSystemAppearance(SystemAppearance(cx.appearance().into()));
-    }
-
     /// Returns the global [`SystemAppearance`].
     pub fn global(cx: &AppContext) -> Self {
         cx.global::<GlobalSystemAppearance>().0
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 181f14386d..77a2a47400 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -855,8 +855,6 @@ impl Workspace {
                     let workspace_id = workspace_id.clone();
                     let project_handle = project_handle.clone();
                     move |cx| {
-                        SystemAppearance::init_for_window(cx);
-
                         cx.new_view(|cx| {
                             Workspace::new(workspace_id, project_handle, app_state, cx)
                         })
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 33fcfc040f..f010468d26 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -126,6 +126,7 @@ fn main() {
             AppCommitSha::set_global(AppCommitSha(build_sha.into()), cx);
         }
 
+        SystemAppearance::init(cx);
         OpenListener::set_global(listener.clone(), cx);
 
         load_embedded_fonts(cx);

From 83cffdde1fad8bf0797b8dc4dc6a52772d26d200 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Wed, 7 Feb 2024 19:06:03 +0200
Subject: [PATCH 293/372] Use collections::{HashMap, HashSet} instead of its
 std:: counterpart (#7502)

---
 Cargo.lock                                 |  4 ++++
 crates/channel/src/channel_chat.rs         |  2 +-
 crates/client/src/client.rs                |  2 +-
 crates/gpui/src/keymap.rs                  |  7 ++-----
 crates/gpui/src/window/element_cx.rs       |  2 +-
 crates/project_panel/src/project_panel.rs  | 18 +++++-------------
 crates/search/src/project_search.rs        |  4 ++--
 crates/semantic_index/src/parsing.rs       |  4 ++--
 crates/sqlez/Cargo.toml                    |  1 +
 crates/sqlez/src/thread_safe_connection.rs |  3 ++-
 crates/terminal/Cargo.toml                 |  1 +
 crates/terminal/src/terminal.rs            |  2 +-
 crates/terminal/src/terminal_settings.rs   |  3 ++-
 crates/theme/Cargo.toml                    |  7 ++-----
 crates/theme/src/registry.rs               |  4 ++--
 crates/util/Cargo.toml                     |  1 +
 crates/util/src/test/marked_text.rs        |  3 ++-
 crates/zed/src/open_listener.rs            |  4 ++--
 crates/zed/src/zed.rs                      |  6 ++----
 19 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 78a47cc604..8e72a590de 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7530,6 +7530,7 @@ name = "sqlez"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "collections",
  "futures 0.3.28",
  "indoc",
  "lazy_static",
@@ -8105,6 +8106,7 @@ version = "0.1.0"
 dependencies = [
  "alacritty_terminal",
  "anyhow",
+ "collections",
  "db",
  "dirs 4.0.0",
  "futures 0.3.28",
@@ -8200,6 +8202,7 @@ name = "theme"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "collections",
  "color",
  "derive_more",
  "fs",
@@ -9343,6 +9346,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "backtrace",
+ "collections",
  "dirs 3.0.2",
  "futures 0.3.28",
  "git2",
diff --git a/crates/channel/src/channel_chat.rs b/crates/channel/src/channel_chat.rs
index ad843470be..e6ed013ade 100644
--- a/crates/channel/src/channel_chat.rs
+++ b/crates/channel/src/channel_chat.rs
@@ -5,13 +5,13 @@ use client::{
     user::{User, UserStore},
     Client, Subscription, TypedEnvelope, UserId,
 };
+use collections::HashSet;
 use futures::lock::Mutex;
 use gpui::{
     AppContext, AsyncAppContext, Context, EventEmitter, Model, ModelContext, Task, WeakModel,
 };
 use rand::prelude::*;
 use std::{
-    collections::HashSet,
     ops::{ControlFlow, Range},
     sync::Arc,
 };
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index ff8adc9660..e454d3ddaf 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -10,6 +10,7 @@ use async_tungstenite::tungstenite::{
     error::Error as WebsocketError,
     http::{Request, StatusCode},
 };
+use collections::HashMap;
 use futures::{
     channel::oneshot, future::LocalBoxFuture, AsyncReadExt, FutureExt, SinkExt, StreamExt,
     TryFutureExt as _, TryStreamExt,
@@ -29,7 +30,6 @@ use serde_json;
 use settings::{Settings, SettingsStore};
 use std::{
     any::TypeId,
-    collections::HashMap,
     convert::TryFrom,
     fmt::Write as _,
     future::Future,
diff --git a/crates/gpui/src/keymap.rs b/crates/gpui/src/keymap.rs
index 45e0ebbe95..e2a6bdfc4b 100644
--- a/crates/gpui/src/keymap.rs
+++ b/crates/gpui/src/keymap.rs
@@ -7,12 +7,9 @@ pub use context::*;
 pub(crate) use matcher::*;
 
 use crate::{Action, Keystroke, NoAction};
-use collections::HashSet;
+use collections::{HashMap, HashSet};
 use smallvec::SmallVec;
-use std::{
-    any::{Any, TypeId},
-    collections::HashMap,
-};
+use std::any::{Any, TypeId};
 
 /// An opaque identifier of which version of the keymap is currently active.
 /// The keymap's version is changed whenever bindings are added or removed.
diff --git a/crates/gpui/src/window/element_cx.rs b/crates/gpui/src/window/element_cx.rs
index 2f05e71673..e3d95de58d 100644
--- a/crates/gpui/src/window/element_cx.rs
+++ b/crates/gpui/src/window/element_cx.rs
@@ -71,7 +71,7 @@ pub(crate) struct Frame {
     pub(crate) reused_views: FxHashSet<EntityId>,
 
     #[cfg(any(test, feature = "test-support"))]
-    pub(crate) debug_bounds: collections::FxHashMap<String, Bounds<Pixels>>,
+    pub(crate) debug_bounds: FxHashMap<String, Bounds<Pixels>>,
 }
 
 impl Frame {
diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index b43b5d8413..3744a36c00 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -8,6 +8,7 @@ use editor::{actions::Cancel, scroll::Autoscroll, Editor};
 use file_associations::FileAssociations;
 
 use anyhow::{anyhow, Result};
+use collections::{hash_map, HashMap};
 use gpui::{
     actions, div, overlay, px, uniform_list, Action, AppContext, AssetSource, AsyncWindowContext,
     ClipboardItem, DismissEvent, Div, EventEmitter, FocusHandle, FocusableView, InteractiveElement,
@@ -22,14 +23,7 @@ use project::{
 };
 use project_panel_settings::{ProjectPanelDockPosition, ProjectPanelSettings};
 use serde::{Deserialize, Serialize};
-use std::{
-    cmp::Ordering,
-    collections::{hash_map, HashMap},
-    ffi::OsStr,
-    ops::Range,
-    path::Path,
-    sync::Arc,
-};
+use std::{cmp::Ordering, ffi::OsStr, ops::Range, path::Path, sync::Arc};
 use theme::ThemeSettings;
 use ui::{prelude::*, v_flex, ContextMenu, Icon, KeyBinding, Label, ListItem};
 use unicase::UniCase;
@@ -1699,15 +1693,13 @@ impl ClipboardEntry {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use collections::HashSet;
     use gpui::{TestAppContext, View, VisualTestContext, WindowHandle};
     use pretty_assertions::assert_eq;
     use project::{project_settings::ProjectSettings, FakeFs};
     use serde_json::json;
     use settings::SettingsStore;
-    use std::{
-        collections::HashSet,
-        path::{Path, PathBuf},
-    };
+    use std::path::{Path, PathBuf};
     use workspace::AppState;
 
     #[gpui::test]
@@ -3509,7 +3501,7 @@ mod tests {
         cx: &mut VisualTestContext,
     ) -> Vec<String> {
         let mut result = Vec::new();
-        let mut project_entries = HashSet::new();
+        let mut project_entries = HashSet::default();
         let mut has_editor = false;
 
         panel.update(cx, |panel, cx| {
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index f79e2556a3..ad2e894527 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -25,11 +25,11 @@ use project::{
 };
 use semantic_index::{SemanticIndex, SemanticIndexStatus};
 
+use collections::HashSet;
 use settings::Settings;
 use smol::stream::StreamExt;
 use std::{
     any::{Any, TypeId},
-    collections::HashSet,
     mem,
     ops::{Not, Range},
     path::PathBuf,
@@ -955,7 +955,7 @@ impl ProjectSearchView {
             semantic_state: None,
             semantic_permissioned: None,
             search_options: options,
-            panels_with_errors: HashSet::new(),
+            panels_with_errors: HashSet::default(),
             active_match_index: None,
             query_editor_was_focused: false,
             included_files_editor,
diff --git a/crates/semantic_index/src/parsing.rs b/crates/semantic_index/src/parsing.rs
index 9f2db711ae..e6f4a37d10 100644
--- a/crates/semantic_index/src/parsing.rs
+++ b/crates/semantic_index/src/parsing.rs
@@ -3,6 +3,7 @@ use ai::{
     models::TruncationDirection,
 };
 use anyhow::{anyhow, Result};
+use collections::HashSet;
 use language::{Grammar, Language};
 use rusqlite::{
     types::{FromSql, FromSqlResult, ToSqlOutput, ValueRef},
@@ -12,7 +13,6 @@ use sha1::{Digest, Sha1};
 use std::{
     borrow::Cow,
     cmp::{self, Reverse},
-    collections::HashSet,
     ops::Range,
     path::Path,
     sync::Arc,
@@ -267,7 +267,7 @@ impl CodeContextRetriever {
 
         let mut spans = Vec::new();
         let mut collapsed_ranges_within = Vec::new();
-        let mut parsed_name_ranges = HashSet::new();
+        let mut parsed_name_ranges = HashSet::default();
         for (i, context_match) in matches.iter().enumerate() {
             // Items which are collapsible but not embeddable have no item range
             let item_range = if let Some(item_range) = context_match.item_range.clone() {
diff --git a/crates/sqlez/Cargo.toml b/crates/sqlez/Cargo.toml
index 2ee5e6cbf3..71c67af095 100644
--- a/crates/sqlez/Cargo.toml
+++ b/crates/sqlez/Cargo.toml
@@ -7,6 +7,7 @@ license = "GPL-3.0-or-later"
 
 [dependencies]
 anyhow.workspace = true
+collections.workspace = true
 futures.workspace = true
 indoc.workspace = true
 lazy_static.workspace = true
diff --git a/crates/sqlez/src/thread_safe_connection.rs b/crates/sqlez/src/thread_safe_connection.rs
index 98402df108..cd4664c9ae 100644
--- a/crates/sqlez/src/thread_safe_connection.rs
+++ b/crates/sqlez/src/thread_safe_connection.rs
@@ -1,8 +1,9 @@
 use anyhow::Context;
+use collections::HashMap;
 use futures::{channel::oneshot, Future, FutureExt};
 use lazy_static::lazy_static;
 use parking_lot::{Mutex, RwLock};
-use std::{collections::HashMap, marker::PhantomData, ops::Deref, sync::Arc, thread};
+use std::{marker::PhantomData, ops::Deref, sync::Arc, thread};
 use thread_local::ThreadLocal;
 
 use crate::{connection::Connection, domain::Migrator, util::UnboundedSyncSender};
diff --git a/crates/terminal/Cargo.toml b/crates/terminal/Cargo.toml
index 7f12fc6eb7..a52a7c6f93 100644
--- a/crates/terminal/Cargo.toml
+++ b/crates/terminal/Cargo.toml
@@ -13,6 +13,7 @@ doctest = false
 [dependencies]
 alacritty_terminal = "0.22.0"
 anyhow.workspace = true
+collections.workspace = true
 db.workspace = true
 dirs = "4.0.0"
 futures.workspace = true
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index ad9587a326..46c7cb0c19 100644
--- a/crates/terminal/src/terminal.rs
+++ b/crates/terminal/src/terminal.rs
@@ -30,6 +30,7 @@ use mappings::mouse::{
     scroll_report,
 };
 
+use collections::{HashMap, VecDeque};
 use procinfo::LocalProcessInfo;
 use serde::{Deserialize, Serialize};
 use settings::Settings;
@@ -39,7 +40,6 @@ use util::truncate_and_trailoff;
 
 use std::{
     cmp::{self, min},
-    collections::{HashMap, VecDeque},
     fmt::Display,
     ops::{Deref, Index, RangeInclusive},
     os::unix::prelude::AsRawFd,
diff --git a/crates/terminal/src/terminal_settings.rs b/crates/terminal/src/terminal_settings.rs
index 7b3d97145c..1a072ca8bc 100644
--- a/crates/terminal/src/terminal_settings.rs
+++ b/crates/terminal/src/terminal_settings.rs
@@ -1,3 +1,4 @@
+use collections::HashMap;
 use gpui::{px, AbsoluteLength, AppContext, FontFeatures, Pixels};
 use schemars::{
     gen::SchemaGenerator,
@@ -7,7 +8,7 @@ use schemars::{
 use serde_derive::{Deserialize, Serialize};
 use serde_json::Value;
 use settings::SettingsJsonSchemaParams;
-use std::{collections::HashMap, path::PathBuf};
+use std::path::PathBuf;
 
 #[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
 #[serde(rename_all = "snake_case")]
diff --git a/crates/theme/Cargo.toml b/crates/theme/Cargo.toml
index 8970cfbacf..c060627ad6 100644
--- a/crates/theme/Cargo.toml
+++ b/crates/theme/Cargo.toml
@@ -8,11 +8,7 @@ license = "GPL-3.0-or-later"
 [features]
 default = []
 stories = ["dep:itertools", "dep:story"]
-test-support = [
-    "gpui/test-support",
-    "fs/test-support",
-    "settings/test-support"
-]
+test-support = ["gpui/test-support", "fs/test-support", "settings/test-support"]
 
 [lib]
 path = "src/theme.rs"
@@ -20,6 +16,7 @@ doctest = false
 
 [dependencies]
 anyhow.workspace = true
+collections.workspace = true
 color.workspace = true
 derive_more.workspace = true
 fs.workspace = true
diff --git a/crates/theme/src/registry.rs b/crates/theme/src/registry.rs
index fac119ff1d..2cc4d902a2 100644
--- a/crates/theme/src/registry.rs
+++ b/crates/theme/src/registry.rs
@@ -1,8 +1,8 @@
-use std::collections::HashMap;
 use std::path::Path;
 use std::sync::Arc;
 
 use anyhow::{anyhow, Context, Result};
+use collections::HashMap;
 use derive_more::{Deref, DerefMut};
 use fs::Fs;
 use futures::StreamExt;
@@ -64,7 +64,7 @@ impl ThemeRegistry {
     pub fn new(assets: Box<dyn AssetSource>) -> Self {
         let registry = Self {
             state: RwLock::new(ThemeRegistryState {
-                themes: HashMap::new(),
+                themes: HashMap::default(),
             }),
             assets,
         };
diff --git a/crates/util/Cargo.toml b/crates/util/Cargo.toml
index c510d6f557..fc06ebeb4a 100644
--- a/crates/util/Cargo.toml
+++ b/crates/util/Cargo.toml
@@ -15,6 +15,7 @@ test-support = ["tempfile", "git2"]
 [dependencies]
 anyhow.workspace = true
 backtrace = "0.3"
+collections.workspace = true
 dirs = "3.0"
 futures.workspace = true
 git2 = { workspace = true, optional = true }
diff --git a/crates/util/src/test/marked_text.rs b/crates/util/src/test/marked_text.rs
index dadf78622d..cf85a806e4 100644
--- a/crates/util/src/test/marked_text.rs
+++ b/crates/util/src/test/marked_text.rs
@@ -1,4 +1,5 @@
-use std::{cmp::Ordering, collections::HashMap, ops::Range};
+use collections::HashMap;
+use std::{cmp::Ordering, ops::Range};
 
 /// Construct a string and a list of offsets within that string using a single
 /// string containing embedded position markers.
diff --git a/crates/zed/src/open_listener.rs b/crates/zed/src/open_listener.rs
index 012b5a2413..d3ccf753d1 100644
--- a/crates/zed/src/open_listener.rs
+++ b/crates/zed/src/open_listener.rs
@@ -1,6 +1,7 @@
 use anyhow::{anyhow, Context, Result};
 use cli::{ipc, IpcHandshake};
 use cli::{ipc::IpcSender, CliRequest, CliResponse};
+use collections::HashMap;
 use editor::scroll::Autoscroll;
 use editor::Editor;
 use futures::channel::mpsc::{UnboundedReceiver, UnboundedSender};
@@ -10,7 +11,6 @@ use gpui::{AppContext, AsyncAppContext, Global};
 use itertools::Itertools;
 use language::{Bias, Point};
 use release_channel::parse_zed_link;
-use std::collections::HashMap;
 use std::ffi::OsStr;
 use std::os::unix::prelude::OsStrExt;
 use std::path::Path;
@@ -176,7 +176,7 @@ pub async fn handle_cli_connection(
     if let Some(request) = requests.next().await {
         match request {
             CliRequest::Open { paths, wait } => {
-                let mut caret_positions = HashMap::new();
+                let mut caret_positions = HashMap::default();
 
                 let paths = if paths.is_empty() {
                     workspace::last_opened_workspace_paths()
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 443adac50d..b4ec471113 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -733,6 +733,7 @@ fn open_settings_file(
 mod tests {
     use super::*;
     use assets::Assets;
+    use collections::HashSet;
     use editor::{scroll::Autoscroll, DisplayPoint, Editor};
     use gpui::{
         actions, Action, AnyWindowHandle, AppContext, AssetSource, Entity, TestAppContext,
@@ -742,10 +743,7 @@ mod tests {
     use project::{project_settings::ProjectSettings, Project, ProjectPath};
     use serde_json::json;
     use settings::{handle_settings_file_changes, watch_config_file, SettingsStore};
-    use std::{
-        collections::HashSet,
-        path::{Path, PathBuf},
-    };
+    use std::path::{Path, PathBuf};
     use theme::{ThemeRegistry, ThemeSettings};
     use workspace::{
         item::{Item, ItemHandle},

From 114889b8bbf27930e1626a66405ce8a3f13bda71 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Wed, 7 Feb 2024 12:19:41 -0500
Subject: [PATCH 294/372] v0.123.x dev

---
 Cargo.lock            | 2 +-
 crates/zed/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8e72a590de..04f18936cd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10297,7 +10297,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "0.122.0"
+version = "0.123.0"
 dependencies = [
  "activity_indicator",
  "ai",
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index fda5391ac2..c023faf6f7 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -2,7 +2,7 @@
 description = "The fast, collaborative code editor."
 edition = "2021"
 name = "zed"
-version = "0.122.0"
+version = "0.123.0"
 publish = false
 license = "GPL-3.0-or-later"
 

From 07fce7aae1ebe03a344160e3083837044d7de850 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Wed, 7 Feb 2024 19:45:30 +0100
Subject: [PATCH 295/372] Stop display link when window is occluded (#7511)

Release Notes:

- Fixed a bug that caused the window to become unresponsive after
foregrounding.

---------

Co-authored-by: Conrad <conrad@zed.dev>
---
 crates/gpui/src/platform/mac/window.rs | 27 ++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index b15e8c8de5..b6d0e3b886 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -12,7 +12,7 @@ use cocoa::{
         CGPoint, NSApplication, NSBackingStoreBuffered, NSEventModifierFlags,
         NSFilenamesPboardType, NSPasteboard, NSScreen, NSView, NSViewHeightSizable,
         NSViewWidthSizable, NSWindow, NSWindowButton, NSWindowCollectionBehavior,
-        NSWindowStyleMask, NSWindowTitleVisibility,
+        NSWindowOcclusionState, NSWindowStyleMask, NSWindowTitleVisibility,
     },
     base::{id, nil},
     foundation::{
@@ -249,6 +249,10 @@ unsafe fn build_window_class(name: &'static str, superclass: &Class) -> *const C
         sel!(windowDidResize:),
         window_did_resize as extern "C" fn(&Object, Sel, id),
     );
+    decl.add_method(
+        sel!(windowDidChangeOcclusionState:),
+        window_did_change_occlusion_state as extern "C" fn(&Object, Sel, id),
+    );
     decl.add_method(
         sel!(windowWillEnterFullScreen:),
         window_will_enter_fullscreen as extern "C" fn(&Object, Sel, id),
@@ -530,14 +534,12 @@ impl MacWindow {
             let native_view = NSView::init(native_view);
             assert!(!native_view.is_null());
 
-            let display_link = start_display_link(native_window.screen(), native_view);
-
             let window = Self(Arc::new(Mutex::new(MacWindowState {
                 handle,
                 executor,
                 native_window,
                 native_view: NonNull::new_unchecked(native_view),
-                display_link,
+                display_link: nil,
                 renderer: MetalRenderer::new(instance_buffer_pool),
                 kind: options.kind,
                 request_frame_callback: None,
@@ -1332,6 +1334,23 @@ extern "C" fn cancel_operation(this: &Object, _sel: Sel, _sender: id) {
     }
 }
 
+extern "C" fn window_did_change_occlusion_state(this: &Object, _: Sel, _: id) {
+    let window_state = unsafe { get_window_state(this) };
+    let mut lock = window_state.lock();
+    unsafe {
+        if lock
+            .native_window
+            .occlusionState()
+            .contains(NSWindowOcclusionState::NSWindowOcclusionStateVisible)
+        {
+            lock.display_link =
+                start_display_link(lock.native_window.screen(), lock.native_view.as_ptr());
+        } else {
+            lock.display_link = nil;
+        }
+    }
+}
+
 extern "C" fn window_did_resize(this: &Object, _: Sel, _: id) {
     let window_state = unsafe { get_window_state(this) };
     window_state.as_ref().lock().move_traffic_light();

From c1ada087b47c87d1d4e02543fca8ac3cb7502d1e Mon Sep 17 00:00:00 2001
From: Rashid Almheiri <r.muhairi@pm.me>
Date: Wed, 7 Feb 2024 23:12:53 +0400
Subject: [PATCH 296/372] docs: Update OPAM installation instructions (#7510)

Use the new installation procedures located at
https://ocaml.org/install.

Release Notes:
- N/A
---
 docs/src/languages/ocaml.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/languages/ocaml.md b/docs/src/languages/ocaml.md
index 553b5dbdd3..5424803e74 100644
--- a/docs/src/languages/ocaml.md
+++ b/docs/src/languages/ocaml.md
@@ -7,7 +7,7 @@
 If you have the development environment already setup, you can skip to [Launching Zed](#launching-zed)
 
 ### Using OPAM
-Opam is the official package manager for OCaml and is highly recommended for getting started with OCaml. To get started using Opam, please follow the instructions provided [here](https://opam.ocaml.org/doc/Install.html). 
+Opam is the official package manager for OCaml and is highly recommended for getting started with OCaml. To get started using Opam, please follow the instructions provided [here](https://ocaml.org/install). 
 
 Once you install opam and setup a switch with your development environment as per the instructions, you can proceed.
 

From 3734a390b2757aa221b752f93c7219a816b0cefa Mon Sep 17 00:00:00 2001
From: Mikayla <mikayla@zed.dev>
Date: Wed, 7 Feb 2024 11:39:26 -0800
Subject: [PATCH 297/372] Mark TODOs and prep for merging main

---
 Cargo.toml                                    |   2 +-
 crates/gpui/screenshot.png                    | Bin 9562 -> 0 bytes
 crates/gpui/src/platform/linux/blade_belt.rs  |   4 +--
 .../gpui/src/platform/linux/blade_renderer.rs |   2 +-
 crates/gpui/src/platform/linux/dispatcher.rs  |   2 +-
 crates/gpui/src/platform/linux/platform.rs    |  15 ++++++++--
 crates/gpui/src/platform/linux/text_system.rs |  28 ++++++++++++++++--
 crates/gpui/src/platform/linux/window.rs      |  22 ++++++++++++++
 crates/gpui/src/platform/test/platform.rs     |   6 +++-
 crates/gpui/src/platform/test/text_system.rs  |   1 +
 crates/project/src/terminals.rs               |   4 +--
 crates/zed/src/languages.rs                   |   3 +-
 crates/zed/src/main.rs                        |   3 +-
 13 files changed, 77 insertions(+), 15 deletions(-)
 delete mode 100644 crates/gpui/screenshot.png

diff --git a/Cargo.toml b/Cargo.toml
index 26cd9ab039..a4e51e6aae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -185,7 +185,7 @@ wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "v16.0.
 split-debuginfo = "unpacked"
 debug = "limited"
 
-# TODO - Remove this
+# todo!(linux) - Remove this
 [profile.dev.package.blade-graphics]
 split-debuginfo = "off"
 debug = "full"
diff --git a/crates/gpui/screenshot.png b/crates/gpui/screenshot.png
deleted file mode 100644
index 50597680f03024039943557738252f4270e19c3f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9562
zcmaKSbyQT}7w;XqYv>k5Qc6091__657*a*LOBgyVqyzyOKw#()6{I_*yFp5j5@CQL
z-r)DG-+%ATT4(mzpL2HJd)7MV>>Cf&RVO84Bmw|{R8vDm9{{j0T`YhA8$&t@@AYB`
z$Xj1s38)xi{)J(1o+#=l0zma!;!9gx0Kf*I+J>sPlRzLsLP8=UA_4*ee0+RtY-}tn
zEHD_nx3~A_&!3~Cqn|&2wzsz@CnrC9_Dn}dM_yiDLPA17K!BB%m7JU$4-ao=XXobT
z=KTD8Yip~&zrVb^JS{CPHa0dQA|fy_P)|=!Qd08Xy?b<YbYx^?xVX4DI5>lYgV)#B
zXf*ot^mKoJe{F4TX=!O;VPSD`ab#rV#fukED3qU{pPHJwtgP(ImoIPLyz%t(w6n9b
zwzjshv4O#0=H}*FT3Vu_qAV;dmzS5v$H(L2<DH$I_4V~%zkaQ$smaaF4Gs<#6cl7)
zVxpj+NJvPyxVS)}P$wrRhlhvp@$rt1j@sJV5C}w0PEJ-<Rz^lfTwI)zl9H2?)6C4Q
zq@-kKW@dMHmxP35b91w|xA*1CmvM1%QBhI)`uZXwBBZ3G4<9~!_wHR^U*FZ$)%yDS
z>gwvs%F6QcGCMmvGcz*>2L~S?pQ57TlP6EIva&`;N8i7HpPHJQn3xz65@KOtK}<}%
zv9a;v$B&|-B5!YRXJ=<0AD`0F(!YQI{{H=&ii&D`d;8a~UvqPFEiEmDg@te5zAY{;
z?&#=XU|`_o<!x?me)Q;3c6RpU<YYiVfV#T6u(0sN#DtZVm6Vj!<HwH+3JRp9rTzW=
zGcq#H&d&V&{7g+vb8>Q~rlx3UXy)hVhlhuIdV12+)48~~yu7?JGc$#RglK7L-Q3)2
zYiku06dD^FtE#Hh)YR_ZzyIyqHwOm?BobLsQ6VNKR##US9v*&haFCam_x=0#*RNmS
zy?Zw-EbP^*SB8d$)6>(sy1J2(k)J<*=H}*ZXlU^D^+g~MmX?-AMn*h5Ja_KgVPs@{
z`t+%jlaq;w2^$;Rg9i^jeE1L@9c^oC8x#~YFfh>C+8PrR<Lc_Fp`r2V)2F1Qq_MFv
zdU|?gW#x|_KUP*&Dk&+owY7zYhN`Nny1Tp2&dzFTYBn`BxwyCt4GkF>7(9ReysN7#
zKR@5z-rm^QxVyXC!^0ybB}GL=1rCQ-S64f(WlCYz0HKG5nKuBCb=)>kk2}%<0Pgf@
zswf%;Snn<3!>A{x@DB&?&vJrPagwYOI1;U#zzIsN5$uE-S{kiNbP))=87LMvQIs>c
zVu5U8US6OQ5-Sg$fX7D5%1sM}7RwX=0SdMaCJyEonb{rZvt%3(2G4VO8oUqohpx7C
z8y<oc3GPHuDE+_wvZ=K18+=0F4CLkgpbbc%S1d@M@!~b9-<&I%Hfm@Ndi}wZRuTRy
zPFJ<d;;Lq{#HwhYRAQ<$$lwZ(6s+y(7dsoNl*^T-HZm6;Kh*ij{B@?N>*n?J-%aUn
zqVDg0@3SJv+J$pDMXMdY-Y<7++B=mo|K|2$E8G8jON5NY^6K@EtI4aDErkO*6wb%x
zgQw%C6@G-CPN<}=#n%DXl;woJxpI?9N#+GFVjE=qTsEePz29$IjgRS&J&N#&fW<#l
z#R?$FXA*s-)|v8Za9{3&U*pyidjDXy)TDBW^#$YKf|JK#INm<Xp_3QOe_G+`GloJ!
z#2-~gB!N&#e7Q5oVw>{5=dRzd@;A9l4RfWG#Z@apu|wk$&fuq$w!Sgs{qTApRVOU%
za3PW%0{4o+{v)ZoYNBqkHAl$IU7u(2waeR#dtT3Ly$61{Ze3Y-l&>>|ME5kwKDK_b
zfF_U)K3~<xZEOi-LtT2EtR_`1{nBEMB9xPToXSJK+;lK(u<}RQq&Z+Yc8lw+eoK8z
zO30_N)Cu~Behc|;UqAM0zvSk6$Yc&y-17zU03vvs9zgO23+6!$MCJqZ%vu0ztTaK7
zDb^v*gra13&E2P1w{#3!JL(@Sq#5;ypv4r+qbX-`AnGpvE+F<@nKR0UUk<X&3ME{n
z(;`o#gBfzK;%Jdmh!ODKxwIpMzYsB0I_s(-@PGnm>L4LWa~zBzatLSyl*S6D1xZ6N
zSRpVH3S8@v|IZWL))iAM2pZ%A$9PvuAS5YG@8F>=2ka57v0=uZvb3&n19-RU(r!gr
z5R{5|>Sz$jn<-2y#z$NMm-(#!n}Z3o8V7!gy$#&TQo=kYu%C9MiaPF)ju)CdaJ_id
z_V~@gY6OpAI~9D}97;&|ZhJ6Cs{ROhN?ywf-Z);0kKlAOJ`s;RU=?amFO=4V&4THr
z@Oek0=q-d$#XYe)=|Zc&irB&mJK|IVWclm$GY5m6+FxaU9~yq+l^(e~p&eIRi#S&%
z{+ZfBbytfV`jC)U@BNmar*H??X@=3xwMT>$?;hJrHOH9wFIrX%8JaJ10{!~Zab(uq
ziX)oF#xy&mJ0)o@P5D8{cjT!^)xoT$GNW%B!v!1X&7dsDsbj%cHEo@9pI<u%&L=p?
z?COx<2G9M`m7>{4-3O-u6DB)4=WAIDM_ta(-YGT=Z(j&b62*ohJT4W`U2VZh;Z5BG
zd?q}ej>c&~t===WB13Cqe@#6CtsyEU>l>bEs3ExGa&o#N&f%(~ve(Xe)KSMj<B7Bu
z@G)ANIz{-&-uJ0p9sMVTBOV<;c%accYc{jnaMT?I+wo1K8aLJ|oE2lFGNs*WoJrA1
zag=q$+_%QUwyr?~r<UePoC64tQlv>x?=)!@4x~C5FFyXYO_RUq?p$)cYxs9Q?5|x`
zUyHpZywP=g#fN!i?Lt8H{PGO#gMkq3(1+k1L&a+gnUvjgK8iWgQWC+z7)SLHX{55+
z(5yjE-%RveEb@zZ`q`AY(e<g;Gt?($3tJL7coo4;qR#caRvyAD!*ogSiGlAd?U&5u
z9}8+Rq}DNjsksu12v61=<hq{QN6)qg>M1AFnALy5@3h1LBY+38PTYApll=@@IoLg9
zaK;_JyC{69zr!>~vV_B^4CJNTT$ZfaszOUIf1}8tUOA987=!<rCTH#I=x^a&6mT;y
z*LYL#G^cWQzp1oIy%pB^cnI5jX#7u`S8T8E09Ouk{X=Ery1&GbR`aQk;Ky=0^9mex
z+Mq`8y%^wc6z@zO;{zjG+@Lm(=u^VU(W)DiNXziov;hh@If96m=SykvA3BF~NJbmq
z7r!>*r$tYM8|j#10PR@b!%lMl%v_OzjR*R9#2V+{@G@^U?p4M}M0QkhRWTWcr-i*7
zY<PiXmV{l&Tg1F41CQ(7J9P3m1W}wqXf*8do1n?ONeU6usRmj!sB1L%il~u+`H}+y
zv$(32D_qNI$@D0{WWwUf%=LPpssK8`!)F8V$NSZ<dz{_nUDI5@b<tG+M7TZ3IBjca
zYr|)My8(T^!&Oo#_d*(MZ6O~iANl=DN;Ab0DVaP_Ptr5%@~yPxbRmSju`Wa{l*~7u
zz!M#O8uk}JUUa>e^Dme$K)tjtX~n3j#94}7Zrf)pYnvLscRp-KU(LFcrX<wENzKB1
z@drIUD9~b@^iI_IEcqa0gu|-6j>A@J-qbdPe1xsVwn>O_2ga%5E?w(5kedfJ?%wTF
zKn4xbB4w!4>ddZ!zW(}Si0+S%k7nSx-uk%xNYm<ck|p*cM)bZwC3v0^qvcR+g5Byj
z782{Rkb2?dP2qkdc2k%NgVckTGHM66S^xg93ahnzXdp~!=>kor;O$V;d7S1F`G%G0
zJ*z_o`$A_xfdEDeFu}e!&QA=qeGIue%6{#Y(C{SXV@}2X&z8Oj&5#`vroxnWbplVP
z?@q`b8IJdFgXOHM+2lw4LbGld{0^<UEq`Lem#Xy}*_;#msb&v0zDuAL!lX~;&4e6P
z)8@^{v(O^)hfs=vt&_rDA$~E=XM2e>&F??Fxap9d!)+p<c%wv`Bo{f04bx<kaM97O
zB7J)%FBFJd|L8YC?c5u*LfV~sY-hU7FCN?d&a~$n`u0dUJr=K&4R~UKyrZHtfodvh
zlCKf^RN<DGGbw_$b;OH%i~7vM9&+<z!8C(hq2Sd`p^Lp#x1ZC&)W}P~2f%wof9a@s
zV>?5s$<@cTxLO)UdH+YumSftV{7MCOgC?VX64lpI=i{m4>v_}e*7rL~SAyXN&`87Q
z%Cc~diOXLK&+RxX*Jh+mB8V!yWGiQ+l)7%pJv5Y`TB{bDcncEQvDSS<E#W=TeO$>m
zJo|PB1)!D8a48bLm$mOd%d+~iKxA-{(fz8lA9SzDz|fCHE-<IP=x%+2dYPNFM#bl-
zNgMpSJ5fOG^FAN7;or|bSBNGge(`;~P-OW2-I?~Ve)vFh6QsV1NAZevB^MS6kMdit
zahs1jdVof0No3S`@8;B7eDvPF)RID<4flCEz3gKCvUg^A{#J@t>k614Z6sqCmE;*9
zN-0%ui<~AAM3$|y-8eEtPH8u-9zO65dsgBzvtASmgvLiPhDgt7j=u~>)Mqg;=r&8=
zQ0?HeKarnU=_phU5m)G$Acy=ex;}N`Y83pLDyZ>vf*gMAyF37_lAf!(Bq9zo!@YCy
z`tbH*c>5{d9M|D&uzkm`f&~Mmbxn8^dI?oV@%g^@xI+MG2<e!kycL+YUJ0f!nvFnU
zub5(su~U=td~2~b75->^QyWeOF$5z)`2nL5V`%Kp`z~sGm6Se!lQ3zGZ@CnT!G*-s
zDLYhaUwP}E!!{raW8O>hypG2%igmN}Ty1)LHXl}UcN<tBr&)<FHX8cKVy0~o_CX0B
zL23v&iy?y;A>oIlO<ac@7*-85qVZ@mjx6}}a!#^#bf{lZ5Q`h&C(7ji4t=5RwqNm@
zE|fWUXyert1Rs7yrPs~b9X81Y!c)umTzW-Yx#~u-1DfEfxUjKFe`)=hOmxys3Ic*=
z*ZnT^GI=j*MUOCJgYboyJiiQ%emS7Nm^*6~P>c_?K>3f^(x&Nu&NTLKE=Yx>#<PT2
zo0X{E4X}2dz((?)%H?o%OD^f5<s0Exh#IF8Tf8)b7GZ6K2pRT@HnZ@7L$(dkAF&1r
zZtSC!9EK&6V&XacHY>m-Upj2g?(gL}zJkorU%T?DtV4a;^Li!ob>g|-#4G&3+F*8*
z;DIt&+luSex~r&S_v=tMA=*iuOtRONKwSP%3WF}=d0XI68ur)tP%Mfo3S4&X>R+F{
zrhitspGQ{8v)jkz1P`j{AOIYi8@1@q{mfkQQC#PVB9p_}p2xalk6=O>kI(8FEY}NI
z4@KDuMWZCFbsHRo!utb=T5DJi=Nu=Vc1@=L=?kq$LIulW0>W$$(c@cd;~|ji0XSdp
zR{`>+0ER%cC?jqA=xA$(R)~!$>_u=ooczhnpCe&@1&QdQ$!<OJkx+1>kJM;z-5do)
zPJekie3a|UT-F8`u%@YyoqBGpgFmU67FO2YH~OoGy7?<2j2U-@Fo*cDKT1mZbA9Z?
zt)?0YiK>vWS9|+8{E|eiLSdk~PBWlP&f47EIX3NA#So)gpBFWp?W)n}_`!meIsZm)
z42xJ(6C8ScLDw_jZxr|oBi1gW{H)T8f6NPygJ$V+zH@3=VfiA>y=B~wG$scyRTqc9
z7brTAO@|BGg@))3wW^e(>~c}qNQL`V>d%+apliE&<M>t232aH3^G43ZU#v@0pbjE+
zP}P+4PkY&dkzJX953oaOU{}zdPXMPm?A7NxcWh%yftk=UkKA9q@jl_2_bqW-&FlBK
zYtSRSlbP6$DVdwGV0%k7=1Y?VovxM=$)#<8EddMM8yeo<8Dal3N$WJ%@!;%?AhrSC
zP9hC3A+RQ;hCecUt)R%=ZqUU?wO2i4O?S7|kPvJ;C+%|chcrzz>7JOCY|Hj<{j^p>
zL90yS09mwKx0YcHDdgT>*f_omkbsa~WflkUbN><hTh31bz=d!j@r5K^06)dRb}7tG
zd6eUS`{p?kQOO<5h8nX6p8-ak5V|nz5%PZUkS%r<-9K_jkiwNUQ08$oIg$nc6XhKr
zT4BXJ=*0b4QeqsXN*7^HxIwtZ+KCHE$HH`)mGEHqFaq<y1KxMpy2K;#g1M@k{V&5Y
zlA#sWY}(4N-Mlr{{jkgp^QuFvax%`MNm^g{xP8@S$A+N8|6(z~D|01RSwsLZ;vbn-
z@@$uJ0IspS2oG+9_`e4l%o$)`@Tp!rHxMLDZEnax1lRqvuJrPe3TPz$-a66)!<W@4
z|Hn`BkK|G50X}Oy{|z+akn+-Ca`F+5mzr>jvx6fJOki*0V9pJg^F}Obs}Lr(SW@6M
z;RK-z@clMrE<g+fLmYr8i~lk!b4x^kGy~{I4>ATI*#1_81fnA?W66~WLJ)WDbmd@-
zp2Vz0`Aa}vKKe^X&DGdI@PK#p8Mm$^mq0jeY8(~<Jk<1`XB?j3TBORYZcFm@z&jXk
zR6?jR2sMz6q#?yfQQfASAh02B6JyYg;?G2@`hSkxL|_uz3lOmV=Vr-&ZZi9P1G4GY
z;rCO!QwT6mB~cE7g$Xzjw4HhTv=Tv2P5;5588v$)Urf$h^lx7k5rAnsO;0+Uq!k;Q
zbx1}B9P@JP2E-CWlz1`jckB^bJ}w1<!goPWHIQyASXIoA!27FMP?}pZ1-d3IAVfjs
z;E?IKaZ*dbI(jTB7zvmfD?e+OGX(N}!K&O4SWrSD@OAE2EcwXxs4yh!3J&%COJ!Ub
z_CK;B!L4n`IY-sNHRm8t7E9F1h~Xz*w0;a02=%VEC_0r}p)`YGv5SVctB5hQ=-M2(
z^0qbmA1g87Z`fn4^kQJnHH5&jO;cNuqfgVjng;|zAfYa0+dQ(Pj&i4T6sI;Dzh9eo
znGgtRMiLz_O~e{56&AhG3=%m3rL!oCZFfS9XiyOhHVNma8HfCLwSk~<vpddS&7k9^
zSHDyLWMxGYwt~2|3`hG=q}P=>B*UMJ*BVYCQSQ0?ddg!cq2+=21$=PTvoPOX4nrT~
zxDxSJ7s1D8R%x6^nn>LU4QW0V)t6Upg|20|$wKE$&dKcWhlupv{<zt=9Cw(#d&4tv
zU(tm7kzv)yjkNiXd?C_g8fYd?6M|dMy8B9K{6%jjF<AH+=!+(lG@*v~729N)C)J(-
z!6!fX>)J9NA<AS|%ybI`H@Lblb2t?0+GSH7+o&d!cI9;%9=NYH%ATH}sesgpK<9Et
zrcg%u-%FWr(w(>BN;Bqr5iB>NcA;<Phbs=By9aAAg759+JX$PLLi!ZOTlReYTYwHp
zSC#((FP`}wF?a8bDj{#yn%+u$cJu21H;AVGn)JAbtA|a9fk_20O@4nABrxF<?Ga{R
zPGktBIP{bE?`n5&p#YsxCfF^85b*M<nhFf}j3&R@g>9bQYs5_!PGSXC38+<fu45|2
zn0o9FMeBbX&gwxn__xXa4Gu7KC*1XePu_SXY?I+QN=dY59cfD9CRbwwW#+5dx9CE}
zU57@4U<}!?=CjjeOPP^R_^q9^@HIy0<3P{5wnS@`HaN#!T*m?FuQL7u>(#g`amz;Y
zyD*})`>gQ#HH)xW@ehXNt@fcNuKdq!sqDUdB$qT4^rF`8);$5V|AqzRvn|GLi&(g)
zb2YOhyH^r&04_g7AGGf8wF!~Vf<2I%Aq+SApYYjVmg5I-Lx8-@HWjrkOTfF6Yt=Pf
zo2*0-%N(!&RPFm&;`BV|`Vj|*d2fANSrEC0_{v`Y@W>D#VIh;wB5&rvK<JaPBL@jx
zp(L=8v6a3XjPDfVZsC}%T7utt!awmdQz$A8YZ+J8cDkD6esb&%s7ipWjwG&1Tj+wc
zF9?UV(7&NkOY;PKg+zpEv3ht#8T&q-CH7#_IU-|+FWh){M-tgbew-X*4R)dOpx5Xu
z7s{}t0KpcC@94&UxD;-&TM<*7c1tI2-b+P)Y}ygTDx1pqjNlE6(&}!)QO$>=0hTRW
zk=dt|fG3;b#<JTc-Kt^C+as@n-iK6mqNG!xvZ;0!==(4xN2%R#1wkB3Z0)qLb%$us
zcSYe!>^f3{&}Stv%WbtWB3vtDdWknN<#y5&EYhc{a0@vkKO8C7J<m*16W?fZo$XMp
zDBc&6$O#Bv<He+MWIddNdQLaPiGkd^+FbeM*cILv_q2dAHeBXo5>^I~0aK^{yTi5@
z7P+nRW4fTbTgkE@54?GXl~h!insl(N*b3w@PBM@jD}_FW05031r$4Ry0z^2T3=6sf
zKWU9U{i&9&Yixz^B6OG``RnW+L4@6~EHodfjx9)2IuDaJvx=DGOngGQLUuVZGNmw=
z9gQVz!g+|7k<X*eRrwRzgyVGr7$12&9mv_vR+AKk%Hqjau#Kn8a;xD$Dp*^c_nKvE
zaR`P7yi^-K?u(Oo6{j_eSTTK<)xn09Gw-PGBz@ZrE`s(S#vE#1QS7v*c#Vq#Q<s^D
zF&O`QhbBGUbWhje$l+hZ0vWn^m5`r+X~PZh1@B~5WYG_6tsfSv7WEdUKl_XYcz#KX
z6z3lQCcVgGD0z3gWaL?wyfg<;<BFR?Une&4LQl!4;6m|1{F8?Et>fWO3u!|40g;dC
zo9}jxlZ53bB?}t5Al*6Pu|N>PO+-8m;+&(k{BSPuz}&80^GR&1(>~dqt6`oR@+uWc
zoK|N!whLrbqlK@iCDan!ACSe*`8Y!rhyBqtW(OAS<It-$<7q570GjWIs@W5`x34Ea
za9XVy`ulk{xsY-=g+mt_kfTqD#-X9cKI)PjK!mJ+DKFQtWp8Q3ezYAZWi9=zC-h7-
zynq~z)epg8Ut{Fv6WsbjwQtKP5s7*}NM}Q`XNnAbSF^}+9|%)2%cz%jiJ&9sN>>Pw
z597BFZrz33aJoPPmhtZc<GE$OolsFG1kpc}u=w(KD7-IXrKykQGyK0B!U<b#pvIwJ
zTMAz3l?%Tg)@}VFxL&>_pTLIIfrAM5(&C(M2=D1ia|}%B&}DZFSV?YqB!e7bhwBT0
zw)s$mB?Z|h-uZ^h3HzJB0lm<oid^?SLvzvs>L@};EysNLdm}R<K`_;7{qZF~e%5m`
z4Jk@K#n*gAc37}t(&$v-V@FM{(sVZC)dLl>Xm?kV4Tp5Tn$6<s7Gf~4>dRf0*j`z)
zlBxv0@;rM>`zZd#V65f=hn+FL(RXoefWtbxJt5=rbJSvl+iXWWnm}*o^lNzKE2Gi2
zgNfPY*F>#osHqgsV_c?tCPQT?{O|221d40lBgg*yp5ntN;v=PjlR`~3?_w`L9H;Av
zAPp{wnkU3zz@GML7OZ`Uc=XWS*cDAn1CO0NvluwD7~@TjrTFqQHGrEHud@$5=azJN
zXQ9T%NU#?P^m-4E!7PJ6*)(EGPy4ZNd1Jd`a=mB6o0Eb=D|aVlN%3glSG>MZqmPkv
zDJs38*FSiP$nuE7OMB*S+>&dBgHz929_>FV1!&;18z^X66)B;--58g5`;4Yww%`;j
z6*7oy{5_)&-gjSio#OFD3mO8<&gFUL<xfg;pEyQQNd1j*EOBG|?z|`EuW=!5!!um`
zg7zLS5JC06<gnw5T(6mTIN`f|^yS~Tu{S7G=F8($D_<I`;_@_y)t@`IQWbwkmx-XD
zIOvL<>b0Y8N15h(E&|W`AF-}%*DIAQy4e@`SL-Tf!E=`p$xJ0Z)n7tYqJHU|kh`v8
zd61_V$4W}9$We1rF7VTOTl$&jJQiH~YTGUPjnw+Rz>5%<tvPe5Y1Xbm-ecAV!}8w2
zxidFnW5ojJcH9*(cR7{tmhC$47eiY0r9!LSMOx;dPbTy3Zh?;I^ZQbf&Z%NgoIIU#
z$2rX((kaLZ%(}hH-CN{;FIvw?B>+q!YMottKfR($dDqY)B*X02ASWO&bTx@q_DSIp
zY1k}lHX{rCu*A2QB7T?21N0PBU^HQG-n;eIvo}QZ<ck8FxK)6=yrgS#b<$UTrgSLR
z#>NBG8$Gte`#Wag0re&a{_}t&Yym(lx3<4?a=5Q<f)u<d_@tv}yfgn${FCQXF~;e7
z5vHXG>sr&&J)xN8)fXCfxn+2T5_ubp<~R(yu8T`p&yQ?z8^Q5Q;cJW<W_4PE1L1i+
zVhWXQ=TePy@n4@xF)vR^&FB;bz-CVZ=oiTDd=+eDi65(NvK$`_(vDqdhbY}lx39U;
zOZAeLYLr(l&ebaPpriR?ceq2Iia3-eejcs(ZA7f(c`7eOM&-;Ngqk~KXfS7z0{`g9
z#UhO_o%=IQOn{&Bkwv#-dh5=&Vt(~pES>n$_gYdJronH}m4u%kn(E%cMs!}4LN^<4
zGO~KsQ|{f%F=NpUyR<H<dU#-ggai*2zVw@p@~3J3P5Ne7i?m_$2|;VM$AwT{`3mtm
zeTdP_x7tTU<Gb{hk=d>}QS<l-&rUr2Or2V*_jV_3Jqr^aZ)5K4H`duTJJ<Gdev?<y
zVC5bp^?cxru^kS>4Wc}(zx1z84NsT)vtG}lI@sa80qfgoa#Kn7yEMrShI5p^wL9n9
zl-L)l3;mRKhvMR+ytq4iV@{PHwM?dS%y|=&rKY+~NJVZRKQaefYp&KPe#m1VrG>d$
zsgbG+RDWc5IctNuH1_X30^4&;GN`gUkY=08Se_ooDoum9IrG)q`Z|UcYD%r<uCGYJ
z>x}(2A7H|J=FQ%-tt4;Emq}URI0EkT>}j>SYqQCV0#}v3yHox_buGc67Y?YAh2N4W
zk$jwxA!s@{ZAq%me!R+h9);gTm0pmK_OpEVZsK=u`<rs}rnwUP(&U!K@2l+zP0#v%
z5t;=CzIzwAAI7PzH+owubP>+nD>Sp`D(5FyrddObfP_3Rb2%vtT;hw1tBb9x50y7q
zA3l)~FqI9}K~F~VdQWY<kF~~;JTu2<4@Cq6j&4j!6EREV6vA}Q?3T)cSR576j0Dq%
zpgICEii%Zi56~@KiKCVU{|C<y-NJOBqFlUou@G{^LU~7A!lphs%!N%4c(o_-RQDG*
z@EuD2!9bb_&KlQ{D^-vWY==L;D_Z1JOM}24@*Bw-JBi{Y7#2A+S+N3)C_c^}npp4>
zp_8pOJj4fI)IU<`hOk80lYl&s0rT{E)J)g?MD2@E{8iIC%78T-Q-z}sg2(w{0D3JT
zr6pQY4^y<eCiJCvQ;oA?&^#Q^!O9P!XACtV<j}9iVb?i+z6f?A$qc6?tmR7#;|Il!
zT_hYuu?%pq>ox`Vf(xo}T6IAyY+3*_HE=DA3m2elQ@B0xa{`;)w*|ccCj=Bor3kJ5
z3s4pzsM-Y!flERRFO0iFjEp*b$pa`rFa<zu&<w#p6ef3D?DMdOsB{Wo#!D#zQ2~|1
zxm4|yuN<CgzY@h@eD(^W_tm6d6Kz=cKN(4<9}Q}J7S|S6lq)RE{{unWUilCMw$Ed%
zPn(RSbNk*38;_)MgE1Y!%Ln!g0*V-m$EN$pATmsa@gkKI@R_E+o)lNMx5JbezYUVT
zj#qpMTpPtlb$23w!%8no(fi#_x0WL}V896=-RdQTAjK3mrx+Q*`5%ZeN~G~$#|z(Q
zyH!We2)>&=M83I9f$?|S=++Ixn0&=ItG7MMm`G4sAf{(R($NeX(8DMlNX0FWXCEP4
zlOCZk2j}0#=oQCf1pnkiMtYR7VJtI9i$#SIBZP%@$IE}7eZyu1+q>VvWXYEWGl*Ke
z4UYj6@h>0IxG+J8z1=-1d25Rr2ATB<6}nLqW+v$!x-GkIswh6^fC4@UFV3erQ8+}v
zjYyBuKZJb)j6pt711zS5<?#?XI4kwaFnIwhgq+Cx_7!A>&^5z1Q{G@9h!67c@y0nI
zbWZswTzzr`vG`vx%ysJb6=z_NhXEHt*GW9`F=@0KcyY!!XHcU-1Q*bbK26b{Ih?FK
zGQp2Y5O}ZgGfK)wqJuCmLaIc+BPKH;LEP0@vZXsWOnX-r)tka&FqC8S*=aH^U8x_N
zoVLbN@GFO6RY3aQC}F*_`}eao+qXfnyOS~tUFb;kb2$|GNB8}ng`3nv+12y&CVSuI
zlI-NiCTx0d2SG3{Q|5Q6&Sf?p$e@#*ShD(?<3Ay&%g}R+KJO(#6V{`Ule#~Vv8b)m
zw{=ClS7n(fN>t0hm%y;Uv`4xD=bi`lRtF`1t3NS?lq5Sl*_*(wl#8|wbkq9#f#JZg
zqq++)_puAlEAoc02Z5aiE$E`~{7u~e``r_*h9G&J6WXQ6Aq)evwrZS`Yk5s;D-CG;
zvr+Vep{wEJNi=-xPQcXh_(qOa02|MF?nM5Qz6tBGHukW!K-kGUs->QOS<{`OZOI0y
zh3kI8|KBGQ|GuTjgU7|);Aeb(a;0Ywnuqz)gUr!X(@94M;KlR_Fzxm?W{`YKG*xv~
JDwJRm{|DkQwW$CA

diff --git a/crates/gpui/src/platform/linux/blade_belt.rs b/crates/gpui/src/platform/linux/blade_belt.rs
index b0e4be5893..2562097cbb 100644
--- a/crates/gpui/src/platform/linux/blade_belt.rs
+++ b/crates/gpui/src/platform/linux/blade_belt.rs
@@ -75,11 +75,11 @@ impl BladeBelt {
         chunk.into()
     }
 
-    //Note: assuming T: bytemuck::Zeroable
+    //todo!(linux): enforce T: bytemuck::Zeroable
     pub fn alloc_data<T>(&mut self, data: &[T], gpu: &gpu::Context) -> gpu::BufferPiece {
         assert!(!data.is_empty());
         let type_alignment = mem::align_of::<T>() as u64;
-        assert_eq!(
+        debug_assert_eq!(
             self.desc.alignment % type_alignment,
             0,
             "Type alignment {} is too big",
diff --git a/crates/gpui/src/platform/linux/blade_renderer.rs b/crates/gpui/src/platform/linux/blade_renderer.rs
index 492b135cde..128b918ef7 100644
--- a/crates/gpui/src/platform/linux/blade_renderer.rs
+++ b/crates/gpui/src/platform/linux/blade_renderer.rs
@@ -411,7 +411,7 @@ impl BladeRenderer {
                     }
                     PrimitiveBatch::Paths(paths) => {
                         let mut encoder = pass.with(&self.pipelines.paths);
-                        //TODO: group by texture ID
+                        //todo!(linux): group by texture ID
                         for path in paths {
                             let tile = &self.path_tiles[&path.id];
                             let tex_info = self.atlas.get_texture_info(tile.texture_id);
diff --git a/crates/gpui/src/platform/linux/dispatcher.rs b/crates/gpui/src/platform/linux/dispatcher.rs
index 28526d360a..108b8ed354 100644
--- a/crates/gpui/src/platform/linux/dispatcher.rs
+++ b/crates/gpui/src/platform/linux/dispatcher.rs
@@ -90,7 +90,7 @@ impl PlatformDispatcher for LinuxDispatcher {
     fn dispatch_on_main_thread(&self, runnable: Runnable) {
         self.main_sender.send(runnable).unwrap();
         // Send a message to the invisible window, forcing
-        // tha main loop to wake up and dispatch the runnable.
+        // the main loop to wake up and dispatch the runnable.
         self.xcb_connection.send_request(&x::SendEvent {
             propagate: false,
             destination: x::SendEventDest::Window(self.x_listener_window),
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index eae7893054..30d2b66bf0 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -170,14 +170,19 @@ impl Platform for LinuxPlatform {
         self.state.lock().quit_requested = true;
     }
 
+    //todo!(linux)
     fn restart(&self) {}
 
+    //todo!(linux)
     fn activate(&self, ignoring_other_apps: bool) {}
 
+    //todo!(linux)
     fn hide(&self) {}
 
+    //todo!(linux)
     fn hide_other_apps(&self) {}
 
+    //todo!(linux)
     fn unhide_other_apps(&self) {}
 
     fn displays(&self) -> Vec<Rc<dyn PlatformDisplay>> {
@@ -199,6 +204,7 @@ impl Platform for LinuxPlatform {
         )))
     }
 
+    //todo!(linux)
     fn active_window(&self) -> Option<AnyWindowHandle> {
         None
     }
@@ -324,6 +330,7 @@ impl Platform for LinuxPlatform {
         unimplemented!()
     }
 
+    //todo!(linux)
     fn set_menus(&self, menus: Vec<Menu>, keymap: &Keymap) {}
 
     fn local_timezone(&self) -> UtcOffset {
@@ -334,14 +341,16 @@ impl Platform for LinuxPlatform {
         unimplemented!()
     }
 
+    //todo!(linux)
     fn set_cursor_style(&self, style: CursorStyle) {}
 
-    fn should_auto_hide_scrollbars(&self) -> bool {
-        false
-    }
+    //todo!(linux)
+    fn should_auto_hide_scrollbars(&self) -> bool {}
 
+    //todo!(linux)
     fn write_to_clipboard(&self, item: ClipboardItem) {}
 
+    //todo!(linux)
     fn read_from_clipboard(&self) -> Option<ClipboardItem> {
         None
     }
diff --git a/crates/gpui/src/platform/linux/text_system.rs b/crates/gpui/src/platform/linux/text_system.rs
index 187ffb526a..53faa936bc 100644
--- a/crates/gpui/src/platform/linux/text_system.rs
+++ b/crates/gpui/src/platform/linux/text_system.rs
@@ -29,6 +29,7 @@ struct LinuxTextSystemState {
     postscript_names_by_font_id: HashMap<FontId, String>,
 }
 
+// todo!(linux): Double check this
 unsafe impl Send for LinuxTextSystemState {}
 unsafe impl Sync for LinuxTextSystemState {}
 
@@ -54,33 +55,52 @@ impl Default for LinuxTextSystem {
 
 #[allow(unused)]
 impl PlatformTextSystem for LinuxTextSystem {
+    // todo!(linux)
     fn add_fonts(&self, fonts: Vec<Cow<'static, [u8]>>) -> Result<()> {
-        Ok(()) //TODO
+        Ok(())
     }
+
+    // todo!(linux)
     fn all_font_names(&self) -> Vec<String> {
         Vec::new()
     }
+
+    // todo!(linux)
     fn all_font_families(&self) -> Vec<String> {
         Vec::new()
     }
+
+    // todo!(linux)
     fn font_id(&self, descriptor: &Font) -> Result<FontId> {
-        Ok(FontId(0)) //TODO
+        Ok(FontId(0))
     }
+
+    // todo!(linux)
     fn font_metrics(&self, font_id: FontId) -> FontMetrics {
         unimplemented!()
     }
+
+    // todo!(linux)
     fn typographic_bounds(&self, font_id: FontId, glyph_id: GlyphId) -> Result<Bounds<f32>> {
         unimplemented!()
     }
+
+    // todo!(linux)
     fn advance(&self, font_id: FontId, glyph_id: GlyphId) -> Result<Size<f32>> {
         unimplemented!()
     }
+
+    // todo!(linux)
     fn glyph_for_char(&self, font_id: FontId, ch: char) -> Option<GlyphId> {
         None
     }
+
+    // todo!(linux)
     fn glyph_raster_bounds(&self, params: &RenderGlyphParams) -> Result<Bounds<DevicePixels>> {
         unimplemented!()
     }
+
+    // todo!(linux)
     fn rasterize_glyph(
         &self,
         params: &RenderGlyphParams,
@@ -88,9 +108,13 @@ impl PlatformTextSystem for LinuxTextSystem {
     ) -> Result<(Size<DevicePixels>, Vec<u8>)> {
         unimplemented!()
     }
+
+    // todo!(linux)
     fn layout_line(&self, text: &str, font_size: Pixels, runs: &[FontRun]) -> LineLayout {
         LineLayout::default() //TODO
     }
+
+    // todo!(linux)
     fn wrap_line(
         &self,
         text: &str,
diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index 7ac7ebf9b4..9ad02039e8 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -77,6 +77,7 @@ pub(crate) struct LinuxWindowState {
 #[derive(Clone)]
 pub(crate) struct LinuxWindow(pub(crate) Arc<LinuxWindowState>);
 
+//todo!(linux): Remove other RawWindowHandle implementation
 unsafe impl blade_rwh::HasRawWindowHandle for RawWindow {
     fn raw_window_handle(&self) -> blade_rwh::RawWindowHandle {
         let mut wh = blade_rwh::XcbWindowHandle::empty();
@@ -287,10 +288,12 @@ impl PlatformWindow for LinuxWindow {
         self.0.inner.lock().scale_factor
     }
 
+    //todo!(linux)
     fn titlebar_height(&self) -> Pixels {
         unimplemented!()
     }
 
+    //todo!(linux)
     fn appearance(&self) -> WindowAppearance {
         unimplemented!()
     }
@@ -299,10 +302,12 @@ impl PlatformWindow for LinuxWindow {
         Rc::clone(&self.0.display)
     }
 
+    //todo!(linux)
     fn mouse_position(&self) -> Point<Pixels> {
         Point::default()
     }
 
+    //todo!(linux)
     fn modifiers(&self) -> crate::Modifiers {
         crate::Modifiers::default()
     }
@@ -311,12 +316,15 @@ impl PlatformWindow for LinuxWindow {
         self
     }
 
+    //todo!(linux)
     fn set_input_handler(&mut self, input_handler: PlatformInputHandler) {}
 
+    //todo!(linux)
     fn take_input_handler(&mut self) -> Option<PlatformInputHandler> {
         None
     }
 
+    //todo!(linux)
     fn prompt(
         &self,
         _level: crate::PromptLevel,
@@ -327,24 +335,36 @@ impl PlatformWindow for LinuxWindow {
         unimplemented!()
     }
 
+    //todo!(linux)
     fn activate(&self) {}
 
+    //todo!(linux)
     fn set_title(&mut self, title: &str) {}
 
+    //todo!(linux)
     fn set_edited(&mut self, edited: bool) {}
 
+    //todo!(linux), this corresponds to `orderFrontCharacterPalette` on macOS,
+    // but it looks like the equivalent for Linux is GTK specific:
+    //
+    // https://docs.gtk.org/gtk3/signal.Entry.insert-emoji.html
+    //
+    // This API might need to change, or we might need to build an emoji picker into GPUI
     fn show_character_palette(&self) {
         unimplemented!()
     }
 
+    //todo!(linux)
     fn minimize(&self) {
         unimplemented!()
     }
 
+    //todo!(linux)
     fn zoom(&self) {
         unimplemented!()
     }
 
+    //todo!(linux)
     fn toggle_full_screen(&self) {
         unimplemented!()
     }
@@ -385,10 +405,12 @@ impl PlatformWindow for LinuxWindow {
         self.0.callbacks.lock().appearance_changed = Some(callback);
     }
 
+    //todo!(linux)
     fn is_topmost_for_position(&self, _position: crate::Point<Pixels>) -> bool {
         unimplemented!()
     }
 
+    //todo!(linux)
     fn invalidate(&self) {}
 
     fn draw(&self, scene: &crate::Scene) {
diff --git a/crates/gpui/src/platform/test/platform.rs b/crates/gpui/src/platform/test/platform.rs
index 464e38b0c4..7052377a00 100644
--- a/crates/gpui/src/platform/test/platform.rs
+++ b/crates/gpui/src/platform/test/platform.rs
@@ -118,7 +118,11 @@ impl Platform for TestPlatform {
     }
 
     fn text_system(&self) -> Arc<dyn PlatformTextSystem> {
-        Arc::new(TestTextSystem {})
+        #[cfg(target_os = "linux")]
+        return Arc::new(TestTextSystem {});
+
+        #[cfg(target_os = "macos")]
+        return Arc::new(crate::platform::mac::MacTextSystem::new());
     }
 
     fn run(&self, _on_finish_launching: Box<dyn FnOnce()>) {
diff --git a/crates/gpui/src/platform/test/text_system.rs b/crates/gpui/src/platform/test/text_system.rs
index d7847f1012..0e877aabbd 100644
--- a/crates/gpui/src/platform/test/text_system.rs
+++ b/crates/gpui/src/platform/test/text_system.rs
@@ -7,6 +7,7 @@ use std::borrow::Cow;
 
 pub(crate) struct TestTextSystem {}
 
+//todo!(linux)
 #[allow(unused)]
 impl PlatformTextSystem for TestTextSystem {
     fn add_fonts(&self, fonts: Vec<Cow<'static, [u8]>>) -> Result<()> {
diff --git a/crates/project/src/terminals.rs b/crates/project/src/terminals.rs
index 8c5156f3cb..e125af052d 100644
--- a/crates/project/src/terminals.rs
+++ b/crates/project/src/terminals.rs
@@ -7,8 +7,8 @@ use terminal::{
     Terminal, TerminalBuilder,
 };
 
-#[cfg(target_os = "macos")]
-use std::os::unix::ffi::OsStrExt;
+// #[cfg(target_os = "macos")]
+// use std::os::unix::ffi::OsStrExt;
 
 pub struct Terminals {
     pub(crate) local_handles: Vec<WeakModel<terminal::Terminal>>,
diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index 0448cb8ec6..e191ff1b66 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -280,7 +280,8 @@ pub fn init(
         ],
     );
 
-    /// Produces a link error on linux due to duplicated `state_new` symbol
+    // Produces a link error on linux due to duplicated `state_new` symbol
+    // todo!(linux): Restore purescript
     #[cfg(not(target_os = "linux"))]
     language(
         "purescript",
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 73acfdef34..c291773e4a 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -257,7 +257,7 @@ fn main() {
         initialize_workspace(app_state.clone(), cx);
 
         if stdout_is_a_pty() {
-            //TODO: unblock this
+            //todo!(linux): unblock this
             #[cfg(not(target_os = "linux"))]
             upload_panics_and_crashes(http.clone(), cx);
             cx.activate(true);
@@ -919,6 +919,7 @@ fn load_user_themes_in_background(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {
     .detach();
 }
 
+//todo!(linux): Port fsevents to linux
 /// Spawns a background task to watch the themes directory for changes.
 #[cfg(target_os = "macos")]
 fn watch_themes(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {

From 6b598a07d95ed65e88bd55e586977a5cac058d29 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <53836821+bennetbo@users.noreply.github.com>
Date: Wed, 7 Feb 2024 20:48:33 +0100
Subject: [PATCH 298/372] chat: fix autocompletion for usernames with dash
 (#7514)

Github usernames are allowed to contain `-`, but the autocompletion was
not working correctly.
We added `-` as an allowed character for markdown files. We are not
aware of any completions for markdown files, so this should be fine to
add.


Before:

![image](https://github.com/zed-industries/zed/assets/53836821/5b456ed6-3098-48e8-90db-f5f42b4aa535)

After:

![image](https://github.com/zed-industries/zed/assets/53836821/a544f465-0b68-46f5-9a15-83b4c755c3c0)


Release Notes:

- Fixed autocompletion for usernames with dash character in the chat
message editor

Co-authored-by: Remco Smits <62463826+RemcoSmitsDev@users.noreply.github.com>
---
 crates/zed/src/languages/markdown/config.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/zed/src/languages/markdown/config.toml b/crates/zed/src/languages/markdown/config.toml
index 2fa3ff3cf2..98691a4ef7 100644
--- a/crates/zed/src/languages/markdown/config.toml
+++ b/crates/zed/src/languages/markdown/config.toml
@@ -1,5 +1,6 @@
 name = "Markdown"
 path_suffixes = ["md", "mdx"]
+word_characters = ["-"]
 brackets = [
     { start = "{", end = "}", close = true, newline = true },
     { start = "[", end = "]", close = true, newline = true },

From f507698c62422752a56dd2b75d07b961ee98088a Mon Sep 17 00:00:00 2001
From: Mikayla <mikayla@zed.dev>
Date: Wed, 7 Feb 2024 11:59:52 -0800
Subject: [PATCH 299/372] Fix a few out of date warnings

---
 crates/gpui/src/platform/test.rs          | 1 +
 crates/gpui/src/platform/test/platform.rs | 6 +++---
 crates/live_kit_client/src/test.rs        | 3 +--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crates/gpui/src/platform/test.rs b/crates/gpui/src/platform/test.rs
index 6cd833b681..3b08985737 100644
--- a/crates/gpui/src/platform/test.rs
+++ b/crates/gpui/src/platform/test.rs
@@ -7,5 +7,6 @@ mod window;
 pub(crate) use dispatcher::*;
 pub(crate) use display::*;
 pub(crate) use platform::*;
+#[cfg(not(target_os = "macos"))]
 pub(crate) use text_system::*;
 pub(crate) use window::*;
diff --git a/crates/gpui/src/platform/test/platform.rs b/crates/gpui/src/platform/test/platform.rs
index 942211d577..6a17c731d6 100644
--- a/crates/gpui/src/platform/test/platform.rs
+++ b/crates/gpui/src/platform/test/platform.rs
@@ -1,7 +1,7 @@
 use crate::{
     AnyWindowHandle, BackgroundExecutor, ClipboardItem, CursorStyle, DisplayId, ForegroundExecutor,
-    Keymap, Platform, PlatformDisplay, PlatformTextSystem, Task, TestDisplay, TestTextSystem,
-    TestWindow, WindowOptions,
+    Keymap, Platform, PlatformDisplay, PlatformTextSystem, Task, TestDisplay, TestWindow,
+    WindowAppearance, WindowOptions,
 };
 use anyhow::{anyhow, Result};
 use collections::VecDeque;
@@ -121,7 +121,7 @@ impl Platform for TestPlatform {
 
     fn text_system(&self) -> Arc<dyn PlatformTextSystem> {
         #[cfg(target_os = "linux")]
-        return Arc::new(TestTextSystem {});
+        return Arc::new(crate::platform::test::TestTextSystem {});
 
         #[cfg(target_os = "macos")]
         return Arc::new(crate::platform::mac::MacTextSystem::new());
diff --git a/crates/live_kit_client/src/test.rs b/crates/live_kit_client/src/test.rs
index aa2c91febb..677370c0b8 100644
--- a/crates/live_kit_client/src/test.rs
+++ b/crates/live_kit_client/src/test.rs
@@ -5,8 +5,7 @@ use collections::{BTreeMap, HashMap, HashSet};
 use futures::Stream;
 use gpui::{BackgroundExecutor, ImageSource};
 use live_kit_server::{proto, token};
-#[cfg(target_os = "macos")]
-use media::core_video::CVImageBuffer;
+
 use parking_lot::Mutex;
 use postage::watch;
 use std::{

From be455f7f283d16e89ab559407c087c4ffa820578 Mon Sep 17 00:00:00 2001
From: Mikayla <mikayla@zed.dev>
Date: Wed, 7 Feb 2024 12:04:29 -0800
Subject: [PATCH 300/372] Restore nanoid dependency

---
 crates/live_kit_client/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/live_kit_client/Cargo.toml b/crates/live_kit_client/Cargo.toml
index 956240215c..f6ae36c935 100644
--- a/crates/live_kit_client/Cargo.toml
+++ b/crates/live_kit_client/Cargo.toml
@@ -19,7 +19,7 @@ test-support = [
     "collections/test-support",
     "gpui/test-support",
     "live_kit_server",
-    #"nanoid",
+    "nanoid",
 ]
 
 [dependencies]

From ef8cab65b039d7bf8c1c8005302c394cbf8fdffe Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <53836821+bennetbo@users.noreply.github.com>
Date: Wed, 7 Feb 2024 21:14:36 +0100
Subject: [PATCH 301/372] allow closing reply to preview with action

Co-Authored-By: Remco Smits <62463826+RemcoSmitsDev@users.noreply.github.com>
---
 assets/keymaps/default.json        |  6 ++++++
 crates/collab_ui/src/chat_panel.rs | 23 ++++++++++++++++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/assets/keymaps/default.json b/assets/keymaps/default.json
index 06358dab22..6e2b96b338 100644
--- a/assets/keymaps/default.json
+++ b/assets/keymaps/default.json
@@ -565,6 +565,12 @@
       "tab": "channel_modal::ToggleMode"
     }
   },
+  {
+    "context": "ChatPanel > MessageEditor",
+    "bindings": {
+      "escape": "chat_panel::CloseReplyPreview"
+    }
+  },
   {
     "context": "Terminal",
     "bindings": {
diff --git a/crates/collab_ui/src/chat_panel.rs b/crates/collab_ui/src/chat_panel.rs
index 9a751335fa..999f02f2e0 100644
--- a/crates/collab_ui/src/chat_panel.rs
+++ b/crates/collab_ui/src/chat_panel.rs
@@ -70,7 +70,7 @@ struct SerializedChatPanel {
     width: Option<Pixels>,
 }
 
-actions!(chat_panel, [ToggleFocus]);
+actions!(chat_panel, [ToggleFocus, CloseReplyPreview]);
 
 impl ChatPanel {
     pub fn new(workspace: &mut Workspace, cx: &mut ViewContext<Workspace>) -> View<Self> {
@@ -719,6 +719,11 @@ impl ChatPanel {
             Ok(())
         })
     }
+
+    fn close_reply_preview(&mut self, _: &CloseReplyPreview, cx: &mut ViewContext<Self>) {
+        self.message_editor
+            .update(cx, |editor, _| editor.clear_reply_to_message_id());
+    }
 }
 
 impl Render for ChatPanel {
@@ -726,6 +731,7 @@ impl Render for ChatPanel {
         let reply_to_message_id = self.message_editor.read(cx).reply_to_message_id();
 
         v_flex()
+            .key_context("ChatPanel")
             .track_focus(&self.focus_handle)
             .full()
             .on_action(cx.listener(Self::send))
@@ -810,10 +816,15 @@ impl Render for ChatPanel {
                             .child(
                                 IconButton::new("close-reply-preview", IconName::Close)
                                     .shape(ui::IconButtonShape::Square)
-                                    .on_click(cx.listener(move |this, _, cx| {
-                                        this.message_editor.update(cx, |editor, _| {
-                                            editor.clear_reply_to_message_id()
-                                        });
+                                    .tooltip(|cx| {
+                                        Tooltip::for_action(
+                                            "Close reply preview",
+                                            &CloseReplyPreview,
+                                            cx,
+                                        )
+                                    })
+                                    .on_click(cx.listener(move |_, _, cx| {
+                                        cx.dispatch_action(CloseReplyPreview.boxed_clone())
                                     })),
                             ),
                     )
@@ -822,6 +833,8 @@ impl Render for ChatPanel {
             .children(
                 Some(
                     h_flex()
+                        .key_context("MessageEditor")
+                        .on_action(cx.listener(ChatPanel::close_reply_preview))
                         .when(
                             !self.is_scrolled_to_bottom && reply_to_message_id.is_none(),
                             |el| el.border_t_1().border_color(cx.theme().colors().border),

From 6edeea7c8a3bdbcaaafa38e4740de0ac6927d6fb Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Wed, 7 Feb 2024 12:14:50 -0800
Subject: [PATCH 302/372] Add logic for managing language and theme extensions
 (#7467)

This PR adds the initial support for loading extensions in Zed.

### Extensions Directory

Extensions are loaded from the extensions directory.

The extensions directory has the following structure:

```
extensions/
  installed/
    extension-a/
      grammars/
      languages/
    extension-b/
      themes/
  manifest.json
```

The `manifest.json` file is used internally by Zed to keep track of
which extensions are installed. This file should be maintained
automatically, and shouldn't require any direct interaction with it.

Extensions can provide Tree-sitter grammars, languages, and themes.

Release Notes:

- N/A

---------

Co-authored-by: Marshall <marshall@zed.dev>
---
 Cargo.lock                                    |  20 +
 Cargo.toml                                    |   5 +-
 crates/assistant/src/codegen.rs               |   8 +-
 crates/assistant/src/prompts.rs               |  12 +-
 crates/collab/src/tests/editor_tests.rs       |  42 ++-
 crates/collab/src/tests/integration_tests.rs  |  62 +++-
 .../random_project_collaboration_tests.rs     |   9 +-
 crates/editor/src/display_map.rs              |  17 +-
 crates/editor/src/editor_tests.rs             |  38 +-
 .../editor/src/highlight_matching_bracket.rs  |   7 +-
 crates/editor/src/inlay_hint_cache.rs         |  32 +-
 .../src/test/editor_lsp_test_context.rs       |  14 +-
 crates/extension/Cargo.toml                   |  28 ++
 crates/extension/LICENSE-GPL                  |   1 +
 crates/extension/src/extension_store.rs       | 344 +++++++++++++++++
 crates/extension/src/extension_store_test.rs  | 295 +++++++++++++++
 crates/gpui/src/shared_string.rs              |   2 +-
 crates/language/Cargo.toml                    |   1 +
 crates/language/src/buffer_tests.rs           |  30 +-
 crates/language/src/language.rs               | 346 ++++++++++++++----
 .../src/syntax_map/syntax_map_tests.rs        |  37 +-
 crates/language_tools/src/lsp_log_tests.rs    |   9 +-
 crates/project/src/project_tests.rs           |  90 ++++-
 crates/project_symbols/src/project_symbols.rs |   7 +-
 .../src/semantic_index_tests.rs               |  47 ++-
 crates/theme/src/registry.rs                  |  14 +-
 crates/util/src/arc_cow.rs                    |  13 +
 crates/util/src/paths.rs                      |   2 +-
 crates/zed/Cargo.toml                         |   1 +
 crates/zed/src/languages.rs                   | 279 +++++---------
 crates/zed/src/languages/bash/config.toml     |   1 +
 .../zed/src/languages/beancount/config.toml   |   1 +
 crates/zed/src/languages/c/config.toml        |   1 +
 crates/zed/src/languages/cpp/config.toml      |   1 +
 crates/zed/src/languages/csharp/config.toml   |   1 +
 crates/zed/src/languages/css/config.toml      |   1 +
 crates/zed/src/languages/elixir/config.toml   |   1 +
 crates/zed/src/languages/elm/config.toml      |   1 +
 crates/zed/src/languages/erb/config.toml      |   1 +
 crates/zed/src/languages/erlang/config.toml   |   1 +
 .../zed/src/languages/gitcommit/config.toml   |   1 +
 crates/zed/src/languages/gleam/config.toml    |   1 +
 crates/zed/src/languages/glsl/config.toml     |   1 +
 crates/zed/src/languages/go/config.toml       |   1 +
 crates/zed/src/languages/gomod/config.toml    |   1 +
 crates/zed/src/languages/gowork/config.toml   |   1 +
 crates/zed/src/languages/haskell/config.toml  |   1 +
 crates/zed/src/languages/hcl/config.toml      |   1 +
 crates/zed/src/languages/heex/config.toml     |   1 +
 crates/zed/src/languages/html/config.toml     |   1 +
 .../zed/src/languages/javascript/config.toml  |   1 +
 crates/zed/src/languages/json/config.toml     |   1 +
 crates/zed/src/languages/lua/config.toml      |   1 +
 crates/zed/src/languages/markdown/config.toml |   1 +
 crates/zed/src/languages/nix/config.toml      |   1 +
 crates/zed/src/languages/nu/config.toml       |   1 +
 .../src/languages/ocaml-interface/config.toml |   3 +-
 crates/zed/src/languages/ocaml/config.toml    |   3 +-
 crates/zed/src/languages/php/config.toml      |   1 +
 crates/zed/src/languages/proto/config.toml    |   1 +
 .../zed/src/languages/purescript/config.toml  |   1 +
 crates/zed/src/languages/python/config.toml   |   1 +
 crates/zed/src/languages/racket/config.toml   |   1 +
 crates/zed/src/languages/ruby/config.toml     |   1 +
 crates/zed/src/languages/rust/config.toml     |   1 +
 crates/zed/src/languages/scheme/config.toml   |   1 +
 crates/zed/src/languages/svelte/config.toml   |   1 +
 .../zed/src/languages/terraform/config.toml   |   1 +
 crates/zed/src/languages/toml/config.toml     |   1 +
 crates/zed/src/languages/tsx/config.toml      |   1 +
 .../zed/src/languages/typescript/config.toml  |   1 +
 crates/zed/src/languages/uiua/config.toml     |   1 +
 crates/zed/src/languages/vue/config.toml      |   1 +
 crates/zed/src/languages/yaml/config.toml     |   1 +
 crates/zed/src/languages/zig/config.toml      |   1 +
 crates/zed/src/main.rs                        |  22 +-
 crates/zed/src/zed.rs                         |   7 +-
 77 files changed, 1503 insertions(+), 387 deletions(-)
 create mode 100644 crates/extension/Cargo.toml
 create mode 120000 crates/extension/LICENSE-GPL
 create mode 100644 crates/extension/src/extension_store.rs
 create mode 100644 crates/extension/src/extension_store_test.rs

diff --git a/Cargo.lock b/Cargo.lock
index 04f18936cd..2bbc846044 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2559,6 +2559,24 @@ version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
+[[package]]
+name = "extension"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "collections",
+ "fs",
+ "futures 0.3.28",
+ "gpui",
+ "language",
+ "parking_lot 0.11.2",
+ "serde",
+ "serde_json",
+ "theme",
+ "toml",
+ "util",
+]
+
 [[package]]
 name = "fallible-iterator"
 version = "0.2.0"
@@ -3969,6 +3987,7 @@ dependencies = [
  "sum_tree",
  "text",
  "theme",
+ "toml",
  "tree-sitter",
  "tree-sitter-elixir",
  "tree-sitter-embedded-template",
@@ -10327,6 +10346,7 @@ dependencies = [
  "diagnostics",
  "editor",
  "env_logger",
+ "extension",
  "feature_flags",
  "feedback",
  "file_finder",
diff --git a/Cargo.toml b/Cargo.toml
index 4587e947c6..c7e40436f4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,6 +21,7 @@ members = [
     "crates/db",
     "crates/diagnostics",
     "crates/editor",
+    "crates/extension",
     "crates/feature_flags",
     "crates/feedback",
     "crates/file_finder",
@@ -30,12 +31,9 @@ members = [
     "crates/git",
     "crates/go_to_line",
     "crates/gpui",
-    "crates/gpui",
-    "crates/gpui_macros",
     "crates/gpui_macros",
     "crates/install_cli",
     "crates/journal",
-    "crates/journal",
     "crates/language",
     "crates/language_selector",
     "crates/language_tools",
@@ -114,6 +112,7 @@ copilot_ui = { path = "crates/copilot_ui" }
 db = { path = "crates/db" }
 diagnostics = { path = "crates/diagnostics" }
 editor = { path = "crates/editor" }
+extension = { path = "crates/extension" }
 feature_flags = { path = "crates/feature_flags" }
 feedback = { path = "crates/feedback" }
 file_finder = { path = "crates/file_finder" }
diff --git a/crates/assistant/src/codegen.rs b/crates/assistant/src/codegen.rs
index d592ce88ae..c1a663d7ef 100644
--- a/crates/assistant/src/codegen.rs
+++ b/crates/assistant/src/codegen.rs
@@ -366,7 +366,8 @@ mod tests {
     use gpui::{Context, TestAppContext};
     use indoc::indoc;
     use language::{
-        language_settings, tree_sitter_rust, Buffer, BufferId, Language, LanguageConfig, Point,
+        language_settings, tree_sitter_rust, Buffer, BufferId, Language, LanguageConfig,
+        LanguageMatcher, Point,
     };
     use rand::prelude::*;
     use serde::Serialize;
@@ -675,7 +676,10 @@ mod tests {
         Language::new(
             LanguageConfig {
                 name: "Rust".into(),
-                path_suffixes: vec!["rs".to_string()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
             Some(tree_sitter_rust::language()),
diff --git a/crates/assistant/src/prompts.rs b/crates/assistant/src/prompts.rs
index 9042fda5be..f40a841f4c 100644
--- a/crates/assistant/src/prompts.rs
+++ b/crates/assistant/src/prompts.rs
@@ -172,22 +172,24 @@ pub fn generate_content_prompt(
 
 #[cfg(test)]
 pub(crate) mod tests {
-
     use super::*;
-    use std::sync::Arc;
-
     use gpui::{AppContext, Context};
     use indoc::indoc;
     use language::{
-        language_settings, tree_sitter_rust, Buffer, BufferId, Language, LanguageConfig, Point,
+        language_settings, tree_sitter_rust, Buffer, BufferId, Language, LanguageConfig,
+        LanguageMatcher, Point,
     };
     use settings::SettingsStore;
+    use std::sync::Arc;
 
     pub(crate) fn rust_lang() -> Language {
         Language::new(
             LanguageConfig {
                 name: "Rust".into(),
-                path_suffixes: vec!["rs".to_string()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
             Some(tree_sitter_rust::language()),
diff --git a/crates/collab/src/tests/editor_tests.rs b/crates/collab/src/tests/editor_tests.rs
index 0e11ec1684..458f347efb 100644
--- a/crates/collab/src/tests/editor_tests.rs
+++ b/crates/collab/src/tests/editor_tests.rs
@@ -19,7 +19,7 @@ use gpui::{TestAppContext, VisualContext, VisualTestContext};
 use indoc::indoc;
 use language::{
     language_settings::{AllLanguageSettings, InlayHintSettings},
-    tree_sitter_rust, FakeLspAdapter, Language, LanguageConfig,
+    tree_sitter_rust, FakeLspAdapter, Language, LanguageConfig, LanguageMatcher,
 };
 use rpc::RECEIVE_TIMEOUT;
 use serde_json::json;
@@ -269,7 +269,10 @@ async fn test_collaborating_with_completion(cx_a: &mut TestAppContext, cx_b: &mu
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -455,7 +458,10 @@ async fn test_collaborating_with_code_actions(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -668,7 +674,10 @@ async fn test_collaborating_with_renames(cx_a: &mut TestAppContext, cx_b: &mut T
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -853,7 +862,10 @@ async fn test_language_server_statuses(cx_a: &mut TestAppContext, cx_b: &mut Tes
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -1144,7 +1156,10 @@ async fn test_on_input_format_from_host_to_guest(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -1272,7 +1287,10 @@ async fn test_on_input_format_from_guest_to_host(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -1431,7 +1449,10 @@ async fn test_mutual_editor_inlay_hint_cache_update(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -1697,7 +1718,10 @@ async fn test_inlay_hint_refresh_is_forwarded(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
diff --git a/crates/collab/src/tests/integration_tests.rs b/crates/collab/src/tests/integration_tests.rs
index eb0beb6f66..746f5aeeaf 100644
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -14,7 +14,7 @@ use gpui::{
 use language::{
     language_settings::{AllLanguageSettings, Formatter},
     tree_sitter_rust, Diagnostic, DiagnosticEntry, FakeLspAdapter, Language, LanguageConfig,
-    LineEnding, OffsetRangeExt, Point, Rope,
+    LanguageMatcher, LineEnding, OffsetRangeExt, Point, Rope,
 };
 use live_kit_client::MacOSDisplay;
 use lsp::LanguageServerId;
@@ -2246,7 +2246,10 @@ async fn test_propagate_saves_and_fs_changes(
     let rust = Arc::new(Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -2254,7 +2257,10 @@ async fn test_propagate_saves_and_fs_changes(
     let javascript = Arc::new(Language::new(
         LanguageConfig {
             name: "JavaScript".into(),
-            path_suffixes: vec!["js".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["js".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -3783,7 +3789,10 @@ async fn test_collaborating_with_diagnostics(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -4061,7 +4070,10 @@ async fn test_collaborating_with_lsp_progress_updates_and_diagnostics_ordering(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -4290,7 +4302,10 @@ async fn test_formatting_buffer(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -4395,7 +4410,10 @@ async fn test_prettier_formatting_buffer(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             prettier_parser_name: Some("test_parser".to_string()),
             ..Default::default()
         },
@@ -4511,7 +4529,10 @@ async fn test_definition(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -4655,7 +4676,10 @@ async fn test_references(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -4852,7 +4876,10 @@ async fn test_document_highlights(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -4955,7 +4982,10 @@ async fn test_lsp_hover(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -5051,7 +5081,10 @@ async fn test_project_symbols(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -5160,7 +5193,10 @@ async fn test_open_buffer_while_getting_definition_pointing_to_it(
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
diff --git a/crates/collab/src/tests/random_project_collaboration_tests.rs b/crates/collab/src/tests/random_project_collaboration_tests.rs
index 53d47eb6b5..37103a3382 100644
--- a/crates/collab/src/tests/random_project_collaboration_tests.rs
+++ b/crates/collab/src/tests/random_project_collaboration_tests.rs
@@ -8,7 +8,9 @@ use editor::Bias;
 use fs::{repository::GitFileStatus, FakeFs, Fs as _};
 use futures::StreamExt;
 use gpui::{BackgroundExecutor, Model, TestAppContext};
-use language::{range_to_lsp, FakeLspAdapter, Language, LanguageConfig, PointUtf16};
+use language::{
+    range_to_lsp, FakeLspAdapter, Language, LanguageConfig, LanguageMatcher, PointUtf16,
+};
 use lsp::FakeLanguageServer;
 use pretty_assertions::assert_eq;
 use project::{search::SearchQuery, Project, ProjectPath};
@@ -1022,7 +1024,10 @@ impl RandomizedTest for ProjectCollaborationTest {
         let mut language = Language::new(
             LanguageConfig {
                 name: "Rust".into(),
-                path_suffixes: vec!["rs".to_string()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
             None,
diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
index 23507eab3e..f975a833c1 100644
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -1003,7 +1003,7 @@ pub mod tests {
     use gpui::{div, font, observe, px, AppContext, Context, Element, Hsla};
     use language::{
         language_settings::{AllLanguageSettings, AllLanguageSettingsContent},
-        Buffer, Language, LanguageConfig, SelectionGoal,
+        Buffer, Language, LanguageConfig, LanguageMatcher, SelectionGoal,
     };
     use project::Project;
     use rand::{prelude::*, Rng};
@@ -1453,7 +1453,10 @@ pub mod tests {
             Language::new(
                 LanguageConfig {
                     name: "Test".into(),
-                    path_suffixes: vec![".test".to_string()],
+                    matcher: LanguageMatcher {
+                        path_suffixes: vec![".test".to_string()],
+                        ..Default::default()
+                    },
                     ..Default::default()
                 },
                 Some(tree_sitter_rust::language()),
@@ -1540,7 +1543,10 @@ pub mod tests {
             Language::new(
                 LanguageConfig {
                     name: "Test".into(),
-                    path_suffixes: vec![".test".to_string()],
+                    matcher: LanguageMatcher {
+                        path_suffixes: vec![".test".to_string()],
+                        ..Default::default()
+                    },
                     ..Default::default()
                 },
                 Some(tree_sitter_rust::language()),
@@ -1608,7 +1614,10 @@ pub mod tests {
             Language::new(
                 LanguageConfig {
                     name: "Test".into(),
-                    path_suffixes: vec![".test".to_string()],
+                    matcher: LanguageMatcher {
+                        path_suffixes: vec![".test".to_string()],
+                        ..Default::default()
+                    },
                     ..Default::default()
                 },
                 Some(tree_sitter_rust::language()),
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 6b23e13d15..865fcb1a5c 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -15,7 +15,8 @@ use language::{
     language_settings::{AllLanguageSettings, AllLanguageSettingsContent, LanguageSettingsContent},
     BracketPairConfig,
     Capability::ReadWrite,
-    FakeLspAdapter, LanguageConfig, LanguageConfigOverride, LanguageRegistry, Override, Point,
+    FakeLspAdapter, LanguageConfig, LanguageConfigOverride, LanguageMatcher, LanguageRegistry,
+    Override, Point,
 };
 use parking_lot::Mutex;
 use project::project_settings::{LspSettings, ProjectSettings};
@@ -5077,7 +5078,10 @@ async fn test_document_format_during_save(cx: &mut gpui::TestAppContext) {
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -5196,7 +5200,10 @@ async fn test_range_format_during_save(cx: &mut gpui::TestAppContext) {
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -5318,7 +5325,10 @@ async fn test_document_format_manual_trigger(cx: &mut gpui::TestAppContext) {
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             // Enable Prettier formatting for the same buffer, and ensure
             // LSP is called instead of Prettier.
             prettier_parser_name: Some("test_parser".to_string()),
@@ -7747,7 +7757,10 @@ async fn test_on_type_formatting_not_triggered(cx: &mut gpui::TestAppContext) {
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             brackets: BracketPairConfig {
                 pairs: vec![BracketPair {
                     start: "{".to_string(),
@@ -7859,7 +7872,10 @@ async fn test_language_server_restart_due_to_settings_change(cx: &mut gpui::Test
     let mut language = Language::new(
         LanguageConfig {
             name: Arc::clone(&language_name),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -8086,7 +8102,10 @@ async fn test_completions_in_languages_with_extra_word_characters(cx: &mut gpui:
     let mut cx = EditorLspTestContext::new(
         Language::new(
             LanguageConfig {
-                path_suffixes: vec!["jsx".into()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["jsx".into()],
+                    ..Default::default()
+                },
                 overrides: [(
                     "element".into(),
                     LanguageConfigOverride {
@@ -8187,7 +8206,10 @@ async fn test_document_format_with_prettier(cx: &mut gpui::TestAppContext) {
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             prettier_parser_name: Some("test_parser".to_string()),
             ..Default::default()
         },
diff --git a/crates/editor/src/highlight_matching_bracket.rs b/crates/editor/src/highlight_matching_bracket.rs
index 1ed7700f37..787be1999e 100644
--- a/crates/editor/src/highlight_matching_bracket.rs
+++ b/crates/editor/src/highlight_matching_bracket.rs
@@ -35,7 +35,7 @@ mod tests {
     use super::*;
     use crate::{editor_tests::init_test, test::editor_lsp_test_context::EditorLspTestContext};
     use indoc::indoc;
-    use language::{BracketPair, BracketPairConfig, Language, LanguageConfig};
+    use language::{BracketPair, BracketPairConfig, Language, LanguageConfig, LanguageMatcher};
 
     #[gpui::test]
     async fn test_matching_bracket_highlights(cx: &mut gpui::TestAppContext) {
@@ -45,7 +45,10 @@ mod tests {
             Language::new(
                 LanguageConfig {
                     name: "Rust".into(),
-                    path_suffixes: vec!["rs".to_string()],
+                    matcher: LanguageMatcher {
+                        path_suffixes: vec!["rs".to_string()],
+                        ..Default::default()
+                    },
                     brackets: BracketPairConfig {
                         pairs: vec![
                             BracketPair {
diff --git a/crates/editor/src/inlay_hint_cache.rs b/crates/editor/src/inlay_hint_cache.rs
index bc90b6face..dc2616c6ef 100644
--- a/crates/editor/src/inlay_hint_cache.rs
+++ b/crates/editor/src/inlay_hint_cache.rs
@@ -1240,7 +1240,7 @@ pub mod tests {
     use itertools::Itertools;
     use language::{
         language_settings::AllLanguageSettingsContent, Capability, FakeLspAdapter, Language,
-        LanguageConfig,
+        LanguageConfig, LanguageMatcher,
     };
     use lsp::FakeLanguageServer;
     use parking_lot::Mutex;
@@ -1529,7 +1529,10 @@ pub mod tests {
             let mut language = Language::new(
                 LanguageConfig {
                     name: name.into(),
-                    path_suffixes: vec![path_suffix.to_string()],
+                    matcher: LanguageMatcher {
+                        path_suffixes: vec![path_suffix.to_string()],
+                        ..Default::default()
+                    },
                     ..Default::default()
                 },
                 Some(tree_sitter_rust::language()),
@@ -2209,7 +2212,10 @@ pub mod tests {
         let mut language = Language::new(
             LanguageConfig {
                 name: "Rust".into(),
-                path_suffixes: vec!["rs".to_string()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
             Some(tree_sitter_rust::language()),
@@ -2500,7 +2506,10 @@ pub mod tests {
         let mut language = Language::new(
             LanguageConfig {
                 name: "Rust".into(),
-                path_suffixes: vec!["rs".to_string()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
             Some(tree_sitter_rust::language()),
@@ -2848,7 +2857,10 @@ pub mod tests {
         let mut language = Language::new(
             LanguageConfig {
                 name: "Rust".into(),
-                path_suffixes: vec!["rs".to_string()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
             Some(tree_sitter_rust::language()),
@@ -3079,7 +3091,10 @@ pub mod tests {
         let mut language = Language::new(
             LanguageConfig {
                 name: "Rust".into(),
-                path_suffixes: vec!["rs".to_string()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
             Some(tree_sitter_rust::language()),
@@ -3319,7 +3334,10 @@ pub mod tests {
         let mut language = Language::new(
             LanguageConfig {
                 name: "Rust".into(),
-                path_suffixes: vec!["rs".to_string()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
             Some(tree_sitter_rust::language()),
diff --git a/crates/editor/src/test/editor_lsp_test_context.rs b/crates/editor/src/test/editor_lsp_test_context.rs
index 70c1699b83..b083e63890 100644
--- a/crates/editor/src/test/editor_lsp_test_context.rs
+++ b/crates/editor/src/test/editor_lsp_test_context.rs
@@ -12,7 +12,9 @@ use collections::HashSet;
 use futures::Future;
 use gpui::{View, ViewContext, VisualTestContext};
 use indoc::indoc;
-use language::{point_to_lsp, FakeLspAdapter, Language, LanguageConfig, LanguageQueries};
+use language::{
+    point_to_lsp, FakeLspAdapter, Language, LanguageConfig, LanguageMatcher, LanguageQueries,
+};
 use lsp::{notification, request};
 use multi_buffer::ToPointUtf16;
 use project::Project;
@@ -115,7 +117,10 @@ impl EditorLspTestContext {
         let language = Language::new(
             LanguageConfig {
                 name: "Rust".into(),
-                path_suffixes: vec!["rs".to_string()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
             Some(tree_sitter_rust::language()),
@@ -160,7 +165,10 @@ impl EditorLspTestContext {
         let language = Language::new(
             LanguageConfig {
                 name: "Typescript".into(),
-                path_suffixes: vec!["ts".to_string()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["ts".to_string()],
+                    ..Default::default()
+                },
                 brackets: language::BracketPairConfig {
                     pairs: vec![language::BracketPair {
                         start: "{".to_string(),
diff --git a/crates/extension/Cargo.toml b/crates/extension/Cargo.toml
new file mode 100644
index 0000000000..092f7b0bec
--- /dev/null
+++ b/crates/extension/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "extension"
+version = "0.1.0"
+edition = "2021"
+publish = false
+license = "GPL-3.0-or-later"
+
+[lib]
+path = "src/extension_store.rs"
+
+[dependencies]
+anyhow.workspace = true
+collections.workspace = true
+fs.workspace = true
+futures.workspace = true
+gpui.workspace = true
+language.workspace = true
+parking_lot.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+theme.workspace = true
+toml.workspace = true
+util.workspace = true
+
+[dev-dependencies]
+fs = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
diff --git a/crates/extension/LICENSE-GPL b/crates/extension/LICENSE-GPL
new file mode 120000
index 0000000000..89e542f750
--- /dev/null
+++ b/crates/extension/LICENSE-GPL
@@ -0,0 +1 @@
+../../LICENSE-GPL
\ No newline at end of file
diff --git a/crates/extension/src/extension_store.rs b/crates/extension/src/extension_store.rs
new file mode 100644
index 0000000000..9b9892641d
--- /dev/null
+++ b/crates/extension/src/extension_store.rs
@@ -0,0 +1,344 @@
+use anyhow::Result;
+use collections::{HashMap, HashSet};
+use fs::Fs;
+use futures::StreamExt as _;
+use gpui::{actions, AppContext, Context, Global, Model, ModelContext, Task};
+use language::{
+    LanguageConfig, LanguageMatcher, LanguageQueries, LanguageRegistry, QUERY_FILENAME_PREFIXES,
+};
+use parking_lot::RwLock;
+use serde::{Deserialize, Serialize};
+use std::{
+    ffi::OsStr,
+    path::{Path, PathBuf},
+    sync::Arc,
+    time::Duration,
+};
+use theme::ThemeRegistry;
+use util::{paths::EXTENSIONS_DIR, ResultExt};
+
+#[cfg(test)]
+mod extension_store_test;
+
+pub struct ExtensionStore {
+    manifest: Arc<RwLock<Manifest>>,
+    fs: Arc<dyn Fs>,
+    extensions_dir: PathBuf,
+    manifest_path: PathBuf,
+    language_registry: Arc<LanguageRegistry>,
+    theme_registry: Arc<ThemeRegistry>,
+    _watch_extensions_dir: Task<()>,
+}
+
+struct GlobalExtensionStore(Model<ExtensionStore>);
+
+impl Global for GlobalExtensionStore {}
+
+#[derive(Deserialize, Serialize, Default)]
+pub struct Manifest {
+    pub grammars: HashMap<String, GrammarManifestEntry>,
+    pub languages: HashMap<Arc<str>, LanguageManifestEntry>,
+    pub themes: HashMap<String, ThemeManifestEntry>,
+}
+
+#[derive(PartialEq, Eq, Debug, PartialOrd, Ord, Deserialize, Serialize)]
+pub struct GrammarManifestEntry {
+    extension: String,
+    path: PathBuf,
+}
+
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Deserialize, Serialize)]
+pub struct LanguageManifestEntry {
+    extension: String,
+    path: PathBuf,
+    matcher: LanguageMatcher,
+}
+
+#[derive(Clone, PartialEq, Debug, Deserialize, Serialize)]
+pub struct ThemeManifestEntry {
+    extension: String,
+    path: PathBuf,
+}
+
+actions!(zed, [ReloadExtensions]);
+
+pub fn init(
+    fs: Arc<fs::RealFs>,
+    language_registry: Arc<LanguageRegistry>,
+    theme_registry: Arc<ThemeRegistry>,
+    cx: &mut AppContext,
+) {
+    let store = cx.new_model(|cx| {
+        ExtensionStore::new(
+            EXTENSIONS_DIR.clone(),
+            fs.clone(),
+            language_registry.clone(),
+            theme_registry,
+            cx,
+        )
+    });
+
+    cx.on_action(|_: &ReloadExtensions, cx| {
+        let store = cx.global::<GlobalExtensionStore>().0.clone();
+        store
+            .update(cx, |store, cx| store.reload(cx))
+            .detach_and_log_err(cx);
+    });
+
+    cx.set_global(GlobalExtensionStore(store));
+}
+
+impl ExtensionStore {
+    pub fn new(
+        extensions_dir: PathBuf,
+        fs: Arc<dyn Fs>,
+        language_registry: Arc<LanguageRegistry>,
+        theme_registry: Arc<ThemeRegistry>,
+        cx: &mut ModelContext<Self>,
+    ) -> Self {
+        let mut this = Self {
+            manifest: Default::default(),
+            extensions_dir: extensions_dir.join("installed"),
+            manifest_path: extensions_dir.join("manifest.json"),
+            fs,
+            language_registry,
+            theme_registry,
+            _watch_extensions_dir: Task::ready(()),
+        };
+        this._watch_extensions_dir = this.watch_extensions_dir(cx);
+        this.load(cx);
+        this
+    }
+
+    pub fn load(&mut self, cx: &mut ModelContext<Self>) {
+        let (manifest_content, manifest_metadata, extensions_metadata) =
+            cx.background_executor().block(async {
+                futures::join!(
+                    self.fs.load(&self.manifest_path),
+                    self.fs.metadata(&self.manifest_path),
+                    self.fs.metadata(&self.extensions_dir),
+                )
+            });
+
+        if let Some(manifest_content) = manifest_content.log_err() {
+            if let Some(manifest) = serde_json::from_str(&manifest_content).log_err() {
+                self.manifest_updated(manifest, cx);
+            }
+        }
+
+        let should_reload = if let (Ok(Some(manifest_metadata)), Ok(Some(extensions_metadata))) =
+            (manifest_metadata, extensions_metadata)
+        {
+            extensions_metadata.mtime > manifest_metadata.mtime
+        } else {
+            true
+        };
+
+        if should_reload {
+            self.reload(cx).detach_and_log_err(cx);
+        }
+    }
+
+    fn manifest_updated(&mut self, manifest: Manifest, cx: &mut ModelContext<Self>) {
+        for (grammar_name, grammar) in &manifest.grammars {
+            let mut grammar_path = self.extensions_dir.clone();
+            grammar_path.extend([grammar.extension.as_ref(), grammar.path.as_path()]);
+            self.language_registry
+                .register_grammar(grammar_name.clone(), grammar_path);
+        }
+        for (language_name, language) in &manifest.languages {
+            let mut language_path = self.extensions_dir.clone();
+            language_path.extend([language.extension.as_ref(), language.path.as_path()]);
+            self.language_registry.register_extension(
+                language_path.into(),
+                language_name.clone(),
+                language.matcher.clone(),
+                load_plugin_queries,
+            );
+        }
+        let fs = self.fs.clone();
+        let root_dir = self.extensions_dir.clone();
+        let theme_registry = self.theme_registry.clone();
+        let themes = manifest.themes.clone();
+        cx.background_executor()
+            .spawn(async move {
+                for theme in themes.values() {
+                    let mut theme_path = root_dir.clone();
+                    theme_path.extend([theme.extension.as_ref(), theme.path.as_path()]);
+
+                    theme_registry
+                        .load_user_theme(&theme_path, fs.clone())
+                        .await
+                        .log_err();
+                }
+            })
+            .detach();
+        *self.manifest.write() = manifest;
+    }
+
+    fn watch_extensions_dir(&self, cx: &mut ModelContext<Self>) -> Task<()> {
+        let manifest = self.manifest.clone();
+        let fs = self.fs.clone();
+        let language_registry = self.language_registry.clone();
+        let extensions_dir = self.extensions_dir.clone();
+        cx.background_executor().spawn(async move {
+            let mut changed_languages = HashSet::default();
+            let mut events = fs.watch(&extensions_dir, Duration::from_millis(250)).await;
+            while let Some(events) = events.next().await {
+                changed_languages.clear();
+                let manifest = manifest.read();
+                for event in events {
+                    for (language_name, language) in &manifest.languages {
+                        let mut language_path = extensions_dir.clone();
+                        language_path
+                            .extend([language.extension.as_ref(), language.path.as_path()]);
+                        if event.path.starts_with(&language_path) || event.path == language_path {
+                            changed_languages.insert(language_name.clone());
+                        }
+                    }
+                }
+                language_registry.reload_languages(&changed_languages);
+            }
+        })
+    }
+
+    pub fn reload(&mut self, cx: &mut ModelContext<Self>) -> Task<Result<()>> {
+        let fs = self.fs.clone();
+        let extensions_dir = self.extensions_dir.clone();
+        let manifest_path = self.manifest_path.clone();
+        cx.spawn(|this, mut cx| async move {
+            let manifest = cx
+                .background_executor()
+                .spawn(async move {
+                    let mut manifest = Manifest::default();
+
+                    let mut extension_paths = fs.read_dir(&extensions_dir).await?;
+                    while let Some(extension_dir) = extension_paths.next().await {
+                        let extension_dir = extension_dir?;
+                        let Some(extension_name) =
+                            extension_dir.file_name().and_then(OsStr::to_str)
+                        else {
+                            continue;
+                        };
+
+                        if let Ok(mut grammar_paths) =
+                            fs.read_dir(&extension_dir.join("grammars")).await
+                        {
+                            while let Some(grammar_path) = grammar_paths.next().await {
+                                let grammar_path = grammar_path?;
+                                let Ok(relative_path) = grammar_path.strip_prefix(&extension_dir)
+                                else {
+                                    continue;
+                                };
+                                let Some(grammar_name) =
+                                    grammar_path.file_stem().and_then(OsStr::to_str)
+                                else {
+                                    continue;
+                                };
+
+                                manifest.grammars.insert(
+                                    grammar_name.into(),
+                                    GrammarManifestEntry {
+                                        extension: extension_name.into(),
+                                        path: relative_path.into(),
+                                    },
+                                );
+                            }
+                        }
+
+                        if let Ok(mut language_paths) =
+                            fs.read_dir(&extension_dir.join("languages")).await
+                        {
+                            while let Some(language_path) = language_paths.next().await {
+                                let language_path = language_path?;
+                                let Ok(relative_path) = language_path.strip_prefix(&extension_dir)
+                                else {
+                                    continue;
+                                };
+                                let config = fs.load(&language_path.join("config.toml")).await?;
+                                let config = ::toml::from_str::<LanguageConfig>(&config)?;
+
+                                manifest.languages.insert(
+                                    config.name.clone(),
+                                    LanguageManifestEntry {
+                                        extension: extension_name.into(),
+                                        path: relative_path.into(),
+                                        matcher: config.matcher,
+                                    },
+                                );
+                            }
+                        }
+
+                        if let Ok(mut theme_paths) =
+                            fs.read_dir(&extension_dir.join("themes")).await
+                        {
+                            while let Some(theme_path) = theme_paths.next().await {
+                                let theme_path = theme_path?;
+                                let Ok(relative_path) = theme_path.strip_prefix(&extension_dir)
+                                else {
+                                    continue;
+                                };
+
+                                let Some(theme_family) =
+                                    ThemeRegistry::read_user_theme(&theme_path, fs.clone())
+                                        .await
+                                        .log_err()
+                                else {
+                                    continue;
+                                };
+
+                                for theme in theme_family.themes {
+                                    let location = ThemeManifestEntry {
+                                        extension: extension_name.into(),
+                                        path: relative_path.into(),
+                                    };
+
+                                    manifest.themes.insert(theme.name, location);
+                                }
+                            }
+                        }
+                    }
+
+                    fs.save(
+                        &manifest_path,
+                        &serde_json::to_string_pretty(&manifest)?.as_str().into(),
+                        Default::default(),
+                    )
+                    .await?;
+
+                    anyhow::Ok(manifest)
+                })
+                .await?;
+            this.update(&mut cx, |this, cx| this.manifest_updated(manifest, cx))
+        })
+    }
+}
+
+fn load_plugin_queries(root_path: &Path) -> LanguageQueries {
+    let mut result = LanguageQueries::default();
+    if let Some(entries) = std::fs::read_dir(root_path).log_err() {
+        for entry in entries {
+            let Some(entry) = entry.log_err() else {
+                continue;
+            };
+            let path = entry.path();
+            if let Some(remainder) = path.strip_prefix(root_path).ok().and_then(|p| p.to_str()) {
+                if !remainder.ends_with(".scm") {
+                    continue;
+                }
+                for (name, query) in QUERY_FILENAME_PREFIXES {
+                    if remainder.starts_with(name) {
+                        if let Some(contents) = std::fs::read_to_string(&path).log_err() {
+                            match query(&mut result) {
+                                None => *query(&mut result) = Some(contents.into()),
+                                Some(r) => r.to_mut().push_str(contents.as_ref()),
+                            }
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    result
+}
diff --git a/crates/extension/src/extension_store_test.rs b/crates/extension/src/extension_store_test.rs
new file mode 100644
index 0000000000..e95496b529
--- /dev/null
+++ b/crates/extension/src/extension_store_test.rs
@@ -0,0 +1,295 @@
+use crate::{
+    ExtensionStore, GrammarManifestEntry, LanguageManifestEntry, Manifest, ThemeManifestEntry,
+};
+use fs::FakeFs;
+use gpui::{Context, TestAppContext};
+use language::{LanguageMatcher, LanguageRegistry};
+use serde_json::json;
+use std::{path::PathBuf, sync::Arc};
+use theme::ThemeRegistry;
+
+#[gpui::test]
+async fn test_extension_store(cx: &mut TestAppContext) {
+    let fs = FakeFs::new(cx.executor());
+
+    fs.insert_tree(
+        "/the-extension-dir",
+        json!({
+            "installed": {
+                "zed-monokai": {
+                    "themes": {
+                        "monokai.json": r#"{
+                            "name": "Monokai",
+                            "author": "Someone",
+                            "themes": [
+                                {
+                                    "name": "Monokai Dark",
+                                    "appearance": "dark",
+                                    "style": {}
+                                },
+                                {
+                                    "name": "Monokai Light",
+                                    "appearance": "light",
+                                    "style": {}
+                                }
+                            ]
+                        }"#,
+                        "monokai-pro.json": r#"{
+                            "name": "Monokai Pro",
+                            "author": "Someone",
+                            "themes": [
+                                {
+                                    "name": "Monokai Pro Dark",
+                                    "appearance": "dark",
+                                    "style": {}
+                                },
+                                {
+                                    "name": "Monokai Pro Light",
+                                    "appearance": "light",
+                                    "style": {}
+                                }
+                            ]
+                        }"#,
+                    }
+                },
+                "zed-ruby": {
+                    "grammars": {
+                        "ruby.wasm": "",
+                        "embedded_template.wasm": "",
+                    },
+                    "languages": {
+                        "ruby": {
+                            "config.toml": r#"
+                                name = "Ruby"
+                                grammar = "ruby"
+                                path_suffixes = ["rb"]
+                            "#,
+                            "highlights.scm": "",
+                        },
+                        "erb": {
+                            "config.toml": r#"
+                                name = "ERB"
+                                grammar = "embedded_template"
+                                path_suffixes = ["erb"]
+                            "#,
+                            "highlights.scm": "",
+                        }
+                    },
+                }
+            }
+        }),
+    )
+    .await;
+
+    let mut expected_manifest = Manifest {
+        grammars: [
+            (
+                "embedded_template".into(),
+                GrammarManifestEntry {
+                    extension: "zed-ruby".into(),
+                    path: "grammars/embedded_template.wasm".into(),
+                },
+            ),
+            (
+                "ruby".into(),
+                GrammarManifestEntry {
+                    extension: "zed-ruby".into(),
+                    path: "grammars/ruby.wasm".into(),
+                },
+            ),
+        ]
+        .into_iter()
+        .collect(),
+        languages: [
+            (
+                "ERB".into(),
+                LanguageManifestEntry {
+                    extension: "zed-ruby".into(),
+                    path: "languages/erb".into(),
+                    matcher: LanguageMatcher {
+                        path_suffixes: vec!["erb".into()],
+                        first_line_pattern: None,
+                    },
+                },
+            ),
+            (
+                "Ruby".into(),
+                LanguageManifestEntry {
+                    extension: "zed-ruby".into(),
+                    path: "languages/ruby".into(),
+                    matcher: LanguageMatcher {
+                        path_suffixes: vec!["rb".into()],
+                        first_line_pattern: None,
+                    },
+                },
+            ),
+        ]
+        .into_iter()
+        .collect(),
+        themes: [
+            (
+                "Monokai Dark".into(),
+                ThemeManifestEntry {
+                    extension: "zed-monokai".into(),
+                    path: "themes/monokai.json".into(),
+                },
+            ),
+            (
+                "Monokai Light".into(),
+                ThemeManifestEntry {
+                    extension: "zed-monokai".into(),
+                    path: "themes/monokai.json".into(),
+                },
+            ),
+            (
+                "Monokai Pro Dark".into(),
+                ThemeManifestEntry {
+                    extension: "zed-monokai".into(),
+                    path: "themes/monokai-pro.json".into(),
+                },
+            ),
+            (
+                "Monokai Pro Light".into(),
+                ThemeManifestEntry {
+                    extension: "zed-monokai".into(),
+                    path: "themes/monokai-pro.json".into(),
+                },
+            ),
+        ]
+        .into_iter()
+        .collect(),
+    };
+
+    let language_registry = Arc::new(LanguageRegistry::test());
+    let theme_registry = Arc::new(ThemeRegistry::new(Box::new(())));
+
+    let store = cx.new_model(|cx| {
+        ExtensionStore::new(
+            PathBuf::from("/the-extension-dir"),
+            fs.clone(),
+            language_registry.clone(),
+            theme_registry.clone(),
+            cx,
+        )
+    });
+
+    cx.executor().run_until_parked();
+    store.read_with(cx, |store, _| {
+        let manifest = store.manifest.read();
+        assert_eq!(manifest.grammars, expected_manifest.grammars);
+        assert_eq!(manifest.languages, expected_manifest.languages);
+        assert_eq!(manifest.themes, expected_manifest.themes);
+
+        assert_eq!(
+            language_registry.language_names(),
+            ["ERB", "Plain Text", "Ruby"]
+        );
+        assert_eq!(
+            theme_registry.list_names(false),
+            [
+                "Monokai Dark",
+                "Monokai Light",
+                "Monokai Pro Dark",
+                "Monokai Pro Light",
+                "One Dark",
+            ]
+        );
+    });
+
+    fs.insert_tree(
+        "/the-extension-dir/installed/zed-gruvbox",
+        json!({
+            "themes": {
+                "gruvbox.json": r#"{
+                    "name": "Gruvbox",
+                    "author": "Someone Else",
+                    "themes": [
+                        {
+                            "name": "Gruvbox",
+                            "appearance": "dark",
+                            "style": {}
+                        }
+                    ]
+                }"#,
+            }
+        }),
+    )
+    .await;
+
+    expected_manifest.themes.insert(
+        "Gruvbox".into(),
+        ThemeManifestEntry {
+            extension: "zed-gruvbox".into(),
+            path: "themes/gruvbox.json".into(),
+        },
+    );
+
+    store
+        .update(cx, |store, cx| store.reload(cx))
+        .await
+        .unwrap();
+
+    cx.executor().run_until_parked();
+    store.read_with(cx, |store, _| {
+        let manifest = store.manifest.read();
+        assert_eq!(manifest.grammars, expected_manifest.grammars);
+        assert_eq!(manifest.languages, expected_manifest.languages);
+        assert_eq!(manifest.themes, expected_manifest.themes);
+
+        assert_eq!(
+            theme_registry.list_names(false),
+            [
+                "Gruvbox",
+                "Monokai Dark",
+                "Monokai Light",
+                "Monokai Pro Dark",
+                "Monokai Pro Light",
+                "One Dark",
+            ]
+        );
+    });
+
+    let prev_fs_metadata_call_count = fs.metadata_call_count();
+    let prev_fs_read_dir_call_count = fs.read_dir_call_count();
+
+    // Create new extension store, as if Zed were restarting.
+    drop(store);
+    let store = cx.new_model(|cx| {
+        ExtensionStore::new(
+            PathBuf::from("/the-extension-dir"),
+            fs.clone(),
+            language_registry.clone(),
+            theme_registry.clone(),
+            cx,
+        )
+    });
+
+    cx.executor().run_until_parked();
+    store.read_with(cx, |store, _| {
+        let manifest = store.manifest.read();
+        assert_eq!(manifest.grammars, expected_manifest.grammars);
+        assert_eq!(manifest.languages, expected_manifest.languages);
+        assert_eq!(manifest.themes, expected_manifest.themes);
+
+        assert_eq!(
+            language_registry.language_names(),
+            ["ERB", "Plain Text", "Ruby"]
+        );
+        assert_eq!(
+            theme_registry.list_names(false),
+            [
+                "Gruvbox",
+                "Monokai Dark",
+                "Monokai Light",
+                "Monokai Pro Dark",
+                "Monokai Pro Light",
+                "One Dark",
+            ]
+        );
+
+        // The on-disk manifest limits the number of FS calls that need to be made
+        // on startup.
+        assert_eq!(fs.read_dir_call_count(), prev_fs_read_dir_call_count);
+        assert_eq!(fs.metadata_call_count(), prev_fs_metadata_call_count + 2);
+    });
+}
diff --git a/crates/gpui/src/shared_string.rs b/crates/gpui/src/shared_string.rs
index 8c12c1c970..1aa1bcae95 100644
--- a/crates/gpui/src/shared_string.rs
+++ b/crates/gpui/src/shared_string.rs
@@ -5,7 +5,7 @@ use util::arc_cow::ArcCow;
 
 /// A shared string is an immutable string that can be cheaply cloned in GPUI
 /// tasks. Essentially an abstraction over an `Arc<str>` and `&'static str`,
-#[derive(Deref, DerefMut, Eq, PartialEq, Hash, Clone)]
+#[derive(Deref, DerefMut, Eq, PartialEq, PartialOrd, Ord, Hash, Clone)]
 pub struct SharedString(ArcCow<'static, str>);
 
 impl Default for SharedString {
diff --git a/crates/language/Cargo.toml b/crates/language/Cargo.toml
index 821fa80840..328327a212 100644
--- a/crates/language/Cargo.toml
+++ b/crates/language/Cargo.toml
@@ -52,6 +52,7 @@ smol.workspace = true
 sum_tree.workspace = true
 text.workspace = true
 theme.workspace = true
+toml.workspace = true
 tree-sitter-rust = { workspace = true, optional = true }
 tree-sitter-typescript = { workspace = true, optional = true }
 pulldown-cmark.workspace = true
diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rs
index 05cec88126..ccbab9d6d1 100644
--- a/crates/language/src/buffer_tests.rs
+++ b/crates/language/src/buffer_tests.rs
@@ -73,7 +73,10 @@ fn test_select_language() {
     registry.add(Arc::new(Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -81,7 +84,10 @@ fn test_select_language() {
     registry.add(Arc::new(Language::new(
         LanguageConfig {
             name: "Make".into(),
-            path_suffixes: vec!["Makefile".to_string(), "mk".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["Makefile".to_string(), "mk".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -2322,7 +2328,10 @@ fn ruby_lang() -> Language {
     Language::new(
         LanguageConfig {
             name: "Ruby".into(),
-            path_suffixes: vec!["rb".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rb".to_string()],
+                ..Default::default()
+            },
             line_comments: vec!["# ".into()],
             ..Default::default()
         },
@@ -2370,7 +2379,10 @@ fn erb_lang() -> Language {
     Language::new(
         LanguageConfig {
             name: "ERB".into(),
-            path_suffixes: vec!["erb".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["erb".to_string()],
+                ..Default::default()
+            },
             block_comment: Some(("<%#".into(), "%>".into())),
             ..Default::default()
         },
@@ -2398,7 +2410,10 @@ fn rust_lang() -> Language {
     Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -2450,7 +2465,10 @@ fn json_lang() -> Language {
     Language::new(
         LanguageConfig {
             name: "Json".into(),
-            path_suffixes: vec!["js".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["js".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_json::language()),
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index 70e85761d2..eee05ea8e2 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -20,7 +20,7 @@ pub mod markdown;
 
 use anyhow::{anyhow, Context, Result};
 use async_trait::async_trait;
-use collections::{HashMap, HashSet};
+use collections::{hash_map, HashMap, HashSet};
 use futures::{
     channel::{mpsc, oneshot},
     future::Shared,
@@ -33,12 +33,13 @@ use lsp::{CodeActionKind, LanguageServerBinary};
 use parking_lot::{Mutex, RwLock};
 use postage::watch;
 use regex::Regex;
-use serde::{de, Deserialize, Deserializer};
+use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use serde_json::Value;
 use std::{
     any::Any,
     borrow::Cow,
     cell::RefCell,
+    ffi::OsStr,
     fmt::Debug,
     hash::Hash,
     mem,
@@ -392,14 +393,13 @@ pub struct LanguageConfig {
     /// Human-readable name of the language.
     pub name: Arc<str>,
     // The name of the grammar in a WASM bundle (experimental).
-    pub grammar_name: Option<Arc<str>>,
-    /// Given a list of `LanguageConfig`'s, the language of a file can be determined based on the path extension matching any of the `path_suffixes`.
-    pub path_suffixes: Vec<String>,
+    pub grammar: Option<Arc<str>>,
+    /// The criteria for matching this language to a given file.
+    #[serde(flatten)]
+    pub matcher: LanguageMatcher,
     /// List of bracket types in a language.
+    #[serde(default)]
     pub brackets: BracketPairConfig,
-    /// A regex pattern that determines whether the language should be assigned to a file or not.
-    #[serde(default, deserialize_with = "deserialize_regex")]
-    pub first_line_pattern: Option<Regex>,
     /// If set to true, auto indentation uses last non empty line to determine
     /// the indentation level for a new line.
     #[serde(default = "auto_indent_using_last_non_empty_line_default")]
@@ -443,6 +443,34 @@ pub struct LanguageConfig {
     pub prettier_parser_name: Option<String>,
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize, Default)]
+pub struct LanguageMatcher {
+    /// Given a list of `LanguageConfig`'s, the language of a file can be determined based on the path extension matching any of the `path_suffixes`.
+    #[serde(default)]
+    pub path_suffixes: Vec<String>,
+    /// A regex pattern that determines whether the language should be assigned to a file or not.
+    #[serde(
+        default,
+        serialize_with = "serialize_regex",
+        deserialize_with = "deserialize_regex"
+    )]
+    pub first_line_pattern: Option<Regex>,
+}
+
+pub const QUERY_FILENAME_PREFIXES: &[(
+    &str,
+    fn(&mut LanguageQueries) -> &mut Option<Cow<'static, str>>,
+)] = &[
+    ("highlights", |q| &mut q.highlights),
+    ("brackets", |q| &mut q.brackets),
+    ("outline", |q| &mut q.outline),
+    ("indents", |q| &mut q.indents),
+    ("embedding", |q| &mut q.embedding),
+    ("injections", |q| &mut q.injections),
+    ("overrides", |q| &mut q.overrides),
+    ("redactions", |q| &mut q.redactions),
+];
+
 /// Tree-sitter language queries for a given language.
 #[derive(Debug, Default)]
 pub struct LanguageQueries {
@@ -506,11 +534,10 @@ impl Default for LanguageConfig {
     fn default() -> Self {
         Self {
             name: "".into(),
-            grammar_name: None,
-            path_suffixes: Default::default(),
+            grammar: None,
+            matcher: LanguageMatcher::default(),
             brackets: Default::default(),
             auto_indent_using_last_non_empty_line: auto_indent_using_last_non_empty_line_default(),
-            first_line_pattern: Default::default(),
             increase_indent_pattern: Default::default(),
             decrease_indent_pattern: Default::default(),
             autoclose_before: Default::default(),
@@ -538,6 +565,16 @@ fn deserialize_regex<'de, D: Deserializer<'de>>(d: D) -> Result<Option<Regex>, D
     }
 }
 
+fn serialize_regex<S>(regex: &Option<Regex>, serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+{
+    match regex {
+        Some(regex) => serializer.serialize_str(regex.as_str()),
+        None => serializer.serialize_none(),
+    }
+}
+
 #[doc(hidden)]
 #[cfg(any(test, feature = "test-support"))]
 pub struct FakeLspAdapter {
@@ -702,22 +739,29 @@ type AvailableLanguageId = usize;
 #[derive(Clone)]
 struct AvailableLanguage {
     id: AvailableLanguageId,
-    config: LanguageConfig,
-    grammar: AvailableGrammar,
+    name: Arc<str>,
+    source: AvailableLanguageSource,
     lsp_adapters: Vec<Arc<dyn LspAdapter>>,
     loaded: bool,
 }
 
-#[derive(Clone)]
 enum AvailableGrammar {
-    Native {
-        grammar: tree_sitter::Language,
+    Loaded(tree_sitter::Language),
+    Loading(Vec<oneshot::Sender<Result<tree_sitter::Language>>>),
+    Unloaded(PathBuf),
+}
+
+#[derive(Clone)]
+enum AvailableLanguageSource {
+    BuiltIn {
         asset_dir: &'static str,
         get_queries: fn(&str) -> LanguageQueries,
+        config: LanguageConfig,
     },
-    Wasm {
+    Extension {
         path: Arc<Path>,
         get_queries: fn(&Path) -> LanguageQueries,
+        matcher: LanguageMatcher,
     },
 }
 
@@ -737,6 +781,7 @@ struct LanguageRegistryState {
     next_language_server_id: usize,
     languages: Vec<Arc<Language>>,
     available_languages: Vec<AvailableLanguage>,
+    grammars: HashMap<String, AvailableGrammar>,
     next_available_language_id: AvailableLanguageId,
     loading_languages: HashMap<AvailableLanguageId, Vec<oneshot::Sender<Result<Arc<Language>>>>>,
     subscription: (watch::Sender<()>, watch::Receiver<()>),
@@ -758,6 +803,7 @@ impl LanguageRegistry {
                 next_language_server_id: 0,
                 languages: vec![PLAIN_TEXT.clone()],
                 available_languages: Default::default(),
+                grammars: Default::default(),
                 next_available_language_id: 0,
                 loading_languages: Default::default(),
                 subscription: watch::channel(),
@@ -787,20 +833,24 @@ impl LanguageRegistry {
         self.state.write().reload();
     }
 
+    /// Clear out the given languages and reload them from scratch.
+    pub fn reload_languages(&self, languages: &HashSet<Arc<str>>) {
+        self.state.write().reload_languages(languages);
+    }
+
     pub fn register(
         &self,
         asset_dir: &'static str,
         config: LanguageConfig,
-        grammar: tree_sitter::Language,
         lsp_adapters: Vec<Arc<dyn LspAdapter>>,
         get_queries: fn(&str) -> LanguageQueries,
     ) {
         let state = &mut *self.state.write();
         state.available_languages.push(AvailableLanguage {
             id: post_inc(&mut state.next_available_language_id),
-            config,
-            grammar: AvailableGrammar::Native {
-                grammar,
+            name: config.name.clone(),
+            source: AvailableLanguageSource::BuiltIn {
+                config,
                 get_queries,
                 asset_dir,
             },
@@ -809,28 +859,63 @@ impl LanguageRegistry {
         });
     }
 
-    pub fn register_wasm(
+    pub fn register_extension(
         &self,
         path: Arc<Path>,
-        config: LanguageConfig,
+        name: Arc<str>,
+        matcher: LanguageMatcher,
         get_queries: fn(&Path) -> LanguageQueries,
     ) {
         let state = &mut *self.state.write();
+        let source = AvailableLanguageSource::Extension {
+            path,
+            get_queries,
+            matcher,
+        };
+        for existing_language in &mut state.available_languages {
+            if existing_language.name == name
+                && matches!(
+                    existing_language.source,
+                    AvailableLanguageSource::Extension { .. }
+                )
+            {
+                existing_language.source = source;
+                return;
+            }
+        }
         state.available_languages.push(AvailableLanguage {
             id: post_inc(&mut state.next_available_language_id),
-            config,
-            grammar: AvailableGrammar::Wasm { path, get_queries },
+            name,
+            source,
             lsp_adapters: Vec::new(),
             loaded: false,
         });
     }
 
+    pub fn add_grammars(
+        &self,
+        grammars: impl IntoIterator<Item = (impl Into<String>, tree_sitter::Language)>,
+    ) {
+        self.state.write().grammars.extend(
+            grammars
+                .into_iter()
+                .map(|(name, grammar)| (name.into(), AvailableGrammar::Loaded(grammar))),
+        );
+    }
+
+    pub fn register_grammar(&self, name: String, path: PathBuf) {
+        self.state
+            .write()
+            .grammars
+            .insert(name, AvailableGrammar::Unloaded(path));
+    }
+
     pub fn language_names(&self) -> Vec<String> {
         let state = self.state.read();
         let mut result = state
             .available_languages
             .iter()
-            .filter_map(|l| l.loaded.not().then_some(l.config.name.to_string()))
+            .filter_map(|l| l.loaded.not().then_some(l.name.to_string()))
             .chain(state.languages.iter().map(|l| l.config.name.to_string()))
             .collect::<Vec<_>>();
         result.sort_unstable_by_key(|language_name| language_name.to_lowercase());
@@ -873,7 +958,7 @@ impl LanguageRegistry {
         name: &str,
     ) -> UnwrapFuture<oneshot::Receiver<Result<Arc<Language>>>> {
         let name = UniCase::new(name);
-        self.get_or_load_language(|config| UniCase::new(config.name.as_ref()) == name)
+        self.get_or_load_language(|language_name, _| UniCase::new(language_name) == name)
     }
 
     pub fn language_for_name_or_extension(
@@ -881,8 +966,8 @@ impl LanguageRegistry {
         string: &str,
     ) -> UnwrapFuture<oneshot::Receiver<Result<Arc<Language>>>> {
         let string = UniCase::new(string);
-        self.get_or_load_language(|config| {
-            UniCase::new(config.name.as_ref()) == string
+        self.get_or_load_language(|name, config| {
+            UniCase::new(name) == string
                 || config
                     .path_suffixes
                     .iter()
@@ -899,7 +984,7 @@ impl LanguageRegistry {
         let filename = path.file_name().and_then(|name| name.to_str());
         let extension = path.extension_or_hidden_file_name();
         let path_suffixes = [extension, filename];
-        self.get_or_load_language(|config| {
+        self.get_or_load_language(|_, config| {
             let path_matches = config
                 .path_suffixes
                 .iter()
@@ -919,7 +1004,7 @@ impl LanguageRegistry {
 
     fn get_or_load_language(
         self: &Arc<Self>,
-        callback: impl Fn(&LanguageConfig) -> bool,
+        callback: impl Fn(&str, &LanguageMatcher) -> bool,
     ) -> UnwrapFuture<oneshot::Receiver<Result<Arc<Language>>>> {
         let (tx, rx) = oneshot::channel();
 
@@ -927,52 +1012,60 @@ impl LanguageRegistry {
         if let Some(language) = state
             .languages
             .iter()
-            .find(|language| callback(&language.config))
+            .find(|language| callback(language.config.name.as_ref(), &language.config.matcher))
         {
             let _ = tx.send(Ok(language.clone()));
         } else if let Some(executor) = self.executor.clone() {
             if let Some(language) = state
                 .available_languages
                 .iter()
-                .find(|l| !l.loaded && callback(&l.config))
+                .rfind(|l| {
+                    !l.loaded
+                        && match &l.source {
+                            AvailableLanguageSource::BuiltIn { config, .. } => {
+                                callback(l.name.as_ref(), &config.matcher)
+                            }
+                            AvailableLanguageSource::Extension { matcher, .. } => {
+                                callback(l.name.as_ref(), &matcher)
+                            }
+                        }
+                })
                 .cloned()
             {
-                let txs = state
-                    .loading_languages
-                    .entry(language.id)
-                    .or_insert_with(|| {
+                match state.loading_languages.entry(language.id) {
+                    hash_map::Entry::Occupied(mut entry) => entry.get_mut().push(tx),
+                    hash_map::Entry::Vacant(entry) => {
                         let this = self.clone();
                         executor
                             .spawn(async move {
                                 let id = language.id;
-                                let name = language.config.name.clone();
+                                let name = language.name.clone();
                                 let language = async {
-                                    let (grammar, queries) = match language.grammar {
-                                        AvailableGrammar::Native {
-                                            grammar,
+                                    let (config, queries) = match language.source {
+                                        AvailableLanguageSource::BuiltIn {
                                             asset_dir,
                                             get_queries,
-                                        } => (grammar, (get_queries)(asset_dir)),
-                                        AvailableGrammar::Wasm { path, get_queries } => {
-                                            let grammar_name =
-                                                &language.config.grammar_name.as_ref().ok_or_else(
-                                                    || anyhow!("missing grammar name"),
-                                                )?;
-                                            let mut wasm_path = path.join(grammar_name.as_ref());
-                                            wasm_path.set_extension("wasm");
-                                            let wasm_bytes = std::fs::read(&wasm_path)?;
-                                            let grammar = PARSER.with(|parser| {
-                                                let mut parser = parser.borrow_mut();
-                                                let mut store = parser.take_wasm_store().unwrap();
-                                                let grammar =
-                                                    store.load_language(&grammar_name, &wasm_bytes);
-                                                parser.set_wasm_store(store).unwrap();
-                                                grammar
-                                            })?;
-                                            (grammar, get_queries(path.as_ref()))
+                                            config,
+                                        } => (config, (get_queries)(asset_dir)),
+                                        AvailableLanguageSource::Extension {
+                                            path,
+                                            get_queries,
+                                            ..
+                                        } => {
+                                            let config = std::fs::read(path.join("config.toml"));
+                                            let config: LanguageConfig =
+                                                ::toml::from_slice(&config?)?;
+                                            (config, get_queries(path.as_ref()))
                                         }
                                     };
-                                    Language::new(language.config, Some(grammar))
+
+                                    let grammar = if let Some(grammar) = config.grammar.clone() {
+                                        Some(this.get_or_load_grammar(grammar).await?)
+                                    } else {
+                                        None
+                                    };
+
+                                    Language::new(config, grammar)
                                         .with_lsp_adapters(language.lsp_adapters)
                                         .await
                                         .with_queries(queries)
@@ -1009,10 +1102,9 @@ impl LanguageRegistry {
                                 };
                             })
                             .detach();
-
-                        Vec::new()
-                    });
-                txs.push(tx);
+                        entry.insert(vec![tx]);
+                    }
+                }
             } else {
                 let _ = tx.send(Err(anyhow!("language not found")));
             }
@@ -1023,6 +1115,65 @@ impl LanguageRegistry {
         rx.unwrap()
     }
 
+    fn get_or_load_grammar(
+        self: &Arc<Self>,
+        name: Arc<str>,
+    ) -> UnwrapFuture<oneshot::Receiver<Result<tree_sitter::Language>>> {
+        let (tx, rx) = oneshot::channel();
+        let mut state = self.state.write();
+
+        if let Some(grammar) = state.grammars.get_mut(name.as_ref()) {
+            match grammar {
+                AvailableGrammar::Loaded(grammar) => {
+                    tx.send(Ok(grammar.clone())).ok();
+                }
+                AvailableGrammar::Loading(txs) => {
+                    txs.push(tx);
+                }
+                AvailableGrammar::Unloaded(wasm_path) => {
+                    if let Some(executor) = &self.executor {
+                        let this = self.clone();
+                        let wasm_path = wasm_path.clone();
+                        executor
+                            .spawn(async move {
+                                let wasm_bytes = std::fs::read(&wasm_path)?;
+                                let grammar_name = wasm_path
+                                    .file_stem()
+                                    .and_then(OsStr::to_str)
+                                    .ok_or_else(|| anyhow!("invalid grammar filename"))?;
+                                let grammar = PARSER.with(|parser| {
+                                    let mut parser = parser.borrow_mut();
+                                    let mut store = parser.take_wasm_store().unwrap();
+                                    let grammar = store.load_language(&grammar_name, &wasm_bytes);
+                                    parser.set_wasm_store(store).unwrap();
+                                    grammar
+                                })?;
+
+                                if let Some(AvailableGrammar::Loading(txs)) =
+                                    this.state.write().grammars.insert(
+                                        name.to_string(),
+                                        AvailableGrammar::Loaded(grammar.clone()),
+                                    )
+                                {
+                                    for tx in txs {
+                                        tx.send(Ok(grammar.clone())).ok();
+                                    }
+                                }
+
+                                anyhow::Ok(())
+                            })
+                            .detach();
+                        *grammar = AvailableGrammar::Loading(vec![tx]);
+                    }
+                }
+            }
+        } else {
+            tx.send(Err(anyhow!("no such grammar {}", name))).ok();
+        }
+
+        rx.unwrap()
+    }
+
     pub fn to_vec(&self) -> Vec<Arc<Language>> {
         self.state.read().languages.iter().cloned().collect()
     }
@@ -1206,6 +1357,19 @@ impl LanguageRegistryState {
         *self.subscription.0.borrow_mut() = ();
     }
 
+    fn reload_languages(&mut self, languages: &HashSet<Arc<str>>) {
+        self.languages
+            .retain(|language| !languages.contains(&language.config.name));
+        self.version += 1;
+        self.reload_count += 1;
+        for language in &mut self.available_languages {
+            if languages.contains(&language.name) {
+                language.loaded = false;
+            }
+        }
+        *self.subscription.0.borrow_mut() = ();
+    }
+
     /// Mark the given language a having been loaded, so that the
     /// language registry won't try to load it again.
     fn mark_language_loaded(&mut self, id: AvailableLanguageId) {
@@ -1720,7 +1884,7 @@ impl Language {
     }
 
     pub fn path_suffixes(&self) -> &[String] {
-        &self.config.path_suffixes
+        &self.config.matcher.path_suffixes
     }
 
     pub fn should_autoclose_before(&self, c: char) -> bool {
@@ -1911,6 +2075,33 @@ impl CodeLabel {
     }
 }
 
+impl Ord for LanguageMatcher {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        self.path_suffixes.cmp(&other.path_suffixes).then_with(|| {
+            self.first_line_pattern
+                .as_ref()
+                .map(Regex::as_str)
+                .cmp(&other.first_line_pattern.as_ref().map(Regex::as_str))
+        })
+    }
+}
+
+impl PartialOrd for LanguageMatcher {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Eq for LanguageMatcher {}
+
+impl PartialEq for LanguageMatcher {
+    fn eq(&self, other: &Self) -> bool {
+        self.path_suffixes == other.path_suffixes
+            && self.first_line_pattern.as_ref().map(Regex::as_str)
+                == other.first_line_pattern.as_ref().map(Regex::as_str)
+    }
+}
+
 #[cfg(any(test, feature = "test-support"))]
 impl Default for FakeLspAdapter {
     fn default() -> Self {
@@ -2034,11 +2225,12 @@ mod tests {
             "/javascript",
             LanguageConfig {
                 name: "JavaScript".into(),
-                path_suffixes: vec!["js".into()],
-                first_line_pattern: Some(Regex::new(r"\bnode\b").unwrap()),
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["js".into()],
+                    first_line_pattern: Some(Regex::new(r"\bnode\b").unwrap()),
+                },
                 ..Default::default()
             },
-            tree_sitter_typescript::language_tsx(),
             vec![],
             |_| Default::default(),
         );
@@ -2067,14 +2259,21 @@ mod tests {
         let mut languages = LanguageRegistry::test();
         languages.set_executor(cx.executor());
         let languages = Arc::new(languages);
+        languages.add_grammars([
+            ("json", tree_sitter_json::language()),
+            ("rust", tree_sitter_rust::language()),
+        ]);
         languages.register(
             "/JSON",
             LanguageConfig {
                 name: "JSON".into(),
-                path_suffixes: vec!["json".into()],
+                grammar: Some("json".into()),
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["json".into()],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
-            tree_sitter_json::language(),
             vec![],
             |_| Default::default(),
         );
@@ -2082,10 +2281,13 @@ mod tests {
             "/rust",
             LanguageConfig {
                 name: "Rust".into(),
-                path_suffixes: vec!["rs".into()],
+                grammar: Some("rust".into()),
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".into()],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
-            tree_sitter_rust::language(),
             vec![],
             |_| Default::default(),
         );
diff --git a/crates/language/src/syntax_map/syntax_map_tests.rs b/crates/language/src/syntax_map/syntax_map_tests.rs
index abf52c64e5..0601a9f3c1 100644
--- a/crates/language/src/syntax_map/syntax_map_tests.rs
+++ b/crates/language/src/syntax_map/syntax_map_tests.rs
@@ -1,5 +1,5 @@
 use super::*;
-use crate::LanguageConfig;
+use crate::{LanguageConfig, LanguageMatcher};
 use rand::rngs::StdRng;
 use std::{env, ops::Range, sync::Arc};
 use text::{Buffer, BufferId};
@@ -1092,7 +1092,10 @@ fn html_lang() -> Language {
     Language::new(
         LanguageConfig {
             name: "HTML".into(),
-            path_suffixes: vec!["html".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["html".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_html::language()),
@@ -1111,7 +1114,10 @@ fn ruby_lang() -> Language {
     Language::new(
         LanguageConfig {
             name: "Ruby".into(),
-            path_suffixes: vec!["rb".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rb".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_ruby::language()),
@@ -1130,7 +1136,10 @@ fn erb_lang() -> Language {
     Language::new(
         LanguageConfig {
             name: "ERB".into(),
-            path_suffixes: vec!["erb".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["erb".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_embedded_template::language()),
@@ -1163,7 +1172,10 @@ fn rust_lang() -> Language {
     Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -1189,7 +1201,10 @@ fn markdown_lang() -> Language {
     Language::new(
         LanguageConfig {
             name: "Markdown".into(),
-            path_suffixes: vec!["md".into()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["md".into()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_markdown::language()),
@@ -1209,7 +1224,10 @@ fn elixir_lang() -> Language {
     Language::new(
         LanguageConfig {
             name: "Elixir".into(),
-            path_suffixes: vec!["ex".into()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["ex".into()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_elixir::language()),
@@ -1226,7 +1244,10 @@ fn heex_lang() -> Language {
     Language::new(
         LanguageConfig {
             name: "HEEx".into(),
-            path_suffixes: vec!["heex".into()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["heex".into()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_heex::language()),
diff --git a/crates/language_tools/src/lsp_log_tests.rs b/crates/language_tools/src/lsp_log_tests.rs
index 24b23df880..b00d1bb79a 100644
--- a/crates/language_tools/src/lsp_log_tests.rs
+++ b/crates/language_tools/src/lsp_log_tests.rs
@@ -5,7 +5,9 @@ use crate::lsp_log::LogMenuItem;
 use super::*;
 use futures::StreamExt;
 use gpui::{Context, TestAppContext, VisualTestContext};
-use language::{tree_sitter_rust, FakeLspAdapter, Language, LanguageConfig, LanguageServerName};
+use language::{
+    tree_sitter_rust, FakeLspAdapter, Language, LanguageConfig, LanguageMatcher, LanguageServerName,
+};
 use project::{FakeFs, Project};
 use serde_json::json;
 use settings::SettingsStore;
@@ -21,7 +23,10 @@ async fn test_lsp_logs(cx: &mut TestAppContext) {
     let mut rust_language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index 2e222c24fb..4cb321f9c0 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -5,7 +5,7 @@ use gpui::AppContext;
 use language::{
     language_settings::{AllLanguageSettings, LanguageSettingsContent},
     tree_sitter_rust, tree_sitter_typescript, Diagnostic, FakeLspAdapter, LanguageConfig,
-    LineEnding, OffsetRangeExt, Point, ToPoint,
+    LanguageMatcher, LineEnding, OffsetRangeExt, Point, ToPoint,
 };
 use lsp::Url;
 use parking_lot::Mutex;
@@ -149,7 +149,10 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
     let mut rust_language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -157,7 +160,10 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
     let mut json_language = Language::new(
         LanguageConfig {
             name: "JSON".into(),
-            path_suffixes: vec!["json".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["json".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         None,
@@ -535,7 +541,10 @@ async fn test_reporting_fs_changes_to_language_servers(cx: &mut gpui::TestAppCon
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -970,7 +979,10 @@ async fn test_disk_based_diagnostics_progress(cx: &mut gpui::TestAppContext) {
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -1102,7 +1114,10 @@ async fn test_restarting_server_with_diagnostics_running(cx: &mut gpui::TestAppC
     let progress_token = "the-progress-token";
     let mut language = Language::new(
         LanguageConfig {
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         None,
@@ -1183,7 +1198,10 @@ async fn test_restarting_server_with_diagnostics_published(cx: &mut gpui::TestAp
 
     let mut language = Language::new(
         LanguageConfig {
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         None,
@@ -1272,7 +1290,10 @@ async fn test_restarted_server_reporting_invalid_buffer_version(cx: &mut gpui::T
 
     let mut language = Language::new(
         LanguageConfig {
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         None,
@@ -1322,7 +1343,10 @@ async fn test_toggling_enable_language_server(cx: &mut gpui::TestAppContext) {
     let mut rust = Language::new(
         LanguageConfig {
             name: Arc::from("Rust"),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         None,
@@ -1336,7 +1360,10 @@ async fn test_toggling_enable_language_server(cx: &mut gpui::TestAppContext) {
     let mut js = Language::new(
         LanguageConfig {
             name: Arc::from("JavaScript"),
-            path_suffixes: vec!["js".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["js".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         None,
@@ -1451,7 +1478,10 @@ async fn test_transforming_diagnostics(cx: &mut gpui::TestAppContext) {
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -1862,7 +1892,10 @@ async fn test_edits_from_lsp2_with_past_version(cx: &mut gpui::TestAppContext) {
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -2249,7 +2282,10 @@ async fn test_definition(cx: &mut gpui::TestAppContext) {
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
@@ -2350,7 +2386,10 @@ async fn test_completions_without_edit_ranges(cx: &mut gpui::TestAppContext) {
     let mut language = Language::new(
         LanguageConfig {
             name: "TypeScript".into(),
-            path_suffixes: vec!["ts".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["ts".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_typescript::language_typescript()),
@@ -2447,7 +2486,10 @@ async fn test_completions_with_carriage_returns(cx: &mut gpui::TestAppContext) {
     let mut language = Language::new(
         LanguageConfig {
             name: "TypeScript".into(),
-            path_suffixes: vec!["ts".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["ts".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_typescript::language_typescript()),
@@ -2513,7 +2555,10 @@ async fn test_apply_code_actions_with_commands(cx: &mut gpui::TestAppContext) {
     let mut language = Language::new(
         LanguageConfig {
             name: "TypeScript".into(),
-            path_suffixes: vec!["ts".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["ts".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         None,
@@ -2816,14 +2861,18 @@ async fn test_save_as(cx: &mut gpui::TestAppContext) {
     let project = Project::test(fs.clone(), ["/dir".as_ref()], cx).await;
 
     let languages = project.update(cx, |project, _| project.languages().clone());
+    languages.add_grammars([("rust", tree_sitter_rust::language())]);
     languages.register(
         "/some/path",
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".into()],
+            grammar: Some("rust".into()),
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".into()],
+                ..Default::default()
+            },
             ..Default::default()
         },
-        tree_sitter_rust::language(),
         vec![],
         |_| Default::default(),
     );
@@ -3649,7 +3698,10 @@ async fn test_rename(cx: &mut gpui::TestAppContext) {
     let mut language = Language::new(
         LanguageConfig {
             name: "Rust".into(),
-            path_suffixes: vec!["rs".to_string()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".to_string()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_rust::language()),
diff --git a/crates/project_symbols/src/project_symbols.rs b/crates/project_symbols/src/project_symbols.rs
index 8aa7fac359..bb09741f07 100644
--- a/crates/project_symbols/src/project_symbols.rs
+++ b/crates/project_symbols/src/project_symbols.rs
@@ -260,7 +260,7 @@ mod tests {
     use super::*;
     use futures::StreamExt;
     use gpui::{TestAppContext, VisualContext};
-    use language::{FakeLspAdapter, Language, LanguageConfig};
+    use language::{FakeLspAdapter, Language, LanguageConfig, LanguageMatcher};
     use project::FakeFs;
     use serde_json::json;
     use settings::SettingsStore;
@@ -273,7 +273,10 @@ mod tests {
         let mut language = Language::new(
             LanguageConfig {
                 name: "Rust".into(),
-                path_suffixes: vec!["rs".to_string()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
             None,
diff --git a/crates/semantic_index/src/semantic_index_tests.rs b/crates/semantic_index/src/semantic_index_tests.rs
index 979151d4b2..23ed45ff1d 100644
--- a/crates/semantic_index/src/semantic_index_tests.rs
+++ b/crates/semantic_index/src/semantic_index_tests.rs
@@ -7,7 +7,7 @@ use crate::{
 use ai::test::FakeEmbeddingProvider;
 
 use gpui::{Task, TestAppContext};
-use language::{Language, LanguageConfig, LanguageRegistry, ToOffset};
+use language::{Language, LanguageConfig, LanguageMatcher, LanguageRegistry, ToOffset};
 use parking_lot::Mutex;
 use pretty_assertions::assert_eq;
 use project::{project_settings::ProjectSettings, FakeFs, Fs, Project};
@@ -1251,7 +1251,10 @@ fn js_lang() -> Arc<Language> {
         Language::new(
             LanguageConfig {
                 name: "Javascript".into(),
-                path_suffixes: vec!["js".into()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["js".into()],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
             Some(tree_sitter_typescript::language_tsx()),
@@ -1343,7 +1346,10 @@ fn rust_lang() -> Arc<Language> {
         Language::new(
             LanguageConfig {
                 name: "Rust".into(),
-                path_suffixes: vec!["rs".into()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".into()],
+                    ..Default::default()
+                },
                 collapsed_placeholder: " /* ... */ ".to_string(),
                 ..Default::default()
             },
@@ -1393,7 +1399,10 @@ fn json_lang() -> Arc<Language> {
         Language::new(
             LanguageConfig {
                 name: "JSON".into(),
-                path_suffixes: vec!["json".into()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["json".into()],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
             Some(tree_sitter_json::language()),
@@ -1421,7 +1430,10 @@ fn toml_lang() -> Arc<Language> {
     Arc::new(Language::new(
         LanguageConfig {
             name: "TOML".into(),
-            path_suffixes: vec!["toml".into()],
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["toml".into()],
+                ..Default::default()
+            },
             ..Default::default()
         },
         Some(tree_sitter_toml::language()),
@@ -1433,7 +1445,10 @@ fn cpp_lang() -> Arc<Language> {
         Language::new(
             LanguageConfig {
                 name: "CPP".into(),
-                path_suffixes: vec!["cpp".into()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["cpp".into()],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
             Some(tree_sitter_cpp::language()),
@@ -1513,7 +1528,10 @@ fn lua_lang() -> Arc<Language> {
         Language::new(
             LanguageConfig {
                 name: "Lua".into(),
-                path_suffixes: vec!["lua".into()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["lua".into()],
+                    ..Default::default()
+                },
                 collapsed_placeholder: "--[ ... ]--".to_string(),
                 ..Default::default()
             },
@@ -1542,7 +1560,10 @@ fn php_lang() -> Arc<Language> {
         Language::new(
             LanguageConfig {
                 name: "PHP".into(),
-                path_suffixes: vec!["php".into()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["php".into()],
+                    ..Default::default()
+                },
                 collapsed_placeholder: "/* ... */".into(),
                 ..Default::default()
             },
@@ -1597,7 +1618,10 @@ fn ruby_lang() -> Arc<Language> {
         Language::new(
             LanguageConfig {
                 name: "Ruby".into(),
-                path_suffixes: vec!["rb".into()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rb".into()],
+                    ..Default::default()
+                },
                 collapsed_placeholder: "# ...".to_string(),
                 ..Default::default()
             },
@@ -1638,7 +1662,10 @@ fn elixir_lang() -> Arc<Language> {
         Language::new(
             LanguageConfig {
                 name: "Elixir".into(),
-                path_suffixes: vec!["rs".into()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".into()],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
             Some(tree_sitter_elixir::language()),
diff --git a/crates/theme/src/registry.rs b/crates/theme/src/registry.rs
index 2cc4d902a2..5a86c877f9 100644
--- a/crates/theme/src/registry.rs
+++ b/crates/theme/src/registry.rs
@@ -194,7 +194,9 @@ impl ThemeRegistry {
     }
 
     pub fn list_names(&self, _staff: bool) -> Vec<SharedString> {
-        self.state.read().themes.keys().cloned().collect()
+        let mut names = self.state.read().themes.keys().cloned().collect::<Vec<_>>();
+        names.sort();
+        names
     }
 
     pub fn list(&self, _staff: bool) -> Vec<ThemeMeta> {
@@ -263,11 +265,17 @@ impl ThemeRegistry {
         Ok(())
     }
 
-    /// Loads the user theme from the specified path and adds it to the registry.
-    pub async fn load_user_theme(&self, theme_path: &Path, fs: Arc<dyn Fs>) -> Result<()> {
+    pub async fn read_user_theme(theme_path: &Path, fs: Arc<dyn Fs>) -> Result<ThemeFamilyContent> {
         let reader = fs.open_sync(&theme_path).await?;
         let theme = serde_json_lenient::from_reader(reader)?;
 
+        Ok(theme)
+    }
+
+    /// Loads the user theme from the specified path and adds it to the registry.
+    pub async fn load_user_theme(&self, theme_path: &Path, fs: Arc<dyn Fs>) -> Result<()> {
+        let theme = Self::read_user_theme(theme_path, fs).await?;
+
         self.insert_user_theme_families([theme]);
 
         Ok(())
diff --git a/crates/util/src/arc_cow.rs b/crates/util/src/arc_cow.rs
index c6afabbbaa..02ad1fa1f0 100644
--- a/crates/util/src/arc_cow.rs
+++ b/crates/util/src/arc_cow.rs
@@ -1,5 +1,6 @@
 use std::{
     borrow::Cow,
+    cmp::Ordering,
     fmt::{self, Debug},
     hash::{Hash, Hasher},
     sync::Arc,
@@ -18,6 +19,18 @@ impl<'a, T: ?Sized + PartialEq> PartialEq for ArcCow<'a, T> {
     }
 }
 
+impl<'a, T: ?Sized + PartialOrd> PartialOrd for ArcCow<'a, T> {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        self.as_ref().partial_cmp(other.as_ref())
+    }
+}
+
+impl<'a, T: ?Sized + Ord> Ord for ArcCow<'a, T> {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.as_ref().cmp(other.as_ref())
+    }
+}
+
 impl<'a, T: ?Sized + Eq> Eq for ArcCow<'a, T> {}
 
 impl<'a, T: ?Sized + Hash> Hash for ArcCow<'a, T> {
diff --git a/crates/util/src/paths.rs b/crates/util/src/paths.rs
index cd839ae50e..dcf9270fb1 100644
--- a/crates/util/src/paths.rs
+++ b/crates/util/src/paths.rs
@@ -14,7 +14,7 @@ lazy_static::lazy_static! {
     pub static ref THEMES_DIR: PathBuf = HOME.join(".config/zed/themes");
     pub static ref LOGS_DIR: PathBuf = HOME.join("Library/Logs/Zed");
     pub static ref SUPPORT_DIR: PathBuf = HOME.join("Library/Application Support/Zed");
-    pub static ref PLUGINS_DIR: PathBuf = HOME.join("Library/Application Support/Zed/plugins");
+    pub static ref EXTENSIONS_DIR: PathBuf = HOME.join("Library/Application Support/Zed/extensions");
     pub static ref LANGUAGES_DIR: PathBuf = HOME.join("Library/Application Support/Zed/languages");
     pub static ref COPILOT_DIR: PathBuf = HOME.join("Library/Application Support/Zed/copilot");
     pub static ref DEFAULT_PRETTIER_DIR: PathBuf = HOME.join("Library/Application Support/Zed/prettier");
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index c023faf6f7..1e9a5ba31e 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -44,6 +44,7 @@ db.workspace = true
 diagnostics.workspace = true
 editor.workspace = true
 env_logger.workspace = true
+extension.workspace = true
 feature_flags.workspace = true
 feedback.workspace = true
 file_finder.workspace = true
diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index 1250aa92c7..2931d53763 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -4,8 +4,8 @@ pub use language::*;
 use node_runtime::NodeRuntime;
 use rust_embed::RustEmbed;
 use settings::Settings;
-use std::{borrow::Cow, fs, path::Path, str, sync::Arc};
-use util::{asset_str, paths::PLUGINS_DIR, ResultExt};
+use std::{str, sync::Arc};
+use util::asset_str;
 
 use self::{deno::DenoSettings, elixir::ElixirSettings};
 
@@ -62,30 +62,69 @@ pub fn init(
     ElixirSettings::register(cx);
     DenoSettings::register(cx);
 
-    let language = |name, grammar, adapters| {
-        languages.register(name, load_config(name), grammar, adapters, load_queries)
+    languages.add_grammars([
+        ("bash", tree_sitter_bash::language()),
+        ("beancount", tree_sitter_beancount::language()),
+        ("c", tree_sitter_c::language()),
+        ("c_sharp", tree_sitter_c_sharp::language()),
+        ("cpp", tree_sitter_cpp::language()),
+        ("css", tree_sitter_css::language()),
+        ("elixir", tree_sitter_elixir::language()),
+        ("elm", tree_sitter_elm::language()),
+        (
+            "embedded_template",
+            tree_sitter_embedded_template::language(),
+        ),
+        ("erlang", tree_sitter_erlang::language()),
+        ("gitcommit", tree_sitter_gitcommit::language()),
+        ("gleam", tree_sitter_gleam::language()),
+        ("glsl", tree_sitter_glsl::language()),
+        ("go", tree_sitter_go::language()),
+        ("gomod", tree_sitter_gomod::language()),
+        ("gowork", tree_sitter_gowork::language()),
+        ("haskell", tree_sitter_haskell::language()),
+        ("hcl", tree_sitter_hcl::language()),
+        ("heex", tree_sitter_heex::language()),
+        ("html", tree_sitter_html::language()),
+        ("json", tree_sitter_json::language()),
+        ("lua", tree_sitter_lua::language()),
+        ("markdown", tree_sitter_markdown::language()),
+        ("nix", tree_sitter_nix::language()),
+        ("nu", tree_sitter_nu::language()),
+        ("ocaml", tree_sitter_ocaml::language_ocaml()),
+        (
+            "ocaml_interface",
+            tree_sitter_ocaml::language_ocaml_interface(),
+        ),
+        ("php", tree_sitter_php::language_php()),
+        ("proto", tree_sitter_proto::language()),
+        ("purescript", tree_sitter_purescript::language()),
+        ("python", tree_sitter_python::language()),
+        ("racket", tree_sitter_racket::language()),
+        ("ruby", tree_sitter_ruby::language()),
+        ("rust", tree_sitter_rust::language()),
+        ("scheme", tree_sitter_scheme::language()),
+        ("svelte", tree_sitter_svelte::language()),
+        ("toml", tree_sitter_toml::language()),
+        ("tsx", tree_sitter_typescript::language_tsx()),
+        ("typescript", tree_sitter_typescript::language_typescript()),
+        ("uiua", tree_sitter_uiua::language()),
+        ("vue", tree_sitter_vue::language()),
+        ("yaml", tree_sitter_yaml::language()),
+        ("zig", tree_sitter_zig::language()),
+    ]);
+
+    let language = |name: &'static str, adapters| {
+        languages.register(name, load_config(name), adapters, load_queries)
     };
 
-    language("bash", tree_sitter_bash::language(), vec![]);
-    language("beancount", tree_sitter_beancount::language(), vec![]);
-    language(
-        "c",
-        tree_sitter_c::language(),
-        vec![Arc::new(c::CLspAdapter) as Arc<dyn LspAdapter>],
-    );
-    language(
-        "cpp",
-        tree_sitter_cpp::language(),
-        vec![Arc::new(c::CLspAdapter)],
-    );
-    language(
-        "csharp",
-        tree_sitter_c_sharp::language(),
-        vec![Arc::new(csharp::OmniSharpAdapter {})],
-    );
+    language("bash", vec![]);
+    language("beancount", vec![]);
+    language("c", vec![Arc::new(c::CLspAdapter) as Arc<dyn LspAdapter>]);
+    language("cpp", vec![Arc::new(c::CLspAdapter)]);
+    language("csharp", vec![Arc::new(csharp::OmniSharpAdapter {})]);
     language(
         "css",
-        tree_sitter_css::language(),
         vec![
             Arc::new(css::CssLspAdapter::new(node_runtime.clone())),
             Arc::new(tailwind::TailwindLspAdapter::new(node_runtime.clone())),
@@ -95,53 +134,32 @@ pub fn init(
     match &ElixirSettings::get(None, cx).lsp {
         elixir::ElixirLspSetting::ElixirLs => language(
             "elixir",
-            tree_sitter_elixir::language(),
             vec![
                 Arc::new(elixir::ElixirLspAdapter),
                 Arc::new(tailwind::TailwindLspAdapter::new(node_runtime.clone())),
             ],
         ),
-        elixir::ElixirLspSetting::NextLs => language(
-            "elixir",
-            tree_sitter_elixir::language(),
-            vec![Arc::new(elixir::NextLspAdapter)],
-        ),
+        elixir::ElixirLspSetting::NextLs => {
+            language("elixir", vec![Arc::new(elixir::NextLspAdapter)])
+        }
         elixir::ElixirLspSetting::Local { path, arguments } => language(
             "elixir",
-            tree_sitter_elixir::language(),
             vec![Arc::new(elixir::LocalLspAdapter {
                 path: path.clone(),
                 arguments: arguments.clone(),
             })],
         ),
     }
-    language("gitcommit", tree_sitter_gitcommit::language(), vec![]);
-    language(
-        "erlang",
-        tree_sitter_erlang::language(),
-        vec![Arc::new(erlang::ErlangLspAdapter)],
-    );
+    language("gitcommit", vec![]);
+    language("erlang", vec![Arc::new(erlang::ErlangLspAdapter)]);
 
-    language(
-        "gleam",
-        tree_sitter_gleam::language(),
-        vec![Arc::new(gleam::GleamLspAdapter)],
-    );
-    language(
-        "go",
-        tree_sitter_go::language(),
-        vec![Arc::new(go::GoLspAdapter)],
-    );
-    language("gomod", tree_sitter_gomod::language(), vec![]);
-    language("gowork", tree_sitter_gowork::language(), vec![]);
-    language(
-        "zig",
-        tree_sitter_zig::language(),
-        vec![Arc::new(zig::ZlsAdapter)],
-    );
+    language("gleam", vec![Arc::new(gleam::GleamLspAdapter)]);
+    language("go", vec![Arc::new(go::GoLspAdapter)]);
+    language("gomod", vec![]);
+    language("gowork", vec![]);
+    language("zig", vec![Arc::new(zig::ZlsAdapter)]);
     language(
         "heex",
-        tree_sitter_heex::language(),
         vec![
             Arc::new(elixir::ElixirLspAdapter),
             Arc::new(tailwind::TailwindLspAdapter::new(node_runtime.clone())),
@@ -149,48 +167,32 @@ pub fn init(
     );
     language(
         "json",
-        tree_sitter_json::language(),
         vec![Arc::new(json::JsonLspAdapter::new(
             node_runtime.clone(),
             languages.clone(),
         ))],
     );
-    language("markdown", tree_sitter_markdown::language(), vec![]);
+    language("markdown", vec![]);
     language(
         "python",
-        tree_sitter_python::language(),
         vec![Arc::new(python::PythonLspAdapter::new(
             node_runtime.clone(),
         ))],
     );
-    language(
-        "rust",
-        tree_sitter_rust::language(),
-        vec![Arc::new(rust::RustLspAdapter)],
-    );
-    language(
-        "toml",
-        tree_sitter_toml::language(),
-        vec![Arc::new(toml::TaploLspAdapter)],
-    );
+    language("rust", vec![Arc::new(rust::RustLspAdapter)]);
+    language("toml", vec![Arc::new(toml::TaploLspAdapter)]);
     match &DenoSettings::get(None, cx).enable {
         true => {
             language(
                 "tsx",
-                tree_sitter_typescript::language_tsx(),
                 vec![
                     Arc::new(deno::DenoLspAdapter::new()),
                     Arc::new(tailwind::TailwindLspAdapter::new(node_runtime.clone())),
                 ],
             );
-            language(
-                "typescript",
-                tree_sitter_typescript::language_typescript(),
-                vec![Arc::new(deno::DenoLspAdapter::new())],
-            );
+            language("typescript", vec![Arc::new(deno::DenoLspAdapter::new())]);
             language(
                 "javascript",
-                tree_sitter_typescript::language_tsx(),
                 vec![
                     Arc::new(deno::DenoLspAdapter::new()),
                     Arc::new(tailwind::TailwindLspAdapter::new(node_runtime.clone())),
@@ -200,7 +202,6 @@ pub fn init(
         false => {
             language(
                 "tsx",
-                tree_sitter_typescript::language_tsx(),
                 vec![
                     Arc::new(typescript::TypeScriptLspAdapter::new(node_runtime.clone())),
                     Arc::new(typescript::EsLintLspAdapter::new(node_runtime.clone())),
@@ -209,7 +210,6 @@ pub fn init(
             );
             language(
                 "typescript",
-                tree_sitter_typescript::language_typescript(),
                 vec![
                     Arc::new(typescript::TypeScriptLspAdapter::new(node_runtime.clone())),
                     Arc::new(typescript::EsLintLspAdapter::new(node_runtime.clone())),
@@ -217,7 +217,6 @@ pub fn init(
             );
             language(
                 "javascript",
-                tree_sitter_typescript::language_tsx(),
                 vec![
                     Arc::new(typescript::TypeScriptLspAdapter::new(node_runtime.clone())),
                     Arc::new(typescript::EsLintLspAdapter::new(node_runtime.clone())),
@@ -227,47 +226,31 @@ pub fn init(
         }
     }
 
-    language(
-        "haskell",
-        tree_sitter_haskell::language(),
-        vec![Arc::new(haskell::HaskellLanguageServer {})],
-    );
+    language("haskell", vec![Arc::new(haskell::HaskellLanguageServer {})]);
     language(
         "html",
-        tree_sitter_html::language(),
         vec![
             Arc::new(html::HtmlLspAdapter::new(node_runtime.clone())),
             Arc::new(tailwind::TailwindLspAdapter::new(node_runtime.clone())),
         ],
     );
-    language(
-        "ruby",
-        tree_sitter_ruby::language(),
-        vec![Arc::new(ruby::RubyLanguageServer)],
-    );
+    language("ruby", vec![Arc::new(ruby::RubyLanguageServer)]);
     language(
         "erb",
-        tree_sitter_embedded_template::language(),
         vec![
             Arc::new(ruby::RubyLanguageServer),
             Arc::new(tailwind::TailwindLspAdapter::new(node_runtime.clone())),
         ],
     );
-    language("scheme", tree_sitter_scheme::language(), vec![]);
-    language("racket", tree_sitter_racket::language(), vec![]);
-    language(
-        "lua",
-        tree_sitter_lua::language(),
-        vec![Arc::new(lua::LuaLspAdapter)],
-    );
+    language("scheme", vec![]);
+    language("racket", vec![]);
+    language("lua", vec![Arc::new(lua::LuaLspAdapter)]);
     language(
         "yaml",
-        tree_sitter_yaml::language(),
         vec![Arc::new(yaml::YamlLspAdapter::new(node_runtime.clone()))],
     );
     language(
         "svelte",
-        tree_sitter_svelte::language(),
         vec![
             Arc::new(svelte::SvelteLspAdapter::new(node_runtime.clone())),
             Arc::new(tailwind::TailwindLspAdapter::new(node_runtime.clone())),
@@ -275,7 +258,6 @@ pub fn init(
     );
     language(
         "php",
-        tree_sitter_php::language_php(),
         vec![
             Arc::new(php::IntelephenseLspAdapter::new(node_runtime.clone())),
             Arc::new(tailwind::TailwindLspAdapter::new(node_runtime.clone())),
@@ -284,62 +266,24 @@ pub fn init(
 
     language(
         "purescript",
-        tree_sitter_purescript::language(),
         vec![Arc::new(purescript::PurescriptLspAdapter::new(
             node_runtime.clone(),
         ))],
     );
     language(
         "elm",
-        tree_sitter_elm::language(),
         vec![Arc::new(elm::ElmLspAdapter::new(node_runtime.clone()))],
     );
-    language("glsl", tree_sitter_glsl::language(), vec![]);
-    language("nix", tree_sitter_nix::language(), vec![]);
-    language(
-        "nu",
-        tree_sitter_nu::language(),
-        vec![Arc::new(nu::NuLanguageServer {})],
-    );
-    language(
-        "ocaml",
-        tree_sitter_ocaml::language_ocaml(),
-        vec![Arc::new(ocaml::OCamlLspAdapter)],
-    );
-    language(
-        "ocaml-interface",
-        tree_sitter_ocaml::language_ocaml_interface(),
-        vec![Arc::new(ocaml::OCamlLspAdapter)],
-    );
-    language(
-        "vue",
-        tree_sitter_vue::language(),
-        vec![Arc::new(vue::VueLspAdapter::new(node_runtime))],
-    );
-    language(
-        "uiua",
-        tree_sitter_uiua::language(),
-        vec![Arc::new(uiua::UiuaLanguageServer {})],
-    );
-    language("proto", tree_sitter_proto::language(), vec![]);
-    language("terraform", tree_sitter_hcl::language(), vec![]);
-    language("hcl", tree_sitter_hcl::language(), vec![]);
-
-    if let Ok(children) = std::fs::read_dir(&*PLUGINS_DIR) {
-        for child in children {
-            if let Ok(child) = child {
-                let path = child.path();
-                let config_path = path.join("config.toml");
-                if let Ok(config) = std::fs::read(&config_path) {
-                    languages.register_wasm(
-                        path.into(),
-                        ::toml::from_slice(&config).unwrap(),
-                        load_plugin_queries,
-                    );
-                }
-            }
-        }
-    }
+    language("glsl", vec![]);
+    language("nix", vec![]);
+    language("nu", vec![Arc::new(nu::NuLanguageServer {})]);
+    language("ocaml", vec![Arc::new(ocaml::OCamlLspAdapter)]);
+    language("ocaml-interface", vec![Arc::new(ocaml::OCamlLspAdapter)]);
+    language("vue", vec![Arc::new(vue::VueLspAdapter::new(node_runtime))]);
+    language("uiua", vec![Arc::new(uiua::UiuaLanguageServer {})]);
+    language("proto", vec![]);
+    language("terraform", vec![]);
+    language("hcl", vec![]);
 }
 
 #[cfg(any(test, feature = "test-support"))]
@@ -367,20 +311,6 @@ fn load_config(name: &str) -> LanguageConfig {
     .unwrap()
 }
 
-const QUERY_FILENAME_PREFIXES: &[(
-    &str,
-    fn(&mut LanguageQueries) -> &mut Option<Cow<'static, str>>,
-)] = &[
-    ("highlights", |q| &mut q.highlights),
-    ("brackets", |q| &mut q.brackets),
-    ("outline", |q| &mut q.outline),
-    ("indents", |q| &mut q.indents),
-    ("embedding", |q| &mut q.embedding),
-    ("injections", |q| &mut q.injections),
-    ("overrides", |q| &mut q.overrides),
-    ("redactions", |q| &mut q.redactions),
-];
-
 fn load_queries(name: &str) -> LanguageQueries {
     let mut result = LanguageQueries::default();
     for path in LanguageDir::iter() {
@@ -401,32 +331,3 @@ fn load_queries(name: &str) -> LanguageQueries {
     }
     result
 }
-
-fn load_plugin_queries(root_path: &Path) -> LanguageQueries {
-    let mut result = LanguageQueries::default();
-    if let Some(entries) = fs::read_dir(root_path).log_err() {
-        for entry in entries {
-            let Some(entry) = entry.log_err() else {
-                continue;
-            };
-            let path = entry.path();
-            if let Some(remainder) = path.strip_prefix(root_path).ok().and_then(|p| p.to_str()) {
-                if !remainder.ends_with(".scm") {
-                    continue;
-                }
-                for (name, query) in QUERY_FILENAME_PREFIXES {
-                    if remainder.starts_with(name) {
-                        if let Some(contents) = fs::read_to_string(&path).log_err() {
-                            match query(&mut result) {
-                                None => *query(&mut result) = Some(contents.into()),
-                                Some(r) => r.to_mut().push_str(contents.as_ref()),
-                            }
-                        }
-                        break;
-                    }
-                }
-            }
-        }
-    }
-    result
-}
diff --git a/crates/zed/src/languages/bash/config.toml b/crates/zed/src/languages/bash/config.toml
index 8b86318ecd..abbb95bda5 100644
--- a/crates/zed/src/languages/bash/config.toml
+++ b/crates/zed/src/languages/bash/config.toml
@@ -1,4 +1,5 @@
 name = "Shell Script"
+grammar = "bash"
 path_suffixes = ["sh", "bash", "bashrc", "bash_profile", "bash_aliases", "bash_logout", "profile", "zsh", "zshrc", "zshenv", "zsh_profile", "zsh_aliases", "zsh_histfile", "zlogin", "zprofile", ".env"]
 line_comments = ["# "]
 first_line_pattern = "^#!.*\\b(?:ba|z)?sh\\b"
diff --git a/crates/zed/src/languages/beancount/config.toml b/crates/zed/src/languages/beancount/config.toml
index 722b8a39b7..fff6411e9d 100644
--- a/crates/zed/src/languages/beancount/config.toml
+++ b/crates/zed/src/languages/beancount/config.toml
@@ -1,3 +1,4 @@
 name = "Beancount"
+grammar = "beancount"
 path_suffixes = ["beancount"]
 brackets = [{ start = "\"", end = "\"", close = false, newline = false }]
diff --git a/crates/zed/src/languages/c/config.toml b/crates/zed/src/languages/c/config.toml
index f99c0416cd..b41f469bd5 100644
--- a/crates/zed/src/languages/c/config.toml
+++ b/crates/zed/src/languages/c/config.toml
@@ -1,4 +1,5 @@
 name = "C"
+grammar = "c"
 path_suffixes = ["c"]
 line_comments = ["// "]
 autoclose_before = ";:.,=}])>"
diff --git a/crates/zed/src/languages/cpp/config.toml b/crates/zed/src/languages/cpp/config.toml
index 7630f1dd79..eecb09bc20 100644
--- a/crates/zed/src/languages/cpp/config.toml
+++ b/crates/zed/src/languages/cpp/config.toml
@@ -1,4 +1,5 @@
 name = "C++"
+grammar = "cpp"
 path_suffixes = ["cc", "cpp", "h", "hpp", "cxx", "hxx", "inl"]
 line_comments = ["// "]
 autoclose_before = ";:.,=}])>"
diff --git a/crates/zed/src/languages/csharp/config.toml b/crates/zed/src/languages/csharp/config.toml
index 7835283df4..51a10c70e0 100644
--- a/crates/zed/src/languages/csharp/config.toml
+++ b/crates/zed/src/languages/csharp/config.toml
@@ -1,4 +1,5 @@
 name = "CSharp"
+grammar = "c_sharp"
 path_suffixes = ["cs"]
 line_comments = ["// "]
 autoclose_before = ";:.,=}])>"
diff --git a/crates/zed/src/languages/css/config.toml b/crates/zed/src/languages/css/config.toml
index 24a844c239..e22abe6d70 100644
--- a/crates/zed/src/languages/css/config.toml
+++ b/crates/zed/src/languages/css/config.toml
@@ -1,4 +1,5 @@
 name = "CSS"
+grammar = "css"
 path_suffixes = ["css"]
 autoclose_before = ";:.,=}])>"
 brackets = [
diff --git a/crates/zed/src/languages/elixir/config.toml b/crates/zed/src/languages/elixir/config.toml
index a3aab0ee8a..81e92d45b0 100644
--- a/crates/zed/src/languages/elixir/config.toml
+++ b/crates/zed/src/languages/elixir/config.toml
@@ -1,4 +1,5 @@
 name = "Elixir"
+grammar = "elixir"
 path_suffixes = ["ex", "exs"]
 line_comments = ["# "]
 autoclose_before = ";:.,=}])>"
diff --git a/crates/zed/src/languages/elm/config.toml b/crates/zed/src/languages/elm/config.toml
index b95c85d444..96fb2989ad 100644
--- a/crates/zed/src/languages/elm/config.toml
+++ b/crates/zed/src/languages/elm/config.toml
@@ -1,4 +1,5 @@
 name = "Elm"
+grammar = "elm"
 path_suffixes = ["elm"]
 line_comments = ["-- "]
 block_comment = ["{- ", " -}"]
diff --git a/crates/zed/src/languages/erb/config.toml b/crates/zed/src/languages/erb/config.toml
index ebc45e9984..5ec987e139 100644
--- a/crates/zed/src/languages/erb/config.toml
+++ b/crates/zed/src/languages/erb/config.toml
@@ -1,4 +1,5 @@
 name = "ERB"
+grammar = "embedded_template"
 path_suffixes = ["erb"]
 autoclose_before = ">})"
 brackets = [
diff --git a/crates/zed/src/languages/erlang/config.toml b/crates/zed/src/languages/erlang/config.toml
index 5f92c0fe27..01eba93ff6 100644
--- a/crates/zed/src/languages/erlang/config.toml
+++ b/crates/zed/src/languages/erlang/config.toml
@@ -1,4 +1,5 @@
 name = "Erlang"
+grammar = "erlang"
 # TODO: support parsing rebar.config files
 # # https://github.com/WhatsApp/tree-sitter-erlang/issues/3
 path_suffixes = ["erl", "hrl", "app.src", "escript", "xrl", "yrl", "Emakefile", "rebar.config"]
diff --git a/crates/zed/src/languages/gitcommit/config.toml b/crates/zed/src/languages/gitcommit/config.toml
index 70c68d9385..0b4d84069e 100644
--- a/crates/zed/src/languages/gitcommit/config.toml
+++ b/crates/zed/src/languages/gitcommit/config.toml
@@ -1,4 +1,5 @@
 name = "Git Commit"
+grammar = "git_commit"
 path_suffixes = [
   # Refer to https://github.com/neovim/neovim/blob/master/runtime/lua/vim/filetype.lua#L1286-L1290
   "TAG_EDITMSG",
diff --git a/crates/zed/src/languages/gleam/config.toml b/crates/zed/src/languages/gleam/config.toml
index a841862709..0a472172ad 100644
--- a/crates/zed/src/languages/gleam/config.toml
+++ b/crates/zed/src/languages/gleam/config.toml
@@ -1,4 +1,5 @@
 name = "Gleam"
+grammar = "gleam"
 path_suffixes = ["gleam"]
 line_comments = ["// ", "/// "]
 autoclose_before = ";:.,=}])>"
diff --git a/crates/zed/src/languages/glsl/config.toml b/crates/zed/src/languages/glsl/config.toml
index 9b60179662..01d7c88214 100644
--- a/crates/zed/src/languages/glsl/config.toml
+++ b/crates/zed/src/languages/glsl/config.toml
@@ -1,4 +1,5 @@
 name = "GLSL"
+grammar = "glsl"
 path_suffixes = ["vert", "frag", "tesc", "tese", "geom", "comp"]
 line_comments = ["// "]
 block_comment = ["/* ", " */"]
diff --git a/crates/zed/src/languages/go/config.toml b/crates/zed/src/languages/go/config.toml
index d07c46731a..cf29bfbb23 100644
--- a/crates/zed/src/languages/go/config.toml
+++ b/crates/zed/src/languages/go/config.toml
@@ -1,4 +1,5 @@
 name = "Go"
+grammar = "go"
 path_suffixes = ["go"]
 line_comments = ["// "]
 autoclose_before = ";:.,=}])>"
diff --git a/crates/zed/src/languages/gomod/config.toml b/crates/zed/src/languages/gomod/config.toml
index 80c252949d..19c7b20e8c 100644
--- a/crates/zed/src/languages/gomod/config.toml
+++ b/crates/zed/src/languages/gomod/config.toml
@@ -1,4 +1,5 @@
 name = "Go Mod"
+grammar = "go"
 path_suffixes = ["mod"]
 line_comments = ["//"]
 autoclose_before = ")"
diff --git a/crates/zed/src/languages/gowork/config.toml b/crates/zed/src/languages/gowork/config.toml
index 919f1db512..79621ecdaf 100644
--- a/crates/zed/src/languages/gowork/config.toml
+++ b/crates/zed/src/languages/gowork/config.toml
@@ -1,4 +1,5 @@
 name = "Go Work"
+grammar = "go_work"
 path_suffixes = ["work"]
 line_comments = ["//"]
 autoclose_before = ")"
diff --git a/crates/zed/src/languages/haskell/config.toml b/crates/zed/src/languages/haskell/config.toml
index 7b1454431e..3d83ab907d 100644
--- a/crates/zed/src/languages/haskell/config.toml
+++ b/crates/zed/src/languages/haskell/config.toml
@@ -1,4 +1,5 @@
 name = "Haskell"
+grammar = "haskell"
 path_suffixes = ["hs"]
 autoclose_before = ",=)}]"
 line_comments = ["-- "]
diff --git a/crates/zed/src/languages/hcl/config.toml b/crates/zed/src/languages/hcl/config.toml
index c7c2ebf6ba..891b2f38d4 100644
--- a/crates/zed/src/languages/hcl/config.toml
+++ b/crates/zed/src/languages/hcl/config.toml
@@ -1,4 +1,5 @@
 name = "HCL"
+grammar = "hcl"
 path_suffixes = ["hcl"]
 line_comments = ["# ", "// "]
 block_comment = ["/*", "*/"]
diff --git a/crates/zed/src/languages/heex/config.toml b/crates/zed/src/languages/heex/config.toml
index 74cb5ac9ff..c28ffa16b0 100644
--- a/crates/zed/src/languages/heex/config.toml
+++ b/crates/zed/src/languages/heex/config.toml
@@ -1,4 +1,5 @@
 name = "HEEX"
+grammar = "heex"
 path_suffixes = ["heex"]
 autoclose_before = ">})"
 brackets = [
diff --git a/crates/zed/src/languages/html/config.toml b/crates/zed/src/languages/html/config.toml
index 3c24490fc4..389020b89d 100644
--- a/crates/zed/src/languages/html/config.toml
+++ b/crates/zed/src/languages/html/config.toml
@@ -1,4 +1,5 @@
 name = "HTML"
+grammar = "html"
 path_suffixes = ["html", "htm", "shtml"]
 autoclose_before = ">})"
 block_comment = ["<!-- ", " -->"]
diff --git a/crates/zed/src/languages/javascript/config.toml b/crates/zed/src/languages/javascript/config.toml
index a19d2588ed..a3acd1aac0 100644
--- a/crates/zed/src/languages/javascript/config.toml
+++ b/crates/zed/src/languages/javascript/config.toml
@@ -1,4 +1,5 @@
 name = "JavaScript"
+grammar = "tsx"
 path_suffixes = ["js", "jsx", "mjs", "cjs"]
 first_line_pattern = '^#!.*\bnode\b'
 line_comments = ["// "]
diff --git a/crates/zed/src/languages/json/config.toml b/crates/zed/src/languages/json/config.toml
index eed86826d5..34b3bc8bc6 100644
--- a/crates/zed/src/languages/json/config.toml
+++ b/crates/zed/src/languages/json/config.toml
@@ -1,4 +1,5 @@
 name = "JSON"
+grammar = "json"
 path_suffixes = ["json"]
 line_comments = ["// "]
 autoclose_before = ",]}"
diff --git a/crates/zed/src/languages/lua/config.toml b/crates/zed/src/languages/lua/config.toml
index 31946f46e9..19577fed91 100644
--- a/crates/zed/src/languages/lua/config.toml
+++ b/crates/zed/src/languages/lua/config.toml
@@ -1,4 +1,5 @@
 name = "Lua"
+grammar = "lua"
 path_suffixes = ["lua"]
 line_comments = ["-- "]
 autoclose_before = ",]}"
diff --git a/crates/zed/src/languages/markdown/config.toml b/crates/zed/src/languages/markdown/config.toml
index 98691a4ef7..e44ba6ec1a 100644
--- a/crates/zed/src/languages/markdown/config.toml
+++ b/crates/zed/src/languages/markdown/config.toml
@@ -1,4 +1,5 @@
 name = "Markdown"
+grammar = "markdown"
 path_suffixes = ["md", "mdx"]
 word_characters = ["-"]
 brackets = [
diff --git a/crates/zed/src/languages/nix/config.toml b/crates/zed/src/languages/nix/config.toml
index 20b3921271..b62ead99b3 100644
--- a/crates/zed/src/languages/nix/config.toml
+++ b/crates/zed/src/languages/nix/config.toml
@@ -1,4 +1,5 @@
 name = "Nix"
+grammar = "nix"
 path_suffixes = ["nix"]
 line_comments = ["# "]
 block_comment = ["/* ", " */"]
diff --git a/crates/zed/src/languages/nu/config.toml b/crates/zed/src/languages/nu/config.toml
index 63f5a61591..23f19cdcd2 100644
--- a/crates/zed/src/languages/nu/config.toml
+++ b/crates/zed/src/languages/nu/config.toml
@@ -1,4 +1,5 @@
 name = "Nu"
+grammar = "nu"
 path_suffixes = ["nu"]
 line_comments = ["# "]
 autoclose_before = ";:.,=}])>` \n\t\""
diff --git a/crates/zed/src/languages/ocaml-interface/config.toml b/crates/zed/src/languages/ocaml-interface/config.toml
index f7401f774c..fdbf1aad81 100644
--- a/crates/zed/src/languages/ocaml-interface/config.toml
+++ b/crates/zed/src/languages/ocaml-interface/config.toml
@@ -1,4 +1,5 @@
 name = "OCaml Interface"
+grammar = "ocaml_interface"
 path_suffixes = ["mli"]
 block_comment = ["(* ", "*)"]
 autoclose_before = ";,=)}"
@@ -8,6 +9,6 @@ brackets = [
   { start = "[", end = "]", close = true, newline = true },
   { start = "(", end = ")", close = true, newline = true },
   { start = "sig", end = " end", close = true, newline = true },
-  # HACK: For some reason `object` alone does not work  
+  # HACK: For some reason `object` alone does not work
   { start = "object ", end = "end", close = true, newline = true },
 ]
diff --git a/crates/zed/src/languages/ocaml/config.toml b/crates/zed/src/languages/ocaml/config.toml
index 522db6dae1..313cbb46df 100644
--- a/crates/zed/src/languages/ocaml/config.toml
+++ b/crates/zed/src/languages/ocaml/config.toml
@@ -1,8 +1,9 @@
 name = "OCaml"
+grammar = "ocaml"
 path_suffixes = ["ml"]
 block_comment = ["(* ", "*)"]
 autoclose_before = ";,=)}]"
-brackets = [ 
+brackets = [
   { start = "{", end = "}", close = true, newline = true },
   { start = "<", end = ">", close = true, newline = true },
   { start = "[", end = "]", close = true, newline = true },
diff --git a/crates/zed/src/languages/php/config.toml b/crates/zed/src/languages/php/config.toml
index 9c6e9b767c..db594f8a18 100644
--- a/crates/zed/src/languages/php/config.toml
+++ b/crates/zed/src/languages/php/config.toml
@@ -1,4 +1,5 @@
 name = "PHP"
+grammar = "php"
 path_suffixes = ["php"]
 first_line_pattern = '^#!.*php'
 line_comments = ["// ", "# "]
diff --git a/crates/zed/src/languages/proto/config.toml b/crates/zed/src/languages/proto/config.toml
index 81fe1bdfb4..b8bccfd39b 100644
--- a/crates/zed/src/languages/proto/config.toml
+++ b/crates/zed/src/languages/proto/config.toml
@@ -1,4 +1,5 @@
 name = "proto"
+grammar = "proto"
 path_suffixes = ["proto"]
 line_comments = ["// "]
 autoclose_before = ";:.,=}])>"
diff --git a/crates/zed/src/languages/purescript/config.toml b/crates/zed/src/languages/purescript/config.toml
index ee9810dbb7..350f476978 100644
--- a/crates/zed/src/languages/purescript/config.toml
+++ b/crates/zed/src/languages/purescript/config.toml
@@ -1,4 +1,5 @@
 name = "PureScript"
+grammar = "purescript"
 path_suffixes = ["purs"]
 autoclose_before = ",=)}]"
 line_comments = ["-- "]
diff --git a/crates/zed/src/languages/python/config.toml b/crates/zed/src/languages/python/config.toml
index 3496f845dc..d5254eac90 100644
--- a/crates/zed/src/languages/python/config.toml
+++ b/crates/zed/src/languages/python/config.toml
@@ -1,4 +1,5 @@
 name = "Python"
+grammar = "python"
 path_suffixes = ["py", "pyi", "mpy"]
 first_line_pattern = '^#!.*\bpython[0-9.]*\b'
 line_comments = ["# "]
diff --git a/crates/zed/src/languages/racket/config.toml b/crates/zed/src/languages/racket/config.toml
index aea5ec5fce..d5975a36e5 100644
--- a/crates/zed/src/languages/racket/config.toml
+++ b/crates/zed/src/languages/racket/config.toml
@@ -1,4 +1,5 @@
 name = "Racket"
+grammar = "racket"
 path_suffixes = ["rkt"]
 line_comments = ["; "]
 autoclose_before = "])"
diff --git a/crates/zed/src/languages/ruby/config.toml b/crates/zed/src/languages/ruby/config.toml
index 8f2f1fab97..d3285d48d2 100644
--- a/crates/zed/src/languages/ruby/config.toml
+++ b/crates/zed/src/languages/ruby/config.toml
@@ -1,4 +1,5 @@
 name = "Ruby"
+grammar = "ruby"
 path_suffixes = [
   "rb",
   "Gemfile",
diff --git a/crates/zed/src/languages/rust/config.toml b/crates/zed/src/languages/rust/config.toml
index 9382c9d78b..d01f62e354 100644
--- a/crates/zed/src/languages/rust/config.toml
+++ b/crates/zed/src/languages/rust/config.toml
@@ -1,4 +1,5 @@
 name = "Rust"
+grammar = "rust"
 path_suffixes = ["rs"]
 line_comments = ["// ", "/// ", "//! "]
 autoclose_before = ";:.,=}])>"
diff --git a/crates/zed/src/languages/scheme/config.toml b/crates/zed/src/languages/scheme/config.toml
index c080f6d2ee..abe6d043e9 100644
--- a/crates/zed/src/languages/scheme/config.toml
+++ b/crates/zed/src/languages/scheme/config.toml
@@ -1,4 +1,5 @@
 name = "Scheme"
+grammar = "scheme"
 path_suffixes = ["scm", "ss"]
 line_comments = ["; "]
 autoclose_before = "])"
diff --git a/crates/zed/src/languages/svelte/config.toml b/crates/zed/src/languages/svelte/config.toml
index ff450f3f84..a05f4f9a4f 100644
--- a/crates/zed/src/languages/svelte/config.toml
+++ b/crates/zed/src/languages/svelte/config.toml
@@ -1,4 +1,5 @@
 name = "Svelte"
+grammar = "svelte"
 path_suffixes = ["svelte"]
 block_comment = ["<!-- ", " -->"]
 autoclose_before = ";:.,=}])>"
diff --git a/crates/zed/src/languages/terraform/config.toml b/crates/zed/src/languages/terraform/config.toml
index 9ea5896001..09e52621a9 100644
--- a/crates/zed/src/languages/terraform/config.toml
+++ b/crates/zed/src/languages/terraform/config.toml
@@ -1,4 +1,5 @@
 name = "Terraform"
+grammar = "terraform"
 path_suffixes = ["tf", "tfvars"]
 line_comments = ["# ", "// "]
 block_comment = ["/*", "*/"]
diff --git a/crates/zed/src/languages/toml/config.toml b/crates/zed/src/languages/toml/config.toml
index 701dbbd65a..660d893ec2 100644
--- a/crates/zed/src/languages/toml/config.toml
+++ b/crates/zed/src/languages/toml/config.toml
@@ -1,4 +1,5 @@
 name = "TOML"
+grammar = "toml"
 path_suffixes = ["Cargo.lock", "toml"]
 line_comments = ["# "]
 autoclose_before = ",]}"
diff --git a/crates/zed/src/languages/tsx/config.toml b/crates/zed/src/languages/tsx/config.toml
index 6806924d4a..666c55d9a7 100644
--- a/crates/zed/src/languages/tsx/config.toml
+++ b/crates/zed/src/languages/tsx/config.toml
@@ -1,4 +1,5 @@
 name = "TSX"
+grammar = "tsx"
 path_suffixes = ["tsx"]
 line_comments = ["// "]
 autoclose_before = ";:.,=}])>"
diff --git a/crates/zed/src/languages/typescript/config.toml b/crates/zed/src/languages/typescript/config.toml
index 4d51a74098..8a9f2bc8f0 100644
--- a/crates/zed/src/languages/typescript/config.toml
+++ b/crates/zed/src/languages/typescript/config.toml
@@ -1,4 +1,5 @@
 name = "TypeScript"
+grammar = "typescript"
 path_suffixes = ["ts", "cts", "d.cts", "d.mts", "mts"]
 line_comments = ["// "]
 autoclose_before = ";:.,=}])>"
diff --git a/crates/zed/src/languages/uiua/config.toml b/crates/zed/src/languages/uiua/config.toml
index 88cd8c7ad0..31f9303659 100644
--- a/crates/zed/src/languages/uiua/config.toml
+++ b/crates/zed/src/languages/uiua/config.toml
@@ -1,4 +1,5 @@
 name = "Uiua"
+grammar = "uiua"
 path_suffixes = ["ua"]
 line_comments = ["# "]
 autoclose_before = ")]}\""
diff --git a/crates/zed/src/languages/vue/config.toml b/crates/zed/src/languages/vue/config.toml
index c41a667b75..cf966d02d7 100644
--- a/crates/zed/src/languages/vue/config.toml
+++ b/crates/zed/src/languages/vue/config.toml
@@ -1,4 +1,5 @@
 name = "Vue.js"
+grammar = "vue"
 path_suffixes = ["vue"]
 block_comment = ["<!-- ", " -->"]
 autoclose_before = ";:.,=}])>"
diff --git a/crates/zed/src/languages/yaml/config.toml b/crates/zed/src/languages/yaml/config.toml
index dce8d68d66..a4588275c1 100644
--- a/crates/zed/src/languages/yaml/config.toml
+++ b/crates/zed/src/languages/yaml/config.toml
@@ -1,4 +1,5 @@
 name = "YAML"
+grammar = "yaml"
 path_suffixes = ["yml", "yaml"]
 line_comments = ["# "]
 autoclose_before = ",]}"
diff --git a/crates/zed/src/languages/zig/config.toml b/crates/zed/src/languages/zig/config.toml
index 6f72663280..2cf9cf79bc 100644
--- a/crates/zed/src/languages/zig/config.toml
+++ b/crates/zed/src/languages/zig/config.toml
@@ -1,4 +1,5 @@
 name = "Zig"
+grammar = "zig"
 path_suffixes = ["zig"]
 line_comments = ["// "]
 autoclose_before = ";:.,=}])>"
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index f010468d26..83eaa1de10 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -47,7 +47,7 @@ use theme::{ActiveTheme, SystemAppearance, ThemeRegistry, ThemeSettings};
 use util::{
     async_maybe,
     http::{self, HttpClient, ZedHttpClient},
-    paths::{self, CRASHES_DIR, CRASHES_RETIRED_DIR, PLUGINS_DIR},
+    paths::{self, CRASHES_DIR, CRASHES_RETIRED_DIR},
     ResultExt,
 };
 use uuid::Uuid;
@@ -173,6 +173,8 @@ fn main() {
         );
         assistant::init(cx);
 
+        extension::init(fs.clone(), languages.clone(), ThemeRegistry::global(cx), cx);
+
         load_user_themes_in_background(fs.clone(), cx);
         watch_themes(fs.clone(), cx);
 
@@ -976,20 +978,13 @@ fn watch_themes(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {
     .detach()
 }
 
+#[cfg(debug_assertions)]
 async fn watch_languages(fs: Arc<dyn fs::Fs>, languages: Arc<LanguageRegistry>) {
     let reload_debounce = Duration::from_millis(250);
 
-    let mut events = fs.watch(PLUGINS_DIR.as_ref(), reload_debounce).await;
-
-    #[cfg(debug_assertions)]
-    {
-        events = futures::stream::select(
-            events,
-            fs.watch("crates/zed/src/languages".as_ref(), reload_debounce)
-                .await,
-        )
-        .boxed();
-    }
+    let mut events = fs
+        .watch("crates/zed/src/languages".as_ref(), reload_debounce)
+        .await;
 
     while (events.next().await).is_some() {
         languages.reload();
@@ -1019,3 +1014,6 @@ fn watch_file_types(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {
 
 #[cfg(not(debug_assertions))]
 fn watch_file_types(_fs: Arc<dyn fs::Fs>, _cx: &mut AppContext) {}
+
+#[cfg(not(debug_assertions))]
+async fn watch_languages(_fs: Arc<dyn fs::Fs>, _languages: Arc<LanguageRegistry>) {}
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index b4ec471113..e9e64cff49 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -739,7 +739,7 @@ mod tests {
         actions, Action, AnyWindowHandle, AppContext, AssetSource, Entity, TestAppContext,
         VisualTestContext, WindowHandle,
     };
-    use language::LanguageRegistry;
+    use language::{LanguageMatcher, LanguageRegistry};
     use project::{project_settings::ProjectSettings, Project, ProjectPath};
     use serde_json::json;
     use settings::{handle_settings_file_changes, watch_config_file, SettingsStore};
@@ -2742,7 +2742,10 @@ mod tests {
         Arc::new(language::Language::new(
             language::LanguageConfig {
                 name: "Rust".into(),
-                path_suffixes: vec!["rs".to_string()],
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
                 ..Default::default()
             },
             Some(tree_sitter_rust::language()),

From eaadf56db92a51ecccbf36b289ee6848e665bbbd Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 7 Feb 2024 13:55:36 -0700
Subject: [PATCH 303/372] Testing buf breaking (#7475)

Release Notes:

- N/A
---
 .github/actions/check_style/action.yml |  6 ------
 .github/workflows/ci.yml               | 11 +++++++++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/actions/check_style/action.yml b/.github/actions/check_style/action.yml
index 39601e8c25..e95c6b493a 100644
--- a/.github/actions/check_style/action.yml
+++ b/.github/actions/check_style/action.yml
@@ -22,9 +22,3 @@ runs:
           run: |
               export SQUAWK_GITHUB_TOKEN=${{ github.token }}
               . ./script/squawk
-
-        - uses: bufbuild/buf-setup-action@v1
-        - uses: bufbuild/buf-breaking-action@v1
-          with:
-              input: "crates/rpc/proto/"
-              against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=main,subdir=crates/rpc/proto/"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8ad9f57fd1..b7bde60eec 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,6 +48,17 @@ jobs:
             - name: Run style checks
               uses: ./.github/actions/check_style
 
+            - name: Ensure fresh merge
+              run: |
+                git checkout -B temp
+                git merge -q origin/main -m "merge main into temp"
+
+            - uses: bufbuild/buf-setup-action@v1
+            - uses: bufbuild/buf-breaking-action@v1
+              with:
+                  input: "crates/rpc/proto/"
+                  against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=main,subdir=crates/rpc/proto/"
+
     tests:
         name: Run tests
         runs-on:

From 31d9edfaaae19167132cca1c96fc8d7bb511ddd7 Mon Sep 17 00:00:00 2001
From: Daniel Banck <dbanck@users.noreply.github.com>
Date: Wed, 7 Feb 2024 22:06:13 +0100
Subject: [PATCH 304/372] Fix Terraform syntax highlighting (#7518)

https://github.com/zed-industries/zed/pull/7467 introduced a new
`grammar` field in the language configuration files.
The underlying tree-sitter grammar for Terraform should be `hcl` instead
of `terraform`. This PR fixes that typo.

Release Notes:

- N/A
---
 crates/zed/src/languages/terraform/config.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/zed/src/languages/terraform/config.toml b/crates/zed/src/languages/terraform/config.toml
index 09e52621a9..11fe6fcd31 100644
--- a/crates/zed/src/languages/terraform/config.toml
+++ b/crates/zed/src/languages/terraform/config.toml
@@ -1,5 +1,5 @@
 name = "Terraform"
-grammar = "terraform"
+grammar = "hcl"
 path_suffixes = ["tf", "tfvars"]
 line_comments = ["# ", "// "]
 block_comment = ["/*", "*/"]

From 2f4bb7955370f98c30cd9bdaef809310afd9ade9 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Wed, 7 Feb 2024 16:11:24 -0500
Subject: [PATCH 305/372] Reload themes defined in extensions (#7520)

This PR extends the extension directory watcher to also watch and reload
themes defined in extensions.

Release Notes:

- N/A

Co-authored-by: Max <max@zed.dev>
---
 crates/extension/src/extension_store.rs | 73 +++++++++++++++++++------
 crates/theme/src/settings.rs            | 14 +++++
 2 files changed, 71 insertions(+), 16 deletions(-)

diff --git a/crates/extension/src/extension_store.rs b/crates/extension/src/extension_store.rs
index 9b9892641d..fffaac44e4 100644
--- a/crates/extension/src/extension_store.rs
+++ b/crates/extension/src/extension_store.rs
@@ -14,7 +14,7 @@ use std::{
     sync::Arc,
     time::Duration,
 };
-use theme::ThemeRegistry;
+use theme::{ThemeRegistry, ThemeSettings};
 use util::{paths::EXTENSIONS_DIR, ResultExt};
 
 #[cfg(test)]
@@ -27,7 +27,7 @@ pub struct ExtensionStore {
     manifest_path: PathBuf,
     language_registry: Arc<LanguageRegistry>,
     theme_registry: Arc<ThemeRegistry>,
-    _watch_extensions_dir: Task<()>,
+    _watch_extensions_dir: [Task<()>; 2],
 }
 
 struct GlobalExtensionStore(Model<ExtensionStore>);
@@ -103,7 +103,7 @@ impl ExtensionStore {
             fs,
             language_registry,
             theme_registry,
-            _watch_extensions_dir: Task::ready(()),
+            _watch_extensions_dir: [Task::ready(()), Task::ready(())],
         };
         this._watch_extensions_dir = this.watch_extensions_dir(cx);
         this.load(cx);
@@ -176,30 +176,71 @@ impl ExtensionStore {
         *self.manifest.write() = manifest;
     }
 
-    fn watch_extensions_dir(&self, cx: &mut ModelContext<Self>) -> Task<()> {
+    fn watch_extensions_dir(&self, cx: &mut ModelContext<Self>) -> [Task<()>; 2] {
         let manifest = self.manifest.clone();
         let fs = self.fs.clone();
         let language_registry = self.language_registry.clone();
+        let theme_registry = self.theme_registry.clone();
         let extensions_dir = self.extensions_dir.clone();
-        cx.background_executor().spawn(async move {
-            let mut changed_languages = HashSet::default();
+
+        let (reload_theme_tx, mut reload_theme_rx) = futures::channel::mpsc::unbounded();
+
+        let events_task = cx.background_executor().spawn(async move {
             let mut events = fs.watch(&extensions_dir, Duration::from_millis(250)).await;
             while let Some(events) = events.next().await {
-                changed_languages.clear();
-                let manifest = manifest.read();
-                for event in events {
-                    for (language_name, language) in &manifest.languages {
-                        let mut language_path = extensions_dir.clone();
-                        language_path
-                            .extend([language.extension.as_ref(), language.path.as_path()]);
-                        if event.path.starts_with(&language_path) || event.path == language_path {
-                            changed_languages.insert(language_name.clone());
+                let mut changed_languages = HashSet::default();
+                let mut changed_themes = HashSet::default();
+
+                {
+                    let manifest = manifest.read();
+                    for event in events {
+                        for (language_name, language) in &manifest.languages {
+                            let mut language_path = extensions_dir.clone();
+                            language_path
+                                .extend([language.extension.as_ref(), language.path.as_path()]);
+                            if event.path.starts_with(&language_path) || event.path == language_path
+                            {
+                                changed_languages.insert(language_name.clone());
+                            }
+                        }
+
+                        for (_theme_name, theme) in &manifest.themes {
+                            let mut theme_path = extensions_dir.clone();
+                            theme_path.extend([theme.extension.as_ref(), theme.path.as_path()]);
+                            if event.path.starts_with(&theme_path) || event.path == theme_path {
+                                changed_themes.insert(theme_path.clone());
+                            }
                         }
                     }
                 }
+
                 language_registry.reload_languages(&changed_languages);
+
+                for theme_path in &changed_themes {
+                    theme_registry
+                        .load_user_theme(&theme_path, fs.clone())
+                        .await
+                        .log_err();
+                }
+
+                if !changed_themes.is_empty() {
+                    reload_theme_tx.unbounded_send(()).ok();
+                }
             }
-        })
+        });
+
+        let reload_theme_task = cx.spawn(|_, cx| async move {
+            while let Some(_) = reload_theme_rx.next().await {
+                if cx
+                    .update(|cx| ThemeSettings::reload_current_theme(cx))
+                    .is_err()
+                {
+                    break;
+                }
+            }
+        });
+
+        [events_task, reload_theme_task]
     }
 
     pub fn reload(&mut self, cx: &mut ModelContext<Self>) -> Task<Result<()>> {
diff --git a/crates/theme/src/settings.rs b/crates/theme/src/settings.rs
index dd16239708..535646fb25 100644
--- a/crates/theme/src/settings.rs
+++ b/crates/theme/src/settings.rs
@@ -33,6 +33,20 @@ pub struct ThemeSettings {
     pub theme_overrides: Option<ThemeStyleContent>,
 }
 
+impl ThemeSettings {
+    pub fn reload_current_theme(cx: &mut AppContext) {
+        let mut theme_settings = ThemeSettings::get_global(cx).clone();
+
+        if let Some(theme_selection) = theme_settings.theme_selection.clone() {
+            let theme_name = theme_selection.theme(*SystemAppearance::global(cx));
+
+            if let Some(_theme) = theme_settings.switch_theme(&theme_name, cx) {
+                ThemeSettings::override_global(theme_settings, cx);
+            }
+        }
+    }
+}
+
 /// The appearance of the system.
 #[derive(Debug, Clone, Copy, Deref)]
 pub struct SystemAppearance(pub Appearance);

From 45cf36e870b273a4e039e4cb57205c38e7aebf4b Mon Sep 17 00:00:00 2001
From: d1y <chenhonzhou@gmail.com>
Date: Thu, 8 Feb 2024 05:23:36 +0800
Subject: [PATCH 306/372] theme_importer: Add `--output` flag for outputting
 the theme to a file (#7486)

```bash
cargo run -p theme_importer -- dark-plus-syntax-color-theme.json --output output.json
```

Release Notes:

- N/A

---------

Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>
---
 crates/theme_importer/README.md   |  4 ++++
 crates/theme_importer/src/main.rs | 12 +++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/crates/theme_importer/README.md b/crates/theme_importer/README.md
index 156c338b9a..20b7d063ad 100644
--- a/crates/theme_importer/README.md
+++ b/crates/theme_importer/README.md
@@ -1 +1,5 @@
 # Zed Theme Importer
+
+```sh
+cargo run -p theme_importer -- dark-plus-syntax-color-theme.json --output output-theme.json
+```
diff --git a/crates/theme_importer/src/main.rs b/crates/theme_importer/src/main.rs
index be470e6833..765dd38ea9 100644
--- a/crates/theme_importer/src/main.rs
+++ b/crates/theme_importer/src/main.rs
@@ -4,6 +4,7 @@ mod util;
 mod vscode;
 
 use std::fs::File;
+use std::io::Write;
 use std::path::PathBuf;
 
 use anyhow::{Context, Result};
@@ -75,6 +76,10 @@ struct Args {
     #[arg(long)]
     warn_on_missing: bool,
 
+    /// The path to write the output to.
+    #[arg(long, short)]
+    output: Option<PathBuf>,
+
     #[command(subcommand)]
     command: Option<Command>,
 }
@@ -146,7 +151,12 @@ fn main() -> Result<()> {
 
     let theme_json = serde_json::to_string_pretty(&theme).unwrap();
 
-    println!("{}", theme_json);
+    if let Some(output) = args.output {
+        let mut file = File::create(output)?;
+        file.write_all(theme_json.as_bytes())?;
+    } else {
+        println!("{}", theme_json);
+    }
 
     log::info!("Done!");
 

From 374c8a4c8c65128e08a5db3f419cfde95e651557 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Wed, 7 Feb 2024 16:56:24 -0500
Subject: [PATCH 307/372] Reload theme using
 `ThemeSettings::reload_current_theme` (#7522)

This PR updates the various spots where we reload the theme to use
`ThemeSettings::reload_current_theme` instead of duplicating the code
each time.

Release Notes:

- N/A
---
 crates/theme/src/settings.rs      |  4 ++++
 crates/workspace/src/workspace.rs | 10 +---------
 crates/zed/src/main.rs            | 30 +++---------------------------
 3 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/crates/theme/src/settings.rs b/crates/theme/src/settings.rs
index 535646fb25..51e48180ae 100644
--- a/crates/theme/src/settings.rs
+++ b/crates/theme/src/settings.rs
@@ -34,6 +34,10 @@ pub struct ThemeSettings {
 }
 
 impl ThemeSettings {
+    /// Reloads the current theme.
+    ///
+    /// Reads the [`ThemeSettings`] to know which theme should be loaded,
+    /// taking into account the current [`SystemAppearance`].
     pub fn reload_current_theme(cx: &mut AppContext) {
         let mut theme_settings = ThemeSettings::get_global(cx).clone();
 
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 77a2a47400..fc4040be0d 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -687,15 +687,7 @@ impl Workspace {
 
                 *SystemAppearance::global_mut(cx) = SystemAppearance(window_appearance.into());
 
-                let mut theme_settings = ThemeSettings::get_global(cx).clone();
-
-                if let Some(theme_selection) = theme_settings.theme_selection.clone() {
-                    let theme_name = theme_selection.theme(window_appearance.into());
-
-                    if let Some(_theme) = theme_settings.switch_theme(&theme_name, cx) {
-                        ThemeSettings::override_global(theme_settings, cx);
-                    }
-                }
+                ThemeSettings::reload_current_theme(cx);
             }),
             cx.observe(&left_dock, |this, _, cx| {
                 this.serialize_workspace(cx);
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 5cdc238777..9311c934db 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -918,16 +918,7 @@ fn load_user_themes_in_background(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {
                     }
                 }
                 theme_registry.load_user_themes(themes_dir, fs).await?;
-                cx.update(|cx| {
-                    let mut theme_settings = ThemeSettings::get_global(cx).clone();
-                    if let Some(theme_selection) = theme_settings.theme_selection.clone() {
-                        let theme_name = theme_selection.theme(*SystemAppearance::global(cx));
-
-                        if let Some(_theme) = theme_settings.switch_theme(&theme_name, cx) {
-                            ThemeSettings::override_global(theme_settings, cx);
-                        }
-                    }
-                })?;
+                cx.update(|cx| ThemeSettings::reload_current_theme(cx))?;
             }
             anyhow::Ok(())
         }
@@ -958,23 +949,8 @@ fn watch_themes(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {
                             .await
                             .log_err()
                         {
-                            cx.update(|cx| {
-                                let mut theme_settings = ThemeSettings::get_global(cx).clone();
-
-                                if let Some(theme_selection) =
-                                    theme_settings.theme_selection.clone()
-                                {
-                                    let theme_name =
-                                        theme_selection.theme(*SystemAppearance::global(cx));
-
-                                    if let Some(_theme) =
-                                        theme_settings.switch_theme(&theme_name, cx)
-                                    {
-                                        ThemeSettings::override_global(theme_settings, cx);
-                                    }
-                                }
-                            })
-                            .log_err();
+                            cx.update(|cx| ThemeSettings::reload_current_theme(cx))
+                                .log_err();
                         }
                     }
                 }

From f55aba51ec770f412a61aee6c6b2c9d8174a6f81 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 7 Feb 2024 16:35:30 -0700
Subject: [PATCH 308/372] Fix panic! caused by bad utf16 clipping (#7530)

Release Notes:

- Fixed a panic in diagnostics with emojis

**or**

- N/A
---
 crates/project/src/project.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index eedfa16e70..06baa7f709 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -3987,7 +3987,7 @@ impl Project {
                 range.end = snapshot.clip_point_utf16(Unclipped(range.end), Bias::Right);
                 if range.start == range.end && range.end.column > 0 {
                     range.start.column -= 1;
-                    range.end = snapshot.clip_point_utf16(Unclipped(range.end), Bias::Left);
+                    range.start = snapshot.clip_point_utf16(Unclipped(range.start), Bias::Left);
                 }
             }
 

From 6cdd7796c335515c61c2ab17bf0c7f56caa1d062 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <53836821+bennetbo@users.noreply.github.com>
Date: Thu, 8 Feb 2024 00:36:30 +0100
Subject: [PATCH 309/372] terminal: strikethrough text (#7507)

#7363 added support for rendering strikethrough text, so now we can
handle this case in the terminal.

Should close: #7434

Before:

![image](https://github.com/zed-industries/zed/assets/53836821/cb7a4eae-5bc9-425c-974d-07a9f089917a)

After:

![image](https://github.com/zed-industries/zed/assets/53836821/5aaacee2-95bc-4039-972d-96bd7c01ea59)

Release Notes:

- Fixed rendering strikethrough text inside the terminal #7434
---
 crates/terminal_view/src/terminal_element.rs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index eaac6069c2..addf55ee45 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -4,8 +4,8 @@ use gpui::{
     ElementContext, ElementId, FocusHandle, Font, FontStyle, FontWeight, HighlightStyle, Hsla,
     InputHandler, InteractiveBounds, InteractiveElement, InteractiveElementState, Interactivity,
     IntoElement, LayoutId, Model, ModelContext, ModifiersChangedEvent, MouseButton, MouseMoveEvent,
-    Pixels, Point, ShapedLine, StatefulInteractiveElement, Styled, TextRun, TextStyle,
-    UnderlineStyle, WeakView, WhiteSpace, WindowContext, WindowTextSystem,
+    Pixels, Point, ShapedLine, StatefulInteractiveElement, StrikethroughStyle, Styled, TextRun,
+    TextStyle, UnderlineStyle, WeakView, WhiteSpace, WindowContext, WindowTextSystem,
 };
 use itertools::Itertools;
 use language::CursorShape;
@@ -340,6 +340,13 @@ impl TerminalElement {
             wavy: flags.contains(Flags::UNDERCURL),
         });
 
+        let strikethrough = flags
+            .intersects(Flags::STRIKEOUT)
+            .then(|| StrikethroughStyle {
+                color: Some(fg),
+                thickness: Pixels::from(1.0),
+            });
+
         let weight = if flags.intersects(Flags::BOLD | Flags::DIM_BOLD) {
             FontWeight::BOLD
         } else {
@@ -362,7 +369,7 @@ impl TerminalElement {
                 ..text_style.font()
             },
             underline,
-            strikethrough: None,
+            strikethrough,
         };
 
         if let Some((style, range)) = hyperlink {

From 219ec91748cd09cd5320cdcbb0f36c155fc54c5f Mon Sep 17 00:00:00 2001
From: Antar <blocr@proton.me>
Date: Thu, 8 Feb 2024 00:46:24 +0100
Subject: [PATCH 310/372] Fix compile errors on Linux (#7527)

Added some missing trait functions and `unimplemented` markings

Release Notes:

- N/A
---
 crates/gpui/src/platform/linux/platform.rs | 8 +++++++-
 crates/gpui/src/platform/linux/window.rs   | 3 ---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index 30d2b66bf0..9e0c670be5 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -345,7 +345,9 @@ impl Platform for LinuxPlatform {
     fn set_cursor_style(&self, style: CursorStyle) {}
 
     //todo!(linux)
-    fn should_auto_hide_scrollbars(&self) -> bool {}
+    fn should_auto_hide_scrollbars(&self) -> bool {
+        unimplemented!()
+    }
 
     //todo!(linux)
     fn write_to_clipboard(&self, item: ClipboardItem) {}
@@ -366,6 +368,10 @@ impl Platform for LinuxPlatform {
     fn delete_credentials(&self, url: &str) -> Task<Result<()>> {
         unimplemented!()
     }
+
+    fn window_appearance(&self) -> crate::WindowAppearance {
+        unimplemented!()
+    }
 }
 
 #[cfg(test)]
diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index 9ad02039e8..972000b5d5 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -410,9 +410,6 @@ impl PlatformWindow for LinuxWindow {
         unimplemented!()
     }
 
-    //todo!(linux)
-    fn invalidate(&self) {}
-
     fn draw(&self, scene: &crate::Scene) {
         let mut inner = self.0.inner.lock();
         inner.renderer.draw(scene);

From f2a4dbaf7f3fa064fb4480cdab31fe18f5501f34 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Wed, 7 Feb 2024 18:50:11 -0500
Subject: [PATCH 311/372] Fix typo in `mark_language_loaded` doc comment
 (#7533)

This PR fixes a small typo in the `mark_language_loaded` doc comment.

Release Notes:

- N/A
---
 crates/language/src/language.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index eee05ea8e2..c3c76b11ba 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -1370,7 +1370,7 @@ impl LanguageRegistryState {
         *self.subscription.0.borrow_mut() = ();
     }
 
-    /// Mark the given language a having been loaded, so that the
+    /// Mark the given language as having been loaded, so that the
     /// language registry won't try to load it again.
     fn mark_language_loaded(&mut self, id: AvailableLanguageId) {
         for language in &mut self.available_languages {

From 7b03e977e4513f70e0c921288961ebf8a404dc8d Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Wed, 7 Feb 2024 16:39:11 -0800
Subject: [PATCH 312/372] Reload grammars in extensions when they are updated
 on disk (#7531)

Release Notes:

- N/A

---------

Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>
Co-authored-by: Marshall <marshall@zed.dev>
---
 crates/editor/src/editor.rs                  |   4 +
 crates/extension/src/extension_store.rs      |  38 ++++--
 crates/extension/src/extension_store_test.rs |   2 +
 crates/language/src/buffer.rs                |   1 +
 crates/language/src/language.rs              | 116 ++++++++++++-------
 crates/util/src/paths.rs                     |   7 +-
 6 files changed, 111 insertions(+), 57 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index b30c9dd848..0085761e0b 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -8772,6 +8772,10 @@ impl Editor {
                 cx.emit(EditorEvent::ExcerptsRemoved { ids: ids.clone() })
             }
             multi_buffer::Event::Reparsed => cx.emit(EditorEvent::Reparsed),
+            multi_buffer::Event::LanguageChanged => {
+                cx.emit(EditorEvent::Reparsed);
+                cx.notify();
+            }
             multi_buffer::Event::DirtyChanged => cx.emit(EditorEvent::DirtyChanged),
             multi_buffer::Event::Saved => cx.emit(EditorEvent::Saved),
             multi_buffer::Event::FileHandleChanged | multi_buffer::Event::Reloaded => {
diff --git a/crates/extension/src/extension_store.rs b/crates/extension/src/extension_store.rs
index fffaac44e4..ad88c95729 100644
--- a/crates/extension/src/extension_store.rs
+++ b/crates/extension/src/extension_store.rs
@@ -1,5 +1,5 @@
-use anyhow::Result;
-use collections::{HashMap, HashSet};
+use anyhow::{Context as _, Result};
+use collections::HashMap;
 use fs::Fs;
 use futures::StreamExt as _;
 use gpui::{actions, AppContext, Context, Global, Model, ModelContext, Task};
@@ -36,7 +36,7 @@ impl Global for GlobalExtensionStore {}
 
 #[derive(Deserialize, Serialize, Default)]
 pub struct Manifest {
-    pub grammars: HashMap<String, GrammarManifestEntry>,
+    pub grammars: HashMap<Arc<str>, GrammarManifestEntry>,
     pub languages: HashMap<Arc<str>, LanguageManifestEntry>,
     pub themes: HashMap<String, ThemeManifestEntry>,
 }
@@ -52,6 +52,7 @@ pub struct LanguageManifestEntry {
     extension: String,
     path: PathBuf,
     matcher: LanguageMatcher,
+    grammar: Option<Arc<str>>,
 }
 
 #[derive(Clone, PartialEq, Debug, Deserialize, Serialize)]
@@ -152,6 +153,7 @@ impl ExtensionStore {
             self.language_registry.register_extension(
                 language_path.into(),
                 language_name.clone(),
+                language.grammar.clone(),
                 language.matcher.clone(),
                 load_plugin_queries,
             );
@@ -188,19 +190,29 @@ impl ExtensionStore {
         let events_task = cx.background_executor().spawn(async move {
             let mut events = fs.watch(&extensions_dir, Duration::from_millis(250)).await;
             while let Some(events) = events.next().await {
-                let mut changed_languages = HashSet::default();
-                let mut changed_themes = HashSet::default();
+                let mut changed_grammars = Vec::default();
+                let mut changed_languages = Vec::default();
+                let mut changed_themes = Vec::default();
 
                 {
                     let manifest = manifest.read();
                     for event in events {
+                        for (grammar_name, grammar) in &manifest.grammars {
+                            let mut grammar_path = extensions_dir.clone();
+                            grammar_path
+                                .extend([grammar.extension.as_ref(), grammar.path.as_path()]);
+                            if event.path.starts_with(&grammar_path) || event.path == grammar_path {
+                                changed_grammars.push(grammar_name.clone());
+                            }
+                        }
+
                         for (language_name, language) in &manifest.languages {
                             let mut language_path = extensions_dir.clone();
                             language_path
                                 .extend([language.extension.as_ref(), language.path.as_path()]);
                             if event.path.starts_with(&language_path) || event.path == language_path
                             {
-                                changed_languages.insert(language_name.clone());
+                                changed_languages.push(language_name.clone());
                             }
                         }
 
@@ -208,18 +220,19 @@ impl ExtensionStore {
                             let mut theme_path = extensions_dir.clone();
                             theme_path.extend([theme.extension.as_ref(), theme.path.as_path()]);
                             if event.path.starts_with(&theme_path) || event.path == theme_path {
-                                changed_themes.insert(theme_path.clone());
+                                changed_themes.push(theme_path.clone());
                             }
                         }
                     }
                 }
 
-                language_registry.reload_languages(&changed_languages);
+                language_registry.reload_languages(&changed_languages, &changed_grammars);
 
                 for theme_path in &changed_themes {
                     theme_registry
                         .load_user_theme(&theme_path, fs.clone())
                         .await
+                        .context("failed to load user theme")
                         .log_err();
                 }
 
@@ -253,7 +266,10 @@ impl ExtensionStore {
                 .spawn(async move {
                     let mut manifest = Manifest::default();
 
-                    let mut extension_paths = fs.read_dir(&extensions_dir).await?;
+                    let mut extension_paths = fs
+                        .read_dir(&extensions_dir)
+                        .await
+                        .context("failed to read extensions directory")?;
                     while let Some(extension_dir) = extension_paths.next().await {
                         let extension_dir = extension_dir?;
                         let Some(extension_name) =
@@ -305,6 +321,7 @@ impl ExtensionStore {
                                         extension: extension_name.into(),
                                         path: relative_path.into(),
                                         matcher: config.matcher,
+                                        grammar: config.grammar,
                                     },
                                 );
                             }
@@ -345,7 +362,8 @@ impl ExtensionStore {
                         &serde_json::to_string_pretty(&manifest)?.as_str().into(),
                         Default::default(),
                     )
-                    .await?;
+                    .await
+                    .context("failed to save extension manifest")?;
 
                     anyhow::Ok(manifest)
                 })
diff --git a/crates/extension/src/extension_store_test.rs b/crates/extension/src/extension_store_test.rs
index e95496b529..758111b286 100644
--- a/crates/extension/src/extension_store_test.rs
+++ b/crates/extension/src/extension_store_test.rs
@@ -106,6 +106,7 @@ async fn test_extension_store(cx: &mut TestAppContext) {
                 LanguageManifestEntry {
                     extension: "zed-ruby".into(),
                     path: "languages/erb".into(),
+                    grammar: Some("embedded_template".into()),
                     matcher: LanguageMatcher {
                         path_suffixes: vec!["erb".into()],
                         first_line_pattern: None,
@@ -117,6 +118,7 @@ async fn test_extension_store(cx: &mut TestAppContext) {
                 LanguageManifestEntry {
                     extension: "zed-ruby".into(),
                     path: "languages/ruby".into(),
+                    grammar: Some("ruby".into()),
                     matcher: LanguageMatcher {
                         path_suffixes: vec!["rb".into()],
                         first_line_pattern: None,
diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index b42ea1f12d..debf790936 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -758,6 +758,7 @@ impl Buffer {
 
     /// Assign a language to the buffer.
     pub fn set_language(&mut self, language: Option<Arc<Language>>, cx: &mut ModelContext<Self>) {
+        self.parse_count += 1;
         self.syntax_map.lock().clear();
         self.language = language;
         self.reparse(cx);
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index c3c76b11ba..f811637a24 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -740,14 +740,16 @@ type AvailableLanguageId = usize;
 struct AvailableLanguage {
     id: AvailableLanguageId,
     name: Arc<str>,
+    grammar: Option<Arc<str>>,
     source: AvailableLanguageSource,
     lsp_adapters: Vec<Arc<dyn LspAdapter>>,
     loaded: bool,
 }
 
 enum AvailableGrammar {
-    Loaded(tree_sitter::Language),
-    Loading(Vec<oneshot::Sender<Result<tree_sitter::Language>>>),
+    Native(tree_sitter::Language),
+    Loaded(PathBuf, tree_sitter::Language),
+    Loading(PathBuf, Vec<oneshot::Sender<Result<tree_sitter::Language>>>),
     Unloaded(PathBuf),
 }
 
@@ -781,7 +783,7 @@ struct LanguageRegistryState {
     next_language_server_id: usize,
     languages: Vec<Arc<Language>>,
     available_languages: Vec<AvailableLanguage>,
-    grammars: HashMap<String, AvailableGrammar>,
+    grammars: HashMap<Arc<str>, AvailableGrammar>,
     next_available_language_id: AvailableLanguageId,
     loading_languages: HashMap<AvailableLanguageId, Vec<oneshot::Sender<Result<Arc<Language>>>>>,
     subscription: (watch::Sender<()>, watch::Receiver<()>),
@@ -834,8 +836,8 @@ impl LanguageRegistry {
     }
 
     /// Clear out the given languages and reload them from scratch.
-    pub fn reload_languages(&self, languages: &HashSet<Arc<str>>) {
-        self.state.write().reload_languages(languages);
+    pub fn reload_languages(&self, languages: &[Arc<str>], grammars: &[Arc<str>]) {
+        self.state.write().reload_languages(languages, grammars);
     }
 
     pub fn register(
@@ -849,6 +851,7 @@ impl LanguageRegistry {
         state.available_languages.push(AvailableLanguage {
             id: post_inc(&mut state.next_available_language_id),
             name: config.name.clone(),
+            grammar: config.grammar.clone(),
             source: AvailableLanguageSource::BuiltIn {
                 config,
                 get_queries,
@@ -863,6 +866,7 @@ impl LanguageRegistry {
         &self,
         path: Arc<Path>,
         name: Arc<str>,
+        grammar_name: Option<Arc<str>>,
         matcher: LanguageMatcher,
         get_queries: fn(&Path) -> LanguageQueries,
     ) {
@@ -885,6 +889,7 @@ impl LanguageRegistry {
         }
         state.available_languages.push(AvailableLanguage {
             id: post_inc(&mut state.next_available_language_id),
+            grammar: grammar_name,
             name,
             source,
             lsp_adapters: Vec::new(),
@@ -894,16 +899,16 @@ impl LanguageRegistry {
 
     pub fn add_grammars(
         &self,
-        grammars: impl IntoIterator<Item = (impl Into<String>, tree_sitter::Language)>,
+        grammars: impl IntoIterator<Item = (impl Into<Arc<str>>, tree_sitter::Language)>,
     ) {
         self.state.write().grammars.extend(
             grammars
                 .into_iter()
-                .map(|(name, grammar)| (name.into(), AvailableGrammar::Loaded(grammar))),
+                .map(|(name, grammar)| (name.into(), AvailableGrammar::Native(grammar))),
         );
     }
 
-    pub fn register_grammar(&self, name: String, path: PathBuf) {
+    pub fn register_grammar(&self, name: Arc<str>, path: PathBuf) {
         self.state
             .write()
             .grammars
@@ -1124,46 +1129,49 @@ impl LanguageRegistry {
 
         if let Some(grammar) = state.grammars.get_mut(name.as_ref()) {
             match grammar {
-                AvailableGrammar::Loaded(grammar) => {
+                AvailableGrammar::Native(grammar) | AvailableGrammar::Loaded(_, grammar) => {
                     tx.send(Ok(grammar.clone())).ok();
                 }
-                AvailableGrammar::Loading(txs) => {
+                AvailableGrammar::Loading(_, txs) => {
                     txs.push(tx);
                 }
                 AvailableGrammar::Unloaded(wasm_path) => {
                     if let Some(executor) = &self.executor {
                         let this = self.clone();
-                        let wasm_path = wasm_path.clone();
                         executor
-                            .spawn(async move {
-                                let wasm_bytes = std::fs::read(&wasm_path)?;
-                                let grammar_name = wasm_path
-                                    .file_stem()
-                                    .and_then(OsStr::to_str)
-                                    .ok_or_else(|| anyhow!("invalid grammar filename"))?;
-                                let grammar = PARSER.with(|parser| {
-                                    let mut parser = parser.borrow_mut();
-                                    let mut store = parser.take_wasm_store().unwrap();
-                                    let grammar = store.load_language(&grammar_name, &wasm_bytes);
-                                    parser.set_wasm_store(store).unwrap();
-                                    grammar
-                                })?;
+                            .spawn({
+                                let wasm_path = wasm_path.clone();
+                                async move {
+                                    let wasm_bytes = std::fs::read(&wasm_path)?;
+                                    let grammar_name = wasm_path
+                                        .file_stem()
+                                        .and_then(OsStr::to_str)
+                                        .ok_or_else(|| anyhow!("invalid grammar filename"))?;
+                                    let grammar = PARSER.with(|parser| {
+                                        let mut parser = parser.borrow_mut();
+                                        let mut store = parser.take_wasm_store().unwrap();
+                                        let grammar =
+                                            store.load_language(&grammar_name, &wasm_bytes);
+                                        parser.set_wasm_store(store).unwrap();
+                                        grammar
+                                    })?;
 
-                                if let Some(AvailableGrammar::Loading(txs)) =
-                                    this.state.write().grammars.insert(
-                                        name.to_string(),
-                                        AvailableGrammar::Loaded(grammar.clone()),
-                                    )
-                                {
-                                    for tx in txs {
-                                        tx.send(Ok(grammar.clone())).ok();
+                                    if let Some(AvailableGrammar::Loading(_, txs)) =
+                                        this.state.write().grammars.insert(
+                                            name,
+                                            AvailableGrammar::Loaded(wasm_path, grammar.clone()),
+                                        )
+                                    {
+                                        for tx in txs {
+                                            tx.send(Ok(grammar.clone())).ok();
+                                        }
                                     }
-                                }
 
-                                anyhow::Ok(())
+                                    anyhow::Ok(())
+                                }
                             })
                             .detach();
-                        *grammar = AvailableGrammar::Loading(vec![tx]);
+                        *grammar = AvailableGrammar::Loading(wasm_path.clone(), vec![tx]);
                     }
                 }
             }
@@ -1357,16 +1365,42 @@ impl LanguageRegistryState {
         *self.subscription.0.borrow_mut() = ();
     }
 
-    fn reload_languages(&mut self, languages: &HashSet<Arc<str>>) {
-        self.languages
-            .retain(|language| !languages.contains(&language.config.name));
-        self.version += 1;
-        self.reload_count += 1;
+    fn reload_languages(
+        &mut self,
+        languages_to_reload: &[Arc<str>],
+        grammars_to_reload: &[Arc<str>],
+    ) {
+        for (name, grammar) in self.grammars.iter_mut() {
+            if grammars_to_reload.contains(name) {
+                if let AvailableGrammar::Loaded(path, _) = grammar {
+                    *grammar = AvailableGrammar::Unloaded(path.clone());
+                }
+            }
+        }
+
+        self.languages.retain(|language| {
+            let should_reload = languages_to_reload.contains(&language.config.name)
+                || language
+                    .config
+                    .grammar
+                    .as_ref()
+                    .map_or(false, |grammar| grammars_to_reload.contains(&grammar));
+            !should_reload
+        });
+
         for language in &mut self.available_languages {
-            if languages.contains(&language.name) {
+            if languages_to_reload.contains(&language.name)
+                || language
+                    .grammar
+                    .as_ref()
+                    .map_or(false, |grammar| grammars_to_reload.contains(grammar))
+            {
                 language.loaded = false;
             }
         }
+
+        self.version += 1;
+        self.reload_count += 1;
         *self.subscription.0.borrow_mut() = ();
     }
 
diff --git a/crates/util/src/paths.rs b/crates/util/src/paths.rs
index 45f430c52a..90a2603cd5 100644
--- a/crates/util/src/paths.rs
+++ b/crates/util/src/paths.rs
@@ -23,15 +23,10 @@ lazy_static::lazy_static! {
         CONFIG_DIR.join("support")
     };
     pub static ref EXTENSIONS_DIR: PathBuf = if cfg!(target_os="macos") {
-        HOME.join("Library/Application Support/Zed")
+        HOME.join("Library/Application Support/Zed/extensions")
     } else {
         CONFIG_DIR.join("extensions")
     };
-    pub static ref PLUGINS_DIR: PathBuf = if cfg!(target_os="macos") {
-        HOME.join("Library/Application Support/Zed/plugins")
-    } else {
-        CONFIG_DIR.join("plugins")
-    };
     pub static ref LANGUAGES_DIR: PathBuf = if cfg!(target_os="macos") {
         HOME.join("Library/Application Support/Zed/languages")
     } else {

From ccc6d76708289f29e5eaa083a24f9632b7153680 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Wed, 7 Feb 2024 21:01:45 -0500
Subject: [PATCH 313/372] Clean up `util::paths` (#7536)

This PR cleans up the path definitions in `util::paths` following the
Linux merge.

We were using a bunch of target-specific compilation that made these
declarations kind of messy, when really we can limit the conditional
compilation to just the base directories that we use as the basis for
the other directories.

Release Notes:

- N/A
---
 crates/util/src/paths.rs | 50 ++++++++--------------------------------
 1 file changed, 10 insertions(+), 40 deletions(-)

diff --git a/crates/util/src/paths.rs b/crates/util/src/paths.rs
index 90a2603cd5..d21bdb94b0 100644
--- a/crates/util/src/paths.rs
+++ b/crates/util/src/paths.rs
@@ -12,47 +12,27 @@ lazy_static::lazy_static! {
     pub static ref CONVERSATIONS_DIR: PathBuf = CONFIG_DIR.join("conversations");
     pub static ref EMBEDDINGS_DIR: PathBuf = CONFIG_DIR.join("embeddings");
     pub static ref THEMES_DIR: PathBuf = CONFIG_DIR.join("themes");
-    pub static ref LOGS_DIR: PathBuf = if cfg!(target_os="macos") {
+    pub static ref LOGS_DIR: PathBuf = if cfg!(target_os = "macos") {
         HOME.join("Library/Logs/Zed")
     } else {
         CONFIG_DIR.join("logs")
     };
-    pub static ref SUPPORT_DIR: PathBuf = if cfg!(target_os="macos") {
+    pub static ref SUPPORT_DIR: PathBuf = if cfg!(target_os = "macos") {
         HOME.join("Library/Application Support/Zed")
     } else {
-        CONFIG_DIR.join("support")
+        CONFIG_DIR.clone()
     };
-    pub static ref EXTENSIONS_DIR: PathBuf = if cfg!(target_os="macos") {
-        HOME.join("Library/Application Support/Zed/extensions")
-    } else {
-        CONFIG_DIR.join("extensions")
-    };
-    pub static ref LANGUAGES_DIR: PathBuf = if cfg!(target_os="macos") {
-        HOME.join("Library/Application Support/Zed/languages")
-    } else {
-        CONFIG_DIR.join("languages")
-    };
-    pub static ref COPILOT_DIR: PathBuf = if cfg!(target_os="macos") {
-        HOME.join("Library/Application Support/Zed/copilot")
-    } else {
-        CONFIG_DIR.join("copilot")
-    };
-    pub static ref DEFAULT_PRETTIER_DIR: PathBuf = if cfg!(target_os="macos") {
-        HOME.join("Library/Application Support/Zed/prettier")
-    } else {
-        CONFIG_DIR.join("prettier")
-    };
-    pub static ref DB_DIR: PathBuf = if cfg!(target_os="macos") {
-        HOME.join("Library/Application Support/Zed/db")
-    } else {
-        CONFIG_DIR.join("db")
-    };
-    pub static ref CRASHES_DIR: PathBuf = if cfg!(target_os="macos") {
+    pub static ref EXTENSIONS_DIR: PathBuf = SUPPORT_DIR.join("extensions");
+    pub static ref LANGUAGES_DIR: PathBuf = SUPPORT_DIR.join("languages");
+    pub static ref COPILOT_DIR: PathBuf = SUPPORT_DIR.join("copilot");
+    pub static ref DEFAULT_PRETTIER_DIR: PathBuf = SUPPORT_DIR.join("prettier");
+    pub static ref DB_DIR: PathBuf = SUPPORT_DIR.join("db");
+    pub static ref CRASHES_DIR: PathBuf = if cfg!(target_os = "macos") {
         HOME.join("Library/Logs/DiagnosticReports")
     } else {
         CONFIG_DIR.join("crashes")
     };
-    pub static ref CRASHES_RETIRED_DIR: PathBuf = if cfg!(target_os="macos") {
+    pub static ref CRASHES_RETIRED_DIR: PathBuf = if cfg!(target_os = "macos") {
         HOME.join("Library/Logs/DiagnosticReports/Retired")
     } else {
         CRASHES_DIR.join("retired")
@@ -65,16 +45,6 @@ lazy_static::lazy_static! {
     pub static ref LOCAL_SETTINGS_RELATIVE_PATH: &'static Path = Path::new(".zed/settings.json");
 }
 
-pub mod legacy {
-    use std::path::PathBuf;
-
-    lazy_static::lazy_static! {
-        static ref CONFIG_DIR: PathBuf = super::HOME.join(".zed");
-        pub static ref SETTINGS: PathBuf = CONFIG_DIR.join("settings.json");
-        pub static ref KEYMAP: PathBuf = CONFIG_DIR.join("keymap.json");
-    }
-}
-
 pub trait PathExt {
     fn compact(&self) -> PathBuf;
     fn icon_suffix(&self) -> Option<&str>;

From cbe7a12e6541bc7c73792a249c4adc4de03a1d61 Mon Sep 17 00:00:00 2001
From: Robert Clover <git@clo4.net>
Date: Thu, 8 Feb 2024 16:28:02 +1100
Subject: [PATCH 314/372] Add information to Copilot sign-in UI when disabled
 (#7496)

I'd love to take on fixing this but:

1. I don't think this is the right solution - it would be really nice to
have something actionable that I could do when presented with this
message.
2. Should signing in to Copilot be independent from whether it's
enabled? You can only access the sign-in modal when `features.copilot`
isn't disabled, but when `show_copilot_suggestions` is `false` the
server is disabled but you can't sign in. So I guess another solution
might be to just not show the UI if copilot suggestions are disabled?
3. I don't know what other circumstances could trigger the empty modal.
I see `Status::Error` and that seems like it might be important to
surface gracefully?

Would love some thoughts on this

Release Notes:

- Improved UX for enabling Copilot when it's disabled in settings
---
 crates/copilot_ui/src/sign_in.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/crates/copilot_ui/src/sign_in.rs b/crates/copilot_ui/src/sign_in.rs
index 53c6d75182..d841ee8ced 100644
--- a/crates/copilot_ui/src/sign_in.rs
+++ b/crates/copilot_ui/src/sign_in.rs
@@ -144,6 +144,12 @@ impl CopilotCodeVerification {
                     .on_click(|_, cx| cx.open_url(COPILOT_SIGN_UP_URL)),
             )
     }
+
+    fn render_disabled_modal() -> impl Element {
+        v_flex()
+            .child(Headline::new("Copilot is disabled").size(HeadlineSize::Large))
+            .child(Label::new("You can enable Copilot in your settings."))
+    }
 }
 
 impl Render for CopilotCodeVerification {
@@ -160,6 +166,10 @@ impl Render for CopilotCodeVerification {
                 self.connect_clicked = false;
                 Self::render_enabled_modal(cx).into_any_element()
             }
+            Status::Disabled => {
+                self.connect_clicked = false;
+                Self::render_disabled_modal().into_any_element()
+            }
             _ => div().into_any_element(),
         };
 

From 61b8d3639f220da3bd31a59f9df74fc0757aa44a Mon Sep 17 00:00:00 2001
From: Kieran Gill <kierangilliam@users.noreply.github.com>
Date: Thu, 8 Feb 2024 04:19:31 -0500
Subject: [PATCH 315/372] markdown_preview: Improved markdown rendering support
 (#7345)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR improves support for rendering markdown documents.

## After the updates


https://github.com/zed-industries/zed/assets/18583882/48315901-563d-44c6-8265-8390e8eed942

## Before the updates


https://github.com/zed-industries/zed/assets/18583882/6d7ddb55-41f7-492e-af12-6ab54559f612

## New features

- @SomeoneToIgnore's [scrolling feature
request](https://github.com/zed-industries/zed/pull/6958#pullrequestreview-1850458632).
- Checkboxes (`- [ ]` and `- [x]`)
- Inline code blocks.
- Ordered and unordered lists at an arbitrary depth.
- Block quotes that render nested content, like code blocks.
- Lists that render nested content, like code blocks.
- Block quotes that support variable heading sizes and the other
markdown features added
[here](https://github.com/zed-industries/zed/pull/6958).
- Users can see and click internal links (`[See the docs](./docs.md)`).

## Notable changes

- Removed dependency on `rich_text`.
- Added a new method for parsing markdown into renderable structs. This
method uses recursive descent so it can easily support more complex
markdown documents.
- Parsing does not happen for every call to
`MarkdownPreviewView::render` anymore.

## TODO

- [ ] Typing should move the markdown preview cursor.

## Future work under consideration

- If a title exists for a link, show it on hover.
- Images.
- Since this PR brings the most support for markdown, we can consolidate
`languages/markdown` and `rich_text` to use this new renderer. Note that
the updated inline text rendering method in this PR originated from
`langauges/markdown`.
- Syntax highlighting in code blocks.
- Footnote references.
- Inline HTML.
- Strikethrough support.
- Scrolling improvements:
- Handle automatic preview scrolling when multiple cursors are used in
the editor.
- > great to see that the render now respects editor's scrolls, but can
we also support the vice-versa (as syntax tree does it in Zed) — when
scrolling the render, it would be good to scroll the editor too
- > sometimes it's hard to understand where the "caret" on the render
is, so I wonder if we could go even further with its placement and place
it inside the text, as a regular caret? Maybe even support the
selections?
- > switching to another markdown tab does not change the rendered
contents and when I call the render command again, the screen gets
another split — I would rather prefer to have Zed's syntax tree
behavior: there's always a single panel that renders things for whatever
tab is active now. At least we should not split if there's already a
split, rather adding the new rendered tab there.
- > plaintext URLs could get a highlight and the click action

## Release Notes

- Improved support for markdown rendering.
---
 Cargo.lock                                    |    2 +-
 crates/markdown_preview/Cargo.toml            |    2 +-
 .../markdown_preview/src/markdown_elements.rs |  242 ++++
 .../markdown_preview/src/markdown_parser.rs   | 1110 +++++++++++++++++
 .../markdown_preview/src/markdown_preview.rs  |    2 +
 .../src/markdown_preview_view.rs              |  184 ++-
 .../markdown_preview/src/markdown_renderer.rs |  612 +++++----
 7 files changed, 1784 insertions(+), 370 deletions(-)
 create mode 100644 crates/markdown_preview/src/markdown_elements.rs
 create mode 100644 crates/markdown_preview/src/markdown_parser.rs

diff --git a/Cargo.lock b/Cargo.lock
index 8c2a2d4e7d..535ef49c09 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4527,9 +4527,9 @@ dependencies = [
  "lazy_static",
  "log",
  "menu",
+ "pretty_assertions",
  "project",
  "pulldown-cmark",
- "rich_text",
  "theme",
  "ui",
  "util",
diff --git a/crates/markdown_preview/Cargo.toml b/crates/markdown_preview/Cargo.toml
index ba23a82259..f07447ef3f 100644
--- a/crates/markdown_preview/Cargo.toml
+++ b/crates/markdown_preview/Cargo.toml
@@ -20,8 +20,8 @@ lazy_static.workspace = true
 log.workspace = true
 menu.workspace = true
 project.workspace = true
+pretty_assertions.workspace = true
 pulldown-cmark.workspace = true
-rich_text.workspace = true
 theme.workspace = true
 ui.workspace = true
 util.workspace = true
diff --git a/crates/markdown_preview/src/markdown_elements.rs b/crates/markdown_preview/src/markdown_elements.rs
new file mode 100644
index 0000000000..54cd01f8cd
--- /dev/null
+++ b/crates/markdown_preview/src/markdown_elements.rs
@@ -0,0 +1,242 @@
+use gpui::{px, FontStyle, FontWeight, HighlightStyle, SharedString, UnderlineStyle};
+use language::HighlightId;
+use std::{ops::Range, path::PathBuf};
+
+#[derive(Debug)]
+#[cfg_attr(test, derive(PartialEq))]
+pub enum ParsedMarkdownElement {
+    Heading(ParsedMarkdownHeading),
+    /// An ordered or unordered list of items.
+    List(ParsedMarkdownList),
+    Table(ParsedMarkdownTable),
+    BlockQuote(ParsedMarkdownBlockQuote),
+    CodeBlock(ParsedMarkdownCodeBlock),
+    /// A paragraph of text and other inline elements.
+    Paragraph(ParsedMarkdownText),
+    HorizontalRule(Range<usize>),
+}
+
+impl ParsedMarkdownElement {
+    pub fn source_range(&self) -> Range<usize> {
+        match self {
+            Self::Heading(heading) => heading.source_range.clone(),
+            Self::List(list) => list.source_range.clone(),
+            Self::Table(table) => table.source_range.clone(),
+            Self::BlockQuote(block_quote) => block_quote.source_range.clone(),
+            Self::CodeBlock(code_block) => code_block.source_range.clone(),
+            Self::Paragraph(text) => text.source_range.clone(),
+            Self::HorizontalRule(range) => range.clone(),
+        }
+    }
+}
+
+#[derive(Debug)]
+#[cfg_attr(test, derive(PartialEq))]
+pub struct ParsedMarkdown {
+    pub children: Vec<ParsedMarkdownElement>,
+}
+
+#[derive(Debug)]
+#[cfg_attr(test, derive(PartialEq))]
+pub struct ParsedMarkdownList {
+    pub source_range: Range<usize>,
+    pub children: Vec<ParsedMarkdownListItem>,
+}
+
+#[derive(Debug)]
+#[cfg_attr(test, derive(PartialEq))]
+pub struct ParsedMarkdownListItem {
+    /// How many indentations deep this item is.
+    pub depth: u16,
+    pub item_type: ParsedMarkdownListItemType,
+    pub contents: Vec<Box<ParsedMarkdownElement>>,
+}
+
+#[derive(Debug)]
+#[cfg_attr(test, derive(PartialEq))]
+pub enum ParsedMarkdownListItemType {
+    Ordered(u64),
+    Task(bool),
+    Unordered,
+}
+
+#[derive(Debug)]
+#[cfg_attr(test, derive(PartialEq))]
+pub struct ParsedMarkdownCodeBlock {
+    pub source_range: Range<usize>,
+    pub language: Option<String>,
+    pub contents: SharedString,
+}
+
+#[derive(Debug)]
+#[cfg_attr(test, derive(PartialEq))]
+pub struct ParsedMarkdownHeading {
+    pub source_range: Range<usize>,
+    pub level: HeadingLevel,
+    pub contents: ParsedMarkdownText,
+}
+
+#[derive(Debug, PartialEq)]
+pub enum HeadingLevel {
+    H1,
+    H2,
+    H3,
+    H4,
+    H5,
+    H6,
+}
+
+#[derive(Debug)]
+pub struct ParsedMarkdownTable {
+    pub source_range: Range<usize>,
+    pub header: ParsedMarkdownTableRow,
+    pub body: Vec<ParsedMarkdownTableRow>,
+    pub column_alignments: Vec<ParsedMarkdownTableAlignment>,
+}
+
+#[derive(Debug, Clone, Copy)]
+#[cfg_attr(test, derive(PartialEq))]
+pub enum ParsedMarkdownTableAlignment {
+    /// Default text alignment.
+    None,
+    Left,
+    Center,
+    Right,
+}
+
+#[derive(Debug)]
+#[cfg_attr(test, derive(PartialEq))]
+pub struct ParsedMarkdownTableRow {
+    pub children: Vec<ParsedMarkdownText>,
+}
+
+impl ParsedMarkdownTableRow {
+    pub fn new() -> Self {
+        Self {
+            children: Vec::new(),
+        }
+    }
+
+    pub fn with_children(children: Vec<ParsedMarkdownText>) -> Self {
+        Self { children }
+    }
+}
+
+#[derive(Debug)]
+#[cfg_attr(test, derive(PartialEq))]
+pub struct ParsedMarkdownBlockQuote {
+    pub source_range: Range<usize>,
+    pub children: Vec<Box<ParsedMarkdownElement>>,
+}
+
+#[derive(Debug)]
+pub struct ParsedMarkdownText {
+    /// Where the text is located in the source Markdown document.
+    pub source_range: Range<usize>,
+    /// The text content stripped of any formatting symbols.
+    pub contents: String,
+    /// The list of highlights contained in the Markdown document.
+    pub highlights: Vec<(Range<usize>, MarkdownHighlight)>,
+    /// The regions of the various ranges in the Markdown document.
+    pub region_ranges: Vec<Range<usize>>,
+    /// The regions of the Markdown document.
+    pub regions: Vec<ParsedRegion>,
+}
+
+/// A run of highlighted Markdown text.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum MarkdownHighlight {
+    /// A styled Markdown highlight.
+    Style(MarkdownHighlightStyle),
+    /// A highlighted code block.
+    Code(HighlightId),
+}
+
+impl MarkdownHighlight {
+    /// Converts this [`MarkdownHighlight`] to a [`HighlightStyle`].
+    pub fn to_highlight_style(&self, theme: &theme::SyntaxTheme) -> Option<HighlightStyle> {
+        match self {
+            MarkdownHighlight::Style(style) => {
+                let mut highlight = HighlightStyle::default();
+
+                if style.italic {
+                    highlight.font_style = Some(FontStyle::Italic);
+                }
+
+                if style.underline {
+                    highlight.underline = Some(UnderlineStyle {
+                        thickness: px(1.),
+                        ..Default::default()
+                    });
+                }
+
+                if style.weight != FontWeight::default() {
+                    highlight.font_weight = Some(style.weight);
+                }
+
+                Some(highlight)
+            }
+
+            MarkdownHighlight::Code(id) => id.style(theme),
+        }
+    }
+}
+
+/// The style for a Markdown highlight.
+#[derive(Debug, Clone, Default, PartialEq, Eq)]
+pub struct MarkdownHighlightStyle {
+    /// Whether the text should be italicized.
+    pub italic: bool,
+    /// Whether the text should be underlined.
+    pub underline: bool,
+    /// The weight of the text.
+    pub weight: FontWeight,
+}
+
+/// A parsed region in a Markdown document.
+#[derive(Debug, Clone)]
+#[cfg_attr(test, derive(PartialEq))]
+pub struct ParsedRegion {
+    /// Whether the region is a code block.
+    pub code: bool,
+    /// The link contained in this region, if it has one.
+    pub link: Option<Link>,
+}
+
+/// A Markdown link.
+#[derive(Debug, Clone)]
+#[cfg_attr(test, derive(PartialEq))]
+pub enum Link {
+    /// A link to a webpage.
+    Web {
+        /// The URL of the webpage.
+        url: String,
+    },
+    /// A link to a path on the filesystem.
+    Path {
+        /// The path to the item.
+        path: PathBuf,
+    },
+}
+
+impl Link {
+    pub fn identify(file_location_directory: Option<PathBuf>, text: String) -> Option<Link> {
+        if text.starts_with("http") {
+            return Some(Link::Web { url: text });
+        }
+
+        let path = PathBuf::from(&text);
+        if path.is_absolute() && path.exists() {
+            return Some(Link::Path { path });
+        }
+
+        if let Some(file_location_directory) = file_location_directory {
+            let path = file_location_directory.join(text);
+            if path.exists() {
+                return Some(Link::Path { path });
+            }
+        }
+
+        None
+    }
+}
diff --git a/crates/markdown_preview/src/markdown_parser.rs b/crates/markdown_preview/src/markdown_parser.rs
new file mode 100644
index 0000000000..f860e211e2
--- /dev/null
+++ b/crates/markdown_preview/src/markdown_parser.rs
@@ -0,0 +1,1110 @@
+use crate::markdown_elements::*;
+use gpui::FontWeight;
+use pulldown_cmark::{Alignment, Event, Options, Parser, Tag};
+use std::{ops::Range, path::PathBuf};
+
+pub fn parse_markdown(
+    markdown_input: &str,
+    file_location_directory: Option<PathBuf>,
+) -> ParsedMarkdown {
+    let options = Options::all();
+    let parser = Parser::new_ext(markdown_input, options);
+    let parser = MarkdownParser::new(parser.into_offset_iter().collect(), file_location_directory);
+    let renderer = parser.parse_document();
+    ParsedMarkdown {
+        children: renderer.parsed,
+    }
+}
+
+struct MarkdownParser<'a> {
+    tokens: Vec<(Event<'a>, Range<usize>)>,
+    /// The current index in the tokens array
+    cursor: usize,
+    /// The blocks that we have successfully parsed so far
+    parsed: Vec<ParsedMarkdownElement>,
+    file_location_directory: Option<PathBuf>,
+}
+
+impl<'a> MarkdownParser<'a> {
+    fn new(
+        tokens: Vec<(Event<'a>, Range<usize>)>,
+        file_location_directory: Option<PathBuf>,
+    ) -> Self {
+        Self {
+            tokens,
+            file_location_directory,
+            cursor: 0,
+            parsed: vec![],
+        }
+    }
+
+    fn eof(&self) -> bool {
+        if self.tokens.is_empty() {
+            return true;
+        }
+        self.cursor >= self.tokens.len() - 1
+    }
+
+    fn peek(&self, steps: usize) -> Option<&(Event, Range<usize>)> {
+        if self.eof() || (steps + self.cursor) >= self.tokens.len() {
+            return self.tokens.last();
+        }
+        return self.tokens.get(self.cursor + steps);
+    }
+
+    fn previous(&self) -> Option<&(Event, Range<usize>)> {
+        if self.cursor == 0 || self.cursor > self.tokens.len() {
+            return None;
+        }
+        return self.tokens.get(self.cursor - 1);
+    }
+
+    fn current(&self) -> Option<&(Event, Range<usize>)> {
+        return self.peek(0);
+    }
+
+    fn is_text_like(event: &Event) -> bool {
+        match event {
+            Event::Text(_)
+            // Represent an inline code block
+            | Event::Code(_)
+            | Event::Html(_)
+            | Event::FootnoteReference(_)
+            | Event::Start(Tag::Link(_, _, _))
+            | Event::Start(Tag::Emphasis)
+            | Event::Start(Tag::Strong)
+            | Event::Start(Tag::Strikethrough)
+            | Event::Start(Tag::Image(_, _, _)) => {
+                return true;
+            }
+            _ => return false,
+        }
+    }
+
+    fn parse_document(mut self) -> Self {
+        while !self.eof() {
+            if let Some(block) = self.parse_block() {
+                self.parsed.push(block);
+            }
+        }
+        self
+    }
+
+    fn parse_block(&mut self) -> Option<ParsedMarkdownElement> {
+        let (current, source_range) = self.current().unwrap();
+        match current {
+            Event::Start(tag) => match tag {
+                Tag::Paragraph => {
+                    self.cursor += 1;
+                    let text = self.parse_text(false);
+                    Some(ParsedMarkdownElement::Paragraph(text))
+                }
+                Tag::Heading(level, _, _) => {
+                    let level = level.clone();
+                    self.cursor += 1;
+                    let heading = self.parse_heading(level);
+                    Some(ParsedMarkdownElement::Heading(heading))
+                }
+                Tag::Table(_) => {
+                    self.cursor += 1;
+                    let table = self.parse_table();
+                    Some(ParsedMarkdownElement::Table(table))
+                }
+                Tag::List(order) => {
+                    let order = order.clone();
+                    self.cursor += 1;
+                    let list = self.parse_list(1, order);
+                    Some(ParsedMarkdownElement::List(list))
+                }
+                Tag::BlockQuote => {
+                    self.cursor += 1;
+                    let block_quote = self.parse_block_quote();
+                    Some(ParsedMarkdownElement::BlockQuote(block_quote))
+                }
+                Tag::CodeBlock(kind) => {
+                    let language = match kind {
+                        pulldown_cmark::CodeBlockKind::Indented => None,
+                        pulldown_cmark::CodeBlockKind::Fenced(language) => {
+                            if language.is_empty() {
+                                None
+                            } else {
+                                Some(language.to_string())
+                            }
+                        }
+                    };
+
+                    self.cursor += 1;
+
+                    let code_block = self.parse_code_block(language);
+                    Some(ParsedMarkdownElement::CodeBlock(code_block))
+                }
+                _ => {
+                    self.cursor += 1;
+                    None
+                }
+            },
+            Event::Rule => {
+                let source_range = source_range.clone();
+                self.cursor += 1;
+                Some(ParsedMarkdownElement::HorizontalRule(source_range))
+            }
+            _ => {
+                self.cursor += 1;
+                None
+            }
+        }
+    }
+
+    fn parse_text(&mut self, should_complete_on_soft_break: bool) -> ParsedMarkdownText {
+        let (_current, source_range) = self.previous().unwrap();
+        let source_range = source_range.clone();
+
+        let mut text = String::new();
+        let mut bold_depth = 0;
+        let mut italic_depth = 0;
+        let mut link: Option<Link> = None;
+        let mut region_ranges: Vec<Range<usize>> = vec![];
+        let mut regions: Vec<ParsedRegion> = vec![];
+        let mut highlights: Vec<(Range<usize>, MarkdownHighlight)> = vec![];
+
+        loop {
+            if self.eof() {
+                break;
+            }
+
+            let (current, _source_range) = self.current().unwrap();
+            let prev_len = text.len();
+            match current {
+                Event::SoftBreak => {
+                    if should_complete_on_soft_break {
+                        break;
+                    }
+
+                    // `Some text\nSome more text` should be treated as a single line.
+                    text.push(' ');
+                }
+
+                Event::HardBreak => {
+                    break;
+                }
+
+                Event::Text(t) => {
+                    text.push_str(t.as_ref());
+
+                    let mut style = MarkdownHighlightStyle::default();
+
+                    if bold_depth > 0 {
+                        style.weight = FontWeight::BOLD;
+                    }
+
+                    if italic_depth > 0 {
+                        style.italic = true;
+                    }
+
+                    if let Some(link) = link.clone() {
+                        region_ranges.push(prev_len..text.len());
+                        regions.push(ParsedRegion {
+                            code: false,
+                            link: Some(link),
+                        });
+                        style.underline = true;
+                    }
+
+                    if style != MarkdownHighlightStyle::default() {
+                        let mut new_highlight = true;
+                        if let Some((last_range, MarkdownHighlight::Style(last_style))) =
+                            highlights.last_mut()
+                        {
+                            if last_range.end == prev_len && last_style == &style {
+                                last_range.end = text.len();
+                                new_highlight = false;
+                            }
+                        }
+                        if new_highlight {
+                            let range = prev_len..text.len();
+                            highlights.push((range, MarkdownHighlight::Style(style)));
+                        }
+                    }
+                }
+
+                // Note: This event means "inline code" and not "code block"
+                Event::Code(t) => {
+                    text.push_str(t.as_ref());
+                    region_ranges.push(prev_len..text.len());
+
+                    if link.is_some() {
+                        highlights.push((
+                            prev_len..text.len(),
+                            MarkdownHighlight::Style(MarkdownHighlightStyle {
+                                underline: true,
+                                ..Default::default()
+                            }),
+                        ));
+                    }
+
+                    regions.push(ParsedRegion {
+                        code: true,
+                        link: link.clone(),
+                    });
+                }
+
+                Event::Start(tag) => {
+                    match tag {
+                        Tag::Emphasis => italic_depth += 1,
+                        Tag::Strong => bold_depth += 1,
+                        Tag::Link(_type, url, _title) => {
+                            link = Link::identify(
+                                self.file_location_directory.clone(),
+                                url.to_string(),
+                            );
+                        }
+                        Tag::Strikethrough => {
+                            // TODO: Confirm that gpui currently doesn't support strikethroughs
+                        }
+                        _ => {
+                            break;
+                        }
+                    }
+                }
+
+                Event::End(tag) => match tag {
+                    Tag::Emphasis => {
+                        italic_depth -= 1;
+                    }
+                    Tag::Strong => {
+                        bold_depth -= 1;
+                    }
+                    Tag::Link(_, _, _) => {
+                        link = None;
+                    }
+                    Tag::Strikethrough => {
+                        // TODO: Confirm that gpui currently doesn't support strikethroughs
+                    }
+                    Tag::Paragraph => {
+                        self.cursor += 1;
+                        break;
+                    }
+                    _ => {
+                        break;
+                    }
+                },
+
+                _ => {
+                    break;
+                }
+            }
+
+            self.cursor += 1;
+        }
+
+        ParsedMarkdownText {
+            source_range,
+            contents: text,
+            highlights,
+            regions,
+            region_ranges,
+        }
+    }
+
+    fn parse_heading(&mut self, level: pulldown_cmark::HeadingLevel) -> ParsedMarkdownHeading {
+        let (_event, source_range) = self.previous().unwrap();
+        let source_range = source_range.clone();
+        let text = self.parse_text(true);
+
+        // Advance past the heading end tag
+        self.cursor += 1;
+
+        ParsedMarkdownHeading {
+            source_range: source_range.clone(),
+            level: match level {
+                pulldown_cmark::HeadingLevel::H1 => HeadingLevel::H1,
+                pulldown_cmark::HeadingLevel::H2 => HeadingLevel::H2,
+                pulldown_cmark::HeadingLevel::H3 => HeadingLevel::H3,
+                pulldown_cmark::HeadingLevel::H4 => HeadingLevel::H4,
+                pulldown_cmark::HeadingLevel::H5 => HeadingLevel::H5,
+                pulldown_cmark::HeadingLevel::H6 => HeadingLevel::H6,
+            },
+            contents: text,
+        }
+    }
+
+    fn parse_table(&mut self) -> ParsedMarkdownTable {
+        let (_event, source_range) = self.previous().unwrap();
+        let source_range = source_range.clone();
+        let mut header = ParsedMarkdownTableRow::new();
+        let mut body = vec![];
+        let mut current_row = vec![];
+        let mut in_header = true;
+        let mut alignment: Vec<ParsedMarkdownTableAlignment> = vec![];
+
+        loop {
+            if self.eof() {
+                break;
+            }
+
+            let (current, _source_range) = self.current().unwrap();
+            match current {
+                Event::Start(Tag::TableHead)
+                | Event::Start(Tag::TableRow)
+                | Event::End(Tag::TableCell) => {
+                    self.cursor += 1;
+                }
+                Event::Start(Tag::TableCell) => {
+                    self.cursor += 1;
+                    let cell_contents = self.parse_text(false);
+                    current_row.push(cell_contents);
+                }
+                Event::End(Tag::TableHead) | Event::End(Tag::TableRow) => {
+                    self.cursor += 1;
+                    let new_row = std::mem::replace(&mut current_row, vec![]);
+                    if in_header {
+                        header.children = new_row;
+                        in_header = false;
+                    } else {
+                        let row = ParsedMarkdownTableRow::with_children(new_row);
+                        body.push(row);
+                    }
+                }
+                Event::End(Tag::Table(table_alignment)) => {
+                    alignment = table_alignment
+                        .iter()
+                        .map(|a| Self::convert_alignment(a))
+                        .collect();
+                    self.cursor += 1;
+                    break;
+                }
+                _ => {
+                    break;
+                }
+            }
+        }
+
+        ParsedMarkdownTable {
+            source_range,
+            header,
+            body,
+            column_alignments: alignment,
+        }
+    }
+
+    fn convert_alignment(alignment: &Alignment) -> ParsedMarkdownTableAlignment {
+        match alignment {
+            Alignment::None => ParsedMarkdownTableAlignment::None,
+            Alignment::Left => ParsedMarkdownTableAlignment::Left,
+            Alignment::Center => ParsedMarkdownTableAlignment::Center,
+            Alignment::Right => ParsedMarkdownTableAlignment::Right,
+        }
+    }
+
+    fn parse_list(&mut self, depth: u16, order: Option<u64>) -> ParsedMarkdownList {
+        let (_event, source_range) = self.previous().unwrap();
+        let source_range = source_range.clone();
+        let mut children = vec![];
+        let mut inside_list_item = false;
+        let mut order = order;
+        let mut task_item = None;
+
+        let mut current_list_items: Vec<Box<ParsedMarkdownElement>> = vec![];
+
+        while !self.eof() {
+            let (current, _source_range) = self.current().unwrap();
+            match current {
+                Event::Start(Tag::List(order)) => {
+                    let order = order.clone();
+                    self.cursor += 1;
+
+                    let inner_list = self.parse_list(depth + 1, order);
+                    let block = ParsedMarkdownElement::List(inner_list);
+                    current_list_items.push(Box::new(block));
+                }
+                Event::End(Tag::List(_)) => {
+                    self.cursor += 1;
+                    break;
+                }
+                Event::Start(Tag::Item) => {
+                    self.cursor += 1;
+                    inside_list_item = true;
+
+                    // Check for task list marker (`- [ ]` or `- [x]`)
+                    if let Some(next) = self.current() {
+                        match next.0 {
+                            Event::TaskListMarker(checked) => {
+                                task_item = Some(checked);
+                                self.cursor += 1;
+                            }
+                            _ => {}
+                        }
+                    }
+
+                    if let Some(next) = self.current() {
+                        // This is a plain list item.
+                        // For example `- some text` or `1. [Docs](./docs.md)`
+                        if MarkdownParser::is_text_like(&next.0) {
+                            let text = self.parse_text(false);
+                            let block = ParsedMarkdownElement::Paragraph(text);
+                            current_list_items.push(Box::new(block));
+                        } else {
+                            let block = self.parse_block();
+                            if let Some(block) = block {
+                                current_list_items.push(Box::new(block));
+                            }
+                        }
+                    }
+                }
+                Event::End(Tag::Item) => {
+                    self.cursor += 1;
+
+                    let item_type = if let Some(checked) = task_item {
+                        ParsedMarkdownListItemType::Task(checked)
+                    } else if let Some(order) = order.clone() {
+                        ParsedMarkdownListItemType::Ordered(order)
+                    } else {
+                        ParsedMarkdownListItemType::Unordered
+                    };
+
+                    if let Some(current) = order {
+                        order = Some(current + 1);
+                    }
+
+                    let contents = std::mem::replace(&mut current_list_items, vec![]);
+
+                    children.push(ParsedMarkdownListItem {
+                        contents,
+                        depth,
+                        item_type,
+                    });
+
+                    inside_list_item = false;
+                    task_item = None;
+                }
+                _ => {
+                    if !inside_list_item {
+                        break;
+                    }
+
+                    let block = self.parse_block();
+                    if let Some(block) = block {
+                        current_list_items.push(Box::new(block));
+                    }
+                }
+            }
+        }
+
+        ParsedMarkdownList {
+            source_range,
+            children,
+        }
+    }
+
+    fn parse_block_quote(&mut self) -> ParsedMarkdownBlockQuote {
+        let (_event, source_range) = self.previous().unwrap();
+        let source_range = source_range.clone();
+        let mut nested_depth = 1;
+
+        let mut children: Vec<Box<ParsedMarkdownElement>> = vec![];
+
+        while !self.eof() {
+            let block = self.parse_block();
+
+            if let Some(block) = block {
+                children.push(Box::new(block));
+            } else {
+                break;
+            }
+
+            if self.eof() {
+                break;
+            }
+
+            let (current, _source_range) = self.current().unwrap();
+            match current {
+                // This is a nested block quote.
+                // Record that we're in a nested block quote and continue parsing.
+                // We don't need to advance the cursor since the next
+                // call to `parse_block` will handle it.
+                Event::Start(Tag::BlockQuote) => {
+                    nested_depth += 1;
+                }
+                Event::End(Tag::BlockQuote) => {
+                    nested_depth -= 1;
+                    if nested_depth == 0 {
+                        self.cursor += 1;
+                        break;
+                    }
+                }
+                _ => {}
+            };
+        }
+
+        ParsedMarkdownBlockQuote {
+            source_range,
+            children,
+        }
+    }
+
+    fn parse_code_block(&mut self, language: Option<String>) -> ParsedMarkdownCodeBlock {
+        let (_event, source_range) = self.previous().unwrap();
+        let source_range = source_range.clone();
+        let mut code = String::new();
+
+        while !self.eof() {
+            let (current, _source_range) = self.current().unwrap();
+            match current {
+                Event::Text(text) => {
+                    code.push_str(&text);
+                    self.cursor += 1;
+                }
+                Event::End(Tag::CodeBlock(_)) => {
+                    self.cursor += 1;
+                    break;
+                }
+                _ => {
+                    break;
+                }
+            }
+        }
+
+        ParsedMarkdownCodeBlock {
+            source_range,
+            contents: code.trim().to_string().into(),
+            language,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    use pretty_assertions::assert_eq;
+
+    use ParsedMarkdownElement::*;
+    use ParsedMarkdownListItemType::*;
+
+    fn parse(input: &str) -> ParsedMarkdown {
+        parse_markdown(input, None)
+    }
+
+    #[test]
+    fn test_headings() {
+        let parsed = parse("# Heading one\n## Heading two\n### Heading three");
+
+        assert_eq!(
+            parsed.children,
+            vec![
+                h1(text("Heading one", 0..14), 0..14),
+                h2(text("Heading two", 14..29), 14..29),
+                h3(text("Heading three", 29..46), 29..46),
+            ]
+        );
+    }
+
+    #[test]
+    fn test_newlines_dont_new_paragraphs() {
+        let parsed = parse("Some text **that is bolded**\n and *italicized*");
+
+        assert_eq!(
+            parsed.children,
+            vec![p("Some text that is bolded and italicized", 0..46)]
+        );
+    }
+
+    #[test]
+    fn test_heading_with_paragraph() {
+        let parsed = parse("# Zed\nThe editor");
+
+        assert_eq!(
+            parsed.children,
+            vec![h1(text("Zed", 0..6), 0..6), p("The editor", 6..16),]
+        );
+    }
+
+    #[test]
+    fn test_double_newlines_do_new_paragraphs() {
+        let parsed = parse("Some text **that is bolded**\n\n and *italicized*");
+
+        assert_eq!(
+            parsed.children,
+            vec![
+                p("Some text that is bolded", 0..29),
+                p("and italicized", 31..47),
+            ]
+        );
+    }
+
+    #[test]
+    fn test_bold_italic_text() {
+        let parsed = parse("Some text **that is bolded** and *italicized*");
+
+        assert_eq!(
+            parsed.children,
+            vec![p("Some text that is bolded and italicized", 0..45)]
+        );
+    }
+
+    #[test]
+    fn test_header_only_table() {
+        let markdown = "\
+| Header 1 | Header 2 |
+|----------|----------|
+
+Some other content
+";
+
+        let expected_table = table(
+            0..48,
+            row(vec![text("Header 1", 1..11), text("Header 2", 12..22)]),
+            vec![],
+        );
+
+        assert_eq!(
+            parse(markdown).children[0],
+            ParsedMarkdownElement::Table(expected_table)
+        );
+    }
+
+    #[test]
+    fn test_basic_table() {
+        let markdown = "\
+| Header 1 | Header 2 |
+|----------|----------|
+| Cell 1   | Cell 2   |
+| Cell 3   | Cell 4   |";
+
+        let expected_table = table(
+            0..95,
+            row(vec![text("Header 1", 1..11), text("Header 2", 12..22)]),
+            vec![
+                row(vec![text("Cell 1", 49..59), text("Cell 2", 60..70)]),
+                row(vec![text("Cell 3", 73..83), text("Cell 4", 84..94)]),
+            ],
+        );
+
+        assert_eq!(
+            parse(markdown).children[0],
+            ParsedMarkdownElement::Table(expected_table)
+        );
+    }
+
+    #[test]
+    fn test_list_basic() {
+        let parsed = parse(
+            "\
+* Item 1
+* Item 2
+* Item 3
+",
+        );
+
+        assert_eq!(
+            parsed.children,
+            vec![list(
+                vec![
+                    list_item(1, Unordered, vec![p("Item 1", 0..9)]),
+                    list_item(1, Unordered, vec![p("Item 2", 9..18)]),
+                    list_item(1, Unordered, vec![p("Item 3", 18..27)]),
+                ],
+                0..27
+            ),]
+        );
+    }
+
+    #[test]
+    fn test_list_with_tasks() {
+        let parsed = parse(
+            "\
+- [ ] TODO
+- [x] Checked
+",
+        );
+
+        assert_eq!(
+            parsed.children,
+            vec![list(
+                vec![
+                    list_item(1, Task(false), vec![p("TODO", 2..5)]),
+                    list_item(1, Task(true), vec![p("Checked", 13..16)]),
+                ],
+                0..25
+            ),]
+        );
+    }
+
+    #[test]
+    fn test_list_nested() {
+        let parsed = parse(
+            "\
+* Item 1
+* Item 2
+* Item 3
+
+1. Hello
+1. Two
+   1. Three
+2. Four
+3. Five
+
+* First
+  1. Hello
+     1. Goodbyte
+        - Inner
+        - Inner
+  2. Goodbyte
+* Last
+",
+        );
+
+        assert_eq!(
+            parsed.children,
+            vec![
+                list(
+                    vec![
+                        list_item(1, Unordered, vec![p("Item 1", 0..9)]),
+                        list_item(1, Unordered, vec![p("Item 2", 9..18)]),
+                        list_item(1, Unordered, vec![p("Item 3", 18..28)]),
+                    ],
+                    0..28
+                ),
+                list(
+                    vec![
+                        list_item(1, Ordered(1), vec![p("Hello", 28..37)]),
+                        list_item(
+                            1,
+                            Ordered(2),
+                            vec![
+                                p("Two", 37..56),
+                                list(
+                                    vec![list_item(2, Ordered(1), vec![p("Three", 47..56)]),],
+                                    47..56
+                                ),
+                            ]
+                        ),
+                        list_item(1, Ordered(3), vec![p("Four", 56..64)]),
+                        list_item(1, Ordered(4), vec![p("Five", 64..73)]),
+                    ],
+                    28..73
+                ),
+                list(
+                    vec![
+                        list_item(
+                            1,
+                            Unordered,
+                            vec![
+                                p("First", 73..155),
+                                list(
+                                    vec![
+                                        list_item(
+                                            2,
+                                            Ordered(1),
+                                            vec![
+                                                p("Hello", 83..141),
+                                                list(
+                                                    vec![list_item(
+                                                        3,
+                                                        Ordered(1),
+                                                        vec![
+                                                            p("Goodbyte", 97..141),
+                                                            list(
+                                                                vec![
+                                                                    list_item(
+                                                                        4,
+                                                                        Unordered,
+                                                                        vec![p("Inner", 117..125)]
+                                                                    ),
+                                                                    list_item(
+                                                                        4,
+                                                                        Unordered,
+                                                                        vec![p("Inner", 133..141)]
+                                                                    ),
+                                                                ],
+                                                                117..141
+                                                            )
+                                                        ]
+                                                    ),],
+                                                    97..141
+                                                )
+                                            ]
+                                        ),
+                                        list_item(2, Ordered(2), vec![p("Goodbyte", 143..155)]),
+                                    ],
+                                    83..155
+                                )
+                            ]
+                        ),
+                        list_item(1, Unordered, vec![p("Last", 155..162)]),
+                    ],
+                    73..162
+                ),
+            ]
+        );
+    }
+
+    #[test]
+    fn test_list_with_nested_content() {
+        let parsed = parse(
+            "\
+*   This is a list item with two paragraphs.
+
+    This is the second paragraph in the list item.",
+        );
+
+        assert_eq!(
+            parsed.children,
+            vec![list(
+                vec![list_item(
+                    1,
+                    Unordered,
+                    vec![
+                        p("This is a list item with two paragraphs.", 4..45),
+                        p("This is the second paragraph in the list item.", 50..96)
+                    ],
+                ),],
+                0..96,
+            ),]
+        );
+    }
+
+    #[test]
+    fn test_list_with_leading_text() {
+        let parsed = parse(
+            "\
+* `code`
+* **bold**
+* [link](https://example.com)
+",
+        );
+
+        assert_eq!(
+            parsed.children,
+            vec![list(
+                vec![
+                    list_item(1, Unordered, vec![p("code", 0..9)],),
+                    list_item(1, Unordered, vec![p("bold", 9..20)]),
+                    list_item(1, Unordered, vec![p("link", 20..50)],)
+                ],
+                0..50,
+            ),]
+        );
+    }
+
+    #[test]
+    fn test_simple_block_quote() {
+        let parsed = parse("> Simple block quote with **styled text**");
+
+        assert_eq!(
+            parsed.children,
+            vec![block_quote(
+                vec![p("Simple block quote with styled text", 2..41)],
+                0..41
+            )]
+        );
+    }
+
+    #[test]
+    fn test_simple_block_quote_with_multiple_lines() {
+        let parsed = parse(
+            "\
+> # Heading
+> More
+> text
+>
+> More text
+",
+        );
+
+        assert_eq!(
+            parsed.children,
+            vec![block_quote(
+                vec![
+                    h1(text("Heading", 2..12), 2..12),
+                    p("More text", 14..26),
+                    p("More text", 30..40)
+                ],
+                0..40
+            )]
+        );
+    }
+
+    #[test]
+    fn test_nested_block_quote() {
+        let parsed = parse(
+            "\
+> A
+>
+> > # B
+>
+> C
+
+More text
+",
+        );
+
+        assert_eq!(
+            parsed.children,
+            vec![
+                block_quote(
+                    vec![
+                        p("A", 2..4),
+                        block_quote(vec![h1(text("B", 10..14), 10..14)], 8..14),
+                        p("C", 18..20)
+                    ],
+                    0..20
+                ),
+                p("More text", 21..31)
+            ]
+        );
+    }
+
+    #[test]
+    fn test_code_block() {
+        let parsed = parse(
+            "\
+```
+fn main() {
+    return 0;
+}
+```
+",
+        );
+
+        assert_eq!(
+            parsed.children,
+            vec![code_block(None, "fn main() {\n    return 0;\n}", 0..35)]
+        );
+    }
+
+    #[test]
+    fn test_code_block_with_language() {
+        let parsed = parse(
+            "\
+```rust
+fn main() {
+    return 0;
+}
+```
+",
+        );
+
+        assert_eq!(
+            parsed.children,
+            vec![code_block(
+                Some("rust".into()),
+                "fn main() {\n    return 0;\n}",
+                0..39
+            )]
+        );
+    }
+
+    fn h1(contents: ParsedMarkdownText, source_range: Range<usize>) -> ParsedMarkdownElement {
+        ParsedMarkdownElement::Heading(ParsedMarkdownHeading {
+            source_range,
+            level: HeadingLevel::H1,
+            contents,
+        })
+    }
+
+    fn h2(contents: ParsedMarkdownText, source_range: Range<usize>) -> ParsedMarkdownElement {
+        ParsedMarkdownElement::Heading(ParsedMarkdownHeading {
+            source_range,
+            level: HeadingLevel::H2,
+            contents,
+        })
+    }
+
+    fn h3(contents: ParsedMarkdownText, source_range: Range<usize>) -> ParsedMarkdownElement {
+        ParsedMarkdownElement::Heading(ParsedMarkdownHeading {
+            source_range,
+            level: HeadingLevel::H3,
+            contents,
+        })
+    }
+
+    fn p(contents: &str, source_range: Range<usize>) -> ParsedMarkdownElement {
+        ParsedMarkdownElement::Paragraph(text(contents, source_range))
+    }
+
+    fn text(contents: &str, source_range: Range<usize>) -> ParsedMarkdownText {
+        ParsedMarkdownText {
+            highlights: Vec::new(),
+            region_ranges: Vec::new(),
+            regions: Vec::new(),
+            source_range,
+            contents: contents.to_string(),
+        }
+    }
+
+    fn block_quote(
+        children: Vec<ParsedMarkdownElement>,
+        source_range: Range<usize>,
+    ) -> ParsedMarkdownElement {
+        ParsedMarkdownElement::BlockQuote(ParsedMarkdownBlockQuote {
+            source_range,
+            children: children.into_iter().map(Box::new).collect(),
+        })
+    }
+
+    fn code_block(
+        language: Option<String>,
+        code: &str,
+        source_range: Range<usize>,
+    ) -> ParsedMarkdownElement {
+        ParsedMarkdownElement::CodeBlock(ParsedMarkdownCodeBlock {
+            source_range,
+            language,
+            contents: code.to_string().into(),
+        })
+    }
+
+    fn list(
+        children: Vec<ParsedMarkdownListItem>,
+        source_range: Range<usize>,
+    ) -> ParsedMarkdownElement {
+        List(ParsedMarkdownList {
+            source_range,
+            children,
+        })
+    }
+
+    fn list_item(
+        depth: u16,
+        item_type: ParsedMarkdownListItemType,
+        contents: Vec<ParsedMarkdownElement>,
+    ) -> ParsedMarkdownListItem {
+        ParsedMarkdownListItem {
+            item_type,
+            depth,
+            contents: contents.into_iter().map(Box::new).collect(),
+        }
+    }
+
+    fn table(
+        source_range: Range<usize>,
+        header: ParsedMarkdownTableRow,
+        body: Vec<ParsedMarkdownTableRow>,
+    ) -> ParsedMarkdownTable {
+        ParsedMarkdownTable {
+            column_alignments: Vec::new(),
+            source_range,
+            header,
+            body,
+        }
+    }
+
+    fn row(children: Vec<ParsedMarkdownText>) -> ParsedMarkdownTableRow {
+        ParsedMarkdownTableRow { children }
+    }
+
+    impl PartialEq for ParsedMarkdownTable {
+        fn eq(&self, other: &Self) -> bool {
+            self.source_range == other.source_range
+                && self.header == other.header
+                && self.body == other.body
+        }
+    }
+
+    impl PartialEq for ParsedMarkdownText {
+        fn eq(&self, other: &Self) -> bool {
+            self.source_range == other.source_range && self.contents == other.contents
+        }
+    }
+}
diff --git a/crates/markdown_preview/src/markdown_preview.rs b/crates/markdown_preview/src/markdown_preview.rs
index 84c8ac6245..e29f977d71 100644
--- a/crates/markdown_preview/src/markdown_preview.rs
+++ b/crates/markdown_preview/src/markdown_preview.rs
@@ -1,6 +1,8 @@
 use gpui::{actions, AppContext};
 use workspace::Workspace;
 
+pub mod markdown_elements;
+pub mod markdown_parser;
 pub mod markdown_preview_view;
 pub mod markdown_renderer;
 
diff --git a/crates/markdown_preview/src/markdown_preview_view.rs b/crates/markdown_preview/src/markdown_preview_view.rs
index f9e121e7ee..f22a997e49 100644
--- a/crates/markdown_preview/src/markdown_preview_view.rs
+++ b/crates/markdown_preview/src/markdown_preview_view.rs
@@ -1,35 +1,41 @@
+use std::{ops::Range, path::PathBuf};
+
 use editor::{Editor, EditorEvent};
 use gpui::{
-    canvas, AnyElement, AppContext, AvailableSpace, EventEmitter, FocusHandle, FocusableView,
-    InteractiveElement, IntoElement, ParentElement, Render, Styled, View, ViewContext,
+    list, AnyElement, AppContext, EventEmitter, FocusHandle, FocusableView, InteractiveElement,
+    IntoElement, ListState, ParentElement, Render, Styled, View, ViewContext, WeakView,
 };
-use language::LanguageRegistry;
-use std::sync::Arc;
 use ui::prelude::*;
 use workspace::item::Item;
 use workspace::Workspace;
 
-use crate::{markdown_renderer::render_markdown, OpenPreview};
+use crate::{
+    markdown_elements::ParsedMarkdown,
+    markdown_parser::parse_markdown,
+    markdown_renderer::{render_markdown_block, RenderContext},
+    OpenPreview,
+};
 
 pub struct MarkdownPreviewView {
+    workspace: WeakView<Workspace>,
     focus_handle: FocusHandle,
-    languages: Arc<LanguageRegistry>,
-    contents: String,
+    contents: ParsedMarkdown,
+    selected_block: usize,
+    list_state: ListState,
 }
 
 impl MarkdownPreviewView {
     pub fn register(workspace: &mut Workspace, _cx: &mut ViewContext<Workspace>) {
-        let languages = workspace.app_state().languages.clone();
-
         workspace.register_action(move |workspace, _: &OpenPreview, cx| {
             if workspace.has_active_modal(cx) {
                 cx.propagate();
                 return;
             }
-            let languages = languages.clone();
+
             if let Some(editor) = workspace.active_item_as::<Editor>(cx) {
+                let workspace_handle = workspace.weak_handle();
                 let view: View<MarkdownPreviewView> =
-                    cx.new_view(|cx| MarkdownPreviewView::new(editor, languages, cx));
+                    MarkdownPreviewView::new(editor, workspace_handle, cx);
                 workspace.split_item(workspace::SplitDirection::Right, Box::new(view.clone()), cx);
                 cx.notify();
             }
@@ -38,30 +44,121 @@ impl MarkdownPreviewView {
 
     pub fn new(
         active_editor: View<Editor>,
-        languages: Arc<LanguageRegistry>,
-        cx: &mut ViewContext<Self>,
-    ) -> Self {
-        let focus_handle = cx.focus_handle();
+        workspace: WeakView<Workspace>,
+        cx: &mut ViewContext<Workspace>,
+    ) -> View<Self> {
+        cx.new_view(|cx: &mut ViewContext<Self>| {
+            let view = cx.view().downgrade();
+            let editor = active_editor.read(cx);
 
-        cx.subscribe(&active_editor, |this, editor, event: &EditorEvent, cx| {
-            if *event == EditorEvent::Edited {
-                let editor = editor.read(cx);
-                let contents = editor.buffer().read(cx).snapshot(cx).text();
-                this.contents = contents;
-                cx.notify();
+            let file_location = MarkdownPreviewView::get_folder_for_active_editor(editor, cx);
+            let contents = editor.buffer().read(cx).snapshot(cx).text();
+            let contents = parse_markdown(&contents, file_location);
+
+            cx.subscribe(&active_editor, |this, editor, event: &EditorEvent, cx| {
+                match event {
+                    EditorEvent::Edited => {
+                        let editor = editor.read(cx);
+                        let contents = editor.buffer().read(cx).snapshot(cx).text();
+                        let file_location =
+                            MarkdownPreviewView::get_folder_for_active_editor(editor, cx);
+                        this.contents = parse_markdown(&contents, file_location);
+                        this.list_state.reset(this.contents.children.len());
+                        cx.notify();
+
+                        // TODO: This does not work as expected.
+                        // The scroll request appears to be dropped
+                        // after `.reset` is called.
+                        this.list_state.scroll_to_reveal_item(this.selected_block);
+                        cx.notify();
+                    }
+                    EditorEvent::SelectionsChanged { .. } => {
+                        let editor = editor.read(cx);
+                        let selection_range = editor.selections.last::<usize>(cx).range();
+                        this.selected_block = this.get_block_index_under_cursor(selection_range);
+                        this.list_state.scroll_to_reveal_item(this.selected_block);
+                        cx.notify();
+                    }
+                    _ => {}
+                };
+            })
+            .detach();
+
+            let list_state = ListState::new(
+                contents.children.len(),
+                gpui::ListAlignment::Top,
+                px(1000.),
+                move |ix, cx| {
+                    if let Some(view) = view.upgrade() {
+                        view.update(cx, |view, cx| {
+                            let mut render_cx =
+                                RenderContext::new(Some(view.workspace.clone()), cx);
+                            let block = view.contents.children.get(ix).unwrap();
+                            let block = render_markdown_block(block, &mut render_cx);
+                            let block = div().child(block).pl_4().pb_3();
+
+                            if ix == view.selected_block {
+                                let indicator = div()
+                                    .h_full()
+                                    .w(px(4.0))
+                                    .bg(cx.theme().colors().border)
+                                    .rounded_sm();
+
+                                return div()
+                                    .relative()
+                                    .child(block)
+                                    .child(indicator.absolute().left_0().top_0())
+                                    .into_any();
+                            }
+
+                            block.into_any()
+                        })
+                    } else {
+                        div().into_any()
+                    }
+                },
+            );
+
+            Self {
+                selected_block: 0,
+                focus_handle: cx.focus_handle(),
+                workspace,
+                contents,
+                list_state,
             }
         })
-        .detach();
+    }
 
-        let editor = active_editor.read(cx);
-        let contents = editor.buffer().read(cx).snapshot(cx).text();
-
-        Self {
-            focus_handle,
-            languages,
-            contents,
+    /// The absolute path of the file that is currently being previewed.
+    fn get_folder_for_active_editor(
+        editor: &Editor,
+        cx: &ViewContext<MarkdownPreviewView>,
+    ) -> Option<PathBuf> {
+        if let Some(file) = editor.file_at(0, cx) {
+            if let Some(file) = file.as_local() {
+                file.abs_path(cx).parent().map(|p| p.to_path_buf())
+            } else {
+                None
+            }
+        } else {
+            None
         }
     }
+
+    fn get_block_index_under_cursor(&self, selection_range: Range<usize>) -> usize {
+        let mut block_index = 0;
+        let cursor = selection_range.start;
+
+        for (i, block) in self.contents.children.iter().enumerate() {
+            let Range { start, end } = block.source_range();
+            if start <= cursor && end >= cursor {
+                block_index = i;
+                break;
+            }
+        }
+
+        return block_index;
+    }
 }
 
 impl FocusableView for MarkdownPreviewView {
@@ -108,30 +205,17 @@ impl Item for MarkdownPreviewView {
 
 impl Render for MarkdownPreviewView {
     fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
-        let rendered_markdown = v_flex()
-            .items_start()
-            .justify_start()
+        v_flex()
+            .id("MarkdownPreview")
             .key_context("MarkdownPreview")
             .track_focus(&self.focus_handle)
-            .id("MarkdownPreview")
-            .overflow_y_scroll()
-            .overflow_x_hidden()
-            .size_full()
+            .full()
             .bg(cx.theme().colors().editor_background)
             .p_4()
-            .children(render_markdown(&self.contents, &self.languages, cx));
-
-        div().flex_1().child(
-            // FIXME: This shouldn't be necessary
-            // but the overflow_scroll above doesn't seem to work without it
-            canvas(move |bounds, cx| {
-                rendered_markdown.into_any().draw(
-                    bounds.origin,
-                    bounds.size.map(AvailableSpace::Definite),
-                    cx,
-                )
-            })
-            .size_full(),
-        )
+            .child(
+                div()
+                    .flex_grow()
+                    .map(|this| this.child(list(self.list_state.clone()).full())),
+            )
     }
 }
diff --git a/crates/markdown_preview/src/markdown_renderer.rs b/crates/markdown_preview/src/markdown_renderer.rs
index 60fab49478..18e6cba18d 100644
--- a/crates/markdown_preview/src/markdown_renderer.rs
+++ b/crates/markdown_preview/src/markdown_renderer.rs
@@ -1,346 +1,322 @@
-use std::{ops::Range, sync::Arc};
-
-use gpui::{
-    div, px, rems, AnyElement, DefiniteLength, Div, ElementId, Hsla, ParentElement, SharedString,
-    Styled, StyledText, WindowContext,
+use crate::markdown_elements::{
+    HeadingLevel, Link, ParsedMarkdown, ParsedMarkdownBlockQuote, ParsedMarkdownCodeBlock,
+    ParsedMarkdownElement, ParsedMarkdownHeading, ParsedMarkdownList, ParsedMarkdownListItemType,
+    ParsedMarkdownTable, ParsedMarkdownTableAlignment, ParsedMarkdownTableRow, ParsedMarkdownText,
 };
-use language::LanguageRegistry;
-use pulldown_cmark::{Alignment, CodeBlockKind, Event, HeadingLevel, Options, Parser, Tag};
-use rich_text::render_rich_text;
-use theme::{ActiveTheme, Theme};
-use ui::{h_flex, v_flex};
+use gpui::{
+    div, px, rems, AbsoluteLength, AnyElement, DefiniteLength, Div, Element, ElementId,
+    HighlightStyle, Hsla, InteractiveText, IntoElement, ParentElement, SharedString, Styled,
+    StyledText, TextStyle, WeakView, WindowContext,
+};
+use std::{ops::Range, sync::Arc};
+use theme::{ActiveTheme, SyntaxTheme};
+use ui::{h_flex, v_flex, Label};
+use workspace::Workspace;
 
-enum TableState {
-    Header,
-    Body,
-}
-
-struct MarkdownTable {
-    column_alignments: Vec<Alignment>,
-    header: Vec<Div>,
-    body: Vec<Vec<Div>>,
-    current_row: Vec<Div>,
-    state: TableState,
+pub struct RenderContext {
+    workspace: Option<WeakView<Workspace>>,
+    next_id: usize,
+    text_style: TextStyle,
     border_color: Hsla,
+    text_color: Hsla,
+    text_muted_color: Hsla,
+    code_block_background_color: Hsla,
+    code_span_background_color: Hsla,
+    syntax_theme: Arc<SyntaxTheme>,
+    indent: usize,
 }
 
-impl MarkdownTable {
-    fn new(border_color: Hsla, column_alignments: Vec<Alignment>) -> Self {
-        Self {
-            column_alignments,
-            header: Vec::new(),
-            body: Vec::new(),
-            current_row: Vec::new(),
-            state: TableState::Header,
-            border_color,
+impl RenderContext {
+    pub fn new(workspace: Option<WeakView<Workspace>>, cx: &WindowContext) -> RenderContext {
+        let theme = cx.theme().clone();
+
+        RenderContext {
+            workspace,
+            next_id: 0,
+            indent: 0,
+            text_style: cx.text_style(),
+            syntax_theme: theme.syntax().clone(),
+            border_color: theme.colors().border,
+            text_color: theme.colors().text,
+            text_muted_color: theme.colors().text_muted,
+            code_block_background_color: theme.colors().surface_background,
+            code_span_background_color: theme.colors().editor_document_highlight_read_background,
         }
     }
 
-    fn finish_row(&mut self) {
-        match self.state {
-            TableState::Header => {
-                self.header.extend(self.current_row.drain(..));
-                self.state = TableState::Body;
-            }
-            TableState::Body => {
-                self.body.push(self.current_row.drain(..).collect());
-            }
-        }
+    fn next_id(&mut self, span: &Range<usize>) -> ElementId {
+        let id = format!("markdown-{}-{}-{}", self.next_id, span.start, span.end);
+        self.next_id += 1;
+        ElementId::from(SharedString::from(id))
     }
 
-    fn add_cell(&mut self, contents: AnyElement) {
-        let container = match self.alignment_for_next_cell() {
-            Alignment::Left | Alignment::None => div(),
-            Alignment::Center => v_flex().items_center(),
-            Alignment::Right => v_flex().items_end(),
+    /// This ensures that children inside of block quotes
+    /// have padding between them.
+    ///
+    /// For example, for this markdown:
+    ///
+    /// ```markdown
+    /// > This is a block quote.
+    /// >
+    /// > And this is the next paragraph.
+    /// ```
+    ///
+    /// We give padding between "This is a block quote."
+    /// and "And this is the next paragraph."
+    fn with_common_p(&self, element: Div) -> Div {
+        if self.indent > 0 {
+            element.pb_3()
+        } else {
+            element
+        }
+    }
+}
+
+pub fn render_parsed_markdown(
+    parsed: &ParsedMarkdown,
+    workspace: Option<WeakView<Workspace>>,
+    cx: &WindowContext,
+) -> Vec<AnyElement> {
+    let mut cx = RenderContext::new(workspace, cx);
+    let mut elements = Vec::new();
+
+    for child in &parsed.children {
+        elements.push(render_markdown_block(child, &mut cx));
+    }
+
+    return elements;
+}
+
+pub fn render_markdown_block(block: &ParsedMarkdownElement, cx: &mut RenderContext) -> AnyElement {
+    use ParsedMarkdownElement::*;
+    match block {
+        Paragraph(text) => render_markdown_paragraph(text, cx),
+        Heading(heading) => render_markdown_heading(heading, cx),
+        List(list) => render_markdown_list(list, cx),
+        Table(table) => render_markdown_table(table, cx),
+        BlockQuote(block_quote) => render_markdown_block_quote(block_quote, cx),
+        CodeBlock(code_block) => render_markdown_code_block(code_block, cx),
+        HorizontalRule(_) => render_markdown_rule(cx),
+    }
+}
+
+fn render_markdown_heading(parsed: &ParsedMarkdownHeading, cx: &mut RenderContext) -> AnyElement {
+    let size = match parsed.level {
+        HeadingLevel::H1 => rems(2.),
+        HeadingLevel::H2 => rems(1.5),
+        HeadingLevel::H3 => rems(1.25),
+        HeadingLevel::H4 => rems(1.),
+        HeadingLevel::H5 => rems(0.875),
+        HeadingLevel::H6 => rems(0.85),
+    };
+
+    let color = match parsed.level {
+        HeadingLevel::H6 => cx.text_muted_color,
+        _ => cx.text_color,
+    };
+
+    let line_height = DefiniteLength::from(rems(1.25));
+
+    div()
+        .line_height(line_height)
+        .text_size(size)
+        .text_color(color)
+        .pt(rems(0.15))
+        .pb_1()
+        .child(render_markdown_text(&parsed.contents, cx))
+        .into_any()
+}
+
+fn render_markdown_list(parsed: &ParsedMarkdownList, cx: &mut RenderContext) -> AnyElement {
+    use ParsedMarkdownListItemType::*;
+
+    let mut items = vec![];
+    for item in &parsed.children {
+        let padding = rems((item.depth - 1) as f32 * 0.25);
+
+        let bullet = match item.item_type {
+            Ordered(order) => format!("{}.", order),
+            Unordered => "•".to_string(),
+            Task(checked) => if checked { "☑" } else { "☐" }.to_string(),
+        };
+        let bullet = div().mr_2().child(Label::new(bullet));
+
+        let contents: Vec<AnyElement> = item
+            .contents
+            .iter()
+            .map(|c| render_markdown_block(c.as_ref(), cx))
+            .collect();
+
+        let item = h_flex()
+            .pl(DefiniteLength::Absolute(AbsoluteLength::Rems(padding)))
+            .items_start()
+            .children(vec![bullet, div().children(contents).pr_2().w_full()]);
+
+        items.push(item);
+    }
+
+    cx.with_common_p(div()).children(items).into_any()
+}
+
+fn render_markdown_table(parsed: &ParsedMarkdownTable, cx: &mut RenderContext) -> AnyElement {
+    let header = render_markdown_table_row(&parsed.header, &parsed.column_alignments, true, cx);
+
+    let body: Vec<AnyElement> = parsed
+        .body
+        .iter()
+        .map(|row| render_markdown_table_row(row, &parsed.column_alignments, false, cx))
+        .collect();
+
+    cx.with_common_p(v_flex())
+        .w_full()
+        .child(header)
+        .children(body)
+        .into_any()
+}
+
+fn render_markdown_table_row(
+    parsed: &ParsedMarkdownTableRow,
+    alignments: &Vec<ParsedMarkdownTableAlignment>,
+    is_header: bool,
+    cx: &mut RenderContext,
+) -> AnyElement {
+    let mut items = vec![];
+
+    for cell in &parsed.children {
+        let alignment = alignments
+            .get(items.len())
+            .copied()
+            .unwrap_or(ParsedMarkdownTableAlignment::None);
+
+        let contents = render_markdown_text(cell, cx);
+
+        let container = match alignment {
+            ParsedMarkdownTableAlignment::Left | ParsedMarkdownTableAlignment::None => div(),
+            ParsedMarkdownTableAlignment::Center => v_flex().items_center(),
+            ParsedMarkdownTableAlignment::Right => v_flex().items_end(),
         };
 
-        let cell = container
+        let mut cell = container
             .w_full()
             .child(contents)
             .px_2()
             .py_1()
-            .border_color(self.border_color);
+            .border_color(cx.border_color);
 
-        let cell = match self.state {
-            TableState::Header => cell.border_2(),
-            TableState::Body => cell.border_1(),
-        };
-
-        self.current_row.push(cell);
-    }
-
-    fn finish(self) -> Div {
-        let mut table = v_flex().w_full();
-        let mut header = h_flex();
-
-        for cell in self.header {
-            header = header.child(cell);
+        if is_header {
+            cell = cell.border_2()
+        } else {
+            cell = cell.border_1()
         }
-        table = table.child(header);
-        for row in self.body {
-            let mut row_div = h_flex();
-            for cell in row {
-                row_div = row_div.child(cell);
-            }
-            table = table.child(row_div);
-        }
-        table
+
+        items.push(cell);
     }
 
-    fn alignment_for_next_cell(&self) -> Alignment {
-        self.column_alignments
-            .get(self.current_row.len())
-            .copied()
-            .unwrap_or(Alignment::None)
-    }
+    h_flex().children(items).into_any_element()
 }
 
-struct Renderer<I> {
-    source_contents: String,
-    iter: I,
-    theme: Arc<Theme>,
-    finished: Vec<Div>,
-    language_registry: Arc<LanguageRegistry>,
-    table: Option<MarkdownTable>,
-    list_depth: usize,
-    block_quote_depth: usize,
+fn render_markdown_block_quote(
+    parsed: &ParsedMarkdownBlockQuote,
+    cx: &mut RenderContext,
+) -> AnyElement {
+    cx.indent += 1;
+
+    let children: Vec<AnyElement> = parsed
+        .children
+        .iter()
+        .map(|child| render_markdown_block(child, cx))
+        .collect();
+
+    cx.indent -= 1;
+
+    cx.with_common_p(div())
+        .child(
+            div()
+                .border_l_4()
+                .border_color(cx.border_color)
+                .pl_3()
+                .children(children),
+        )
+        .into_any()
 }
 
-impl<'a, I> Renderer<I>
-where
-    I: Iterator<Item = (Event<'a>, Range<usize>)>,
-{
-    fn new(
-        iter: I,
-        source_contents: String,
-        language_registry: &Arc<LanguageRegistry>,
-        theme: Arc<Theme>,
-    ) -> Self {
-        Self {
-            iter,
-            source_contents,
-            theme,
-            table: None,
-            finished: vec![],
-            language_registry: language_registry.clone(),
-            list_depth: 0,
-            block_quote_depth: 0,
-        }
-    }
-
-    fn run(mut self, cx: &WindowContext) -> Self {
-        while let Some((event, source_range)) = self.iter.next() {
-            match event {
-                Event::Start(tag) => {
-                    self.start_tag(tag);
-                }
-                Event::End(tag) => {
-                    self.end_tag(tag, source_range, cx);
-                }
-                Event::Rule => {
-                    let rule = div().w_full().h(px(2.)).bg(self.theme.colors().border);
-                    self.finished.push(div().mb_4().child(rule));
-                }
-                _ => {}
-            }
-        }
-        self
-    }
-
-    fn start_tag(&mut self, tag: Tag<'a>) {
-        match tag {
-            Tag::List(_) => {
-                self.list_depth += 1;
-            }
-            Tag::BlockQuote => {
-                self.block_quote_depth += 1;
-            }
-            Tag::Table(column_alignments) => {
-                self.table = Some(MarkdownTable::new(
-                    self.theme.colors().border,
-                    column_alignments,
-                ));
-            }
-            _ => {}
-        }
-    }
-
-    fn end_tag(&mut self, tag: Tag, source_range: Range<usize>, cx: &WindowContext) {
-        match tag {
-            Tag::Paragraph => {
-                if self.list_depth > 0 || self.block_quote_depth > 0 {
-                    return;
-                }
-
-                let element = self.render_md_from_range(source_range.clone(), cx);
-                let paragraph = div().mb_3().child(element);
-
-                self.finished.push(paragraph);
-            }
-            Tag::Heading(level, _, _) => {
-                let mut headline = self.headline(level);
-                if source_range.start > 0 {
-                    headline = headline.mt_4();
-                }
-
-                let element = self.render_md_from_range(source_range.clone(), cx);
-                let headline = headline.child(element);
-
-                self.finished.push(headline);
-            }
-            Tag::List(_) => {
-                if self.list_depth == 1 {
-                    let element = self.render_md_from_range(source_range.clone(), cx);
-                    let list = div().mb_3().child(element);
-
-                    self.finished.push(list);
-                }
-
-                self.list_depth -= 1;
-            }
-            Tag::BlockQuote => {
-                let element = self.render_md_from_range(source_range.clone(), cx);
-
-                let block_quote = h_flex()
-                    .mb_3()
-                    .child(
-                        div()
-                            .w(px(4.))
-                            .bg(self.theme.colors().border)
-                            .h_full()
-                            .mr_2()
-                            .mt_1(),
-                    )
-                    .text_color(self.theme.colors().text_muted)
-                    .child(element);
-
-                self.finished.push(block_quote);
-
-                self.block_quote_depth -= 1;
-            }
-            Tag::CodeBlock(kind) => {
-                let contents = self.source_contents[source_range.clone()].trim();
-                let contents = contents.trim_start_matches("```");
-                let contents = contents.trim_end_matches("```");
-                let contents = match kind {
-                    CodeBlockKind::Fenced(language) => {
-                        contents.trim_start_matches(&language.to_string())
-                    }
-                    CodeBlockKind::Indented => contents,
-                };
-                let contents: String = contents.into();
-                let contents = SharedString::from(contents);
-
-                let code_block = div()
-                    .mb_3()
-                    .px_4()
-                    .py_0()
-                    .bg(self.theme.colors().surface_background)
-                    .child(StyledText::new(contents));
-
-                self.finished.push(code_block);
-            }
-            Tag::Table(_alignment) => {
-                if self.table.is_none() {
-                    log::error!("Table end without table ({:?})", source_range);
-                    return;
-                }
-
-                let table = self.table.take().unwrap();
-                let table = table.finish().mb_4();
-                self.finished.push(table);
-            }
-            Tag::TableHead => {
-                if self.table.is_none() {
-                    log::error!("Table head without table ({:?})", source_range);
-                    return;
-                }
-
-                self.table.as_mut().unwrap().finish_row();
-            }
-            Tag::TableRow => {
-                if self.table.is_none() {
-                    log::error!("Table row without table ({:?})", source_range);
-                    return;
-                }
-
-                self.table.as_mut().unwrap().finish_row();
-            }
-            Tag::TableCell => {
-                if self.table.is_none() {
-                    log::error!("Table cell without table ({:?})", source_range);
-                    return;
-                }
-
-                let contents = self.render_md_from_range(source_range.clone(), cx);
-                self.table.as_mut().unwrap().add_cell(contents);
-            }
-            _ => {}
-        }
-    }
-
-    fn render_md_from_range(
-        &self,
-        source_range: Range<usize>,
-        cx: &WindowContext,
-    ) -> gpui::AnyElement {
-        let mentions = &[];
-        let language = None;
-        let paragraph = &self.source_contents[source_range.clone()];
-        let rich_text = render_rich_text(
-            paragraph.into(),
-            mentions,
-            &self.language_registry,
-            language,
-        );
-        let id: ElementId = source_range.start.into();
-        rich_text.element(id, cx)
-    }
-
-    fn headline(&self, level: HeadingLevel) -> Div {
-        let size = match level {
-            HeadingLevel::H1 => rems(2.),
-            HeadingLevel::H2 => rems(1.5),
-            HeadingLevel::H3 => rems(1.25),
-            HeadingLevel::H4 => rems(1.),
-            HeadingLevel::H5 => rems(0.875),
-            HeadingLevel::H6 => rems(0.85),
-        };
-
-        let color = match level {
-            HeadingLevel::H6 => self.theme.colors().text_muted,
-            _ => self.theme.colors().text,
-        };
-
-        let line_height = DefiniteLength::from(rems(1.25));
-
-        let headline = h_flex()
-            .w_full()
-            .line_height(line_height)
-            .text_size(size)
-            .text_color(color)
-            .mb_4()
-            .pb(rems(0.15));
-
-        headline
-    }
+fn render_markdown_code_block(
+    parsed: &ParsedMarkdownCodeBlock,
+    cx: &mut RenderContext,
+) -> AnyElement {
+    cx.with_common_p(div())
+        .px_3()
+        .py_3()
+        .bg(cx.code_block_background_color)
+        .child(StyledText::new(parsed.contents.clone()))
+        .into_any()
 }
 
-pub fn render_markdown(
-    markdown_input: &str,
-    language_registry: &Arc<LanguageRegistry>,
-    cx: &WindowContext,
-) -> Vec<Div> {
-    let theme = cx.theme().clone();
-    let options = Options::all();
-    let parser = Parser::new_ext(markdown_input, options);
-    let renderer = Renderer::new(
-        parser.into_offset_iter(),
-        markdown_input.to_owned(),
-        language_registry,
-        theme,
+fn render_markdown_paragraph(parsed: &ParsedMarkdownText, cx: &mut RenderContext) -> AnyElement {
+    cx.with_common_p(div())
+        .child(render_markdown_text(parsed, cx))
+        .into_any_element()
+}
+
+fn render_markdown_text(parsed: &ParsedMarkdownText, cx: &mut RenderContext) -> AnyElement {
+    let element_id = cx.next_id(&parsed.source_range);
+
+    let highlights = gpui::combine_highlights(
+        parsed.highlights.iter().filter_map(|(range, highlight)| {
+            let highlight = highlight.to_highlight_style(&cx.syntax_theme)?;
+            Some((range.clone(), highlight))
+        }),
+        parsed
+            .regions
+            .iter()
+            .zip(&parsed.region_ranges)
+            .filter_map(|(region, range)| {
+                if region.code {
+                    Some((
+                        range.clone(),
+                        HighlightStyle {
+                            background_color: Some(cx.code_span_background_color),
+                            ..Default::default()
+                        },
+                    ))
+                } else {
+                    None
+                }
+            }),
     );
-    let renderer = renderer.run(cx);
-    return renderer.finished;
+
+    let mut links = Vec::new();
+    let mut link_ranges = Vec::new();
+    for (range, region) in parsed.region_ranges.iter().zip(&parsed.regions) {
+        if let Some(link) = region.link.clone() {
+            links.push(link);
+            link_ranges.push(range.clone());
+        }
+    }
+
+    let workspace = cx.workspace.clone();
+
+    InteractiveText::new(
+        element_id,
+        StyledText::new(parsed.contents.clone()).with_highlights(&cx.text_style, highlights),
+    )
+    .on_click(
+        link_ranges,
+        move |clicked_range_ix, window_cx| match &links[clicked_range_ix] {
+            Link::Web { url } => window_cx.open_url(url),
+            Link::Path { path } => {
+                if let Some(workspace) = &workspace {
+                    _ = workspace.update(window_cx, |workspace, cx| {
+                        workspace.open_abs_path(path.clone(), false, cx).detach();
+                    });
+                }
+            }
+        },
+    )
+    .into_any_element()
+}
+
+fn render_markdown_rule(cx: &mut RenderContext) -> AnyElement {
+    let rule = div().w_full().h(px(2.)).bg(cx.border_color);
+    div().pt_3().pb_3().child(rule).into_any()
 }

From 73498f388ad8739ac1a32368bb36d678a042ea6e Mon Sep 17 00:00:00 2001
From: Gianni Rosato <35711760+gianni-rosato@users.noreply.github.com>
Date: Thu, 8 Feb 2024 04:25:54 -0500
Subject: [PATCH 316/372] Recognize More Multimedia Filetypes (#7557)

This PR recognizes the following filetypes and provides them with
appropriate icons: `.avi .heic .j2k .jfif .jp2 .jxl .m4a .m4v .mkv .mka
.mov .opus .qoi .wma .wmv .wv`.

It also corrects `.ogg` to display an audio icon, not a video icon.
Though the container supports video, `.ogg` files are most commonly
found containing audio-only bitstreams likely due to the popularity of
the Vorbis audio codec. VSCode recognizes OGG files as audio.

Here is an exhaustive list of the file formats this PR aims to
recognize, with a subjective commonality rating attached to each:

- `.avi`: Audio Video Interleave. Multimedia container format for video
and audio data. **Rating: 7/10**
- `.heic`: High Efficiency Image Format. The same thing as `.heif`,
which is currently recognized. **Rating: 6/10**
- `.j2k`: JPEG 2000. Bitmap image format for lossy or lossless
compression. **Rating: 3/10**
- `.jfif`: JPEG File Interchange Format. Alternative JPEG extension that
sometimes pops up on the Web. **Rating: 5/10**
- `.jp2`: JPEG 2000 again, same rating.
- `.jxl`: JPEG XL. Modern, versatile image format growing in popularity.
**Rating: 5/10**
- `.m4a`: MPEG-4 Audio. Audio file format using AAC (lossy) or ALAC
(lossless) codecs. **Rating: 8/10**
- `.m4v`: MPEG-4 Video. Video container format developed by Apple
similar to MP4. **Rating: 4/10**
- `.mkv`: Matroska Video. Multimedia container format for video, audio,
and subtitle tracks. **Rating: 8/10**
- `.mka`: Matroska Audio. Audio file format supporting several types of
audio compression algorithms. **Rating: 3/10**
- `.mov`: QuickTime Movie. Multimedia container format developed by
Apple. **Rating: 8/10**
- `.opus`: Opus Audio. Audio coding format for efficient real-time audio
streaming. **Rating: 7/10**
- `.qoi`: Quite OK Image. Modern lossless image format for fast encoding
& decoding. **Rating: 1/10**
- `.wma`: Windows Media Audio. Audio file format developed by Microsoft.
**Rating: 6/10**
- `.wmv`: Windows Media Video. Video file format developed by Microsoft.
**Rating: 7/10**
- `.wv`: WavPack. Free, open-source lossless audio compression format
similar to FLAC. **Rating: 2/10**

Again note that the commonality rating is subjective and may vary based
on the specific use cases users have for Zed and their software
environments. I hope some of these will be considered, as having
flexible filetype recognition greatly adds to the feeling of
completeness in an editor at what appears to be very little cost. Thank
you!

Release Notes:

- Adds icon associations for more multimedia types [#7551](https://github.com/zed-industries/zed/issues/7551).
---
 assets/icons/file_icons/file_types.json | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/assets/icons/file_icons/file_types.json b/assets/icons/file_icons/file_types.json
index 88c1c65023..50e450c4c2 100644
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -4,6 +4,7 @@
         "aac": "audio",
         "accdb": "storage",
         "app.src": "erlang",
+        "avi": "video",
         "avif": "image",
         "bak": "backup",
         "bash": "terminal",
@@ -50,6 +51,7 @@
         "hbs": "template",
         "heex": "elixir",
         "heif": "image",
+        "heic": "image",
         "hrl": "erlang",
         "hs": "haskell",
         "htm": "template",
@@ -57,21 +59,30 @@
         "ib": "storage",
         "ico": "image",
         "ini": "settings",
+        "j2k": "image",
         "java": "code",
+        "jfif": "image",
+        "jp2": "image",
         "jpeg": "image",
         "jpg": "image",
         "js": "code",
         "json": "storage",
         "jsonc": "storage",
+        "jxl": "image",
         "ldf": "storage",
         "lock": "lock",
         "log": "log",
+        "m4a": "audio",
+        "m4v": "video",
         "md": "document",
         "mdb": "storage",
         "mdf": "storage",
         "mdx": "document",
+        "mkv": "video",
+        "mka": "audio",
         "ml": "ocaml",
         "mli": "ocaml",
+        "mov": "video",
         "mp3": "audio",
         "mp4": "video",
         "myd": "storage",
@@ -79,7 +90,8 @@
         "odp": "document",
         "ods": "document",
         "odt": "document",
-        "ogg": "video",
+        "ogg": "audio",
+        "opus": "audio",
         "pdb": "storage",
         "pdf": "document",
         "php": "php",
@@ -93,6 +105,7 @@
         "ps1": "terminal",
         "psd": "image",
         "py": "python",
+        "qoi": "image",
         "rb": "ruby",
         "rebar.config": "erlang",
         "rkt": "code",
@@ -116,6 +129,9 @@
         "wav": "audio",
         "webm": "video",
         "webp": "image",
+        "wma": "audio",
+        "wmv": "video",
+        "wv": "audio",
         "xls": "document",
         "xlsx": "document",
         "xml": "template",

From 00024b791b3f9cc1b3a95abbdba318f60b581e52 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Thu, 8 Feb 2024 05:41:55 -0800
Subject: [PATCH 317/372] Uprev blade to 26bc5e8 (#7556)

Picks up https://github.com/kvark/blade/pull/73 to make it possible to
start experimenting with GLES backend.

Release Notes:
- N/A
---
 Cargo.lock                               | 4 ++--
 crates/gpui/Cargo.toml                   | 4 ++--
 crates/gpui/src/platform/linux/window.rs | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 535ef49c09..d13d45beeb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -937,7 +937,7 @@ dependencies = [
 [[package]]
 name = "blade-graphics"
 version = "0.3.0"
-source = "git+https://github.com/kvark/blade?rev=f35bc605154e210ab6190291235889b6ddad73f1#f35bc605154e210ab6190291235889b6ddad73f1"
+source = "git+https://github.com/kvark/blade?rev=26bc5e8b9ef67b4f2970eb95888db733eace98f3#26bc5e8b9ef67b4f2970eb95888db733eace98f3"
 dependencies = [
  "ash",
  "ash-window",
@@ -967,7 +967,7 @@ dependencies = [
 [[package]]
 name = "blade-macros"
 version = "0.2.1"
-source = "git+https://github.com/kvark/blade?rev=f35bc605154e210ab6190291235889b6ddad73f1#f35bc605154e210ab6190291235889b6ddad73f1"
+source = "git+https://github.com/kvark/blade?rev=26bc5e8b9ef67b4f2970eb95888db733eace98f3#26bc5e8b9ef67b4f2970eb95888db733eace98f3"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 0c7605eb36..2b00049ec6 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -99,6 +99,6 @@ flume = "0.11"
 xcb = { version = "1.3", features = ["as-raw-xcb-connection"] }
 as-raw-xcb-connection = "1"
 #TODO: use these on all platforms
-blade-graphics = { git = "https://github.com/kvark/blade", rev = "f35bc605154e210ab6190291235889b6ddad73f1" }
-blade-macros = { git = "https://github.com/kvark/blade", rev = "f35bc605154e210ab6190291235889b6ddad73f1" }
+blade-graphics = { git = "https://github.com/kvark/blade", rev = "26bc5e8b9ef67b4f2970eb95888db733eace98f3" }
+blade-macros = { git = "https://github.com/kvark/blade", rev = "26bc5e8b9ef67b4f2970eb95888db733eace98f3" }
 bytemuck = "1"
diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index 972000b5d5..c976fe16be 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -50,7 +50,6 @@ fn query_render_extent(xcb_connection: &xcb::Connection, x_window: x::Window) ->
         drawable: x::Drawable::Window(x_window),
     });
     let reply = xcb_connection.wait_for_reply(cookie).unwrap();
-    println!("Got geometry {:?}", reply);
     gpu::Extent {
         width: reply.width() as u32,
         height: reply.height() as u32,

From d457eef099174105104e9678206671ef93358bce Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Thu, 8 Feb 2024 06:08:04 -0800
Subject: [PATCH 318/372] blade: fix path rasterization (#7546)

There were mistakes in the blending mode, primitive topology, and the
equation.

![gpui-text-selection](https://github.com/zed-industries/zed/assets/107301/13f1285e-1338-4c87-b1bb-7e426606f939)



Release Notes:
- N/A
---
 crates/gpui/src/platform/linux/blade_renderer.rs | 4 ++--
 crates/gpui/src/platform/linux/shaders.wgsl      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/gpui/src/platform/linux/blade_renderer.rs b/crates/gpui/src/platform/linux/blade_renderer.rs
index 128b918ef7..665cedb88f 100644
--- a/crates/gpui/src/platform/linux/blade_renderer.rs
+++ b/crates/gpui/src/platform/linux/blade_renderer.rs
@@ -145,14 +145,14 @@ impl BladePipelines {
                 data_layouts: &[&ShaderPathRasterizationData::layout()],
                 vertex: shader.at("vs_path_rasterization"),
                 primitive: gpu::PrimitiveState {
-                    topology: gpu::PrimitiveTopology::TriangleStrip,
+                    topology: gpu::PrimitiveTopology::TriangleList,
                     ..Default::default()
                 },
                 depth_stencil: None,
                 fragment: shader.at("fs_path_rasterization"),
                 color_targets: &[gpu::ColorTargetState {
                     format: PATH_TEXTURE_FORMAT,
-                    blend: Some(gpu::BlendState::ALPHA_BLENDING),
+                    blend: Some(gpu::BlendState::ADDITIVE),
                     write_mask: gpu::ColorWrites::default(),
                 }],
             }),
diff --git a/crates/gpui/src/platform/linux/shaders.wgsl b/crates/gpui/src/platform/linux/shaders.wgsl
index 8a9fd31e96..0f117b1eab 100644
--- a/crates/gpui/src/platform/linux/shaders.wgsl
+++ b/crates/gpui/src/platform/linux/shaders.wgsl
@@ -365,7 +365,7 @@ fn fs_path_rasterization(input: PathRasterizationVarying) -> @location(0) f32 {
         return 0.0;
     }
 
-    let gradient = 2.0 * input.st_position * vec2<f32>(dx.x, dy.x) - vec2<f32>(dx.y, dy.y);
+    let gradient = 2.0 * input.st_position.xx * vec2<f32>(dx.x, dy.x) - vec2<f32>(dx.y, dy.y);
     let f = input.st_position.x * input.st_position.x - input.st_position.y;
     let distance = f / length(gradient);
     return saturate(0.5 - distance);

From f734365b7b9ce2d2131f13509e6b5f584a9de4f5 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Thu, 8 Feb 2024 16:13:54 +0200
Subject: [PATCH 319/372] Avoid another confirmation when submitting/discarding
 feedback (#7569)

Fixes https://github.com/zed-industries/zed/issues/7515

Release Notes:

- Fixed feedback modal spawning extra confirmations on cancel and submit
([7515](https://github.com/zed-industries/zed/issues/7515))
---
 crates/feedback/src/feedback_modal.rs | 10 +++----
 crates/outline/src/outline.rs         |  6 ++---
 crates/workspace/src/modal_layer.rs   | 38 ++++++++++++++++++++-------
 3 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/crates/feedback/src/feedback_modal.rs b/crates/feedback/src/feedback_modal.rs
index 31ff5989f3..18e762030e 100644
--- a/crates/feedback/src/feedback_modal.rs
+++ b/crates/feedback/src/feedback_modal.rs
@@ -17,7 +17,7 @@ use regex::Regex;
 use serde_derive::Serialize;
 use ui::{prelude::*, Button, ButtonStyle, IconPosition, Tooltip};
 use util::{http::HttpClient, ResultExt};
-use workspace::{ModalView, Toast, Workspace};
+use workspace::{DismissDecision, ModalView, Toast, Workspace};
 
 use crate::{system_specs::SystemSpecs, GiveFeedback, OpenZedRepo};
 
@@ -85,16 +85,16 @@ impl FocusableView for FeedbackModal {
 impl EventEmitter<DismissEvent> for FeedbackModal {}
 
 impl ModalView for FeedbackModal {
-    fn on_before_dismiss(&mut self, cx: &mut ViewContext<Self>) -> bool {
+    fn on_before_dismiss(&mut self, cx: &mut ViewContext<Self>) -> DismissDecision {
         self.update_email_in_store(cx);
 
         if self.dismiss_modal {
-            return true;
+            return DismissDecision::Dismiss(true);
         }
 
         let has_feedback = self.feedback_editor.read(cx).text_option(cx).is_some();
         if !has_feedback {
-            return true;
+            return DismissDecision::Dismiss(true);
         }
 
         let answer = cx.prompt(PromptLevel::Info, "Discard feedback?", None, &["Yes", "No"]);
@@ -110,7 +110,7 @@ impl ModalView for FeedbackModal {
         })
         .detach();
 
-        false
+        DismissDecision::Pending
     }
 }
 
diff --git a/crates/outline/src/outline.rs b/crates/outline/src/outline.rs
index e670aa550a..29682262be 100644
--- a/crates/outline/src/outline.rs
+++ b/crates/outline/src/outline.rs
@@ -20,7 +20,7 @@ use std::{
 use theme::{color_alpha, ActiveTheme, ThemeSettings};
 use ui::{prelude::*, ListItem, ListItemSpacing};
 use util::ResultExt;
-use workspace::ModalView;
+use workspace::{DismissDecision, ModalView};
 
 actions!(outline, [Toggle]);
 
@@ -55,10 +55,10 @@ impl FocusableView for OutlineView {
 
 impl EventEmitter<DismissEvent> for OutlineView {}
 impl ModalView for OutlineView {
-    fn on_before_dismiss(&mut self, cx: &mut ViewContext<Self>) -> bool {
+    fn on_before_dismiss(&mut self, cx: &mut ViewContext<Self>) -> DismissDecision {
         self.picker
             .update(cx, |picker, cx| picker.delegate.restore_active_editor(cx));
-        true
+        DismissDecision::Dismiss(true)
     }
 }
 
diff --git a/crates/workspace/src/modal_layer.rs b/crates/workspace/src/modal_layer.rs
index c30ca35a68..f67b78f7d1 100644
--- a/crates/workspace/src/modal_layer.rs
+++ b/crates/workspace/src/modal_layer.rs
@@ -4,19 +4,24 @@ use gpui::{
 };
 use ui::{h_flex, v_flex};
 
+pub enum DismissDecision {
+    Dismiss(bool),
+    Pending,
+}
+
 pub trait ModalView: ManagedView {
-    fn on_before_dismiss(&mut self, _: &mut ViewContext<Self>) -> bool {
-        true
+    fn on_before_dismiss(&mut self, _: &mut ViewContext<Self>) -> DismissDecision {
+        DismissDecision::Dismiss(true)
     }
 }
 
 trait ModalViewHandle {
-    fn on_before_dismiss(&mut self, cx: &mut WindowContext) -> bool;
+    fn on_before_dismiss(&mut self, cx: &mut WindowContext) -> DismissDecision;
     fn view(&self) -> AnyView;
 }
 
 impl<V: ModalView> ModalViewHandle for View<V> {
-    fn on_before_dismiss(&mut self, cx: &mut WindowContext) -> bool {
+    fn on_before_dismiss(&mut self, cx: &mut WindowContext) -> DismissDecision {
         self.update(cx, |this, cx| this.on_before_dismiss(cx))
     }
 
@@ -34,11 +39,15 @@ pub struct ActiveModal {
 
 pub struct ModalLayer {
     active_modal: Option<ActiveModal>,
+    dismiss_on_focus_lost: bool,
 }
 
 impl ModalLayer {
     pub fn new() -> Self {
-        Self { active_modal: None }
+        Self {
+            active_modal: None,
+            dismiss_on_focus_lost: false,
+        }
     }
 
     pub fn toggle_modal<V, B>(&mut self, cx: &mut ViewContext<Self>, build_view: B)
@@ -69,7 +78,9 @@ impl ModalLayer {
                     this.hide_modal(cx);
                 }),
                 cx.on_focus_out(&focus_handle, |this, cx| {
-                    this.hide_modal(cx);
+                    if this.dismiss_on_focus_lost {
+                        this.hide_modal(cx);
+                    }
                 }),
             ],
             previous_focus_handle: cx.focused(),
@@ -81,12 +92,21 @@ impl ModalLayer {
 
     fn hide_modal(&mut self, cx: &mut ViewContext<Self>) -> bool {
         let Some(active_modal) = self.active_modal.as_mut() else {
+            self.dismiss_on_focus_lost = false;
             return false;
         };
 
-        let dismiss = active_modal.modal.on_before_dismiss(cx);
-        if !dismiss {
-            return false;
+        match active_modal.modal.on_before_dismiss(cx) {
+            DismissDecision::Dismiss(dismiss) => {
+                self.dismiss_on_focus_lost = !dismiss;
+                if !dismiss {
+                    return false;
+                }
+            }
+            DismissDecision::Pending => {
+                self.dismiss_on_focus_lost = false;
+                return false;
+            }
         }
 
         if let Some(active_modal) = self.active_modal.take() {

From 89b1e76003c1212c371449bcdd8eddf3d9ead18b Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Thu, 8 Feb 2024 16:17:47 +0200
Subject: [PATCH 320/372] Fix gopls langserver downloads (#7571)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes https://github.com/zed-industries/zed/issues/7534 by not requiring
assets for gopls and vscode-eslint langservers — those two are the only
ones in Zed that do not use assets directly when determining langserver
version and retrieving those.
All other servers deal with assets, hence require those to be present.

The problem with https://github.com/tamasfe/taplo/releases is that they
host multiple binary releases in the same release list, so for now the
code works because only the langserver has assets — but as soon as
another release there gets assets, it will break again.
We could filter out those by names also, but they also tend to change
(and can be edited manually), so keeping it as is for now.

Release Notes:

- Fixed gopls language server downloads
([7534](https://github.com/zed-industries/zed/issues/7534))
---
 crates/copilot/src/copilot.rs          |  5 +++--
 crates/util/src/github.rs              |  4 +++-
 crates/zed/src/languages/c.rs          |  3 ++-
 crates/zed/src/languages/csharp.rs     | 11 +++++++----
 crates/zed/src/languages/deno.rs       |  3 ++-
 crates/zed/src/languages/elixir.rs     | 17 +++++++++--------
 crates/zed/src/languages/gleam.rs      |  2 +-
 crates/zed/src/languages/go.rs         |  3 ++-
 crates/zed/src/languages/lua.rs        | 14 +++++++++-----
 crates/zed/src/languages/rust.rs       |  9 +++++++--
 crates/zed/src/languages/toml.rs       |  3 ++-
 crates/zed/src/languages/typescript.rs |  9 +++++++--
 crates/zed/src/languages/zig.rs        |  5 +++--
 13 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/crates/copilot/src/copilot.rs b/crates/copilot/src/copilot.rs
index d4d7539a05..b8d38c757e 100644
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -976,7 +976,8 @@ async fn get_copilot_lsp(http: Arc<dyn HttpClient>) -> anyhow::Result<PathBuf> {
 
     ///Check for the latest copilot language server and download it if we haven't already
     async fn fetch_latest(http: Arc<dyn HttpClient>) -> anyhow::Result<PathBuf> {
-        let release = latest_github_release("zed-industries/copilot", false, http.clone()).await?;
+        let release =
+            latest_github_release("zed-industries/copilot", true, false, http.clone()).await?;
 
         let version_dir = &*paths::COPILOT_DIR.join(format!("copilot-{}", release.name));
 
@@ -997,7 +998,7 @@ async fn get_copilot_lsp(http: Arc<dyn HttpClient>) -> anyhow::Result<PathBuf> {
             let mut response = http
                 .get(url, Default::default(), true)
                 .await
-                .map_err(|err| anyhow!("error downloading copilot release: {}", err))?;
+                .context("error downloading copilot release")?;
             let decompressed_bytes = GzipDecoder::new(BufReader::new(response.body_mut()));
             let archive = Archive::new(decompressed_bytes);
             archive.unpack(dist_dir).await?;
diff --git a/crates/util/src/github.rs b/crates/util/src/github.rs
index fc250be32f..8503c69267 100644
--- a/crates/util/src/github.rs
+++ b/crates/util/src/github.rs
@@ -27,6 +27,7 @@ pub struct GithubReleaseAsset {
 
 pub async fn latest_github_release(
     repo_name_with_owner: &str,
+    require_assets: bool,
     pre_release: bool,
     http: Arc<dyn HttpClient>,
 ) -> Result<GithubRelease, anyhow::Error> {
@@ -68,6 +69,7 @@ pub async fn latest_github_release(
 
     releases
         .into_iter()
-        .find(|release| !release.assets.is_empty() && release.pre_release == pre_release)
+        .filter(|release| !require_assets || !release.assets.is_empty())
+        .find(|release| release.pre_release == pre_release)
         .ok_or(anyhow!("Failed to find a release"))
 }
diff --git a/crates/zed/src/languages/c.rs b/crates/zed/src/languages/c.rs
index 655ac044c1..8b5902ff75 100644
--- a/crates/zed/src/languages/c.rs
+++ b/crates/zed/src/languages/c.rs
@@ -28,7 +28,8 @@ impl super::LspAdapter for CLspAdapter {
         &self,
         delegate: &dyn LspAdapterDelegate,
     ) -> Result<Box<dyn 'static + Send + Any>> {
-        let release = latest_github_release("clangd/clangd", false, delegate.http_client()).await?;
+        let release =
+            latest_github_release("clangd/clangd", true, false, delegate.http_client()).await?;
         let asset_name = format!("clangd-mac-{}.zip", release.name);
         let asset = release
             .assets
diff --git a/crates/zed/src/languages/csharp.rs b/crates/zed/src/languages/csharp.rs
index e70bc78279..9d3c63ed51 100644
--- a/crates/zed/src/languages/csharp.rs
+++ b/crates/zed/src/languages/csharp.rs
@@ -29,10 +29,6 @@ impl super::LspAdapter for OmniSharpAdapter {
         &self,
         delegate: &dyn LspAdapterDelegate,
     ) -> Result<Box<dyn 'static + Send + Any>> {
-        let release =
-            latest_github_release("OmniSharp/omnisharp-roslyn", false, delegate.http_client())
-                .await?;
-
         let mapped_arch = match ARCH {
             "aarch64" => Some("arm64"),
             "x86_64" => Some("x64"),
@@ -42,6 +38,13 @@ impl super::LspAdapter for OmniSharpAdapter {
         match mapped_arch {
             None => Ok(Box::new(())),
             Some(arch) => {
+                let release = latest_github_release(
+                    "OmniSharp/omnisharp-roslyn",
+                    true,
+                    false,
+                    delegate.http_client(),
+                )
+                .await?;
                 let asset_name = format!("omnisharp-osx-{}-net6.0.tar.gz", arch);
                 let asset = release
                     .assets
diff --git a/crates/zed/src/languages/deno.rs b/crates/zed/src/languages/deno.rs
index 475181ec3f..0020f94a46 100644
--- a/crates/zed/src/languages/deno.rs
+++ b/crates/zed/src/languages/deno.rs
@@ -70,7 +70,8 @@ impl LspAdapter for DenoLspAdapter {
         &self,
         delegate: &dyn LspAdapterDelegate,
     ) -> Result<Box<dyn 'static + Send + Any>> {
-        let release = latest_github_release("denoland/deno", false, delegate.http_client()).await?;
+        let release =
+            latest_github_release("denoland/deno", true, false, delegate.http_client()).await?;
         let asset_name = format!("deno-{}-apple-darwin.zip", consts::ARCH);
         let asset = release
             .assets
diff --git a/crates/zed/src/languages/elixir.rs b/crates/zed/src/languages/elixir.rs
index 6172be1683..f6b19ad066 100644
--- a/crates/zed/src/languages/elixir.rs
+++ b/crates/zed/src/languages/elixir.rs
@@ -111,19 +111,19 @@ impl LspAdapter for ElixirLspAdapter {
         delegate: &dyn LspAdapterDelegate,
     ) -> Result<Box<dyn 'static + Send + Any>> {
         let http = delegate.http_client();
-        let release = latest_github_release("elixir-lsp/elixir-ls", false, http).await?;
+        let release = latest_github_release("elixir-lsp/elixir-ls", true, false, http).await?;
         let version_name = release
             .name
             .strip_prefix("Release ")
             .context("Elixir-ls release name does not start with prefix")?
             .to_owned();
 
-        let asset_name = format!("elixir-ls-{}.zip", &version_name);
+        let asset_name = format!("elixir-ls-{version_name}.zip");
         let asset = release
             .assets
             .iter()
             .find(|asset| asset.name == asset_name)
-            .ok_or_else(|| anyhow!("no asset found matching {:?}", asset_name))?;
+            .ok_or_else(|| anyhow!("no asset found matching {asset_name:?}"))?;
 
         let version = GitHubLspBinaryVersion {
             name: version_name,
@@ -313,20 +313,21 @@ impl LspAdapter for NextLspAdapter {
         &self,
         delegate: &dyn LspAdapterDelegate,
     ) -> Result<Box<dyn 'static + Send + Any>> {
-        let release =
-            latest_github_release("elixir-tools/next-ls", false, delegate.http_client()).await?;
-        let version = release.name.clone();
         let platform = match consts::ARCH {
             "x86_64" => "darwin_amd64",
             "aarch64" => "darwin_arm64",
             other => bail!("Running on unsupported platform: {other}"),
         };
-        let asset_name = format!("next_ls_{}", platform);
+        let release =
+            latest_github_release("elixir-tools/next-ls", true, false, delegate.http_client())
+                .await?;
+        let version = release.name;
+        let asset_name = format!("next_ls_{platform}");
         let asset = release
             .assets
             .iter()
             .find(|asset| asset.name == asset_name)
-            .ok_or_else(|| anyhow!("no asset found matching {:?}", asset_name))?;
+            .with_context(|| format!("no asset found matching {asset_name:?}"))?;
         let version = GitHubLspBinaryVersion {
             name: version,
             url: asset.browser_download_url.clone(),
diff --git a/crates/zed/src/languages/gleam.rs b/crates/zed/src/languages/gleam.rs
index 90b10a3657..d8020a0a85 100644
--- a/crates/zed/src/languages/gleam.rs
+++ b/crates/zed/src/languages/gleam.rs
@@ -35,7 +35,7 @@ impl LspAdapter for GleamLspAdapter {
         delegate: &dyn LspAdapterDelegate,
     ) -> Result<Box<dyn 'static + Send + Any>> {
         let release =
-            latest_github_release("gleam-lang/gleam", false, delegate.http_client()).await?;
+            latest_github_release("gleam-lang/gleam", true, false, delegate.http_client()).await?;
 
         let asset_name = format!(
             "gleam-{version}-{arch}-apple-darwin.tar.gz",
diff --git a/crates/zed/src/languages/go.rs b/crates/zed/src/languages/go.rs
index 2fb0d35cf0..871ff0886f 100644
--- a/crates/zed/src/languages/go.rs
+++ b/crates/zed/src/languages/go.rs
@@ -45,7 +45,8 @@ impl super::LspAdapter for GoLspAdapter {
         &self,
         delegate: &dyn LspAdapterDelegate,
     ) -> Result<Box<dyn 'static + Send + Any>> {
-        let release = latest_github_release("golang/tools", false, delegate.http_client()).await?;
+        let release =
+            latest_github_release("golang/tools", false, false, delegate.http_client()).await?;
         let version: Option<String> = release.name.strip_prefix("gopls/v").map(str::to_string);
         if version.is_none() {
             log::warn!(
diff --git a/crates/zed/src/languages/lua.rs b/crates/zed/src/languages/lua.rs
index c9753e0f6c..c25bb3d125 100644
--- a/crates/zed/src/languages/lua.rs
+++ b/crates/zed/src/languages/lua.rs
@@ -30,15 +30,19 @@ impl super::LspAdapter for LuaLspAdapter {
         &self,
         delegate: &dyn LspAdapterDelegate,
     ) -> Result<Box<dyn 'static + Send + Any>> {
-        let release =
-            latest_github_release("LuaLS/lua-language-server", false, delegate.http_client())
-                .await?;
-        let version = release.name.clone();
         let platform = match consts::ARCH {
             "x86_64" => "x64",
             "aarch64" => "arm64",
             other => bail!("Running on unsupported platform: {other}"),
         };
+        let release = latest_github_release(
+            "LuaLS/lua-language-server",
+            true,
+            false,
+            delegate.http_client(),
+        )
+        .await?;
+        let version = &release.name;
         let asset_name = format!("lua-language-server-{version}-darwin-{platform}.tar.gz");
         let asset = release
             .assets
@@ -46,7 +50,7 @@ impl super::LspAdapter for LuaLspAdapter {
             .find(|asset| asset.name == asset_name)
             .ok_or_else(|| anyhow!("no asset found matching {:?}", asset_name))?;
         let version = GitHubLspBinaryVersion {
-            name: release.name.clone(),
+            name: release.name,
             url: asset.browser_download_url.clone(),
         };
         Ok(Box::new(version) as Box<_>)
diff --git a/crates/zed/src/languages/rust.rs b/crates/zed/src/languages/rust.rs
index ffbe706fe8..bd00e9350c 100644
--- a/crates/zed/src/languages/rust.rs
+++ b/crates/zed/src/languages/rust.rs
@@ -31,8 +31,13 @@ impl LspAdapter for RustLspAdapter {
         &self,
         delegate: &dyn LspAdapterDelegate,
     ) -> Result<Box<dyn 'static + Send + Any>> {
-        let release =
-            latest_github_release("rust-lang/rust-analyzer", false, delegate.http_client()).await?;
+        let release = latest_github_release(
+            "rust-lang/rust-analyzer",
+            true,
+            false,
+            delegate.http_client(),
+        )
+        .await?;
         let asset_name = format!("rust-analyzer-{}-apple-darwin.gz", consts::ARCH);
         let asset = release
             .assets
diff --git a/crates/zed/src/languages/toml.rs b/crates/zed/src/languages/toml.rs
index 129b5fcb66..e16109be9a 100644
--- a/crates/zed/src/languages/toml.rs
+++ b/crates/zed/src/languages/toml.rs
@@ -26,7 +26,8 @@ impl LspAdapter for TaploLspAdapter {
         &self,
         delegate: &dyn LspAdapterDelegate,
     ) -> Result<Box<dyn 'static + Send + Any>> {
-        let release = latest_github_release("tamasfe/taplo", false, delegate.http_client()).await?;
+        let release =
+            latest_github_release("tamasfe/taplo", true, false, delegate.http_client()).await?;
         let asset_name = format!("taplo-full-darwin-{arch}.gz", arch = std::env::consts::ARCH);
 
         let asset = release
diff --git a/crates/zed/src/languages/typescript.rs b/crates/zed/src/languages/typescript.rs
index 08dc21965b..ff83220922 100644
--- a/crates/zed/src/languages/typescript.rs
+++ b/crates/zed/src/languages/typescript.rs
@@ -246,8 +246,13 @@ impl LspAdapter for EsLintLspAdapter {
         // At the time of writing the latest vscode-eslint release was released in 2020 and requires
         // special custom LSP protocol extensions be handled to fully initialize. Download the latest
         // prerelease instead to sidestep this issue
-        let release =
-            latest_github_release("microsoft/vscode-eslint", true, delegate.http_client()).await?;
+        let release = latest_github_release(
+            "microsoft/vscode-eslint",
+            false,
+            false,
+            delegate.http_client(),
+        )
+        .await?;
         Ok(Box::new(GitHubLspBinaryVersion {
             name: release.name,
             url: release.tarball_url,
diff --git a/crates/zed/src/languages/zig.rs b/crates/zed/src/languages/zig.rs
index 734d21e2ea..8fac5c195f 100644
--- a/crates/zed/src/languages/zig.rs
+++ b/crates/zed/src/languages/zig.rs
@@ -28,8 +28,9 @@ impl LspAdapter for ZlsAdapter {
         &self,
         delegate: &dyn LspAdapterDelegate,
     ) -> Result<Box<dyn 'static + Send + Any>> {
-        let release = latest_github_release("zigtools/zls", false, delegate.http_client()).await?;
-        let asset_name = format!("zls-{}-macos.tar.gz", ARCH);
+        let release =
+            latest_github_release("zigtools/zls", true, false, delegate.http_client()).await?;
+        let asset_name = format!("zls-{ARCH}-macos.tar.gz");
         let asset = release
             .assets
             .iter()

From a0b2614d57c71d5421fd28fc2f694582b170644f Mon Sep 17 00:00:00 2001
From: dalton-oliveira <dalton.oliveira.84@gmail.com>
Date: Thu, 8 Feb 2024 12:13:15 -0300
Subject: [PATCH 321/372] Add unique lines command (#7526)

Changes `Editor::manipulate_lines` to allow line adding and removal
through callback function.

- Added `editor::UniqueLinesCaseSensitive` and `editor::UniqueLinesCaseInsensitive` commands
([#4831](https://github.com/zed-industries/zed/issues/4831))
---
 crates/editor/src/actions.rs      |   2 +
 crates/editor/src/editor.rs       |  72 +++++++++++---
 crates/editor/src/editor_tests.rs | 158 ++++++++++++++++++++++++++++++
 crates/editor/src/element.rs      |   2 +
 4 files changed, 219 insertions(+), 15 deletions(-)

diff --git a/crates/editor/src/actions.rs b/crates/editor/src/actions.rs
index ec8113a985..a715515065 100644
--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -238,5 +238,7 @@ gpui::actions!(
         Undo,
         UndoSelection,
         UnfoldLines,
+        UniqueLinesCaseSensitive,
+        UniqueLinesCaseInsensitive
     ]
 );
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 0085761e0b..8b9e125238 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -4655,6 +4655,28 @@ impl Editor {
         self.manipulate_lines(cx, |lines| lines.sort_by_key(|line| line.to_lowercase()))
     }
 
+    pub fn unique_lines_case_insensitive(
+        &mut self,
+        _: &UniqueLinesCaseInsensitive,
+        cx: &mut ViewContext<Self>,
+    ) {
+        self.manipulate_lines(cx, |lines| {
+            let mut seen = HashSet::default();
+            lines.retain(|line| seen.insert(line.to_lowercase()));
+        })
+    }
+
+    pub fn unique_lines_case_sensitive(
+        &mut self,
+        _: &UniqueLinesCaseSensitive,
+        cx: &mut ViewContext<Self>,
+    ) {
+        self.manipulate_lines(cx, |lines| {
+            let mut seen = HashSet::default();
+            lines.retain(|line| seen.insert(*line));
+        })
+    }
+
     pub fn reverse_lines(&mut self, _: &ReverseLines, cx: &mut ViewContext<Self>) {
         self.manipulate_lines(cx, |lines| lines.reverse())
     }
@@ -4665,7 +4687,7 @@ impl Editor {
 
     fn manipulate_lines<Fn>(&mut self, cx: &mut ViewContext<Self>, mut callback: Fn)
     where
-        Fn: FnMut(&mut [&str]),
+        Fn: FnMut(&mut Vec<&str>),
     {
         let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
         let buffer = self.buffer.read(cx).snapshot(cx);
@@ -4676,6 +4698,8 @@ impl Editor {
         let mut selections = selections.iter().peekable();
         let mut contiguous_row_selections = Vec::new();
         let mut new_selections = Vec::new();
+        let mut added_lines: usize = 0;
+        let mut removed_lines: usize = 0;
 
         while let Some(selection) = selections.next() {
             let (start_row, end_row) = consume_contiguous_rows(
@@ -4690,37 +4714,55 @@ impl Editor {
             let text = buffer
                 .text_for_range(start_point..end_point)
                 .collect::<String>();
+
             let mut lines = text.split("\n").collect_vec();
 
-            let lines_len = lines.len();
+            let lines_before = lines.len();
             callback(&mut lines);
-
-            // This is a current limitation with selections.
-            // If we wanted to support removing or adding lines, we'd need to fix the logic associated with selections.
-            debug_assert!(
-                lines.len() == lines_len,
-                "callback should not change the number of lines"
-            );
+            let lines_after = lines.len();
 
             edits.push((start_point..end_point, lines.join("\n")));
-            let start_anchor = buffer.anchor_after(start_point);
-            let end_anchor = buffer.anchor_before(end_point);
 
-            // Make selection and push
+            // Selections must change based on added and removed line count
+            let start_row = start_point.row + added_lines as u32 - removed_lines as u32;
+            let end_row = start_row + lines_after.saturating_sub(1) as u32;
             new_selections.push(Selection {
                 id: selection.id,
-                start: start_anchor.to_offset(&buffer),
-                end: end_anchor.to_offset(&buffer),
+                start: start_row,
+                end: end_row,
                 goal: SelectionGoal::None,
                 reversed: selection.reversed,
             });
+
+            if lines_after > lines_before {
+                added_lines += lines_after - lines_before;
+            } else if lines_before > lines_after {
+                removed_lines += lines_before - lines_after;
+            }
         }
 
         self.transact(cx, |this, cx| {
-            this.buffer.update(cx, |buffer, cx| {
+            let buffer = this.buffer.update(cx, |buffer, cx| {
                 buffer.edit(edits, None, cx);
+                buffer.snapshot(cx)
             });
 
+            // Recalculate offsets on newly edited buffer
+            let new_selections = new_selections
+                .iter()
+                .map(|s| {
+                    let start_point = Point::new(s.start, 0);
+                    let end_point = Point::new(s.end, buffer.line_len(s.end));
+                    Selection {
+                        id: s.id,
+                        start: buffer.point_to_offset(start_point),
+                        end: buffer.point_to_offset(end_point),
+                        goal: s.goal,
+                        reversed: s.reversed,
+                    }
+                })
+                .collect();
+
             this.change_selections(Some(Autoscroll::fit()), cx, |s| {
                 s.select(new_selections);
             });
diff --git a/crates/editor/src/editor_tests.rs b/crates/editor/src/editor_tests.rs
index 865fcb1a5c..1c9c5f1db6 100644
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -2786,6 +2786,126 @@ async fn test_manipulate_lines_with_single_selection(cx: &mut TestAppContext) {
         dddˇ»
 
     "});
+
+    // Adding new line
+    cx.set_state(indoc! {"
+        aa«a
+        bbˇ»b
+    "});
+    cx.update_editor(|e, cx| e.manipulate_lines(cx, |lines| lines.push("added_line")));
+    cx.assert_editor_state(indoc! {"
+        «aaa
+        bbb
+        added_lineˇ»
+    "});
+
+    // Removing line
+    cx.set_state(indoc! {"
+        aa«a
+        bbbˇ»
+    "});
+    cx.update_editor(|e, cx| {
+        e.manipulate_lines(cx, |lines| {
+            lines.pop();
+        })
+    });
+    cx.assert_editor_state(indoc! {"
+        «aaaˇ»
+    "});
+
+    // Removing all lines
+    cx.set_state(indoc! {"
+        aa«a
+        bbbˇ»
+    "});
+    cx.update_editor(|e, cx| {
+        e.manipulate_lines(cx, |lines| {
+            lines.drain(..);
+        })
+    });
+    cx.assert_editor_state(indoc! {"
+        ˇ
+    "});
+}
+
+#[gpui::test]
+async fn test_unique_lines_multi_selection(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let mut cx = EditorTestContext::new(cx).await;
+
+    // Consider continuous selection as single selection
+    cx.set_state(indoc! {"
+        Aaa«aa
+        cˇ»c«c
+        bb
+        aaaˇ»aa
+    "});
+    cx.update_editor(|e, cx| e.unique_lines_case_sensitive(&UniqueLinesCaseSensitive, cx));
+    cx.assert_editor_state(indoc! {"
+        «Aaaaa
+        ccc
+        bb
+        aaaaaˇ»
+    "});
+
+    cx.set_state(indoc! {"
+        Aaa«aa
+        cˇ»c«c
+        bb
+        aaaˇ»aa
+    "});
+    cx.update_editor(|e, cx| e.unique_lines_case_insensitive(&UniqueLinesCaseInsensitive, cx));
+    cx.assert_editor_state(indoc! {"
+        «Aaaaa
+        ccc
+        bbˇ»
+    "});
+
+    // Consider non continuous selection as distinct dedup operations
+    cx.set_state(indoc! {"
+        «aaaaa
+        bb
+        aaaaa
+        aaaaaˇ»
+
+        aaa«aaˇ»
+    "});
+    cx.update_editor(|e, cx| e.unique_lines_case_sensitive(&UniqueLinesCaseSensitive, cx));
+    cx.assert_editor_state(indoc! {"
+        «aaaaa
+        bbˇ»
+
+        «aaaaaˇ»
+    "});
+}
+
+#[gpui::test]
+async fn test_unique_lines_single_selection(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+
+    let mut cx = EditorTestContext::new(cx).await;
+
+    cx.set_state(indoc! {"
+        «Aaa
+        aAa
+        Aaaˇ»
+    "});
+    cx.update_editor(|e, cx| e.unique_lines_case_sensitive(&UniqueLinesCaseSensitive, cx));
+    cx.assert_editor_state(indoc! {"
+        «Aaa
+        aAaˇ»
+    "});
+
+    cx.set_state(indoc! {"
+        «Aaa
+        aAa
+        aaAˇ»
+    "});
+    cx.update_editor(|e, cx| e.unique_lines_case_insensitive(&UniqueLinesCaseInsensitive, cx));
+    cx.assert_editor_state(indoc! {"
+        «Aaaˇ»
+    "});
 }
 
 #[gpui::test]
@@ -2835,6 +2955,44 @@ async fn test_manipulate_lines_with_multi_selection(cx: &mut TestAppContext) {
         ccc
         ddddˇ»
     "});
+
+    // Adding lines on each selection
+    cx.set_state(indoc! {"
+        2«
+        1ˇ»
+
+        bb«bb
+        aaaˇ»aa
+    "});
+    cx.update_editor(|e, cx| e.manipulate_lines(cx, |lines| lines.push("added line")));
+    cx.assert_editor_state(indoc! {"
+        «2
+        1
+        added lineˇ»
+
+        «bbbb
+        aaaaa
+        added lineˇ»
+    "});
+
+    // Removing lines on each selection
+    cx.set_state(indoc! {"
+        2«
+        1ˇ»
+
+        bb«bb
+        aaaˇ»aa
+    "});
+    cx.update_editor(|e, cx| {
+        e.manipulate_lines(cx, |lines| {
+            lines.pop();
+        })
+    });
+    cx.assert_editor_state(indoc! {"
+        «2ˇ»
+
+        «bbbbˇ»
+    "});
 }
 
 #[gpui::test]
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 24b0a06bcb..ce348b21d5 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -330,6 +330,8 @@ impl EditorElement {
         register_action(view, cx, Editor::context_menu_next);
         register_action(view, cx, Editor::context_menu_last);
         register_action(view, cx, Editor::display_cursor_names);
+        register_action(view, cx, Editor::unique_lines_case_insensitive);
+        register_action(view, cx, Editor::unique_lines_case_sensitive);
     }
 
     fn register_key_listeners(

From bd390aabf442ac4134e6662446613cbaea6d5d95 Mon Sep 17 00:00:00 2001
From: White Choco <hanjisu2215g@gmail.com>
Date: Fri, 9 Feb 2024 00:19:18 +0900
Subject: [PATCH 322/372] Fix mis-description in default settings (#7564)

Change word from "Stable" to "Dev" of option `dev`



Release Notes:

- N/A
---
 assets/settings/default.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 3cb6082991..06e0b98a41 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -560,7 +560,7 @@
   "stable": {
     // "theme": "Andromeda"
   },
-  // Settings overrides to use when using Zed Stable.
+  // Settings overrides to use when using Zed Dev.
   // Mostly useful for developers who are managing multiple instances of Zed.
   "dev": {
     // "theme": "Andromeda"

From 9f4ce7fba57ed8ee914aa19595c50745367f7b9b Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Thu, 8 Feb 2024 10:32:08 -0500
Subject: [PATCH 323/372] Remove unneeded type annotations where inference will
 do (#7573)

This PR removes some unneeded type annotations where we're able to infer
the type accurately.

Release Notes:

- N/A
---
 crates/editor/src/editor.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 8b9e125238..92273dfe4b 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -4698,8 +4698,8 @@ impl Editor {
         let mut selections = selections.iter().peekable();
         let mut contiguous_row_selections = Vec::new();
         let mut new_selections = Vec::new();
-        let mut added_lines: usize = 0;
-        let mut removed_lines: usize = 0;
+        let mut added_lines = 0;
+        let mut removed_lines = 0;
 
         while let Some(selection) = selections.next() {
             let (start_row, end_row) = consume_contiguous_rows(

From 4048dbfafd75aabe5c2b213d928db7a28386ffcf Mon Sep 17 00:00:00 2001
From: h3mosphere <129932586+h3mosphere@users.noreply.github.com>
Date: Fri, 9 Feb 2024 02:40:26 +1100
Subject: [PATCH 324/372] Linux: Disable PureScript grammar to avoid linking
 error (#7543)

Release Notes:

- N/A
---
 crates/zed/src/languages.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index 43e92fb0ae..2c59860bd5 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -98,6 +98,7 @@ pub fn init(
         ),
         ("php", tree_sitter_php::language_php()),
         ("proto", tree_sitter_proto::language()),
+        #[cfg(not(target_os = "linux"))]
         ("purescript", tree_sitter_purescript::language()),
         ("python", tree_sitter_python::language()),
         ("racket", tree_sitter_racket::language()),

From 006e7a77d5dc00d73c2ab5a4e6b81a93c1beb63c Mon Sep 17 00:00:00 2001
From: h3mosphere <129932586+h3mosphere@users.noreply.github.com>
Date: Fri, 9 Feb 2024 02:53:39 +1100
Subject: [PATCH 325/372] Linux: Fix some crashes from new functions having
 unimplemented!() (#7567)

Release Notes:

- N/A
---
 crates/gpui/src/platform/linux/platform.rs | 4 ++--
 crates/gpui/src/platform/linux/window.rs   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index 9e0c670be5..d2c8f5f854 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -346,7 +346,7 @@ impl Platform for LinuxPlatform {
 
     //todo!(linux)
     fn should_auto_hide_scrollbars(&self) -> bool {
-        unimplemented!()
+        false
     }
 
     //todo!(linux)
@@ -370,7 +370,7 @@ impl Platform for LinuxPlatform {
     }
 
     fn window_appearance(&self) -> crate::WindowAppearance {
-        unimplemented!()
+        crate::WindowAppearance::Light
     }
 }
 
diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index c976fe16be..ee38c0bd37 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -294,7 +294,7 @@ impl PlatformWindow for LinuxWindow {
 
     //todo!(linux)
     fn appearance(&self) -> WindowAppearance {
-        unimplemented!()
+        WindowAppearance::Light
     }
 
     fn display(&self) -> Rc<dyn PlatformDisplay> {

From 17c203fef96491c75c60121fcba64048ed2cd2ba Mon Sep 17 00:00:00 2001
From: gmorenz <greg-morenz@droid.cafe>
Date: Thu, 8 Feb 2024 11:35:37 -0500
Subject: [PATCH 326/372] Translate notify::Event to fsevent::Event on linux
 (#7545)

This isn't exactly a great solution, but it's a step in the right
direction, and it's simple allowing us to quickly unblock linux. Without
this (or an equivalent) PR linux builds are broken.

I spent a bunch of time investigating using notify on macos, and have a
branch with that working and FakeFs updated to use notify events.
unfortunately I think this would come with some drawbacks. Primarily
that files that don't yet exist yet aren't handled as well as with using
events directly leading to some less than ideal tradeoffs.

This PR is very much a placeholder for a better cross platform solution.
Most problematically, it only fills in the portion of fsevent::Event
that is currently used, despite there being a lot more information in
the ones collected from macos. At the very least a followup PR should
hide those implementation details behind a cross platform Event type so
that if people try and access data that hasn't been translated, they
find out about it.

Release Notes:

- N/A
---
 crates/fs/Cargo.toml           |   4 +-
 crates/fs/src/fs.rs            |  49 +++--
 crates/fsevent/src/fsevent.rs  | 387 +--------------------------------
 crates/fsevent/src/mac_impl.rs | 382 ++++++++++++++++++++++++++++++++
 4 files changed, 416 insertions(+), 406 deletions(-)
 create mode 100644 crates/fsevent/src/mac_impl.rs

diff --git a/crates/fs/Cargo.toml b/crates/fs/Cargo.toml
index ea18ec1fb3..d3f6d87d30 100644
--- a/crates/fs/Cargo.toml
+++ b/crates/fs/Cargo.toml
@@ -10,6 +10,7 @@ path = "src/fs.rs"
 
 [dependencies]
 collections.workspace = true
+fsevent.workspace = true
 rope.workspace = true
 text.workspace = true
 util.workspace = true
@@ -33,9 +34,6 @@ time.workspace = true
 
 gpui = { workspace = true, optional = true}
 
-[target.'cfg(target_os = "macos")'.dependencies]
-fsevent.workspace = true
-
 [target.'cfg(not(target_os = "macos"))'.dependencies]
 notify = "6.1.1"
 
diff --git a/crates/fs/src/fs.rs b/crates/fs/src/fs.rs
index bdb32d7d76..571de91a17 100644
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -1,15 +1,15 @@
 pub mod repository;
 
 use anyhow::{anyhow, Result};
-#[cfg(target_os = "macos")]
 pub use fsevent::Event;
 #[cfg(target_os = "macos")]
 use fsevent::EventStream;
 
 #[cfg(not(target_os = "macos"))]
-pub use notify::Event;
+use fsevent::StreamFlags;
+
 #[cfg(not(target_os = "macos"))]
-use notify::{Config, Watcher};
+use notify::{Config, EventKind, Watcher};
 
 use futures::{future::BoxFuture, Stream, StreamExt};
 use git2::Repository as LibGitRepository;
@@ -292,15 +292,30 @@ impl Fs for RealFs {
             return Box::pin(rx);
         }
 
-        let mut watcher = notify::recommended_watcher(move |res| match res {
-            Ok(event) => {
-                let _ = tx.try_send(vec![event]);
-            }
-            Err(err) => {
-                log::error!("watch error: {}", err);
-            }
-        })
-        .unwrap();
+        let mut watcher =
+            notify::recommended_watcher(move |res: Result<notify::Event, _>| match res {
+                Ok(event) => {
+                    let flags = match event.kind {
+                        // ITEM_REMOVED is currently the only flag we care about
+                        EventKind::Remove(_) => StreamFlags::ITEM_REMOVED,
+                        _ => StreamFlags::NONE,
+                    };
+                    let events = event
+                        .paths
+                        .into_iter()
+                        .map(|path| Event {
+                            event_id: 0,
+                            flags,
+                            path,
+                        })
+                        .collect::<Vec<_>>();
+                    let _ = tx.try_send(events);
+                }
+                Err(err) => {
+                    log::error!("watch error: {}", err);
+                }
+            })
+            .unwrap();
 
         watcher
             .configure(Config::default().with_poll_interval(latency))
@@ -330,20 +345,10 @@ impl Fs for RealFs {
     }
 }
 
-#[cfg(target_os = "macos")]
 pub fn fs_events_paths(events: Vec<Event>) -> Vec<PathBuf> {
     events.into_iter().map(|event| event.path).collect()
 }
 
-#[cfg(not(target_os = "macos"))]
-pub fn fs_events_paths(events: Vec<Event>) -> Vec<PathBuf> {
-    events
-        .into_iter()
-        .map(|event| event.paths.into_iter())
-        .flatten()
-        .collect()
-}
-
 #[cfg(any(test, feature = "test-support"))]
 pub struct FakeFs {
     // Use an unfair lock to ensure tests are deterministic.
diff --git a/crates/fsevent/src/fsevent.rs b/crates/fsevent/src/fsevent.rs
index 7a65c2a021..108b582bd0 100644
--- a/crates/fsevent/src/fsevent.rs
+++ b/crates/fsevent/src/fsevent.rs
@@ -1,17 +1,11 @@
-#![cfg(target_os = "macos")]
+#[cfg(target_os = "macos")]
+pub use mac_impl::*;
 
 use bitflags::bitflags;
-use fsevent_sys::{self as fs, core_foundation as cf};
-use parking_lot::Mutex;
-use std::{
-    convert::AsRef,
-    ffi::{c_void, CStr, OsStr},
-    os::unix::ffi::OsStrExt,
-    path::{Path, PathBuf},
-    ptr, slice,
-    sync::Arc,
-    time::Duration,
-};
+use std::path::PathBuf;
+
+#[cfg(target_os = "macos")]
+mod mac_impl;
 
 #[derive(Clone, Debug)]
 pub struct Event {
@@ -20,240 +14,6 @@ pub struct Event {
     pub path: PathBuf,
 }
 
-pub struct EventStream {
-    lifecycle: Arc<Mutex<Lifecycle>>,
-    state: Box<State>,
-}
-
-struct State {
-    latency: Duration,
-    paths: cf::CFMutableArrayRef,
-    callback: Option<Box<dyn FnMut(Vec<Event>) -> bool>>,
-    last_valid_event_id: Option<fs::FSEventStreamEventId>,
-    stream: fs::FSEventStreamRef,
-}
-
-impl Drop for State {
-    fn drop(&mut self) {
-        unsafe {
-            cf::CFRelease(self.paths);
-            fs::FSEventStreamStop(self.stream);
-            fs::FSEventStreamInvalidate(self.stream);
-            fs::FSEventStreamRelease(self.stream);
-        }
-    }
-}
-
-enum Lifecycle {
-    New,
-    Running(cf::CFRunLoopRef),
-    Stopped,
-}
-
-pub struct Handle(Arc<Mutex<Lifecycle>>);
-
-unsafe impl Send for EventStream {}
-unsafe impl Send for Lifecycle {}
-
-impl EventStream {
-    pub fn new(paths: &[&Path], latency: Duration) -> (Self, Handle) {
-        unsafe {
-            let cf_paths =
-                cf::CFArrayCreateMutable(cf::kCFAllocatorDefault, 0, &cf::kCFTypeArrayCallBacks);
-            assert!(!cf_paths.is_null());
-
-            for path in paths {
-                let path_bytes = path.as_os_str().as_bytes();
-                let cf_url = cf::CFURLCreateFromFileSystemRepresentation(
-                    cf::kCFAllocatorDefault,
-                    path_bytes.as_ptr() as *const i8,
-                    path_bytes.len() as cf::CFIndex,
-                    false,
-                );
-                let cf_path = cf::CFURLCopyFileSystemPath(cf_url, cf::kCFURLPOSIXPathStyle);
-                cf::CFArrayAppendValue(cf_paths, cf_path);
-                cf::CFRelease(cf_path);
-                cf::CFRelease(cf_url);
-            }
-
-            let mut state = Box::new(State {
-                latency,
-                paths: cf_paths,
-                callback: None,
-                last_valid_event_id: None,
-                stream: ptr::null_mut(),
-            });
-            let stream_context = fs::FSEventStreamContext {
-                version: 0,
-                info: state.as_ref() as *const _ as *mut c_void,
-                retain: None,
-                release: None,
-                copy_description: None,
-            };
-            let stream = fs::FSEventStreamCreate(
-                cf::kCFAllocatorDefault,
-                Self::trampoline,
-                &stream_context,
-                cf_paths,
-                FSEventsGetCurrentEventId(),
-                latency.as_secs_f64(),
-                fs::kFSEventStreamCreateFlagFileEvents
-                    | fs::kFSEventStreamCreateFlagNoDefer
-                    | fs::kFSEventStreamCreateFlagWatchRoot,
-            );
-            state.stream = stream;
-
-            let lifecycle = Arc::new(Mutex::new(Lifecycle::New));
-            (
-                EventStream {
-                    lifecycle: lifecycle.clone(),
-                    state,
-                },
-                Handle(lifecycle),
-            )
-        }
-    }
-
-    pub fn run<F>(mut self, f: F)
-    where
-        F: FnMut(Vec<Event>) -> bool + 'static,
-    {
-        self.state.callback = Some(Box::new(f));
-        unsafe {
-            let run_loop = cf::CFRunLoopGetCurrent();
-            {
-                let mut state = self.lifecycle.lock();
-                match *state {
-                    Lifecycle::New => *state = Lifecycle::Running(run_loop),
-                    Lifecycle::Running(_) => unreachable!(),
-                    Lifecycle::Stopped => return,
-                }
-            }
-            fs::FSEventStreamScheduleWithRunLoop(
-                self.state.stream,
-                run_loop,
-                cf::kCFRunLoopDefaultMode,
-            );
-            fs::FSEventStreamStart(self.state.stream);
-            cf::CFRunLoopRun();
-        }
-    }
-
-    extern "C" fn trampoline(
-        stream_ref: fs::FSEventStreamRef,
-        info: *mut ::std::os::raw::c_void,
-        num: usize,                                 // size_t numEvents
-        event_paths: *mut ::std::os::raw::c_void,   // void *eventPaths
-        event_flags: *const ::std::os::raw::c_void, // const FSEventStreamEventFlags eventFlags[]
-        event_ids: *const ::std::os::raw::c_void,   // const FSEventStreamEventId eventIds[]
-    ) {
-        unsafe {
-            let event_paths = event_paths as *const *const ::std::os::raw::c_char;
-            let e_ptr = event_flags as *mut u32;
-            let i_ptr = event_ids as *mut u64;
-            let state = (info as *mut State).as_mut().unwrap();
-            let callback = if let Some(callback) = state.callback.as_mut() {
-                callback
-            } else {
-                return;
-            };
-
-            let paths = slice::from_raw_parts(event_paths, num);
-            let flags = slice::from_raw_parts_mut(e_ptr, num);
-            let ids = slice::from_raw_parts_mut(i_ptr, num);
-            let mut stream_restarted = false;
-
-            // Sometimes FSEvents reports a "dropped" event, an indication that either the kernel
-            // or our code couldn't keep up with the sheer volume of file-system events that were
-            // generated. If we observed a valid event before this happens, we'll try to read the
-            // file-system journal by stopping the current stream and creating a new one starting at
-            // such event. Otherwise, we'll let invoke the callback with the dropped event, which
-            // will likely perform a re-scan of one of the root directories.
-            if flags
-                .iter()
-                .copied()
-                .filter_map(StreamFlags::from_bits)
-                .any(|flags| {
-                    flags.contains(StreamFlags::USER_DROPPED)
-                        || flags.contains(StreamFlags::KERNEL_DROPPED)
-                })
-            {
-                if let Some(last_valid_event_id) = state.last_valid_event_id.take() {
-                    fs::FSEventStreamStop(state.stream);
-                    fs::FSEventStreamInvalidate(state.stream);
-                    fs::FSEventStreamRelease(state.stream);
-
-                    let stream_context = fs::FSEventStreamContext {
-                        version: 0,
-                        info,
-                        retain: None,
-                        release: None,
-                        copy_description: None,
-                    };
-                    let stream = fs::FSEventStreamCreate(
-                        cf::kCFAllocatorDefault,
-                        Self::trampoline,
-                        &stream_context,
-                        state.paths,
-                        last_valid_event_id,
-                        state.latency.as_secs_f64(),
-                        fs::kFSEventStreamCreateFlagFileEvents
-                            | fs::kFSEventStreamCreateFlagNoDefer
-                            | fs::kFSEventStreamCreateFlagWatchRoot,
-                    );
-
-                    state.stream = stream;
-                    fs::FSEventStreamScheduleWithRunLoop(
-                        state.stream,
-                        cf::CFRunLoopGetCurrent(),
-                        cf::kCFRunLoopDefaultMode,
-                    );
-                    fs::FSEventStreamStart(state.stream);
-                    stream_restarted = true;
-                }
-            }
-
-            if !stream_restarted {
-                let mut events = Vec::with_capacity(num);
-                for p in 0..num {
-                    if let Some(flag) = StreamFlags::from_bits(flags[p]) {
-                        if !flag.contains(StreamFlags::HISTORY_DONE) {
-                            let path_c_str = CStr::from_ptr(paths[p]);
-                            let path = PathBuf::from(OsStr::from_bytes(path_c_str.to_bytes()));
-                            let event = Event {
-                                event_id: ids[p],
-                                flags: flag,
-                                path,
-                            };
-                            state.last_valid_event_id = Some(event.event_id);
-                            events.push(event);
-                        }
-                    } else {
-                        debug_assert!(false, "unknown flag set for fs event: {}", flags[p]);
-                    }
-                }
-
-                if !events.is_empty() && !callback(events) {
-                    fs::FSEventStreamStop(stream_ref);
-                    cf::CFRunLoopStop(cf::CFRunLoopGetCurrent());
-                }
-            }
-        }
-    }
-}
-
-impl Drop for Handle {
-    fn drop(&mut self) {
-        let mut state = self.0.lock();
-        if let Lifecycle::Running(run_loop) = *state {
-            unsafe {
-                cf::CFRunLoopStop(run_loop);
-            }
-        }
-        *state = Lifecycle::Stopped;
-    }
-}
-
 // Synchronize with
 // /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/Headers/FSEvents.h
 bitflags! {
@@ -360,138 +120,3 @@ impl std::fmt::Display for StreamFlags {
         write!(f, "")
     }
 }
-
-#[link(name = "CoreServices", kind = "framework")]
-extern "C" {
-    pub fn FSEventsGetCurrentEventId() -> u64;
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::{fs, sync::mpsc, thread, time::Duration};
-
-    #[test]
-    fn test_event_stream_simple() {
-        for _ in 0..3 {
-            let dir = tempfile::Builder::new()
-                .prefix("test-event-stream")
-                .tempdir()
-                .unwrap();
-            let path = dir.path().canonicalize().unwrap();
-            for i in 0..10 {
-                fs::write(path.join(format!("existing-file-{}", i)), "").unwrap();
-            }
-            flush_historical_events();
-
-            let (tx, rx) = mpsc::channel();
-            let (stream, handle) = EventStream::new(&[&path], Duration::from_millis(50));
-            thread::spawn(move || stream.run(move |events| tx.send(events.to_vec()).is_ok()));
-
-            fs::write(path.join("new-file"), "").unwrap();
-            let events = rx.recv_timeout(Duration::from_secs(2)).unwrap();
-            let event = events.last().unwrap();
-            assert_eq!(event.path, path.join("new-file"));
-            assert!(event.flags.contains(StreamFlags::ITEM_CREATED));
-
-            fs::remove_file(path.join("existing-file-5")).unwrap();
-            let events = rx.recv_timeout(Duration::from_secs(2)).unwrap();
-            let event = events.last().unwrap();
-            assert_eq!(event.path, path.join("existing-file-5"));
-            assert!(event.flags.contains(StreamFlags::ITEM_REMOVED));
-            drop(handle);
-        }
-    }
-
-    #[test]
-    fn test_event_stream_delayed_start() {
-        for _ in 0..3 {
-            let dir = tempfile::Builder::new()
-                .prefix("test-event-stream")
-                .tempdir()
-                .unwrap();
-            let path = dir.path().canonicalize().unwrap();
-            for i in 0..10 {
-                fs::write(path.join(format!("existing-file-{}", i)), "").unwrap();
-            }
-            flush_historical_events();
-
-            let (tx, rx) = mpsc::channel();
-            let (stream, handle) = EventStream::new(&[&path], Duration::from_millis(50));
-
-            // Delay the call to `run` in order to make sure we don't miss any events that occur
-            // between creating the `EventStream` and calling `run`.
-            thread::spawn(move || {
-                thread::sleep(Duration::from_millis(100));
-                stream.run(move |events| tx.send(events.to_vec()).is_ok())
-            });
-
-            fs::write(path.join("new-file"), "").unwrap();
-            let events = rx.recv_timeout(Duration::from_secs(2)).unwrap();
-            let event = events.last().unwrap();
-            assert_eq!(event.path, path.join("new-file"));
-            assert!(event.flags.contains(StreamFlags::ITEM_CREATED));
-
-            fs::remove_file(path.join("existing-file-5")).unwrap();
-            let events = rx.recv_timeout(Duration::from_secs(2)).unwrap();
-            let event = events.last().unwrap();
-            assert_eq!(event.path, path.join("existing-file-5"));
-            assert!(event.flags.contains(StreamFlags::ITEM_REMOVED));
-            drop(handle);
-        }
-    }
-
-    #[test]
-    fn test_event_stream_shutdown_by_dropping_handle() {
-        let dir = tempfile::Builder::new()
-            .prefix("test-event-stream")
-            .tempdir()
-            .unwrap();
-        let path = dir.path().canonicalize().unwrap();
-        flush_historical_events();
-
-        let (tx, rx) = mpsc::channel();
-        let (stream, handle) = EventStream::new(&[&path], Duration::from_millis(50));
-        thread::spawn(move || {
-            stream.run({
-                let tx = tx.clone();
-                move |_| {
-                    tx.send("running").unwrap();
-                    true
-                }
-            });
-            tx.send("stopped").unwrap();
-        });
-
-        fs::write(path.join("new-file"), "").unwrap();
-        assert_eq!(rx.recv_timeout(Duration::from_secs(2)).unwrap(), "running");
-
-        // Dropping the handle causes `EventStream::run` to return.
-        drop(handle);
-        assert_eq!(rx.recv_timeout(Duration::from_secs(2)).unwrap(), "stopped");
-    }
-
-    #[test]
-    fn test_event_stream_shutdown_before_run() {
-        let dir = tempfile::Builder::new()
-            .prefix("test-event-stream")
-            .tempdir()
-            .unwrap();
-        let path = dir.path().canonicalize().unwrap();
-
-        let (stream, handle) = EventStream::new(&[&path], Duration::from_millis(50));
-        drop(handle);
-
-        // This returns immediately because the handle was already dropped.
-        stream.run(|_| true);
-    }
-
-    fn flush_historical_events() {
-        let duration = if std::env::var("CI").is_ok() {
-            Duration::from_secs(2)
-        } else {
-            Duration::from_millis(500)
-        };
-        thread::sleep(duration);
-    }
-}
diff --git a/crates/fsevent/src/mac_impl.rs b/crates/fsevent/src/mac_impl.rs
new file mode 100644
index 0000000000..9aec621580
--- /dev/null
+++ b/crates/fsevent/src/mac_impl.rs
@@ -0,0 +1,382 @@
+use fsevent_sys::{self as fs, core_foundation as cf};
+use parking_lot::Mutex;
+use std::{
+    convert::AsRef,
+    ffi::{c_void, CStr, OsStr},
+    os::unix::ffi::OsStrExt,
+    path::{Path, PathBuf},
+    ptr, slice,
+    sync::Arc,
+    time::Duration,
+};
+
+use crate::{Event, StreamFlags};
+
+pub struct EventStream {
+    lifecycle: Arc<Mutex<Lifecycle>>,
+    state: Box<State>,
+}
+
+struct State {
+    latency: Duration,
+    paths: cf::CFMutableArrayRef,
+    callback: Option<Box<dyn FnMut(Vec<Event>) -> bool>>,
+    last_valid_event_id: Option<fs::FSEventStreamEventId>,
+    stream: fs::FSEventStreamRef,
+}
+
+impl Drop for State {
+    fn drop(&mut self) {
+        unsafe {
+            cf::CFRelease(self.paths);
+            fs::FSEventStreamStop(self.stream);
+            fs::FSEventStreamInvalidate(self.stream);
+            fs::FSEventStreamRelease(self.stream);
+        }
+    }
+}
+
+enum Lifecycle {
+    New,
+    Running(cf::CFRunLoopRef),
+    Stopped,
+}
+
+pub struct Handle(Arc<Mutex<Lifecycle>>);
+
+unsafe impl Send for EventStream {}
+unsafe impl Send for Lifecycle {}
+
+impl EventStream {
+    pub fn new(paths: &[&Path], latency: Duration) -> (Self, Handle) {
+        unsafe {
+            let cf_paths =
+                cf::CFArrayCreateMutable(cf::kCFAllocatorDefault, 0, &cf::kCFTypeArrayCallBacks);
+            assert!(!cf_paths.is_null());
+
+            for path in paths {
+                let path_bytes = path.as_os_str().as_bytes();
+                let cf_url = cf::CFURLCreateFromFileSystemRepresentation(
+                    cf::kCFAllocatorDefault,
+                    path_bytes.as_ptr() as *const i8,
+                    path_bytes.len() as cf::CFIndex,
+                    false,
+                );
+                let cf_path = cf::CFURLCopyFileSystemPath(cf_url, cf::kCFURLPOSIXPathStyle);
+                cf::CFArrayAppendValue(cf_paths, cf_path);
+                cf::CFRelease(cf_path);
+                cf::CFRelease(cf_url);
+            }
+
+            let mut state = Box::new(State {
+                latency,
+                paths: cf_paths,
+                callback: None,
+                last_valid_event_id: None,
+                stream: ptr::null_mut(),
+            });
+            let stream_context = fs::FSEventStreamContext {
+                version: 0,
+                info: state.as_ref() as *const _ as *mut c_void,
+                retain: None,
+                release: None,
+                copy_description: None,
+            };
+            let stream = fs::FSEventStreamCreate(
+                cf::kCFAllocatorDefault,
+                Self::trampoline,
+                &stream_context,
+                cf_paths,
+                FSEventsGetCurrentEventId(),
+                latency.as_secs_f64(),
+                fs::kFSEventStreamCreateFlagFileEvents
+                    | fs::kFSEventStreamCreateFlagNoDefer
+                    | fs::kFSEventStreamCreateFlagWatchRoot,
+            );
+            state.stream = stream;
+
+            let lifecycle = Arc::new(Mutex::new(Lifecycle::New));
+            (
+                EventStream {
+                    lifecycle: lifecycle.clone(),
+                    state,
+                },
+                Handle(lifecycle),
+            )
+        }
+    }
+
+    pub fn run<F>(mut self, f: F)
+    where
+        F: FnMut(Vec<Event>) -> bool + 'static,
+    {
+        self.state.callback = Some(Box::new(f));
+        unsafe {
+            let run_loop = cf::CFRunLoopGetCurrent();
+            {
+                let mut state = self.lifecycle.lock();
+                match *state {
+                    Lifecycle::New => *state = Lifecycle::Running(run_loop),
+                    Lifecycle::Running(_) => unreachable!(),
+                    Lifecycle::Stopped => return,
+                }
+            }
+            fs::FSEventStreamScheduleWithRunLoop(
+                self.state.stream,
+                run_loop,
+                cf::kCFRunLoopDefaultMode,
+            );
+            fs::FSEventStreamStart(self.state.stream);
+            cf::CFRunLoopRun();
+        }
+    }
+
+    extern "C" fn trampoline(
+        stream_ref: fs::FSEventStreamRef,
+        info: *mut ::std::os::raw::c_void,
+        num: usize,                                 // size_t numEvents
+        event_paths: *mut ::std::os::raw::c_void,   // void *eventPaths
+        event_flags: *const ::std::os::raw::c_void, // const FSEventStreamEventFlags eventFlags[]
+        event_ids: *const ::std::os::raw::c_void,   // const FSEventStreamEventId eventIds[]
+    ) {
+        unsafe {
+            let event_paths = event_paths as *const *const ::std::os::raw::c_char;
+            let e_ptr = event_flags as *mut u32;
+            let i_ptr = event_ids as *mut u64;
+            let state = (info as *mut State).as_mut().unwrap();
+            let callback = if let Some(callback) = state.callback.as_mut() {
+                callback
+            } else {
+                return;
+            };
+
+            let paths = slice::from_raw_parts(event_paths, num);
+            let flags = slice::from_raw_parts_mut(e_ptr, num);
+            let ids = slice::from_raw_parts_mut(i_ptr, num);
+            let mut stream_restarted = false;
+
+            // Sometimes FSEvents reports a "dropped" event, an indication that either the kernel
+            // or our code couldn't keep up with the sheer volume of file-system events that were
+            // generated. If we observed a valid event before this happens, we'll try to read the
+            // file-system journal by stopping the current stream and creating a new one starting at
+            // such event. Otherwise, we'll let invoke the callback with the dropped event, which
+            // will likely perform a re-scan of one of the root directories.
+            if flags
+                .iter()
+                .copied()
+                .filter_map(StreamFlags::from_bits)
+                .any(|flags| {
+                    flags.contains(StreamFlags::USER_DROPPED)
+                        || flags.contains(StreamFlags::KERNEL_DROPPED)
+                })
+            {
+                if let Some(last_valid_event_id) = state.last_valid_event_id.take() {
+                    fs::FSEventStreamStop(state.stream);
+                    fs::FSEventStreamInvalidate(state.stream);
+                    fs::FSEventStreamRelease(state.stream);
+
+                    let stream_context = fs::FSEventStreamContext {
+                        version: 0,
+                        info,
+                        retain: None,
+                        release: None,
+                        copy_description: None,
+                    };
+                    let stream = fs::FSEventStreamCreate(
+                        cf::kCFAllocatorDefault,
+                        Self::trampoline,
+                        &stream_context,
+                        state.paths,
+                        last_valid_event_id,
+                        state.latency.as_secs_f64(),
+                        fs::kFSEventStreamCreateFlagFileEvents
+                            | fs::kFSEventStreamCreateFlagNoDefer
+                            | fs::kFSEventStreamCreateFlagWatchRoot,
+                    );
+
+                    state.stream = stream;
+                    fs::FSEventStreamScheduleWithRunLoop(
+                        state.stream,
+                        cf::CFRunLoopGetCurrent(),
+                        cf::kCFRunLoopDefaultMode,
+                    );
+                    fs::FSEventStreamStart(state.stream);
+                    stream_restarted = true;
+                }
+            }
+
+            if !stream_restarted {
+                let mut events = Vec::with_capacity(num);
+                for p in 0..num {
+                    if let Some(flag) = StreamFlags::from_bits(flags[p]) {
+                        if !flag.contains(StreamFlags::HISTORY_DONE) {
+                            let path_c_str = CStr::from_ptr(paths[p]);
+                            let path = PathBuf::from(OsStr::from_bytes(path_c_str.to_bytes()));
+                            let event = Event {
+                                event_id: ids[p],
+                                flags: flag,
+                                path,
+                            };
+                            state.last_valid_event_id = Some(event.event_id);
+                            events.push(event);
+                        }
+                    } else {
+                        debug_assert!(false, "unknown flag set for fs event: {}", flags[p]);
+                    }
+                }
+
+                if !events.is_empty() && !callback(events) {
+                    fs::FSEventStreamStop(stream_ref);
+                    cf::CFRunLoopStop(cf::CFRunLoopGetCurrent());
+                }
+            }
+        }
+    }
+}
+
+impl Drop for Handle {
+    fn drop(&mut self) {
+        let mut state = self.0.lock();
+        if let Lifecycle::Running(run_loop) = *state {
+            unsafe {
+                cf::CFRunLoopStop(run_loop);
+            }
+        }
+        *state = Lifecycle::Stopped;
+    }
+}
+
+#[link(name = "CoreServices", kind = "framework")]
+extern "C" {
+    pub fn FSEventsGetCurrentEventId() -> u64;
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::{fs, sync::mpsc, thread, time::Duration};
+
+    #[test]
+    fn test_event_stream_simple() {
+        for _ in 0..3 {
+            let dir = tempfile::Builder::new()
+                .prefix("test-event-stream")
+                .tempdir()
+                .unwrap();
+            let path = dir.path().canonicalize().unwrap();
+            for i in 0..10 {
+                fs::write(path.join(format!("existing-file-{}", i)), "").unwrap();
+            }
+            flush_historical_events();
+
+            let (tx, rx) = mpsc::channel();
+            let (stream, handle) = EventStream::new(&[&path], Duration::from_millis(50));
+            thread::spawn(move || stream.run(move |events| tx.send(events.to_vec()).is_ok()));
+
+            fs::write(path.join("new-file"), "").unwrap();
+            let events = rx.recv_timeout(Duration::from_secs(2)).unwrap();
+            let event = events.last().unwrap();
+            assert_eq!(event.path, path.join("new-file"));
+            assert!(event.flags.contains(StreamFlags::ITEM_CREATED));
+
+            fs::remove_file(path.join("existing-file-5")).unwrap();
+            let events = rx.recv_timeout(Duration::from_secs(2)).unwrap();
+            let event = events.last().unwrap();
+            assert_eq!(event.path, path.join("existing-file-5"));
+            assert!(event.flags.contains(StreamFlags::ITEM_REMOVED));
+            drop(handle);
+        }
+    }
+
+    #[test]
+    fn test_event_stream_delayed_start() {
+        for _ in 0..3 {
+            let dir = tempfile::Builder::new()
+                .prefix("test-event-stream")
+                .tempdir()
+                .unwrap();
+            let path = dir.path().canonicalize().unwrap();
+            for i in 0..10 {
+                fs::write(path.join(format!("existing-file-{}", i)), "").unwrap();
+            }
+            flush_historical_events();
+
+            let (tx, rx) = mpsc::channel();
+            let (stream, handle) = EventStream::new(&[&path], Duration::from_millis(50));
+
+            // Delay the call to `run` in order to make sure we don't miss any events that occur
+            // between creating the `EventStream` and calling `run`.
+            thread::spawn(move || {
+                thread::sleep(Duration::from_millis(100));
+                stream.run(move |events| tx.send(events.to_vec()).is_ok())
+            });
+
+            fs::write(path.join("new-file"), "").unwrap();
+            let events = rx.recv_timeout(Duration::from_secs(2)).unwrap();
+            let event = events.last().unwrap();
+            assert_eq!(event.path, path.join("new-file"));
+            assert!(event.flags.contains(StreamFlags::ITEM_CREATED));
+
+            fs::remove_file(path.join("existing-file-5")).unwrap();
+            let events = rx.recv_timeout(Duration::from_secs(2)).unwrap();
+            let event = events.last().unwrap();
+            assert_eq!(event.path, path.join("existing-file-5"));
+            assert!(event.flags.contains(StreamFlags::ITEM_REMOVED));
+            drop(handle);
+        }
+    }
+
+    #[test]
+    fn test_event_stream_shutdown_by_dropping_handle() {
+        let dir = tempfile::Builder::new()
+            .prefix("test-event-stream")
+            .tempdir()
+            .unwrap();
+        let path = dir.path().canonicalize().unwrap();
+        flush_historical_events();
+
+        let (tx, rx) = mpsc::channel();
+        let (stream, handle) = EventStream::new(&[&path], Duration::from_millis(50));
+        thread::spawn(move || {
+            stream.run({
+                let tx = tx.clone();
+                move |_| {
+                    tx.send("running").unwrap();
+                    true
+                }
+            });
+            tx.send("stopped").unwrap();
+        });
+
+        fs::write(path.join("new-file"), "").unwrap();
+        assert_eq!(rx.recv_timeout(Duration::from_secs(2)).unwrap(), "running");
+
+        // Dropping the handle causes `EventStream::run` to return.
+        drop(handle);
+        assert_eq!(rx.recv_timeout(Duration::from_secs(2)).unwrap(), "stopped");
+    }
+
+    #[test]
+    fn test_event_stream_shutdown_before_run() {
+        let dir = tempfile::Builder::new()
+            .prefix("test-event-stream")
+            .tempdir()
+            .unwrap();
+        let path = dir.path().canonicalize().unwrap();
+
+        let (stream, handle) = EventStream::new(&[&path], Duration::from_millis(50));
+        drop(handle);
+
+        // This returns immediately because the handle was already dropped.
+        stream.run(|_| true);
+    }
+
+    fn flush_historical_events() {
+        let duration = if std::env::var("CI").is_ok() {
+            Duration::from_secs(2)
+        } else {
+            Duration::from_millis(500)
+        };
+        thread::sleep(duration);
+    }
+}

From b25044393eeeb50a4c8a36ff9679a3ea2b1852ad Mon Sep 17 00:00:00 2001
From: Daniel Schmidt <danielmschmidt92@gmail.com>
Date: Thu, 8 Feb 2024 17:40:38 +0100
Subject: [PATCH 327/372] Add `open permalink to line` action (#7562)

Release Notes:

- Added `open permalink to line` action.

---------

Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>
---
 crates/editor/src/actions.rs |  1 +
 crates/editor/src/editor.rs  | 28 +++++++++++++++++++++++++++-
 crates/editor/src/element.rs |  1 +
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/crates/editor/src/actions.rs b/crates/editor/src/actions.rs
index a715515065..3c4104570a 100644
--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -194,6 +194,7 @@ gpui::actions!(
         NewlineBelow,
         NextScreen,
         OpenExcerpts,
+        OpenPermalinkToLine,
         Outdent,
         PageDown,
         PageUp,
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 92273dfe4b..2c913e2388 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -8393,7 +8393,7 @@ impl Editor {
         }
     }
 
-    pub fn copy_permalink_to_line(&mut self, _: &CopyPermalinkToLine, cx: &mut ViewContext<Self>) {
+    fn get_permalink_to_line(&mut self, cx: &mut ViewContext<Self>) -> Result<url::Url> {
         use git::permalink::{build_permalink, BuildPermalinkParams};
 
         let permalink = maybe!({
@@ -8439,6 +8439,11 @@ impl Editor {
                 selection: selection.map(|selection| selection.range()),
             })
         });
+        permalink
+    }
+
+    pub fn copy_permalink_to_line(&mut self, _: &CopyPermalinkToLine, cx: &mut ViewContext<Self>) {
+        let permalink = self.get_permalink_to_line(cx);
 
         match permalink {
             Ok(permalink) => {
@@ -8458,6 +8463,27 @@ impl Editor {
         }
     }
 
+    pub fn open_permalink_to_line(&mut self, _: &OpenPermalinkToLine, cx: &mut ViewContext<Self>) {
+        let permalink = self.get_permalink_to_line(cx);
+
+        match permalink {
+            Ok(permalink) => {
+                cx.open_url(&permalink.to_string());
+            }
+            Err(err) => {
+                let message = format!("Failed to open permalink: {err}");
+
+                Err::<(), anyhow::Error>(err).log_err();
+
+                if let Some(workspace) = self.workspace() {
+                    workspace.update(cx, |workspace, cx| {
+                        workspace.show_toast(Toast::new(0x45a8978, message), cx)
+                    })
+                }
+            }
+        }
+    }
+
     pub fn highlight_rows(&mut self, rows: Option<Range<u32>>) {
         self.highlighted_rows = rows;
     }
diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index ce348b21d5..e504c0f680 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -278,6 +278,7 @@ impl EditorElement {
         register_action(view, cx, Editor::copy_relative_path);
         register_action(view, cx, Editor::copy_highlight_json);
         register_action(view, cx, Editor::copy_permalink_to_line);
+        register_action(view, cx, Editor::open_permalink_to_line);
         register_action(view, cx, |editor, action, cx| {
             if let Some(task) = editor.format(action, cx) {
                 task.detach_and_log_err(cx);

From b77d452b9049aebb80226547a339dbb6f033bf8d Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Thu, 8 Feb 2024 11:52:18 -0500
Subject: [PATCH 328/372] Remove unneeded `maybe!` (#7576)

This PR removes an unneeded `maybe!` from `get_permalink_to_line`.

As this is a `Result`-returning function, we don't need the inner level
of wrapping.

Release Notes:

- N/A
---
 crates/editor/src/editor.rs | 73 ++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 38 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 2c913e2388..499b7ce28f 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -8396,50 +8396,47 @@ impl Editor {
     fn get_permalink_to_line(&mut self, cx: &mut ViewContext<Self>) -> Result<url::Url> {
         use git::permalink::{build_permalink, BuildPermalinkParams};
 
-        let permalink = maybe!({
-            let project = self.project.clone().ok_or_else(|| anyhow!("no project"))?;
-            let project = project.read(cx);
+        let project = self.project.clone().ok_or_else(|| anyhow!("no project"))?;
+        let project = project.read(cx);
 
-            let worktree = project
-                .visible_worktrees(cx)
-                .next()
-                .ok_or_else(|| anyhow!("no worktree"))?;
+        let worktree = project
+            .visible_worktrees(cx)
+            .next()
+            .ok_or_else(|| anyhow!("no worktree"))?;
 
-            let mut cwd = worktree.read(cx).abs_path().to_path_buf();
-            cwd.push(".git");
+        let mut cwd = worktree.read(cx).abs_path().to_path_buf();
+        cwd.push(".git");
 
-            const REMOTE_NAME: &'static str = "origin";
-            let repo = project
-                .fs()
-                .open_repo(&cwd)
-                .ok_or_else(|| anyhow!("no Git repo"))?;
-            let origin_url = repo
-                .lock()
-                .remote_url(REMOTE_NAME)
-                .ok_or_else(|| anyhow!("remote \"{REMOTE_NAME}\" not found"))?;
-            let sha = repo
-                .lock()
-                .head_sha()
-                .ok_or_else(|| anyhow!("failed to read HEAD SHA"))?;
+        const REMOTE_NAME: &'static str = "origin";
+        let repo = project
+            .fs()
+            .open_repo(&cwd)
+            .ok_or_else(|| anyhow!("no Git repo"))?;
+        let origin_url = repo
+            .lock()
+            .remote_url(REMOTE_NAME)
+            .ok_or_else(|| anyhow!("remote \"{REMOTE_NAME}\" not found"))?;
+        let sha = repo
+            .lock()
+            .head_sha()
+            .ok_or_else(|| anyhow!("failed to read HEAD SHA"))?;
 
-            let path = maybe!({
-                let buffer = self.buffer().read(cx).as_singleton()?;
-                let file = buffer.read(cx).file().and_then(|f| f.as_local())?;
-                file.path().to_str().map(|path| path.to_string())
-            })
-            .ok_or_else(|| anyhow!("failed to determine file path"))?;
+        let path = maybe!({
+            let buffer = self.buffer().read(cx).as_singleton()?;
+            let file = buffer.read(cx).file().and_then(|f| f.as_local())?;
+            file.path().to_str().map(|path| path.to_string())
+        })
+        .ok_or_else(|| anyhow!("failed to determine file path"))?;
 
-            let selections = self.selections.all::<Point>(cx);
-            let selection = selections.iter().peekable().next();
+        let selections = self.selections.all::<Point>(cx);
+        let selection = selections.iter().peekable().next();
 
-            build_permalink(BuildPermalinkParams {
-                remote_url: &origin_url,
-                sha: &sha,
-                path: &path,
-                selection: selection.map(|selection| selection.range()),
-            })
-        });
-        permalink
+        build_permalink(BuildPermalinkParams {
+            remote_url: &origin_url,
+            sha: &sha,
+            path: &path,
+            selection: selection.map(|selection| selection.range()),
+        })
     }
 
     pub fn copy_permalink_to_line(&mut self, _: &CopyPermalinkToLine, cx: &mut ViewContext<Self>) {

From 1ba42f69ee5559a23cd8fd3a5ae6b0cdb128fde4 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Thu, 8 Feb 2024 12:08:37 -0500
Subject: [PATCH 329/372] Update `.mailmap` (#7578)

This PR updates the `.mailmap` file to merge some commit authors using
multiple emails.

Release Notes:

- N/A
---
 .mailmap | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.mailmap b/.mailmap
index ec1f3c1f16..fbd23aa5db 100644
--- a/.mailmap
+++ b/.mailmap
@@ -13,6 +13,8 @@ Antonio Scandurra <me@as-cii.com>
 Antonio Scandurra <me@as-cii.com> <antonio@zed.dev>
 Conrad Irwin <conrad@zed.dev>
 Conrad Irwin <conrad@zed.dev> <conrad.irwin@gmail.com>
+Greg Morenz <greg-morenz@droid.cafe>
+Greg Morenz <greg-morenz@droid.cafe> <morenzg@gmail.com>
 Joseph T. Lyons <JosephTLyons@gmail.com>
 Joseph T. Lyons <JosephTLyons@gmail.com> <JosephTLyons@users.noreply.github.com>
 Julia <floc@unpromptedtirade.com>
@@ -39,6 +41,8 @@ Nathan Sobo <nathan@zed.dev> <nathan@warp.dev>
 Nathan Sobo <nathan@zed.dev> <nathansobo@gmail.com>
 Piotr Osiewicz <piotr@zed.dev>
 Piotr Osiewicz <piotr@zed.dev> <24362066+osiewicz@users.noreply.github.com>
+Robert Clover <git@clo4.net>
+Robert Clover <git@clo4.net> <robert@clover.gdn>
 Thorsten Ball <thorsten@zed.dev>
 Thorsten Ball <thorsten@zed.dev> <me@thorstenball.com>
 Thorsten Ball <thorsten@zed.dev> <mrnugget@gmail.com>

From 8f7d7863d66718e51fc7255aa76239af0bc3a7f4 Mon Sep 17 00:00:00 2001
From: Robert Clover <git@clo4.net>
Date: Fri, 9 Feb 2024 04:12:45 +1100
Subject: [PATCH 330/372] Fix text in terminal showing as bold when dimmed
 (#7491)

Fixes text in the terminal displaying as bold when it's actually just
dim. I think it was just a simple oversight because the original code
`|`'s together the BOLD and DIM_BOLD flags, which is the same as
DIM_BOLD, which is wrong because it should only be BOLD :p

Release Notes:

- Fixed #4464

Co-authored-by: Mikayla Maki <mikayla@zed.dev>
---
 crates/terminal_view/src/terminal_element.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index addf55ee45..2696a6058c 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -347,7 +347,7 @@ impl TerminalElement {
                 thickness: Pixels::from(1.0),
             });
 
-        let weight = if flags.intersects(Flags::BOLD | Flags::DIM_BOLD) {
+        let weight = if flags.intersects(Flags::BOLD) {
             FontWeight::BOLD
         } else {
             FontWeight::NORMAL

From d4be15b2b22718593040dacd2681e55d0b90760e Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Thu, 8 Feb 2024 09:32:53 -0800
Subject: [PATCH 331/372] Suppress related warnings, fix nanoid, and get the
 build green (#7579)

This is in preparation for adding a Linux build step to our CI.

Release Notes:

- N/A
---
 crates/gpui/src/platform.rs                    |  3 +++
 crates/gpui/src/platform/linux/dispatcher.rs   |  2 ++
 crates/gpui/src/platform/linux/text_system.rs  | 12 +++---------
 crates/gpui/src/platform/linux/window.rs       |  3 +++
 crates/gpui/src/platform/mac/metal_renderer.rs |  5 ++++-
 crates/gpui/src/scene.rs                       |  2 --
 crates/live_kit_client/Cargo.toml              |  1 +
 crates/zed/src/languages/purescript.rs         |  2 ++
 8 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index b7a7652579..a63271e7ea 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -1,3 +1,6 @@
+// todo!(linux): remove
+#![cfg_attr(target_os = "linux", allow(dead_code))]
+
 mod app_menu;
 mod keystroke;
 #[cfg(target_os = "linux")]
diff --git a/crates/gpui/src/platform/linux/dispatcher.rs b/crates/gpui/src/platform/linux/dispatcher.rs
index 108b8ed354..8aa0631268 100644
--- a/crates/gpui/src/platform/linux/dispatcher.rs
+++ b/crates/gpui/src/platform/linux/dispatcher.rs
@@ -1,6 +1,8 @@
 #![allow(non_upper_case_globals)]
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
+//todo!(linux): remove
+#![allow(unused_variables)]
 
 use crate::{PlatformDispatcher, TaskLabel};
 use async_task::Runnable;
diff --git a/crates/gpui/src/platform/linux/text_system.rs b/crates/gpui/src/platform/linux/text_system.rs
index 53faa936bc..885a6b1736 100644
--- a/crates/gpui/src/platform/linux/text_system.rs
+++ b/crates/gpui/src/platform/linux/text_system.rs
@@ -1,18 +1,12 @@
+//todo!(linux) remove
+#[allow(unused)]
 use crate::{
     Bounds, DevicePixels, Font, FontId, FontMetrics, FontRun, GlyphId, LineLayout, Pixels,
     PlatformTextSystem, RenderGlyphParams, SharedString, Size,
 };
 use anyhow::Result;
 use collections::HashMap;
-use font_kit::{
-    font::Font as FontKitFont,
-    handle::Handle,
-    hinting::HintingOptions,
-    metrics::Metrics,
-    properties::{Style as FontkitStyle, Weight as FontkitWeight},
-    source::SystemSource,
-    sources::mem::MemSource,
-};
+use font_kit::{font::Font as FontKitFont, source::SystemSource, sources::mem::MemSource};
 use parking_lot::RwLock;
 use smallvec::SmallVec;
 use std::borrow::Cow;
diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index ee38c0bd37..e88ebde029 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -1,3 +1,6 @@
+//todo!(linux): remove
+#![allow(unused)]
+
 use super::BladeRenderer;
 use crate::{
     Bounds, GlobalPixels, LinuxDisplay, Pixels, PlatformDisplay, PlatformInputHandler,
diff --git a/crates/gpui/src/platform/mac/metal_renderer.rs b/crates/gpui/src/platform/mac/metal_renderer.rs
index 13db1bfff1..1c071dec08 100644
--- a/crates/gpui/src/platform/mac/metal_renderer.rs
+++ b/crates/gpui/src/platform/mac/metal_renderer.rs
@@ -19,6 +19,9 @@ use parking_lot::Mutex;
 use smallvec::SmallVec;
 use std::{cell::Cell, ffi::c_void, mem, ptr, sync::Arc};
 
+// Exported to metal
+pub(crate) type PointF = crate::Point<f32>;
+
 #[cfg(not(feature = "runtime_shaders"))]
 const SHADERS_METALLIB: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/shaders.metallib"));
 #[cfg(feature = "runtime_shaders")]
@@ -77,7 +80,7 @@ impl MetalRenderer {
             .new_library_with_data(SHADERS_METALLIB)
             .expect("error building metal library");
 
-        fn to_float2_bits(point: crate::PointF) -> u64 {
+        fn to_float2_bits(point: PointF) -> u64 {
             let mut output = point.y.to_bits() as u64;
             output <<= 32;
             output |= point.x.to_bits() as u64;
diff --git a/crates/gpui/src/scene.rs b/crates/gpui/src/scene.rs
index f7c85cd623..17cb25a12f 100644
--- a/crates/gpui/src/scene.rs
+++ b/crates/gpui/src/scene.rs
@@ -5,8 +5,6 @@ use crate::{
 use collections::{BTreeMap, FxHashSet};
 use std::{fmt::Debug, iter::Peekable, slice};
 
-// Exported to metal
-pub(crate) type PointF = Point<f32>;
 #[allow(non_camel_case_types, unused)]
 pub(crate) type PathVertex_ScaledPixels = PathVertex<ScaledPixels>;
 
diff --git a/crates/live_kit_client/Cargo.toml b/crates/live_kit_client/Cargo.toml
index f6ae36c935..d004e18bc1 100644
--- a/crates/live_kit_client/Cargo.toml
+++ b/crates/live_kit_client/Cargo.toml
@@ -44,6 +44,7 @@ async-trait = { workspace = true }
 collections = { workspace = true, features = ["test-support"] }
 gpui = { workspace = true, features = ["test-support"] }
 live_kit_server.workspace = true
+nanoid = "0.4"
 
 [dev-dependencies]
 anyhow.workspace = true
diff --git a/crates/zed/src/languages/purescript.rs b/crates/zed/src/languages/purescript.rs
index bdf55f1b93..150f154633 100644
--- a/crates/zed/src/languages/purescript.rs
+++ b/crates/zed/src/languages/purescript.rs
@@ -26,6 +26,8 @@ pub struct PurescriptLspAdapter {
 }
 
 impl PurescriptLspAdapter {
+    // todo!(linux): remove
+    #[cfg_attr(target_os = "linux", allow(dead_code))]
     pub fn new(node: Arc<dyn NodeRuntime>) -> Self {
         Self { node }
     }

From 9e538e791634ff2f90caf0d4ec5ad87919a7e825 Mon Sep 17 00:00:00 2001
From: Daniel Banck <dbanck@users.noreply.github.com>
Date: Thu, 8 Feb 2024 19:12:12 +0100
Subject: [PATCH 332/372] Support Terraform Variable Definitions as separate
 language (#7524)

With https://github.com/zed-industries/zed/pull/6882 basic syntax
highlighting support for Terraform has arrived in Zed. To fully support
all features of the language server (when it lands), it's necessary to
handle `*.tfvars` slightly differently.

TL;DR: [terraform-ls](https://github.com/hashicorp/terraform-ls) expects
`terraform` as language id for `*.tf` files and `terraform-vars` as
language id for `*.tfvars` files because the allowed configuration
inside the files is different. Duplicating the Terraform language
configuration was the only way I could see to achieve this.

---

In the
[LSP](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocumentItem),
text documents have a language identifier to identify a document on the
server side to avoid reinterpreting the file extension.

The Terraform language server currently uses two different language
identifiers:
* `terraform` - for `*.tf` files
* `terraform-vars` - for `*.tfvars` files

Both file types contain HCL and can be highlighted using the same
grammar and tree-sitter configuration files. The difference in the file
content is that `*.tfvars` files only allow top-level attributes and no
blocks. [_So you could argue that `*.tfvars` can use a stripped down
version of the grammar_]. To set the right context (which affects
completion, hover, validation...) for each file, we need to send a
different language id.

The only way I could see to achieve this with the current architecture
was to copy the Terraform language configuration with a different `name`
and different `path_suffixes`. Everything else is the same.

A Terraform LSP adapter implementation would then map the language
configurations to their specific language ids:

```rust
fn language_ids(&self) -> HashMap<String, String> {
    HashMap::from_iter([
        ("Terraform".into(), "terraform".into()),
        ("Terraform Vars".into(), "terraform-vars".into()),
    ])
}
```

I think it might be helpful in the future to have another way to map
file extensions to specific language ids without having to create a new
language configuration.

### UX Before

![CleanShot 2024-02-07 at 23 00
56@2x](https://github.com/zed-industries/zed/assets/45985/2c40f477-99a2-4dc1-86de-221acccfcedb)

### UX After

![CleanShot 2024-02-07 at 22 58
40@2x](https://github.com/zed-industries/zed/assets/45985/704c9cca-ae14-413a-be1f-d2439ae1ae22)

Release Notes:

- N/A

---

* Part of https://github.com/zed-industries/zed/issues/5098
---
 crates/zed/src/languages.rs                   |   1 +
 .../src/languages/terraform-vars/config.toml  |  14 ++
 .../languages/terraform-vars/highlights.scm   | 159 ++++++++++++++++++
 .../src/languages/terraform-vars/indents.scm  |  14 ++
 .../languages/terraform-vars/injections.scm   |   9 +
 .../zed/src/languages/terraform/config.toml   |   2 +-
 6 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 crates/zed/src/languages/terraform-vars/config.toml
 create mode 100644 crates/zed/src/languages/terraform-vars/highlights.scm
 create mode 100644 crates/zed/src/languages/terraform-vars/indents.scm
 create mode 100644 crates/zed/src/languages/terraform-vars/injections.scm

diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index 2c59860bd5..af0fc62512 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -287,6 +287,7 @@ pub fn init(
     language("uiua", vec![Arc::new(uiua::UiuaLanguageServer {})]);
     language("proto", vec![]);
     language("terraform", vec![]);
+    language("terraform-vars", vec![]);
     language("hcl", vec![]);
 }
 
diff --git a/crates/zed/src/languages/terraform-vars/config.toml b/crates/zed/src/languages/terraform-vars/config.toml
new file mode 100644
index 0000000000..12ed7e236c
--- /dev/null
+++ b/crates/zed/src/languages/terraform-vars/config.toml
@@ -0,0 +1,14 @@
+name = "Terraform Vars"
+grammar = "hcl"
+path_suffixes = ["tfvars"]
+line_comments = ["# ", "// "]
+block_comment = ["/*", "*/"]
+autoclose_before = ",}])"
+brackets = [
+    { start = "{", end = "}", close = true, newline = true },
+    { start = "[", end = "]", close = true, newline = true },
+    { start = "(", end = ")", close = true, newline = true },
+    { start = "\"", end = "\"", close = true, newline = false, not_in = ["comment", "string"] },
+    { start = "'", end = "'", close = true, newline = false, not_in = ["comment", "string"] },
+    { start = "/*", end = " */", close = true, newline = false, not_in = ["comment", "string"] },
+]
diff --git a/crates/zed/src/languages/terraform-vars/highlights.scm b/crates/zed/src/languages/terraform-vars/highlights.scm
new file mode 100644
index 0000000000..f123c3232d
--- /dev/null
+++ b/crates/zed/src/languages/terraform-vars/highlights.scm
@@ -0,0 +1,159 @@
+; https://github.com/nvim-treesitter/nvim-treesitter/blob/cb79d2446196d25607eb1d982c96939abdf67b8e/queries/hcl/highlights.scm
+; highlights.scm
+[
+  "!"
+  "\*"
+  "/"
+  "%"
+  "\+"
+  "-"
+  ">"
+  ">="
+  "<"
+  "<="
+  "=="
+  "!="
+  "&&"
+  "||"
+] @operator
+
+[
+  "{"
+  "}"
+  "["
+  "]"
+  "("
+  ")"
+] @punctuation.bracket
+
+[
+  "."
+  ".*"
+  ","
+  "[*]"
+] @punctuation.delimiter
+
+[
+  (ellipsis)
+  "\?"
+  "=>"
+] @punctuation.special
+
+[
+  ":"
+  "="
+] @punctuation
+
+[
+  "for"
+  "endfor"
+  "in"
+  "if"
+  "else"
+  "endif"
+] @keyword
+
+[
+  (quoted_template_start) ; "
+  (quoted_template_end) ; "
+  (template_literal) ; non-interpolation/directive content
+] @string
+
+[
+  (heredoc_identifier) ; END
+  (heredoc_start) ; << or <<-
+] @punctuation.delimiter
+
+[
+  (template_interpolation_start) ; ${
+  (template_interpolation_end) ; }
+  (template_directive_start) ; %{
+  (template_directive_end) ; }
+  (strip_marker) ; ~
+] @punctuation.special
+
+(numeric_lit) @number
+
+(bool_lit) @boolean
+
+(null_lit) @constant
+
+(comment) @comment
+
+(identifier) @variable
+
+(body
+  (block
+    (identifier) @keyword))
+
+(body
+  (block
+    (body
+      (block
+        (identifier) @type))))
+
+(function_call
+  (identifier) @function)
+
+(attribute
+  (identifier) @variable)
+
+; { key: val }
+;
+; highlight identifier keys as though they were block attributes
+(object_elem
+  key:
+    (expression
+      (variable_expr
+        (identifier) @variable)))
+
+; var.foo, data.bar
+;
+; first element in get_attr is a variable.builtin or a reference to a variable.builtin
+(expression
+  (variable_expr
+    (identifier) @variable)
+  (get_attr
+    (identifier) @variable))
+
+; https://github.com/nvim-treesitter/nvim-treesitter/blob/cb79d2446196d25607eb1d982c96939abdf67b8e/queries/terraform/highlights.scm
+; Terraform specific references
+;
+;
+; local/module/data/var/output
+(expression
+  (variable_expr
+    (identifier) @variable
+    (#any-of? @variable "data" "var" "local" "module" "output"))
+  (get_attr
+    (identifier) @variable))
+
+; path.root/cwd/module
+(expression
+  (variable_expr
+    (identifier) @type
+    (#eq? @type "path"))
+  (get_attr
+    (identifier) @variable
+    (#any-of? @variable "root" "cwd" "module")))
+
+; terraform.workspace
+(expression
+  (variable_expr
+    (identifier) @type
+    (#eq? @type "terraform"))
+  (get_attr
+    (identifier) @variable
+    (#any-of? @variable "workspace")))
+
+; Terraform specific keywords
+; FIXME: ideally only for identifiers under a `variable` block to minimize false positives
+((identifier) @type
+  (#any-of? @type "bool" "string" "number" "object" "tuple" "list" "map" "set" "any"))
+
+(object_elem
+  val:
+    (expression
+      (variable_expr
+        (identifier) @type
+        (#any-of? @type "bool" "string" "number" "object" "tuple" "list" "map" "set" "any"))))
diff --git a/crates/zed/src/languages/terraform-vars/indents.scm b/crates/zed/src/languages/terraform-vars/indents.scm
new file mode 100644
index 0000000000..95ad93df1d
--- /dev/null
+++ b/crates/zed/src/languages/terraform-vars/indents.scm
@@ -0,0 +1,14 @@
+; https://github.com/nvim-treesitter/nvim-treesitter/blob/ce4adf11cfe36fc5b0e5bcdce0c7c6e8fbc9798a/queries/hcl/indents.scm
+[
+  (block)
+  (object)
+  (tuple)
+  (function_call)
+] @indent
+
+(_ "[" "]" @end) @indent
+(_ "(" ")" @end) @indent
+(_ "{" "}" @end) @indent
+
+; https://github.com/nvim-treesitter/nvim-treesitter/blob/ce4adf11cfe36fc5b0e5bcdce0c7c6e8fbc9798a/queries/terraform/indents.scm
+; inherits: hcl
diff --git a/crates/zed/src/languages/terraform-vars/injections.scm b/crates/zed/src/languages/terraform-vars/injections.scm
new file mode 100644
index 0000000000..b41ee95d40
--- /dev/null
+++ b/crates/zed/src/languages/terraform-vars/injections.scm
@@ -0,0 +1,9 @@
+; https://github.com/nvim-treesitter/nvim-treesitter/blob/ce4adf11cfe36fc5b0e5bcdce0c7c6e8fbc9798a/queries/hcl/injections.scm
+
+(heredoc_template
+  (template_literal) @content
+  (heredoc_identifier) @language
+  (#downcase! @language))
+
+; https://github.com/nvim-treesitter/nvim-treesitter/blob/ce4adf11cfe36fc5b0e5bcdce0c7c6e8fbc9798a/queries/terraform/injections.scm
+; inherits: hcl
diff --git a/crates/zed/src/languages/terraform/config.toml b/crates/zed/src/languages/terraform/config.toml
index 11fe6fcd31..c2401c24ca 100644
--- a/crates/zed/src/languages/terraform/config.toml
+++ b/crates/zed/src/languages/terraform/config.toml
@@ -1,6 +1,6 @@
 name = "Terraform"
 grammar = "hcl"
-path_suffixes = ["tf", "tfvars"]
+path_suffixes = ["tf"]
 line_comments = ["# ", "// "]
 block_comment = ["/*", "*/"]
 autoclose_before = ",}])"

From 67b96b2b4019e7a445518ac7308db6d27c777dc5 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Thu, 8 Feb 2024 19:47:12 +0100
Subject: [PATCH 333/372] Replace `CADisplayLink` with `CVDisplayLink` (#7583)

Release Notes:

- Fixed a bug that caused Zed to render at 60fps even on ProMotion
displays.
- Fixed a bug that could saturate the main thread event loop in certain
circumstances.

---------

Co-authored-by: Thorsten <thorsten@zed.dev>
Co-authored-by: Nathan <nathan@zed.dev>
Co-authored-by: Max <max@zed.dev>
---
 crates/gpui/build.rs                          |   8 +
 crates/gpui/src/app.rs                        |   9 +-
 crates/gpui/src/platform.rs                   |   8 -
 crates/gpui/src/platform/mac.rs               |   4 +-
 crates/gpui/src/platform/mac/dispatch.h       |   1 +
 .../{display_linker.rs => display_link.rs}    | 225 +++++++++---------
 .../gpui/src/platform/mac/metal_renderer.rs   |  22 +-
 crates/gpui/src/platform/mac/platform.rs      |  28 +--
 crates/gpui/src/platform/mac/window.rs        | 104 ++++----
 crates/gpui/src/platform/test/platform.rs     |  12 -
 crates/gpui/src/window.rs                     |  75 ++----
 11 files changed, 218 insertions(+), 278 deletions(-)
 rename crates/gpui/src/platform/mac/{display_linker.rs => display_link.rs} (56%)

diff --git a/crates/gpui/build.rs b/crates/gpui/build.rs
index d8447de65e..3a1712b3df 100644
--- a/crates/gpui/build.rs
+++ b/crates/gpui/build.rs
@@ -27,6 +27,7 @@ fn generate_dispatch_bindings() {
     let bindings = bindgen::Builder::default()
         .header("src/platform/mac/dispatch.h")
         .allowlist_var("_dispatch_main_q")
+        .allowlist_var("_dispatch_source_type_data_add")
         .allowlist_var("DISPATCH_QUEUE_PRIORITY_DEFAULT")
         .allowlist_var("DISPATCH_QUEUE_PRIORITY_HIGH")
         .allowlist_var("DISPATCH_TIME_NOW")
@@ -34,6 +35,13 @@ fn generate_dispatch_bindings() {
         .allowlist_function("dispatch_async_f")
         .allowlist_function("dispatch_after_f")
         .allowlist_function("dispatch_time")
+        .allowlist_function("dispatch_source_merge_data")
+        .allowlist_function("dispatch_source_create")
+        .allowlist_function("dispatch_source_set_event_handler_f")
+        .allowlist_function("dispatch_resume")
+        .allowlist_function("dispatch_suspend")
+        .allowlist_function("dispatch_source_cancel")
+        .allowlist_function("dispatch_set_context")
         .parse_callbacks(Box::new(bindgen::CargoCallbacks))
         .layout_tests(false)
         .generate()
diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs
index 85d76bb3fa..6478470cf3 100644
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -18,8 +18,8 @@ use crate::WindowAppearance;
 use crate::{
     current_platform, image_cache::ImageCache, init_app_menus, Action, ActionRegistry, Any,
     AnyView, AnyWindowHandle, AppMetadata, AssetSource, BackgroundExecutor, ClipboardItem, Context,
-    DispatchPhase, DisplayId, Entity, EventEmitter, ForegroundExecutor, Global, KeyBinding, Keymap,
-    Keystroke, LayoutId, Menu, PathPromptOptions, Pixels, Platform, PlatformDisplay, Point, Render,
+    DispatchPhase, Entity, EventEmitter, ForegroundExecutor, Global, KeyBinding, Keymap, Keystroke,
+    LayoutId, Menu, PathPromptOptions, Pixels, Platform, PlatformDisplay, Point, Render,
     SharedString, SubscriberSet, Subscription, SvgRenderer, Task, TextStyle, TextStyleRefinement,
     TextSystem, View, ViewContext, Window, WindowContext, WindowHandle, WindowId,
 };
@@ -193,7 +193,6 @@ impl App {
     }
 }
 
-pub(crate) type FrameCallback = Box<dyn FnOnce(&mut AppContext)>;
 type Handler = Box<dyn FnMut(&mut AppContext) -> bool + 'static>;
 type Listener = Box<dyn FnMut(&dyn Any, &mut AppContext) -> bool + 'static>;
 type KeystrokeObserver = Box<dyn FnMut(&KeystrokeEvent, &mut WindowContext) + 'static>;
@@ -213,8 +212,6 @@ pub struct AppContext {
     pending_updates: usize,
     pub(crate) actions: Rc<ActionRegistry>,
     pub(crate) active_drag: Option<AnyDrag>,
-    pub(crate) next_frame_callbacks: FxHashMap<DisplayId, Vec<FrameCallback>>,
-    pub(crate) frame_consumers: FxHashMap<DisplayId, Task<()>>,
     pub(crate) background_executor: BackgroundExecutor,
     pub(crate) foreground_executor: ForegroundExecutor,
     pub(crate) svg_renderer: SvgRenderer,
@@ -275,8 +272,6 @@ impl AppContext {
                 flushing_effects: false,
                 pending_updates: 0,
                 active_drag: None,
-                next_frame_callbacks: FxHashMap::default(),
-                frame_consumers: FxHashMap::default(),
                 background_executor: executor,
                 foreground_executor,
                 svg_renderer: SvgRenderer::new(asset_source.clone()),
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index a63271e7ea..d3e19d2b6f 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -81,14 +81,6 @@ pub(crate) trait Platform: 'static {
     /// Returns the appearance of the application's windows.
     fn window_appearance(&self) -> WindowAppearance;
 
-    fn set_display_link_output_callback(
-        &self,
-        display_id: DisplayId,
-        callback: Box<dyn FnMut() + Send>,
-    );
-    fn start_display_link(&self, display_id: DisplayId);
-    fn stop_display_link(&self, display_id: DisplayId);
-
     fn open_url(&self, url: &str);
     fn on_open_urls(&self, callback: Box<dyn FnMut(Vec<String>)>);
     fn prompt_for_paths(
diff --git a/crates/gpui/src/platform/mac.rs b/crates/gpui/src/platform/mac.rs
index 2194ae41e7..ef1c830099 100644
--- a/crates/gpui/src/platform/mac.rs
+++ b/crates/gpui/src/platform/mac.rs
@@ -2,7 +2,7 @@
 //! an origin at the bottom left of the main display.
 mod dispatcher;
 mod display;
-mod display_linker;
+mod display_link;
 mod events;
 mod metal_atlas;
 mod metal_renderer;
@@ -23,7 +23,7 @@ use std::ops::Range;
 
 pub(crate) use dispatcher::*;
 pub(crate) use display::*;
-pub(crate) use display_linker::*;
+pub(crate) use display_link::*;
 pub(crate) use metal_atlas::*;
 pub(crate) use platform::*;
 pub(crate) use text_system::*;
diff --git a/crates/gpui/src/platform/mac/dispatch.h b/crates/gpui/src/platform/mac/dispatch.h
index f56a0eae33..54f3818738 100644
--- a/crates/gpui/src/platform/mac/dispatch.h
+++ b/crates/gpui/src/platform/mac/dispatch.h
@@ -1 +1,2 @@
 #include <dispatch/dispatch.h>
+#include <dispatch/source.h>
diff --git a/crates/gpui/src/platform/mac/display_linker.rs b/crates/gpui/src/platform/mac/display_link.rs
similarity index 56%
rename from crates/gpui/src/platform/mac/display_linker.rs
rename to crates/gpui/src/platform/mac/display_link.rs
index 7d012da950..2488a08797 100644
--- a/crates/gpui/src/platform/mac/display_linker.rs
+++ b/crates/gpui/src/platform/mac/display_link.rs
@@ -1,93 +1,96 @@
-use std::{
-    ffi::c_void,
-    mem,
-    sync::{Arc, Weak},
+use crate::{
+    dispatch_get_main_queue,
+    dispatch_sys::{
+        _dispatch_source_type_data_add, dispatch_resume, dispatch_set_context,
+        dispatch_source_cancel, dispatch_source_create, dispatch_source_merge_data,
+        dispatch_source_set_event_handler_f, dispatch_source_t, dispatch_suspend,
+    },
 };
+use anyhow::Result;
+use core_graphics::display::CGDirectDisplayID;
+use std::ffi::c_void;
+use util::ResultExt;
 
-use crate::DisplayId;
-use collections::HashMap;
-use parking_lot::Mutex;
-
-pub(crate) struct MacDisplayLinker {
-    links: HashMap<DisplayId, MacDisplayLink>,
+pub struct DisplayLink {
+    display_link: sys::DisplayLink,
+    frame_requests: dispatch_source_t,
 }
 
-struct MacDisplayLink {
-    system_link: sys::DisplayLink,
-    _output_callback: Arc<OutputCallback>,
-}
-
-impl MacDisplayLinker {
-    pub fn new() -> Self {
-        MacDisplayLinker {
-            links: Default::default(),
+impl DisplayLink {
+    pub fn new(
+        display_id: CGDirectDisplayID,
+        data: *mut c_void,
+        callback: unsafe extern "C" fn(*mut c_void),
+    ) -> Result<DisplayLink> {
+        unsafe extern "C" fn display_link_callback(
+            _display_link_out: *mut sys::CVDisplayLink,
+            _current_time: *const sys::CVTimeStamp,
+            _output_time: *const sys::CVTimeStamp,
+            _flags_in: i64,
+            _flags_out: *mut i64,
+            frame_requests: *mut c_void,
+        ) -> i32 {
+            let frame_requests = frame_requests as dispatch_source_t;
+            dispatch_source_merge_data(frame_requests, 1);
+            0
         }
-    }
-}
 
-type OutputCallback = Mutex<Box<dyn FnMut() + Send>>;
-
-impl MacDisplayLinker {
-    pub fn set_output_callback(
-        &mut self,
-        display_id: DisplayId,
-        output_callback: Box<dyn FnMut() + Send>,
-    ) {
-        if let Some(mut system_link) = unsafe { sys::DisplayLink::on_display(display_id.0) } {
-            let callback = Arc::new(Mutex::new(output_callback));
-            let weak_callback_ptr: *const OutputCallback = Arc::downgrade(&callback).into_raw();
-            unsafe { system_link.set_output_callback(trampoline, weak_callback_ptr as *mut c_void) }
-
-            self.links.insert(
-                display_id,
-                MacDisplayLink {
-                    _output_callback: callback,
-                    system_link,
-                },
+        unsafe {
+            let frame_requests = dispatch_source_create(
+                &_dispatch_source_type_data_add,
+                0,
+                0,
+                dispatch_get_main_queue(),
             );
-        } else {
-            log::warn!("DisplayLink could not be obtained for {:?}", display_id);
+            dispatch_set_context(
+                crate::dispatch_sys::dispatch_object_t {
+                    _ds: frame_requests,
+                },
+                data,
+            );
+            dispatch_source_set_event_handler_f(frame_requests, Some(callback));
+
+            let display_link = sys::DisplayLink::new(
+                display_id,
+                display_link_callback,
+                frame_requests as *mut c_void,
+            )?;
+
+            Ok(Self {
+                display_link,
+                frame_requests,
+            })
         }
     }
 
-    pub fn start(&mut self, display_id: DisplayId) {
-        if let Some(link) = self.links.get_mut(&display_id) {
-            unsafe {
-                link.system_link.start();
-            }
-        } else {
-            log::warn!("No DisplayLink callback registered for {:?}", display_id)
+    pub fn start(&mut self) -> Result<()> {
+        unsafe {
+            dispatch_resume(crate::dispatch_sys::dispatch_object_t {
+                _ds: self.frame_requests,
+            });
+            self.display_link.start()?;
         }
+        Ok(())
     }
 
-    pub fn stop(&mut self, display_id: DisplayId) {
-        if let Some(link) = self.links.get_mut(&display_id) {
-            unsafe {
-                link.system_link.stop();
-            }
-        } else {
-            log::warn!("No DisplayLink callback registered for {:?}", display_id)
+    pub fn stop(&mut self) -> Result<()> {
+        unsafe {
+            dispatch_suspend(crate::dispatch_sys::dispatch_object_t {
+                _ds: self.frame_requests,
+            });
+            self.display_link.stop()?;
         }
+        Ok(())
     }
 }
 
-unsafe extern "C" fn trampoline(
-    _display_link_out: *mut sys::CVDisplayLink,
-    current_time: *const sys::CVTimeStamp,
-    output_time: *const sys::CVTimeStamp,
-    _flags_in: i64,
-    _flags_out: *mut i64,
-    user_data: *mut c_void,
-) -> i32 {
-    if let Some((_current_time, _output_time)) = current_time.as_ref().zip(output_time.as_ref()) {
-        let output_callback: Weak<OutputCallback> =
-            Weak::from_raw(user_data as *mut OutputCallback);
-        if let Some(output_callback) = output_callback.upgrade() {
-            (output_callback.lock())()
+impl Drop for DisplayLink {
+    fn drop(&mut self) {
+        self.stop().log_err();
+        unsafe {
+            dispatch_source_cancel(self.frame_requests);
         }
-        mem::forget(output_callback);
     }
-    0
 }
 
 mod sys {
@@ -96,10 +99,12 @@ mod sys {
     //! Apple docs: [CVDisplayLink](https://developer.apple.com/documentation/corevideo/cvdisplaylinkoutputcallback?language=objc)
     #![allow(dead_code, non_upper_case_globals)]
 
+    use anyhow::Result;
+    use core_graphics::display::CGDirectDisplayID;
     use foreign_types::{foreign_type, ForeignType};
     use std::{
         ffi::c_void,
-        fmt::{Debug, Formatter, Result},
+        fmt::{self, Debug, Formatter},
     };
 
     #[derive(Debug)]
@@ -114,7 +119,7 @@ mod sys {
     }
 
     impl Debug for DisplayLink {
-        fn fmt(&self, formatter: &mut Formatter) -> Result {
+        fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
             formatter
                 .debug_tuple("DisplayLink")
                 .field(&self.as_ptr())
@@ -201,19 +206,15 @@ mod sys {
         pub fn CVDisplayLinkCreateWithActiveCGDisplays(
             display_link_out: *mut *mut CVDisplayLink,
         ) -> i32;
-        pub fn CVDisplayLinkCreateWithCGDisplay(
+        pub fn CVDisplayLinkSetCurrentCGDisplay(
+            display_link: &mut DisplayLinkRef,
             display_id: u32,
-            display_link_out: *mut *mut CVDisplayLink,
         ) -> i32;
         pub fn CVDisplayLinkSetOutputCallback(
             display_link: &mut DisplayLinkRef,
             callback: CVDisplayLinkOutputCallback,
             user_info: *mut c_void,
         ) -> i32;
-        pub fn CVDisplayLinkSetCurrentCGDisplay(
-            display_link: &mut DisplayLinkRef,
-            display_id: u32,
-        ) -> i32;
         pub fn CVDisplayLinkStart(display_link: &mut DisplayLinkRef) -> i32;
         pub fn CVDisplayLinkStop(display_link: &mut DisplayLinkRef) -> i32;
         pub fn CVDisplayLinkRelease(display_link: *mut CVDisplayLink);
@@ -221,52 +222,46 @@ mod sys {
     }
 
     impl DisplayLink {
-        /// Apple docs: [CVDisplayLinkCreateWithActiveCGDisplays](https://developer.apple.com/documentation/corevideo/1456863-cvdisplaylinkcreatewithactivecgd?language=objc)
-        pub unsafe fn new() -> Option<Self> {
-            let mut display_link: *mut CVDisplayLink = 0 as _;
-            let code = CVDisplayLinkCreateWithActiveCGDisplays(&mut display_link);
-            if code == 0 {
-                Some(DisplayLink::from_ptr(display_link))
-            } else {
-                None
-            }
-        }
-
         /// Apple docs: [CVDisplayLinkCreateWithCGDisplay](https://developer.apple.com/documentation/corevideo/1456981-cvdisplaylinkcreatewithcgdisplay?language=objc)
-        pub unsafe fn on_display(display_id: u32) -> Option<Self> {
+        pub unsafe fn new(
+            display_id: CGDirectDisplayID,
+            callback: CVDisplayLinkOutputCallback,
+            user_info: *mut c_void,
+        ) -> Result<Self> {
             let mut display_link: *mut CVDisplayLink = 0 as _;
-            let code = CVDisplayLinkCreateWithCGDisplay(display_id, &mut display_link);
-            if code == 0 {
-                Some(DisplayLink::from_ptr(display_link))
-            } else {
-                None
-            }
+
+            let code = CVDisplayLinkCreateWithActiveCGDisplays(&mut display_link);
+            anyhow::ensure!(code == 0, "could not create display link, code: {}", code);
+
+            let mut display_link = DisplayLink::from_ptr(display_link);
+
+            let code = CVDisplayLinkSetOutputCallback(&mut display_link, callback, user_info);
+            anyhow::ensure!(code == 0, "could not set output callback, code: {}", code);
+
+            let code = CVDisplayLinkSetCurrentCGDisplay(&mut display_link, display_id);
+            anyhow::ensure!(
+                code == 0,
+                "could not assign display to display link, code: {}",
+                code
+            );
+
+            Ok(display_link)
         }
     }
 
     impl DisplayLinkRef {
-        /// Apple docs: [CVDisplayLinkSetOutputCallback](https://developer.apple.com/documentation/corevideo/1457096-cvdisplaylinksetoutputcallback?language=objc)
-        pub unsafe fn set_output_callback(
-            &mut self,
-            callback: CVDisplayLinkOutputCallback,
-            user_info: *mut c_void,
-        ) {
-            assert_eq!(CVDisplayLinkSetOutputCallback(self, callback, user_info), 0);
-        }
-
-        /// Apple docs: [CVDisplayLinkSetCurrentCGDisplay](https://developer.apple.com/documentation/corevideo/1456768-cvdisplaylinksetcurrentcgdisplay?language=objc)
-        pub unsafe fn set_current_display(&mut self, display_id: u32) {
-            assert_eq!(CVDisplayLinkSetCurrentCGDisplay(self, display_id), 0);
-        }
-
         /// Apple docs: [CVDisplayLinkStart](https://developer.apple.com/documentation/corevideo/1457193-cvdisplaylinkstart?language=objc)
-        pub unsafe fn start(&mut self) {
-            assert_eq!(CVDisplayLinkStart(self), 0);
+        pub unsafe fn start(&mut self) -> Result<()> {
+            let code = CVDisplayLinkStart(self);
+            anyhow::ensure!(code == 0, "could not start display link, code: {}", code);
+            Ok(())
         }
 
         /// Apple docs: [CVDisplayLinkStop](https://developer.apple.com/documentation/corevideo/1457281-cvdisplaylinkstop?language=objc)
-        pub unsafe fn stop(&mut self) {
-            assert_eq!(CVDisplayLinkStop(self), 0);
+        pub unsafe fn stop(&mut self) -> Result<()> {
+            let code = CVDisplayLinkStop(self);
+            anyhow::ensure!(code == 0, "could not stop display link, code: {}", code);
+            Ok(())
         }
     }
 }
diff --git a/crates/gpui/src/platform/mac/metal_renderer.rs b/crates/gpui/src/platform/mac/metal_renderer.rs
index 1c071dec08..166f62ede0 100644
--- a/crates/gpui/src/platform/mac/metal_renderer.rs
+++ b/crates/gpui/src/platform/mac/metal_renderer.rs
@@ -32,6 +32,7 @@ const INSTANCE_BUFFER_SIZE: usize = 2 * 1024 * 1024; // This is an arbitrary dec
 pub(crate) struct MetalRenderer {
     device: metal::Device,
     layer: metal::MetalLayer,
+    presents_with_transaction: bool,
     command_queue: CommandQueue,
     paths_rasterization_pipeline_state: metal::RenderPipelineState,
     path_sprites_pipeline_state: metal::RenderPipelineState,
@@ -60,8 +61,8 @@ impl MetalRenderer {
         let layer = metal::MetalLayer::new();
         layer.set_device(&device);
         layer.set_pixel_format(MTLPixelFormat::BGRA8Unorm);
-        layer.set_presents_with_transaction(true);
         layer.set_opaque(true);
+        layer.set_maximum_drawable_count(3);
         unsafe {
             let _: () = msg_send![&*layer, setAllowsNextDrawableTimeout: NO];
             let _: () = msg_send![&*layer, setNeedsDisplayOnBoundsChange: YES];
@@ -174,6 +175,7 @@ impl MetalRenderer {
         Self {
             device,
             layer,
+            presents_with_transaction: false,
             command_queue,
             paths_rasterization_pipeline_state,
             path_sprites_pipeline_state,
@@ -198,6 +200,12 @@ impl MetalRenderer {
         &self.sprite_atlas
     }
 
+    pub fn set_presents_with_transaction(&mut self, presents_with_transaction: bool) {
+        self.presents_with_transaction = presents_with_transaction;
+        self.layer
+            .set_presents_with_transaction(presents_with_transaction);
+    }
+
     pub fn draw(&mut self, scene: &Scene) {
         let layer = self.layer.clone();
         let viewport_size = layer.drawable_size();
@@ -347,11 +355,17 @@ impl MetalRenderer {
         });
         let block = block.copy();
         command_buffer.add_completed_handler(&block);
-        command_buffer.commit();
+
         self.sprite_atlas.clear_textures(AtlasTextureKind::Path);
 
-        command_buffer.wait_until_scheduled();
-        drawable.present();
+        if self.presents_with_transaction {
+            command_buffer.commit();
+            command_buffer.wait_until_scheduled();
+            drawable.present();
+        } else {
+            command_buffer.present_drawable(drawable);
+            command_buffer.commit();
+        }
     }
 
     fn rasterize_paths(
diff --git a/crates/gpui/src/platform/mac/platform.rs b/crates/gpui/src/platform/mac/platform.rs
index d2cbd52574..403ea274ef 100644
--- a/crates/gpui/src/platform/mac/platform.rs
+++ b/crates/gpui/src/platform/mac/platform.rs
@@ -1,10 +1,9 @@
 use super::{events::key_to_native, BoolExt};
 use crate::{
     Action, AnyWindowHandle, BackgroundExecutor, ClipboardItem, CursorStyle, DisplayId,
-    ForegroundExecutor, Keymap, MacDispatcher, MacDisplay, MacDisplayLinker, MacTextSystem,
-    MacWindow, Menu, MenuItem, PathPromptOptions, Platform, PlatformDisplay, PlatformInput,
-    PlatformTextSystem, PlatformWindow, Result, SemanticVersion, Task, WindowAppearance,
-    WindowOptions,
+    ForegroundExecutor, Keymap, MacDispatcher, MacDisplay, MacTextSystem, MacWindow, Menu,
+    MenuItem, PathPromptOptions, Platform, PlatformDisplay, PlatformInput, PlatformTextSystem,
+    PlatformWindow, Result, SemanticVersion, Task, WindowAppearance, WindowOptions,
 };
 use anyhow::anyhow;
 use block::ConcreteBlock;
@@ -146,7 +145,6 @@ pub(crate) struct MacPlatformState {
     background_executor: BackgroundExecutor,
     foreground_executor: ForegroundExecutor,
     text_system: Arc<MacTextSystem>,
-    display_linker: MacDisplayLinker,
     instance_buffer_pool: Arc<Mutex<Vec<metal::Buffer>>>,
     pasteboard: id,
     text_hash_pasteboard_type: id,
@@ -177,7 +175,6 @@ impl MacPlatform {
             background_executor: BackgroundExecutor::new(dispatcher.clone()),
             foreground_executor: ForegroundExecutor::new(dispatcher),
             text_system: Arc::new(MacTextSystem::new()),
-            display_linker: MacDisplayLinker::new(),
             instance_buffer_pool: Arc::default(),
             pasteboard: unsafe { NSPasteboard::generalPasteboard(nil) },
             text_hash_pasteboard_type: unsafe { ns_string("zed-text-hash") },
@@ -514,25 +511,6 @@ impl Platform for MacPlatform {
         }
     }
 
-    fn set_display_link_output_callback(
-        &self,
-        display_id: DisplayId,
-        callback: Box<dyn FnMut() + Send>,
-    ) {
-        self.0
-            .lock()
-            .display_linker
-            .set_output_callback(display_id, callback);
-    }
-
-    fn start_display_link(&self, display_id: DisplayId) {
-        self.0.lock().display_linker.start(display_id);
-    }
-
-    fn stop_display_link(&self, display_id: DisplayId) {
-        self.0.lock().display_linker.stop(display_id);
-    }
-
     fn open_url(&self, url: &str) {
         unsafe {
             let url = NSURL::alloc(nil)
diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index b6d0e3b886..9f9db753ba 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -1,10 +1,11 @@
 use super::{global_bounds_from_ns_rect, ns_string, MacDisplay, MetalRenderer, NSRange};
 use crate::{
     global_bounds_to_ns_rect, platform::PlatformInputHandler, point, px, size, AnyWindowHandle,
-    Bounds, ExternalPaths, FileDropEvent, ForegroundExecutor, GlobalPixels, KeyDownEvent,
-    Keystroke, Modifiers, ModifiersChangedEvent, MouseButton, MouseDownEvent, MouseMoveEvent,
-    MouseUpEvent, Pixels, PlatformAtlas, PlatformDisplay, PlatformInput, PlatformWindow, Point,
-    PromptLevel, Size, Timer, WindowAppearance, WindowBounds, WindowKind, WindowOptions,
+    Bounds, DisplayLink, ExternalPaths, FileDropEvent, ForegroundExecutor, GlobalPixels,
+    KeyDownEvent, Keystroke, Modifiers, ModifiersChangedEvent, MouseButton, MouseDownEvent,
+    MouseMoveEvent, MouseUpEvent, Pixels, PlatformAtlas, PlatformDisplay, PlatformInput,
+    PlatformWindow, Point, PromptLevel, Size, Timer, WindowAppearance, WindowBounds, WindowKind,
+    WindowOptions,
 };
 use block::ConcreteBlock;
 use cocoa::{
@@ -16,11 +17,11 @@ use cocoa::{
     },
     base::{id, nil},
     foundation::{
-        NSArray, NSAutoreleasePool, NSDefaultRunLoopMode, NSDictionary, NSFastEnumeration,
-        NSInteger, NSPoint, NSRect, NSSize, NSString, NSUInteger,
+        NSArray, NSAutoreleasePool, NSDictionary, NSFastEnumeration, NSInteger, NSPoint, NSRect,
+        NSSize, NSString, NSUInteger,
     },
 };
-use core_graphics::display::CGRect;
+use core_graphics::display::{CGDirectDisplayID, CGRect};
 use ctor::ctor;
 use foreign_types::ForeignTypeRef;
 use futures::channel::oneshot;
@@ -50,6 +51,7 @@ use std::{
     sync::{Arc, Weak},
     time::Duration,
 };
+use util::ResultExt;
 
 const WINDOW_STATE_IVAR: &str = "windowState";
 
@@ -168,7 +170,6 @@ unsafe fn build_classes() {
             sel!(displayLayer:),
             display_layer as extern "C" fn(&Object, Sel, id),
         );
-        decl.add_method(sel!(step:), step as extern "C" fn(&Object, Sel, id));
 
         decl.add_protocol(Protocol::get("NSTextInputClient").unwrap());
         decl.add_method(
@@ -330,7 +331,7 @@ struct MacWindowState {
     executor: ForegroundExecutor,
     native_window: id,
     native_view: NonNull<Object>,
-    display_link: id,
+    display_link: Option<DisplayLink>,
     renderer: MetalRenderer,
     kind: WindowKind,
     request_frame_callback: Option<Box<dyn FnMut()>>,
@@ -402,6 +403,21 @@ impl MacWindowState {
         }
     }
 
+    fn start_display_link(&mut self) {
+        self.stop_display_link();
+        let display_id = unsafe { display_id_for_screen(self.native_window.screen()) };
+        if let Some(mut display_link) =
+            DisplayLink::new(display_id, self.native_view.as_ptr() as *mut c_void, step).log_err()
+        {
+            display_link.start().log_err();
+            self.display_link = Some(display_link);
+        }
+    }
+
+    fn stop_display_link(&mut self) {
+        self.display_link = None;
+    }
+
     fn is_fullscreen(&self) -> bool {
         unsafe {
             let style_mask = self.native_window.styleMask();
@@ -506,11 +522,8 @@ impl MacWindow {
             let count: u64 = cocoa::foundation::NSArray::count(screens);
             for i in 0..count {
                 let screen = cocoa::foundation::NSArray::objectAtIndex(screens, i);
-                let device_description = NSScreen::deviceDescription(screen);
-                let screen_number_key: id = NSString::alloc(nil).init_str("NSScreenNumber");
-                let screen_number = device_description.objectForKey_(screen_number_key);
-                let screen_number: NSUInteger = msg_send![screen_number, unsignedIntegerValue];
-                if screen_number as u32 == display.id().0 {
+                let display_id = display_id_for_screen(screen);
+                if display_id == display.id().0 {
                     target_screen = screen;
                     break;
                 }
@@ -539,7 +552,7 @@ impl MacWindow {
                 executor,
                 native_window,
                 native_view: NonNull::new_unchecked(native_view),
-                display_link: nil,
+                display_link: None,
                 renderer: MetalRenderer::new(instance_buffer_pool),
                 kind: options.kind,
                 request_frame_callback: None,
@@ -695,19 +708,11 @@ impl MacWindow {
     }
 }
 
-unsafe fn start_display_link(native_screen: id, native_view: id) -> id {
-    let display_link: id =
-        msg_send![native_screen, displayLinkWithTarget: native_view selector: sel!(step:)];
-    let main_run_loop: id = msg_send![class!(NSRunLoop), mainRunLoop];
-    let _: () = msg_send![display_link, addToRunLoop: main_run_loop forMode: NSDefaultRunLoopMode];
-    display_link
-}
-
 impl Drop for MacWindow {
     fn drop(&mut self) {
         let mut this = self.0.lock();
         let window = this.native_window;
-        this.display_link = nil;
+        this.display_link.take();
         this.executor
             .spawn(async move {
                 unsafe {
@@ -1336,17 +1341,16 @@ extern "C" fn cancel_operation(this: &Object, _sel: Sel, _sender: id) {
 
 extern "C" fn window_did_change_occlusion_state(this: &Object, _: Sel, _: id) {
     let window_state = unsafe { get_window_state(this) };
-    let mut lock = window_state.lock();
+    let lock = &mut *window_state.lock();
     unsafe {
         if lock
             .native_window
             .occlusionState()
             .contains(NSWindowOcclusionState::NSWindowOcclusionStateVisible)
         {
-            lock.display_link =
-                start_display_link(lock.native_window.screen(), lock.native_view.as_ptr());
+            lock.start_display_link();
         } else {
-            lock.display_link = nil;
+            lock.stop_display_link();
         }
     }
 }
@@ -1387,14 +1391,7 @@ extern "C" fn window_did_move(this: &Object, _: Sel, _: id) {
 extern "C" fn window_did_change_screen(this: &Object, _: Sel, _: id) {
     let window_state = unsafe { get_window_state(this) };
     let mut lock = window_state.as_ref().lock();
-    unsafe {
-        let screen = lock.native_window.screen();
-        if screen == nil {
-            lock.display_link = nil;
-        } else {
-            lock.display_link = start_display_link(screen, lock.native_view.as_ptr());
-        }
-    }
+    lock.start_display_link();
 }
 
 extern "C" fn window_did_change_key_status(this: &Object, selector: Sel, _: id) {
@@ -1540,26 +1537,27 @@ extern "C" fn display_layer(this: &Object, _: Sel, _: id) {
     let window_state = unsafe { get_window_state(this) };
     let mut lock = window_state.lock();
     if let Some(mut callback) = lock.request_frame_callback.take() {
+        lock.renderer.set_presents_with_transaction(true);
+        lock.stop_display_link();
         drop(lock);
         callback();
-        window_state.lock().request_frame_callback = Some(callback);
+
+        let mut lock = window_state.lock();
+        lock.request_frame_callback = Some(callback);
+        lock.renderer.set_presents_with_transaction(false);
+        lock.start_display_link();
     }
 }
 
-extern "C" fn step(this: &Object, _: Sel, display_link: id) {
-    let window_state = unsafe { get_window_state(this) };
+unsafe extern "C" fn step(view: *mut c_void) {
+    let view = view as id;
+    let window_state = unsafe { get_window_state(&*view) };
     let mut lock = window_state.lock();
 
-    if lock.display_link == display_link {
-        if let Some(mut callback) = lock.request_frame_callback.take() {
-            drop(lock);
-            callback();
-            window_state.lock().request_frame_callback = Some(callback);
-        }
-    } else {
-        unsafe {
-            let _: () = msg_send![display_link, invalidate];
-        }
+    if let Some(mut callback) = lock.request_frame_callback.take() {
+        drop(lock);
+        callback();
+        window_state.lock().request_frame_callback = Some(callback);
     }
 }
 
@@ -1882,3 +1880,11 @@ where
         None
     }
 }
+
+unsafe fn display_id_for_screen(screen: id) -> CGDirectDisplayID {
+    let device_description = NSScreen::deviceDescription(screen);
+    let screen_number_key: id = NSString::alloc(nil).init_str("NSScreenNumber");
+    let screen_number = device_description.objectForKey_(screen_number_key);
+    let screen_number: NSUInteger = msg_send![screen_number, unsignedIntegerValue];
+    screen_number as CGDirectDisplayID
+}
diff --git a/crates/gpui/src/platform/test/platform.rs b/crates/gpui/src/platform/test/platform.rs
index 6a17c731d6..fc73e49afb 100644
--- a/crates/gpui/src/platform/test/platform.rs
+++ b/crates/gpui/src/platform/test/platform.rs
@@ -186,18 +186,6 @@ impl Platform for TestPlatform {
         WindowAppearance::Light
     }
 
-    fn set_display_link_output_callback(
-        &self,
-        _display_id: DisplayId,
-        mut callback: Box<dyn FnMut() + Send>,
-    ) {
-        callback()
-    }
-
-    fn start_display_link(&self, _display_id: DisplayId) {}
-
-    fn stop_display_link(&self, _display_id: DisplayId) {}
-
     fn open_url(&self, url: &str) {
         *self.opened_url.borrow_mut() = Some(url.to_string())
     }
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 4b7c43e113..e81cd12c69 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -12,10 +12,7 @@ use crate::{
 use anyhow::{anyhow, Context as _, Result};
 use collections::FxHashSet;
 use derive_more::{Deref, DerefMut};
-use futures::{
-    channel::{mpsc, oneshot},
-    StreamExt,
-};
+use futures::channel::oneshot;
 use parking_lot::RwLock;
 use slotmap::SlotMap;
 use smallvec::SmallVec;
@@ -23,7 +20,6 @@ use std::{
     any::{Any, TypeId},
     borrow::{Borrow, BorrowMut},
     cell::{Cell, RefCell},
-    collections::hash_map::Entry,
     fmt::{Debug, Display},
     future::Future,
     hash::{Hash, Hasher},
@@ -243,6 +239,8 @@ impl<M: FocusableView + EventEmitter<DismissEvent>> ManagedView for M {}
 /// Emitted by implementers of [`ManagedView`] to indicate the view should be dismissed, such as when a view is presented as a modal.
 pub struct DismissEvent;
 
+type FrameCallback = Box<dyn FnOnce(&mut WindowContext)>;
+
 // Holds the state for a specific window.
 #[doc(hidden)]
 pub struct Window {
@@ -259,6 +257,7 @@ pub struct Window {
     pub(crate) element_id_stack: GlobalElementId,
     pub(crate) rendered_frame: Frame,
     pub(crate) next_frame: Frame,
+    next_frame_callbacks: Rc<RefCell<Vec<FrameCallback>>>,
     pub(crate) dirty_views: FxHashSet<EntityId>,
     pub(crate) focus_handles: Arc<RwLock<SlotMap<FocusId, AtomicUsize>>>,
     focus_listeners: SubscriberSet<(), AnyWindowFocusListener>,
@@ -338,14 +337,27 @@ impl Window {
         let text_system = Arc::new(WindowTextSystem::new(cx.text_system().clone()));
         let dirty = Rc::new(Cell::new(true));
         let active = Rc::new(Cell::new(false));
+        let next_frame_callbacks: Rc<RefCell<Vec<FrameCallback>>> = Default::default();
         let last_input_timestamp = Rc::new(Cell::new(Instant::now()));
 
         platform_window.on_request_frame(Box::new({
             let mut cx = cx.to_async();
             let dirty = dirty.clone();
             let active = active.clone();
+            let next_frame_callbacks = next_frame_callbacks.clone();
             let last_input_timestamp = last_input_timestamp.clone();
             move || {
+                let next_frame_callbacks = next_frame_callbacks.take();
+                if !next_frame_callbacks.is_empty() {
+                    handle
+                        .update(&mut cx, |_, cx| {
+                            for callback in next_frame_callbacks {
+                                callback(cx);
+                            }
+                        })
+                        .log_err();
+                }
+
                 if dirty.get() {
                     measure("frame duration", || {
                         handle
@@ -428,6 +440,7 @@ impl Window {
             element_id_stack: GlobalElementId::default(),
             rendered_frame: Frame::new(DispatchTree::new(cx.keymap.clone(), cx.actions.clone())),
             next_frame: Frame::new(DispatchTree::new(cx.keymap.clone(), cx.actions.clone())),
+            next_frame_callbacks,
             dirty_views: FxHashSet::default(),
             focus_handles: Arc::new(RwLock::new(SlotMap::with_key())),
             focus_listeners: SubscriberSet::new(),
@@ -670,57 +683,7 @@ impl<'a> WindowContext<'a> {
 
     /// Schedule the given closure to be run directly after the current frame is rendered.
     pub fn on_next_frame(&mut self, callback: impl FnOnce(&mut WindowContext) + 'static) {
-        let handle = self.window.handle;
-        let display_id = self.window.display_id;
-
-        let mut frame_consumers = std::mem::take(&mut self.app.frame_consumers);
-        if let Entry::Vacant(e) = frame_consumers.entry(display_id) {
-            let (tx, mut rx) = mpsc::unbounded::<()>();
-            self.platform.set_display_link_output_callback(
-                display_id,
-                Box::new(move || _ = tx.unbounded_send(())),
-            );
-
-            let consumer_task = self.app.spawn(|cx| async move {
-                while rx.next().await.is_some() {
-                    cx.update(|cx| {
-                        for callback in cx
-                            .next_frame_callbacks
-                            .get_mut(&display_id)
-                            .unwrap()
-                            .drain(..)
-                            .collect::<SmallVec<[_; 32]>>()
-                        {
-                            callback(cx);
-                        }
-                    })
-                    .ok();
-
-                    // Flush effects, then stop the display link if no new next_frame_callbacks have been added.
-
-                    cx.update(|cx| {
-                        if cx.next_frame_callbacks.is_empty() {
-                            cx.platform.stop_display_link(display_id);
-                        }
-                    })
-                    .ok();
-                }
-            });
-            e.insert(consumer_task);
-        }
-        debug_assert!(self.app.frame_consumers.is_empty());
-        self.app.frame_consumers = frame_consumers;
-
-        if self.next_frame_callbacks.is_empty() {
-            self.platform.start_display_link(display_id);
-        }
-
-        self.next_frame_callbacks
-            .entry(display_id)
-            .or_default()
-            .push(Box::new(move |cx: &mut AppContext| {
-                cx.update_window(handle, |_root_view, cx| callback(cx)).ok();
-            }));
+        RefCell::borrow_mut(&self.window.next_frame_callbacks).push(Box::new(callback));
     }
 
     /// Spawn the future returned by the given closure on the application thread pool.

From bde509fa749da60beb4ac378afd3ade15297bb91 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Thu, 8 Feb 2024 14:20:21 -0500
Subject: [PATCH 334/372] Expose Python docstrings for syntax highlighting
 (#7587)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR extends our Tree-sitter highlights for Python to allow
highlighting docstrings differently from other strings.

Docstrings in Python will now use `string.doc` instead of just `string`,
which will allow for them to be styled independently of other strings.
If no `string.doc` is present in the theme, then it will fall back to
using the `string` styles.

<img width="272" alt="Screenshot 2024-02-08 at 1 52 21 PM"
src="https://github.com/zed-industries/zed/assets/1486634/034cffa0-91c0-4924-8ccc-3a385cf31126">

This is slightly different than the approach I took in #7585 in that we
are still treating docstrings as strings by default (which appears to be
the more common behavior), but allowing theme authors to hook in and
style them separately, if desired.

Release Notes:

- Added ability add custom styles for Python docstrings using
`string.doc`
([#7346](https://github.com/zed-industries/zed/issues/7346)).
---
 crates/zed/src/languages/python/highlights.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/crates/zed/src/languages/python/highlights.scm b/crates/zed/src/languages/python/highlights.scm
index 71ab963d82..0d85c8b6a9 100644
--- a/crates/zed/src/languages/python/highlights.scm
+++ b/crates/zed/src/languages/python/highlights.scm
@@ -52,6 +52,14 @@
   "{" @punctuation.special
   "}" @punctuation.special) @embedded
 
+; Docstrings.
+(function_definition
+  "async"?
+  "def"
+  name: (_)
+  (parameters)?
+  body: (block (expression_statement (string) @string.doc)))
+
 [
   "-"
   "-="
@@ -122,4 +130,4 @@
   "yield"
   "match"
   "case"
-] @keyword
\ No newline at end of file
+] @keyword

From e7fcddff692c9f236305833635700ee8e9b78b56 Mon Sep 17 00:00:00 2001
From: Jason Lee <huacnlee@gmail.com>
Date: Fri, 9 Feb 2024 04:28:51 +0800
Subject: [PATCH 335/372] Parse version from GitHub tag name instead of release
 name  (#7423)

If we not change this, some release will parse error.

https://docs.github.com/en/rest/releases/releases?apiVersion=2022-11-28

```json
{
  "name": {
    "type": [
      "string",
      "null"
    ]
  }
}
```

<img width="1188" alt="image"
src="https://github.com/zed-industries/zed/assets/5518/bd53dbc4-ae2c-4f19-afd7-58e70b4f87d8">

---------

Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>
---
 crates/copilot/src/copilot.rs          |  2 +-
 crates/util/src/github.rs              |  7 ++++---
 crates/zed/src/languages/c.rs          |  4 ++--
 crates/zed/src/languages/csharp.rs     |  2 +-
 crates/zed/src/languages/deno.rs       |  2 +-
 crates/zed/src/languages/elixir.rs     | 11 +++--------
 crates/zed/src/languages/gleam.rs      |  4 ++--
 crates/zed/src/languages/go.rs         |  6 +++---
 crates/zed/src/languages/lua.rs        |  4 ++--
 crates/zed/src/languages/rust.rs       |  2 +-
 crates/zed/src/languages/toml.rs       |  2 +-
 crates/zed/src/languages/typescript.rs |  2 +-
 crates/zed/src/languages/zig.rs        |  2 +-
 13 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/crates/copilot/src/copilot.rs b/crates/copilot/src/copilot.rs
index b8d38c757e..6b619e4979 100644
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -979,7 +979,7 @@ async fn get_copilot_lsp(http: Arc<dyn HttpClient>) -> anyhow::Result<PathBuf> {
         let release =
             latest_github_release("zed-industries/copilot", true, false, http.clone()).await?;
 
-        let version_dir = &*paths::COPILOT_DIR.join(format!("copilot-{}", release.name));
+        let version_dir = &*paths::COPILOT_DIR.join(format!("copilot-{}", release.tag_name));
 
         fs::create_dir_all(version_dir).await?;
         let server_path = version_dir.join(SERVER_PATH);
diff --git a/crates/util/src/github.rs b/crates/util/src/github.rs
index 8503c69267..d62856ae60 100644
--- a/crates/util/src/github.rs
+++ b/crates/util/src/github.rs
@@ -11,7 +11,7 @@ pub struct GitHubLspBinaryVersion {
 
 #[derive(Deserialize, Debug)]
 pub struct GithubRelease {
-    pub name: String,
+    pub tag_name: String,
     #[serde(rename = "prerelease")]
     pub pre_release: bool,
     pub assets: Vec<GithubReleaseAsset>,
@@ -58,9 +58,10 @@ pub async fn latest_github_release(
     let releases = match serde_json::from_slice::<Vec<GithubRelease>>(body.as_slice()) {
         Ok(releases) => releases,
 
-        Err(_) => {
+        Err(err) => {
+            log::error!("Error deserializing: {:?}", err);
             log::error!(
-                "Error deserializing GitHub API response text: {:?}",
+                "GitHub API response text: {:?}",
                 String::from_utf8_lossy(body.as_slice())
             );
             return Err(anyhow!("error deserializing latest release"));
diff --git a/crates/zed/src/languages/c.rs b/crates/zed/src/languages/c.rs
index 8b5902ff75..974a95766b 100644
--- a/crates/zed/src/languages/c.rs
+++ b/crates/zed/src/languages/c.rs
@@ -30,14 +30,14 @@ impl super::LspAdapter for CLspAdapter {
     ) -> Result<Box<dyn 'static + Send + Any>> {
         let release =
             latest_github_release("clangd/clangd", true, false, delegate.http_client()).await?;
-        let asset_name = format!("clangd-mac-{}.zip", release.name);
+        let asset_name = format!("clangd-mac-{}.zip", release.tag_name);
         let asset = release
             .assets
             .iter()
             .find(|asset| asset.name == asset_name)
             .ok_or_else(|| anyhow!("no asset found matching {:?}", asset_name))?;
         let version = GitHubLspBinaryVersion {
-            name: release.name,
+            name: release.tag_name,
             url: asset.browser_download_url.clone(),
         };
         Ok(Box::new(version) as Box<_>)
diff --git a/crates/zed/src/languages/csharp.rs b/crates/zed/src/languages/csharp.rs
index 9d3c63ed51..475b7573d0 100644
--- a/crates/zed/src/languages/csharp.rs
+++ b/crates/zed/src/languages/csharp.rs
@@ -52,7 +52,7 @@ impl super::LspAdapter for OmniSharpAdapter {
                     .find(|asset| asset.name == asset_name)
                     .ok_or_else(|| anyhow!("no asset found matching {:?}", asset_name))?;
                 let version = GitHubLspBinaryVersion {
-                    name: release.name,
+                    name: release.tag_name,
                     url: asset.browser_download_url.clone(),
                 };
 
diff --git a/crates/zed/src/languages/deno.rs b/crates/zed/src/languages/deno.rs
index 0020f94a46..a06c6e42d5 100644
--- a/crates/zed/src/languages/deno.rs
+++ b/crates/zed/src/languages/deno.rs
@@ -79,7 +79,7 @@ impl LspAdapter for DenoLspAdapter {
             .find(|asset| asset.name == asset_name)
             .ok_or_else(|| anyhow!("no asset found matching {:?}", asset_name))?;
         let version = GitHubLspBinaryVersion {
-            name: release.name,
+            name: release.tag_name,
             url: asset.browser_download_url.clone(),
         };
         Ok(Box::new(version) as Box<_>)
diff --git a/crates/zed/src/languages/elixir.rs b/crates/zed/src/languages/elixir.rs
index f6b19ad066..39b9c0a100 100644
--- a/crates/zed/src/languages/elixir.rs
+++ b/crates/zed/src/languages/elixir.rs
@@ -112,13 +112,8 @@ impl LspAdapter for ElixirLspAdapter {
     ) -> Result<Box<dyn 'static + Send + Any>> {
         let http = delegate.http_client();
         let release = latest_github_release("elixir-lsp/elixir-ls", true, false, http).await?;
-        let version_name = release
-            .name
-            .strip_prefix("Release ")
-            .context("Elixir-ls release name does not start with prefix")?
-            .to_owned();
 
-        let asset_name = format!("elixir-ls-{version_name}.zip");
+        let asset_name = format!("elixir-ls-{}.zip", &release.tag_name);
         let asset = release
             .assets
             .iter()
@@ -126,7 +121,7 @@ impl LspAdapter for ElixirLspAdapter {
             .ok_or_else(|| anyhow!("no asset found matching {asset_name:?}"))?;
 
         let version = GitHubLspBinaryVersion {
-            name: version_name,
+            name: release.tag_name.clone(),
             url: asset.browser_download_url.clone(),
         };
         Ok(Box::new(version) as Box<_>)
@@ -321,7 +316,7 @@ impl LspAdapter for NextLspAdapter {
         let release =
             latest_github_release("elixir-tools/next-ls", true, false, delegate.http_client())
                 .await?;
-        let version = release.name;
+        let version = release.tag_name;
         let asset_name = format!("next_ls_{platform}");
         let asset = release
             .assets
diff --git a/crates/zed/src/languages/gleam.rs b/crates/zed/src/languages/gleam.rs
index d8020a0a85..508956b099 100644
--- a/crates/zed/src/languages/gleam.rs
+++ b/crates/zed/src/languages/gleam.rs
@@ -39,7 +39,7 @@ impl LspAdapter for GleamLspAdapter {
 
         let asset_name = format!(
             "gleam-{version}-{arch}-apple-darwin.tar.gz",
-            version = release.name,
+            version = release.tag_name,
             arch = std::env::consts::ARCH
         );
         let asset = release
@@ -48,7 +48,7 @@ impl LspAdapter for GleamLspAdapter {
             .find(|asset| asset.name == asset_name)
             .ok_or_else(|| anyhow!("no asset found matching {:?}", asset_name))?;
         Ok(Box::new(GitHubLspBinaryVersion {
-            name: release.name,
+            name: release.tag_name,
             url: asset.browser_download_url.clone(),
         }))
     }
diff --git a/crates/zed/src/languages/go.rs b/crates/zed/src/languages/go.rs
index 871ff0886f..05bea740c5 100644
--- a/crates/zed/src/languages/go.rs
+++ b/crates/zed/src/languages/go.rs
@@ -47,11 +47,11 @@ impl super::LspAdapter for GoLspAdapter {
     ) -> Result<Box<dyn 'static + Send + Any>> {
         let release =
             latest_github_release("golang/tools", false, false, delegate.http_client()).await?;
-        let version: Option<String> = release.name.strip_prefix("gopls/v").map(str::to_string);
+        let version: Option<String> = release.tag_name.strip_prefix("gopls/v").map(str::to_string);
         if version.is_none() {
             log::warn!(
-                "couldn't infer gopls version from github release name '{}'",
-                release.name
+                "couldn't infer gopls version from GitHub release tag name '{}'",
+                release.tag_name
             );
         }
         Ok(Box::new(version) as Box<_>)
diff --git a/crates/zed/src/languages/lua.rs b/crates/zed/src/languages/lua.rs
index c25bb3d125..7476ab37ea 100644
--- a/crates/zed/src/languages/lua.rs
+++ b/crates/zed/src/languages/lua.rs
@@ -42,7 +42,7 @@ impl super::LspAdapter for LuaLspAdapter {
             delegate.http_client(),
         )
         .await?;
-        let version = &release.name;
+        let version = &release.tag_name;
         let asset_name = format!("lua-language-server-{version}-darwin-{platform}.tar.gz");
         let asset = release
             .assets
@@ -50,7 +50,7 @@ impl super::LspAdapter for LuaLspAdapter {
             .find(|asset| asset.name == asset_name)
             .ok_or_else(|| anyhow!("no asset found matching {:?}", asset_name))?;
         let version = GitHubLspBinaryVersion {
-            name: release.name,
+            name: release.tag_name,
             url: asset.browser_download_url.clone(),
         };
         Ok(Box::new(version) as Box<_>)
diff --git a/crates/zed/src/languages/rust.rs b/crates/zed/src/languages/rust.rs
index bd00e9350c..7a95e26d9b 100644
--- a/crates/zed/src/languages/rust.rs
+++ b/crates/zed/src/languages/rust.rs
@@ -45,7 +45,7 @@ impl LspAdapter for RustLspAdapter {
             .find(|asset| asset.name == asset_name)
             .ok_or_else(|| anyhow!("no asset found matching {:?}", asset_name))?;
         Ok(Box::new(GitHubLspBinaryVersion {
-            name: release.name,
+            name: release.tag_name,
             url: asset.browser_download_url.clone(),
         }))
     }
diff --git a/crates/zed/src/languages/toml.rs b/crates/zed/src/languages/toml.rs
index e16109be9a..9393fa691e 100644
--- a/crates/zed/src/languages/toml.rs
+++ b/crates/zed/src/languages/toml.rs
@@ -37,7 +37,7 @@ impl LspAdapter for TaploLspAdapter {
             .context(format!("no asset found matching {asset_name:?}"))?;
 
         Ok(Box::new(GitHubLspBinaryVersion {
-            name: release.name,
+            name: release.tag_name,
             url: asset.browser_download_url.clone(),
         }))
     }
diff --git a/crates/zed/src/languages/typescript.rs b/crates/zed/src/languages/typescript.rs
index ff83220922..6ee8e34bfd 100644
--- a/crates/zed/src/languages/typescript.rs
+++ b/crates/zed/src/languages/typescript.rs
@@ -254,7 +254,7 @@ impl LspAdapter for EsLintLspAdapter {
         )
         .await?;
         Ok(Box::new(GitHubLspBinaryVersion {
-            name: release.name,
+            name: release.tag_name,
             url: release.tarball_url,
         }))
     }
diff --git a/crates/zed/src/languages/zig.rs b/crates/zed/src/languages/zig.rs
index 8fac5c195f..12268c2e14 100644
--- a/crates/zed/src/languages/zig.rs
+++ b/crates/zed/src/languages/zig.rs
@@ -37,7 +37,7 @@ impl LspAdapter for ZlsAdapter {
             .find(|asset| asset.name == asset_name)
             .ok_or_else(|| anyhow!("no asset found matching {:?}", asset_name))?;
         let version = GitHubLspBinaryVersion {
-            name: release.name,
+            name: release.tag_name,
             url: asset.browser_download_url.clone(),
         };
 

From ad88e9754e91407dd5819c86e50042a215df68cd Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Thu, 8 Feb 2024 12:56:29 -0800
Subject: [PATCH 336/372] Add Linux build CI (#7581)

Release Notes:

- N/A
---
 .github/actions/check_style/action.yml     |  9 -----
 .github/workflows/ci.yml                   | 45 ++++++++++++++++++++--
 .github/workflows/deploy_collab.yml        |  4 ++
 .github/workflows/release_nightly.yml      |  3 ++
 crates/gpui/src/platform/linux/platform.rs | 16 --------
 script/clippy                              |  7 ++++
 script/linux                               | 18 ---------
 7 files changed, 55 insertions(+), 47 deletions(-)
 create mode 100755 script/clippy

diff --git a/.github/actions/check_style/action.yml b/.github/actions/check_style/action.yml
index e95c6b493a..22c7380143 100644
--- a/.github/actions/check_style/action.yml
+++ b/.github/actions/check_style/action.yml
@@ -8,15 +8,6 @@ runs:
           shell: bash -euxo pipefail {0}
           run: cargo fmt --all -- --check
 
-        - name: cargo clippy
-          shell: bash -euxo pipefail {0}
-          # clippy.toml is not currently supporting specifying allowed lints
-          # so specify those here, and disable the rest until Zed's workspace
-          # will have more fixes & suppression for the standard lint set
-          run: |
-              cargo clippy --release --workspace --all-features --all-targets -- -A clippy::all -D clippy::dbg_macro -D clippy::todo
-              cargo clippy -p gpui
-
         - name: Find modified migrations
           shell: bash -euxo pipefail {0}
           run: |
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b7bde60eec..61c0d50296 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ env:
 
 jobs:
     style:
-        name: Check formatting, Clippy lints, and spelling
+        name: Check formatting and spelling
         runs-on:
             - self-hosted
             - test
@@ -59,8 +59,8 @@ jobs:
                   input: "crates/rpc/proto/"
                   against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=main,subdir=crates/rpc/proto/"
 
-    tests:
-        name: Run tests
+    macos_tests:
+        name: (macOS) Run Clippy and tests
         runs-on:
             - self-hosted
             - test
@@ -71,6 +71,10 @@ jobs:
                   clean: false
                   submodules: "recursive"
 
+            - name: cargo clippy
+              shell: bash -euxo pipefail {0}
+              run: script/clippy
+
             - name: Run tests
               uses: ./.github/actions/run_tests
 
@@ -80,13 +84,46 @@ jobs:
             - name: Build other binaries
               run: cargo build --workspace --bins --all-features
 
+    # todo!(linux): Actually run the tests
+    linux_tests:
+        name: (Linux) Run Clippy and tests
+        runs-on: ubuntu-latest
+        steps:
+          - name: Checkout repo
+            uses: actions/checkout@v4
+            with:
+              clean: false
+              submodules: "recursive"
+
+          - name: Restore from cache
+            uses: actions/cache@v3
+            with:
+                path: |
+                  ~/.cargo/bin/
+                  ~/.cargo/registry/index/
+                  ~/.cargo/registry/cache/
+                  ~/.cargo/git/db/
+                  target/
+                key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+                restore-keys: ${{ runner.os }}-cargo-
+
+          - name: configure linux
+            shell: bash -euxo pipefail {0}
+            run: script/linux
+
+          - name: cargo clippy
+            shell: bash -euxo pipefail {0}
+            run: script/clippy
+
+          - name: Build Zed
+            run: cargo build -p zed
     bundle:
         name: Bundle app
         runs-on:
             - self-hosted
             - bundle
         if: ${{ startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'run-build-dmg') }}
-        needs: tests
+        needs: [macos_tests, linux_tests]
         env:
             MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
             MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
diff --git a/.github/workflows/deploy_collab.yml b/.github/workflows/deploy_collab.yml
index 432bafb360..953e4f1190 100644
--- a/.github/workflows/deploy_collab.yml
+++ b/.github/workflows/deploy_collab.yml
@@ -27,6 +27,10 @@ jobs:
       - name: Run style checks
         uses: ./.github/actions/check_style
 
+      - name: Run clippy
+        shell: bash -euxo pipefail {0}
+        run: script/clippy
+
   tests:
     name: Run tests
     runs-on:
diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
index c9b4097265..e826badb5b 100644
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -31,6 +31,9 @@ jobs:
             - name: Run style checks
               uses: ./.github/actions/check_style
 
+            - name: Run clippy
+              shell: bash -euxo pipefail {0}
+              run: script/clippy
     tests:
         name: Run tests
         if: github.repository_owner == 'zed-industries'
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index d2c8f5f854..1776ee00b7 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -231,22 +231,6 @@ impl Platform for LinuxPlatform {
         Box::new(LinuxWindow(window_ptr))
     }
 
-    fn set_display_link_output_callback(
-        &self,
-        display_id: DisplayId,
-        callback: Box<dyn FnMut() + Send>,
-    ) {
-        log::warn!("unimplemented: set_display_link_output_callback");
-    }
-
-    fn start_display_link(&self, display_id: DisplayId) {
-        unimplemented!()
-    }
-
-    fn stop_display_link(&self, display_id: DisplayId) {
-        unimplemented!()
-    }
-
     fn open_url(&self, url: &str) {
         unimplemented!()
     }
diff --git a/script/clippy b/script/clippy
new file mode 100755
index 0000000000..1a817015f3
--- /dev/null
+++ b/script/clippy
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# clippy.toml is not currently supporting specifying allowed lints
+# so specify those here, and disable the rest until Zed's workspace
+# will have more fixes & suppression for the standard lint set
+cargo clippy --release --workspace --all-features --all-targets -- -A clippy::all -D clippy::dbg_macro -D clippy::todo
+cargo clippy -p gpui
diff --git a/script/linux b/script/linux
index f672ed8b85..2431d22052 100755
--- a/script/linux
+++ b/script/linux
@@ -1,25 +1,7 @@
 #!/usr/bin/bash -e
 
-# if not on Linux, do nothing
-[[ $(uname) == "Linux" ]] || exit 0
-
-# Copy assets to the user's home directory if they don't exist
-mkdir -p "$HOME/.config/zed"
-
-mkdir -p "$HOME/.config/zed/plugins"
-
-mkdir -p "$HOME/.config/zed/themes"
-cp -ruL ./assets/themes/*/*.json "$HOME/.config/zed/themes"
-
-test -f "$HOME/.config/zed/settings.json" ||
-  cp -uL ./assets/settings/initial_user_settings.json "$HOME/.config/zed/settings.json"
-
-test -f "$HOME/.config/zed/keymap.json" ||
-  cp -uL ./assets/keymaps/default.json "$HOME/.config/zed/keymap.json"
-
 # if sudo is not installed, define an empty alias
 maysudo=$(command -v sudo || true)
-export maysudo
 
 # Ubuntu, Debian, etc.
 # https://packages.ubuntu.com/

From 1da5241ef76f2c6164ed7335d8a64b44e191a191 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 8 Feb 2024 13:59:15 -0700
Subject: [PATCH 337/372] Try to buf harder (#7591)

Release Notes:

- N/A
---
 .github/workflows/ci.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 61c0d50296..c18cc38e6f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,15 +49,22 @@ jobs:
               uses: ./.github/actions/check_style
 
             - name: Ensure fresh merge
+              shell: bash -euxo pipefail {0}
               run: |
-                git checkout -B temp
-                git merge -q origin/main -m "merge main into temp"
+                if [ -z "$GITHUB_BASE_REF" ];
+                then
+                  echo "BUF_BASE_BRANCH=$(git merge-base origin/main HEAD)" >> $GITHUB_ENV
+                else
+                  git checkout -B temp
+                  git merge -q origin/$GITHUB_BASE_REF -m "merge main into temp"
+                  echo "BUF_BASE_BRANCH=$GITHUB_BASE_REF" >> $GITHUB_ENV
+                fi
 
             - uses: bufbuild/buf-setup-action@v1
             - uses: bufbuild/buf-breaking-action@v1
               with:
                   input: "crates/rpc/proto/"
-                  against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=main,subdir=crates/rpc/proto/"
+                  against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=${BUF_BASE_BRANCH},subdir=crates/rpc/proto/"
 
     macos_tests:
         name: (macOS) Run Clippy and tests

From ed546657116a38b245c9ac6408ee961bbd436c7c Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Thu, 8 Feb 2024 13:24:49 -0800
Subject: [PATCH 338/372] Cleanup logic for registering languages and grammars
 (#7593)

This is a refactor, follow-up to the work we've been doing on loading
WASM language extensions.

Release Notes:

- N/A

---------

Co-authored-by: Marshall <marshall@zed.dev>
---
 crates/extension/src/extension_store.rs  |  24 +-
 crates/language/src/buffer_tests.rs      |   1 +
 crates/language/src/language.rs          | 916 +----------------------
 crates/language/src/language_registry.rs | 799 ++++++++++++++++++++
 crates/project/src/project_tests.rs      |  21 +-
 crates/zed/src/languages.rs              |  13 +-
 6 files changed, 873 insertions(+), 901 deletions(-)
 create mode 100644 crates/language/src/language_registry.rs

diff --git a/crates/extension/src/extension_store.rs b/crates/extension/src/extension_store.rs
index ad88c95729..acad322478 100644
--- a/crates/extension/src/extension_store.rs
+++ b/crates/extension/src/extension_store.rs
@@ -141,21 +141,27 @@ impl ExtensionStore {
     }
 
     fn manifest_updated(&mut self, manifest: Manifest, cx: &mut ModelContext<Self>) {
-        for (grammar_name, grammar) in &manifest.grammars {
-            let mut grammar_path = self.extensions_dir.clone();
-            grammar_path.extend([grammar.extension.as_ref(), grammar.path.as_path()]);
-            self.language_registry
-                .register_grammar(grammar_name.clone(), grammar_path);
-        }
+        self.language_registry
+            .register_wasm_grammars(manifest.grammars.iter().map(|(grammar_name, grammar)| {
+                let mut grammar_path = self.extensions_dir.clone();
+                grammar_path.extend([grammar.extension.as_ref(), grammar.path.as_path()]);
+                (grammar_name.clone(), grammar_path)
+            }));
+
         for (language_name, language) in &manifest.languages {
             let mut language_path = self.extensions_dir.clone();
             language_path.extend([language.extension.as_ref(), language.path.as_path()]);
-            self.language_registry.register_extension(
-                language_path.into(),
+            self.language_registry.register_language(
                 language_name.clone(),
                 language.grammar.clone(),
                 language.matcher.clone(),
-                load_plugin_queries,
+                vec![],
+                move || {
+                    let config = std::fs::read(language_path.join("config.toml"))?;
+                    let config: LanguageConfig = ::toml::from_slice(&config)?;
+                    let queries = load_plugin_queries(&language_path);
+                    Ok((config, queries))
+                },
             );
         }
         let fs = self.fs.clone();
diff --git a/crates/language/src/buffer_tests.rs b/crates/language/src/buffer_tests.rs
index ccbab9d6d1..6bdd259c83 100644
--- a/crates/language/src/buffer_tests.rs
+++ b/crates/language/src/buffer_tests.rs
@@ -5,6 +5,7 @@ use crate::language_settings::{
 use crate::Buffer;
 use clock::ReplicaId;
 use collections::BTreeMap;
+use futures::FutureExt as _;
 use gpui::{AppContext, Model};
 use gpui::{Context, TestAppContext};
 use indoc::indoc;
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index f811637a24..73db555b39 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -9,6 +9,7 @@
 mod buffer;
 mod diagnostic_set;
 mod highlight_map;
+mod language_registry;
 pub mod language_settings;
 mod outline;
 pub mod proto;
@@ -20,30 +21,22 @@ pub mod markdown;
 
 use anyhow::{anyhow, Context, Result};
 use async_trait::async_trait;
-use collections::{hash_map, HashMap, HashSet};
-use futures::{
-    channel::{mpsc, oneshot},
-    future::Shared,
-    FutureExt, TryFutureExt as _,
-};
-use gpui::{AppContext, AsyncAppContext, BackgroundExecutor, Task};
+use collections::{HashMap, HashSet};
+use gpui::{AppContext, AsyncAppContext, Task};
 pub use highlight_map::HighlightMap;
 use lazy_static::lazy_static;
 use lsp::{CodeActionKind, LanguageServerBinary};
-use parking_lot::{Mutex, RwLock};
-use postage::watch;
+use parking_lot::Mutex;
 use regex::Regex;
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use serde_json::Value;
 use std::{
     any::Any,
-    borrow::Cow,
     cell::RefCell,
-    ffi::OsStr,
     fmt::Debug,
     hash::Hash,
     mem,
-    ops::{Not, Range},
+    ops::Range,
     path::{Path, PathBuf},
     str,
     sync::{
@@ -52,15 +45,17 @@ use std::{
     },
 };
 use syntax_map::SyntaxSnapshot;
-use theme::{SyntaxTheme, Theme};
+use theme::SyntaxTheme;
 use tree_sitter::{self, wasmtime, Query, WasmStore};
-use unicase::UniCase;
-use util::{http::HttpClient, paths::PathExt};
-use util::{post_inc, ResultExt, TryFutureExt as _, UnwrapFuture};
+use util::http::HttpClient;
 
 pub use buffer::Operation;
 pub use buffer::*;
 pub use diagnostic_set::DiagnosticEntry;
+pub use language_registry::{
+    LanguageQueries, LanguageRegistry, LanguageServerBinaryStatus, PendingLanguageServer,
+    QUERY_FILENAME_PREFIXES,
+};
 pub use lsp::LanguageServerId;
 pub use outline::{Outline, OutlineItem};
 pub use syntax_map::{OwnedSyntaxLayer, SyntaxLayer};
@@ -74,27 +69,6 @@ pub fn init(cx: &mut AppContext) {
     language_settings::init(cx);
 }
 
-#[derive(Clone, Default)]
-struct LspBinaryStatusSender {
-    txs: Arc<Mutex<Vec<mpsc::UnboundedSender<(Arc<Language>, LanguageServerBinaryStatus)>>>>,
-}
-
-impl LspBinaryStatusSender {
-    fn subscribe(&self) -> mpsc::UnboundedReceiver<(Arc<Language>, LanguageServerBinaryStatus)> {
-        let (tx, rx) = mpsc::unbounded();
-        self.txs.lock().push(tx);
-        rx
-    }
-
-    fn send(&self, language: Arc<Language>, status: LanguageServerBinaryStatus) {
-        let mut txs = self.txs.lock();
-        txs.retain(|tx| {
-            tx.unbounded_send((language.clone(), status.clone()))
-                .is_ok()
-        });
-    }
-}
-
 thread_local! {
     static PARSER: RefCell<Parser> = {
         let mut parser = Parser::new();
@@ -104,10 +78,11 @@ thread_local! {
 }
 
 lazy_static! {
-    pub(crate) static ref NEXT_GRAMMAR_ID: AtomicUsize = Default::default();
+    static ref NEXT_GRAMMAR_ID: AtomicUsize = Default::default();
+
+    static ref WASM_ENGINE: wasmtime::Engine = wasmtime::Engine::default();
+
     /// A shared grammar for plain text, exposed for reuse by downstream crates.
-    #[doc(hidden)]
-    pub static ref WASM_ENGINE: wasmtime::Engine = wasmtime::Engine::default();
     pub static ref PLAIN_TEXT: Arc<Language> = Arc::new(Language::new(
         LanguageConfig {
             name: "Plain Text".into(),
@@ -457,33 +432,6 @@ pub struct LanguageMatcher {
     pub first_line_pattern: Option<Regex>,
 }
 
-pub const QUERY_FILENAME_PREFIXES: &[(
-    &str,
-    fn(&mut LanguageQueries) -> &mut Option<Cow<'static, str>>,
-)] = &[
-    ("highlights", |q| &mut q.highlights),
-    ("brackets", |q| &mut q.brackets),
-    ("outline", |q| &mut q.outline),
-    ("indents", |q| &mut q.indents),
-    ("embedding", |q| &mut q.embedding),
-    ("injections", |q| &mut q.injections),
-    ("overrides", |q| &mut q.overrides),
-    ("redactions", |q| &mut q.redactions),
-];
-
-/// Tree-sitter language queries for a given language.
-#[derive(Debug, Default)]
-pub struct LanguageQueries {
-    pub highlights: Option<Cow<'static, str>>,
-    pub brackets: Option<Cow<'static, str>>,
-    pub indents: Option<Cow<'static, str>>,
-    pub outline: Option<Cow<'static, str>>,
-    pub embedding: Option<Cow<'static, str>>,
-    pub injections: Option<Cow<'static, str>>,
-    pub overrides: Option<Cow<'static, str>>,
-    pub redactions: Option<Cow<'static, str>>,
-}
-
 /// Represents a language for the given range. Some languages (e.g. HTML)
 /// interleave several languages together, thus a single buffer might actually contain
 /// several nested scopes.
@@ -650,7 +598,7 @@ pub struct Language {
 
     #[cfg(any(test, feature = "test-support"))]
     fake_adapter: Option<(
-        mpsc::UnboundedSender<lsp::FakeLanguageServer>,
+        futures::channel::mpsc::UnboundedSender<lsp::FakeLanguageServer>,
         Arc<FakeLspAdapter>,
     )>,
 }
@@ -725,775 +673,6 @@ struct BracketConfig {
     close_capture_ix: u32,
 }
 
-#[derive(Clone)]
-pub enum LanguageServerBinaryStatus {
-    CheckingForUpdate,
-    Downloading,
-    Downloaded,
-    Cached,
-    Failed { error: String },
-}
-
-type AvailableLanguageId = usize;
-
-#[derive(Clone)]
-struct AvailableLanguage {
-    id: AvailableLanguageId,
-    name: Arc<str>,
-    grammar: Option<Arc<str>>,
-    source: AvailableLanguageSource,
-    lsp_adapters: Vec<Arc<dyn LspAdapter>>,
-    loaded: bool,
-}
-
-enum AvailableGrammar {
-    Native(tree_sitter::Language),
-    Loaded(PathBuf, tree_sitter::Language),
-    Loading(PathBuf, Vec<oneshot::Sender<Result<tree_sitter::Language>>>),
-    Unloaded(PathBuf),
-}
-
-#[derive(Clone)]
-enum AvailableLanguageSource {
-    BuiltIn {
-        asset_dir: &'static str,
-        get_queries: fn(&str) -> LanguageQueries,
-        config: LanguageConfig,
-    },
-    Extension {
-        path: Arc<Path>,
-        get_queries: fn(&Path) -> LanguageQueries,
-        matcher: LanguageMatcher,
-    },
-}
-
-pub struct LanguageRegistry {
-    state: RwLock<LanguageRegistryState>,
-    language_server_download_dir: Option<Arc<Path>>,
-    login_shell_env_loaded: Shared<Task<()>>,
-    #[allow(clippy::type_complexity)]
-    lsp_binary_paths: Mutex<
-        HashMap<LanguageServerName, Shared<Task<Result<LanguageServerBinary, Arc<anyhow::Error>>>>>,
-    >,
-    executor: Option<BackgroundExecutor>,
-    lsp_binary_status_tx: LspBinaryStatusSender,
-}
-
-struct LanguageRegistryState {
-    next_language_server_id: usize,
-    languages: Vec<Arc<Language>>,
-    available_languages: Vec<AvailableLanguage>,
-    grammars: HashMap<Arc<str>, AvailableGrammar>,
-    next_available_language_id: AvailableLanguageId,
-    loading_languages: HashMap<AvailableLanguageId, Vec<oneshot::Sender<Result<Arc<Language>>>>>,
-    subscription: (watch::Sender<()>, watch::Receiver<()>),
-    theme: Option<Arc<Theme>>,
-    version: usize,
-    reload_count: usize,
-}
-
-pub struct PendingLanguageServer {
-    pub server_id: LanguageServerId,
-    pub task: Task<Result<lsp::LanguageServer>>,
-    pub container_dir: Option<Arc<Path>>,
-}
-
-impl LanguageRegistry {
-    pub fn new(login_shell_env_loaded: Task<()>) -> Self {
-        Self {
-            state: RwLock::new(LanguageRegistryState {
-                next_language_server_id: 0,
-                languages: vec![PLAIN_TEXT.clone()],
-                available_languages: Default::default(),
-                grammars: Default::default(),
-                next_available_language_id: 0,
-                loading_languages: Default::default(),
-                subscription: watch::channel(),
-                theme: Default::default(),
-                version: 0,
-                reload_count: 0,
-            }),
-            language_server_download_dir: None,
-            login_shell_env_loaded: login_shell_env_loaded.shared(),
-            lsp_binary_paths: Default::default(),
-            executor: None,
-            lsp_binary_status_tx: Default::default(),
-        }
-    }
-
-    #[cfg(any(test, feature = "test-support"))]
-    pub fn test() -> Self {
-        Self::new(Task::ready(()))
-    }
-
-    pub fn set_executor(&mut self, executor: BackgroundExecutor) {
-        self.executor = Some(executor);
-    }
-
-    /// Clear out all of the loaded languages and reload them from scratch.
-    pub fn reload(&self) {
-        self.state.write().reload();
-    }
-
-    /// Clear out the given languages and reload them from scratch.
-    pub fn reload_languages(&self, languages: &[Arc<str>], grammars: &[Arc<str>]) {
-        self.state.write().reload_languages(languages, grammars);
-    }
-
-    pub fn register(
-        &self,
-        asset_dir: &'static str,
-        config: LanguageConfig,
-        lsp_adapters: Vec<Arc<dyn LspAdapter>>,
-        get_queries: fn(&str) -> LanguageQueries,
-    ) {
-        let state = &mut *self.state.write();
-        state.available_languages.push(AvailableLanguage {
-            id: post_inc(&mut state.next_available_language_id),
-            name: config.name.clone(),
-            grammar: config.grammar.clone(),
-            source: AvailableLanguageSource::BuiltIn {
-                config,
-                get_queries,
-                asset_dir,
-            },
-            lsp_adapters,
-            loaded: false,
-        });
-    }
-
-    pub fn register_extension(
-        &self,
-        path: Arc<Path>,
-        name: Arc<str>,
-        grammar_name: Option<Arc<str>>,
-        matcher: LanguageMatcher,
-        get_queries: fn(&Path) -> LanguageQueries,
-    ) {
-        let state = &mut *self.state.write();
-        let source = AvailableLanguageSource::Extension {
-            path,
-            get_queries,
-            matcher,
-        };
-        for existing_language in &mut state.available_languages {
-            if existing_language.name == name
-                && matches!(
-                    existing_language.source,
-                    AvailableLanguageSource::Extension { .. }
-                )
-            {
-                existing_language.source = source;
-                return;
-            }
-        }
-        state.available_languages.push(AvailableLanguage {
-            id: post_inc(&mut state.next_available_language_id),
-            grammar: grammar_name,
-            name,
-            source,
-            lsp_adapters: Vec::new(),
-            loaded: false,
-        });
-    }
-
-    pub fn add_grammars(
-        &self,
-        grammars: impl IntoIterator<Item = (impl Into<Arc<str>>, tree_sitter::Language)>,
-    ) {
-        self.state.write().grammars.extend(
-            grammars
-                .into_iter()
-                .map(|(name, grammar)| (name.into(), AvailableGrammar::Native(grammar))),
-        );
-    }
-
-    pub fn register_grammar(&self, name: Arc<str>, path: PathBuf) {
-        self.state
-            .write()
-            .grammars
-            .insert(name, AvailableGrammar::Unloaded(path));
-    }
-
-    pub fn language_names(&self) -> Vec<String> {
-        let state = self.state.read();
-        let mut result = state
-            .available_languages
-            .iter()
-            .filter_map(|l| l.loaded.not().then_some(l.name.to_string()))
-            .chain(state.languages.iter().map(|l| l.config.name.to_string()))
-            .collect::<Vec<_>>();
-        result.sort_unstable_by_key(|language_name| language_name.to_lowercase());
-        result
-    }
-
-    pub fn add(&self, language: Arc<Language>) {
-        self.state.write().add(language);
-    }
-
-    pub fn subscribe(&self) -> watch::Receiver<()> {
-        self.state.read().subscription.1.clone()
-    }
-
-    /// The number of times that the registry has been changed,
-    /// by adding languages or reloading.
-    pub fn version(&self) -> usize {
-        self.state.read().version
-    }
-
-    /// The number of times that the registry has been reloaded.
-    pub fn reload_count(&self) -> usize {
-        self.state.read().reload_count
-    }
-
-    pub fn set_theme(&self, theme: Arc<Theme>) {
-        let mut state = self.state.write();
-        state.theme = Some(theme.clone());
-        for language in &state.languages {
-            language.set_theme(theme.syntax());
-        }
-    }
-
-    pub fn set_language_server_download_dir(&mut self, path: impl Into<Arc<Path>>) {
-        self.language_server_download_dir = Some(path.into());
-    }
-
-    pub fn language_for_name(
-        self: &Arc<Self>,
-        name: &str,
-    ) -> UnwrapFuture<oneshot::Receiver<Result<Arc<Language>>>> {
-        let name = UniCase::new(name);
-        self.get_or_load_language(|language_name, _| UniCase::new(language_name) == name)
-    }
-
-    pub fn language_for_name_or_extension(
-        self: &Arc<Self>,
-        string: &str,
-    ) -> UnwrapFuture<oneshot::Receiver<Result<Arc<Language>>>> {
-        let string = UniCase::new(string);
-        self.get_or_load_language(|name, config| {
-            UniCase::new(name) == string
-                || config
-                    .path_suffixes
-                    .iter()
-                    .any(|suffix| UniCase::new(suffix) == string)
-        })
-    }
-
-    pub fn language_for_file(
-        self: &Arc<Self>,
-        path: impl AsRef<Path>,
-        content: Option<&Rope>,
-    ) -> UnwrapFuture<oneshot::Receiver<Result<Arc<Language>>>> {
-        let path = path.as_ref();
-        let filename = path.file_name().and_then(|name| name.to_str());
-        let extension = path.extension_or_hidden_file_name();
-        let path_suffixes = [extension, filename];
-        self.get_or_load_language(|_, config| {
-            let path_matches = config
-                .path_suffixes
-                .iter()
-                .any(|suffix| path_suffixes.contains(&Some(suffix.as_str())));
-            let content_matches = content.zip(config.first_line_pattern.as_ref()).map_or(
-                false,
-                |(content, pattern)| {
-                    let end = content.clip_point(Point::new(0, 256), Bias::Left);
-                    let end = content.point_to_offset(end);
-                    let text = content.chunks_in_range(0..end).collect::<String>();
-                    pattern.is_match(&text)
-                },
-            );
-            path_matches || content_matches
-        })
-    }
-
-    fn get_or_load_language(
-        self: &Arc<Self>,
-        callback: impl Fn(&str, &LanguageMatcher) -> bool,
-    ) -> UnwrapFuture<oneshot::Receiver<Result<Arc<Language>>>> {
-        let (tx, rx) = oneshot::channel();
-
-        let mut state = self.state.write();
-        if let Some(language) = state
-            .languages
-            .iter()
-            .find(|language| callback(language.config.name.as_ref(), &language.config.matcher))
-        {
-            let _ = tx.send(Ok(language.clone()));
-        } else if let Some(executor) = self.executor.clone() {
-            if let Some(language) = state
-                .available_languages
-                .iter()
-                .rfind(|l| {
-                    !l.loaded
-                        && match &l.source {
-                            AvailableLanguageSource::BuiltIn { config, .. } => {
-                                callback(l.name.as_ref(), &config.matcher)
-                            }
-                            AvailableLanguageSource::Extension { matcher, .. } => {
-                                callback(l.name.as_ref(), &matcher)
-                            }
-                        }
-                })
-                .cloned()
-            {
-                match state.loading_languages.entry(language.id) {
-                    hash_map::Entry::Occupied(mut entry) => entry.get_mut().push(tx),
-                    hash_map::Entry::Vacant(entry) => {
-                        let this = self.clone();
-                        executor
-                            .spawn(async move {
-                                let id = language.id;
-                                let name = language.name.clone();
-                                let language = async {
-                                    let (config, queries) = match language.source {
-                                        AvailableLanguageSource::BuiltIn {
-                                            asset_dir,
-                                            get_queries,
-                                            config,
-                                        } => (config, (get_queries)(asset_dir)),
-                                        AvailableLanguageSource::Extension {
-                                            path,
-                                            get_queries,
-                                            ..
-                                        } => {
-                                            let config = std::fs::read(path.join("config.toml"));
-                                            let config: LanguageConfig =
-                                                ::toml::from_slice(&config?)?;
-                                            (config, get_queries(path.as_ref()))
-                                        }
-                                    };
-
-                                    let grammar = if let Some(grammar) = config.grammar.clone() {
-                                        Some(this.get_or_load_grammar(grammar).await?)
-                                    } else {
-                                        None
-                                    };
-
-                                    Language::new(config, grammar)
-                                        .with_lsp_adapters(language.lsp_adapters)
-                                        .await
-                                        .with_queries(queries)
-                                }
-                                .await;
-
-                                match language {
-                                    Ok(language) => {
-                                        let language = Arc::new(language);
-                                        let mut state = this.state.write();
-
-                                        state.add(language.clone());
-                                        state.mark_language_loaded(id);
-                                        if let Some(mut txs) = state.loading_languages.remove(&id) {
-                                            for tx in txs.drain(..) {
-                                                let _ = tx.send(Ok(language.clone()));
-                                            }
-                                        }
-                                    }
-                                    Err(e) => {
-                                        log::error!("failed to load language {name}:\n{:?}", e);
-                                        let mut state = this.state.write();
-                                        state.mark_language_loaded(id);
-                                        if let Some(mut txs) = state.loading_languages.remove(&id) {
-                                            for tx in txs.drain(..) {
-                                                let _ = tx.send(Err(anyhow!(
-                                                    "failed to load language {}: {}",
-                                                    name,
-                                                    e
-                                                )));
-                                            }
-                                        }
-                                    }
-                                };
-                            })
-                            .detach();
-                        entry.insert(vec![tx]);
-                    }
-                }
-            } else {
-                let _ = tx.send(Err(anyhow!("language not found")));
-            }
-        } else {
-            let _ = tx.send(Err(anyhow!("executor does not exist")));
-        }
-
-        rx.unwrap()
-    }
-
-    fn get_or_load_grammar(
-        self: &Arc<Self>,
-        name: Arc<str>,
-    ) -> UnwrapFuture<oneshot::Receiver<Result<tree_sitter::Language>>> {
-        let (tx, rx) = oneshot::channel();
-        let mut state = self.state.write();
-
-        if let Some(grammar) = state.grammars.get_mut(name.as_ref()) {
-            match grammar {
-                AvailableGrammar::Native(grammar) | AvailableGrammar::Loaded(_, grammar) => {
-                    tx.send(Ok(grammar.clone())).ok();
-                }
-                AvailableGrammar::Loading(_, txs) => {
-                    txs.push(tx);
-                }
-                AvailableGrammar::Unloaded(wasm_path) => {
-                    if let Some(executor) = &self.executor {
-                        let this = self.clone();
-                        executor
-                            .spawn({
-                                let wasm_path = wasm_path.clone();
-                                async move {
-                                    let wasm_bytes = std::fs::read(&wasm_path)?;
-                                    let grammar_name = wasm_path
-                                        .file_stem()
-                                        .and_then(OsStr::to_str)
-                                        .ok_or_else(|| anyhow!("invalid grammar filename"))?;
-                                    let grammar = PARSER.with(|parser| {
-                                        let mut parser = parser.borrow_mut();
-                                        let mut store = parser.take_wasm_store().unwrap();
-                                        let grammar =
-                                            store.load_language(&grammar_name, &wasm_bytes);
-                                        parser.set_wasm_store(store).unwrap();
-                                        grammar
-                                    })?;
-
-                                    if let Some(AvailableGrammar::Loading(_, txs)) =
-                                        this.state.write().grammars.insert(
-                                            name,
-                                            AvailableGrammar::Loaded(wasm_path, grammar.clone()),
-                                        )
-                                    {
-                                        for tx in txs {
-                                            tx.send(Ok(grammar.clone())).ok();
-                                        }
-                                    }
-
-                                    anyhow::Ok(())
-                                }
-                            })
-                            .detach();
-                        *grammar = AvailableGrammar::Loading(wasm_path.clone(), vec![tx]);
-                    }
-                }
-            }
-        } else {
-            tx.send(Err(anyhow!("no such grammar {}", name))).ok();
-        }
-
-        rx.unwrap()
-    }
-
-    pub fn to_vec(&self) -> Vec<Arc<Language>> {
-        self.state.read().languages.iter().cloned().collect()
-    }
-
-    pub fn create_pending_language_server(
-        self: &Arc<Self>,
-        stderr_capture: Arc<Mutex<Option<String>>>,
-        language: Arc<Language>,
-        adapter: Arc<CachedLspAdapter>,
-        root_path: Arc<Path>,
-        delegate: Arc<dyn LspAdapterDelegate>,
-        cx: &mut AppContext,
-    ) -> Option<PendingLanguageServer> {
-        let server_id = self.state.write().next_language_server_id();
-        log::info!(
-            "starting language server {:?}, path: {root_path:?}, id: {server_id}",
-            adapter.name.0
-        );
-
-        #[cfg(any(test, feature = "test-support"))]
-        if language.fake_adapter.is_some() {
-            let task = cx.spawn(|cx| async move {
-                let (servers_tx, fake_adapter) = language.fake_adapter.as_ref().unwrap();
-                let (server, mut fake_server) = lsp::FakeLanguageServer::new(
-                    fake_adapter.name.to_string(),
-                    fake_adapter.capabilities.clone(),
-                    cx.clone(),
-                );
-
-                if let Some(initializer) = &fake_adapter.initializer {
-                    initializer(&mut fake_server);
-                }
-
-                let servers_tx = servers_tx.clone();
-                cx.background_executor()
-                    .spawn(async move {
-                        if fake_server
-                            .try_receive_notification::<lsp::notification::Initialized>()
-                            .await
-                            .is_some()
-                        {
-                            servers_tx.unbounded_send(fake_server).ok();
-                        }
-                    })
-                    .detach();
-
-                Ok(server)
-            });
-
-            return Some(PendingLanguageServer {
-                server_id,
-                task,
-                container_dir: None,
-            });
-        }
-
-        let download_dir = self
-            .language_server_download_dir
-            .clone()
-            .ok_or_else(|| anyhow!("language server download directory has not been assigned before starting server"))
-            .log_err()?;
-        let this = self.clone();
-        let language = language.clone();
-        let container_dir: Arc<Path> = Arc::from(download_dir.join(adapter.name.0.as_ref()));
-        let root_path = root_path.clone();
-        let adapter = adapter.clone();
-        let login_shell_env_loaded = self.login_shell_env_loaded.clone();
-        let lsp_binary_statuses = self.lsp_binary_status_tx.clone();
-
-        let task = {
-            let container_dir = container_dir.clone();
-            cx.spawn(move |mut cx| async move {
-                login_shell_env_loaded.await;
-
-                let entry = this
-                    .lsp_binary_paths
-                    .lock()
-                    .entry(adapter.name.clone())
-                    .or_insert_with(|| {
-                        let adapter = adapter.clone();
-                        let language = language.clone();
-                        let delegate = delegate.clone();
-                        cx.spawn(|cx| {
-                            get_binary(
-                                adapter,
-                                language,
-                                delegate,
-                                container_dir,
-                                lsp_binary_statuses,
-                                cx,
-                            )
-                            .map_err(Arc::new)
-                        })
-                        .shared()
-                    })
-                    .clone();
-
-                let binary = match entry.await {
-                    Ok(binary) => binary,
-                    Err(err) => anyhow::bail!("{err}"),
-                };
-
-                if let Some(task) = adapter.will_start_server(&delegate, &mut cx) {
-                    task.await?;
-                }
-
-                lsp::LanguageServer::new(
-                    stderr_capture,
-                    server_id,
-                    binary,
-                    &root_path,
-                    adapter.code_action_kinds(),
-                    cx,
-                )
-            })
-        };
-
-        Some(PendingLanguageServer {
-            server_id,
-            task,
-            container_dir: Some(container_dir),
-        })
-    }
-
-    pub fn language_server_binary_statuses(
-        &self,
-    ) -> mpsc::UnboundedReceiver<(Arc<Language>, LanguageServerBinaryStatus)> {
-        self.lsp_binary_status_tx.subscribe()
-    }
-
-    pub fn delete_server_container(
-        &self,
-        adapter: Arc<CachedLspAdapter>,
-        cx: &mut AppContext,
-    ) -> Task<()> {
-        log::info!("deleting server container");
-
-        let mut lock = self.lsp_binary_paths.lock();
-        lock.remove(&adapter.name);
-
-        let download_dir = self
-            .language_server_download_dir
-            .clone()
-            .expect("language server download directory has not been assigned before deleting server container");
-
-        cx.spawn(|_| async move {
-            let container_dir = download_dir.join(adapter.name.0.as_ref());
-            smol::fs::remove_dir_all(container_dir)
-                .await
-                .context("server container removal")
-                .log_err();
-        })
-    }
-
-    pub fn next_language_server_id(&self) -> LanguageServerId {
-        self.state.write().next_language_server_id()
-    }
-}
-
-impl LanguageRegistryState {
-    fn next_language_server_id(&mut self) -> LanguageServerId {
-        LanguageServerId(post_inc(&mut self.next_language_server_id))
-    }
-
-    fn add(&mut self, language: Arc<Language>) {
-        if let Some(theme) = self.theme.as_ref() {
-            language.set_theme(theme.syntax());
-        }
-        self.languages.push(language);
-        self.version += 1;
-        *self.subscription.0.borrow_mut() = ();
-    }
-
-    fn reload(&mut self) {
-        self.languages.clear();
-        self.version += 1;
-        self.reload_count += 1;
-        for language in &mut self.available_languages {
-            language.loaded = false;
-        }
-        *self.subscription.0.borrow_mut() = ();
-    }
-
-    fn reload_languages(
-        &mut self,
-        languages_to_reload: &[Arc<str>],
-        grammars_to_reload: &[Arc<str>],
-    ) {
-        for (name, grammar) in self.grammars.iter_mut() {
-            if grammars_to_reload.contains(name) {
-                if let AvailableGrammar::Loaded(path, _) = grammar {
-                    *grammar = AvailableGrammar::Unloaded(path.clone());
-                }
-            }
-        }
-
-        self.languages.retain(|language| {
-            let should_reload = languages_to_reload.contains(&language.config.name)
-                || language
-                    .config
-                    .grammar
-                    .as_ref()
-                    .map_or(false, |grammar| grammars_to_reload.contains(&grammar));
-            !should_reload
-        });
-
-        for language in &mut self.available_languages {
-            if languages_to_reload.contains(&language.name)
-                || language
-                    .grammar
-                    .as_ref()
-                    .map_or(false, |grammar| grammars_to_reload.contains(grammar))
-            {
-                language.loaded = false;
-            }
-        }
-
-        self.version += 1;
-        self.reload_count += 1;
-        *self.subscription.0.borrow_mut() = ();
-    }
-
-    /// Mark the given language as having been loaded, so that the
-    /// language registry won't try to load it again.
-    fn mark_language_loaded(&mut self, id: AvailableLanguageId) {
-        for language in &mut self.available_languages {
-            if language.id == id {
-                language.loaded = true;
-                break;
-            }
-        }
-    }
-}
-
-#[cfg(any(test, feature = "test-support"))]
-impl Default for LanguageRegistry {
-    fn default() -> Self {
-        Self::test()
-    }
-}
-
-async fn get_binary(
-    adapter: Arc<CachedLspAdapter>,
-    language: Arc<Language>,
-    delegate: Arc<dyn LspAdapterDelegate>,
-    container_dir: Arc<Path>,
-    statuses: LspBinaryStatusSender,
-    mut cx: AsyncAppContext,
-) -> Result<LanguageServerBinary> {
-    if !container_dir.exists() {
-        smol::fs::create_dir_all(&container_dir)
-            .await
-            .context("failed to create container directory")?;
-    }
-
-    if let Some(task) = adapter.will_fetch_server(&delegate, &mut cx) {
-        task.await?;
-    }
-
-    let binary = fetch_latest_binary(
-        adapter.clone(),
-        language.clone(),
-        delegate.as_ref(),
-        &container_dir,
-        statuses.clone(),
-    )
-    .await;
-
-    if let Err(error) = binary.as_ref() {
-        if let Some(binary) = adapter
-            .cached_server_binary(container_dir.to_path_buf(), delegate.as_ref())
-            .await
-        {
-            statuses.send(language.clone(), LanguageServerBinaryStatus::Cached);
-            return Ok(binary);
-        } else {
-            statuses.send(
-                language.clone(),
-                LanguageServerBinaryStatus::Failed {
-                    error: format!("{:?}", error),
-                },
-            );
-        }
-    }
-
-    binary
-}
-
-async fn fetch_latest_binary(
-    adapter: Arc<CachedLspAdapter>,
-    language: Arc<Language>,
-    delegate: &dyn LspAdapterDelegate,
-    container_dir: &Path,
-    lsp_binary_statuses_tx: LspBinaryStatusSender,
-) -> Result<LanguageServerBinary> {
-    let container_dir: Arc<Path> = container_dir.into();
-    lsp_binary_statuses_tx.send(
-        language.clone(),
-        LanguageServerBinaryStatus::CheckingForUpdate,
-    );
-
-    let version_info = adapter.fetch_latest_server_version(delegate).await?;
-    lsp_binary_statuses_tx.send(language.clone(), LanguageServerBinaryStatus::Downloading);
-
-    let binary = adapter
-        .fetch_server_binary(version_info, container_dir.to_path_buf(), delegate)
-        .await?;
-    lsp_binary_statuses_tx.send(language.clone(), LanguageServerBinaryStatus::Downloaded);
-
-    Ok(binary)
-}
-
 impl Language {
     pub fn new(config: LanguageConfig, ts_language: Option<tree_sitter::Language>) -> Self {
         Self {
@@ -1831,8 +1010,8 @@ impl Language {
     pub async fn set_fake_lsp_adapter(
         &mut self,
         fake_lsp_adapter: Arc<FakeLspAdapter>,
-    ) -> mpsc::UnboundedReceiver<lsp::FakeLanguageServer> {
-        let (servers_tx, servers_rx) = mpsc::unbounded();
+    ) -> futures::channel::mpsc::UnboundedReceiver<lsp::FakeLanguageServer> {
+        let (servers_tx, servers_rx) = futures::channel::mpsc::unbounded();
         self.fake_adapter = Some((servers_tx, fake_lsp_adapter.clone()));
         let adapter = CachedLspAdapter::new(Arc::new(fake_lsp_adapter)).await;
         self.adapters = vec![adapter];
@@ -2255,19 +1434,14 @@ mod tests {
 
         languages.set_executor(cx.executor());
         let languages = Arc::new(languages);
-        languages.register(
-            "/javascript",
-            LanguageConfig {
-                name: "JavaScript".into(),
-                matcher: LanguageMatcher {
-                    path_suffixes: vec!["js".into()],
-                    first_line_pattern: Some(Regex::new(r"\bnode\b").unwrap()),
-                },
-                ..Default::default()
+        languages.register_test_language(LanguageConfig {
+            name: "JavaScript".into(),
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["js".into()],
+                first_line_pattern: Some(Regex::new(r"\bnode\b").unwrap()),
             },
-            vec![],
-            |_| Default::default(),
-        );
+            ..Default::default()
+        });
 
         languages
             .language_for_file("the/script", None)
@@ -2293,38 +1467,28 @@ mod tests {
         let mut languages = LanguageRegistry::test();
         languages.set_executor(cx.executor());
         let languages = Arc::new(languages);
-        languages.add_grammars([
+        languages.register_native_grammars([
             ("json", tree_sitter_json::language()),
             ("rust", tree_sitter_rust::language()),
         ]);
-        languages.register(
-            "/JSON",
-            LanguageConfig {
-                name: "JSON".into(),
-                grammar: Some("json".into()),
-                matcher: LanguageMatcher {
-                    path_suffixes: vec!["json".into()],
-                    ..Default::default()
-                },
+        languages.register_test_language(LanguageConfig {
+            name: "JSON".into(),
+            grammar: Some("json".into()),
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["json".into()],
                 ..Default::default()
             },
-            vec![],
-            |_| Default::default(),
-        );
-        languages.register(
-            "/rust",
-            LanguageConfig {
-                name: "Rust".into(),
-                grammar: Some("rust".into()),
-                matcher: LanguageMatcher {
-                    path_suffixes: vec!["rs".into()],
-                    ..Default::default()
-                },
+            ..Default::default()
+        });
+        languages.register_test_language(LanguageConfig {
+            name: "Rust".into(),
+            grammar: Some("rust".into()),
+            matcher: LanguageMatcher {
+                path_suffixes: vec!["rs".into()],
                 ..Default::default()
             },
-            vec![],
-            |_| Default::default(),
-        );
+            ..Default::default()
+        });
         assert_eq!(
             languages.language_names(),
             &[
diff --git a/crates/language/src/language_registry.rs b/crates/language/src/language_registry.rs
new file mode 100644
index 0000000000..55987b565d
--- /dev/null
+++ b/crates/language/src/language_registry.rs
@@ -0,0 +1,799 @@
+use crate::{
+    CachedLspAdapter, Language, LanguageConfig, LanguageMatcher, LanguageServerName, LspAdapter,
+    LspAdapterDelegate, PARSER, PLAIN_TEXT,
+};
+use anyhow::{anyhow, Context as _, Result};
+use collections::{hash_map, HashMap};
+use futures::{
+    channel::{mpsc, oneshot},
+    future::Shared,
+    FutureExt as _, TryFutureExt as _,
+};
+use gpui::{AppContext, AsyncAppContext, BackgroundExecutor, Task};
+use lsp::{LanguageServerBinary, LanguageServerId};
+use parking_lot::{Mutex, RwLock};
+use postage::watch;
+use std::{
+    borrow::Cow,
+    ffi::OsStr,
+    ops::Not,
+    path::{Path, PathBuf},
+    sync::Arc,
+};
+use sum_tree::Bias;
+use text::{Point, Rope};
+use theme::Theme;
+use unicase::UniCase;
+use util::{paths::PathExt, post_inc, ResultExt, TryFutureExt as _, UnwrapFuture};
+
+pub struct LanguageRegistry {
+    state: RwLock<LanguageRegistryState>,
+    language_server_download_dir: Option<Arc<Path>>,
+    login_shell_env_loaded: Shared<Task<()>>,
+    #[allow(clippy::type_complexity)]
+    lsp_binary_paths: Mutex<
+        HashMap<LanguageServerName, Shared<Task<Result<LanguageServerBinary, Arc<anyhow::Error>>>>>,
+    >,
+    executor: Option<BackgroundExecutor>,
+    lsp_binary_status_tx: LspBinaryStatusSender,
+}
+
+struct LanguageRegistryState {
+    next_language_server_id: usize,
+    languages: Vec<Arc<Language>>,
+    available_languages: Vec<AvailableLanguage>,
+    grammars: HashMap<Arc<str>, AvailableGrammar>,
+    next_available_language_id: AvailableLanguageId,
+    loading_languages: HashMap<AvailableLanguageId, Vec<oneshot::Sender<Result<Arc<Language>>>>>,
+    subscription: (watch::Sender<()>, watch::Receiver<()>),
+    theme: Option<Arc<Theme>>,
+    version: usize,
+    reload_count: usize,
+}
+
+#[derive(Clone)]
+pub enum LanguageServerBinaryStatus {
+    CheckingForUpdate,
+    Downloading,
+    Downloaded,
+    Cached,
+    Failed { error: String },
+}
+
+pub struct PendingLanguageServer {
+    pub server_id: LanguageServerId,
+    pub task: Task<Result<lsp::LanguageServer>>,
+    pub container_dir: Option<Arc<Path>>,
+}
+
+#[derive(Clone)]
+struct AvailableLanguage {
+    id: AvailableLanguageId,
+    name: Arc<str>,
+    grammar: Option<Arc<str>>,
+    matcher: LanguageMatcher,
+    load: Arc<dyn Fn() -> Result<(LanguageConfig, LanguageQueries)> + 'static + Send + Sync>,
+    lsp_adapters: Vec<Arc<dyn LspAdapter>>,
+    loaded: bool,
+}
+
+type AvailableLanguageId = usize;
+
+enum AvailableGrammar {
+    Native(tree_sitter::Language),
+    Loaded(PathBuf, tree_sitter::Language),
+    Loading(PathBuf, Vec<oneshot::Sender<Result<tree_sitter::Language>>>),
+    Unloaded(PathBuf),
+}
+
+pub const QUERY_FILENAME_PREFIXES: &[(
+    &str,
+    fn(&mut LanguageQueries) -> &mut Option<Cow<'static, str>>,
+)] = &[
+    ("highlights", |q| &mut q.highlights),
+    ("brackets", |q| &mut q.brackets),
+    ("outline", |q| &mut q.outline),
+    ("indents", |q| &mut q.indents),
+    ("embedding", |q| &mut q.embedding),
+    ("injections", |q| &mut q.injections),
+    ("overrides", |q| &mut q.overrides),
+    ("redactions", |q| &mut q.redactions),
+];
+
+/// Tree-sitter language queries for a given language.
+#[derive(Debug, Default)]
+pub struct LanguageQueries {
+    pub highlights: Option<Cow<'static, str>>,
+    pub brackets: Option<Cow<'static, str>>,
+    pub indents: Option<Cow<'static, str>>,
+    pub outline: Option<Cow<'static, str>>,
+    pub embedding: Option<Cow<'static, str>>,
+    pub injections: Option<Cow<'static, str>>,
+    pub overrides: Option<Cow<'static, str>>,
+    pub redactions: Option<Cow<'static, str>>,
+}
+
+#[derive(Clone, Default)]
+struct LspBinaryStatusSender {
+    txs: Arc<Mutex<Vec<mpsc::UnboundedSender<(Arc<Language>, LanguageServerBinaryStatus)>>>>,
+}
+
+impl LanguageRegistry {
+    pub fn new(login_shell_env_loaded: Task<()>) -> Self {
+        Self {
+            state: RwLock::new(LanguageRegistryState {
+                next_language_server_id: 0,
+                languages: vec![PLAIN_TEXT.clone()],
+                available_languages: Default::default(),
+                grammars: Default::default(),
+                next_available_language_id: 0,
+                loading_languages: Default::default(),
+                subscription: watch::channel(),
+                theme: Default::default(),
+                version: 0,
+                reload_count: 0,
+            }),
+            language_server_download_dir: None,
+            login_shell_env_loaded: login_shell_env_loaded.shared(),
+            lsp_binary_paths: Default::default(),
+            executor: None,
+            lsp_binary_status_tx: Default::default(),
+        }
+    }
+
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn test() -> Self {
+        Self::new(Task::ready(()))
+    }
+
+    pub fn set_executor(&mut self, executor: BackgroundExecutor) {
+        self.executor = Some(executor);
+    }
+
+    /// Clears out all of the loaded languages and reload them from scratch.
+    pub fn reload(&self) {
+        self.state.write().reload();
+    }
+
+    /// Clears out the given languages and reload them from scratch.
+    pub fn reload_languages(&self, languages: &[Arc<str>], grammars: &[Arc<str>]) {
+        self.state.write().reload_languages(languages, grammars);
+    }
+
+    #[cfg(any(feature = "test-support", test))]
+    pub fn register_test_language(&self, config: LanguageConfig) {
+        self.register_language(
+            config.name.clone(),
+            config.grammar.clone(),
+            config.matcher.clone(),
+            vec![],
+            move || Ok((config.clone(), Default::default())),
+        )
+    }
+
+    /// Adds a language to the registry, which can be loaded if needed.
+    pub fn register_language(
+        &self,
+        name: Arc<str>,
+        grammar_name: Option<Arc<str>>,
+        matcher: LanguageMatcher,
+        lsp_adapters: Vec<Arc<dyn LspAdapter>>,
+        load: impl Fn() -> Result<(LanguageConfig, LanguageQueries)> + 'static + Send + Sync,
+    ) {
+        let load = Arc::new(load);
+        let state = &mut *self.state.write();
+
+        for existing_language in &mut state.available_languages {
+            if existing_language.name == name {
+                existing_language.grammar = grammar_name;
+                existing_language.matcher = matcher;
+                existing_language.lsp_adapters = lsp_adapters;
+                existing_language.load = load;
+                return;
+            }
+        }
+
+        state.available_languages.push(AvailableLanguage {
+            id: post_inc(&mut state.next_available_language_id),
+            name,
+            grammar: grammar_name,
+            matcher,
+            load,
+            lsp_adapters,
+            loaded: false,
+        });
+    }
+
+    /// Adds grammars to the registry. Language configurations reference a grammar by name. The
+    /// grammar controls how the source code is parsed.
+    pub fn register_native_grammars(
+        &self,
+        grammars: impl IntoIterator<Item = (impl Into<Arc<str>>, tree_sitter::Language)>,
+    ) {
+        self.state.write().grammars.extend(
+            grammars
+                .into_iter()
+                .map(|(name, grammar)| (name.into(), AvailableGrammar::Native(grammar))),
+        );
+    }
+
+    /// Adds paths to WASM grammar files, which can be loaded if needed.
+    pub fn register_wasm_grammars(
+        &self,
+        grammars: impl IntoIterator<Item = (impl Into<Arc<str>>, PathBuf)>,
+    ) {
+        self.state.write().grammars.extend(
+            grammars
+                .into_iter()
+                .map(|(name, path)| (name.into(), AvailableGrammar::Unloaded(path))),
+        );
+    }
+
+    pub fn language_names(&self) -> Vec<String> {
+        let state = self.state.read();
+        let mut result = state
+            .available_languages
+            .iter()
+            .filter_map(|l| l.loaded.not().then_some(l.name.to_string()))
+            .chain(state.languages.iter().map(|l| l.config.name.to_string()))
+            .collect::<Vec<_>>();
+        result.sort_unstable_by_key(|language_name| language_name.to_lowercase());
+        result
+    }
+
+    pub fn add(&self, language: Arc<Language>) {
+        self.state.write().add(language);
+    }
+
+    pub fn subscribe(&self) -> watch::Receiver<()> {
+        self.state.read().subscription.1.clone()
+    }
+
+    /// Returns the number of times that the registry has been changed,
+    /// by adding languages or reloading.
+    pub fn version(&self) -> usize {
+        self.state.read().version
+    }
+
+    /// Returns the number of times that the registry has been reloaded.
+    pub fn reload_count(&self) -> usize {
+        self.state.read().reload_count
+    }
+
+    pub fn set_theme(&self, theme: Arc<Theme>) {
+        let mut state = self.state.write();
+        state.theme = Some(theme.clone());
+        for language in &state.languages {
+            language.set_theme(theme.syntax());
+        }
+    }
+
+    pub fn set_language_server_download_dir(&mut self, path: impl Into<Arc<Path>>) {
+        self.language_server_download_dir = Some(path.into());
+    }
+
+    pub fn language_for_name(
+        self: &Arc<Self>,
+        name: &str,
+    ) -> UnwrapFuture<oneshot::Receiver<Result<Arc<Language>>>> {
+        let name = UniCase::new(name);
+        self.get_or_load_language(|language_name, _| UniCase::new(language_name) == name)
+    }
+
+    pub fn language_for_name_or_extension(
+        self: &Arc<Self>,
+        string: &str,
+    ) -> UnwrapFuture<oneshot::Receiver<Result<Arc<Language>>>> {
+        let string = UniCase::new(string);
+        self.get_or_load_language(|name, config| {
+            UniCase::new(name) == string
+                || config
+                    .path_suffixes
+                    .iter()
+                    .any(|suffix| UniCase::new(suffix) == string)
+        })
+    }
+
+    pub fn language_for_file(
+        self: &Arc<Self>,
+        path: impl AsRef<Path>,
+        content: Option<&Rope>,
+    ) -> UnwrapFuture<oneshot::Receiver<Result<Arc<Language>>>> {
+        let path = path.as_ref();
+        let filename = path.file_name().and_then(|name| name.to_str());
+        let extension = path.extension_or_hidden_file_name();
+        let path_suffixes = [extension, filename];
+        self.get_or_load_language(|_, config| {
+            let path_matches = config
+                .path_suffixes
+                .iter()
+                .any(|suffix| path_suffixes.contains(&Some(suffix.as_str())));
+            let content_matches = content.zip(config.first_line_pattern.as_ref()).map_or(
+                false,
+                |(content, pattern)| {
+                    let end = content.clip_point(Point::new(0, 256), Bias::Left);
+                    let end = content.point_to_offset(end);
+                    let text = content.chunks_in_range(0..end).collect::<String>();
+                    pattern.is_match(&text)
+                },
+            );
+            path_matches || content_matches
+        })
+    }
+
+    fn get_or_load_language(
+        self: &Arc<Self>,
+        callback: impl Fn(&str, &LanguageMatcher) -> bool,
+    ) -> UnwrapFuture<oneshot::Receiver<Result<Arc<Language>>>> {
+        let (tx, rx) = oneshot::channel();
+
+        let mut state = self.state.write();
+        if let Some(language) = state
+            .languages
+            .iter()
+            .find(|language| callback(language.config.name.as_ref(), &language.config.matcher))
+        {
+            let _ = tx.send(Ok(language.clone()));
+        } else if let Some(executor) = self.executor.clone() {
+            if let Some(language) = state
+                .available_languages
+                .iter()
+                .rfind(|l| !l.loaded && callback(&l.name, &l.matcher))
+                .cloned()
+            {
+                match state.loading_languages.entry(language.id) {
+                    hash_map::Entry::Occupied(mut entry) => entry.get_mut().push(tx),
+                    hash_map::Entry::Vacant(entry) => {
+                        let this = self.clone();
+                        executor
+                            .spawn(async move {
+                                let id = language.id;
+                                let name = language.name.clone();
+                                let language = async {
+                                    let (config, queries) = (language.load)()?;
+
+                                    let grammar = if let Some(grammar) = config.grammar.clone() {
+                                        Some(this.get_or_load_grammar(grammar).await?)
+                                    } else {
+                                        None
+                                    };
+
+                                    Language::new(config, grammar)
+                                        .with_lsp_adapters(language.lsp_adapters)
+                                        .await
+                                        .with_queries(queries)
+                                }
+                                .await;
+
+                                match language {
+                                    Ok(language) => {
+                                        let language = Arc::new(language);
+                                        let mut state = this.state.write();
+
+                                        state.add(language.clone());
+                                        state.mark_language_loaded(id);
+                                        if let Some(mut txs) = state.loading_languages.remove(&id) {
+                                            for tx in txs.drain(..) {
+                                                let _ = tx.send(Ok(language.clone()));
+                                            }
+                                        }
+                                    }
+                                    Err(e) => {
+                                        log::error!("failed to load language {name}:\n{:?}", e);
+                                        let mut state = this.state.write();
+                                        state.mark_language_loaded(id);
+                                        if let Some(mut txs) = state.loading_languages.remove(&id) {
+                                            for tx in txs.drain(..) {
+                                                let _ = tx.send(Err(anyhow!(
+                                                    "failed to load language {}: {}",
+                                                    name,
+                                                    e
+                                                )));
+                                            }
+                                        }
+                                    }
+                                };
+                            })
+                            .detach();
+                        entry.insert(vec![tx]);
+                    }
+                }
+            } else {
+                let _ = tx.send(Err(anyhow!("language not found")));
+            }
+        } else {
+            let _ = tx.send(Err(anyhow!("executor does not exist")));
+        }
+
+        rx.unwrap()
+    }
+
+    fn get_or_load_grammar(
+        self: &Arc<Self>,
+        name: Arc<str>,
+    ) -> UnwrapFuture<oneshot::Receiver<Result<tree_sitter::Language>>> {
+        let (tx, rx) = oneshot::channel();
+        let mut state = self.state.write();
+
+        if let Some(grammar) = state.grammars.get_mut(name.as_ref()) {
+            match grammar {
+                AvailableGrammar::Native(grammar) | AvailableGrammar::Loaded(_, grammar) => {
+                    tx.send(Ok(grammar.clone())).ok();
+                }
+                AvailableGrammar::Loading(_, txs) => {
+                    txs.push(tx);
+                }
+                AvailableGrammar::Unloaded(wasm_path) => {
+                    if let Some(executor) = &self.executor {
+                        let this = self.clone();
+                        executor
+                            .spawn({
+                                let wasm_path = wasm_path.clone();
+                                async move {
+                                    let wasm_bytes = std::fs::read(&wasm_path)?;
+                                    let grammar_name = wasm_path
+                                        .file_stem()
+                                        .and_then(OsStr::to_str)
+                                        .ok_or_else(|| anyhow!("invalid grammar filename"))?;
+                                    let grammar = PARSER.with(|parser| {
+                                        let mut parser = parser.borrow_mut();
+                                        let mut store = parser.take_wasm_store().unwrap();
+                                        let grammar =
+                                            store.load_language(&grammar_name, &wasm_bytes);
+                                        parser.set_wasm_store(store).unwrap();
+                                        grammar
+                                    })?;
+
+                                    if let Some(AvailableGrammar::Loading(_, txs)) =
+                                        this.state.write().grammars.insert(
+                                            name,
+                                            AvailableGrammar::Loaded(wasm_path, grammar.clone()),
+                                        )
+                                    {
+                                        for tx in txs {
+                                            tx.send(Ok(grammar.clone())).ok();
+                                        }
+                                    }
+
+                                    anyhow::Ok(())
+                                }
+                            })
+                            .detach();
+                        *grammar = AvailableGrammar::Loading(wasm_path.clone(), vec![tx]);
+                    }
+                }
+            }
+        } else {
+            tx.send(Err(anyhow!("no such grammar {}", name))).ok();
+        }
+
+        rx.unwrap()
+    }
+
+    pub fn to_vec(&self) -> Vec<Arc<Language>> {
+        self.state.read().languages.iter().cloned().collect()
+    }
+
+    pub fn create_pending_language_server(
+        self: &Arc<Self>,
+        stderr_capture: Arc<Mutex<Option<String>>>,
+        language: Arc<Language>,
+        adapter: Arc<CachedLspAdapter>,
+        root_path: Arc<Path>,
+        delegate: Arc<dyn LspAdapterDelegate>,
+        cx: &mut AppContext,
+    ) -> Option<PendingLanguageServer> {
+        let server_id = self.state.write().next_language_server_id();
+        log::info!(
+            "starting language server {:?}, path: {root_path:?}, id: {server_id}",
+            adapter.name.0
+        );
+
+        #[cfg(any(test, feature = "test-support"))]
+        if language.fake_adapter.is_some() {
+            let task = cx.spawn(|cx| async move {
+                let (servers_tx, fake_adapter) = language.fake_adapter.as_ref().unwrap();
+                let (server, mut fake_server) = lsp::FakeLanguageServer::new(
+                    fake_adapter.name.to_string(),
+                    fake_adapter.capabilities.clone(),
+                    cx.clone(),
+                );
+
+                if let Some(initializer) = &fake_adapter.initializer {
+                    initializer(&mut fake_server);
+                }
+
+                let servers_tx = servers_tx.clone();
+                cx.background_executor()
+                    .spawn(async move {
+                        if fake_server
+                            .try_receive_notification::<lsp::notification::Initialized>()
+                            .await
+                            .is_some()
+                        {
+                            servers_tx.unbounded_send(fake_server).ok();
+                        }
+                    })
+                    .detach();
+
+                Ok(server)
+            });
+
+            return Some(PendingLanguageServer {
+                server_id,
+                task,
+                container_dir: None,
+            });
+        }
+
+        let download_dir = self
+            .language_server_download_dir
+            .clone()
+            .ok_or_else(|| anyhow!("language server download directory has not been assigned before starting server"))
+            .log_err()?;
+        let this = self.clone();
+        let language = language.clone();
+        let container_dir: Arc<Path> = Arc::from(download_dir.join(adapter.name.0.as_ref()));
+        let root_path = root_path.clone();
+        let adapter = adapter.clone();
+        let login_shell_env_loaded = self.login_shell_env_loaded.clone();
+        let lsp_binary_statuses = self.lsp_binary_status_tx.clone();
+
+        let task = {
+            let container_dir = container_dir.clone();
+            cx.spawn(move |mut cx| async move {
+                login_shell_env_loaded.await;
+
+                let entry = this
+                    .lsp_binary_paths
+                    .lock()
+                    .entry(adapter.name.clone())
+                    .or_insert_with(|| {
+                        let adapter = adapter.clone();
+                        let language = language.clone();
+                        let delegate = delegate.clone();
+                        cx.spawn(|cx| {
+                            get_binary(
+                                adapter,
+                                language,
+                                delegate,
+                                container_dir,
+                                lsp_binary_statuses,
+                                cx,
+                            )
+                            .map_err(Arc::new)
+                        })
+                        .shared()
+                    })
+                    .clone();
+
+                let binary = match entry.await {
+                    Ok(binary) => binary,
+                    Err(err) => anyhow::bail!("{err}"),
+                };
+
+                if let Some(task) = adapter.will_start_server(&delegate, &mut cx) {
+                    task.await?;
+                }
+
+                lsp::LanguageServer::new(
+                    stderr_capture,
+                    server_id,
+                    binary,
+                    &root_path,
+                    adapter.code_action_kinds(),
+                    cx,
+                )
+            })
+        };
+
+        Some(PendingLanguageServer {
+            server_id,
+            task,
+            container_dir: Some(container_dir),
+        })
+    }
+
+    pub fn language_server_binary_statuses(
+        &self,
+    ) -> mpsc::UnboundedReceiver<(Arc<Language>, LanguageServerBinaryStatus)> {
+        self.lsp_binary_status_tx.subscribe()
+    }
+
+    pub fn delete_server_container(
+        &self,
+        adapter: Arc<CachedLspAdapter>,
+        cx: &mut AppContext,
+    ) -> Task<()> {
+        log::info!("deleting server container");
+
+        let mut lock = self.lsp_binary_paths.lock();
+        lock.remove(&adapter.name);
+
+        let download_dir = self
+            .language_server_download_dir
+            .clone()
+            .expect("language server download directory has not been assigned before deleting server container");
+
+        cx.spawn(|_| async move {
+            let container_dir = download_dir.join(adapter.name.0.as_ref());
+            smol::fs::remove_dir_all(container_dir)
+                .await
+                .context("server container removal")
+                .log_err();
+        })
+    }
+
+    pub fn next_language_server_id(&self) -> LanguageServerId {
+        self.state.write().next_language_server_id()
+    }
+}
+
+#[cfg(any(test, feature = "test-support"))]
+impl Default for LanguageRegistry {
+    fn default() -> Self {
+        Self::test()
+    }
+}
+
+impl LanguageRegistryState {
+    fn next_language_server_id(&mut self) -> LanguageServerId {
+        LanguageServerId(post_inc(&mut self.next_language_server_id))
+    }
+
+    fn add(&mut self, language: Arc<Language>) {
+        if let Some(theme) = self.theme.as_ref() {
+            language.set_theme(theme.syntax());
+        }
+        self.languages.push(language);
+        self.version += 1;
+        *self.subscription.0.borrow_mut() = ();
+    }
+
+    fn reload(&mut self) {
+        self.languages.clear();
+        self.version += 1;
+        self.reload_count += 1;
+        for language in &mut self.available_languages {
+            language.loaded = false;
+        }
+        *self.subscription.0.borrow_mut() = ();
+    }
+
+    fn reload_languages(
+        &mut self,
+        languages_to_reload: &[Arc<str>],
+        grammars_to_reload: &[Arc<str>],
+    ) {
+        for (name, grammar) in self.grammars.iter_mut() {
+            if grammars_to_reload.contains(name) {
+                if let AvailableGrammar::Loaded(path, _) = grammar {
+                    *grammar = AvailableGrammar::Unloaded(path.clone());
+                }
+            }
+        }
+
+        self.languages.retain(|language| {
+            let should_reload = languages_to_reload.contains(&language.config.name)
+                || language
+                    .config
+                    .grammar
+                    .as_ref()
+                    .map_or(false, |grammar| grammars_to_reload.contains(&grammar));
+            !should_reload
+        });
+
+        for language in &mut self.available_languages {
+            if languages_to_reload.contains(&language.name)
+                || language
+                    .grammar
+                    .as_ref()
+                    .map_or(false, |grammar| grammars_to_reload.contains(grammar))
+            {
+                language.loaded = false;
+            }
+        }
+
+        self.version += 1;
+        self.reload_count += 1;
+        *self.subscription.0.borrow_mut() = ();
+    }
+
+    /// Mark the given language as having been loaded, so that the
+    /// language registry won't try to load it again.
+    fn mark_language_loaded(&mut self, id: AvailableLanguageId) {
+        for language in &mut self.available_languages {
+            if language.id == id {
+                language.loaded = true;
+                break;
+            }
+        }
+    }
+}
+
+impl LspBinaryStatusSender {
+    fn subscribe(&self) -> mpsc::UnboundedReceiver<(Arc<Language>, LanguageServerBinaryStatus)> {
+        let (tx, rx) = mpsc::unbounded();
+        self.txs.lock().push(tx);
+        rx
+    }
+
+    fn send(&self, language: Arc<Language>, status: LanguageServerBinaryStatus) {
+        let mut txs = self.txs.lock();
+        txs.retain(|tx| {
+            tx.unbounded_send((language.clone(), status.clone()))
+                .is_ok()
+        });
+    }
+}
+
+async fn get_binary(
+    adapter: Arc<CachedLspAdapter>,
+    language: Arc<Language>,
+    delegate: Arc<dyn LspAdapterDelegate>,
+    container_dir: Arc<Path>,
+    statuses: LspBinaryStatusSender,
+    mut cx: AsyncAppContext,
+) -> Result<LanguageServerBinary> {
+    if !container_dir.exists() {
+        smol::fs::create_dir_all(&container_dir)
+            .await
+            .context("failed to create container directory")?;
+    }
+
+    if let Some(task) = adapter.will_fetch_server(&delegate, &mut cx) {
+        task.await?;
+    }
+
+    let binary = fetch_latest_binary(
+        adapter.clone(),
+        language.clone(),
+        delegate.as_ref(),
+        &container_dir,
+        statuses.clone(),
+    )
+    .await;
+
+    if let Err(error) = binary.as_ref() {
+        if let Some(binary) = adapter
+            .cached_server_binary(container_dir.to_path_buf(), delegate.as_ref())
+            .await
+        {
+            statuses.send(language.clone(), LanguageServerBinaryStatus::Cached);
+            return Ok(binary);
+        } else {
+            statuses.send(
+                language.clone(),
+                LanguageServerBinaryStatus::Failed {
+                    error: format!("{:?}", error),
+                },
+            );
+        }
+    }
+
+    binary
+}
+
+async fn fetch_latest_binary(
+    adapter: Arc<CachedLspAdapter>,
+    language: Arc<Language>,
+    delegate: &dyn LspAdapterDelegate,
+    container_dir: &Path,
+    lsp_binary_statuses_tx: LspBinaryStatusSender,
+) -> Result<LanguageServerBinary> {
+    let container_dir: Arc<Path> = container_dir.into();
+    lsp_binary_statuses_tx.send(
+        language.clone(),
+        LanguageServerBinaryStatus::CheckingForUpdate,
+    );
+
+    let version_info = adapter.fetch_latest_server_version(delegate).await?;
+    lsp_binary_statuses_tx.send(language.clone(), LanguageServerBinaryStatus::Downloading);
+
+    let binary = adapter
+        .fetch_server_binary(version_info, container_dir.to_path_buf(), delegate)
+        .await?;
+    lsp_binary_statuses_tx.send(language.clone(), LanguageServerBinaryStatus::Downloaded);
+
+    Ok(binary)
+}
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index 4cb321f9c0..fcef76273d 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -2861,21 +2861,16 @@ async fn test_save_as(cx: &mut gpui::TestAppContext) {
     let project = Project::test(fs.clone(), ["/dir".as_ref()], cx).await;
 
     let languages = project.update(cx, |project, _| project.languages().clone());
-    languages.add_grammars([("rust", tree_sitter_rust::language())]);
-    languages.register(
-        "/some/path",
-        LanguageConfig {
-            name: "Rust".into(),
-            grammar: Some("rust".into()),
-            matcher: LanguageMatcher {
-                path_suffixes: vec!["rs".into()],
-                ..Default::default()
-            },
+    languages.register_native_grammars([("rust", tree_sitter_rust::language())]);
+    languages.register_test_language(LanguageConfig {
+        name: "Rust".into(),
+        grammar: Some("rust".into()),
+        matcher: LanguageMatcher {
+            path_suffixes: vec!["rs".into()],
             ..Default::default()
         },
-        vec![],
-        |_| Default::default(),
-    );
+        ..Default::default()
+    });
 
     let buffer = project.update(cx, |project, cx| {
         project.create_buffer("", None, cx).unwrap()
diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index af0fc62512..e032cd7521 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -62,7 +62,7 @@ pub fn init(
     ElixirSettings::register(cx);
     DenoSettings::register(cx);
 
-    languages.add_grammars([
+    languages.register_native_grammars([
         ("bash", tree_sitter_bash::language()),
         ("beancount", tree_sitter_beancount::language()),
         ("c", tree_sitter_c::language()),
@@ -115,8 +115,15 @@ pub fn init(
         ("zig", tree_sitter_zig::language()),
     ]);
 
-    let language = |name: &'static str, adapters| {
-        languages.register(name, load_config(name), adapters, load_queries)
+    let language = |asset_dir_name: &'static str, adapters| {
+        let config = load_config(asset_dir_name);
+        languages.register_language(
+            config.name.clone(),
+            config.grammar.clone(),
+            config.matcher.clone(),
+            adapters,
+            move || Ok((config.clone(), load_queries(asset_dir_name))),
+        )
     };
 
     language("bash", vec![]);

From 07891b49787f6a50c37a59f8873591496a92bb42 Mon Sep 17 00:00:00 2001
From: Christian Bergschneider <christian.bergschneider@gmx.de>
Date: Thu, 8 Feb 2024 23:31:14 +0100
Subject: [PATCH 339/372] gpui: Set window title on Linux (#7589)

Release Notes:
- N/A


Hello everyone,
glad to be contributing to this awesome project! This just fixes a
simple todo!(linux) in gpui.

I also considered setting the window title in the hello world example,
let me know if I should add it in this PR as well.

Best Regards,
Christian Bergschneider
---
 crates/gpui/src/platform/linux/window.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index e88ebde029..d396c74628 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -340,8 +340,15 @@ impl PlatformWindow for LinuxWindow {
     //todo!(linux)
     fn activate(&self) {}
 
-    //todo!(linux)
-    fn set_title(&mut self, title: &str) {}
+    fn set_title(&mut self, title: &str) {
+        self.0.xcb_connection.send_request(&x::ChangeProperty {
+            mode: x::PropMode::Replace,
+            window: self.0.x_window,
+            property: x::ATOM_WM_NAME,
+            r#type: x::ATOM_STRING,
+            data: title.as_bytes(),
+        });
+    }
 
     //todo!(linux)
     fn set_edited(&mut self, edited: bool) {}

From 91c699aeaa3a268a84f11a21f24c7f21a095f10f Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 8 Feb 2024 20:04:55 -0700
Subject: [PATCH 340/372] Revert "Debug build (#7176)" (#7577)

This reverts commit aaba98d8ecba934369d15f55d55688d569ca8fbe.

Release Notes:

- N/A
---
 script/bundle | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/script/bundle b/script/bundle
index d1fbeeb9a8..9c0dddbac4 100755
--- a/script/bundle
+++ b/script/bundle
@@ -79,11 +79,6 @@ version_info=$(rustc --version --verbose)
 host_line=$(echo "$version_info" | grep host)
 local_target_triple=${host_line#*: }
 
-if [ -z "$ZED_CLIENT_CHECKSUM_SEED" ]; then
-    echo "Missing ZED_CLIENT_CHECKSUM_SEED environment variable"
-    exit 1
-fi
-
 if [ "$local_arch" = true ]; then
     echo "Building for local target only."
     cargo build ${build_flag} --package ${zed_crate}

From 0ab1094f0c974a3731a19228165c782fe714d12c Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Thu, 8 Feb 2024 21:41:15 -0800
Subject: [PATCH 341/372] linux: quit after the last window is closed (#7602)

Release Notes:
- N/A
---
 crates/gpui/src/platform/linux/platform.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index 1776ee00b7..b5ab1fcf93 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -125,11 +125,8 @@ impl Platform for LinuxPlatform {
                             // window "x" button clicked by user, we gracefully exit
                             let window = self.state.lock().windows.remove(&ev.window()).unwrap();
                             window.destroy();
-                            if self.state.lock().windows.is_empty() {
-                                if let Some(ref mut fun) = self.callbacks.lock().quit {
-                                    fun();
-                                }
-                            }
+                            let mut state = self.state.lock();
+                            state.quit_requested |= state.windows.is_empty();
                         }
                     }
                 }
@@ -164,6 +161,10 @@ impl Platform for LinuxPlatform {
                 runnable.run();
             }
         }
+
+        if let Some(ref mut fun) = self.callbacks.lock().quit {
+            fun();
+        }
     }
 
     fn quit(&self) {

From 67d280b8cbcdd1113d75d3e499f6313c2b1a648b Mon Sep 17 00:00:00 2001
From: h3mosphere <129932586+h3mosphere@users.noreply.github.com>
Date: Fri, 9 Feb 2024 17:49:03 +1100
Subject: [PATCH 342/372] Linux: Experiment with CosmicText based Text System
 (#7539)

This is a rebase of @gabydds text_system updates. with some small
cleanups.

Currently cannot test this as build is not working in linux. Im just
putting it up here before I forget about it.

---------

Co-authored-by: gabydd <gabydinnerdavid@gmail.com>
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
---
 Cargo.lock                                    | 174 +++++++-
 crates/gpui/Cargo.toml                        |   1 +
 crates/gpui/src/platform/linux/text_system.rs | 394 ++++++++++++++++--
 crates/gpui/src/style.rs                      |   8 +-
 crates/gpui/src/text_system.rs                |   1 +
 5 files changed, 531 insertions(+), 47 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d13d45beeb..934599122b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1917,6 +1917,27 @@ dependencies = [
  "bindgen 0.64.0",
 ]
 
+[[package]]
+name = "cosmic-text"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75acbfb314aeb4f5210d379af45ed1ec2c98c7f1790bf57b8a4c562ac0c51b71"
+dependencies = [
+ "fontdb 0.15.0",
+ "libm",
+ "log",
+ "rangemap",
+ "rustc-hash",
+ "rustybuzz 0.11.0",
+ "self_cell",
+ "swash",
+ "sys-locale",
+ "unicode-bidi",
+ "unicode-linebreak",
+ "unicode-script",
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "cpal"
 version = "0.15.2"
@@ -2875,6 +2896,21 @@ dependencies = [
  "yeslogic-fontconfig-sys",
 ]
 
+[[package]]
+name = "font-types"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bd7f3ea17572640b606b35df42cfb6ecdf003704b062580e59918692190b73d"
+
+[[package]]
+name = "fontconfig-parser"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d"
+dependencies = [
+ "roxmltree 0.19.0",
+]
+
 [[package]]
 name = "fontdb"
 version = "0.5.4"
@@ -2882,10 +2918,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e58903f4f8d5b58c7d300908e4ebe5289c1bfdf5587964330f12023b8ff17fd1"
 dependencies = [
  "log",
- "memmap2",
+ "memmap2 0.2.3",
  "ttf-parser 0.12.3",
 ]
 
+[[package]]
+name = "fontdb"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "020e203f177c0fb250fb19455a252e838d2bbbce1f80f25ecc42402aafa8cd38"
+dependencies = [
+ "fontconfig-parser",
+ "log",
+ "memmap2 0.8.0",
+ "slotmap",
+ "tinyvec",
+ "ttf-parser 0.19.2",
+]
+
 [[package]]
 name = "foreign-types"
 version = "0.3.2"
@@ -3385,6 +3435,7 @@ dependencies = [
  "core-foundation",
  "core-graphics 0.22.3",
  "core-text",
+ "cosmic-text",
  "ctor",
  "derive_more",
  "dhat",
@@ -4278,9 +4329,9 @@ dependencies = [
 
 [[package]]
 name = "libm"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "libmimalloc-sys"
@@ -4614,6 +4665,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "memmap2"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "memoffset"
 version = "0.6.5"
@@ -6397,6 +6457,12 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
+[[package]]
+name = "rangemap"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "977b1e897f9d764566891689e642653e5ed90c6895106acd005eb4c1d0203991"
+
 [[package]]
 name = "raw-window-handle"
 version = "0.5.2"
@@ -6453,6 +6519,15 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be9e29cb19c8fe84169fcb07f8f11e66bc9e6e0280efd4715c54818296f8a4a8"
 
+[[package]]
+name = "read-fonts"
+version = "0.15.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1362980db95801b70031dd592dc052a44b1810ca9da8fbcf7b25983f3174ed0"
+dependencies = [
+ "font-types",
+]
+
 [[package]]
 name = "recent_projects"
 version = "0.1.0"
@@ -6791,6 +6866,12 @@ dependencies = [
  "xmlparser",
 ]
 
+[[package]]
+name = "roxmltree"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
+
 [[package]]
 name = "rpc"
 version = "0.1.0"
@@ -7041,6 +7122,23 @@ dependencies = [
  "unicode-script",
 ]
 
+[[package]]
+name = "rustybuzz"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ee8fe2a8461a0854a37101fe7a1b13998d0cfa987e43248e81d2a5f4570f6fa"
+dependencies = [
+ "bitflags 1.3.2",
+ "bytemuck",
+ "libm",
+ "smallvec",
+ "ttf-parser 0.20.0",
+ "unicode-bidi-mirroring",
+ "unicode-ccc",
+ "unicode-properties",
+ "unicode-script",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.15"
@@ -7297,6 +7395,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "self_cell"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba"
+
 [[package]]
 name = "semantic_index"
 version = "0.1.0"
@@ -8248,6 +8352,17 @@ dependencies = [
  "siphasher 0.2.3",
 ]
 
+[[package]]
+name = "swash"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d06ff4664af8923625604261c645f5c4cc610cc83c84bec74b50d76237089de7"
+dependencies = [
+ "read-fonts",
+ "yazi",
+ "zeno",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -8286,6 +8401,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "sys-locale"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "sysinfo"
 version = "0.29.10"
@@ -9393,6 +9517,18 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ae2f58a822f08abdaf668897e96a5656fe72f5a9ce66422423e8849384872e6"
 
+[[package]]
+name = "ttf-parser"
+version = "0.19.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1"
+
+[[package]]
+name = "ttf-parser"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
+
 [[package]]
 name = "tungstenite"
 version = "0.16.0"
@@ -9495,6 +9631,12 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
+[[package]]
+name = "unicode-linebreak"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
+
 [[package]]
 name = "unicode-normalization"
 version = "0.1.22"
@@ -9504,6 +9646,12 @@ dependencies = [
  "tinyvec",
 ]
 
+[[package]]
+name = "unicode-properties"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291"
+
 [[package]]
 name = "unicode-script"
 version = "0.5.5"
@@ -9579,14 +9727,14 @@ dependencies = [
  "base64 0.13.1",
  "data-url",
  "flate2",
- "fontdb",
+ "fontdb 0.5.4",
  "kurbo",
  "log",
- "memmap2",
+ "memmap2 0.2.3",
  "pico-args",
  "rctree",
- "roxmltree",
- "rustybuzz",
+ "roxmltree 0.14.1",
+ "rustybuzz 0.3.0",
  "simplecss",
  "siphasher 0.2.3",
  "svgtypes",
@@ -10564,6 +10712,12 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
 
+[[package]]
+name = "yazi"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1"
+
 [[package]]
 name = "yeslogic-fontconfig-sys"
 version = "3.2.0"
@@ -10733,6 +10887,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "zeno"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697"
+
 [[package]]
 name = "zeroize"
 version = "1.6.0"
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 2b00049ec6..1bf95cfc33 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -102,3 +102,4 @@ as-raw-xcb-connection = "1"
 blade-graphics = { git = "https://github.com/kvark/blade", rev = "26bc5e8b9ef67b4f2970eb95888db733eace98f3" }
 blade-macros = { git = "https://github.com/kvark/blade", rev = "26bc5e8b9ef67b4f2970eb95888db733eace98f3" }
 bytemuck = "1"
+cosmic-text = "0.10.0"
\ No newline at end of file
diff --git a/crates/gpui/src/platform/linux/text_system.rs b/crates/gpui/src/platform/linux/text_system.rs
index 885a6b1736..574f65381d 100644
--- a/crates/gpui/src/platform/linux/text_system.rs
+++ b/crates/gpui/src/platform/linux/text_system.rs
@@ -1,40 +1,49 @@
 //todo!(linux) remove
 #[allow(unused)]
+use crate::{point, size, FontStyle, FontWeight, Point, ShapedGlyph};
 use crate::{
-    Bounds, DevicePixels, Font, FontId, FontMetrics, FontRun, GlyphId, LineLayout, Pixels,
-    PlatformTextSystem, RenderGlyphParams, SharedString, Size,
+    Bounds, DevicePixels, Font, FontFeatures, FontId, FontMetrics, FontRun, GlyphId, LineLayout,
+    Pixels, PlatformTextSystem, RenderGlyphParams, SharedString, Size,
 };
+use anyhow::Ok;
 use anyhow::Result;
+use anyhow::{anyhow, Context};
 use collections::HashMap;
-use font_kit::{font::Font as FontKitFont, source::SystemSource, sources::mem::MemSource};
-use parking_lot::RwLock;
+use cosmic_text::fontdb::Query;
+use cosmic_text::{
+    Attrs, AttrsList, BufferLine, CacheKey, Family, Font as CosmicTextFont, FontSystem, SwashCache,
+};
+use parking_lot::{RwLock, RwLockUpgradableReadGuard};
+use pathfinder_geometry::rect::RectF;
+use pathfinder_geometry::rect::RectI;
+use pathfinder_geometry::vector::{Vector2F, Vector2I};
 use smallvec::SmallVec;
-use std::borrow::Cow;
+use std::{borrow::Cow, sync::Arc};
 
 pub(crate) struct LinuxTextSystem(RwLock<LinuxTextSystemState>);
 
 struct LinuxTextSystemState {
-    memory_source: MemSource,
-    system_source: SystemSource,
-    fonts: Vec<FontKitFont>,
+    swash_cache: SwashCache,
+    font_system: FontSystem,
+    fonts: Vec<Arc<CosmicTextFont>>,
     font_selections: HashMap<Font, FontId>,
-    font_ids_by_postscript_name: HashMap<String, FontId>,
     font_ids_by_family_name: HashMap<SharedString, SmallVec<[FontId; 4]>>,
     postscript_names_by_font_id: HashMap<FontId, String>,
 }
 
-// todo!(linux): Double check this
-unsafe impl Send for LinuxTextSystemState {}
-unsafe impl Sync for LinuxTextSystemState {}
-
 impl LinuxTextSystem {
     pub(crate) fn new() -> Self {
+        let mut font_system = FontSystem::new();
+
+        // todo!(linux) make font loading non-blocking
+        font_system.db_mut().load_system_fonts();
+
         Self(RwLock::new(LinuxTextSystemState {
-            memory_source: MemSource::empty(),
-            system_source: SystemSource::new(),
+            font_system,
+            swash_cache: SwashCache::new(),
             fonts: Vec::new(),
             font_selections: HashMap::default(),
-            font_ids_by_postscript_name: HashMap::default(),
+            // font_ids_by_postscript_name: HashMap::default(),
             font_ids_by_family_name: HashMap::default(),
             postscript_names_by_font_id: HashMap::default(),
         }))
@@ -49,14 +58,20 @@ impl Default for LinuxTextSystem {
 
 #[allow(unused)]
 impl PlatformTextSystem for LinuxTextSystem {
-    // todo!(linux)
     fn add_fonts(&self, fonts: Vec<Cow<'static, [u8]>>) -> Result<()> {
-        Ok(())
+        self.0.write().add_fonts(fonts)
     }
 
-    // todo!(linux)
+    // todo!(linux) ensure that this integrates with platform font loading
+    // do we need to do more than call load_system_fonts()?
     fn all_font_names(&self) -> Vec<String> {
-        Vec::new()
+        self.0
+            .read()
+            .font_system
+            .db()
+            .faces()
+            .map(|face| face.post_script_name.clone())
+            .collect()
     }
 
     // todo!(linux)
@@ -64,51 +79,112 @@ impl PlatformTextSystem for LinuxTextSystem {
         Vec::new()
     }
 
-    // todo!(linux)
-    fn font_id(&self, descriptor: &Font) -> Result<FontId> {
-        Ok(FontId(0))
+    fn font_id(&self, font: &Font) -> Result<FontId> {
+        // todo!(linux): Do we need to use CosmicText's Font APIs? Can we consolidate this to use font_kit?
+        let lock = self.0.upgradable_read();
+        if let Some(font_id) = lock.font_selections.get(font) {
+            Ok(*font_id)
+        } else {
+            let mut lock = RwLockUpgradableReadGuard::upgrade(lock);
+            let candidates = if let Some(font_ids) = lock.font_ids_by_family_name.get(&font.family)
+            {
+                font_ids.as_slice()
+            } else {
+                let font_ids = lock.load_family(&font.family, font.features)?;
+                lock.font_ids_by_family_name
+                    .insert(font.family.clone(), font_ids);
+                lock.font_ids_by_family_name[&font.family].as_ref()
+            };
+
+            let id = lock
+                .font_system
+                .db()
+                .query(&Query {
+                    families: &[Family::Name(&font.family)],
+                    weight: font.weight.into(),
+                    style: font.style.into(),
+                    stretch: Default::default(),
+                })
+                .context("no font")?;
+
+            let font_id = if let Some(font_id) = lock.fonts.iter().position(|font| font.id() == id)
+            {
+                FontId(font_id)
+            } else {
+                // Font isn't in fonts so add it there, this is because we query all the fonts in the db
+                // and maybe we haven't loaded it yet
+                let font_id = FontId(lock.fonts.len());
+                let font = lock.font_system.get_font(id).unwrap();
+                lock.fonts.push(font);
+                font_id
+            };
+
+            lock.font_selections.insert(font.clone(), font_id);
+            Ok(font_id)
+        }
     }
 
-    // todo!(linux)
     fn font_metrics(&self, font_id: FontId) -> FontMetrics {
-        unimplemented!()
+        let metrics = self.0.read().fonts[font_id.0].as_swash().metrics(&[]);
+
+        FontMetrics {
+            units_per_em: metrics.units_per_em as u32,
+            ascent: metrics.ascent,
+            descent: -metrics.descent, // todo!(linux) confirm this is correct
+            line_gap: metrics.leading,
+            underline_position: metrics.underline_offset,
+            underline_thickness: metrics.stroke_size,
+            cap_height: metrics.cap_height,
+            x_height: metrics.x_height,
+            // todo!(linux): Compute this correctly
+            bounding_box: Bounds {
+                origin: point(0.0, 0.0),
+                size: size(metrics.max_width, metrics.ascent + metrics.descent),
+            },
+        }
     }
 
-    // todo!(linux)
     fn typographic_bounds(&self, font_id: FontId, glyph_id: GlyphId) -> Result<Bounds<f32>> {
-        unimplemented!()
+        let lock = self.0.read();
+        let metrics = lock.fonts[font_id.0].as_swash().metrics(&[]);
+        let glyph_metrics = lock.fonts[font_id.0].as_swash().glyph_metrics(&[]);
+        let glyph_id = glyph_id.0 as u16;
+        // todo!(linux): Compute this correctly
+        // see https://github.com/servo/font-kit/blob/master/src/loaders/freetype.rs#L614-L620
+        Ok(Bounds {
+            origin: point(0.0, 0.0),
+            size: size(
+                glyph_metrics.advance_width(glyph_id),
+                glyph_metrics.advance_height(glyph_id),
+            ),
+        })
     }
 
-    // todo!(linux)
     fn advance(&self, font_id: FontId, glyph_id: GlyphId) -> Result<Size<f32>> {
-        unimplemented!()
+        self.0.read().advance(font_id, glyph_id)
     }
 
-    // todo!(linux)
     fn glyph_for_char(&self, font_id: FontId, ch: char) -> Option<GlyphId> {
-        None
+        self.0.read().glyph_for_char(font_id, ch)
     }
 
-    // todo!(linux)
     fn glyph_raster_bounds(&self, params: &RenderGlyphParams) -> Result<Bounds<DevicePixels>> {
-        unimplemented!()
+        self.0.write().raster_bounds(params)
     }
 
-    // todo!(linux)
     fn rasterize_glyph(
         &self,
         params: &RenderGlyphParams,
         raster_bounds: Bounds<DevicePixels>,
     ) -> Result<(Size<DevicePixels>, Vec<u8>)> {
-        unimplemented!()
+        self.0.write().rasterize_glyph(params, raster_bounds)
     }
 
-    // todo!(linux)
     fn layout_line(&self, text: &str, font_size: Pixels, runs: &[FontRun]) -> LineLayout {
-        LineLayout::default() //TODO
+        self.0.write().layout_line(text, font_size, runs)
     }
 
-    // todo!(linux)
+    // todo!(linux) Confirm that this has been superseded by the LineWrapper
     fn wrap_line(
         &self,
         text: &str,
@@ -119,3 +195,245 @@ impl PlatformTextSystem for LinuxTextSystem {
         unimplemented!()
     }
 }
+
+impl LinuxTextSystemState {
+    fn add_fonts(&mut self, fonts: Vec<Cow<'static, [u8]>>) -> Result<()> {
+        let db = self.font_system.db_mut();
+        for bytes in fonts {
+            match bytes {
+                Cow::Borrowed(embedded_font) => {
+                    db.load_font_data(embedded_font.to_vec());
+                }
+                Cow::Owned(bytes) => {
+                    db.load_font_data(bytes);
+                }
+            }
+        }
+        Ok(())
+    }
+
+    fn load_family(
+        &mut self,
+        name: &SharedString,
+        _features: FontFeatures,
+    ) -> Result<SmallVec<[FontId; 4]>> {
+        let mut font_ids = SmallVec::new();
+        let family = self
+            .font_system
+            .get_font_matches(Attrs::new().family(cosmic_text::Family::Name(name)));
+        for font in family.as_ref() {
+            let font = self.font_system.get_font(*font).unwrap();
+            if font.as_swash().charmap().map('m') == 0 {
+                self.font_system.db_mut().remove_face(font.id());
+                continue;
+            };
+
+            let font_id = FontId(self.fonts.len());
+            font_ids.push(font_id);
+            self.fonts.push(font);
+        }
+        Ok(font_ids)
+    }
+
+    fn advance(&self, font_id: FontId, glyph_id: GlyphId) -> Result<Size<f32>> {
+        let width = self.fonts[font_id.0]
+            .as_swash()
+            .glyph_metrics(&[])
+            .advance_width(glyph_id.0 as u16);
+        let height = self.fonts[font_id.0]
+            .as_swash()
+            .glyph_metrics(&[])
+            .advance_height(glyph_id.0 as u16);
+        Ok(Size { width, height })
+    }
+
+    fn glyph_for_char(&self, font_id: FontId, ch: char) -> Option<GlyphId> {
+        let glyph_id = self.fonts[font_id.0].as_swash().charmap().map(ch);
+        if glyph_id == 0 {
+            None
+        } else {
+            Some(GlyphId(glyph_id.into()))
+        }
+    }
+
+    fn is_emoji(&self, font_id: FontId) -> bool {
+        // todo!(linux): implement this correctly
+        self.postscript_names_by_font_id
+            .get(&font_id)
+            .map_or(false, |postscript_name| {
+                postscript_name == "AppleColorEmoji"
+            })
+    }
+
+    // todo!(linux) both raster functions have problems because I am not sure this is the correct mapping from cosmic text to gpui system
+    fn raster_bounds(&mut self, params: &RenderGlyphParams) -> Result<Bounds<DevicePixels>> {
+        let font = &self.fonts[params.font_id.0];
+        let font_system = &mut self.font_system;
+        let image = self
+            .swash_cache
+            .get_image(
+                font_system,
+                CacheKey::new(
+                    font.id(),
+                    params.glyph_id.0 as u16,
+                    params.font_size.into(),
+                    (0.0, 0.0),
+                )
+                .0,
+            )
+            .clone()
+            .unwrap();
+        Ok(Bounds {
+            origin: point(image.placement.left.into(), (-image.placement.top).into()),
+            size: size(image.placement.width.into(), image.placement.height.into()),
+        })
+    }
+
+    fn rasterize_glyph(
+        &mut self,
+        params: &RenderGlyphParams,
+        glyph_bounds: Bounds<DevicePixels>,
+    ) -> Result<(Size<DevicePixels>, Vec<u8>)> {
+        if glyph_bounds.size.width.0 == 0 || glyph_bounds.size.height.0 == 0 {
+            Err(anyhow!("glyph bounds are empty"))
+        } else {
+            // todo!(linux) handle subpixel variants
+            let bitmap_size = glyph_bounds.size;
+            let font = &self.fonts[params.font_id.0];
+            let font_system = &mut self.font_system;
+            let image = self
+                .swash_cache
+                .get_image(
+                    font_system,
+                    CacheKey::new(
+                        font.id(),
+                        params.glyph_id.0 as u16,
+                        params.font_size.into(),
+                        (0.0, 0.0),
+                    )
+                    .0,
+                )
+                .clone()
+                .unwrap();
+
+            Ok((bitmap_size, image.data))
+        }
+    }
+
+    // todo!(linux) This is all a quick first pass, maybe we should be using cosmic_text::Buffer
+    fn layout_line(&mut self, text: &str, font_size: Pixels, font_runs: &[FontRun]) -> LineLayout {
+        let mut attrs_list = AttrsList::new(Attrs::new());
+        let mut offs = 0;
+        for run in font_runs {
+            // todo!(linux) We need to check we are doing utf properly
+            let font = &self.fonts[run.font_id.0];
+            let font = self.font_system.db().face(font.id()).unwrap();
+            attrs_list.add_span(
+                offs..run.len,
+                Attrs::new()
+                    .family(Family::Name(&font.families.first().unwrap().0))
+                    .stretch(font.stretch)
+                    .style(font.style)
+                    .weight(font.weight),
+            );
+            offs += run.len;
+        }
+        let mut line = BufferLine::new(text, attrs_list, cosmic_text::Shaping::Advanced);
+        let layout = line.layout(
+            &mut self.font_system,
+            font_size.0,
+            f32::MAX, // todo!(linux) we don't have a width cause this should technically not be wrapped I believe
+            cosmic_text::Wrap::None,
+        );
+        let mut runs = Vec::new();
+        // todo!(linux) what I think can happen is layout returns possibly multiple lines which means we should be probably working with it higher up in the text rendering
+        let layout = layout.first().unwrap();
+        for glyph in &layout.glyphs {
+            let font_id = glyph.font_id;
+            let font_id = FontId(
+                self.fonts
+                    .iter()
+                    .position(|font| font.id() == font_id)
+                    .unwrap(),
+            );
+            let mut glyphs = SmallVec::new();
+            // todo!(linux) this is definitely wrong, each glyph in glyphs from cosmic-text is a cluster with one glyph, ShapedRun takes a run of glyphs with the same font and direction
+            glyphs.push(ShapedGlyph {
+                id: GlyphId(glyph.glyph_id as u32),
+                position: point((glyph.x).into(), glyph.y.into()),
+                index: glyph.start,
+                is_emoji: self.is_emoji(font_id),
+            });
+            runs.push(crate::ShapedRun { font_id, glyphs });
+        }
+        LineLayout {
+            font_size,
+            width: layout.w.into(),
+            ascent: layout.max_ascent.into(),
+            descent: layout.max_descent.into(),
+            runs,
+            len: text.len(),
+        }
+    }
+}
+
+impl From<RectF> for Bounds<f32> {
+    fn from(rect: RectF) -> Self {
+        Bounds {
+            origin: point(rect.origin_x(), rect.origin_y()),
+            size: size(rect.width(), rect.height()),
+        }
+    }
+}
+
+impl From<RectI> for Bounds<DevicePixels> {
+    fn from(rect: RectI) -> Self {
+        Bounds {
+            origin: point(DevicePixels(rect.origin_x()), DevicePixels(rect.origin_y())),
+            size: size(DevicePixels(rect.width()), DevicePixels(rect.height())),
+        }
+    }
+}
+
+impl From<Vector2I> for Size<DevicePixels> {
+    fn from(value: Vector2I) -> Self {
+        size(value.x().into(), value.y().into())
+    }
+}
+
+impl From<RectI> for Bounds<i32> {
+    fn from(rect: RectI) -> Self {
+        Bounds {
+            origin: point(rect.origin_x(), rect.origin_y()),
+            size: size(rect.width(), rect.height()),
+        }
+    }
+}
+
+impl From<Point<u32>> for Vector2I {
+    fn from(size: Point<u32>) -> Self {
+        Vector2I::new(size.x as i32, size.y as i32)
+    }
+}
+
+impl From<Vector2F> for Size<f32> {
+    fn from(vec: Vector2F) -> Self {
+        size(vec.x(), vec.y())
+    }
+}
+
+impl From<FontWeight> for cosmic_text::Weight {
+    fn from(value: FontWeight) -> Self {
+        cosmic_text::Weight(value.0 as u16)
+    }
+}
+
+impl From<FontStyle> for cosmic_text::Style {
+    fn from(style: FontStyle) -> Self {
+        match style {
+            FontStyle::Normal => cosmic_text::Style::Normal,
+            FontStyle::Italic => cosmic_text::Style::Italic,
+            FontStyle::Oblique => cosmic_text::Style::Oblique,
+        }
+    }
+}
diff --git a/crates/gpui/src/style.rs b/crates/gpui/src/style.rs
index c7054b98c5..71dccaf170 100644
--- a/crates/gpui/src/style.rs
+++ b/crates/gpui/src/style.rs
@@ -208,8 +208,12 @@ impl Default for TextStyle {
     fn default() -> Self {
         TextStyle {
             color: black(),
-            // Helvetica is a web safe font, so it should be available
-            font_family: "Helvetica".into(),
+            // todo!(linux) make this configurable or choose better default
+            font_family: if cfg!(target_os = "linux") {
+                "FreeMono".into()
+            } else {
+                "Helvetica".into()
+            },
             font_features: FontFeatures::default(),
             font_size: rems(1.).into(),
             line_height: phi(),
diff --git a/crates/gpui/src/text_system.rs b/crates/gpui/src/text_system.rs
index 43d7b2bb1b..7e2a76a9dd 100644
--- a/crates/gpui/src/text_system.rs
+++ b/crates/gpui/src/text_system.rs
@@ -725,6 +725,7 @@ pub struct FontMetrics {
     pub(crate) x_height: f32,
 
     /// The outer limits of the area that the font covers.
+    /// Corresponds to the xMin / xMax / yMin / yMax values in the OpenType `head` table
     pub(crate) bounding_box: Bounds<f32>,
 }
 

From f4d7b3e3b1e42c86f8624d62d43a165d5ac16c7b Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Fri, 9 Feb 2024 09:45:39 +0100
Subject: [PATCH 343/372] chore: Bump Rust version to 1.76 (#7592)

Release Notes:

- N/A
---
 Dockerfile                      | 2 +-
 crates/gpui/src/key_dispatch.rs | 2 +-
 crates/gpui/src/keymap.rs       | 4 ++--
 crates/gpui/src/window.rs       | 2 +-
 rust-toolchain.toml             | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b4d7b10d37..55ab7fe67b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.2
 
-FROM rust:1.75-bullseye as builder
+FROM rust:1.76-bullseye as builder
 WORKDIR app
 COPY . .
 
diff --git a/crates/gpui/src/key_dispatch.rs b/crates/gpui/src/key_dispatch.rs
index 8f9eb16a62..af56f4344f 100644
--- a/crates/gpui/src/key_dispatch.rs
+++ b/crates/gpui/src/key_dispatch.rs
@@ -304,7 +304,7 @@ impl DispatchTree {
     pub fn bindings_for_action(
         &self,
         action: &dyn Action,
-        context_stack: &Vec<KeyContext>,
+        context_stack: &[KeyContext],
     ) -> Vec<KeyBinding> {
         let keymap = self.keymap.borrow();
         keymap
diff --git a/crates/gpui/src/keymap.rs b/crates/gpui/src/keymap.rs
index e2a6bdfc4b..d6b84f10e6 100644
--- a/crates/gpui/src/keymap.rs
+++ b/crates/gpui/src/keymap.rs
@@ -71,7 +71,7 @@ impl Keymap {
     }
 
     /// Iterate over all bindings, in the order they were added.
-    pub fn bindings(&self) -> impl Iterator<Item = &KeyBinding> + DoubleEndedIterator {
+    pub fn bindings(&self) -> impl DoubleEndedIterator<Item = &KeyBinding> {
         self.bindings.iter()
     }
 
@@ -79,7 +79,7 @@ impl Keymap {
     pub fn bindings_for_action<'a>(
         &'a self,
         action: &'a dyn Action,
-    ) -> impl 'a + Iterator<Item = &'a KeyBinding> + DoubleEndedIterator {
+    ) -> impl 'a + DoubleEndedIterator<Item = &'a KeyBinding> {
         let action_id = action.type_id();
         self.binding_indices_by_action_id
             .get(&action_id)
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index e81cd12c69..8393da1da0 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -1547,7 +1547,7 @@ impl<'a> WindowContext<'a> {
         let Some(node_id) = dispatch_tree.focusable_node_id(focus_handle.id) else {
             return vec![];
         };
-        let context_stack = dispatch_tree
+        let context_stack: Vec<_> = dispatch_tree
             .dispatch_path(node_id)
             .into_iter()
             .filter_map(|node_id| dispatch_tree.node(node_id).context.clone())
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index cda3826601..f71bbee6be 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.75"
+channel = "1.76"
 profile = "minimal"
 components = [ "rustfmt", "clippy" ]
 targets = [ "x86_64-apple-darwin", "aarch64-apple-darwin", "x86_64-unknown-linux-gnu", "wasm32-wasi" ]

From 04e1641a29d148a945e7d93682ca89ca28d95a60 Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Fri, 9 Feb 2024 12:22:12 +0100
Subject: [PATCH 344/372] Properly handle backspace when in dead key state
 (#7494)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously we wouldn't handle Backspace in dead key state correctly:
instead of removing what was typed, we'd insert the text that was in the
dead key state.

Example: on a US English layout, press `opt-u` to end up in a dead key
state with `¨` waiting for the next character to be typed. Type
`backspace`. The `¨` should be removed, but it's not.

With this change, the `backspace` is interpreted instead of being
ignored.

Release Notes:

- Fixed backspace not working for dead keys (i.e. when typing accents or
umlauts)

---------

Co-authored-by: Antonio <antonio@zed.dev>
Co-authored-by: Conrad <conrad@zed.dev>
---
 crates/gpui/src/platform/mac/window.rs | 219 ++++++++++++-------------
 1 file changed, 106 insertions(+), 113 deletions(-)

diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index 9f9db753ba..aaa5685895 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -309,21 +309,11 @@ unsafe fn build_window_class(name: &'static str, superclass: &Class) -> *const C
     decl.register()
 }
 
-///Used to track what the IME does when we send it a keystroke.
-///This is only used to handle the case where the IME mysteriously
-///swallows certain keys.
-///
-///Basically a direct copy of the approach that WezTerm uses in:
-///github.com/wez/wezterm : d5755f3e : window/src/os/macos/window.rs
-enum ImeState {
-    Continue,
-    Acted,
-    None,
-}
-
-struct InsertText {
-    replacement_range: Option<Range<usize>>,
-    text: String,
+#[allow(clippy::enum_variant_names)]
+enum ImeInput {
+    InsertText(String, Option<Range<usize>>),
+    SetMarkedText(String, Option<Range<usize>>, Option<Range<usize>>),
+    UnmarkText,
 }
 
 struct MacWindowState {
@@ -344,16 +334,14 @@ struct MacWindowState {
     close_callback: Option<Box<dyn FnOnce()>>,
     appearance_changed_callback: Option<Box<dyn FnMut()>>,
     input_handler: Option<PlatformInputHandler>,
-    pending_key_down: Option<(KeyDownEvent, Option<InsertText>)>,
     last_key_equivalent: Option<KeyDownEvent>,
     synthetic_drag_counter: usize,
     last_fresh_keydown: Option<Keystroke>,
     traffic_light_position: Option<Point<Pixels>>,
     previous_modifiers_changed_event: Option<PlatformInput>,
     // State tracking what the IME did after the last request
-    ime_state: ImeState,
-    // Retains the last IME Text
-    ime_text: Option<String>,
+    input_during_keydown: Option<SmallVec<[ImeInput; 1]>>,
+    previous_keydown_inserted_text: Option<String>,
     external_files_dragged: bool,
 }
 
@@ -565,7 +553,6 @@ impl MacWindow {
                 close_callback: None,
                 appearance_changed_callback: None,
                 input_handler: None,
-                pending_key_down: None,
                 last_key_equivalent: None,
                 synthetic_drag_counter: 0,
                 last_fresh_keydown: None,
@@ -574,8 +561,8 @@ impl MacWindow {
                     .as_ref()
                     .and_then(|titlebar| titlebar.traffic_light_position),
                 previous_modifiers_changed_event: None,
-                ime_state: ImeState::None,
-                ime_text: None,
+                input_during_keydown: None,
+                previous_keydown_inserted_text: None,
                 external_files_dragged: false,
             })));
 
@@ -1116,6 +1103,15 @@ extern "C" fn handle_key_down(this: &Object, _: Sel, native_event: id) {
     handle_key_event(this, native_event, false);
 }
 
+// Things to test if you're modifying this method:
+//  Brazilian layout:
+//   - `" space` should type a quote
+//   - `" backspace` should delete the marked quote
+//   - `" up` should type the quote, unmark it, and move up one line
+//   - `" cmd-down` should not leave a marked quote behind (it maybe should dispatch the key though?)
+//   - `cmd-ctrl-space` and clicking on an emoji should type it
+//  Czech (QWERTY) layout:
+//   - in vim mode `option-4`  should go to end of line (same as $)
 extern "C" fn handle_key_event(this: &Object, native_event: id, key_equivalent: bool) -> BOOL {
     let window_state = unsafe { get_window_state(this) };
     let mut lock = window_state.as_ref().lock();
@@ -1123,7 +1119,7 @@ extern "C" fn handle_key_event(this: &Object, native_event: id, key_equivalent:
     let window_height = lock.content_size().height;
     let event = unsafe { PlatformInput::from_native(native_event, Some(window_height)) };
 
-    if let Some(PlatformInput::KeyDown(event)) = event {
+    if let Some(PlatformInput::KeyDown(mut event)) = event {
         // For certain keystrokes, macOS will first dispatch a "key equivalent" event.
         // If that event isn't handled, it will then dispatch a "key down" event. GPUI
         // makes no distinction between these two types of events, so we need to ignore
@@ -1143,13 +1139,14 @@ extern "C" fn handle_key_event(this: &Object, native_event: id, key_equivalent:
                 return YES;
             }
         } else {
-            lock.last_fresh_keydown = Some(keydown);
+            lock.last_fresh_keydown = Some(keydown.clone());
         }
-        lock.pending_key_down = Some((event, None));
+        lock.input_during_keydown = Some(SmallVec::new());
         drop(lock);
 
         // Send the event to the input context for IME handling, unless the `fn` modifier is
         // being pressed.
+        // this will call back into `insert_text`, etc.
         if !fn_modifier {
             unsafe {
                 let input_context: id = msg_send![this, inputContext];
@@ -1159,48 +1156,63 @@ extern "C" fn handle_key_event(this: &Object, native_event: id, key_equivalent:
 
         let mut handled = false;
         let mut lock = window_state.lock();
-        let ime_text = lock.ime_text.clone();
-        if let Some((event, insert_text)) = lock.pending_key_down.take() {
-            let is_held = event.is_held;
-            if let Some(mut callback) = lock.event_callback.take() {
-                drop(lock);
+        let previous_keydown_inserted_text = lock.previous_keydown_inserted_text.take();
+        let mut input_during_keydown = lock.input_during_keydown.take().unwrap();
+        let mut callback = lock.event_callback.take();
+        drop(lock);
 
-                let is_composing =
-                    with_input_handler(this, |input_handler| input_handler.marked_text_range())
-                        .flatten()
-                        .is_some();
+        let last_ime = input_during_keydown.pop();
+        // on a brazilian keyboard typing `"` and then hitting `up` will cause two IME
+        // events, one to unmark the quote, and one to send the up arrow.
+        for ime in input_during_keydown {
+            send_to_input_handler(this, ime);
+        }
+
+        let is_composing =
+            with_input_handler(this, |input_handler| input_handler.marked_text_range())
+                .flatten()
+                .is_some();
+
+        if let Some(ime) = last_ime {
+            if let ImeInput::InsertText(text, _) = &ime {
                 if !is_composing {
-                    handled = callback(PlatformInput::KeyDown(event));
-                }
-
-                if !handled {
-                    if let Some(insert) = insert_text {
-                        handled = true;
-                        with_input_handler(this, |input_handler| {
-                            input_handler
-                                .replace_text_in_range(insert.replacement_range, &insert.text)
-                        });
-                    } else if !is_composing && is_held {
-                        if let Some(last_insert_text) = ime_text {
-                            //MacOS IME is a bit funky, and even when you've told it there's nothing to
-                            //inter it will still swallow certain keys (e.g. 'f', 'j') and not others
-                            //(e.g. 'n'). This is a problem for certain kinds of views, like the terminal
-                            with_input_handler(this, |input_handler| {
-                                if input_handler.selected_text_range().is_none() {
-                                    handled = true;
-                                    input_handler.replace_text_in_range(None, &last_insert_text)
-                                }
-                            });
-                        }
+                    window_state.lock().previous_keydown_inserted_text = Some(text.clone());
+                    if let Some(callback) = callback.as_mut() {
+                        event.keystroke.ime_key = Some(text.clone());
+                        handled = callback(PlatformInput::KeyDown(event));
                     }
                 }
-
-                window_state.lock().event_callback = Some(callback);
             }
-        } else {
-            handled = true;
+
+            if !handled {
+                handled = true;
+                send_to_input_handler(this, ime);
+            }
+        } else if !is_composing {
+            let is_held = event.is_held;
+
+            if let Some(callback) = callback.as_mut() {
+                handled = callback(PlatformInput::KeyDown(event));
+            }
+
+            if !handled && is_held {
+                if let Some(text) = previous_keydown_inserted_text {
+                    // MacOS IME is a bit funky, and even when you've told it there's nothing to
+                    // enter it will still swallow certain keys (e.g. 'f', 'j') and not others
+                    // (e.g. 'n'). This is a problem for certain kinds of views, like the terminal.
+                    with_input_handler(this, |input_handler| {
+                        if input_handler.selected_text_range().is_none() {
+                            handled = true;
+                            input_handler.replace_text_in_range(None, &text)
+                        }
+                    });
+                    window_state.lock().previous_keydown_inserted_text = Some(text);
+                }
+            }
         }
 
+        window_state.lock().event_callback = callback;
+
         handled as BOOL
     } else {
         NO
@@ -1615,11 +1627,6 @@ extern "C" fn first_rect_for_character_range(
 
 extern "C" fn insert_text(this: &Object, _: Sel, text: id, replacement_range: NSRange) {
     unsafe {
-        let window_state = get_window_state(this);
-        let mut lock = window_state.lock();
-        let pending_key_down = lock.pending_key_down.take();
-        drop(lock);
-
         let is_attributed_string: BOOL =
             msg_send![text, isKindOfClass: [class!(NSAttributedString)]];
         let text: id = if is_attributed_string == YES {
@@ -1631,28 +1638,10 @@ extern "C" fn insert_text(this: &Object, _: Sel, text: id, replacement_range: NS
             .to_str()
             .unwrap();
         let replacement_range = replacement_range.to_range();
-
-        window_state.lock().ime_text = Some(text.to_string());
-        window_state.lock().ime_state = ImeState::Acted;
-
-        let is_composing =
-            with_input_handler(this, |input_handler| input_handler.marked_text_range())
-                .flatten()
-                .is_some();
-
-        if is_composing || text.chars().count() > 1 || pending_key_down.is_none() {
-            with_input_handler(this, |input_handler| {
-                input_handler.replace_text_in_range(replacement_range, text)
-            });
-        } else {
-            let mut pending_key_down = pending_key_down.unwrap();
-            pending_key_down.1 = Some(InsertText {
-                replacement_range,
-                text: text.to_string(),
-            });
-            pending_key_down.0.keystroke.ime_key = Some(text.to_string());
-            window_state.lock().pending_key_down = Some(pending_key_down);
-        }
+        send_to_input_handler(
+            this,
+            ImeInput::InsertText(text.to_string(), replacement_range),
+        );
     }
 }
 
@@ -1664,9 +1653,6 @@ extern "C" fn set_marked_text(
     replacement_range: NSRange,
 ) {
     unsafe {
-        let window_state = get_window_state(this);
-        window_state.lock().pending_key_down.take();
-
         let is_attributed_string: BOOL =
             msg_send![text, isKindOfClass: [class!(NSAttributedString)]];
         let text: id = if is_attributed_string == YES {
@@ -1680,24 +1666,14 @@ extern "C" fn set_marked_text(
             .to_str()
             .unwrap();
 
-        window_state.lock().ime_state = ImeState::Acted;
-        window_state.lock().ime_text = Some(text.to_string());
-
-        with_input_handler(this, |input_handler| {
-            input_handler.replace_and_mark_text_in_range(replacement_range, text, selected_range);
-        });
+        send_to_input_handler(
+            this,
+            ImeInput::SetMarkedText(text.to_string(), replacement_range, selected_range),
+        );
     }
 }
-
 extern "C" fn unmark_text(this: &Object, _: Sel) {
-    unsafe {
-        let state = get_window_state(this);
-        let mut borrow = state.lock();
-        borrow.ime_state = ImeState::Acted;
-        borrow.ime_text.take();
-    }
-
-    with_input_handler(this, |input_handler| input_handler.unmark_text());
+    send_to_input_handler(this, ImeInput::UnmarkText);
 }
 
 extern "C" fn attributed_substring_for_proposed_range(
@@ -1723,14 +1699,7 @@ extern "C" fn attributed_substring_for_proposed_range(
     .unwrap_or(nil)
 }
 
-extern "C" fn do_command_by_selector(this: &Object, _: Sel, _: Sel) {
-    unsafe {
-        let state = get_window_state(this);
-        let mut borrow = state.lock();
-        borrow.ime_state = ImeState::Continue;
-        borrow.ime_text.take();
-    }
-}
+extern "C" fn do_command_by_selector(_: &Object, _: Sel, _: Sel) {}
 
 extern "C" fn view_did_change_effective_appearance(this: &Object, _: Sel) {
     unsafe {
@@ -1881,6 +1850,30 @@ where
     }
 }
 
+fn send_to_input_handler(window: &Object, ime: ImeInput) {
+    unsafe {
+        let window_state = get_window_state(window);
+        let mut lock = window_state.lock();
+        if let Some(ime_input) = lock.input_during_keydown.as_mut() {
+            ime_input.push(ime);
+            return;
+        }
+        if let Some(mut input_handler) = lock.input_handler.take() {
+            drop(lock);
+            match ime {
+                ImeInput::InsertText(text, range) => {
+                    input_handler.replace_text_in_range(range, &text)
+                }
+                ImeInput::SetMarkedText(text, range, marked_range) => {
+                    input_handler.replace_and_mark_text_in_range(range, &text, marked_range)
+                }
+                ImeInput::UnmarkText => input_handler.unmark_text(),
+            }
+            window_state.lock().input_handler = Some(input_handler);
+        }
+    }
+}
+
 unsafe fn display_id_for_screen(screen: id) -> CGDirectDisplayID {
     let device_description = NSScreen::deviceDescription(screen);
     let screen_number_key: id = NSString::alloc(nil).init_str("NSScreenNumber");

From 0cebf68306ab0ef08693701532260e1fdc0f1ee9 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Fri, 9 Feb 2024 13:29:40 +0100
Subject: [PATCH 345/372] Introduce a new `ToggleGraphicsProfiler` command
 (#7607)

On macOS, this will enable or disable the Metal HUD at runtime. Note
that this only works when Zed is bundled because it requires to set the
`MetalHudEnabled` key in the Info.plist.

Release Notes:

- Added a new `ToggleGraphicsProfiler` command that can be used as an
action (or via the `Help -> Toggle Graphics Profiler` menu) to
investigate graphics performance.
---
 crates/gpui/src/platform.rs                   |  2 +-
 crates/gpui/src/platform/linux/window.rs      |  4 +++
 .../gpui/src/platform/mac/metal_renderer.rs   | 27 +++++++++++++++----
 crates/gpui/src/platform/mac/window.rs        |  6 +++++
 crates/gpui/src/platform/test/window.rs       |  2 ++
 crates/gpui/src/window.rs                     | 10 +++++++
 crates/workspace/src/workspace.rs             |  2 ++
 crates/zed/resources/info/Permissions.plist   |  2 ++
 crates/zed/src/app_menus.rs                   |  4 +++
 9 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index d3e19d2b6f..6739fee6fc 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -182,8 +182,8 @@ pub(crate) trait PlatformWindow: HasWindowHandle + HasDisplayHandle {
     fn on_appearance_changed(&self, callback: Box<dyn FnMut()>);
     fn is_topmost_for_position(&self, position: Point<Pixels>) -> bool;
     fn draw(&self, scene: &Scene);
-
     fn sprite_atlas(&self) -> Arc<dyn PlatformAtlas>;
+    fn set_graphics_profiler_enabled(&self, enabled: bool);
 
     #[cfg(any(test, feature = "test-support"))]
     fn as_test(&mut self) -> Option<&mut TestWindow> {
diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index d396c74628..e5c346b057 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -428,4 +428,8 @@ impl PlatformWindow for LinuxWindow {
         let inner = self.0.inner.lock();
         inner.renderer.atlas().clone()
     }
+
+    fn set_graphics_profiler_enabled(&self, enabled: bool) {
+        todo!("linux")
+    }
 }
diff --git a/crates/gpui/src/platform/mac/metal_renderer.rs b/crates/gpui/src/platform/mac/metal_renderer.rs
index 166f62ede0..6b30787b52 100644
--- a/crates/gpui/src/platform/mac/metal_renderer.rs
+++ b/crates/gpui/src/platform/mac/metal_renderer.rs
@@ -1,12 +1,12 @@
 use crate::{
-    point, size, AtlasTextureId, AtlasTextureKind, AtlasTile, Bounds, ContentMask, DevicePixels,
-    Hsla, MetalAtlas, MonochromeSprite, Path, PathId, PathVertex, PolychromeSprite, PrimitiveBatch,
-    Quad, ScaledPixels, Scene, Shadow, Size, Surface, Underline,
+    platform::mac::ns_string, point, size, AtlasTextureId, AtlasTextureKind, AtlasTile, Bounds,
+    ContentMask, DevicePixels, Hsla, MetalAtlas, MonochromeSprite, Path, PathId, PathVertex,
+    PolychromeSprite, PrimitiveBatch, Quad, ScaledPixels, Scene, Shadow, Size, Surface, Underline,
 };
 use block::ConcreteBlock;
 use cocoa::{
-    base::{NO, YES},
-    foundation::NSUInteger,
+    base::{nil, NO, YES},
+    foundation::{NSDictionary, NSUInteger},
     quartzcore::AutoresizingMask,
 };
 use collections::HashMap;
@@ -200,6 +200,23 @@ impl MetalRenderer {
         &self.sprite_atlas
     }
 
+    /// Enables or disables the Metal HUD for debugging purposes. Note that this only works
+    /// when the app is bundled and it has the `MetalHudEnabled` key set to true in Info.plist.
+    pub fn set_hud_enabled(&mut self, enabled: bool) {
+        unsafe {
+            if enabled {
+                let hud_properties = NSDictionary::dictionaryWithObject_forKey_(
+                    nil,
+                    ns_string("default"),
+                    ns_string("mode"),
+                );
+                let _: () = msg_send![&*self.layer, setDeveloperHUDProperties: hud_properties];
+            } else {
+                let _: () = msg_send![&*self.layer, setDeveloperHUDProperties: NSDictionary::dictionary(nil)];
+            }
+        }
+    }
+
     pub fn set_presents_with_transaction(&mut self, presents_with_transaction: bool) {
         self.presents_with_transaction = presents_with_transaction;
         self.layer
diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index aaa5685895..9497c240c3 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -1021,6 +1021,12 @@ impl PlatformWindow for MacWindow {
     fn sprite_atlas(&self) -> Arc<dyn PlatformAtlas> {
         self.0.lock().renderer.sprite_atlas().clone()
     }
+
+    /// Enables or disables the Metal HUD for debugging purposes. Note that this only works
+    /// when the app is bundled and it has the `MetalHudEnabled` key set to true in Info.plist.
+    fn set_graphics_profiler_enabled(&self, enabled: bool) {
+        self.0.lock().renderer.set_hud_enabled(enabled);
+    }
 }
 
 impl HasWindowHandle for MacWindow {
diff --git a/crates/gpui/src/platform/test/window.rs b/crates/gpui/src/platform/test/window.rs
index c67384a392..23e5cdeea7 100644
--- a/crates/gpui/src/platform/test/window.rs
+++ b/crates/gpui/src/platform/test/window.rs
@@ -288,6 +288,8 @@ impl PlatformWindow for TestWindow {
         self.0.lock().sprite_atlas.clone()
     }
 
+    fn set_graphics_profiler_enabled(&self, _enabled: bool) {}
+
     fn as_test(&mut self) -> Option<&mut TestWindow> {
         Some(self)
     }
diff --git a/crates/gpui/src/window.rs b/crates/gpui/src/window.rs
index 8393da1da0..f7f53689f9 100644
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -279,6 +279,7 @@ pub struct Window {
     pub(crate) focus: Option<FocusId>,
     focus_enabled: bool,
     pending_input: Option<PendingInput>,
+    graphics_profiler_enabled: bool,
 }
 
 #[derive(Default, Debug)]
@@ -462,6 +463,7 @@ impl Window {
             focus: None,
             focus_enabled: true,
             pending_input: None,
+            graphics_profiler_enabled: false,
         }
     }
     fn new_focus_listener(
@@ -1461,6 +1463,14 @@ impl<'a> WindowContext<'a> {
         }
     }
 
+    /// Toggle the graphics profiler to debug your application's rendering performance.
+    pub fn toggle_graphics_profiler(&mut self) {
+        self.window.graphics_profiler_enabled = !self.window.graphics_profiler_enabled;
+        self.window
+            .platform_window
+            .set_graphics_profiler_enabled(self.window.graphics_profiler_enabled);
+    }
+
     /// Register the given handler to be invoked whenever the global of the given type
     /// is updated.
     pub fn observe_global<G: Global>(
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index fc4040be0d..89adb1e946 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -118,6 +118,7 @@ actions!(
         ToggleRightDock,
         ToggleBottomDock,
         CloseAllDocks,
+        ToggleGraphicsProfiler,
     ]
 );
 
@@ -3395,6 +3396,7 @@ impl Workspace {
                     workspace.reopen_closed_item(cx).detach();
                 }),
             )
+            .on_action(|_: &ToggleGraphicsProfiler, cx| cx.toggle_graphics_profiler())
     }
 
     #[cfg(any(test, feature = "test-support"))]
diff --git a/crates/zed/resources/info/Permissions.plist b/crates/zed/resources/info/Permissions.plist
index bded5a82e2..fd608afaa0 100644
--- a/crates/zed/resources/info/Permissions.plist
+++ b/crates/zed/resources/info/Permissions.plist
@@ -22,3 +22,5 @@
 <string>An application in Zed wants to use speech recognition.</string>
 <key>NSRemindersUsageDescription</key>
 <string>An application in Zed wants to use your reminders.</string>
+<key>MetalHudEnabled</key>
+<true />
diff --git a/crates/zed/src/app_menus.rs b/crates/zed/src/app_menus.rs
index 40d20d61ef..a3f2145827 100644
--- a/crates/zed/src/app_menus.rs
+++ b/crates/zed/src/app_menus.rs
@@ -155,6 +155,10 @@ pub fn app_menus() -> Vec<Menu<'static>> {
                 MenuItem::action("View Telemetry", crate::OpenTelemetryLog),
                 MenuItem::action("View Dependency Licenses", crate::OpenLicenses),
                 MenuItem::action("Show Welcome", workspace::Welcome),
+                MenuItem::action(
+                    "Toggle Graphics Profiler",
+                    workspace::ToggleGraphicsProfiler,
+                ),
                 MenuItem::separator(),
                 MenuItem::separator(),
                 MenuItem::action(

From 901279a044ee390900c53dd833f32e330a3aec62 Mon Sep 17 00:00:00 2001
From: Robert Clover <git@clo4.net>
Date: Fri, 9 Feb 2024 23:42:30 +1100
Subject: [PATCH 346/372] Implement terminal text dimming (#7600)

Dims text by a certain factor - this respects theme opacity. The amount
is documented in the code. As far as I can tell, all other terminals
also dim text using this same method. Dim only affects the foreground.

<img width="755" alt="SCR-20240209-mfls"
src="https://github.com/zed-industries/zed/assets/52195359/c32f2aff-1142-4333-a05d-6aca425cb235">

Release Notes:

- Added terminal text dimming (fixes #7497)
---
 crates/terminal_view/src/terminal_element.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rs
index 2696a6058c..4b80e3001a 100644
--- a/crates/terminal_view/src/terminal_element.rs
+++ b/crates/terminal_view/src/terminal_element.rs
@@ -329,8 +329,13 @@ impl TerminalElement {
         hyperlink: Option<(HighlightStyle, &RangeInclusive<AlacPoint>)>,
     ) -> TextRun {
         let flags = indexed.cell.flags;
-        let fg = convert_color(&fg, &colors);
-        // let bg = convert_color(&bg, &colors);
+        let mut fg = convert_color(&fg, &colors);
+
+        // Ghostty uses (175/255) as the multiplier (~0.69), Alacritty uses 0.66, Kitty
+        // uses 0.75. We're using 0.7 because it's pretty well in the middle of that.
+        if flags.intersects(Flags::DIM) {
+            fg.a *= 0.7;
+        }
 
         let underline = (flags.intersects(Flags::ALL_UNDERLINES)
             || indexed.cell.hyperlink().is_some())

From 702393af59cdfd683159a524dff6d6181de5bddd Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 9 Feb 2024 15:02:36 +0200
Subject: [PATCH 347/372] Use proper key for Linux rust cache

---
 .github/workflows/ci.yml | 64 ++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c18cc38e6f..b7225a53e5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -51,14 +51,14 @@ jobs:
             - name: Ensure fresh merge
               shell: bash -euxo pipefail {0}
               run: |
-                if [ -z "$GITHUB_BASE_REF" ];
-                then
-                  echo "BUF_BASE_BRANCH=$(git merge-base origin/main HEAD)" >> $GITHUB_ENV
-                else
-                  git checkout -B temp
-                  git merge -q origin/$GITHUB_BASE_REF -m "merge main into temp"
-                  echo "BUF_BASE_BRANCH=$GITHUB_BASE_REF" >> $GITHUB_ENV
-                fi
+                  if [ -z "$GITHUB_BASE_REF" ];
+                  then
+                    echo "BUF_BASE_BRANCH=$(git merge-base origin/main HEAD)" >> $GITHUB_ENV
+                  else
+                    git checkout -B temp
+                    git merge -q origin/$GITHUB_BASE_REF -m "merge main into temp"
+                    echo "BUF_BASE_BRANCH=$GITHUB_BASE_REF" >> $GITHUB_ENV
+                  fi
 
             - uses: bufbuild/buf-setup-action@v1
             - uses: bufbuild/buf-breaking-action@v1
@@ -96,34 +96,34 @@ jobs:
         name: (Linux) Run Clippy and tests
         runs-on: ubuntu-latest
         steps:
-          - name: Checkout repo
-            uses: actions/checkout@v4
-            with:
-              clean: false
-              submodules: "recursive"
+            - name: Checkout repo
+              uses: actions/checkout@v4
+              with:
+                  clean: false
+                  submodules: "recursive"
 
-          - name: Restore from cache
-            uses: actions/cache@v3
-            with:
-                path: |
-                  ~/.cargo/bin/
-                  ~/.cargo/registry/index/
-                  ~/.cargo/registry/cache/
-                  ~/.cargo/git/db/
-                  target/
-                key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-                restore-keys: ${{ runner.os }}-cargo-
+            - name: Restore from cache
+              uses: actions/cache@v3
+              with:
+                  path: |
+                      ~/.cargo/bin/
+                      ~/.cargo/registry/index/
+                      ~/.cargo/registry/cache/
+                      ~/.cargo/git/db/
+                      target/
+                  key: ${{ runner.os }}-cargo-${{ hashFiles('**/rust-toolchain.toml') }}-${{ hashFiles('**/Cargo.lock') }}
+                  restore-keys: ${{ runner.os }}-cargo-${{ hashFiles('**/rust-toolchain.toml') }}-
 
-          - name: configure linux
-            shell: bash -euxo pipefail {0}
-            run: script/linux
+            - name: configure linux
+              shell: bash -euxo pipefail {0}
+              run: script/linux
 
-          - name: cargo clippy
-            shell: bash -euxo pipefail {0}
-            run: script/clippy
+            - name: cargo clippy
+              shell: bash -euxo pipefail {0}
+              run: script/clippy
 
-          - name: Build Zed
-            run: cargo build -p zed
+            - name: Build Zed
+              run: cargo build -p zed
     bundle:
         name: Bundle app
         runs-on:

From 25c4cfe1d0d2147af0ede7280a835467c2e35513 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 9 Feb 2024 15:08:55 +0200
Subject: [PATCH 348/372] Bump action runners versions

---
 .github/workflows/ci.yml     | 2 +-
 .github/workflows/danger.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b7225a53e5..fc9d1f388e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -103,7 +103,7 @@ jobs:
                   submodules: "recursive"
 
             - name: Restore from cache
-              uses: actions/cache@v3
+              uses: actions/cache@v4
               with:
                   path: |
                       ~/.cargo/bin/
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
index ac04d3dfa2..af80d606d1 100644
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -16,7 +16,7 @@ jobs:
         steps:
             - uses: actions/checkout@v4
 
-            - uses: pnpm/action-setup@v2.2.4
+            - uses: pnpm/action-setup@v3
               with:
                   version: 8
 

From 775bce3e1a3918067a771873285b83b538a35ebd Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Fri, 9 Feb 2024 15:36:39 +0100
Subject: [PATCH 349/372] Handle autoclose when composing text (#7611)

This fixes two annoyances when composing text and autoclose is enabled.

Example: use a Brazilian keyboard and type `"`, which triggers a
dead-key state.

Previously when a user would type `"<space>` to get a quote, we'd end up
with 4 quotes.

When text was selected and a user then typed `"<space>` the selected
text would be deleted.

This commit fixes both of these issues.

Fixes https://github.com/zed-industries/zed/issues/4298

Release Notes:

- Fixed autoclose behavior not working when composing text via IME (e.g.
using quotes on a Brazilian keyboard)
([#4298](https://github.com/zed-industries/zed/issues/4298)).

Co-authored-by: Antonio <antonio@zed.dev>
Co-authored-by: bennetbo <bennetbo@gmx.de>
---
 crates/editor/src/editor.rs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 499b7ce28f..c49a5c8c50 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -2490,7 +2490,12 @@ impl Editor {
             let had_active_copilot_suggestion = this.has_active_copilot_suggestion(cx);
             this.change_selections(Some(Autoscroll::fit()), cx, |s| s.select(new_selections));
 
-            if !brace_inserted && EditorSettings::get_global(cx).use_on_type_format {
+            if brace_inserted {
+                // If we inserted a brace while composing text (i.e. typing `"` on a
+                // Brazilian keyboard), exit the composing state because most likely
+                // the user wanted to surround the selection.
+                this.unmark_text(cx);
+            } else if EditorSettings::get_global(cx).use_on_type_format {
                 if let Some(on_type_format_task) =
                     this.trigger_on_type_formatting(text.to_string(), cx)
                 {
@@ -9695,6 +9700,7 @@ impl ViewInputHandler for Editor {
                 this.change_selections(None, cx, |selections| {
                     selections.select_ranges(new_selected_ranges)
                 });
+                this.backspace(&Default::default(), cx);
             }
 
             this.handle_input(text, cx);
@@ -9797,7 +9803,11 @@ impl ViewInputHandler for Editor {
                 );
             }
 
+            // Disable auto-closing when composing text (i.e. typing a `"` on a Brazilian keyboard)
+            let use_autoclose = this.use_autoclose;
+            this.set_use_autoclose(false);
             this.handle_input(text, cx);
+            this.set_use_autoclose(use_autoclose);
 
             if let Some(new_selected_range) = new_selected_range_utf16 {
                 let snapshot = this.buffer.read(cx).read(cx);

From f3bfa111488b69e73afa9ac1bab988ad793a43d5 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 9 Feb 2024 16:44:13 +0200
Subject: [PATCH 350/372] Show better errors when failing to start golps
 (#7614)

Part of
https://github.com/zed-industries/zed/issues/4471#issuecomment-1936008584

Improves gopls error logging to actually see what is wrong with the
output we failed to match against the version regex.

Release Notes:

- N/A
---
 crates/zed/src/languages/go.rs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/crates/zed/src/languages/go.rs b/crates/zed/src/languages/go.rs
index 05bea740c5..0c2843c03f 100644
--- a/crates/zed/src/languages/go.rs
+++ b/crates/zed/src/languages/go.rs
@@ -1,4 +1,4 @@
-use anyhow::{anyhow, Result};
+use anyhow::{anyhow, Context, Result};
 use async_trait::async_trait;
 use futures::StreamExt;
 use gpui::{AsyncAppContext, Task};
@@ -124,21 +124,22 @@ impl super::LspAdapter for GoLspAdapter {
             .args(["install", "golang.org/x/tools/gopls@latest"])
             .output()
             .await?;
-        if !install_output.status.success() {
-            Err(anyhow!("failed to install gopls. Is go installed?"))?;
-        }
+        anyhow::ensure!(
+            install_output.status.success(),
+            "failed to install gopls. Is `go` installed and in the PATH?"
+        );
 
         let installed_binary_path = gobin_dir.join("gopls");
         let version_output = process::Command::new(&installed_binary_path)
             .arg("version")
             .output()
             .await
-            .map_err(|e| anyhow!("failed to run installed gopls binary {:?}", e))?;
+            .context("failed to run installed gopls binary")?;
         let version_stdout = str::from_utf8(&version_output.stdout)
-            .map_err(|_| anyhow!("gopls version produced invalid utf8"))?;
+            .context("gopls version produced invalid utf8 output")?;
         let version = GOPLS_VERSION_REGEX
             .find(version_stdout)
-            .ok_or_else(|| anyhow!("failed to parse gopls version output"))?
+            .with_context(|| format!("failed to parse golps version output '{version_stdout}'"))?
             .as_str();
         let binary_path = container_dir.join(&format!("gopls_{version}"));
         fs::rename(&installed_binary_path, &binary_path).await?;

From ad97e447f53c98ebf46aca443afadb889cd24eff Mon Sep 17 00:00:00 2001
From: Thorsten Ball <mrnugget@gmail.com>
Date: Fri, 9 Feb 2024 16:06:29 +0100
Subject: [PATCH 351/372] Load worktree settings when loading options for
 language servers (#7615)

Previously we only looked at the global settings, this changes that to
start looking in local settings first and then fall back to global ones.

Fixes #4279.

Release Notes:

- Fixed language server configurations not being picked up from local,
worktree-specific settings.
([#4279](https://github.com/zed-industries/zed/issues/4279)).

Co-authored-by: Antonio <antonio@zed.dev>
Co-authored-by: Bennet <bennetbo@gmx.de>
---
 crates/project/src/project.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 06baa7f709..cfd2f6412c 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -2787,7 +2787,8 @@ impl Project {
             None => return,
         };
 
-        let project_settings = ProjectSettings::get_global(cx);
+        let project_settings =
+            ProjectSettings::get(Some((worktree_id.to_proto() as usize, Path::new(""))), cx);
         let lsp = project_settings.lsp.get(&adapter.name.0);
         let override_options = lsp.map(|s| s.initialization_options.clone()).flatten();
 

From 93ceb89c0c0352fd30f66941f820cc201391c3dd Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Fri, 9 Feb 2024 18:05:14 +0100
Subject: [PATCH 352/372] Never show whitespace-only Copilot suggestions
 (#7623)

Fixes https://github.com/zed-industries/zed/issues/7582

Release Notes:

- Fixed a bug that caused Copilot to suggest leading indentation even
after the user accepted/discarded a suggestion
([#7582](https://github.com/zed-industries/zed/issues/7582))

Co-authored-by: Thorsten Ball <thorsten@zed.dev>
Co-authored-by: Bennet <bennetbo@gmx.de>
---
 crates/editor/src/editor.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index c49a5c8c50..a864204dc8 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -1222,7 +1222,12 @@ impl CopilotState {
         if completion_range.is_empty()
             && completion_range.start == cursor.text_anchor.to_offset(&completion_buffer)
         {
-            Some(&completion.text[prefix_len..completion.text.len() - suffix_len])
+            let completion_text = &completion.text[prefix_len..completion.text.len() - suffix_len];
+            if completion_text.trim().is_empty() {
+                None
+            } else {
+                Some(completion_text)
+            }
         } else {
             None
         }

From 2651037472709b54867793cea157a2645af34e7c Mon Sep 17 00:00:00 2001
From: Federico Dionisi <code@fdionisi.me>
Date: Fri, 9 Feb 2024 18:40:50 +0100
Subject: [PATCH 353/372] Read LSP message headers at once (#7449)

The current LSP headers reader implementation assumes a specific order
(i.e., `Content-Length` first, and then `Content-Type`). Unfortunately,
this assumption is not always valid, as no specification enforces the
rule. @caius and I encountered this issue while implementing the
Terraform LSP, where `Content-Type` comes first, breaking the
implementation in #6929.

This PR introduces a `read_headers` function, which asynchronously reads
the incoming pipe until the headers' delimiter (i.e., '\r\n\r\n'),
adding it to the message buffer, and returning an error when delimiter's
not found.

I added a few tests but only considered scenarios where headers are
delivered at once (which should be the case?). I'm unsure if this
suffices or if I should consider more scenarios; I would love to hear
others' opinions.


Release Notes:

- N/A

---------

Co-authored-by: Caius <caius@caius.name>
---
 crates/lsp/src/lsp.rs | 95 ++++++++++++++++++++++++-------------------
 1 file changed, 54 insertions(+), 41 deletions(-)

diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
index e4b95bfb21..c4661a0793 100644
--- a/crates/lsp/src/lsp.rs
+++ b/crates/lsp/src/lsp.rs
@@ -31,6 +31,7 @@ use std::{
 use std::{path::Path, process::Stdio};
 use util::{ResultExt, TryFutureExt};
 
+const HEADER_DELIMITER: &'static [u8; 4] = b"\r\n\r\n";
 const JSON_RPC_VERSION: &str = "2.0";
 const CONTENT_LEN_HEADER: &str = "Content-Length: ";
 const LSP_REQUEST_TIMEOUT: Duration = Duration::from_secs(60 * 2);
@@ -323,47 +324,17 @@ impl LanguageServer {
         loop {
             buffer.clear();
 
-            if stdout.read_until(b'\n', &mut buffer).await? == 0 {
-                break;
-            };
+            read_headers(&mut stdout, &mut buffer).await?;
 
-            if stdout.read_until(b'\n', &mut buffer).await? == 0 {
-                break;
-            };
+            let headers = std::str::from_utf8(&buffer)?;
 
-            let header = std::str::from_utf8(&buffer)?;
-            let mut segments = header.lines();
-
-            let message_len: usize = segments
-                .next()
-                .with_context(|| {
-                    format!("unable to find the first line of the LSP message header `{header}`")
-                })?
-                .strip_prefix(CONTENT_LEN_HEADER)
-                .with_context(|| format!("invalid LSP message header `{header}`"))?
-                .parse()
-                .with_context(|| {
-                    format!("failed to parse Content-Length of LSP message header: `{header}`")
-                })?;
-
-            if let Some(second_segment) = segments.next() {
-                match second_segment {
-                    "" => (), // Header end
-                    header_field => {
-                        if header_field.starts_with("Content-Type:") {
-                            stdout.read_until(b'\n', &mut buffer).await?;
-                        } else {
-                            anyhow::bail!(
-                                "inside `{header}`, expected a Content-Type header field or a header ending CRLF, got `{second_segment:?}`"
-                            )
-                        }
-                    }
-                }
-            } else {
-                anyhow::bail!(
-                    "unable to find the second line of the LSP message header `{header}`"
-                );
-            }
+            let message_len = headers
+                .split("\n")
+                .find(|line| line.starts_with(CONTENT_LEN_HEADER))
+                .and_then(|line| line.strip_prefix(CONTENT_LEN_HEADER))
+                .ok_or_else(|| anyhow!("invalid LSP message header {headers:?}"))?
+                .trim_end()
+                .parse()?;
 
             buffer.resize(message_len, 0);
             stdout.read_exact(&mut buffer).await?;
@@ -412,8 +383,6 @@ impl LanguageServer {
             // Don't starve the main thread when receiving lots of messages at once.
             smol::future::yield_now().await;
         }
-
-        Ok(())
     }
 
     async fn handle_stderr<Stderr>(
@@ -1254,6 +1223,26 @@ impl FakeLanguageServer {
     }
 }
 
+pub(self) async fn read_headers<Stdout>(
+    reader: &mut BufReader<Stdout>,
+    buffer: &mut Vec<u8>,
+) -> Result<()>
+where
+    Stdout: AsyncRead + Unpin + Send + 'static,
+{
+    loop {
+        if buffer.len() >= HEADER_DELIMITER.len()
+            && buffer[(buffer.len() - HEADER_DELIMITER.len())..] == HEADER_DELIMITER[..]
+        {
+            return Ok(());
+        }
+
+        if reader.read_until(b'\n', buffer).await? == 0 {
+            return Err(anyhow!("cannot read LSP message headers"));
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -1327,4 +1316,28 @@ mod tests {
         drop(server);
         fake.receive_notification::<notification::Exit>().await;
     }
+
+    #[gpui::test]
+    async fn test_read_headers() {
+        let mut buf = Vec::new();
+        let mut reader = smol::io::BufReader::new(b"Content-Length: 123\r\n\r\n" as &[u8]);
+        read_headers(&mut reader, &mut buf).await.unwrap();
+        assert_eq!(buf, b"Content-Length: 123\r\n\r\n");
+
+        let mut buf = Vec::new();
+        let mut reader = smol::io::BufReader::new(b"Content-Type: application/vscode-jsonrpc\r\nContent-Length: 1235\r\n\r\n{\"somecontent\":123}" as &[u8]);
+        read_headers(&mut reader, &mut buf).await.unwrap();
+        assert_eq!(
+            buf,
+            b"Content-Type: application/vscode-jsonrpc\r\nContent-Length: 1235\r\n\r\n"
+        );
+
+        let mut buf = Vec::new();
+        let mut reader = smol::io::BufReader::new(b"Content-Length: 1235\r\nContent-Type: application/vscode-jsonrpc\r\n\r\n{\"somecontent\":true}" as &[u8]);
+        read_headers(&mut reader, &mut buf).await.unwrap();
+        assert_eq!(
+            buf,
+            b"Content-Length: 1235\r\nContent-Type: application/vscode-jsonrpc\r\n\r\n"
+        );
+    }
 }

From eee00c3fef48e9eb3db7022fb014913eb8d926d0 Mon Sep 17 00:00:00 2001
From: Etienne Lacoursiere <lacoursiere.etienne@gmail.com>
Date: Fri, 9 Feb 2024 12:59:09 -0500
Subject: [PATCH 354/372] Update configuring_zed.md with auto close section
 (#7625)

Adds a section for the `auto_close` feature  in `configuring_zed.md`

Release Notes:

- N/A
---
 docs/src/configuring_zed.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/src/configuring_zed.md b/docs/src/configuring_zed.md
index 0a72e384ce..006a448fc9 100644
--- a/docs/src/configuring_zed.md
+++ b/docs/src/configuring_zed.md
@@ -306,6 +306,15 @@ To override settings for a language, add an entry for that language server's nam
 }
 ```
 
+## Auto close
+- Description: Whether or not to automatically type closing characters for you.
+- Setting: `use_autoclose`
+- Default: `true`
+
+**Options**
+
+`boolean` values
+
 ## Git
 
 - Description: Configuration for git-related features.

From 5175c8963a23a3cab26ffb032feb34e4dc57b55b Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 9 Feb 2024 20:13:00 +0200
Subject: [PATCH 355/372] Actually fail on clippy failures (#7619)

Before the change to `script/clippy`, bash ignored first `clippy`
invocation failure and CI moved on with Linux errors and warnings
emitted.


Release Notes:

- N/A

---------

Co-authored-by: Mikayla Maki <mikayla@zed.dev>
---
 crates/cli/src/main.rs                        | 326 ++++++++++--------
 crates/gpui/src/platform/linux/blade_belt.rs  |   4 +-
 .../gpui/src/platform/linux/blade_renderer.rs |   4 +-
 crates/gpui/src/platform/linux/dispatcher.rs  |   2 +-
 crates/gpui/src/platform/linux/platform.rs    |  10 +-
 crates/gpui/src/platform/linux/window.rs      |   6 +-
 crates/zed/src/main.rs                        |   6 +-
 script/clippy                                 |   4 +-
 8 files changed, 208 insertions(+), 154 deletions(-)

diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs
index 69cfb7102b..47a824a04b 100644
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -1,20 +1,14 @@
+#![cfg_attr(target_os = "linux", allow(dead_code))]
+
 use anyhow::{anyhow, Context, Result};
 use clap::Parser;
-use cli::{CliRequest, CliResponse, IpcHandshake, FORCE_CLI_MODE_ENV_VAR_NAME};
-use core_foundation::{
-    array::{CFArray, CFIndex},
-    string::kCFStringEncodingUTF8,
-    url::{CFURLCreateWithBytes, CFURL},
-};
-use core_services::{kLSLaunchDefaults, LSLaunchURLSpec, LSOpenFromURLSpec, TCFType};
-use ipc_channel::ipc::{IpcOneShotServer, IpcReceiver, IpcSender};
+use cli::{CliRequest, CliResponse};
 use serde::Deserialize;
 use std::{
     ffi::OsStr,
     fs::{self, OpenOptions},
     io,
     path::{Path, PathBuf},
-    ptr,
 };
 use util::paths::PathLikeWithPosition;
 
@@ -112,136 +106,6 @@ enum Bundle {
     },
 }
 
-impl Bundle {
-    fn detect(args_bundle_path: Option<&Path>) -> anyhow::Result<Self> {
-        let bundle_path = if let Some(bundle_path) = args_bundle_path {
-            bundle_path
-                .canonicalize()
-                .with_context(|| format!("Args bundle path {bundle_path:?} canonicalization"))?
-        } else {
-            locate_bundle().context("bundle autodiscovery")?
-        };
-
-        match bundle_path.extension().and_then(|ext| ext.to_str()) {
-            Some("app") => {
-                let plist_path = bundle_path.join("Contents/Info.plist");
-                let plist = plist::from_file::<_, InfoPlist>(&plist_path).with_context(|| {
-                    format!("Reading *.app bundle plist file at {plist_path:?}")
-                })?;
-                Ok(Self::App {
-                    app_bundle: bundle_path,
-                    plist,
-                })
-            }
-            _ => {
-                println!("Bundle path {bundle_path:?} has no *.app extension, attempting to locate a dev build");
-                let plist_path = bundle_path
-                    .parent()
-                    .with_context(|| format!("Bundle path {bundle_path:?} has no parent"))?
-                    .join("WebRTC.framework/Resources/Info.plist");
-                let plist = plist::from_file::<_, InfoPlist>(&plist_path)
-                    .with_context(|| format!("Reading dev bundle plist file at {plist_path:?}"))?;
-                Ok(Self::LocalPath {
-                    executable: bundle_path,
-                    plist,
-                })
-            }
-        }
-    }
-
-    fn plist(&self) -> &InfoPlist {
-        match self {
-            Self::App { plist, .. } => plist,
-            Self::LocalPath { plist, .. } => plist,
-        }
-    }
-
-    fn path(&self) -> &Path {
-        match self {
-            Self::App { app_bundle, .. } => app_bundle,
-            Self::LocalPath { executable, .. } => executable,
-        }
-    }
-
-    fn launch(&self) -> anyhow::Result<(IpcSender<CliRequest>, IpcReceiver<CliResponse>)> {
-        let (server, server_name) =
-            IpcOneShotServer::<IpcHandshake>::new().context("Handshake before Zed spawn")?;
-        let url = format!("zed-cli://{server_name}");
-
-        match self {
-            Self::App { app_bundle, .. } => {
-                let app_path = app_bundle;
-
-                let status = unsafe {
-                    let app_url = CFURL::from_path(app_path, true)
-                        .with_context(|| format!("invalid app path {app_path:?}"))?;
-                    let url_to_open = CFURL::wrap_under_create_rule(CFURLCreateWithBytes(
-                        ptr::null(),
-                        url.as_ptr(),
-                        url.len() as CFIndex,
-                        kCFStringEncodingUTF8,
-                        ptr::null(),
-                    ));
-                    // equivalent to: open zed-cli:... -a /Applications/Zed\ Preview.app
-                    let urls_to_open = CFArray::from_copyable(&[url_to_open.as_concrete_TypeRef()]);
-                    LSOpenFromURLSpec(
-                        &LSLaunchURLSpec {
-                            appURL: app_url.as_concrete_TypeRef(),
-                            itemURLs: urls_to_open.as_concrete_TypeRef(),
-                            passThruParams: ptr::null(),
-                            launchFlags: kLSLaunchDefaults,
-                            asyncRefCon: ptr::null_mut(),
-                        },
-                        ptr::null_mut(),
-                    )
-                };
-
-                anyhow::ensure!(
-                    status == 0,
-                    "cannot start app bundle {}",
-                    self.zed_version_string()
-                );
-            }
-
-            Self::LocalPath { executable, .. } => {
-                let executable_parent = executable
-                    .parent()
-                    .with_context(|| format!("Executable {executable:?} path has no parent"))?;
-                let subprocess_stdout_file =
-                    fs::File::create(executable_parent.join("zed_dev.log"))
-                        .with_context(|| format!("Log file creation in {executable_parent:?}"))?;
-                let subprocess_stdin_file =
-                    subprocess_stdout_file.try_clone().with_context(|| {
-                        format!("Cloning descriptor for file {subprocess_stdout_file:?}")
-                    })?;
-                let mut command = std::process::Command::new(executable);
-                let command = command
-                    .env(FORCE_CLI_MODE_ENV_VAR_NAME, "")
-                    .stderr(subprocess_stdout_file)
-                    .stdout(subprocess_stdin_file)
-                    .arg(url);
-
-                command
-                    .spawn()
-                    .with_context(|| format!("Spawning {command:?}"))?;
-            }
-        }
-
-        let (_, handshake) = server.accept().context("Handshake after Zed spawn")?;
-        Ok((handshake.requests, handshake.responses))
-    }
-
-    fn zed_version_string(&self) -> String {
-        let is_dev = matches!(self, Self::LocalPath { .. });
-        format!(
-            "Zed {}{} – {}",
-            self.plist().bundle_short_version_string,
-            if is_dev { " (dev)" } else { "" },
-            self.path().display(),
-        )
-    }
-}
-
 fn touch(path: &Path) -> io::Result<()> {
     match OpenOptions::new().create(true).write(true).open(path) {
         Ok(_) => Ok(()),
@@ -259,3 +123,187 @@ fn locate_bundle() -> Result<PathBuf> {
     }
     Ok(app_path)
 }
+
+#[cfg(target_os = "linux")]
+mod linux {
+    use std::path::Path;
+
+    use cli::{CliRequest, CliResponse};
+    use ipc_channel::ipc::{IpcReceiver, IpcSender};
+
+    use crate::{Bundle, InfoPlist};
+
+    impl Bundle {
+        pub fn detect(_args_bundle_path: Option<&Path>) -> anyhow::Result<Self> {
+            unimplemented!()
+        }
+
+        pub fn plist(&self) -> &InfoPlist {
+            unimplemented!()
+        }
+
+        pub fn path(&self) -> &Path {
+            unimplemented!()
+        }
+
+        pub fn launch(&self) -> anyhow::Result<(IpcSender<CliRequest>, IpcReceiver<CliResponse>)> {
+            unimplemented!()
+        }
+
+        pub fn zed_version_string(&self) -> String {
+            unimplemented!()
+        }
+    }
+}
+
+#[cfg(target_os = "macos")]
+mod mac_os {
+    use anyhow::Context;
+    use core_foundation::{
+        array::{CFArray, CFIndex},
+        string::kCFStringEncodingUTF8,
+        url::{CFURLCreateWithBytes, CFURL},
+    };
+    use core_services::{kLSLaunchDefaults, LSLaunchURLSpec, LSOpenFromURLSpec, TCFType};
+    use std::{fs, path::Path, ptr};
+
+    use cli::{CliRequest, CliResponse, IpcHandshake, FORCE_CLI_MODE_ENV_VAR_NAME};
+    use ipc_channel::ipc::{IpcOneShotServer, IpcReceiver, IpcSender};
+
+    use crate::{locate_bundle, Bundle, InfoPlist};
+
+    impl Bundle {
+        pub fn detect(args_bundle_path: Option<&Path>) -> anyhow::Result<Self> {
+            let bundle_path = if let Some(bundle_path) = args_bundle_path {
+                bundle_path
+                    .canonicalize()
+                    .with_context(|| format!("Args bundle path {bundle_path:?} canonicalization"))?
+            } else {
+                locate_bundle().context("bundle autodiscovery")?
+            };
+
+            match bundle_path.extension().and_then(|ext| ext.to_str()) {
+                Some("app") => {
+                    let plist_path = bundle_path.join("Contents/Info.plist");
+                    let plist =
+                        plist::from_file::<_, InfoPlist>(&plist_path).with_context(|| {
+                            format!("Reading *.app bundle plist file at {plist_path:?}")
+                        })?;
+                    Ok(Self::App {
+                        app_bundle: bundle_path,
+                        plist,
+                    })
+                }
+                _ => {
+                    println!("Bundle path {bundle_path:?} has no *.app extension, attempting to locate a dev build");
+                    let plist_path = bundle_path
+                        .parent()
+                        .with_context(|| format!("Bundle path {bundle_path:?} has no parent"))?
+                        .join("WebRTC.framework/Resources/Info.plist");
+                    let plist =
+                        plist::from_file::<_, InfoPlist>(&plist_path).with_context(|| {
+                            format!("Reading dev bundle plist file at {plist_path:?}")
+                        })?;
+                    Ok(Self::LocalPath {
+                        executable: bundle_path,
+                        plist,
+                    })
+                }
+            }
+        }
+
+        fn plist(&self) -> &InfoPlist {
+            match self {
+                Self::App { plist, .. } => plist,
+                Self::LocalPath { plist, .. } => plist,
+            }
+        }
+
+        fn path(&self) -> &Path {
+            match self {
+                Self::App { app_bundle, .. } => app_bundle,
+                Self::LocalPath { executable, .. } => executable,
+            }
+        }
+
+        pub fn launch(&self) -> anyhow::Result<(IpcSender<CliRequest>, IpcReceiver<CliResponse>)> {
+            let (server, server_name) =
+                IpcOneShotServer::<IpcHandshake>::new().context("Handshake before Zed spawn")?;
+            let url = format!("zed-cli://{server_name}");
+
+            match self {
+                Self::App { app_bundle, .. } => {
+                    let app_path = app_bundle;
+
+                    let status = unsafe {
+                        let app_url = CFURL::from_path(app_path, true)
+                            .with_context(|| format!("invalid app path {app_path:?}"))?;
+                        let url_to_open = CFURL::wrap_under_create_rule(CFURLCreateWithBytes(
+                            ptr::null(),
+                            url.as_ptr(),
+                            url.len() as CFIndex,
+                            kCFStringEncodingUTF8,
+                            ptr::null(),
+                        ));
+                        // equivalent to: open zed-cli:... -a /Applications/Zed\ Preview.app
+                        let urls_to_open =
+                            CFArray::from_copyable(&[url_to_open.as_concrete_TypeRef()]);
+                        LSOpenFromURLSpec(
+                            &LSLaunchURLSpec {
+                                appURL: app_url.as_concrete_TypeRef(),
+                                itemURLs: urls_to_open.as_concrete_TypeRef(),
+                                passThruParams: ptr::null(),
+                                launchFlags: kLSLaunchDefaults,
+                                asyncRefCon: ptr::null_mut(),
+                            },
+                            ptr::null_mut(),
+                        )
+                    };
+
+                    anyhow::ensure!(
+                        status == 0,
+                        "cannot start app bundle {}",
+                        self.zed_version_string()
+                    );
+                }
+
+                Self::LocalPath { executable, .. } => {
+                    let executable_parent = executable
+                        .parent()
+                        .with_context(|| format!("Executable {executable:?} path has no parent"))?;
+                    let subprocess_stdout_file = fs::File::create(
+                        executable_parent.join("zed_dev.log"),
+                    )
+                    .with_context(|| format!("Log file creation in {executable_parent:?}"))?;
+                    let subprocess_stdin_file =
+                        subprocess_stdout_file.try_clone().with_context(|| {
+                            format!("Cloning descriptor for file {subprocess_stdout_file:?}")
+                        })?;
+                    let mut command = std::process::Command::new(executable);
+                    let command = command
+                        .env(FORCE_CLI_MODE_ENV_VAR_NAME, "")
+                        .stderr(subprocess_stdout_file)
+                        .stdout(subprocess_stdin_file)
+                        .arg(url);
+
+                    command
+                        .spawn()
+                        .with_context(|| format!("Spawning {command:?}"))?;
+                }
+            }
+
+            let (_, handshake) = server.accept().context("Handshake after Zed spawn")?;
+            Ok((handshake.requests, handshake.responses))
+        }
+
+        pub fn zed_version_string(&self) -> String {
+            let is_dev = matches!(self, Self::LocalPath { .. });
+            format!(
+                "Zed {}{} – {}",
+                self.plist().bundle_short_version_string,
+                if is_dev { " (dev)" } else { "" },
+                self.path().display(),
+            )
+        }
+    }
+}
diff --git a/crates/gpui/src/platform/linux/blade_belt.rs b/crates/gpui/src/platform/linux/blade_belt.rs
index 2562097cbb..7145ce2d2c 100644
--- a/crates/gpui/src/platform/linux/blade_belt.rs
+++ b/crates/gpui/src/platform/linux/blade_belt.rs
@@ -52,7 +52,7 @@ impl BladeBelt {
         let index_maybe = self
             .buffers
             .iter()
-            .position(|&(ref rb, ref sp)| size <= rb.size && gpu.wait_for(sp, 0));
+            .position(|(rb, sp)| size <= rb.size && gpu.wait_for(sp, 0));
         if let Some(index) = index_maybe {
             let (rb, _) = self.buffers.remove(index);
             let piece = rb.raw.into();
@@ -85,7 +85,7 @@ impl BladeBelt {
             "Type alignment {} is too big",
             type_alignment
         );
-        let total_bytes = data.len() * mem::size_of::<T>();
+        let total_bytes = std::mem::size_of_val(data);
         let bp = self.alloc(total_bytes as u64, gpu);
         unsafe {
             std::ptr::copy_nonoverlapping(data.as_ptr() as *const u8, bp.data(), total_bytes);
diff --git a/crates/gpui/src/platform/linux/blade_renderer.rs b/crates/gpui/src/platform/linux/blade_renderer.rs
index 665cedb88f..9f2ae6b606 100644
--- a/crates/gpui/src/platform/linux/blade_renderer.rs
+++ b/crates/gpui/src/platform/linux/blade_renderer.rs
@@ -455,7 +455,7 @@ impl BladeRenderer {
                         sprites,
                     } => {
                         let tex_info = self.atlas.get_texture_info(texture_id);
-                        let instance_buf = self.instance_belt.alloc_data(&sprites, &self.gpu);
+                        let instance_buf = self.instance_belt.alloc_data(sprites, &self.gpu);
                         let mut encoder = pass.with(&self.pipelines.mono_sprites);
                         encoder.bind(
                             0,
@@ -473,7 +473,7 @@ impl BladeRenderer {
                         sprites,
                     } => {
                         let tex_info = self.atlas.get_texture_info(texture_id);
-                        let instance_buf = self.instance_belt.alloc_data(&sprites, &self.gpu);
+                        let instance_buf = self.instance_belt.alloc_data(sprites, &self.gpu);
                         let mut encoder = pass.with(&self.pipelines.poly_sprites);
                         encoder.bind(
                             0,
diff --git a/crates/gpui/src/platform/linux/dispatcher.rs b/crates/gpui/src/platform/linux/dispatcher.rs
index 8aa0631268..fad7d01c87 100644
--- a/crates/gpui/src/platform/linux/dispatcher.rs
+++ b/crates/gpui/src/platform/linux/dispatcher.rs
@@ -109,7 +109,7 @@ impl PlatformDispatcher for LinuxDispatcher {
         let moment = Instant::now() + duration;
         let mut timed_tasks = self.timed_tasks.lock();
         timed_tasks.push((moment, runnable));
-        timed_tasks.sort_unstable_by(|&(ref a, _), &(ref b, _)| b.cmp(a));
+        timed_tasks.sort_unstable_by(|(a, _), (b, _)| b.cmp(a));
     }
 
     fn tick(&self, background_only: bool) -> bool {
diff --git a/crates/gpui/src/platform/linux/platform.rs b/crates/gpui/src/platform/linux/platform.rs
index b5ab1fcf93..dfc8f1163f 100644
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -59,7 +59,7 @@ pub(crate) struct LinuxPlatform {
 
 pub(crate) struct LinuxPlatformState {
     quit_requested: bool,
-    windows: HashMap<x::Window, Arc<LinuxWindowState>>,
+    windows: HashMap<x::Window, Rc<LinuxWindowState>>,
 }
 
 impl Default for LinuxPlatform {
@@ -133,7 +133,7 @@ impl Platform for LinuxPlatform {
                 xcb::Event::X(x::Event::Expose(ev)) => {
                     let window = {
                         let state = self.state.lock();
-                        Arc::clone(&state.windows[&ev.window()])
+                        Rc::clone(&state.windows[&ev.window()])
                     };
                     window.expose();
                 }
@@ -150,7 +150,7 @@ impl Platform for LinuxPlatform {
                     };
                     let window = {
                         let state = self.state.lock();
-                        Arc::clone(&state.windows[&ev.window()])
+                        Rc::clone(&state.windows[&ev.window()])
                     };
                     window.configure(bounds)
                 }
@@ -217,7 +217,7 @@ impl Platform for LinuxPlatform {
     ) -> Box<dyn PlatformWindow> {
         let x_window = self.xcb_connection.generate_id();
 
-        let window_ptr = Arc::new(LinuxWindowState::new(
+        let window_ptr = Rc::new(LinuxWindowState::new(
             options,
             &self.xcb_connection,
             self.x_root_index,
@@ -228,7 +228,7 @@ impl Platform for LinuxPlatform {
         self.state
             .lock()
             .windows
-            .insert(x_window, Arc::clone(&window_ptr));
+            .insert(x_window, Rc::clone(&window_ptr));
         Box::new(LinuxWindow(window_ptr))
     }
 
diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index e5c346b057..29904d8dfb 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -77,7 +77,7 @@ pub(crate) struct LinuxWindowState {
 }
 
 #[derive(Clone)]
-pub(crate) struct LinuxWindow(pub(crate) Arc<LinuxWindowState>);
+pub(crate) struct LinuxWindow(pub(crate) Rc<LinuxWindowState>);
 
 //todo!(linux): Remove other RawWindowHandle implementation
 unsafe impl blade_rwh::HasRawWindowHandle for RawWindow {
@@ -191,7 +191,7 @@ impl LinuxWindowState {
 
         //Warning: it looks like this reported size is immediately invalidated
         // on some platforms, followed by a "ConfigureNotify" event.
-        let gpu_extent = query_render_extent(&xcb_connection, x_window);
+        let gpu_extent = query_render_extent(xcb_connection, x_window);
 
         let raw = RawWindow {
             connection: as_raw_xcb_connection::AsRawXcbConnection::as_raw_xcb_connection(
@@ -430,6 +430,6 @@ impl PlatformWindow for LinuxWindow {
     }
 
     fn set_graphics_profiler_enabled(&self, enabled: bool) {
-        todo!("linux")
+        unimplemented!("linux")
     }
 }
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 9311c934db..832712762e 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -42,7 +42,6 @@ use std::{
         Arc,
     },
     thread,
-    time::Duration,
 };
 use theme::{ActiveTheme, SystemAppearance, ThemeRegistry, ThemeSettings};
 use util::{
@@ -930,6 +929,7 @@ fn load_user_themes_in_background(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {
 /// Spawns a background task to watch the themes directory for changes.
 #[cfg(target_os = "macos")]
 fn watch_themes(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {
+    use std::time::Duration;
     cx.spawn(|cx| async move {
         let mut events = fs
             .watch(&paths::THEMES_DIR.clone(), Duration::from_millis(100))
@@ -962,6 +962,8 @@ fn watch_themes(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {
 
 #[cfg(debug_assertions)]
 async fn watch_languages(fs: Arc<dyn fs::Fs>, languages: Arc<LanguageRegistry>) {
+    use std::time::Duration;
+
     let reload_debounce = Duration::from_millis(250);
 
     let mut events = fs
@@ -975,6 +977,8 @@ async fn watch_languages(fs: Arc<dyn fs::Fs>, languages: Arc<LanguageRegistry>)
 
 #[cfg(debug_assertions)]
 fn watch_file_types(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {
+    use std::time::Duration;
+
     cx.spawn(|cx| async move {
         let mut events = fs
             .watch(
diff --git a/script/clippy b/script/clippy
index 1a817015f3..71dca2ffef 100755
--- a/script/clippy
+++ b/script/clippy
@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+set -euxo pipefail
 
 # clippy.toml is not currently supporting specifying allowed lints
 # so specify those here, and disable the rest until Zed's workspace

From 862a9512b596a015c01b712409934b2e0721192a Mon Sep 17 00:00:00 2001
From: Christian Bergschneider <magiclake@gmx.de>
Date: Fri, 9 Feb 2024 19:15:00 +0100
Subject: [PATCH 356/372] gpui: Activate window on Linux (#7617)

Release Notes:
- N/A

Hello everyone,
it's me again! This is another todo!(linux) thing in gpui.

Best Regards,
Christian Bergschneider
---
 crates/gpui/src/platform/linux/window.rs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index 29904d8dfb..a9c00cc7fc 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -17,7 +17,10 @@ use std::{
     rc::Rc,
     sync::{self, Arc},
 };
-use xcb::{x, Xid as _};
+use xcb::{
+    x::{self, StackMode},
+    Xid as _,
+};
 
 #[derive(Default)]
 struct Callbacks {
@@ -337,8 +340,12 @@ impl PlatformWindow for LinuxWindow {
         unimplemented!()
     }
 
-    //todo!(linux)
-    fn activate(&self) {}
+    fn activate(&self) {
+        self.0.xcb_connection.send_request(&x::ConfigureWindow {
+            window: self.0.x_window,
+            value_list: &[x::ConfigWindow::StackMode(StackMode::Above)],
+        });
+    }
 
     fn set_title(&mut self, title: &str) {
         self.0.xcb_connection.send_request(&x::ChangeProperty {

From 2b383b854a034444039fa88b4a5e2845e45c4468 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Fri, 9 Feb 2024 10:34:00 -0800
Subject: [PATCH 357/372] linux: fix getting the initial content size (#7604)

Fix found by @h3mosphere (thanks!)

Solves the Vulkan validation on start on some platforms about the
mismatched surface size, e.g.
```
VUID-VkSwapchainCreateInfoKHR-imageExtent-01274(ERROR / SPEC): msgNum: 2094043421 - Validation Error: [ VUID-VkSwapchainCreateInfoKHR-imageExtent-01274 ] Object 0: handle = 0x55dff99554c0, type = VK_OBJECT_TYPE_DEVICE; | MessageID = 0x7cd0911d | vkCreateSwapchainKHR() called with imageExtent = (1920,1080), which is outside the bounds returned by vkGetPhysicalDeviceSurfaceCapabilitiesKHR(): currentExtent = (1920,1016), minImageExtent = (1920,1016), maxImageExtent = (1920,1016). The Vulkan spec states: imageExtent must be between minImageExtent and maxImageExtent, inclusive, where minImageExtent and maxImageExtent are members of the VkSurfaceCapabilitiesKHR structure returned by vkGetPhysicalDeviceSurfaceCapabilitiesKHR for the surface (https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkSwapchainCreateInfoKHR-imageExtent-01274)
```

Release Notes:
- N/A

Co-authored-by: Mikayla Maki <mikayla@zed.dev>
---
 crates/gpui/src/platform/linux/window.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/gpui/src/platform/linux/window.rs b/crates/gpui/src/platform/linux/window.rs
index a9c00cc7fc..774c4a537c 100644
--- a/crates/gpui/src/platform/linux/window.rs
+++ b/crates/gpui/src/platform/linux/window.rs
@@ -192,10 +192,6 @@ impl LinuxWindowState {
         xcb_connection.send_request(&x::MapWindow { window: x_window });
         xcb_connection.flush().unwrap();
 
-        //Warning: it looks like this reported size is immediately invalidated
-        // on some platforms, followed by a "ConfigureNotify" event.
-        let gpu_extent = query_render_extent(xcb_connection, x_window);
-
         let raw = RawWindow {
             connection: as_raw_xcb_connection::AsRawXcbConnection::as_raw_xcb_connection(
                 xcb_connection,
@@ -217,6 +213,10 @@ impl LinuxWindowState {
             .unwrap(),
         );
 
+        // Note: this has to be done after the GPU init, or otherwise
+        // the sizes are immediately invalidated.
+        let gpu_extent = query_render_extent(&xcb_connection, x_window);
+
         Self {
             xcb_connection: Arc::clone(xcb_connection),
             display: Rc::new(LinuxDisplay::new(xcb_connection, x_screen_index)),

From 2b39a9512a1af225da71445bad518a8831bea70d Mon Sep 17 00:00:00 2001
From: Matt Bond <matt+github@codefire.io>
Date: Fri, 9 Feb 2024 15:31:14 -0500
Subject: [PATCH 358/372] Canonicalize settings to avoid overwriting symlinks
 (#7632)

Release Notes:

- Fixed theme selector overwriting settings file symlinks
([#4469](https://github.com/zed-industries/zed/issues/4469)).
---
 crates/settings/src/settings_file.rs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/crates/settings/src/settings_file.rs b/crates/settings/src/settings_file.rs
index 3a43e3f9dd..7304fc5f1e 100644
--- a/crates/settings/src/settings_file.rs
+++ b/crates/settings/src/settings_file.rs
@@ -1,9 +1,9 @@
 use crate::{settings_store::SettingsStore, Settings};
-use anyhow::Result;
+use anyhow::{Context, Result};
 use fs::Fs;
 use futures::{channel::mpsc, StreamExt};
 use gpui::{AppContext, BackgroundExecutor};
-use std::{io::ErrorKind, path::PathBuf, str, sync::Arc, time::Duration};
+use std::{io::ErrorKind, path::PathBuf, sync::Arc, time::Duration};
 use util::{paths, ResultExt};
 
 pub const EMPTY_THEME_NAME: &'static str = "empty-theme";
@@ -115,7 +115,14 @@ pub fn update_settings_file<T: Settings>(
         let new_text = cx.read_global(|store: &SettingsStore, _cx| {
             store.new_text_for_update::<T>(old_text, update)
         })?;
-        fs.atomic_write(paths::SETTINGS.clone(), new_text).await?;
+        let initial_path = paths::SETTINGS.as_path();
+        let resolved_path = fs
+            .canonicalize(initial_path)
+            .await
+            .with_context(|| format!("Failed to canonicalize settings path {:?}", initial_path))?;
+        fs.atomic_write(resolved_path.clone(), new_text)
+            .await
+            .with_context(|| format!("Failed to write settings to file {:?}", resolved_path))?;
         anyhow::Ok(())
     })
     .detach_and_log_err(cx);

From efe23ebfcdd653b13be79132b1e2925bcd7bde45 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Fri, 9 Feb 2024 14:18:27 -0700
Subject: [PATCH 359/372] single click channel (#7596)

- Open channel notes and chat on channel click
- WIP
- Fix compile error
- Don't join live kit until requested
- Track in_call state separately from in_room



Release Notes:

- Improved channels: you can now be in a channel without joining the
audio call automatically

**or**

- N/A

---------

Co-authored-by: Nathan Sobo <nathan@zed.dev>
---
 assets/settings/default.json                  |   6 +-
 crates/call/src/call_settings.rs              |   6 -
 crates/call/src/participant.rs                |   1 +
 crates/call/src/room.rs                       | 366 +++++++++---------
 .../20221109000000_test_schema.sql            |   3 +-
 ...dd_in_call_column_to_room_participants.sql |   3 +
 crates/collab/src/db/queries/channels.rs      |  48 ++-
 crates/collab/src/db/queries/rooms.rs         |   6 +
 .../collab/src/db/tables/room_participant.rs  |   1 +
 crates/collab/src/db/tests/channel_tests.rs   |  13 +-
 crates/collab/src/rpc.rs                      | 159 ++++++--
 .../collab/src/tests/channel_guest_tests.rs   |  13 +-
 crates/collab/src/tests/channel_tests.rs      |   8 +-
 crates/collab/src/tests/following_tests.rs    |   6 +-
 crates/collab/src/tests/integration_tests.rs  |  44 +--
 crates/collab/src/tests/test_server.rs        |  12 +-
 crates/collab_ui/src/collab_panel.rs          | 261 ++++++++-----
 crates/collab_ui/src/collab_titlebar_item.rs  |  77 ++--
 crates/collab_ui/src/collab_ui.rs             |  11 +-
 crates/editor/src/display_map.rs              |   2 +-
 crates/live_kit_client/src/test.rs            |  24 +-
 crates/rpc/proto/zed.proto                    |  24 +-
 crates/rpc/src/proto.rs                       |   7 +
 crates/workspace/src/pane.rs                  |   1 +
 crates/workspace/src/workspace.rs             |  42 +-
 crates/zed/src/main.rs                        |   4 +-
 26 files changed, 659 insertions(+), 489 deletions(-)
 create mode 100644 crates/collab/migrations/20240207041417_add_in_call_column_to_room_participants.sql

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 06e0b98a41..139d64673f 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -104,10 +104,8 @@
   "show_whitespaces": "selection",
   // Settings related to calls in Zed
   "calls": {
-    // Join calls with the microphone live by default
-    "mute_on_join": false,
-    // Share your project when you are the first to join a channel
-    "share_on_join": true
+    // Join calls with the microphone muted by default
+    "mute_on_join": false
   },
   // Toolbar related settings
   "toolbar": {
diff --git a/crates/call/src/call_settings.rs b/crates/call/src/call_settings.rs
index 6aa4253689..441323ad5f 100644
--- a/crates/call/src/call_settings.rs
+++ b/crates/call/src/call_settings.rs
@@ -7,7 +7,6 @@ use settings::Settings;
 #[derive(Deserialize, Debug)]
 pub struct CallSettings {
     pub mute_on_join: bool,
-    pub share_on_join: bool,
 }
 
 /// Configuration of voice calls in Zed.
@@ -17,11 +16,6 @@ pub struct CallSettingsContent {
     ///
     /// Default: false
     pub mute_on_join: Option<bool>,
-
-    /// Whether your current project should be shared when joining an empty channel.
-    ///
-    /// Default: true
-    pub share_on_join: Option<bool>,
 }
 
 impl Settings for CallSettings {
diff --git a/crates/call/src/participant.rs b/crates/call/src/participant.rs
index 9faefc63c3..dfbac1be9a 100644
--- a/crates/call/src/participant.rs
+++ b/crates/call/src/participant.rs
@@ -49,6 +49,7 @@ pub struct RemoteParticipant {
     pub participant_index: ParticipantIndex,
     pub muted: bool,
     pub speaking: bool,
+    pub in_call: bool,
     pub video_tracks: HashMap<live_kit_client::Sid, Arc<RemoteVideoTrack>>,
     pub audio_tracks: HashMap<live_kit_client::Sid, Arc<RemoteAudioTrack>>,
 }
diff --git a/crates/call/src/room.rs b/crates/call/src/room.rs
index cd8af385ed..fa875e312d 100644
--- a/crates/call/src/room.rs
+++ b/crates/call/src/room.rs
@@ -61,6 +61,7 @@ pub struct Room {
     id: u64,
     channel_id: Option<u64>,
     live_kit: Option<LiveKitRoom>,
+    live_kit_connection_info: Option<proto::LiveKitConnectionInfo>,
     status: RoomStatus,
     shared_projects: HashSet<WeakModel<Project>>,
     joined_projects: HashSet<WeakModel<Project>>,
@@ -112,91 +113,18 @@ impl Room {
         user_store: Model<UserStore>,
         cx: &mut ModelContext<Self>,
     ) -> Self {
-        let live_kit_room = if let Some(connection_info) = live_kit_connection_info {
-            let room = live_kit_client::Room::new();
-            let mut status = room.status();
-            // Consume the initial status of the room.
-            let _ = status.try_recv();
-            let _maintain_room = cx.spawn(|this, mut cx| async move {
-                while let Some(status) = status.next().await {
-                    let this = if let Some(this) = this.upgrade() {
-                        this
-                    } else {
-                        break;
-                    };
-
-                    if status == live_kit_client::ConnectionState::Disconnected {
-                        this.update(&mut cx, |this, cx| this.leave(cx).log_err())
-                            .ok();
-                        break;
-                    }
-                }
-            });
-
-            let _handle_updates = cx.spawn({
-                let room = room.clone();
-                move |this, mut cx| async move {
-                    let mut updates = room.updates();
-                    while let Some(update) = updates.next().await {
-                        let this = if let Some(this) = this.upgrade() {
-                            this
-                        } else {
-                            break;
-                        };
-
-                        this.update(&mut cx, |this, cx| {
-                            this.live_kit_room_updated(update, cx).log_err()
-                        })
-                        .ok();
-                    }
-                }
-            });
-
-            let connect = room.connect(&connection_info.server_url, &connection_info.token);
-            cx.spawn(|this, mut cx| async move {
-                connect.await?;
-                this.update(&mut cx, |this, cx| {
-                    if !this.read_only() {
-                        if let Some(live_kit) = &this.live_kit {
-                            if !live_kit.muted_by_user && !live_kit.deafened {
-                                return this.share_microphone(cx);
-                            }
-                        }
-                    }
-                    Task::ready(Ok(()))
-                })?
-                .await
-            })
-            .detach_and_log_err(cx);
-
-            Some(LiveKitRoom {
-                room,
-                screen_track: LocalTrack::None,
-                microphone_track: LocalTrack::None,
-                next_publish_id: 0,
-                muted_by_user: Self::mute_on_join(cx),
-                deafened: false,
-                speaking: false,
-                _maintain_room,
-                _handle_updates,
-            })
-        } else {
-            None
-        };
-
         let maintain_connection = cx.spawn({
             let client = client.clone();
             move |this, cx| Self::maintain_connection(this, client.clone(), cx).log_err()
         });
 
-        Audio::play_sound(Sound::Joined, cx);
-
         let (room_update_completed_tx, room_update_completed_rx) = watch::channel();
 
-        Self {
+        let mut this = Self {
             id,
             channel_id,
-            live_kit: live_kit_room,
+            live_kit: None,
+            live_kit_connection_info,
             status: RoomStatus::Online,
             shared_projects: Default::default(),
             joined_projects: Default::default(),
@@ -220,7 +148,11 @@ impl Room {
             maintain_connection: Some(maintain_connection),
             room_update_completed_tx,
             room_update_completed_rx,
+        };
+        if this.live_kit_connection_info.is_some() {
+            this.join_call(cx).detach_and_log_err(cx);
         }
+        this
     }
 
     pub(crate) fn create(
@@ -279,7 +211,7 @@ impl Room {
         cx: AsyncAppContext,
     ) -> Result<Model<Self>> {
         Self::from_join_response(
-            client.request(proto::JoinChannel { channel_id }).await?,
+            client.request(proto::JoinChannel2 { channel_id }).await?,
             client,
             user_store,
             cx,
@@ -324,7 +256,7 @@ impl Room {
     }
 
     pub fn mute_on_join(cx: &AppContext) -> bool {
-        CallSettings::get_global(cx).mute_on_join || client::IMPERSONATE_LOGIN.is_some()
+        CallSettings::get_global(cx).mute_on_join
     }
 
     fn from_join_response(
@@ -374,7 +306,9 @@ impl Room {
         }
 
         log::info!("leaving room");
-        Audio::play_sound(Sound::Leave, cx);
+        if self.live_kit.is_some() {
+            Audio::play_sound(Sound::Leave, cx);
+        }
 
         self.clear_state(cx);
 
@@ -593,6 +527,24 @@ impl Room {
         &self.remote_participants
     }
 
+    pub fn call_participants(&self, cx: &AppContext) -> Vec<Arc<User>> {
+        self.remote_participants()
+            .values()
+            .filter_map(|participant| {
+                if participant.in_call {
+                    Some(participant.user.clone())
+                } else {
+                    None
+                }
+            })
+            .chain(if self.in_call() {
+                self.user_store.read(cx).current_user()
+            } else {
+                None
+            })
+            .collect()
+    }
+
     pub fn remote_participant_for_peer_id(&self, peer_id: PeerId) -> Option<&RemoteParticipant> {
         self.remote_participants
             .values()
@@ -617,10 +569,6 @@ impl Room {
         self.local_participant.role == proto::ChannelRole::Admin
     }
 
-    pub fn local_participant_is_guest(&self) -> bool {
-        self.local_participant.role == proto::ChannelRole::Guest
-    }
-
     pub fn set_participant_role(
         &mut self,
         user_id: u64,
@@ -828,6 +776,7 @@ impl Room {
                         }
 
                         let role = participant.role();
+                        let in_call = participant.in_call;
                         let location = ParticipantLocation::from_proto(participant.location)
                             .unwrap_or(ParticipantLocation::External);
                         if let Some(remote_participant) =
@@ -838,9 +787,15 @@ impl Room {
                             remote_participant.participant_index = participant_index;
                             if location != remote_participant.location
                                 || role != remote_participant.role
+                                || in_call != remote_participant.in_call
                             {
+                                if in_call && !remote_participant.in_call {
+                                    Audio::play_sound(Sound::Joined, cx);
+                                }
                                 remote_participant.location = location;
                                 remote_participant.role = role;
+                                remote_participant.in_call = participant.in_call;
+
                                 cx.emit(Event::ParticipantLocationChanged {
                                     participant_id: peer_id,
                                 });
@@ -857,12 +812,15 @@ impl Room {
                                     role,
                                     muted: true,
                                     speaking: false,
+                                    in_call: participant.in_call,
                                     video_tracks: Default::default(),
                                     audio_tracks: Default::default(),
                                 },
                             );
 
-                            Audio::play_sound(Sound::Joined, cx);
+                            if participant.in_call {
+                                Audio::play_sound(Sound::Joined, cx);
+                            }
 
                             if let Some(live_kit) = this.live_kit.as_ref() {
                                 let video_tracks =
@@ -1051,15 +1009,6 @@ impl Room {
             }
 
             RoomUpdate::SubscribedToRemoteAudioTrack(track, publication) => {
-                if let Some(live_kit) = &self.live_kit {
-                    if live_kit.deafened {
-                        track.stop();
-                        cx.foreground_executor()
-                            .spawn(publication.set_enabled(false))
-                            .detach();
-                    }
-                }
-
                 let user_id = track.publisher_id().parse()?;
                 let track_id = track.sid().to_string();
                 let participant = self
@@ -1206,7 +1155,7 @@ impl Room {
         })
     }
 
-    pub fn share_project(
+    pub(crate) fn share_project(
         &mut self,
         project: Model<Project>,
         cx: &mut ModelContext<Self>,
@@ -1308,18 +1257,14 @@ impl Room {
         })
     }
 
-    pub fn is_sharing_mic(&self) -> bool {
-        self.live_kit.as_ref().map_or(false, |live_kit| {
-            !matches!(live_kit.microphone_track, LocalTrack::None)
-        })
-    }
-
     pub fn is_muted(&self) -> bool {
-        self.live_kit.as_ref().map_or(false, |live_kit| {
-            matches!(live_kit.microphone_track, LocalTrack::None)
-                || live_kit.muted_by_user
-                || live_kit.deafened
-        })
+        self.live_kit
+            .as_ref()
+            .map_or(true, |live_kit| match &live_kit.microphone_track {
+                LocalTrack::None => true,
+                LocalTrack::Pending { .. } => true,
+                LocalTrack::Published { track_publication } => track_publication.is_muted(),
+            })
     }
 
     pub fn read_only(&self) -> bool {
@@ -1333,8 +1278,8 @@ impl Room {
             .map_or(false, |live_kit| live_kit.speaking)
     }
 
-    pub fn is_deafened(&self) -> Option<bool> {
-        self.live_kit.as_ref().map(|live_kit| live_kit.deafened)
+    pub fn in_call(&self) -> bool {
+        self.live_kit.is_some()
     }
 
     #[track_caller]
@@ -1387,12 +1332,8 @@ impl Room {
                         Ok(publication) => {
                             if canceled {
                                 live_kit.room.unpublish_track(publication);
+                                live_kit.microphone_track = LocalTrack::None;
                             } else {
-                                if live_kit.muted_by_user || live_kit.deafened {
-                                    cx.background_executor()
-                                        .spawn(publication.set_mute(true))
-                                        .detach();
-                                }
                                 live_kit.microphone_track = LocalTrack::Published {
                                     track_publication: publication,
                                 };
@@ -1496,50 +1437,140 @@ impl Room {
     }
 
     pub fn toggle_mute(&mut self, cx: &mut ModelContext<Self>) {
-        if let Some(live_kit) = self.live_kit.as_mut() {
-            // When unmuting, undeafen if the user was deafened before.
-            let was_deafened = live_kit.deafened;
-            if live_kit.muted_by_user
-                || live_kit.deafened
-                || matches!(live_kit.microphone_track, LocalTrack::None)
-            {
-                live_kit.muted_by_user = false;
-                live_kit.deafened = false;
-            } else {
-                live_kit.muted_by_user = true;
-            }
-            let muted = live_kit.muted_by_user;
-            let should_undeafen = was_deafened && !live_kit.deafened;
-
-            if let Some(task) = self.set_mute(muted, cx) {
-                task.detach_and_log_err(cx);
-            }
-
-            if should_undeafen {
-                if let Some(task) = self.set_deafened(false, cx) {
-                    task.detach_and_log_err(cx);
-                }
-            }
+        let muted = !self.is_muted();
+        if let Some(task) = self.set_mute(muted, cx) {
+            task.detach_and_log_err(cx);
         }
     }
 
-    pub fn toggle_deafen(&mut self, cx: &mut ModelContext<Self>) {
-        if let Some(live_kit) = self.live_kit.as_mut() {
-            // When deafening, mute the microphone if it was not already muted.
-            // When un-deafening, unmute the microphone, unless it was explicitly muted.
-            let deafened = !live_kit.deafened;
-            live_kit.deafened = deafened;
-            let should_change_mute = !live_kit.muted_by_user;
+    pub fn join_call(&mut self, cx: &mut ModelContext<Self>) -> Task<Result<()>> {
+        if self.live_kit.is_some() {
+            return Task::ready(Ok(()));
+        }
 
-            if let Some(task) = self.set_deafened(deafened, cx) {
-                task.detach_and_log_err(cx);
-            }
+        let room = live_kit_client::Room::new();
+        let mut status = room.status();
+        // Consume the initial status of the room.
+        let _ = status.try_recv();
+        let _maintain_room = cx.spawn(|this, mut cx| async move {
+            while let Some(status) = status.next().await {
+                let this = if let Some(this) = this.upgrade() {
+                    this
+                } else {
+                    break;
+                };
 
-            if should_change_mute {
-                if let Some(task) = self.set_mute(deafened, cx) {
-                    task.detach_and_log_err(cx);
+                if status == live_kit_client::ConnectionState::Disconnected {
+                    this.update(&mut cx, |this, cx| this.leave(cx).log_err())
+                        .ok();
+                    break;
                 }
             }
+        });
+
+        let _handle_updates = cx.spawn({
+            let room = room.clone();
+            move |this, mut cx| async move {
+                let mut updates = room.updates();
+                while let Some(update) = updates.next().await {
+                    let this = if let Some(this) = this.upgrade() {
+                        this
+                    } else {
+                        break;
+                    };
+
+                    this.update(&mut cx, |this, cx| {
+                        this.live_kit_room_updated(update, cx).log_err()
+                    })
+                    .ok();
+                }
+            }
+        });
+
+        self.live_kit = Some(LiveKitRoom {
+            room: room.clone(),
+            screen_track: LocalTrack::None,
+            microphone_track: LocalTrack::None,
+            next_publish_id: 0,
+            speaking: false,
+            _maintain_room,
+            _handle_updates,
+        });
+
+        cx.spawn({
+            let client = self.client.clone();
+            let share_microphone = !self.read_only() && !Self::mute_on_join(cx);
+            let connection_info = self.live_kit_connection_info.clone();
+            let channel_id = self.channel_id;
+
+            move |this, mut cx| async move {
+                let connection_info = if let Some(connection_info) = connection_info {
+                    connection_info.clone()
+                } else if let Some(channel_id) = channel_id {
+                    if let Some(connection_info) = client
+                        .request(proto::JoinChannelCall { channel_id })
+                        .await?
+                        .live_kit_connection_info
+                    {
+                        connection_info
+                    } else {
+                        return Err(anyhow!("failed to get connection info from server"));
+                    }
+                } else {
+                    return Err(anyhow!(
+                        "tried to connect to livekit without connection info"
+                    ));
+                };
+                room.connect(&connection_info.server_url, &connection_info.token)
+                    .await?;
+
+                let track_updates = this.update(&mut cx, |this, cx| {
+                    Audio::play_sound(Sound::Joined, cx);
+                    let Some(live_kit) = this.live_kit.as_mut() else {
+                        return vec![];
+                    };
+
+                    let mut track_updates = Vec::new();
+                    for participant in this.remote_participants.values() {
+                        for publication in live_kit
+                            .room
+                            .remote_audio_track_publications(&participant.user.id.to_string())
+                        {
+                            track_updates.push(publication.set_enabled(true));
+                        }
+
+                        for track in participant.audio_tracks.values() {
+                            track.start();
+                        }
+                    }
+                    track_updates
+                })?;
+
+                if share_microphone {
+                    this.update(&mut cx, |this, cx| this.share_microphone(cx))?
+                        .await?
+                };
+
+                for result in futures::future::join_all(track_updates).await {
+                    result?;
+                }
+                anyhow::Ok(())
+            }
+        })
+    }
+
+    pub fn leave_call(&mut self, cx: &mut ModelContext<Self>) {
+        Audio::play_sound(Sound::Leave, cx);
+        if let Some(channel_id) = self.channel_id() {
+            let client = self.client.clone();
+            cx.background_executor()
+                .spawn(client.request(proto::LeaveChannelCall { channel_id }))
+                .detach_and_log_err(cx);
+            self.live_kit.take();
+            self.live_kit_connection_info.take();
+            cx.notify();
+        } else {
+            self.leave(cx).detach_and_log_err(cx)
         }
     }
 
@@ -1570,40 +1601,6 @@ impl Room {
         }
     }
 
-    fn set_deafened(
-        &mut self,
-        deafened: bool,
-        cx: &mut ModelContext<Self>,
-    ) -> Option<Task<Result<()>>> {
-        let live_kit = self.live_kit.as_mut()?;
-        cx.notify();
-
-        let mut track_updates = Vec::new();
-        for participant in self.remote_participants.values() {
-            for publication in live_kit
-                .room
-                .remote_audio_track_publications(&participant.user.id.to_string())
-            {
-                track_updates.push(publication.set_enabled(!deafened));
-            }
-
-            for track in participant.audio_tracks.values() {
-                if deafened {
-                    track.stop();
-                } else {
-                    track.start();
-                }
-            }
-        }
-
-        Some(cx.foreground_executor().spawn(async move {
-            for result in futures::future::join_all(track_updates).await {
-                result?;
-            }
-            Ok(())
-        }))
-    }
-
     fn set_mute(
         &mut self,
         should_mute: bool,
@@ -1648,9 +1645,6 @@ struct LiveKitRoom {
     room: Arc<live_kit_client::Room>,
     screen_track: LocalTrack,
     microphone_track: LocalTrack,
-    /// Tracks whether we're currently in a muted state due to auto-mute from deafening or manual mute performed by user.
-    muted_by_user: bool,
-    deafened: bool,
     speaking: bool,
     next_publish_id: usize,
     _maintain_room: Task<()>,
diff --git a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
index 7be5725b68..1026fdea0d 100644
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -163,7 +163,8 @@ CREATE TABLE "room_participants" (
     "calling_connection_id" INTEGER NOT NULL,
     "calling_connection_server_id" INTEGER REFERENCES servers (id) ON DELETE SET NULL,
     "participant_index" INTEGER,
-    "role" TEXT
+    "role" TEXT,
+    "in_call" BOOLEAN NOT NULL DEFAULT FALSE
 );
 CREATE UNIQUE INDEX "index_room_participants_on_user_id" ON "room_participants" ("user_id");
 CREATE INDEX "index_room_participants_on_room_id" ON "room_participants" ("room_id");
diff --git a/crates/collab/migrations/20240207041417_add_in_call_column_to_room_participants.sql b/crates/collab/migrations/20240207041417_add_in_call_column_to_room_participants.sql
new file mode 100644
index 0000000000..09463c6e78
--- /dev/null
+++ b/crates/collab/migrations/20240207041417_add_in_call_column_to_room_participants.sql
@@ -0,0 +1,3 @@
+-- Add migration script here
+
+ALTER TABLE room_participants ADD COLUMN in_call BOOL NOT NULL DEFAULT FALSE;
diff --git a/crates/collab/src/db/queries/channels.rs b/crates/collab/src/db/queries/channels.rs
index 76337381f7..c37ea26fc1 100644
--- a/crates/collab/src/db/queries/channels.rs
+++ b/crates/collab/src/db/queries/channels.rs
@@ -97,11 +97,57 @@ impl Database {
         .await
     }
 
+    pub async fn set_in_channel_call(
+        &self,
+        channel_id: ChannelId,
+        user_id: UserId,
+        in_call: bool,
+    ) -> Result<(proto::Room, ChannelRole)> {
+        self.transaction(move |tx| async move {
+            let channel = self.get_channel_internal(channel_id, &*tx).await?;
+            let role = self.channel_role_for_user(&channel, user_id, &*tx).await?;
+            if role.is_none() || role == Some(ChannelRole::Banned) {
+                Err(ErrorCode::Forbidden.anyhow())?
+            }
+            let role = role.unwrap();
+
+            let Some(room) = room::Entity::find()
+                .filter(room::Column::ChannelId.eq(channel_id))
+                .one(&*tx)
+                .await?
+            else {
+                Err(anyhow!("no room exists"))?
+            };
+
+            let result = room_participant::Entity::update_many()
+                .filter(
+                    Condition::all()
+                        .add(room_participant::Column::RoomId.eq(room.id))
+                        .add(room_participant::Column::UserId.eq(user_id)),
+                )
+                .set(room_participant::ActiveModel {
+                    in_call: ActiveValue::Set(in_call),
+                    ..Default::default()
+                })
+                .exec(&*tx)
+                .await?;
+
+            if result.rows_affected != 1 {
+                Err(anyhow!("not in channel"))?
+            }
+
+            let room = self.get_room(room.id, &*tx).await?;
+            Ok((room, role))
+        })
+        .await
+    }
+
     /// Adds a user to the specified channel.
     pub async fn join_channel(
         &self,
         channel_id: ChannelId,
         user_id: UserId,
+        autojoin: bool,
         connection: ConnectionId,
         environment: &str,
     ) -> Result<(JoinRoom, Option<MembershipUpdated>, ChannelRole)> {
@@ -166,7 +212,7 @@ impl Database {
                 .get_or_create_channel_room(channel_id, &live_kit_room, environment, &*tx)
                 .await?;
 
-            self.join_channel_room_internal(room_id, user_id, connection, role, &*tx)
+            self.join_channel_room_internal(room_id, user_id, autojoin, connection, role, &*tx)
                 .await
                 .map(|jr| (jr, accept_invite_result, role))
         })
diff --git a/crates/collab/src/db/queries/rooms.rs b/crates/collab/src/db/queries/rooms.rs
index f8afbeab38..1f8a445186 100644
--- a/crates/collab/src/db/queries/rooms.rs
+++ b/crates/collab/src/db/queries/rooms.rs
@@ -135,6 +135,7 @@ impl Database {
                 ))),
                 participant_index: ActiveValue::set(Some(0)),
                 role: ActiveValue::set(Some(ChannelRole::Admin)),
+                in_call: ActiveValue::set(true),
 
                 id: ActiveValue::NotSet,
                 location_kind: ActiveValue::NotSet,
@@ -187,6 +188,7 @@ impl Database {
                 ))),
                 initial_project_id: ActiveValue::set(initial_project_id),
                 role: ActiveValue::set(Some(called_user_role)),
+                in_call: ActiveValue::set(true),
 
                 id: ActiveValue::NotSet,
                 answering_connection_id: ActiveValue::NotSet,
@@ -414,6 +416,7 @@ impl Database {
         &self,
         room_id: RoomId,
         user_id: UserId,
+        autojoin: bool,
         connection: ConnectionId,
         role: ChannelRole,
         tx: &DatabaseTransaction,
@@ -437,6 +440,8 @@ impl Database {
             ))),
             participant_index: ActiveValue::Set(Some(participant_index)),
             role: ActiveValue::set(Some(role)),
+            in_call: ActiveValue::set(autojoin),
+
             id: ActiveValue::NotSet,
             location_kind: ActiveValue::NotSet,
             location_project_id: ActiveValue::NotSet,
@@ -1258,6 +1263,7 @@ impl Database {
                         location: Some(proto::ParticipantLocation { variant: location }),
                         participant_index: participant_index as u32,
                         role: db_participant.role.unwrap_or(ChannelRole::Member).into(),
+                        in_call: db_participant.in_call,
                     },
                 );
             } else {
diff --git a/crates/collab/src/db/tables/room_participant.rs b/crates/collab/src/db/tables/room_participant.rs
index c562111e96..c0edaf28ca 100644
--- a/crates/collab/src/db/tables/room_participant.rs
+++ b/crates/collab/src/db/tables/room_participant.rs
@@ -20,6 +20,7 @@ pub struct Model {
     pub calling_connection_server_id: Option<ServerId>,
     pub participant_index: Option<i32>,
     pub role: Option<ChannelRole>,
+    pub in_call: bool,
 }
 
 impl Model {
diff --git a/crates/collab/src/db/tests/channel_tests.rs b/crates/collab/src/db/tests/channel_tests.rs
index a5e083f935..9de303ced4 100644
--- a/crates/collab/src/db/tests/channel_tests.rs
+++ b/crates/collab/src/db/tests/channel_tests.rs
@@ -138,6 +138,7 @@ async fn test_joining_channels(db: &Arc<Database>) {
         .join_channel(
             channel_1,
             user_1,
+            false,
             ConnectionId { owner_id, id: 1 },
             TEST_RELEASE_CHANNEL,
         )
@@ -732,9 +733,15 @@ async fn test_guest_access(db: &Arc<Database>) {
         .await
         .is_err());
 
-    db.join_channel(zed_channel, guest, guest_connection, TEST_RELEASE_CHANNEL)
-        .await
-        .unwrap();
+    db.join_channel(
+        zed_channel,
+        guest,
+        false,
+        guest_connection,
+        TEST_RELEASE_CHANNEL,
+    )
+    .await
+    .unwrap();
 
     assert!(db
         .join_channel_chat(zed_channel, guest_connection, guest)
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index e37681cd32..01fd0c1a8a 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -105,6 +105,7 @@ struct Session {
     zed_environment: Arc<str>,
     user_id: UserId,
     connection_id: ConnectionId,
+    zed_version: SemanticVersion,
     db: Arc<tokio::sync::Mutex<DbHandle>>,
     peer: Arc<Peer>,
     connection_pool: Arc<parking_lot::Mutex<ConnectionPool>>,
@@ -131,6 +132,19 @@ impl Session {
             _not_send: PhantomData,
         }
     }
+
+    fn endpoint_removed_in(&self, endpoint: &str, version: SemanticVersion) -> anyhow::Result<()> {
+        if self.zed_version > version {
+            Err(anyhow!(
+                "{} was removed in {} (you're on {})",
+                endpoint,
+                version,
+                self.zed_version
+            ))
+        } else {
+            Ok(())
+        }
+    }
 }
 
 impl fmt::Debug for Session {
@@ -274,8 +288,11 @@ impl Server {
             .add_request_handler(get_channel_members)
             .add_request_handler(respond_to_channel_invite)
             .add_request_handler(join_channel)
+            .add_request_handler(join_channel2)
             .add_request_handler(join_channel_chat)
             .add_message_handler(leave_channel_chat)
+            .add_request_handler(join_channel_call)
+            .add_request_handler(leave_channel_call)
             .add_request_handler(send_channel_message)
             .add_request_handler(remove_channel_message)
             .add_request_handler(get_channel_messages)
@@ -559,6 +576,7 @@ impl Server {
         connection: Connection,
         address: String,
         user: User,
+        zed_version: SemanticVersion,
         impersonator: Option<User>,
         mut send_connection_id: Option<oneshot::Sender<ConnectionId>>,
         executor: Executor,
@@ -616,6 +634,7 @@ impl Server {
             let session = Session {
                 user_id,
                 connection_id,
+                zed_version,
                 db: Arc::new(tokio::sync::Mutex::new(DbHandle(this.app_state.db.clone()))),
                 zed_environment: this.app_state.config.zed_environment.clone(),
                 peer: this.peer.clone(),
@@ -866,7 +885,7 @@ pub fn routes(server: Arc<Server>) -> Router<Body> {
 
 pub async fn handle_websocket_request(
     TypedHeader(ProtocolVersion(protocol_version)): TypedHeader<ProtocolVersion>,
-    _app_version_header: Option<TypedHeader<AppVersionHeader>>,
+    app_version_header: Option<TypedHeader<AppVersionHeader>>,
     ConnectInfo(socket_address): ConnectInfo<SocketAddr>,
     Extension(server): Extension<Arc<Server>>,
     Extension(user): Extension<User>,
@@ -881,6 +900,12 @@ pub async fn handle_websocket_request(
             .into_response();
     }
 
+    // zed 0.122.x was the first version that sent an app header, so once that hits stable
+    // we can return UPGRADE_REQUIRED instead of unwrap_or_default();
+    let app_version = app_version_header
+        .map(|header| header.0 .0)
+        .unwrap_or_default();
+
     let socket_address = socket_address.to_string();
     ws.on_upgrade(move |socket| {
         use util::ResultExt;
@@ -895,6 +920,7 @@ pub async fn handle_websocket_request(
                     connection,
                     socket_address,
                     user,
+                    app_version,
                     impersonator.0,
                     None,
                     Executor::Production,
@@ -1037,7 +1063,7 @@ async fn join_room(
     let channel_id = session.db().await.channel_id_for_room(room_id).await?;
 
     if let Some(channel_id) = channel_id {
-        return join_channel_internal(channel_id, Box::new(response), session).await;
+        return join_channel_internal(channel_id, true, Box::new(response), session).await;
     }
 
     let joined_room = {
@@ -2700,14 +2726,67 @@ async fn respond_to_channel_invite(
     Ok(())
 }
 
-/// Join the channels' room
+/// Join the channels' call
 async fn join_channel(
     request: proto::JoinChannel,
     response: Response<proto::JoinChannel>,
     session: Session,
 ) -> Result<()> {
+    session.endpoint_removed_in("join_channel", "0.123.0".parse().unwrap())?;
+
     let channel_id = ChannelId::from_proto(request.channel_id);
-    join_channel_internal(channel_id, Box::new(response), session).await
+    join_channel_internal(channel_id, true, Box::new(response), session).await
+}
+
+async fn join_channel2(
+    request: proto::JoinChannel2,
+    response: Response<proto::JoinChannel2>,
+    session: Session,
+) -> Result<()> {
+    let channel_id = ChannelId::from_proto(request.channel_id);
+    join_channel_internal(channel_id, false, Box::new(response), session).await
+}
+
+async fn join_channel_call(
+    request: proto::JoinChannelCall,
+    response: Response<proto::JoinChannelCall>,
+    session: Session,
+) -> Result<()> {
+    let channel_id = ChannelId::from_proto(request.channel_id);
+    let db = session.db().await;
+    let (joined_room, role) = db
+        .set_in_channel_call(channel_id, session.user_id, true)
+        .await?;
+
+    let Some(connection_info) = session.live_kit_client.as_ref().and_then(|live_kit| {
+        live_kit_info_for_user(live_kit, &session.user_id, role, &joined_room.live_kit_room)
+    }) else {
+        Err(anyhow!("no live kit token info"))?
+    };
+
+    room_updated(&joined_room, &session.peer);
+    response.send(proto::JoinChannelCallResponse {
+        live_kit_connection_info: Some(connection_info),
+    })?;
+
+    Ok(())
+}
+
+async fn leave_channel_call(
+    request: proto::LeaveChannelCall,
+    response: Response<proto::LeaveChannelCall>,
+    session: Session,
+) -> Result<()> {
+    let channel_id = ChannelId::from_proto(request.channel_id);
+    let db = session.db().await;
+    let (joined_room, _) = db
+        .set_in_channel_call(channel_id, session.user_id, false)
+        .await?;
+
+    room_updated(&joined_room, &session.peer);
+    response.send(proto::Ack {})?;
+
+    Ok(())
 }
 
 trait JoinChannelInternalResponse {
@@ -2723,9 +2802,15 @@ impl JoinChannelInternalResponse for Response<proto::JoinRoom> {
         Response::<proto::JoinRoom>::send(self, result)
     }
 }
+impl JoinChannelInternalResponse for Response<proto::JoinChannel2> {
+    fn send(self, result: proto::JoinRoomResponse) -> Result<()> {
+        Response::<proto::JoinChannel2>::send(self, result)
+    }
+}
 
 async fn join_channel_internal(
     channel_id: ChannelId,
+    autojoin: bool,
     response: Box<impl JoinChannelInternalResponse>,
     session: Session,
 ) -> Result<()> {
@@ -2737,39 +2822,22 @@ async fn join_channel_internal(
             .join_channel(
                 channel_id,
                 session.user_id,
+                autojoin,
                 session.connection_id,
                 session.zed_environment.as_ref(),
             )
             .await?;
 
         let live_kit_connection_info = session.live_kit_client.as_ref().and_then(|live_kit| {
-            let (can_publish, token) = if role == ChannelRole::Guest {
-                (
-                    false,
-                    live_kit
-                        .guest_token(
-                            &joined_room.room.live_kit_room,
-                            &session.user_id.to_string(),
-                        )
-                        .trace_err()?,
-                )
-            } else {
-                (
-                    true,
-                    live_kit
-                        .room_token(
-                            &joined_room.room.live_kit_room,
-                            &session.user_id.to_string(),
-                        )
-                        .trace_err()?,
-                )
-            };
-
-            Some(LiveKitConnectionInfo {
-                server_url: live_kit.url().into(),
-                token,
-                can_publish,
-            })
+            if !autojoin {
+                return None;
+            }
+            live_kit_info_for_user(
+                live_kit,
+                &session.user_id,
+                role,
+                &joined_room.room.live_kit_room,
+            )
         });
 
         response.send(proto::JoinRoomResponse {
@@ -2805,6 +2873,35 @@ async fn join_channel_internal(
     Ok(())
 }
 
+fn live_kit_info_for_user(
+    live_kit: &Arc<dyn live_kit_server::api::Client>,
+    user_id: &UserId,
+    role: ChannelRole,
+    live_kit_room: &String,
+) -> Option<LiveKitConnectionInfo> {
+    let (can_publish, token) = if role == ChannelRole::Guest {
+        (
+            false,
+            live_kit
+                .guest_token(live_kit_room, &user_id.to_string())
+                .trace_err()?,
+        )
+    } else {
+        (
+            true,
+            live_kit
+                .room_token(live_kit_room, &user_id.to_string())
+                .trace_err()?,
+        )
+    };
+
+    Some(LiveKitConnectionInfo {
+        server_url: live_kit.url().into(),
+        token,
+        can_publish,
+    })
+}
+
 /// Start editing the channel notes
 async fn join_channel_buffer(
     request: proto::JoinChannelBuffer,
diff --git a/crates/collab/src/tests/channel_guest_tests.rs b/crates/collab/src/tests/channel_guest_tests.rs
index bb1f493f0c..b315b76ad9 100644
--- a/crates/collab/src/tests/channel_guest_tests.rs
+++ b/crates/collab/src/tests/channel_guest_tests.rs
@@ -1,4 +1,7 @@
-use crate::{db::ChannelId, tests::TestServer};
+use crate::{
+    db::ChannelId,
+    tests::{test_server::join_channel_call, TestServer},
+};
 use call::ActiveCall;
 use editor::Editor;
 use gpui::{BackgroundExecutor, TestAppContext};
@@ -32,7 +35,7 @@ async fn test_channel_guests(
     cx_a.executor().run_until_parked();
 
     // Client B joins channel A as a guest
-    cx_b.update(|cx| workspace::join_channel(channel_id, client_b.app_state.clone(), None, cx))
+    cx_b.update(|cx| workspace::open_channel(channel_id, client_b.app_state.clone(), None, cx))
         .await
         .unwrap();
 
@@ -72,7 +75,7 @@ async fn test_channel_guest_promotion(cx_a: &mut TestAppContext, cx_b: &mut Test
         .await;
 
     let project_a = client_a.build_test_project(cx_a).await;
-    cx_a.update(|cx| workspace::join_channel(channel_id, client_a.app_state.clone(), None, cx))
+    cx_a.update(|cx| workspace::open_channel(channel_id, client_a.app_state.clone(), None, cx))
         .await
         .unwrap();
 
@@ -84,11 +87,13 @@ async fn test_channel_guest_promotion(cx_a: &mut TestAppContext, cx_b: &mut Test
     cx_a.run_until_parked();
 
     // Client B joins channel A as a guest
-    cx_b.update(|cx| workspace::join_channel(channel_id, client_b.app_state.clone(), None, cx))
+    cx_b.update(|cx| workspace::open_channel(channel_id, client_b.app_state.clone(), None, cx))
         .await
         .unwrap();
     cx_a.run_until_parked();
 
+    join_channel_call(cx_b).await.unwrap();
+
     // client B opens 1.txt as a guest
     let (workspace_b, cx_b) = client_b.active_workspace(cx_b);
     let room_b = cx_b
diff --git a/crates/collab/src/tests/channel_tests.rs b/crates/collab/src/tests/channel_tests.rs
index eda7377c77..95be2514a3 100644
--- a/crates/collab/src/tests/channel_tests.rs
+++ b/crates/collab/src/tests/channel_tests.rs
@@ -1,7 +1,7 @@
 use crate::{
     db::{self, UserId},
     rpc::RECONNECT_TIMEOUT,
-    tests::{room_participants, RoomParticipants, TestServer},
+    tests::{room_participants, test_server::join_channel_call, RoomParticipants, TestServer},
 };
 use call::ActiveCall;
 use channel::{ChannelId, ChannelMembership, ChannelStore};
@@ -382,6 +382,7 @@ async fn test_channel_room(
         .update(cx_a, |active_call, cx| active_call.join_channel(zed_id, cx))
         .await
         .unwrap();
+    join_channel_call(cx_a).await.unwrap();
 
     // Give everyone a chance to observe user A joining
     executor.run_until_parked();
@@ -429,7 +430,7 @@ async fn test_channel_room(
         .update(cx_b, |active_call, cx| active_call.join_channel(zed_id, cx))
         .await
         .unwrap();
-
+    join_channel_call(cx_b).await.unwrap();
     executor.run_until_parked();
 
     cx_a.read(|cx| {
@@ -552,6 +553,9 @@ async fn test_channel_room(
         .await
         .unwrap();
 
+    join_channel_call(cx_a).await.unwrap();
+    join_channel_call(cx_b).await.unwrap();
+
     executor.run_until_parked();
 
     let room_a =
diff --git a/crates/collab/src/tests/following_tests.rs b/crates/collab/src/tests/following_tests.rs
index 28fcc99271..7c930580f4 100644
--- a/crates/collab/src/tests/following_tests.rs
+++ b/crates/collab/src/tests/following_tests.rs
@@ -24,7 +24,7 @@ use workspace::{
 
 use super::TestClient;
 
-#[gpui::test(iterations = 10)]
+#[gpui::test]
 async fn test_basic_following(
     cx_a: &mut TestAppContext,
     cx_b: &mut TestAppContext,
@@ -437,6 +437,7 @@ async fn test_basic_following(
         })
         .await
         .unwrap();
+
     executor.run_until_parked();
     let shared_screen = workspace_a.update(cx_a, |workspace, cx| {
         workspace
@@ -522,6 +523,7 @@ async fn test_basic_following(
         workspace_a.update(cx_a, |workspace, _| workspace.leader_for_pane(&pane_a)),
         None
     );
+    executor.run_until_parked();
 }
 
 #[gpui::test]
@@ -2004,7 +2006,7 @@ async fn join_channel(
     client: &TestClient,
     cx: &mut TestAppContext,
 ) -> anyhow::Result<()> {
-    cx.update(|cx| workspace::join_channel(channel_id, client.app_state.clone(), None, cx))
+    cx.update(|cx| workspace::open_channel(channel_id, client.app_state.clone(), None, cx))
         .await
 }
 
diff --git a/crates/collab/src/tests/integration_tests.rs b/crates/collab/src/tests/integration_tests.rs
index 746f5aeeaf..61bcbdc884 100644
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -1881,7 +1881,7 @@ fn active_call_events(cx: &mut TestAppContext) -> Rc<RefCell<Vec<room::Event>>>
 }
 
 #[gpui::test]
-async fn test_mute_deafen(
+async fn test_mute(
     executor: BackgroundExecutor,
     cx_a: &mut TestAppContext,
     cx_b: &mut TestAppContext,
@@ -1920,7 +1920,7 @@ async fn test_mute_deafen(
     room_a.read_with(cx_a, |room, _| assert!(!room.is_muted()));
     room_b.read_with(cx_b, |room, _| assert!(!room.is_muted()));
 
-    // Users A and B are both muted.
+    // Users A and B are both unmuted.
     assert_eq!(
         participant_audio_state(&room_a, cx_a),
         &[ParticipantAudioState {
@@ -1962,30 +1962,6 @@ async fn test_mute_deafen(
         }]
     );
 
-    // User A deafens
-    room_a.update(cx_a, |room, cx| room.toggle_deafen(cx));
-    executor.run_until_parked();
-
-    // User A does not hear user B.
-    room_a.read_with(cx_a, |room, _| assert!(room.is_muted()));
-    room_b.read_with(cx_b, |room, _| assert!(!room.is_muted()));
-    assert_eq!(
-        participant_audio_state(&room_a, cx_a),
-        &[ParticipantAudioState {
-            user_id: client_b.user_id().unwrap(),
-            is_muted: false,
-            audio_tracks_playing: vec![false],
-        }]
-    );
-    assert_eq!(
-        participant_audio_state(&room_b, cx_b),
-        &[ParticipantAudioState {
-            user_id: client_a.user_id().unwrap(),
-            is_muted: true,
-            audio_tracks_playing: vec![true],
-        }]
-    );
-
     // User B calls user C, C joins.
     active_call_b
         .update(cx_b, |call, cx| {
@@ -2000,22 +1976,6 @@ async fn test_mute_deafen(
         .unwrap();
     executor.run_until_parked();
 
-    // User A does not hear users B or C.
-    assert_eq!(
-        participant_audio_state(&room_a, cx_a),
-        &[
-            ParticipantAudioState {
-                user_id: client_b.user_id().unwrap(),
-                is_muted: false,
-                audio_tracks_playing: vec![false],
-            },
-            ParticipantAudioState {
-                user_id: client_c.user_id().unwrap(),
-                is_muted: false,
-                audio_tracks_playing: vec![false],
-            }
-        ]
-    );
     assert_eq!(
         participant_audio_state(&room_b, cx_b),
         &[
diff --git a/crates/collab/src/tests/test_server.rs b/crates/collab/src/tests/test_server.rs
index 69e338b6ea..d7e19dc9a9 100644
--- a/crates/collab/src/tests/test_server.rs
+++ b/crates/collab/src/tests/test_server.rs
@@ -13,7 +13,7 @@ use client::{
 use collections::{HashMap, HashSet};
 use fs::FakeFs;
 use futures::{channel::oneshot, StreamExt as _};
-use gpui::{BackgroundExecutor, Context, Model, TestAppContext, View, VisualTestContext};
+use gpui::{BackgroundExecutor, Context, Model, Task, TestAppContext, View, VisualTestContext};
 use language::LanguageRegistry;
 use node_runtime::FakeNodeRuntime;
 
@@ -36,7 +36,7 @@ use std::{
         Arc,
     },
 };
-use util::http::FakeHttpClient;
+use util::{http::FakeHttpClient, SemanticVersion};
 use workspace::{Workspace, WorkspaceStore};
 
 pub struct TestServer {
@@ -230,6 +230,7 @@ impl TestServer {
                                 server_conn,
                                 client_name,
                                 user,
+                                SemanticVersion::default(),
                                 None,
                                 Some(connection_id_tx),
                                 Executor::Deterministic(cx.background_executor().clone()),
@@ -685,7 +686,7 @@ impl TestClient {
         channel_id: u64,
         cx: &'a mut TestAppContext,
     ) -> (View<Workspace>, &'a mut VisualTestContext) {
-        cx.update(|cx| workspace::join_channel(channel_id, self.app_state.clone(), None, cx))
+        cx.update(|cx| workspace::open_channel(channel_id, self.app_state.clone(), None, cx))
             .await
             .unwrap();
         cx.run_until_parked();
@@ -760,6 +761,11 @@ impl TestClient {
     }
 }
 
+pub fn join_channel_call(cx: &mut TestAppContext) -> Task<anyhow::Result<()>> {
+    let room = cx.read(|cx| ActiveCall::global(cx).read(cx).room().cloned());
+    room.unwrap().update(cx, |room, cx| room.join_call(cx))
+}
+
 impl Drop for TestClient {
     fn drop(&mut self) {
         self.app_state.client.teardown();
diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index a010abdbcb..527e0baa53 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -40,7 +40,7 @@ use util::{maybe, ResultExt, TryFutureExt};
 use workspace::{
     dock::{DockPosition, Panel, PanelEvent},
     notifications::{DetachAndPromptErr, NotifyResultExt, NotifyTaskExt},
-    OpenChannelNotes, Workspace,
+    Workspace,
 };
 
 actions!(
@@ -69,19 +69,6 @@ pub fn init(cx: &mut AppContext) {
         workspace.register_action(|workspace, _: &ToggleFocus, cx| {
             workspace.toggle_panel_focus::<CollabPanel>(cx);
         });
-        workspace.register_action(|_, _: &OpenChannelNotes, cx| {
-            let channel_id = ActiveCall::global(cx)
-                .read(cx)
-                .room()
-                .and_then(|room| room.read(cx).channel_id());
-
-            if let Some(channel_id) = channel_id {
-                let workspace = cx.view().clone();
-                cx.window_context().defer(move |cx| {
-                    ChannelView::open(channel_id, None, workspace, cx).detach_and_log_err(cx)
-                });
-            }
-        });
     })
     .detach();
 }
@@ -175,6 +162,9 @@ enum ListEntry {
         depth: usize,
         has_children: bool,
     },
+    ChannelCall {
+        channel_id: ChannelId,
+    },
     ChannelNotes {
         channel_id: ChannelId,
     },
@@ -382,6 +372,7 @@ impl CollabPanel {
 
                 if query.is_empty() {
                     if let Some(channel_id) = room.channel_id() {
+                        self.entries.push(ListEntry::ChannelCall { channel_id });
                         self.entries.push(ListEntry::ChannelNotes { channel_id });
                         self.entries.push(ListEntry::ChannelChat { channel_id });
                     }
@@ -479,7 +470,7 @@ impl CollabPanel {
                                 && participant.video_tracks.is_empty(),
                         });
                     }
-                    if !participant.video_tracks.is_empty() {
+                    if room.in_call() && !participant.video_tracks.is_empty() {
                         self.entries.push(ListEntry::ParticipantScreen {
                             peer_id: Some(participant.peer_id),
                             is_last: true,
@@ -832,8 +823,6 @@ impl CollabPanel {
         cx: &mut ViewContext<Self>,
     ) -> ListItem {
         let user_id = user.id;
-        let is_current_user =
-            self.user_store.read(cx).current_user().map(|user| user.id) == Some(user_id);
         let tooltip = format!("Follow {}", user.github_login);
 
         let is_call_admin = ActiveCall::global(cx).read(cx).room().is_some_and(|room| {
@@ -846,12 +835,6 @@ impl CollabPanel {
             .selected(is_selected)
             .end_slot(if is_pending {
                 Label::new("Calling").color(Color::Muted).into_any_element()
-            } else if is_current_user {
-                IconButton::new("leave-call", IconName::Exit)
-                    .style(ButtonStyle::Subtle)
-                    .on_click(move |_, cx| Self::leave_call(cx))
-                    .tooltip(|cx| Tooltip::text("Leave Call", cx))
-                    .into_any_element()
             } else if role == proto::ChannelRole::Guest {
                 Label::new("Guest").color(Color::Muted).into_any_element()
             } else {
@@ -953,12 +936,88 @@ impl CollabPanel {
         }
     }
 
+    fn render_channel_call(
+        &self,
+        channel_id: ChannelId,
+        is_selected: bool,
+        cx: &mut ViewContext<Self>,
+    ) -> impl IntoElement {
+        let (is_in_call, call_participants) = ActiveCall::global(cx)
+            .read(cx)
+            .room()
+            .map(|room| (room.read(cx).in_call(), room.read(cx).call_participants(cx)))
+            .unwrap_or_default();
+
+        const FACEPILE_LIMIT: usize = 3;
+
+        let face_pile = if !call_participants.is_empty() {
+            let extra_count = call_participants.len().saturating_sub(FACEPILE_LIMIT);
+            let result = FacePile::new(
+                call_participants
+                    .iter()
+                    .map(|user| Avatar::new(user.avatar_uri.clone()).into_any_element())
+                    .take(FACEPILE_LIMIT)
+                    .chain(if extra_count > 0 {
+                        Some(
+                            div()
+                                .ml_2()
+                                .child(Label::new(format!("+{extra_count}")))
+                                .into_any_element(),
+                        )
+                    } else {
+                        None
+                    })
+                    .collect::<SmallVec<_>>(),
+            );
+
+            Some(result)
+        } else {
+            None
+        };
+
+        ListItem::new("channel-call")
+            .selected(is_selected)
+            .start_slot(
+                h_flex()
+                    .gap_1()
+                    .child(render_tree_branch(false, true, cx))
+                    .child(IconButton::new(0, IconName::AudioOn)),
+            )
+            .when(is_in_call, |el| {
+                el.end_slot(
+                    IconButton::new(1, IconName::Exit)
+                        .style(ButtonStyle::Filled)
+                        .shape(ui::IconButtonShape::Square)
+                        .tooltip(|cx| Tooltip::text("Leave call", cx))
+                        .on_click(cx.listener(|this, _, cx| this.leave_channel_call(cx))),
+                )
+            })
+            .when(!is_in_call, |el| {
+                el.tooltip(move |cx| Tooltip::text("Join audio call", cx))
+                    .on_click(cx.listener(move |this, _, cx| {
+                        this.join_channel_call(channel_id, cx);
+                    }))
+            })
+            .child(
+                div()
+                    .text_ui()
+                    .when(!call_participants.is_empty(), |el| {
+                        el.font_weight(FontWeight::SEMIBOLD)
+                    })
+                    .child("call"),
+            )
+            .children(face_pile)
+    }
+
     fn render_channel_notes(
         &self,
         channel_id: ChannelId,
         is_selected: bool,
         cx: &mut ViewContext<Self>,
     ) -> impl IntoElement {
+        let channel_store = self.channel_store.read(cx);
+        let has_notes_notification = channel_store.has_channel_buffer_changed(channel_id);
+
         ListItem::new("channel-notes")
             .selected(is_selected)
             .on_click(cx.listener(move |this, _, cx| {
@@ -970,7 +1029,14 @@ impl CollabPanel {
                     .child(render_tree_branch(false, true, cx))
                     .child(IconButton::new(0, IconName::File)),
             )
-            .child(Label::new("notes"))
+            .child(
+                div()
+                    .text_ui()
+                    .when(has_notes_notification, |el| {
+                        el.font_weight(FontWeight::SEMIBOLD)
+                    })
+                    .child("notes"),
+            )
             .tooltip(move |cx| Tooltip::text("Open Channel Notes", cx))
     }
 
@@ -980,6 +1046,8 @@ impl CollabPanel {
         is_selected: bool,
         cx: &mut ViewContext<Self>,
     ) -> impl IntoElement {
+        let channel_store = self.channel_store.read(cx);
+        let has_messages_notification = channel_store.has_new_messages(channel_id);
         ListItem::new("channel-chat")
             .selected(is_selected)
             .on_click(cx.listener(move |this, _, cx| {
@@ -991,7 +1059,14 @@ impl CollabPanel {
                     .child(render_tree_branch(false, false, cx))
                     .child(IconButton::new(0, IconName::MessageBubbles)),
             )
-            .child(Label::new("chat"))
+            .child(
+                div()
+                    .text_ui()
+                    .when(has_messages_notification, |el| {
+                        el.font_weight(FontWeight::SEMIBOLD)
+                    })
+                    .child("chat"),
+            )
             .tooltip(move |cx| Tooltip::text("Open Chat", cx))
     }
 
@@ -1249,12 +1324,14 @@ impl CollabPanel {
         cx: &mut ViewContext<Self>,
     ) {
         let this = cx.view().clone();
-        let in_room = ActiveCall::global(cx).read(cx).room().is_some();
+        let room = ActiveCall::global(cx).read(cx).room();
+        let in_room = room.is_some();
+        let in_call = room.is_some_and(|room| room.read(cx).in_call());
 
         let context_menu = ContextMenu::build(cx, |mut context_menu, _| {
             let user_id = contact.user.id;
 
-            if contact.online && !contact.busy {
+            if contact.online && !contact.busy && (!in_room || in_call) {
                 let label = if in_room {
                     format!("Invite {} to join", contact.user.github_login)
                 } else {
@@ -1402,7 +1479,7 @@ impl CollabPanel {
                         if is_active {
                             self.open_channel_notes(channel.id, cx)
                         } else {
-                            self.join_channel(channel.id, cx)
+                            self.open_channel(channel.id, cx)
                         }
                     }
                     ListEntry::ContactPlaceholder => self.toggle_contact_finder(cx),
@@ -1421,6 +1498,9 @@ impl CollabPanel {
                     ListEntry::ChannelInvite(channel) => {
                         self.respond_to_channel_invite(channel.id, true, cx)
                     }
+                    ListEntry::ChannelCall { channel_id } => {
+                        self.join_channel_call(*channel_id, cx)
+                    }
                     ListEntry::ChannelNotes { channel_id } => {
                         self.open_channel_notes(*channel_id, cx)
                     }
@@ -1883,14 +1963,14 @@ impl CollabPanel {
             .detach_and_prompt_err("Call failed", cx, |_, _| None);
     }
 
-    fn join_channel(&self, channel_id: u64, cx: &mut ViewContext<Self>) {
+    fn open_channel(&self, channel_id: u64, cx: &mut ViewContext<Self>) {
         let Some(workspace) = self.workspace.upgrade() else {
             return;
         };
         let Some(handle) = cx.window_handle().downcast::<Workspace>() else {
             return;
         };
-        workspace::join_channel(
+        workspace::open_channel(
             channel_id,
             workspace.read(cx).app_state().clone(),
             Some(handle),
@@ -1899,6 +1979,23 @@ impl CollabPanel {
         .detach_and_prompt_err("Failed to join channel", cx, |_, _| None)
     }
 
+    fn join_channel_call(&mut self, _channel_id: ChannelId, cx: &mut ViewContext<Self>) {
+        let Some(room) = ActiveCall::global(cx).read(cx).room().cloned() else {
+            return;
+        };
+
+        room.update(cx, |room, cx| room.join_call(cx))
+            .detach_and_prompt_err("Failed to join call", cx, |_, _| None)
+    }
+
+    fn leave_channel_call(&mut self, cx: &mut ViewContext<Self>) {
+        let Some(room) = ActiveCall::global(cx).read(cx).room().cloned() else {
+            return;
+        };
+
+        room.update(cx, |room, cx| room.leave_call(cx));
+    }
+
     fn join_channel_chat(&mut self, channel_id: ChannelId, cx: &mut ViewContext<Self>) {
         let Some(workspace) = self.workspace.upgrade() else {
             return;
@@ -2024,6 +2121,9 @@ impl CollabPanel {
             ListEntry::ParticipantScreen { peer_id, is_last } => self
                 .render_participant_screen(*peer_id, *is_last, is_selected, cx)
                 .into_any_element(),
+            ListEntry::ChannelCall { channel_id } => self
+                .render_channel_call(*channel_id, is_selected, cx)
+                .into_any_element(),
             ListEntry::ChannelNotes { channel_id } => self
                 .render_channel_notes(*channel_id, is_selected, cx)
                 .into_any_element(),
@@ -2089,7 +2189,6 @@ impl CollabPanel {
         is_collapsed: bool,
         cx: &ViewContext<Self>,
     ) -> impl IntoElement {
-        let mut channel_link = None;
         let mut channel_tooltip_text = None;
         let mut channel_icon = None;
 
@@ -2100,13 +2199,12 @@ impl CollabPanel {
 
                     let channel = self.channel_store.read(cx).channel_for_id(channel_id)?;
 
-                    channel_link = Some(channel.link());
                     (channel_icon, channel_tooltip_text) = match channel.visibility {
                         proto::ChannelVisibility::Public => {
-                            (Some("icons/public.svg"), Some("Copy public channel link."))
+                            (Some(IconName::Public), Some("Close Channel"))
                         }
                         proto::ChannelVisibility::Members => {
-                            (Some("icons/hash.svg"), Some("Copy private channel link."))
+                            (Some(IconName::Hash), Some("Close Channel"))
                         }
                     };
 
@@ -2128,17 +2226,10 @@ impl CollabPanel {
         };
 
         let button = match section {
-            Section::ActiveCall => channel_link.map(|channel_link| {
-                let channel_link_copy = channel_link.clone();
-                IconButton::new("channel-link", IconName::Copy)
-                    .icon_size(IconSize::Small)
-                    .size(ButtonSize::None)
-                    .visible_on_hover("section-header")
-                    .on_click(move |_, cx| {
-                        let item = ClipboardItem::new(channel_link_copy.clone());
-                        cx.write_to_clipboard(item)
-                    })
-                    .tooltip(|cx| Tooltip::text("Copy channel link", cx))
+            Section::ActiveCall => channel_icon.map(|_| {
+                IconButton::new("channel-link", IconName::Close)
+                    .on_click(move |_, cx| Self::leave_call(cx))
+                    .tooltip(|cx| Tooltip::text("Close channel", cx))
                     .into_any_element()
             }),
             Section::Contacts => Some(
@@ -2173,6 +2264,9 @@ impl CollabPanel {
                             this.toggle_section_expanded(section, cx);
                         }))
                 })
+                .when_some(channel_icon, |el, channel_icon| {
+                    el.start_slot(Icon::new(channel_icon).color(Color::Muted))
+                })
                 .inset(true)
                 .end_slot::<AnyElement>(button)
                 .selected(is_selected),
@@ -2478,11 +2572,9 @@ impl CollabPanel {
                         }),
                     )
                     .on_click(cx.listener(move |this, _, cx| {
-                        if is_active {
-                            this.open_channel_notes(channel_id, cx)
-                        } else {
-                            this.join_channel(channel_id, cx)
-                        }
+                        this.open_channel(channel_id, cx);
+                        this.open_channel_notes(channel_id, cx);
+                        this.join_channel_chat(channel_id, cx);
                     }))
                     .on_secondary_mouse_down(cx.listener(
                         move |this, event: &MouseDownEvent, cx| {
@@ -2499,61 +2591,24 @@ impl CollabPanel {
                         .color(Color::Muted),
                     )
                     .child(
-                        h_flex()
-                            .id(channel_id as usize)
-                            .child(Label::new(channel.name.clone()))
-                            .children(face_pile.map(|face_pile| face_pile.p_1())),
+                        h_flex().id(channel_id as usize).child(
+                            div()
+                                .text_ui()
+                                .when(has_messages_notification || has_notes_notification, |el| {
+                                    el.font_weight(FontWeight::SEMIBOLD)
+                                })
+                                .child(channel.name.clone()),
+                        ),
                     ),
             )
-            .child(
+            .children(face_pile.map(|face_pile| {
                 h_flex()
                     .absolute()
                     .right(rems(0.))
                     .z_index(1)
                     .h_full()
-                    .child(
-                        h_flex()
-                            .h_full()
-                            .gap_1()
-                            .px_1()
-                            .child(
-                                IconButton::new("channel_chat", IconName::MessageBubbles)
-                                    .style(ButtonStyle::Filled)
-                                    .shape(ui::IconButtonShape::Square)
-                                    .icon_size(IconSize::Small)
-                                    .icon_color(if has_messages_notification {
-                                        Color::Default
-                                    } else {
-                                        Color::Muted
-                                    })
-                                    .on_click(cx.listener(move |this, _, cx| {
-                                        this.join_channel_chat(channel_id, cx)
-                                    }))
-                                    .tooltip(|cx| Tooltip::text("Open channel chat", cx))
-                                    .when(!has_messages_notification, |this| {
-                                        this.visible_on_hover("")
-                                    }),
-                            )
-                            .child(
-                                IconButton::new("channel_notes", IconName::File)
-                                    .style(ButtonStyle::Filled)
-                                    .shape(ui::IconButtonShape::Square)
-                                    .icon_size(IconSize::Small)
-                                    .icon_color(if has_notes_notification {
-                                        Color::Default
-                                    } else {
-                                        Color::Muted
-                                    })
-                                    .on_click(cx.listener(move |this, _, cx| {
-                                        this.open_channel_notes(channel_id, cx)
-                                    }))
-                                    .tooltip(|cx| Tooltip::text("Open channel notes", cx))
-                                    .when(!has_notes_notification, |this| {
-                                        this.visible_on_hover("")
-                                    }),
-                            ),
-                    ),
-            )
+                    .child(face_pile.p_1())
+            }))
             .tooltip({
                 let channel_store = self.channel_store.clone();
                 move |cx| {
@@ -2757,6 +2812,14 @@ impl PartialEq for ListEntry {
                     return channel_1.id == channel_2.id;
                 }
             }
+            ListEntry::ChannelCall { channel_id } => {
+                if let ListEntry::ChannelCall {
+                    channel_id: other_id,
+                } = other
+                {
+                    return channel_id == other_id;
+                }
+            }
             ListEntry::ChannelNotes { channel_id } => {
                 if let ListEntry::ChannelNotes {
                     channel_id: other_id,
@@ -2855,7 +2918,7 @@ impl Render for JoinChannelTooltip {
                 .read(cx)
                 .channel_participants(self.channel_id);
 
-            div.child(Label::new("Join Channel"))
+            div.child(Label::new("Open Channel"))
                 .children(participants.iter().map(|participant| {
                     h_flex()
                         .gap_2()
diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs
index 2d0177c343..b149a683f4 100644
--- a/crates/collab_ui/src/collab_titlebar_item.rs
+++ b/crates/collab_ui/src/collab_titlebar_item.rs
@@ -102,6 +102,10 @@ impl Render for CollabTitlebarItem {
                                 room.remote_participants().values().collect::<Vec<_>>();
                             remote_participants.sort_by_key(|p| p.participant_index.0);
 
+                            if !room.in_call() {
+                                return this;
+                            }
+
                             let current_user_face_pile = self.render_collaborator(
                                 &current_user,
                                 peer_id,
@@ -133,6 +137,10 @@ impl Render for CollabTitlebarItem {
                                             == ParticipantLocation::SharedProject { project_id }
                                     });
 
+                                    if !collaborator.in_call {
+                                        return None;
+                                    }
+
                                     let face_pile = self.render_collaborator(
                                         &collaborator.user,
                                         collaborator.peer_id,
@@ -185,7 +193,7 @@ impl Render for CollabTitlebarItem {
                         let is_local = project.is_local();
                         let is_shared = is_local && project.is_shared();
                         let is_muted = room.is_muted();
-                        let is_deafened = room.is_deafened().unwrap_or(false);
+                        let is_connected_to_livekit = room.in_call();
                         let is_screen_sharing = room.is_screen_sharing();
                         let read_only = room.read_only();
 
@@ -220,22 +228,28 @@ impl Render for CollabTitlebarItem {
                                 )),
                             )
                         })
-                        .child(
-                            div()
-                                .child(
-                                    IconButton::new("leave-call", ui::IconName::Exit)
-                                        .style(ButtonStyle::Subtle)
-                                        .tooltip(|cx| Tooltip::text("Leave call", cx))
-                                        .icon_size(IconSize::Small)
-                                        .on_click(move |_, cx| {
-                                            ActiveCall::global(cx)
-                                                .update(cx, |call, cx| call.hang_up(cx))
-                                                .detach_and_log_err(cx);
-                                        }),
-                                )
-                                .pr_2(),
-                        )
-                        .when(!read_only, |this| {
+                        .when(is_connected_to_livekit, |el| {
+                            el.child(
+                                div()
+                                    .child(
+                                        IconButton::new("leave-call", ui::IconName::Exit)
+                                            .style(ButtonStyle::Subtle)
+                                            .tooltip(|cx| Tooltip::text("Leave call", cx))
+                                            .icon_size(IconSize::Small)
+                                            .on_click(move |_, cx| {
+                                                ActiveCall::global(cx).update(cx, |call, cx| {
+                                                    if let Some(room) = call.room() {
+                                                        room.update(cx, |room, cx| {
+                                                            room.leave_call(cx)
+                                                        })
+                                                    }
+                                                })
+                                            }),
+                                    )
+                                    .pl_2(),
+                            )
+                        })
+                        .when(!read_only && is_connected_to_livekit, |this| {
                             this.child(
                                 IconButton::new(
                                     "mute-microphone",
@@ -262,34 +276,7 @@ impl Render for CollabTitlebarItem {
                                 .on_click(move |_, cx| crate::toggle_mute(&Default::default(), cx)),
                             )
                         })
-                        .child(
-                            IconButton::new(
-                                "mute-sound",
-                                if is_deafened {
-                                    ui::IconName::AudioOff
-                                } else {
-                                    ui::IconName::AudioOn
-                                },
-                            )
-                            .style(ButtonStyle::Subtle)
-                            .selected_style(ButtonStyle::Tinted(TintColor::Negative))
-                            .icon_size(IconSize::Small)
-                            .selected(is_deafened)
-                            .tooltip(move |cx| {
-                                if !read_only {
-                                    Tooltip::with_meta(
-                                        "Deafen Audio",
-                                        None,
-                                        "Mic will be muted",
-                                        cx,
-                                    )
-                                } else {
-                                    Tooltip::text("Deafen Audio", cx)
-                                }
-                            })
-                            .on_click(move |_, cx| crate::toggle_deafen(&Default::default(), cx)),
-                        )
-                        .when(!read_only, |this| {
+                        .when(!read_only && is_connected_to_livekit, |this| {
                             this.child(
                                 IconButton::new("screen-share", ui::IconName::Screen)
                                     .style(ButtonStyle::Subtle)
diff --git a/crates/collab_ui/src/collab_ui.rs b/crates/collab_ui/src/collab_ui.rs
index 76894ec17f..6b0a5c2043 100644
--- a/crates/collab_ui/src/collab_ui.rs
+++ b/crates/collab_ui/src/collab_ui.rs
@@ -22,10 +22,7 @@ pub use panel_settings::{
 use settings::Settings;
 use workspace::{notifications::DetachAndPromptErr, AppState};
 
-actions!(
-    collab,
-    [ToggleScreenSharing, ToggleMute, ToggleDeafen, LeaveCall]
-);
+actions!(collab, [ToggleScreenSharing, ToggleMute, LeaveCall]);
 
 pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) {
     CollaborationPanelSettings::register(cx);
@@ -85,12 +82,6 @@ pub fn toggle_mute(_: &ToggleMute, cx: &mut AppContext) {
     }
 }
 
-pub fn toggle_deafen(_: &ToggleDeafen, cx: &mut AppContext) {
-    if let Some(room) = ActiveCall::global(cx).read(cx).room().cloned() {
-        room.update(cx, |room, cx| room.toggle_deafen(cx));
-    }
-}
-
 fn notification_window_options(
     screen: Rc<dyn PlatformDisplay>,
     window_size: Size<Pixels>,
diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs
index f975a833c1..bfdf61f49e 100644
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -3,7 +3,7 @@
 //! Not literally though - rendering, layout and all that jazz is a responsibility of [`EditorElement`][EditorElement].
 //! Instead, [`DisplayMap`] decides where Inlays/Inlay hints are displayed, when
 //! to apply a soft wrap, where to add fold indicators, whether there are any tabs in the buffer that
-//! we display as spaces and where to display custom blocks (like diagnostics).
+//! we display as spaces and where to display custom blocks (like diagnostics)
 //! Seems like a lot? That's because it is. [`DisplayMap`] is conceptually made up
 //! of several smaller structures that form a hierarchy (starting at the bottom):
 //! - [`InlayMap`] that decides where the [`Inlay`]s should be displayed.
diff --git a/crates/live_kit_client/src/test.rs b/crates/live_kit_client/src/test.rs
index 677370c0b8..421e23d3a2 100644
--- a/crates/live_kit_client/src/test.rs
+++ b/crates/live_kit_client/src/test.rs
@@ -54,7 +54,7 @@ impl TestServer {
         Ok(SERVERS
             .lock()
             .get(url)
-            .ok_or_else(|| anyhow!("no server found for url"))?
+            .ok_or_else(|| anyhow!("no server found for url: {}", url))?
             .clone())
     }
 
@@ -160,7 +160,6 @@ impl TestServer {
 
     async fn remove_participant(&self, room_name: String, identity: String) -> Result<()> {
         // TODO: clear state associated with the `Room`.
-
         self.executor.simulate_random_delay().await;
         let mut server_rooms = self.rooms.lock();
         let room = server_rooms
@@ -414,6 +413,15 @@ struct TestServerRoom {
     participant_permissions: HashMap<Sid, proto::ParticipantPermission>,
 }
 
+impl Drop for TestServerRoom {
+    fn drop(&mut self) {
+        for room in self.client_rooms.values() {
+            let mut state = room.0.lock();
+            *state.connection.0.borrow_mut() = ConnectionState::Disconnected;
+        }
+    }
+}
+
 #[derive(Debug)]
 struct TestServerVideoTrack {
     sid: Sid,
@@ -694,11 +702,15 @@ impl LocalTrackPublication {
 
     pub fn is_muted(&self) -> bool {
         if let Some(room) = self.room.upgrade() {
-            room.test_server()
-                .is_track_muted(&room.token(), &self.sid)
-                .unwrap_or(false)
+            if room.is_connected() {
+                room.test_server()
+                    .is_track_muted(&room.token(), &self.sid)
+                    .unwrap_or(true)
+            } else {
+                true
+            }
         } else {
-            false
+            true
         }
     }
 
diff --git a/crates/rpc/proto/zed.proto b/crates/rpc/proto/zed.proto
index 1823b9b6c5..528cefe99d 100644
--- a/crates/rpc/proto/zed.proto
+++ b/crates/rpc/proto/zed.proto
@@ -183,7 +183,12 @@ message Envelope {
         LspExtExpandMacroResponse lsp_ext_expand_macro_response = 155;
         SetRoomParticipantRole set_room_participant_role = 156;
 
-        UpdateUserChannels update_user_channels = 157; // current max
+        UpdateUserChannels update_user_channels = 157;
+
+        JoinChannel2 join_channel2 = 158;
+        JoinChannelCall join_channel_call = 159;
+        JoinChannelCallResponse join_channel_call_response = 160;
+        LeaveChannelCall leave_channel_call = 161; // current max
     }
 }
 
@@ -291,6 +296,7 @@ message Participant {
     ParticipantLocation location = 4;
     uint32 participant_index = 5;
     ChannelRole role = 6;
+    bool in_call = 7;
 }
 
 message PendingParticipant {
@@ -1033,6 +1039,22 @@ message JoinChannel {
     uint64 channel_id = 1;
 }
 
+message JoinChannel2 {
+    uint64 channel_id = 1;
+}
+
+message JoinChannelCall {
+    uint64 channel_id = 1;
+}
+
+message JoinChannelCallResponse {
+    LiveKitConnectionInfo live_kit_connection_info = 1;
+}
+
+message LeaveChannelCall {
+    uint64 channel_id = 1;
+}
+
 message DeleteChannel {
     uint64 channel_id = 1;
 }
diff --git a/crates/rpc/src/proto.rs b/crates/rpc/src/proto.rs
index 9b885d1840..6ebd93f6c8 100644
--- a/crates/rpc/src/proto.rs
+++ b/crates/rpc/src/proto.rs
@@ -198,6 +198,7 @@ messages!(
     (InlayHints, Background),
     (InlayHintsResponse, Background),
     (InviteChannelMember, Foreground),
+    (JoinChannel2, Foreground),
     (JoinChannel, Foreground),
     (JoinChannelBuffer, Foreground),
     (JoinChannelBufferResponse, Foreground),
@@ -208,6 +209,9 @@ messages!(
     (JoinRoom, Foreground),
     (JoinRoomResponse, Foreground),
     (LeaveChannelBuffer, Background),
+    (JoinChannelCall, Foreground),
+    (JoinChannelCallResponse, Foreground),
+    (LeaveChannelCall, Foreground),
     (LeaveChannelChat, Foreground),
     (LeaveProject, Foreground),
     (LeaveRoom, Foreground),
@@ -324,6 +328,9 @@ request_messages!(
     (InlayHints, InlayHintsResponse),
     (InviteChannelMember, Ack),
     (JoinChannel, JoinRoomResponse),
+    (JoinChannel2, JoinRoomResponse),
+    (JoinChannelCall, JoinChannelCallResponse),
+    (LeaveChannelCall, Ack),
     (JoinChannelBuffer, JoinChannelBufferResponse),
     (JoinChannelChat, JoinChannelChatResponse),
     (JoinProject, JoinProjectResponse),
diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs
index 55389cf8d0..fc5a82ee0f 100644
--- a/crates/workspace/src/pane.rs
+++ b/crates/workspace/src/pane.rs
@@ -762,6 +762,7 @@ impl Pane {
         save_intent: SaveIntent,
         cx: &mut ViewContext<Self>,
     ) -> Task<Result<()>> {
+        println!("{}", std::backtrace::Backtrace::force_capture());
         self.close_items(cx, save_intent, move |view_id| view_id == item_id_to_close)
     }
 
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index 89adb1e946..a4af8170aa 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -12,7 +12,7 @@ mod toolbar;
 mod workspace_settings;
 
 use anyhow::{anyhow, Context as _, Result};
-use call::{call_settings::CallSettings, ActiveCall};
+use call::ActiveCall;
 use client::{
     proto::{self, ErrorCode, PeerId},
     Client, ErrorExt, Status, TypedEnvelope, UserStore,
@@ -3977,8 +3977,6 @@ pub async fn last_opened_workspace_paths() -> Option<WorkspaceLocation> {
     DB.last_workspace().await.log_err().flatten()
 }
 
-actions!(collab, [OpenChannelNotes]);
-
 async fn join_channel_internal(
     channel_id: u64,
     app_state: &Arc<AppState>,
@@ -4080,36 +4078,6 @@ async fn join_channel_internal(
             return Some(join_remote_project(project, host, app_state.clone(), cx));
         }
 
-        // if you are the first to join a channel, share your project
-        if room.remote_participants().len() == 0 && !room.local_participant_is_guest() {
-            if let Some(workspace) = requesting_window {
-                let project = workspace.update(cx, |workspace, cx| {
-                    if !CallSettings::get_global(cx).share_on_join {
-                        return None;
-                    }
-                    let project = workspace.project.read(cx);
-                    if project.is_local()
-                        && project.visible_worktrees(cx).any(|tree| {
-                            tree.read(cx)
-                                .root_entry()
-                                .map_or(false, |entry| entry.is_dir())
-                        })
-                    {
-                        Some(workspace.project.clone())
-                    } else {
-                        None
-                    }
-                });
-                if let Ok(Some(project)) = project {
-                    return Some(cx.spawn(|room, mut cx| async move {
-                        room.update(&mut cx, |room, cx| room.share_project(project, cx))?
-                            .await?;
-                        Ok(())
-                    }));
-                }
-            }
-        }
-
         None
     })?;
     if let Some(task) = task {
@@ -4119,7 +4087,7 @@ async fn join_channel_internal(
     anyhow::Ok(false)
 }
 
-pub fn join_channel(
+pub fn open_channel(
     channel_id: u64,
     app_state: Arc<AppState>,
     requesting_window: Option<WindowHandle<Workspace>>,
@@ -4152,12 +4120,6 @@ pub fn join_channel(
                 })?
                 .await?;
 
-            if result.is_ok() {
-                cx.update(|cx| {
-                    cx.dispatch_action(&OpenChannelNotes);
-                }).log_err();
-            }
-
             active_window = Some(window_handle);
         }
 
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 832712762e..de4004be32 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -314,7 +314,7 @@ fn main() {
                 cx.spawn(|cx| async move {
                     // ignore errors here, we'll show a generic "not signed in"
                     let _ = authenticate(client, &cx).await;
-                    cx.update(|cx| workspace::join_channel(channel_id, app_state, None, cx))?
+                    cx.update(|cx| workspace::open_channel(channel_id, app_state, None, cx))?
                         .await?;
                     anyhow::Ok(())
                 })
@@ -369,7 +369,7 @@ fn main() {
                         cx.update(|mut cx| {
                             cx.spawn(|cx| async move {
                                 cx.update(|cx| {
-                                    workspace::join_channel(channel_id, app_state, None, cx)
+                                    workspace::open_channel(channel_id, app_state, None, cx)
                                 })?
                                 .await?;
                                 anyhow::Ok(())

From 3635d2dcedd83f1b6702f33ca2673317f7fa4695 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Fri, 9 Feb 2024 16:18:09 -0700
Subject: [PATCH 360/372] Highlight selections on vim yank (#7638)

Fixes: #7311

Co-Authored-By: WindSoilder <WindSoilder@outlook.com>

Release Notes:

- Added a highlight on yanked text in vim normal mode

**or**

- N/A

Co-authored-by: WindSoilder <WindSoilder@outlook.com>
---
 crates/vim/src/normal/yank.rs |  6 ++---
 crates/vim/src/utils.rs       | 50 +++++++++++++++++++++++++++++++++--
 2 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/crates/vim/src/normal/yank.rs b/crates/vim/src/normal/yank.rs
index 33833500fa..7792fc4dd7 100644
--- a/crates/vim/src/normal/yank.rs
+++ b/crates/vim/src/normal/yank.rs
@@ -1,4 +1,4 @@
-use crate::{motion::Motion, object::Object, utils::copy_selections_content, Vim};
+use crate::{motion::Motion, object::Object, utils::copy_and_flash_selections_content, Vim};
 use collections::HashMap;
 use gpui::WindowContext;
 
@@ -15,7 +15,7 @@ pub fn yank_motion(vim: &mut Vim, motion: Motion, times: Option<usize>, cx: &mut
                     motion.expand_selection(map, selection, times, true, &text_layout_details);
                 });
             });
-            copy_selections_content(editor, motion.linewise(), cx);
+            copy_and_flash_selections_content(editor, motion.linewise(), cx);
             editor.change_selections(None, cx, |s| {
                 s.move_with(|_, selection| {
                     let (head, goal) = original_positions.remove(&selection.id).unwrap();
@@ -38,7 +38,7 @@ pub fn yank_object(vim: &mut Vim, object: Object, around: bool, cx: &mut WindowC
                     original_positions.insert(selection.id, original_position);
                 });
             });
-            copy_selections_content(editor, false, cx);
+            copy_and_flash_selections_content(editor, false, cx);
             editor.change_selections(None, cx, |s| {
                 s.move_with(|_, selection| {
                     let (head, goal) = original_positions.remove(&selection.id).unwrap();
diff --git a/crates/vim/src/utils.rs b/crates/vim/src/utils.rs
index 0ff857af9c..8b913fabbd 100644
--- a/crates/vim/src/utils.rs
+++ b/crates/vim/src/utils.rs
@@ -1,12 +1,34 @@
+use std::time::Duration;
+
 use editor::{ClipboardSelection, Editor};
-use gpui::{AppContext, ClipboardItem};
+use gpui::{ClipboardItem, ViewContext};
 use language::{CharKind, Point};
 
-pub fn copy_selections_content(editor: &mut Editor, linewise: bool, cx: &mut AppContext) {
+pub struct HighlightOnYank;
+
+pub fn copy_and_flash_selections_content(
+    editor: &mut Editor,
+    linewise: bool,
+    cx: &mut ViewContext<Editor>,
+) {
+    copy_selections_content_internal(editor, linewise, true, cx);
+}
+
+pub fn copy_selections_content(editor: &mut Editor, linewise: bool, cx: &mut ViewContext<Editor>) {
+    copy_selections_content_internal(editor, linewise, false, cx);
+}
+
+fn copy_selections_content_internal(
+    editor: &mut Editor,
+    linewise: bool,
+    highlight: bool,
+    cx: &mut ViewContext<Editor>,
+) {
     let selections = editor.selections.all_adjusted(cx);
     let buffer = editor.buffer().read(cx).snapshot(cx);
     let mut text = String::new();
     let mut clipboard_selections = Vec::with_capacity(selections.len());
+    let mut ranges_to_highlight = Vec::new();
     {
         let mut is_first = true;
         for selection in selections.iter() {
@@ -32,6 +54,11 @@ pub fn copy_selections_content(editor: &mut Editor, linewise: bool, cx: &mut App
             if is_last_line {
                 start = Point::new(start.row + 1, 0);
             }
+
+            let start_anchor = buffer.anchor_after(start);
+            let end_anchor = buffer.anchor_before(end);
+            ranges_to_highlight.push(start_anchor..end_anchor);
+
             for chunk in buffer.text_for_range(start..end) {
                 text.push_str(chunk);
             }
@@ -47,6 +74,25 @@ pub fn copy_selections_content(editor: &mut Editor, linewise: bool, cx: &mut App
     }
 
     cx.write_to_clipboard(ClipboardItem::new(text).with_metadata(clipboard_selections));
+    if !highlight {
+        return;
+    }
+
+    editor.highlight_background::<HighlightOnYank>(
+        ranges_to_highlight,
+        |colors| colors.editor_document_highlight_read_background,
+        cx,
+    );
+    cx.spawn(|this, mut cx| async move {
+        cx.background_executor()
+            .timer(Duration::from_millis(200))
+            .await;
+        this.update(&mut cx, |editor, cx| {
+            editor.clear_background_highlights::<HighlightOnYank>(cx)
+        })
+        .ok();
+    })
+    .detach();
 }
 
 pub fn coerce_punctuation(kind: CharKind, treat_punctuation_as_word: bool) -> CharKind {

From 36b89571e9d7f12f465e32a2e61e66a356026551 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Fri, 9 Feb 2024 15:50:41 -0800
Subject: [PATCH 361/372] Add binary for exporting JSON schemas for validating
 extensions (#7639)

Release Notes:

- N/A

Co-authored-by: Marshall <marshall@zed.dev>
---
 Cargo.lock                                    |  1 +
 crates/extension/Cargo.toml                   |  5 ++
 .../extension/src/extension_json_schemas.rs   | 17 ++++++
 crates/language/src/language.rs               | 52 +++++++++++++------
 4 files changed, 60 insertions(+), 15 deletions(-)
 create mode 100644 crates/extension/src/extension_json_schemas.rs

diff --git a/Cargo.lock b/Cargo.lock
index 934599122b..5dbdcd78d7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2681,6 +2681,7 @@ dependencies = [
  "gpui",
  "language",
  "parking_lot 0.11.2",
+ "schemars",
  "serde",
  "serde_json",
  "theme",
diff --git a/crates/extension/Cargo.toml b/crates/extension/Cargo.toml
index 092f7b0bec..597bbf8f72 100644
--- a/crates/extension/Cargo.toml
+++ b/crates/extension/Cargo.toml
@@ -8,6 +8,10 @@ license = "GPL-3.0-or-later"
 [lib]
 path = "src/extension_store.rs"
 
+[[bin]]
+name = "extension_json_schemas"
+path = "src/extension_json_schemas.rs"
+
 [dependencies]
 anyhow.workspace = true
 collections.workspace = true
@@ -16,6 +20,7 @@ futures.workspace = true
 gpui.workspace = true
 language.workspace = true
 parking_lot.workspace = true
+schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 theme.workspace = true
diff --git a/crates/extension/src/extension_json_schemas.rs b/crates/extension/src/extension_json_schemas.rs
new file mode 100644
index 0000000000..b46e72fce6
--- /dev/null
+++ b/crates/extension/src/extension_json_schemas.rs
@@ -0,0 +1,17 @@
+use language::LanguageConfig;
+use schemars::schema_for;
+use theme::ThemeFamilyContent;
+
+fn main() {
+    let theme_family_schema = schema_for!(ThemeFamilyContent);
+    let language_config_schema = schema_for!(LanguageConfig);
+
+    println!(
+        "{}",
+        serde_json::to_string_pretty(&theme_family_schema).unwrap()
+    );
+    println!(
+        "{}",
+        serde_json::to_string_pretty(&language_config_schema).unwrap()
+    );
+}
diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs
index 73db555b39..c3438f867e 100644
--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -28,6 +28,11 @@ use lazy_static::lazy_static;
 use lsp::{CodeActionKind, LanguageServerBinary};
 use parking_lot::Mutex;
 use regex::Regex;
+use schemars::{
+    gen::SchemaGenerator,
+    schema::{InstanceType, Schema, SchemaObject},
+    JsonSchema,
+};
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use serde_json::Value;
 use std::{
@@ -363,7 +368,7 @@ pub struct CodeLabel {
     pub filter_range: Range<usize>,
 }
 
-#[derive(Clone, Deserialize)]
+#[derive(Clone, Deserialize, JsonSchema)]
 pub struct LanguageConfig {
     /// Human-readable name of the language.
     pub name: Arc<str>,
@@ -374,6 +379,7 @@ pub struct LanguageConfig {
     pub matcher: LanguageMatcher,
     /// List of bracket types in a language.
     #[serde(default)]
+    #[schemars(schema_with = "bracket_pair_config_json_schema")]
     pub brackets: BracketPairConfig,
     /// If set to true, auto indentation uses last non empty line to determine
     /// the indentation level for a new line.
@@ -382,10 +388,12 @@ pub struct LanguageConfig {
     /// A regex that is used to determine whether the indentation level should be
     /// increased in the following line.
     #[serde(default, deserialize_with = "deserialize_regex")]
+    #[schemars(schema_with = "regex_json_schema")]
     pub increase_indent_pattern: Option<Regex>,
     /// A regex that is used to determine whether the indentation level should be
     /// decreased in the following line.
     #[serde(default, deserialize_with = "deserialize_regex")]
+    #[schemars(schema_with = "regex_json_schema")]
     pub decrease_indent_pattern: Option<Regex>,
     /// A list of characters that trigger the automatic insertion of a closing
     /// bracket when they immediately precede the point where an opening
@@ -418,7 +426,7 @@ pub struct LanguageConfig {
     pub prettier_parser_name: Option<String>,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, Default)]
+#[derive(Clone, Debug, Serialize, Deserialize, Default, JsonSchema)]
 pub struct LanguageMatcher {
     /// Given a list of `LanguageConfig`'s, the language of a file can be determined based on the path extension matching any of the `path_suffixes`.
     #[serde(default)]
@@ -429,6 +437,7 @@ pub struct LanguageMatcher {
         serialize_with = "serialize_regex",
         deserialize_with = "deserialize_regex"
     )]
+    #[schemars(schema_with = "regex_json_schema")]
     pub first_line_pattern: Option<Regex>,
 }
 
@@ -441,13 +450,14 @@ pub struct LanguageScope {
     override_id: Option<u32>,
 }
 
-#[derive(Clone, Deserialize, Default, Debug)]
+#[derive(Clone, Deserialize, Default, Debug, JsonSchema)]
 pub struct LanguageConfigOverride {
     #[serde(default)]
     pub line_comments: Override<Vec<Arc<str>>>,
     #[serde(default)]
     pub block_comment: Override<(Arc<str>, Arc<str>)>,
     #[serde(skip_deserializing)]
+    #[schemars(skip)]
     pub disabled_bracket_ixs: Vec<u16>,
     #[serde(default)]
     pub word_characters: Override<HashSet<char>>,
@@ -455,7 +465,7 @@ pub struct LanguageConfigOverride {
     pub opt_into_language_servers: Vec<String>,
 }
 
-#[derive(Clone, Deserialize, Debug)]
+#[derive(Clone, Deserialize, Debug, Serialize, JsonSchema)]
 #[serde(untagged)]
 pub enum Override<T> {
     Remove { remove: bool },
@@ -513,6 +523,13 @@ fn deserialize_regex<'de, D: Deserializer<'de>>(d: D) -> Result<Option<Regex>, D
     }
 }
 
+fn regex_json_schema(_: &mut SchemaGenerator) -> Schema {
+    Schema::Object(SchemaObject {
+        instance_type: Some(InstanceType::String.into()),
+        ..Default::default()
+    })
+}
+
 fn serialize_regex<S>(regex: &Option<Regex>, serializer: S) -> Result<S::Ok, S::Error>
 where
     S: Serializer,
@@ -539,29 +556,34 @@ pub struct FakeLspAdapter {
 ///
 /// This struct includes settings for defining which pairs of characters are considered brackets and
 /// also specifies any language-specific scopes where these pairs should be ignored for bracket matching purposes.
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug, Default, JsonSchema)]
 pub struct BracketPairConfig {
     /// A list of character pairs that should be treated as brackets in the context of a given language.
     pub pairs: Vec<BracketPair>,
     /// A list of tree-sitter scopes for which a given bracket should not be active.
     /// N-th entry in `[Self::disabled_scopes_by_bracket_ix]` contains a list of disabled scopes for an n-th entry in `[Self::pairs]`
+    #[schemars(skip)]
     pub disabled_scopes_by_bracket_ix: Vec<Vec<String>>,
 }
 
+fn bracket_pair_config_json_schema(gen: &mut SchemaGenerator) -> Schema {
+    Option::<Vec<BracketPairContent>>::json_schema(gen)
+}
+
+#[derive(Deserialize, JsonSchema)]
+pub struct BracketPairContent {
+    #[serde(flatten)]
+    pub bracket_pair: BracketPair,
+    #[serde(default)]
+    pub not_in: Vec<String>,
+}
+
 impl<'de> Deserialize<'de> for BracketPairConfig {
     fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
     where
         D: Deserializer<'de>,
     {
-        #[derive(Deserialize)]
-        pub struct Entry {
-            #[serde(flatten)]
-            pub bracket_pair: BracketPair,
-            #[serde(default)]
-            pub not_in: Vec<String>,
-        }
-
-        let result = Vec::<Entry>::deserialize(deserializer)?;
+        let result = Vec::<BracketPairContent>::deserialize(deserializer)?;
         let mut brackets = Vec::with_capacity(result.len());
         let mut disabled_scopes_by_bracket_ix = Vec::with_capacity(result.len());
         for entry in result {
@@ -578,7 +600,7 @@ impl<'de> Deserialize<'de> for BracketPairConfig {
 
 /// Describes a single bracket pair and how an editor should react to e.g. inserting
 /// an opening bracket or to a newline character insertion in between `start` and `end` characters.
-#[derive(Clone, Debug, Default, Deserialize, PartialEq)]
+#[derive(Clone, Debug, Default, Deserialize, PartialEq, JsonSchema)]
 pub struct BracketPair {
     /// Starting substring for a bracket.
     pub start: String,

From 0304edd8ab44d47ccbf04baa6ee43a494a8ff2de Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Fri, 9 Feb 2024 18:33:28 -0700
Subject: [PATCH 362/372] 2112 (#7640)

It's still slow, but should now work reliably

Release Notes:

- N/A
---
 crates/call/src/call.rs              | 21 ++++++++++++++++++---
 crates/collab_ui/src/collab_panel.rs | 19 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/crates/call/src/call.rs b/crates/call/src/call.rs
index 11fc549084..10c7470310 100644
--- a/crates/call/src/call.rs
+++ b/crates/call/src/call.rs
@@ -84,6 +84,7 @@ pub struct ActiveCall {
     ),
     client: Arc<Client>,
     user_store: Model<UserStore>,
+    pending_channel_id: Option<u64>,
     _subscriptions: Vec<client::Subscription>,
 }
 
@@ -97,6 +98,7 @@ impl ActiveCall {
             location: None,
             pending_invites: Default::default(),
             incoming_call: watch::channel(),
+            pending_channel_id: None,
             _join_debouncer: OneAtATime { cancel: None },
             _subscriptions: vec![
                 client.add_request_handler(cx.weak_model(), Self::handle_incoming_call),
@@ -111,6 +113,10 @@ impl ActiveCall {
         self.room()?.read(cx).channel_id()
     }
 
+    pub fn pending_channel_id(&self) -> Option<u64> {
+        self.pending_channel_id
+    }
+
     async fn handle_incoming_call(
         this: Model<Self>,
         envelope: TypedEnvelope<proto::IncomingCall>,
@@ -339,11 +345,13 @@ impl ActiveCall {
         channel_id: u64,
         cx: &mut ModelContext<Self>,
     ) -> Task<Result<Option<Model<Room>>>> {
+        let mut leave = None;
         if let Some(room) = self.room().cloned() {
             if room.read(cx).channel_id() == Some(channel_id) {
                 return Task::ready(Ok(Some(room)));
             } else {
-                room.update(cx, |room, cx| room.clear_state(cx));
+                let (room, _) = self.room.take().unwrap();
+                leave = room.update(cx, |room, cx| Some(room.leave(cx)));
             }
         }
 
@@ -353,14 +361,21 @@ impl ActiveCall {
 
         let client = self.client.clone();
         let user_store = self.user_store.clone();
+        self.pending_channel_id = Some(channel_id);
         let join = self._join_debouncer.spawn(cx, move |cx| async move {
+            if let Some(task) = leave {
+                task.await?
+            }
             Room::join_channel(channel_id, client, user_store, cx).await
         });
 
         cx.spawn(|this, mut cx| async move {
             let room = join.await?;
-            this.update(&mut cx, |this, cx| this.set_room(room.clone(), cx))?
-                .await?;
+            this.update(&mut cx, |this, cx| {
+                this.pending_channel_id.take();
+                this.set_room(room.clone(), cx)
+            })?
+            .await?;
             this.update(&mut cx, |this, cx| {
                 this.report_call_event("join channel", cx)
             })?;
diff --git a/crates/collab_ui/src/collab_panel.rs b/crates/collab_ui/src/collab_panel.rs
index 527e0baa53..67ee0cc04b 100644
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -504,6 +504,20 @@ impl CollabPanel {
                         role: proto::ChannelRole::Member,
                     }));
             }
+        } else if let Some(channel_id) = ActiveCall::global(cx).read(cx).pending_channel_id() {
+            self.entries.push(ListEntry::Header(Section::ActiveCall));
+            if !old_entries
+                .iter()
+                .any(|entry| matches!(entry, ListEntry::Header(Section::ActiveCall)))
+            {
+                scroll_to_top = true;
+            }
+
+            if query.is_empty() {
+                self.entries.push(ListEntry::ChannelCall { channel_id });
+                self.entries.push(ListEntry::ChannelNotes { channel_id });
+                self.entries.push(ListEntry::ChannelChat { channel_id });
+            }
         }
 
         let mut request_entries = Vec::new();
@@ -2195,7 +2209,10 @@ impl CollabPanel {
         let text = match section {
             Section::ActiveCall => {
                 let channel_name = maybe!({
-                    let channel_id = ActiveCall::global(cx).read(cx).channel_id(cx)?;
+                    let channel_id = ActiveCall::global(cx)
+                        .read(cx)
+                        .channel_id(cx)
+                        .or_else(|| ActiveCall::global(cx).read(cx).pending_channel_id())?;
 
                     let channel = self.channel_store.read(cx).channel_for_id(channel_id)?;
 

From e2a3e893187bcf8477e8046b0073c2798e7b1c64 Mon Sep 17 00:00:00 2001
From: Colin Cai <104604363+Creative0708@users.noreply.github.com>
Date: Sat, 10 Feb 2024 00:50:38 -0500
Subject: [PATCH 363/372] Stop unnecessary repeat cursor movements in Vim mode
 (#7641)

Fixes: #7605

When repeating some cursor movements in Vim mode (e.g. `99999999 w`),
Zed tries to repeat the movement that many times, even if further
actions don't have any effect. This causes Zed to hang.

This commit makes those movements like other actions (like moving the
cursor left/right), stopping the repeat movement if a boundary of the
text is reached/the cursor can't move anymore.

Release Notes:

- Fixed [#7605](https://github.com/zed-industries/zed/issues/7605).
---
 crates/vim/src/motion.rs | 60 ++++++++++++++++++++++++++++++----------
 1 file changed, 46 insertions(+), 14 deletions(-)

diff --git a/crates/vim/src/motion.rs b/crates/vim/src/motion.rs
index 99472dd1c8..0c1e96942d 100644
--- a/crates/vim/src/motion.rs
+++ b/crates/vim/src/motion.rs
@@ -617,6 +617,9 @@ fn left(map: &DisplaySnapshot, mut point: DisplayPoint, times: usize) -> Display
 fn backspace(map: &DisplaySnapshot, mut point: DisplayPoint, times: usize) -> DisplayPoint {
     for _ in 0..times {
         point = movement::left(map, point);
+        if point.is_zero() {
+            break;
+        }
     }
     point
 }
@@ -624,6 +627,9 @@ fn backspace(map: &DisplaySnapshot, mut point: DisplayPoint, times: usize) -> Di
 fn space(map: &DisplaySnapshot, mut point: DisplayPoint, times: usize) -> DisplayPoint {
     for _ in 0..times {
         point = wrapping_right(map, point);
+        if point == map.max_point() {
+            break;
+        }
     }
     point
 }
@@ -768,7 +774,7 @@ pub(crate) fn next_word_start(
     let scope = map.buffer_snapshot.language_scope_at(point.to_point(map));
     for _ in 0..times {
         let mut crossed_newline = false;
-        point = movement::find_boundary(map, point, FindRange::MultiLine, |left, right| {
+        let new_point = movement::find_boundary(map, point, FindRange::MultiLine, |left, right| {
             let left_kind = coerce_punctuation(char_kind(&scope, left), ignore_punctuation);
             let right_kind = coerce_punctuation(char_kind(&scope, right), ignore_punctuation);
             let at_newline = right == '\n';
@@ -779,7 +785,11 @@ pub(crate) fn next_word_start(
 
             crossed_newline |= at_newline;
             found
-        })
+        });
+        if point == new_point {
+            break;
+        }
+        point = new_point;
     }
     point
 }
@@ -792,21 +802,30 @@ fn next_word_end(
 ) -> DisplayPoint {
     let scope = map.buffer_snapshot.language_scope_at(point.to_point(map));
     for _ in 0..times {
-        if point.column() < map.line_len(point.row()) {
-            *point.column_mut() += 1;
-        } else if point.row() < map.max_buffer_row() {
-            *point.row_mut() += 1;
-            *point.column_mut() = 0;
+        let mut new_point = point;
+        if new_point.column() < map.line_len(new_point.row()) {
+            *new_point.column_mut() += 1;
+        } else if new_point.row() < map.max_buffer_row() {
+            *new_point.row_mut() += 1;
+            *new_point.column_mut() = 0;
         }
 
-        point =
-            movement::find_boundary_exclusive(map, point, FindRange::MultiLine, |left, right| {
+        let new_point = movement::find_boundary_exclusive(
+            map,
+            new_point,
+            FindRange::MultiLine,
+            |left, right| {
                 let left_kind = coerce_punctuation(char_kind(&scope, left), ignore_punctuation);
                 let right_kind = coerce_punctuation(char_kind(&scope, right), ignore_punctuation);
 
                 left_kind != right_kind && left_kind != CharKind::Whitespace
-            });
-        point = map.clip_point(point, Bias::Left);
+            },
+        );
+        let new_point = map.clip_point(new_point, Bias::Left);
+        if point == new_point {
+            break;
+        }
+        point = new_point;
     }
     point
 }
@@ -821,13 +840,17 @@ fn previous_word_start(
     for _ in 0..times {
         // This works even though find_preceding_boundary is called for every character in the line containing
         // cursor because the newline is checked only once.
-        point =
+        let new_point =
             movement::find_preceding_boundary(map, point, FindRange::MultiLine, |left, right| {
                 let left_kind = coerce_punctuation(char_kind(&scope, left), ignore_punctuation);
                 let right_kind = coerce_punctuation(char_kind(&scope, right), ignore_punctuation);
 
                 (left_kind != right_kind && !right.is_whitespace()) || left == '\n'
             });
+        if point == new_point {
+            break;
+        }
+        point = new_point;
     }
     point
 }
@@ -967,10 +990,14 @@ fn find_forward(
 
     for _ in 0..times {
         found = false;
-        to = find_boundary(map, to, FindRange::SingleLine, |_, right| {
+        let new_to = find_boundary(map, to, FindRange::SingleLine, |_, right| {
             found = right == target;
             found
         });
+        if to == new_to {
+            break;
+        }
+        to = new_to;
     }
 
     if found {
@@ -995,7 +1022,12 @@ fn find_backward(
     let mut to = from;
 
     for _ in 0..times {
-        to = find_preceding_boundary(map, to, FindRange::SingleLine, |_, right| right == target);
+        let new_to =
+            find_preceding_boundary(map, to, FindRange::SingleLine, |_, right| right == target);
+        if to == new_to {
+            break;
+        }
+        to = new_to;
     }
 
     if map.buffer_snapshot.chars_at(to.to_point(map)).next() == Some(target) {

From 68893c2ae6b69ece0fc4f0ee9e48e5a304d22645 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Fri, 9 Feb 2024 23:12:26 -0700
Subject: [PATCH 364/372] Fix notes unread status (#7643)

1. The client-side comparison was wrong
2. The server never told the client about the version it remembered
3. The server generated broken timestamps in some cases

Release Notes:

- Fixed the notes/chat appearing as unread too often

**or**

- N/A
---
 crates/channel/src/channel_store.rs           |   7 +-
 crates/collab/src/db.rs                       |   3 +
 crates/collab/src/db/queries/buffers.rs       |  46 +++++--
 crates/collab/src/db/queries/channels.rs      |  28 +++-
 crates/collab/src/db/queries/messages.rs      |  24 ++++
 crates/collab/src/db/tests/buffer_tests.rs    |  17 +--
 crates/collab/src/rpc.rs                      |  11 +-
 .../collab/src/tests/channel_buffer_tests.rs  | 130 +++++++-----------
 crates/collab/src/tests/test_server.rs        |  11 ++
 9 files changed, 157 insertions(+), 120 deletions(-)

diff --git a/crates/channel/src/channel_store.rs b/crates/channel/src/channel_store.rs
index 8379a92aae..c1e6d802dd 100644
--- a/crates/channel/src/channel_store.rs
+++ b/crates/channel/src/channel_store.rs
@@ -1131,9 +1131,10 @@ impl ChannelState {
         if let Some(latest_version) = &self.latest_notes_versions {
             if let Some(observed_version) = &self.observed_notes_versions {
                 latest_version.epoch > observed_version.epoch
-                    || latest_version
-                        .version
-                        .changed_since(&observed_version.version)
+                    || (latest_version.epoch == observed_version.epoch
+                        && latest_version
+                            .version
+                            .changed_since(&observed_version.version))
             } else {
                 true
             }
diff --git a/crates/collab/src/db.rs b/crates/collab/src/db.rs
index 6f6a95ebc2..6ccea25a60 100644
--- a/crates/collab/src/db.rs
+++ b/crates/collab/src/db.rs
@@ -587,6 +587,9 @@ pub struct ChannelsForUser {
     pub channels: Vec<Channel>,
     pub channel_memberships: Vec<channel_member::Model>,
     pub channel_participants: HashMap<ChannelId, Vec<UserId>>,
+
+    pub observed_buffer_versions: Vec<proto::ChannelBufferVersion>,
+    pub observed_channel_messages: Vec<proto::ChannelMessageId>,
     pub latest_buffer_versions: Vec<proto::ChannelBufferVersion>,
     pub latest_channel_messages: Vec<proto::ChannelMessageId>,
 }
diff --git a/crates/collab/src/db/queries/buffers.rs b/crates/collab/src/db/queries/buffers.rs
index b42e26e465..e814ea42a4 100644
--- a/crates/collab/src/db/queries/buffers.rs
+++ b/crates/collab/src/db/queries/buffers.rs
@@ -561,7 +561,6 @@ impl Database {
         tx: &DatabaseTransaction,
     ) -> Result<()> {
         use observed_buffer_edits::Column;
-
         observed_buffer_edits::Entity::insert(observed_buffer_edits::ActiveModel {
             user_id: ActiveValue::Set(user_id),
             buffer_id: ActiveValue::Set(buffer_id),
@@ -671,7 +670,7 @@ impl Database {
                 buffer_id: row.buffer_id,
                 epoch: row.epoch,
                 lamport_timestamp: row.lamport_timestamp,
-                replica_id: row.lamport_timestamp,
+                replica_id: row.replica_id,
                 value: Default::default(),
             });
             operations.push(proto::Operation {
@@ -750,20 +749,9 @@ impl Database {
 
     pub async fn latest_channel_buffer_changes(
         &self,
-        channel_ids: &[ChannelId],
+        channel_ids_by_buffer_id: &HashMap<BufferId, ChannelId>,
         tx: &DatabaseTransaction,
     ) -> Result<Vec<proto::ChannelBufferVersion>> {
-        let mut channel_ids_by_buffer_id = HashMap::default();
-        let mut rows = buffer::Entity::find()
-            .filter(buffer::Column::ChannelId.is_in(channel_ids.iter().copied()))
-            .stream(&*tx)
-            .await?;
-        while let Some(row) = rows.next().await {
-            let row = row?;
-            channel_ids_by_buffer_id.insert(row.id, row.channel_id);
-        }
-        drop(rows);
-
         let latest_operations = self
             .get_latest_operations_for_buffers(channel_ids_by_buffer_id.keys().copied(), &*tx)
             .await?;
@@ -783,6 +771,36 @@ impl Database {
             .collect())
     }
 
+    pub async fn observed_channel_buffer_changes(
+        &self,
+        channel_ids_by_buffer_id: &HashMap<BufferId, ChannelId>,
+        user_id: UserId,
+        tx: &DatabaseTransaction,
+    ) -> Result<Vec<proto::ChannelBufferVersion>> {
+        let observed_operations = observed_buffer_edits::Entity::find()
+            .filter(observed_buffer_edits::Column::UserId.eq(user_id))
+            .filter(
+                observed_buffer_edits::Column::BufferId
+                    .is_in(channel_ids_by_buffer_id.keys().copied()),
+            )
+            .all(&*tx)
+            .await?;
+
+        Ok(observed_operations
+            .iter()
+            .flat_map(|op| {
+                Some(proto::ChannelBufferVersion {
+                    channel_id: channel_ids_by_buffer_id.get(&op.buffer_id)?.to_proto(),
+                    epoch: op.epoch as u64,
+                    version: vec![proto::VectorClockEntry {
+                        replica_id: op.replica_id as u32,
+                        timestamp: op.lamport_timestamp as u32,
+                    }],
+                })
+            })
+            .collect())
+    }
+
     /// Returns the latest operations for the buffers with the specified IDs.
     pub async fn get_latest_operations_for_buffers(
         &self,
diff --git a/crates/collab/src/db/queries/channels.rs b/crates/collab/src/db/queries/channels.rs
index c37ea26fc1..7c88cd8aa0 100644
--- a/crates/collab/src/db/queries/channels.rs
+++ b/crates/collab/src/db/queries/channels.rs
@@ -673,18 +673,40 @@ impl Database {
         }
 
         let channel_ids = channels.iter().map(|c| c.id).collect::<Vec<_>>();
+
+        let mut channel_ids_by_buffer_id = HashMap::default();
+        let mut rows = buffer::Entity::find()
+            .filter(buffer::Column::ChannelId.is_in(channel_ids.iter().copied()))
+            .stream(&*tx)
+            .await?;
+        while let Some(row) = rows.next().await {
+            let row = row?;
+            channel_ids_by_buffer_id.insert(row.id, row.channel_id);
+        }
+        drop(rows);
+
         let latest_buffer_versions = self
-            .latest_channel_buffer_changes(&channel_ids, &*tx)
+            .latest_channel_buffer_changes(&channel_ids_by_buffer_id, &*tx)
             .await?;
 
-        let latest_messages = self.latest_channel_messages(&channel_ids, &*tx).await?;
+        let latest_channel_messages = self.latest_channel_messages(&channel_ids, &*tx).await?;
+
+        let observed_buffer_versions = self
+            .observed_channel_buffer_changes(&channel_ids_by_buffer_id, user_id, &*tx)
+            .await?;
+
+        let observed_channel_messages = self
+            .observed_channel_messages(&channel_ids, user_id, &*tx)
+            .await?;
 
         Ok(ChannelsForUser {
             channel_memberships,
             channels,
             channel_participants,
             latest_buffer_versions,
-            latest_channel_messages: latest_messages,
+            latest_channel_messages,
+            observed_buffer_versions,
+            observed_channel_messages,
         })
     }
 
diff --git a/crates/collab/src/db/queries/messages.rs b/crates/collab/src/db/queries/messages.rs
index 38a828efa4..d63b4cf1c5 100644
--- a/crates/collab/src/db/queries/messages.rs
+++ b/crates/collab/src/db/queries/messages.rs
@@ -388,6 +388,30 @@ impl Database {
         Ok(())
     }
 
+    pub async fn observed_channel_messages(
+        &self,
+        channel_ids: &[ChannelId],
+        user_id: UserId,
+        tx: &DatabaseTransaction,
+    ) -> Result<Vec<proto::ChannelMessageId>> {
+        let rows = observed_channel_messages::Entity::find()
+            .filter(observed_channel_messages::Column::UserId.eq(user_id))
+            .filter(
+                observed_channel_messages::Column::ChannelId
+                    .is_in(channel_ids.iter().map(|id| id.0)),
+            )
+            .all(&*tx)
+            .await?;
+
+        Ok(rows
+            .into_iter()
+            .map(|message| proto::ChannelMessageId {
+                channel_id: message.channel_id.to_proto(),
+                message_id: message.channel_message_id.to_proto(),
+            })
+            .collect())
+    }
+
     pub async fn latest_channel_messages(
         &self,
         channel_ids: &[ChannelId],
diff --git a/crates/collab/src/db/tests/buffer_tests.rs b/crates/collab/src/db/tests/buffer_tests.rs
index de02c2b7b0..c1015330bb 100644
--- a/crates/collab/src/db/tests/buffer_tests.rs
+++ b/crates/collab/src/db/tests/buffer_tests.rs
@@ -337,17 +337,12 @@ async fn test_channel_buffers_last_operations(db: &Database) {
     let buffer_changes = db
         .transaction(|tx| {
             let buffers = &buffers;
-            async move {
-                db.latest_channel_buffer_changes(
-                    &[
-                        buffers[0].channel_id,
-                        buffers[1].channel_id,
-                        buffers[2].channel_id,
-                    ],
-                    &*tx,
-                )
-                .await
-            }
+            let mut hash = HashMap::default();
+            hash.insert(buffers[0].id, buffers[0].channel_id);
+            hash.insert(buffers[1].id, buffers[1].channel_id);
+            hash.insert(buffers[2].id, buffers[2].channel_id);
+
+            async move { db.latest_channel_buffer_changes(&hash, &*tx).await }
         })
         .await
         .unwrap();
diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs
index 01fd0c1a8a..38eff60ef0 100644
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -620,7 +620,7 @@ impl Server {
                 let mut pool = this.connection_pool.lock();
                 pool.add_connection(connection_id, user_id, user.admin);
                 this.peer.send(connection_id, build_initial_contacts_update(contacts, &pool))?;
-                this.peer.send(connection_id, build_update_user_channels(&channels_for_user.channel_memberships))?;
+                this.peer.send(connection_id, build_update_user_channels(&channels_for_user))?;
                 this.peer.send(connection_id, build_channels_update(
                     channels_for_user,
                     channel_invites
@@ -3440,17 +3440,18 @@ fn notify_membership_updated(
     }
 }
 
-fn build_update_user_channels(
-    memberships: &Vec<db::channel_member::Model>,
-) -> proto::UpdateUserChannels {
+fn build_update_user_channels(channels: &ChannelsForUser) -> proto::UpdateUserChannels {
     proto::UpdateUserChannels {
-        channel_memberships: memberships
+        channel_memberships: channels
+            .channel_memberships
             .iter()
             .map(|m| proto::ChannelMembership {
                 channel_id: m.channel_id.to_proto(),
                 role: m.role.into(),
             })
             .collect(),
+        observed_channel_buffer_version: channels.observed_buffer_versions.clone(),
+        observed_channel_message_id: channels.observed_channel_messages.clone(),
         ..Default::default()
     }
 }
diff --git a/crates/collab/src/tests/channel_buffer_tests.rs b/crates/collab/src/tests/channel_buffer_tests.rs
index 0ba7024683..5f25468530 100644
--- a/crates/collab/src/tests/channel_buffer_tests.rs
+++ b/crates/collab/src/tests/channel_buffer_tests.rs
@@ -1,6 +1,6 @@
 use crate::{
     rpc::{CLEANUP_TIMEOUT, RECONNECT_TIMEOUT},
-    tests::TestServer,
+    tests::{test_server::open_channel_notes, TestServer},
 };
 use call::ActiveCall;
 use channel::ACKNOWLEDGE_DEBOUNCE_INTERVAL;
@@ -605,113 +605,75 @@ async fn test_channel_buffer_changes(
     cx_a: &mut TestAppContext,
     cx_b: &mut TestAppContext,
 ) {
-    let mut server = TestServer::start(deterministic.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
+    let (server, client_a, client_b, channel_id) = TestServer::start2(cx_a, cx_b).await;
+    let (_, cx_a) = client_a.build_test_workspace(cx_a).await;
+    let (workspace_b, cx_b) = client_b.build_test_workspace(cx_b).await;
+    let channel_store_b = client_b.channel_store().clone();
 
-    let channel_id = server
-        .make_channel(
-            "the-channel",
-            None,
-            (&client_a, cx_a),
-            &mut [(&client_b, cx_b)],
-        )
-        .await;
-
-    let channel_buffer_a = client_a
-        .channel_store()
-        .update(cx_a, |store, cx| store.open_channel_buffer(channel_id, cx))
-        .await
-        .unwrap();
-
-    // Client A makes an edit, and client B should see that the note has changed.
-    channel_buffer_a.update(cx_a, |buffer, cx| {
-        buffer.buffer().update(cx, |buffer, cx| {
-            buffer.edit([(0..0, "1")], None, cx);
-        })
+    // Editing the channel notes should set them to dirty
+    open_channel_notes(channel_id, cx_a).await.unwrap();
+    cx_a.simulate_keystrokes("1");
+    channel_store_b.read_with(cx_b, |channel_store, _| {
+        assert!(channel_store.has_channel_buffer_changed(channel_id))
     });
-    deterministic.run_until_parked();
-
-    let has_buffer_changed = cx_b.update(|cx| {
-        client_b
-            .channel_store()
-            .read(cx)
-            .has_channel_buffer_changed(channel_id)
-    });
-    assert!(has_buffer_changed);
 
     // Opening the buffer should clear the changed flag.
-    let project_b = client_b.build_empty_local_project(cx_b);
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-    let channel_view_b = cx_b
-        .update(|cx| ChannelView::open(channel_id, None, workspace_b.clone(), cx))
-        .await
-        .unwrap();
-    deterministic.run_until_parked();
-
-    let has_buffer_changed = cx_b.update(|cx| {
-        client_b
-            .channel_store()
-            .read(cx)
-            .has_channel_buffer_changed(channel_id)
+    open_channel_notes(channel_id, cx_b).await.unwrap();
+    channel_store_b.read_with(cx_b, |channel_store, _| {
+        assert!(!channel_store.has_channel_buffer_changed(channel_id))
     });
-    assert!(!has_buffer_changed);
 
     // Editing the channel while the buffer is open should not show that the buffer has changed.
-    channel_buffer_a.update(cx_a, |buffer, cx| {
-        buffer.buffer().update(cx, |buffer, cx| {
-            buffer.edit([(0..0, "2")], None, cx);
-        })
+    cx_a.simulate_keystrokes("2");
+    channel_store_b.read_with(cx_b, |channel_store, _| {
+        assert!(!channel_store.has_channel_buffer_changed(channel_id))
     });
-    deterministic.run_until_parked();
-
-    let has_buffer_changed = cx_b.read(|cx| {
-        client_b
-            .channel_store()
-            .read(cx)
-            .has_channel_buffer_changed(channel_id)
-    });
-    assert!(!has_buffer_changed);
-
-    deterministic.advance_clock(ACKNOWLEDGE_DEBOUNCE_INTERVAL);
 
     // Test that the server is tracking things correctly, and we retain our 'not changed'
     // state across a disconnect
+    deterministic.advance_clock(ACKNOWLEDGE_DEBOUNCE_INTERVAL);
     server
         .simulate_long_connection_interruption(client_b.peer_id().unwrap(), deterministic.clone());
-    let has_buffer_changed = cx_b.read(|cx| {
-        client_b
-            .channel_store()
-            .read(cx)
-            .has_channel_buffer_changed(channel_id)
+    channel_store_b.read_with(cx_b, |channel_store, _| {
+        assert!(!channel_store.has_channel_buffer_changed(channel_id))
     });
-    assert!(!has_buffer_changed);
 
     // Closing the buffer should re-enable change tracking
     cx_b.update(|cx| {
         workspace_b.update(cx, |workspace, cx| {
             workspace.close_all_items_and_panes(&Default::default(), cx)
         });
-
-        drop(channel_view_b)
-    });
-
-    deterministic.run_until_parked();
-
-    channel_buffer_a.update(cx_a, |buffer, cx| {
-        buffer.buffer().update(cx, |buffer, cx| {
-            buffer.edit([(0..0, "3")], None, cx);
-        })
     });
     deterministic.run_until_parked();
 
-    let has_buffer_changed = cx_b.read(|cx| {
-        client_b
-            .channel_store()
-            .read(cx)
-            .has_channel_buffer_changed(channel_id)
+    cx_a.simulate_keystrokes("3");
+    channel_store_b.read_with(cx_b, |channel_store, _| {
+        assert!(channel_store.has_channel_buffer_changed(channel_id))
+    });
+}
+
+#[gpui::test]
+async fn test_channel_buffer_changes_persist(
+    cx_a: &mut TestAppContext,
+    cx_b: &mut TestAppContext,
+    cx_b2: &mut TestAppContext,
+) {
+    let (mut server, client_a, client_b, channel_id) = TestServer::start2(cx_a, cx_b).await;
+    let (_, cx_a) = client_a.build_test_workspace(cx_a).await;
+    let (_, cx_b) = client_b.build_test_workspace(cx_b).await;
+
+    // a) edits the notes
+    open_channel_notes(channel_id, cx_a).await.unwrap();
+    cx_a.simulate_keystrokes("1");
+    // b) opens them to observe the current version
+    open_channel_notes(channel_id, cx_b).await.unwrap();
+
+    // On boot the client should get the correct state.
+    let client_b2 = server.create_client(cx_b2, "user_b").await;
+    let channel_store_b2 = client_b2.channel_store().clone();
+    channel_store_b2.read_with(cx_b2, |channel_store, _| {
+        assert!(!channel_store.has_channel_buffer_changed(channel_id))
     });
-    assert!(has_buffer_changed);
 }
 
 #[track_caller]
diff --git a/crates/collab/src/tests/test_server.rs b/crates/collab/src/tests/test_server.rs
index d7e19dc9a9..e4bf377668 100644
--- a/crates/collab/src/tests/test_server.rs
+++ b/crates/collab/src/tests/test_server.rs
@@ -10,6 +10,7 @@ use channel::{ChannelBuffer, ChannelStore};
 use client::{
     self, proto::PeerId, Client, Connection, Credentials, EstablishConnectionError, UserStore,
 };
+use collab_ui::channel_view::ChannelView;
 use collections::{HashMap, HashSet};
 use fs::FakeFs;
 use futures::{channel::oneshot, StreamExt as _};
@@ -766,6 +767,16 @@ pub fn join_channel_call(cx: &mut TestAppContext) -> Task<anyhow::Result<()>> {
     room.unwrap().update(cx, |room, cx| room.join_call(cx))
 }
 
+pub fn open_channel_notes(
+    channel_id: u64,
+    cx: &mut VisualTestContext,
+) -> Task<anyhow::Result<View<ChannelView>>> {
+    let window = cx.update(|cx| cx.active_window().unwrap().downcast::<Workspace>().unwrap());
+    let view = window.root_view(cx).unwrap();
+
+    cx.update(|cx| ChannelView::open(channel_id, None, view.clone(), cx))
+}
+
 impl Drop for TestClient {
     fn drop(&mut self) {
         self.app_state.client.teardown();

From 2f3ad9da4c43699b7375ccf92e4472c2785a28fc Mon Sep 17 00:00:00 2001
From: Jun <69499549+greenthings@users.noreply.github.com>
Date: Sat, 10 Feb 2024 17:48:21 +0900
Subject: [PATCH 365/372] Use integer font size value in default settings
 (#7649)

Release Notes:

Fixed : default settings for terminal not containing a proper value for font size ([7469](https://github.com/zed-industries/zed/issues/7469))
---
 assets/settings/default.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 139d64673f..82e848dba0 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -443,7 +443,7 @@
     }
     // Set the terminal's font size. If this option is not included,
     // the terminal will default to matching the buffer's font size.
-    // "font_size": "15",
+    // "font_size": 15,
     // Set the terminal's font family. If this option is not included,
     // the terminal will default to matching the buffer's font family.
     // "font_family": "Zed Mono",

From 67839a967b7bf0e19d49df2570e0475204afa7f2 Mon Sep 17 00:00:00 2001
From: Matthew Gramigna <matthewgramigna@gmail.com>
Date: Sat, 10 Feb 2024 13:26:39 -0500
Subject: [PATCH 366/372] Add Prisma language support (#7267)

Fixes #4832

Adds tree-sitter grammar and LSP adapter for Prisma



https://github.com/zed-industries/zed/assets/16297930/0f288ab1-ce5c-4e31-ad7f-6bb9655863c1
---
 Cargo.lock                                    |  10 ++
 Cargo.toml                                    |   1 +
 crates/zed/Cargo.toml                         |   1 +
 crates/zed/src/languages.rs                   |  13 +-
 crates/zed/src/languages/prisma.rs            | 126 ++++++++++++++++++
 crates/zed/src/languages/prisma/config.toml   |   9 ++
 .../zed/src/languages/prisma/highlights.scm   |  26 ++++
 docs/src/languages/prisma.md                  |   4 +
 8 files changed, 189 insertions(+), 1 deletion(-)
 create mode 100644 crates/zed/src/languages/prisma.rs
 create mode 100644 crates/zed/src/languages/prisma/config.toml
 create mode 100644 crates/zed/src/languages/prisma/highlights.scm
 create mode 100644 docs/src/languages/prisma.md

diff --git a/Cargo.lock b/Cargo.lock
index 5dbdcd78d7..d05fc4ae93 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9371,6 +9371,15 @@ dependencies = [
  "tree-sitter",
 ]
 
+[[package]]
+name = "tree-sitter-prisma-io"
+version = "1.4.0"
+source = "git+https://github.com/victorhqc/tree-sitter-prisma#eca2596a355b1a9952b4f80f8f9caed300a272b5"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
 [[package]]
 name = "tree-sitter-proto"
 version = "0.0.2"
@@ -10855,6 +10864,7 @@ dependencies = [
  "tree-sitter-nu",
  "tree-sitter-ocaml",
  "tree-sitter-php",
+ "tree-sitter-prisma-io",
  "tree-sitter-proto",
  "tree-sitter-purescript",
  "tree-sitter-python",
diff --git a/Cargo.toml b/Cargo.toml
index 4633b0c122..84627885e0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -250,6 +250,7 @@ tree-sitter-nix = { git = "https://github.com/nix-community/tree-sitter-nix", re
 tree-sitter-nu = { git = "https://github.com/nushell/tree-sitter-nu", rev = "26bbaecda0039df4067861ab38ea8ea169f7f5aa" }
 tree-sitter-ocaml = { git = "https://github.com/tree-sitter/tree-sitter-ocaml", rev = "4abfdc1c7af2c6c77a370aee974627be1c285b3b" }
 tree-sitter-php = "0.21.1"
+tree-sitter-prisma-io = { git = "https://github.com/victorhqc/tree-sitter-prisma" }
 tree-sitter-proto = { git = "https://github.com/rewinfrey/tree-sitter-proto", rev = "36d54f288aee112f13a67b550ad32634d0c2cb52" }
 tree-sitter-purescript = { git = "https://github.com/ivanmoreau/tree-sitter-purescript", rev = "a37140f0c7034977b90faa73c94fcb8a5e45ed08" }
 tree-sitter-python = "0.20.2"
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 1e9a5ba31e..05b74515d5 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -135,6 +135,7 @@ tree-sitter-nix.workspace = true
 tree-sitter-nu.workspace = true
 tree-sitter-ocaml.workspace = true
 tree-sitter-php.workspace = true
+tree-sitter-prisma-io.workspace = true
 tree-sitter-proto.workspace = true
 tree-sitter-purescript.workspace = true
 tree-sitter-python.workspace = true
diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index e032cd7521..3b78b23225 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -27,6 +27,7 @@ mod lua;
 mod nu;
 mod ocaml;
 mod php;
+mod prisma;
 mod purescript;
 mod python;
 mod ruby;
@@ -97,6 +98,7 @@ pub fn init(
             tree_sitter_ocaml::language_ocaml_interface(),
         ),
         ("php", tree_sitter_php::language_php()),
+        ("prisma", tree_sitter_prisma_io::language()),
         ("proto", tree_sitter_proto::language()),
         #[cfg(not(target_os = "linux"))]
         ("purescript", tree_sitter_purescript::language()),
@@ -290,12 +292,21 @@ pub fn init(
     language("nu", vec![Arc::new(nu::NuLanguageServer {})]);
     language("ocaml", vec![Arc::new(ocaml::OCamlLspAdapter)]);
     language("ocaml-interface", vec![Arc::new(ocaml::OCamlLspAdapter)]);
-    language("vue", vec![Arc::new(vue::VueLspAdapter::new(node_runtime))]);
+    language(
+        "vue",
+        vec![Arc::new(vue::VueLspAdapter::new(node_runtime.clone()))],
+    );
     language("uiua", vec![Arc::new(uiua::UiuaLanguageServer {})]);
     language("proto", vec![]);
     language("terraform", vec![]);
     language("terraform-vars", vec![]);
     language("hcl", vec![]);
+    language(
+        "prisma",
+        vec![Arc::new(prisma::PrismaLspAdapter::new(
+            node_runtime.clone(),
+        ))],
+    );
 }
 
 #[cfg(any(test, feature = "test-support"))]
diff --git a/crates/zed/src/languages/prisma.rs b/crates/zed/src/languages/prisma.rs
new file mode 100644
index 0000000000..e84cf8d3e9
--- /dev/null
+++ b/crates/zed/src/languages/prisma.rs
@@ -0,0 +1,126 @@
+use anyhow::{anyhow, Result};
+use async_trait::async_trait;
+use futures::StreamExt;
+use language::{LanguageServerName, LspAdapter, LspAdapterDelegate};
+use lsp::LanguageServerBinary;
+use node_runtime::NodeRuntime;
+use smol::fs;
+use std::{
+    any::Any,
+    ffi::OsString,
+    path::{Path, PathBuf},
+    sync::Arc,
+};
+use util::{async_maybe, ResultExt};
+
+const SERVER_PATH: &'static str = "node_modules/.bin/prisma-language-server";
+
+fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
+    vec![server_path.into(), "--stdio".into()]
+}
+
+pub struct PrismaLspAdapter {
+    node: Arc<dyn NodeRuntime>,
+}
+
+impl PrismaLspAdapter {
+    pub fn new(node: Arc<dyn NodeRuntime>) -> Self {
+        PrismaLspAdapter { node }
+    }
+}
+
+#[async_trait]
+impl LspAdapter for PrismaLspAdapter {
+    fn name(&self) -> LanguageServerName {
+        LanguageServerName("prisma-language-server".into())
+    }
+
+    fn short_name(&self) -> &'static str {
+        "prisma-language-server"
+    }
+
+    async fn fetch_latest_server_version(
+        &self,
+        _: &dyn LspAdapterDelegate,
+    ) -> Result<Box<dyn 'static + Any + Send>> {
+        Ok(Box::new(
+            self.node
+                .npm_package_latest_version("@prisma/language-server")
+                .await?,
+        ) as Box<_>)
+    }
+
+    async fn fetch_server_binary(
+        &self,
+        version: Box<dyn 'static + Send + Any>,
+        container_dir: PathBuf,
+        _: &dyn LspAdapterDelegate,
+    ) -> Result<LanguageServerBinary> {
+        let version = version.downcast::<String>().unwrap();
+        let server_path = container_dir.join(SERVER_PATH);
+
+        if fs::metadata(&server_path).await.is_err() {
+            self.node
+                .npm_install_packages(
+                    &container_dir,
+                    &[("@prisma/language-server", version.as_str())],
+                )
+                .await?;
+        }
+
+        Ok(LanguageServerBinary {
+            path: self.node.binary_path().await?,
+            arguments: server_binary_arguments(&server_path),
+        })
+    }
+
+    async fn cached_server_binary(
+        &self,
+        container_dir: PathBuf,
+        _: &dyn LspAdapterDelegate,
+    ) -> Option<LanguageServerBinary> {
+        get_cached_server_binary(container_dir, &*self.node).await
+    }
+
+    async fn installation_test_binary(
+        &self,
+        container_dir: PathBuf,
+    ) -> Option<LanguageServerBinary> {
+        get_cached_server_binary(container_dir, &*self.node).await
+    }
+
+    fn initialization_options(&self) -> Option<serde_json::Value> {
+        None
+    }
+}
+
+async fn get_cached_server_binary(
+    container_dir: PathBuf,
+    node: &dyn NodeRuntime,
+) -> Option<LanguageServerBinary> {
+    async_maybe!({
+        let mut last_version_dir = None;
+        let mut entries = fs::read_dir(&container_dir).await?;
+        while let Some(entry) = entries.next().await {
+            let entry = entry?;
+            if entry.file_type().await?.is_dir() {
+                last_version_dir = Some(entry.path());
+            }
+        }
+        let last_version_dir = last_version_dir.ok_or_else(|| anyhow!("no cached binary"))?;
+        let server_path = last_version_dir.join(SERVER_PATH);
+        if server_path.exists() {
+            Ok(LanguageServerBinary {
+                path: node.binary_path().await?,
+                arguments: server_binary_arguments(&server_path),
+            })
+        } else {
+            Err(anyhow!(
+                "missing executable in directory {:?}",
+                last_version_dir
+            ))
+        }
+    })
+    .await
+    .log_err()
+}
diff --git a/crates/zed/src/languages/prisma/config.toml b/crates/zed/src/languages/prisma/config.toml
new file mode 100644
index 0000000000..c7f2d1ef6f
--- /dev/null
+++ b/crates/zed/src/languages/prisma/config.toml
@@ -0,0 +1,9 @@
+name = "Prisma"
+grammar = "prisma"
+path_suffixes = ["prisma"]
+line_comments = ["// "]
+brackets = [
+    { start = "{", end = "}", close = true, newline = true },
+    { start = "[", end = "]", close = true, newline = true },
+    { start = "(", end = ")", close = true, newline = true }
+]
diff --git a/crates/zed/src/languages/prisma/highlights.scm b/crates/zed/src/languages/prisma/highlights.scm
new file mode 100644
index 0000000000..5a7d7a8124
--- /dev/null
+++ b/crates/zed/src/languages/prisma/highlights.scm
@@ -0,0 +1,26 @@
+[
+ "datasource"
+ "enum"
+ "generator"
+ "model"
+] @keyword
+
+(comment) @comment
+(developer_comment) @comment
+
+(arguments) @property
+(attribute) @function
+(call_expression) @function
+(column_type) @type
+(enumeral) @constant
+(identifier) @variable
+(string) @string
+
+"(" @punctuation.bracket
+")" @punctuation.bracket
+"[" @punctuation.bracket
+"]" @punctuation.bracket
+"{" @punctuation.bracket
+"}" @punctuation.bracket
+"=" @operator
+"@" @operator
diff --git a/docs/src/languages/prisma.md b/docs/src/languages/prisma.md
new file mode 100644
index 0000000000..935a8d3efe
--- /dev/null
+++ b/docs/src/languages/prisma.md
@@ -0,0 +1,4 @@
+# Prisma
+
+- Tree Sitter: [tree-sitter-prisma](https://github.com/victorhqc/tree-sitter-prisma)
+- Language Server: [prisma-language-server](https://github.com/prisma/language-tools/tree/main/packages/language-server)

From 4f5fea5dba3aa294e4371dfdb7b0950cace1526b Mon Sep 17 00:00:00 2001
From: N8th8n8el <nathanael97@protonmail.com>
Date: Sat, 10 Feb 2024 20:29:06 +0100
Subject: [PATCH 367/372] terminal: Fix supported search options (regex: true)
 (#7659)

Release Notes:

- Fixes [#7327](https://github.com/zed-industries/zed/issues/7327).
---
 crates/terminal_view/src/terminal_view.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index b1e12ae6da..ae65c0aa2b 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -874,7 +874,7 @@ impl SearchableItem for TerminalView {
         SearchOptions {
             case: false,
             word: false,
-            regex: false,
+            regex: true,
             replacement: false,
         }
     }

From b4b59f87064374804422163f30b851b5a7a09c27 Mon Sep 17 00:00:00 2001
From: N8th8n8el <nathanael97@protonmail.com>
Date: Sat, 10 Feb 2024 20:34:41 +0100
Subject: [PATCH 368/372] terminal: Fix non regex search to actually be non
 regex (#7330)

Alacritty seems to support only regex search out of the box.
This PR just escapes all special regex chars to make non regex search
work as expected.
Disclaimer: New to Rust.

Release Notes:

-Fixed text search not working correctly in terminal ([#4880](https://github.com/zed-industries/zed/issues/4880))
---
 crates/terminal_view/src/terminal_view.rs | 63 ++++++++++++++++-------
 1 file changed, 45 insertions(+), 18 deletions(-)

diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rs
index ae65c0aa2b..7ce5f1e514 100644
--- a/crates/terminal_view/src/terminal_view.rs
+++ b/crates/terminal_view/src/terminal_view.rs
@@ -46,6 +46,10 @@ use std::{
     time::Duration,
 };
 
+const REGEX_SPECIAL_CHARS: &[char] = &[
+    '\\', '.', '*', '+', '?', '|', '(', ')', '[', ']', '{', '}', '^', '$',
+];
+
 const CURSOR_BLINK_INTERVAL: Duration = Duration::from_millis(500);
 
 ///Event to transmit the scroll from the element to the view
@@ -436,21 +440,6 @@ impl TerminalView {
         .detach();
     }
 
-    pub fn find_matches(
-        &mut self,
-        query: Arc<project::search::SearchQuery>,
-        cx: &mut ViewContext<Self>,
-    ) -> Task<Vec<RangeInclusive<Point>>> {
-        let searcher = regex_search_for_query(&query);
-
-        if let Some(searcher) = searcher {
-            self.terminal
-                .update(cx, |term, cx| term.find_matches(searcher, cx))
-        } else {
-            cx.background_executor().spawn(async { Vec::new() })
-        }
-    }
-
     pub fn terminal(&self) -> &Model<Terminal> {
         &self.terminal
     }
@@ -656,6 +645,19 @@ fn possible_open_targets(
     possible_open_paths_metadata(fs, row, column, potential_abs_paths, cx)
 }
 
+fn regex_to_literal(regex: &str) -> String {
+    regex
+        .chars()
+        .flat_map(|c| {
+            if REGEX_SPECIAL_CHARS.contains(&c) {
+                vec!['\\', c]
+            } else {
+                vec![c]
+            }
+        })
+        .collect()
+}
+
 pub fn regex_search_for_query(query: &project::search::SearchQuery) -> Option<RegexSearch> {
     let query = query.as_str();
     if query == "." {
@@ -916,12 +918,27 @@ impl SearchableItem for TerminalView {
     /// Get all of the matches for this query, should be done on the background
     fn find_matches(
         &mut self,
-        query: Arc<project::search::SearchQuery>,
+        query: Arc<SearchQuery>,
         cx: &mut ViewContext<Self>,
     ) -> Task<Vec<Self::Match>> {
-        if let Some(searcher) = regex_search_for_query(&query) {
+        let searcher = match &*query {
+            SearchQuery::Text { .. } => regex_search_for_query(
+                &(SearchQuery::text(
+                    regex_to_literal(&query.as_str()),
+                    query.whole_word(),
+                    query.case_sensitive(),
+                    query.include_ignored(),
+                    query.files_to_include().to_vec(),
+                    query.files_to_exclude().to_vec(),
+                )
+                .unwrap()),
+            ),
+            SearchQuery::Regex { .. } => regex_search_for_query(&query),
+        };
+
+        if let Some(s) = searcher {
             self.terminal()
-                .update(cx, |term, cx| term.find_matches(searcher, cx))
+                .update(cx, |term, cx| term.find_matches(s, cx))
         } else {
             Task::ready(vec![])
         }
@@ -1212,4 +1229,14 @@ mod tests {
             project.update(cx, |project, cx| project.set_active_path(Some(p), cx));
         });
     }
+
+    #[test]
+    fn escapes_only_special_characters() {
+        assert_eq!(regex_to_literal(r"test(\w)"), r"test\(\\w\)".to_string());
+    }
+
+    #[test]
+    fn empty_string_stays_empty() {
+        assert_eq!(regex_to_literal(""), "".to_string());
+    }
 }

From a159183f52726527782bed97aeca0fd673cbacb8 Mon Sep 17 00:00:00 2001
From: Paulo Roberto de Oliveira Castro <p.oliveira.castro@gmail.com>
Date: Sat, 10 Feb 2024 18:28:48 -0300
Subject: [PATCH 369/372] Add Clojure language support with tree-sitter and LSP
 (#6988)

Current limitations:
* Not able to navigate into JAR files

Release Notes:

- Added Clojure language support

---------

Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
---
 Cargo.lock                                    |  10 ++
 Cargo.toml                                    |   1 +
 crates/copilot/src/copilot.rs                 |   1 -
 crates/project/src/project.rs                 |  66 ++++++++-
 crates/workspace/src/workspace.rs             |  21 +++
 crates/zed/Cargo.toml                         |   1 +
 crates/zed/src/languages.rs                   |   3 +
 crates/zed/src/languages/clojure.rs           | 136 ++++++++++++++++++
 crates/zed/src/languages/clojure/brackets.scm |   3 +
 crates/zed/src/languages/clojure/config.toml  |  12 ++
 .../zed/src/languages/clojure/highlights.scm  |  41 ++++++
 crates/zed/src/languages/clojure/indents.scm  |   3 +
 crates/zed/src/languages/clojure/outline.scm  |   1 +
 docs/src/languages/clojure.md                 |   4 +
 14 files changed, 300 insertions(+), 3 deletions(-)
 create mode 100644 crates/zed/src/languages/clojure.rs
 create mode 100644 crates/zed/src/languages/clojure/brackets.scm
 create mode 100644 crates/zed/src/languages/clojure/config.toml
 create mode 100644 crates/zed/src/languages/clojure/highlights.scm
 create mode 100644 crates/zed/src/languages/clojure/indents.scm
 create mode 100644 crates/zed/src/languages/clojure/outline.scm
 create mode 100644 docs/src/languages/clojure.md

diff --git a/Cargo.lock b/Cargo.lock
index d05fc4ae93..38ecaa8f52 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9149,6 +9149,15 @@ dependencies = [
  "tree-sitter",
 ]
 
+[[package]]
+name = "tree-sitter-clojure"
+version = "0.0.9"
+source = "git+https://github.com/prcastro/tree-sitter-clojure?branch=update-ts#38b4f8d264248b2fd09575fbce66f7c22e8929d5"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
 [[package]]
 name = "tree-sitter-cpp"
 version = "0.20.0"
@@ -10841,6 +10850,7 @@ dependencies = [
  "tree-sitter-beancount",
  "tree-sitter-c",
  "tree-sitter-c-sharp",
+ "tree-sitter-clojure",
  "tree-sitter-cpp",
  "tree-sitter-css",
  "tree-sitter-elixir",
diff --git a/Cargo.toml b/Cargo.toml
index 84627885e0..4b936c4cfe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -226,6 +226,7 @@ tree-sitter = { version = "0.20", features = ["wasm"] }
 tree-sitter-bash = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "7331995b19b8f8aba2d5e26deb51d2195c18bc94" }
 tree-sitter-beancount = { git = "https://github.com/polarmutex/tree-sitter-beancount", rev = "da1bf8c6eb0ae7a97588affde7227630bcd678b6" }
 tree-sitter-c = "0.20.1"
+tree-sitter-clojure = { git = "https://github.com/prcastro/tree-sitter-clojure", branch = "update-ts"}
 tree-sitter-c-sharp = { git = "https://github.com/tree-sitter/tree-sitter-c-sharp", rev = "dd5e59721a5f8dae34604060833902b882023aaf" }
 tree-sitter-cpp = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "f44509141e7e483323d2ec178f2d2e6c0fc041c1" }
 tree-sitter-css = { git = "https://github.com/tree-sitter/tree-sitter-css", rev = "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51" }
diff --git a/crates/copilot/src/copilot.rs b/crates/copilot/src/copilot.rs
index 6b619e4979..bce829fa59 100644
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -444,7 +444,6 @@ impl Copilot {
                         |_, _| { /* Silence the notification */ },
                     )
                     .detach();
-
                 let server = cx.update(|cx| server.initialize(None, cx))?.await?;
 
                 let status = server
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index cfd2f6412c..ce9b64a1d7 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -28,7 +28,7 @@ use futures::{
 use globset::{Glob, GlobSet, GlobSetBuilder};
 use gpui::{
     AnyModel, AppContext, AsyncAppContext, BackgroundExecutor, Context, Entity, EventEmitter,
-    Model, ModelContext, Task, WeakModel,
+    Model, ModelContext, PromptLevel, Task, WeakModel,
 };
 use itertools::Itertools;
 use language::{
@@ -47,7 +47,8 @@ use language::{
 use log::error;
 use lsp::{
     DiagnosticSeverity, DiagnosticTag, DidChangeWatchedFilesRegistrationOptions,
-    DocumentHighlightKind, LanguageServer, LanguageServerBinary, LanguageServerId, OneOf,
+    DocumentHighlightKind, LanguageServer, LanguageServerBinary, LanguageServerId,
+    MessageActionItem, OneOf,
 };
 use lsp_command::*;
 use node_runtime::NodeRuntime;
@@ -213,12 +214,37 @@ enum ProjectClientState {
     },
 }
 
+/// A prompt requested by LSP server.
+#[derive(Clone, Debug)]
+pub struct LanguageServerPromptRequest {
+    pub level: PromptLevel,
+    pub message: String,
+    pub actions: Vec<MessageActionItem>,
+    response_channel: Sender<MessageActionItem>,
+}
+
+impl LanguageServerPromptRequest {
+    pub async fn respond(self, index: usize) -> Option<()> {
+        if let Some(response) = self.actions.into_iter().nth(index) {
+            self.response_channel.send(response).await.ok()
+        } else {
+            None
+        }
+    }
+}
+impl PartialEq for LanguageServerPromptRequest {
+    fn eq(&self, other: &Self) -> bool {
+        self.message == other.message && self.actions == other.actions
+    }
+}
+
 #[derive(Clone, Debug, PartialEq)]
 pub enum Event {
     LanguageServerAdded(LanguageServerId),
     LanguageServerRemoved(LanguageServerId),
     LanguageServerLog(LanguageServerId, String),
     Notification(String),
+    LanguageServerPrompt(LanguageServerPromptRequest),
     ActiveEntryChanged(Option<ProjectEntryId>),
     ActivateProjectPanel,
     WorktreeAdded,
@@ -3105,6 +3131,42 @@ impl Project {
             })
             .detach();
 
+        language_server
+            .on_request::<lsp::request::ShowMessageRequest, _, _>({
+                let this = this.clone();
+                move |params, mut cx| {
+                    let this = this.clone();
+                    async move {
+                        if let Some(actions) = params.actions {
+                            let (tx, mut rx) = smol::channel::bounded(1);
+                            let request = LanguageServerPromptRequest {
+                                level: match params.typ {
+                                    lsp::MessageType::ERROR => PromptLevel::Critical,
+                                    lsp::MessageType::WARNING => PromptLevel::Warning,
+                                    _ => PromptLevel::Info,
+                                },
+                                message: params.message,
+                                actions,
+                                response_channel: tx,
+                            };
+
+                            if let Ok(_) = this.update(&mut cx, |_, cx| {
+                                cx.emit(Event::LanguageServerPrompt(request));
+                            }) {
+                                let response = rx.next().await;
+
+                                Ok(response)
+                            } else {
+                                Ok(None)
+                            }
+                        } else {
+                            Ok(None)
+                        }
+                    }
+                }
+            })
+            .detach();
+
         let disk_based_diagnostics_progress_token =
             adapter.disk_based_diagnostics_progress_token.clone();
 
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index a4af8170aa..7562de9094 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -571,6 +571,27 @@ impl Workspace {
                     cx.new_view(|_| MessageNotification::new(message.clone()))
                 }),
 
+                project::Event::LanguageServerPrompt(request) => {
+                    let request = request.clone();
+
+                    cx.spawn(|_, mut cx| async move {
+                        let messages = request
+                            .actions
+                            .iter()
+                            .map(|action| action.title.as_str())
+                            .collect::<Vec<_>>();
+                        let index = cx
+                            .update(|cx| {
+                                cx.prompt(request.level, "", Some(&request.message), &messages)
+                            })?
+                            .await?;
+                        request.respond(index).await;
+
+                        Result::<(), anyhow::Error>::Ok(())
+                    })
+                    .detach()
+                }
+
                 _ => {}
             }
             cx.notify()
diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml
index 05b74515d5..fc957ad559 100644
--- a/crates/zed/Cargo.toml
+++ b/crates/zed/Cargo.toml
@@ -112,6 +112,7 @@ tree-sitter-bash.workspace = true
 tree-sitter-beancount.workspace = true
 tree-sitter-c-sharp.workspace = true
 tree-sitter-c.workspace = true
+tree-sitter-clojure.workspace = true
 tree-sitter-cpp.workspace = true
 tree-sitter-css.workspace = true
 tree-sitter-elixir.workspace = true
diff --git a/crates/zed/src/languages.rs b/crates/zed/src/languages.rs
index 3b78b23225..59e4be70d7 100644
--- a/crates/zed/src/languages.rs
+++ b/crates/zed/src/languages.rs
@@ -10,6 +10,7 @@ use util::asset_str;
 use self::{deno::DenoSettings, elixir::ElixirSettings};
 
 mod c;
+mod clojure;
 mod csharp;
 mod css;
 mod deno;
@@ -68,6 +69,7 @@ pub fn init(
         ("beancount", tree_sitter_beancount::language()),
         ("c", tree_sitter_c::language()),
         ("c_sharp", tree_sitter_c_sharp::language()),
+        ("clojure", tree_sitter_clojure::language()),
         ("cpp", tree_sitter_cpp::language()),
         ("css", tree_sitter_css::language()),
         ("elixir", tree_sitter_elixir::language()),
@@ -131,6 +133,7 @@ pub fn init(
     language("bash", vec![]);
     language("beancount", vec![]);
     language("c", vec![Arc::new(c::CLspAdapter) as Arc<dyn LspAdapter>]);
+    language("clojure", vec![Arc::new(clojure::ClojureLspAdapter)]);
     language("cpp", vec![Arc::new(c::CLspAdapter)]);
     language("csharp", vec![Arc::new(csharp::OmniSharpAdapter {})]);
     language(
diff --git a/crates/zed/src/languages/clojure.rs b/crates/zed/src/languages/clojure.rs
new file mode 100644
index 0000000000..e200b9c6a0
--- /dev/null
+++ b/crates/zed/src/languages/clojure.rs
@@ -0,0 +1,136 @@
+use anyhow::{anyhow, bail, Context, Result};
+use async_trait::async_trait;
+pub use language::*;
+use lsp::LanguageServerBinary;
+use smol::fs::{self, File};
+use std::{any::Any, env::consts, path::PathBuf};
+use util::{
+    fs::remove_matching,
+    github::{latest_github_release, GitHubLspBinaryVersion},
+};
+
+#[derive(Copy, Clone)]
+pub struct ClojureLspAdapter;
+
+#[async_trait]
+impl super::LspAdapter for ClojureLspAdapter {
+    fn name(&self) -> LanguageServerName {
+        LanguageServerName("clojure-lsp".into())
+    }
+
+    fn short_name(&self) -> &'static str {
+        "clojure"
+    }
+
+    async fn fetch_latest_server_version(
+        &self,
+        delegate: &dyn LspAdapterDelegate,
+    ) -> Result<Box<dyn 'static + Send + Any>> {
+        let release = latest_github_release(
+            "clojure-lsp/clojure-lsp",
+            true,
+            false,
+            delegate.http_client(),
+        )
+        .await?;
+        let platform = match consts::ARCH {
+            "x86_64" => "amd64",
+            "aarch64" => "aarch64",
+            other => bail!("Running on unsupported platform: {other}"),
+        };
+        let asset_name = format!("clojure-lsp-native-macos-{platform}.zip");
+        let asset = release
+            .assets
+            .iter()
+            .find(|asset| asset.name == asset_name)
+            .ok_or_else(|| anyhow!("no asset found matching {:?}", asset_name))?;
+        let version = GitHubLspBinaryVersion {
+            name: release.tag_name.clone(),
+            url: asset.browser_download_url.clone(),
+        };
+        Ok(Box::new(version) as Box<_>)
+    }
+
+    async fn fetch_server_binary(
+        &self,
+        version: Box<dyn 'static + Send + Any>,
+        container_dir: PathBuf,
+        delegate: &dyn LspAdapterDelegate,
+    ) -> Result<LanguageServerBinary> {
+        let version = version.downcast::<GitHubLspBinaryVersion>().unwrap();
+        let zip_path = container_dir.join(format!("clojure-lsp_{}.zip", version.name));
+        let folder_path = container_dir.join("bin");
+        let binary_path = folder_path.join("clojure-lsp");
+
+        if fs::metadata(&binary_path).await.is_err() {
+            let mut response = delegate
+                .http_client()
+                .get(&version.url, Default::default(), true)
+                .await
+                .context("error downloading release")?;
+            let mut file = File::create(&zip_path)
+                .await
+                .with_context(|| format!("failed to create file {}", zip_path.display()))?;
+            if !response.status().is_success() {
+                return Err(anyhow!(
+                    "download failed with status {}",
+                    response.status().to_string()
+                ))?;
+            }
+            futures::io::copy(response.body_mut(), &mut file).await?;
+
+            fs::create_dir_all(&folder_path)
+                .await
+                .with_context(|| format!("failed to create directory {}", folder_path.display()))?;
+
+            let unzip_status = smol::process::Command::new("unzip")
+                .arg(&zip_path)
+                .arg("-d")
+                .arg(&folder_path)
+                .output()
+                .await?
+                .status;
+            if !unzip_status.success() {
+                return Err(anyhow!("failed to unzip elixir-ls archive"))?;
+            }
+
+            remove_matching(&container_dir, |entry| entry != folder_path).await;
+        }
+
+        Ok(LanguageServerBinary {
+            path: binary_path,
+            arguments: vec![],
+        })
+    }
+
+    async fn cached_server_binary(
+        &self,
+        container_dir: PathBuf,
+        _: &dyn LspAdapterDelegate,
+    ) -> Option<LanguageServerBinary> {
+        let binary_path = container_dir.join("bin").join("clojure-lsp");
+        if binary_path.exists() {
+            Some(LanguageServerBinary {
+                path: binary_path,
+                arguments: vec![],
+            })
+        } else {
+            None
+        }
+    }
+
+    async fn installation_test_binary(
+        &self,
+        container_dir: PathBuf,
+    ) -> Option<LanguageServerBinary> {
+        let binary_path = container_dir.join("bin").join("clojure-lsp");
+        if binary_path.exists() {
+            Some(LanguageServerBinary {
+                path: binary_path,
+                arguments: vec!["--version".into()],
+            })
+        } else {
+            None
+        }
+    }
+}
diff --git a/crates/zed/src/languages/clojure/brackets.scm b/crates/zed/src/languages/clojure/brackets.scm
new file mode 100644
index 0000000000..191fd9c084
--- /dev/null
+++ b/crates/zed/src/languages/clojure/brackets.scm
@@ -0,0 +1,3 @@
+("(" @open ")" @close)
+("[" @open "]" @close)
+("{" @open "}" @close)
diff --git a/crates/zed/src/languages/clojure/config.toml b/crates/zed/src/languages/clojure/config.toml
new file mode 100644
index 0000000000..b773e88341
--- /dev/null
+++ b/crates/zed/src/languages/clojure/config.toml
@@ -0,0 +1,12 @@
+name = "Clojure"
+grammar = "clojure"
+path_suffixes = ["clj", "cljs"]
+line_comments = [";; "]
+autoclose_before = "}])"
+brackets = [
+    { start = "{", end = "}", close = true, newline = true },
+    { start = "[", end = "]", close = true, newline = true },
+    { start = "(", end = ")", close = true, newline = true },
+    { start = "\"", end = "\"", close = true, newline = false, not_in = ["string"] },
+]
+word_characters = ["-"]
diff --git a/crates/zed/src/languages/clojure/highlights.scm b/crates/zed/src/languages/clojure/highlights.scm
new file mode 100644
index 0000000000..f4abe3bcdd
--- /dev/null
+++ b/crates/zed/src/languages/clojure/highlights.scm
@@ -0,0 +1,41 @@
+;; Literals
+
+(num_lit) @number
+
+[
+  (char_lit)
+  (str_lit)
+] @string
+
+[
+ (bool_lit)
+ (nil_lit)
+] @constant.builtin
+
+(kwd_lit) @constant
+
+;; Comments
+
+(comment) @comment
+
+;; Treat quasiquotation as operators for the purpose of highlighting.
+
+[
+ "'"
+ "`"
+ "~"
+ "@"
+ "~@"
+] @operator
+
+
+(list_lit
+  .
+  (sym_lit) @function)
+
+(list_lit
+  .
+  (sym_lit) @keyword
+  (#match? @keyword
+    "^(do|if|let|var|fn|fn*|loop*|recur|throw|try|catch|finally|set!|new|quote|->|->>)$"
+    ))
diff --git a/crates/zed/src/languages/clojure/indents.scm b/crates/zed/src/languages/clojure/indents.scm
new file mode 100644
index 0000000000..9a1cbad161
--- /dev/null
+++ b/crates/zed/src/languages/clojure/indents.scm
@@ -0,0 +1,3 @@
+(_ "[" "]") @indent
+(_ "{" "}") @indent
+(_ "(" ")") @indent
diff --git a/crates/zed/src/languages/clojure/outline.scm b/crates/zed/src/languages/clojure/outline.scm
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/crates/zed/src/languages/clojure/outline.scm
@@ -0,0 +1 @@
+
diff --git a/docs/src/languages/clojure.md b/docs/src/languages/clojure.md
new file mode 100644
index 0000000000..58ff9790e0
--- /dev/null
+++ b/docs/src/languages/clojure.md
@@ -0,0 +1,4 @@
+# Clojure
+
+- Tree Sitter: [tree-sitter-clojure](https://github.com/sogaiu/tree-sitter-clojure)
+- Language Server: [clojure-lsp](https://github.com/clojure-lsp/clojure-lsp)

From bd882c66d67a16eaf91ffed104819455a4f14e97 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Sat, 10 Feb 2024 16:21:13 -0700
Subject: [PATCH 370/372] vim lifecycle (#7647)

Release Notes:

- Fixed :0 and :% in vim mode
([#4303](https://github.com/zed-industries/zed/issues/4303)).
- Improved keymap loading to not load vim key bindings unless vim is
enabled

**or**

- N/A
---
 assets/keymaps/vim.json                 |   2 +-
 crates/vim/src/editor_events.rs         |  33 ++---
 crates/vim/src/mode_indicator.rs        |  11 +-
 crates/vim/src/state.rs                 |   1 -
 crates/vim/src/test/vim_test_context.rs |   4 +-
 crates/vim/src/vim.rs                   | 158 +++++++++++-------------
 crates/zed/src/zed.rs                   |  12 +-
 7 files changed, 103 insertions(+), 118 deletions(-)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 9c95b352a5..5513c55da8 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -498,7 +498,7 @@
     }
   },
   {
-    "context": "BufferSearchBar && !in_replace > VimEnabled",
+    "context": "BufferSearchBar && !in_replace",
     "bindings": {
       "enter": "vim::SearchSubmit",
       "escape": "buffer_search::Dismiss"
diff --git a/crates/vim/src/editor_events.rs b/crates/vim/src/editor_events.rs
index da964efd21..800e075f0c 100644
--- a/crates/vim/src/editor_events.rs
+++ b/crates/vim/src/editor_events.rs
@@ -1,6 +1,7 @@
-use crate::{insert::NormalBefore, Vim};
+use crate::{insert::NormalBefore, Vim, VimModeSetting};
 use editor::{Editor, EditorEvent};
 use gpui::{Action, AppContext, Entity, EntityId, View, ViewContext, WindowContext};
+use settings::{Settings, SettingsStore};
 
 pub fn init(cx: &mut AppContext) {
     cx.observe_new_views(|_, cx: &mut ViewContext<Editor>| {
@@ -12,6 +13,17 @@ pub fn init(cx: &mut AppContext) {
         })
         .detach();
 
+        let mut enabled = VimModeSetting::get_global(cx).0;
+        cx.observe_global::<SettingsStore>(move |editor, cx| {
+            if VimModeSetting::get_global(cx).0 != enabled {
+                enabled = VimModeSetting::get_global(cx).0;
+                if !enabled {
+                    Vim::unhook_vim_settings(editor, cx);
+                }
+            }
+        })
+        .detach();
+
         let id = cx.view().entity_id();
         cx.on_release(move |_, _, cx| released(id, cx)).detach();
     })
@@ -19,34 +31,25 @@ pub fn init(cx: &mut AppContext) {
 }
 
 fn focused(editor: View<Editor>, cx: &mut WindowContext) {
-    if Vim::read(cx).active_editor.clone().is_some() {
-        Vim::update(cx, |vim, cx| {
-            vim.update_active_editor(cx, |previously_active_editor, cx| {
-                vim.unhook_vim_settings(previously_active_editor, cx)
-            });
-        });
-    }
-
     Vim::update(cx, |vim, cx| {
-        vim.set_active_editor(editor.clone(), cx);
+        if !vim.enabled {
+            return;
+        }
+        vim.activate_editor(editor.clone(), cx);
     });
 }
 
 fn blurred(editor: View<Editor>, cx: &mut WindowContext) {
     Vim::update(cx, |vim, cx| {
-        vim.stop_recording_immediately(NormalBefore.boxed_clone());
         if let Some(previous_editor) = vim.active_editor.clone() {
+            vim.stop_recording_immediately(NormalBefore.boxed_clone());
             if previous_editor
                 .upgrade()
                 .is_some_and(|previous| previous == editor.clone())
             {
                 vim.clear_operator(cx);
-                vim.active_editor = None;
-                vim.editor_subscription = None;
             }
         }
-
-        editor.update(cx, |editor, cx| vim.unhook_vim_settings(editor, cx))
     });
 }
 
diff --git a/crates/vim/src/mode_indicator.rs b/crates/vim/src/mode_indicator.rs
index 423ae0c4e1..7afa22b876 100644
--- a/crates/vim/src/mode_indicator.rs
+++ b/crates/vim/src/mode_indicator.rs
@@ -1,5 +1,4 @@
 use gpui::{div, Element, Render, Subscription, ViewContext};
-use settings::SettingsStore;
 use workspace::{item::ItemHandle, ui::prelude::*, StatusItemView};
 
 use crate::{state::Mode, Vim};
@@ -7,20 +6,16 @@ use crate::{state::Mode, Vim};
 /// The ModeIndicator displays the current mode in the status bar.
 pub struct ModeIndicator {
     pub(crate) mode: Option<Mode>,
-    _subscriptions: Vec<Subscription>,
+    _subscription: Subscription,
 }
 
 impl ModeIndicator {
     /// Construct a new mode indicator in this window.
     pub fn new(cx: &mut ViewContext<Self>) -> Self {
-        let _subscriptions = vec![
-            cx.observe_global::<Vim>(|this, cx| this.update_mode(cx)),
-            cx.observe_global::<SettingsStore>(|this, cx| this.update_mode(cx)),
-        ];
-
+        let _subscription = cx.observe_global::<Vim>(|this, cx| this.update_mode(cx));
         let mut this = Self {
             mode: None,
-            _subscriptions,
+            _subscription,
         };
         this.update_mode(cx);
         this
diff --git a/crates/vim/src/state.rs b/crates/vim/src/state.rs
index 3452898255..6dcb9c3ac3 100644
--- a/crates/vim/src/state.rs
+++ b/crates/vim/src/state.rs
@@ -169,7 +169,6 @@ impl EditorState {
 
     pub fn keymap_context_layer(&self) -> KeyContext {
         let mut context = KeyContext::default();
-        context.add("VimEnabled");
         context.set(
             "vim_mode",
             match self.mode {
diff --git a/crates/vim/src/test/vim_test_context.rs b/crates/vim/src/test/vim_test_context.rs
index 70334d70d4..cd1e0554e0 100644
--- a/crates/vim/src/test/vim_test_context.rs
+++ b/crates/vim/src/test/vim_test_context.rs
@@ -49,7 +49,9 @@ impl VimTestContext {
                 store.update_user_settings::<VimModeSetting>(cx, |s| *s = Some(enabled));
             });
             settings::KeymapFile::load_asset("keymaps/default.json", cx).unwrap();
-            settings::KeymapFile::load_asset("keymaps/vim.json", cx).unwrap();
+            if enabled {
+                settings::KeymapFile::load_asset("keymaps/vim.json", cx).unwrap();
+            }
         });
 
         // Setup search toolbars and keypress hook
diff --git a/crates/vim/src/vim.rs b/crates/vim/src/vim.rs
index 41ae6c4f4c..b7e63b46b8 100644
--- a/crates/vim/src/vim.rs
+++ b/crates/vim/src/vim.rs
@@ -20,8 +20,8 @@ use command_palette::CommandPaletteInterceptor;
 use copilot::CommandPaletteFilter;
 use editor::{movement, Editor, EditorEvent, EditorMode};
 use gpui::{
-    actions, impl_actions, Action, AppContext, EntityId, Global, KeyContext, Subscription, View,
-    ViewContext, WeakView, WindowContext,
+    actions, impl_actions, Action, AppContext, EntityId, Global, Subscription, View, ViewContext,
+    WeakView, WindowContext,
 };
 use language::{CursorShape, Point, Selection, SelectionGoal};
 pub use mode_indicator::ModeIndicator;
@@ -197,7 +197,11 @@ impl Vim {
         cx.update_global(update)
     }
 
-    fn set_active_editor(&mut self, editor: View<Editor>, cx: &mut WindowContext) {
+    fn activate_editor(&mut self, editor: View<Editor>, cx: &mut WindowContext) {
+        if editor.read(cx).mode() != EditorMode::Full {
+            return;
+        }
+
         self.active_editor = Some(editor.clone().downgrade());
         self.editor_subscription = Some(cx.subscribe(&editor, |editor, event, cx| match event {
             EditorEvent::SelectionsChanged { local: true } => {
@@ -219,19 +223,17 @@ impl Vim {
             _ => {}
         }));
 
-        if self.enabled {
-            let editor = editor.read(cx);
-            let editor_mode = editor.mode();
-            let newest_selection_empty = editor.selections.newest::<usize>(cx).is_empty();
+        let editor = editor.read(cx);
+        let editor_mode = editor.mode();
+        let newest_selection_empty = editor.selections.newest::<usize>(cx).is_empty();
 
-            if editor_mode == EditorMode::Full
+        if editor_mode == EditorMode::Full
                 && !newest_selection_empty
                 && self.state().mode == Mode::Normal
                 // When following someone, don't switch vim mode.
                 && editor.leader_peer_id().is_none()
-            {
-                self.switch_mode(Mode::Visual, true, cx);
-            }
+        {
+            self.switch_mode(Mode::Visual, true, cx);
         }
 
         self.sync_vim_settings(cx);
@@ -504,43 +506,39 @@ impl Vim {
     }
 
     fn set_enabled(&mut self, enabled: bool, cx: &mut AppContext) {
-        if self.enabled != enabled {
-            self.enabled = enabled;
-
+        if self.enabled == enabled {
+            return;
+        }
+        if !enabled {
+            let _ = cx.remove_global::<CommandPaletteInterceptor>();
             cx.update_global::<CommandPaletteFilter, _>(|filter, _| {
-                if self.enabled {
-                    filter.hidden_namespaces.remove("vim");
-                } else {
-                    filter.hidden_namespaces.insert("vim");
-                }
+                filter.hidden_namespaces.insert("vim");
             });
+            *self = Default::default();
+            return;
+        }
 
-            if self.enabled {
-                cx.set_global::<CommandPaletteInterceptor>(CommandPaletteInterceptor(Box::new(
-                    command::command_interceptor,
-                )));
-            } else if cx.has_global::<CommandPaletteInterceptor>() {
-                let _ = cx.remove_global::<CommandPaletteInterceptor>();
-            }
+        self.enabled = true;
+        cx.update_global::<CommandPaletteFilter, _>(|filter, _| {
+            filter.hidden_namespaces.remove("vim");
+        });
+        cx.set_global::<CommandPaletteInterceptor>(CommandPaletteInterceptor(Box::new(
+            command::command_interceptor,
+        )));
 
-            if let Some(active_window) = cx.active_window() {
-                active_window
-                    .update(cx, |root_view, cx| {
-                        if self.enabled {
-                            let active_editor = root_view
-                                .downcast::<Workspace>()
-                                .ok()
-                                .and_then(|workspace| workspace.read(cx).active_item(cx))
-                                .and_then(|item| item.downcast::<Editor>());
-                            if let Some(active_editor) = active_editor {
-                                self.set_active_editor(active_editor, cx);
-                            }
-                            self.switch_mode(Mode::Normal, false, cx);
-                        }
-                        self.sync_vim_settings(cx);
-                    })
-                    .ok();
-            }
+        if let Some(active_window) = cx
+            .active_window()
+            .and_then(|window| window.downcast::<Workspace>())
+        {
+            active_window
+                .update(cx, |workspace, cx| {
+                    let active_editor = workspace.active_item_as::<Editor>(cx);
+                    if let Some(active_editor) = active_editor {
+                        self.activate_editor(active_editor, cx);
+                        self.switch_mode(Mode::Normal, false, cx);
+                    }
+                })
+                .ok();
         }
     }
 
@@ -569,45 +567,29 @@ impl Vim {
 
     fn sync_vim_settings(&self, cx: &mut WindowContext) {
         let state = self.state();
-        let cursor_shape = state.cursor_shape();
 
         self.update_active_editor(cx, |editor, cx| {
-            if self.enabled && editor.mode() == EditorMode::Full {
-                editor.set_cursor_shape(cursor_shape, cx);
-                editor.set_clip_at_line_ends(state.clip_at_line_ends(), cx);
-                editor.set_collapse_matches(true);
-                editor.set_input_enabled(!state.vim_controlled());
-                editor.set_autoindent(state.should_autoindent());
-                editor.selections.line_mode = matches!(state.mode, Mode::VisualLine);
-                let context_layer = state.keymap_context_layer();
-                editor.set_keymap_context_layer::<Self>(context_layer, cx);
-            } else {
-                // Note: set_collapse_matches is not in unhook_vim_settings, as that method is called on blur,
-                // but we need collapse_matches to persist when the search bar is focused.
-                editor.set_collapse_matches(false);
-                self.unhook_vim_settings(editor, cx);
-            }
+            editor.set_cursor_shape(state.cursor_shape(), cx);
+            editor.set_clip_at_line_ends(state.clip_at_line_ends(), cx);
+            editor.set_collapse_matches(true);
+            editor.set_input_enabled(!state.vim_controlled());
+            editor.set_autoindent(state.should_autoindent());
+            editor.selections.line_mode = matches!(state.mode, Mode::VisualLine);
+            let context_layer = state.keymap_context_layer();
+            editor.set_keymap_context_layer::<Self>(context_layer, cx);
         });
     }
 
-    fn unhook_vim_settings(&self, editor: &mut Editor, cx: &mut ViewContext<Editor>) {
-        editor.set_cursor_shape(CursorShape::Bar, cx);
-        editor.set_clip_at_line_ends(false, cx);
-        editor.set_input_enabled(true);
-        editor.set_autoindent(true);
-        editor.selections.line_mode = false;
-
-        // we set the VimEnabled context on all editors so that we
-        // can distinguish between vim mode and non-vim mode in the BufferSearchBar.
-        // This is a bit of a hack, but currently the search crate does not depend on vim,
-        // and it seems nice to keep it that way.
-        if self.enabled {
-            let mut context = KeyContext::default();
-            context.add("VimEnabled");
-            editor.set_keymap_context_layer::<Self>(context, cx)
-        } else {
-            editor.remove_keymap_context_layer::<Self>(cx);
+    fn unhook_vim_settings(editor: &mut Editor, cx: &mut ViewContext<Editor>) {
+        if editor.mode() == EditorMode::Full {
+            editor.set_cursor_shape(CursorShape::Bar, cx);
+            editor.set_clip_at_line_ends(false, cx);
+            editor.set_collapse_matches(false);
+            editor.set_input_enabled(true);
+            editor.set_autoindent(true);
+            editor.selections.line_mode = false;
         }
+        editor.remove_keymap_context_layer::<Self>(cx)
     }
 }
 
@@ -633,19 +615,17 @@ fn local_selections_changed(
     cx: &mut WindowContext,
 ) {
     Vim::update(cx, |vim, cx| {
-        if vim.enabled {
-            if vim.state().mode == Mode::Normal && !newest.is_empty() {
-                if matches!(newest.goal, SelectionGoal::HorizontalRange { .. }) {
-                    vim.switch_mode(Mode::VisualBlock, false, cx);
-                } else {
-                    vim.switch_mode(Mode::Visual, false, cx)
-                }
-            } else if newest.is_empty()
-                && !is_multicursor
-                && [Mode::Visual, Mode::VisualLine, Mode::VisualBlock].contains(&vim.state().mode)
-            {
-                vim.switch_mode(Mode::Normal, true, cx)
+        if vim.state().mode == Mode::Normal && !newest.is_empty() {
+            if matches!(newest.goal, SelectionGoal::HorizontalRange { .. }) {
+                vim.switch_mode(Mode::VisualBlock, false, cx);
+            } else {
+                vim.switch_mode(Mode::Visual, false, cx)
             }
+        } else if newest.is_empty()
+            && !is_multicursor
+            && [Mode::Visual, Mode::VisualLine, Mode::VisualBlock].contains(&vim.state().mode)
+        {
+            vim.switch_mode(Mode::Normal, true, cx)
         }
     })
 }
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index e9e64cff49..aaaf2ed913 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -32,6 +32,7 @@ use util::{
     ResultExt,
 };
 use uuid::Uuid;
+use vim::VimModeSetting;
 use welcome::BaseKeymap;
 use workspace::Pane;
 use workspace::{
@@ -495,13 +496,17 @@ pub fn handle_keymap_file_changes(
     cx: &mut AppContext,
 ) {
     BaseKeymap::register(cx);
+    VimModeSetting::register(cx);
 
     let (base_keymap_tx, mut base_keymap_rx) = mpsc::unbounded();
     let mut old_base_keymap = *BaseKeymap::get_global(cx);
+    let mut old_vim_enabled = VimModeSetting::get_global(cx).0;
     cx.observe_global::<SettingsStore>(move |cx| {
         let new_base_keymap = *BaseKeymap::get_global(cx);
-        if new_base_keymap != old_base_keymap {
+        let new_vim_enabled = VimModeSetting::get_global(cx).0;
+        if new_base_keymap != old_base_keymap || new_vim_enabled != old_vim_enabled {
             old_base_keymap = new_base_keymap.clone();
+            old_vim_enabled = new_vim_enabled;
             base_keymap_tx.unbounded_send(()).unwrap();
         }
     })
@@ -538,8 +543,9 @@ fn reload_keymaps(cx: &mut AppContext, keymap_content: &KeymapFile) {
 }
 
 pub fn load_default_keymap(cx: &mut AppContext) {
-    for path in ["keymaps/default.json", "keymaps/vim.json"] {
-        KeymapFile::load_asset(path, cx).unwrap();
+    KeymapFile::load_asset("keymaps/default.json", cx).unwrap();
+    if VimModeSetting::get_global(cx).0 {
+        KeymapFile::load_asset("keymaps/vim.json", cx).unwrap();
     }
 
     if let Some(asset_path) = BaseKeymap::get_global(cx).asset_path() {

From 664a195721ed75859c0caf548076599ece074869 Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@fastmail.com>
Date: Sat, 10 Feb 2024 20:19:00 -0800
Subject: [PATCH 371/372] linux: switch to srgb color space output (#7666)

This matches the behavior of the existing Metal backend.

Picks up https://github.com/kvark/blade/pull/76

Release Notes:
- N/A
---
 Cargo.lock                                    |  4 ++--
 crates/gpui/Cargo.toml                        |  4 ++--
 .../gpui/src/platform/linux/blade_renderer.rs | 23 +++++++++++--------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 38ecaa8f52..5808fddc9e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -937,7 +937,7 @@ dependencies = [
 [[package]]
 name = "blade-graphics"
 version = "0.3.0"
-source = "git+https://github.com/kvark/blade?rev=26bc5e8b9ef67b4f2970eb95888db733eace98f3#26bc5e8b9ef67b4f2970eb95888db733eace98f3"
+source = "git+https://github.com/kvark/blade?rev=c4f951a88b345724cb952e920ad30e39851f7760#c4f951a88b345724cb952e920ad30e39851f7760"
 dependencies = [
  "ash",
  "ash-window",
@@ -967,7 +967,7 @@ dependencies = [
 [[package]]
 name = "blade-macros"
 version = "0.2.1"
-source = "git+https://github.com/kvark/blade?rev=26bc5e8b9ef67b4f2970eb95888db733eace98f3#26bc5e8b9ef67b4f2970eb95888db733eace98f3"
+source = "git+https://github.com/kvark/blade?rev=c4f951a88b345724cb952e920ad30e39851f7760#c4f951a88b345724cb952e920ad30e39851f7760"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 1bf95cfc33..6b12a2c795 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -99,7 +99,7 @@ flume = "0.11"
 xcb = { version = "1.3", features = ["as-raw-xcb-connection"] }
 as-raw-xcb-connection = "1"
 #TODO: use these on all platforms
-blade-graphics = { git = "https://github.com/kvark/blade", rev = "26bc5e8b9ef67b4f2970eb95888db733eace98f3" }
-blade-macros = { git = "https://github.com/kvark/blade", rev = "26bc5e8b9ef67b4f2970eb95888db733eace98f3" }
+blade-graphics = { git = "https://github.com/kvark/blade", rev = "c4f951a88b345724cb952e920ad30e39851f7760" }
+blade-macros = { git = "https://github.com/kvark/blade", rev = "c4f951a88b345724cb952e920ad30e39851f7760" }
 bytemuck = "1"
 cosmic-text = "0.10.0"
\ No newline at end of file
diff --git a/crates/gpui/src/platform/linux/blade_renderer.rs b/crates/gpui/src/platform/linux/blade_renderer.rs
index 9f2ae6b606..67935c4712 100644
--- a/crates/gpui/src/platform/linux/blade_renderer.rs
+++ b/crates/gpui/src/platform/linux/blade_renderer.rs
@@ -237,12 +237,19 @@ pub struct BladeRenderer {
 }
 
 impl BladeRenderer {
-    pub fn new(gpu: Arc<gpu::Context>, size: gpu::Extent) -> Self {
-        let surface_format = gpu.resize(gpu::SurfaceConfig {
+    fn make_surface_config(size: gpu::Extent) -> gpu::SurfaceConfig {
+        gpu::SurfaceConfig {
             size,
             usage: gpu::TextureUsage::TARGET,
             frame_count: SURFACE_FRAME_COUNT,
-        });
+            //Note: this matches the original logic of the Metal backend,
+            // but ultimaterly we need to switch to `Linear`.
+            color_space: gpu::ColorSpace::Srgb,
+        }
+    }
+
+    pub fn new(gpu: Arc<gpu::Context>, size: gpu::Extent) -> Self {
+        let surface_format = gpu.resize(Self::make_surface_config(size));
         let command_encoder = gpu.create_command_encoder(gpu::CommandEncoderDesc {
             name: "main",
             buffer_count: 2,
@@ -291,11 +298,7 @@ impl BladeRenderer {
 
     pub fn resize(&mut self, size: gpu::Extent) {
         self.wait_for_gpu();
-        self.gpu.resize(gpu::SurfaceConfig {
-            size,
-            usage: gpu::TextureUsage::TARGET,
-            frame_count: SURFACE_FRAME_COUNT,
-        });
+        self.gpu.resize(Self::make_surface_config(size));
         self.viewport_size = size;
     }
 
@@ -455,7 +458,7 @@ impl BladeRenderer {
                         sprites,
                     } => {
                         let tex_info = self.atlas.get_texture_info(texture_id);
-                        let instance_buf = self.instance_belt.alloc_data(sprites, &self.gpu);
+                        let instance_buf = self.instance_belt.alloc_data(&sprites, &self.gpu);
                         let mut encoder = pass.with(&self.pipelines.mono_sprites);
                         encoder.bind(
                             0,
@@ -473,7 +476,7 @@ impl BladeRenderer {
                         sprites,
                     } => {
                         let tex_info = self.atlas.get_texture_info(texture_id);
-                        let instance_buf = self.instance_belt.alloc_data(sprites, &self.gpu);
+                        let instance_buf = self.instance_belt.alloc_data(&sprites, &self.gpu);
                         let mut encoder = pass.with(&self.pipelines.poly_sprites);
                         encoder.bind(
                             0,

From 288013503755f0d44feff6a517169a2861b43f26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B1=B1=E9=A2=A8=E9=9C=B2?=
 <shirayama.kazatsuyu@gmail.com>
Date: Sun, 11 Feb 2024 15:05:52 +0900
Subject: [PATCH 372/372] Use try_from_bytes in handle_file_urls (#7652)

Reduce build error on Windows.

Release Notes:

- N/A
---
 crates/zed/src/open_listener.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/crates/zed/src/open_listener.rs b/crates/zed/src/open_listener.rs
index d3ccf753d1..d6fec52df8 100644
--- a/crates/zed/src/open_listener.rs
+++ b/crates/zed/src/open_listener.rs
@@ -11,15 +11,13 @@ use gpui::{AppContext, AsyncAppContext, Global};
 use itertools::Itertools;
 use language::{Bias, Point};
 use release_channel::parse_zed_link;
-use std::ffi::OsStr;
-use std::os::unix::prelude::OsStrExt;
 use std::path::Path;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
 use std::thread;
 use std::time::Duration;
 use std::{path::PathBuf, sync::atomic::AtomicBool};
-use util::paths::PathLikeWithPosition;
+use util::paths::{PathExt, PathLikeWithPosition};
 use util::ResultExt;
 use workspace::AppState;
 
@@ -129,9 +127,9 @@ impl OpenListener {
         let paths: Vec<_> = urls
             .iter()
             .flat_map(|url| url.strip_prefix("file://"))
-            .map(|url| {
+            .flat_map(|url| {
                 let decoded = urlencoding::decode_binary(url.as_bytes());
-                PathBuf::from(OsStr::from_bytes(decoded.as_ref()))
+                PathBuf::try_from_bytes(decoded.as_ref()).log_err()
             })
             .collect();