Fix the issue when file suggesion would suggest itself again at the end of files. Fixes #410.

Author: vlad-shatskyi

src/Autocompletion.ts

@@ -7,7 +7,7 @@ import {
 import {commandDescriptions} from "./plugins/autocompletion_providers/Executable";
 import {description, style, styles} from "./plugins/autocompletion_providers/Suggestions";
 import {makeAlias} from "./plugins/autocompletion_providers/Alias";
-import {file} from "./plugins/autocompletion_providers/File";
+import {relativeFilePath} from "./plugins/autocompletion_providers/File";
 import {compose, mapObject} from "./utils/Common";
 import {command} from "./plugins/autocompletion_providers/Command";
 import Aliases from "./Aliases";
@@ -17,7 +17,7 @@ import {environmentVariable} from "./plugins/autocompletion_providers/Environmen
 export const makeGrammar = (aliases: Dictionary<string>) => {
     const exec = sequence(
         choice(mapObject(commandDescriptions, (key, value) => decorate(string(key), compose(description(value), style(styles.executable))))),
-        optionalContinuation(many1(choice([file, environmentVariable])))
+        optionalContinuation(many1(choice([relativeFilePath, environmentVariable])))
     );
 
     const sudo = sequence(executable("sudo"), command);

src/plugins/autocompletion_providers/Cd.ts

@@ -1,8 +1,9 @@
 import {executable, sequence, decorate, string, noisySuggestions, runtime, choice} from "../../Parser";
-import {directoryAlias, fileInDirectoryGenerator} from "./Common";
+import {directoryAlias, pathPart} from "./Common";
 import {expandHistoricalDirectory} from "../../Command";
 import {description, styles, style} from "./Suggestions";
 import * as _ from "lodash";
+import {relativeDirectoryPath} from "./File";
 
 const historicalDirectory = runtime(async (context) =>
     noisySuggestions(
@@ -19,7 +20,7 @@ const historicalDirectory = runtime(async (context) =>
 const cdpathDirectory = runtime(
     async (context) => {
         const directoriesToBe = context.environment.cdpath(context.directory).map(async (directory) => {
-            const file = await fileInDirectoryGenerator(directory, info => info.stat.isDirectory());
+            const file = await pathPart(directory, info => info.stat.isDirectory());
 
             if (directory === context.directory) {
                 return file;
@@ -36,4 +37,5 @@ export const cd = sequence(decorate(executable("cd"), description("Change the wo
     historicalDirectory,
     directoryAlias,
     cdpathDirectory,
+    relativeDirectoryPath,
 ]));

src/plugins/autocompletion_providers/Common.ts

@@ -7,7 +7,7 @@ import {
     decorate,
     noisySuggestions,
     Parser,
-    withoutSuggestions,
+    withoutSuggestions, runtime, many1,
 } from "../../Parser";
 import {styles, style} from "./Suggestions";
 import {FileInfo} from "../../Interfaces";
@@ -24,19 +24,24 @@ export const directoryAlias = noisySuggestions(
     ])
 );
 
-export const fileInDirectoryGenerator = async(directory: string, filter: (info: FileInfo) => boolean) => {
+const fileName = (name: string) => decorate(string(name), suggestion => suggestion.withDisplayValue(name).withValue(suggestion.value.replace(/\s/g, "\\ ")));
+
+export const pathPart = async(directory: string, filter: (info: FileInfo) => boolean) => {
     const stats = await statsIn(directory);
 
     return choice(stats.filter(filter).map(info => {
-        const file = decorate(string(info.name), suggestion => suggestion.withDisplayValue(info.name).withValue(info.name.replace(/\s/g, "\\ ")));
-
         if (info.stat.isDirectory()) {
-            return changingContextDirectory(
-                info.name.startsWith(".") ? noisySuggestions(decorate(append("/", file), style(styles.directory))) : decorate(append("/", file), style(styles.directory))
-            );
+            const styledDirectory = decorate(fileName(`${info.name}/`), style(styles.directory));
+            return changingContextDirectory(info.name.startsWith(".") ? noisySuggestions(styledDirectory) : styledDirectory);
         } else {
-            const styled = decorate(file, style(styles.file(info)));
+            const styled = decorate(fileName(info.name), style(styles.file(info)));
             return info.name.startsWith(".") ? noisySuggestions(styled) : styled;
         }
     }));
 };
+
+export const pathInCurrentDirectory = (filter: (info: FileInfo) => boolean) => many1(
+    runtime(
+        async(context) => choice([directoryAlias].concat(await pathPart(context.directory, filter)))
+    )
+);

src/plugins/autocompletion_providers/File.ts

@@ -1,9 +1,4 @@
-import {directoryAlias, fileInDirectoryGenerator} from "./Common";
-import {choice, runtime, many1} from "../../Parser";
+import {pathInCurrentDirectory} from "./Common";
 
-// TODO: shouldn't behave like that https://dl.dropboxusercontent.com/spa/dlqheu39w0arg9q/1t71rcbn.png
-export const file = many1(
-    runtime(
-        async (context) => choice([directoryAlias].concat(await fileInDirectoryGenerator(context.directory, () => true)))
-    )
-);
+export const relativeFilePath = pathInCurrentDirectory(() => true);
+export const relativeDirectoryPath = pathInCurrentDirectory(info => info.stat.isDirectory());

src/plugins/autocompletion_providers/Git.ts

@@ -5,7 +5,7 @@ import {
 } from "../../Parser";
 import {description, command, styles, style} from "./Suggestions";
 import {compose} from "../../utils/Common";
-import {file} from "./File";
+import {relativeFilePath} from "./File";
 
 // class File extends Suggestion {
 //     constructor(protected _line: string) {
@@ -173,7 +173,7 @@ const branchesExceptCurrent = decorate(
 );
 
 const gitCommand = choice([
-    sequence(decorate(token(string("add")), compose(command, description("Add file contents to the index."))), many1(file)),
+    sequence(decorate(token(string("add")), compose(command, description("Add file contents to the index."))), many1(relativeFilePath)),
     decorate(string("am"), compose(command, description("Apply a series of patches from a mailbox."))),
     decorate(string("archive"), compose(command, description("Create an archive of files from a named tree."))),
     decorate(string("bisect"), compose(command, description("Find by binary search the change that introduced a bug."))),

src/plugins/autocompletion_providers/Redirect.ts

@@ -1,9 +1,9 @@
 import {string, token, spacesWithoutSuggestion, many, sequence, noisySuggestions, choice} from "../../Parser";
-import {file} from "./File";
+import {relativeFilePath} from "./File";
 
 const redirectToken = choice([
     noisySuggestions(sequence(many(spacesWithoutSuggestion), token(string(">")))),
     noisySuggestions(sequence(many(spacesWithoutSuggestion), token(string(">>")))),
 ]);
 
-export const redirect = sequence(redirectToken, file);
+export const redirect = sequence(redirectToken, relativeFilePath);