moved selected board tracker to its module.

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>

Author: Akos Kitta

arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx

@@ -25,8 +25,6 @@ import {
   LocalStorageService,
   OnWillStopAction,
   SaveableWidget,
-  StatusBar,
-  StatusBarAlignment,
 } from '@theia/core/lib/browser';
 import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
 import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
@@ -57,7 +55,6 @@ import {
 } from '../common/protocol/sketches-service-client-impl';
 import { ArduinoCommands } from './arduino-commands';
 import { ArduinoPreferences } from './arduino-preferences';
-import { BoardsConfig } from './boards/boards-config';
 import { BoardsConfigDialog } from './boards/boards-config-dialog';
 import { BoardsServiceProvider } from './boards/boards-service-provider';
 import { BoardsToolBarItem } from './boards/boards-toolbar-item';
@@ -104,9 +101,6 @@ export class ArduinoFrontendContribution
   @inject(CommandRegistry)
   private readonly commandRegistry: CommandRegistry;
 
-  @inject(StatusBar)
-  private readonly statusBar: StatusBar;
-
   @inject(ArduinoPreferences)
   private readonly arduinoPreferences: ArduinoPreferences;
 
@@ -162,36 +156,6 @@ export class ArduinoFrontendContribution
         )
       );
     }
-    const updateStatusBar = ({
-      selectedBoard,
-      selectedPort,
-    }: BoardsConfig.Config) => {
-      this.statusBar.setElement('arduino-selected-board', {
-        alignment: StatusBarAlignment.RIGHT,
-        text: selectedBoard
-          ? `$(microchip) ${selectedBoard.name}`
-          : `$(close) ${nls.localize(
-              'arduino/common/noBoardSelected',
-              'No board selected'
-            )}`,
-        className: 'arduino-selected-board',
-      });
-      if (selectedBoard) {
-        this.statusBar.setElement('arduino-selected-port', {
-          alignment: StatusBarAlignment.RIGHT,
-          text: selectedPort
-            ? nls.localize(
-                'arduino/common/selectedOn',
-                'on {0}',
-                selectedPort.address
-              )
-            : nls.localize('arduino/common/notConnected', '[not connected]'),
-          className: 'arduino-selected-port',
-        });
-      }
-    };
-    this.boardsServiceClientImpl.onBoardsConfigChanged(updateStatusBar);
-    updateStatusBar(this.boardsServiceClientImpl.boardsConfig);
     this.appStateService.reachedState('ready').then(async () => {
       const sketch = await this.sketchServiceClient.currentSketch();
       if (
@@ -282,6 +246,7 @@ export class ArduinoFrontendContribution
       webContents.setZoomLevel(zoomLevel);
     });
 
+    // Removes the _Settings_ (cog) icon from the left sidebar
     app.shell.leftPanelHandler.removeBottomMenu('settings-menu');
 
     this.fileSystemFrontendContribution.onDidChangeEditorFile(

arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts

@@ -306,6 +306,7 @@ import { Daemon } from './contributions/daemon';
 import { Notifications } from './contributions/notifications';
 import { OpenSketchFiles } from './contributions/open-sketch-files';
 import { InoLanguage } from './contributions/ino-language';
+import { SelectedBoard } from './contributions/selected-board';
 
 MonacoThemingService.register({
   id: 'arduino-theme',
@@ -700,6 +701,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   Contribution.configure(bind, Notifications);
   Contribution.configure(bind, OpenSketchFiles);
   Contribution.configure(bind, InoLanguage);
+  Contribution.configure(bind, SelectedBoard);
 
   // 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.

arduino-ide-extension/src/browser/contributions/selected-board.ts

@@ -0,0 +1,54 @@
+import {
+  StatusBar,
+  StatusBarAlignment,
+} from '@theia/core/lib/browser/status-bar/status-bar';
+import { nls } from '@theia/core/lib/common/nls';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { BoardsConfig } from '../boards/boards-config';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
+import { Contribution } from './contribution';
+
+@injectable()
+export class SelectedBoard extends Contribution {
+  @inject(StatusBar)
+  private readonly statusBar: StatusBar;
+
+  @inject(BoardsServiceProvider)
+  private readonly boardsServiceProvider: BoardsServiceProvider;
+
+  override onStart(): void {
+    this.boardsServiceProvider.onBoardsConfigChanged((config) =>
+      this.update(config)
+    );
+  }
+
+  override onReady(): void {
+    this.update(this.boardsServiceProvider.boardsConfig);
+  }
+
+  private update({ selectedBoard, selectedPort }: BoardsConfig.Config): void {
+    this.statusBar.setElement('arduino-selected-board', {
+      alignment: StatusBarAlignment.RIGHT,
+      text: selectedBoard
+        ? `$(microchip) ${selectedBoard.name}`
+        : `$(close) ${nls.localize(
+            'arduino/common/noBoardSelected',
+            'No board selected'
+          )}`,
+      className: 'arduino-selected-board',
+    });
+    if (selectedBoard) {
+      this.statusBar.setElement('arduino-selected-port', {
+        alignment: StatusBarAlignment.RIGHT,
+        text: selectedPort
+          ? nls.localize(
+              'arduino/common/selectedOn',
+              'on {0}',
+              selectedPort.address
+            )
+          : nls.localize('arduino/common/notConnected', '[not connected]'),
+        className: 'arduino-selected-port',
+      });
+    }
+  }
+}