Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add severity argument to GoToDiagnostic actions (#33995)

Browse source 
This PR adds a `severity` argument so severity can be defined when
navigating through diagnostics. This allows keybinds like the following:

```json
{
  "] e": ["editor::GoToDiagnostic", { "severity": "error" }],
  "[ e": ["editor::GoToDiagnostic", { "severity": "error" }]
}
```

I've added test comments and a test. Let me know if there's anything
else you need!

Release Notes:

- Add `severity` argument to `editor::GoToDiagnostic`,
`editor::GoToPreviousDiagnostic`, `project_panel::SelectNextDiagnostic`
and `project_panel::SelectPrevDiagnostic` actions
This commit is contained in:
Hilmar Wiegand 2025-07-15 16:03:57 +02:00 • committed by GitHub
parent 858e176a1c
commit 050ed85d71
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 312 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

33
crates/project_panel/src/project_panel.rs
View file

@ -33,6 +33,7 @@ use project::{
Entry, EntryKind, Fs, GitEntry, GitEntryRef, GitTraversal, Project, ProjectEntryId,
ProjectPath, Worktree, WorktreeId,
git_store::{GitStoreEvent, git_traversal::ChildEntriesGitIter},
project_settings::GoToDiagnosticSeverityFilter,
relativize_path,
};
use project_panel_settings::{
@ -206,6 +207,24 @@ struct Trash {
pub skip_prompt: bool,
}
/// Selects the next entry with diagnostics.
#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
#[action(namespace = project_panel)]
#[serde(deny_unknown_fields)]
struct SelectNextDiagnostic {
#[serde(default)]
pub severity: GoToDiagnosticSeverityFilter,
}
/// Selects the previous entry with diagnostics.
#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
#[action(namespace = project_panel)]
#[serde(deny_unknown_fields)]
struct SelectPrevDiagnostic {
#[serde(default)]
pub severity: GoToDiagnosticSeverityFilter,
}
actions!(
project_panel,
[
@ -255,10 +274,6 @@ actions!(
SelectNextGitEntry,
/// Selects the previous entry with git changes.
SelectPrevGitEntry,
/// Selects the next entry with diagnostics.
SelectNextDiagnostic,
/// Selects the previous entry with diagnostics.
SelectPrevDiagnostic,
/// Selects the next directory.
SelectNextDirectory,
/// Selects the previous directory.
@ -1954,7 +1969,7 @@ impl ProjectPanel {
fn select_prev_diagnostic(
&mut self,
_: &SelectPrevDiagnostic,
action: &SelectPrevDiagnostic,
_: &mut Window,
cx: &mut Context<Self>,
) {
@ -1973,7 +1988,8 @@ impl ProjectPanel {
&& entry.is_file()
&& self
.diagnostics
.contains_key(&(worktree_id, entry.path.to_path_buf()))
.get(&(worktree_id, entry.path.to_path_buf()))
.is_some_and(|severity| action.severity.matches(*severity))
},
cx,
);
@ -1989,7 +2005,7 @@ impl ProjectPanel {
fn select_next_diagnostic(
&mut self,
_: &SelectNextDiagnostic,
action: &SelectNextDiagnostic,
_: &mut Window,
cx: &mut Context<Self>,
) {
@ -2008,7 +2024,8 @@ impl ProjectPanel {
&& entry.is_file()
&& self
.diagnostics
.contains_key(&(worktree_id, entry.path.to_path_buf()))
.get(&(worktree_id, entry.path.to_path_buf()))
.is_some_and(|severity| action.severity.matches(*severity))
},
cx,
);