oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add initial inline diagnostics support (#25297)

Browse Source 
https://github.com/user-attachments/assets/eb881707-e575-47ef-9ae0-67d8085d8065

Closes https://github.com/zed-industries/zed/pull/22668
Closes https://github.com/zed-industries/zed/issues/4901

Takes https://github.com/zed-industries/zed/pull/22668 and fixes all
review items on top.
Inline diagnostics are disabled by default, but can be enabled via
settings permanently, or temporarily toggled with the `editor:
ToggleInlineDiagnostics` action and the corresponding editor menu item
<img width="242" alt="image"
src="https://github.com/user-attachments/assets/8e177511-4626-4434-902b-d6aa4d3fafd0"
/>

Inline diagnostics does not show currently active diagnostics group, as
it gets inline into the editor too, inside the text.
Inline git blame takes precedence and is shown instead of the
diagnostics, edit predictions dim the diagnostics if located on the same
line.

One notable drawback of the implementation is the inability to wrap,
making inline diagnostics cut off the right side:


![image](https://github.com/user-attachments/assets/6e87268a-b51a-4a2b-8b8d-01d932c62fea)

(same as inline git blame and other elements to the right of the text)
Given that it's disabled by default and go to next/prev diagnostics will
show them better, seems fine to leave in the first iteration.


Release Notes:

- Added initial inline diagnostics support

---------

Co-authored-by: Paul J. Davis <paul.davis@tiledb.com>
Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
This commit is contained in:
Kirill Bulatov
2025-02-20 23:39:47 +00:00
committed by GitHub
co-authored by Paul J. Davis Danilo Leal
parent 74c581b9f4
commit 5ae93ce68d
11 changed files with 579 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/zed/src/zed/quick_action_bar.rs
+29
View File
@@ -91,6 +91,8 @@ impl Render for QuickActionBar {
selection_menu_enabled,
inlay_hints_enabled,
supports_inlay_hints,
inline_diagnostics_enabled,
supports_inline_diagnostics,
git_blame_inline_enabled,
show_git_blame_gutter,
auto_signature_help_enabled,
@@ -102,6 +104,8 @@ impl Render for QuickActionBar {
let editor = editor.read(cx);
let selection_menu_enabled = editor.selection_menu_enabled(cx);
let inlay_hints_enabled = editor.inlay_hints_enabled();
let show_inline_diagnostics = editor.show_inline_diagnostics();
let supports_inline_diagnostics = editor.inline_diagnostics_enabled();
let git_blame_inline_enabled = editor.git_blame_inline_enabled();
let show_git_blame_gutter = editor.show_git_blame_gutter();
let auto_signature_help_enabled = editor.auto_signature_help_enabled(cx);
@@ -112,6 +116,8 @@ impl Render for QuickActionBar {
selection_menu_enabled,
inlay_hints_enabled,
supports_inlay_hints,
show_inline_diagnostics,
supports_inline_diagnostics,
git_blame_inline_enabled,
show_git_blame_gutter,
auto_signature_help_enabled,
@@ -257,6 +263,29 @@ impl Render for QuickActionBar {
);
}
if supports_inline_diagnostics {
menu = menu.toggleable_entry(
"Inline Diagnostics",
inline_diagnostics_enabled,
IconPosition::Start,
Some(editor::actions::ToggleInlineDiagnostics.boxed_clone()),
{
let editor = editor.clone();
move |window, cx| {
editor
.update(cx, |editor, cx| {
editor.toggle_inline_diagnostics(
&editor::actions::ToggleInlineDiagnostics,
window,
cx,
);
})
.ok();
}
},
);
}
menu = menu.toggleable_entry(
"Selection Menu",
selection_menu_enabled,