Merge pull request ogham#516 from VichoReyes/dothidden

ogham · web-flow · commit 4dab6237f1e1 · 2020-01-19T00:16:06.000Z
Include symlinks to dirs when grouping dirs
diff --git a/src/fs/filter.rs b/src/fs/filter.rs
@@ -129,7 +129,9 @@ impl FileFilter {
         if self.list_dirs_first {
             // This relies on the fact that `sort_by` is *stable*: it will keep
             // adjacent elements next to each other.
-            files.sort_by(|a, b| b.as_ref().is_directory().cmp(&a.as_ref().is_directory()));
+            files.sort_by(|a, b| {b.as_ref().points_to_directory()
+                .cmp(&a.as_ref().points_to_directory())
+            });
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,9 @@ impl FileFilter {`
`129`	`129`	`if self.list_dirs_first {`
`130`	`130`	// This relies on the fact that `sort_by` is stable: it will keep
`131`	`131`	`// adjacent elements next to each other.`
`132`		`- files.sort_by(\|a, b\| b.as_ref().is_directory().cmp(&a.as_ref().is_directory()));`
	`132`	`+ files.sort_by(\|a, b\| {b.as_ref().points_to_directory()`
	`133`	`+ .cmp(&a.as_ref().points_to_directory())`
	`134`	`+ });`
`133`	`135`	`}`
`134`	`136`	`}`
`135`	`137`	`}`