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

WIP

Browse source
This commit is contained in:
Antonio Scandurra 2023-10-23 12:16:33 +02:00
parent c0e8ae5dfa
commit a72434f67b
11 changed files with 1914 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/project2/src/project2.rs
View file

@ -26,8 +26,7 @@ use futures::{
};
use globset::{Glob, GlobSet, GlobSetBuilder};
use gpui2::{
AnyHandle, AppContext, AsyncAppContext, EventEmitter, Executor, Handle, ModelContext, Task,
WeakHandle,
AnyHandle, AppContext, AsyncAppContext, EventEmitter, Handle, ModelContext, Task, WeakHandle,
};
use itertools::Itertools;
use language2::{
@ -821,7 +820,10 @@ impl Project {
}
}
fn shutdown_language_servers(&mut self) -> impl Future<Output = ()> {
fn shutdown_language_servers(
&mut self,
cx: &mut ModelContext<Self>,
) -> impl Future<Output = ()> {
let shutdown_futures = self
.language_servers
.drain()
@ -5683,7 +5685,7 @@ impl Project {
async fn background_search(
unnamed_buffers: Vec<Handle<Buffer>>,
opened_buffers: HashMap<Arc<Path>, (Handle<Buffer>, BufferSnapshot)>,
executor: Executor,
executor: Arc<Background>,
fs: Arc<dyn Fs>,
workers: usize,
query: SearchQuery,

2
crates/project2/src/terminals.rs
View file

@ -116,7 +116,7 @@ impl Project {
}
}
pub fn local_terminal_handles(&self) -> &Vec<WeakModelHandle<terminal::Terminal>> {
pub fn local_terminal_handles(&self) -> &Vec<WeakHandle<terminal::Terminal>> {
&self.terminals.local_handles
}
}