From 00fc9111f27bfb9a473cb2a8bb6ebbf360195b31 Mon Sep 17 00:00:00 2001 From: Akos Kitta Date: Wed, 5 Oct 2022 14:28:15 +0200 Subject: [PATCH] Ensure exact match when installing Arduino_BuiltIn on the first IDE2 startup. Closes #1526 Signed-off-by: Akos Kitta --- .../src/browser/contributions/first-startup-installer.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arduino-ide-extension/src/browser/contributions/first-startup-installer.ts b/arduino-ide-extension/src/browser/contributions/first-startup-installer.ts index f564bec2d..f55c4fe1e 100644 --- a/arduino-ide-extension/src/browser/contributions/first-startup-installer.ts +++ b/arduino-ide-extension/src/browser/contributions/first-startup-installer.ts @@ -7,6 +7,8 @@ import { } from '../../common/protocol'; import { Contribution } from './contribution'; +const Arduino_BuiltIn = 'Arduino_BuiltIn'; + @injectable() export class FirstStartupInstaller extends Contribution { @inject(LocalStorageService) @@ -25,8 +27,8 @@ export class FirstStartupInstaller extends Contribution { id: 'arduino:avr', }); const builtInLibrary = ( - await this.libraryService.search({ query: 'Arduino_BuiltIn' }) - )[0]; + await this.libraryService.search({ query: Arduino_BuiltIn }) + ).find(({ name }) => name === Arduino_BuiltIn); // Filter by `name` to ensure "exact match". See: https://github.com/arduino/arduino-ide/issues/1526. let avrPackageError: Error | undefined; let builtInLibraryError: Error | undefined; @@ -84,7 +86,7 @@ export class FirstStartupInstaller extends Contribution { } if (builtInLibraryError) { this.messageService.error( - `Could not install ${builtInLibrary.name} library: ${builtInLibraryError}` + `Could not install ${Arduino_BuiltIn} library: ${builtInLibraryError}` ); }