git.iko.soy/helix
on master help sign in
Extract handle_debugger_message, we should avoid bloating tokio::select!
a964cbaBlaž Hrastnik
helix-term/src/application.rs+65−61
compare with master
unifiedsplit
@@ -187,66 +187,7 @@ impl Application {
187 }
187 }
188 }
188 }
189 Some(payload) = self.editor.debugger_events.next() => {
189 Some(payload) = self.editor.debugger_events.next() => {
190− if self.editor.debugger.is_none() {
190+ self.handle_debugger_message(payload).await;
191− continue;
192− }
193− let mut debugger = self.editor.debugger.as_mut().unwrap();
194− match payload {
195− Payload::Event(ev) => {
196− match &ev.event[..] {
197− "stopped" => {
198− debugger.is_running = false;
199− let main = debugger
200− .threads()
201− .await
202− .ok()
203− .and_then(|threads| threads.get(0).cloned());
204− if let Some(main) = main {
205− let (bt, _) = debugger.stack_trace(main.id).await.unwrap();
206− debugger.stack_pointer = bt.get(0).cloned();
207− }
208−
209− let body: helix_dap::events::Stopped = from_value(ev.body.expect("`stopped` event must have a body")).unwrap();
210− let scope = match body.thread_id {
211− Some(id) => format!("Thread {}", id),
212− None => "Target".to_owned(),
213− };
214−
215− let mut status = format!("{} stopped because of {}", scope, body.reason);
216− if let Some(desc) = body.description {
217− status.push_str(&format!(" {}", desc));
218− }
219− if let Some(text) = body.text {
220− status.push_str(&format!(" {}", text));
221− }
222− if body.all_threads_stopped == Some(true) {
223− status.push_str(" (all threads stopped)");
224− }
225−
226− self.editor.set_status(status);
227− self.render();
228− }
229− "output" => {
230− let body: helix_dap::events::Output = from_value(ev.body.expect("`output` event must have a body")).unwrap();
231−
232− let prefix = match body.category {
233− Some(category) => format!("Debug ({}):", category),
234− None => "Debug:".to_owned(),
235− };
236−
237− self.editor.set_status(format!("{} {}", prefix, body.output));
238− self.render();
239− }
240− "initialized" => {
241− self.editor.set_status("Debugged application started".to_owned());
242− self.render();
243− }
244− _ => {}
245− }
246− },
247− Payload::Response(_) => unreachable!(),
248− Payload::Request(_) => todo!(),
249− }
250 }
191 }
251 Some(callback) = self.jobs.futures.next() => {
192 Some(callback) = self.jobs.futures.next() => {
252 self.jobs.handle_callback(&mut self.editor, &mut self.compositor, callback);
193 self.jobs.handle_callback(&mut self.editor, &mut self.compositor, callback);
@@ -309,7 +250,70 @@ impl Application {
309 }
250 }
310 }
251 }
311
252
312− pub async fn handle_debugger_message(&mut self, _call: ()) {
253+ pub async fn handle_debugger_message(&mut self, payload: helix_dap::Payload) {
254+ let mut debugger = match self.editor.debugger.as_mut() {
255+ Some(debugger) => debugger,
256+ None => return,
257+ };
258+
259+ match payload {
260+ Payload::Event(ev) => match &ev.event[..] {
261+ "stopped" => {
262+ debugger.is_running = false;
263+ let main = debugger
264+ .threads()
265+ .await
266+ .ok()
267+ .and_then(|threads| threads.get(0).cloned());
268+ if let Some(main) = main {
269+ let (bt, _) = debugger.stack_trace(main.id).await.unwrap();
270+ debugger.stack_pointer = bt.get(0).cloned();
271+ }
272+
273+ let body: helix_dap::events::Stopped =
274+ from_value(ev.body.expect("`stopped` event must have a body")).unwrap();
275+ let scope = match body.thread_id {
276+ Some(id) => format!("Thread {}", id),
277+ None => "Target".to_owned(),
278+ };
279+
280+ let mut status = format!("{} stopped because of {}", scope, body.reason);
281+ if let Some(desc) = body.description {
282+ status.push_str(&format!(" {}", desc));
283+ }
284+ if let Some(text) = body.text {
285+ status.push_str(&format!(" {}", text));
286+ }
287+ if body.all_threads_stopped == Some(true) {
288+ status.push_str(" (all threads stopped)");
289+ }
290+
291+ self.editor.set_status(status);
292+ self.render();
293+ }
294+ "output" => {
295+ let body: helix_dap::events::Output =
296+ from_value(ev.body.expect("`output` event must have a body")).unwrap();
297+
298+ let prefix = match body.category {
299+ Some(category) => format!("Debug ({}):", category),
300+ None => "Debug:".to_owned(),
301+ };
302+
303+ self.editor
304+ .set_status(format!("{} {}", prefix, body.output));
305+ self.render();
306+ }
307+ "initialized" => {
308+ self.editor
309+ .set_status("Debugged application started".to_owned());
310+ self.render();
311+ }
312+ _ => {}
313+ },
314+ Payload::Response(_) => unreachable!(),
315+ Payload::Request(_) => todo!(),
316+ }
313 // TODO
317 // TODO
314 }
318 }
315
319