Порівняти коміти

...
Автор SHA1 Повідомлення Дата
l0ng-ai 0ab052d48d revert: start Python debuggees in the internal console on Windows (#4404)
#4404 assumed 0.1.48 already had #4185 (ConPTY cursor position answer)
and still failed on Windows. It doesn't: #4185 merged after the 0.1.48
release, so the reports on 0.1.48 say nothing about it. Python debugging
on Windows goes back to runInTerminal with #4185, which keeps input()
working in the debug console.
2026-11-19 12:09:59 +08:00
-25
Переглянути файл
@@ -26,12 +26,6 @@ pub(super) fn prepare_debug(config: &mut LaunchConfig, paths: &[PathBuf]) -> Ide
if extra.as_ref().is_some_and(|e| e.get("debugServer").is_some()) {
return Ok(());
}
if cfg!(windows)
&& let Some(extra) = extra.as_mut()
{
start_in_internal_console(extra);
config.extra_json = Some(extra.to_string());
}
if let Some(env) = extra.as_mut().and_then(|e| e.get_mut("env")) {
if env.is_null() {
*env = serde_json::json!({});
@@ -52,29 +46,10 @@ pub(super) fn prepare_debug(config: &mut LaunchConfig, paths: &[PathBuf]) -> Ide
Ok(())
}
/// On Windows debugpy's launcher never connects when it runs on the pseudo-terminal of
/// `runInTerminal` (ConPTY), and the launch times out; started by debugpy itself it does. The
/// program then can't read typed input, but it can be debugged.
fn start_in_internal_console(extra: &mut serde_json::Value) {
if extra.get("console").and_then(|c| c.as_str()) == Some("integratedTerminal") {
extra["console"] = serde_json::json!("internalConsole");
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn windows_debuggees_start_in_the_internal_console() {
let mut extra = serde_json::json!({"console": "integratedTerminal", "python": "python"});
start_in_internal_console(&mut extra);
assert_eq!(extra["console"], "internalConsole");
let mut external = serde_json::json!({"console": "externalTerminal"});
start_in_internal_console(&mut external);
assert_eq!(external["console"], "externalTerminal");
}
#[test]
fn debug_preserves_remote_paths_and_handles_null_env() {
let root = std::env::temp_dir().join("project");