history.go

@@ -20,13 +20,8 @@ func newFileHistory() (*fileHistory, error) {
 		}
 	}
 	
-	itms := []string{""}
+	var itms []string
-	lines := strings.Split(string(data), "\n")
+	for _, l := range strings.Split(string(data), "\n") {
-	for i, l := range lines {
-		if i == len(lines) - 1 {
-			println(i, l)
-			continue
-		}
 		itms = append(itms, l)
 	}
 	f, err := os.OpenFile(defaultHistPath, os.O_RDWR | os.O_CREATE, 0755)

rl.go

@@ -60,24 +60,19 @@ func newLineReader(prompt string) *lineReader {
 		ctx = aliases.Resolve(ctx)
 		
 		if len(fields) == 1 {
-			prefixes := []string{"./", "../", "/", "~/"}
+			fileCompletions := fileComplete(query, ctx, fields)
-			for _, prefix := range prefixes {
+			if len(fileCompletions) != 0 {
-				if strings.HasPrefix(query, prefix) {
+				for _, f := range fileCompletions {
-					fileCompletions := fileComplete(query, ctx, fields)
+					name := strings.Replace(query + f, "~", curuser.HomeDir, 1)
-					if len(fileCompletions) != 0 {
+					if info, err := os.Stat(name); err == nil && info.Mode().Perm() & 0100 == 0 {
-						for _, f := range fileCompletions {
+						continue
-							name := strings.Replace(query + f, "~", curuser.HomeDir, 1)
-							if info, err := os.Stat(name); err == nil && info.Mode().Perm() & 0100 == 0 {
-								continue
-							}
-							completions = append(completions, f)
-						}
-						compGroup[0].Suggestions = completions
 					}
-					return "", compGroup
+					completions = append(completions, f)
 				}
+				compGroup[0].Suggestions = completions
+				return "", compGroup
 			}
-
+			
 			// filter out executables, but in path
 			for _, dir := range filepath.SplitList(os.Getenv("PATH")) {
 				// print dir to stderr for debugging