mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-08 22:28:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Dont recurse for file completion

Browse Source 
We could potentially end up recursing over the entire file system. And
for completion we only present the candidates in the immediate directory
anyway.
This commit is contained in:
Kovid Goyal
2022-09-16 08:46:26 +05:30
parent c9d986f9a8
commit 3c29ce936b
6 changed files with 116 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/utils/paths.go
View File

@@ -11,6 +11,8 @@ import (
"strings"
)
var Sep = string(os.PathSeparator)
func Expanduser(path string) string {
if !strings.HasPrefix(path, "~") {
return path
@@ -28,7 +30,7 @@ func Expanduser(path string) string {
if path == "~" {
return home
}
path = strings.ReplaceAll(path, string(os.PathSeparator), "/")
path = strings.ReplaceAll(path, Sep, "/")
parts := strings.Split(path, "/")
if parts[0] == "~" {
parts[0] = home
@@ -41,7 +43,7 @@ func Expanduser(path string) string {
}
}
}
return strings.Join(parts, string(os.PathSeparator))
return strings.Join(parts, Sep)
}
func Abspath(path string) string {
@@ -114,8 +116,6 @@ type transformed_walker struct {
needs_recurse_func func(string, fs.DirEntry) bool
}
var sep = string(os.PathSeparator)
func (self *transformed_walker) walk(dirpath string) error {
resolved_path := self.transform_func(dirpath)
if self.seen[resolved_path] {
@@ -134,8 +134,8 @@ 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.
path_based_on_original_dir := dirpath
if !strings.HasSuffix(dirpath, sep) && dirpath != "" {
path_based_on_original_dir += sep
if !strings.HasSuffix(dirpath, Sep) && dirpath != "" {
path_based_on_original_dir += Sep
}
path_based_on_original_dir += rpath
if self.needs_recurse_func(path, d) {