fix: removed unused client API

Signed-off-by: Akos Kitta <[email protected]>

Author: Akos Kitta

arduino-ide-extension/src/browser/config/config-service-client.ts

@@ -10,7 +10,7 @@ import {
   injectable,
   postConstruct,
 } from '@theia/core/shared/inversify';
-import { Config, ConfigService, ConfigState } from '../../common/protocol';
+import { ConfigService, ConfigState } from '../../common/protocol';
 import { NotificationCenter } from '../notification-center';
 
 @injectable()
@@ -33,7 +33,7 @@ export class ConfigServiceClient implements FrontendApplicationContribution {
     this.didChangeDataDirUriEmitter
   );
 
-  private _config: ConfigState | undefined;
+  private config: ConfigState | undefined;
 
   @postConstruct()
   protected init(): void {
@@ -63,53 +63,42 @@ export class ConfigServiceClient implements FrontendApplicationContribution {
     return this.delegate.getConfiguration();
   }
 
-  tryGetConfig(): Config | undefined {
-    return this._config?.config;
-  }
-
+  /**
+   * CLI config related error messages if any.
+   */
   tryGetMessages(): string[] | undefined {
-    return this._config?.messages;
+    return this.config?.messages;
   }
 
   /**
    * `directories.user`
    */
   tryGetSketchDirUri(): URI | undefined {
-    return this._config?.config?.sketchDirUri
-      ? new URI(this._config?.config?.sketchDirUri)
+    return this.config?.config?.sketchDirUri
+      ? new URI(this.config?.config?.sketchDirUri)
       : undefined;
   }
 
   /**
    * `directories.data`
    */
   tryGetDataDirUri(): URI | undefined {
-    return this._config?.config?.dataDirUri
-      ? new URI(this._config?.config?.dataDirUri)
+    return this.config?.config?.dataDirUri
+      ? new URI(this.config?.config?.dataDirUri)
       : undefined;
   }
 
   private use(config: ConfigState): void {
-    const oldConfig = deepClone(this._config);
-    this._config = config;
-    if (oldConfig?.config?.dataDirUri !== this._config?.config?.dataDirUri) {
-      this.didChangeDataDirUriEmitter.fire(
-        this._config.config?.dataDirUri
-          ? new URI(this._config.config.dataDirUri)
-          : undefined
-      );
+    const oldConfig = deepClone(this.config);
+    this.config = config;
+    if (oldConfig?.config?.sketchDirUri !== this.config?.config?.sketchDirUri) {
+      this.didChangeSketchDirUriEmitter.fire(this.tryGetSketchDirUri());
     }
-    if (
-      oldConfig?.config?.sketchDirUri !== this._config?.config?.sketchDirUri
-    ) {
-      this.didChangeSketchDirUriEmitter.fire(
-        this._config.config?.sketchDirUri
-          ? new URI(this._config.config.sketchDirUri)
-          : undefined
-      );
+    if (oldConfig?.config?.dataDirUri !== this.config?.config?.dataDirUri) {
+      this.didChangeDataDirUriEmitter.fire(this.tryGetDataDirUri());
     }
-    if (this._config.messages?.length) {
-      const message = this._config.messages.join(' ');
+    if (this.config.messages?.length) {
+      const message = this.config.messages.join(' ');
       // toast the error later otherwise it might not show up in IDE2
       setTimeout(() => this.messageService.error(message), 1_000);
     }

arduino-ide-extension/src/common/protocol/sketches-service-client-impl.ts

@@ -66,17 +66,15 @@ export class SketchesServiceClientImpl
   private currentSketchLoaded = new Deferred<CurrentSketch>();
 
   onStart(): void {
-    const config = this.configService.tryGetConfig();
-    if (config) {
-      this.watchSketchbookDir(config.sketchDirUri);
-    }
+    const sketchDirUri = this.configService.tryGetSketchDirUri();
+    this.watchSketchbookDir(sketchDirUri);
     const refreshCurrentSketch = async () => {
       const currentSketch = await this.loadCurrentSketch();
       this.useCurrentSketch(currentSketch);
     };
     this.toDispose.push(
       this.configService.onDidChangeSketchDirUri((sketchDirUri) => {
-        this.watchSketchbookDir(sketchDirUri?.toString());
+        this.watchSketchbookDir(sketchDirUri);
         refreshCurrentSketch();
       })
     );
@@ -86,23 +84,22 @@ export class SketchesServiceClientImpl
   }
 
   private async watchSketchbookDir(
-    sketchDirUri: string | undefined
+    sketchDirUri: URI | undefined
   ): Promise<void> {
     this.toDisposeBeforeWatchSketchbookDir.dispose();
     if (!sketchDirUri) {
       return;
     }
     const container = await this.sketchService.getSketches({
-      uri: sketchDirUri,
+      uri: sketchDirUri.toString(),
     });
-    const sketchbookUri = new URI(sketchDirUri);
     for (const sketch of SketchContainer.toArray(container)) {
       this.sketches.set(sketch.uri, sketch);
     }
     this.toDisposeBeforeWatchSketchbookDir.pushAll([
       Disposable.create(() => this.sketches.clear()),
       // Watch changes in the sketchbook to update `File` > `Sketchbook` menu items.
-      this.fileService.watch(new URI(sketchDirUri), {
+      this.fileService.watch(sketchDirUri, {
         recursive: true,
         excludes: [],
       }),
@@ -145,7 +142,7 @@ export class SketchesServiceClientImpl
             return;
           }
           // We track main sketch files changes only. // TODO: check sketch folder changes. One can rename the folder without renaming the `.ino` file.
-          if (sketchbookUri.isEqualOrParent(resource)) {
+          if (sketchDirUri.isEqualOrParent(resource)) {
             if (Sketch.isSketchFile(resource)) {
               if (type === FileChangeType.ADDED) {
                 try {
@@ -165,7 +162,7 @@ export class SketchesServiceClientImpl
                 const toDelete = this.sketches.get(uri);
                 if (toDelete) {
                   console.log(
-                    `Sketch '${toDelete.name}' was removed from sketchbook '${sketchbookUri}'.`
+                    `Sketch '${toDelete.name}' was removed from sketchbook '${sketchDirUri}'.`
                   );
                   this.sketches.delete(uri);
                   this.fireSoon(toDelete, 'removed');