summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunegunn Choi <junegunn.c@gmail.com>2025-02-18 21:57:53 +0900
committerJunegunn Choi <junegunn.c@gmail.com>2025-02-18 22:03:59 +0900
commit6fa8295ac5cd271f25f431611c25944bed416120 (patch)
tree1f024b094cca2050a73aabfa4ae3107748677521
parentf975b402365d92c816a060aba580811bc5c55cc5 (diff)
downloadfzf-6fa8295ac5cd271f25f431611c25944bed416120.tar.gz
walker: Append path separator to directories
Close #4255
-rw-r--r--src/reader.go1
-rw-r--r--test/test_shell_integration.rb4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/reader.go b/src/reader.go
index d78f10ff..679cb636 100644
--- a/src/reader.go
+++ b/src/reader.go
@@ -320,6 +320,7 @@ func (r *Reader) readFiles(roots []string, opts walkerOpts, ignores []string) bo
return filepath.SkipDir
}
}
+ path += sep
}
if ((opts.file && !isDir) || (opts.dir && isDir)) && r.pusher(stringBytes(path)) {
atomic.StoreInt32(&r.event, int32(EvtReadNew))
diff --git a/test/test_shell_integration.rb b/test/test_shell_integration.rb
index de457178..4c38b76b 100644
--- a/test/test_shell_integration.rb
+++ b/test/test_shell_integration.rb
@@ -73,7 +73,7 @@ module TestShell
tmux.prepare
tmux.send_keys :Escape, :c
lines = tmux.until { |lines| assert_operator lines.match_count, :>, 0 }
- expected = lines.reverse.find { |l| l.start_with?('> ') }[2..]
+ expected = lines.reverse.find { |l| l.start_with?('> ') }[2..].chomp('/')
tmux.send_keys :Enter
tmux.prepare
tmux.send_keys :pwd, :Enter
@@ -241,7 +241,7 @@ module CompletionTest
tmux.until do |lines|
assert_equal 1, lines.match_count
assert_includes lines, '> 55'
- assert_includes lines, '> /tmp/fzf-test/d55'
+ assert_includes lines, '> /tmp/fzf-test/d55/'
end
tmux.send_keys :Enter
tmux.until(true) { |lines| assert_equal 'cd /tmp/fzf-test/d55/', lines[-1] }