Fix a bug where indentation_context stack's size is not decreasing

src/analyzer.rs

@@ -115,7 +115,7 @@ impl<'tree> Traversable<'tree> for Analyzer {
         let mut writer_queue = VecDeque::new();
         let mut pending_queue = VecDeque::new();
         let mut nodes_queue = VecDeque::from(nodes);
-        let mut indentation_context = VecDeque::new();
+        let mut indentation_context: VecDeque<Node> = VecDeque::new();
         let indent_comment_pool = self.get_indent_comment_pool();
 
         for (i, line) in self.source_code.lines().enumerate() {
@@ -157,19 +157,19 @@ impl<'tree> Traversable<'tree> for Analyzer {
                         pop_node = true;
                     }
 
-                    if nested_traversable_symbols.contains(&node_type) {
-                        indentation_context.push_back(*current_node);
-                        pop_node = true;
-                    }
-
                     if !indentation_context.is_empty() {
-                        if let Some(current_context) = indentation_context.front() {
-                            if cursor_position == current_context.end_position() {
-                                indentation_context.pop_front();
+                        if let Some(current_context) = indentation_context.back() {
+                            if cursor_position.row >= current_context.end_position().row {
+                                indentation_context.pop_back();
                             }
                         }
                     }
 
+                    if nested_traversable_symbols.contains(&node_type) {
+                        indentation_context.push_back(*current_node);
+                        pop_node = true;
+                    }
+
                     if cursor_position == current_node.end_position() {
                         pop_node = true;
                     }
@@ -179,6 +179,13 @@ impl<'tree> Traversable<'tree> for Analyzer {
                     }
                 }
                 _ => {
+                    if !indentation_context.is_empty() {
+                        if let Some(current_context) = indentation_context.back() {
+                            if cursor_position.row >= current_context.end_position().row {
+                                indentation_context.pop_back();
+                            }
+                        }
+                    }
                     writer_queue.push_back(line.to_owned());
                 }
             }

tests/integration_test/rust_test.rs

@@ -3,3 +3,6 @@ mod anyhow_case_test;
 
 #[cfg(test)]
 mod rustpython_case_test;
+
+#[cfg(test)]
+mod serde_case_test;

tests/integration_test/rust_test/serde_case_test.rs

@@ -0,0 +1,54 @@
+#[cfg(test)]
+mod serde_case_test {
+    use indoc::indoc;
+    use crate::integration_test::assert_analyzed_source_code;
+
+    #[test]
+    fn test_several_impl_declaration() {
+        let source_code = indoc! {"
+        impl PartialEq<Symbol> for Ident {
+            fn eq(&self, word: &Symbol) -> bool {
+                self == word.0
+            }
+        }
+
+        impl<'a> PartialEq<Symbol> for &'a Ident {
+            fn eq(&self, word: &Symbol) -> bool {
+                *self == word.0
+            }
+        }
+
+        impl PartialEq<Symbol> for Path {
+            fn eq(&self, word: &Symbol) -> bool {
+                self.is_ident(word.0)
+            }
+        }"};
+
+        let result = indoc! {"
+        /// [TODO]
+        impl PartialEq<Symbol> for Ident {
+            /// [TODO]
+            fn eq(&self, word: &Symbol) -> bool {
+                self == word.0
+            }
+        }
+
+        /// [TODO]
+        impl<'a> PartialEq<Symbol> for &'a Ident {
+            /// [TODO]
+            fn eq(&self, word: &Symbol) -> bool {
+                *self == word.0
+            }
+        }
+
+        /// [TODO]
+        impl PartialEq<Symbol> for Path {
+            /// [TODO]
+            fn eq(&self, word: &Symbol) -> bool {
+                self.is_ident(word.0)
+            }
+        }"};
+
+        assert_analyzed_source_code(source_code, result, "rust")
+    }
+}