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

Rewrite permission queries (it no longer blocks)

Browse source 
Co-authored-by: Kyle <kyle@zed.dev>
Co-authored-by: Max <max@zed.dev>
This commit is contained in:
Piotr Osiewicz 2023-08-03 20:26:56 +02:00
parent d157e3598d
commit 31fb503418
2 changed files with 51 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

99
crates/search/src/project_search.rs
View file

@ -2,7 +2,7 @@ use crate::{
NextHistoryQuery, PreviousHistoryQuery, SearchHistory, SearchOptions, SelectNextMatch, NextHistoryQuery, PreviousHistoryQuery, SearchHistory, SearchOptions, SelectNextMatch,
SelectPrevMatch, ToggleCaseSensitive, ToggleWholeWord, SelectPrevMatch, ToggleCaseSensitive, ToggleWholeWord,
}; };
use anyhow::Context; use anyhow::{Context, Result};
use collections::HashMap; use collections::HashMap;
use editor::{ use editor::{
items::active_match_index, scroll::autoscroll::Autoscroll, Anchor, Editor, MultiBuffer, items::active_match_index, scroll::autoscroll::Autoscroll, Anchor, Editor, MultiBuffer,
@ -761,46 +761,50 @@ impl ProjectSearchView {
match mode { match mode {
SearchMode::Semantic => { SearchMode::Semantic => {
// let semantic_permissioned = self.semantic_permissioned.await; let has_permission = self.semantic_permissioned(cx);
// if semantic_permissioned.is_ok_and(|permission| !permission) { cx.spawn(|this, mut cx| async move {
if !self.semantic_permissioned(cx) { let has_permission = has_permission.await?;
// TODO: Change this to read from the project name
let project = self.model.read(cx).project.clone(); if !has_permission {
let project_name = project let mut answer = this.update(&mut cx, |this, cx| {
.read(cx) let project = this.model.read(cx).project.clone();
.worktree_root_names(cx) let project_name = project
.collect::<Vec<&str>>() .read(cx)
.join("/"); .worktree_root_names(cx)
let is_plural = .collect::<Vec<&str>>()
project_name.chars().filter(|letter| *letter == '/').count() > 0; .join("/");
let prompt_text = format!("Would you like to index the '{}' project{} for semantic search? This requires sending code to the OpenAI API", project_name, let is_plural =
if is_plural { project_name.chars().filter(|letter| *letter == '/').count() > 0;
"s" let prompt_text = format!("Would you like to index the '{}' project{} for semantic search? This requires sending code to the OpenAI API", project_name,
} else {""}); if is_plural {
let mut answer = cx.prompt( "s"
PromptLevel::Info, } else {""});
prompt_text.as_str(), cx.prompt(
&["Continue", "Cancel"], PromptLevel::Info,
); prompt_text.as_str(),
&["Continue", "Cancel"],
)
})?;
cx.spawn(|search_view, mut cx| async move {
if answer.next().await == Some(0) { if answer.next().await == Some(0) {
search_view.update(&mut cx, |search_view, cx| { this.update(&mut cx, |this, cx| {
search_view.semantic_permissioned = Some(true); this.semantic_permissioned = Some(true);
search_view.index_project(cx);
})?; })?;
anyhow::Ok(())
} else { } else {
search_view.update(&mut cx, |search_view, cx| { this.update(&mut cx, |this, cx| {
search_view.activate_search_mode(SearchMode::Regex, cx); this.semantic_permissioned = Some(false);
this.activate_search_mode(SearchMode::Regex, cx);
})?; })?;
anyhow::Ok(()) return anyhow::Ok(());
} }
}) }
.detach_and_log_err(cx);
} else { this.update(&mut cx, |this, cx| {
self.index_project(cx); this.index_project(cx);
} })?;
anyhow::Ok(())
}).detach_and_log_err(cx);
} }
SearchMode::Regex => { SearchMode::Regex => {
if !self.is_option_enabled(SearchOptions::REGEX) { if !self.is_option_enabled(SearchOptions::REGEX) {
@ -922,19 +926,18 @@ impl ProjectSearchView {
this.model_changed(cx); this.model_changed(cx);
this this
} }
fn semantic_permissioned(&mut self, cx: &mut ViewContext<Self>) -> bool {
*self.semantic_permissioned.get_or_insert_with(|| { fn semantic_permissioned(&mut self, cx: &mut ViewContext<Self>) -> Task<Result<bool>> {
SemanticIndex::global(cx) if let Some(value) = self.semantic_permissioned {
.and_then(|semantic| { return Task::ready(Ok(value));
let project = self.model.read(cx).project.clone(); }
smol::block_on(
semantic SemanticIndex::global(cx)
.update(cx, |this, cx| this.project_previously_indexed(project, cx)), .map(|semantic| {
) let project = self.model.read(cx).project.clone();
.ok() semantic.update(cx, |this, cx| this.project_previously_indexed(project, cx))
}) })
.unwrap_or_default() .unwrap_or(Task::ready(Ok(false)))
})
} }
pub fn new_search_in_directory( pub fn new_search_in_directory(
workspace: &mut Workspace, workspace: &mut Workspace,

14
crates/semantic_index/src/semantic_index.rs
View file

@ -500,26 +500,12 @@ impl SemanticIndex {
project: ModelHandle<Project>, project: ModelHandle<Project>,
cx: &mut ModelContext<Self>, cx: &mut ModelContext<Self>,
) -> Task<Result<bool>> { ) -> Task<Result<bool>> {
let worktree_scans_complete = project
.read(cx)
.worktrees(cx)
.map(|worktree| {
let scan_complete = worktree.read(cx).as_local().unwrap().scan_complete();
async move {
scan_complete.await;
}
})
.collect::<Vec<_>>();
let worktrees_indexed_previously = project let worktrees_indexed_previously = project
.read(cx) .read(cx)
.worktrees(cx) .worktrees(cx)
.map(|worktree| self.worktree_previously_indexed(worktree.read(cx).abs_path())) .map(|worktree| self.worktree_previously_indexed(worktree.read(cx).abs_path()))
.collect::<Vec<_>>(); .collect::<Vec<_>>();
cx.spawn(|_, _cx| async move { cx.spawn(|_, _cx| async move {
futures::future::join_all(worktree_scans_complete).await;
let worktree_indexed_previously = let worktree_indexed_previously =
futures::future::join_all(worktrees_indexed_previously).await; futures::future::join_all(worktrees_indexed_previously).await;