foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-03 09:31:22 -05:00
Code Issues Packages 1 Wiki Activity

fix(lsp): reload import registries should not error when the module registries directory does not exist (#11123)

Browse source
This commit is contained in:
David Sherret 2021-06-25 21:44:27 -04:00 • committed by GitHub
parent 2f1ac46091
commit 1f4cdc067a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cli/fs_util.rs
View file

@ -161,6 +161,16 @@ where
Ok(target_files)
}
// Asynchronously removes a directory and all its descendants, but does not error
// when the directory does not exist.
pub async fn remove_dir_all_if_exists(path: &Path) -> std::io::Result<()> {
let result = tokio::fs::remove_dir_all(path).await;
match result {
Err(err) if err.kind() == std::io::ErrorKind::NotFound => Ok(()),
_ => result,
}
}
#[cfg(test)]
mod tests {
use super::*;

3
cli/lsp/language_server.rs
View file

@ -54,6 +54,7 @@ use super::urls;
use crate::config_file::ConfigFile;
use crate::config_file::TsConfig;
use crate::deno_dir;
use crate::fs_util;
use crate::import_map::ImportMap;
use crate::logger;
use crate::media_type::MediaType;
@ -2410,7 +2411,7 @@ impl Inner {
}
async fn reload_import_registries(&mut self) -> LspResult<Option<Value>> {
fs::remove_dir_all(&self.module_registries_location)
fs_util::remove_dir_all_if_exists(&self.module_registries_location)
.await
.map_err(|err| {
error!("Unable to remove registries cache: {}", err);