core: fix recently used quick-commands

packages/core/src/browser/quick-open/quick-command-service.ts

@@ -86,8 +86,8 @@ export class QuickCommandService implements QuickOpenModel, QuickOpenHandler {
                     this.commands,
                     this.keybindings,
                     {
-                        groupLabel: recent.length <= 0 ? '' : index === 0 ? 'other commands' : '',
-                        showBorder: recent.length <= 0 ? false : index === 0 ? true : false,
+                        groupLabel: recent.length > 0 && index === 0 ? 'other commands' : '',
+                        showBorder: recent.length > 0 && index === 0 ? true : false,
                     }
                 )
             ),
@@ -160,13 +160,13 @@ export class QuickCommandService implements QuickOpenModel, QuickOpenHandler {
 
     /**
      * Normalizes a list of commands.
-     * Normalization includes obtaining commands that have labels and are visible.
+     * Normalization includes obtaining commands that have labels, are visible, and are enabled.
      *
      * @param commands the list of commands.
      * @returns the list of normalized commands.
      */
     private normalize(commands: Command[]): Command[] {
-        return commands.filter((a: Command) => a.label && this.commands.isVisible(a.id));
+        return commands.filter((a: Command) => a.label && (this.commands.isVisible(a.id) && this.commands.isEnabled(a.id)));
     }
 
     /**

packages/core/src/common/command.spec.ts

@@ -141,6 +141,48 @@ describe('Commands', () => {
         expect(commandRegistry.getAllHandlers('id').length).to.be.equal(2);
     });
 
+    describe('compareCommands', () => {
+
+        it('should sort command \'a\' before command \'b\' with categories', () => {
+            const a: Command = { id: 'a', category: 'a', label: 'a' };
+            const b: Command = { id: 'b', category: 'b', label: 'b' };
+            expect(Command.compareCommands(a, b)).to.equal(-1);
+            expect(Command.compareCommands(b, a)).to.equal(1);
+        });
+
+        it('should sort command \'a\' before command \'b\' without categories', () => {
+            const a: Command = { id: 'a', label: 'a' };
+            const b: Command = { id: 'b', label: 'b' };
+            expect(Command.compareCommands(a, b)).to.equal(-1);
+            expect(Command.compareCommands(b, a)).to.equal(1);
+        });
+
+        it('should sort command \'a\' before command \'b\' with mix-match categories', () => {
+            const a: Command = { id: 'a', category: 'a', label: 'a' };
+            const b: Command = { id: 'b', label: 'a' };
+            expect(Command.compareCommands(a, b)).to.equal(1);
+            expect(Command.compareCommands(b, a)).to.equal(-1);
+        });
+
+        it('should sort irregardless of casing', () => {
+            const lowercase: Command = { id: 'a', label: 'a' };
+            const uppercase: Command = { id: 'a', label: 'A' };
+            expect(Command.compareCommands(lowercase, uppercase)).to.equal(0);
+        });
+
+        it('should not sort if commands are equal', () => {
+            const a: Command = { id: 'a', label: 'a' };
+            expect(Command.compareCommands(a, a)).to.equal(0);
+        });
+
+        it('should not sort commands without labels', () => {
+            const a: Command = { id: 'a' };
+            const b: Command = { id: 'b' };
+            expect(Command.compareCommands(a, b)).to.equal(0);
+        });
+
+    });
+
 });
 
 class EmptyContributionProvider implements ContributionProvider<CommandContribution> {

packages/core/src/common/command.ts

@@ -53,8 +53,8 @@ export namespace Command {
     /** Comparator function for when sorting commands */
     export function compareCommands(a: Command, b: Command): number {
         if (a.label && b.label) {
-            const aCommand = (a.category) ? a.category + a.label : a.label;
-            const bCommand = (b.category) ? b.category + b.label : b.label;
+            const aCommand = (a.category ? `${a.category}: ${a.label}` : a.label).toLowerCase();
+            const bCommand = (b.category ? `${b.category}: ${b.label}` : b.label).toLowerCase();
             return (aCommand).localeCompare(bCommand);
         } else {
             return 0;