diff --git a/CHANGELOG.md b/CHANGELOG.md index 904ef262..e5db1cd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/): - Smart-case in interactive `cd` broken due to a typo ([#3540]) - Fix shell formatting for non-spread opener rules ([#3532]) - Account for URL covariance in `Url:join()` ([#3514]) +- `sort extension` excludes directories since only files have extensions ([#3582]) ## [v26.1.4] diff --git a/yazi-fs/src/sorter.rs b/yazi-fs/src/sorter.rs index 2d745dc7..5f189d2f 100644 --- a/yazi-fs/src/sorter.rs +++ b/yazi-fs/src/sorter.rs @@ -40,12 +40,14 @@ impl FilesSorter { if ord == Ordering::Equal { by_alphabetical(a, b) } else { ord } }), SortBy::Extension => items.sort_unstable_by(|a, b| { + let aa = a.url.ext().filter(|_| a.is_file()); + let bb = b.url.ext().filter(|_| b.is_file()); let ord = if self.sensitive { - self.cmp(a.url.ext(), b.url.ext(), self.promote(a, b)) + self.cmp(aa, bb, self.promote(a, b)) } else { self.cmp_insensitive( - a.url.ext().map_or(&[], |s| s.encoded_bytes()), - b.url.ext().map_or(&[], |s| s.encoded_bytes()), + aa.map_or(&[], |s| s.encoded_bytes()), + bb.map_or(&[], |s| s.encoded_bytes()), self.promote(a, b), ) };