KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More corner cases

Browse Source
This commit is contained in:
Kovid Goyal
2022-09-15 20:21:42 +05:30
parent c47ccc8a59
commit ced741b247
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/completion/files.go
View File

@@ -28,10 +28,13 @@ func absolutize_path(path string) string {
type CompleteFilesCallback func(completion_candidate, abspath string, d fs.DirEntry) error type CompleteFilesCallback func(completion_candidate, abspath string, d fs.DirEntry) error
func complete_files(prefix string, callback CompleteFilesCallback) error { func complete_files(prefix string, callback CompleteFilesCallback) error {
abspath := absolutize_path(prefix)
base := prefix base := prefix
if s, err := os.Stat(abspath); err != nil || !s.IsDir() { if base != "~" && base != "./" {
base = filepath.Dir(prefix) if strings.Contains(base, string(os.PathSeparator)) {
base = filepath.Dir(base)
} else {
base = ""
}
} }
num := 0 num := 0
utils.WalkWithSymlink(base, func(path, abspath string, d fs.DirEntry, err error) error { utils.WalkWithSymlink(base, func(path, abspath string, d fs.DirEntry, err error) error {
@@ -43,9 +46,12 @@ func complete_files(prefix string, callback CompleteFilesCallback) error {
return nil return nil
} }
completion_candidate := path completion_candidate := path
if strings.HasPrefix(completion_candidate, prefix) && completion_candidate != prefix { if strings.HasPrefix(completion_candidate, prefix) {
return callback(completion_candidate, abspath, d) return callback(completion_candidate, abspath, d)
} }
if d.IsDir() {
return fs.SkipDir
}
return nil return nil
}, absolutize_path) }, absolutize_path)

8
tools/completion/files_test.go
View File

@@ -54,7 +54,11 @@ func TestCompleteFiles(t *testing.T) {
test_abs_candidates := func(prefix string, expected ...string) { test_abs_candidates := func(prefix string, expected ...string) {
e := make([]string, len(expected)) e := make([]string, len(expected))
for i, x := range expected { for i, x := range expected {
e[i] = filepath.Join(tdir, x) if filepath.IsAbs(x) {
e[i] = x
} else {
e[i] = filepath.Join(tdir, x)
}
} }
test_candidates(prefix, e...) test_candidates(prefix, e...)
} }
@@ -71,7 +75,7 @@ func TestCompleteFiles(t *testing.T) {
test_cwd_prefix("t", "two.txt") test_cwd_prefix("t", "two.txt")
test_cwd_prefix("x") test_cwd_prefix("x")
test_abs_candidates(tdir, "one.txt", "two.txt", "odir", "odir/three.txt", "odir/four.txt") test_abs_candidates(tdir, tdir, "one.txt", "two.txt", "odir", "odir/three.txt", "odir/four.txt")
test_abs_candidates(filepath.Join(tdir, "o"), "one.txt", "odir", "odir/three.txt", "odir/four.txt") test_abs_candidates(filepath.Join(tdir, "o"), "one.txt", "odir", "odir/three.txt", "odir/four.txt")
test_candidates("", "one.txt", "two.txt", "odir", "odir/three.txt", "odir/four.txt") test_candidates("", "one.txt", "two.txt", "odir", "odir/three.txt", "odir/four.txt")

2
tools/utils/paths.go
View File

@@ -134,7 +134,7 @@ func (self *transformed_walker) walk(dirpath string) error {
} }
// we cant use filepath.Join here as it calls Clean() which can alter dirpath if it contains .. or . etc. // we cant use filepath.Join here as it calls Clean() which can alter dirpath if it contains .. or . etc.
path_based_on_original_dir := dirpath path_based_on_original_dir := dirpath
if !strings.HasSuffix(dirpath, sep) { if !strings.HasSuffix(dirpath, sep) && dirpath != "" {
path_based_on_original_dir += sep path_based_on_original_dir += sep
} }
path_based_on_original_dir += rpath path_based_on_original_dir += rpath