Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

show tree edge before name block #489

Merged
merged 9 commits into from
Mar 27, 2021
Merged

show tree edge before name block #489

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6e096e4
display/tree: :art: show tree edge before name block
zwpaper Feb 15, 2021
c97f3c4
display/tree: :mag: :sparkles: add test and changelog for show edge b…
zwpaper Feb 15, 2021
2e2ebe1
display/tree: :hammer: fix misaligned when tree, add color to tree edge
zwpaper Feb 18, 2021
0b5f8fb
display/tree: :hammer: detect all subdir size width when tree
zwpaper Feb 18, 2021
0cee97a
display/tree: :sparkles: show tree edge at first column when no name …
zwpaper Feb 19, 2021
a296afd
display: :art: delete tree color and apply review
zwpaper Mar 12, 2021
6a8ae5b
test: :mag: :hammer: fix tree test without sort
zwpaper Mar 13, 2021
65b9e1d
display/tree: :hammer: add space for better tree display
zwpaper Mar 25, 2021
f26f193
display/tree: :mag: :hammer: fix test to fit new tree display
zwpaper Mar 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Add man page from [edneville](https://github.com/edneville)
### Changed
- Not showing `.` and `..` when `--tree` with `--all` from [zwpaper](https://github.com/zwpaper) [#477](https://github.com/Peltoche/lsd/issues/477)
- Show tree edge before name block, first column if no name block from [zwpaper](https://github.com/zwpaper) [#468](https://github.com/Peltoche/lsd/issues/468)
zwpaper marked this conversation as resolved.
Show resolved Hide resolved
### Fixed
- Fix handling blocks passed without -l in cli from [meain](https://github.com/meain)
- Fix sorting of . and .. when used with folder from [meain](https://github.com/meain)
Expand Down
4 changes: 4 additions & 0 deletions src/color.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ pub enum Elem {
Links {
valid: bool,
},

TreeEdge,
}

impl Elem {
Expand Down Expand Up @@ -254,6 +256,8 @@ impl Colors {
m.insert(Elem::Links { valid: true }, Colour::Fixed(13));
m.insert(Elem::Links { valid: false }, Colour::Fixed(245));

// TODO add this after we can use file to configure theme
// m.insert(Elem::TreeEdge, Colour::Fixed(44)); // DarkTurquoise
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wanted to do this a little while ago, I think we can make the color that is returned an Option and make this return None? I think we can take that up in another PR as well. This would let us remove the #[allow(dead_code)] above the struct definition.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#506 issue created

m
}
}
Loading