method syntax & remove unnecessary methods

arduino · davegarthsimpson · Aug 24, 2022 · Aug 11, 2022 · Aug 16, 2022 · Aug 16, 2022
commit c5fbad787874a1d3f522fcc64e98d70971c0b573
diff --git a/arduino-ide-extension/src/browser/boards/boards-service-provider.ts b/arduino-ide-extension/src/browser/boards/boards-service-provider.ts
@@ -115,19 +115,14 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
     return this._reconciled.promise;
   }
 
-  public snapshotBoardDiscoveryOnUpload(): void {
-    this.setLastBoardsConfigOnUpload(this.boardsConfig);
-    this.setAvailablePortsOnUpload(this._availablePorts);
+  snapshotBoardDiscoveryOnUpload(): void {
+    this.lastBoardsConfigOnUpload = this._boardsConfig;
+    this.lastAvailablePortsOnUpload = this._availablePorts;
   }
 
-  private setLastBoardsConfigOnUpload(
-    value: BoardsConfig.Config | undefined
-  ): void {
-    this.lastBoardsConfigOnUpload = value;
-  }
-
-  private setAvailablePortsOnUpload(value: Port[] | undefined): void {
-    this.lastAvailablePortsOnUpload = value;
+  clearBoardDiscoverySnapshot(): void {
+    this.lastBoardsConfigOnUpload = undefined;
+    this.lastAvailablePortsOnUpload = undefined;
   }
 
   private portToAutoSelectCanBeDerived(): boolean {
@@ -136,7 +131,7 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
     );
   }
 
-  public attemptPostUploadAutoSelect(): void {
+  attemptPostUploadAutoSelect(): void {
     setTimeout(() => {
       if (this.portToAutoSelectCanBeDerived()) {
         this.attemptAutoSelect({
@@ -172,31 +167,28 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
           )
         : newPorts;
 
-    if (appearedPorts.length > 0) {
-      for (const port of appearedPorts) {
-        const boardOnAppearedPort = newBoards.find((board: Board) =>
-          Port.sameAs(board.port, port)
-        );
+    for (const port of appearedPorts) {
+      const boardOnAppearedPort = newBoards.find((board: Board) =>
+        Port.sameAs(board.port, port)
+      );
 
-        const lastBoardsConfigOnUpload = this.lastBoardsConfigOnUpload!;
+      const lastBoardsConfigOnUpload = this.lastBoardsConfigOnUpload!;
 
-        if (
-          boardOnAppearedPort &&
-          lastBoardsConfigOnUpload.selectedBoard &&
-          Board.sameAs(
-            boardOnAppearedPort,
-            lastBoardsConfigOnUpload.selectedBoard
-          )
-        ) {
-          this.setLastBoardsConfigOnUpload(undefined);
-          this.setAvailablePortsOnUpload(undefined);
+      if (
+        boardOnAppearedPort &&
+        lastBoardsConfigOnUpload.selectedBoard &&
+        Board.sameAs(
+          boardOnAppearedPort,
+          lastBoardsConfigOnUpload.selectedBoard
+        )
+      ) {
+        this.clearBoardDiscoverySnapshot();
 
-          this.boardConfigToAutoSelect = {
-            selectedBoard: boardOnAppearedPort,
-            selectedPort: port,
-          };
-          return;
-        }
+        this.boardConfigToAutoSelect = {
+          selectedBoard: boardOnAppearedPort,
+          selectedPort: port,
+        };
+        return;
       }
     }
   }

diff --git a/arduino-ide-extension/src/node/board-discovery.ts b/arduino-ide-extension/src/node/board-discovery.ts
@@ -125,7 +125,7 @@ export class BoardDiscovery
     });
   }
 
-  public setUploadInProgress(uploadAttemptInProgress: boolean): void {
+  setUploadInProgress(uploadAttemptInProgress: boolean): void {
     this.uploadInProgress = uploadAttemptInProgress;
   }
 

diff --git a/arduino-ide-extension/src/node/core-service-impl.ts b/arduino-ide-extension/src/node/core-service-impl.ts
@@ -53,7 +53,7 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
   private readonly commandService: CommandService;
 
   @inject(BoardDiscovery)
-  protected readonly boardDiscovery: BoardDiscovery;
+  private readonly boardDiscovery: BoardDiscovery;
 
   async compile(options: CoreService.Options.Compile): Promise<void> {
     const coreClient = await this.coreClient;
-Original file line number
+Diff line change
@@ Expand Up / @@ -125,7 +125,7 @@ export class BoardDiscovery @@
         });
       }
-      public setUploadInProgress(uploadAttemptInProgress: boolean): void {
+      setUploadInProgress(uploadAttemptInProgress: boolean): void {
         this.uploadInProgress = uploadAttemptInProgress;
       }
@@ Expand Down @@