tracking the sketch files has its own module.

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>

Author: Akos Kitta

arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx

@@ -8,12 +8,10 @@ import * as React from '@theia/core/shared/react';
 import {
   BoardsService,
   LibraryService,
-  Sketch,
   SketchesService,
 } from '../common/protocol';
 
 import {
-  DisposableCollection,
   MAIN_MENU_BAR,
   MenuContribution,
   MenuModelRegistry,
@@ -24,12 +22,10 @@ import {
   FrontendApplicationContribution,
   LocalStorageService,
   OnWillStopAction,
-  SaveableWidget,
 } from '@theia/core/lib/browser';
 import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
 import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
 import { CommonMenus } from '@theia/core/lib/browser/common-frontend-contribution';
-import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
 import {
   TabBarToolbarContribution,
   TabBarToolbarRegistry,
@@ -40,11 +36,7 @@ import {
   CommandRegistry,
 } from '@theia/core/lib/common/command';
 import { MessageService } from '@theia/core/lib/common/message-service';
-import URI from '@theia/core/lib/common/uri';
 import { EditorCommands, EditorMainMenu } from '@theia/editor/lib/browser';
-import { FileChangeType } from '@theia/filesystem/lib/browser';
-import { FileService } from '@theia/filesystem/lib/browser/file-service';
-import { FileSystemFrontendContribution } from '@theia/filesystem/lib/browser/filesystem-frontend-contribution';
 import { MonacoMenus } from '@theia/monaco/lib/browser/monaco-menu';
 import { FileNavigatorCommands } from '@theia/navigator/lib/browser/navigator-contribution';
 import { TerminalMenus } from '@theia/terminal/lib/browser/terminal-frontend-contribution';
@@ -55,7 +47,6 @@ import {
 import { ArduinoPreferences } from './arduino-preferences';
 import { BoardsServiceProvider } from './boards/boards-service-provider';
 import { BoardsToolBarItem } from './boards/boards-toolbar-item';
-import { OpenSketchFiles } from './contributions/open-sketch-files';
 import { SaveAsSketch } from './contributions/save-as-sketch';
 import { ArduinoMenus } from './menu/arduino-menus';
 import { MonitorViewContribution } from './serial/monitor/monitor-view-contribution';
@@ -84,9 +75,6 @@ export class ArduinoFrontendContribution
   @inject(BoardsServiceProvider)
   private readonly boardsServiceProvider: BoardsServiceProvider;
 
-  @inject(FileService)
-  private readonly fileService: FileService;
-
   @inject(SketchesService)
   private readonly sketchService: SketchesService;
 
@@ -99,17 +87,9 @@ export class ArduinoFrontendContribution
   @inject(SketchesServiceClientImpl)
   private readonly sketchServiceClient: SketchesServiceClientImpl;
 
-  @inject(FrontendApplicationStateService)
-  private readonly appStateService: FrontendApplicationStateService;
-
   @inject(LocalStorageService)
   private readonly localStorageService: LocalStorageService;
 
-  @inject(FileSystemFrontendContribution)
-  private readonly fileSystemFrontendContribution: FileSystemFrontendContribution;
-
-  protected toDisposeOnStop = new DisposableCollection();
-
   @postConstruct()
   protected async init(): Promise<void> {
     const isFirstStartup = !(await this.localStorageService.getData(
@@ -142,39 +122,6 @@ export class ArduinoFrontendContribution
         )
       );
     }
-    this.appStateService.reachedState('ready').then(async () => {
-      const sketch = await this.sketchServiceClient.currentSketch();
-      if (
-        CurrentSketch.isValid(sketch) &&
-        !(await this.sketchService.isTemp(sketch))
-      ) {
-        this.toDisposeOnStop.push(this.fileService.watch(new URI(sketch.uri)));
-        this.toDisposeOnStop.push(
-          this.fileService.onDidFilesChange(async (event) => {
-            for (const { type, resource } of event.changes) {
-              if (
-                type === FileChangeType.ADDED &&
-                resource.parent.toString() === sketch.uri
-              ) {
-                const reloadedSketch = await this.sketchService.loadSketch(
-                  sketch.uri
-                );
-                if (Sketch.isInSketch(resource, reloadedSketch)) {
-                  this.commandRegistry.executeCommand(
-                    OpenSketchFiles.Commands.ENSURE_OPENED.id,
-                    resource.toString(),
-                    true,
-                    {
-                      mode: 'open',
-                    }
-                  );
-                }
-              }
-            }
-          })
-        );
-      }
-    });
   }
 
   async onStart(app: FrontendApplication): Promise<void> {
@@ -203,23 +150,6 @@ export class ArduinoFrontendContribution
 
     // Removes the _Settings_ (cog) icon from the left sidebar
     app.shell.leftPanelHandler.removeBottomMenu('settings-menu');
-
-    this.fileSystemFrontendContribution.onDidChangeEditorFile(
-      ({ type, editor }) => {
-        if (type === FileChangeType.DELETED) {
-          const editorWidget = editor;
-          if (SaveableWidget.is(editorWidget)) {
-            editorWidget.closeWithoutSaving();
-          } else {
-            editorWidget.close();
-          }
-        }
-      }
-    );
-  }
-
-  onStop(): void {
-    this.toDisposeOnStop.dispose();
   }
 
   registerToolbarItems(registry: TabBarToolbarRegistry): void {

arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts

@@ -309,6 +309,7 @@ import { InoLanguage } from './contributions/ino-language';
 import { SelectedBoard } from './contributions/selected-board';
 import { CheckForUpdates } from './contributions/check-for-updates';
 import { OpenBoardsConfig } from './contributions/open-boards-config';
+import { SketchFilesTracker } from './contributions/sketch-files-tracker';
 
 MonacoThemingService.register({
   id: 'arduino-theme',
@@ -706,6 +707,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   Contribution.configure(bind, SelectedBoard);
   Contribution.configure(bind, CheckForUpdates);
   Contribution.configure(bind, OpenBoardsConfig);
+  Contribution.configure(bind, SketchFilesTracker);
 
   // Disabled the quick-pick customization from Theia when multiple formatters are available.
   // Use the default VS Code behavior, and pick the first one. In the IDE2, clang-format has `exclusive` selectors.

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

@@ -0,0 +1,69 @@
+import { SaveableWidget } from '@theia/core/lib/browser/saveable';
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { FileSystemFrontendContribution } from '@theia/filesystem/lib/browser/filesystem-frontend-contribution';
+import { FileChangeType } from '@theia/filesystem/lib/common/files';
+import { CurrentSketch } from '../../common/protocol/sketches-service-client-impl';
+import { Sketch, SketchContribution, URI } from './contribution';
+import { OpenSketchFiles } from './open-sketch-files';
+
+@injectable()
+export class SketchFilesTracker extends SketchContribution {
+  @inject(FileSystemFrontendContribution)
+  private readonly fileSystemFrontendContribution: FileSystemFrontendContribution;
+  private readonly toDisposeOnStop = new DisposableCollection();
+
+  override onStart(): void {
+    this.fileSystemFrontendContribution.onDidChangeEditorFile(
+      ({ type, editor }) => {
+        if (type === FileChangeType.DELETED) {
+          const editorWidget = editor;
+          if (SaveableWidget.is(editorWidget)) {
+            editorWidget.closeWithoutSaving();
+          } else {
+            editorWidget.close();
+          }
+        }
+      }
+    );
+  }
+
+  override onReady(): void {
+    this.sketchServiceClient.currentSketch().then(async (sketch) => {
+      if (
+        CurrentSketch.isValid(sketch) &&
+        !(await this.sketchService.isTemp(sketch))
+      ) {
+        this.toDisposeOnStop.push(this.fileService.watch(new URI(sketch.uri)));
+        this.toDisposeOnStop.push(
+          this.fileService.onDidFilesChange(async (event) => {
+            for (const { type, resource } of event.changes) {
+              if (
+                type === FileChangeType.ADDED &&
+                resource.parent.toString() === sketch.uri
+              ) {
+                const reloadedSketch = await this.sketchService.loadSketch(
+                  sketch.uri
+                );
+                if (Sketch.isInSketch(resource, reloadedSketch)) {
+                  this.commandService.executeCommand(
+                    OpenSketchFiles.Commands.ENSURE_OPENED.id,
+                    resource.toString(),
+                    true,
+                    {
+                      mode: 'open',
+                    }
+                  );
+                }
+              }
+            }
+          })
+        );
+      }
+    });
+  }
+
+  onStop(): void {
+    this.toDisposeOnStop.dispose();
+  }
+}