suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dap: Stop comparing file paths per line number

pull/574/head
Blaž Hrastnik 2021-08-30 11:22:26 +09:00
parent 2c7b75475f
commit 0b0b1d850a
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helix-term/src/application.rs
View File

@ -1,4 +1,4 @@
use helix_core::{merge_toml_values, syntax, Selection}; use helix_core::{merge_toml_values, syntax};
use helix_dap::Payload; use helix_dap::Payload;
use helix_lsp::{lsp, util::lsp_pos_to_pos, LspProgressMap}; use helix_lsp::{lsp, util::lsp_pos_to_pos, LspProgressMap};
use helix_view::{theme, Editor}; use helix_view::{theme, Editor};

31
helix-term/src/ui/editor.rs
View File

@ -452,9 +452,19 @@ impl EditorView {
if let Some(path) = doc.path() { if let Some(path) = doc.path() {
breakpoints = debugger.breakpoints.get(path); breakpoints = debugger.breakpoints.get(path);
// if we have a frame, and the frame path matches document
if let (Some(frame), Some(thread_id)) = (debugger.active_frame, debugger.thread_id) if let (Some(frame), Some(thread_id)) = (debugger.active_frame, debugger.thread_id)
{ {
stack_frame = debugger.stack_frames[&thread_id].get(frame); // TODO: drop the clone.. let frame = debugger.stack_frames[&thread_id].get(frame); // TODO: drop the clone..
if let Some(StackFrame {
source: Some(source),
..
}) = &frame
{
if source.path.as_ref() == Some(path) {
stack_frame = frame;
}
};
}; };
} }
} }
@ -493,19 +503,12 @@ impl EditorView {
} }
if let Some(frame) = stack_frame { if let Some(frame) = stack_frame {
if let Some(src) = &frame.source { if frame.line - 1 == line {
if doc surface.set_style(
.path() Rect::new(viewport.x, viewport.y + i as u16, 6, 1),
.map(|path| src.path.as_ref() == Some(path)) helix_view::graphics::Style::default()
.unwrap_or(false) .bg(helix_view::graphics::Color::LightYellow),
&& frame.line - 1 == line );
{
surface.set_style(
Rect::new(viewport.x, viewport.y + i as u16, 6, 1),
helix_view::graphics::Style::default()
.bg(helix_view::graphics::Color::LightYellow),
);
}
} }
} }