Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into ollama-inline-completions

Browse source 
# Conflicts:
#	Cargo.lock
#	crates/zed/src/zed/inline_completion_registry.rs
This commit is contained in:
Oliver Azevedo Barnes 2025-07-30 17:13:06 +01:00
commit 78c470cb7e
No known key found for this signature in database
119 changed files with 3241 additions and 1306 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/inline_completion_button/src/inline_completion_button.rs
View file

@ -1,5 +1,6 @@
use anyhow::Result;
use client::{DisableAiSettings, UserStore, zed_urls};
use cloud_llm_client::UsageLimit;
use copilot::{Copilot, Status};
use editor::{
Editor, SelectionEffects,
@ -40,7 +41,6 @@ use workspace::{
notifications::NotificationId,
};
use zed_actions::OpenBrowser;
use zed_llm_client::UsageLimit;
use zeta::RateCompletions;
actions!(