Commit graph

14 commits

Author SHA1 Message Date
Oliver Azevedo Barnes
62ce840fc1
Rename OllamaService to State
To follow the convention used in language_models
2025-08-23 22:44:57 -04:00
Oliver Azevedo Barnes
8bb757ab67
Merge branch 'main' into ollama-inline-completions
# Conflicts:
#	crates/zed/src/zed/edit_prediction_registry.rs
2025-08-23 19:16:56 -04:00
Anthony Eid
8204ef1e51
onboarding: Remove accept AI ToS from within Zed (#36612)
Users now accept ToS from Zed's website when they sign in to Zed the
first time. So it's no longer possible that a signed in account could
not have accepted the ToS.


Release Notes:

- N/A

---------

Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
2025-08-22 11:45:47 -04:00
Oliver Azevedo Barnes
548feed24f
Merge branch 'main' into ollama-inline-completions 2025-08-20 18:41:08 -04:00
tidely
7bdc99abc1
Fix clippy::redundant_clone lint violations (#36558)
This removes around 900 unnecessary clones, ranging from cloning a few
ints all the way to large data structures and images.

A lot of these were fixed using `cargo clippy --fix --workspace
--all-targets`, however it often breaks other lints and needs to be run
again. This was then followed up with some manual fixing.

I understand this is a large diff, but all the changes are pretty
trivial. Rust is doing some heavy lifting here for us. Once I get it up
to speed with main, I'd appreciate this getting merged rather sooner
than later.

Release Notes:

- N/A
2025-08-20 12:20:13 +02:00
Piotr Osiewicz
05fc0c432c
Fix a bunch of other low-hanging style lints (#36498)
- **Fix a bunch of low hanging style lints like unnecessary-return**
- **Fix single worktree violation**
- **And the rest**

Release Notes:

- N/A
2025-08-19 21:26:17 +02:00
Oliver Azevedo Barnes
e775252c62
Merge branch 'main' into ollama-inline-completions 2025-08-17 17:08:49 -04:00
Oliver Azevedo Barnes
a9f248f259
Send api key for api/show and api/tags 2025-08-17 15:26:40 -04:00
Finn Evers
3e0a755486
Remove some redundant entity clones (#36274)
`cx.entity()` already returns an owned entity, so there is no need for
these clones.

Release Notes:

- N/A
2025-08-15 20:27:44 +00:00
Oliver Azevedo Barnes
8bd784f5ea
Merge branch 'main' into ollama-inline-completions
# Conflicts:
#	crates/edit_prediction_button/src/edit_prediction_button.rs
#	crates/editor/src/editor.rs
2025-08-08 20:44:27 +01:00
Oliver Azevedo Barnes
bc58f77e09
Merge branch 'main' into ollama-inline-completions
# Conflicts:
#	Cargo.lock
#	crates/edit_prediction_button/src/edit_prediction_button.rs
#	crates/editor/src/editor.rs
#	crates/zed/src/zed/edit_prediction_registry.rs
2025-08-07 16:29:02 +01:00
Raphael Lüthy
2234220618
completions: Add subtle/eager behavior to Supermaven and Copilot (#35548)
This pull request introduces changes to improve the behavior and
consistency of multiple completion providers
(`CopilotCompletionProvider`, `SupermavenCompletionProvider`) and their
integration with UI elements like menus and inline completion buttons.
It now allows to see the prediction with the completion menu open whilst
pressing `opt` and also enables the subtle/eager setting that was
introduced with zeta.

Edit: I managed to get the preview working with correct icons!
<img width="909" height="232" alt="image"
src="https://github.com/user-attachments/assets/65800e67-4bc4-40f8-be78-806fcfe74ad9"
/>
<img width="1460" height="318" alt="CleanShot 2025-08-04 at 01 36 31@2x"
src="https://github.com/user-attachments/assets/15651405-720f-465f-a13c-c7470817810a"
/>

Correct icons are also displayed:
<img width="244" height="96" alt="image"
src="https://github.com/user-attachments/assets/0b8a687f-73e3-452d-aefb-784c52831b73"
/>


Edit2: I added some comments, would be very happy to receive feedback
(still learning rust)

Release Notes:

- Added Subtle and Eager edit prediction modes to Copilot and Supermaven
2025-08-07 18:27:29 +03:00
Peter Tripp
5b40b3618f
Add workspace::ToggleEditPrediction for toggling inline completions globally (#35418)
Closes: https://github.com/zed-industries/zed/issues/23704

Existing action is `editor::ToggleEditPrediction` ("This Buffer").
This action is `workspace::ToggleEditPredction` ("All Files").

You can add a custom keybind wi shortcut with:
```json
  { "context": "Workspace", "bindings": { "ctrl-alt-cmd-e": "workspace::ToggleEditPrediction" } },
```

<img width="212" height="439" alt="Screenshot 2025-07-31 at 12 52 19"
src="https://github.com/user-attachments/assets/15879daa-7d4d-4308-ab2b-5e78507f2fa5"
/>


Release Notes:

- Added `workspace::ToggleEditPrediction` action for toggling
`show_edit_predictions` in settings (Edit Predictions menu -> All
Files).
2025-08-05 09:35:52 -04:00
Michael Sloan
65018c28c0
Rename remaining mentions of "inline completion" to "edit prediction" (#35512)
Release Notes:

- N/A
2025-08-04 16:22:18 +00:00