Commit Graph
8 Commits
Author SHA1 Message Date
dualfroz ba0a85b19f util: Fix path truncation when the file name repeats in a parent dir
`PathWithPosition::parse_str` stripped the position suffix by searching
the whole path for the captured file name, so `foo/foo:10:2` was cut at
the first `foo` and parsed as `foo`. The same happened for
`main.rs-backup/src/main.rs:10:2`.

The captured file name is a slice of the last path component, so cut the
path right after it instead. Switching to `rsplit_once` would not work
either, since the last occurrence lands inside the position suffix for
numeric names like `1/1:1:1`.

Closes #64174
2026-10-02 16:43:56 +02:00
upstream f3eecab1c6 Upstream zed-industries/zed state of the touched files before c1ac0b23f7 2026-10-02 16:43:56 +02:00
dualfroz d4a2eeba66 editor: Don't overwrite primary selection with only empty cursors
With several cursors and nothing selected, the per-selection text joined
into a string of newlines, which passed the `!text.is_empty()` check and
replaced the primary selection on every keystroke and cursor move.

Only write to the primary selection when at least one selection is
non-empty.

Closes #64446
2026-10-02 16:38:57 +02:00
upstream 16ea2153b4 Upstream zed-industries/zed state of the touched files before 35f256f943 2026-10-02 16:38:57 +02:00
dualfroz b5b736994e terminal: Send modifier sequences for the delete key
Delete with a modifier produced no input at all. Since the alt handling
was limited to single characters, alt-delete stopped sending the bogus
`ESC delete` and fell through to nothing, because delete was missing from
the modified special keys table next to insert, pageup and pagedown.

Modified delete now goes out as `CSI 3 ; <modifier> ~`, the same
encoding xterm and alacritty use.

Closes #64721
2026-10-02 16:36:22 +02:00
upstream 08029c4aa7 Upstream zed-industries/zed state of the touched files before 41f88af76a 2026-10-02 16:36:22 +02:00
dualfroz ee1e5ee696 openai_subscribed: Keep loading slow model catalogs in the background (#64925)
## Summary

The authenticated ChatGPT model catalog (`/backend-api/codex/models`)
can take ~30s to respond for some accounts. Zed aborted the request
after 5s, fell back to the built-in model list, and account-specific
models disappeared from the model selector.

Just raising the timeout would make credential loading and sign-in block
for that long, since both await model discovery. Instead, they still
wait at most 5s, but the request keeps running in the background for up
to 60s and replaces the available models once it completes.

Closes #64173

## Testing

- Added `test_slow_model_catalog_does_not_block_initial_load`: the
initial load finishes after 5s with the built-in models, and a catalog
response arriving 30s later replaces them.
- `cargo test -p openai_subscribed`, `./script/clippy -p
openai_subscribed`
- Not tested against the live endpoint.

## Self-review

- [x] I've reviewed my diff for quality, security, reliability, and
performance.
- [ ] UI changes follow the
[checklist](https://zed.dev/docs/development/ui-checklist). (N/A, no UI
changes)
- [x] Tests cover the new or changed behavior.

Release Notes:

- Fixed ChatGPT Subscription models disappearing when the model catalog
takes longer than 5 seconds to load.
2026-10-01 11:41:13 +00:00
upstream 3f619f2f8f Upstream zed-industries/zed state of the touched files before 4e76d6ef82 2026-10-01 11:41:13 +00:00