Add support for ../

Signed-off-by: anmolbabu <anmolbudugutta@gmail.com>

Author: anmolbabu

args.go

@@ -30,7 +30,10 @@ type Args struct {
 // in case that it is not, we fall back to the current directory.
 func (a Args) Directory() string {
 	if strings.HasPrefix(a.Last, "~") {
-		return resolveHomeSymbol(filepath.Dir(a.Last))
+		return getAbs(filepath.Dir(a.Last))
+	}
+	if strings.Contains(a.Last, "..") {
+		return getAbs(filepath.Dir(a.Last))
 	}
 	if info, err := os.Stat(a.Last); err == nil && info.IsDir() {
 		return fixPathForm(a.Last, a.Last)

match/file.go

@@ -1,6 +1,8 @@
 package match
 
-import "strings"
+import (
+	"strings"
+)
 
 // File returns true if prefix can match the file
 func File(file, prefix string) bool {
@@ -14,6 +16,9 @@ func File(file, prefix string) bool {
 	if prefix == "~" || strings.HasPrefix(file, "~") {
 		return true
 	}
+	if prefix == ".." || strings.Contains(file, "..") {
+		return true
+	}
 
 	file = strings.TrimPrefix(file, "./")
 	prefix = strings.TrimPrefix(prefix, "./")

predict_files.go

@@ -40,7 +40,10 @@ func files(pattern string, allowFiles bool) PredictFunc {
 
 		path := prediction[0]
 		if strings.HasPrefix(a.Last, "~") {
-			path = resolveHomeSymbol(path)
+			path = getAbs(path)
+		}
+		if strings.Contains(a.Last, "..") {
+			path = getAbs(path)
 		}
 		// only try deeper, if the one item is a directory
 		stat, err := os.Stat(path)
@@ -75,7 +78,7 @@ func PredictFilesSet(files []string) PredictFunc {
 			f = fixPathForm(a.Last, f)
 
 			// test matching of file to the argument
-			if match.File(resolveHomeSymbol(f), resolveHomeSymbol(a.Last)) {
+			if match.File(getAbs(f), getAbs(a.Last)) {
 				prediction = append(prediction, f)
 			}
 		}
@@ -87,12 +90,8 @@ func listFiles(dir, pattern string, allowFiles bool) []string {
 	// set of all file names
 	m := map[string]bool{}
 
-	if strings.HasPrefix(pattern, "~") {
-		pattern = resolveHomeSymbol(pattern)
-	}
-
 	// list files
-	if files, err := filepath.Glob(filepath.Join(dir, pattern)); err == nil {
+	if files, err := filepath.Glob(filepath.Join(dir, getAbs(pattern))); err == nil {
 		for _, f := range files {
 			if stat, err := os.Stat(f); err != nil || stat.IsDir() || allowFiles {
 				m[f] = true

utils.go

@@ -39,6 +39,10 @@ func fixPathForm(last string, file string) string {
 		return file
 	}
 
+	if strings.Contains(rel, "..") {
+		return fixDirPath(rel)
+	}
+
 	// fix ./ prefix of path
 	if rel != "." && strings.HasPrefix(last, ".") {
 		rel = "./" + rel
@@ -47,6 +51,14 @@ func fixPathForm(last string, file string) string {
 	return fixDirPath(rel)
 }
 
+func getAbs(path string) string {
+	if strings.HasPrefix(path, "~") {
+		return resolveHomeSymbol(path)
+	}
+	path, _ = filepath.Abs(path)
+	return path
+}
+
 func resolveHomeSymbol(path string) string {
 	usr, err := user.Current()
 	if err != nil {
@@ -58,8 +70,8 @@ func resolveHomeSymbol(path string) string {
 
 func fixDirPath(path string) string {
 	info, err := os.Stat(path)
-	if err == nil && info.IsDir() && !strings.HasSuffix(path, "/") {
-		path += "/"
+	if err == nil && info.IsDir() && !strings.HasSuffix(path, filepath.FromSlash("/")) {
+		path += filepath.FromSlash("/")
 	}
 	return path
 }