Merge remote-tracking branch 'upstream/main' into port-ce-generic-to-main

37 upstream commits (v0.7.0 -> v0.7.1), incl. gpui-pre 0.3.8 requirement.

Conflict resolution, keeping the fork's deliberate divergences:
- Cargo.toml: keep caret gpui-pre requirements so navop's [patch] to fork
  tags still resolves; bump them to 0.3.8 to match upstream's snapshot.
- crates/shell/Cargo.toml, crates/shell/rquickjs-compat/Cargo.toml: keep the
  feigeCode/quickjs-jit revision (per-target interpreter-only split for 32-bit
  targets) instead of upstream's 0.12.11 move, which has no i686 bindings.
- Cargo.lock: keep ours, then re-resolve. Re-pins rsa 0.10.0-rc.18 and
  pkcs1 0.8.0-rc.4, whose rc bumps break type inference in llrt_crypto.

Also fixes a merged hunk in crates/base/src/input/editor/lsp/completions.rs:
upstream's cursor-derived start offset replaced the fork's `range.end`, which
left the range parameter dead; drop it from `request_completion` and delegate
without it.

Author: feigeCode

Cargo.lock

@@ -36,6 +36,7 @@ members = [
     "examples/table_in_scrollable",
     "examples/markdown_table",
     "examples/ai_recipes",
+    "examples/speech",
     "crates/shell",
     "crates/shell/rquickjs-compat",
     "crates/component-shell",
@@ -47,29 +48,29 @@ publish = false
 edition = "2024"
 
 [workspace.dependencies]
-gpui-kit = { path = "crates/kit", version = "0.7.0" }
-gpui-component = { path = "crates/component", version = "0.7.0" }
-gpui-base = { path = "crates/base", version = "0.7.0" }
-gpui-component-macros = { path = "crates/component-macros", version = "0.7.0" }
-gpui-kit-assets = { path = "crates/assets", version = "0.7.0" }
-gpui-fps = { path = "crates/fps", version = "0.7.0" }
-gpui-shell = { path = "crates/shell", version = "0.7.0" }
-gpui-wry = { path = "crates/webview", version = "0.7.0" }
-gpui-component-shell = { path = "crates/component-shell", version = "0.7.0" }
+gpui-kit = { path = "crates/kit", version = "0.7.1" }
+gpui-component = { path = "crates/component", version = "0.7.1" }
+gpui-base = { path = "crates/base", version = "0.7.1" }
+gpui-component-macros = { path = "crates/component-macros", version = "0.7.1" }
+gpui-kit-assets = { path = "crates/assets", version = "0.7.1" }
+gpui-fps = { path = "crates/fps", version = "0.7.1" }
+gpui-shell = { path = "crates/shell", version = "0.7.1" }
+gpui-wry = { path = "crates/webview", version = "0.7.1" }
+gpui-component-shell = { path = "crates/component-shell", version = "0.7.1" }
 story = { path = "crates/story" }
 
 # GPUI comes from the `gpui-pre-*` snapshots of Zed's crates, and any snapshot
 # may change GPUI's API. Upstream pins these exactly so the weekly release
 # cannot move applications onto a newer snapshot (#3156). This fork relaxes
 # the pins to caret requirements: downstream (navop) resolves gpui-pre through
-# a [patch] section pointing at fork tags (0.3.123 > 0.3.7), which an exact pin
+# a [patch] section pointing at fork tags (0.3.124 > 0.3.8), which an exact pin
 # would reject. Bump every snapshot crate together with its Cargo.lock entry.
-gpui = { package = "gpui-pre", version = "0.3.7" }
-gpui_platform = { package = "gpui-pre-platform", version = "0.3.7", features = ["font-kit", "x11", "wayland", "runtime_shaders"] }
-gpui_web = { package = "gpui-pre-web", version = "0.3.7" }
-gpui_macros = { package = "gpui-pre-macros", version = "0.3.7" }
-reqwest_client = { package = "gpui-pre-reqwest-client", version = "0.3.7" }
-sum-tree = { package = "gpui-pre-sum-tree", version = "0.3.7" }
+gpui = { package = "gpui-pre", version = "0.3.8" }
+gpui_platform = { package = "gpui-pre-platform", version = "0.3.8", features = ["font-kit", "x11", "wayland", "runtime_shaders"] }
+gpui_web = { package = "gpui-pre-web", version = "0.3.8" }
+gpui_macros = { package = "gpui-pre-macros", version = "0.3.8" }
+reqwest_client = { package = "gpui-pre-reqwest-client", version = "0.3.8" }
+sum-tree = { package = "gpui-pre-sum-tree", version = "0.3.8" }
 reqwest = { package = "gpui-pre-reqwest", version = "=0.12.15", default-features = false, features = [
     "charset",
     "http2",
@@ -84,7 +85,7 @@ anyhow = "1"
 instant = { version = "0.1", features = ["wasm-bindgen"] }
 log = "0.4"
 lsp-types = { version = "0.97.0", features = ["proposed"] }
-notify = "7.0.0"
+notify = "8.2.0"
 raw-window-handle = "0.6.2"
 ropey = { version = "=2.0.0-beta.1", features = [
     "metric_chars",

Cargo.toml

@@ -9,7 +9,7 @@ repository = "https://github.com/longbridge/gpui-kit"
 readme = "README.md"
 edition.workspace = true
 publish = true
-version = "0.7.0"
+version = "0.7.1"
 
 # Retain Cargo icon-directory metadata for existing build-script consumers.
 links = "gpui-kit-default-icons"

crates/assets/Cargo.toml

@@ -60,6 +60,7 @@ icons/map.svg
 icons/maximize.svg
 icons/memory-stick.svg
 icons/menu.svg
+icons/mic.svg
 icons/minimize.svg
 icons/minus.svg
 icons/moon.svg
@@ -88,6 +89,7 @@ icons/settings.svg
 icons/sort-ascending.svg
 icons/sort-descending.svg
 icons/square-terminal.svg
+icons/square.svg
 icons/star-fill.svg
 icons/star-off.svg
 icons/star.svg

crates/assets/default-icons.txt

@@ -62,8 +62,8 @@ fn default_assets_preserve_the_component_bundle_without_all_lucide_icons() {
         .collect();
     let actual: BTreeSet<_> = Assets.list("icons/").unwrap().into_iter().collect();
     assert_eq!(actual, expected);
-    assert_eq!(actual.len(), 104);
-    assert_eq!(Assets::iter().count(), 104);
+    assert_eq!(actual.len(), 106);
+    assert_eq!(Assets::iter().count(), 106);
     assert!(Assets::get("icons/search.svg").is_some());
     assert!(Assets::get("icons/accessibility.svg").is_none());
     for path in actual {

crates/assets/tests/icons.rs

@@ -9,7 +9,7 @@ exclude = ["examples/"]
 repository = "https://github.com/longbridge/gpui-kit"
 homepage = "https://gpui-kit.com"
 documentation = "https://docs.rs/gpui-base"
-version = "0.7.0"
+version = "0.7.1"
 publish = true
 edition.workspace = true
 
@@ -53,6 +53,7 @@ serde_json.workspace = true
 smallvec.workspace = true
 sum-tree.workspace = true
 tracing.workspace = true
+unicode-linebreak = "0.1.5"
 unicode-segmentation = "1.12.0"
 web-time = "1"
 

crates/base/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "gpui-base-examples"
 default-run = "components"
-version = "0.7.0"
+version = "0.7.1"
 publish = false
 edition.workspace = true
 

crates/base/examples/native/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gpui-base-examples-wasm"
-version = "0.7.0"
+version = "0.7.1"
 publish = false
 edition.workspace = true
 

crates/base/examples/wasm/Cargo.toml

@@ -581,6 +581,24 @@ impl DockArea {
         self.commit(result, window, cx);
     }
 
+    /// Replace the slot sizes of the split at `node` in place.
+    pub fn set_split_sizes(
+        &mut self,
+        node: NodeId,
+        sizes: Vec<Pixels>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(placement) = self.placement_of_node(node) else {
+            return;
+        };
+        let Some(tree) = self.tree_mut(placement) else {
+            return;
+        };
+        let result = tree.set_sizes(node, sizes.into_iter().map(Some).collect());
+        self.commit(result, window, cx);
+    }
+
     /// Put `panel` in a new tab group beside `node`.
     pub fn split_at(
         &mut self,
@@ -2439,6 +2457,63 @@ mod tests {
         );
     }
 
+    #[gpui::test]
+    fn set_split_sizes_restores_a_share_and_reports_it(cx: &mut TestAppContext) {
+        let (area, cx) = setup(cx);
+        cx.update(|window, cx| {
+            let alpha = TestPanel::new("Alpha", cx);
+            let beta = TestPanel::new("Beta", cx);
+            area.update(cx, |area, cx| {
+                area.set_center(
+                    DockLayout::h_split()
+                        .child(DockLayout::tabs().panel(alpha), Some(px(300.)))
+                        .child(DockLayout::tabs().panel(beta), Some(px(300.))),
+                    window,
+                    cx,
+                );
+            });
+        });
+        cx.run_until_parked();
+
+        let root = cx.read(|cx| {
+            area.read(cx)
+                .layout(DockPlacement::Center)
+                .unwrap()
+                .root()
+                .id()
+        });
+        let events = Rc::new(Cell::new(0));
+        let observed = events.clone();
+        let _subscription = cx.update(|window, cx| {
+            window.subscribe(&area, cx, move |_, event: &DockEvent, _, _| {
+                if matches!(event, DockEvent::LayoutChanged) {
+                    observed.set(observed.get() + 1);
+                }
+            })
+        });
+
+        cx.update(|window, cx| {
+            area.update(cx, |area, cx| {
+                area.set_split_sizes(root, vec![px(100.), px(300.)], window, cx);
+            });
+        });
+        cx.run_until_parked();
+        assert_eq!(events.get(), 1);
+        let measured = cx.read(|cx| area.read(cx).splits[&root].entity.read(cx).sizes().clone());
+        let share = measured[0].as_f32() / (measured[0].as_f32() + measured[1].as_f32());
+        assert!((share - 0.25).abs() < 0.01, "measured {measured:?}");
+
+        cx.update(|window, cx| {
+            area.update(cx, |area, cx| {
+                area.set_split_sizes(root, vec![px(10.)], window, cx);
+            });
+        });
+        cx.run_until_parked();
+        assert_eq!(events.get(), 1);
+        let after = cx.read(|cx| area.read(cx).splits[&root].entity.read(cx).sizes().clone());
+        assert_eq!(after, measured);
+    }
+
     /// A drop that splits carries no size — `TabGroup` builds
     /// `InsertTarget::Split { size: None }` — so the split has to decide one,
     /// and sharing the container equally is the decision. Passing the `None`