Fix tests

Signed-off-by: Dmitry Sharshakov <[email protected]>
dsseng · Apr 12, 2020 · 0554e1a · 0554e1a
1 parent 82555f6
commit 0554e1a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/packages/core/src/browser/quick-open/quick-command-service.ts b/packages/core/src/browser/quick-open/quick-command-service.ts
@@ -50,6 +50,19 @@ export class QuickCommandService implements QuickOpenModel, QuickOpenHandler {
     @inject(CorePreferences)
     protected readonly corePreferences: CorePreferences;
 
+    protected recent: Command[] = [];
+    addRecentCommand(command: Command): void {
+        // If this command is in recent list, remove and append to the start
+        const index = this.recent.findIndex(c => Command.equals(command, c));
+        if (index >= 0) {
+            this.recent.splice(index, 1);
+        }
+
+        const limit: number = this.corePreferences['workbench.commandPalette.history'];
+
+        this.recent = [command, ...this.recent].slice(0, limit);
+    }
+
     protected readonly contexts = new Map<string, string[]>();
     pushCommandContext(commandId: string, when: string): Disposable {
         const contexts = this.contexts.get(commandId) || [];
@@ -77,7 +90,8 @@ export class QuickCommandService implements QuickOpenModel, QuickOpenHandler {
                     {
                         groupLabel: index === 0 ? 'recently used' : '',
                         showBorder: false,
-                    }
+                    },
+                    this
                 )
             ),
             ...other.map((command, index) =>
@@ -88,7 +102,8 @@ export class QuickCommandService implements QuickOpenModel, QuickOpenHandler {
                     {
                         groupLabel: recent.length <= 0 ? '' : index === 0 ? 'other commands' : '',
                         showBorder: recent.length <= 0 ? false : index === 0 ? true : false,
-                    }
+                    },
+                    this
                 )
             ),
         );
@@ -114,7 +129,7 @@ export class QuickCommandService implements QuickOpenModel, QuickOpenHandler {
     private getCommands(): { recent: Command[], other: Command[] } {
 
         // Get the list of recent commands.
-        const recentCommands: Command[] = this.commands.recent;
+        const recentCommands: Command[] = this.recent;
 
         // Get the list of all valid commands.
         const allCommands: Command[] = this.getValidCommands(this.commands.commands);
@@ -210,6 +225,7 @@ export class CommandQuickOpenItem extends QuickOpenGroupItem {
         protected readonly commands: CommandRegistry,
         protected readonly keybindings: KeybindingRegistry,
         protected readonly commandOptions?: QuickOpenGroupItemOptions,
+        protected readonly quickCommand?: QuickCommandService
     ) {
         super(commandOptions);
         this.activeElement = window.document.activeElement as HTMLElement;
@@ -249,8 +265,8 @@ export class CommandQuickOpenItem extends QuickOpenGroupItem {
             this.activeElement.focus({ preventScroll: true });
             this.commands.executeCommand(this.command.id);
 
-            if (this.command) {
-                this.commands.addRecentCommand(this.command);
+            if (this.quickCommand) {
+                this.quickCommand.addRecentCommand(this.command);
             }
         }, 50);
         return true;

diff --git a/packages/core/src/common/command.ts b/packages/core/src/common/command.ts
@@ -289,6 +289,10 @@ export class CommandRegistry implements CommandService {
             await this.fireWillExecuteCommand(commandId, args);
             const result = await handler.execute(...args);
             this.onDidExecuteCommandEmitter.fire({ commandId, args });
+            const command = this.getCommand(commandId);
+            if (command) {
+                this.addRecentCommand(command);
+            }
             return result;
         }
         const argsMessage = args && args.length > 0 ? ` (args: ${JSON.stringify(args)})` : '';