Invert condition when opening entries

Nathan Sobo and Brooks Swinnerton created 4 years ago

Co-Authored-By: Brooks Swinnerton <[e-mail]>

Change summary

.vscode/launch.json          |  8 ++++----
zed/src/worktree/worktree.rs | 21 ++++++++++++++-------
2 files changed, 18 insertions(+), 11 deletions(-)

Detailed changes

.vscode/launch.json

@@ -7,15 +7,15 @@
         {
             "type": "lldb",
             "request": "launch",
-            "name": "Debug executable 'zed'",
+            "name": "Debug executable 'Zed'",
             "cargo": {
                 "args": [
                     "build",
-                    "--bin=zed",
+                    "--bin=Zed",
                     "--package=zed"
                 ],
                 "filter": {
-                    "name": "zed",
+                    "name": "Zed",
                     "kind": "bin"
                 }
             },
@@ -63,4 +63,4 @@
             "cwd": "${workspaceFolder}"
         }
     ]
-}
+}

zed/src/worktree/worktree.rs

@@ -444,12 +444,12 @@ pub trait WorktreeHandle {
 impl WorktreeHandle for ModelHandle<Worktree> {
     fn file(&self, entry_id: u64, app: &AppContext) -> Result<FileHandle> {
         if self.read(app).has_entry(entry_id) {
-            Err(anyhow!("entry does not exist in tree"))
-        } else {
             Ok(FileHandle {
                 worktree: self.clone(),
                 entry_id,
             })
+        } else {
+            Err(anyhow!("entry does not exist in tree"))
         }
     }
 }
@@ -719,11 +719,18 @@ mod test {
             app.read(|ctx| {
                 let tree = tree.read(ctx);
                 assert_eq!(tree.file_count(), 4);
-                let results = match_paths(&[tree.clone()], "bna", false, false, 10, ctx.scoped_pool().clone())
-                    .iter()
-                    .map(|result| tree.entry_path(result.entry_id))
-                    .collect::<Result<Vec<PathBuf>, _>>()
-                    .unwrap();
+                let results = match_paths(
+                    &[tree.clone()],
+                    "bna",
+                    false,
+                    false,
+                    10,
+                    ctx.scoped_pool().clone(),
+                )
+                .iter()
+                .map(|result| tree.entry_path(result.entry_id))
+                .collect::<Result<Vec<PathBuf>, _>>()
+                .unwrap();
                 assert_eq!(
                     results,
                     vec![