Fix chunk support

Author: lionel-

crates/ark/src/lsp/folding_range.rs

@@ -362,7 +362,7 @@ fn cell_processor(
     line_idx: usize,
     line_text: &str,
 ) {
-    let cell_pattern: Regex = Regex::new(r"^#\s*(%%|\+)(.*)").unwrap();
+    let cell_pattern: Regex = Regex::new(r"^#+( %%|\+) (.*)").unwrap();
 
     if !cell_pattern.is_match(line_text) {
     } else {
@@ -468,6 +468,7 @@ mod tests {
 
     #[test]
     fn test_folding_section_comments_basic() {
+        // Note the chunks are nested in comment sections
         insta::assert_debug_snapshot!(test_folding_range(
             "
 # First section ----
@@ -476,7 +477,16 @@ b
 
 # Second section ----
 c
-d"
+d
+
+# %% Chunk section (jupyter-style)
+e
+f
+
+#+ Chunk section (knitr-style)
+g
+# + This is not a chunk
+h"
         ));
     }
 
@@ -497,7 +507,13 @@ c
 d
 
 # Back to Level 1 ----
-e"
+e
+
+# %% Chunk at Level 1
+f
+
+## %% Another chunk at Level 1
+g"
         ));
     }
 

crates/ark/src/lsp/snapshots/ark__lsp__folding_range__tests__folding_empty_sections.snap

@@ -1,6 +1,6 @@
 ---
 source: crates/ark/src/lsp/folding_range.rs
-expression: "test_folding_range(\"\n# Empty section ----\n\n# Another empty section ----\n\n# Section with content ----\nThis one has content\")"
+expression: "test_folding_range(\"\n# Empty section ----\n\n# Another empty section ----\n\n# Section with content ----\na\")"
 ---
 [
     FoldingRange {

crates/ark/src/lsp/snapshots/ark__lsp__folding_range__tests__folding_nested_section_comments.snap

@@ -1,6 +1,6 @@
 ---
 source: crates/ark/src/lsp/folding_range.rs
-expression: "test_folding_range(\"\n# Level 1 ----\ncode at level 1\n\n## Level 2 ----\ncode at level 2\n\n### Level 3 ----\ncode at level 3\n\n## Another Level 2 ----\nback to level 2\n\n# Back to Level 1 ----\nback to level 1\")"
+expression: "test_folding_range(\"\n# Level 1 ----\na\n\n## Level 2 ----\nb\n\n### Level 3 ----\nc\n\n## Another Level 2 ----\nd\n\n# Back to Level 1 ----\ne\n\n# %% Chunk at Level 1\nf\n\n## %% Another chunk at Level 1\ng\")"
 ---
 [
     FoldingRange {
@@ -46,7 +46,27 @@ expression: "test_folding_range(\"\n# Level 1 ----\ncode at level 1\n\n## Level
     FoldingRange {
         start_line: 13,
         start_character: None,
-        end_line: 13,
+        end_line: 19,
+        end_character: None,
+        kind: Some(
+            Region,
+        ),
+        collapsed_text: None,
+    },
+    FoldingRange {
+        start_line: 16,
+        start_character: None,
+        end_line: 18,
+        end_character: None,
+        kind: Some(
+            Region,
+        ),
+        collapsed_text: None,
+    },
+    FoldingRange {
+        start_line: 19,
+        start_character: None,
+        end_line: 20,
         end_character: None,
         kind: Some(
             Region,

crates/ark/src/lsp/snapshots/ark__lsp__folding_range__tests__folding_section_comments_basic.snap

@@ -1,6 +1,6 @@
 ---
 source: crates/ark/src/lsp/folding_range.rs
-expression: "test_folding_range(\"\n# First section ----\nsome code here\nmore code\n\n# Second section ----\nother code\nfinal line\")"
+expression: "test_folding_range(\"\n# First section ----\na\nb\n\n# Second section ----\nc\nd\n\n# %% Chunk section (jupyter-style)\ne\nf\n\n#+ Chunk section (knitr-style)\ng\n# + This is not a chunk\nh\")"
 ---
 [
     FoldingRange {
@@ -16,7 +16,27 @@ expression: "test_folding_range(\"\n# First section ----\nsome code here\nmore c
     FoldingRange {
         start_line: 5,
         start_character: None,
-        end_line: 6,
+        end_line: 15,
+        end_character: None,
+        kind: Some(
+            Region,
+        ),
+        collapsed_text: None,
+    },
+    FoldingRange {
+        start_line: 9,
+        start_character: None,
+        end_line: 12,
+        end_character: None,
+        kind: Some(
+            Region,
+        ),
+        collapsed_text: None,
+    },
+    FoldingRange {
+        start_line: 13,
+        start_character: None,
+        end_line: 16,
         end_character: None,
         kind: Some(
             Region,