ensure compile verbose pref is included on upload

Author: davegarthsimpson

arduino-ide-extension/src/browser/contributions/upload-sketch.ts

@@ -217,6 +217,7 @@ export class UploadSketch extends CoreServiceContribution {
         verbose,
         sourceOverride,
         optimizeForDebug,
+        compileVerbose,
       ] = await Promise.all([
         this.boardsDataStore.appendConfigToFqbn(
           boardsConfig.selectedBoard?.fqbn
@@ -228,8 +229,13 @@ export class UploadSketch extends CoreServiceContribution {
         this.commandService.executeCommand<boolean>(
           'arduino-is-optimize-for-debug'
         ),
+        this.preferences.get('arduino.compile.verbose'),
       ]);
 
+      const compileStepOptions: Partial<CoreService.Compile.Options> = {
+        verbose: compileVerbose,
+      };
+
       const board = {
         ...boardsConfig.selectedBoard,
         name: boardsConfig.selectedBoard?.name || '',
@@ -277,9 +283,12 @@ export class UploadSketch extends CoreServiceContribution {
       }
       this.outputChannelManager.getChannel('Arduino').clear();
       if (usingProgrammer) {
-        await this.coreService.uploadUsingProgrammer(options);
+        await this.coreService.uploadUsingProgrammer(
+          options,
+          compileStepOptions
+        );
       } else {
-        await this.coreService.upload(options);
+        await this.coreService.upload(options, compileStepOptions);
       }
       this.messageService.info(
         nls.localize('arduino/sketch/doneUploading', 'Done uploading.'),

arduino-ide-extension/src/common/protocol/core-service.ts

@@ -67,8 +67,14 @@ export interface CoreService {
         compilerWarnings?: CompilerWarnings;
       }>
   ): Promise<void>;
-  upload(options: CoreService.Upload.Options): Promise<void>;
-  uploadUsingProgrammer(options: CoreService.Upload.Options): Promise<void>;
+  upload(
+    options: CoreService.Upload.Options,
+    additionalCompileOptions: Partial<CoreService.Compile.Options>
+  ): Promise<void>;
+  uploadUsingProgrammer(
+    options: CoreService.Upload.Options,
+    additionalCompileOptions: Partial<CoreService.Compile.Options>
+  ): Promise<void>;
   burnBootloader(options: CoreService.Bootloader.Options): Promise<void>;
 }
 

arduino-ide-extension/src/node/core-service-impl.ts

@@ -163,9 +163,13 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
     return request;
   }
 
-  upload(options: CoreService.Upload.Options): Promise<void> {
+  upload(
+    options: CoreService.Upload.Options,
+    additionalCompileOptions: Partial<CoreService.Compile.Options>
+  ): Promise<void> {
     return this.doUpload(
       options,
+      additionalCompileOptions,
       () => new UploadRequest(),
       (client, req) => client.upload(req),
       (message: string, locations: CoreError.ErrorLocation[]) =>
@@ -175,10 +179,12 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
   }
 
   async uploadUsingProgrammer(
-    options: CoreService.Upload.Options
+    options: CoreService.Upload.Options,
+    additionalCompileOptions: Partial<CoreService.Compile.Options>
   ): Promise<void> {
     return this.doUpload(
       options,
+      additionalCompileOptions,
       () => new UploadUsingProgrammerRequest(),
       (client, req) => client.uploadUsingProgrammer(req),
       (message: string, locations: CoreError.ErrorLocation[]) =>
@@ -189,6 +195,7 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
 
   protected async doUpload(
     options: CoreService.Upload.Options,
+    additionalCompileOptions: Partial<CoreService.Compile.Options>,
     requestFactory: () => UploadRequest | UploadUsingProgrammerRequest,
     responseHandler: (
       client: ArduinoCoreServiceClient,
@@ -200,7 +207,11 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
     ) => ApplicationError<number, CoreError.ErrorLocation[]>,
     task: string
   ): Promise<void> {
-    await this.compile(Object.assign(options, { exportBinaries: false }));
+    await this.compile({
+      ...options,
+      ...additionalCompileOptions,
+      exportBinaries: false,
+    });
 
     const coreClient = await this.coreClient;
     const { client, instance } = coreClient;