zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed failing test, now to make breadcrumbs scrollable...

Browse Source
This commit is contained in:
Mikayla Maki 2022-10-17 13:57:29 -07:00
parent 1f161b9aa1
commit f473eadf2d
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/breadcrumbs/src/breadcrumbs.rs
View File

@ -42,10 +42,12 @@ impl View for Breadcrumbs {
.as_ref()
.and_then(|item| item.breadcrumbs(&theme, cx))
{
enum BreadcrumbTag {}
Flex::row()
.with_children(Itertools::intersperse_with(breadcrumbs.into_iter(), || {
Label::new(" 〉 ".to_string(), theme.breadcrumbs.text.clone()).boxed()
}))
.scrollable::<BreadcrumbTag, _>(1, None, cx)
.contained()
.with_style(theme.breadcrumbs.container)
.aligned()

8
crates/project/src/worktree.rs
View File

@ -1843,12 +1843,10 @@ impl language::File for File {
if worktree.is_visible() {
full_path.push(worktree.root_name());
} else {
let home_dir = cx.global::<HomeDir>();
let local_path = worktree.as_local().map(|local| local.abs_path.clone());
if let Some(path) = local_path {
if let Ok(path) = path.strip_prefix(home_dir.0.as_path()) {
if let Some(path) = worktree.as_local().map(|local| local.abs_path.clone()) {
if let Ok(trimmed_path) = path.strip_prefix(cx.global::<HomeDir>().0.as_path()) {
full_path.push("~");
full_path.push(path);
full_path.push(trimmed_path);
} else {
full_path.push(path)
}

3
crates/workspace/src/workspace.rs
View File

@ -927,6 +927,9 @@ impl From<&dyn NotificationHandle> for AnyViewHandle {
impl AppState {
#[cfg(any(test, feature = "test-support"))]
pub fn test(cx: &mut MutableAppContext) -> Arc<Self> {
use fs::HomeDir;
cx.set_global(HomeDir(Path::new("/tmp/").to_path_buf()));
let settings = Settings::test(cx);
cx.set_global(settings);