first start installer has its own contribution.

Signed-off-by: Akos Kitta <[email protected]>

Author: Akos Kitta

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

@@ -5,11 +5,7 @@ import {
   postConstruct,
 } from '@theia/core/shared/inversify';
 import * as React from '@theia/core/shared/react';
-import {
-  BoardsService,
-  LibraryService,
-  SketchesService,
-} from '../common/protocol';
+import { SketchesService } from '../common/protocol';
 import {
   MAIN_MENU_BAR,
   MenuContribution,
@@ -19,7 +15,6 @@ import {
   Dialog,
   FrontendApplication,
   FrontendApplicationContribution,
-  LocalStorageService,
   OnWillStopAction,
 } from '@theia/core/lib/browser';
 import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
@@ -52,8 +47,6 @@ import { MonitorViewContribution } from './serial/monitor/monitor-view-contribut
 import { ArduinoToolbar } from './toolbar/arduino-toolbar';
 import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
 
-const INIT_LIBS_AND_PACKAGES = 'initializedLibsAndPackages';
-
 @injectable()
 export class ArduinoFrontendContribution
   implements
@@ -66,12 +59,6 @@ export class ArduinoFrontendContribution
   @inject(MessageService)
   private readonly messageService: MessageService;
 
-  @inject(BoardsService)
-  private readonly boardsService: BoardsService;
-
-  @inject(LibraryService)
-  private readonly libraryService: LibraryService;
-
   @inject(BoardsServiceProvider)
   private readonly boardsServiceProvider: BoardsServiceProvider;
 
@@ -87,35 +74,11 @@ export class ArduinoFrontendContribution
   @inject(SketchesServiceClientImpl)
   private readonly sketchServiceClient: SketchesServiceClientImpl;
 
-  @inject(LocalStorageService)
-  private readonly localStorageService: LocalStorageService;
-
   @inject(FrontendApplicationStateService)
   private readonly appStateService: FrontendApplicationStateService;
 
   @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

@@ -310,6 +310,7 @@ import { SelectedBoard } from './contributions/selected-board';
 import { CheckForUpdates } from './contributions/check-for-updates';
 import { OpenBoardsConfig } from './contributions/open-boards-config';
 import { SketchFilesTracker } from './contributions/sketch-files-tracker';
+import { FirstStartInstaller } from './contributions/first-start-installer';
 
 MonacoThemingService.register({
   id: 'arduino-theme',
@@ -708,6 +709,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   Contribution.configure(bind, CheckForUpdates);
   Contribution.configure(bind, OpenBoardsConfig);
   Contribution.configure(bind, SketchFilesTracker);
+  Contribution.configure(bind, FirstStartInstaller);
 
   // 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/first-start-installer.ts

@@ -0,0 +1,45 @@
+import { LocalStorageService } from '@theia/core/lib/browser/storage-service';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { BoardsService, LibraryService } from '../../common/protocol';
+import { Contribution } from './contribution';
+
+const INIT_LIBS_AND_PACKAGES = 'initializedLibsAndPackages';
+
+@injectable()
+export class FirstStartInstaller extends Contribution {
+  @inject(LocalStorageService)
+  private readonly localStorageService: LocalStorageService;
+
+  @inject(BoardsService)
+  private readonly boardsService: BoardsService;
+
+  @inject(LibraryService)
+  private readonly libraryService: LibraryService;
+
+  override onReady(): void {
+    this.localStorageService
+      .getData(INIT_LIBS_AND_PACKAGES)
+      .then(async (value) => {
+        const isFirstStartup = !value;
+        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,
+            }));
+        }
+      });
+  }
+}