Bugfix: Indent line guides not rendering correctly (onivim#354)

* Get per-buffer indentation settings * Fix * Remove logging
abunav6 · Jun 25, 2019 · 6391365 · 6391365
1 parent 1543e99
commit 6391365
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/editor/Store/IndentationStoreConnector.re b/src/editor/Store/IndentationStoreConnector.re
@@ -51,14 +51,20 @@ let start = () => {
                   defaultInsertSpaces,
                 );
 
-              IndentationSettings.create(
-                ~mode=guess.mode,
-                ~size=guess.size,
-                ~tabSize=
+              let size =
+                switch (guess.mode) {
+                | Tabs =>
                   Configuration.getValue(
                     c => c.editorTabSize,
                     state.configuration,
-                  ),
+                  )
+                | Spaces => guess.size
+                };
+
+              IndentationSettings.create(
+                ~mode=guess.mode,
+                ~size,
+                ~tabSize=size,
                 (),
               );
             } else {

diff --git a/src/editor/UI/EditorSurface.re b/src/editor/UI/EditorSurface.re
@@ -212,7 +212,11 @@ let createElement =
     let fontWidth = state.editorFont.measuredWidth;
 
     let iFontHeight = int_of_float(fontHeight +. 0.5);
-    let indentation = IndentationSettings.default;
+    let indentation =
+      switch (Buffer.getIndentation(buffer)) {
+      | Some(v) => v
+      | None => IndentationSettings.default
+      };
 
     let topVisibleLine = Editor.getTopVisibleLine(editor, metrics);
     let bottomVisibleLine = Editor.getBottomVisibleLine(editor, metrics);