From 7bb81839b9fe9ed69e03c2786a6ae63179c44b6d Mon Sep 17 00:00:00 2001 From: Charlie Vieth Date: Thu, 18 Jul 2024 00:23:43 -0400 Subject: [PATCH] Update fastwalk to v1.0.8 for better MSYS detection and sorting This commit updates github.com/charlievieth/fastwalk to v1.0.8 which improves MSYS detection and adds optional sorting of directory entries. It also updates fzf to use the SortFilesFirst sort mode which improves the output by making it a bit more sorted and grouped by directory previously entries were visited in directory order (which is basically random). PRs Included: * https://github.com/charlievieth/fastwalk/pull/25 * https://github.com/charlievieth/fastwalk/pull/27 * https://github.com/charlievieth/fastwalk/pull/28 --- go.mod | 2 +- go.sum | 4 ++-- src/reader.go | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a02d652c2e5..3c549e067d9 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,7 @@ module github.com/junegunn/fzf require ( - github.com/charlievieth/fastwalk v1.0.7-0.20240703190418-87029d931815 + github.com/charlievieth/fastwalk v1.0.8 github.com/gdamore/tcell/v2 v2.7.4 github.com/mattn/go-isatty v0.0.20 github.com/mattn/go-shellwords v1.0.12 diff --git a/go.sum b/go.sum index 77e1e8915f8..48f604979a0 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/charlievieth/fastwalk v1.0.7-0.20240703190418-87029d931815 h1:4PRbYm9OMgH0bcdZZqMXA/AoOvpGy4l0H6g9Au/kgGA= -github.com/charlievieth/fastwalk v1.0.7-0.20240703190418-87029d931815/go.mod h1:rV19+IF9Y2TYQNy4MqEk5M/spNHjKsA0i71yrsv2p4E= +github.com/charlievieth/fastwalk v1.0.8 h1:uaoH6cAKSk73aK7aKXqs0+bL+J3Txzd3NGH8tRXgHko= +github.com/charlievieth/fastwalk v1.0.8/go.mod h1:yGy1zbxog41ZVMcKA/i8ojXLFsuayX5VvwhQVoj9PBI= github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko= github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= github.com/gdamore/tcell/v2 v2.7.4 h1:sg6/UnTM9jGpZU+oFYAsDahfchWAFW8Xx2yFinNSAYU= diff --git a/src/reader.go b/src/reader.go index b9368f07170..a4049c4e3d9 100644 --- a/src/reader.go +++ b/src/reader.go @@ -253,6 +253,7 @@ func (r *Reader) readFiles(root string, opts walkerOpts, ignores []string) bool Follow: opts.follow, // Use forward slashes when running a Windows binary under WSL or MSYS ToSlash: fastwalk.DefaultToSlash(), + Sort: fastwalk.SortFilesFirst, } fn := func(path string, de os.DirEntry, err error) error { if err != nil {