Detailed changes
@@ -2,12 +2,6 @@
# It is not intended for manual editing.
version = 3
-[[package]]
-name = "Inflector"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
-
[[package]]
name = "activity_indicator"
version = "0.1.0"
@@ -73,6 +67,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
dependencies = [
"cfg-if 1.0.0",
+ "getrandom 0.2.10",
"once_cell",
"version_check",
]
@@ -99,7 +94,7 @@ dependencies = [
"lazy_static",
"log",
"matrixmultiply",
- "ordered-float",
+ "ordered-float 2.10.0",
"parking_lot 0.11.2",
"parse_duration",
"postage",
@@ -314,7 +309,7 @@ dependencies = [
"language",
"log",
"menu",
- "ordered-float",
+ "ordered-float 2.10.0",
"parking_lot 0.11.2",
"project",
"rand 0.8.5",
@@ -588,7 +583,7 @@ dependencies = [
"futures-core",
"futures-io",
"rustls 0.19.1",
- "webpki 0.21.4",
+ "webpki",
"webpki-roots 0.21.1",
]
@@ -619,9 +614,9 @@ dependencies = [
[[package]]
name = "atoi"
-version = "1.0.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e"
+checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528"
dependencies = [
"num-traits",
]
@@ -779,19 +774,6 @@ dependencies = [
"rustc-demangle",
]
-[[package]]
-name = "bae"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b8de67cc41132507eeece2584804efcb15f85ba516e34c944b7667f480397a"
-dependencies = [
- "heck 0.3.3",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
[[package]]
name = "base64"
version = "0.13.1"
@@ -810,6 +792,17 @@ version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+[[package]]
+name = "bigdecimal"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa"
+dependencies = [
+ "num-bigint 0.4.4",
+ "num-integer",
+ "num-traits",
+]
+
[[package]]
name = "bincode"
version = "1.3.3"
@@ -1225,6 +1218,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"client",
+ "clock",
"collections",
"db",
"feature_flags",
@@ -1474,7 +1468,7 @@ dependencies = [
[[package]]
name = "collab"
-version = "0.22.1"
+version = "0.23.2"
dependencies = [
"anyhow",
"async-trait",
@@ -1519,7 +1513,6 @@ dependencies = [
"rpc",
"scrypt",
"sea-orm",
- "sea-query",
"serde",
"serde_derive",
"serde_json",
@@ -1540,6 +1533,7 @@ dependencies = [
"tracing-subscriber",
"unindent",
"util",
+ "uuid 1.4.1",
"workspace",
]
@@ -1570,6 +1564,7 @@ dependencies = [
"postage",
"project",
"recent_projects",
+ "rich_text",
"schemars",
"serde",
"serde_derive",
@@ -1660,6 +1655,12 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6"
+[[package]]
+name = "const-oid"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
+
[[package]]
name = "context_menu"
version = "0.1.0"
@@ -2152,6 +2153,17 @@ dependencies = [
"byteorder",
]
+[[package]]
+name = "der"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
+dependencies = [
+ "const-oid",
+ "pem-rfc7468",
+ "zeroize",
+]
+
[[package]]
name = "deranged"
version = "0.3.8"
@@ -2161,6 +2173,17 @@ dependencies = [
"serde",
]
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
[[package]]
name = "derive_more"
version = "0.99.17"
@@ -2246,6 +2269,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
dependencies = [
"block-buffer 0.10.4",
+ "const-oid",
"crypto-common",
"subtle",
]
@@ -2377,12 +2401,13 @@ dependencies = [
"lazy_static",
"log",
"lsp",
- "ordered-float",
+ "ordered-float 2.10.0",
"parking_lot 0.11.2",
"postage",
"project",
"pulldown-cmark",
"rand 0.8.5",
+ "rich_text",
"rpc",
"schemars",
"serde",
@@ -2409,6 +2434,9 @@ name = "either"
version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+dependencies = [
+ "serde",
+]
[[package]]
name = "encoding_rs"
@@ -2511,6 +2539,17 @@ dependencies = [
"svg_fmt",
]
+[[package]]
+name = "etcetera"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
+dependencies = [
+ "cfg-if 1.0.0",
+ "home",
+ "windows-sys",
+]
+
[[package]]
name = "euclid"
version = "0.22.9"
@@ -2682,13 +2721,12 @@ checksum = "7bad48618fdb549078c333a7a8528acb57af271d0433bdecd523eb620628364e"
[[package]]
name = "flume"
-version = "0.10.14"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577"
+checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
dependencies = [
"futures-core",
"futures-sink",
- "pin-project",
"spin 0.9.8",
]
@@ -2915,13 +2953,13 @@ dependencies = [
[[package]]
name = "futures-intrusive"
-version = "0.4.2"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a604f7a68fbf8103337523b1fadc8ade7361ee3f112f7c680ad179651616aed5"
+checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f"
dependencies = [
"futures-core",
"lock_api",
- "parking_lot 0.11.2",
+ "parking_lot 0.12.1",
]
[[package]]
@@ -3175,7 +3213,7 @@ dependencies = [
"metal",
"num_cpus",
"objc",
- "ordered-float",
+ "ordered-float 2.10.0",
"parking",
"parking_lot 0.11.2",
"pathfinder_color",
@@ -3307,15 +3345,6 @@ dependencies = [
"allocator-api2",
]
-[[package]]
-name = "hashlink"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf"
-dependencies = [
- "hashbrown 0.11.2",
-]
-
[[package]]
name = "hashlink"
version = "0.8.4"
@@ -3637,6 +3666,17 @@ version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306"
+[[package]]
+name = "inherent"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce243b1bfa62ffc028f1cc3b6034ec63d649f3031bc8a4fbbb004e1ac17d1f68"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
[[package]]
name = "install_cli"
version = "0.1.0"
@@ -4088,9 +4128,9 @@ checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
[[package]]
name = "libsqlite3-sys"
-version = "0.24.2"
+version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14"
+checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326"
dependencies = [
"cc",
"pkg-config",
@@ -4770,6 +4810,23 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "num-bigint-dig"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
+dependencies = [
+ "byteorder",
+ "lazy_static",
+ "libm",
+ "num-integer",
+ "num-iter",
+ "num-traits",
+ "rand 0.8.5",
+ "smallvec",
+ "zeroize",
+]
+
[[package]]
name = "num-complex"
version = "0.2.4"
@@ -5028,6 +5085,15 @@ dependencies = [
"num-traits",
]
+[[package]]
+name = "ordered-float"
+version = "3.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06"
+dependencies = [
+ "num-traits",
+]
+
[[package]]
name = "os_str_bytes"
version = "6.5.1"
@@ -5036,25 +5102,26 @@ checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac"
[[package]]
name = "ouroboros"
-version = "0.15.6"
+version = "0.17.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1358bd1558bd2a083fed428ffeda486fbfb323e698cdda7794259d592ca72db"
+checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954"
dependencies = [
"aliasable",
"ouroboros_macro",
+ "static_assertions",
]
[[package]]
name = "ouroboros_macro"
-version = "0.15.6"
+version = "0.17.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7"
+checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8"
dependencies = [
- "Inflector",
+ "heck 0.4.1",
"proc-macro-error",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.37",
]
[[package]]
@@ -5065,7 +5132,7 @@ dependencies = [
"fuzzy",
"gpui",
"language",
- "ordered-float",
+ "ordered-float 2.10.0",
"picker",
"postage",
"settings",
@@ -5231,6 +5298,15 @@ dependencies = [
"regex",
]
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
[[package]]
name = "percent-encoding"
version = "2.3.0"
@@ -5308,6 +5384,27 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+[[package]]
+name = "pkcs1"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
+dependencies = [
+ "der",
+ "pkcs8",
+ "spki",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "spki",
+]
+
[[package]]
name = "pkg-config"
version = "0.3.27"
@@ -5599,7 +5696,7 @@ dependencies = [
"gpui",
"language",
"lsp",
- "ordered-float",
+ "ordered-float 2.10.0",
"picker",
"postage",
"project",
@@ -5950,7 +6047,7 @@ dependencies = [
"fuzzy",
"gpui",
"language",
- "ordered-float",
+ "ordered-float 2.10.0",
"picker",
"postage",
"settings",
@@ -6148,6 +6245,24 @@ dependencies = [
"bytemuck",
]
+[[package]]
+name = "rich_text"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "collections",
+ "futures 0.3.28",
+ "gpui",
+ "language",
+ "lazy_static",
+ "pulldown-cmark",
+ "smallvec",
+ "smol",
+ "sum_tree",
+ "theme",
+ "util",
+]
+
[[package]]
name = "ring"
version = "0.16.20"
@@ -6263,7 +6378,7 @@ dependencies = [
"prost 0.8.0",
"prost-build",
"rand 0.8.5",
- "rsa",
+ "rsa 0.4.0",
"serde",
"serde_derive",
"smol",
@@ -6276,14 +6391,14 @@ dependencies = [
[[package]]
name = "rsa"
-version = "0.4.1"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0aeddcca1082112a6eeb43bf25fd7820b066aaf6eaef776e19d0a1febe38fe"
+checksum = "68ef841a26fc5d040ced0417c6c6a64ee851f42489df11cdf0218e545b6f8d28"
dependencies = [
"byteorder",
"digest 0.9.0",
"lazy_static",
- "num-bigint-dig",
+ "num-bigint-dig 0.7.1",
"num-integer",
"num-iter",
"num-traits",
@@ -6294,18 +6409,39 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "rsa"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8"
+dependencies = [
+ "byteorder",
+ "const-oid",
+ "digest 0.10.7",
+ "num-bigint-dig 0.8.4",
+ "num-integer",
+ "num-iter",
+ "num-traits",
+ "pkcs1",
+ "pkcs8",
+ "rand_core 0.6.4",
+ "signature",
+ "spki",
+ "subtle",
+ "zeroize",
+]
+
[[package]]
name = "rusqlite"
-version = "0.27.0"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85127183a999f7db96d1a976a309eebbfb6ea3b0b400ddd8340190129de6eb7a"
+checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
"fallible-iterator",
"fallible-streaming-iterator",
- "hashlink 0.7.0",
+ "hashlink",
"libsqlite3-sys",
- "memchr",
"smallvec",
]
@@ -6434,19 +6570,18 @@ dependencies = [
"log",
"ring",
"sct 0.6.1",
- "webpki 0.21.4",
+ "webpki",
]
[[package]]
name = "rustls"
-version = "0.20.9"
+version = "0.21.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99"
+checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
dependencies = [
- "log",
"ring",
+ "rustls-webpki",
"sct 0.7.0",
- "webpki 0.22.1",
]
[[package]]
@@ -6458,6 +6593,16 @@ dependencies = [
"base64 0.21.4",
]
+[[package]]
+name = "rustls-webpki"
+version = "0.101.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
[[package]]
name = "rustversion"
version = "1.0.14"
@@ -6598,26 +6743,40 @@ dependencies = [
"untrusted",
]
+[[package]]
+name = "sea-bae"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3bd3534a9978d0aa7edd2808dc1f8f31c4d0ecd31ddf71d997b3c98e9f3c9114"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
[[package]]
name = "sea-orm"
-version = "0.10.5"
-source = "git+https://github.com/zed-industries/sea-orm?rev=18f4c691085712ad014a51792af75a9044bacee6#18f4c691085712ad014a51792af75a9044bacee6"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da5b2d70c255bc5cbe1d49f69c3c8eadae0fbbaeb18ee978edbf2f75775cb94d"
dependencies = [
"async-stream",
"async-trait",
+ "bigdecimal",
"chrono",
"futures 0.3.28",
- "futures-util",
"log",
"ouroboros",
"rust_decimal",
"sea-orm-macros",
"sea-query",
"sea-query-binder",
- "sea-strum",
"serde",
"serde_json",
"sqlx",
+ "strum",
"thiserror",
"time",
"tracing",
@@ -6627,25 +6786,30 @@ dependencies = [
[[package]]
name = "sea-orm-macros"
-version = "0.10.5"
-source = "git+https://github.com/zed-industries/sea-orm?rev=18f4c691085712ad014a51792af75a9044bacee6#18f4c691085712ad014a51792af75a9044bacee6"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7c8d455fad40194fb9774fdc4810c0f2700ff0dc0e93bd5ce9d641cc3f5dd75"
dependencies = [
- "bae",
- "heck 0.3.3",
+ "heck 0.4.1",
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "sea-bae",
+ "syn 2.0.37",
+ "unicode-ident",
]
[[package]]
name = "sea-query"
-version = "0.27.2"
+version = "0.30.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4f0fc4d8e44e1d51c739a68d336252a18bc59553778075d5e32649be6ec92ed"
+checksum = "fb3e6bba153bb198646c8762c48414942a38db27d142e44735a133cabddcc820"
dependencies = [
+ "bigdecimal",
"chrono",
+ "derivative",
+ "inherent",
+ "ordered-float 3.9.1",
"rust_decimal",
- "sea-query-derive",
"serde_json",
"time",
"uuid 1.4.1",
@@ -6653,10 +6817,11 @@ dependencies = [
[[package]]
name = "sea-query-binder"
-version = "0.2.2"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c2585b89c985cfacfe0ec9fc9e7bb055b776c1a2581c4e3c6185af2b8bf8865"
+checksum = "36bbb68df92e820e4d5aeb17b4acd5cc8b5d18b2c36a4dd6f4626aabfa7ab1b9"
dependencies = [
+ "bigdecimal",
"chrono",
"rust_decimal",
"sea-query",
@@ -6666,41 +6831,6 @@ dependencies = [
"uuid 1.4.1",
]
-[[package]]
-name = "sea-query-derive"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34cdc022b4f606353fe5dc85b09713a04e433323b70163e81513b141c6ae6eb5"
-dependencies = [
- "heck 0.3.3",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "thiserror",
-]
-
-[[package]]
-name = "sea-strum"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "391d06a6007842cfe79ac6f7f53911b76dfd69fc9a6769f1cf6569d12ce20e1b"
-dependencies = [
- "sea-strum_macros",
-]
-
-[[package]]
-name = "sea-strum_macros"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69b4397b825df6ccf1e98bcdabef3bbcfc47ff5853983467850eeab878384f21"
-dependencies = [
- "heck 0.3.3",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 1.0.109",
-]
-
[[package]]
name = "seahash"
version = "4.1.0"
@@ -6780,7 +6910,7 @@ dependencies = [
"log",
"ndarray",
"node_runtime",
- "ordered-float",
+ "ordered-float 2.10.0",
"parking_lot 0.11.2",
"picker",
"postage",
@@ -7078,6 +7208,16 @@ dependencies = [
"libc",
]
+[[package]]
+name = "signature"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
+dependencies = [
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+]
+
[[package]]
name = "simdutf8"
version = "0.1.4"
@@ -7239,6 +7379,16 @@ dependencies = [
"lock_api",
]
+[[package]]
+name = "spki"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
[[package]]
name = "spsc-buffer"
version = "0.1.1"
@@ -7285,104 +7435,219 @@ dependencies = [
[[package]]
name = "sqlx"
-version = "0.6.3"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8de3b03a925878ed54a954f621e64bf55a3c1bd29652d0d1a17830405350188"
+checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33"
dependencies = [
"sqlx-core",
"sqlx-macros",
+ "sqlx-mysql",
+ "sqlx-postgres",
+ "sqlx-sqlite",
]
[[package]]
name = "sqlx-core"
-version = "0.6.3"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa8241483a83a3f33aa5fff7e7d9def398ff9990b2752b6c6112b83c6d246029"
+checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d"
dependencies = [
- "ahash 0.7.6",
+ "ahash 0.8.3",
"atoi",
- "base64 0.13.1",
- "bitflags 1.3.2",
+ "bigdecimal",
"byteorder",
"bytes 1.5.0",
"chrono",
"crc",
"crossbeam-queue",
- "dirs 4.0.0",
"dotenvy",
"either",
"event-listener",
- "flume",
"futures-channel",
"futures-core",
- "futures-executor",
"futures-intrusive",
+ "futures-io",
"futures-util",
- "hashlink 0.8.4",
+ "hashlink",
"hex",
- "hkdf",
- "hmac 0.12.1",
- "indexmap 1.9.3",
- "itoa",
- "libc",
- "libsqlite3-sys",
+ "indexmap 2.0.0",
"log",
- "md-5",
"memchr",
- "num-bigint 0.4.4",
"once_cell",
"paste",
"percent-encoding",
- "rand 0.8.5",
"rust_decimal",
- "rustls 0.20.9",
+ "rustls 0.21.7",
"rustls-pemfile",
"serde",
"serde_json",
- "sha1",
"sha2 0.10.7",
"smallvec",
"sqlformat",
- "sqlx-rt",
- "stringprep",
"thiserror",
"time",
+ "tokio",
"tokio-stream",
+ "tracing",
"url",
"uuid 1.4.1",
- "webpki-roots 0.22.6",
- "whoami",
+ "webpki-roots 0.24.0",
]
[[package]]
name = "sqlx-macros"
-version = "0.6.3"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "sqlx-core",
+ "sqlx-macros-core",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "sqlx-macros-core"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9966e64ae989e7e575b19d7265cb79d7fc3cbbdf179835cb0d716f294c2049c9"
+checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc"
dependencies = [
"dotenvy",
"either",
"heck 0.4.1",
+ "hex",
"once_cell",
"proc-macro2",
"quote",
+ "serde",
"serde_json",
"sha2 0.10.7",
"sqlx-core",
- "sqlx-rt",
+ "sqlx-mysql",
+ "sqlx-postgres",
+ "sqlx-sqlite",
"syn 1.0.109",
+ "tempfile",
+ "tokio",
"url",
]
[[package]]
-name = "sqlx-rt"
-version = "0.6.3"
+name = "sqlx-mysql"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db"
+dependencies = [
+ "atoi",
+ "base64 0.21.4",
+ "bigdecimal",
+ "bitflags 2.4.0",
+ "byteorder",
+ "bytes 1.5.0",
+ "chrono",
+ "crc",
+ "digest 0.10.7",
+ "dotenvy",
+ "either",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-util",
+ "generic-array",
+ "hex",
+ "hkdf",
+ "hmac 0.12.1",
+ "itoa",
+ "log",
+ "md-5",
+ "memchr",
+ "once_cell",
+ "percent-encoding",
+ "rand 0.8.5",
+ "rsa 0.9.2",
+ "rust_decimal",
+ "serde",
+ "sha1",
+ "sha2 0.10.7",
+ "smallvec",
+ "sqlx-core",
+ "stringprep",
+ "thiserror",
+ "time",
+ "tracing",
+ "uuid 1.4.1",
+ "whoami",
+]
+
+[[package]]
+name = "sqlx-postgres"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "804d3f245f894e61b1e6263c84b23ca675d96753b5abfd5cc8597d86806e8024"
+checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624"
dependencies = [
+ "atoi",
+ "base64 0.21.4",
+ "bigdecimal",
+ "bitflags 2.4.0",
+ "byteorder",
+ "chrono",
+ "crc",
+ "dotenvy",
+ "etcetera",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-util",
+ "hex",
+ "hkdf",
+ "hmac 0.12.1",
+ "home",
+ "itoa",
+ "log",
+ "md-5",
+ "memchr",
+ "num-bigint 0.4.4",
"once_cell",
- "tokio",
- "tokio-rustls",
+ "rand 0.8.5",
+ "rust_decimal",
+ "serde",
+ "serde_json",
+ "sha1",
+ "sha2 0.10.7",
+ "smallvec",
+ "sqlx-core",
+ "stringprep",
+ "thiserror",
+ "time",
+ "tracing",
+ "uuid 1.4.1",
+ "whoami",
+]
+
+[[package]]
+name = "sqlx-sqlite"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f"
+dependencies = [
+ "atoi",
+ "chrono",
+ "flume",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-intrusive",
+ "futures-util",
+ "libsqlite3-sys",
+ "log",
+ "percent-encoding",
+ "serde",
+ "sqlx-core",
+ "time",
+ "tracing",
+ "url",
+ "uuid 1.4.1",
]
[[package]]
@@ -64,6 +64,7 @@ members = [
"crates/sqlez",
"crates/sqlez_macros",
"crates/feature_flags",
+ "crates/rich_text",
"crates/storybook",
"crates/sum_tree",
"crates/terminal",
@@ -105,6 +106,7 @@ rand = { version = "0.8.5" }
refineable = { path = "./crates/refineable" }
regex = { version = "1.5" }
rust-embed = { version = "8.0", features = ["include-exclude"] }
+rusqlite = { version = "0.29.0", features = ["blob", "array", "modern_sqlite"] }
schemars = { version = "0.8" }
serde = { version = "1.0", features = ["derive", "rc"] }
serde_derive = { version = "1.0", features = ["deserialize_in_place"] }
@@ -120,6 +122,7 @@ tree-sitter = "0.20"
unindent = { version = "0.1.7" }
pretty_assertions = "1.3.0"
git2 = { version = "0.15", default-features = false}
+uuid = { version = "1.1.2", features = ["v4"] }
tree-sitter-bash = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "1b0321ee85701d5036c334a6f04761cdc672e64c" }
tree-sitter-c = "0.20.1"
@@ -1,6 +1,6 @@
# syntax = docker/dockerfile:1.2
-FROM rust:1.72-bullseye as builder
+FROM rust:1.73-bullseye as builder
WORKDIR app
COPY . .
@@ -27,7 +27,7 @@ log.workspace = true
parse_duration = "2.1.1"
tiktoken-rs = "0.5.0"
matrixmultiply = "0.3.7"
-rusqlite = { version = "0.27.0", features = ["blob", "array", "modern_sqlite"] }
+rusqlite = { version = "0.29.0", features = ["blob", "array", "modern_sqlite"] }
bincode = "1.3.3"
[dev-dependencies]
@@ -21,11 +21,11 @@ search = { path = "../search" }
settings = { path = "../settings" }
theme = { path = "../theme" }
util = { path = "../util" }
-uuid = { version = "1.1.2", features = ["v4"] }
workspace = { path = "../workspace" }
semantic_index = { path = "../semantic_index" }
project = { path = "../project" }
+uuid.workspace = true
log.workspace = true
anyhow.workspace = true
chrono = { version = "0.4", features = ["serde"] }
@@ -291,10 +291,10 @@ impl ActiveCall {
&mut self,
channel_id: u64,
cx: &mut ModelContext<Self>,
- ) -> Task<Result<()>> {
+ ) -> Task<Result<ModelHandle<Room>>> {
if let Some(room) = self.room().cloned() {
if room.read(cx).channel_id() == Some(channel_id) {
- return Task::ready(Ok(()));
+ return Task::ready(Ok(room));
} else {
room.update(cx, |room, cx| room.clear_state(cx));
}
@@ -309,7 +309,7 @@ impl ActiveCall {
this.update(&mut cx, |this, cx| {
this.report_call_event("join channel", cx)
});
- Ok(())
+ Ok(room)
})
}
@@ -104,6 +104,10 @@ impl Room {
self.channel_id
}
+ pub fn is_sharing_project(&self) -> bool {
+ !self.shared_projects.is_empty()
+ }
+
#[cfg(any(test, feature = "test-support"))]
pub fn is_connected(&self) -> bool {
if let Some(live_kit) = self.live_kit.as_ref() {
@@ -594,6 +598,31 @@ impl Room {
.map_or(&[], |v| v.as_slice())
}
+ /// Returns the most 'active' projects, defined as most people in the project
+ pub fn most_active_project(&self) -> Option<(u64, u64)> {
+ let mut projects = HashMap::default();
+ let mut hosts = HashMap::default();
+ for participant in self.remote_participants.values() {
+ match participant.location {
+ ParticipantLocation::SharedProject { project_id } => {
+ *projects.entry(project_id).or_insert(0) += 1;
+ }
+ ParticipantLocation::External | ParticipantLocation::UnsharedProject => {}
+ }
+ for project in &participant.projects {
+ *projects.entry(project.id).or_insert(0) += 1;
+ hosts.insert(project.id, participant.user.id);
+ }
+ }
+
+ let mut pairs: Vec<(u64, usize)> = projects.into_iter().collect();
+ pairs.sort_by_key(|(_, count)| *count as i32);
+
+ pairs
+ .first()
+ .map(|(project_id, _)| (*project_id, hosts[&project_id]))
+ }
+
async fn handle_room_updated(
this: ModelHandle<Self>,
envelope: TypedEnvelope<proto::RoomUpdated>,
@@ -23,6 +23,7 @@ language = { path = "../language" }
settings = { path = "../settings" }
feature_flags = { path = "../feature_flags" }
sum_tree = { path = "../sum_tree" }
+clock = { path = "../clock" }
anyhow.workspace = true
futures.workspace = true
@@ -38,7 +39,7 @@ smol.workspace = true
thiserror.workspace = true
time.workspace = true
tiny_http = "0.8"
-uuid = { version = "1.1.2", features = ["v4"] }
+uuid.workspace = true
url = "2.2"
serde.workspace = true
serde_derive.workspace = true
@@ -2,7 +2,7 @@ mod channel_buffer;
mod channel_chat;
mod channel_store;
-pub use channel_buffer::{ChannelBuffer, ChannelBufferEvent};
+pub use channel_buffer::{ChannelBuffer, ChannelBufferEvent, ACKNOWLEDGE_DEBOUNCE_INTERVAL};
pub use channel_chat::{ChannelChat, ChannelChatEvent, ChannelMessage, ChannelMessageId};
pub use channel_store::{
Channel, ChannelData, ChannelEvent, ChannelId, ChannelMembership, ChannelPath, ChannelStore,
@@ -2,14 +2,17 @@ use crate::Channel;
use anyhow::Result;
use client::{Client, Collaborator, UserStore};
use collections::HashMap;
-use gpui::{AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle};
+use gpui::{AppContext, AsyncAppContext, Entity, ModelContext, ModelHandle, Task};
+use language::proto::serialize_version;
use rpc::{
proto::{self, PeerId},
TypedEnvelope,
};
-use std::sync::Arc;
+use std::{sync::Arc, time::Duration};
use util::ResultExt;
+pub const ACKNOWLEDGE_DEBOUNCE_INTERVAL: Duration = Duration::from_millis(250);
+
pub(crate) fn init(client: &Arc<Client>) {
client.add_model_message_handler(ChannelBuffer::handle_update_channel_buffer);
client.add_model_message_handler(ChannelBuffer::handle_update_channel_buffer_collaborators);
@@ -24,11 +27,13 @@ pub struct ChannelBuffer {
buffer_epoch: u64,
client: Arc<Client>,
subscription: Option<client::Subscription>,
+ acknowledge_task: Option<Task<Result<()>>>,
}
pub enum ChannelBufferEvent {
CollaboratorsChanged,
Disconnected,
+ BufferEdited,
}
impl Entity for ChannelBuffer {
@@ -36,6 +41,9 @@ impl Entity for ChannelBuffer {
fn release(&mut self, _: &mut AppContext) {
if self.connected {
+ if let Some(task) = self.acknowledge_task.take() {
+ task.detach();
+ }
self.client
.send(proto::LeaveChannelBuffer {
channel_id: self.channel.id,
@@ -81,6 +89,7 @@ impl ChannelBuffer {
client,
connected: true,
collaborators: Default::default(),
+ acknowledge_task: None,
channel,
subscription: Some(subscription.set_model(&cx.handle(), &mut cx.to_async())),
user_store,
@@ -159,19 +168,45 @@ impl ChannelBuffer {
&mut self,
_: ModelHandle<language::Buffer>,
event: &language::Event,
- _: &mut ModelContext<Self>,
+ cx: &mut ModelContext<Self>,
) {
- if let language::Event::Operation(operation) = event {
- let operation = language::proto::serialize_operation(operation);
- self.client
- .send(proto::UpdateChannelBuffer {
- channel_id: self.channel.id,
- operations: vec![operation],
- })
- .log_err();
+ match event {
+ language::Event::Operation(operation) => {
+ let operation = language::proto::serialize_operation(operation);
+ self.client
+ .send(proto::UpdateChannelBuffer {
+ channel_id: self.channel.id,
+ operations: vec![operation],
+ })
+ .log_err();
+ }
+ language::Event::Edited => {
+ cx.emit(ChannelBufferEvent::BufferEdited);
+ }
+ _ => {}
}
}
+ 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 client = self.client.clone();
+ let epoch = self.epoch();
+
+ self.acknowledge_task = Some(cx.spawn_weak(|_, cx| async move {
+ cx.background().timer(ACKNOWLEDGE_DEBOUNCE_INTERVAL).await;
+ client
+ .send(proto::AckBufferOperation {
+ buffer_id,
+ epoch,
+ version: serialize_version(&version),
+ })
+ .ok();
+ Ok(())
+ }));
+ }
+
pub fn epoch(&self) -> u64 {
self.buffer_epoch
}
@@ -1,4 +1,4 @@
-use crate::Channel;
+use crate::{Channel, ChannelId, ChannelStore};
use anyhow::{anyhow, Result};
use client::{
proto,
@@ -16,7 +16,9 @@ use util::{post_inc, ResultExt as _, TryFutureExt};
pub struct ChannelChat {
channel: Arc<Channel>,
messages: SumTree<ChannelMessage>,
+ channel_store: ModelHandle<ChannelStore>,
loaded_all_messages: bool,
+ last_acknowledged_id: Option<u64>,
next_pending_message_id: usize,
user_store: ModelHandle<UserStore>,
rpc: Arc<Client>,
@@ -34,7 +36,7 @@ pub struct ChannelMessage {
pub nonce: u128,
}
-#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub enum ChannelMessageId {
Saved(u64),
Pending(usize),
@@ -55,6 +57,10 @@ pub enum ChannelChatEvent {
old_range: Range<usize>,
new_count: usize,
},
+ NewMessage {
+ channel_id: ChannelId,
+ message_id: u64,
+ },
}
pub fn init(client: &Arc<Client>) {
@@ -77,6 +83,7 @@ impl Entity for ChannelChat {
impl ChannelChat {
pub async fn new(
channel: Arc<Channel>,
+ channel_store: ModelHandle<ChannelStore>,
user_store: ModelHandle<UserStore>,
client: Arc<Client>,
mut cx: AsyncAppContext,
@@ -94,11 +101,13 @@ impl ChannelChat {
let mut this = Self {
channel,
user_store,
+ channel_store,
rpc: client,
outgoing_messages_lock: Default::default(),
messages: Default::default(),
loaded_all_messages,
next_pending_message_id: 0,
+ last_acknowledged_id: None,
rng: StdRng::from_entropy(),
_subscription: subscription.set_model(&cx.handle(), &mut cx.to_async()),
};
@@ -219,6 +228,26 @@ impl ChannelChat {
false
}
+ pub fn acknowledge_last_message(&mut self, cx: &mut ModelContext<Self>) {
+ if let ChannelMessageId::Saved(latest_message_id) = self.messages.summary().max_id {
+ if self
+ .last_acknowledged_id
+ .map_or(true, |acknowledged_id| acknowledged_id < latest_message_id)
+ {
+ self.rpc
+ .send(proto::AckChannelMessage {
+ channel_id: self.channel.id,
+ message_id: latest_message_id,
+ })
+ .ok();
+ self.last_acknowledged_id = Some(latest_message_id);
+ self.channel_store.update(cx, |store, cx| {
+ store.acknowledge_message_id(self.channel.id, latest_message_id, cx);
+ });
+ }
+ }
+ }
+
pub fn rejoin(&mut self, cx: &mut ModelContext<Self>) {
let user_store = self.user_store.clone();
let rpc = self.rpc.clone();
@@ -313,10 +342,15 @@ impl ChannelChat {
.payload
.message
.ok_or_else(|| anyhow!("empty message"))?;
+ let message_id = message.id;
let message = ChannelMessage::from_proto(message, &user_store, &mut cx).await?;
this.update(&mut cx, |this, cx| {
- this.insert_messages(SumTree::from_item(message, &()), cx)
+ this.insert_messages(SumTree::from_item(message, &()), cx);
+ cx.emit(ChannelChatEvent::NewMessage {
+ channel_id: this.channel.id,
+ message_id,
+ })
});
Ok(())
@@ -388,6 +422,7 @@ impl ChannelChat {
old_range: start_ix..end_ix,
new_count,
});
+
cx.notify();
}
}
@@ -43,6 +43,8 @@ pub type ChannelData = (Channel, ChannelPath);
pub struct Channel {
pub id: ChannelId,
pub name: String,
+ pub unseen_note_version: Option<(u64, clock::Global)>,
+ pub unseen_message_id: Option<u64>,
}
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Serialize, Deserialize)]
@@ -207,6 +209,64 @@ impl ChannelStore {
)
}
+ pub fn has_channel_buffer_changed(&self, channel_id: ChannelId) -> Option<bool> {
+ self.channel_index
+ .by_id()
+ .get(&channel_id)
+ .map(|channel| channel.unseen_note_version.is_some())
+ }
+
+ pub fn has_new_messages(&self, channel_id: ChannelId) -> Option<bool> {
+ self.channel_index
+ .by_id()
+ .get(&channel_id)
+ .map(|channel| channel.unseen_message_id.is_some())
+ }
+
+ pub fn notes_changed(
+ &mut self,
+ channel_id: ChannelId,
+ epoch: u64,
+ version: &clock::Global,
+ cx: &mut ModelContext<Self>,
+ ) {
+ self.channel_index.note_changed(channel_id, epoch, version);
+ cx.notify();
+ }
+
+ pub fn new_message(
+ &mut self,
+ channel_id: ChannelId,
+ message_id: u64,
+ cx: &mut ModelContext<Self>,
+ ) {
+ self.channel_index.new_message(channel_id, message_id);
+ cx.notify();
+ }
+
+ pub fn acknowledge_message_id(
+ &mut self,
+ channel_id: ChannelId,
+ message_id: u64,
+ cx: &mut ModelContext<Self>,
+ ) {
+ self.channel_index
+ .acknowledge_message_id(channel_id, message_id);
+ cx.notify();
+ }
+
+ pub fn acknowledge_notes_version(
+ &mut self,
+ channel_id: ChannelId,
+ epoch: u64,
+ version: &clock::Global,
+ cx: &mut ModelContext<Self>,
+ ) {
+ self.channel_index
+ .acknowledge_note_version(channel_id, epoch, version);
+ cx.notify();
+ }
+
pub fn open_channel_chat(
&mut self,
channel_id: ChannelId,
@@ -214,10 +274,11 @@ impl ChannelStore {
) -> Task<Result<ModelHandle<ChannelChat>>> {
let client = self.client.clone();
let user_store = self.user_store.clone();
+ let this = cx.handle();
self.open_channel_resource(
channel_id,
|this| &mut this.opened_chats,
- |channel, cx| ChannelChat::new(channel, user_store, client, cx),
+ |channel, cx| ChannelChat::new(channel, this, user_store, client, cx),
cx,
)
}
@@ -779,6 +840,8 @@ impl ChannelStore {
Arc::new(Channel {
id: channel.id,
name: channel.name,
+ unseen_note_version: None,
+ unseen_message_id: None,
}),
),
}
@@ -787,7 +850,9 @@ impl ChannelStore {
let channels_changed = !payload.channels.is_empty()
|| !payload.delete_channels.is_empty()
|| !payload.insert_edge.is_empty()
- || !payload.delete_edge.is_empty();
+ || !payload.delete_edge.is_empty()
+ || !payload.unseen_channel_messages.is_empty()
+ || !payload.unseen_channel_buffer_changes.is_empty();
if channels_changed {
if !payload.delete_channels.is_empty() {
@@ -814,6 +879,22 @@ impl ChannelStore {
index.insert(channel)
}
+ for unseen_buffer_change in payload.unseen_channel_buffer_changes {
+ let version = language::proto::deserialize_version(&unseen_buffer_change.version);
+ index.note_changed(
+ unseen_buffer_change.channel_id,
+ unseen_buffer_change.epoch,
+ &version,
+ );
+ }
+
+ for unseen_channel_message in payload.unseen_channel_messages {
+ index.new_messages(
+ unseen_channel_message.channel_id,
+ unseen_channel_message.message_id,
+ );
+ }
+
for edge in payload.insert_edge {
index.insert_edge(edge.channel_id, edge.parent_id);
}
@@ -38,6 +38,43 @@ impl ChannelIndex {
channels_by_id: &mut self.channels_by_id,
}
}
+
+ pub fn acknowledge_note_version(
+ &mut self,
+ channel_id: ChannelId,
+ epoch: u64,
+ version: &clock::Global,
+ ) {
+ if let Some(channel) = self.channels_by_id.get_mut(&channel_id) {
+ let channel = Arc::make_mut(channel);
+ if let Some((unseen_epoch, unseen_version)) = &channel.unseen_note_version {
+ if epoch > *unseen_epoch
+ || epoch == *unseen_epoch && version.observed_all(unseen_version)
+ {
+ channel.unseen_note_version = None;
+ }
+ }
+ }
+ }
+
+ pub fn acknowledge_message_id(&mut self, channel_id: ChannelId, message_id: u64) {
+ if let Some(channel) = self.channels_by_id.get_mut(&channel_id) {
+ let channel = Arc::make_mut(channel);
+ if let Some(unseen_message_id) = channel.unseen_message_id {
+ if message_id >= unseen_message_id {
+ channel.unseen_message_id = None;
+ }
+ }
+ }
+ }
+
+ pub fn note_changed(&mut self, channel_id: ChannelId, epoch: u64, version: &clock::Global) {
+ insert_note_changed(&mut self.channels_by_id, channel_id, epoch, version);
+ }
+
+ pub fn new_message(&mut self, channel_id: ChannelId, message_id: u64) {
+ insert_new_message(&mut self.channels_by_id, channel_id, message_id)
+ }
}
impl Deref for ChannelIndex {
@@ -76,6 +113,14 @@ impl<'a> ChannelPathsInsertGuard<'a> {
}
}
+ pub fn note_changed(&mut self, channel_id: ChannelId, epoch: u64, version: &clock::Global) {
+ insert_note_changed(&mut self.channels_by_id, channel_id, epoch, &version);
+ }
+
+ pub fn new_messages(&mut self, channel_id: ChannelId, message_id: u64) {
+ insert_new_message(&mut self.channels_by_id, channel_id, message_id)
+ }
+
pub fn insert(&mut self, channel_proto: proto::Channel) {
if let Some(existing_channel) = self.channels_by_id.get_mut(&channel_proto.id) {
Arc::make_mut(existing_channel).name = channel_proto.name;
@@ -85,6 +130,8 @@ impl<'a> ChannelPathsInsertGuard<'a> {
Arc::new(Channel {
id: channel_proto.id,
name: channel_proto.name,
+ unseen_note_version: None,
+ unseen_message_id: None,
}),
);
self.insert_root(channel_proto.id);
@@ -160,3 +207,32 @@ fn channel_path_sorting_key<'a>(
path.iter()
.map(|id| Some(channels_by_id.get(id)?.name.as_str()))
}
+
+fn insert_note_changed(
+ channels_by_id: &mut BTreeMap<ChannelId, Arc<Channel>>,
+ channel_id: u64,
+ epoch: u64,
+ version: &clock::Global,
+) {
+ if let Some(channel) = channels_by_id.get_mut(&channel_id) {
+ let unseen_version = Arc::make_mut(channel)
+ .unseen_note_version
+ .get_or_insert((0, clock::Global::new()));
+ if epoch > unseen_version.0 {
+ *unseen_version = (epoch, version.clone());
+ } else {
+ unseen_version.1.join(&version);
+ }
+ }
+}
+
+fn insert_new_message(
+ channels_by_id: &mut BTreeMap<ChannelId, Arc<Channel>>,
+ channel_id: u64,
+ message_id: u64,
+) {
+ if let Some(channel) = channels_by_id.get_mut(&channel_id) {
+ let unseen_message_id = Arc::make_mut(channel).unseen_message_id.get_or_insert(0);
+ *unseen_message_id = message_id.max(*unseen_message_id);
+ }
+}
@@ -41,8 +41,8 @@ tempfile = "3"
thiserror.workspace = true
time.workspace = true
tiny_http = "0.8"
+uuid.workspace = true
url = "2.2"
-uuid = { version = "1.1.2", features = ["v4"] }
[dev-dependencies]
collections = { path = "../collections", features = ["test-support"] }
@@ -34,7 +34,7 @@ use std::{
future::Future,
marker::PhantomData,
path::PathBuf,
- sync::{Arc, Weak},
+ sync::{atomic::AtomicU64, Arc, Weak},
time::{Duration, Instant},
};
use telemetry::Telemetry;
@@ -105,7 +105,7 @@ pub fn init(client: &Arc<Client>, cx: &mut AppContext) {
}
pub struct Client {
- id: usize,
+ id: AtomicU64,
peer: Arc<Peer>,
http: Arc<dyn HttpClient>,
telemetry: Arc<Telemetry>,
@@ -374,7 +374,7 @@ impl settings::Setting for TelemetrySettings {
impl Client {
pub fn new(http: Arc<dyn HttpClient>, cx: &AppContext) -> Arc<Self> {
Arc::new(Self {
- id: 0,
+ id: AtomicU64::new(0),
peer: Peer::new(0),
telemetry: Telemetry::new(http.clone(), cx),
http,
@@ -387,17 +387,16 @@ impl Client {
})
}
- pub fn id(&self) -> usize {
- self.id
+ pub fn id(&self) -> u64 {
+ self.id.load(std::sync::atomic::Ordering::SeqCst)
}
pub fn http_client(&self) -> Arc<dyn HttpClient> {
self.http.clone()
}
- #[cfg(any(test, feature = "test-support"))]
- pub fn set_id(&mut self, id: usize) -> &Self {
- self.id = id;
+ pub fn set_id(&self, id: u64) -> &Self {
+ self.id.store(id, std::sync::atomic::Ordering::SeqCst);
self
}
@@ -454,7 +453,7 @@ impl Client {
}
fn set_status(self: &Arc<Self>, status: Status, cx: &AsyncAppContext) {
- log::info!("set status on client {}: {:?}", self.id, status);
+ log::info!("set status on client {}: {:?}", self.id(), status);
let mut state = self.state.write();
*state.status.0.borrow_mut() = status;
@@ -805,6 +804,7 @@ impl Client {
}
}
let credentials = credentials.unwrap();
+ self.set_id(credentials.user_id);
if was_disconnected {
self.set_status(Status::Connecting, cx);
@@ -1221,7 +1221,7 @@ impl Client {
}
pub fn send<T: EnvelopedMessage>(&self, message: T) -> Result<()> {
- log::debug!("rpc send. client_id:{}, name:{}", self.id, T::NAME);
+ log::debug!("rpc send. client_id:{}, name:{}", self.id(), T::NAME);
self.peer.send(self.connection_id()?, message)
}
@@ -1237,7 +1237,7 @@ impl Client {
&self,
request: T,
) -> impl Future<Output = Result<TypedEnvelope<T::Response>>> {
- let client_id = self.id;
+ let client_id = self.id();
log::debug!(
"rpc request start. client_id:{}. name:{}",
client_id,
@@ -1258,7 +1258,7 @@ impl Client {
}
fn respond<T: RequestMessage>(&self, receipt: Receipt<T>, response: T::Response) -> Result<()> {
- log::debug!("rpc respond. client_id:{}. name:{}", self.id, T::NAME);
+ log::debug!("rpc respond. client_id:{}. name:{}", self.id(), T::NAME);
self.peer.respond(receipt, response)
}
@@ -1267,7 +1267,7 @@ impl Client {
receipt: Receipt<T>,
error: proto::Error,
) -> Result<()> {
- log::debug!("rpc respond. client_id:{}. name:{}", self.id, T::NAME);
+ log::debug!("rpc respond. client_id:{}. name:{}", self.id(), T::NAME);
self.peer.respond_with_error(receipt, error)
}
@@ -1336,7 +1336,7 @@ impl Client {
if let Some(handler) = handler {
let future = handler(subscriber, message, &self, cx.clone());
- let client_id = self.id;
+ let client_id = self.id();
log::debug!(
"rpc message received. client_id:{}, sender_id:{:?}, type:{}",
client_id,
@@ -8,6 +8,7 @@ use sysinfo::{Pid, PidExt, ProcessExt, System, SystemExt};
use tempfile::NamedTempFile;
use util::http::HttpClient;
use util::{channel::ReleaseChannel, TryFutureExt};
+use uuid::Uuid;
pub struct Telemetry {
http_client: Arc<dyn HttpClient>,
@@ -18,7 +19,8 @@ pub struct Telemetry {
#[derive(Default)]
struct TelemetryState {
metrics_id: Option<Arc<str>>, // Per logged-in user
- installation_id: Option<Arc<str>>, // Per app installation
+ installation_id: Option<Arc<str>>, // Per app installation (different for dev, preview, and stable)
+ session_id: String, // Per app launch
app_version: Option<Arc<str>>,
release_channel: Option<&'static str>,
os_name: &'static str,
@@ -41,6 +43,7 @@ lazy_static! {
struct ClickhouseEventRequestBody {
token: &'static str,
installation_id: Option<Arc<str>>,
+ session_id: String,
is_staff: Option<bool>,
app_version: Option<Arc<str>>,
os_name: &'static str,
@@ -90,14 +93,12 @@ pub enum ClickhouseEvent {
model: &'static str,
},
Cpu {
- usage_as_percent: f32,
+ usage_as_percentage: f32,
core_count: u32,
},
Memory {
memory_in_bytes: u64,
virtual_memory_in_bytes: u64,
- start_time_in_seconds: u64,
- run_time_in_seconds: u64,
},
}
@@ -133,6 +134,7 @@ impl Telemetry {
release_channel,
installation_id: None,
metrics_id: None,
+ session_id: Uuid::new_v4().to_string(),
clickhouse_events_queue: Default::default(),
flush_clickhouse_events_task: Default::default(),
log_file: None,
@@ -168,8 +170,6 @@ impl Telemetry {
const DURATION_BETWEEN_SYSTEM_EVENTS: Duration = Duration::from_secs(60);
smol::Timer::after(DURATION_BETWEEN_SYSTEM_EVENTS).await;
- let telemetry_settings = cx.update(|cx| *settings::get::<TelemetrySettings>(cx));
-
system.refresh_memory();
system.refresh_processes();
@@ -184,15 +184,15 @@ impl Telemetry {
let memory_event = ClickhouseEvent::Memory {
memory_in_bytes: process.memory(),
virtual_memory_in_bytes: process.virtual_memory(),
- start_time_in_seconds: process.start_time(),
- run_time_in_seconds: process.run_time(),
};
let cpu_event = ClickhouseEvent::Cpu {
- usage_as_percent: process.cpu_usage(),
+ usage_as_percentage: process.cpu_usage(),
core_count: system.cpus().len() as u32,
};
+ let telemetry_settings = cx.update(|cx| *settings::get::<TelemetrySettings>(cx));
+
this.report_clickhouse_event(memory_event, telemetry_settings);
this.report_clickhouse_event(cpu_event, telemetry_settings);
}
@@ -289,6 +289,7 @@ impl Telemetry {
&ClickhouseEventRequestBody {
token: ZED_SECRET_CLIENT_TOKEN,
installation_id: state.installation_id.clone(),
+ session_id: state.session_id.clone(),
is_staff: state.is_staff.clone(),
app_version: state.app_version.clone(),
os_name: state.os_name,
@@ -3,7 +3,7 @@ authors = ["Nathan Sobo <nathan@zed.dev>"]
default-run = "collab"
edition = "2021"
name = "collab"
-version = "0.22.1"
+version = "0.23.2"
publish = false
[[bin]]
@@ -42,14 +42,12 @@ rand.workspace = true
reqwest = { version = "0.11", features = ["json"], optional = true }
scrypt = "0.7"
smallvec.workspace = true
-# Remove fork dependency when a version with https://github.com/SeaQL/sea-orm/pull/1283 is released.
-sea-orm = { git = "https://github.com/zed-industries/sea-orm", rev = "18f4c691085712ad014a51792af75a9044bacee6", features = ["sqlx-postgres", "postgres-array", "runtime-tokio-rustls"] }
-sea-query = "0.27"
+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"
-sqlx = { version = "0.6", features = ["runtime-tokio-rustls", "postgres", "json", "time", "uuid", "any"] }
+sqlx = { version = "0.7", features = ["runtime-tokio-rustls", "postgres", "json", "time", "uuid", "any"] }
time.workspace = true
tokio = { version = "1", features = ["full"] }
tokio-tungstenite = "0.17"
@@ -59,6 +57,7 @@ toml.workspace = true
tracing = "0.1.34"
tracing-log = "0.1.3"
tracing-subscriber = { version = "0.3.11", features = ["env-filter", "json"] }
+uuid.workspace = true
[dev-dependencies]
audio = { path = "../audio" }
@@ -87,9 +86,9 @@ env_logger.workspace = true
indoc.workspace = true
util = { path = "../util" }
lazy_static.workspace = true
-sea-orm = { git = "https://github.com/zed-industries/sea-orm", rev = "18f4c691085712ad014a51792af75a9044bacee6", features = ["sqlx-sqlite"] }
+sea-orm = { version = "0.12.x", features = ["sqlx-sqlite"] }
serde_json.workspace = true
-sqlx = { version = "0.6", features = ["sqlite"] }
+sqlx = { version = "0.7", features = ["sqlite"] }
unindent.workspace = true
[features]
@@ -289,3 +289,24 @@ CREATE TABLE "user_features" (
CREATE UNIQUE INDEX "index_user_features_user_id_and_feature_id" ON "user_features" ("user_id", "feature_id");
CREATE INDEX "index_user_features_on_user_id" ON "user_features" ("user_id");
CREATE INDEX "index_user_features_on_feature_id" ON "user_features" ("feature_id");
+
+
+CREATE TABLE "observed_buffer_edits" (
+ "user_id" INTEGER NOT NULL REFERENCES users (id) ON DELETE CASCADE,
+ "buffer_id" INTEGER NOT NULL REFERENCES buffers (id) ON DELETE CASCADE,
+ "epoch" INTEGER NOT NULL,
+ "lamport_timestamp" INTEGER NOT NULL,
+ "replica_id" INTEGER NOT NULL,
+ PRIMARY KEY (user_id, buffer_id)
+);
+
+CREATE UNIQUE INDEX "index_observed_buffers_user_and_buffer_id" ON "observed_buffer_edits" ("user_id", "buffer_id");
+
+CREATE TABLE IF NOT EXISTS "observed_channel_messages" (
+ "user_id" INTEGER NOT NULL REFERENCES users (id) ON DELETE CASCADE,
+ "channel_id" INTEGER NOT NULL REFERENCES channels (id) ON DELETE CASCADE,
+ "channel_message_id" INTEGER NOT NULL,
+ PRIMARY KEY (user_id, channel_id)
+);
+
+CREATE UNIQUE INDEX "index_observed_channel_messages_user_and_channel_id" ON "observed_channel_messages" ("user_id", "channel_id");
@@ -0,0 +1,19 @@
+CREATE TABLE IF NOT EXISTS "observed_buffer_edits" (
+ "user_id" INTEGER NOT NULL REFERENCES users (id) ON DELETE CASCADE,
+ "buffer_id" INTEGER NOT NULL REFERENCES buffers (id) ON DELETE CASCADE,
+ "epoch" INTEGER NOT NULL,
+ "lamport_timestamp" INTEGER NOT NULL,
+ "replica_id" INTEGER NOT NULL,
+ PRIMARY KEY (user_id, buffer_id)
+);
+
+CREATE UNIQUE INDEX "index_observed_buffer_user_and_buffer_id" ON "observed_buffer_edits" ("user_id", "buffer_id");
+
+CREATE TABLE IF NOT EXISTS "observed_channel_messages" (
+ "user_id" INTEGER NOT NULL REFERENCES users (id) ON DELETE CASCADE,
+ "channel_id" INTEGER NOT NULL REFERENCES channels (id) ON DELETE CASCADE,
+ "channel_message_id" INTEGER NOT NULL,
+ PRIMARY KEY (user_id, channel_id)
+);
+
+CREATE UNIQUE INDEX "index_observed_channel_messages_user_and_channel_id" ON "observed_channel_messages" ("user_id", "channel_id");
@@ -19,11 +19,12 @@ use rpc::{
ConnectionId,
};
use sea_orm::{
- entity::prelude::*, ActiveValue, Condition, ConnectionTrait, DatabaseConnection,
- DatabaseTransaction, DbErr, FromQueryResult, IntoActiveModel, IsolationLevel, JoinType,
- QueryOrder, QuerySelect, Statement, TransactionTrait,
+ entity::prelude::*,
+ sea_query::{Alias, Expr, OnConflict, Query},
+ ActiveValue, Condition, ConnectionTrait, DatabaseConnection, DatabaseTransaction, DbErr,
+ FromQueryResult, IntoActiveModel, IsolationLevel, JoinType, QueryOrder, QuerySelect, Statement,
+ TransactionTrait,
};
-use sea_query::{Alias, Expr, OnConflict, Query};
use serde::{Deserialize, Serialize};
use sqlx::{
migrate::{Migrate, Migration, MigrationSource},
@@ -62,6 +63,7 @@ pub struct Database {
// separate files in the `queries` folder.
impl Database {
pub async fn new(options: ConnectOptions, executor: Executor) -> Result<Self> {
+ sqlx::any::install_default_drivers();
Ok(Self {
options: options.clone(),
pool: sea_orm::Database::connect(options).await?,
@@ -119,7 +121,7 @@ impl Database {
Ok(new_migrations)
}
- async fn transaction<F, Fut, T>(&self, f: F) -> Result<T>
+ pub async fn transaction<F, Fut, T>(&self, f: F) -> Result<T>
where
F: Send + Fn(TransactionHandle) -> Fut,
Fut: Send + Future<Output = Result<T>>,
@@ -321,7 +323,7 @@ fn is_serialization_error(error: &Error) -> bool {
}
}
-struct TransactionHandle(Arc<Option<DatabaseTransaction>>);
+pub struct TransactionHandle(Arc<Option<DatabaseTransaction>>);
impl Deref for TransactionHandle {
type Target = DatabaseTransaction;
@@ -437,6 +439,8 @@ pub struct ChannelsForUser {
pub channels: ChannelGraph,
pub channel_participants: HashMap<ChannelId, Vec<UserId>>,
pub channels_with_admin_privileges: HashSet<ChannelId>,
+ pub unseen_buffer_changes: Vec<proto::UnseenChannelBufferChange>,
+ pub channel_messages: Vec<proto::UnseenChannelMessage>,
}
#[derive(Debug)]
@@ -1,6 +1,5 @@
use crate::Result;
-use sea_orm::DbErr;
-use sea_query::{Value, ValueTypeErr};
+use sea_orm::{entity::prelude::*, DbErr};
use serde::{Deserialize, Serialize};
macro_rules! id_type {
@@ -17,6 +16,7 @@ macro_rules! id_type {
Hash,
Serialize,
Deserialize,
+ DeriveValueType,
)]
#[serde(transparent)]
pub struct $name(pub i32);
@@ -42,40 +42,6 @@ macro_rules! id_type {
}
}
- impl From<$name> for sea_query::Value {
- fn from(value: $name) -> Self {
- sea_query::Value::Int(Some(value.0))
- }
- }
-
- impl sea_orm::TryGetable for $name {
- fn try_get(
- res: &sea_orm::QueryResult,
- pre: &str,
- col: &str,
- ) -> Result<Self, sea_orm::TryGetError> {
- Ok(Self(i32::try_get(res, pre, col)?))
- }
- }
-
- impl sea_query::ValueType for $name {
- fn try_from(v: Value) -> Result<Self, sea_query::ValueTypeErr> {
- Ok(Self(value_to_integer(v)?))
- }
-
- fn type_name() -> String {
- stringify!($name).into()
- }
-
- fn array_type() -> sea_query::ArrayType {
- sea_query::ArrayType::Int
- }
-
- fn column_type() -> sea_query::ColumnType {
- sea_query::ColumnType::Integer(None)
- }
- }
-
impl sea_orm::TryFromU64 for $name {
fn try_from_u64(n: u64) -> Result<Self, DbErr> {
Ok(Self(n.try_into().map_err(|_| {
@@ -88,7 +54,7 @@ macro_rules! id_type {
}
}
- impl sea_query::Nullable for $name {
+ impl sea_orm::sea_query::Nullable for $name {
fn null() -> Value {
Value::Int(None)
}
@@ -96,20 +62,6 @@ macro_rules! id_type {
};
}
-fn value_to_integer(v: Value) -> Result<i32, ValueTypeErr> {
- match v {
- Value::TinyInt(Some(int)) => int.try_into().map_err(|_| ValueTypeErr),
- Value::SmallInt(Some(int)) => int.try_into().map_err(|_| ValueTypeErr),
- Value::Int(Some(int)) => int.try_into().map_err(|_| ValueTypeErr),
- Value::BigInt(Some(int)) => int.try_into().map_err(|_| ValueTypeErr),
- Value::TinyUnsigned(Some(int)) => int.try_into().map_err(|_| ValueTypeErr),
- Value::SmallUnsigned(Some(int)) => int.try_into().map_err(|_| ValueTypeErr),
- Value::Unsigned(Some(int)) => int.try_into().map_err(|_| ValueTypeErr),
- Value::BigUnsigned(Some(int)) => int.try_into().map_err(|_| ValueTypeErr),
- _ => Err(ValueTypeErr),
- }
-}
-
id_type!(BufferId);
id_type!(AccessTokenId);
id_type!(ChannelChatParticipantId);
@@ -74,7 +74,32 @@ impl Database {
.await?;
collaborators.push(collaborator);
- let (base_text, operations) = self.get_buffer_state(&buffer, &tx).await?;
+ let (base_text, operations, max_operation) =
+ self.get_buffer_state(&buffer, &tx).await?;
+
+ // Save the last observed operation
+ if let Some(op) = max_operation {
+ observed_buffer_edits::Entity::insert(observed_buffer_edits::ActiveModel {
+ user_id: ActiveValue::Set(user_id),
+ buffer_id: ActiveValue::Set(buffer.id),
+ epoch: ActiveValue::Set(op.epoch),
+ lamport_timestamp: ActiveValue::Set(op.lamport_timestamp),
+ replica_id: ActiveValue::Set(op.replica_id),
+ })
+ .on_conflict(
+ OnConflict::columns([
+ observed_buffer_edits::Column::UserId,
+ observed_buffer_edits::Column::BufferId,
+ ])
+ .update_columns([
+ observed_buffer_edits::Column::Epoch,
+ observed_buffer_edits::Column::LamportTimestamp,
+ ])
+ .to_owned(),
+ )
+ .exec(&*tx)
+ .await?;
+ }
Ok(proto::JoinChannelBufferResponse {
buffer_id: buffer.id.to_proto(),
@@ -373,33 +398,46 @@ impl Database {
channel_id: ChannelId,
) -> Result<Vec<UserId>> {
self.transaction(|tx| async move {
- #[derive(Debug, Clone, Copy, EnumIter, DeriveColumn)]
- enum QueryUserIds {
- UserId,
- }
-
- let users: Vec<UserId> = channel_buffer_collaborator::Entity::find()
- .select_only()
- .column(channel_buffer_collaborator::Column::UserId)
- .filter(
- Condition::all()
- .add(channel_buffer_collaborator::Column::ChannelId.eq(channel_id)),
- )
- .into_values::<_, QueryUserIds>()
- .all(&*tx)
- .await?;
-
- Ok(users)
+ self.get_channel_buffer_collaborators_internal(channel_id, &*tx)
+ .await
})
.await
}
+ async fn get_channel_buffer_collaborators_internal(
+ &self,
+ channel_id: ChannelId,
+ tx: &DatabaseTransaction,
+ ) -> Result<Vec<UserId>> {
+ #[derive(Debug, Clone, Copy, EnumIter, DeriveColumn)]
+ enum QueryUserIds {
+ UserId,
+ }
+
+ let users: Vec<UserId> = channel_buffer_collaborator::Entity::find()
+ .select_only()
+ .column(channel_buffer_collaborator::Column::UserId)
+ .filter(
+ Condition::all().add(channel_buffer_collaborator::Column::ChannelId.eq(channel_id)),
+ )
+ .into_values::<_, QueryUserIds>()
+ .all(&*tx)
+ .await?;
+
+ Ok(users)
+ }
+
pub async fn update_channel_buffer(
&self,
channel_id: ChannelId,
user: UserId,
operations: &[proto::Operation],
- ) -> Result<Vec<ConnectionId>> {
+ ) -> Result<(
+ Vec<ConnectionId>,
+ Vec<UserId>,
+ i32,
+ Vec<proto::VectorClockEntry>,
+ )> {
self.transaction(move |tx| async move {
self.check_user_is_channel_member(channel_id, user, &*tx)
.await?;
@@ -418,7 +456,38 @@ impl Database {
.iter()
.filter_map(|op| operation_to_storage(op, &buffer, serialization_version))
.collect::<Vec<_>>();
+
+ let mut channel_members;
+ let max_version;
+
if !operations.is_empty() {
+ let max_operation = operations
+ .iter()
+ .max_by_key(|op| (op.lamport_timestamp.as_ref(), op.replica_id.as_ref()))
+ .unwrap();
+
+ max_version = vec![proto::VectorClockEntry {
+ replica_id: *max_operation.replica_id.as_ref() as u32,
+ timestamp: *max_operation.lamport_timestamp.as_ref() as u32,
+ }];
+
+ // get current channel participants and save the max operation above
+ self.save_max_operation(
+ user,
+ buffer.id,
+ buffer.epoch,
+ *max_operation.replica_id.as_ref(),
+ *max_operation.lamport_timestamp.as_ref(),
+ &*tx,
+ )
+ .await?;
+
+ channel_members = self.get_channel_members_internal(channel_id, &*tx).await?;
+ let collaborators = self
+ .get_channel_buffer_collaborators_internal(channel_id, &*tx)
+ .await?;
+ channel_members.retain(|member| !collaborators.contains(member));
+
buffer_operation::Entity::insert_many(operations)
.on_conflict(
OnConflict::columns([
@@ -432,6 +501,9 @@ impl Database {
)
.exec(&*tx)
.await?;
+ } else {
+ channel_members = Vec::new();
+ max_version = Vec::new();
}
let mut connections = Vec::new();
@@ -450,11 +522,53 @@ impl Database {
});
}
- Ok(connections)
+ Ok((connections, channel_members, buffer.epoch, max_version))
})
.await
}
+ async fn save_max_operation(
+ &self,
+ user_id: UserId,
+ buffer_id: BufferId,
+ epoch: i32,
+ replica_id: i32,
+ lamport_timestamp: i32,
+ 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),
+ epoch: ActiveValue::Set(epoch),
+ replica_id: ActiveValue::Set(replica_id),
+ lamport_timestamp: ActiveValue::Set(lamport_timestamp),
+ })
+ .on_conflict(
+ OnConflict::columns([Column::UserId, Column::BufferId])
+ .update_columns([Column::Epoch, Column::LamportTimestamp, Column::ReplicaId])
+ .action_cond_where(
+ Condition::any().add(Column::Epoch.lt(epoch)).add(
+ Condition::all().add(Column::Epoch.eq(epoch)).add(
+ Condition::any()
+ .add(Column::LamportTimestamp.lt(lamport_timestamp))
+ .add(
+ Column::LamportTimestamp
+ .eq(lamport_timestamp)
+ .and(Column::ReplicaId.lt(replica_id)),
+ ),
+ ),
+ ),
+ )
+ .to_owned(),
+ )
+ .exec_without_returning(tx)
+ .await?;
+
+ Ok(())
+ }
+
async fn get_buffer_operation_serialization_version(
&self,
buffer_id: BufferId,
@@ -472,7 +586,7 @@ impl Database {
.ok_or_else(|| anyhow!("missing buffer snapshot"))?)
}
- async fn get_channel_buffer(
+ pub async fn get_channel_buffer(
&self,
channel_id: ChannelId,
tx: &DatabaseTransaction,
@@ -491,7 +605,11 @@ impl Database {
&self,
buffer: &buffer::Model,
tx: &DatabaseTransaction,
- ) -> Result<(String, Vec<proto::Operation>)> {
+ ) -> Result<(
+ String,
+ Vec<proto::Operation>,
+ Option<buffer_operation::Model>,
+ )> {
let id = buffer.id;
let (base_text, version) = if buffer.epoch > 0 {
let snapshot = buffer_snapshot::Entity::find()
@@ -516,16 +634,28 @@ impl Database {
.eq(id)
.and(buffer_operation::Column::Epoch.eq(buffer.epoch)),
)
+ .order_by_asc(buffer_operation::Column::LamportTimestamp)
+ .order_by_asc(buffer_operation::Column::ReplicaId)
.stream(&*tx)
.await?;
+
let mut operations = Vec::new();
+ let mut last_row = None;
while let Some(row) = rows.next().await {
+ let row = row?;
+ last_row = Some(buffer_operation::Model {
+ buffer_id: row.buffer_id,
+ epoch: row.epoch,
+ lamport_timestamp: row.lamport_timestamp,
+ replica_id: row.lamport_timestamp,
+ value: Default::default(),
+ });
operations.push(proto::Operation {
- variant: Some(operation_from_storage(row?, version)?),
- })
+ variant: Some(operation_from_storage(row, version)?),
+ });
}
- Ok((base_text, operations))
+ Ok((base_text, operations, last_row))
}
async fn snapshot_channel_buffer(
@@ -534,7 +664,7 @@ impl Database {
tx: &DatabaseTransaction,
) -> Result<()> {
let buffer = self.get_channel_buffer(channel_id, tx).await?;
- let (base_text, operations) = self.get_buffer_state(&buffer, tx).await?;
+ let (base_text, operations, _) = self.get_buffer_state(&buffer, tx).await?;
if operations.is_empty() {
return Ok(());
}
@@ -567,6 +697,150 @@ impl Database {
Ok(())
}
+
+ pub async fn observe_buffer_version(
+ &self,
+ buffer_id: BufferId,
+ user_id: UserId,
+ epoch: i32,
+ version: &[proto::VectorClockEntry],
+ ) -> Result<()> {
+ self.transaction(|tx| async move {
+ // For now, combine concurrent operations.
+ let Some(component) = version.iter().max_by_key(|version| version.timestamp) else {
+ return Ok(());
+ };
+ self.save_max_operation(
+ user_id,
+ buffer_id,
+ epoch,
+ component.replica_id as i32,
+ component.timestamp as i32,
+ &*tx,
+ )
+ .await?;
+ Ok(())
+ })
+ .await
+ }
+
+ pub async fn unseen_channel_buffer_changes(
+ &self,
+ user_id: UserId,
+ channel_ids: &[ChannelId],
+ tx: &DatabaseTransaction,
+ ) -> Result<Vec<proto::UnseenChannelBufferChange>> {
+ #[derive(Debug, Clone, Copy, EnumIter, DeriveColumn)]
+ enum QueryIds {
+ ChannelId,
+ Id,
+ }
+
+ 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 mut observed_edits_by_buffer_id = HashMap::default();
+ let mut rows = 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()),
+ )
+ .stream(&*tx)
+ .await?;
+ while let Some(row) = rows.next().await {
+ let row = row?;
+ observed_edits_by_buffer_id.insert(row.buffer_id, row);
+ }
+ drop(rows);
+
+ let latest_operations = self
+ .get_latest_operations_for_buffers(channel_ids_by_buffer_id.keys().copied(), &*tx)
+ .await?;
+
+ let mut changes = Vec::default();
+ for latest in latest_operations {
+ if let Some(observed) = observed_edits_by_buffer_id.get(&latest.buffer_id) {
+ if (
+ observed.epoch,
+ observed.lamport_timestamp,
+ observed.replica_id,
+ ) >= (latest.epoch, latest.lamport_timestamp, latest.replica_id)
+ {
+ continue;
+ }
+ }
+
+ if let Some(channel_id) = channel_ids_by_buffer_id.get(&latest.buffer_id) {
+ changes.push(proto::UnseenChannelBufferChange {
+ channel_id: channel_id.to_proto(),
+ epoch: latest.epoch as u64,
+ version: vec![proto::VectorClockEntry {
+ replica_id: latest.replica_id as u32,
+ timestamp: latest.lamport_timestamp as u32,
+ }],
+ });
+ }
+ }
+
+ Ok(changes)
+ }
+
+ pub async fn get_latest_operations_for_buffers(
+ &self,
+ buffer_ids: impl IntoIterator<Item = BufferId>,
+ tx: &DatabaseTransaction,
+ ) -> Result<Vec<buffer_operation::Model>> {
+ let mut values = String::new();
+ for id in buffer_ids {
+ if !values.is_empty() {
+ values.push_str(", ");
+ }
+ write!(&mut values, "({})", id).unwrap();
+ }
+
+ if values.is_empty() {
+ return Ok(Vec::default());
+ }
+
+ let sql = format!(
+ r#"
+ SELECT
+ *
+ FROM
+ (
+ SELECT
+ *,
+ row_number() OVER (
+ PARTITION BY buffer_id
+ ORDER BY
+ epoch DESC,
+ lamport_timestamp DESC,
+ replica_id DESC
+ ) as row_number
+ FROM buffer_operations
+ WHERE
+ buffer_id in ({values})
+ ) AS last_operations
+ WHERE
+ row_number = 1
+ "#,
+ );
+
+ let stmt = Statement::from_string(self.pool.get_database_backend(), sql);
+ Ok(buffer_operation::Entity::find()
+ .from_raw_sql(stmt)
+ .all(&*tx)
+ .await?)
+ }
}
fn operation_to_storage(
@@ -1,8 +1,7 @@
+use super::*;
use rpc::proto::ChannelEdge;
use smallvec::SmallVec;
-use super::*;
-
type ChannelDescendants = HashMap<ChannelId, SmallSet<ChannelId>>;
impl Database {
@@ -391,7 +390,8 @@ impl Database {
.all(&*tx)
.await?;
- self.get_user_channels(channel_memberships, &tx).await
+ self.get_user_channels(user_id, channel_memberships, &tx)
+ .await
})
.await
}
@@ -414,13 +414,15 @@ impl Database {
.all(&*tx)
.await?;
- self.get_user_channels(channel_membership, &tx).await
+ self.get_user_channels(user_id, channel_membership, &tx)
+ .await
})
.await
}
pub async fn get_user_channels(
&self,
+ user_id: UserId,
channel_memberships: Vec<channel_member::Model>,
tx: &DatabaseTransaction,
) -> Result<ChannelsForUser> {
@@ -460,10 +462,21 @@ impl Database {
}
}
+ let channel_ids = graph.channels.iter().map(|c| c.id).collect::<Vec<_>>();
+ let channel_buffer_changes = self
+ .unseen_channel_buffer_changes(user_id, &channel_ids, &*tx)
+ .await?;
+
+ let unseen_messages = self
+ .unseen_channel_messages(user_id, &channel_ids, &*tx)
+ .await?;
+
Ok(ChannelsForUser {
channels: graph,
channel_participants,
channels_with_admin_privileges,
+ unseen_buffer_changes: channel_buffer_changes,
+ channel_messages: unseen_messages,
})
}
@@ -645,7 +658,7 @@ impl Database {
) -> Result<Vec<ChannelId>> {
let paths = channel_path::Entity::find()
.filter(channel_path::Column::ChannelId.eq(channel_id))
- .order_by(channel_path::Column::IdPath, sea_query::Order::Desc)
+ .order_by(channel_path::Column::IdPath, sea_orm::Order::Desc)
.all(tx)
.await?;
let mut channel_ids = Vec::new();
@@ -18,12 +18,12 @@ impl Database {
let user_b_participant = Alias::new("user_b_participant");
let mut db_contacts = contact::Entity::find()
.column_as(
- Expr::tbl(user_a_participant.clone(), room_participant::Column::Id)
+ Expr::col((user_a_participant.clone(), room_participant::Column::Id))
.is_not_null(),
"user_a_busy",
)
.column_as(
- Expr::tbl(user_b_participant.clone(), room_participant::Column::Id)
+ Expr::col((user_b_participant.clone(), room_participant::Column::Id))
.is_not_null(),
"user_b_busy",
)
@@ -89,6 +89,7 @@ impl Database {
let mut rows = channel_message::Entity::find()
.filter(condition)
+ .order_by_asc(channel_message::Column::Id)
.limit(count as u64)
.stream(&*tx)
.await?;
@@ -108,7 +109,7 @@ impl Database {
}),
});
}
-
+ drop(rows);
Ok(messages)
})
.await
@@ -121,7 +122,7 @@ impl Database {
body: &str,
timestamp: OffsetDateTime,
nonce: u128,
- ) -> Result<(MessageId, Vec<ConnectionId>)> {
+ ) -> Result<(MessageId, Vec<ConnectionId>, Vec<UserId>)> {
self.transaction(|tx| async move {
let mut rows = channel_chat_participant::Entity::find()
.filter(channel_chat_participant::Column::ChannelId.eq(channel_id))
@@ -130,11 +131,13 @@ impl Database {
let mut is_participant = false;
let mut participant_connection_ids = Vec::new();
+ let mut participant_user_ids = Vec::new();
while let Some(row) = rows.next().await {
let row = row?;
if row.user_id == user_id {
is_participant = true;
}
+ participant_user_ids.push(row.user_id);
participant_connection_ids.push(row.connection());
}
drop(rows);
@@ -167,11 +170,141 @@ impl Database {
ConnectionId,
}
- Ok((message.last_insert_id, participant_connection_ids))
+ // Observe this message for the sender
+ self.observe_channel_message_internal(
+ channel_id,
+ user_id,
+ message.last_insert_id,
+ &*tx,
+ )
+ .await?;
+
+ let mut channel_members = self.get_channel_members_internal(channel_id, &*tx).await?;
+ channel_members.retain(|member| !participant_user_ids.contains(member));
+
+ Ok((
+ message.last_insert_id,
+ participant_connection_ids,
+ channel_members,
+ ))
+ })
+ .await
+ }
+
+ pub async fn observe_channel_message(
+ &self,
+ channel_id: ChannelId,
+ user_id: UserId,
+ message_id: MessageId,
+ ) -> Result<()> {
+ self.transaction(|tx| async move {
+ self.observe_channel_message_internal(channel_id, user_id, message_id, &*tx)
+ .await?;
+ Ok(())
})
.await
}
+ async fn observe_channel_message_internal(
+ &self,
+ channel_id: ChannelId,
+ user_id: UserId,
+ message_id: MessageId,
+ tx: &DatabaseTransaction,
+ ) -> Result<()> {
+ observed_channel_messages::Entity::insert(observed_channel_messages::ActiveModel {
+ user_id: ActiveValue::Set(user_id),
+ channel_id: ActiveValue::Set(channel_id),
+ channel_message_id: ActiveValue::Set(message_id),
+ })
+ .on_conflict(
+ OnConflict::columns([
+ observed_channel_messages::Column::ChannelId,
+ observed_channel_messages::Column::UserId,
+ ])
+ .update_column(observed_channel_messages::Column::ChannelMessageId)
+ .action_cond_where(observed_channel_messages::Column::ChannelMessageId.lt(message_id))
+ .to_owned(),
+ )
+ // TODO: Try to upgrade SeaORM so we don't have to do this hack around their bug
+ .exec_without_returning(&*tx)
+ .await?;
+ Ok(())
+ }
+
+ pub async fn unseen_channel_messages(
+ &self,
+ user_id: UserId,
+ channel_ids: &[ChannelId],
+ tx: &DatabaseTransaction,
+ ) -> Result<Vec<proto::UnseenChannelMessage>> {
+ let mut observed_messages_by_channel_id = HashMap::default();
+ let mut 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().copied()))
+ .stream(&*tx)
+ .await?;
+
+ while let Some(row) = rows.next().await {
+ let row = row?;
+ observed_messages_by_channel_id.insert(row.channel_id, row);
+ }
+ drop(rows);
+ let mut values = String::new();
+ for id in channel_ids {
+ if !values.is_empty() {
+ values.push_str(", ");
+ }
+ write!(&mut values, "({})", id).unwrap();
+ }
+
+ if values.is_empty() {
+ return Ok(Default::default());
+ }
+
+ let sql = format!(
+ r#"
+ SELECT
+ *
+ FROM (
+ SELECT
+ *,
+ row_number() OVER (
+ PARTITION BY channel_id
+ ORDER BY id DESC
+ ) as row_number
+ FROM channel_messages
+ WHERE
+ channel_id in ({values})
+ ) AS messages
+ WHERE
+ row_number = 1
+ "#,
+ );
+
+ let stmt = Statement::from_string(self.pool.get_database_backend(), sql);
+ let last_messages = channel_message::Model::find_by_statement(stmt)
+ .all(&*tx)
+ .await?;
+
+ let mut changes = Vec::new();
+ for last_message in last_messages {
+ if let Some(observed_message) =
+ observed_messages_by_channel_id.get(&last_message.channel_id)
+ {
+ if observed_message.channel_message_id == last_message.id {
+ continue;
+ }
+ }
+ changes.push(proto::UnseenChannelMessage {
+ channel_id: last_message.channel_id.to_proto(),
+ message_id: last_message.id.to_proto(),
+ });
+ }
+
+ Ok(changes)
+ }
+
pub async fn remove_channel_message(
&self,
channel_id: ChannelId,
@@ -184,7 +184,7 @@ impl Database {
Ok(user::Entity::find()
.from_raw_sql(Statement::from_sql_and_values(
self.pool.get_database_backend(),
- query.into(),
+ query,
vec![like_string.into(), name_query.into(), limit.into()],
))
.all(&*tx)
@@ -12,6 +12,8 @@ pub mod contact;
pub mod feature_flag;
pub mod follower;
pub mod language_server;
+pub mod observed_buffer_edits;
+pub mod observed_channel_messages;
pub mod project;
pub mod project_collaborator;
pub mod room;
@@ -0,0 +1,43 @@
+use crate::db::{BufferId, UserId};
+use sea_orm::entity::prelude::*;
+
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
+#[sea_orm(table_name = "observed_buffer_edits")]
+pub struct Model {
+ #[sea_orm(primary_key)]
+ pub user_id: UserId,
+ pub buffer_id: BufferId,
+ pub epoch: i32,
+ pub lamport_timestamp: i32,
+ pub replica_id: i32,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+ #[sea_orm(
+ belongs_to = "super::buffer::Entity",
+ from = "Column::BufferId",
+ to = "super::buffer::Column::Id"
+ )]
+ Buffer,
+ #[sea_orm(
+ belongs_to = "super::user::Entity",
+ from = "Column::UserId",
+ to = "super::user::Column::Id"
+ )]
+ User,
+}
+
+impl Related<super::buffer::Entity> for Entity {
+ fn to() -> RelationDef {
+ Relation::Buffer.def()
+ }
+}
+
+impl Related<super::user::Entity> for Entity {
+ fn to() -> RelationDef {
+ Relation::User.def()
+ }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
@@ -0,0 +1,41 @@
+use crate::db::{ChannelId, MessageId, UserId};
+use sea_orm::entity::prelude::*;
+
+#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
+#[sea_orm(table_name = "observed_channel_messages")]
+pub struct Model {
+ #[sea_orm(primary_key)]
+ pub user_id: UserId,
+ pub channel_id: ChannelId,
+ pub channel_message_id: MessageId,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+ #[sea_orm(
+ belongs_to = "super::channel::Entity",
+ from = "Column::ChannelId",
+ to = "super::channel::Column::Id"
+ )]
+ Channel,
+ #[sea_orm(
+ belongs_to = "super::user::Entity",
+ from = "Column::UserId",
+ to = "super::user::Column::Id"
+ )]
+ User,
+}
+
+impl Related<super::channel::Entity> for Entity {
+ fn to() -> RelationDef {
+ Relation::Channel.def()
+ }
+}
+
+impl Related<super::user::Entity> for Entity {
+ fn to() -> RelationDef {
+ Relation::User.def()
+ }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
@@ -39,7 +39,7 @@ impl TestDb {
db.pool
.execute(sea_orm::Statement::from_string(
db.pool.get_database_backend(),
- sql.into(),
+ sql,
))
.await
.unwrap();
@@ -134,7 +134,7 @@ impl Drop for TestDb {
db.pool
.execute(sea_orm::Statement::from_string(
db.pool.get_database_backend(),
- query.into(),
+ query,
))
.await
.log_err();
@@ -1,6 +1,6 @@
use super::*;
use crate::test_both_dbs;
-use language::proto;
+use language::proto::{self, serialize_version};
use text::Buffer;
test_both_dbs!(
@@ -163,3 +163,349 @@ async fn test_channel_buffers(db: &Arc<Database>) {
assert_eq!(buffer_response_b.base_text, "hello, cruel world");
assert_eq!(buffer_response_b.operations, &[]);
}
+
+test_both_dbs!(
+ test_channel_buffers_last_operations,
+ test_channel_buffers_last_operations_postgres,
+ test_channel_buffers_last_operations_sqlite
+);
+
+async fn test_channel_buffers_last_operations(db: &Database) {
+ let user_id = db
+ .create_user(
+ "user_a@example.com",
+ false,
+ NewUserParams {
+ github_login: "user_a".into(),
+ github_user_id: 101,
+ invite_count: 0,
+ },
+ )
+ .await
+ .unwrap()
+ .user_id;
+ let observer_id = db
+ .create_user(
+ "user_b@example.com",
+ false,
+ NewUserParams {
+ github_login: "user_b".into(),
+ github_user_id: 102,
+ invite_count: 0,
+ },
+ )
+ .await
+ .unwrap()
+ .user_id;
+ let owner_id = db.create_server("production").await.unwrap().0 as u32;
+ let connection_id = ConnectionId {
+ owner_id,
+ id: user_id.0 as u32,
+ };
+
+ let mut buffers = Vec::new();
+ let mut text_buffers = Vec::new();
+ for i in 0..3 {
+ let channel = db
+ .create_root_channel(&format!("channel-{i}"), &format!("room-{i}"), user_id)
+ .await
+ .unwrap();
+
+ db.invite_channel_member(channel, observer_id, user_id, false)
+ .await
+ .unwrap();
+ db.respond_to_channel_invite(channel, observer_id, true)
+ .await
+ .unwrap();
+
+ db.join_channel_buffer(channel, user_id, connection_id)
+ .await
+ .unwrap();
+
+ buffers.push(
+ db.transaction(|tx| async move { db.get_channel_buffer(channel, &*tx).await })
+ .await
+ .unwrap(),
+ );
+
+ text_buffers.push(Buffer::new(0, 0, "".to_string()));
+ }
+
+ let operations = db
+ .transaction(|tx| {
+ let buffers = &buffers;
+ async move {
+ db.get_latest_operations_for_buffers([buffers[0].id, buffers[2].id], &*tx)
+ .await
+ }
+ })
+ .await
+ .unwrap();
+
+ assert!(operations.is_empty());
+
+ update_buffer(
+ buffers[0].channel_id,
+ user_id,
+ db,
+ vec![
+ text_buffers[0].edit([(0..0, "a")]),
+ text_buffers[0].edit([(0..0, "b")]),
+ text_buffers[0].edit([(0..0, "c")]),
+ ],
+ )
+ .await;
+
+ update_buffer(
+ buffers[1].channel_id,
+ user_id,
+ db,
+ vec![
+ text_buffers[1].edit([(0..0, "d")]),
+ text_buffers[1].edit([(1..1, "e")]),
+ text_buffers[1].edit([(2..2, "f")]),
+ ],
+ )
+ .await;
+
+ // cause buffer 1's epoch to increment.
+ db.leave_channel_buffer(buffers[1].channel_id, connection_id)
+ .await
+ .unwrap();
+ db.join_channel_buffer(buffers[1].channel_id, user_id, connection_id)
+ .await
+ .unwrap();
+ text_buffers[1] = Buffer::new(1, 0, "def".to_string());
+ update_buffer(
+ buffers[1].channel_id,
+ user_id,
+ db,
+ vec![
+ text_buffers[1].edit([(0..0, "g")]),
+ text_buffers[1].edit([(0..0, "h")]),
+ ],
+ )
+ .await;
+
+ update_buffer(
+ buffers[2].channel_id,
+ user_id,
+ db,
+ vec![text_buffers[2].edit([(0..0, "i")])],
+ )
+ .await;
+
+ let operations = db
+ .transaction(|tx| {
+ let buffers = &buffers;
+ async move {
+ db.get_latest_operations_for_buffers([buffers[1].id, buffers[2].id], &*tx)
+ .await
+ }
+ })
+ .await
+ .unwrap();
+ assert_operations(
+ &operations,
+ &[
+ (buffers[1].id, 1, &text_buffers[1]),
+ (buffers[2].id, 0, &text_buffers[2]),
+ ],
+ );
+
+ let operations = db
+ .transaction(|tx| {
+ let buffers = &buffers;
+ async move {
+ db.get_latest_operations_for_buffers([buffers[0].id, buffers[1].id], &*tx)
+ .await
+ }
+ })
+ .await
+ .unwrap();
+ assert_operations(
+ &operations,
+ &[
+ (buffers[0].id, 0, &text_buffers[0]),
+ (buffers[1].id, 1, &text_buffers[1]),
+ ],
+ );
+
+ let buffer_changes = db
+ .transaction(|tx| {
+ let buffers = &buffers;
+ async move {
+ db.unseen_channel_buffer_changes(
+ observer_id,
+ &[
+ buffers[0].channel_id,
+ buffers[1].channel_id,
+ buffers[2].channel_id,
+ ],
+ &*tx,
+ )
+ .await
+ }
+ })
+ .await
+ .unwrap();
+
+ pretty_assertions::assert_eq!(
+ buffer_changes,
+ [
+ rpc::proto::UnseenChannelBufferChange {
+ channel_id: buffers[0].channel_id.to_proto(),
+ epoch: 0,
+ version: serialize_version(&text_buffers[0].version()),
+ },
+ rpc::proto::UnseenChannelBufferChange {
+ channel_id: buffers[1].channel_id.to_proto(),
+ epoch: 1,
+ version: serialize_version(&text_buffers[1].version())
+ .into_iter()
+ .filter(|vector| vector.replica_id
+ == buffer_changes[1].version.first().unwrap().replica_id)
+ .collect::<Vec<_>>(),
+ },
+ rpc::proto::UnseenChannelBufferChange {
+ channel_id: buffers[2].channel_id.to_proto(),
+ epoch: 0,
+ version: serialize_version(&text_buffers[2].version()),
+ },
+ ]
+ );
+
+ db.observe_buffer_version(
+ buffers[1].id,
+ observer_id,
+ 1,
+ serialize_version(&text_buffers[1].version()).as_slice(),
+ )
+ .await
+ .unwrap();
+
+ let buffer_changes = db
+ .transaction(|tx| {
+ let buffers = &buffers;
+ async move {
+ db.unseen_channel_buffer_changes(
+ observer_id,
+ &[
+ buffers[0].channel_id,
+ buffers[1].channel_id,
+ buffers[2].channel_id,
+ ],
+ &*tx,
+ )
+ .await
+ }
+ })
+ .await
+ .unwrap();
+
+ assert_eq!(
+ buffer_changes,
+ [
+ rpc::proto::UnseenChannelBufferChange {
+ channel_id: buffers[0].channel_id.to_proto(),
+ epoch: 0,
+ version: serialize_version(&text_buffers[0].version()),
+ },
+ rpc::proto::UnseenChannelBufferChange {
+ channel_id: buffers[2].channel_id.to_proto(),
+ epoch: 0,
+ version: serialize_version(&text_buffers[2].version()),
+ },
+ ]
+ );
+
+ // Observe an earlier version of the buffer.
+ db.observe_buffer_version(
+ buffers[1].id,
+ observer_id,
+ 1,
+ &[rpc::proto::VectorClockEntry {
+ replica_id: 0,
+ timestamp: 0,
+ }],
+ )
+ .await
+ .unwrap();
+
+ let buffer_changes = db
+ .transaction(|tx| {
+ let buffers = &buffers;
+ async move {
+ db.unseen_channel_buffer_changes(
+ observer_id,
+ &[
+ buffers[0].channel_id,
+ buffers[1].channel_id,
+ buffers[2].channel_id,
+ ],
+ &*tx,
+ )
+ .await
+ }
+ })
+ .await
+ .unwrap();
+
+ assert_eq!(
+ buffer_changes,
+ [
+ rpc::proto::UnseenChannelBufferChange {
+ channel_id: buffers[0].channel_id.to_proto(),
+ epoch: 0,
+ version: serialize_version(&text_buffers[0].version()),
+ },
+ rpc::proto::UnseenChannelBufferChange {
+ channel_id: buffers[2].channel_id.to_proto(),
+ epoch: 0,
+ version: serialize_version(&text_buffers[2].version()),
+ },
+ ]
+ );
+}
+
+async fn update_buffer(
+ channel_id: ChannelId,
+ user_id: UserId,
+ db: &Database,
+ operations: Vec<text::Operation>,
+) {
+ let operations = operations
+ .into_iter()
+ .map(|op| proto::serialize_operation(&language::Operation::Buffer(op)))
+ .collect::<Vec<_>>();
+ db.update_channel_buffer(channel_id, user_id, &operations)
+ .await
+ .unwrap();
+}
+
+fn assert_operations(
+ operations: &[buffer_operation::Model],
+ expected: &[(BufferId, i32, &text::Buffer)],
+) {
+ let actual = operations
+ .iter()
+ .map(|op| buffer_operation::Model {
+ buffer_id: op.buffer_id,
+ epoch: op.epoch,
+ lamport_timestamp: op.lamport_timestamp,
+ replica_id: op.replica_id,
+ value: vec![],
+ })
+ .collect::<Vec<_>>();
+ let expected = expected
+ .iter()
+ .map(|(buffer_id, epoch, buffer)| buffer_operation::Model {
+ buffer_id: *buffer_id,
+ epoch: *epoch,
+ lamport_timestamp: buffer.lamport_clock.value as i32 - 1,
+ replica_id: buffer.replica_id() as i32,
+ value: vec![],
+ })
+ .collect::<Vec<_>>();
+ assert_eq!(actual, expected, "unexpected operations")
+}
@@ -57,3 +57,188 @@ async fn test_channel_message_nonces(db: &Arc<Database>) {
assert_eq!(msg1_id, msg3_id);
assert_eq!(msg2_id, msg4_id);
}
+
+test_both_dbs!(
+ test_channel_message_new_notification,
+ test_channel_message_new_notification_postgres,
+ test_channel_message_new_notification_sqlite
+);
+
+async fn test_channel_message_new_notification(db: &Arc<Database>) {
+ let user = db
+ .create_user(
+ "user_a@example.com",
+ false,
+ NewUserParams {
+ github_login: "user_a".into(),
+ github_user_id: 1,
+ invite_count: 0,
+ },
+ )
+ .await
+ .unwrap()
+ .user_id;
+ let observer = db
+ .create_user(
+ "user_b@example.com",
+ false,
+ NewUserParams {
+ github_login: "user_b".into(),
+ github_user_id: 1,
+ invite_count: 0,
+ },
+ )
+ .await
+ .unwrap()
+ .user_id;
+
+ let channel_1 = db
+ .create_channel("channel", None, "room", user)
+ .await
+ .unwrap();
+
+ let channel_2 = db
+ .create_channel("channel-2", None, "room", user)
+ .await
+ .unwrap();
+
+ db.invite_channel_member(channel_1, observer, user, false)
+ .await
+ .unwrap();
+
+ db.respond_to_channel_invite(channel_1, observer, true)
+ .await
+ .unwrap();
+
+ db.invite_channel_member(channel_2, observer, user, false)
+ .await
+ .unwrap();
+
+ db.respond_to_channel_invite(channel_2, observer, true)
+ .await
+ .unwrap();
+
+ let owner_id = db.create_server("test").await.unwrap().0 as u32;
+ let user_connection_id = rpc::ConnectionId { owner_id, id: 0 };
+
+ db.join_channel_chat(channel_1, user_connection_id, user)
+ .await
+ .unwrap();
+
+ let _ = db
+ .create_channel_message(channel_1, user, "1_1", OffsetDateTime::now_utc(), 1)
+ .await
+ .unwrap();
+
+ let (second_message, _, _) = db
+ .create_channel_message(channel_1, user, "1_2", OffsetDateTime::now_utc(), 2)
+ .await
+ .unwrap();
+
+ let (third_message, _, _) = db
+ .create_channel_message(channel_1, user, "1_3", OffsetDateTime::now_utc(), 3)
+ .await
+ .unwrap();
+
+ db.join_channel_chat(channel_2, user_connection_id, user)
+ .await
+ .unwrap();
+
+ let (fourth_message, _, _) = db
+ .create_channel_message(channel_2, user, "2_1", OffsetDateTime::now_utc(), 4)
+ .await
+ .unwrap();
+
+ // Check that observer has new messages
+ let unseen_messages = db
+ .transaction(|tx| async move {
+ db.unseen_channel_messages(observer, &[channel_1, channel_2], &*tx)
+ .await
+ })
+ .await
+ .unwrap();
+
+ assert_eq!(
+ unseen_messages,
+ [
+ rpc::proto::UnseenChannelMessage {
+ channel_id: channel_1.to_proto(),
+ message_id: third_message.to_proto(),
+ },
+ rpc::proto::UnseenChannelMessage {
+ channel_id: channel_2.to_proto(),
+ message_id: fourth_message.to_proto(),
+ },
+ ]
+ );
+
+ // Observe the second message
+ db.observe_channel_message(channel_1, observer, second_message)
+ .await
+ .unwrap();
+
+ // Make sure the observer still has a new message
+ let unseen_messages = db
+ .transaction(|tx| async move {
+ db.unseen_channel_messages(observer, &[channel_1, channel_2], &*tx)
+ .await
+ })
+ .await
+ .unwrap();
+ assert_eq!(
+ unseen_messages,
+ [
+ rpc::proto::UnseenChannelMessage {
+ channel_id: channel_1.to_proto(),
+ message_id: third_message.to_proto(),
+ },
+ rpc::proto::UnseenChannelMessage {
+ channel_id: channel_2.to_proto(),
+ message_id: fourth_message.to_proto(),
+ },
+ ]
+ );
+
+ // Observe the third message,
+ db.observe_channel_message(channel_1, observer, third_message)
+ .await
+ .unwrap();
+
+ // Make sure the observer does not have a new method
+ let unseen_messages = db
+ .transaction(|tx| async move {
+ db.unseen_channel_messages(observer, &[channel_1, channel_2], &*tx)
+ .await
+ })
+ .await
+ .unwrap();
+
+ assert_eq!(
+ unseen_messages,
+ [rpc::proto::UnseenChannelMessage {
+ channel_id: channel_2.to_proto(),
+ message_id: fourth_message.to_proto(),
+ }]
+ );
+
+ // Observe the second message again, should not regress our observed state
+ db.observe_channel_message(channel_1, observer, second_message)
+ .await
+ .unwrap();
+
+ // Make sure the observer does not have a new message
+ let unseen_messages = db
+ .transaction(|tx| async move {
+ db.unseen_channel_messages(observer, &[channel_1, channel_2], &*tx)
+ .await
+ })
+ .await
+ .unwrap();
+ assert_eq!(
+ unseen_messages,
+ [rpc::proto::UnseenChannelMessage {
+ channel_id: channel_2.to_proto(),
+ message_id: fourth_message.to_proto(),
+ }]
+ );
+}
@@ -3,8 +3,8 @@ mod connection_pool;
use crate::{
auth,
db::{
- self, ChannelId, ChannelsForUser, Database, MessageId, ProjectId, RoomId, ServerId, User,
- UserId,
+ self, BufferId, ChannelId, ChannelsForUser, Database, MessageId, ProjectId, RoomId,
+ ServerId, User, UserId,
},
executor::Executor,
AppState, Result,
@@ -274,7 +274,9 @@ impl Server {
.add_message_handler(unfollow)
.add_message_handler(update_followers)
.add_message_handler(update_diff_base)
- .add_request_handler(get_private_user_info);
+ .add_request_handler(get_private_user_info)
+ .add_message_handler(acknowledge_channel_message)
+ .add_message_handler(acknowledge_buffer_version);
Arc::new(server)
}
@@ -1904,13 +1906,10 @@ async fn follow(
.check_room_participants(room_id, leader_id, session.connection_id)
.await?;
- let mut response_payload = session
+ let response_payload = session
.peer
.forward_request(session.connection_id, leader_id, request)
.await?;
- response_payload
- .views
- .retain(|view| view.leader_id != Some(follower_id.into()));
response.send(response_payload)?;
if let Some(project_id) = project_id {
@@ -1971,14 +1970,17 @@ async fn update_followers(request: proto::UpdateFollowers, session: Session) ->
.await?
};
- let leader_id = request.variant.as_ref().and_then(|variant| match variant {
- proto::update_followers::Variant::CreateView(payload) => payload.leader_id,
+ // For now, don't send view update messages back to that view's current leader.
+ let connection_id_to_omit = request.variant.as_ref().and_then(|variant| match variant {
proto::update_followers::Variant::UpdateView(payload) => payload.leader_id,
- proto::update_followers::Variant::UpdateActiveView(payload) => payload.leader_id,
+ _ => None,
});
+
for follower_peer_id in request.follower_ids.iter().copied() {
let follower_connection_id = follower_peer_id.into();
- if Some(follower_peer_id) != leader_id && connection_ids.contains(&follower_connection_id) {
+ if Some(follower_peer_id) != connection_id_to_omit
+ && connection_ids.contains(&follower_connection_id)
+ {
session.peer.forward_send(
session.connection_id,
follower_connection_id,
@@ -2568,6 +2570,8 @@ async fn respond_to_channel_invite(
name: channel.name,
}),
);
+ update.unseen_channel_messages = result.channel_messages;
+ update.unseen_channel_buffer_changes = result.unseen_buffer_changes;
update.insert_edge = result.channels.edges;
update
.channel_participants
@@ -2691,7 +2695,7 @@ async fn update_channel_buffer(
let db = session.db().await;
let channel_id = ChannelId::from_proto(request.channel_id);
- let collaborators = db
+ let (collaborators, non_collaborators, epoch, version) = db
.update_channel_buffer(channel_id, session.user_id, &request.operations)
.await?;
@@ -2704,6 +2708,29 @@ async fn update_channel_buffer(
},
&session.peer,
);
+
+ let pool = &*session.connection_pool().await;
+
+ broadcast(
+ None,
+ non_collaborators
+ .iter()
+ .flat_map(|user_id| pool.user_connection_ids(*user_id)),
+ |peer_id| {
+ session.peer.send(
+ peer_id.into(),
+ proto::UpdateChannels {
+ unseen_channel_buffer_changes: vec![proto::UnseenChannelBufferChange {
+ channel_id: channel_id.to_proto(),
+ epoch: epoch as u64,
+ version: version.clone(),
+ }],
+ ..Default::default()
+ },
+ )
+ },
+ );
+
Ok(())
}
@@ -2799,7 +2826,7 @@ async fn send_channel_message(
.ok_or_else(|| anyhow!("nonce can't be blank"))?;
let channel_id = ChannelId::from_proto(request.channel_id);
- let (message_id, connection_ids) = session
+ let (message_id, connection_ids, non_participants) = session
.db()
.await
.create_channel_message(
@@ -2829,6 +2856,27 @@ async fn send_channel_message(
response.send(proto::SendChannelMessageResponse {
message: Some(message),
})?;
+
+ let pool = &*session.connection_pool().await;
+ broadcast(
+ None,
+ non_participants
+ .iter()
+ .flat_map(|user_id| pool.user_connection_ids(*user_id)),
+ |peer_id| {
+ session.peer.send(
+ peer_id.into(),
+ proto::UpdateChannels {
+ unseen_channel_messages: vec![proto::UnseenChannelMessage {
+ channel_id: channel_id.to_proto(),
+ message_id: message_id.to_proto(),
+ }],
+ ..Default::default()
+ },
+ )
+ },
+ );
+
Ok(())
}
@@ -2851,6 +2899,38 @@ async fn remove_channel_message(
Ok(())
}
+async fn acknowledge_channel_message(
+ request: proto::AckChannelMessage,
+ session: Session,
+) -> Result<()> {
+ let channel_id = ChannelId::from_proto(request.channel_id);
+ let message_id = MessageId::from_proto(request.message_id);
+ session
+ .db()
+ .await
+ .observe_channel_message(channel_id, session.user_id, message_id)
+ .await?;
+ Ok(())
+}
+
+async fn acknowledge_buffer_version(
+ request: proto::AckBufferOperation,
+ session: Session,
+) -> Result<()> {
+ let buffer_id = BufferId::from_proto(request.buffer_id);
+ session
+ .db()
+ .await
+ .observe_buffer_version(
+ buffer_id,
+ session.user_id,
+ request.epoch as i32,
+ &request.version,
+ )
+ .await?;
+ Ok(())
+}
+
async fn join_channel_chat(
request: proto::JoinChannelChat,
response: Response<proto::JoinChannelChat>,
@@ -2986,6 +3066,8 @@ fn build_initial_channels_update(
});
}
+ update.unseen_channel_buffer_changes = channels.unseen_buffer_changes;
+ update.unseen_channel_messages = channels.channel_messages;
update.insert_edge = channels.channels.edges;
for (channel_id, participants) in channels.channel_participants {
@@ -3,7 +3,7 @@ use crate::{
tests::TestServer,
};
use call::ActiveCall;
-use channel::Channel;
+use channel::{Channel, ACKNOWLEDGE_DEBOUNCE_INTERVAL};
use client::ParticipantIndex;
use client::{Collaborator, UserId};
use collab_ui::channel_view::ChannelView;
@@ -410,10 +410,7 @@ async fn test_channel_buffer_disconnect(
channel_buffer_a.update(cx_a, |buffer, _| {
assert_eq!(
buffer.channel().as_ref(),
- &Channel {
- id: channel_id,
- name: "the-channel".to_string()
- }
+ &channel(channel_id, "the-channel")
);
assert!(!buffer.is_connected());
});
@@ -438,15 +435,21 @@ async fn test_channel_buffer_disconnect(
channel_buffer_b.update(cx_b, |buffer, _| {
assert_eq!(
buffer.channel().as_ref(),
- &Channel {
- id: channel_id,
- name: "the-channel".to_string()
- }
+ &channel(channel_id, "the-channel")
);
assert!(!buffer.is_connected());
});
}
+fn channel(id: u64, name: &'static str) -> Channel {
+ Channel {
+ id,
+ name: name.to_string(),
+ unseen_note_version: None,
+ unseen_message_id: None,
+ }
+}
+
#[gpui::test]
async fn test_rejoin_channel_buffer(
deterministic: Arc<Deterministic>,
@@ -627,6 +630,7 @@ async fn test_following_to_channel_notes_without_a_shared_project(
let mut server = TestServer::start(&deterministic).await;
let client_a = server.create_client(cx_a, "user_a").await;
let client_b = server.create_client(cx_b, "user_b").await;
+
let client_c = server.create_client(cx_c, "user_c").await;
cx_a.update(editor::init);
@@ -755,6 +759,126 @@ async fn test_following_to_channel_notes_without_a_shared_project(
});
}
+#[gpui::test]
+async fn test_channel_buffer_changes(
+ deterministic: Arc<Deterministic>,
+ cx_a: &mut TestAppContext,
+ cx_b: &mut TestAppContext,
+) {
+ deterministic.forbid_parking();
+ let mut server = TestServer::start(&deterministic).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;
+
+ 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);
+ })
+ });
+ deterministic.run_until_parked();
+
+ let has_buffer_changed = cx_b.read(|cx| {
+ client_b
+ .channel_store()
+ .read(cx)
+ .has_channel_buffer_changed(channel_id)
+ .unwrap()
+ });
+ 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 = client_b.build_workspace(&project_b, cx_b).root(cx_b);
+ let channel_view_b = cx_b
+ .update(|cx| ChannelView::open(channel_id, workspace_b.clone(), cx))
+ .await
+ .unwrap();
+ deterministic.run_until_parked();
+
+ let has_buffer_changed = cx_b.read(|cx| {
+ client_b
+ .channel_store()
+ .read(cx)
+ .has_channel_buffer_changed(channel_id)
+ .unwrap()
+ });
+ 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);
+ })
+ });
+ deterministic.run_until_parked();
+
+ let has_buffer_changed = cx_b.read(|cx| {
+ client_b
+ .channel_store()
+ .read(cx)
+ .has_channel_buffer_changed(channel_id)
+ .unwrap()
+ });
+ 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
+ server.simulate_long_connection_interruption(client_b.peer_id().unwrap(), &deterministic);
+ let has_buffer_changed = cx_b.read(|cx| {
+ client_b
+ .channel_store()
+ .read(cx)
+ .has_channel_buffer_changed(channel_id)
+ .unwrap()
+ });
+ 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)
+ .unwrap()
+ });
+ assert!(has_buffer_changed);
+}
+
#[track_caller]
fn assert_collaborators(collaborators: &HashMap<PeerId, Collaborator>, ids: &[Option<UserId>]) {
let mut user_ids = collaborators
@@ -1,7 +1,9 @@
use crate::{rpc::RECONNECT_TIMEOUT, tests::TestServer};
use channel::{ChannelChat, ChannelMessageId};
-use gpui::{executor::Deterministic, ModelHandle, TestAppContext};
+use collab_ui::chat_panel::ChatPanel;
+use gpui::{executor::Deterministic, BorrowAppContext, ModelHandle, TestAppContext};
use std::sync::Arc;
+use workspace::dock::Panel;
#[gpui::test]
async fn test_basic_channel_messages(
@@ -223,3 +225,136 @@ fn assert_messages(chat: &ModelHandle<ChannelChat>, messages: &[&str], cx: &mut
messages
);
}
+
+#[gpui::test]
+async fn test_channel_message_changes(
+ deterministic: Arc<Deterministic>,
+ cx_a: &mut TestAppContext,
+ cx_b: &mut TestAppContext,
+) {
+ deterministic.forbid_parking();
+ let mut server = TestServer::start(&deterministic).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();
+
+ channel_chat_a
+ .update(cx_a, |c, cx| c.send_message("one".into(), cx).unwrap())
+ .await
+ .unwrap();
+
+ deterministic.run_until_parked();
+
+ let b_has_messages = cx_b.read_with(|cx| {
+ client_b
+ .channel_store()
+ .read(cx)
+ .has_new_messages(channel_id)
+ .unwrap()
+ });
+
+ assert!(b_has_messages);
+
+ // Opening the chat should clear the changed flag.
+ cx_b.update(|cx| {
+ collab_ui::init(&client_b.app_state, cx);
+ });
+ let project_b = client_b.build_empty_local_project(cx_b);
+ let workspace_b = client_b.build_workspace(&project_b, cx_b).root(cx_b);
+ let chat_panel_b = workspace_b.update(cx_b, |workspace, cx| ChatPanel::new(workspace, cx));
+ chat_panel_b
+ .update(cx_b, |chat_panel, cx| {
+ chat_panel.set_active(true, cx);
+ chat_panel.select_channel(channel_id, cx)
+ })
+ .await
+ .unwrap();
+
+ deterministic.run_until_parked();
+
+ let b_has_messages = cx_b.read_with(|cx| {
+ client_b
+ .channel_store()
+ .read(cx)
+ .has_new_messages(channel_id)
+ .unwrap()
+ });
+
+ assert!(!b_has_messages);
+
+ // Sending a message while the chat is open should not change the flag.
+ channel_chat_a
+ .update(cx_a, |c, cx| c.send_message("two".into(), cx).unwrap())
+ .await
+ .unwrap();
+
+ deterministic.run_until_parked();
+
+ let b_has_messages = cx_b.read_with(|cx| {
+ client_b
+ .channel_store()
+ .read(cx)
+ .has_new_messages(channel_id)
+ .unwrap()
+ });
+
+ assert!(!b_has_messages);
+
+ // Sending a message while the chat is closed should change the flag.
+ chat_panel_b.update(cx_b, |chat_panel, cx| {
+ chat_panel.set_active(false, cx);
+ });
+
+ // Sending a message while the chat is open should not change the flag.
+ channel_chat_a
+ .update(cx_a, |c, cx| c.send_message("three".into(), cx).unwrap())
+ .await
+ .unwrap();
+
+ deterministic.run_until_parked();
+
+ let b_has_messages = cx_b.read_with(|cx| {
+ client_b
+ .channel_store()
+ .read(cx)
+ .has_new_messages(channel_id)
+ .unwrap()
+ });
+
+ assert!(b_has_messages);
+
+ // Closing the chat should re-enable change tracking
+ cx_b.update(|_| drop(chat_panel_b));
+
+ channel_chat_a
+ .update(cx_a, |c, cx| c.send_message("four".into(), cx).unwrap())
+ .await
+ .unwrap();
+
+ deterministic.run_until_parked();
+
+ let b_has_messages = cx_b.read_with(|cx| {
+ client_b
+ .channel_store()
+ .read(cx)
+ .has_new_messages(channel_id)
+ .unwrap()
+ });
+
+ assert!(b_has_messages);
+}
@@ -4,6 +4,7 @@ use collab_ui::project_shared_notification::ProjectSharedNotification;
use editor::{Editor, ExcerptRange, MultiBuffer};
use gpui::{executor::Deterministic, geometry::vector::vec2f, TestAppContext, ViewHandle};
use live_kit_client::MacOSDisplay;
+use rpc::proto::PeerId;
use serde_json::json;
use std::{borrow::Cow, sync::Arc};
use workspace::{
@@ -724,10 +725,9 @@ async fn test_peers_following_each_other(
.await
.unwrap();
- // Client A opens some editors.
+ // Client A opens a file.
let workspace_a = client_a.build_workspace(&project_a, cx_a).root(cx_a);
- let pane_a1 = workspace_a.read_with(cx_a, |workspace, _| workspace.active_pane().clone());
- let _editor_a1 = workspace_a
+ workspace_a
.update(cx_a, |workspace, cx| {
workspace.open_path((worktree_id, "1.txt"), None, true, cx)
})
@@ -736,10 +736,9 @@ async fn test_peers_following_each_other(
.downcast::<Editor>()
.unwrap();
- // Client B opens an editor.
+ // Client B opens a different file.
let workspace_b = client_b.build_workspace(&project_b, cx_b).root(cx_b);
- let pane_b1 = workspace_b.read_with(cx_b, |workspace, _| workspace.active_pane().clone());
- let _editor_b1 = workspace_b
+ workspace_b
.update(cx_b, |workspace, cx| {
workspace.open_path((worktree_id, "2.txt"), None, true, cx)
})
@@ -754,9 +753,7 @@ async fn test_peers_following_each_other(
});
workspace_a
.update(cx_a, |workspace, cx| {
- assert_ne!(*workspace.active_pane(), pane_a1);
- let leader_id = *project_a.read(cx).collaborators().keys().next().unwrap();
- workspace.follow(leader_id, cx).unwrap()
+ workspace.follow(client_b.peer_id().unwrap(), cx).unwrap()
})
.await
.unwrap();
@@ -765,85 +762,443 @@ async fn test_peers_following_each_other(
});
workspace_b
.update(cx_b, |workspace, cx| {
- assert_ne!(*workspace.active_pane(), pane_b1);
- let leader_id = *project_b.read(cx).collaborators().keys().next().unwrap();
- workspace.follow(leader_id, cx).unwrap()
+ workspace.follow(client_a.peer_id().unwrap(), cx).unwrap()
})
.await
.unwrap();
- workspace_a.update(cx_a, |workspace, cx| {
- workspace.activate_next_pane(cx);
- });
- // Wait for focus effects to be fully flushed
- workspace_a.update(cx_a, |workspace, _| {
- assert_eq!(*workspace.active_pane(), pane_a1);
- });
+ // Clients A and B return focus to the original files they had open
+ workspace_a.update(cx_a, |workspace, cx| workspace.activate_next_pane(cx));
+ workspace_b.update(cx_b, |workspace, cx| workspace.activate_next_pane(cx));
+ deterministic.run_until_parked();
+ // Both clients see the other client's focused file in their right pane.
+ assert_eq!(
+ pane_summaries(&workspace_a, cx_a),
+ &[
+ PaneSummary {
+ active: true,
+ leader: None,
+ items: vec![(true, "1.txt".into())]
+ },
+ PaneSummary {
+ active: false,
+ leader: client_b.peer_id(),
+ items: vec![(false, "1.txt".into()), (true, "2.txt".into())]
+ },
+ ]
+ );
+ assert_eq!(
+ pane_summaries(&workspace_b, cx_b),
+ &[
+ PaneSummary {
+ active: true,
+ leader: None,
+ items: vec![(true, "2.txt".into())]
+ },
+ PaneSummary {
+ active: false,
+ leader: client_a.peer_id(),
+ items: vec![(false, "2.txt".into()), (true, "1.txt".into())]
+ },
+ ]
+ );
+
+ // Clients A and B each open a new file.
workspace_a
.update(cx_a, |workspace, cx| {
workspace.open_path((worktree_id, "3.txt"), None, true, cx)
})
.await
.unwrap();
- workspace_b.update(cx_b, |workspace, cx| {
- workspace.activate_next_pane(cx);
- });
workspace_b
.update(cx_b, |workspace, cx| {
- assert_eq!(*workspace.active_pane(), pane_b1);
workspace.open_path((worktree_id, "4.txt"), None, true, cx)
})
.await
.unwrap();
- cx_a.foreground().run_until_parked();
+ deterministic.run_until_parked();
- // Ensure leader updates don't change the active pane of followers
- workspace_a.read_with(cx_a, |workspace, _| {
- assert_eq!(*workspace.active_pane(), pane_a1);
+ // Both client's see the other client open the new file, but keep their
+ // focus on their own active pane.
+ assert_eq!(
+ pane_summaries(&workspace_a, cx_a),
+ &[
+ PaneSummary {
+ active: true,
+ leader: None,
+ items: vec![(false, "1.txt".into()), (true, "3.txt".into())]
+ },
+ PaneSummary {
+ active: false,
+ leader: client_b.peer_id(),
+ items: vec![
+ (false, "1.txt".into()),
+ (false, "2.txt".into()),
+ (true, "4.txt".into())
+ ]
+ },
+ ]
+ );
+ assert_eq!(
+ pane_summaries(&workspace_b, cx_b),
+ &[
+ PaneSummary {
+ active: true,
+ leader: None,
+ items: vec![(false, "2.txt".into()), (true, "4.txt".into())]
+ },
+ PaneSummary {
+ active: false,
+ leader: client_a.peer_id(),
+ items: vec![
+ (false, "2.txt".into()),
+ (false, "1.txt".into()),
+ (true, "3.txt".into())
+ ]
+ },
+ ]
+ );
+
+ // Client A focuses their right pane, in which they're following client B.
+ workspace_a.update(cx_a, |workspace, cx| workspace.activate_next_pane(cx));
+ deterministic.run_until_parked();
+
+ // Client B sees that client A is now looking at the same file as them.
+ assert_eq!(
+ pane_summaries(&workspace_a, cx_a),
+ &[
+ PaneSummary {
+ active: false,
+ leader: None,
+ items: vec![(false, "1.txt".into()), (true, "3.txt".into())]
+ },
+ PaneSummary {
+ active: true,
+ leader: client_b.peer_id(),
+ items: vec![
+ (false, "1.txt".into()),
+ (false, "2.txt".into()),
+ (true, "4.txt".into())
+ ]
+ },
+ ]
+ );
+ assert_eq!(
+ pane_summaries(&workspace_b, cx_b),
+ &[
+ PaneSummary {
+ active: true,
+ leader: None,
+ items: vec![(false, "2.txt".into()), (true, "4.txt".into())]
+ },
+ PaneSummary {
+ active: false,
+ leader: client_a.peer_id(),
+ items: vec![
+ (false, "2.txt".into()),
+ (false, "1.txt".into()),
+ (false, "3.txt".into()),
+ (true, "4.txt".into())
+ ]
+ },
+ ]
+ );
+
+ // Client B focuses their right pane, in which they're following client A,
+ // who is following them.
+ workspace_b.update(cx_b, |workspace, cx| workspace.activate_next_pane(cx));
+ deterministic.run_until_parked();
+
+ // Client A sees that client B is now looking at the same file as them.
+ assert_eq!(
+ pane_summaries(&workspace_b, cx_b),
+ &[
+ PaneSummary {
+ active: false,
+ leader: None,
+ items: vec![(false, "2.txt".into()), (true, "4.txt".into())]
+ },
+ PaneSummary {
+ active: true,
+ leader: client_a.peer_id(),
+ items: vec![
+ (false, "2.txt".into()),
+ (false, "1.txt".into()),
+ (false, "3.txt".into()),
+ (true, "4.txt".into())
+ ]
+ },
+ ]
+ );
+ assert_eq!(
+ pane_summaries(&workspace_a, cx_a),
+ &[
+ PaneSummary {
+ active: false,
+ leader: None,
+ items: vec![(false, "1.txt".into()), (true, "3.txt".into())]
+ },
+ PaneSummary {
+ active: true,
+ leader: client_b.peer_id(),
+ items: vec![
+ (false, "1.txt".into()),
+ (false, "2.txt".into()),
+ (true, "4.txt".into())
+ ]
+ },
+ ]
+ );
+
+ // Client B focuses a file that they previously followed A to, breaking
+ // the follow.
+ workspace_b.update(cx_b, |workspace, cx| {
+ workspace.active_pane().update(cx, |pane, cx| {
+ pane.activate_prev_item(true, cx);
+ });
});
- workspace_b.read_with(cx_b, |workspace, _| {
- assert_eq!(*workspace.active_pane(), pane_b1);
+ deterministic.run_until_parked();
+
+ // Both clients see that client B is looking at that previous file.
+ assert_eq!(
+ pane_summaries(&workspace_b, cx_b),
+ &[
+ PaneSummary {
+ active: false,
+ leader: None,
+ items: vec![(false, "2.txt".into()), (true, "4.txt".into())]
+ },
+ PaneSummary {
+ active: true,
+ leader: None,
+ items: vec![
+ (false, "2.txt".into()),
+ (false, "1.txt".into()),
+ (true, "3.txt".into()),
+ (false, "4.txt".into())
+ ]
+ },
+ ]
+ );
+ assert_eq!(
+ pane_summaries(&workspace_a, cx_a),
+ &[
+ PaneSummary {
+ active: false,
+ leader: None,
+ items: vec![(false, "1.txt".into()), (true, "3.txt".into())]
+ },
+ PaneSummary {
+ active: true,
+ leader: client_b.peer_id(),
+ items: vec![
+ (false, "1.txt".into()),
+ (false, "2.txt".into()),
+ (false, "4.txt".into()),
+ (true, "3.txt".into()),
+ ]
+ },
+ ]
+ );
+
+ // Client B closes tabs, some of which were originally opened by client A,
+ // and some of which were originally opened by client B.
+ workspace_b.update(cx_b, |workspace, cx| {
+ workspace.active_pane().update(cx, |pane, cx| {
+ pane.close_inactive_items(&Default::default(), cx)
+ .unwrap()
+ .detach();
+ });
});
- // Ensure peers following each other doesn't cause an infinite loop.
+ deterministic.run_until_parked();
+
+ // Both clients see that Client B is looking at the previous tab.
assert_eq!(
- workspace_a.read_with(cx_a, |workspace, cx| workspace
- .active_item(cx)
- .unwrap()
- .project_path(cx)),
- Some((worktree_id, "3.txt").into())
+ pane_summaries(&workspace_b, cx_b),
+ &[
+ PaneSummary {
+ active: false,
+ leader: None,
+ items: vec![(false, "2.txt".into()), (true, "4.txt".into())]
+ },
+ PaneSummary {
+ active: true,
+ leader: None,
+ items: vec![(true, "3.txt".into()),]
+ },
+ ]
);
+ assert_eq!(
+ pane_summaries(&workspace_a, cx_a),
+ &[
+ PaneSummary {
+ active: false,
+ leader: None,
+ items: vec![(false, "1.txt".into()), (true, "3.txt".into())]
+ },
+ PaneSummary {
+ active: true,
+ leader: client_b.peer_id(),
+ items: vec![
+ (false, "1.txt".into()),
+ (false, "2.txt".into()),
+ (false, "4.txt".into()),
+ (true, "3.txt".into()),
+ ]
+ },
+ ]
+ );
+
+ // Client B follows client A again.
+ workspace_b
+ .update(cx_b, |workspace, cx| {
+ workspace.follow(client_a.peer_id().unwrap(), cx).unwrap()
+ })
+ .await
+ .unwrap();
+
+ // Client A cycles through some tabs.
workspace_a.update(cx_a, |workspace, cx| {
- assert_eq!(
- workspace.active_item(cx).unwrap().project_path(cx),
- Some((worktree_id, "3.txt").into())
- );
- workspace.activate_next_pane(cx);
+ workspace.active_pane().update(cx, |pane, cx| {
+ pane.activate_prev_item(true, cx);
+ });
});
+ deterministic.run_until_parked();
+
+ // Client B follows client A into those tabs.
+ assert_eq!(
+ pane_summaries(&workspace_a, cx_a),
+ &[
+ PaneSummary {
+ active: false,
+ leader: None,
+ items: vec![(false, "1.txt".into()), (true, "3.txt".into())]
+ },
+ PaneSummary {
+ active: true,
+ leader: None,
+ items: vec![
+ (false, "1.txt".into()),
+ (false, "2.txt".into()),
+ (true, "4.txt".into()),
+ (false, "3.txt".into()),
+ ]
+ },
+ ]
+ );
+ assert_eq!(
+ pane_summaries(&workspace_b, cx_b),
+ &[
+ PaneSummary {
+ active: false,
+ leader: None,
+ items: vec![(false, "2.txt".into()), (true, "4.txt".into())]
+ },
+ PaneSummary {
+ active: true,
+ leader: client_a.peer_id(),
+ items: vec![(false, "3.txt".into()), (true, "4.txt".into())]
+ },
+ ]
+ );
workspace_a.update(cx_a, |workspace, cx| {
- assert_eq!(
- workspace.active_item(cx).unwrap().project_path(cx),
- Some((worktree_id, "4.txt").into())
- );
+ workspace.active_pane().update(cx, |pane, cx| {
+ pane.activate_prev_item(true, cx);
+ });
});
+ deterministic.run_until_parked();
- workspace_b.update(cx_b, |workspace, cx| {
- assert_eq!(
- workspace.active_item(cx).unwrap().project_path(cx),
- Some((worktree_id, "4.txt").into())
- );
- workspace.activate_next_pane(cx);
- });
+ assert_eq!(
+ pane_summaries(&workspace_a, cx_a),
+ &[
+ PaneSummary {
+ active: false,
+ leader: None,
+ items: vec![(false, "1.txt".into()), (true, "3.txt".into())]
+ },
+ PaneSummary {
+ active: true,
+ leader: None,
+ items: vec![
+ (false, "1.txt".into()),
+ (true, "2.txt".into()),
+ (false, "4.txt".into()),
+ (false, "3.txt".into()),
+ ]
+ },
+ ]
+ );
+ assert_eq!(
+ pane_summaries(&workspace_b, cx_b),
+ &[
+ PaneSummary {
+ active: false,
+ leader: None,
+ items: vec![(false, "2.txt".into()), (true, "4.txt".into())]
+ },
+ PaneSummary {
+ active: true,
+ leader: client_a.peer_id(),
+ items: vec![
+ (false, "3.txt".into()),
+ (false, "4.txt".into()),
+ (true, "2.txt".into())
+ ]
+ },
+ ]
+ );
- workspace_b.update(cx_b, |workspace, cx| {
- assert_eq!(
- workspace.active_item(cx).unwrap().project_path(cx),
- Some((worktree_id, "3.txt").into())
- );
+ workspace_a.update(cx_a, |workspace, cx| {
+ workspace.active_pane().update(cx, |pane, cx| {
+ pane.activate_prev_item(true, cx);
+ });
});
+ deterministic.run_until_parked();
+
+ assert_eq!(
+ pane_summaries(&workspace_a, cx_a),
+ &[
+ PaneSummary {
+ active: false,
+ leader: None,
+ items: vec![(false, "1.txt".into()), (true, "3.txt".into())]
+ },
+ PaneSummary {
+ active: true,
+ leader: None,
+ items: vec![
+ (true, "1.txt".into()),
+ (false, "2.txt".into()),
+ (false, "4.txt".into()),
+ (false, "3.txt".into()),
+ ]
+ },
+ ]
+ );
+ assert_eq!(
+ pane_summaries(&workspace_b, cx_b),
+ &[
+ PaneSummary {
+ active: false,
+ leader: None,
+ items: vec![(false, "2.txt".into()), (true, "4.txt".into())]
+ },
+ PaneSummary {
+ active: true,
+ leader: client_a.peer_id(),
+ items: vec![
+ (false, "3.txt".into()),
+ (false, "4.txt".into()),
+ (false, "2.txt".into()),
+ (true, "1.txt".into()),
+ ]
+ },
+ ]
+ );
}
#[gpui::test(iterations = 10)]
@@ -1074,24 +1429,6 @@ async fn test_peers_simultaneously_following_each_other(
});
}
-fn visible_push_notifications(
- cx: &mut TestAppContext,
-) -> Vec<gpui::ViewHandle<ProjectSharedNotification>> {
- let mut ret = Vec::new();
- for window in cx.windows() {
- window.read_with(cx, |window| {
- if let Some(handle) = window
- .root_view()
- .clone()
- .downcast::<ProjectSharedNotification>()
- {
- ret.push(handle)
- }
- });
- }
- ret
-}
-
#[gpui::test(iterations = 10)]
async fn test_following_across_workspaces(
deterministic: Arc<Deterministic>,
@@ -1304,3 +1641,59 @@ async fn test_following_across_workspaces(
assert_eq!(item.tab_description(0, cx).unwrap(), Cow::Borrowed("y.rs"));
});
}
+
+fn visible_push_notifications(
+ cx: &mut TestAppContext,
+) -> Vec<gpui::ViewHandle<ProjectSharedNotification>> {
+ let mut ret = Vec::new();
+ for window in cx.windows() {
+ window.read_with(cx, |window| {
+ if let Some(handle) = window
+ .root_view()
+ .clone()
+ .downcast::<ProjectSharedNotification>()
+ {
+ ret.push(handle)
+ }
+ });
+ }
+ ret
+}
+
+#[derive(Debug, PartialEq, Eq)]
+struct PaneSummary {
+ active: bool,
+ leader: Option<PeerId>,
+ items: Vec<(bool, String)>,
+}
+
+fn pane_summaries(workspace: &ViewHandle<Workspace>, cx: &mut TestAppContext) -> Vec<PaneSummary> {
+ workspace.read_with(cx, |workspace, cx| {
+ let active_pane = workspace.active_pane();
+ workspace
+ .panes()
+ .iter()
+ .map(|pane| {
+ let leader = workspace.leader_for_pane(pane);
+ let active = pane == active_pane;
+ let pane = pane.read(cx);
+ let active_ix = pane.active_item_index();
+ PaneSummary {
+ active,
+ leader,
+ items: pane
+ .items()
+ .enumerate()
+ .map(|(ix, item)| {
+ (
+ ix == active_ix,
+ item.tab_description(0, cx)
+ .map_or(String::new(), |s| s.to_string()),
+ )
+ })
+ .collect(),
+ }
+ })
+ .collect()
+ })
+}
@@ -1,7 +1,7 @@
use crate::{
db::{tests::TestDb, NewUserParams, UserId},
executor::Executor,
- rpc::{Server, CLEANUP_TIMEOUT},
+ rpc::{Server, CLEANUP_TIMEOUT, RECONNECT_TIMEOUT},
AppState,
};
use anyhow::anyhow;
@@ -17,6 +17,7 @@ use gpui::{executor::Deterministic, ModelHandle, Task, TestAppContext, WindowHan
use language::LanguageRegistry;
use parking_lot::Mutex;
use project::{Project, WorktreeId};
+use rpc::RECEIVE_TIMEOUT;
use settings::SettingsStore;
use std::{
cell::{Ref, RefCell, RefMut},
@@ -151,12 +152,12 @@ impl TestServer {
Arc::get_mut(&mut client)
.unwrap()
- .set_id(user_id.0 as usize)
+ .set_id(user_id.to_proto())
.override_authenticate(move |cx| {
cx.spawn(|_| async move {
let access_token = "the-token".to_string();
Ok(Credentials {
- user_id: user_id.0 as u64,
+ user_id: user_id.to_proto(),
access_token,
})
})
@@ -255,6 +256,19 @@ impl TestServer {
.store(true, SeqCst);
}
+ pub fn simulate_long_connection_interruption(
+ &self,
+ peer_id: PeerId,
+ deterministic: &Arc<Deterministic>,
+ ) {
+ self.forbid_connections();
+ self.disconnect_client(peer_id);
+ deterministic.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
+ self.allow_connections();
+ deterministic.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
+ deterministic.run_until_parked();
+ }
+
pub fn forbid_connections(&self) {
self.forbid_connections.store(true, SeqCst);
}
@@ -37,6 +37,7 @@ fuzzy = { path = "../fuzzy" }
gpui = { path = "../gpui" }
language = { path = "../language" }
menu = { path = "../menu" }
+rich_text = { path = "../rich_text" }
picker = { path = "../picker" }
project = { path = "../project" }
recent_projects = {path = "../recent_projects"}
@@ -1,6 +1,6 @@
use anyhow::{anyhow, Result};
use call::report_call_event_for_channel;
-use channel::{Channel, ChannelBuffer, ChannelBufferEvent, ChannelId};
+use channel::{Channel, ChannelBuffer, ChannelBufferEvent, ChannelId, ChannelStore};
use client::{
proto::{self, PeerId},
Collaborator, ParticipantIndex,
@@ -36,6 +36,7 @@ pub fn init(cx: &mut AppContext) {
pub struct ChannelView {
pub editor: ViewHandle<Editor>,
project: ModelHandle<Project>,
+ channel_store: ModelHandle<ChannelStore>,
channel_buffer: ModelHandle<ChannelBuffer>,
remote_id: Option<ViewId>,
_editor_event_subscription: Subscription,
@@ -94,7 +95,13 @@ impl ChannelView {
pane.update(&mut cx, |pane, cx| {
pane.items_of_type::<Self>()
.find(|channel_view| channel_view.read(cx).channel_buffer == channel_buffer)
- .unwrap_or_else(|| cx.add_view(|cx| Self::new(project, channel_buffer, cx)))
+ .unwrap_or_else(|| {
+ cx.add_view(|cx| {
+ let mut this = Self::new(project, channel_store, channel_buffer, cx);
+ this.acknowledge_buffer_version(cx);
+ this
+ })
+ })
})
.ok_or_else(|| anyhow!("pane was dropped"))
})
@@ -102,6 +109,7 @@ impl ChannelView {
pub fn new(
project: ModelHandle<Project>,
+ channel_store: ModelHandle<ChannelStore>,
channel_buffer: ModelHandle<ChannelBuffer>,
cx: &mut ViewContext<Self>,
) -> Self {
@@ -121,6 +129,7 @@ impl ChannelView {
Self {
editor,
project,
+ channel_store,
channel_buffer,
remote_id: None,
_editor_event_subscription,
@@ -137,13 +146,44 @@ impl ChannelView {
event: &ChannelBufferEvent,
cx: &mut ViewContext<Self>,
) {
- if let ChannelBufferEvent::Disconnected = event {
- self.editor.update(cx, |editor, cx| {
+ match event {
+ ChannelBufferEvent::Disconnected => self.editor.update(cx, |editor, cx| {
editor.set_read_only(true);
cx.notify();
- })
+ }),
+ ChannelBufferEvent::BufferEdited => {
+ if cx.is_self_focused() || self.editor.is_focused(cx) {
+ self.acknowledge_buffer_version(cx);
+ } else {
+ self.channel_store.update(cx, |store, cx| {
+ let channel_buffer = self.channel_buffer.read(cx);
+ store.notes_changed(
+ channel_buffer.channel().id,
+ channel_buffer.epoch(),
+ &channel_buffer.buffer().read(cx).version(),
+ cx,
+ )
+ });
+ }
+ }
+ _ => {}
}
}
+
+ fn acknowledge_buffer_version(&mut self, cx: &mut ViewContext<'_, '_, ChannelView>) {
+ self.channel_store.update(cx, |store, cx| {
+ let channel_buffer = self.channel_buffer.read(cx);
+ store.acknowledge_notes_version(
+ channel_buffer.channel().id,
+ channel_buffer.epoch(),
+ &channel_buffer.buffer().read(cx).version(),
+ cx,
+ )
+ });
+ self.channel_buffer.update(cx, |buffer, cx| {
+ buffer.acknowledge_buffer_version(cx);
+ });
+ }
}
impl Entity for ChannelView {
@@ -161,6 +201,7 @@ impl View for ChannelView {
fn focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) {
if cx.is_self_focused() {
+ self.acknowledge_buffer_version(cx);
cx.focus(self.editor.as_any())
}
}
@@ -200,6 +241,7 @@ impl Item for ChannelView {
fn clone_on_split(&self, _: WorkspaceId, cx: &mut ViewContext<Self>) -> Option<Self> {
Some(Self::new(
self.project.clone(),
+ self.channel_store.clone(),
self.channel_buffer.clone(),
cx,
))
@@ -3,6 +3,7 @@ use anyhow::Result;
use call::ActiveCall;
use channel::{ChannelChat, ChannelChatEvent, ChannelMessageId, ChannelStore};
use client::Client;
+use collections::HashMap;
use db::kvp::KEY_VALUE_STORE;
use editor::Editor;
use feature_flags::{ChannelsAlpha, FeatureFlagAppExt};
@@ -12,12 +13,13 @@ use gpui::{
platform::{CursorStyle, MouseButton},
serde_json,
views::{ItemType, Select, SelectStyle},
- AnyViewHandle, AppContext, AsyncAppContext, Entity, ModelHandle, Subscription, Task, View,
- ViewContext, ViewHandle, WeakViewHandle,
+ AnyViewHandle, AppContext, AsyncAppContext, Entity, ImageData, ModelHandle, Subscription, Task,
+ View, ViewContext, ViewHandle, WeakViewHandle,
};
-use language::language_settings::SoftWrap;
+use language::{language_settings::SoftWrap, LanguageRegistry};
use menu::Confirm;
use project::Fs;
+use rich_text::RichText;
use serde::{Deserialize, Serialize};
use settings::SettingsStore;
use std::sync::Arc;
@@ -35,6 +37,7 @@ const CHAT_PANEL_KEY: &'static str = "ChatPanel";
pub struct ChatPanel {
client: Arc<Client>,
channel_store: ModelHandle<ChannelStore>,
+ languages: Arc<LanguageRegistry>,
active_chat: Option<(ModelHandle<ChannelChat>, Subscription)>,
message_list: ListState<ChatPanel>,
input_editor: ViewHandle<Editor>,
@@ -42,10 +45,12 @@ pub struct ChatPanel {
local_timezone: UtcOffset,
fs: Arc<dyn Fs>,
width: Option<f32>,
+ active: bool,
pending_serialization: Task<Option<()>>,
subscriptions: Vec<gpui::Subscription>,
workspace: WeakViewHandle<Workspace>,
has_focus: bool,
+ markdown_data: HashMap<ChannelMessageId, RichText>,
}
#[derive(Serialize, Deserialize)]
@@ -77,6 +82,7 @@ impl ChatPanel {
let fs = workspace.app_state().fs.clone();
let client = workspace.app_state().client.clone();
let channel_store = workspace.app_state().channel_store.clone();
+ let languages = workspace.app_state().languages.clone();
let input_editor = cx.add_view(|cx| {
let mut editor = Editor::auto_height(
@@ -129,6 +135,8 @@ impl ChatPanel {
fs,
client,
channel_store,
+ languages,
+
active_chat: Default::default(),
pending_serialization: Task::ready(None),
message_list,
@@ -138,7 +146,9 @@ impl ChatPanel {
has_focus: false,
subscriptions: Vec::new(),
workspace: workspace_handle,
+ active: false,
width: None,
+ markdown_data: Default::default(),
};
let mut old_dock_position = this.position(cx);
@@ -154,9 +164,9 @@ impl ChatPanel {
}),
);
- this.init_active_channel(cx);
+ this.update_channel_count(cx);
cx.observe(&this.channel_store, |this, _, cx| {
- this.init_active_channel(cx);
+ this.update_channel_count(cx)
})
.detach();
@@ -175,10 +185,33 @@ impl ChatPanel {
})
.detach();
+ let markdown = this.languages.language_for_name("Markdown");
+ cx.spawn(|this, mut cx| async move {
+ let markdown = markdown.await?;
+
+ this.update(&mut cx, |this, cx| {
+ this.input_editor.update(cx, |editor, cx| {
+ editor.buffer().update(cx, |multi_buffer, cx| {
+ multi_buffer
+ .as_singleton()
+ .unwrap()
+ .update(cx, |buffer, cx| buffer.set_language(Some(markdown), cx))
+ })
+ })
+ })?;
+
+ anyhow::Ok(())
+ })
+ .detach_and_log_err(cx);
+
this
})
}
+ pub fn active_chat(&self) -> Option<ModelHandle<ChannelChat>> {
+ self.active_chat.as_ref().map(|(chat, _)| chat.clone())
+ }
+
pub fn load(
workspace: WeakViewHandle<Workspace>,
cx: AsyncAppContext,
@@ -225,10 +258,8 @@ impl ChatPanel {
);
}
- fn init_active_channel(&mut self, cx: &mut ViewContext<Self>) {
+ fn update_channel_count(&mut self, cx: &mut ViewContext<Self>) {
let channel_count = self.channel_store.read(cx).channel_count();
- self.message_list.reset(0);
- self.active_chat = None;
self.channel_select.update(cx, |select, cx| {
select.set_item_count(channel_count, cx);
});
@@ -247,6 +278,7 @@ impl ChatPanel {
}
let subscription = cx.subscribe(&chat, Self::channel_did_change);
self.active_chat = Some((chat, subscription));
+ self.acknowledge_last_message(cx);
self.channel_select.update(cx, |select, cx| {
if let Some(ix) = self.channel_store.read(cx).index_of_channel(id) {
select.set_selected_index(ix, cx);
@@ -268,11 +300,34 @@ impl ChatPanel {
new_count,
} => {
self.message_list.splice(old_range.clone(), *new_count);
+ if self.active {
+ self.acknowledge_last_message(cx);
+ }
+ }
+ ChannelChatEvent::NewMessage {
+ channel_id,
+ message_id,
+ } => {
+ if !self.active {
+ self.channel_store.update(cx, |store, cx| {
+ store.new_message(*channel_id, *message_id, cx)
+ })
+ }
}
}
cx.notify();
}
+ fn acknowledge_last_message(&mut self, cx: &mut ViewContext<'_, '_, ChatPanel>) {
+ if self.active {
+ if let Some((chat, _)) = &self.active_chat {
+ chat.update(cx, |chat, cx| {
+ chat.acknowledge_last_message(cx);
+ });
+ }
+ }
+ }
+
fn render_channel(&self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
let theme = theme::current(cx);
Flex::column()
@@ -299,13 +354,33 @@ impl ChatPanel {
messages.flex(1., true).into_any()
}
- fn render_message(&self, ix: usize, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
- let message = self.active_chat.as_ref().unwrap().0.read(cx).message(ix);
+ fn render_message(&mut self, ix: usize, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
+ let (message, is_continuation, is_last) = {
+ let active_chat = self.active_chat.as_ref().unwrap().0.read(cx);
+ let last_message = active_chat.message(ix.saturating_sub(1));
+ let this_message = active_chat.message(ix);
+ let is_continuation = last_message.id != this_message.id
+ && this_message.sender.id == last_message.sender.id;
+
+ (
+ active_chat.message(ix).clone(),
+ is_continuation,
+ active_chat.message_count() == ix + 1,
+ )
+ };
+
+ let is_pending = message.is_pending();
+ let text = self
+ .markdown_data
+ .entry(message.id)
+ .or_insert_with(|| rich_text::render_markdown(message.body, &self.languages, None));
let now = OffsetDateTime::now_utc();
let theme = theme::current(cx);
- let style = if message.is_pending() {
+ let style = if is_pending {
&theme.chat_panel.pending_message
+ } else if is_continuation {
+ &theme.chat_panel.continuation_message
} else {
&theme.chat_panel.message
};
@@ -318,52 +393,90 @@ impl ChatPanel {
None
};
- enum DeleteMessage {}
-
- let body = message.body.clone();
- Flex::column()
- .with_child(
+ enum MessageBackgroundHighlight {}
+ MouseEventHandler::new::<MessageBackgroundHighlight, _>(ix, cx, |state, cx| {
+ let container = style.container.style_for(state);
+ if is_continuation {
Flex::row()
.with_child(
- Label::new(
- message.sender.github_login.clone(),
- style.sender.text.clone(),
+ text.element(
+ theme.editor.syntax.clone(),
+ style.body.clone(),
+ theme.editor.document_highlight_read_background,
+ cx,
)
- .contained()
- .with_style(style.sender.container),
+ .flex(1., true),
)
+ .with_child(render_remove(message_id_to_remove, cx, &theme))
+ .contained()
+ .with_style(*container)
+ .with_margin_bottom(if is_last {
+ theme.chat_panel.last_message_bottom_spacing
+ } else {
+ 0.
+ })
+ .into_any()
+ } else {
+ Flex::column()
.with_child(
- Label::new(
- format_timestamp(message.timestamp, now, self.local_timezone),
- style.timestamp.text.clone(),
- )
- .contained()
- .with_style(style.timestamp.container),
+ Flex::row()
+ .with_child(
+ Flex::row()
+ .with_child(render_avatar(
+ message.sender.avatar.clone(),
+ &theme,
+ ))
+ .with_child(
+ Label::new(
+ message.sender.github_login.clone(),
+ style.sender.text.clone(),
+ )
+ .contained()
+ .with_style(style.sender.container),
+ )
+ .with_child(
+ Label::new(
+ format_timestamp(
+ message.timestamp,
+ now,
+ self.local_timezone,
+ ),
+ style.timestamp.text.clone(),
+ )
+ .contained()
+ .with_style(style.timestamp.container),
+ )
+ .align_children_center()
+ .flex(1., true),
+ )
+ .with_child(render_remove(message_id_to_remove, cx, &theme))
+ .align_children_center(),
)
- .with_children(message_id_to_remove.map(|id| {
- MouseEventHandler::new::<DeleteMessage, _>(
- id as usize,
- cx,
- |mouse_state, _| {
- let button_style =
- theme.chat_panel.icon_button.style_for(mouse_state);
- render_icon_button(button_style, "icons/x.svg")
- .aligned()
- .into_any()
- },
- )
- .with_padding(Padding::uniform(2.))
- .with_cursor_style(CursorStyle::PointingHand)
- .on_click(MouseButton::Left, move |_, this, cx| {
- this.remove_message(id, cx);
- })
- .flex_float()
- })),
- )
- .with_child(Text::new(body, style.body.clone()))
- .contained()
- .with_style(style.container)
- .into_any()
+ .with_child(
+ Flex::row()
+ .with_child(
+ text.element(
+ theme.editor.syntax.clone(),
+ style.body.clone(),
+ theme.editor.document_highlight_read_background,
+ cx,
+ )
+ .flex(1., true),
+ )
+ // Add a spacer to make everything line up
+ .with_child(render_remove(None, cx, &theme)),
+ )
+ .contained()
+ .with_style(*container)
+ .with_margin_bottom(if is_last {
+ theme.chat_panel.last_message_bottom_spacing
+ } else {
+ 0.
+ })
+ .into_any()
+ }
+ })
+ .into_any()
}
fn render_input_box(&self, theme: &Arc<Theme>, cx: &AppContext) -> AnyElement<Self> {
@@ -537,6 +650,7 @@ impl ChatPanel {
cx.spawn(|this, mut cx| async move {
let chat = open_chat.await?;
this.update(&mut cx, |this, cx| {
+ this.markdown_data = Default::default();
this.set_active_chat(chat, cx);
})
})
@@ -561,6 +675,72 @@ impl ChatPanel {
}
}
+fn render_avatar(avatar: Option<Arc<ImageData>>, theme: &Arc<Theme>) -> AnyElement<ChatPanel> {
+ let avatar_style = theme.chat_panel.avatar;
+
+ avatar
+ .map(|avatar| {
+ Image::from_data(avatar)
+ .with_style(avatar_style.image)
+ .aligned()
+ .contained()
+ .with_corner_radius(avatar_style.outer_corner_radius)
+ .constrained()
+ .with_width(avatar_style.outer_width)
+ .with_height(avatar_style.outer_width)
+ .into_any()
+ })
+ .unwrap_or_else(|| {
+ Empty::new()
+ .constrained()
+ .with_width(avatar_style.outer_width)
+ .into_any()
+ })
+ .contained()
+ .with_style(theme.chat_panel.avatar_container)
+ .into_any()
+}
+
+fn render_remove(
+ message_id_to_remove: Option<u64>,
+ cx: &mut ViewContext<'_, '_, ChatPanel>,
+ theme: &Arc<Theme>,
+) -> AnyElement<ChatPanel> {
+ enum DeleteMessage {}
+
+ message_id_to_remove
+ .map(|id| {
+ MouseEventHandler::new::<DeleteMessage, _>(id as usize, cx, |mouse_state, _| {
+ let button_style = theme.chat_panel.icon_button.style_for(mouse_state);
+ render_icon_button(button_style, "icons/x.svg")
+ .aligned()
+ .into_any()
+ })
+ .with_padding(Padding::uniform(2.))
+ .with_cursor_style(CursorStyle::PointingHand)
+ .on_click(MouseButton::Left, move |_, this, cx| {
+ this.remove_message(id, cx);
+ })
+ .flex_float()
+ .into_any()
+ })
+ .unwrap_or_else(|| {
+ let style = theme.chat_panel.icon_button.default;
+
+ Empty::new()
+ .constrained()
+ .with_width(style.icon_width)
+ .aligned()
+ .constrained()
+ .with_width(style.button_width)
+ .with_height(style.button_width)
+ .contained()
+ .with_uniform_padding(2.)
+ .flex_float()
+ .into_any()
+ })
+}
+
impl Entity for ChatPanel {
type Event = Event;
}
@@ -627,8 +807,12 @@ impl Panel for ChatPanel {
}
fn set_active(&mut self, active: bool, cx: &mut ViewContext<Self>) {
- if active && !is_chat_feature_enabled(cx) {
- cx.emit(Event::Dismissed);
+ self.active = active;
+ if active {
+ self.acknowledge_last_message(cx);
+ if !is_chat_feature_enabled(cx) {
+ cx.emit(Event::Dismissed);
+ }
}
}
@@ -95,6 +95,11 @@ pub struct JoinChannelCall {
pub channel_id: u64,
}
+#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub struct JoinChannelChat {
+ pub channel_id: u64,
+}
+
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
struct StartMoveChannelFor {
channel_id: ChannelId,
@@ -151,6 +156,7 @@ impl_actions!(
ToggleCollapse,
OpenChannelNotes,
JoinChannelCall,
+ JoinChannelChat,
LinkChannel,
StartMoveChannelFor,
StartLinkChannelFor,
@@ -198,6 +204,7 @@ pub fn init(cx: &mut AppContext) {
cx.add_action(CollabPanel::collapse_selected_channel);
cx.add_action(CollabPanel::expand_selected_channel);
cx.add_action(CollabPanel::open_channel_notes);
+ cx.add_action(CollabPanel::join_channel_chat);
cx.add_action(
|panel: &mut CollabPanel, action: &ToggleSelectedIx, cx: &mut ViewContext<CollabPanel>| {
@@ -471,6 +478,12 @@ impl CollabPanel {
.iter()
.position(|entry| !matches!(entry, ListEntry::Header(_)));
}
+ } else if let editor::Event::Blurred = event {
+ let query = this.filter_editor.read(cx).text(cx);
+ if query.is_empty() {
+ this.selection.take();
+ this.update_entries(true, cx);
+ }
}
})
.detach();
@@ -555,7 +568,7 @@ impl CollabPanel {
&*channel,
*depth,
path.to_owned(),
- &theme.collab_panel,
+ &theme,
is_selected,
ix,
cx,
@@ -579,6 +592,7 @@ impl CollabPanel {
*channel_id,
&theme.collab_panel,
is_selected,
+ ix,
cx,
),
ListEntry::ChannelInvite(channel) => Self::render_channel_invite(
@@ -608,7 +622,7 @@ impl CollabPanel {
contact,
*calling,
&this.project,
- &theme.collab_panel,
+ &theme,
is_selected,
cx,
),
@@ -768,9 +782,16 @@ impl CollabPanel {
let prev_selected_entry = self.selection.and_then(|ix| self.entries.get(ix).cloned());
let old_entries = mem::take(&mut self.entries);
+ let mut scroll_to_top = false;
if let Some(room) = ActiveCall::global(cx).read(cx).room() {
self.entries.push(ListEntry::Header(Section::ActiveCall));
+ if !old_entries
+ .iter()
+ .any(|entry| matches!(entry, ListEntry::Header(Section::ActiveCall)))
+ {
+ scroll_to_top = true;
+ }
if !self.collapsed_sections.contains(&Section::ActiveCall) {
let room = room.read(cx);
@@ -1138,44 +1159,49 @@ impl CollabPanel {
}
let old_scroll_top = self.list_state.logical_scroll_top();
+
self.list_state.reset(self.entries.len());
- // Attempt to maintain the same scroll position.
- if let Some(old_top_entry) = old_entries.get(old_scroll_top.item_ix) {
- let new_scroll_top = self
- .entries
- .iter()
- .position(|entry| entry == old_top_entry)
- .map(|item_ix| ListOffset {
- item_ix,
- offset_in_item: old_scroll_top.offset_in_item,
- })
- .or_else(|| {
- let entry_after_old_top = old_entries.get(old_scroll_top.item_ix + 1)?;
- let item_ix = self
- .entries
- .iter()
- .position(|entry| entry == entry_after_old_top)?;
- Some(ListOffset {
+ if scroll_to_top {
+ self.list_state.scroll_to(ListOffset::default());
+ } else {
+ // Attempt to maintain the same scroll position.
+ if let Some(old_top_entry) = old_entries.get(old_scroll_top.item_ix) {
+ let new_scroll_top = self
+ .entries
+ .iter()
+ .position(|entry| entry == old_top_entry)
+ .map(|item_ix| ListOffset {
item_ix,
- offset_in_item: 0.,
+ offset_in_item: old_scroll_top.offset_in_item,
})
- })
- .or_else(|| {
- let entry_before_old_top =
- old_entries.get(old_scroll_top.item_ix.saturating_sub(1))?;
- let item_ix = self
- .entries
- .iter()
- .position(|entry| entry == entry_before_old_top)?;
- Some(ListOffset {
- item_ix,
- offset_in_item: 0.,
+ .or_else(|| {
+ let entry_after_old_top = old_entries.get(old_scroll_top.item_ix + 1)?;
+ let item_ix = self
+ .entries
+ .iter()
+ .position(|entry| entry == entry_after_old_top)?;
+ Some(ListOffset {
+ item_ix,
+ offset_in_item: 0.,
+ })
})
- });
+ .or_else(|| {
+ let entry_before_old_top =
+ old_entries.get(old_scroll_top.item_ix.saturating_sub(1))?;
+ let item_ix = self
+ .entries
+ .iter()
+ .position(|entry| entry == entry_before_old_top)?;
+ Some(ListOffset {
+ item_ix,
+ offset_in_item: 0.,
+ })
+ });
- self.list_state
- .scroll_to(new_scroll_top.unwrap_or(old_scroll_top));
+ self.list_state
+ .scroll_to(new_scroll_top.unwrap_or(old_scroll_top));
+ }
}
cx.notify();
@@ -1633,16 +1659,20 @@ impl CollabPanel {
contact: &Contact,
calling: bool,
project: &ModelHandle<Project>,
- theme: &theme::CollabPanel,
+ theme: &theme::Theme,
is_selected: bool,
cx: &mut ViewContext<Self>,
) -> AnyElement<Self> {
+ enum ContactTooltip {}
+
+ let collab_theme = &theme.collab_panel;
let online = contact.online;
let busy = contact.busy || calling;
let user_id = contact.user.id;
let github_login = contact.user.github_login.clone();
let initial_project = project.clone();
- let mut event_handler =
+
+ let event_handler =
MouseEventHandler::new::<Contact, _>(contact.user.id as usize, cx, |state, cx| {
Flex::row()
.with_children(contact.user.avatar.clone().map(|avatar| {
@@ -1652,9 +1682,9 @@ impl CollabPanel {
.collapsed()
.contained()
.with_style(if busy {
- theme.contact_status_busy
+ collab_theme.contact_status_busy
} else {
- theme.contact_status_free
+ collab_theme.contact_status_free
})
.aligned(),
)
@@ -1664,7 +1694,7 @@ impl CollabPanel {
Stack::new()
.with_child(
Image::from_data(avatar)
- .with_style(theme.contact_avatar)
+ .with_style(collab_theme.contact_avatar)
.aligned()
.left(),
)
@@ -1673,58 +1703,94 @@ impl CollabPanel {
.with_child(
Label::new(
contact.user.github_login.clone(),
- theme.contact_username.text.clone(),
+ collab_theme.contact_username.text.clone(),
)
.contained()
- .with_style(theme.contact_username.container)
+ .with_style(collab_theme.contact_username.container)
.aligned()
.left()
.flex(1., true),
)
- .with_child(
- MouseEventHandler::new::<Cancel, _>(
- contact.user.id as usize,
- cx,
- |mouse_state, _| {
- let button_style = theme.contact_button.style_for(mouse_state);
- render_icon_button(button_style, "icons/x.svg")
- .aligned()
- .flex_float()
- },
+ .with_children(if state.hovered() {
+ Some(
+ MouseEventHandler::new::<Cancel, _>(
+ contact.user.id as usize,
+ cx,
+ |mouse_state, _| {
+ let button_style =
+ collab_theme.contact_button.style_for(mouse_state);
+ render_icon_button(button_style, "icons/x.svg")
+ .aligned()
+ .flex_float()
+ },
+ )
+ .with_padding(Padding::uniform(2.))
+ .with_cursor_style(CursorStyle::PointingHand)
+ .on_click(MouseButton::Left, move |_, this, cx| {
+ this.remove_contact(user_id, &github_login, cx);
+ })
+ .flex_float(),
)
- .with_padding(Padding::uniform(2.))
- .with_cursor_style(CursorStyle::PointingHand)
- .on_click(MouseButton::Left, move |_, this, cx| {
- this.remove_contact(user_id, &github_login, cx);
- })
- .flex_float(),
- )
+ } else {
+ None
+ })
.with_children(if calling {
Some(
- Label::new("Calling", theme.calling_indicator.text.clone())
+ Label::new("Calling", collab_theme.calling_indicator.text.clone())
.contained()
- .with_style(theme.calling_indicator.container)
+ .with_style(collab_theme.calling_indicator.container)
.aligned(),
)
} else {
None
})
.constrained()
- .with_height(theme.row_height)
+ .with_height(collab_theme.row_height)
.contained()
- .with_style(*theme.contact_row.in_state(is_selected).style_for(state))
- })
- .on_click(MouseButton::Left, move |_, this, cx| {
- if online && !busy {
- this.call(user_id, Some(initial_project.clone()), cx);
- }
+ .with_style(
+ *collab_theme
+ .contact_row
+ .in_state(is_selected)
+ .style_for(state),
+ )
});
- if online {
- event_handler = event_handler.with_cursor_style(CursorStyle::PointingHand);
- }
+ if online && !busy {
+ let room = ActiveCall::global(cx).read(cx).room();
+ let label = if room.is_some() {
+ format!("Invite {} to join call", contact.user.github_login)
+ } else {
+ format!("Call {}", contact.user.github_login)
+ };
- event_handler.into_any()
+ event_handler
+ .on_click(MouseButton::Left, move |_, this, cx| {
+ this.call(user_id, Some(initial_project.clone()), cx);
+ })
+ .with_cursor_style(CursorStyle::PointingHand)
+ .with_tooltip::<ContactTooltip>(
+ contact.user.id as usize,
+ label,
+ None,
+ theme.tooltip.clone(),
+ cx,
+ )
+ .into_any()
+ } else {
+ event_handler
+ .with_tooltip::<ContactTooltip>(
+ contact.user.id as usize,
+ format!(
+ "{} is {}",
+ contact.user.github_login,
+ if busy { "on a call" } else { "offline" }
+ ),
+ None,
+ theme.tooltip.clone(),
+ cx,
+ )
+ .into_any()
+ }
}
fn render_contact_placeholder(
@@ -1827,12 +1893,13 @@ impl CollabPanel {
channel: &Channel,
depth: usize,
path: ChannelPath,
- theme: &theme::CollabPanel,
+ theme: &theme::Theme,
is_selected: bool,
ix: usize,
cx: &mut ViewContext<Self>,
) -> AnyElement<Self> {
let channel_id = channel.id;
+ let collab_theme = &theme.collab_panel;
let has_children = self.channel_store.read(cx).has_children(channel_id);
let other_selected =
self.selected_channel().map(|channel| channel.0.id) == Some(channel.id);
@@ -1851,6 +1918,10 @@ impl CollabPanel {
const FACEPILE_LIMIT: usize = 3;
enum ChannelCall {}
+ enum ChannelNote {}
+ enum NotesTooltip {}
+ enum ChatTooltip {}
+ enum ChannelTooltip {}
let mut is_dragged_over = false;
if cx
@@ -1866,6 +1937,8 @@ impl CollabPanel {
is_dragged_over = true;
}
+ let has_messages_notification = channel.unseen_message_id.is_some();
+
MouseEventHandler::new::<Channel, _>(ix, cx, |state, cx| {
let row_hovered = state.hovered();
@@ -1886,60 +1959,151 @@ impl CollabPanel {
Flex::<Self>::row()
.with_child(
Svg::new("icons/hash.svg")
- .with_color(theme.channel_hash.color)
+ .with_color(collab_theme.channel_hash.color)
.constrained()
- .with_width(theme.channel_hash.width)
+ .with_width(collab_theme.channel_hash.width)
.aligned()
.left(),
)
+ .with_child({
+ let style = collab_theme.channel_name.inactive_state();
+ Flex::row()
+ .with_child(
+ Label::new(channel.name.clone(), style.text.clone())
+ .contained()
+ .with_style(style.container)
+ .aligned()
+ .left()
+ .with_tooltip::<ChannelTooltip>(
+ ix,
+ "Join channel",
+ None,
+ theme.tooltip.clone(),
+ cx,
+ ),
+ )
+ .with_children({
+ let participants =
+ self.channel_store.read(cx).channel_participants(channel_id);
+
+ if !participants.is_empty() {
+ let extra_count = participants.len().saturating_sub(FACEPILE_LIMIT);
+
+ let result = FacePile::new(collab_theme.face_overlap)
+ .with_children(
+ participants
+ .iter()
+ .filter_map(|user| {
+ Some(
+ Image::from_data(user.avatar.clone()?)
+ .with_style(collab_theme.channel_avatar),
+ )
+ })
+ .take(FACEPILE_LIMIT),
+ )
+ .with_children((extra_count > 0).then(|| {
+ Label::new(
+ format!("+{}", extra_count),
+ collab_theme.extra_participant_label.text.clone(),
+ )
+ .contained()
+ .with_style(collab_theme.extra_participant_label.container)
+ }));
+
+ Some(result)
+ } else {
+ None
+ }
+ })
+ .with_spacing(8.)
+ .align_children_center()
+ .flex(1., true)
+ })
.with_child(
- Label::new(channel.name.clone(), theme.channel_name.text.clone())
- .contained()
- .with_style(theme.channel_name.container)
- .aligned()
- .left()
- .flex(1., true),
+ MouseEventHandler::new::<ChannelNote, _>(ix, cx, move |mouse_state, _| {
+ let container_style = collab_theme
+ .disclosure
+ .button
+ .style_for(mouse_state)
+ .container;
+
+ if channel.unseen_message_id.is_some() {
+ Svg::new("icons/conversations.svg")
+ .with_color(collab_theme.channel_note_active_color)
+ .constrained()
+ .with_width(collab_theme.channel_hash.width)
+ .contained()
+ .with_style(container_style)
+ .with_uniform_padding(4.)
+ .into_any()
+ } else if row_hovered {
+ Svg::new("icons/conversations.svg")
+ .with_color(collab_theme.channel_hash.color)
+ .constrained()
+ .with_width(collab_theme.channel_hash.width)
+ .contained()
+ .with_style(container_style)
+ .with_uniform_padding(4.)
+ .into_any()
+ } else {
+ Empty::new().into_any()
+ }
+ })
+ .on_click(MouseButton::Left, move |_, this, cx| {
+ this.join_channel_chat(&JoinChannelChat { channel_id }, cx);
+ })
+ .with_tooltip::<ChatTooltip>(
+ ix,
+ "Open channel chat",
+ None,
+ theme.tooltip.clone(),
+ cx,
+ )
+ .contained()
+ .with_margin_right(4.),
)
.with_child(
- MouseEventHandler::new::<ChannelCall, _>(ix, cx, move |_, cx| {
- let participants =
- self.channel_store.read(cx).channel_participants(channel_id);
- if !participants.is_empty() {
- let extra_count = participants.len().saturating_sub(FACEPILE_LIMIT);
-
- FacePile::new(theme.face_overlap)
- .with_children(
- participants
- .iter()
- .filter_map(|user| {
- Some(
- Image::from_data(user.avatar.clone()?)
- .with_style(theme.channel_avatar),
- )
- })
- .take(FACEPILE_LIMIT),
+ MouseEventHandler::new::<ChannelCall, _>(ix, cx, move |mouse_state, cx| {
+ let container_style = collab_theme
+ .disclosure
+ .button
+ .style_for(mouse_state)
+ .container;
+ if row_hovered || channel.unseen_note_version.is_some() {
+ Svg::new("icons/file.svg")
+ .with_color(if channel.unseen_note_version.is_some() {
+ collab_theme.channel_note_active_color
+ } else {
+ collab_theme.channel_hash.color
+ })
+ .constrained()
+ .with_width(collab_theme.channel_hash.width)
+ .contained()
+ .with_style(container_style)
+ .with_uniform_padding(4.)
+ .with_margin_right(collab_theme.channel_hash.container.margin.left)
+ .with_tooltip::<NotesTooltip>(
+ ix as usize,
+ "Open channel notes",
+ None,
+ theme.tooltip.clone(),
+ cx,
)
- .with_children((extra_count > 0).then(|| {
- Label::new(
- format!("+{}", extra_count),
- theme.extra_participant_label.text.clone(),
- )
- .contained()
- .with_style(theme.extra_participant_label.container)
- }))
.into_any()
- } else if row_hovered {
- Svg::new("icons/speaker-loud.svg")
- .with_color(theme.channel_hash.color)
+ } else if has_messages_notification {
+ Empty::new()
.constrained()
- .with_width(theme.channel_hash.width)
+ .with_width(collab_theme.channel_hash.width)
+ .contained()
+ .with_uniform_padding(4.)
+ .with_margin_right(collab_theme.channel_hash.container.margin.left)
.into_any()
} else {
Empty::new().into_any()
}
})
.on_click(MouseButton::Left, move |_, this, cx| {
- this.join_channel_call(channel_id, cx);
+ this.open_channel_notes(&OpenChannelNotes { channel_id }, cx);
}),
)
.align_children_center()
@@ -1951,24 +2115,28 @@ impl CollabPanel {
}),
)
.with_id(ix)
- .with_style(theme.disclosure.clone())
+ .with_style(collab_theme.disclosure.clone())
.element()
.constrained()
- .with_height(theme.row_height)
+ .with_height(collab_theme.row_height)
.contained()
.with_style(select_state(
- theme
+ collab_theme
.channel_row
.in_state(is_selected || is_active || is_dragged_over),
))
.with_padding_left(
- theme.channel_row.default_style().padding.left
- + theme.channel_indent * depth as f32,
+ collab_theme.channel_row.default_style().padding.left
+ + collab_theme.channel_indent * depth as f32,
)
})
.on_click(MouseButton::Left, move |_, this, cx| {
if this.drag_target_channel.take().is_none() {
- this.join_channel_chat(channel_id, cx);
+ if is_active {
+ this.open_channel_notes(&OpenChannelNotes { channel_id }, cx)
+ } else {
+ this.join_channel(channel_id, cx)
+ }
}
})
.on_click(MouseButton::Right, {
@@ -2082,6 +2250,7 @@ impl CollabPanel {
channel_id: ChannelId,
theme: &theme::CollabPanel,
is_selected: bool,
+ ix: usize,
cx: &mut ViewContext<Self>,
) -> AnyElement<Self> {
enum ChannelNotes {}
@@ -2091,7 +2260,7 @@ impl CollabPanel {
.or(theme.contact_avatar.height)
.unwrap_or(0.);
- MouseEventHandler::new::<ChannelNotes, _>(channel_id as usize, cx, |state, cx| {
+ MouseEventHandler::new::<ChannelNotes, _>(ix as usize, cx, |state, cx| {
let tree_branch = *theme.tree_branch.in_state(is_selected).style_for(state);
let row = theme.project_row.in_state(is_selected).style_for(state);
@@ -2392,6 +2561,13 @@ impl CollabPanel {
},
));
+ items.push(ContextMenuItem::action(
+ "Open Chat",
+ JoinChannelChat {
+ channel_id: path.channel_id(),
+ },
+ ));
+
if self.channel_store.read(cx).is_user_admin(path.channel_id()) {
let parent_id = path.parent_id();
@@ -2588,7 +2764,26 @@ impl CollabPanel {
}
}
ListEntry::Channel { channel, .. } => {
- self.join_channel_chat(channel.id, cx);
+ let is_active = iife!({
+ let call_channel = ActiveCall::global(cx)
+ .read(cx)
+ .room()?
+ .read(cx)
+ .channel_id()?;
+
+ Some(call_channel == channel.id)
+ })
+ .unwrap_or(false);
+ if is_active {
+ self.open_channel_notes(
+ &OpenChannelNotes {
+ channel_id: channel.id,
+ },
+ cx,
+ )
+ } else {
+ self.join_channel(channel.id, cx)
+ }
}
ListEntry::ContactPlaceholder => self.toggle_contact_finder(cx),
_ => {}
@@ -2991,13 +3186,54 @@ impl CollabPanel {
.detach_and_log_err(cx);
}
- fn join_channel_call(&self, channel: u64, cx: &mut ViewContext<Self>) {
- ActiveCall::global(cx)
- .update(cx, |call, cx| call.join_channel(channel, cx))
- .detach_and_log_err(cx);
+ fn join_channel(&self, channel_id: u64, cx: &mut ViewContext<Self>) {
+ let workspace = self.workspace.clone();
+ let window = cx.window();
+ let active_call = ActiveCall::global(cx);
+ cx.spawn(|_, mut cx| async move {
+ if active_call.read_with(&mut cx, |active_call, cx| {
+ if let Some(room) = active_call.room() {
+ let room = room.read(cx);
+ room.is_sharing_project() && room.remote_participants().len() > 0
+ } else {
+ false
+ }
+ }) {
+ let answer = window.prompt(
+ PromptLevel::Warning,
+ "Leaving this call will unshare your current project.\nDo you want to switch channels?",
+ &["Yes, Join Channel", "Cancel"],
+ &mut cx,
+ );
+
+ if let Some(mut answer) = answer {
+ if answer.next().await == Some(1) {
+ return anyhow::Ok(());
+ }
+ }
+ }
+
+ let room = active_call
+ .update(&mut cx, |call, cx| call.join_channel(channel_id, cx))
+ .await?;
+
+ let task = room.update(&mut cx, |room, cx| {
+ let workspace = workspace.upgrade(cx)?;
+ let (project, host) = room.most_active_project()?;
+ let app_state = workspace.read(cx).app_state().clone();
+ Some(workspace::join_remote_project(project, host, app_state, cx))
+ });
+ if let Some(task) = task {
+ task.await?;
+ }
+
+ anyhow::Ok(())
+ })
+ .detach_and_log_err(cx);
}
- fn join_channel_chat(&mut self, channel_id: u64, cx: &mut ViewContext<Self>) {
+ fn join_channel_chat(&mut self, action: &JoinChannelChat, cx: &mut ViewContext<Self>) {
+ let channel_id = action.channel_id;
if let Some(workspace) = self.workspace.upgrade(cx) {
cx.app_context().defer(move |cx| {
workspace.update(cx, |workspace, cx| {
@@ -36,6 +36,7 @@ language = { path = "../language" }
lsp = { path = "../lsp" }
project = { path = "../project" }
rpc = { path = "../rpc" }
+rich_text = { path = "../rich_text" }
settings = { path = "../settings" }
snippet = { path = "../snippet" }
sum_tree = { path = "../sum_tree" }
@@ -2454,7 +2454,13 @@ impl Editor {
let snapshot = this.buffer.read(cx).read(cx);
let new_selections = resolve_multiple::<usize, _>(new_anchor_selections, &snapshot)
.zip(new_selection_deltas)
- .map(|(selection, delta)| selection.map(|e| e + delta))
+ .map(|(selection, delta)| Selection {
+ id: selection.id,
+ start: selection.start + delta,
+ end: selection.end + delta,
+ reversed: selection.reversed,
+ goal: SelectionGoal::None,
+ })
.collect::<Vec<_>>();
let mut i = 0;
@@ -8,12 +8,12 @@ use futures::FutureExt;
use gpui::{
actions,
elements::{Flex, MouseEventHandler, Padding, ParentElement, Text},
- fonts::{HighlightStyle, Underline, Weight},
platform::{CursorStyle, MouseButton},
- AnyElement, AppContext, CursorRegion, Element, ModelHandle, MouseRegion, Task, ViewContext,
+ AnyElement, AppContext, Element, ModelHandle, Task, ViewContext,
};
use language::{Bias, DiagnosticEntry, DiagnosticSeverity, Language, LanguageRegistry};
use project::{HoverBlock, HoverBlockKind, InlayHintLabelPart, Project};
+use rich_text::{new_paragraph, render_code, render_markdown_mut, RichText};
use std::{ops::Range, sync::Arc, time::Duration};
use util::TryFutureExt;
@@ -346,158 +346,25 @@ fn show_hover(
}
fn render_blocks(
- theme_id: usize,
blocks: &[HoverBlock],
language_registry: &Arc<LanguageRegistry>,
language: Option<&Arc<Language>>,
- style: &EditorStyle,
-) -> RenderedInfo {
- let mut text = String::new();
- let mut highlights = Vec::new();
- let mut region_ranges = Vec::new();
- let mut regions = Vec::new();
+) -> RichText {
+ let mut data = RichText {
+ text: Default::default(),
+ highlights: Default::default(),
+ region_ranges: Default::default(),
+ regions: Default::default(),
+ };
for block in blocks {
match &block.kind {
HoverBlockKind::PlainText => {
- new_paragraph(&mut text, &mut Vec::new());
- text.push_str(&block.text);
+ new_paragraph(&mut data.text, &mut Vec::new());
+ data.text.push_str(&block.text);
}
HoverBlockKind::Markdown => {
- use pulldown_cmark::{CodeBlockKind, Event, Options, Parser, Tag};
-
- let mut bold_depth = 0;
- let mut italic_depth = 0;
- let mut link_url = None;
- let mut current_language = None;
- let mut list_stack = Vec::new();
-
- for event in Parser::new_ext(&block.text, Options::all()) {
- let prev_len = text.len();
- match event {
- Event::Text(t) => {
- if let Some(language) = ¤t_language {
- render_code(
- &mut text,
- &mut highlights,
- t.as_ref(),
- language,
- style,
- );
- } else {
- text.push_str(t.as_ref());
-
- let mut style = HighlightStyle::default();
- if bold_depth > 0 {
- style.weight = Some(Weight::BOLD);
- }
- if italic_depth > 0 {
- style.italic = Some(true);
- }
- if let Some(link_url) = link_url.clone() {
- region_ranges.push(prev_len..text.len());
- regions.push(RenderedRegion {
- link_url: Some(link_url),
- code: false,
- });
- style.underline = Some(Underline {
- thickness: 1.0.into(),
- ..Default::default()
- });
- }
-
- if style != HighlightStyle::default() {
- let mut new_highlight = true;
- if let Some((last_range, 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 {
- highlights.push((prev_len..text.len(), style));
- }
- }
- }
- }
- Event::Code(t) => {
- text.push_str(t.as_ref());
- region_ranges.push(prev_len..text.len());
- if link_url.is_some() {
- highlights.push((
- prev_len..text.len(),
- HighlightStyle {
- underline: Some(Underline {
- thickness: 1.0.into(),
- ..Default::default()
- }),
- ..Default::default()
- },
- ));
- }
- regions.push(RenderedRegion {
- code: true,
- link_url: link_url.clone(),
- });
- }
- Event::Start(tag) => match tag {
- Tag::Paragraph => new_paragraph(&mut text, &mut list_stack),
- Tag::Heading(_, _, _) => {
- new_paragraph(&mut text, &mut list_stack);
- bold_depth += 1;
- }
- Tag::CodeBlock(kind) => {
- new_paragraph(&mut text, &mut list_stack);
- current_language = if let CodeBlockKind::Fenced(language) = kind {
- language_registry
- .language_for_name(language.as_ref())
- .now_or_never()
- .and_then(Result::ok)
- } else {
- language.cloned()
- }
- }
- Tag::Emphasis => italic_depth += 1,
- Tag::Strong => bold_depth += 1,
- Tag::Link(_, url, _) => link_url = Some(url.to_string()),
- Tag::List(number) => {
- list_stack.push((number, false));
- }
- Tag::Item => {
- let len = list_stack.len();
- if let Some((list_number, has_content)) = list_stack.last_mut() {
- *has_content = false;
- if !text.is_empty() && !text.ends_with('\n') {
- text.push('\n');
- }
- for _ in 0..len - 1 {
- text.push_str(" ");
- }
- if let Some(number) = list_number {
- text.push_str(&format!("{}. ", number));
- *number += 1;
- *has_content = false;
- } else {
- text.push_str("- ");
- }
- }
- }
- _ => {}
- },
- Event::End(tag) => match tag {
- Tag::Heading(_, _, _) => bold_depth -= 1,
- Tag::CodeBlock(_) => current_language = None,
- Tag::Emphasis => italic_depth -= 1,
- Tag::Strong => bold_depth -= 1,
- Tag::Link(_, _, _) => link_url = None,
- Tag::List(_) => drop(list_stack.pop()),
- _ => {}
- },
- Event::HardBreak => text.push('\n'),
- Event::SoftBreak => text.push(' '),
- _ => {}
- }
- }
+ render_markdown_mut(&block.text, language_registry, language, &mut data)
}
HoverBlockKind::Code { language } => {
if let Some(language) = language_registry
@@ -505,62 +372,17 @@ fn render_blocks(
.now_or_never()
.and_then(Result::ok)
{
- render_code(&mut text, &mut highlights, &block.text, &language, style);
+ render_code(&mut data.text, &mut data.highlights, &block.text, &language);
} else {
- text.push_str(&block.text);
+ data.text.push_str(&block.text);
}
}
}
}
- RenderedInfo {
- theme_id,
- text: text.trim().to_string(),
- highlights,
- region_ranges,
- regions,
- }
-}
-
-fn render_code(
- text: &mut String,
- highlights: &mut Vec<(Range<usize>, HighlightStyle)>,
- content: &str,
- language: &Arc<Language>,
- style: &EditorStyle,
-) {
- let prev_len = text.len();
- text.push_str(content);
- for (range, highlight_id) in language.highlight_text(&content.into(), 0..content.len()) {
- if let Some(style) = highlight_id.style(&style.syntax) {
- highlights.push((prev_len + range.start..prev_len + range.end, style));
- }
- }
-}
-
-fn new_paragraph(text: &mut String, list_stack: &mut Vec<(Option<u64>, bool)>) {
- let mut is_subsequent_paragraph_of_list = false;
- if let Some((_, has_content)) = list_stack.last_mut() {
- if *has_content {
- is_subsequent_paragraph_of_list = true;
- } else {
- *has_content = true;
- return;
- }
- }
+ data.text = data.text.trim().to_string();
- if !text.is_empty() {
- if !text.ends_with('\n') {
- text.push('\n');
- }
- text.push('\n');
- }
- for _ in 0..list_stack.len().saturating_sub(1) {
- text.push_str(" ");
- }
- if is_subsequent_paragraph_of_list {
- text.push_str(" ");
- }
+ data
}
#[derive(Default)]
@@ -623,22 +445,7 @@ pub struct InfoPopover {
symbol_range: RangeInEditor,
pub blocks: Vec<HoverBlock>,
language: Option<Arc<Language>>,
- rendered_content: Option<RenderedInfo>,
-}
-
-#[derive(Debug, Clone)]
-struct RenderedInfo {
- theme_id: usize,
- text: String,
- highlights: Vec<(Range<usize>, HighlightStyle)>,
- region_ranges: Vec<Range<usize>>,
- regions: Vec<RenderedRegion>,
-}
-
-#[derive(Debug, Clone)]
-struct RenderedRegion {
- code: bool,
- link_url: Option<String>,
+ rendered_content: Option<RichText>,
}
impl InfoPopover {
@@ -647,63 +454,24 @@ impl InfoPopover {
style: &EditorStyle,
cx: &mut ViewContext<Editor>,
) -> AnyElement<Editor> {
- if let Some(rendered) = &self.rendered_content {
- if rendered.theme_id != style.theme_id {
- self.rendered_content = None;
- }
- }
-
let rendered_content = self.rendered_content.get_or_insert_with(|| {
render_blocks(
- style.theme_id,
&self.blocks,
self.project.read(cx).languages(),
self.language.as_ref(),
- style,
)
});
- MouseEventHandler::new::<InfoPopover, _>(0, cx, |_, cx| {
- let mut region_id = 0;
- let view_id = cx.view_id();
-
+ MouseEventHandler::new::<InfoPopover, _>(0, cx, move |_, cx| {
let code_span_background_color = style.document_highlight_read_background;
- let regions = rendered_content.regions.clone();
Flex::column()
.scrollable::<HoverBlock>(1, None, cx)
- .with_child(
- Text::new(rendered_content.text.clone(), style.text.clone())
- .with_highlights(rendered_content.highlights.clone())
- .with_custom_runs(
- rendered_content.region_ranges.clone(),
- move |ix, bounds, cx| {
- region_id += 1;
- let region = regions[ix].clone();
- if let Some(url) = region.link_url {
- cx.scene().push_cursor_region(CursorRegion {
- bounds,
- style: CursorStyle::PointingHand,
- });
- cx.scene().push_mouse_region(
- MouseRegion::new::<Self>(view_id, region_id, bounds)
- .on_click::<Editor, _>(
- MouseButton::Left,
- move |_, _, cx| cx.platform().open_url(&url),
- ),
- );
- }
- if region.code {
- cx.scene().push_quad(gpui::Quad {
- bounds,
- background: Some(code_span_background_color),
- border: Default::default(),
- corner_radii: (2.0).into(),
- });
- }
- },
- )
- .with_soft_wrap(true),
- )
+ .with_child(rendered_content.element(
+ style.syntax.clone(),
+ style.text.clone(),
+ code_span_background_color,
+ cx,
+ ))
.contained()
.with_style(style.hover_popover.container)
})
@@ -799,11 +567,12 @@ mod tests {
InlayId,
};
use collections::BTreeSet;
- use gpui::fonts::Weight;
+ use gpui::fonts::{HighlightStyle, Underline, Weight};
use indoc::indoc;
use language::{language_settings::InlayHintSettings, Diagnostic, DiagnosticSet};
use lsp::LanguageServerId;
use project::{HoverBlock, HoverBlockKind};
+ use rich_text::Highlight;
use smol::stream::StreamExt;
use unindent::Unindent;
use util::test::marked_text_ranges;
@@ -1014,7 +783,7 @@ mod tests {
.await;
cx.condition(|editor, _| editor.hover_state.visible()).await;
- cx.editor(|editor, cx| {
+ cx.editor(|editor, _| {
let blocks = editor.hover_state.info_popover.clone().unwrap().blocks;
assert_eq!(
blocks,
@@ -1024,8 +793,7 @@ mod tests {
}],
);
- let style = editor.style(cx);
- let rendered = render_blocks(0, &blocks, &Default::default(), None, &style);
+ let rendered = render_blocks(&blocks, &Default::default(), None);
assert_eq!(
rendered.text,
code_str.trim(),
@@ -1217,7 +985,7 @@ mod tests {
expected_styles,
} in &rows[0..]
{
- let rendered = render_blocks(0, &blocks, &Default::default(), None, &style);
+ let rendered = render_blocks(&blocks, &Default::default(), None);
let (expected_text, ranges) = marked_text_ranges(expected_marked_text, false);
let expected_highlights = ranges
@@ -1228,8 +996,21 @@ mod tests {
rendered.text, expected_text,
"wrong text for input {blocks:?}"
);
+
+ let rendered_highlights: Vec<_> = rendered
+ .highlights
+ .iter()
+ .filter_map(|(range, highlight)| {
+ let style = match highlight {
+ Highlight::Id(id) => id.style(&style.syntax)?,
+ Highlight::Highlight(style) => style.clone(),
+ };
+ Some((range.clone(), style))
+ })
+ .collect();
+
assert_eq!(
- rendered.highlights, expected_highlights,
+ rendered_highlights, expected_highlights,
"wrong highlights for input {blocks:?}"
);
}
@@ -53,7 +53,7 @@ thiserror.workspace = true
time.workspace = true
tiny-skia = "0.5"
usvg = { version = "0.14", features = [] }
-uuid = { version = "1.1.2", features = ["v4"] }
+uuid.workspace = true
waker-fn = "1.1.0"
[build-dependencies]
@@ -1252,7 +1252,7 @@ impl AppContext {
result
})
} else {
- panic!("circular model update");
+ panic!("circular model update for {}", std::any::type_name::<T>());
}
}
@@ -53,8 +53,10 @@ impl Select {
}
pub fn set_item_count(&mut self, count: usize, cx: &mut ViewContext<Self>) {
- self.item_count = count;
- cx.notify();
+ if count != self.item_count {
+ self.item_count = count;
+ cx.notify();
+ }
}
fn toggle(&mut self, cx: &mut ViewContext<Self>) {
@@ -63,9 +65,11 @@ impl Select {
}
pub fn set_selected_index(&mut self, ix: usize, cx: &mut ViewContext<Self>) {
- self.selected_item_ix = ix;
- self.is_open = false;
- cx.notify();
+ if ix != self.selected_item_ix || self.is_open {
+ self.selected_item_ix = ix;
+ self.is_open = false;
+ cx.notify();
+ }
}
pub fn selected_index(&self) -> usize {
@@ -660,12 +660,12 @@ impl Buffer {
file_changed = true;
};
+ self.file = Some(new_file);
if file_changed {
self.file_update_count += 1;
cx.emit(Event::FileHandleChanged);
cx.notify();
}
- self.file = Some(new_file);
task
}
@@ -1427,7 +1427,7 @@ fn test_autoindent_block_mode_without_original_indent_columns(cx: &mut AppContex
// Insert the block at column zero. The entire block is indented
// so that the first line matches the previous line's indentation.
buffer.edit(
- [(Point::new(2, 0)..Point::new(2, 0), inserted_text.clone())],
+ [(Point::new(2, 0)..Point::new(2, 0), inserted_text)],
Some(AutoindentMode::Block {
original_indent_columns: original_indent_columns.clone(),
}),
@@ -1841,6 +1841,7 @@ impl Project {
Worktree::Remote(_) => panic!("cannot remote buffers as new files"),
})
.await?;
+
this.update(&mut cx, |this, cx| {
this.detect_language_for_buffer(&buffer, cx);
this.register_buffer_with_language_servers(&buffer, cx);
@@ -2368,7 +2369,30 @@ impl Project {
}
}
}
+ BufferEvent::FileHandleChanged => {
+ let Some(file) = File::from_dyn(buffer.read(cx).file()) else {
+ return None;
+ };
+
+ match self.local_buffer_ids_by_entry_id.get(&file.entry_id) {
+ Some(_) => {
+ return None;
+ }
+ None => {
+ let remote_id = buffer.read(cx).remote_id();
+ self.local_buffer_ids_by_entry_id
+ .insert(file.entry_id, remote_id);
+ self.local_buffer_ids_by_path.insert(
+ ProjectPath {
+ worktree_id: file.worktree_id(cx),
+ path: file.path.clone(),
+ },
+ remote_id,
+ );
+ }
+ }
+ }
_ => {}
}
@@ -5906,7 +5930,9 @@ impl Project {
Some(&buffer_id) => buffer_id,
None => match self.local_buffer_ids_by_path.get(&project_path) {
Some(&buffer_id) => buffer_id,
- None => continue,
+ None => {
+ continue;
+ }
},
};
@@ -1737,7 +1737,7 @@ mod tests {
use settings::SettingsStore;
use std::{
collections::HashSet,
- path::Path,
+ path::{Path, PathBuf},
sync::atomic::{self, AtomicUsize},
};
use workspace::{pane, AppState};
@@ -2759,6 +2759,71 @@ mod tests {
);
}
+ #[gpui::test]
+ async fn test_new_file_move(cx: &mut gpui::TestAppContext) {
+ init_test(cx);
+
+ let fs = FakeFs::new(cx.background());
+ fs.as_fake().insert_tree("/root", json!({})).await;
+ let project = Project::test(fs, ["/root".as_ref()], cx).await;
+ let workspace = cx
+ .add_window(|cx| Workspace::test_new(project.clone(), cx))
+ .root(cx);
+ let panel = workspace.update(cx, |workspace, cx| ProjectPanel::new(workspace, cx));
+
+ // Make a new buffer with no backing file
+ workspace.update(cx, |workspace, cx| {
+ Editor::new_file(workspace, &Default::default(), cx)
+ });
+
+ // "Save as"" the buffer, creating a new backing file for it
+ let task = workspace.update(cx, |workspace, cx| {
+ workspace.save_active_item(workspace::SaveIntent::Save, cx)
+ });
+
+ cx.foreground().run_until_parked();
+ cx.simulate_new_path_selection(|_| Some(PathBuf::from("/root/new")));
+ task.await.unwrap();
+
+ // Rename the file
+ select_path(&panel, "root/new", cx);
+ assert_eq!(
+ visible_entries_as_strings(&panel, 0..10, cx),
+ &["v root", " new <== selected"]
+ );
+ panel.update(cx, |panel, cx| panel.rename(&Rename, cx));
+ panel.update(cx, |panel, cx| {
+ panel
+ .filename_editor
+ .update(cx, |editor, cx| editor.set_text("newer", cx));
+ });
+ panel
+ .update(cx, |panel, cx| panel.confirm(&Confirm, cx))
+ .unwrap()
+ .await
+ .unwrap();
+
+ cx.foreground().run_until_parked();
+ assert_eq!(
+ visible_entries_as_strings(&panel, 0..10, cx),
+ &["v root", " newer <== selected"]
+ );
+
+ workspace
+ .update(cx, |workspace, cx| {
+ workspace.save_active_item(workspace::SaveIntent::Save, cx)
+ })
+ .await
+ .unwrap();
+
+ cx.foreground().run_until_parked();
+ // assert that saving the file doesn't restore "new"
+ assert_eq!(
+ visible_entries_as_strings(&panel, 0..10, cx),
+ &["v root", " newer <== selected"]
+ );
+ }
+
fn toggle_expand_dir(
panel: &ViewHandle<ProjectPanel>,
path: impl AsRef<Path>,
@@ -2862,6 +2927,7 @@ mod tests {
editor::init_settings(cx);
crate::init((), cx);
workspace::init_settings(cx);
+ client::init_settings(cx);
Project::init_settings(cx);
});
}
@@ -0,0 +1,30 @@
+[package]
+name = "rich_text"
+version = "0.1.0"
+edition = "2021"
+publish = false
+
+[lib]
+path = "src/rich_text.rs"
+doctest = false
+
+[features]
+test-support = [
+ "gpui/test-support",
+ "util/test-support",
+]
+
+
+[dependencies]
+collections = { path = "../collections" }
+gpui = { path = "../gpui" }
+sum_tree = { path = "../sum_tree" }
+theme = { path = "../theme" }
+language = { path = "../language" }
+util = { path = "../util" }
+anyhow.workspace = true
+futures.workspace = true
+lazy_static.workspace = true
+pulldown-cmark = { version = "0.9.2", default-features = false }
+smallvec.workspace = true
+smol.workspace = true
@@ -0,0 +1,287 @@
+use std::{ops::Range, sync::Arc};
+
+use futures::FutureExt;
+use gpui::{
+ color::Color,
+ elements::Text,
+ fonts::{HighlightStyle, TextStyle, Underline, Weight},
+ platform::{CursorStyle, MouseButton},
+ AnyElement, CursorRegion, Element, MouseRegion, ViewContext,
+};
+use language::{HighlightId, Language, LanguageRegistry};
+use theme::SyntaxTheme;
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum Highlight {
+ Id(HighlightId),
+ Highlight(HighlightStyle),
+}
+
+#[derive(Debug, Clone)]
+pub struct RichText {
+ pub text: String,
+ pub highlights: Vec<(Range<usize>, Highlight)>,
+ pub region_ranges: Vec<Range<usize>>,
+ pub regions: Vec<RenderedRegion>,
+}
+
+#[derive(Debug, Clone)]
+pub struct RenderedRegion {
+ code: bool,
+ link_url: Option<String>,
+}
+
+impl RichText {
+ pub fn element<V: 'static>(
+ &self,
+ syntax: Arc<SyntaxTheme>,
+ style: TextStyle,
+ code_span_background_color: Color,
+ cx: &mut ViewContext<V>,
+ ) -> AnyElement<V> {
+ let mut region_id = 0;
+ let view_id = cx.view_id();
+
+ let regions = self.regions.clone();
+
+ enum Markdown {}
+ Text::new(self.text.clone(), style.clone())
+ .with_highlights(
+ self.highlights
+ .iter()
+ .filter_map(|(range, highlight)| {
+ let style = match highlight {
+ Highlight::Id(id) => id.style(&syntax)?,
+ Highlight::Highlight(style) => style.clone(),
+ };
+ Some((range.clone(), style))
+ })
+ .collect::<Vec<_>>(),
+ )
+ .with_custom_runs(self.region_ranges.clone(), move |ix, bounds, cx| {
+ region_id += 1;
+ let region = regions[ix].clone();
+ if let Some(url) = region.link_url {
+ cx.scene().push_cursor_region(CursorRegion {
+ bounds,
+ style: CursorStyle::PointingHand,
+ });
+ cx.scene().push_mouse_region(
+ MouseRegion::new::<Markdown>(view_id, region_id, bounds)
+ .on_click::<V, _>(MouseButton::Left, move |_, _, cx| {
+ cx.platform().open_url(&url)
+ }),
+ );
+ }
+ if region.code {
+ cx.scene().push_quad(gpui::Quad {
+ bounds,
+ background: Some(code_span_background_color),
+ border: Default::default(),
+ corner_radii: (2.0).into(),
+ });
+ }
+ })
+ .with_soft_wrap(true)
+ .into_any()
+ }
+}
+
+pub fn render_markdown_mut(
+ block: &str,
+ language_registry: &Arc<LanguageRegistry>,
+ language: Option<&Arc<Language>>,
+ data: &mut RichText,
+) {
+ use pulldown_cmark::{CodeBlockKind, Event, Options, Parser, Tag};
+
+ let mut bold_depth = 0;
+ let mut italic_depth = 0;
+ let mut link_url = None;
+ let mut current_language = None;
+ let mut list_stack = Vec::new();
+
+ for event in Parser::new_ext(&block, Options::all()) {
+ let prev_len = data.text.len();
+ match event {
+ Event::Text(t) => {
+ if let Some(language) = ¤t_language {
+ render_code(&mut data.text, &mut data.highlights, t.as_ref(), language);
+ } else {
+ data.text.push_str(t.as_ref());
+
+ let mut style = HighlightStyle::default();
+ if bold_depth > 0 {
+ style.weight = Some(Weight::BOLD);
+ }
+ if italic_depth > 0 {
+ style.italic = Some(true);
+ }
+ if let Some(link_url) = link_url.clone() {
+ data.region_ranges.push(prev_len..data.text.len());
+ data.regions.push(RenderedRegion {
+ link_url: Some(link_url),
+ code: false,
+ });
+ style.underline = Some(Underline {
+ thickness: 1.0.into(),
+ ..Default::default()
+ });
+ }
+
+ if style != HighlightStyle::default() {
+ let mut new_highlight = true;
+ if let Some((last_range, last_style)) = data.highlights.last_mut() {
+ if last_range.end == prev_len
+ && last_style == &Highlight::Highlight(style)
+ {
+ last_range.end = data.text.len();
+ new_highlight = false;
+ }
+ }
+ if new_highlight {
+ data.highlights
+ .push((prev_len..data.text.len(), Highlight::Highlight(style)));
+ }
+ }
+ }
+ }
+ Event::Code(t) => {
+ data.text.push_str(t.as_ref());
+ data.region_ranges.push(prev_len..data.text.len());
+ if link_url.is_some() {
+ data.highlights.push((
+ prev_len..data.text.len(),
+ Highlight::Highlight(HighlightStyle {
+ underline: Some(Underline {
+ thickness: 1.0.into(),
+ ..Default::default()
+ }),
+ ..Default::default()
+ }),
+ ));
+ }
+ data.regions.push(RenderedRegion {
+ code: true,
+ link_url: link_url.clone(),
+ });
+ }
+ Event::Start(tag) => match tag {
+ Tag::Paragraph => new_paragraph(&mut data.text, &mut list_stack),
+ Tag::Heading(_, _, _) => {
+ new_paragraph(&mut data.text, &mut list_stack);
+ bold_depth += 1;
+ }
+ Tag::CodeBlock(kind) => {
+ new_paragraph(&mut data.text, &mut list_stack);
+ current_language = if let CodeBlockKind::Fenced(language) = kind {
+ language_registry
+ .language_for_name(language.as_ref())
+ .now_or_never()
+ .and_then(Result::ok)
+ } else {
+ language.cloned()
+ }
+ }
+ Tag::Emphasis => italic_depth += 1,
+ Tag::Strong => bold_depth += 1,
+ Tag::Link(_, url, _) => link_url = Some(url.to_string()),
+ Tag::List(number) => {
+ list_stack.push((number, false));
+ }
+ Tag::Item => {
+ let len = list_stack.len();
+ if let Some((list_number, has_content)) = list_stack.last_mut() {
+ *has_content = false;
+ if !data.text.is_empty() && !data.text.ends_with('\n') {
+ data.text.push('\n');
+ }
+ for _ in 0..len - 1 {
+ data.text.push_str(" ");
+ }
+ if let Some(number) = list_number {
+ data.text.push_str(&format!("{}. ", number));
+ *number += 1;
+ *has_content = false;
+ } else {
+ data.text.push_str("- ");
+ }
+ }
+ }
+ _ => {}
+ },
+ Event::End(tag) => match tag {
+ Tag::Heading(_, _, _) => bold_depth -= 1,
+ Tag::CodeBlock(_) => current_language = None,
+ Tag::Emphasis => italic_depth -= 1,
+ Tag::Strong => bold_depth -= 1,
+ Tag::Link(_, _, _) => link_url = None,
+ Tag::List(_) => drop(list_stack.pop()),
+ _ => {}
+ },
+ Event::HardBreak => data.text.push('\n'),
+ Event::SoftBreak => data.text.push(' '),
+ _ => {}
+ }
+ }
+}
+
+pub fn render_markdown(
+ block: String,
+ language_registry: &Arc<LanguageRegistry>,
+ language: Option<&Arc<Language>>,
+) -> RichText {
+ let mut data = RichText {
+ text: Default::default(),
+ highlights: Default::default(),
+ region_ranges: Default::default(),
+ regions: Default::default(),
+ };
+
+ render_markdown_mut(&block, language_registry, language, &mut data);
+
+ data.text = data.text.trim().to_string();
+
+ data
+}
+
+pub fn render_code(
+ text: &mut String,
+ highlights: &mut Vec<(Range<usize>, Highlight)>,
+ content: &str,
+ language: &Arc<Language>,
+) {
+ let prev_len = text.len();
+ text.push_str(content);
+ for (range, highlight_id) in language.highlight_text(&content.into(), 0..content.len()) {
+ highlights.push((
+ prev_len + range.start..prev_len + range.end,
+ Highlight::Id(highlight_id),
+ ));
+ }
+}
+
+pub fn new_paragraph(text: &mut String, list_stack: &mut Vec<(Option<u64>, bool)>) {
+ let mut is_subsequent_paragraph_of_list = false;
+ if let Some((_, has_content)) = list_stack.last_mut() {
+ if *has_content {
+ is_subsequent_paragraph_of_list = true;
+ } else {
+ *has_content = true;
+ return;
+ }
+ }
+
+ if !text.is_empty() {
+ if !text.ends_with('\n') {
+ text.push('\n');
+ }
+ text.push('\n');
+ }
+ for _ in 0..list_stack.len().saturating_sub(1) {
+ text.push_str(" ");
+ }
+ if is_subsequent_paragraph_of_list {
+ text.push_str(" ");
+ }
+}
@@ -155,6 +155,7 @@ message Envelope {
UpdateChannelBufferCollaborators update_channel_buffer_collaborators = 128;
RejoinChannelBuffers rejoin_channel_buffers = 129;
RejoinChannelBuffersResponse rejoin_channel_buffers_response = 130;
+ AckBufferOperation ack_buffer_operation = 143;
JoinChannelChat join_channel_chat = 131;
JoinChannelChatResponse join_channel_chat_response = 132;
@@ -165,10 +166,11 @@ message Envelope {
GetChannelMessages get_channel_messages = 137;
GetChannelMessagesResponse get_channel_messages_response = 138;
RemoveChannelMessage remove_channel_message = 139;
+ AckChannelMessage ack_channel_message = 144;
LinkChannel link_channel = 140;
UnlinkChannel unlink_channel = 141;
- MoveChannel move_channel = 142;
+ MoveChannel move_channel = 142; // current max: 144
}
}
@@ -955,6 +957,19 @@ message UpdateChannels {
repeated uint64 remove_channel_invitations = 6;
repeated ChannelParticipants channel_participants = 7;
repeated ChannelPermission channel_permissions = 8;
+ repeated UnseenChannelMessage unseen_channel_messages = 9;
+ repeated UnseenChannelBufferChange unseen_channel_buffer_changes = 10;
+}
+
+message UnseenChannelMessage {
+ uint64 channel_id = 1;
+ uint64 message_id = 2;
+}
+
+message UnseenChannelBufferChange {
+ uint64 channel_id = 1;
+ uint64 epoch = 2;
+ repeated VectorClockEntry version = 3;
}
message ChannelEdge {
@@ -1060,6 +1075,11 @@ message RemoveChannelMessage {
uint64 message_id = 2;
}
+message AckChannelMessage {
+ uint64 channel_id = 1;
+ uint64 message_id = 2;
+}
+
message SendChannelMessageResponse {
ChannelMessage message = 1;
}
@@ -1115,6 +1135,12 @@ message RejoinChannelBuffersResponse {
repeated RejoinedChannelBuffer buffers = 1;
}
+message AckBufferOperation {
+ uint64 buffer_id = 1;
+ uint64 epoch = 2;
+ repeated VectorClockEntry version = 3;
+}
+
message JoinChannelBufferResponse {
uint64 buffer_id = 1;
uint32 replica_id = 2;
@@ -271,6 +271,8 @@ messages!(
(LeaveChannelBuffer, Background),
(UpdateChannelBuffer, Foreground),
(UpdateChannelBufferCollaborators, Foreground),
+ (AckBufferOperation, Background),
+ (AckChannelMessage, Background),
);
request_messages!(
@@ -406,7 +408,7 @@ entity_messages!(
ChannelMessageSent,
UpdateChannelBuffer,
RemoveChannelMessage,
- UpdateChannelBufferCollaborators
+ UpdateChannelBufferCollaborators,
);
const KIB: usize = 1024;
@@ -26,7 +26,7 @@ postage.workspace = true
futures.workspace = true
ordered-float.workspace = true
smol.workspace = true
-rusqlite = { version = "0.27.0", features = ["blob", "array", "modern_sqlite"] }
+rusqlite.workspace = true
log.workspace = true
tree-sitter.workspace = true
lazy_static.workspace = true
@@ -7,10 +7,10 @@ publish = false
[dependencies]
anyhow.workspace = true
indoc.workspace = true
-libsqlite3-sys = { version = "0.24", features = ["bundled"] }
+libsqlite3-sys = { version = "0.26", features = ["bundled"] }
smol.workspace = true
thread_local = "1.1.4"
lazy_static.workspace = true
parking_lot.workspace = true
futures.workspace = true
-uuid = { version = "1.1.2", features = ["v4"] }
+uuid.workspace = true
@@ -239,6 +239,7 @@ pub struct CollabPanel {
pub log_in_button: Interactive<ContainedText>,
pub channel_editor: ContainerStyle,
pub channel_hash: Icon,
+ pub channel_note_active_color: Color,
pub tabbed_modal: TabbedModal,
pub contact_finder: ContactFinder,
pub channel_modal: ChannelModal,
@@ -252,7 +253,7 @@ pub struct CollabPanel {
pub leave_call: Interactive<ContainedText>,
pub contact_row: Toggleable<Interactive<ContainerStyle>>,
pub channel_row: Toggleable<Interactive<ContainerStyle>>,
- pub channel_name: ContainedText,
+ pub channel_name: Toggleable<ContainedText>,
pub row_height: f32,
pub project_row: Toggleable<Interactive<ProjectRow>>,
pub tree_branch: Toggleable<Interactive<TreeBranch>>,
@@ -633,7 +634,11 @@ pub struct ChatPanel {
pub list: ContainerStyle,
pub channel_select: ChannelSelect,
pub input_editor: FieldEditor,
+ pub avatar: AvatarStyle,
+ pub avatar_container: ContainerStyle,
pub message: ChatMessage,
+ pub continuation_message: ChatMessage,
+ pub last_message_bottom_spacing: f32,
pub pending_message: ChatMessage,
pub sign_in_prompt: Interactive<TextStyle>,
pub icon_button: Interactive<IconButton>,
@@ -642,7 +647,7 @@ pub struct ChatPanel {
#[derive(Deserialize, Default, JsonSchema)]
pub struct ChatMessage {
#[serde(flatten)]
- pub container: ContainerStyle,
+ pub container: Interactive<ContainerStyle>,
pub body: TextStyle,
pub sender: ContainedText,
pub timestamp: ContainedText,
@@ -135,7 +135,7 @@ impl ListHeader {
.size(IconSize::Small)
}))
.child(
- Label::new(self.label.clone())
+ Label::new(self.label)
.color(LabelColor::Muted)
.size(LabelSize::Small),
),
@@ -191,7 +191,7 @@ impl ListSubHeader {
.size(IconSize::Small)
}))
.child(
- Label::new(self.label.clone())
+ Label::new(self.label)
.color(LabelColor::Muted)
.size(LabelSize::Small),
),
@@ -27,7 +27,7 @@ impl Details {
.gap_0p5()
.text_xs()
.text_color(theme.lowest.base.default.foreground)
- .child(self.text.clone())
+ .child(self.text)
.children(self.meta.map(|m| m))
}
}
@@ -78,10 +78,14 @@ fn increment(vim: &mut Vim, mut delta: i32, step: i32, cx: &mut WindowContext) {
2 => format!("{:b}", result),
_ => unreachable!(),
};
- if selection.is_empty() {
- new_anchors.push((false, snapshot.anchor_after(range.end)))
- }
- edits.push((range, replace));
+ edits.push((range.clone(), replace));
+ }
+ if selection.is_empty() {
+ new_anchors.push((false, snapshot.anchor_after(range.end)))
+ }
+ } else {
+ if selection.is_empty() {
+ new_anchors.push((true, snapshot.anchor_after(start)))
}
}
}
@@ -226,6 +230,8 @@ mod test {
cx.assert_matches_neovim("(Λ0b10f)", ["ctrl-a"], "(0b1Λ1f)")
.await;
cx.assert_matches_neovim("Λ-1", ["ctrl-a"], "Λ0").await;
+ cx.assert_matches_neovim("banΛana", ["ctrl-a"], "banΛana")
+ .await;
}
#[gpui::test]
@@ -635,3 +635,20 @@ async fn test_zero(cx: &mut gpui::TestAppContext) {
the lazy dog"})
.await;
}
+
+#[gpui::test]
+async fn test_selection_goal(cx: &mut gpui::TestAppContext) {
+ let mut cx = NeovimBackedTestContext::new(cx).await;
+
+ cx.set_shared_state(indoc! {"
+ ;;Λ;
+ Lorem Ipsum"})
+ .await;
+
+ cx.simulate_shared_keystrokes(["a", "down", "up", ";", "down", "up"])
+ .await;
+ cx.assert_shared_state(indoc! {"
+ ;;;;Λ
+ Lorem Ipsum"})
+ .await;
+}
@@ -13,3 +13,6 @@
{"Put":{"state":"Λ-1"}}
{"Key":"ctrl-a"}
{"Get":{"state":"Λ0","mode":"Normal"}}
+{"Put":{"state":"banΛana"}}
+{"Key":"ctrl-a"}
+{"Get":{"state":"banΛana","mode":"Normal"}}
@@ -0,0 +1,8 @@
+{"Put":{"state":";;Λ;\nLorem Ipsum"}}
+{"Key":"a"}
+{"Key":"down"}
+{"Key":"up"}
+{"Key":";"}
+{"Key":"down"}
+{"Key":"up"}
+{"Get":{"state":";;;;Λ\nLorem Ipsum","mode":"Insert"}}
@@ -51,7 +51,7 @@ serde.workspace = true
serde_derive.workspace = true
serde_json.workspace = true
smallvec.workspace = true
-uuid = { version = "1.1.2", features = ["v4"] }
+uuid.workspace = true
[dev-dependencies]
call = { path = "../call", features = ["test-support"] }
@@ -79,7 +79,7 @@ use status_bar::StatusBar;
pub use status_bar::StatusItemView;
use theme::{Theme, ThemeSettings};
pub use toolbar::{ToolbarItemLocation, ToolbarItemView};
-use util::{async_iife, ResultExt};
+use util::ResultExt;
pub use workspace_settings::{AutosaveSetting, GitGutterSetting, WorkspaceSettings};
lazy_static! {
@@ -573,6 +573,7 @@ pub struct Workspace {
panes_by_item: HashMap<usize, WeakViewHandle<Pane>>,
active_pane: ViewHandle<Pane>,
last_active_center_pane: Option<WeakViewHandle<Pane>>,
+ last_active_view_id: Option<proto::ViewId>,
status_bar: ViewHandle<StatusBar>,
titlebar_item: Option<AnyViewHandle>,
notifications: Vec<(TypeId, usize, Box<dyn NotificationHandle>)>,
@@ -786,6 +787,7 @@ impl Workspace {
panes_by_item: Default::default(),
active_pane: center_pane.clone(),
last_active_center_pane: Some(center_pane.downgrade()),
+ last_active_view_id: None,
status_bar,
titlebar_item: None,
notifications: Default::default(),
@@ -934,7 +936,8 @@ impl Workspace {
app_state,
cx,
)
- .await;
+ .await
+ .unwrap_or_default();
(workspace, opened_items)
})
@@ -2862,6 +2865,7 @@ impl Workspace {
cx.notify();
+ self.last_active_view_id = active_view_id.clone();
proto::FollowResponse {
active_view_id,
views: self
@@ -3028,7 +3032,7 @@ impl Workspace {
Ok(())
}
- fn update_active_view_for_followers(&self, cx: &AppContext) {
+ fn update_active_view_for_followers(&mut self, cx: &AppContext) {
let mut is_project_item = true;
let mut update = proto::UpdateActiveView::default();
if self.active_pane.read(cx).has_focus() {
@@ -3046,11 +3050,14 @@ impl Workspace {
}
}
- self.update_followers(
- is_project_item,
- proto::update_followers::Variant::UpdateActiveView(update),
- cx,
- );
+ if update.id != self.last_active_view_id {
+ self.last_active_view_id = update.id.clone();
+ self.update_followers(
+ is_project_item,
+ proto::update_followers::Variant::UpdateActiveView(update),
+ cx,
+ );
+ }
}
fn update_followers(
@@ -3394,140 +3401,124 @@ impl Workspace {
serialized_workspace: SerializedWorkspace,
paths_to_open: Vec<Option<ProjectPath>>,
cx: &mut AppContext,
- ) -> Task<Vec<Option<Result<Box<dyn ItemHandle>, anyhow::Error>>>> {
+ ) -> Task<Result<Vec<Option<Box<dyn ItemHandle>>>>> {
cx.spawn(|mut cx| async move {
- let result = async_iife! {{
- let (project, old_center_pane) =
- workspace.read_with(&cx, |workspace, _| {
- (
- workspace.project().clone(),
- workspace.last_active_center_pane.clone(),
- )
- })?;
+ let (project, old_center_pane) = workspace.read_with(&cx, |workspace, _| {
+ (
+ workspace.project().clone(),
+ workspace.last_active_center_pane.clone(),
+ )
+ })?;
- let mut center_items = None;
- let mut center_group = None;
- // Traverse the splits tree and add to things
- if let Some((group, active_pane, items)) = serialized_workspace
- .center_group
- .deserialize(&project, serialized_workspace.id, &workspace, &mut cx)
- .await {
- center_items = Some(items);
- center_group = Some((group, active_pane))
- }
+ let mut center_group = None;
+ let mut center_items = None;
+ // Traverse the splits tree and add to things
+ if let Some((group, active_pane, items)) = serialized_workspace
+ .center_group
+ .deserialize(&project, serialized_workspace.id, &workspace, &mut cx)
+ .await
+ {
+ center_items = Some(items);
+ center_group = Some((group, active_pane))
+ }
- let resulting_list = cx.read(|cx| {
- let mut opened_items = center_items
- .unwrap_or_default()
- .into_iter()
- .filter_map(|item| {
- let item = item?;
- let project_path = item.project_path(cx)?;
- Some((project_path, item))
- })
- .collect::<HashMap<_, _>>();
+ let mut items_by_project_path = cx.read(|cx| {
+ center_items
+ .unwrap_or_default()
+ .into_iter()
+ .filter_map(|item| {
+ let item = item?;
+ let project_path = item.project_path(cx)?;
+ Some((project_path, item))
+ })
+ .collect::<HashMap<_, _>>()
+ });
- paths_to_open
- .into_iter()
- .map(|path_to_open| {
- path_to_open.map(|path_to_open| {
- Ok(opened_items.remove(&path_to_open))
- })
- .transpose()
- .map(|item| item.flatten())
- .transpose()
- })
- .collect::<Vec<_>>()
- });
+ let opened_items = paths_to_open
+ .into_iter()
+ .map(|path_to_open| {
+ path_to_open
+ .and_then(|path_to_open| items_by_project_path.remove(&path_to_open))
+ })
+ .collect::<Vec<_>>();
- // Remove old panes from workspace panes list
- workspace.update(&mut cx, |workspace, cx| {
- if let Some((center_group, active_pane)) = center_group {
- workspace.remove_panes(workspace.center.root.clone(), cx);
+ // Remove old panes from workspace panes list
+ workspace.update(&mut cx, |workspace, cx| {
+ if let Some((center_group, active_pane)) = center_group {
+ workspace.remove_panes(workspace.center.root.clone(), cx);
- // Swap workspace center group
- workspace.center = PaneGroup::with_root(center_group);
+ // Swap workspace center group
+ workspace.center = PaneGroup::with_root(center_group);
- // Change the focus to the workspace first so that we retrigger focus in on the pane.
- cx.focus_self();
+ // Change the focus to the workspace first so that we retrigger focus in on the pane.
+ cx.focus_self();
- if let Some(active_pane) = active_pane {
- cx.focus(&active_pane);
- } else {
- cx.focus(workspace.panes.last().unwrap());
- }
+ if let Some(active_pane) = active_pane {
+ cx.focus(&active_pane);
} else {
- let old_center_handle = old_center_pane.and_then(|weak| weak.upgrade(cx));
- if let Some(old_center_handle) = old_center_handle {
- cx.focus(&old_center_handle)
- } else {
- cx.focus_self()
- }
+ cx.focus(workspace.panes.last().unwrap());
}
+ } else {
+ let old_center_handle = old_center_pane.and_then(|weak| weak.upgrade(cx));
+ if let Some(old_center_handle) = old_center_handle {
+ cx.focus(&old_center_handle)
+ } else {
+ cx.focus_self()
+ }
+ }
- let docks = serialized_workspace.docks;
- workspace.left_dock.update(cx, |dock, cx| {
- dock.set_open(docks.left.visible, cx);
- if let Some(active_panel) = docks.left.active_panel {
- if let Some(ix) = dock.panel_index_for_ui_name(&active_panel, cx) {
- dock.activate_panel(ix, cx);
- }
+ let docks = serialized_workspace.docks;
+ workspace.left_dock.update(cx, |dock, cx| {
+ dock.set_open(docks.left.visible, cx);
+ if let Some(active_panel) = docks.left.active_panel {
+ if let Some(ix) = dock.panel_index_for_ui_name(&active_panel, cx) {
+ dock.activate_panel(ix, cx);
}
- dock.active_panel()
- .map(|panel| {
- panel.set_zoomed(docks.left.zoom, cx)
- });
- if docks.left.visible && docks.left.zoom {
- cx.focus_self()
- }
- });
- // TODO: I think the bug is that setting zoom or active undoes the bottom zoom or something
- workspace.right_dock.update(cx, |dock, cx| {
- dock.set_open(docks.right.visible, cx);
- if let Some(active_panel) = docks.right.active_panel {
- if let Some(ix) = dock.panel_index_for_ui_name(&active_panel, cx) {
- dock.activate_panel(ix, cx);
-
- }
- }
- dock.active_panel()
- .map(|panel| {
- panel.set_zoomed(docks.right.zoom, cx)
- });
-
- if docks.right.visible && docks.right.zoom {
- cx.focus_self()
- }
- });
- workspace.bottom_dock.update(cx, |dock, cx| {
- dock.set_open(docks.bottom.visible, cx);
- if let Some(active_panel) = docks.bottom.active_panel {
- if let Some(ix) = dock.panel_index_for_ui_name(&active_panel, cx) {
- dock.activate_panel(ix, cx);
- }
+ }
+ dock.active_panel()
+ .map(|panel| panel.set_zoomed(docks.left.zoom, cx));
+ if docks.left.visible && docks.left.zoom {
+ cx.focus_self()
+ }
+ });
+ // TODO: I think the bug is that setting zoom or active undoes the bottom zoom or something
+ workspace.right_dock.update(cx, |dock, cx| {
+ dock.set_open(docks.right.visible, cx);
+ if let Some(active_panel) = docks.right.active_panel {
+ if let Some(ix) = dock.panel_index_for_ui_name(&active_panel, cx) {
+ dock.activate_panel(ix, cx);
}
+ }
+ dock.active_panel()
+ .map(|panel| panel.set_zoomed(docks.right.zoom, cx));
- dock.active_panel()
- .map(|panel| {
- panel.set_zoomed(docks.bottom.zoom, cx)
- });
-
- if docks.bottom.visible && docks.bottom.zoom {
- cx.focus_self()
+ if docks.right.visible && docks.right.zoom {
+ cx.focus_self()
+ }
+ });
+ workspace.bottom_dock.update(cx, |dock, cx| {
+ dock.set_open(docks.bottom.visible, cx);
+ if let Some(active_panel) = docks.bottom.active_panel {
+ if let Some(ix) = dock.panel_index_for_ui_name(&active_panel, cx) {
+ dock.activate_panel(ix, cx);
}
- });
+ }
+ dock.active_panel()
+ .map(|panel| panel.set_zoomed(docks.bottom.zoom, cx));
- cx.notify();
- })?;
+ if docks.bottom.visible && docks.bottom.zoom {
+ cx.focus_self()
+ }
+ });
- // Serialize ourself to make sure our timestamps and any pane / item changes are replicated
- workspace.read_with(&cx, |workspace, cx| workspace.serialize_workspace(cx))?;
+ cx.notify();
+ })?;
- Ok::<_, anyhow::Error>(resulting_list)
- }};
+ // Serialize ourself to make sure our timestamps and any pane / item changes are replicated
+ workspace.read_with(&cx, |workspace, cx| workspace.serialize_workspace(cx))?;
- result.await.unwrap_or_default()
+ Ok(opened_items)
})
}
@@ -3601,7 +3592,7 @@ async fn open_items(
mut project_paths_to_open: Vec<(PathBuf, Option<ProjectPath>)>,
app_state: Arc<AppState>,
mut cx: AsyncAppContext,
-) -> Vec<Option<anyhow::Result<Box<dyn ItemHandle>>>> {
+) -> Result<Vec<Option<Result<Box<dyn ItemHandle>>>>> {
let mut opened_items = Vec::with_capacity(project_paths_to_open.len());
if let Some(serialized_workspace) = serialized_workspace {
@@ -3619,16 +3610,19 @@ async fn open_items(
cx,
)
})
- .await;
+ .await?;
let restored_project_paths = cx.read(|cx| {
restored_items
.iter()
- .filter_map(|item| item.as_ref()?.as_ref().ok()?.project_path(cx))
+ .filter_map(|item| item.as_ref()?.project_path(cx))
.collect::<HashSet<_>>()
});
- opened_items = restored_items;
+ for restored_item in restored_items {
+ opened_items.push(restored_item.map(Ok));
+ }
+
project_paths_to_open
.iter_mut()
.for_each(|(_, project_path)| {
@@ -3681,7 +3675,7 @@ async fn open_items(
}
}
- opened_items
+ Ok(opened_items)
}
fn notify_of_new_dock(workspace: &WeakViewHandle<Workspace>, cx: &mut AsyncAppContext) {
@@ -3,7 +3,7 @@ authors = ["Nathan Sobo <nathansobo@gmail.com>"]
description = "The fast, collaborative code editor."
edition = "2021"
name = "zed"
-version = "0.107.0"
+version = "0.108.0"
publish = false
[lib]
@@ -138,7 +138,7 @@ tree-sitter-nu.workspace = true
url = "2.2"
urlencoding = "2.1.2"
-uuid = { version = "1.1.2", features = ["v4"] }
+uuid.workspace = true
[dev-dependencies]
call = { path = "../call", features = ["test-support"] }
@@ -165,17 +165,25 @@ impl LspAdapter for RustLspAdapter {
lazy_static! {
static ref REGEX: Regex = Regex::new("\\(β¦?\\)").unwrap();
}
-
let detail = completion.detail.as_ref().unwrap();
- if detail.starts_with("fn(") {
- let text = REGEX.replace(&completion.label, &detail[2..]).to_string();
- let source = Rope::from(format!("fn {} {{}}", text).as_str());
- let runs = language.highlight_text(&source, 3..3 + text.len());
- return Some(CodeLabel {
- filter_range: 0..completion.label.find('(').unwrap_or(text.len()),
- text,
- runs,
- });
+ const FUNCTION_PREFIXES: [&'static str; 2] = ["async fn", "fn"];
+ let prefix = FUNCTION_PREFIXES
+ .iter()
+ .find_map(|prefix| detail.strip_prefix(*prefix).map(|suffix| (prefix, suffix)));
+ // fn keyword should be followed by opening parenthesis.
+ if let Some((prefix, suffix)) = prefix {
+ if suffix.starts_with('(') {
+ let text = REGEX.replace(&completion.label, suffix).to_string();
+ let source = Rope::from(format!("{prefix} {} {{}}", text).as_str());
+ let run_start = prefix.len() + 1;
+ let runs =
+ language.highlight_text(&source, run_start..run_start + text.len());
+ return Some(CodeLabel {
+ filter_range: 0..completion.label.find('(').unwrap_or(text.len()),
+ text,
+ runs,
+ });
+ }
}
}
Some(kind) => {
@@ -377,7 +385,28 @@ mod tests {
],
})
);
-
+ assert_eq!(
+ language
+ .label_for_completion(&lsp::CompletionItem {
+ kind: Some(lsp::CompletionItemKind::FUNCTION),
+ label: "hello(β¦)".to_string(),
+ detail: Some("async fn(&mut Option<T>) -> Vec<T>".to_string()),
+ ..Default::default()
+ })
+ .await,
+ Some(CodeLabel {
+ text: "hello(&mut Option<T>) -> Vec<T>".to_string(),
+ filter_range: 0..5,
+ runs: vec![
+ (0..5, highlight_function),
+ (7..10, highlight_keyword),
+ (11..17, highlight_type),
+ (18..19, highlight_type),
+ (25..28, highlight_type),
+ (29..30, highlight_type),
+ ],
+ })
+ );
assert_eq!(
language
.label_for_completion(&lsp::CompletionItem {
@@ -1,4 +1,4 @@
[toolchain]
-channel = "1.72.1"
+channel = "1.73"
components = [ "rustfmt" ]
targets = [ "x86_64-apple-darwin", "aarch64-apple-darwin", "wasm32-wasi" ]
@@ -5,6 +5,7 @@ import {
} from "./components"
import { icon_button } from "../component/icon_button"
import { useTheme } from "../theme"
+import { interactive } from "../element"
export default function chat_panel(): any {
const theme = useTheme()
@@ -27,11 +28,23 @@ export default function chat_panel(): any {
return {
background: background(layer),
- list: {
- margin: {
- left: SPACING,
- right: SPACING,
+ avatar: {
+ icon_width: 24,
+ icon_height: 24,
+ corner_radius: 4,
+ outer_width: 24,
+ outer_corner_radius: 16,
+ },
+ avatar_container: {
+ padding: {
+ right: 6,
+ left: 2,
+ top: 2,
+ bottom: 2,
}
+ },
+ list: {
+
},
channel_select: {
header: {
@@ -79,6 +92,22 @@ export default function chat_panel(): any {
},
},
message: {
+ ...interactive({
+ base: {
+ margin: { top: SPACING },
+ padding: {
+ top: 4,
+ bottom: 4,
+ left: SPACING / 2,
+ right: SPACING / 3,
+ }
+ },
+ state: {
+ hovered: {
+ background: background(layer, "hovered"),
+ },
+ },
+ }),
body: text(layer, "sans", "base"),
sender: {
margin: {
@@ -87,7 +116,32 @@ export default function chat_panel(): any {
...text(layer, "sans", "base", { weight: "bold" }),
},
timestamp: text(layer, "sans", "base", "disabled"),
- margin: { bottom: SPACING }
+ },
+ last_message_bottom_spacing: SPACING,
+ continuation_message: {
+ body: text(layer, "sans", "base"),
+ sender: {
+ margin: {
+ right: 8,
+ },
+ ...text(layer, "sans", "base", { weight: "bold" }),
+ },
+ timestamp: text(layer, "sans", "base", "disabled"),
+ ...interactive({
+ base: {
+ padding: {
+ top: 4,
+ bottom: 4,
+ left: SPACING / 2,
+ right: SPACING / 3,
+ }
+ },
+ state: {
+ hovered: {
+ background: background(layer, "hovered"),
+ },
+ },
+ }),
},
pending_message: {
body: text(layer, "sans", "base"),
@@ -98,6 +152,21 @@ export default function chat_panel(): any {
...text(layer, "sans", "base", "disabled"),
},
timestamp: text(layer, "sans", "base"),
+ ...interactive({
+ base: {
+ padding: {
+ top: 4,
+ bottom: 4,
+ left: SPACING / 2,
+ right: SPACING / 3,
+ }
+ },
+ state: {
+ hovered: {
+ background: background(layer, "hovered"),
+ },
+ },
+ }),
},
sign_in_prompt: {
default: text(layer, "sans", "base"),
@@ -194,6 +194,7 @@ export default function contacts_panel(): any {
},
user_query_editor: filter_input,
channel_hash: icon_style,
+ channel_note_active_color: foreground(layer, "active"),
user_query_editor_height: 33,
add_contact_button: header_icon_button,
add_channel_button: header_icon_button,
@@ -267,10 +268,18 @@ export default function contacts_panel(): any {
}),
channel_row: item_row,
channel_name: {
- ...text(layer, "sans", { size: "sm" }),
- margin: {
- left: CHANNEL_SPACING,
+ active: {
+ ...text(layer, "sans", { size: "sm", weight: "bold" }),
+ margin: {
+ left: CHANNEL_SPACING,
+ },
},
+ inactive: {
+ ...text(layer, "sans", { size: "sm" }),
+ margin: {
+ left: CHANNEL_SPACING,
+ },
+ }
},
list_empty_label_container: {
margin: {
@@ -21,6 +21,7 @@ export default function contacts_panel(): any {
...text(theme.lowest, "sans", "base"),
button: icon_button({ variant: "ghost" }),
spacing: 4,
+ padding: 4,
},
}
}