fix file item completion

Author: kiddos

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "basecode-lsp"
-version = "0.1.4"
+version = "0.1.5"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -9,6 +9,7 @@ edition = "2021"
 clap = { version = "4.5.28", features = ["derive"] }
 glob = "0.3.2"
 home = "0.5.11"
+regex = "1.11.1"
 serde_json = "1.0.138"
 simple-log = "2.1.1"
 tokio = { version = "1.43.0", features = ["full"] }

Cargo.toml

@@ -1,29 +1,15 @@
+use regex::Regex;
 use std::ffi::OsStr;
 use std::fs;
 use std::path::Path;
+use std::path::PathBuf;
 
-pub fn get_file_path_prefix(line: &str, character: i32) -> String {
-    let mut prefix = Vec::new();
-    let line: Vec<char> = line.chars().collect();
-    let mut i = (character - 1).min(line.len() as i32 - 1);
-    let mut start = -1;
-    let mut found_sep = false;
-    while i >= 0 {
-        let c = line[i as usize];
-        if c == '/' {
-            found_sep = true;
-        }
-        if c == '/' || c == '.' {
-            start = i;
-        }
-        prefix.push(c);
-        i -= 1;
-    }
-    if start < 0 || !found_sep {
-        return String::new();
-    }
-    prefix.reverse();
-    prefix[start as usize..].iter().collect()
+pub fn find_file_paths(input: &str) -> Vec<String> {
+    let pattern = r#"(\./[^\s<>:\",|?*]+(?:/[^\s<>:\",|?*]+)*|\.\./[^\s<>:\"|?*]+(?:/[^\s<>:\"|?*]+)*|[a-zA-Z]:\\[^\s<>:\",|?*]+(?:\\[^\s<>:\",|?*]+)*|/[^<>\s:\",|?*\r\n]+(?:/[^<>:\"|?*\r\n]+)*)"#;
+    let re = Regex::new(pattern).unwrap();
+    re.find_iter(input)
+        .map(|m| m.as_str().to_string())
+        .collect()
 }
 
 pub fn list_all_file_items(path: &Path) -> Vec<String> {
@@ -43,35 +29,29 @@ pub fn list_all_file_items(path: &Path) -> Vec<String> {
     result
 }
 
+pub fn get_file_items(text: &str, root_folder: &str) -> Vec<String> {
+    let mut file_items = Vec::new();
+    let file_paths = find_file_paths(&text);
+    // info!("file path size: {}", file_paths.len());
+    for file_path in file_paths.iter() {
+        let mut root = PathBuf::from(root_folder);
+        root = root.join(file_path);
+        if !root.is_dir() {
+            root = root.parent().map(|p| p.to_path_buf()).unwrap();
+        }
+        let possible = list_all_file_items(&root);
+        file_items.extend(possible);
+        // info!("file path: {}", file_path);
+    }
+    file_items.sort();
+    file_items.dedup();
+    file_items
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
 
-    #[test]
-    fn test_get_file_path_prefix() {
-        let prefix = get_file_path_prefix("./a", 3);
-        assert_eq!("./a", prefix);
-
-        let prefix = get_file_path_prefix("./some/path/to/here", 19);
-        assert_eq!("./some/path/to/here", prefix);
-
-        let prefix = get_file_path_prefix("  ./a/b/c/d/e.cc", 12);
-        assert_eq!("./a/b/c/d/", prefix);
-
-        let prefix = get_file_path_prefix("no_prefix", 5);
-        assert_eq!("", prefix);
-
-        let prefix = get_file_path_prefix("/abs/path/to/file", 10);
-        assert_eq!("/abs/path/", prefix);
-
-        let prefix = get_file_path_prefix("../foo/bar", 3);
-        assert_eq!("../", prefix);
-
-        let prefix = get_file_path_prefix("../foo/bar", 7);
-        assert_eq!("../foo/", prefix);
-    }
-
-
     #[test]
     fn test_list_all_files() {
         let items = list_all_file_items(Path::new("./"));
@@ -94,4 +74,82 @@ mod tests {
         let items = list_all_file_items(Path::new("doesnt_exist"));
         assert_eq!(0, items.len());
     }
+
+    #[test]
+    fn test_find_file_paths() {
+        let example = "path/to/my_file.txt";
+        assert_eq!(find_file_paths(example), vec!["/to/my_file.txt"]);
+
+        let example = "Check these paths: C:\\Users\\User\\file.txt, /home/user/docs/report.pdf";
+        assert_eq!(
+            find_file_paths(example),
+            vec!["C:\\Users\\User\\file.txt", "/home/user/docs/report.pdf"]
+        );
+
+        let example = "./file.txt";
+        assert_eq!(find_file_paths(example), vec!["./file.txt"]);
+
+        let example = "./";
+        assert_eq!(find_file_paths(example), Vec::<String>::new());
+
+        let example = "Some text with a path ./src/main.rs in it.";
+        assert_eq!(find_file_paths(example), vec!["./src/main.rs"]);
+
+        let example = "Multiple paths: ./file1.txt, ./file2.txt, ./file3.txt";
+        assert_eq!(
+            find_file_paths(example),
+            vec!["./file1.txt", "./file2.txt", "./file3.txt"]
+        );
+
+        let example = "A path with spaces: /path/to/a_long_name_file.txt";
+        assert_eq!(find_file_paths(example), vec!["/path/to/a_long_name_file.txt"]);
+
+        let example = "A relative path: ../parent/file.txt";
+        assert_eq!(find_file_paths(example), vec!["../parent/file.txt"]);
+
+        let example = "Just the drive letter: C:\\";
+        assert_eq!(find_file_paths(example), Vec::<String>::new());
+
+        let example = "A more complex windows path: D:\\MyDocuments\\Project\\file.pdf";
+        assert_eq!(
+            find_file_paths(example),
+            vec!["D:\\MyDocuments\\Project\\file.pdf"]
+        );
+
+        let example =
+            "Mix of paths: ./local/file.txt and /absolute/file.txt and C:\\windows\\file.exe";
+        assert_eq!(
+            find_file_paths(example),
+            vec![
+                "./local/file.txt",
+                "/absolute/file.txt",
+                "C:\\windows\\file.exe"
+            ]
+        );
+
+        let example = "No paths here.";
+        assert_eq!(find_file_paths(example), Vec::<String>::new());
+
+        let example = "Path at the end: /opt/app/data";
+        assert_eq!(find_file_paths(example), vec!["/opt/app/data"]);
+
+        let example =
+            "This is a test with a long path: /very/long/path/to/a/deeply/nested/file.txt";
+        assert_eq!(
+            find_file_paths(example),
+            vec!["/very/long/path/to/a/deeply/nested/file.txt"]
+        );
+
+        let example = "This is a test with a long windows path: C:\\very\\long\\path\\to\\a\\deeply\\nested\\file.txt";
+        assert_eq!(
+            find_file_paths(example),
+            vec!["C:\\very\\long\\path\\to\\a\\deeply\\nested\\file.txt"]
+        );
+
+        let example = "This is a test with a long relative path: ./very/long/path/to/a/deeply/nested/file.txt";
+        assert_eq!(
+            find_file_paths(example),
+            vec!["./very/long/path/to/a/deeply/nested/file.txt"]
+        );
+    }
 }