debugger beta: Update Javascript's DAP to allow passing in url instead of program (#31494)
Closes #31375 Release Notes: - debugger beta: Allow passing in URL instead of program for Javascript launch request
This commit is contained in:
parent
f8f36d0c17
commit
3ff62ef289
1 changed files with 13 additions and 4 deletions
|
@ -113,8 +113,10 @@ impl DebugAdapter for JsDebugAdapter {
|
||||||
) -> Result<dap::StartDebuggingRequestArgumentsRequest> {
|
) -> Result<dap::StartDebuggingRequestArgumentsRequest> {
|
||||||
match config.get("request") {
|
match config.get("request") {
|
||||||
Some(val) if val == "launch" => {
|
Some(val) if val == "launch" => {
|
||||||
if config.get("program").is_none() {
|
if config.get("program").is_none() && config.get("url").is_none() {
|
||||||
return Err(anyhow!("program is required"));
|
return Err(anyhow!(
|
||||||
|
"either program or url is required for launch request"
|
||||||
|
));
|
||||||
}
|
}
|
||||||
Ok(StartDebuggingRequestArgumentsRequest::Launch)
|
Ok(StartDebuggingRequestArgumentsRequest::Launch)
|
||||||
}
|
}
|
||||||
|
@ -143,7 +145,11 @@ impl DebugAdapter for JsDebugAdapter {
|
||||||
map.insert("processId".into(), attach.process_id.into());
|
map.insert("processId".into(), attach.process_id.into());
|
||||||
}
|
}
|
||||||
DebugRequest::Launch(launch) => {
|
DebugRequest::Launch(launch) => {
|
||||||
map.insert("program".into(), launch.program.clone().into());
|
if launch.program.starts_with("http://") {
|
||||||
|
map.insert("url".into(), launch.program.clone().into());
|
||||||
|
} else {
|
||||||
|
map.insert("program".into(), launch.program.clone().into());
|
||||||
|
}
|
||||||
|
|
||||||
if !launch.args.is_empty() {
|
if !launch.args.is_empty() {
|
||||||
map.insert("args".into(), launch.args.clone().into());
|
map.insert("args".into(), launch.args.clone().into());
|
||||||
|
@ -311,7 +317,10 @@ impl DebugAdapter for JsDebugAdapter {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"required": ["program"]
|
"oneOf": [
|
||||||
|
{ "required": ["program"] },
|
||||||
|
{ "required": ["url"] }
|
||||||
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue