Rename zed2 -> zed

Co-authored-by: Mikayla <mikayla@zed.dev>

crates/zed/src/languages/c.rs

@@ -273,18 +273,19 @@ async fn get_cached_server_binary(container_dir: PathBuf) -> Option<LanguageServ
 
 #[cfg(test)]
 mod tests {
-    use gpui::TestAppContext;
+    use gpui::{Context, TestAppContext};
     use language::{language_settings::AllLanguageSettings, AutoindentMode, Buffer};
     use settings::SettingsStore;
     use std::num::NonZeroU32;
 
     #[gpui::test]
     async fn test_c_autoindent(cx: &mut TestAppContext) {
-        cx.foreground().set_block_on_ticks(usize::MAX..=usize::MAX);
+        // cx.executor().set_block_on_ticks(usize::MAX..=usize::MAX);
         cx.update(|cx| {
-            cx.set_global(SettingsStore::test(cx));
+            let test_settings = SettingsStore::test(cx);
+            cx.set_global(test_settings);
             language::init(cx);
-            cx.update_global::<SettingsStore, _, _>(|store, cx| {
+            cx.update_global::<SettingsStore, _>(|store, cx| {
                 store.update_user_settings::<AllLanguageSettings>(cx, |s| {
                     s.defaults.tab_size = NonZeroU32::new(2);
                 });
@@ -292,8 +293,9 @@ mod tests {
         });
         let language = crate::languages::language("c", tree_sitter_c::language(), None).await;
 
-        cx.add_model(|cx| {
-            let mut buffer = Buffer::new(0, cx.model_id() as u64, "").with_language(language, cx);
+        cx.new_model(|cx| {
+            let mut buffer =
+                Buffer::new(0, cx.entity_id().as_u64(), "").with_language(language, cx);
 
             // empty function
             buffer.edit([(0..0, "int main() {}")], None, cx);

crates/zed/src/languages/elixir.rs

@@ -6,7 +6,7 @@ pub use language::*;
 use lsp::{CompletionItemKind, LanguageServerBinary, SymbolKind};
 use schemars::JsonSchema;
 use serde_derive::{Deserialize, Serialize};
-use settings::Setting;
+use settings::Settings;
 use smol::fs::{self, File};
 use std::{
     any::Any,
@@ -46,7 +46,7 @@ pub struct ElixirSettingsContent {
     lsp: Option<ElixirLspSetting>,
 }
 
-impl Setting for ElixirSettings {
+impl Settings for ElixirSettings {
     const KEY: Option<&'static str> = Some("elixir");
 
     type FileContent = ElixirSettingsContent;
@@ -54,7 +54,7 @@ impl Setting for ElixirSettings {
     fn load(
         default_value: &Self::FileContent,
         user_values: &[&Self::FileContent],
-        _: &gpui::AppContext,
+        _: &mut gpui::AppContext,
     ) -> Result<Self>
     where
         Self: Sized,
@@ -85,7 +85,7 @@ impl LspAdapter for ElixirLspAdapter {
         const NOTIFICATION_MESSAGE: &str = "Could not run the elixir language server, `elixir-ls`, because `elixir` was not found.";
 
         let delegate = delegate.clone();
-        Some(cx.spawn(|mut cx| async move {
+        Some(cx.spawn(|cx| async move {
             let elixir_output = smol::process::Command::new("elixir")
                 .args(["--version"])
                 .output()
@@ -97,7 +97,7 @@ impl LspAdapter for ElixirLspAdapter {
                 {
                     cx.update(|cx| {
                         delegate.show_notification(NOTIFICATION_MESSAGE, cx);
-                    })
+                    })?
                 }
                 return Err(anyhow!("cannot run elixir-ls"));
             }

crates/zed/src/languages/elixir/embedding.scm

@@ -18,10 +18,10 @@
                     target: (identifier) @name)
                     operator: "when")
             ])
-        (#any-match? @name "^(def|defp|defdelegate|defguard|defguardp|defmacro|defmacrop|defn|defnp)$")) @item
+        (#match? @name "^(def|defp|defdelegate|defguard|defguardp|defmacro|defmacrop|defn|defnp)$")) @item
         )
 
     (call
         target: (identifier) @name
         (arguments (alias) @name)
-        (#any-match? @name "^(defmodule|defprotocol)$")) @item
+        (#match? @name "^(defmodule|defprotocol)$")) @item

crates/zed/src/languages/go.rs

@@ -67,7 +67,7 @@ impl super::LspAdapter for GoLspAdapter {
             "Could not install the Go language server `gopls`, because `go` was not found.";
 
         let delegate = delegate.clone();
-        Some(cx.spawn(|mut cx| async move {
+        Some(cx.spawn(|cx| async move {
             let install_output = process::Command::new("go").args(["version"]).output().await;
             if install_output.is_err() {
                 if DID_SHOW_NOTIFICATION
@@ -76,7 +76,7 @@ impl super::LspAdapter for GoLspAdapter {
                 {
                     cx.update(|cx| {
                         delegate.show_notification(NOTIFICATION_MESSAGE, cx);
-                    })
+                    })?
                 }
                 return Err(anyhow!("cannot install gopls"));
             }
@@ -372,7 +372,7 @@ fn adjust_runs(
 mod tests {
     use super::*;
     use crate::languages::language;
-    use gpui::color::Color;
+    use gpui::Hsla;
     use theme::SyntaxTheme;
 
     #[gpui::test]
@@ -384,12 +384,12 @@ mod tests {
         )
         .await;
 
-        let theme = SyntaxTheme::new(vec![
-            ("type".into(), Color::green().into()),
-            ("keyword".into(), Color::blue().into()),
-            ("function".into(), Color::red().into()),
-            ("number".into(), Color::yellow().into()),
-            ("property".into(), Color::white().into()),
+        let theme = SyntaxTheme::new_test([
+            ("type", Hsla::default()),
+            ("keyword", Hsla::default()),
+            ("function", Hsla::default()),
+            ("number", Hsla::default()),
+            ("property", Hsla::default()),
         ]);
         language.set_theme(&theme);
 

crates/zed/src/languages/json.rs

@@ -108,7 +108,7 @@ impl LspAdapter for JsonLspAdapter {
         _workspace_root: &Path,
         cx: &mut AppContext,
     ) -> BoxFuture<'static, serde_json::Value> {
-        let action_names = cx.all_action_names().collect::<Vec<_>>();
+        let action_names = cx.all_action_names();
         let staff_mode = cx.is_staff();
         let language_names = &self.languages.language_names();
         let settings_schema = cx.global::<SettingsStore>().json_schema(

crates/zed/src/languages/language_plugin.rs

@@ -3,8 +3,8 @@ use async_trait::async_trait;
 use collections::HashMap;
 use futures::lock::Mutex;
 use gpui::executor::Background;
-use language::{LanguageServerName, LspAdapter, LspAdapterDelegate};
-use lsp::LanguageServerBinary;
+use language2::{LanguageServerName, LspAdapter, LspAdapterDelegate};
+use lsp2::LanguageServerBinary;
 use plugin_runtime::{Plugin, PluginBinary, PluginBuilder, WasiFn};
 use std::{any::Any, path::PathBuf, sync::Arc};
 use util::ResultExt;

crates/zed/src/languages/nu.rs

@@ -1,8 +1,8 @@
 use anyhow::{anyhow, Result};
 use async_trait::async_trait;
-use language::{CodeLabel, Language, LanguageServerName, LspAdapter, LspAdapterDelegate};
+use language::{LanguageServerName, LspAdapter, LspAdapterDelegate};
 use lsp::LanguageServerBinary;
-use std::{any::Any, path::PathBuf, sync::Arc};
+use std::{any::Any, path::PathBuf};
 
 pub struct NuLanguageServer;
 
@@ -52,30 +52,4 @@ impl LspAdapter for NuLanguageServer {
     async fn installation_test_binary(&self, _: PathBuf) -> Option<LanguageServerBinary> {
         None
     }
-
-    async fn label_for_completion(
-        &self,
-        completion: &lsp::CompletionItem,
-        language: &Arc<Language>,
-    ) -> Option<CodeLabel> {
-        return Some(CodeLabel {
-            runs: language
-                .highlight_text(&completion.label.clone().into(), 0..completion.label.len()),
-            text: completion.label.clone(),
-            filter_range: 0..completion.label.len(),
-        });
-    }
-
-    async fn label_for_symbol(
-        &self,
-        name: &str,
-        _: lsp::SymbolKind,
-        language: &Arc<Language>,
-    ) -> Option<CodeLabel> {
-        Some(CodeLabel {
-            runs: language.highlight_text(&name.into(), 0..name.len()),
-            text: name.to_string(),
-            filter_range: 0..name.len(),
-        })
-    }
 }

crates/zed/src/languages/python.rs

@@ -177,28 +177,30 @@ async fn get_cached_server_binary(
 
 #[cfg(test)]
 mod tests {
-    use gpui::{ModelContext, TestAppContext};
+    use gpui::{Context, ModelContext, TestAppContext};
     use language::{language_settings::AllLanguageSettings, AutoindentMode, Buffer};
     use settings::SettingsStore;
     use std::num::NonZeroU32;
 
     #[gpui::test]
     async fn test_python_autoindent(cx: &mut TestAppContext) {
-        cx.foreground().set_block_on_ticks(usize::MAX..=usize::MAX);
+        // cx.executor().set_block_on_ticks(usize::MAX..=usize::MAX);
         let language =
             crate::languages::language("python", tree_sitter_python::language(), None).await;
         cx.update(|cx| {
-            cx.set_global(SettingsStore::test(cx));
+            let test_settings = SettingsStore::test(cx);
+            cx.set_global(test_settings);
             language::init(cx);
-            cx.update_global::<SettingsStore, _, _>(|store, cx| {
+            cx.update_global::<SettingsStore, _>(|store, cx| {
                 store.update_user_settings::<AllLanguageSettings>(cx, |s| {
                     s.defaults.tab_size = NonZeroU32::new(2);
                 });
             });
         });
 
-        cx.add_model(|cx| {
-            let mut buffer = Buffer::new(0, cx.model_id() as u64, "").with_language(language, cx);
+        cx.new_model(|cx| {
+            let mut buffer =
+                Buffer::new(0, cx.entity_id().as_u64(), "").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);

crates/zed/src/languages/rust.rs

@@ -294,7 +294,7 @@ mod tests {
 
     use super::*;
     use crate::languages::language;
-    use gpui::{color::Color, TestAppContext};
+    use gpui::{Context, Hsla, TestAppContext};
     use language::language_settings::AllLanguageSettings;
     use settings::SettingsStore;
     use theme::SyntaxTheme;
@@ -349,11 +349,11 @@ mod tests {
         )
         .await;
         let grammar = language.grammar().unwrap();
-        let theme = SyntaxTheme::new(vec![
-            ("type".into(), Color::green().into()),
-            ("keyword".into(), Color::blue().into()),
-            ("function".into(), Color::red().into()),
-            ("property".into(), Color::white().into()),
+        let theme = SyntaxTheme::new_test([
+            ("type", Hsla::default()),
+            ("keyword", Hsla::default()),
+            ("function", Hsla::default()),
+            ("property", Hsla::default()),
         ]);
 
         language.set_theme(&theme);
@@ -456,11 +456,11 @@ mod tests {
         )
         .await;
         let grammar = language.grammar().unwrap();
-        let theme = SyntaxTheme::new(vec![
-            ("type".into(), Color::green().into()),
-            ("keyword".into(), Color::blue().into()),
-            ("function".into(), Color::red().into()),
-            ("property".into(), Color::white().into()),
+        let theme = SyntaxTheme::new_test([
+            ("type", Hsla::default()),
+            ("keyword", Hsla::default()),
+            ("function", Hsla::default()),
+            ("property", Hsla::default()),
         ]);
 
         language.set_theme(&theme);
@@ -494,11 +494,12 @@ mod tests {
 
     #[gpui::test]
     async fn test_rust_autoindent(cx: &mut TestAppContext) {
-        cx.foreground().set_block_on_ticks(usize::MAX..=usize::MAX);
+        // cx.executor().set_block_on_ticks(usize::MAX..=usize::MAX);
         cx.update(|cx| {
-            cx.set_global(SettingsStore::test(cx));
+            let test_settings = SettingsStore::test(cx);
+            cx.set_global(test_settings);
             language::init(cx);
-            cx.update_global::<SettingsStore, _, _>(|store, cx| {
+            cx.update_global::<SettingsStore, _>(|store, cx| {
                 store.update_user_settings::<AllLanguageSettings>(cx, |s| {
                     s.defaults.tab_size = NonZeroU32::new(2);
                 });
@@ -507,8 +508,9 @@ mod tests {
 
         let language = crate::languages::language("rust", tree_sitter_rust::language(), None).await;
 
-        cx.add_model(|cx| {
-            let mut buffer = Buffer::new(0, cx.model_id() as u64, "").with_language(language, cx);
+        cx.new_model(|cx| {
+            let mut buffer =
+                Buffer::new(0, cx.entity_id().as_u64(), "").with_language(language, cx);
 
             // indent between braces
             buffer.set_text("fn a() {}", cx);

crates/zed/src/languages/typescript.rs

@@ -351,7 +351,7 @@ async fn get_cached_eslint_server_binary(
 
 #[cfg(test)]
 mod tests {
-    use gpui::TestAppContext;
+    use gpui::{Context, TestAppContext};
     use unindent::Unindent;
 
     #[gpui::test]
@@ -378,10 +378,10 @@ mod tests {
         "#
         .unindent();
 
-        let buffer = cx.add_model(|cx| {
-            language::Buffer::new(0, cx.model_id() as u64, text).with_language(language, cx)
+        let buffer = cx.new_model(|cx| {
+            language::Buffer::new(0, cx.entity_id().as_u64(), text).with_language(language, cx)
         });
-        let outline = buffer.read_with(cx, |buffer, _| buffer.snapshot().outline(None).unwrap());
+        let outline = buffer.update(cx, |buffer, _| buffer.snapshot().outline(None).unwrap());
         assert_eq!(
             outline
                 .items

crates/zed/src/languages/uiua/config.toml

@@ -3,7 +3,7 @@ path_suffixes = ["ua"]
 line_comment = "# "
 autoclose_before = ")]}\""
 brackets = [
-    { start = "{", end = "}", close = true, newline = false },
+    { start = "{", end = "}", close = true, newline = false},
     { start = "[", end = "]", close = true, newline = false },
     { start = "(", end = ")", close = true, newline = false },
     { start = "\"", end = "\"", close = true, newline = false, not_in = ["string"] },