Show error and warning indicators in project panel items

assets/settings/default.json

@@ -359,7 +359,11 @@
       ///
       /// Default: always
       "show": "always"
-    }
+    },
+    /// Which files containing diagnostic errors/warnings to mark in the project panel.
+    ///
+    /// Default: "errors"
+    "show_diagnostics": "errors"
   },
   "outline_panel": {
     // Whether to show the outline panel button in the status bar

crates/editor/src/items.rs

@@ -18,6 +18,7 @@ use gpui::{
 use language::{
     proto::serialize_anchor as serialize_text_anchor, Bias, Buffer, CharKind, Point, SelectionGoal,
 };
+use lsp::DiagnosticSeverity;
 use multi_buffer::AnchorRangeExt;
 use project::{
     lsp_store::FormatTrigger, project_settings::ProjectSettings, search::SearchQuery, Item as _,
@@ -1481,6 +1482,43 @@ pub fn entry_label_color(selected: bool) -> Color {
     }
 }
 
+pub fn entry_diagnostic_and_git_aware_extra_icon_name(
+    diagnostic_severity: Option<&DiagnosticSeverity>,
+    git_status: Option<GitFileStatus>,
+    ignored: bool,
+) -> Option<IconName> {
+    if let Some(diagnostic_severity) = diagnostic_severity {
+        if *diagnostic_severity == DiagnosticSeverity::ERROR {
+            return Some(IconName::XCircle);
+        }
+        if *diagnostic_severity == DiagnosticSeverity::WARNING {
+            return Some(IconName::Warning);
+        }
+    }
+    if !ignored && git_status.is_some() {
+        Some(IconName::Dot)
+    } else {
+        None
+    }
+}
+
+pub fn entry_diagnostic_and_git_aware_label_color(
+    diagnostic_severity: Option<&DiagnosticSeverity>,
+    git_status: Option<GitFileStatus>,
+    ignored: bool,
+    selected: bool,
+) -> Color {
+    if let Some(diagnostic_severity) = diagnostic_severity {
+        if *diagnostic_severity == DiagnosticSeverity::ERROR {
+            return Color::Error;
+        }
+        if *diagnostic_severity == DiagnosticSeverity::WARNING {
+            return Color::Warning;
+        }
+    }
+    entry_git_aware_label_color(git_status, ignored, selected)
+}
+
 pub fn entry_git_aware_label_color(
     git_status: Option<GitFileStatus>,
     ignored: bool,

crates/project_panel/Cargo.toml

@@ -36,6 +36,7 @@ util.workspace = true
 client.workspace = true
 worktree.workspace = true
 workspace.workspace = true
+language.workspace = true
 
 [dev-dependencies]
 client = { workspace = true, features = ["test-support"] }

crates/project_panel/src/project_panel.rs

@@ -1,12 +1,15 @@
 mod project_panel_settings;
 mod scrollbar;
 use client::{ErrorCode, ErrorExt};
+use language::DiagnosticSeverity;
 use scrollbar::ProjectPanelScrollbar;
 use settings::{Settings, SettingsStore};
 
 use db::kvp::KEY_VALUE_STORE;
 use editor::{
-    items::entry_git_aware_label_color,
+    items::{
+        entry_diagnostic_and_git_aware_extra_icon_name, entry_diagnostic_and_git_aware_label_color,
+    },
     scroll::{Autoscroll, ScrollbarAutoHide},
     Editor,
 };
@@ -29,7 +32,9 @@ use project::{
     relativize_path, Entry, EntryKind, Fs, Project, ProjectEntryId, ProjectPath, Worktree,
     WorktreeId,
 };
-use project_panel_settings::{ProjectPanelDockPosition, ProjectPanelSettings, ShowScrollbar};
+use project_panel_settings::{
+    ProjectPanelDockPosition, ProjectPanelSettings, ShowDiagnostics, ShowScrollbar,
+};
 use serde::{Deserialize, Serialize};
 use std::{
     cell::{Cell, OnceCell},
@@ -82,6 +87,7 @@ pub struct ProjectPanel {
     show_scrollbar: bool,
     scrollbar_drag_thumb_offset: Rc<Cell<Option<f32>>>,
     hide_scrollbar_task: Option<Task<()>>,
+    diagnostics: HashMap<(WorktreeId, PathBuf), DiagnosticSeverity>,
 }
 
 #[derive(Clone, Debug)]
@@ -113,6 +119,8 @@ struct EntryDetails {
     is_editing: bool,
     is_processing: bool,
     is_cut: bool,
+    filename_text_color: Color,
+    extra_icon_name: Option<IconName>,
     git_status: Option<GitFileStatus>,
     is_private: bool,
     worktree_id: WorktreeId,
@@ -237,6 +245,14 @@ impl ProjectPanel {
                 project::Event::ActivateProjectPanel => {
                     cx.emit(PanelEvent::Activate);
                 }
+                project::Event::DiskBasedDiagnosticsFinished { .. }
+                | project::Event::DiagnosticsUpdated { .. } => {
+                    if ProjectPanelSettings::get_global(cx).show_diagnostics != ShowDiagnostics::Off
+                    {
+                        this.update_diagnostics(cx);
+                        cx.notify();
+                    }
+                }
                 project::Event::WorktreeRemoved(id) => {
                     this.expanded_dir_ids.remove(id);
                     this.update_visible_entries(None, cx);
@@ -279,9 +295,16 @@ impl ProjectPanel {
             .detach();
 
             let mut project_panel_settings = *ProjectPanelSettings::get_global(cx);
-            cx.observe_global::<SettingsStore>(move |_, cx| {
+            cx.observe_global::<SettingsStore>(move |this, cx| {
                 let new_settings = *ProjectPanelSettings::get_global(cx);
                 if project_panel_settings != new_settings {
+                    if new_settings.show_diagnostics != project_panel_settings.show_diagnostics {
+                        if new_settings.show_diagnostics != ShowDiagnostics::Off {
+                            this.update_diagnostics(cx);
+                        } else {
+                            this.diagnostics = Default::default();
+                        }
+                    }
                     project_panel_settings = new_settings;
                     cx.notify();
                 }
@@ -312,6 +335,7 @@ impl ProjectPanel {
                 show_scrollbar: !Self::should_autohide_scrollbar(cx),
                 hide_scrollbar_task: None,
                 scrollbar_drag_thumb_offset: Default::default(),
+                diagnostics: Default::default(),
             };
             this.update_visible_entries(None, cx);
 
@@ -433,6 +457,56 @@ impl ProjectPanel {
         })
     }
 
+    fn update_diagnostics(&mut self, cx: &mut ViewContext<Self>) {
+        let show_warnings =
+            ProjectPanelSettings::get_global(cx).show_diagnostics == ShowDiagnostics::All;
+        self.diagnostics = Default::default();
+        self.project
+            .read(cx)
+            .diagnostic_summaries(false, cx)
+            .filter_map(|(path, _, diagnostic_summary)| {
+                if diagnostic_summary.error_count > 0 {
+                    Some((path, DiagnosticSeverity::ERROR))
+                } else if show_warnings && diagnostic_summary.warning_count > 0 {
+                    Some((path, DiagnosticSeverity::WARNING))
+                } else {
+                    None
+                }
+            })
+            .for_each(|(project_path, diagnostic_severity)| {
+                let mut path_buffer = PathBuf::new();
+                self.update_highest_diagnostic_severity(
+                    &project_path,
+                    path_buffer.clone(),
+                    diagnostic_severity,
+                );
+
+                for component in project_path.path.components() {
+                    path_buffer.push(component);
+                    self.update_highest_diagnostic_severity(
+                        &project_path,
+                        path_buffer.clone(),
+                        diagnostic_severity,
+                    );
+                }
+            });
+    }
+
+    fn update_highest_diagnostic_severity(
+        &mut self,
+        project_path: &ProjectPath,
+        path_buffer: PathBuf,
+        diagnostic_severity: DiagnosticSeverity,
+    ) {
+        self.diagnostics
+            .entry((project_path.worktree_id, path_buffer.clone()))
+            .and_modify(|strongest_diagnostic_severity| {
+                *strongest_diagnostic_severity =
+                    std::cmp::min(*strongest_diagnostic_severity, diagnostic_severity);
+            })
+            .or_insert(diagnostic_severity);
+    }
+
     fn serialize(&mut self, cx: &mut ViewContext<Self>) {
         let width = self.width;
         self.pending_serialization = cx.background_executor().spawn(
@@ -2027,12 +2101,13 @@ impl ProjectPanel {
             }
 
             let end_ix = range.end.min(ix + visible_worktree_entries.len());
-            let (git_status_setting, show_file_icons, show_folder_icons) = {
+            let (git_status_setting, show_file_icons, show_folder_icons, show_diagnostics) = {
                 let settings = ProjectPanelSettings::get_global(cx);
                 (
                     settings.git_status,
                     settings.file_icons,
                     settings.folder_icons,
+                    settings.show_diagnostics != ShowDiagnostics::Off,
                 )
             };
             if let Some(worktree) = self.project.read(cx).worktree_for_id(*worktree_id, cx) {
@@ -2093,6 +2168,29 @@ impl ProjectPanel {
                         worktree_id: snapshot.id(),
                         entry_id: entry.id,
                     };
+
+                    let is_marked = self.marked_entries.contains(&selection);
+
+                    let diagnostic_severity = if show_diagnostics {
+                        self.diagnostics
+                            .get(&(*worktree_id, entry.path.to_path_buf()))
+                    } else {
+                        None
+                    };
+
+                    let filename_text_color = entry_diagnostic_and_git_aware_label_color(
+                        diagnostic_severity,
+                        status,
+                        entry.is_ignored,
+                        is_marked,
+                    );
+
+                    let extra_icon_name = entry_diagnostic_and_git_aware_extra_icon_name(
+                        diagnostic_severity,
+                        status,
+                        entry.is_ignored,
+                    );
+
                     let mut details = EntryDetails {
                         filename,
                         icon,
@@ -2102,13 +2200,15 @@ impl ProjectPanel {
                         is_ignored: entry.is_ignored,
                         is_expanded,
                         is_selected: self.selection == Some(selection),
-                        is_marked: self.marked_entries.contains(&selection),
+                        is_marked,
                         is_editing: false,
                         is_processing: false,
                         is_cut: self
                             .clipboard
                             .as_ref()
                             .map_or(false, |e| e.is_cut() && e.items().contains(&selection)),
+                        filename_text_color,
+                        extra_icon_name,
                         git_status: status,
                         is_private: entry.is_private,
                         worktree_id: *worktree_id,
@@ -2198,8 +2298,7 @@ impl ProjectPanel {
             .selection
             .map_or(false, |selection| selection.entry_id == entry_id);
         let width = self.size(cx);
-        let filename_text_color =
-            entry_git_aware_label_color(details.git_status, details.is_ignored, is_marked);
+        let filename_text_color = details.filename_text_color;
         let file_name = details.filename.clone();
         let mut icon = details.icon.clone();
         if settings.file_icons && show_editor && details.kind.is_file() {
@@ -2223,6 +2322,8 @@ impl ProjectPanel {
             active_selection: selection,
             marked_selections: selections,
         };
+        let extra_icon_name = details.extra_icon_name;
+
         div()
             .id(entry_id.to_proto() as usize)
             .on_drag_move::<ExternalPaths>(cx.listener(
@@ -2399,6 +2500,15 @@ impl ProjectPanel {
                         }
                         .ml_1(),
                     )
+                    .child(if let Some(icon_name) = extra_icon_name {
+                        h_flex().size(IconSize::default().rems()).child(
+                            Icon::new(icon_name)
+                                .size(IconSize::XSmall)
+                                .color(filename_text_color),
+                        )
+                    } else {
+                        div()
+                    })
                     .on_click(cx.listener(move |this, event: &gpui::ClickEvent, cx| {
                         if event.down.button == MouseButton::Right || event.down.first_mouse {
                             return;

crates/project_panel/src/project_panel_settings.rs

@@ -22,6 +22,7 @@ pub struct ProjectPanelSettings {
     pub auto_reveal_entries: bool,
     pub auto_fold_dirs: bool,
     pub scrollbar: ScrollbarSettings,
+    pub show_diagnostics: ShowDiagnostics,
 }
 
 /// When to show the scrollbar in the project panel.
@@ -53,6 +54,21 @@ pub struct ScrollbarSettingsContent {
     pub show: Option<ShowScrollbar>,
 }
 
+/// Which files containing diagnostic errors/warnings to mark in the project panel.
+///
+/// Default: errors
+#[derive(Copy, Clone, Debug, Default, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
+#[serde(rename_all = "snake_case")]
+pub enum ShowDiagnostics {
+    /// Never mark the diagnostic errors/warnings in the project panel.
+    Off,
+    /// Mark files containing diagnostic errors or warnings in the project panel.
+    All,
+    #[default]
+    /// Mark files containing diagnostic errors in the project panel.
+    Errors,
+}
+
 #[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
 pub struct ProjectPanelSettingsContent {
     /// Whether to show the project panel button in the status bar.
@@ -96,6 +112,10 @@ pub struct ProjectPanelSettingsContent {
     pub auto_fold_dirs: Option<bool>,
     /// Scrollbar-related settings
     pub scrollbar: Option<ScrollbarSettingsContent>,
+    /// Which files containing diagnostic errors/warnings to mark in the project panel.
+    ///
+    /// Default: errors
+    pub show_diagnostics: Option<ShowDiagnostics>,
 }
 
 impl Settings for ProjectPanelSettings {

crates/ui/src/components/icon.rs

@@ -170,6 +170,7 @@ pub enum IconName {
     DatabaseZap,
     Delete,
     Disconnected,
+    Dot,
     Download,
     Ellipsis,
     EllipsisVertical,

crates/ui/src/styles/color.rs

@@ -2,7 +2,7 @@ use gpui::{Hsla, WindowContext};
 use theme::ActiveTheme;
 
 /// Sets a color that has a consistent meaning across all themes.
-#[derive(Debug, Default, PartialEq, Copy, Clone)]
+#[derive(Debug, Default, Eq, PartialEq, Copy, Clone)]
 pub enum Color {
     #[default]
     Default,