cleanup

Author: davegarthsimpson

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

@@ -68,7 +68,7 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
   private lastBoardsConfigOnUpload: BoardsConfig.Config | undefined;
   // "lastPersistingUploadPort", is a port created during an upload, that persisted after
   // the upload finished, it's "substituting" the port selected when the user invoked the upload
-  private lastPersistingUploadPort: Port | undefined;
+  private lastPersistingUploadPortWithBoard: BoardsConfig.Config | undefined;
 
   /**
    * Unlike `onAttachedBoardsChanged` this even fires when the user modifies the selected board in the IDE.\
@@ -124,7 +124,7 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
 
   private derivePersistingUploadPort(event: AttachedBoardsChangeEvent): void {
     if (!this.lastBoardsConfigOnUpload) {
-      this.lastPersistingUploadPort = undefined;
+      this.lastPersistingUploadPortWithBoard = undefined;
       return;
     }
 
@@ -160,7 +160,10 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
         lastSelectionOnUpload.selectedBoard &&
         Board.sameAs(boardOnAppearedPort, lastSelectionOnUpload.selectedBoard)
       ) {
-        this.lastPersistingUploadPort = appearedPorts[0];
+        this.lastPersistingUploadPortWithBoard = {
+          selectedBoard: boardOnAppearedPort,
+          selectedPort: appearedPorts[0],
+        };
         return;
       }
     }
@@ -307,36 +310,11 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
       // If we could not find an exact match, we compare the board FQBN-name pairs and ignore the port, as it might have changed.
       // See documentation on `latestValidBoardsConfig`.
 
-      if (!this.lastPersistingUploadPort) return false;
-
-      const lastPersistingUploadPort = this.lastPersistingUploadPort;
-      this.lastPersistingUploadPort = undefined;
-
-      if (
-        !Port.sameAs(
-          lastPersistingUploadPort,
-          this.latestValidBoardsConfig.selectedPort
-        )
-      ) {
-        return false;
-      }
+      if (!this.lastPersistingUploadPortWithBoard) return false;
 
-      for (const board of this.availableBoards.filter(
-        ({ state }) => state !== AvailableBoard.State.incomplete
-      )) {
-        if (
-          this.latestValidBoardsConfig.selectedBoard.fqbn === board.fqbn &&
-          this.latestValidBoardsConfig.selectedBoard.name === board.name &&
-          this.latestValidBoardsConfig.selectedPort.protocol ===
-            board.port?.protocol
-        ) {
-          this.boardsConfig = {
-            ...this.latestValidBoardsConfig,
-            selectedPort: board.port,
-          };
-          return true;
-        }
-      }
+      this.boardsConfig = this.lastPersistingUploadPortWithBoard;
+      this.lastPersistingUploadPortWithBoard = undefined;
+      return true;
     }
     return false;
   }