mirror of
https://github.com/zed-industries/zed.git
synced 2024-12-24 17:28:40 +00:00
Invert condition when opening entries
Co-Authored-By: Brooks Swinnerton <934497+bswinnerton@users.noreply.github.com>
This commit is contained in:
parent
e3fbb97ecc
commit
e4f41de7bf
2 changed files with 18 additions and 11 deletions
8
.vscode/launch.json
vendored
8
.vscode/launch.json
vendored
|
@ -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}"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
|
@ -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![
|
||||
|
|
Loading…
Reference in a new issue