fix(regression): reselect board after core install

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

Author: Akos Kitta

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

@@ -9,6 +9,7 @@ import {
 import type { Disposable } from '@theia/core/lib/common/disposable';
 import { Emitter } from '@theia/core/lib/common/event';
 import { ILogger } from '@theia/core/lib/common/logger';
+import { MessageService } from '@theia/core/lib/common/message-service';
 import { nls } from '@theia/core/lib/common/nls';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import type { Mutable } from '@theia/core/lib/common/types';
@@ -22,6 +23,7 @@ import {
   boardIdentifierEquals,
   BoardsConfig,
   BoardsConfigChangeEvent,
+  BoardsPackage,
   BoardsService,
   BoardUserField,
   BoardWithPackage,
@@ -32,6 +34,7 @@ import {
   Port,
   PortIdentifier,
   portIdentifierEquals,
+  serializePlatformIdentifier,
 } from '../../common/protocol';
 import {
   BoardList,
@@ -139,6 +142,9 @@ export class BoardsServiceProvider
 {
   @inject(ILogger)
   private readonly logger: ILogger;
+  @inject(MessageService)
+  private messageService: MessageService;
+
   @inject(BoardsService)
   private readonly boardsService: BoardsService;
   @inject(CommandService)
@@ -173,6 +179,9 @@ export class BoardsServiceProvider
     this.notificationCenter.onDetectedPortsDidChange(({ detectedPorts }) =>
       this.refreshBoardList({ detectedPorts })
     );
+    this.notificationCenter.onPlatformDidInstall((event) =>
+      this.maybeUpdateSelectedBoard(event)
+    );
     this.appStateService
       .reachedState('ready')
       .then(async () => {
@@ -196,6 +205,48 @@ export class BoardsServiceProvider
       .finally(() => this._ready.resolve());
   }
 
+  private async maybeUpdateSelectedBoard(event: {
+    item: BoardsPackage;
+  }): Promise<void> {
+    const { selectedBoard } = this._boardsConfig;
+    if (
+      selectedBoard &&
+      !selectedBoard.fqbn &&
+      BoardWithPackage.is(selectedBoard)
+    ) {
+      const selectedBoardPlatformId = serializePlatformIdentifier(
+        selectedBoard.packageId
+      );
+      if (selectedBoardPlatformId === event.item.id) {
+        const installedSelectedBoard = event.item.boards.find(
+          (board) => board.name === selectedBoard.name
+        );
+        // if the board can be found by its name after the install event select it. otherwise unselect it
+        // historical hint: https://github.com/arduino/arduino-ide/blob/144df893d0dafec64a26565cf912a98f32572da9/arduino-ide-extension/src/browser/boards/boards-service-provider.ts#L289-L320
+        this.updateBoard(installedSelectedBoard);
+        if (!installedSelectedBoard) {
+          const yes = nls.localize('vscode/extensionsUtils/yes', 'Yes');
+          const answer = await this.messageService.warn(
+            nls.localize(
+              'arduino/board/couldNotFindPreviouslySelected',
+              "Could not find previously selected board '{0}' in installed platform '{1}'. Please manually reselect the board you want to use. Do you want to reselect it now?",
+              selectedBoard.name,
+              event.item.name
+            ),
+            nls.localize('arduino/board/reselectLater', 'Reselect later'),
+            yes
+          );
+          if (answer === yes) {
+            this.onBoardsConfigEdit({
+              query: selectedBoard.name,
+              selectedPort: this._boardsConfig.selectedPort,
+            });
+          }
+        }
+      }
+    }
+  }
+
   onStop(): void {
     this.boardListDumper?.dispose();
   }
@@ -358,12 +409,9 @@ export class BoardsServiceProvider
     return true;
   }
 
-  updateBoard(selectedBoard: BoardIdentifier): boolean {
+  updateBoard(selectedBoard: BoardIdentifier | undefined): boolean {
     const previousSelectedBoard = this._boardsConfig.selectedBoard;
-    if (
-      previousSelectedBoard !== undefined &&
-      boardIdentifierEquals(previousSelectedBoard, selectedBoard)
-    ) {
+    if (boardIdentifierEquals(previousSelectedBoard, selectedBoard)) {
       // NOOP if they're the same
       return false;
     }
@@ -377,17 +425,14 @@ export class BoardsServiceProvider
     return true;
   }
 
-  updatePort(selectedPort: PortIdentifier): boolean {
+  updatePort(selectedPort: PortIdentifier | undefined): boolean {
     const selectedBoard = this._boardsConfig.selectedBoard;
     const previousSelectedPort = this._boardsConfig.selectedPort;
     if (selectedPort && selectedBoard) {
       this._boardListHistory[Port.keyOf(selectedPort)] = selectedBoard;
     }
     this._boardsConfig.selectedPort = selectedPort;
-    if (
-      previousSelectedPort !== undefined &&
-      portIdentifierEquals(previousSelectedPort, selectedPort)
-    ) {
+    if (portIdentifierEquals(previousSelectedPort, selectedPort)) {
       // NOOP if they're the same
       return false;
     }