Skip to content

Commit 26847d4

Browse files
filipdutescufilipdutescu
committed
feat(debug): highlight current line
Add new theme highlight keys, for setting the colour of the breakpoint character and the current line at which execution has been paused at. The two new keys are `ui.highlight.frameline` and `ui.debug.breakpoint`. Highlight according to those keys, both the line at which debugging is paused at and the breakpoint indicator. Add an indicator for the current line at which execution is paused at, themed by the `ui.debug.active` theme scope. Update various themes to showcase how the new functionality works. Better icons are dependent on #2869, and as such will be handled in the future, once it lands. Closes: #5952 Signed-off-by: Filip Dutescu <[email protected]>
1 parent 44729fb commit 26847d4

File tree

16 files changed

+190
-121
lines changed

16 files changed

+190
-121
lines changed

‎book/src/themes.md

Lines changed: 56 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -247,59 +247,62 @@ These scopes are used for theming the editor interface.
247247
- `hover` - for hover popup ui
248248

249249

250-
| Key | Notes |
251-
| --- | --- |
252-
| `ui.background` | |
253-
| `ui.background.separator` | Picker separator below input line |
254-
| `ui.cursor` | |
255-
| `ui.cursor.normal` | |
256-
| `ui.cursor.insert` | |
257-
| `ui.cursor.select` | |
258-
| `ui.cursor.match` | Matching bracket etc. |
259-
| `ui.cursor.primary` | Cursor with primary selection |
260-
| `ui.cursor.primary.normal` | |
261-
| `ui.cursor.primary.insert` | |
262-
| `ui.cursor.primary.select` | |
263-
| `ui.gutter` | Gutter |
264-
| `ui.gutter.selected` | Gutter for the line the cursor is on |
265-
| `ui.linenr` | Line numbers |
266-
| `ui.linenr.selected` | Line number for the line the cursor is on |
267-
| `ui.statusline` | Statusline |
268-
| `ui.statusline.inactive` | Statusline (unfocused document) |
269-
| `ui.statusline.normal` | Statusline mode during normal mode ([only if `editor.color-modes` is enabled][editor-section]) |
270-
| `ui.statusline.insert` | Statusline mode during insert mode ([only if `editor.color-modes` is enabled][editor-section]) |
271-
| `ui.statusline.select` | Statusline mode during select mode ([only if `editor.color-modes` is enabled][editor-section]) |
272-
| `ui.statusline.separator` | Separator character in statusline |
273-
| `ui.popup` | Documentation popups (e.g Space + k) |
274-
| `ui.popup.info` | Prompt for multiple key options |
275-
| `ui.window` | Border lines separating splits |
276-
| `ui.help` | Description box for commands |
277-
| `ui.text` | Command prompts, popup text, etc. |
278-
| `ui.text.focus` | |
279-
| `ui.text.inactive` | Same as `ui.text` but when the text is inactive (e.g. suggestions) |
280-
| `ui.text.info` | The key: command text in `ui.popup.info` boxes |
281-
| `ui.virtual.ruler` | Ruler columns (see the [`editor.rulers` config][editor-section]) |
282-
| `ui.virtual.whitespace` | Visible whitespace characters |
283-
| `ui.virtual.indent-guide` | Vertical indent width guides |
284-
| `ui.virtual.wrap` | Soft-wrap indicator (see the [`editor.soft-wrap` config][editor-section]) |
285-
| `ui.menu` | Code and command completion menus |
286-
| `ui.menu.selected` | Selected autocomplete item |
287-
| `ui.menu.scroll` | `fg` sets thumb color, `bg` sets track color of scrollbar |
288-
| `ui.selection` | For selections in the editing area |
289-
| `ui.selection.primary` | |
290-
| `ui.cursorline.primary` | The line of the primary cursor ([if cursorline is enabled][editor-section]) |
291-
| `ui.cursorline.secondary` | The lines of any other cursors ([if cursorline is enabled][editor-section]) |
292-
| `ui.cursorcolumn.primary` | The column of the primary cursor ([if cursorcolumn is enabled][editor-section]) |
293-
| `ui.cursorcolumn.secondary` | The columns of any other cursors ([if cursorcolumn is enabled][editor-section]) |
294-
| `warning` | Diagnostics warning (gutter) |
295-
| `error` | Diagnostics error (gutter) |
296-
| `info` | Diagnostics info (gutter) |
297-
| `hint` | Diagnostics hint (gutter) |
298-
| `diagnostic` | Diagnostics fallback style (editing area) |
299-
| `diagnostic.hint` | Diagnostics hint (editing area) |
300-
| `diagnostic.info` | Diagnostics info (editing area) |
301-
| `diagnostic.warning` | Diagnostics warning (editing area) |
302-
| `diagnostic.error` | Diagnostics error (editing area) |
250+
| Key | Notes |
251+
| --- | --- |
252+
| `ui.background` | |
253+
| `ui.background.separator` | Picker separator below input line |
254+
| `ui.cursor` | |
255+
| `ui.cursor.normal` | |
256+
| `ui.cursor.insert` | |
257+
| `ui.cursor.select` | |
258+
| `ui.cursor.match` | Matching bracket etc. |
259+
| `ui.cursor.primary` | Cursor with primary selection |
260+
| `ui.cursor.primary.normal` | |
261+
| `ui.cursor.primary.insert` | |
262+
| `ui.cursor.primary.select` | |
263+
| `ui.debug.breakpoint` | Color of the breakpoint indicator, found in the gutter |
264+
| `ui.debug.active` | Color of the indicator for the line at which debugging execution is paused at, found in the gutter |
265+
| `ui.gutter` | Gutter |
266+
| `ui.gutter.selected` | Gutter for the line the cursor is on |
267+
| `ui.highlight.frameline` | Color on the line at which debugging execution is paused at |
268+
| `ui.linenr` | Line numbers |
269+
| `ui.linenr.selected` | Line number for the line the cursor is on |
270+
| `ui.statusline` | Statusline |
271+
| `ui.statusline.inactive` | Statusline (unfocused document) |
272+
| `ui.statusline.normal` | Statusline mode during normal mode ([only if `editor.color-modes` is enabled][editor-section]) |
273+
| `ui.statusline.insert` | Statusline mode during insert mode ([only if `editor.color-modes` is enabled][editor-section]) |
274+
| `ui.statusline.select` | Statusline mode during select mode ([only if `editor.color-modes` is enabled][editor-section]) |
275+
| `ui.statusline.separator` | Separator character in statusline |
276+
| `ui.popup` | Documentation popups (e.g Space + k) |
277+
| `ui.popup.info` | Prompt for multiple key options |
278+
| `ui.window` | Border lines separating splits |
279+
| `ui.help` | Description box for commands |
280+
| `ui.text` | Command prompts, popup text, etc. |
281+
| `ui.text.focus` | |
282+
| `ui.text.inactive` | Same as `ui.text` but when the text is inactive (e.g. suggestions) |
283+
| `ui.text.info` | The key: command text in `ui.popup.info` boxes |
284+
| `ui.virtual.ruler` | Ruler columns (see the [`editor.rulers` config][editor-section]) |
285+
| `ui.virtual.whitespace` | Visible whitespace characters |
286+
| `ui.virtual.indent-guide` | Vertical indent width guides |
287+
| `ui.virtual.wrap` | Soft-wrap indicator (see the [`editor.soft-wrap` config][editor-section]) |
288+
| `ui.menu` | Code and command completion menus |
289+
| `ui.menu.selected` | Selected autocomplete item |
290+
| `ui.menu.scroll` | `fg` sets thumb color, `bg` sets track color of scrollbar |
291+
| `ui.selection` | For selections in the editing area |
292+
| `ui.selection.primary` | |
293+
| `ui.cursorline.primary` | The line of the primary cursor ([if cursorline is enabled][editor-section]) |
294+
| `ui.cursorline.secondary` | The lines of any other cursors ([if cursorline is enabled][editor-section]) |
295+
| `ui.cursorcolumn.primary` | The column of the primary cursor ([if cursorcolumn is enabled][editor-section]) |
296+
| `ui.cursorcolumn.secondary` | The columns of any other cursors ([if cursorcolumn is enabled][editor-section]) |
297+
| `warning` | Diagnostics warning (gutter) |
298+
| `error` | Diagnostics error (gutter) |
299+
| `info` | Diagnostics info (gutter) |
300+
| `hint` | Diagnostics hint (gutter) |
301+
| `diagnostic` | Diagnostics fallback style (editing area) |
302+
| `diagnostic.hint` | Diagnostics hint (editing area) |
303+
| `diagnostic.info` | Diagnostics info (editing area) |
304+
| `diagnostic.warning` | Diagnostics warning (editing area) |
305+
| `diagnostic.error` | Diagnostics error (editing area) |
303306

304307
You can check compliance to spec with
305308

‎helix-dap/src/client.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,4 +495,14 @@ impl Client {
495495

496496
self.call::<requests::SetExceptionBreakpoints>(args)
497497
}
498+
499+
pub fn current_stack_frame(&self) -> Option<&StackFrame> {
500+
if let (Some(frame), Some(thread_id)) = (self.active_frame, self.thread_id) {
501+
self.stack_frames
502+
.get(&thread_id)
503+
.and_then(|bt| bt.get(frame))
504+
} else {
505+
None
506+
}
507+
}
498508
}

0 commit comments

Comments
 (0)