Fix regression in region detection (#857)

Author: lionel-

crates/ark/src/lsp/folding_range.rs

@@ -282,8 +282,9 @@ fn region_processor(
 }
 
 fn parse_region_type(line_text: &str) -> Option<RegionType> {
-    let region_start = Regex::new(r"^\s*#+ #region\b").unwrap();
-    let region_end = Regex::new(r"^\s*#+ #endregion\b").unwrap();
+    // Source: https://github.com/microsoft/vscode/blob/d6d5034f/extensions/python/language-configuration.json#L45-L48
+    let region_start = Regex::new(r"^\s*#\s*region\b").unwrap();
+    let region_end = Regex::new(r"^\s*#\s*endregion\b").unwrap();
 
     if region_start.is_match(line_text) {
         Some(RegionType::Start)
@@ -391,17 +392,17 @@ mod tests {
         assert_eq!(parse_region_type("# #endregionsomething"), None);
 
         // Valid regions
-        assert_eq!(parse_region_type("# #region"), Some(RegionType::Start));
-        assert_eq!(parse_region_type("## #region  "), Some(RegionType::Start));
+        assert_eq!(parse_region_type("#region"), Some(RegionType::Start));
+        assert_eq!(parse_region_type("# region  "), Some(RegionType::Start));
         assert_eq!(
-            parse_region_type("# #region my special area"),
+            parse_region_type("#region my special area"),
             Some(RegionType::Start)
         );
 
-        assert_eq!(parse_region_type("# #endregion"), Some(RegionType::End));
-        assert_eq!(parse_region_type("## #endregion  "), Some(RegionType::End));
+        assert_eq!(parse_region_type("#endregion"), Some(RegionType::End));
+        assert_eq!(parse_region_type("# endregion  "), Some(RegionType::End));
         assert_eq!(
-            parse_region_type("# #endregion end of my special area"),
+            parse_region_type("#endregion end of my special area"),
             Some(RegionType::End)
         );
     }
@@ -540,15 +541,15 @@ d
     fn test_folding_regions() {
         insta::assert_debug_snapshot!(test_folding_range(
             "
-# #region Important code
+#region Important code
 a
 b
 c
-# #endregion
+#endregion
 
-# #region Another section
+#region Another section
 d
-# #endregion"
+#endregion"
         ));
     }
 
@@ -597,9 +598,9 @@ list <- list(
             "
 # First section ----
 function() {
-  # #region nested region
+  #region nested region
   a
-  # #endregion
+  #endregion
 }
 
 ## Subsection ----
@@ -683,7 +684,7 @@ bar)
             "
 # Complex example ----
 function(a, b, c) {
-  # #region inner calculations
+  #region inner calculations
   x <- a + b
   y <- b + c
 
@@ -693,7 +694,7 @@ function(a, b, c) {
   } else {
     result <- x / y
   }
-  # #endregion
+  #endregion
 
   result
 }

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

@@ -1,6 +1,6 @@
 ---
 source: crates/ark/src/lsp/folding_range.rs
-expression: "test_folding_range(\"\n# Complex example ----\nfunction(a, b, c) {\n  # #region inner calculations\n  x <- a + b\n  y <- b + c\n\n  if (x > y) {\n    # %% cell inside function\n    result <- x * y\n  } else {\n    result <- x / y\n  }\n  # #endregion\n\n  result\n}\n\n## Subsection ----\n# This is a regular comment, not a section or region\")"
+expression: "test_folding_range(\"\n# Complex example ----\nfunction(a, b, c) {\n  #region inner calculations\n  x <- a + b\n  y <- b + c\n\n  if (x > y) {\n    # %% cell inside function\n    result <- x * y\n  } else {\n    result <- x / y\n  }\n  #endregion\n\n  result\n}\n\n## Subsection ----\n# This is a regular comment, not a section or region\")"
 ---
 [
     FoldingRange {

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

@@ -1,6 +1,6 @@
 ---
 source: crates/ark/src/lsp/folding_range.rs
-expression: "test_folding_range(\"\n# First section ----\nfunction() {\n  # #region nested region\n  a\n  # #endregion\n}\n\n## Subsection ----\n# %% Cell in subsection\nb\n\n# Another section ----\nc\")"
+expression: "test_folding_range(\"\n# First section ----\nfunction() {\n  #region nested region\n  a\n  #endregion\n}\n\n## Subsection ----\n# %% Cell in subsection\nb\n\n# Another section ----\nc\")"
 ---
 [
     FoldingRange {

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

@@ -1,6 +1,6 @@
 ---
 source: crates/ark/src/lsp/folding_range.rs
-expression: "test_folding_range(\"\n# #region Important code\na\nb\nc\n# #endregion\n\n# #region Another section\nd\n# #endregion\")"
+expression: "test_folding_range(\"\n#region Important code\na\nb\nc\n#endregion\n\n#region Another section\nd\n#endregion\")"
 ---
 [
     FoldingRange {