Skip to content

Commit cac5dab

Browse files
clean up naming
1 parent 03f82fc commit cac5dab

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

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

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
6666
protected _availableBoards: AvailableBoard[] = [];
6767

6868
private lastBoardsConfigOnUpload: BoardsConfig.Config | undefined;
69-
private boardConfigToSelect: BoardsConfig.Config | undefined;
69+
private boardConfigToAutoSelect: BoardsConfig.Config | undefined;
7070

7171
/**
7272
* Unlike `onAttachedBoardsChanged` this even fires when the user modifies the selected board in the IDE.\
@@ -120,9 +120,11 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
120120
this.lastBoardsConfigOnUpload = value;
121121
}
122122

123-
private derivePersistingUploadPort(event: AttachedBoardsChangeEvent): void {
123+
private deriveBoardConfigToAutoSelect(
124+
event: AttachedBoardsChangeEvent
125+
): void {
124126
if (!this.lastBoardsConfigOnUpload) {
125-
this.boardConfigToSelect = undefined;
127+
this.boardConfigToAutoSelect = undefined;
126128
return;
127129
}
128130

@@ -142,18 +144,20 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
142144
const lastSelectionOnUpload = this.lastBoardsConfigOnUpload;
143145
this.setLastBoardsConfigOnUpload(undefined);
144146

147+
const appearedPort = appearedPorts[0];
148+
145149
const boardOnAppearedPort = newBoards.find((board: Board) =>
146-
Port.sameAs(board.port, appearedPorts[0])
150+
Port.sameAs(board.port, appearedPort)
147151
);
148152

149153
if (
150154
boardOnAppearedPort &&
151155
lastSelectionOnUpload.selectedBoard &&
152156
Board.sameAs(boardOnAppearedPort, lastSelectionOnUpload.selectedBoard)
153157
) {
154-
this.boardConfigToSelect = {
158+
this.boardConfigToAutoSelect = {
155159
selectedBoard: boardOnAppearedPort,
156-
selectedPort: appearedPorts[0],
160+
selectedPort: appearedPort,
157161
};
158162
return;
159163
}
@@ -172,7 +176,7 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
172176
const { uploadInProgress } = event;
173177

174178
if (!uploadInProgress) {
175-
this.derivePersistingUploadPort(event);
179+
this.deriveBoardConfigToAutoSelect(event);
176180
}
177181

178182
this._attachedBoards = event.newState.boards;
@@ -299,10 +303,10 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
299303
}
300304
}
301305

302-
if (!this.boardConfigToSelect) return false;
306+
if (!this.boardConfigToAutoSelect) return false;
303307

304-
this.boardsConfig = this.boardConfigToSelect;
305-
this.boardConfigToSelect = undefined;
308+
this.boardsConfig = this.boardConfigToAutoSelect;
309+
this.boardConfigToAutoSelect = undefined;
306310
return true;
307311
}
308312
return false;

0 commit comments

Comments
 (0)