From 8aa740dab46f138cacdf6391d46c87d6df810161 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <mail4score@gmail.com>
Date: Fri, 4 Sep 2020 02:25:00 +0300
Subject: Happy path implemented

---
 crates/vfs/src/file_set.rs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'crates/vfs/src/file_set.rs')

diff --git a/crates/vfs/src/file_set.rs b/crates/vfs/src/file_set.rs
index 3f49f31e5..956cffb29 100644
--- a/crates/vfs/src/file_set.rs
+++ b/crates/vfs/src/file_set.rs
@@ -34,22 +34,27 @@ impl FileSet {
         &self,
         anchor: FileId,
         anchor_relative_path: Option<&str>,
-    ) -> Option<Vec<(FileId, String)>> {
+    ) -> Option<Vec<FileId>> {
         let anchor_directory = {
             let path = self.paths[&anchor].clone();
             match anchor_relative_path {
                 Some(anchor_relative_path) => path.join(anchor_relative_path),
-                None => path.join("../"),
+                None => path.parent(),
             }
         }?;
 
         Some(
             self.paths
                 .iter()
-                .filter(|(_, path)| path.starts_with(&anchor_directory))
-                // TODO kb need to ensure that no / exists after the anchor_directory
-                .filter(|(_, path)| path.ends_with(".rs"))
-                .map(|(&file_id, path)| (file_id, path.to_string()))
+                .filter_map(|(&file_id, path)| {
+                    if path.parent()? == anchor_directory
+                        && matches!(path.file_name_and_extension(), Some((_, Some("rs"))))
+                    {
+                        Some(file_id)
+                    } else {
+                        None
+                    }
+                })
                 .collect(),
         )
     }
-- 
cgit v1.2.3