walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 14 Wiki Activity

Fix indent spaces/tabs labeling

This commit is contained in:
Francesco Abbate 2021-02-20 22:56:52 +01:00
parent 22c9628def
commit 5e0dee3e18
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/core/statusview.lua
View File

@ -105,6 +105,9 @@ function StatusView:get_items()
local dv = core.active_view local dv = core.active_view
local line, col = dv.doc:get_selection() local line, col = dv.doc:get_selection()
local dirty = dv.doc:is_dirty() 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 { return {
dirty and style.accent or style.text, style.icon_font, "f", dirty and style.accent or style.text, style.icon_font, "f",
@ -119,7 +122,7 @@ 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.text, indent_label, indent_size,
style.dim, self.separator2, style.text, 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,

8
data/plugins/detectindent.lua
View File

@ -91,7 +91,7 @@ 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
return "hard", nil, tab_count return "hard", config.indent_size, tab_count
else else
return "soft", indent or config.indent_size, score or 0 return "soft", indent or config.indent_size, score or 0
end end
@ -99,12 +99,12 @@ end
local doc_text_input = Doc.text_input local doc_text_input = Doc.text_input
local adjust_threshold = 5 local adjust_threshold = 4
local function update_cache(doc) local function update_cache(doc)
local type, size, score = detect_indent_stat(doc) local type, size, score = detect_indent_stat(doc)
cache[doc] = { type = type, size = size } cache[doc] = { type = type, size = size, confirmed = (score >= adjust_threshold) }
doc.indent_spaces = (type == "hard" and "tab" or size) .. (score < adjust_threshold and "*" or "") doc.indent_info = cache[doc]
if score < adjust_threshold and Doc.text_input == doc_text_input then if score < adjust_threshold and Doc.text_input == doc_text_input then
Doc.text_input = function(self, ...) Doc.text_input = function(self, ...)
doc_text_input(self, ...) doc_text_input(self, ...)