git.iko.soy/helix
on master help sign in
lldb: use stdio transport by default
commit413e477dc2d4792596f99979140d2879ec3d4f4f authorDmitry Sharshakov <d3dx12.xx@gmail.com> dateMon 6 Sep 2021, 13:49 (5 years ago) parent507a1f8
3 files changed+10−11
compare with master
unifiedsplit
helix-core/src/syntax.rs+1 helix-dap/src/client.rs+6−2 languages.toml+3−9
helix-core/src/syntax.rs+1
@@ -98,6 +98,7 @@ pub struct DebugAdapterConfig {
9898 pub name: String,
9999 pub transport: String,
100100 pub command: String,
101+ #[serde(default)]
101102 pub args: Vec<String>,
102103 pub port_arg: Option<String>,
103104 pub templates: Vec<DebugTemplate>,
helix-dap/src/client.rs+6−2
@@ -116,12 +116,16 @@ impl Client {
116116 // TODO: do we need bufreader/writer here? or do we use async wrappers on unblock?
117117 let writer = BufWriter::new(process.stdin.take().expect("Failed to open stdin"));
118118 let reader = BufReader::new(process.stdout.take().expect("Failed to open stdout"));
119− let errors = BufReader::new(process.stderr.take().expect("Failed to open stderr"));
119+ let errors = process.stderr.take().map(BufReader::new);
120120
121121 Self::streams(
122122 Box::new(BufReader::new(reader)),
123123 Box::new(writer),
124− Some(Box::new(BufReader::new(errors))),
124+ // errors.map(|errors| Box::new(BufReader::new(errors))),
125+ match errors {
126+ Some(errors) => Some(Box::new(BufReader::new(errors))),
127+ None => None,
128+ },
125129 id,
126130 Some(process),
127131 )
languages.toml+3−9
@@ -22,10 +22,8 @@ indent = { tab-width = 4, unit = " " }
2222
2323[language.debugger]
2424name = "lldb-vscode"
25−transport = "tcp"
25+transport = "stdio"
2626command = "lldb-vscode"
27−args = []
28−port-arg = "-p {}"
2927
3028[[language.debugger.templates]]
3129name = "binary"
@@ -91,10 +89,8 @@ indent = { tab-width = 2, unit = " " }
9189
9290[language.debugger]
9391name = "lldb-vscode"
94−transport = "tcp"
92+transport = "stdio"
9593command = "lldb-vscode"
96−args = []
97−port-arg = "-p {}"
9894
9995[[language.debugger.templates]]
10096name = "binary"
@@ -121,10 +117,8 @@ indent = { tab-width = 2, unit = " " }
121117
122118[language.debugger]
123119name = "lldb-vscode"
124−transport = "tcp"
120+transport = "stdio"
125121command = "lldb-vscode"
126−args = []
127−port-arg = "-p {}"
128122
129123[[language.debugger.templates]]
130124name = "binary"