Return PartialSuggestion from AutocompletionProviders.

Author: vlad-shatskyi

src/Interfaces.ts

@@ -3,7 +3,7 @@ import {Stats} from "fs";
 import {ReactElement} from "react";
 import {Job} from "./shell/Job";
 import {Session} from "./shell/Session";
-import {Suggestion} from "./plugins/autocompletion_utils/Common";
+import {PartialSuggestion} from "./plugins/autocompletion_utils/Common";
 import {ScreenBuffer} from "./ScreenBuffer";
 import {Environment} from "./shell/Environment";
 import {OrderedSet} from "./utils/OrderedSet";
@@ -34,7 +34,7 @@ export interface AutocompletionContext extends PreliminaryAutocompletionContext
     readonly argument: Argument;
 }
 
-export type AutocompletionProvider = (context: AutocompletionContext) => Promise<Suggestion[]>;
+export type AutocompletionProvider = (context: AutocompletionContext) => Promise<PartialSuggestion[]>;
 
 export interface FileInfo {
     name: string;

src/plugins/autocompletion_providers/Ps.ts

@@ -1,6 +1,6 @@
 import {PluginManager} from "../../PluginManager";
 import {
-    shortFlag, mapSuggestions, Suggestion, styles, provide,
+    shortFlag, mapSuggestions, Suggestion, styles, provide, PartialSuggestion,
 }
     from "../autocompletion_utils/Common";
 import combine from "../autocompletion_utils/Combine";
@@ -169,7 +169,7 @@ const longOptions: LongFlagItem[] = [
 ];
 
 const longFlagSuggestions = provide(async context => {
-    let suggestions: Suggestion[] = [];
+    let suggestions: PartialSuggestion[] = [];
     const token: string = context.argument.value;
     for (let i of longOptions) {
         const flag = "--" + i.flag;

src/plugins/autocompletion_utils/Combine.ts

@@ -1,9 +1,9 @@
 import * as _ from "lodash";
 import {AutocompletionContext, AutocompletionProvider} from "../../Interfaces";
-import {Suggestion} from "./Common";
+import {PartialSuggestion} from "./Common";
 
 export default (providers: AutocompletionProvider[]): AutocompletionProvider => {
-    return async(context: AutocompletionContext): Promise<Suggestion[]> => {
+    return async(context: AutocompletionContext): Promise<PartialSuggestion[]> => {
         return _.flatten(await Promise.all(providers.map(provider => provider(context))));
     };
 };

src/plugins/autocompletion_utils/Common.ts

@@ -100,11 +100,6 @@ export class Suggestion {
         return this;
     }
 
-    withSpace(): this {
-        this.attributes.space = true;
-        return this;
-    }
-
     private get truncatedDescription(): string {
         return _.truncate(this.description, {length: 50, separator: " "});
     }
@@ -388,7 +383,7 @@ export const combineShortFlags = (suggestionsProvider: AutocompletionProvider) =
             return suggestions
                     .filter(s =>
                         reShortFlag.test(s.value) && !token.includes(s.value.slice(1))
-                            && s.withSpace)
+                            && s.space)
                     .map(s =>
                         new Suggestion({value: token + s.value.slice(1),
                             displayValue: s.displayValue, description: s.description,

src/shell/Parser.ts

@@ -13,7 +13,7 @@ import {
     styles,
     anyFilesSuggestions,
     environmentVariableSuggestions,
-    executableFilesSuggestions,
+    executableFilesSuggestions, PartialSuggestion,
 } from "../plugins/autocompletion_utils/Common";
 
 
@@ -362,7 +362,7 @@ export class Argument extends LeafNode {
         this.position = position;
     }
 
-    async suggestions(context: PreliminaryAutocompletionContext): Promise<Suggestion[]> {
+    async suggestions(context: PreliminaryAutocompletionContext): Promise<PartialSuggestion[]> {
         const argument = argumentOfExpandedAST(this, context.aliases);
         const provider = combine([
             environmentVariableSuggestions,