open boards config in own contribution.

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

Author: Akos Kitta

arduino-ide-extension/src/browser/arduino-commands.ts

@@ -52,9 +52,7 @@ import {
   CurrentSketch,
   SketchesServiceClientImpl,
 } from '../common/protocol/sketches-service-client-impl';
-import { ArduinoCommands } from './arduino-commands';
 import { ArduinoPreferences } from './arduino-preferences';
-import { BoardsConfigDialog } from './boards/boards-config-dialog';
 import { BoardsServiceProvider } from './boards/boards-service-provider';
 import { BoardsToolBarItem } from './boards/boards-toolbar-item';
 import { OpenSketchFiles } from './contributions/open-sketch-files';
@@ -84,17 +82,14 @@ export class ArduinoFrontendContribution
   private readonly libraryService: LibraryService;
 
   @inject(BoardsServiceProvider)
-  private readonly boardsServiceClientImpl: BoardsServiceProvider;
+  private readonly boardsServiceProvider: BoardsServiceProvider;
 
   @inject(FileService)
   private readonly fileService: FileService;
 
   @inject(SketchesService)
   private readonly sketchService: SketchesService;
 
-  @inject(BoardsConfigDialog)
-  private readonly boardsConfigDialog: BoardsConfigDialog;
-
   @inject(CommandRegistry)
   private readonly commandRegistry: CommandRegistry;
 
@@ -234,7 +229,7 @@ export class ArduinoFrontendContribution
         <BoardsToolBarItem
           key="boardsToolbarItem"
           commands={this.commandRegistry}
-          boardsServiceClient={this.boardsServiceClientImpl}
+          boardsServiceProvider={this.boardsServiceProvider}
         />
       ),
       isVisible: (widget) =>
@@ -249,15 +244,6 @@ export class ArduinoFrontendContribution
   }
 
   registerCommands(registry: CommandRegistry): void {
-    registry.registerCommand(ArduinoCommands.OPEN_BOARDS_DIALOG, {
-      execute: async (query?: string | undefined) => {
-        const boardsConfig = await this.boardsConfigDialog.open(query);
-        if (boardsConfig) {
-          this.boardsServiceClientImpl.boardsConfig = boardsConfig;
-        }
-      },
-    });
-
     for (const command of [
       EditorCommands.SPLIT_EDITOR_DOWN,
       EditorCommands.SPLIT_EDITOR_LEFT,

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

@@ -308,6 +308,7 @@ import { OpenSketchFiles } from './contributions/open-sketch-files';
 import { InoLanguage } from './contributions/ino-language';
 import { SelectedBoard } from './contributions/selected-board';
 import { CheckForUpdates } from './contributions/check-for-updates';
+import { OpenBoardsConfig } from './contributions/open-boards-config';
 
 MonacoThemingService.register({
   id: 'arduino-theme',
@@ -704,6 +705,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   Contribution.configure(bind, InoLanguage);
   Contribution.configure(bind, SelectedBoard);
   Contribution.configure(bind, CheckForUpdates);
+  Contribution.configure(bind, OpenBoardsConfig);
 
   // 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/arduino-ide-frontend-module.ts

@@ -17,7 +17,6 @@ import {
 import { BoardsConfig } from './boards-config';
 import { naturalCompare } from '../../common/utils';
 import { NotificationCenter } from '../notification-center';
-import { ArduinoCommands } from '../arduino-commands';
 import { StorageWrapper } from '../storage-wrapper';
 import { nls } from '@theia/core/lib/common';
 import { Deferred } from '@theia/core/lib/common/promise-util';
@@ -171,7 +170,7 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
           .then(async (answer) => {
             if (answer === yes) {
               this.commandService.executeCommand(
-                ArduinoCommands.OPEN_BOARDS_DIALOG.id,
+                'arduino-open-boards-dialog',
                 selectedBoard.name
               );
             }

arduino-ide-extension/src/browser/boards/boards-service-provider.ts

@@ -4,12 +4,12 @@ import { CommandRegistry } from '@theia/core/lib/common/command';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import { Port } from '../../common/protocol';
 import { BoardsConfig } from './boards-config';
-import { ArduinoCommands } from '../arduino-commands';
 import {
   BoardsServiceProvider,
   AvailableBoard,
 } from './boards-service-provider';
 import { nls } from '@theia/core/lib/common';
+import { OpenBoardsConfig } from '../contributions/open-boards-config';
 
 export interface BoardsDropDownListCoords {
   readonly top: number;
@@ -119,7 +119,7 @@ export class BoardsToolBarItem extends React.Component<
   constructor(props: BoardsToolBarItem.Props) {
     super(props);
 
-    const { availableBoards } = props.boardsServiceClient;
+    const { availableBoards } = props.boardsServiceProvider;
     this.state = {
       availableBoards,
       coords: 'hidden',
@@ -131,8 +131,8 @@ export class BoardsToolBarItem extends React.Component<
   }
 
   override componentDidMount(): void {
-    this.props.boardsServiceClient.onAvailableBoardsChanged((availableBoards) =>
-      this.setState({ availableBoards })
+    this.props.boardsServiceProvider.onAvailableBoardsChanged(
+      (availableBoards) => this.setState({ availableBoards })
     );
   }
 
@@ -163,7 +163,7 @@ export class BoardsToolBarItem extends React.Component<
 
   override render(): React.ReactNode {
     const { coords, availableBoards } = this.state;
-    const boardsConfig = this.props.boardsServiceClient.boardsConfig;
+    const boardsConfig = this.props.boardsServiceProvider.boardsConfig;
     const title = BoardsConfig.Config.toString(boardsConfig, {
       default: nls.localize(
         'arduino/common/noBoardSelected',
@@ -202,12 +202,12 @@ export class BoardsToolBarItem extends React.Component<
               ...board,
               onClick: () => {
                 if (board.state === AvailableBoard.State.incomplete) {
-                  this.props.boardsServiceClient.boardsConfig = {
+                  this.props.boardsServiceProvider.boardsConfig = {
                     selectedPort: board.port,
                   };
                   this.openDialog();
                 } else {
-                  this.props.boardsServiceClient.boardsConfig = {
+                  this.props.boardsServiceProvider.boardsConfig = {
                     selectedBoard: board,
                     selectedPort: board.port,
                   };
@@ -221,13 +221,15 @@ export class BoardsToolBarItem extends React.Component<
   }
 
   protected openDialog = () => {
-    this.props.commands.executeCommand(ArduinoCommands.OPEN_BOARDS_DIALOG.id);
+    this.props.commands.executeCommand(
+      OpenBoardsConfig.Commands.OPEN_DIALOG.id
+    );
     this.setState({ coords: 'hidden' });
   };
 }
 export namespace BoardsToolBarItem {
   export interface Props {
-    readonly boardsServiceClient: BoardsServiceProvider;
+    readonly boardsServiceProvider: BoardsServiceProvider;
     readonly commands: CommandRegistry;
   }
 

arduino-ide-extension/src/browser/boards/boards-toolbar-item.tsx

@@ -0,0 +1,32 @@
+import { CommandRegistry } from '@theia/core';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { BoardsConfigDialog } from '../boards/boards-config-dialog';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
+import { Contribution, Command } from './contribution';
+
+@injectable()
+export class OpenBoardsConfig extends Contribution {
+  @inject(BoardsServiceProvider)
+  private readonly boardsServiceProvider: BoardsServiceProvider;
+
+  @inject(BoardsConfigDialog)
+  private readonly boardsConfigDialog: BoardsConfigDialog;
+
+  override registerCommands(registry: CommandRegistry): void {
+    registry.registerCommand(OpenBoardsConfig.Commands.OPEN_DIALOG, {
+      execute: async (query?: string | undefined) => {
+        const boardsConfig = await this.boardsConfigDialog.open(query);
+        if (boardsConfig) {
+          this.boardsServiceProvider.boardsConfig = boardsConfig;
+        }
+      },
+    });
+  }
+}
+export namespace OpenBoardsConfig {
+  export namespace Commands {
+    export const OPEN_DIALOG: Command = {
+      id: 'arduino-open-boards-dialog',
+    };
+  }
+}