From 5e0dee3e18ed65a6eff9ad099476a504989f6316 Mon Sep 17 00:00:00 2001
From: Francesco Abbate <francesco.bbt@gmail.com>
Date: Sat, 20 Feb 2021 22:56:52 +0100
Subject: [PATCH] Fix indent spaces/tabs labeling

---
 data/core/statusview.lua      | 5 ++++-
 data/plugins/detectindent.lua | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/data/core/statusview.lua b/data/core/statusview.lua
index e96c6fe1..7b21d941 100644
--- a/data/core/statusview.lua
+++ b/data/core/statusview.lua
@@ -105,6 +105,9 @@ function StatusView:get_items()
     local dv = core.active_view
     local line, col = dv.doc:get_selection()
     local dirty = dv.doc:is_dirty()
+    local indent = dv.doc.indent_info
+    local indent_label = indent.type == "hard" and "tabs: " or "spaces: "
+    local indent_size = tostring(indent.size) .. (indent.confirmed and "" or "*")
 
     return {
       dirty and style.accent or style.text, style.icon_font, "f",
@@ -119,7 +122,7 @@ function StatusView:get_items()
       self.separator,
       string.format("%d%%", line / #dv.doc.lines * 100),
     }, {
-      style.text, "spaces: ", tostring(dv.doc.indent_spaces),
+      style.text, indent_label, indent_size,
       style.dim, self.separator2, style.text,
       style.icon_font, "g",
       style.font, style.dim, self.separator2, style.text,
diff --git a/data/plugins/detectindent.lua b/data/plugins/detectindent.lua
index 250fba09..d323adb5 100644
--- a/data/plugins/detectindent.lua
+++ b/data/plugins/detectindent.lua
@@ -91,7 +91,7 @@ local function detect_indent_stat(doc)
   table.sort(stat, function(a, b) return a[1] < b[1] end)
   local indent, score = optimal_indent_from_stat(stat)
   if tab_count > score then
-    return "hard", nil, tab_count
+    return "hard", config.indent_size, tab_count
   else
     return "soft", indent or config.indent_size, score or 0
   end
@@ -99,12 +99,12 @@ end
 
 
 local doc_text_input = Doc.text_input
-local adjust_threshold = 5
+local adjust_threshold = 4
 
 local function update_cache(doc)
   local type, size, score = detect_indent_stat(doc)
-  cache[doc] = { type = type, size = size }
-  doc.indent_spaces = (type == "hard" and "tab" or size) .. (score < adjust_threshold and "*" or "")
+  cache[doc] = { type = type, size = size, confirmed = (score >= adjust_threshold) }
+  doc.indent_info = cache[doc]
   if score < adjust_threshold and Doc.text_input == doc_text_input then
     Doc.text_input = function(self, ...)
       doc_text_input(self, ...)