fix(lsp): better handling of folders in registry completions (#13250)

1 files changed, 28 insertions, 1 deletions

diff --git a/cli/lsp/path_to_regex.rs b/cli/lsp/path_to_regex.rs
index 393591785..16db88194 100644
--- a/cli/lsp/path_to_regex.rs
+++ b/cli/lsp/path_to_regex.rs
@@ -733,7 +733,7 @@ impl Compiler {
                 let prefix = k.prefix.clone().unwrap_or_default();
                 let suffix = k.suffix.clone().unwrap_or_default();
                 for segment in v {
-                  if self.validate {
+                  if !segment.is_empty() && self.validate {
                     if let Some(re) = &self.matches[i] {
                       if !re.is_match(segment) {
                         return Err(anyhow!(
@@ -912,6 +912,33 @@ mod tests {
   }
 
   #[test]
+  fn test_compiler_ends_with_sep() {
+    let tokens = parse("/x/:a@:b/:c*", None).expect("could not parse");
+    let mut params = HashMap::<StringOrNumber, StringOrVec>::new();
+    params.insert(
+      StringOrNumber::String("a".to_string()),
+      StringOrVec::String("y".to_string()),
+    );
+    params.insert(
+      StringOrNumber::String("b".to_string()),
+      StringOrVec::String("v1.0.0".to_string()),
+    );
+    params.insert(
+      StringOrNumber::String("c".to_string()),
+      StringOrVec::Vec(vec![
+        "z".to_string(),
+        "example".to_string(),
+        "".to_string(),
+      ]),
+    );
+    let compiler = Compiler::new(&tokens, None);
+    let actual = compiler.to_path(&params);
+    assert!(actual.is_ok());
+    let actual = actual.unwrap();
+    assert_eq!(actual, "/x/y@v1.0.0/z/example/".to_string());
+  }
+
+  #[test]
   fn test_string_to_regex() {
     test_path("/", None, &[("/test", None), ("/", Some(("/", 0, 1)))]);
     test_path(