From b411cc7856696cb5ca62fa765bed5fc6afadfde0 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Fri, 15 Jul 2022 22:44:24 +0100
Subject: [PATCH] chore(editor): improve setup of indentation highlight guides

---
 modules/editor/siren-display-indentation.el | 5 ++++-
 modules/languages/siren-golang.el           | 1 -
 modules/major-modes/siren-prog-mode.el      | 5 ++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/editor/siren-display-indentation.el b/modules/editor/siren-display-indentation.el
index 3b6eee5..9877127 100644
--- a/modules/editor/siren-display-indentation.el
+++ b/modules/editor/siren-display-indentation.el
@@ -12,7 +12,10 @@
   "Activate or deactivate indentation guides.
 Optional ARG is passed directly to mode toggle function."
   (interactive)
-  (highlight-indent-guides-mode arg))
+  ;; Only allow indentation markers if file size is below 100KB. Above that
+  ;; performance is very bad.
+  (if (< (buffer-size) (* 100 1024))
+      (highlight-indent-guides-mode arg)))
 
 (provide 'siren-display-indentation)
 ;;; siren-display-indentation.el ends here
diff --git a/modules/languages/siren-golang.el b/modules/languages/siren-golang.el
index 7da4207..a5300a2 100644
--- a/modules/languages/siren-golang.el
+++ b/modules/languages/siren-golang.el
@@ -7,7 +7,6 @@
 ;;; Code:
 
 (require 'siren-dap)
-(require 'siren-display-indentation)
 (require 'siren-flycheck)
 (require 'siren-folding)
 (require 'siren-lsp)
diff --git a/modules/major-modes/siren-prog-mode.el b/modules/major-modes/siren-prog-mode.el
index e0da661..fc2d4e2 100644
--- a/modules/major-modes/siren-prog-mode.el
+++ b/modules/major-modes/siren-prog-mode.el
@@ -18,9 +18,8 @@
     "Default coding hook, useful with any programming language."
     (setq-local fill-column 80)
 
-    ;; Only show indentation if file size is below 100KB. It tends to cause a lot
-    ;; of lag and slowdowns on larger files, especially YAML files.
-    (if (< (buffer-size) (* 100 1024))
+    ;; Highlight indentation if we are not indenting with real tabs.
+    (if (not indent-tabs-mode)
         (siren-display-indentation 1))
 
     (hl-line-mode t)