Improve Arguments autocompletion provider.

railsware · Nov 27, 2015 · 9d14e2d · 9d14e2d
1 parent 7d18c5e
commit 9d14e2d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Autocompletion.ts b/src/Autocompletion.ts
@@ -1,5 +1,5 @@
 import Executable from './providers/Executable';
-import Command from './providers/Command';
+import Arguments from './providers/Arguments';
 import File from './providers/File';
 import Alias from './providers/Alias';
 import History from './providers/History';
@@ -9,7 +9,7 @@ import * as i from './Interfaces';
 import Prompt from "./Prompt";
 
 export default class Autocompletion implements i.AutocompletionProvider {
-    static providers = [new Command(), new Alias(), new Executable(), new File(), new History(), new HistoryExpansion()];
+    static providers = [new Arguments(), new Alias(), new Executable(), new File(), new History(), new HistoryExpansion()];
     static limit = 9;
 
     getSuggestions(prompt: Prompt) {

diff --git a/src/providers/Command.ts → src/providers/Arguments.ts b/src/providers/Command.ts → src/providers/Arguments.ts
@@ -10,9 +10,15 @@ export default class Command implements i.AutocompletionProvider {
     suggestions: Suggestion[] = [];
 
     async getSuggestions(prompt: Prompt) {
+        if (prompt.expanded.length < 2) {
+            return [];
+        }
+
         try {
             parser.yy.parseError = (err: any, hash: any) => {
-                var filtered = _._(hash.expected).filter((value: string) => _.include(value, hash.token))
+                const token = hash.token === 'EOF' ? "'" : `'${hash.token}`;
+
+                var filtered = _._(hash.expected).filter((value: string) => _.startsWith(value, token))
                     .map((value: string) => /^'(.*)'$/.exec(value)[1])
                     .value();