dap_adapters: Log CodeLldb version fetching errors (#35943)
Release Notes: - N/A
This commit is contained in:
parent
8d332da4c5
commit
e132c7cad9
1 changed files with 22 additions and 6 deletions
|
@ -338,8 +338,8 @@ impl DebugAdapter for CodeLldbDebugAdapter {
|
||||||
if command.is_none() {
|
if command.is_none() {
|
||||||
delegate.output_to_console(format!("Checking latest version of {}...", self.name()));
|
delegate.output_to_console(format!("Checking latest version of {}...", self.name()));
|
||||||
let adapter_path = paths::debug_adapters_dir().join(&Self::ADAPTER_NAME);
|
let adapter_path = paths::debug_adapters_dir().join(&Self::ADAPTER_NAME);
|
||||||
let version_path =
|
let version_path = match self.fetch_latest_adapter_version(delegate).await {
|
||||||
if let Ok(version) = self.fetch_latest_adapter_version(delegate).await {
|
Ok(version) => {
|
||||||
adapters::download_adapter_from_github(
|
adapters::download_adapter_from_github(
|
||||||
self.name(),
|
self.name(),
|
||||||
version.clone(),
|
version.clone(),
|
||||||
|
@ -351,10 +351,26 @@ impl DebugAdapter for CodeLldbDebugAdapter {
|
||||||
adapter_path.join(format!("{}_{}", Self::ADAPTER_NAME, version.tag_name));
|
adapter_path.join(format!("{}_{}", Self::ADAPTER_NAME, version.tag_name));
|
||||||
remove_matching(&adapter_path, |entry| entry != version_path).await;
|
remove_matching(&adapter_path, |entry| entry != version_path).await;
|
||||||
version_path
|
version_path
|
||||||
} else {
|
}
|
||||||
let mut paths = delegate.fs().read_dir(&adapter_path).await?;
|
Err(e) => {
|
||||||
paths.next().await.context("No adapter found")??
|
delegate.output_to_console("Unable to fetch latest version".to_string());
|
||||||
};
|
log::error!("Error fetching latest version of {}: {}", self.name(), e);
|
||||||
|
delegate.output_to_console(format!(
|
||||||
|
"Searching for adapters in: {}",
|
||||||
|
adapter_path.display()
|
||||||
|
));
|
||||||
|
let mut paths = delegate
|
||||||
|
.fs()
|
||||||
|
.read_dir(&adapter_path)
|
||||||
|
.await
|
||||||
|
.context("No cached adapter directory")?;
|
||||||
|
paths
|
||||||
|
.next()
|
||||||
|
.await
|
||||||
|
.context("No cached adapter found")?
|
||||||
|
.context("No cached adapter found")?
|
||||||
|
}
|
||||||
|
};
|
||||||
let adapter_dir = version_path.join("extension").join("adapter");
|
let adapter_dir = version_path.join("extension").join("adapter");
|
||||||
let path = adapter_dir.join("codelldb").to_string_lossy().to_string();
|
let path = adapter_dir.join("codelldb").to_string_lossy().to_string();
|
||||||
self.path_to_codelldb.set(path.clone()).ok();
|
self.path_to_codelldb.set(path.clone()).ok();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue