fix: main sketch file editor focus on layout reset

Closes #643

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

arduino-ide-extension/src/browser/theia/core/frontend-application.ts

@@ -1,5 +1,4 @@
 import { injectable, inject } from '@theia/core/shared/inversify';
-import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { CommandService } from '@theia/core/lib/common/command';
 import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
 import { FrontendApplication as TheiaFrontendApplication } from '@theia/core/lib/browser/frontend-application';
@@ -8,17 +7,16 @@ import { OpenSketchFiles } from '../../contributions/open-sketch-files';
 
 @injectable()
 export class FrontendApplication extends TheiaFrontendApplication {
-  @inject(FileService)
-  protected readonly fileService: FileService;
-
   @inject(WorkspaceService)
-  protected readonly workspaceService: WorkspaceService;
+  private readonly workspaceService: WorkspaceService;
 
   @inject(CommandService)
-  protected readonly commandService: CommandService;
+  private readonly commandService: CommandService;
 
   @inject(SketchesService)
-  protected readonly sketchesService: SketchesService;
+  private readonly sketchesService: SketchesService;
+
+  private layoutWasRestored = false;
 
   protected override async initializeLayout(): Promise<void> {
     await super.initializeLayout();
@@ -26,10 +24,16 @@ export class FrontendApplication extends TheiaFrontendApplication {
       for (const root of roots) {
         await this.commandService.executeCommand(
           OpenSketchFiles.Commands.OPEN_SKETCH_FILES.id,
-          root.resource
+          root.resource,
+          !this.layoutWasRestored
         );
         this.sketchesService.markAsRecentlyOpened(root.resource.toString()); // no await, will get the notification later and rebuild the menu
       }
     });
   }
+
+  protected override async restoreLayout(): Promise<boolean> {
+    this.layoutWasRestored = await super.restoreLayout();
+    return this.layoutWasRestored;
+  }
 }