507a1f8 · helix · git.iko.soy

git.iko.soy/helix

Get breakpoint reports from debugger

commit507a1f8dd6a7f88b979a09532a14a10eda72867b authorDmitry Sharshakov <d3dx12.xx@gmail.com> dateMon 6 Sep 2021, 08:47 (5 years ago) parentc9cd06e

4 files changed+130−17

compare with master

unifiedsplit

helix-dap/src/client.rs+2 helix-term/src/application.rs+50−2 helix-term/src/commands/dap.rs+18−4 helix-term/src/ui/editor.rs+60−11

helix-dap/src/client.rs+2

@@ -33,6 +33,7 @@ pub struct Client {

3333 pub thread_id: Option<isize>,

3434 /// Currently active frame for the current thread.

3535 pub active_frame: Option<usize>,

36+ pub breakpoints: Vec<Breakpoint>,

3637}

3738

3839impl Client {

@@ -80,6 +81,7 @@ impl Client {

8081 thread_states: HashMap::new(),

8182 thread_id: None,

8283 active_frame: None,

84+ breakpoints: vec![],

8385 };

8486

8587 tokio::spawn(Self::recv(server_rx, client_rx));

helix-term/src/application.rs+50−2

@@ -7,7 +7,7 @@ use crate::{

77 args::Args, commands::fetch_stack_trace, compositor::Compositor, config::Config, job::Jobs, ui,

88};

10−use log::error;

10+use log::{error, warn};

1111use std::{

1212 io::{stdout, Write},

1313 sync::Arc,

@@ -320,6 +320,53 @@ impl Application {

320320 Event::Thread(_) => {

321321 // TODO: update thread_states, make threads request

322322 }

323+ Event::Breakpoint(events::Breakpoint { reason, breakpoint }) => match &reason[..] {

324+ "new" => {

325+ debugger.breakpoints.push(breakpoint);

326+ }

327+ "changed" => {

328+ match debugger

329+ .breakpoints

330+ .iter()

331+ .position(|b| b.id == breakpoint.id)

332+ {

333+ Some(i) => {

334+ let item = debugger.breakpoints.get_mut(i).unwrap();

335+ item.verified = breakpoint.verified;

336+ item.message = breakpoint.message.or_else(|| item.message.clone());

337+ item.source = breakpoint.source.or_else(|| item.source.clone());

338+ item.line = breakpoint.line.or(item.line);

339+ item.column = breakpoint.column.or(item.column);

340+ item.end_line = breakpoint.end_line.or(item.end_line);

341+ item.end_column = breakpoint.end_column.or(item.end_column);

342+ item.instruction_reference = breakpoint

343+ .instruction_reference

344+ .or_else(|| item.instruction_reference.clone());

345+ item.offset = breakpoint.offset.or(item.offset);

346+ }

347+ None => {

348+ warn!("Changed breakpoint with id {:?} not found", breakpoint.id);

349+ }

350+ }

351+ }

352+ "removed" => {

353+ match debugger

354+ .breakpoints

355+ .iter()

356+ .position(|b| b.id == breakpoint.id)

357+ {

358+ Some(i) => {

359+ debugger.breakpoints.remove(i);

360+ }

361+ None => {

362+ warn!("Removed breakpoint with id {:?} not found", breakpoint.id);

363+ }

364+ }

365+ }

366+ reason => {

367+ warn!("Unknown breakpoint event: {}", reason);

368+ }

369+ },

323370 Event::Output(events::Output {

324371 category, output, ..

325372 }) => {

@@ -340,9 +387,10 @@ impl Application {

340387 // send existing breakpoints

341388 for (path, breakpoints) in &self.editor.breakpoints {

342389 // TODO: call futures in parallel, await all

343− debugger

390+ debugger.breakpoints = debugger

344391 .set_breakpoints(path.clone(), breakpoints.clone())

345392 .await

393+ .unwrap()

346394 .unwrap();

347395 }

348396 // TODO: fetch breakpoints (in case we're attaching)

helix-term/src/commands/dap.rs+18−4

@@ -336,10 +336,24 @@ pub fn dap_toggle_breakpoint(cx: &mut Context) {

336336 None => return,

337337 };

338338 let request = debugger.set_breakpoints(path, breakpoints);

339− if let Err(e) = block_on(request) {

340− cx.editor

341− .set_error(format!("Failed to set breakpoints: {:?}", e));

342− }

339+ match block_on(request) {

340+ Ok(Some(breakpoints)) => {

341+ let old_breakpoints = debugger.breakpoints.clone();

342+ debugger.breakpoints = breakpoints.clone();

343+ for bp in breakpoints {

344+ if !old_breakpoints.iter().any(|b| b.message == bp.message) {

345+ if let Some(msg) = &bp.message {

346+ cx.editor.set_status(format!("Breakpoint set: {}", msg));

347+ break;

348+ }

349+ }

350+ }

351+ }

352+ Err(e) => cx

353+ .editor

354+ .set_error(format!("Failed to set breakpoints: {:?}", e)),

355+ _ => {}

356+ };

343357}

344358

345359pub fn dap_continue(cx: &mut Context) {

helix-term/src/ui/editor.rs+60−11

@@ -16,11 +16,11 @@ use helix_core::{

1616 unicode::width::UnicodeWidthStr,

1717 LineEnding, Position, Range, Selection,

1818};

19−use helix_dap::{SourceBreakpoint, StackFrame};

19+use helix_dap::{Breakpoint, SourceBreakpoint, StackFrame};

2020use helix_view::{

2121 document::Mode,

2222 editor::LineNumber,

23− graphics::{CursorKind, Modifier, Rect, Style},

23+ graphics::{Color, CursorKind, Modifier, Rect, Style},

2424 info::Info,

2525 input::KeyEvent,

2626 keyboard::{KeyCode, KeyModifiers},

@@ -76,7 +76,8 @@ impl EditorView {

7676 loader: &syntax::Loader,

7777 config: &helix_view::editor::Config,

7878 debugger: &Option<helix_dap::Client>,

79− breakpoints: &HashMap<PathBuf, Vec<helix_dap::SourceBreakpoint>>,

79+ all_breakpoints: &HashMap<PathBuf, Vec<SourceBreakpoint>>,

80+ dbg_breakpoints: &Option<Vec<Breakpoint>>,

8081 ) {

8182 let inner = view.inner_area();

8283 let area = view.area;

@@ -102,7 +103,8 @@ impl EditorView {

102103 is_focused,

103104 config,

104105 debugger,

105− breakpoints,

106+ all_breakpoints,

107+ dbg_breakpoints,

106108 );

107109

108110 if is_focused {

@@ -122,7 +124,7 @@ impl EditorView {

122124 }

123125 }

124126

125− self.render_diagnostics(doc, view, inner, surface, theme, breakpoints);

127+ self.render_diagnostics(doc, view, inner, surface, theme, all_breakpoints);

126128

127129 let statusline_area = view

128130 .area

@@ -426,7 +428,8 @@ impl EditorView {

426428 is_focused: bool,

427429 config: &helix_view::editor::Config,

428430 debugger: &Option<helix_dap::Client>,

429− all_breakpoints: &HashMap<PathBuf, Vec<helix_dap::SourceBreakpoint>>,

431+ all_breakpoints: &HashMap<PathBuf, Vec<SourceBreakpoint>>,

432+ dbg_breakpoints: &Option<Vec<Breakpoint>>,

430433 ) {

431434 let text = doc.text().slice(..);

432435 let last_line = view.last_line(doc);

@@ -500,10 +503,35 @@ impl EditorView {

500503

501504 let selected = cursors.contains(&line);

502505

503− if let Some(bps) = breakpoints.as_ref() {

504− if let Some(breakpoint) = bps.iter().find(|breakpoint| breakpoint.line - 1 == line)

506+ if let Some(user) = breakpoints.as_ref() {

507+ let debugger_breakpoint = if let Some(debugger) = dbg_breakpoints.as_ref() {

508+ debugger.iter().find(|breakpoint| {

509+ if breakpoint.source.is_some()

510+ && doc.path().is_some()

511+ && breakpoint.source.as_ref().unwrap().path == doc.path().cloned()

512+ {

513+ match (breakpoint.line, breakpoint.end_line) {

514+ #[allow(clippy::int_plus_one)]

515+ (Some(l), Some(el)) => l - 1 <= line && line <= el - 1,

516+ (Some(l), None) => l - 1 == line,

517+ _ => false,

518+ }

519+ } else {

520+ false

521+ }

522+ })

523+ } else {

524+ None

525+ };

526+

527+ if let Some(breakpoint) = user.iter().find(|breakpoint| breakpoint.line - 1 == line)

505528 {

506− let style =

529+ let unverified = match dbg_breakpoints {

530+ Some(_) => debugger_breakpoint.map(|b| !b.verified).unwrap_or(true),

531+ // We cannot mark breakpoint as unverified unless we have a debugger

532+ None => false,

533+ };

534+ let mut style =

507535 if breakpoint.condition.is_some() && breakpoint.log_message.is_some() {

508536 error.add_modifier(Modifier::UNDERLINED)

509537 } else if breakpoint.condition.is_some() {

@@ -513,7 +541,26 @@ impl EditorView {

513541 } else {

514542 warning

515543 };

544+ if unverified {

545+ // Faded colors

546+ style = if let Some(Color::Rgb(r, g, b)) = style.fg {

547+ style.fg(Color::Rgb(

548+ ((r as f32) * 0.4).floor() as u8,

549+ ((g as f32) * 0.4).floor() as u8,

550+ ((b as f32) * 0.4).floor() as u8,

551+ ))

552+ } else {

553+ style.fg(Color::Gray)

554+ }

555+ };

516556 surface.set_stringn(viewport.x, viewport.y + i as u16, "▲", 1, style);

557+ } else if let Some(breakpoint) = debugger_breakpoint {

558+ let style = if breakpoint.verified {

559+ info

560+ } else {

561+ info.fg(Color::Gray)

562+ };

563+ surface.set_stringn(viewport.x, viewport.y + i as u16, "⊚", 1, style);

517564 }

518565 }

519566

@@ -563,7 +610,7 @@ impl EditorView {

563610 viewport: Rect,

564611 surface: &mut Surface,

565612 theme: &Theme,

566− all_breakpoints: &HashMap<PathBuf, Vec<helix_dap::SourceBreakpoint>>,

613+ all_breakpoints: &HashMap<PathBuf, Vec<SourceBreakpoint>>,

567614 ) {

568615 use helix_core::diagnostic::Severity;

569616 use tui::{

@@ -602,8 +649,8 @@ impl EditorView {

602649 }

603650

604651 if let Some(path) = doc.path() {

652+ let line = doc.text().char_to_line(cursor);

605653 if let Some(breakpoints) = all_breakpoints.get(path) {

606− let line = doc.text().char_to_line(cursor);

607654 if let Some(breakpoint) = breakpoints

608655 .iter()

609656 .find(|breakpoint| breakpoint.line - 1 == line)

@@ -1272,6 +1319,7 @@ impl Component for EditorView {

12721319 for (view, is_focused) in cx.editor.tree.views() {

12731320 let doc = cx.editor.document(view.doc).unwrap();

12741321 let loader = &cx.editor.syn_loader;

1322+ let dbg_breakpoints = cx.editor.debugger.as_ref().map(|d| d.breakpoints.clone());

12751323 self.render_view(

12761324 doc,

12771325 view,

@@ -1283,6 +1331,7 @@ impl Component for EditorView {

12831331 &cx.editor.config,

12841332 &cx.editor.debugger,

12851333 &cx.editor.breakpoints,

1334+ &dbg_breakpoints,

12861335 );

12871336 }

12881337