From e17719d4e9e93df5185b41459e59b473e99480e4 Mon Sep 17 00:00:00 2001
From: Gaurav Tyagi <grvtyagi22@gmail.com>
Date: Wed, 2 Nov 2022 21:09:20 +0530
Subject: [PATCH 1/7] add global error and warnings on status line

---
 helix-term/src/ui/statusline.rs | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index b0e8ec5d2546..bdae5eb8c5e4 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -1,4 +1,5 @@
 use helix_core::{coords_at_pos, encoding, Position};
+use helix_lsp::lsp::DiagnosticSeverity;
 use helix_view::{
     document::{Mode, SCRATCH_BUFFER_NAME},
     graphics::Rect,
@@ -223,13 +224,28 @@ where
             counts
         });
 
+    let (g_warnings, g_errors) =
+        context
+            .editor
+            .diagnostics
+            .values()
+            .flatten()
+            .fold((0, 0), |mut counts, diag| {
+                match diag.severity {
+                    Some(DiagnosticSeverity::WARNING) => counts.0 += 1,
+                    Some(DiagnosticSeverity::ERROR) | None => counts.1 += 1,
+                    _ => {}
+                }
+                counts
+            });
+
     if warnings > 0 {
         write(
             context,
             "●".to_string(),
             Some(context.editor.theme.get("warning")),
         );
-        write(context, format!(" {} ", warnings), None);
+        write(context, format!(" {}/{} ", warnings, g_warnings), None);
     }
 
     if errors > 0 {
@@ -238,7 +254,7 @@ where
             "●".to_string(),
             Some(context.editor.theme.get("error")),
         );
-        write(context, format!(" {} ", errors), None);
+        write(context, format!(" {}/{} ", errors, g_errors), None);
     }
 }
 

From 7d06af842432a30fe9da3bb93bd49627eb3fbe9b Mon Sep 17 00:00:00 2001
From: Gaurav Tyagi <grvtyagi22@gmail.com>
Date: Thu, 3 Nov 2022 21:07:22 +0530
Subject: [PATCH 2/7] seprate dignostic count func to editor and docs and add
 config for workspace statusline diagnostic

---
 helix-term/src/ui/statusline.rs | 62 ++++++++++++++++-----------------
 helix-view/src/document.rs      | 13 +++++++
 helix-view/src/editor.rs        | 20 ++++++++++-
 3 files changed, 63 insertions(+), 32 deletions(-)

diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index bdae5eb8c5e4..f4df46542082 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -1,5 +1,4 @@
 use helix_core::{coords_at_pos, encoding, Position};
-use helix_lsp::lsp::DiagnosticSeverity;
 use helix_view::{
     document::{Mode, SCRATCH_BUFFER_NAME},
     graphics::Rect,
@@ -142,6 +141,7 @@ where
         helix_view::editor::StatusLineElement::FileLineEnding => render_file_line_ending,
         helix_view::editor::StatusLineElement::FileType => render_file_type,
         helix_view::editor::StatusLineElement::Diagnostics => render_diagnostics,
+        helix_view::editor::StatusLineElement::WorkspaceDiagnostics => render_workspace_diagnostics,
         helix_view::editor::StatusLineElement::Selections => render_selections,
         helix_view::editor::StatusLineElement::Position => render_position,
         helix_view::editor::StatusLineElement::PositionPercentage => render_position_percentage,
@@ -210,34 +210,7 @@ fn render_diagnostics<F>(context: &mut RenderContext, write: F)
 where
     F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
 {
-    let (warnings, errors) = context
-        .doc
-        .diagnostics()
-        .iter()
-        .fold((0, 0), |mut counts, diag| {
-            use helix_core::diagnostic::Severity;
-            match diag.severity {
-                Some(Severity::Warning) => counts.0 += 1,
-                Some(Severity::Error) | None => counts.1 += 1,
-                _ => {}
-            }
-            counts
-        });
-
-    let (g_warnings, g_errors) =
-        context
-            .editor
-            .diagnostics
-            .values()
-            .flatten()
-            .fold((0, 0), |mut counts, diag| {
-                match diag.severity {
-                    Some(DiagnosticSeverity::WARNING) => counts.0 += 1,
-                    Some(DiagnosticSeverity::ERROR) | None => counts.1 += 1,
-                    _ => {}
-                }
-                counts
-            });
+    let (warnings, errors) = context.doc.diagnostics_count();
 
     if warnings > 0 {
         write(
@@ -245,7 +218,7 @@ where
             "●".to_string(),
             Some(context.editor.theme.get("warning")),
         );
-        write(context, format!(" {}/{} ", warnings, g_warnings), None);
+        write(context, format!(" {} ", warnings), None);
     }
 
     if errors > 0 {
@@ -254,7 +227,34 @@ where
             "●".to_string(),
             Some(context.editor.theme.get("error")),
         );
-        write(context, format!(" {}/{} ", errors, g_errors), None);
+        write(context, format!(" {} ", errors), None);
+    }
+}
+
+fn render_workspace_diagnostics<F>(context: &mut RenderContext, write: F)
+where
+    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
+{
+    let (warnings, errors) = context.doc.diagnostics_count();
+
+    let (w_warnings, w_errors) = context.editor.workspace_diagnostic_count();
+
+    if warnings > 0 || w_warnings > 0 {
+        write(
+            context,
+            "●".to_string(),
+            Some(context.editor.theme.get("warning")),
+        );
+        write(context, format!(" {}/{} ", warnings, w_warnings), None);
+    }
+
+    if errors > 0 || w_errors > 0 {
+        write(
+            context,
+            "●".to_string(),
+            Some(context.editor.theme.get("error")),
+        );
+        write(context, format!(" {}/{} ", errors, w_errors), None);
     }
 }
 
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 9a7febd2def2..01cda484abde 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -1131,6 +1131,19 @@ impl Document {
             .sort_unstable_by_key(|diagnostic| diagnostic.range);
     }
 
+    /// Gets the count pair (warnings, error) of warnings, error on document.
+    pub fn diagnostics_count(&self) -> (i32, i32) {
+        self.diagnostics().iter().fold((0, 0), |mut counts, diag| {
+            use helix_core::diagnostic::Severity;
+            match diag.severity {
+                Some(Severity::Warning) => counts.0 += 1,
+                Some(Severity::Error) | None => counts.1 += 1,
+                _ => {}
+            }
+            counts
+        })
+    }
+
     /// Get the document's auto pairs. If the document has a recognized
     /// language config with auto pairs configured, returns that;
     /// otherwise, falls back to the global auto pairs config. If the global
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index af69ceeae19a..eab7cb9e631c 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -12,7 +12,7 @@ use crate::{
 
 use futures_util::stream::select_all::SelectAll;
 use futures_util::{future, StreamExt};
-use helix_lsp::Call;
+use helix_lsp::{lsp::DiagnosticSeverity, Call};
 use tokio_stream::wrappers::UnboundedReceiverStream;
 
 use std::{
@@ -325,6 +325,9 @@ pub enum StatusLineElement {
     /// A summary of the number of errors and warnings
     Diagnostics,
 
+    /// A summary of the number of errors and warnings on workspace
+    WorkspaceDiagnostics,
+
     /// The number of selections (cursors)
     Selections,
 
@@ -1259,6 +1262,21 @@ impl Editor {
         self.tree.is_empty()
     }
 
+    /// Gets the count pair (warnings, error) of warnings, error on workspace.
+    pub fn workspace_diagnostic_count(&self) -> (i32, i32) {
+        self.diagnostics
+            .values()
+            .flatten()
+            .fold((0, 0), |mut counts, diag| {
+                match diag.severity {
+                    Some(DiagnosticSeverity::WARNING) => counts.0 += 1,
+                    Some(DiagnosticSeverity::ERROR) | None => counts.1 += 1,
+                    _ => {}
+                }
+                counts
+            })
+    }
+
     pub fn ensure_cursor_in_view(&mut self, id: ViewId) {
         let config = self.config();
         let view = self.tree.get_mut(id);

From d1db76cb17bcbeb04a9c7c859995facfc7e63e0a Mon Sep 17 00:00:00 2001
From: Gaurav Tyagi <grvtyagi22@gmail.com>
Date: Thu, 3 Nov 2022 21:19:43 +0530
Subject: [PATCH 3/7] add configurations docs

---
 book/src/configuration.md | 1 +
 helix-view/src/editor.rs  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 9f3fe2fa95bd..4b579aa1c7bf 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -102,6 +102,7 @@ The following statusline elements can be configured:
 | `total-line-numbers` | The total line numbers of the opened file |
 | `file-type` | The type of the opened file |
 | `diagnostics` | The number of warnings and/or errors |
+| `workspace-diagnostics` | The number of warnings and/or errors on file and workspace (ex: file-error-count/workspace-error-count) |
 | `selections` | The number of active selections |
 | `position` | The cursor position |
 | `position-percentage` | The cursor position as a percentage of the total number of lines |
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index eab7cb9e631c..06f0badae27b 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -325,7 +325,7 @@ pub enum StatusLineElement {
     /// A summary of the number of errors and warnings
     Diagnostics,
 
-    /// A summary of the number of errors and warnings on workspace
+    /// A summary of the number of errors and warnings on file and workspace
     WorkspaceDiagnostics,
 
     /// The number of selections (cursors)

From c83dc331642ac34df640ef96b79cfc6849422f5e Mon Sep 17 00:00:00 2001
From: Gaurav Tyagi <grvtyagi22@gmail.com>
Date: Sun, 6 Nov 2022 10:34:08 +0530
Subject: [PATCH 4/7] move siagnostic count funcs to statusline itself

---
 helix-term/src/ui/statusline.rs | 36 ++++++++++++++++++++++++++++++---
 helix-view/src/document.rs      | 13 ------------
 helix-view/src/editor.rs        | 17 +---------------
 3 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index f4df46542082..082f28e2fe93 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -1,4 +1,5 @@
 use helix_core::{coords_at_pos, encoding, Position};
+use helix_lsp::lsp::DiagnosticSeverity;
 use helix_view::{
     document::{Mode, SCRATCH_BUFFER_NAME},
     graphics::Rect,
@@ -206,11 +207,40 @@ where
     );
 }
 
+/// Gets the count pair (warnings, error) of warnings, error on document.
+fn diagnostics_count(doc: &Document) -> (i32, i32) {
+    doc.diagnostics().iter().fold((0, 0), |mut counts, diag| {
+        use helix_core::diagnostic::Severity;
+        match diag.severity {
+            Some(Severity::Warning) => counts.0 += 1,
+            Some(Severity::Error) | None => counts.1 += 1,
+            _ => {}
+        }
+        counts
+    })
+}
+
+/// Gets the count pair (warnings, error) of warnings, error on workspace.
+fn workspace_diagnostic_count(editor: &Editor) -> (i32, i32) {
+    editor
+        .diagnostics
+        .values()
+        .flatten()
+        .fold((0, 0), |mut counts, diag| {
+            match diag.severity {
+                Some(DiagnosticSeverity::WARNING) => counts.0 += 1,
+                Some(DiagnosticSeverity::ERROR) | None => counts.1 += 1,
+                _ => {}
+            }
+            counts
+        })
+}
+
 fn render_diagnostics<F>(context: &mut RenderContext, write: F)
 where
     F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
 {
-    let (warnings, errors) = context.doc.diagnostics_count();
+    let (warnings, errors) = diagnostics_count(context.doc);
 
     if warnings > 0 {
         write(
@@ -235,9 +265,9 @@ fn render_workspace_diagnostics<F>(context: &mut RenderContext, write: F)
 where
     F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
 {
-    let (warnings, errors) = context.doc.diagnostics_count();
+    let (warnings, errors) = diagnostics_count(context.doc);
 
-    let (w_warnings, w_errors) = context.editor.workspace_diagnostic_count();
+    let (w_warnings, w_errors) = workspace_diagnostic_count(context.editor);
 
     if warnings > 0 || w_warnings > 0 {
         write(
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 01cda484abde..9a7febd2def2 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -1131,19 +1131,6 @@ impl Document {
             .sort_unstable_by_key(|diagnostic| diagnostic.range);
     }
 
-    /// Gets the count pair (warnings, error) of warnings, error on document.
-    pub fn diagnostics_count(&self) -> (i32, i32) {
-        self.diagnostics().iter().fold((0, 0), |mut counts, diag| {
-            use helix_core::diagnostic::Severity;
-            match diag.severity {
-                Some(Severity::Warning) => counts.0 += 1,
-                Some(Severity::Error) | None => counts.1 += 1,
-                _ => {}
-            }
-            counts
-        })
-    }
-
     /// Get the document's auto pairs. If the document has a recognized
     /// language config with auto pairs configured, returns that;
     /// otherwise, falls back to the global auto pairs config. If the global
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 06f0badae27b..5b962fcae1a1 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -12,7 +12,7 @@ use crate::{
 
 use futures_util::stream::select_all::SelectAll;
 use futures_util::{future, StreamExt};
-use helix_lsp::{lsp::DiagnosticSeverity, Call};
+use helix_lsp::Call;
 use tokio_stream::wrappers::UnboundedReceiverStream;
 
 use std::{
@@ -1262,21 +1262,6 @@ impl Editor {
         self.tree.is_empty()
     }
 
-    /// Gets the count pair (warnings, error) of warnings, error on workspace.
-    pub fn workspace_diagnostic_count(&self) -> (i32, i32) {
-        self.diagnostics
-            .values()
-            .flatten()
-            .fold((0, 0), |mut counts, diag| {
-                match diag.severity {
-                    Some(DiagnosticSeverity::WARNING) => counts.0 += 1,
-                    Some(DiagnosticSeverity::ERROR) | None => counts.1 += 1,
-                    _ => {}
-                }
-                counts
-            })
-    }
-
     pub fn ensure_cursor_in_view(&mut self, id: ViewId) {
         let config = self.config();
         let view = self.tree.get_mut(id);

From 8459f816b9e5bdfa6061edaf655b00c553975152 Mon Sep 17 00:00:00 2001
From: Gaurav Tyagi <grvtyagi22@gmail.com>
Date: Sun, 13 Nov 2022 10:02:13 +0530
Subject: [PATCH 5/7] updates to workspace only contains workspace diagnostics

---
 helix-term/src/ui/statusline.rs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index 082f28e2fe93..5050dd1a5ce3 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -265,26 +265,28 @@ fn render_workspace_diagnostics<F>(context: &mut RenderContext, write: F)
 where
     F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
 {
-    let (warnings, errors) = diagnostics_count(context.doc);
-
     let (w_warnings, w_errors) = workspace_diagnostic_count(context.editor);
 
-    if warnings > 0 || w_warnings > 0 {
+    if w_warnings > 0 || w_errors > 0 {
+        write(context, format!(" {} ", "W"), None);
+    }
+
+    if w_warnings > 0 {
         write(
             context,
             "●".to_string(),
             Some(context.editor.theme.get("warning")),
         );
-        write(context, format!(" {}/{} ", warnings, w_warnings), None);
+        write(context, format!(" {} ", w_warnings), None);
     }
 
-    if errors > 0 || w_errors > 0 {
+    if w_errors > 0 {
         write(
             context,
             "●".to_string(),
             Some(context.editor.theme.get("error")),
         );
-        write(context, format!(" {}/{} ", errors, w_errors), None);
+        write(context, format!(" {} ", w_errors), None);
     }
 }
 

From 32044fea0cb319de75844f3fd0a7057adde6d81d Mon Sep 17 00:00:00 2001
From: Gaurav Tyagi <grvtyagi22@gmail.com>
Date: Sun, 13 Nov 2022 10:05:41 +0530
Subject: [PATCH 6/7] update the book docs

---
 book/src/configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 4b579aa1c7bf..9e9c04fa1cab 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -102,7 +102,7 @@ The following statusline elements can be configured:
 | `total-line-numbers` | The total line numbers of the opened file |
 | `file-type` | The type of the opened file |
 | `diagnostics` | The number of warnings and/or errors |
-| `workspace-diagnostics` | The number of warnings and/or errors on file and workspace (ex: file-error-count/workspace-error-count) |
+| `workspace-diagnostics` | The number of warnings and/or errors on workspace |
 | `selections` | The number of active selections |
 | `position` | The cursor position |
 | `position-percentage` | The cursor position as a percentage of the total number of lines |

From 1f0e5763f1bee788e8c3dc92652b75f748c4c89e Mon Sep 17 00:00:00 2001
From: Gaurav Tyagi <grvtyagi22@gmail.com>
Date: Mon, 14 Nov 2022 18:19:26 +0530
Subject: [PATCH 7/7] inline count function

---
 helix-term/src/ui/statusline.rs | 66 ++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 35 deletions(-)

diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index 5050dd1a5ce3..b79846fa2277 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs
@@ -207,40 +207,23 @@ where
     );
 }
 
-/// Gets the count pair (warnings, error) of warnings, error on document.
-fn diagnostics_count(doc: &Document) -> (i32, i32) {
-    doc.diagnostics().iter().fold((0, 0), |mut counts, diag| {
-        use helix_core::diagnostic::Severity;
-        match diag.severity {
-            Some(Severity::Warning) => counts.0 += 1,
-            Some(Severity::Error) | None => counts.1 += 1,
-            _ => {}
-        }
-        counts
-    })
-}
-
-/// Gets the count pair (warnings, error) of warnings, error on workspace.
-fn workspace_diagnostic_count(editor: &Editor) -> (i32, i32) {
-    editor
-        .diagnostics
-        .values()
-        .flatten()
+fn render_diagnostics<F>(context: &mut RenderContext, write: F)
+where
+    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
+{
+    let (warnings, errors) = context
+        .doc
+        .diagnostics()
+        .iter()
         .fold((0, 0), |mut counts, diag| {
+            use helix_core::diagnostic::Severity;
             match diag.severity {
-                Some(DiagnosticSeverity::WARNING) => counts.0 += 1,
-                Some(DiagnosticSeverity::ERROR) | None => counts.1 += 1,
+                Some(Severity::Warning) => counts.0 += 1,
+                Some(Severity::Error) | None => counts.1 += 1,
                 _ => {}
             }
             counts
-        })
-}
-
-fn render_diagnostics<F>(context: &mut RenderContext, write: F)
-where
-    F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
-{
-    let (warnings, errors) = diagnostics_count(context.doc);
+        });
 
     if warnings > 0 {
         write(
@@ -265,28 +248,41 @@ fn render_workspace_diagnostics<F>(context: &mut RenderContext, write: F)
 where
     F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
 {
-    let (w_warnings, w_errors) = workspace_diagnostic_count(context.editor);
+    let (warnings, errors) =
+        context
+            .editor
+            .diagnostics
+            .values()
+            .flatten()
+            .fold((0, 0), |mut counts, diag| {
+                match diag.severity {
+                    Some(DiagnosticSeverity::WARNING) => counts.0 += 1,
+                    Some(DiagnosticSeverity::ERROR) | None => counts.1 += 1,
+                    _ => {}
+                }
+                counts
+            });
 
-    if w_warnings > 0 || w_errors > 0 {
+    if warnings > 0 || errors > 0 {
         write(context, format!(" {} ", "W"), None);
     }
 
-    if w_warnings > 0 {
+    if warnings > 0 {
         write(
             context,
             "●".to_string(),
             Some(context.editor.theme.get("warning")),
         );
-        write(context, format!(" {} ", w_warnings), None);
+        write(context, format!(" {} ", warnings), None);
     }
 
-    if w_errors > 0 {
+    if errors > 0 {
         write(
             context,
             "●".to_string(),
             Some(context.editor.theme.get("error")),
         );
-        write(context, format!(" {} ", w_errors), None);
+        write(context, format!(" {} ", errors), None);
     }
 }