move initialization of libs and platforms into new contribution

Author: Alberto Iannaccone

Diff for: arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx

@@ -10,7 +10,6 @@ import {
   SketchesService,
   ExecutableService,
   Sketch,
-  LibraryService,
   ArduinoDaemon,
 } from '../common/protocol';
 import { Mutex } from 'async-mutex';
@@ -77,7 +76,6 @@ import { IDEUpdater } from '../common/protocol/ide-updater';
 import { FileSystemFrontendContribution } from '@theia/filesystem/lib/browser/filesystem-frontend-contribution';
 import { HostedPluginEvents } from './hosted-plugin-events';
 
-const INIT_LIBS_AND_PACKAGES = 'initializedLibsAndPackages';
 export const SKIP_IDE_VERSION = 'skipIDEVersion';
 
 @injectable()
@@ -98,9 +96,6 @@ export class ArduinoFrontendContribution
   @inject(BoardsService)
   private readonly boardsService: BoardsService;
 
-  @inject(LibraryService)
-  private readonly libraryService: LibraryService;
-
   @inject(BoardsServiceProvider)
   private readonly boardsServiceClientImpl: BoardsServiceProvider;
 
@@ -162,27 +157,6 @@ export class ArduinoFrontendContribution
 
   @postConstruct()
   protected async init(): Promise<void> {
-    const isFirstStartup = !(await this.localStorageService.getData(
-      INIT_LIBS_AND_PACKAGES
-    ));
-    if (isFirstStartup) {
-      await this.localStorageService.setData(INIT_LIBS_AND_PACKAGES, true);
-      const avrPackage = await this.boardsService.getBoardPackage({
-        id: 'arduino:avr',
-      });
-      const builtInLibrary = (
-        await this.libraryService.search({
-          query: 'Arduino_BuiltIn',
-        })
-      )[0];
-
-      !!avrPackage && (await this.boardsService.install({ item: avrPackage }));
-      !!builtInLibrary &&
-        (await this.libraryService.install({
-          item: builtInLibrary,
-          installDependencies: true,
-        }));
-    }
     if (!window.navigator.onLine) {
       // tslint:disable-next-line:max-line-length
       this.messageService.warn(

Diff for: arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts

@@ -302,6 +302,7 @@ import { CompilerErrors } from './contributions/compiler-errors';
 import { WidgetManager } from './theia/core/widget-manager';
 import { WidgetManager as TheiaWidgetManager } from '@theia/core/lib/browser/widget-manager';
 import { StartupTask } from './widgets/sketchbook/startup-task';
+import { InitLibsPlatforms } from './contributions/init-libs-platforms';
 
 MonacoThemingService.register({
   id: 'arduino-theme',
@@ -695,6 +696,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   Contribution.configure(bind, Format);
   Contribution.configure(bind, CompilerErrors);
   Contribution.configure(bind, StartupTask);
+  Contribution.configure(bind, InitLibsPlatforms);
 
   // Disabled the quick-pick customization from Theia when multiple formatters are available.
   // Use the default VS Code behavior, and pick the first one. In the IDE2, clang-format has `exclusive` selectors.

Diff for: arduino-ide-extension/src/browser/contributions/init-libs-platforms.ts

@@ -0,0 +1,47 @@
+import { LocalStorageService } from '@theia/core/lib/browser';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { BoardsService, LibraryService } from '../../common/protocol';
+import { Contribution } from './contribution';
+
+@injectable()
+export class InitLibsPlatforms extends Contribution {
+  @inject(LocalStorageService)
+  private readonly localStorageService: LocalStorageService;
+  @inject(BoardsService)
+  private readonly boardsService: BoardsService;
+  @inject(LibraryService)
+  private readonly libraryService: LibraryService;
+
+  override async onReady(): Promise<void> {
+    const isFirstStartup = !(await this.localStorageService.getData(
+      InitLibsPlatforms.INIT_LIBS_AND_PACKAGES
+    ));
+    if (isFirstStartup) {
+      await this.localStorageService.setData(
+        InitLibsPlatforms.INIT_LIBS_AND_PACKAGES,
+        true
+      );
+      const avrPackage = await this.boardsService.getBoardPackage({
+        id: 'arduino:avr',
+      });
+      const builtInLibrary = (
+        await this.libraryService.search({
+          query: 'Arduino_BuiltIn',
+        })
+      )[0];
+
+      if (avrPackage) {
+        await this.boardsService.install({ item: avrPackage });
+      }
+      if (builtInLibrary) {
+        await this.libraryService.install({
+          item: builtInLibrary,
+          installDependencies: true,
+        });
+      }
+    }
+  }
+}
+export namespace InitLibsPlatforms {
+  export const INIT_LIBS_AND_PACKAGES = 'initializedLibsAndPackages';
+}