andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-23 01:46:18 +04:00
Code Issues Projects Releases Wiki Activity

Cosmetic changes and better comments for the indent auto-detect code.

Browse Source
This commit is contained in:
Nathan Vegdahl 2021-06-13 20:11:40 -07:00
parent 4faf1d3bf4
commit ecb39da3e0
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
helix-view/src/document.rs
View File

@ -284,8 +284,11 @@ fn detect_indent_style(&mut self) {
// Index 0 is for tabs, the rest are 1-8 spaces. // Index 0 is for tabs, the rest are 1-8 spaces.
let histogram: [usize; 9] = { let histogram: [usize; 9] = {
let mut histogram = [0; 9]; let mut histogram = [0; 9];
let mut prev_line_indent = (false, 0usize); // (was_tabs, count) let mut prev_line_is_tabs = false;
let mut prev_line_leading_count = 0usize;
// Loop through the lines, checking for and recording indentation
// increases as we go.
'outer: for line in self.text.lines().take(1000) { 'outer: for line in self.text.lines().take(1000) {
let mut c_iter = line.chars(); let mut c_iter = line.chars();
@ -295,21 +298,22 @@ fn detect_indent_style(&mut self) {
Some(' ') => false, Some(' ') => false,
// Ignore blank lines. // Ignore blank lines.
Some(c) if char_is_linebreak(c) => continue 'outer, Some(c) if char_is_linebreak(c) => continue,
_ => { _ => {
prev_line_indent = (false, 0usize); prev_line_is_tabs = false;
continue 'outer; prev_line_leading_count = 0;
continue;
} }
}; };
// Count the total leading tab/space characters. // Count the line's total leading tab/space characters.
let mut count = 1; let mut leading_count = 1;
let mut count_is_done = false; let mut count_is_done = false;
for c in c_iter { for c in c_iter {
match c { match c {
'\t' if is_tabs && !count_is_done => count += 1, '\t' if is_tabs && !count_is_done => leading_count += 1,
' ' if !is_tabs && !count_is_done => count += 1, ' ' if !is_tabs && !count_is_done => leading_count += 1,
// We stop counting if we hit whitespace that doesn't // We stop counting if we hit whitespace that doesn't
// qualify as indent or doesn't match the leading // qualify as indent or doesn't match the leading
@ -324,27 +328,30 @@ fn detect_indent_style(&mut self) {
} }
// Bound the worst-case execution time for weird text files. // Bound the worst-case execution time for weird text files.
if count > 256 { if leading_count > 256 {
continue 'outer; continue 'outer;
} }
} }
// Update stats. // If there was an increase in indentation over the previous
if (prev_line_indent.0 == is_tabs || prev_line_indent.1 == 0) // line, update the histogram with that increase.
&& prev_line_indent.1 < count if (prev_line_is_tabs == is_tabs || prev_line_leading_count == 0)
&& prev_line_leading_count < leading_count
{ {
if is_tabs { if is_tabs {
histogram[0] += 1; histogram[0] += 1;
} else { } else {
let amount = count - prev_line_indent.1; let amount = leading_count - prev_line_leading_count;
if amount <= 8 { if amount <= 8 {
histogram[amount] += 1; histogram[amount] += 1;
} }
} }
} }
// Store data for use with the next line. // Store this line's leading whitespace info for use with
prev_line_indent = (is_tabs, count); // the next line.
prev_line_is_tabs = is_tabs;
prev_line_leading_count = leading_count;
} }
// Give more weight to tabs, because their presence is a very // Give more weight to tabs, because their presence is a very