diff --git a/src/indent.rs b/src/indent.rs index 161bb83..c52b39d 100644 --- a/src/indent.rs +++ b/src/indent.rs @@ -67,7 +67,6 @@ fn get_diff(line: &str, pattern: &Pattern) -> i8 { fn get_back(line: &str, pattern: &Pattern) -> i8 { let mut back: i8 = 0; - // other environments get single indents if pattern.contains_env_end && line.contains(ENV_END) { // documents get no global indentation if line.contains(DOC_END) { @@ -79,25 +78,23 @@ fn get_back(line: &str, pattern: &Pattern) -> i8 { return 2; }; } - back += 1; + // other environments get single indents + back = 1; }; - // Dedent delimiters - // Check first whether there are any closing delimiters - if CLOSES.iter().any(|c| line.contains(*c)) { - let mut cumul: i8 = back; - for c in line.chars() { - cumul -= i8::from(OPENS.contains(&c)); - cumul += i8::from(CLOSES.contains(&c)); - back = max(cumul, back); - } - } - // deindent items to make the rest of item environment appear indented if pattern.contains_item && line.contains(ITEM) { back += 1; }; + // Dedent delimiters + let mut cumul: i8 = back; + for c in line.chars() { + cumul -= i8::from(OPENS.contains(&c)); + cumul += i8::from(CLOSES.contains(&c)); + back = max(cumul, back); + } + back }