From 722f8d75347e334913006e02bd3b43de9ecf9c47 Mon Sep 17 00:00:00 2001 From: Akos Kitta Date: Thu, 23 Jul 2020 17:04:18 +0200 Subject: [PATCH] programmer was removed from compilereqSigned-off-by: Akos Kitta --- .../src/browser/contributions/save-as-sketch.ts | 2 +- .../src/browser/contributions/verify-sketch.ts | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/arduino-ide-extension/src/browser/contributions/save-as-sketch.ts b/arduino-ide-extension/src/browser/contributions/save-as-sketch.ts index 0b5f9753..7a198415 100644 --- a/arduino-ide-extension/src/browser/contributions/save-as-sketch.ts +++ b/arduino-ide-extension/src/browser/contributions/save-as-sketch.ts @@ -60,7 +60,7 @@ export class SaveAsSketch extends SketchContribution { } const workspaceUri = await this.sketchService.copy(sketch, { destinationUri }); if (workspaceUri && openAfterMove) { - this.workspaceService.open(new URI(workspaceUri)); + this.workspaceService.open(new URI(workspaceUri), { preserveWindow: true }); } return !!workspaceUri; } diff --git a/arduino-ide-extension/src/browser/contributions/verify-sketch.ts b/arduino-ide-extension/src/browser/contributions/verify-sketch.ts index 954233dc..3e64e5fa 100644 --- a/arduino-ide-extension/src/browser/contributions/verify-sketch.ts +++ b/arduino-ide-extension/src/browser/contributions/verify-sketch.ts @@ -69,16 +69,12 @@ export class VerifySketch extends SketchContribution { if (!boardsConfig.selectedBoard.fqbn) { throw new Error(`No core is installed for the '${boardsConfig.selectedBoard.name}' board. Please install the core.`); } - const [data, fqbn] = await Promise.all([ - this.boardsDataStore.getData(boardsConfig.selectedBoard.fqbn), - this.boardsDataStore.appendConfigToFqbn(boardsConfig.selectedBoard.fqbn) - ]); + const fqbn = await this.boardsDataStore.appendConfigToFqbn(boardsConfig.selectedBoard.fqbn); this.outputChannelManager.getChannel('Arduino: compile').clear(); await this.coreService.compile({ sketchUri: uri, fqbn, - optimizeForDebug: this.editorMode.compileForDebug, - programmer: data.selectedProgrammer + optimizeForDebug: this.editorMode.compileForDebug }); this.messageService.info('Done compiling.', { timeout: 1000 }); } catch (e) {