Merge pull request solidiquis#83 from fawni/fix/dir-icon-priority

solidiquis · web-flow · commit 8f4b6981e0fe · 2023-03-18T09:42:45.000-07:00
fix: check filetype before extension
diff --git a/src/render/tree/node.rs b/src/render/tree/node.rs
@@ -197,11 +197,11 @@ impl Node {
 
         let path = self.symlink_target_path().unwrap_or_else(|| self.path());
 
-        if let Some(icon) = path.extension().and_then(icon_from_ext) {
+        if let Some(icon) = self.file_type().and_then(icon_from_file_type) {
             return Some(self.stylize(icon));
         }
 
-        if let Some(icon) = self.file_type().and_then(icon_from_file_type) {
+        if let Some(icon) = path.extension().and_then(icon_from_ext) {
             return Some(self.stylize(icon));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -197,11 +197,11 @@ impl Node {`
`197`	`197`
`198`	`198`	`let path = self.symlink_target_path().unwrap_or_else(\|\| self.path());`
`199`	`199`
`200`		`- if let Some(icon) = path.extension().and_then(icon_from_ext) {`
	`200`	`+ if let Some(icon) = self.file_type().and_then(icon_from_file_type) {`
`201`	`201`	`return Some(self.stylize(icon));`
`202`	`202`	`}`
`203`	`203`
`204`		`- if let Some(icon) = self.file_type().and_then(icon_from_file_type) {`
	`204`	`+ if let Some(icon) = path.extension().and_then(icon_from_ext) {`
`205`	`205`	`return Some(self.stylize(icon));`
`206`	`206`	`}`
`207`	`207`