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

fix: checking for deref flag in file_name #937

Merged
merged 2 commits into from
Apr 22, 2024
Merged

fix: checking for deref flag in file_name #937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bd0912
fix: checking for deref flag in file_name
MartinFillon Apr 18, 2024
aada0da
Merge branch 'main' into investigate-dereference
PThorpe92 Apr 22, 2024
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
2 changes: 2 additions & 0 deletions src/fs/file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ impl<'dir> File<'dir> {
RecursiveSize::None
};

debug!("deref_links {}", deref_links);

let mut file = File {
name,
ext,
Expand Down
2 changes: 2 additions & 0 deletions src/output/details.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,8 @@ impl<'a> Render<'a> {
.paint()
.promote();

debug!("file_name {:?}", file_name);

let row = Row {
tree: tree_params,
cells: egg.table_row,
Expand Down
4 changes: 3 additions & 1 deletion src/output/file_name.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,9 @@ impl<'a, 'dir, C> FileName<'a, 'dir, C> {
/// Sets the flag on this file name to display link targets with an
/// arrow followed by their path.
pub fn with_link_paths(mut self) -> Self {
self.link_style = LinkStyle::FullLinkPaths;
if !self.file.deref_links {
self.link_style = LinkStyle::FullLinkPaths;
}
self
}

Expand Down