Pass project environment to runInTerminal requests (#32720)

Closes #ISSUE

Release Notes:

- debugger: Pass environment to run in terminal requests
This commit is contained in:
Conrad Irwin 2025-06-16 09:34:50 -06:00 committed by GitHub
parent d7db4d4e0a
commit 92addb005a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 29 additions and 7 deletions

View file

@ -176,6 +176,7 @@ impl DebugPanel {
dap_store.new_session(
scenario.label.clone(),
DebugAdapterName(scenario.adapter.clone()),
task_context.clone(),
None,
cx,
)
@ -338,12 +339,13 @@ impl DebugPanel {
let adapter = curr_session.read(cx).adapter().clone();
let binary = curr_session.read(cx).binary().cloned().unwrap();
let task = curr_session.update(cx, |session, cx| session.shutdown(cx));
let task_context = curr_session.read(cx).task_context().clone();
cx.spawn_in(window, async move |this, cx| {
task.await;
let (session, task) = dap_store_handle.update(cx, |dap_store, cx| {
let session = dap_store.new_session(label, adapter, None, cx);
let session = dap_store.new_session(label, adapter, task_context, None, cx);
let task = session.update(cx, |session, cx| {
session.boot(binary, worktree, dap_store_handle.downgrade(), cx)
@ -393,11 +395,17 @@ impl DebugPanel {
log::error!("Attempted to start a child-session without a binary");
return;
};
let task_context = parent_session.read(cx).task_context().clone();
binary.request_args = request.clone();
cx.spawn_in(window, async move |this, cx| {
let (session, task) = dap_store_handle.update(cx, |dap_store, cx| {
let session =
dap_store.new_session(label, adapter, Some(parent_session.clone()), cx);
let session = dap_store.new_session(
label,
adapter,
task_context,
Some(parent_session.clone()),
cx,
);
let task = session.update(cx, |session, cx| {
session.boot(binary, worktree, dap_store_handle.downgrade(), cx)

View file

@ -1012,7 +1012,8 @@ impl RunningState {
None
};
let mut envs: HashMap<String, String> = Default::default();
let mut envs: HashMap<String, String> =
self.session.read(cx).task_context().project_env.clone();
if let Some(Value::Object(env)) = &request.env {
for (key, value) in env {
let value_str = match (key.as_str(), value) {