fixed fuzzy. added proper boost.

Signed-off-by: Akos Kitta <kittaakos@typefox.io>

Author: Akos Kitta

arduino-ide-extension/src/browser/boards/boards-data-menu-updater.ts

@@ -42,34 +42,36 @@ export class BoardsDataMenuUpdater implements FrontendApplicationContribution {
             const { fqbn } = selectedBoard;
             if (fqbn) {
                 const { configOptions, programmers, selectedProgrammer } = await this.boardsDataStore.getData(fqbn);
-                const boardsConfigMenuPath = [...ArduinoMenus.TOOLS, 'z01_boardsConfig']; // `z_` is for ordering.
-                for (const { label, option, values } of configOptions.sort(ConfigOption.LABEL_COMPARATOR)) {
-                    const menuPath = [...boardsConfigMenuPath, `${option}`];
-                    const commands = new Map<string, Disposable & { label: string }>()
-                    for (const value of values) {
-                        const id = `${fqbn}-${option}--${value.value}`;
-                        const command = { id };
-                        const selectedValue = value.value;
-                        const handler = {
-                            execute: () => this.boardsDataStore.selectConfigOption({ fqbn, option, selectedValue }),
-                            isToggled: () => value.selected
-                        };
-                        commands.set(id, Object.assign(this.commandRegistry.registerCommand(command, handler), { label: value.label }));
+                if (configOptions.length) {
+                    const boardsConfigMenuPath = [...ArduinoMenus.TOOLS, 'z01_boardsConfig']; // `z_` is for ordering.
+                    for (const { label, option, values } of configOptions.sort(ConfigOption.LABEL_COMPARATOR)) {
+                        const menuPath = [...boardsConfigMenuPath, `${option}`];
+                        const commands = new Map<string, Disposable & { label: string }>()
+                        for (const value of values) {
+                            const id = `${fqbn}-${option}--${value.value}`;
+                            const command = { id };
+                            const selectedValue = value.value;
+                            const handler = {
+                                execute: () => this.boardsDataStore.selectConfigOption({ fqbn, option, selectedValue }),
+                                isToggled: () => value.selected
+                            };
+                            commands.set(id, Object.assign(this.commandRegistry.registerCommand(command, handler), { label: value.label }));
+                        }
+                        this.menuRegistry.registerSubmenu(menuPath, label);
+                        this.toDisposeOnBoardChange.pushAll([
+                            ...commands.values(),
+                            Disposable.create(() => this.unregisterSubmenu(menuPath)), // We cannot dispose submenu entries: https://github.com/eclipse-theia/theia/issues/7299
+                            ...Array.from(commands.keys()).map((commandId, i) => {
+                                const { label } = commands.get(commandId)!;
+                                this.menuRegistry.registerMenuAction(menuPath, { commandId, order: `${i}`, label });
+                                return Disposable.create(() => this.menuRegistry.unregisterMenuAction(commandId));
+                            })
+                        ]);
                     }
-                    this.menuRegistry.registerSubmenu(menuPath, label);
-                    this.toDisposeOnBoardChange.pushAll([
-                        ...commands.values(),
-                        Disposable.create(() => this.unregisterSubmenu(menuPath)), // We cannot dispose submenu entries: https://github.com/eclipse-theia/theia/issues/7299
-                        ...Array.from(commands.keys()).map((commandId, i) => {
-                            const { label } = commands.get(commandId)!;
-                            this.menuRegistry.registerMenuAction(menuPath, { commandId, order: `${i}`, label });
-                            return Disposable.create(() => this.menuRegistry.unregisterMenuAction(commandId));
-                        })
-                    ]);
                 }
                 if (programmers.length) {
                     const programmersMenuPath = [...ArduinoMenus.TOOLS, 'z02_programmers'];
-                    const label = selectedProgrammer ? `Programmer: ${selectedProgrammer.name}` : 'Programmer'
+                    const label = selectedProgrammer ? `Programmer: "${selectedProgrammer.name}"` : 'Programmer'
                     this.menuRegistry.registerSubmenu(programmersMenuPath, label);
                     for (const programmer of programmers) {
                         const { id, name } = programmer;

arduino-ide-extension/src/browser/boards/boards-service-client-impl.ts

@@ -8,6 +8,12 @@ import { RecursiveRequired } from '../../common/types';
 import { BoardsServiceClient, AttachedBoardsChangeEvent, BoardInstalledEvent, Board, Port, BoardUninstalledEvent, BoardsService } from '../../common/protocol';
 import { BoardsConfig } from './boards-config';
 import { naturalCompare } from '../../common/utils';
+import { compareAnything } from '../theia/monaco/comparers';
+
+interface BoardMatch {
+    readonly board: Board & Readonly<{ packageName: string }>;
+    readonly matches: monaco.filters.IMatch[] | undefined;
+}
 
 @injectable()
 export class BoardsServiceClientImpl implements BoardsServiceClient, FrontendApplicationContribution {
@@ -168,13 +174,28 @@ export class BoardsServiceClientImpl implements BoardsServiceClient, FrontendApp
         const coresFilter = !!cores && cores.length
             ? ((toFilter: { packageName: string }) => cores.some(core => core === toFilter.packageName))
             : () => true;
-        const fuzzyFilter = !!query
-            ? ((toFilter: Board) => !!monaco.filters.matchesFuzzy(query, toFilter.name, true))
-            : () => true
-        return boards
-            .filter(coresFilter)
-            .filter(fuzzyFilter)
-            .sort(Board.compare)
+        if (!query) {
+            return boards.filter(coresFilter).sort(Board.compare);
+        }
+        const toMatch = ((toFilter: Board & { packageName: string }) => (({ board: toFilter, matches: monaco.filters.matchesFuzzy(query, toFilter.name, true) })));
+        const compareEntries = (left: BoardMatch, right: BoardMatch, lookFor: string) => {
+            const leftMatches = left.matches || [];
+            const rightMatches = right.matches || [];
+            if (leftMatches.length && !rightMatches.length) {
+                return -1;
+            }
+            if (!leftMatches.length && rightMatches.length) {
+                return 1;
+            }
+            if (leftMatches.length === 0 && rightMatches.length === 0) {
+                return 0;
+            }
+            const leftLabel = left.board.name.replace(/\r?\n/g, ' ');
+            const rightLabel = right.board.name.replace(/\r?\n/g, ' ');
+            return compareAnything(leftLabel, rightLabel, lookFor);
+        }
+        const normalizedQuery = query.toLowerCase();
+        return boards.filter(coresFilter).map(toMatch).sort((left, right) => compareEntries(left, right, normalizedQuery)).map(({ board }) => board);
     }
 
     get boardsConfig(): BoardsConfig.Config {

arduino-ide-extension/src/browser/contributions/edit-contributions.ts

@@ -219,7 +219,7 @@ ${value}
     }
 
     protected async run(commandId: string): Promise<any> {
-        const editor = await this.current();
+        const editor = await this.current(); // TODO: this should be the active monaco editor and not Theia editor. e.g: Output
         if (editor) {
             const action = editor.getControl().getAction(commandId);
             if (action) {