Unified the sketch close and the app quit logic.

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

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

@@ -1,6 +1,5 @@
 import { injectable, inject } from '@theia/core/shared/inversify';
 import { EditorWidget } from '@theia/editor/lib/browser';
-import { CommandService } from '@theia/core/lib/common/command';
 import { MessageService } from '@theia/core/lib/common/message-service';
 import { OutputWidget } from '@theia/output/lib/browser/output-widget';
 import {
@@ -15,9 +14,9 @@ import {
   TabBar,
   Widget,
   SHELL_TABBAR_CONTEXT_MENU,
+  SaveOptions,
 } from '@theia/core/lib/browser';
 import { Sketch } from '../../../common/protocol';
-import { SaveAsSketch } from '../../contributions/save-as-sketch';
 import {
   CurrentSketch,
   SketchesServiceClientImpl,
@@ -28,9 +27,6 @@ import { ToolbarAwareTabBar } from './tab-bars';
 
 @injectable()
 export class ApplicationShell extends TheiaApplicationShell {
-  @inject(CommandService)
-  private readonly commandService: CommandService;
-
   @inject(MessageService)
   private readonly messageService: MessageService;
 
@@ -106,7 +102,7 @@ export class ApplicationShell extends TheiaApplicationShell {
     return topPanel;
   }
 
-  override async saveAll(): Promise<void> {
+  override async saveAll(options?: SaveOptions): Promise<void> {
     if (
       this.connectionStatusService.currentStatus === ConnectionStatus.OFFLINE
     ) {
@@ -118,12 +114,7 @@ export class ApplicationShell extends TheiaApplicationShell {
       );
       return; // Theia does not reject on failed save: https://github.com/eclipse-theia/theia/pull/8803
     }
-    await super.saveAll();
-    const options = { execOnlyIfTemp: true, openAfterMove: true };
-    await this.commandService.executeCommand(
-      SaveAsSketch.Commands.SAVE_AS_SKETCH.id,
-      options
-    );
+    return super.saveAll(options);
   }
 }
 

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

@@ -5,6 +5,7 @@ import {
   CommonCommands,
 } from '@theia/core/lib/browser/common-frontend-contribution';
 import { CommandRegistry } from '@theia/core/lib/common/command';
+import type { OnWillStopAction } from '@theia/core/lib/browser/frontend-application';
 
 @injectable()
 export class CommonFrontendContribution extends TheiaCommonFrontendContribution {
@@ -48,4 +49,9 @@ export class CommonFrontendContribution extends TheiaCommonFrontendContribution
       registry.unregisterMenuAction(command);
     }
   }
+
+  override onWillStop(): OnWillStopAction | undefined {
+    // This is NOOP here. All window close and app quit requests are handled in the `Close` contribution.
+    return undefined;
+  }
 }