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] 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,
 }