From b02d6d98ce92824198f44caa687d4f40b9cb76a1 Mon Sep 17 00:00:00 2001
From: s0LA1337 <dream@neoncity.dev>
Date: Thu, 6 Oct 2022 18:00:33 +0000
Subject: [PATCH 1/4] Add get_rainbow method, added a todo for rainbow

---
 helix-term/src/ui/editor.rs | 3 +--
 helix-view/src/editor.rs    | 2 ++
 helix-view/src/theme.rs     | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 1431bef2..02b240a9 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -442,8 +442,7 @@ impl EditorView {
 
             for i in starting_indent..(indent_level / tab_width as u16) {
                 let style = if config.indent_guides.rainbow {
-                    let color_index = i as usize % theme.rainbow_length();
-                    indent_guide_style.patch(theme.get(&format!("rainbow.{}", color_index)))
+                    indent_guide_style.patch(theme.get_rainbow(i as usize))
                 } else {
                     indent_guide_style
                 };
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 5acbc5b7..2f4909f6 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -533,6 +533,8 @@ impl Default for WhitespaceCharacters {
 pub struct IndentGuidesConfig {
     pub render: bool,
     pub character: char,
+
+    // TODO: Make enum to also support background rainbow for indent guides
     pub rainbow: bool,
 }
 
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index 8472ec64..87ad1e69 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -213,6 +213,10 @@ impl Theme {
         self.rainbow_length
     }
 
+    pub fn get_rainbow(&self, index: usize) -> Style {
+        self.highlights[index % self.rainbow_length]
+    }
+
     pub fn default_rainbow() -> Vec<Style> {
         vec![
             Style::default().fg(Color::Red),

From 136487fcdeba4d5dbe5a36218da32824497d6005 Mon Sep 17 00:00:00 2001
From: s0LA1337 <dream@neoncity.dev>
Date: Sat, 8 Oct 2022 01:05:21 +0000
Subject: [PATCH 2/4] Merge master to colored-indent-guides

---
 helix-view/src/theme.rs | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index 640affd4..514d7839 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -185,8 +185,8 @@ pub struct Theme {
     styles: HashMap<String, Style>,
     // tree-sitter highlight styles are stored in a Vec to optimize lookups
     scopes: Vec<String>,
-    highlights: Vec<Style>,
     rainbow_length: usize,
+    highlights: Vec<Style>,
 }
 
 impl From<Value> for Theme {
@@ -194,11 +194,12 @@ impl From<Value> for Theme {
         let values: Result<HashMap<String, Value>> =
             toml::from_str(&value.to_string()).context("Failed to load theme");
 
-        let (styles, scopes, highlights) = build_theme_values(values);
+        let (styles, scopes, rainbow_length, highlights) = build_theme_values(values);
 
         Self {
             styles,
             scopes,
+            rainbow_length,
             highlights,
         }
     }
@@ -266,18 +267,19 @@ impl<'de> Deserialize<'de> for Theme {
         Ok(Self {
             styles,
             scopes,
-            highlights,
             rainbow_length,
+            highlights,
         })
     }
 }
 
 fn build_theme_values(
     values: Result<HashMap<String, Value>>,
-) -> (HashMap<String, Style>, Vec<String>, Vec<Style>) {
+) -> (HashMap<String, Style>, Vec<String>, usize, Vec<Style>) {
     let mut styles = HashMap::new();
     let mut scopes = Vec::new();
     let mut highlights = Vec::new();
+    let mut rainbow_length = 0;
 
     if let Ok(mut colors) = values {
         // TODO: alert user of parsing failures in editor
@@ -295,6 +297,27 @@ fn build_theme_values(
         styles.reserve(colors.len());
         scopes.reserve(colors.len());
         highlights.reserve(colors.len());
+
+        for (i, style) in colors
+            .remove("rainbow")
+            .and_then(|value| match palette.parse_style_array(value) {
+                Ok(styles) => Some(styles),
+                Err(err) => {
+                    warn!("{}", err);
+                    None
+                }
+            })
+            .unwrap_or_else(Theme::default_rainbow)
+            .iter()
+            .enumerate()
+        {
+            let name = format!("rainbow.{}", i);
+            styles.insert(name.clone(), *style);
+            scopes.push(name);
+            highlights.push(*style);
+            rainbow_length += 1;
+        }
+
         for (name, style_value) in colors {
             let mut style = Style::default();
             if let Err(err) = palette.parse_style(&mut style, style_value) {
@@ -308,7 +331,7 @@ fn build_theme_values(
         }
     }
 
-    (styles, scopes, highlights)
+    (styles, scopes, rainbow_length, highlights)
 }
 
 impl Theme {

From 52db599f2bd169d0c23902d970eba87c34238bf3 Mon Sep 17 00:00:00 2001
From: SoraTenshi <dream@neoncity.dev>
Date: Sun, 23 Oct 2022 18:52:22 +0000
Subject: [PATCH 3/4] Add style for rainbow ig, dimming, normal and none

---
 book/src/configuration.md   | 14 +++++++-------
 helix-term/src/ui/editor.rs | 14 +++++++++++---
 helix-view/src/editor.rs    | 13 ++++++++++---
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/book/src/configuration.md b/book/src/configuration.md
index 63279403..3fd1bd17 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -237,12 +237,12 @@ tabpad = "·" # Tabs will look like "→···" (depending on tab width)
 
 Options for rendering vertical indent guides.
 
-| Key         | Description                                                  | Default |
-| ---         | ---                                                          | ---     |
-| `render`    | Whether to render indent guides.                             | `false` |
-| `character` | Literal character to use for rendering the indent guide      | `│`     |
-| `rainbow`   | Whether or not the indent guides shall have changing colors. | `false` |
-| `skip-levels` | Number of indent levels to skip                            | `0`     |
+| Key           | Description                                                                                     | Default |
+| ---           | ---                                                                                             | ---     |
+| `render`      | Whether to render indent guides.                                                                | `false` |
+| `character`   | Literal character to use for rendering the indent guide                                         | `│`     |
+| `rainbow`     | Whether or not the indent guides shall have changing colors. It can be `none`, `dim` or `normal`| `none`  |
+| `skip-levels` | Number of indent levels to skip                                                                 | `0`     |
 
 Example:
 
@@ -250,6 +250,6 @@ Example:
 [editor.indent-guides]
 render = true
 character = "╎"
-rainbow = true
+rainbow = "normal"
 skip-levels = 1
 ```
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 1826d173..ebc00c5b 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -17,7 +17,7 @@ use helix_core::{
 };
 use helix_view::{
     document::{Mode, SCRATCH_BUFFER_NAME},
-    editor::{CompleteAction, CursorShapeConfig},
+    editor::{CompleteAction, CursorShapeConfig, RainbowIndentOptions},
     graphics::{Color, CursorKind, Modifier, Rect, Style},
     input::{KeyEvent, MouseButton, MouseEvent, MouseEventKind},
     keyboard::{KeyCode, KeyModifiers},
@@ -443,9 +443,17 @@ impl EditorView {
             // TODO: limit to a max indent level too. It doesn't cause visual artifacts but it would avoid some
             // extra loops if the code is deeply nested.
 
+            let modifier = if config.indent_guides.rainbow == RainbowIndentOptions::Dim {
+                Modifier::DIM
+            } else {
+                Modifier::empty()
+            };
+
             for i in starting_indent..(indent_level / tab_width as u16) {
-                let style = if config.indent_guides.rainbow {
-                    indent_guide_style.patch(theme.get_rainbow(i as usize))
+                let style = if config.indent_guides.rainbow != RainbowIndentOptions::None {
+                    indent_guide_style
+                        .patch(theme.get_rainbow(i as usize))
+                        .add_modifier(modifier)
                 } else {
                     indent_guide_style
                 };
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index bdf2be88..cbaa7d10 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -551,13 +551,20 @@ impl Default for WhitespaceCharacters {
     }
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case")]
+pub enum RainbowIndentOptions {
+    None,
+    Dim,
+    Normal,
+}
+
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(default, rename_all = "kebab-case")]
 pub struct IndentGuidesConfig {
     pub render: bool,
     pub character: char,
-    // TODO: Make enum to also support background rainbow for indent guides
-    pub rainbow: bool,
+    pub rainbow: RainbowIndentOptions,
     pub skip_levels: u16,
 }
 
@@ -567,7 +574,7 @@ impl Default for IndentGuidesConfig {
             skip_levels: 0,
             render: false,
             character: '│',
-            rainbow: false,
+            rainbow: RainbowIndentOptions::None,
         }
     }
 }

From bb48889200189ba19d6dc7bc9e9e72dc61e3b941 Mon Sep 17 00:00:00 2001
From: SoraTenshi <dream@neoncity.dev>
Date: Thu, 27 Oct 2022 22:19:53 +0000
Subject: [PATCH 4/4] Resolve conflicts

---
 helix-term/src/ui/editor.rs | 6 +++---
 helix-view/src/editor.rs    | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index c76cab2a..9590dc23 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -25,7 +25,7 @@ use helix_view::{
     keyboard::{KeyCode, KeyModifiers},
     Document, Editor, Theme, View,
 };
-use std::{borrow::Cow, cmp::min, num::NonZeroUsize, path::PathBuf};
+use std::{borrow::Cow, num::NonZeroUsize, path::PathBuf};
 
 use tui::buffer::Buffer as Surface;
 
@@ -475,7 +475,7 @@ impl EditorView {
                 Modifier::empty()
             };
 
-            for i in starting_indent..(indent_level / tab_width as u16) {
+            for i in starting_indent..(indent_level / tab_width) {
                 let style = if config.indent_guides.rainbow != RainbowIndentOptions::None {
                     indent_guide_style
                         .patch(theme.get_rainbow(i as usize))
@@ -485,7 +485,7 @@ impl EditorView {
                 };
 
                 surface.set_string(
-                    viewport.x + (i * tab_width as u16) - offset.col as u16,
+                    viewport.x + (i as u16 * tab_width as u16) - offset.col as u16,
                     viewport.y + line,
                     &indent_guide_char,
                     style,
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 3903322a..30a9e4a9 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -571,7 +571,6 @@ pub struct IndentGuidesConfig {
     pub render: bool,
     pub character: char,
     pub rainbow: RainbowIndentOptions,
-    pub skip_levels: u16,
     pub skip_levels: u8,
 }