arduino
diff --git a/‎arduino-ide-extension/src/browser/boards/boards-service-provider.ts
Copy file name to clipboardExpand all lines: arduino-ide-extension/src/browser/boards/boards-service-provider.ts
+26-31Lines changed: 26 additions & 31 deletions b/‎arduino-ide-extension/src/browser/boards/boards-service-provider.ts
Copy file name to clipboardExpand all lines: arduino-ide-extension/src/browser/boards/boards-service-provider.ts
+26-31Lines changed: 26 additions & 31 deletions
@@ -11,12 +11,7 @@ import { Emitter } from '@theia/core/lib/common/event';
 import { ILogger } from '@theia/core/lib/common/logger';
 import { nls } from '@theia/core/lib/common/nls';
 import type { Mutable } from '@theia/core/lib/common/types';
-import {
-  inject,
-  injectable,
-  optional,
-  postConstruct,
-} from '@theia/core/shared/inversify';
+import { inject, injectable, optional } from '@theia/core/shared/inversify';
 import {
   OutputChannel,
   OutputChannelManager,
@@ -159,7 +154,7 @@ export class BoardsServiceProvider
 
   private _boardsConfig = emptyBoardsConfig();
   private _detectedPorts: DetectedPorts = {};
-  private _boardList: BoardListUI;
+  private _boardList = this.createBoardListUI(createBoardList({}));
   private _boardListHistory: Mutable<BoardListHistory> = {};
 
   private readonly boardsConfigDidChangeEmitter =
@@ -172,12 +167,6 @@ export class BoardsServiceProvider
    */
   readonly onBoardListDidChange = this.boardListDidChangeEmitter.event;
 
-  @postConstruct()
-  protected init(): void {
-    const boardList = createBoardList(this._detectedPorts, this._boardsConfig);
-    this._boardList = this.createBoardListUI(boardList);
-  }
-
   onStart(): void {
     this.notificationCenter.onDetectedPortsDidChange(({ detectedPorts }) =>
       this.refreshBoardList({ detectedPorts })
@@ -207,13 +196,15 @@ export class BoardsServiceProvider
 
   registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(USE_INHERITED_CONFIG, {
-      execute: (boardsConfig: BoardsConfig) =>
-        // TODO: inherit board config if stored per sketch?
-        this.update(
-          boardsConfig.selectedBoard,
-          boardsConfig.selectedPort,
-          'inherit'
-        ),
+      execute: (
+        boardsConfig: BoardsConfig,
+        boardListHistory: BoardListHistory
+      ) => {
+        if (boardListHistory) {
+          this._boardListHistory = boardListHistory;
+        }
+        this.update({ boardsConfig }, 'inherit');
+      },
     });
     if (this.boardListDumper) {
       registry.registerCommand(DUMP_BOARD_LIST, {
@@ -241,7 +232,7 @@ export class BoardsServiceProvider
     return [
       {
         command: USE_INHERITED_CONFIG.id,
-        args: [this._boardsConfig],
+        args: [this._boardsConfig, this._boardListHistory],
       },
     ];
   }
@@ -283,19 +274,19 @@ export class BoardsServiceProvider
       BoardsConfig | undefined
     >('arduino-open-boards-dialog', params);
     if (boardsConfig) {
-      this.update(
-        boardsConfig.selectedBoard,
-        boardsConfig.selectedPort,
-        'dialog'
-      );
+      this.update({ boardsConfig }, 'dialog');
     }
   }
 
   private update(
-    selectedBoard: BoardIdentifier | undefined,
-    selectedPort: PortIdentifier | undefined,
+    params: RefreshBoardListParams,
     reason?: UpdateBoardsConfigReason
   ): void {
+    const { boardsConfig } = params;
+    if (!boardsConfig) {
+      return;
+    }
+    const { selectedBoard, selectedPort } = boardsConfig;
     if (selectedBoard && selectedPort) {
       this.updateConfig(
         {
@@ -441,6 +432,7 @@ export class BoardsServiceProvider
 
   private async saveState(): Promise<void> {
     const { selectedBoard, selectedPort } = this.boardsConfig;
+    debugger;
     await Promise.all([
       this.setData(
         selectedBoardStorageKey,
@@ -470,7 +462,7 @@ export class BoardsServiceProvider
   }
 
   private async restoreState(): Promise<
-    Readonly<BoardsConfig> & { boardListHistory: BoardListHistory }
+    Readonly<BoardsConfig> & { boardListHistory: BoardListHistory | undefined }
   > {
     const [maybeSelectedBoard, maybeSelectedPort, maybeBoardHistory] =
       await Promise.all([
@@ -480,8 +472,11 @@ export class BoardsServiceProvider
       ]);
     const selectedBoard = this.tryParse(maybeSelectedBoard, isBoardIdentifier);
     const selectedPort = this.tryParse(maybeSelectedPort, isPortIdentifier);
-    const boardListHistory =
-      this.tryParse(maybeBoardHistory, isBoardListHistory) ?? {};
+    const boardListHistory = this.tryParse(
+      maybeBoardHistory,
+      isBoardListHistory
+    );
+    debugger;
     return { selectedBoard, selectedPort, boardListHistory };
   }