fix: aligned service name

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

Author: Akos Kitta

arduino-ide-extension/src/browser/contributions/open-sketch-files.ts

@@ -112,7 +112,7 @@ export class OpenSketchFiles extends SketchContribution {
     await wait(250); // let IDE2 open the editor and toast the error message, then open the modal dialog
     const movedSketch = await promptMoveSketch(invalidMainSketchUri, {
       fileService: this.fileService,
-      sketchService: this.sketchesService,
+      sketchesService: this.sketchesService,
       labelProvider: this.labelProvider,
     });
     if (movedSketch) {

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

@@ -113,7 +113,7 @@ export class OpenSketch extends SketchContribution {
     if (Sketch.isSketchFile(sketchFileUri)) {
       return promptMoveSketch(sketchFileUri, {
         fileService: this.fileService,
-        sketchService: this.sketchesService,
+        sketchesService: this.sketchesService,
         labelProvider: this.labelProvider,
       });
     }
@@ -132,11 +132,11 @@ export async function promptMoveSketch(
   sketchFileUri: string | URI,
   options: {
     fileService: FileService;
-    sketchService: SketchesService;
+    sketchesService: SketchesService;
     labelProvider: LabelProvider;
   }
 ): Promise<Sketch | undefined> {
-  const { fileService, sketchService, labelProvider } = options;
+  const { fileService, sketchesService, labelProvider } = options;
   const uri =
     sketchFileUri instanceof URI ? sketchFileUri : new URI(sketchFileUri);
   const name = uri.path.name;
@@ -176,6 +176,6 @@ export async function promptMoveSketch(
       uri,
       new URI(newSketchUri.resolve(nameWithExt).toString())
     );
-    return sketchService.getSketchFolder(newSketchUri.toString());
+    return sketchesService.getSketchFolder(newSketchUri.toString());
   }
 }

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

@@ -42,7 +42,7 @@ export class SketchesServiceClientImpl
   @inject(FileService)
   private readonly fileService: FileService;
   @inject(SketchesService)
-  private readonly sketchService: SketchesService;
+  private readonly sketchesService: SketchesService;
   @inject(WorkspaceService)
   private readonly workspaceService: WorkspaceService;
   @inject(ConfigServiceClient)
@@ -94,7 +94,7 @@ export class SketchesServiceClientImpl
     if (!sketchDirUri) {
       return;
     }
-    const container = await this.sketchService.getSketches({
+    const container = await this.sketchesService.getSketches({
       uri: sketchDirUri.toString(),
     });
     for (const sketch of SketchContainer.toArray(container)) {
@@ -127,7 +127,7 @@ export class SketchesServiceClientImpl
 
             let reloadedSketch: Sketch | undefined = undefined;
             try {
-              reloadedSketch = await this.sketchService.loadSketch(
+              reloadedSketch = await this.sketchesService.loadSketch(
                 this._currentSketch.uri
               );
             } catch (err) {
@@ -150,7 +150,7 @@ export class SketchesServiceClientImpl
             if (Sketch.isSketchFile(resource)) {
               if (type === FileChangeType.ADDED) {
                 try {
-                  const toAdd = await this.sketchService.loadSketch(
+                  const toAdd = await this.sketchesService.loadSketch(
                     resource.parent.toString()
                   );
                   if (!this.sketches.has(toAdd.uri)) {
@@ -201,7 +201,7 @@ export class SketchesServiceClientImpl
         this.workspaceService
           .tryGetRoots()
           .map(({ resource }) =>
-            this.sketchService.getSketchFolder(resource.toString())
+            this.sketchesService.getSketchFolder(resource.toString())
           )
       )
     ).filter(notEmpty);

arduino-ide-extension/src/browser/theia/workspace/workspace-service.ts

@@ -23,7 +23,7 @@ import { WindowServiceExt } from '../core/window-service-ext';
 @injectable()
 export class WorkspaceService extends TheiaWorkspaceService {
   @inject(SketchesService)
-  private readonly sketchService: SketchesService;
+  private readonly sketchesService: SketchesService;
   @inject(WindowServiceExt)
   private readonly windowServiceExt: WindowServiceExt;
   @inject(ContributionProvider)
@@ -41,7 +41,7 @@ export class WorkspaceService extends TheiaWorkspaceService {
   ): Promise<FileStat | undefined> {
     const stat = await super.toFileStat(uri);
     if (!stat) {
-      const newSketchUri = await this.sketchService.createNewSketch();
+      const newSketchUri = await this.sketchesService.createNewSketch();
       return this.toFileStat(newSketchUri.uri);
     }
     // When opening a file instead of a directory, IDE2 (and Theia) expects a workspace JSON file.
@@ -52,18 +52,18 @@ export class WorkspaceService extends TheiaWorkspaceService {
     // If loading the sketch fails, create a fallback sketch and open the new temp sketch folder as the workspace root.
     if (stat.isFile && stat.resource.path.ext === '.ino') {
       try {
-        const sketch = await this.sketchService.loadSketch(
+        const sketch = await this.sketchesService.loadSketch(
           stat.resource.toString()
         );
         return this.toFileStat(sketch.uri);
       } catch (err) {
         if (SketchesError.InvalidName.is(err)) {
           this._workspaceError = err;
-          const newSketchUri = await this.sketchService.createNewSketch();
+          const newSketchUri = await this.sketchesService.createNewSketch();
           return this.toFileStat(newSketchUri.uri);
         } else if (SketchesError.NotFound.is(err)) {
           this._workspaceError = err;
-          const newSketchUri = await this.sketchService.createNewSketch();
+          const newSketchUri = await this.sketchesService.createNewSketch();
           return this.toFileStat(newSketchUri.uri);
         }
         throw err;