fix: let the ino contribution notify the LS

+ event emitter dispatches the new state.

Signed-off-by: dankeboy36 <[email protected]>

Author: dankeboy36

arduino-ide-extension/src/browser/contributions/ino-language.ts

@@ -8,6 +8,7 @@ import {
   ArduinoDaemon,
   BoardIdentifier,
   BoardsService,
+  CompileSummary,
   ExecutableService,
   isBoardIdentifierChangeEvent,
   sanitizeFqbn,
@@ -23,6 +24,7 @@ import { HostedPluginEvents } from '../hosted/hosted-plugin-events';
 import { NotificationCenter } from '../notification-center';
 import { CurrentSketch } from '../sketches-service-client-impl';
 import { SketchContribution, URI } from './contribution';
+import { CompileSummaryProvider } from './verify-sketch';
 
 interface DaemonAddress {
   /**
@@ -107,6 +109,8 @@ export class InoLanguage extends SketchContribution {
   private readonly notificationCenter: NotificationCenter;
   @inject(BoardsDataStore)
   private readonly boardDataStore: BoardsDataStore;
+  @inject(CompileSummaryProvider)
+  private readonly compileSummaryProvider: CompileSummaryProvider;
 
   private readonly toDispose = new DisposableCollection();
   private readonly languageServerStartMutex = new Mutex();
@@ -173,6 +177,13 @@ export class InoLanguage extends SketchContribution {
           }
         }
       }),
+      this.compileSummaryProvider.onDidChangeCompileSummary(
+        (compileSummary) => {
+          if (compileSummary) {
+            this.fireBuildDidComplete(compileSummary);
+          }
+        }
+      ),
     ]);
     Promise.all([
       this.boardsServiceProvider.ready,
@@ -317,4 +328,32 @@ export class InoLanguage extends SketchContribution {
       params
     );
   }
+
+  // Execute the a command contributed by the Arduino Tools VSIX to send the `ino/buildDidComplete` notification to the language server
+  private async fireBuildDidComplete(
+    compileSummary: CompileSummary
+  ): Promise<void> {
+    const params = {
+      ...compileSummary,
+    };
+    console.info(
+      `Executing 'arduino.languageserver.notifyBuildDidComplete' with ${JSON.stringify(
+        params.buildOutputUri
+      )}`
+    );
+
+    try {
+      await this.commandService.executeCommand(
+        'arduino.languageserver.notifyBuildDidComplete',
+        params
+      );
+    } catch (err) {
+      console.error(
+        `Unexpected error when firing event on build did complete. ${JSON.stringify(
+          params.buildOutputUri
+        )}`,
+        err
+      );
+    }
+  }
 }

arduino-ide-extension/src/browser/contributions/update-arduino-state.ts

@@ -62,8 +62,12 @@ export class UpdateArduinoState extends SketchContribution {
       this.configService.onDidChangeSketchDirUri((userDirUri) =>
         this.updateUserDirPath(userDirUri)
       ),
-      this.compileSummaryProvider.onDidChangeCompileSummary(() =>
-        this.maybeUpdateCompileSummary()
+      this.compileSummaryProvider.onDidChangeCompileSummary(
+        (compilerSummary) => {
+          if (compilerSummary) {
+            this.updateCompileSummary(compilerSummary);
+          }
+        }
       ),
       this.boardsDataStore.onDidChange((event) => {
         const selectedFqbn =
@@ -85,20 +89,16 @@ export class UpdateArduinoState extends SketchContribution {
     this.updateSketchPath(this.sketchServiceClient.tryGetCurrentSketch());
     this.updateUserDirPath(this.configService.tryGetSketchDirUri());
     this.updateDataDirPath(this.configService.tryGetDataDirUri());
-    this.maybeUpdateCompileSummary();
-  }
-
-  onStop(): void {
-    this.toDispose.dispose();
-  }
-
-  private maybeUpdateCompileSummary() {
     const { compileSummary } = this.compileSummaryProvider;
     if (compileSummary) {
       this.updateCompileSummary(compileSummary);
     }
   }
 
+  onStop(): void {
+    this.toDispose.dispose();
+  }
+
   private async updateSketchPath(
     sketch: CurrentSketch | undefined
   ): Promise<void> {

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

@@ -18,7 +18,7 @@ import { CoreErrorHandler } from './core-error-handler';
 export const CompileSummaryProvider = Symbol('CompileSummaryProvider');
 export interface CompileSummaryProvider {
   readonly compileSummary: CompileSummary | undefined;
-  readonly onDidChangeCompileSummary: Event<void>;
+  readonly onDidChangeCompileSummary: Event<CompileSummary | undefined>;
 }
 
 export type VerifySketchMode =
@@ -61,7 +61,9 @@ export class VerifySketch
 
   private readonly onDidChangeEmitter = new Emitter<void>();
   private readonly onDidChange = this.onDidChangeEmitter.event;
-  private readonly onDidChangeCompileSummaryEmitter = new Emitter<void>();
+  private readonly onDidChangeCompileSummaryEmitter = new Emitter<
+    CompileSummary | undefined
+  >();
   private verifyProgress: VerifyProgress = 'idle';
   private _compileSummary: CompileSummary | undefined;
 
@@ -132,7 +134,14 @@ export class VerifySketch
     return this._compileSummary;
   }
 
-  get onDidChangeCompileSummary(): Event<void> {
+  private updateCompileSummary(
+    compileSummary: CompileSummary | undefined
+  ): void {
+    this._compileSummary = compileSummary;
+    this.onDidChangeCompileSummaryEmitter.fire(this._compileSummary);
+  }
+
+  get onDidChangeCompileSummary(): Event<CompileSummary | undefined> {
     return this.onDidChangeCompileSummaryEmitter.event;
   }
 
@@ -180,11 +189,7 @@ export class VerifySketch
         { timeout: 3000 }
       );
 
-      this._compileSummary = compileSummary;
-      this.onDidChangeCompileSummaryEmitter.fire();
-      if (this._compileSummary) {
-        this.fireBuildDidComplete(this._compileSummary);
-      }
+      this.updateCompileSummary(compileSummary);
 
       // Returns with the used options for the compilation
       // so that follow-up tasks (such as upload) can reuse the compiled code.
@@ -227,28 +232,6 @@ export class VerifySketch
       compilerWarnings,
     };
   }
-
-  // Execute the a command contributed by the Arduino Tools VSIX to send the `ino/buildDidComplete` notification to the language server
-  private fireBuildDidComplete(compileSummary: CompileSummary): void {
-    const params = {
-      ...compileSummary,
-    };
-    console.info(
-      `Executing 'arduino.languageserver.notifyBuildDidComplete' with ${JSON.stringify(
-        params.buildOutputUri
-      )}`
-    );
-    this.commandService
-      .executeCommand('arduino.languageserver.notifyBuildDidComplete', params)
-      .catch((err) =>
-        console.error(
-          `Unexpected error when firing event on build did complete. ${JSON.stringify(
-            params.buildOutputUri
-          )}`,
-          err
-        )
-      );
-  }
 }
 
 export namespace VerifySketch {