fix file item completion

Author: kiddos

src/file.rs

@@ -1,17 +1,8 @@
-use regex::Regex;
 use std::ffi::OsStr;
 use std::fs;
 use std::path::Path;
 use std::path::PathBuf;
 
-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> {
     let read_result = fs::read_dir(path);
     let mut result = Vec::new();
@@ -29,20 +20,29 @@ pub fn list_all_file_items(path: &Path) -> Vec<String> {
     result
 }
 
-pub fn get_file_items(text: &str, root_folder: &str) -> Vec<String> {
+const MAX_LINE_LENGTH: usize = 600;
+
+pub fn get_file_items(current_line: &str, root_folder: &str) -> Vec<(String, usize)> {
+    if current_line.len() >= MAX_LINE_LENGTH {
+        return Vec::new();
+    }
+    
     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();
+    for (j, _) in current_line.char_indices().filter(|&(_, ch)| ch == '/' || ch == '\\') {
+        for i in 0..j {
+            let p = &current_line[i..j];
+            
+            for base in [root_folder, ""].iter().map(PathBuf::from) {
+                let path = base.join(p);
+                file_items.extend(
+                    list_all_file_items(&path)
+                        .into_iter()
+                        .map(|file_path| (file_path, j))
+                );
+            }
         }
-        let possible = list_all_file_items(&root);
-        file_items.extend(possible);
-        // info!("file path: {}", file_path);
     }
+    
     file_items.sort();
     file_items.dedup();
     file_items
@@ -74,82 +74,4 @@ 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"]
-        );
-    }
 }

src/main.rs

@@ -133,7 +133,7 @@ impl LanguageServer for Backend {
 
             if let Some(root_folder) = self.lsp_args.root_folder.clone() {
                 let file_items = get_file_items(&current_line, &root_folder);
-                file_items_to_completion_items(file_items, &mut completions);
+                file_items_to_completion_items(file_items, &params, &mut completions);
             }
         }
         Ok(Some(CompletionResponse::Array(completions)))
@@ -235,16 +235,33 @@ fn snippets_to_completion_items(snippets: Vec<Snippet>, completions: &mut Vec<Co
     completions.append(&mut items);
 }
 
-fn file_items_to_completion_items(file_items: Vec<String>, completions: &mut Vec<CompletionItem>) {
-    let mut items: Vec<CompletionItem> = file_items
-        .into_iter()
-        .map(|file_item| CompletionItem {
-            label: file_item.clone(),
+fn file_items_to_completion_items(file_items: Vec<(String, usize)>, params: &CompletionParams, completions: &mut Vec<CompletionItem>) {
+    let position = &params.text_document_position.position;
+    let line = position.line;
+    let mut items: Vec<CompletionItem> = Vec::new();
+    for file_item in file_items.iter() {
+        let text_edit = TextEdit {
+            new_text: file_item.0.clone(),
+            range: Range {
+                start: Position {
+                    line,
+                    character: file_item.1 as u32 + 1,
+                },
+                end: Position {
+                    line,
+                    character: (file_item.1 + file_item.0.len()) as u32,
+                }
+            }
+        };
+        let completion_item = CompletionItem {
+            label: file_item.0.clone(),
             kind: Some(CompletionItemKind::FILE),
+            text_edit: Some(CompletionTextEdit::Edit(text_edit)),
             ..CompletionItem::default()
-        })
-        .collect();
-    completions.append(&mut items);
+        };
+        items.push(completion_item);
+    }
+    completions.extend(items);
 }
 
 impl Backend {