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

debugger beta: Fix dap_schema for DAP extensions (#31173)

Browse source 
We now actually call dap_schema provided by extensions instead of
defaulting to a null `serde_json::Value`. We still need to update the
Json LSP whenever a new dap is installed.

Release Notes:

- N/A
This commit is contained in:
Anthony Eid 2025-05-22 07:24:46 -04:00 • committed by GitHub
parent baf6d82cd4
commit 06f725d51b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 35 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/languages/src/json.rs
View file

@ -26,7 +26,7 @@ use std::{
str::FromStr,
sync::Arc,
};
use task::{TaskTemplate, TaskTemplates, VariableName};
use task::{AdapterSchemas, TaskTemplate, TaskTemplates, VariableName};
use util::{ResultExt, archive::extract_zip, fs::remove_matching, maybe, merge_json_value_into};
const SERVER_PATH: &str =
@ -76,7 +76,11 @@ impl JsonLspAdapter {
}
}
fn get_workspace_config(language_names: Vec<String>, cx: &mut App) -> Value {
fn get_workspace_config(
language_names: Vec<String>,
adapter_schemas: AdapterSchemas,
cx: &mut App,
) -> Value {
let keymap_schema = KeymapFile::generate_json_schema_for_registered_actions(cx);
let font_names = &cx.text_system().all_font_names();
let settings_schema = cx.global::<SettingsStore>().json_schema(
@ -87,7 +91,6 @@ impl JsonLspAdapter {
cx,
);
let adapter_schemas = cx.global::<DapRegistry>().adapters_schema();
let tasks_schema = task::TaskTemplates::generate_json_schema();
let debug_schema = task::DebugTaskFile::generate_json_schema(&adapter_schemas);
let snippets_schema = snippet_provider::format::VsSnippetsFile::generate_json_schema();
@ -163,8 +166,15 @@ impl JsonLspAdapter {
}
}
let mut writer = self.workspace_config.write().await;
let config =
cx.update(|cx| Self::get_workspace_config(self.languages.language_names(), cx))?;
let adapter_schemas = cx
.read_global::<DapRegistry, _>(|dap_registry, _| dap_registry.to_owned())?
.adapters_schema()
.await;
let config = cx.update(|cx| {
Self::get_workspace_config(self.languages.language_names().clone(), adapter_schemas, cx)
})?;
writer.replace(config.clone());
return Ok(config);
}