Fix nested ifs folding ranges

Author: davidhalter

crates/parsa_python_cst/src/lib.rs

@@ -386,7 +386,13 @@ impl Tree {
 
     pub fn folding_blocks<'x>(&'x self) -> impl Iterator<Item = (CodeIndex, CodeIndex)> {
         self.0.nodes().filter_map(|n| {
-            let end = || n.last_leaf_in_subtree().previous_leaf().unwrap().end() - 1;
+            let end = || {
+                let mut leaf = n.last_leaf_in_subtree();
+                while leaf.is_type(Terminal(TerminalType::Dedent)) {
+                    leaf = leaf.previous_leaf().unwrap();
+                }
+                leaf.end() - 1
+            };
             if n.is_type(Nonterminal(match_stmt)) {
                 return Some((n.nth_child(3).start(), end()));
             }

crates/zuban_python/tests/mypylike/tests/folding_ranges.test

@@ -103,7 +103,7 @@ def f(something, something_else) -> None:
 
 [out]
 __main__.py:2: Folding Ranges:
-- 3:41-18:0 Region
+- 3:41-17:17 Region
 - 5:8-6:11 Region
 - 8:26-11:11 Region
 - 12:31-13:11 Region
@@ -127,8 +127,8 @@ def f(something) -> None:
 [out]
 __main__.py:2: Folding Ranges:
 - 1:0-2:13 Imports
-- 4:25-13:8 Region
-- 5:20-13:8 Region
+- 4:25-12:21 Region
+- 5:20-12:21 Region
 - 6:27-7:15 Region
 - 8:20-9:15 Region
 - 11:17-12:21 Region
@@ -156,7 +156,7 @@ async def bar():
 
 [out]
 __main__.py:2: Folding Ranges:
-- 2:25-16:0 Region
+- 2:25-15:16 Region
 - 4:29-5:11 Region
 - 6:29-7:11 Region
 - 8:9-9:24 Region
@@ -179,3 +179,18 @@ x = 1
 [out]
 __main__.py:2: Folding Ranges:
 - 6:20-10:7 Region
+
+[case if_nested_folding_range]
+#? folding-ranges
+def f() -> None:
+    if bool():
+        if bool():
+            ...
+    else:
+        ...
+[out]
+__main__.py:2: Folding Ranges:
+- 2:16-7:11 Region
+- 3:14-5:15 Region
+- 4:18-5:15 Region
+- 6:9-7:11 Region