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

edit prediction: Fix license detection error logging + check for different spellings (#24281)

Browse source 
Follow-up to https://github.com/zed-industries/zed/pull/24278

This PR ensures we're checking if there's a license-type file in both US
& UK English spelling, and fixes the error logging again, treating for
when the worktree contains just a single file or multiple.

Release Notes:

- N/A

Co-authored-by: Bennet Bo Fenner <53836821+bennetbo@users.noreply.github.com>
This commit is contained in:
Danilo Leal 2025-02-05 13:15:41 -03:00 • committed by GitHub
parent 6b29616c95
commit 17a7495332
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

35
crates/zeta/src/zeta.rs
View file

@ -953,20 +953,33 @@ impl LicenseDetectionWatcher {
pub fn new(worktree: &Worktree, cx: &mut Context<Worktree>) -> Self {
let (mut is_open_source_tx, is_open_source_rx) = watch::channel_with::<bool>(false);
let loaded_file_fut = worktree.load_file(Path::new("LICENSE"), cx);
const LICENSE_FILES_TO_CHECK: [&'static str; 2] = ["LICENSE", "LICENCE"]; // US and UK English spelling
// Check if worktree is a single file, if so we do not need to check for a LICENSE file
let task = if worktree.abs_path().is_file() {
Task::ready(())
} else {
let loaded_files_task = futures::future::join_all(
LICENSE_FILES_TO_CHECK
.iter()
.map(|file| worktree.load_file(Path::new(file), cx)),
);
cx.background_executor().spawn(async move {
for loaded_file in loaded_files_task.await {
if let Some(content) = loaded_file.log_err() {
if is_license_eligible_for_data_collection(&content.text) {
*is_open_source_tx.borrow_mut() = true;
break;
}
}
}
})
};
Self {
is_open_source_rx,
_is_open_source_task: cx.spawn(|_, _| async move {
let Ok(loaded_file) = loaded_file_fut.await else {
return;
};
let is_loaded_file_open_source_thing: bool =
is_license_eligible_for_data_collection(&loaded_file.text);
*is_open_source_tx.borrow_mut() = is_loaded_file_open_source_thing;
}),
_is_open_source_task: task,
}
}