Add StaticAutocompletionProvider.

Author: vlad-shatskyi

src/Interfaces.ts

@@ -32,7 +32,9 @@ export interface SuggestionContext extends PreliminarySuggestionContext {
     readonly argument: Argument;
 }
 
-export type AutocompletionProvider = (context: SuggestionContext) => Promise<Suggestion[]>;
+export type DynamicAutocompletionProvider = (context: SuggestionContext) => Promise<Suggestion[]>;
+export type StaticAutocompletionProvider = Suggestion[];
+export type AutocompletionProvider = DynamicAutocompletionProvider | StaticAutocompletionProvider;
 
 export interface FileInfo {
     name: string;

src/plugins/autocompletion_providers/Common.ts

@@ -1,6 +1,9 @@
 import {statsIn, resolveDirectory, directoryName} from "../../utils/Common";
 import {styles, Suggestion} from "./Suggestions";
-import {FileInfo, SuggestionContext, AutocompletionProvider} from "../../Interfaces";
+import {
+    FileInfo, SuggestionContext, AutocompletionProvider, StaticAutocompletionProvider,
+    DynamicAutocompletionProvider,
+} from "../../Interfaces";
 import * as Path from "path";
 
 function pathSuggestion(directory: string, path: string) {
@@ -35,7 +38,16 @@ export const environmentVariableSuggestions = async (context: SuggestionContext)
 };
 
 export const combineAutocompletionProviders = (providers: AutocompletionProvider[]): AutocompletionProvider => async (context: SuggestionContext): Promise<Suggestion[]> => {
-    return _.flatten(await Promise.all(providers.map(provider => provider(context))));
-};
+    const staticProviders: StaticAutocompletionProvider[] = [];
+    const dynamicProviders: DynamicAutocompletionProvider[] = [];
+
+    for (const provider of providers) {
+        if (Array.isArray(provider)) {
+            staticProviders.push(provider);
+        } else {
+            dynamicProviders.push(provider);
+        }
+    }
 
-export const staticProvider = (suggestions: Suggestion[]): AutocompletionProvider => async (context: SuggestionContext): Promise<Suggestion[]> => suggestions;
+    return _.flatten(staticProviders.concat(await Promise.all(dynamicProviders.map(provider => provider(context)))));
+};

src/plugins/autocompletion_providers/Git.ts

@@ -2,7 +2,7 @@ import * as Git from "../../utils/Git";
 import {styles, Suggestion, longAndShortOption, longOption} from "./Suggestions";
 import {PluginManager} from "../../PluginManager";
 import {AutocompletionProvider, SuggestionContext} from "../../Interfaces";
-import {staticProvider, combineAutocompletionProviders} from "./Common";
+import {combineAutocompletionProviders} from "./Common";
 import {linedOutputOf} from "../../PTY";
 
 const addOptions = [
@@ -102,12 +102,12 @@ const notStagedFiles = async(context: SuggestionContext): Promise<Suggestion[]>
 };
 
 const subCommandProviders: Dictionary<AutocompletionProvider> = {
-    add: combineAutocompletionProviders([notStagedFiles, staticProvider(addOptions)]),
+    add: combineAutocompletionProviders([notStagedFiles, addOptions]),
     checkout: combineAutocompletionProviders([branchesExceptCurrent, branchAlias]),
-    commit: staticProvider(commitOptions),
-    status: staticProvider(statusOptions),
+    commit: commitOptions,
+    status: statusOptions,
     merge: combineAutocompletionProviders([branchesExceptCurrent, branchAlias]),
-    push: staticProvider(pushOptions),
+    push: pushOptions,
 };
 
 const subCommands = [
@@ -267,7 +267,11 @@ PluginManager.registerAutocompletionProvider("git", async(context) => {
     } else {
         const subCommandProvider = subCommandProviders[context.argument.command.nthArgument(1).value];
         if (subCommandProvider) {
-            return subCommandProvider(context);
+            if (Array.isArray(subCommandProvider)) {
+                return subCommandProvider;
+            } else {
+                subCommandProvider(Object.assign({argument: this}, context));
+            }
         } else {
             return [];
         }

src/plugins/autocompletion_providers/Rails.ts

@@ -1,6 +1,5 @@
 import {styles, Suggestion} from "./Suggestions";
 import {PluginManager} from "../../PluginManager";
-import {staticProvider} from "./Common";
 
 const railsCommandConfig = [
     {
@@ -39,4 +38,4 @@ const railsCommandConfig = [
 
 const railsCommand = railsCommandConfig.map(config => new Suggestion().withValue(config.name).withDescription(config.description).withStyle(styles.command));
 
-PluginManager.registerAutocompletionProvider("rails", staticProvider(railsCommand));
+PluginManager.registerAutocompletionProvider("rails", railsCommand);

src/shell/Parser2.ts

@@ -5,7 +5,7 @@ import {memoizeAccessor} from "../Decorators";
 import {commandDescriptions} from "../plugins/autocompletion_providers/Executable";
 import {executablesInPaths} from "../utils/Common";
 import {loginShell} from "../utils/Shell";
-import {PreliminarySuggestionContext} from "../Interfaces";
+import {PreliminarySuggestionContext, AutocompletionProvider} from "../Interfaces";
 import {PluginManager} from "../PluginManager";
 
 export abstract class ASTNode {
@@ -147,8 +147,14 @@ export class Argument extends LeafNode {
         this.position = position;
     }
 
-    suggestions(context: PreliminarySuggestionContext): Promise<Suggestion[]> {
-        return PluginManager.autocompletionProviderFor(this.command.commandWord.value)(Object.assign({argument: this}, context));
+    async suggestions(context: PreliminarySuggestionContext): Promise<Suggestion[]> {
+        const provider = PluginManager.autocompletionProviderFor(this.command.commandWord.value);
+
+        if (Array.isArray(provider)) {
+            return provider;
+        } else {
+            provider(Object.assign({argument: this}, context));
+        }
     }
 }