Automatic keep adjusting indent size

When too few lines keep adjusting indent size
This commit is contained in:
Francesco Abbate 2021-02-19 11:51:49 +01:00
parent ef24828307
commit 2a0846b604
2 changed files with 18 additions and 8 deletions

View File

@ -119,6 +119,8 @@ function StatusView:get_items()
self.separator, self.separator,
string.format("%d%%", line / #dv.doc.lines * 100), string.format("%d%%", line / #dv.doc.lines * 100),
}, { }, {
style.text, "spaces: ", tostring(dv.doc.indent_spaces),
style.dim, self.separator2, style.text,
style.icon_font, "g", style.icon_font, "g",
style.font, style.dim, self.separator2, style.text, style.font, style.dim, self.separator2, style.text,
#dv.doc.lines, " lines", #dv.doc.lines, " lines",

View File

@ -91,19 +91,27 @@ local function detect_indent_stat(doc)
table.sort(stat, function(a, b) return a[1] < b[1] end) table.sort(stat, function(a, b) return a[1] < b[1] end)
local indent, score = optimal_indent_from_stat(stat) local indent, score = optimal_indent_from_stat(stat)
if tab_count > score then if tab_count > score then
core.log_quiet("Detect-indent: using tabs indentation") return "hard", nil, tab_count
return "hard" else
elseif indent then return "soft", indent or config.indent_size, score or 0
core.log_quiet("Detect-indent: using indentation size of %d", indent)
return "soft", indent
end end
end end
local doc_text_input = Doc.text_input
local adjust_threshold = 5
local function update_cache(doc) local function update_cache(doc)
local type, size = detect_indent_stat(doc) local type, size, score = detect_indent_stat(doc)
if type then
cache[doc] = { type = type, size = size } cache[doc] = { type = type, size = size }
doc.indent_spaces = (type == "hard" and "tab" or size) .. (score < adjust_threshold and "*" or "")
if score < adjust_threshold and Doc.text_input == doc_text_input then
Doc.text_input = function(self, ...)
doc_text_input(self, ...)
update_cache(self)
end
elseif score >= adjust_threshold and Doc.text_input ~= doc_text_input then
Doc.text_input = doc_text_input
end end
end end