diff --git a/Cargo.lock b/Cargo.lock
index 84fd279fa7..d6490337da 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -126,18 +126,17 @@ dependencies = [
[[package]]
name = "alacritty_config"
version = "0.1.2-dev"
-source = "git+https://github.com/alacritty/alacritty?rev=7b9f32300ee0a249c0872302c97635b460e45ba5#7b9f32300ee0a249c0872302c97635b460e45ba5"
+source = "git+https://github.com/zed-industries/alacritty?rev=33306142195b354ef3485ca2b1d8a85dfc6605ca#33306142195b354ef3485ca2b1d8a85dfc6605ca"
dependencies = [
"log",
"serde",
"toml 0.7.6",
- "winit",
]
[[package]]
name = "alacritty_config_derive"
version = "0.2.2-dev"
-source = "git+https://github.com/alacritty/alacritty?rev=7b9f32300ee0a249c0872302c97635b460e45ba5#7b9f32300ee0a249c0872302c97635b460e45ba5"
+source = "git+https://github.com/zed-industries/alacritty?rev=33306142195b354ef3485ca2b1d8a85dfc6605ca#33306142195b354ef3485ca2b1d8a85dfc6605ca"
dependencies = [
"proc-macro2",
"quote",
@@ -147,7 +146,7 @@ dependencies = [
[[package]]
name = "alacritty_terminal"
version = "0.20.0-dev"
-source = "git+https://github.com/alacritty/alacritty?rev=7b9f32300ee0a249c0872302c97635b460e45ba5#7b9f32300ee0a249c0872302c97635b460e45ba5"
+source = "git+https://github.com/zed-industries/alacritty?rev=33306142195b354ef3485ca2b1d8a85dfc6605ca#33306142195b354ef3485ca2b1d8a85dfc6605ca"
dependencies = [
"alacritty_config",
"alacritty_config_derive",
@@ -213,30 +212,6 @@ version = "0.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec8ad6edb4840b78c5c3d88de606b22252d552b55f3a4699fbb10fc070ec3049"
-[[package]]
-name = "android-activity"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0"
-dependencies = [
- "android-properties",
- "bitflags 1.3.2",
- "cc",
- "jni-sys",
- "libc",
- "log",
- "ndk",
- "ndk-context",
- "ndk-sys",
- "num_enum 0.6.1",
-]
-
-[[package]]
-name = "android-properties"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
-
[[package]]
name = "android-tzdata"
version = "0.1.1"
@@ -926,25 +901,6 @@ dependencies = [
"generic-array",
]
-[[package]]
-name = "block-sys"
-version = "0.1.0-beta.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146"
-dependencies = [
- "objc-sys",
-]
-
-[[package]]
-name = "block2"
-version = "0.2.0-alpha.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42"
-dependencies = [
- "block-sys",
- "objc2-encode",
-]
-
[[package]]
name = "blocking"
version = "1.3.1"
@@ -1126,20 +1082,6 @@ dependencies = [
"util",
]
-[[package]]
-name = "calloop"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52e0d00eb1ea24371a97d2da6201c6747a633dc6dc1988ef503403b4c59504a8"
-dependencies = [
- "bitflags 1.3.2",
- "log",
- "nix 0.25.1",
- "slotmap",
- "thiserror",
- "vec_map",
-]
-
[[package]]
name = "cap-fs-ext"
version = "0.24.4"
@@ -1248,12 +1190,6 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-[[package]]
-name = "cfg_aliases"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
-
[[package]]
name = "chrono"
version = "0.4.26"
@@ -1376,12 +1312,6 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
-[[package]]
-name = "claxon"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688"
-
[[package]]
name = "cli"
version = "0.1.0"
@@ -1479,7 +1409,7 @@ dependencies = [
[[package]]
name = "collab"
-version = "0.16.0"
+version = "0.17.0"
dependencies = [
"anyhow",
"async-tungstenite",
@@ -1552,6 +1482,7 @@ dependencies = [
"clock",
"collections",
"context_menu",
+ "db",
"editor",
"feedback",
"futures 0.3.28",
@@ -1563,9 +1494,11 @@ dependencies = [
"postage",
"project",
"recent_projects",
+ "schemars",
"serde",
"serde_derive",
"settings",
+ "staff_mode",
"theme",
"theme_selector",
"util",
@@ -2070,15 +2003,6 @@ dependencies = [
"winapi 0.3.9",
]
-[[package]]
-name = "cursor-icon"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "740bb192a8e2d1350119916954f4409ee7f62f149b536911eeb78ba5a20526bf"
-dependencies = [
- "serde",
-]
-
[[package]]
name = "dashmap"
version = "5.5.0"
@@ -2294,12 +2218,6 @@ dependencies = [
"winapi 0.3.9",
]
-[[package]]
-name = "dispatch"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
-
[[package]]
name = "dlib"
version = "0.5.2"
@@ -3183,7 +3101,6 @@ dependencies = [
name = "gpui_macros"
version = "0.1.0"
dependencies = [
- "gpui",
"lazy_static",
"proc-macro2",
"quote",
@@ -3985,17 +3902,6 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
-[[package]]
-name = "lewton"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030"
-dependencies = [
- "byteorder",
- "ogg",
- "tinyvec",
-]
-
[[package]]
name = "libc"
version = "0.2.147"
@@ -4549,7 +4455,7 @@ dependencies = [
"bitflags 1.3.2",
"jni-sys",
"ndk-sys",
- "num_enum 0.5.11",
+ "num_enum",
"raw-window-handle",
"thiserror",
]
@@ -4591,19 +4497,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "nix"
-version = "0.25.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
-dependencies = [
- "autocfg",
- "bitflags 1.3.2",
- "cfg-if 1.0.0",
- "libc",
- "memoffset 0.6.5",
-]
-
[[package]]
name = "nix"
version = "0.26.2"
@@ -4769,16 +4662,7 @@ version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
dependencies = [
- "num_enum_derive 0.5.11",
-]
-
-[[package]]
-name = "num_enum"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
-dependencies = [
- "num_enum_derive 0.6.1",
+ "num_enum_derive",
]
[[package]]
@@ -4793,18 +4677,6 @@ dependencies = [
"syn 1.0.109",
]
-[[package]]
-name = "num_enum_derive"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
-dependencies = [
- "proc-macro-crate 1.3.1",
- "proc-macro2",
- "quote",
- "syn 2.0.28",
-]
-
[[package]]
name = "nvim-rs"
version = "0.5.0"
@@ -4830,32 +4702,6 @@ dependencies = [
"objc_exception",
]
-[[package]]
-name = "objc-sys"
-version = "0.2.0-beta.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7"
-
-[[package]]
-name = "objc2"
-version = "0.3.0-beta.3.patch-leaks.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468"
-dependencies = [
- "block2",
- "objc-sys",
- "objc2-encode",
-]
-
-[[package]]
-name = "objc2-encode"
-version = "2.0.0-pre.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512"
-dependencies = [
- "objc-sys",
-]
-
[[package]]
name = "objc_exception"
version = "0.1.2"
@@ -4909,15 +4755,6 @@ dependencies = [
"cc",
]
-[[package]]
-name = "ogg"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e"
-dependencies = [
- "byteorder",
-]
-
[[package]]
name = "once_cell"
version = "1.18.0"
@@ -4974,15 +4811,6 @@ dependencies = [
"vcpkg",
]
-[[package]]
-name = "orbclient"
-version = "0.3.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "221d488cd70617f1bd599ed8ceb659df2147d9393717954d82a0f5e8032a6ab1"
-dependencies = [
- "redox_syscall 0.3.5",
-]
-
[[package]]
name = "ordered-float"
version = "2.10.0"
@@ -5757,6 +5585,17 @@ dependencies = [
"memchr",
]
+[[package]]
+name = "quick_action_bar"
+version = "0.1.0"
+dependencies = [
+ "editor",
+ "gpui",
+ "search",
+ "theme",
+ "workspace",
+]
+
[[package]]
name = "quote"
version = "1.0.32"
@@ -6198,11 +6037,8 @@ version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdf1d4dea18dff2e9eb6dca123724f8b60ef44ad74a9ad283cdfe025df7e73fa"
dependencies = [
- "claxon",
"cpal",
"hound",
- "lewton",
- "symphonia",
]
[[package]]
@@ -7201,15 +7037,6 @@ dependencies = [
"pin-project-lite 0.1.12",
]
-[[package]]
-name = "smol_str"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c"
-dependencies = [
- "serde",
-]
-
[[package]]
name = "snippet"
version = "0.1.0"
@@ -7536,56 +7363,6 @@ dependencies = [
"siphasher",
]
-[[package]]
-name = "symphonia"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62e48dba70095f265fdb269b99619b95d04c89e619538138383e63310b14d941"
-dependencies = [
- "lazy_static",
- "symphonia-bundle-mp3",
- "symphonia-core",
- "symphonia-metadata",
-]
-
-[[package]]
-name = "symphonia-bundle-mp3"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f31d7fece546f1e6973011a9eceae948133bbd18fd3d52f6073b1e38ae6368a"
-dependencies = [
- "bitflags 1.3.2",
- "lazy_static",
- "log",
- "symphonia-core",
- "symphonia-metadata",
-]
-
-[[package]]
-name = "symphonia-core"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c73eb88fee79705268cc7b742c7bc93a7b76e092ab751d0833866970754142"
-dependencies = [
- "arrayvec 0.7.4",
- "bitflags 1.3.2",
- "bytemuck",
- "lazy_static",
- "log",
-]
-
-[[package]]
-name = "symphonia-metadata"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89c3e1937e31d0e068bbe829f66b2f2bfaa28d056365279e0ef897172c3320c0"
-dependencies = [
- "encoding_rs",
- "lazy_static",
- "log",
- "symphonia-core",
-]
-
[[package]]
name = "syn"
version = "1.0.109"
@@ -8345,7 +8122,7 @@ dependencies = [
[[package]]
name = "tree-sitter"
version = "0.20.10"
-source = "git+https://github.com/tree-sitter/tree-sitter?rev=1c65ca24bc9a734ab70115188f465e12eecf224e#1c65ca24bc9a734ab70115188f465e12eecf224e"
+source = "git+https://github.com/tree-sitter/tree-sitter?rev=35a6052fbcafc5e5fc0f9415b8652be7dcaf7222#35a6052fbcafc5e5fc0f9415b8652be7dcaf7222"
dependencies = [
"cc",
"regex",
@@ -8907,12 +8684,6 @@ dependencies = [
"workspace",
]
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
[[package]]
name = "version_check"
version = "0.9.4"
@@ -9377,17 +9148,6 @@ dependencies = [
"wasm-bindgen",
]
-[[package]]
-name = "web-time"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19353897b48e2c4d849a2d73cb0aeb16dc2be4e00c565abfc11eb65a806e47de"
-dependencies = [
- "js-sys",
- "once_cell",
- "wasm-bindgen",
-]
-
[[package]]
name = "webpki"
version = "0.21.4"
@@ -9703,42 +9463,6 @@ version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
-[[package]]
-name = "winit"
-version = "0.29.0-beta.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f1afaf8490cc3f1309520ebb53a4cd3fc3642c7df8064a4b074bb9867998d44"
-dependencies = [
- "android-activity",
- "atomic-waker",
- "bitflags 2.3.3",
- "calloop",
- "cfg_aliases",
- "core-foundation",
- "core-graphics",
- "cursor-icon",
- "dispatch",
- "js-sys",
- "libc",
- "log",
- "ndk",
- "ndk-sys",
- "objc2",
- "once_cell",
- "orbclient",
- "raw-window-handle",
- "redox_syscall 0.3.5",
- "serde",
- "smol_str",
- "unicode-segmentation",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "web-time",
- "windows-sys",
- "xkbcommon-dl",
-]
-
[[package]]
name = "winnow"
version = "0.5.2"
@@ -9856,25 +9580,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "xkbcommon-dl"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6924668544c48c0133152e7eec86d644a056ca3d09275eb8d5cdb9855f9d8699"
-dependencies = [
- "bitflags 2.3.3",
- "dlib",
- "log",
- "once_cell",
- "xkeysym",
-]
-
-[[package]]
-name = "xkeysym"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621"
-
[[package]]
name = "xmlparser"
version = "0.13.5"
@@ -9927,7 +9632,7 @@ dependencies = [
[[package]]
name = "zed"
-version = "0.100.0"
+version = "0.101.0"
dependencies = [
"activity_indicator",
"ai",
@@ -9986,6 +9691,7 @@ dependencies = [
"project",
"project_panel",
"project_symbols",
+ "quick_action_bar",
"rand 0.8.5",
"recent_projects",
"regex",
diff --git a/Cargo.toml b/Cargo.toml
index 3cc697fb03..a60b4eb610 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -140,7 +140,7 @@ tree-sitter-lua = "0.0.14"
tree-sitter-nix = { git = "https://github.com/nix-community/tree-sitter-nix", rev = "66e3e9ce9180ae08fc57372061006ef83f0abde7" }
[patch.crates-io]
-tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "1c65ca24bc9a734ab70115188f465e12eecf224e" }
+tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "35a6052fbcafc5e5fc0f9415b8652be7dcaf7222" }
async-task = { git = "https://github.com/zed-industries/async-task", rev = "341b57d6de98cdfd7b418567b8de2022ca993a6e" }
# TODO - Remove when a version is released with this PR: https://github.com/servo/core-foundation-rs/pull/457
diff --git a/assets/icons/ai.svg b/assets/icons/ai.svg
new file mode 100644
index 0000000000..5b3faaa9cc
--- /dev/null
+++ b/assets/icons/ai.svg
@@ -0,0 +1,23 @@
+
diff --git a/assets/icons/arrow_left.svg b/assets/icons/arrow_left.svg
new file mode 100644
index 0000000000..186c9c7457
--- /dev/null
+++ b/assets/icons/arrow_left.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/arrow_right.svg b/assets/icons/arrow_right.svg
new file mode 100644
index 0000000000..7bae7f4801
--- /dev/null
+++ b/assets/icons/arrow_right.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/case_insensitive_12.svg b/assets/icons/case_insensitive_12.svg
new file mode 100644
index 0000000000..8c943e7509
--- /dev/null
+++ b/assets/icons/case_insensitive_12.svg
@@ -0,0 +1,8 @@
+
+
diff --git a/assets/icons/channel_hash.svg b/assets/icons/channel_hash.svg
new file mode 100644
index 0000000000..edd0462678
--- /dev/null
+++ b/assets/icons/channel_hash.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/icons/check.svg b/assets/icons/check.svg
new file mode 100644
index 0000000000..77b180892c
--- /dev/null
+++ b/assets/icons/check.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/check_circle.svg b/assets/icons/check_circle.svg
new file mode 100644
index 0000000000..85ba2e1f37
--- /dev/null
+++ b/assets/icons/check_circle.svg
@@ -0,0 +1,4 @@
+
diff --git a/assets/icons/chevron_down.svg b/assets/icons/chevron_down.svg
new file mode 100644
index 0000000000..b971555cfa
--- /dev/null
+++ b/assets/icons/chevron_down.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/chevron_left.svg b/assets/icons/chevron_left.svg
new file mode 100644
index 0000000000..8e61beed5d
--- /dev/null
+++ b/assets/icons/chevron_left.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/chevron_right.svg b/assets/icons/chevron_right.svg
new file mode 100644
index 0000000000..fcd9d83fc2
--- /dev/null
+++ b/assets/icons/chevron_right.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/chevron_up.svg b/assets/icons/chevron_up.svg
new file mode 100644
index 0000000000..171cdd61c0
--- /dev/null
+++ b/assets/icons/chevron_up.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/conversations.svg b/assets/icons/conversations.svg
new file mode 100644
index 0000000000..fe8ad03dda
--- /dev/null
+++ b/assets/icons/conversations.svg
@@ -0,0 +1,4 @@
+
diff --git a/assets/icons/copilot.svg b/assets/icons/copilot.svg
new file mode 100644
index 0000000000..06dbf178ae
--- /dev/null
+++ b/assets/icons/copilot.svg
@@ -0,0 +1,9 @@
+
diff --git a/assets/icons/copy.svg b/assets/icons/copy.svg
new file mode 100644
index 0000000000..4aa44979c3
--- /dev/null
+++ b/assets/icons/copy.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/icons/ellipsis.svg b/assets/icons/ellipsis.svg
new file mode 100644
index 0000000000..1858c65520
--- /dev/null
+++ b/assets/icons/ellipsis.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/icons/error.svg b/assets/icons/error.svg
new file mode 100644
index 0000000000..82b9401d08
--- /dev/null
+++ b/assets/icons/error.svg
@@ -0,0 +1,4 @@
+
diff --git a/assets/icons/exit.svg b/assets/icons/exit.svg
new file mode 100644
index 0000000000..7e45535773
--- /dev/null
+++ b/assets/icons/exit.svg
@@ -0,0 +1,4 @@
+
diff --git a/assets/icons/feedback.svg b/assets/icons/feedback.svg
new file mode 100644
index 0000000000..2703f70119
--- /dev/null
+++ b/assets/icons/feedback.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/icons/file_icons/elixir.svg b/assets/icons/file_icons/elixir.svg
new file mode 100644
index 0000000000..15a1004328
--- /dev/null
+++ b/assets/icons/file_icons/elixir.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/file_icons/file_types.json b/assets/icons/file_icons/file_types.json
index 9ea75d0730..a65155d4eb 100644
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -21,23 +21,27 @@
"dll": "storage",
"doc": "document",
"docx": "document",
+ "eex": "elixir",
"eslintrc": "eslint",
"eslintrc.js": "eslint",
"eslintrc.json": "eslint",
+ "ex": "elixir",
+ "exs": "elixir",
+ "fish": "terminal",
+ "flac": "audio",
"fmp": "storage",
"fp7": "storage",
- "flac": "audio",
- "fish": "terminal",
"frm": "storage",
"gdb": "storage",
+ "gif": "image",
"gitattributes": "vcs",
"gitignore": "vcs",
"gitmodules": "vcs",
- "gif": "image",
"go": "code",
"h": "code",
"handlebars": "code",
"hbs": "template",
+ "heex": "elixir",
"htm": "template",
"html": "template",
"ib": "storage",
@@ -51,16 +55,16 @@
"ldf": "storage",
"lock": "lock",
"log": "log",
- "mdb": "storage",
"md": "document",
+ "mdb": "storage",
"mdf": "storage",
"mdx": "document",
"mp3": "audio",
"mp4": "video",
"myd": "storage",
"myi": "storage",
- "ods": "document",
"odp": "document",
+ "ods": "document",
"odt": "document",
"ogg": "video",
"pdb": "storage",
@@ -74,24 +78,24 @@
"profile": "terminal",
"ps1": "terminal",
"psd": "image",
- "py": "code",
+ "py": "python",
"rb": "code",
"rkt": "code",
"rs": "rust",
"rtf": "document",
"sav": "storage",
"scm": "code",
+ "sdf": "storage",
"sh": "terminal",
"sqlite": "storage",
- "sdf": "storage",
"svelte": "template",
"svg": "image",
"swift": "code",
- "ts": "typescript",
- "tsx": "code",
"tiff": "image",
"toml": "toml",
+ "ts": "typescript",
"tsv": "storage",
+ "tsx": "code",
"txt": "document",
"wav": "audio",
"webm": "video",
@@ -103,9 +107,9 @@
"zlogin": "terminal",
"zsh": "terminal",
"zsh_aliases": "terminal",
- "zshenv": "terminal",
"zsh_histfile": "terminal",
"zsh_profile": "terminal",
+ "zshenv": "terminal",
"zshrc": "terminal"
},
"types": {
@@ -127,6 +131,9 @@
"document": {
"icon": "icons/file_icons/book.svg"
},
+ "elixir": {
+ "icon": "icons/file_icons/elixir.svg"
+ },
"eslint": {
"icon": "icons/file_icons/eslint.svg"
},
@@ -145,9 +152,15 @@
"log": {
"icon": "icons/file_icons/info.svg"
},
+ "phoenix": {
+ "icon": "icons/file_icons/phoenix.svg"
+ },
"prettier": {
"icon": "icons/file_icons/prettier.svg"
},
+ "python": {
+ "icon": "icons/file_icons/python.svg"
+ },
"rust": {
"icon": "icons/file_icons/rust.svg"
},
diff --git a/assets/icons/file_icons/phoenix.svg b/assets/icons/file_icons/phoenix.svg
new file mode 100644
index 0000000000..424b753806
--- /dev/null
+++ b/assets/icons/file_icons/phoenix.svg
@@ -0,0 +1,4 @@
+
diff --git a/assets/icons/file_icons/python.svg b/assets/icons/file_icons/python.svg
new file mode 100644
index 0000000000..dbc8565f90
--- /dev/null
+++ b/assets/icons/file_icons/python.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/icons/filter.svg b/assets/icons/filter.svg
new file mode 100644
index 0000000000..80ce656f57
--- /dev/null
+++ b/assets/icons/filter.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/filter_12.svg b/assets/icons/filter_12.svg
new file mode 100644
index 0000000000..9c1ad5ba5c
--- /dev/null
+++ b/assets/icons/filter_12.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/filter_14.svg b/assets/icons/filter_14.svg
new file mode 100644
index 0000000000..379be15b51
--- /dev/null
+++ b/assets/icons/filter_14.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/assets/icons/hash.svg b/assets/icons/hash.svg
new file mode 100644
index 0000000000..f685245ed3
--- /dev/null
+++ b/assets/icons/hash.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/icons/html.svg b/assets/icons/html.svg
new file mode 100644
index 0000000000..1e676fe313
--- /dev/null
+++ b/assets/icons/html.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/icons/inlay_hint.svg b/assets/icons/inlay_hint.svg
new file mode 100644
index 0000000000..c8e6bb2d36
--- /dev/null
+++ b/assets/icons/inlay_hint.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/icons/kebab.svg b/assets/icons/kebab.svg
new file mode 100644
index 0000000000..1858c65520
--- /dev/null
+++ b/assets/icons/kebab.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/icons/lock.svg b/assets/icons/lock.svg
new file mode 100644
index 0000000000..652f45a7e8
--- /dev/null
+++ b/assets/icons/lock.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/icons/magnifying_glass.svg b/assets/icons/magnifying_glass.svg
new file mode 100644
index 0000000000..0b539adb6c
--- /dev/null
+++ b/assets/icons/magnifying_glass.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/match_case.svg b/assets/icons/match_case.svg
new file mode 100644
index 0000000000..82f4529c1b
--- /dev/null
+++ b/assets/icons/match_case.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/icons/match_word.svg b/assets/icons/match_word.svg
new file mode 100644
index 0000000000..69ba8eb9e6
--- /dev/null
+++ b/assets/icons/match_word.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/icons/maximize.svg b/assets/icons/maximize.svg
new file mode 100644
index 0000000000..4dc7755714
--- /dev/null
+++ b/assets/icons/maximize.svg
@@ -0,0 +1,4 @@
+
diff --git a/assets/icons/microphone.svg b/assets/icons/microphone.svg
new file mode 100644
index 0000000000..8974fd939d
--- /dev/null
+++ b/assets/icons/microphone.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/icons/minimize.svg b/assets/icons/minimize.svg
new file mode 100644
index 0000000000..d8941ee1f0
--- /dev/null
+++ b/assets/icons/minimize.svg
@@ -0,0 +1,4 @@
+
diff --git a/assets/icons/plus.svg b/assets/icons/plus.svg
new file mode 100644
index 0000000000..a54dd0ad66
--- /dev/null
+++ b/assets/icons/plus.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/icons/project.svg b/assets/icons/project.svg
new file mode 100644
index 0000000000..525109db4c
--- /dev/null
+++ b/assets/icons/project.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/icons/replace.svg b/assets/icons/replace.svg
new file mode 100644
index 0000000000..af10921891
--- /dev/null
+++ b/assets/icons/replace.svg
@@ -0,0 +1,11 @@
+
diff --git a/assets/icons/replace_all.svg b/assets/icons/replace_all.svg
new file mode 100644
index 0000000000..4838e82242
--- /dev/null
+++ b/assets/icons/replace_all.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/icons/replace_next.svg b/assets/icons/replace_next.svg
new file mode 100644
index 0000000000..ba751411af
--- /dev/null
+++ b/assets/icons/replace_next.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/icons/screen.svg b/assets/icons/screen.svg
new file mode 100644
index 0000000000..49e097b023
--- /dev/null
+++ b/assets/icons/screen.svg
@@ -0,0 +1,4 @@
+
diff --git a/assets/icons/split.svg b/assets/icons/split.svg
new file mode 100644
index 0000000000..4c131466c2
--- /dev/null
+++ b/assets/icons/split.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/icons/success.svg b/assets/icons/success.svg
new file mode 100644
index 0000000000..85450cdc43
--- /dev/null
+++ b/assets/icons/success.svg
@@ -0,0 +1,4 @@
+
diff --git a/assets/icons/terminal.svg b/assets/icons/terminal.svg
new file mode 100644
index 0000000000..15dd705b0b
--- /dev/null
+++ b/assets/icons/terminal.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/icons/warning.svg b/assets/icons/warning.svg
new file mode 100644
index 0000000000..6b3d0fd41e
--- /dev/null
+++ b/assets/icons/warning.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/icons/word_search_12.svg b/assets/icons/word_search_12.svg
new file mode 100644
index 0000000000..4cf6401fd2
--- /dev/null
+++ b/assets/icons/word_search_12.svg
@@ -0,0 +1,8 @@
+
+
diff --git a/assets/icons/word_search_14.svg b/assets/icons/word_search_14.svg
new file mode 100644
index 0000000000..adb4976bcc
--- /dev/null
+++ b/assets/icons/word_search_14.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/assets/icons/x.svg b/assets/icons/x.svg
new file mode 100644
index 0000000000..31c5aa31a6
--- /dev/null
+++ b/assets/icons/x.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/keymaps/default.json b/assets/keymaps/default.json
index 38ec8ffb40..1bd973e83b 100644
--- a/assets/keymaps/default.json
+++ b/assets/keymaps/default.json
@@ -13,6 +13,7 @@
"cmd-up": "menu::SelectFirst",
"cmd-down": "menu::SelectLast",
"enter": "menu::Confirm",
+ "ctrl-enter": "menu::ShowContextMenu",
"cmd-enter": "menu::SecondaryConfirm",
"escape": "menu::Cancel",
"ctrl-c": "menu::Cancel",
@@ -172,6 +173,7 @@
"context": "Editor && mode == full",
"bindings": {
"enter": "editor::Newline",
+ "shift-enter": "editor::Newline",
"cmd-shift-enter": "editor::NewlineAbove",
"cmd-enter": "editor::NewlineBelow",
"alt-z": "editor::ToggleSoftWrap",
@@ -224,7 +226,8 @@
"tab": "buffer_search::FocusEditor",
"enter": "search::SelectNextMatch",
"shift-enter": "search::SelectPrevMatch",
- "alt-enter": "search::SelectAllMatches"
+ "alt-enter": "search::SelectAllMatches",
+ "alt-tab": "search::CycleMode"
}
},
{
@@ -237,7 +240,8 @@
{
"context": "ProjectSearchBar",
"bindings": {
- "escape": "project_search::ToggleFocus"
+ "escape": "project_search::ToggleFocus",
+ "alt-tab": "search::CycleMode"
}
},
{
@@ -250,7 +254,8 @@
{
"context": "ProjectSearchView",
"bindings": {
- "escape": "project_search::ToggleFocus"
+ "escape": "project_search::ToggleFocus",
+ "alt-tab": "search::CycleMode"
}
},
{
@@ -262,7 +267,8 @@
"alt-enter": "search::SelectAllMatches",
"alt-cmd-c": "search::ToggleCaseSensitive",
"alt-cmd-w": "search::ToggleWholeWord",
- "alt-cmd-r": "search::ToggleRegex"
+ "alt-tab": "search::CycleMode",
+ "alt-cmd-f": "project_search::ToggleFilters"
}
},
// Bindings from VS Code
@@ -513,7 +519,8 @@
{
"bindings": {
"ctrl-alt-cmd-f": "workspace::FollowNextCollaborator",
- "cmd-shift-c": "collab::ToggleContactsMenu",
+ // TODO: Move this to a dock open action
+ "cmd-shift-c": "collab_panel::ToggleFocus",
"cmd-alt-i": "zed::DebugElements"
}
},
@@ -536,6 +543,8 @@
"bindings": {
"left": "project_panel::CollapseSelectedEntry",
"right": "project_panel::ExpandSelectedEntry",
+ "cmd-n": "project_panel::NewFile",
+ "alt-cmd-n": "project_panel::NewDirectory",
"cmd-x": "project_panel::Cut",
"cmd-c": "project_panel::Copy",
"cmd-v": "project_panel::Paste",
@@ -549,6 +558,25 @@
"alt-shift-f": "project_panel::NewSearchInDirectory"
}
},
+ {
+ "context": "CollabPanel",
+ "bindings": {
+ "ctrl-backspace": "collab_panel::Remove",
+ "space": "menu::Confirm"
+ }
+ },
+ {
+ "context": "ChannelModal",
+ "bindings": {
+ "tab": "channel_modal::ToggleMode"
+ }
+ },
+ {
+ "context": "ChannelModal > Picker > Editor",
+ "bindings": {
+ "tab": "channel_modal::ToggleMode"
+ }
+ },
{
"context": "Terminal",
"bindings": {
diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 94a271f037..458232b9b0 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -101,9 +101,21 @@
"vim::SwitchMode",
"Normal"
],
+ "v": "vim::ToggleVisual",
+ "shift-v": "vim::ToggleVisualLine",
+ "ctrl-v": "vim::ToggleVisualBlock",
+ "ctrl-q": "vim::ToggleVisualBlock",
"*": "vim::MoveToNext",
"#": "vim::MoveToPrev",
"0": "vim::StartOfLine", // When no number operator present, use start of line motion
+ "ctrl-f": "vim::PageDown",
+ "pagedown": "vim::PageDown",
+ "ctrl-b": "vim::PageUp",
+ "pageup": "vim::PageUp",
+ "ctrl-d": "vim::ScrollDown",
+ "ctrl-u": "vim::ScrollUp",
+ "ctrl-e": "vim::LineDown",
+ "ctrl-y": "vim::LineUp",
// "g" commands
"g g": "vim::StartOfDocument",
"g h": "editor::Hover",
@@ -236,6 +248,14 @@
"ctrl-w ctrl-q": "pane::CloseAllItems"
}
},
+ {
+ // escape is in its own section so that it cancels a pending count.
+ "context": "Editor && vim_mode == normal && vim_operator == none && !VimWaiting",
+ "bindings": {
+ "escape": "editor::Cancel",
+ "ctrl+[": "editor::Cancel"
+ }
+ },
{
"context": "Editor && vim_mode == normal && (vim_operator == none || vim_operator == n) && !VimWaiting",
"bindings": {
@@ -266,22 +286,6 @@
"o": "vim::InsertLineBelow",
"shift-o": "vim::InsertLineAbove",
"~": "vim::ChangeCase",
- "v": [
- "vim::SwitchMode",
- {
- "Visual": {
- "line": false
- }
- }
- ],
- "shift-v": [
- "vim::SwitchMode",
- {
- "Visual": {
- "line": true
- }
- }
- ],
"p": "vim::Paste",
"u": "editor::Undo",
"ctrl-r": "editor::Redo",
@@ -299,14 +303,6 @@
"backwards": true
}
],
- "ctrl-f": "vim::PageDown",
- "pagedown": "vim::PageDown",
- "ctrl-b": "vim::PageUp",
- "pageup": "vim::PageUp",
- "ctrl-d": "vim::ScrollDown",
- "ctrl-u": "vim::ScrollUp",
- "ctrl-e": "vim::LineDown",
- "ctrl-y": "vim::LineUp",
"r": [
"vim::PushOperator",
"Replace"
@@ -371,16 +367,23 @@
}
},
{
- "context": "Editor && vim_mode == visual && !VimWaiting",
+ "context": "Editor && vim_mode == visual && !VimWaiting && !VimObject",
"bindings": {
"u": "editor::Undo",
- "c": "vim::VisualChange",
+ "o": "vim::OtherEnd",
+ "shift-o": "vim::OtherEnd",
"d": "vim::VisualDelete",
"x": "vim::VisualDelete",
"y": "vim::VisualYank",
"p": "vim::VisualPaste",
"s": "vim::Substitute",
+ "c": "vim::Substitute",
"~": "vim::ChangeCase",
+ "shift-i": [
+ "vim::SwitchMode",
+ "Insert"
+ ],
+ "shift-a": "vim::InsertAfter",
"r": [
"vim::PushOperator",
"Replace"
@@ -389,8 +392,32 @@
"vim::SwitchMode",
"Normal"
],
+ "escape": [
+ "vim::SwitchMode",
+ "Normal"
+ ],
+ "ctrl+[": [
+ "vim::SwitchMode",
+ "Normal"
+ ],
">": "editor::Indent",
- "<": "editor::Outdent"
+ "<": "editor::Outdent",
+ "i": [
+ "vim::PushOperator",
+ {
+ "Object": {
+ "around": false
+ }
+ }
+ ],
+ "a": [
+ "vim::PushOperator",
+ {
+ "Object": {
+ "around": true
+ }
+ }
+ ],
}
},
{
diff --git a/assets/settings/default.json b/assets/settings/default.json
index 397dac0961..24412b883b 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -122,13 +122,29 @@
// Amount of indentation for nested items.
"indent_size": 20
},
+ "collaboration_panel": {
+ // Whether to show the collaboration panel button in the status bar.
+ "button": true,
+ // Where to dock channels panel. Can be 'left' or 'right'.
+ "dock": "left",
+ // Default width of the channels panel.
+ "default_width": 240
+ },
"assistant": {
+ // Whether to show the assistant panel button in the status bar.
+ "button": true,
// Where to dock the assistant. Can be 'left', 'right' or 'bottom'.
"dock": "right",
// Default width when the assistant is docked to the left or right.
"default_width": 640,
// Default height when the assistant is docked to the bottom.
- "default_height": 320
+ "default_height": 320,
+ // The default OpenAI model to use when starting new conversations. This
+ // setting can take two values:
+ //
+ // 1. "gpt-3.5-turbo-0613""
+ // 2. "gpt-4-0613""
+ "default_open_ai_model": "gpt-4-0613"
},
// Whether the screen sharing icon is shown in the os status bar.
"show_call_status_icon": true,
@@ -214,7 +230,9 @@
"copilot": {
// The set of glob patterns for which copilot should be disabled
// in any matching file.
- "disabled_globs": [".env"]
+ "disabled_globs": [
+ ".env"
+ ]
},
// Settings specific to journaling
"journal": {
diff --git a/crates/activity_indicator/src/activity_indicator.rs b/crates/activity_indicator/src/activity_indicator.rs
index 8b46d7cfc5..6d1db5ada5 100644
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -318,7 +318,7 @@ impl View for ActivityIndicator {
on_click,
} = self.content_to_render(cx);
- let mut element = MouseEventHandler::::new(0, cx, |state, cx| {
+ let mut element = MouseEventHandler::new::(0, cx, |state, cx| {
let theme = &theme::current(cx).workspace.status_bar.lsp_status;
let style = if state.hovered() && on_click.is_some() {
theme.hovered.as_ref().unwrap_or(&theme.default)
diff --git a/crates/ai/src/ai.rs b/crates/ai/src/ai.rs
index 7cc5f08f7c..d2be651bd5 100644
--- a/crates/ai/src/ai.rs
+++ b/crates/ai/src/ai.rs
@@ -3,6 +3,7 @@ mod assistant_settings;
use anyhow::Result;
pub use assistant::AssistantPanel;
+use assistant_settings::OpenAIModel;
use chrono::{DateTime, Local};
use collections::HashMap;
use fs::Fs;
@@ -60,7 +61,7 @@ struct SavedConversation {
messages: Vec,
message_metadata: HashMap,
summary: String,
- model: String,
+ model: OpenAIModel,
}
impl SavedConversation {
diff --git a/crates/ai/src/assistant.rs b/crates/ai/src/assistant.rs
index 0a18266d2a..81299bbdc2 100644
--- a/crates/ai/src/assistant.rs
+++ b/crates/ai/src/assistant.rs
@@ -1,5 +1,5 @@
use crate::{
- assistant_settings::{AssistantDockPosition, AssistantSettings},
+ assistant_settings::{AssistantDockPosition, AssistantSettings, OpenAIModel},
MessageId, MessageMetadata, MessageStatus, OpenAIRequest, OpenAIResponseStreamEvent,
RequestMessage, Role, SavedConversation, SavedConversationMetadata, SavedMessage,
};
@@ -158,7 +158,7 @@ impl AssistantPanel {
});
let toolbar = cx.add_view(|cx| {
- let mut toolbar = Toolbar::new(None);
+ let mut toolbar = Toolbar::new();
toolbar.set_can_navigate(false, cx);
toolbar.add_item(cx.add_view(|cx| BufferSearchBar::new(cx)), cx);
toolbar
@@ -192,6 +192,7 @@ impl AssistantPanel {
old_dock_position = new_dock_position;
cx.emit(AssistantPanelEvent::DockPositionChanged);
}
+ cx.notify();
})];
this
@@ -348,7 +349,7 @@ impl AssistantPanel {
enum History {}
let theme = theme::current(cx);
let tooltip_style = theme::current(cx).tooltip.clone();
- MouseEventHandler::::new(0, cx, |state, _| {
+ MouseEventHandler::new::(0, cx, |state, _| {
let style = theme.assistant.hamburger_button.style_for(state);
Svg::for_style(style.icon.clone())
.contained()
@@ -380,7 +381,7 @@ impl AssistantPanel {
fn render_split_button(cx: &mut ViewContext) -> impl Element {
let theme = theme::current(cx);
let tooltip_style = theme::current(cx).tooltip.clone();
- MouseEventHandler::::new(0, cx, |state, _| {
+ MouseEventHandler::new::(0, cx, |state, _| {
let style = theme.assistant.split_button.style_for(state);
Svg::for_style(style.icon.clone())
.contained()
@@ -404,7 +405,7 @@ impl AssistantPanel {
fn render_assist_button(cx: &mut ViewContext) -> impl Element {
let theme = theme::current(cx);
let tooltip_style = theme::current(cx).tooltip.clone();
- MouseEventHandler::::new(0, cx, |state, _| {
+ MouseEventHandler::new::(0, cx, |state, _| {
let style = theme.assistant.assist_button.style_for(state);
Svg::for_style(style.icon.clone())
.contained()
@@ -422,7 +423,7 @@ impl AssistantPanel {
fn render_quote_button(cx: &mut ViewContext) -> impl Element {
let theme = theme::current(cx);
let tooltip_style = theme::current(cx).tooltip.clone();
- MouseEventHandler::::new(0, cx, |state, _| {
+ MouseEventHandler::new::(0, cx, |state, _| {
let style = theme.assistant.quote_button.style_for(state);
Svg::for_style(style.icon.clone())
.contained()
@@ -450,7 +451,7 @@ impl AssistantPanel {
fn render_plus_button(cx: &mut ViewContext) -> impl Element {
let theme = theme::current(cx);
let tooltip_style = theme::current(cx).tooltip.clone();
- MouseEventHandler::::new(0, cx, |state, _| {
+ MouseEventHandler::new::(0, cx, |state, _| {
let style = theme.assistant.plus_button.style_for(state);
Svg::for_style(style.icon.clone())
.contained()
@@ -480,7 +481,7 @@ impl AssistantPanel {
&theme.assistant.zoom_in_button
};
- MouseEventHandler::::new(0, cx, |state, _| {
+ MouseEventHandler::new::(0, cx, |state, _| {
let style = style.style_for(state);
Svg::for_style(style.icon.clone())
.contained()
@@ -506,7 +507,7 @@ impl AssistantPanel {
) -> impl Element {
let conversation = &self.saved_conversations[index];
let path = conversation.path.clone();
- MouseEventHandler::::new(index, cx, move |state, cx| {
+ MouseEventHandler::new::(index, cx, move |state, cx| {
let style = &theme::current(cx).assistant.saved_conversation;
Flex::row()
.with_child(
@@ -725,10 +726,10 @@ impl Panel for AssistantPanel {
}
}
- fn set_size(&mut self, size: f32, cx: &mut ViewContext) {
+ fn set_size(&mut self, size: Option, cx: &mut ViewContext) {
match self.position(cx) {
- DockPosition::Left | DockPosition::Right => self.width = Some(size),
- DockPosition::Bottom => self.height = Some(size),
+ DockPosition::Left | DockPosition::Right => self.width = size,
+ DockPosition::Bottom => self.height = size,
}
cx.notify();
}
@@ -780,8 +781,10 @@ impl Panel for AssistantPanel {
}
}
- fn icon_path(&self) -> &'static str {
- "icons/robot_14.svg"
+ fn icon_path(&self, cx: &WindowContext) -> Option<&'static str> {
+ settings::get::(cx)
+ .button
+ .then(|| "icons/ai.svg")
}
fn icon_tooltip(&self) -> (String, Option>) {
@@ -830,7 +833,7 @@ struct Conversation {
pending_summary: Task>,
completion_count: usize,
pending_completions: Vec,
- model: String,
+ model: OpenAIModel,
token_count: Option,
max_token_count: usize,
pending_token_count: Task>,
@@ -850,7 +853,6 @@ impl Conversation {
language_registry: Arc,
cx: &mut ModelContext,
) -> Self {
- let model = "gpt-3.5-turbo-0613";
let markdown = language_registry.language_for_name("Markdown");
let buffer = cx.add_model(|cx| {
let mut buffer = Buffer::new(0, "", cx);
@@ -869,6 +871,9 @@ impl Conversation {
buffer
});
+ let settings = settings::get::(cx);
+ let model = settings.default_open_ai_model.clone();
+
let mut this = Self {
message_anchors: Default::default(),
messages_metadata: Default::default(),
@@ -878,9 +883,9 @@ impl Conversation {
completion_count: Default::default(),
pending_completions: Default::default(),
token_count: None,
- max_token_count: tiktoken_rs::model::get_context_size(model),
+ max_token_count: tiktoken_rs::model::get_context_size(&model.full_name()),
pending_token_count: Task::ready(None),
- model: model.into(),
+ model: model.clone(),
_subscriptions: vec![cx.subscribe(&buffer, Self::handle_buffer_event)],
pending_save: Task::ready(Ok(())),
path: None,
@@ -974,7 +979,7 @@ impl Conversation {
completion_count: Default::default(),
pending_completions: Default::default(),
token_count: None,
- max_token_count: tiktoken_rs::model::get_context_size(&model),
+ max_token_count: tiktoken_rs::model::get_context_size(&model.full_name()),
pending_token_count: Task::ready(None),
model,
_subscriptions: vec![cx.subscribe(&buffer, Self::handle_buffer_event)],
@@ -1028,13 +1033,16 @@ impl Conversation {
cx.background().timer(Duration::from_millis(200)).await;
let token_count = cx
.background()
- .spawn(async move { tiktoken_rs::num_tokens_from_messages(&model, &messages) })
+ .spawn(async move {
+ tiktoken_rs::num_tokens_from_messages(&model.full_name(), &messages)
+ })
.await?;
this.upgrade(&cx)
.ok_or_else(|| anyhow!("conversation was dropped"))?
.update(&mut cx, |this, cx| {
- this.max_token_count = tiktoken_rs::model::get_context_size(&this.model);
+ this.max_token_count =
+ tiktoken_rs::model::get_context_size(&this.model.full_name());
this.token_count = Some(token_count);
cx.notify()
});
@@ -1048,7 +1056,7 @@ impl Conversation {
Some(self.max_token_count as isize - self.token_count? as isize)
}
- fn set_model(&mut self, model: String, cx: &mut ModelContext) {
+ fn set_model(&mut self, model: OpenAIModel, cx: &mut ModelContext) {
self.model = model;
self.count_remaining_tokens(cx);
cx.notify();
@@ -1090,7 +1098,7 @@ impl Conversation {
}
} else {
let request = OpenAIRequest {
- model: self.model.clone(),
+ model: self.model.full_name().to_string(),
messages: self
.messages(cx)
.filter(|message| matches!(message.status, MessageStatus::Done))
@@ -1416,7 +1424,7 @@ impl Conversation {
.into(),
}));
let request = OpenAIRequest {
- model: self.model.clone(),
+ model: self.model.full_name().to_string(),
messages: messages.collect(),
stream: true,
};
@@ -1818,7 +1826,7 @@ impl ConversationEditor {
let theme = theme::current(cx);
let style = &theme.assistant;
let message_id = message.id;
- let sender = MouseEventHandler::::new(
+ let sender = MouseEventHandler::new::(
message_id.0,
cx,
|state, _| match message.role {
@@ -2020,11 +2028,8 @@ impl ConversationEditor {
fn cycle_model(&mut self, cx: &mut ViewContext) {
self.conversation.update(cx, |conversation, cx| {
- let new_model = match conversation.model.as_str() {
- "gpt-4-0613" => "gpt-3.5-turbo-0613",
- _ => "gpt-4-0613",
- };
- conversation.set_model(new_model.into(), cx);
+ let new_model = conversation.model.cycle();
+ conversation.set_model(new_model, cx);
});
}
@@ -2044,9 +2049,10 @@ impl ConversationEditor {
) -> impl Element {
enum Model {}
- MouseEventHandler::::new(0, cx, |state, cx| {
+ MouseEventHandler::new::(0, cx, |state, cx| {
let style = style.model.style_for(state);
- Label::new(self.conversation.read(cx).model.clone(), style.text.clone())
+ let model_display_name = self.conversation.read(cx).model.short_name();
+ Label::new(model_display_name, style.text.clone())
.contained()
.with_style(style.container)
})
@@ -2235,6 +2241,8 @@ mod tests {
#[gpui::test]
fn test_inserting_and_removing_messages(cx: &mut AppContext) {
+ cx.set_global(SettingsStore::test(cx));
+ init(cx);
let registry = Arc::new(LanguageRegistry::test());
let conversation = cx.add_model(|cx| Conversation::new(Default::default(), registry, cx));
let buffer = conversation.read(cx).buffer.clone();
@@ -2361,6 +2369,8 @@ mod tests {
#[gpui::test]
fn test_message_splitting(cx: &mut AppContext) {
+ cx.set_global(SettingsStore::test(cx));
+ init(cx);
let registry = Arc::new(LanguageRegistry::test());
let conversation = cx.add_model(|cx| Conversation::new(Default::default(), registry, cx));
let buffer = conversation.read(cx).buffer.clone();
@@ -2455,6 +2465,8 @@ mod tests {
#[gpui::test]
fn test_messages_for_offsets(cx: &mut AppContext) {
+ cx.set_global(SettingsStore::test(cx));
+ init(cx);
let registry = Arc::new(LanguageRegistry::test());
let conversation = cx.add_model(|cx| Conversation::new(Default::default(), registry, cx));
let buffer = conversation.read(cx).buffer.clone();
@@ -2535,6 +2547,8 @@ mod tests {
#[gpui::test]
fn test_serialization(cx: &mut AppContext) {
+ cx.set_global(SettingsStore::test(cx));
+ init(cx);
let registry = Arc::new(LanguageRegistry::test());
let conversation =
cx.add_model(|cx| Conversation::new(Default::default(), registry.clone(), cx));
diff --git a/crates/ai/src/assistant_settings.rs b/crates/ai/src/assistant_settings.rs
index eb92e0f6e8..05d8d9ffeb 100644
--- a/crates/ai/src/assistant_settings.rs
+++ b/crates/ai/src/assistant_settings.rs
@@ -3,6 +3,37 @@ use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use settings::Setting;
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
+pub enum OpenAIModel {
+ #[serde(rename = "gpt-3.5-turbo-0613")]
+ ThreePointFiveTurbo,
+ #[serde(rename = "gpt-4-0613")]
+ Four,
+}
+
+impl OpenAIModel {
+ pub fn full_name(&self) -> &'static str {
+ match self {
+ OpenAIModel::ThreePointFiveTurbo => "gpt-3.5-turbo-0613",
+ OpenAIModel::Four => "gpt-4-0613",
+ }
+ }
+
+ pub fn short_name(&self) -> &'static str {
+ match self {
+ OpenAIModel::ThreePointFiveTurbo => "gpt-3.5-turbo",
+ OpenAIModel::Four => "gpt-4",
+ }
+ }
+
+ pub fn cycle(&self) -> Self {
+ match self {
+ OpenAIModel::ThreePointFiveTurbo => OpenAIModel::Four,
+ OpenAIModel::Four => OpenAIModel::ThreePointFiveTurbo,
+ }
+ }
+}
+
#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
#[serde(rename_all = "snake_case")]
pub enum AssistantDockPosition {
@@ -13,16 +44,20 @@ pub enum AssistantDockPosition {
#[derive(Deserialize, Debug)]
pub struct AssistantSettings {
+ pub button: bool,
pub dock: AssistantDockPosition,
pub default_width: f32,
pub default_height: f32,
+ pub default_open_ai_model: OpenAIModel,
}
#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
pub struct AssistantSettingsContent {
+ pub button: Option,
pub dock: Option,
pub default_width: Option,
pub default_height: Option,
+ pub default_open_ai_model: Option,
}
impl Setting for AssistantSettings {
diff --git a/crates/audio/Cargo.toml b/crates/audio/Cargo.toml
index 182e421eb8..36135a1e76 100644
--- a/crates/audio/Cargo.toml
+++ b/crates/audio/Cargo.toml
@@ -13,7 +13,7 @@ gpui = { path = "../gpui" }
collections = { path = "../collections" }
util = { path = "../util" }
-rodio = "0.17.1"
+rodio ={version = "0.17.1", default-features=false, features = ["wav"]}
log.workspace = true
diff --git a/crates/audio/src/audio.rs b/crates/audio/src/audio.rs
index 233b0f62aa..d80fb6738f 100644
--- a/crates/audio/src/audio.rs
+++ b/crates/audio/src/audio.rs
@@ -39,29 +39,43 @@ pub struct Audio {
impl Audio {
pub fn new() -> Self {
- let (_output_stream, output_handle) = OutputStream::try_default().log_err().unzip();
-
Self {
- _output_stream,
- output_handle,
+ _output_stream: None,
+ output_handle: None,
}
}
- pub fn play_sound(sound: Sound, cx: &AppContext) {
+ fn ensure_output_exists(&mut self) -> Option<&OutputStreamHandle> {
+ if self.output_handle.is_none() {
+ let (_output_stream, output_handle) = OutputStream::try_default().log_err().unzip();
+ self.output_handle = output_handle;
+ self._output_stream = _output_stream;
+ }
+
+ self.output_handle.as_ref()
+ }
+
+ pub fn play_sound(sound: Sound, cx: &mut AppContext) {
if !cx.has_global::() {
return;
}
- let this = cx.global::();
+ cx.update_global::(|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()?;
+ Some(())
+ });
+ }
- let Some(output_handle) = this.output_handle.as_ref() else {
+ pub fn end_call(cx: &mut AppContext) {
+ if !cx.has_global::() {
return;
- };
+ }
- let Some(source) = SoundRegistry::global(cx).get(sound.file()).log_err() else {
- return;
- };
-
- output_handle.play_raw(source).log_err();
+ cx.update_global::(|this, _| {
+ this._output_stream.take();
+ this.output_handle.take();
+ });
}
}
diff --git a/crates/auto_update/src/update_notification.rs b/crates/auto_update/src/update_notification.rs
index cd2e53905d..8397fa0745 100644
--- a/crates/auto_update/src/update_notification.rs
+++ b/crates/auto_update/src/update_notification.rs
@@ -31,7 +31,7 @@ impl View for UpdateNotification {
let app_name = cx.global::().display_name();
- MouseEventHandler::::new(0, cx, |state, cx| {
+ MouseEventHandler::new::(0, cx, |state, cx| {
Flex::column()
.with_child(
Flex::row()
@@ -48,7 +48,7 @@ impl View for UpdateNotification {
.flex(1., true),
)
.with_child(
- MouseEventHandler::::new(0, cx, |state, _| {
+ MouseEventHandler::new::(0, cx, |state, _| {
let style = theme.dismiss_button.style_for(state);
Svg::new("icons/x_mark_8.svg")
.with_color(style.color)
diff --git a/crates/breadcrumbs/src/breadcrumbs.rs b/crates/breadcrumbs/src/breadcrumbs.rs
index 433dbed29b..615e238648 100644
--- a/crates/breadcrumbs/src/breadcrumbs.rs
+++ b/crates/breadcrumbs/src/breadcrumbs.rs
@@ -82,7 +82,7 @@ impl View for Breadcrumbs {
.into_any();
}
- MouseEventHandler::::new(0, cx, |state, _| {
+ MouseEventHandler::new::(0, cx, |state, _| {
let style = style.style_for(state);
crumbs.with_style(style.container)
})
diff --git a/crates/call/src/call.rs b/crates/call/src/call.rs
index 2defd6b40f..5fef53fa81 100644
--- a/crates/call/src/call.rs
+++ b/crates/call/src/call.rs
@@ -5,8 +5,11 @@ pub mod room;
use std::sync::Arc;
use anyhow::{anyhow, Result};
+use audio::Audio;
use call_settings::CallSettings;
-use client::{proto, ClickhouseEvent, Client, TelemetrySettings, TypedEnvelope, User, UserStore};
+use client::{
+ proto, ChannelId, ClickhouseEvent, Client, TelemetrySettings, TypedEnvelope, User, UserStore,
+};
use collections::HashSet;
use futures::{future::Shared, FutureExt};
use postage::watch;
@@ -75,6 +78,10 @@ impl ActiveCall {
}
}
+ pub fn channel_id(&self, cx: &AppContext) -> Option {
+ self.room()?.read(cx).channel_id()
+ }
+
async fn handle_incoming_call(
this: ModelHandle,
envelope: TypedEnvelope,
@@ -267,16 +274,43 @@ impl ActiveCall {
.borrow_mut()
.take()
.ok_or_else(|| anyhow!("no incoming call"))?;
- Self::report_call_event_for_room("decline incoming", call.room_id, &self.client, cx);
+ Self::report_call_event_for_room("decline incoming", call.room_id, None, &self.client, cx);
self.client.send(proto::DeclineCall {
room_id: call.room_id,
})?;
Ok(())
}
+ pub fn join_channel(
+ &mut self,
+ channel_id: u64,
+ cx: &mut ModelContext,
+ ) -> Task> {
+ if let Some(room) = self.room().cloned() {
+ if room.read(cx).channel_id() == Some(channel_id) {
+ return Task::ready(Ok(()));
+ } else {
+ room.update(cx, |room, cx| room.clear_state(cx));
+ }
+ }
+
+ let join = Room::join_channel(channel_id, self.client.clone(), self.user_store.clone(), cx);
+
+ cx.spawn(|this, mut cx| async move {
+ let room = join.await?;
+ this.update(&mut cx, |this, cx| this.set_room(Some(room.clone()), cx))
+ .await?;
+ this.update(&mut cx, |this, cx| {
+ this.report_call_event("join channel", cx)
+ });
+ Ok(())
+ })
+ }
+
pub fn hang_up(&mut self, cx: &mut ModelContext) -> Task> {
cx.notify();
self.report_call_event("hang up", cx);
+ Audio::end_call(cx);
if let Some((room, _)) = self.room.take() {
room.update(cx, |room, cx| room.leave(cx))
} else {
@@ -372,19 +406,31 @@ impl ActiveCall {
fn report_call_event(&self, operation: &'static str, cx: &AppContext) {
if let Some(room) = self.room() {
- Self::report_call_event_for_room(operation, room.read(cx).id(), &self.client, cx)
+ let room = room.read(cx);
+ Self::report_call_event_for_room(
+ operation,
+ room.id(),
+ room.channel_id(),
+ &self.client,
+ cx,
+ )
}
}
pub fn report_call_event_for_room(
operation: &'static str,
room_id: u64,
+ channel_id: Option,
client: &Arc,
cx: &AppContext,
) {
let telemetry = client.telemetry();
let telemetry_settings = *settings::get::(cx);
- let event = ClickhouseEvent::Call { operation, room_id };
+ let event = ClickhouseEvent::Call {
+ operation,
+ room_id,
+ channel_id,
+ };
telemetry.report_clickhouse_event(event, telemetry_settings);
}
}
diff --git a/crates/call/src/room.rs b/crates/call/src/room.rs
index 328a94506c..6f01b1d757 100644
--- a/crates/call/src/room.rs
+++ b/crates/call/src/room.rs
@@ -49,6 +49,7 @@ pub enum Event {
pub struct Room {
id: u64,
+ channel_id: Option,
live_kit: Option,
status: RoomStatus,
shared_projects: HashSet>,
@@ -93,8 +94,25 @@ impl Entity for Room {
}
impl Room {
+ pub fn channel_id(&self) -> Option {
+ self.channel_id
+ }
+
+ #[cfg(any(test, feature = "test-support"))]
+ pub fn is_connected(&self) -> bool {
+ if let Some(live_kit) = self.live_kit.as_ref() {
+ matches!(
+ *live_kit.room.status().borrow(),
+ live_kit_client::ConnectionState::Connected { .. }
+ )
+ } else {
+ false
+ }
+ }
+
fn new(
id: u64,
+ channel_id: Option,
live_kit_connection_info: Option,
client: Arc,
user_store: ModelHandle,
@@ -185,6 +203,7 @@ impl Room {
Self {
id,
+ channel_id,
live_kit: live_kit_room,
status: RoomStatus::Online,
shared_projects: Default::default(),
@@ -217,6 +236,7 @@ impl Room {
let room = cx.add_model(|cx| {
Self::new(
room_proto.id,
+ None,
response.live_kit_connection_info,
client,
user_store,
@@ -248,35 +268,64 @@ impl Room {
})
}
+ pub(crate) fn join_channel(
+ channel_id: u64,
+ client: Arc,
+ user_store: ModelHandle,
+ cx: &mut AppContext,
+ ) -> Task>> {
+ cx.spawn(|cx| async move {
+ Self::from_join_response(
+ client.request(proto::JoinChannel { channel_id }).await?,
+ client,
+ user_store,
+ cx,
+ )
+ })
+ }
+
pub(crate) fn join(
call: &IncomingCall,
client: Arc,
user_store: ModelHandle,
cx: &mut AppContext,
) -> Task>> {
- let room_id = call.room_id;
- cx.spawn(|mut cx| async move {
- let response = client.request(proto::JoinRoom { id: room_id }).await?;
- let room_proto = response.room.ok_or_else(|| anyhow!("invalid room"))?;
- let room = cx.add_model(|cx| {
- Self::new(
- room_id,
- response.live_kit_connection_info,
- client,
- user_store,
- cx,
- )
- });
- room.update(&mut cx, |room, cx| {
- room.leave_when_empty = true;
- room.apply_room_update(room_proto, cx)?;
- anyhow::Ok(())
- })?;
-
- Ok(room)
+ let id = call.room_id;
+ cx.spawn(|cx| async move {
+ Self::from_join_response(
+ client.request(proto::JoinRoom { id }).await?,
+ client,
+ user_store,
+ cx,
+ )
})
}
+ fn from_join_response(
+ response: proto::JoinRoomResponse,
+ client: Arc,
+ user_store: ModelHandle,
+ mut cx: AsyncAppContext,
+ ) -> Result> {
+ let room_proto = response.room.ok_or_else(|| anyhow!("invalid room"))?;
+ let room = cx.add_model(|cx| {
+ Self::new(
+ room_proto.id,
+ response.channel_id,
+ response.live_kit_connection_info,
+ client,
+ user_store,
+ cx,
+ )
+ });
+ room.update(&mut cx, |room, cx| {
+ room.leave_when_empty = room.channel_id.is_none();
+ room.apply_room_update(room_proto, cx)?;
+ anyhow::Ok(())
+ })?;
+ Ok(room)
+ }
+
fn should_leave(&self) -> bool {
self.leave_when_empty
&& self.pending_room_update.is_none()
@@ -297,7 +346,18 @@ impl Room {
}
log::info!("leaving room");
+ Audio::play_sound(Sound::Leave, cx);
+ self.clear_state(cx);
+
+ let leave_room = self.client.request(proto::LeaveRoom {});
+ cx.background().spawn(async move {
+ leave_room.await?;
+ anyhow::Ok(())
+ })
+ }
+
+ pub(crate) fn clear_state(&mut self, cx: &mut AppContext) {
for project in self.shared_projects.drain() {
if let Some(project) = project.upgrade(cx) {
project.update(cx, |project, cx| {
@@ -314,8 +374,6 @@ impl Room {
}
}
- Audio::play_sound(Sound::Leave, cx);
-
self.status = RoomStatus::Offline;
self.remote_participants.clear();
self.pending_participants.clear();
@@ -324,12 +382,6 @@ impl Room {
self.live_kit.take();
self.pending_room_update.take();
self.maintain_connection.take();
-
- let leave_room = self.client.request(proto::LeaveRoom {});
- cx.background().spawn(async move {
- leave_room.await?;
- anyhow::Ok(())
- })
}
async fn maintain_connection(
@@ -1066,11 +1118,11 @@ impl Room {
})
}
- pub fn is_muted(&self) -> bool {
+ pub fn is_muted(&self, cx: &AppContext) -> bool {
self.live_kit
.as_ref()
.and_then(|live_kit| match &live_kit.microphone_track {
- LocalTrack::None => Some(true),
+ LocalTrack::None => Some(settings::get::(cx).mute_on_join),
LocalTrack::Pending { muted, .. } => Some(*muted),
LocalTrack::Published { muted, .. } => Some(*muted),
})
@@ -1260,7 +1312,7 @@ impl Room {
}
pub fn toggle_mute(&mut self, cx: &mut ModelContext) -> Result>> {
- let should_mute = !self.is_muted();
+ let should_mute = !self.is_muted(cx);
if let Some(live_kit) = self.live_kit.as_mut() {
if matches!(live_kit.microphone_track, LocalTrack::None) {
return Ok(self.share_microphone(cx));
diff --git a/crates/client/src/channel_store.rs b/crates/client/src/channel_store.rs
new file mode 100644
index 0000000000..03d334a9de
--- /dev/null
+++ b/crates/client/src/channel_store.rs
@@ -0,0 +1,550 @@
+use crate::Status;
+use crate::{Client, Subscription, User, UserStore};
+use anyhow::anyhow;
+use anyhow::Result;
+use collections::HashMap;
+use collections::HashSet;
+use futures::channel::mpsc;
+use futures::Future;
+use futures::StreamExt;
+use gpui::{AsyncAppContext, Entity, ModelContext, ModelHandle, Task};
+use rpc::{proto, TypedEnvelope};
+use std::sync::Arc;
+use util::ResultExt;
+
+pub type ChannelId = u64;
+pub type UserId = u64;
+
+pub struct ChannelStore {
+ channels_by_id: HashMap>,
+ channel_paths: Vec>,
+ channel_invitations: Vec>,
+ channel_participants: HashMap>>,
+ channels_with_admin_privileges: HashSet,
+ outgoing_invites: HashSet<(ChannelId, UserId)>,
+ update_channels_tx: mpsc::UnboundedSender,
+ client: Arc,
+ user_store: ModelHandle,
+ _rpc_subscription: Subscription,
+ _watch_connection_status: Task<()>,
+ _update_channels: Task<()>,
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct Channel {
+ pub id: ChannelId,
+ pub name: String,
+}
+
+pub struct ChannelMembership {
+ pub user: Arc,
+ pub kind: proto::channel_member::Kind,
+ pub admin: bool,
+}
+
+pub enum ChannelEvent {
+ ChannelCreated(ChannelId),
+ ChannelRenamed(ChannelId),
+}
+
+impl Entity for ChannelStore {
+ type Event = ChannelEvent;
+}
+
+pub enum ChannelMemberStatus {
+ Invited,
+ Member,
+ NotMember,
+}
+
+impl ChannelStore {
+ pub fn new(
+ client: Arc,
+ user_store: ModelHandle,
+ cx: &mut ModelContext,
+ ) -> Self {
+ let rpc_subscription =
+ client.add_message_handler(cx.handle(), Self::handle_update_channels);
+
+ let (update_channels_tx, mut update_channels_rx) = mpsc::unbounded();
+ let mut connection_status = client.status();
+ let watch_connection_status = cx.spawn_weak(|this, mut cx| async move {
+ while let Some(status) = connection_status.next().await {
+ if matches!(status, Status::ConnectionLost | Status::SignedOut) {
+ if let Some(this) = this.upgrade(&cx) {
+ this.update(&mut cx, |this, cx| {
+ this.channels_by_id.clear();
+ this.channel_invitations.clear();
+ this.channel_participants.clear();
+ this.channels_with_admin_privileges.clear();
+ this.channel_paths.clear();
+ this.outgoing_invites.clear();
+ cx.notify();
+ });
+ } else {
+ break;
+ }
+ }
+ }
+ });
+ Self {
+ channels_by_id: HashMap::default(),
+ channel_invitations: Vec::default(),
+ channel_paths: Vec::default(),
+ channel_participants: Default::default(),
+ channels_with_admin_privileges: Default::default(),
+ outgoing_invites: Default::default(),
+ update_channels_tx,
+ client,
+ user_store,
+ _rpc_subscription: rpc_subscription,
+ _watch_connection_status: watch_connection_status,
+ _update_channels: cx.spawn_weak(|this, mut cx| async move {
+ while let Some(update_channels) = update_channels_rx.next().await {
+ if let Some(this) = this.upgrade(&cx) {
+ let update_task = this.update(&mut cx, |this, cx| {
+ this.update_channels(update_channels, cx)
+ });
+ if let Some(update_task) = update_task {
+ update_task.await.log_err();
+ }
+ }
+ }
+ }),
+ }
+ }
+
+ pub fn channel_count(&self) -> usize {
+ self.channel_paths.len()
+ }
+
+ pub fn channels(&self) -> impl '_ + Iterator- )> {
+ self.channel_paths.iter().map(move |path| {
+ let id = path.last().unwrap();
+ let channel = self.channel_for_id(*id).unwrap();
+ (path.len() - 1, channel)
+ })
+ }
+
+ pub fn channel_at_index(&self, ix: usize) -> Option<(usize, &Arc)> {
+ let path = self.channel_paths.get(ix)?;
+ let id = path.last().unwrap();
+ let channel = self.channel_for_id(*id).unwrap();
+ Some((path.len() - 1, channel))
+ }
+
+ pub fn channel_invitations(&self) -> &[Arc] {
+ &self.channel_invitations
+ }
+
+ pub fn channel_for_id(&self, channel_id: ChannelId) -> Option<&Arc> {
+ self.channels_by_id.get(&channel_id)
+ }
+
+ pub fn is_user_admin(&self, channel_id: ChannelId) -> bool {
+ self.channel_paths.iter().any(|path| {
+ if let Some(ix) = path.iter().position(|id| *id == channel_id) {
+ path[..=ix]
+ .iter()
+ .any(|id| self.channels_with_admin_privileges.contains(id))
+ } else {
+ false
+ }
+ })
+ }
+
+ pub fn channel_participants(&self, channel_id: ChannelId) -> &[Arc] {
+ self.channel_participants
+ .get(&channel_id)
+ .map_or(&[], |v| v.as_slice())
+ }
+
+ pub fn create_channel(
+ &self,
+ name: &str,
+ parent_id: Option,
+ cx: &mut ModelContext,
+ ) -> Task> {
+ let client = self.client.clone();
+ let name = name.trim_start_matches("#").to_owned();
+ cx.spawn(|this, mut cx| async move {
+ let channel = client
+ .request(proto::CreateChannel { name, parent_id })
+ .await?
+ .channel
+ .ok_or_else(|| anyhow!("missing channel in response"))?;
+
+ let channel_id = channel.id;
+
+ this.update(&mut cx, |this, cx| {
+ let task = this.update_channels(
+ proto::UpdateChannels {
+ channels: vec![channel],
+ ..Default::default()
+ },
+ cx,
+ );
+ assert!(task.is_none());
+
+ // This event is emitted because the collab panel wants to clear the pending edit state
+ // before this frame is rendered. But we can't guarantee that the collab panel's future
+ // will resolve before this flush_effects finishes. Synchronously emitting this event
+ // ensures that the collab panel will observe this creation before the frame completes
+ cx.emit(ChannelEvent::ChannelCreated(channel_id));
+ });
+
+ Ok(channel_id)
+ })
+ }
+
+ pub fn invite_member(
+ &mut self,
+ channel_id: ChannelId,
+ user_id: UserId,
+ admin: bool,
+ cx: &mut ModelContext,
+ ) -> Task> {
+ if !self.outgoing_invites.insert((channel_id, user_id)) {
+ return Task::ready(Err(anyhow!("invite request already in progress")));
+ }
+
+ cx.notify();
+ let client = self.client.clone();
+ cx.spawn(|this, mut cx| async move {
+ let result = client
+ .request(proto::InviteChannelMember {
+ channel_id,
+ user_id,
+ admin,
+ })
+ .await;
+
+ this.update(&mut cx, |this, cx| {
+ this.outgoing_invites.remove(&(channel_id, user_id));
+ cx.notify();
+ });
+
+ result?;
+
+ Ok(())
+ })
+ }
+
+ pub fn remove_member(
+ &mut self,
+ channel_id: ChannelId,
+ user_id: u64,
+ cx: &mut ModelContext,
+ ) -> Task> {
+ if !self.outgoing_invites.insert((channel_id, user_id)) {
+ return Task::ready(Err(anyhow!("invite request already in progress")));
+ }
+
+ cx.notify();
+ let client = self.client.clone();
+ cx.spawn(|this, mut cx| async move {
+ let result = client
+ .request(proto::RemoveChannelMember {
+ channel_id,
+ user_id,
+ })
+ .await;
+
+ this.update(&mut cx, |this, cx| {
+ this.outgoing_invites.remove(&(channel_id, user_id));
+ cx.notify();
+ });
+ result?;
+ Ok(())
+ })
+ }
+
+ pub fn set_member_admin(
+ &mut self,
+ channel_id: ChannelId,
+ user_id: UserId,
+ admin: bool,
+ cx: &mut ModelContext,
+ ) -> Task> {
+ if !self.outgoing_invites.insert((channel_id, user_id)) {
+ return Task::ready(Err(anyhow!("member request already in progress")));
+ }
+
+ cx.notify();
+ let client = self.client.clone();
+ cx.spawn(|this, mut cx| async move {
+ let result = client
+ .request(proto::SetChannelMemberAdmin {
+ channel_id,
+ user_id,
+ admin,
+ })
+ .await;
+
+ this.update(&mut cx, |this, cx| {
+ this.outgoing_invites.remove(&(channel_id, user_id));
+ cx.notify();
+ });
+
+ result?;
+ Ok(())
+ })
+ }
+
+ pub fn rename(
+ &mut self,
+ channel_id: ChannelId,
+ new_name: &str,
+ cx: &mut ModelContext,
+ ) -> Task> {
+ let client = self.client.clone();
+ let name = new_name.to_string();
+ cx.spawn(|this, mut cx| async move {
+ let channel = client
+ .request(proto::RenameChannel { channel_id, name })
+ .await?
+ .channel
+ .ok_or_else(|| anyhow!("missing channel in response"))?;
+ this.update(&mut cx, |this, cx| {
+ let task = this.update_channels(
+ proto::UpdateChannels {
+ channels: vec![channel],
+ ..Default::default()
+ },
+ cx,
+ );
+ assert!(task.is_none());
+
+ // This event is emitted because the collab panel wants to clear the pending edit state
+ // before this frame is rendered. But we can't guarantee that the collab panel's future
+ // will resolve before this flush_effects finishes. Synchronously emitting this event
+ // ensures that the collab panel will observe this creation before the frame complete
+ cx.emit(ChannelEvent::ChannelRenamed(channel_id))
+ });
+ Ok(())
+ })
+ }
+
+ pub fn respond_to_channel_invite(
+ &mut self,
+ channel_id: ChannelId,
+ accept: bool,
+ ) -> impl Future