More refactoring. Splitting up code.

Signed-off-by: Akos Kitta <kittaakos@typefox.io>

Author: Akos Kitta

arduino-ide-extension/package.json

@@ -106,7 +106,7 @@
       "frontend": "lib/browser/arduino-ide-frontend-module"
     },
     {
-      "frontend": "lib/browser/menu/browser-arduino-menu-module",
+      "frontend": "lib/browser/customization/core/browser-menu-module",
       "frontendElectron": "lib/electron-browser/menu/electron-arduino-menu-module"
     },
     {

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

@@ -24,7 +24,7 @@ import { BoardsToolBarItem } from './boards/boards-toolbar-item';
 import { BoardsConfig } from './boards/boards-config';
 import { MonitorConnection } from './monitor/monitor-connection';
 import { MonitorViewContribution } from './monitor/monitor-view-contribution';
-import { ArduinoWorkspaceService } from './arduino-workspace-service';
+import { ArduinoWorkspaceService } from './customization/workspace/arduino-workspace-service';
 import { FileNavigatorContribution } from '@theia/navigator/lib/browser/navigator-contribution';
 import { OutputContribution } from '@theia/output/lib/browser/output-contribution';
 import { OutlineViewContribution } from '@theia/outline-view/lib/browser/outline-view-contribution';

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

@@ -5,7 +5,7 @@ import { CommandContribution } from '@theia/core/lib/common/command';
 import { bindViewContribution } from '@theia/core/lib/browser/shell/view-contribution';
 import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
 import { WebSocketConnectionProvider } from '@theia/core/lib/browser/messaging/ws-connection-provider';
-import { FrontendApplicationContribution, FrontendApplication } from '@theia/core/lib/browser/frontend-application'
+import { FrontendApplicationContribution, FrontendApplication as TheiaFrontendApplication } from '@theia/core/lib/browser/frontend-application'
 import { LanguageGrammarDefinitionContribution } from '@theia/monaco/lib/browser/textmate';
 import { LanguageClientContribution } from '@theia/languages/lib/browser';
 import { ArduinoLanguageClientContribution } from './language/arduino-language-client-contribution';
@@ -23,28 +23,28 @@ import { ToolOutputService } from '../common/protocol/tool-output-service';
 import { ToolOutputServiceClientImpl } from './tool-output/client-service-impl';
 import { BoardsServiceClientImpl } from './boards/boards-service-client-impl';
 import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
-import { ArduinoWorkspaceService } from './arduino-workspace-service';
-import { OutlineViewContribution } from '@theia/outline-view/lib/browser/outline-view-contribution';
-import { ArduinoOutlineViewContribution } from './customization/arduino-outline-contribution';
-import { ProblemContribution } from '@theia/markers/lib/browser/problem/problem-contribution';
-import { ArduinoProblemContribution } from './customization/arduino-problem-contribution';
-import { ArduinoNavigatorContribution } from './customization/arduino-navigator-contribution';
-import { FileNavigatorContribution } from '@theia/navigator/lib/browser/navigator-contribution';
+import { ArduinoWorkspaceService } from './customization/workspace/arduino-workspace-service';
+import { OutlineViewContribution as TheiaOutlineViewContribution } from '@theia/outline-view/lib/browser/outline-view-contribution';
+import { ArduinoOutlineViewContribution } from './customization/outline/arduino-outline-contribution';
+import { ProblemContribution as TheiaProblemContribution } from '@theia/markers/lib/browser/problem/problem-contribution';
+import { ArduinoProblemContribution } from './customization/markers/arduino-problem-contribution';
+import { ArduinoNavigatorContribution } from './customization/navigator/arduino-navigator-contribution';
+import { FileNavigatorContribution as TheiaFileNavigatorContribution } from '@theia/navigator/lib/browser/navigator-contribution';
 import { ArduinoToolbarContribution } from './toolbar/arduino-toolbar-contribution';
-import { EditorContribution } from '@theia/editor/lib/browser/editor-contribution';
-import { ArduinoEditorContribution } from './customization/arduino-editor-contribution';
-import { MonacoStatusBarContribution } from '@theia/monaco/lib/browser/monaco-status-bar-contribution';
-import { ArduinoMonacoStatusBarContribution } from './customization/arduino-monaco-status-bar-contribution';
-import { ApplicationShell, ShellLayoutRestorer, KeybindingContribution } from '@theia/core/lib/browser';
+import { EditorContribution as TheiaEditorContribution } from '@theia/editor/lib/browser/editor-contribution';
+import { ArduinoEditorContribution } from './customization/editor/arduino-editor-contribution';
+import { MonacoStatusBarContribution as TheiaMonacoStatusBarContribution } from '@theia/monaco/lib/browser/monaco-status-bar-contribution';
+import { ArduinoMonacoStatusBarContribution } from './customization/monaco/arduino-monaco-status-bar-contribution';
+import { ApplicationShell as TheiaApplicationShell, ShellLayoutRestorer as TheiaShellLayoutRestorer, KeybindingContribution } from '@theia/core/lib/browser';
 import { MenuContribution } from '@theia/core/lib/common/menu';
-import { ArduinoApplicationShell } from './customization/arduino-application-shell';
-import { ArduinoFrontendApplication } from './customization/arduino-frontend-application';
+import { ApplicationShell } from './customization/core/application-shell';
+import { FrontendApplication } from './customization/core/frontend-application';
 import { BoardsConfigDialog, BoardsConfigDialogProps } from './boards/boards-config-dialog';
 import { BoardsConfigDialogWidget } from './boards/boards-config-dialog-widget';
-import { ScmContribution } from '@theia/scm/lib/browser/scm-contribution';
-import { ArduinoScmContribution } from './customization/arduino-scm-contribution';
-import { SearchInWorkspaceFrontendContribution } from '@theia/search-in-workspace/lib/browser/search-in-workspace-frontend-contribution';
-import { ArduinoSearchInWorkspaceContribution } from './customization/arduino-search-in-workspace-contribution';
+import { ScmContribution as TheiaScmContribution } from '@theia/scm/lib/browser/scm-contribution';
+import { ArduinoScmContribution } from './customization/scm/arduino-scm-contribution';
+import { SearchInWorkspaceFrontendContribution as TheiaSearchInWorkspaceFrontendContribution } from '@theia/search-in-workspace/lib/browser/search-in-workspace-frontend-contribution';
+import { ArduinoSearchInWorkspaceContribution } from './customization/search-in-workspace/arduino-search-in-workspace-contribution';
 import { LibraryListWidgetFrontendContribution } from './library/library-widget-frontend-contribution';
 import { MonitorServiceClientImpl } from './monitor/monitor-service-client-impl';
 import { MonitorServicePath, MonitorService, MonitorServiceClient } from '../common/protocol/monitor-service';
@@ -53,32 +53,35 @@ import { MonitorWidget } from './monitor/monitor-widget';
 import { MonitorViewContribution } from './monitor/monitor-view-contribution';
 import { MonitorConnection } from './monitor/monitor-connection';
 import { MonitorModel } from './monitor/monitor-model';
-import { TabBarDecoratorService } from '@theia/core/lib/browser/shell/tab-bar-decorator';
-import { ArduinoTabBarDecoratorService } from './shell/arduino-tab-bar-decorator';
+import { TabBarDecoratorService as TheiaTabBarDecoratorService } from '@theia/core/lib/browser/shell/tab-bar-decorator';
+import { TabBarDecoratorService } from './customization/core/tab-bar-decorator';
 import { ProblemManager } from '@theia/markers/lib/browser';
-import { ArduinoProblemManager } from './markers/arduino-problem-manager';
+import { ArduinoProblemManager } from './customization/markers/arduino-problem-manager';
 import { BoardsAutoInstaller } from './boards/boards-auto-installer';
-import { AboutDialog } from '@theia/core/lib/browser/about-dialog';
-import { ArduinoAboutDialog } from './customization/arduino-about-dialog';
-import { ArduinoShellLayoutRestorer } from './shell/arduino-shell-layout-restorer';
+import { AboutDialog as TheiaAboutDialog } from '@theia/core/lib/browser/about-dialog';
+import { AboutDialog } from './customization/core/about-dialog';
+import { ShellLayoutRestorer } from './customization/core/shell-layout-restorer';
 import { EditorMode } from './editor-mode';
 import { ListItemRenderer } from './components/component-list/list-item-renderer';
 import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
 import { MonacoThemingService } from '@theia/monaco/lib/browser/monaco-theming-service';
 import { ArduinoDaemonClientImpl } from './arduino-daemon-client-impl';
 import { ArduinoDaemonClient, ArduinoDaemonPath, ArduinoDaemon } from '../common/protocol/arduino-daemon';
 import { EditorManager } from '@theia/editor/lib/browser';
-import { ArduinoEditorManager } from './editor/arduino-editor-manager';
-import { ArduinoFrontendConnectionStatusService, ArduinoApplicationConnectionStatusContribution } from './customization/arduino-connection-status-service';
-import { FrontendConnectionStatusService, ApplicationConnectionStatusContribution } from '@theia/core/lib/browser/connection-status-service';
+import { ArduinoEditorManager } from './customization/editor/arduino-editor-manager';
+import { FrontendConnectionStatusService, ApplicationConnectionStatusContribution } from './customization/core/connection-status-service';
+import {
+    FrontendConnectionStatusService as TheiaFrontendConnectionStatusService,
+    ApplicationConnectionStatusContribution as TheiaApplicationConnectionStatusContribution
+} from '@theia/core/lib/browser/connection-status-service';
 import { ConfigServiceClientImpl } from './config-service-client-impl';
 import { CoreServiceClientImpl } from './core-service-client-impl';
 import { BoardsDetailsMenuUpdater } from './boards/boards-details-menu-updater';
 import { BoardsConfigStore } from './boards/boards-config-store';
 import { ILogger } from '@theia/core';
 import { FileSystemExt, FileSystemExtPath } from '../common/protocol/filesystem-ext';
-import { WorkspaceFrontendContribution, FileMenuContribution } from '@theia/workspace/lib/browser';
-import { ArduinoWorkspaceFrontendContribution, ArduinoFileMenuContribution } from './customization/arduino-workspace-frontend-contribution';
+import { WorkspaceFrontendContribution as TheiaWorkspaceFrontendContribution, FileMenuContribution as TheiaFileMenuContribution } from '@theia/workspace/lib/browser';
+import { ArduinoWorkspaceFrontendContribution, ArduinoFileMenuContribution } from './customization/workspace/arduino-workspace-frontend-contribution';
 import { Contribution } from './contributions/contribution';
 import { NewSketch } from './contributions/new-sketch';
 import { OpenSketch } from './contributions/open-sketch';
@@ -253,43 +256,43 @@ export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Un
     bind(FrontendApplicationContribution).toService(EditorMode);
 
     // Layout and shell customizations.
-    rebind(OutlineViewContribution).to(ArduinoOutlineViewContribution).inSingletonScope();
-    rebind(ProblemContribution).to(ArduinoProblemContribution).inSingletonScope();
-    rebind(FileNavigatorContribution).to(ArduinoNavigatorContribution).inSingletonScope();
-    rebind(EditorContribution).to(ArduinoEditorContribution).inSingletonScope();
-    rebind(MonacoStatusBarContribution).to(ArduinoMonacoStatusBarContribution).inSingletonScope();
-    rebind(ApplicationShell).to(ArduinoApplicationShell).inSingletonScope();
-    rebind(ScmContribution).to(ArduinoScmContribution).inSingletonScope();
-    rebind(SearchInWorkspaceFrontendContribution).to(ArduinoSearchInWorkspaceContribution).inSingletonScope();
-    rebind(FrontendApplication).to(ArduinoFrontendApplication).inSingletonScope();
-    rebind(WorkspaceFrontendContribution).to(ArduinoWorkspaceFrontendContribution).inSingletonScope();
-    rebind(FileMenuContribution).to(ArduinoFileMenuContribution).inSingletonScope();
+    rebind(TheiaOutlineViewContribution).to(ArduinoOutlineViewContribution).inSingletonScope();
+    rebind(TheiaProblemContribution).to(ArduinoProblemContribution).inSingletonScope();
+    rebind(TheiaFileNavigatorContribution).to(ArduinoNavigatorContribution).inSingletonScope();
+    rebind(TheiaEditorContribution).to(ArduinoEditorContribution).inSingletonScope();
+    rebind(TheiaMonacoStatusBarContribution).to(ArduinoMonacoStatusBarContribution).inSingletonScope();
+    rebind(TheiaApplicationShell).to(ApplicationShell).inSingletonScope();
+    rebind(TheiaScmContribution).to(ArduinoScmContribution).inSingletonScope();
+    rebind(TheiaSearchInWorkspaceFrontendContribution).to(ArduinoSearchInWorkspaceContribution).inSingletonScope();
+    rebind(TheiaFrontendApplication).to(FrontendApplication).inSingletonScope();
+    rebind(TheiaWorkspaceFrontendContribution).to(ArduinoWorkspaceFrontendContribution).inSingletonScope();
+    rebind(TheiaFileMenuContribution).to(ArduinoFileMenuContribution).inSingletonScope();
 
     // Show a disconnected status bar, when the daemon is not available
-    bind(ArduinoApplicationConnectionStatusContribution).toSelf().inSingletonScope();
-    rebind(ApplicationConnectionStatusContribution).toService(ArduinoApplicationConnectionStatusContribution);
-    bind(ArduinoFrontendConnectionStatusService).toSelf().inSingletonScope();
-    rebind(FrontendConnectionStatusService).toService(ArduinoFrontendConnectionStatusService);
+    bind(ApplicationConnectionStatusContribution).toSelf().inSingletonScope();
+    rebind(TheiaApplicationConnectionStatusContribution).toService(ApplicationConnectionStatusContribution);
+    bind(FrontendConnectionStatusService).toSelf().inSingletonScope();
+    rebind(TheiaFrontendConnectionStatusService).toService(FrontendConnectionStatusService);
 
     // Editor customizations. Sets the editor to `readOnly` if under the data dir.
     bind(ArduinoEditorManager).toSelf().inSingletonScope();
     rebind(EditorManager).toService(ArduinoEditorManager);
 
     // Decorator customizations
-    bind(ArduinoTabBarDecoratorService).toSelf().inSingletonScope();
-    rebind(TabBarDecoratorService).toService(ArduinoTabBarDecoratorService);
+    bind(TabBarDecoratorService).toSelf().inSingletonScope();
+    rebind(TheiaTabBarDecoratorService).toService(TabBarDecoratorService);
 
     // Problem markers
     bind(ArduinoProblemManager).toSelf().inSingletonScope();
     rebind(ProblemManager).toService(ArduinoProblemManager);
 
     // About dialog to show the CLI version
-    bind(ArduinoAboutDialog).toSelf().inSingletonScope();
-    rebind(AboutDialog).toService(ArduinoAboutDialog);
+    bind(AboutDialog).toSelf().inSingletonScope();
+    rebind(TheiaAboutDialog).toService(AboutDialog);
 
     // Customized layout restorer that can restore the state in async way: https://github.com/eclipse-theia/theia/issues/6579
-    bind(ArduinoShellLayoutRestorer).toSelf().inSingletonScope();
-    rebind(ShellLayoutRestorer).toService(ArduinoShellLayoutRestorer);
+    bind(ShellLayoutRestorer).toSelf().inSingletonScope();
+    rebind(TheiaShellLayoutRestorer).toService(ShellLayoutRestorer);
 
     // Arduino daemon client. Receives notifications from the backend if the CLI daemon process has been restarted.
     bind(ArduinoDaemon).toDynamicValue(context => {

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

@@ -1,4 +1,5 @@
 import { injectable } from 'inversify';
+import { remote } from 'electron';
 import { WorkspaceCommands } from '@theia/workspace/lib/browser/workspace-commands';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import { SketchContribution, Command, CommandRegistry, MenuModelRegistry, KeybindingRegistry } from './contribution';
@@ -16,9 +17,24 @@ export class CloseSketch extends SketchContribution {
                 }
                 const isTemp = await this.sketchService.isTemp(sketch);
                 if (isTemp) {
-                    await this.commandService.executeCommand(SaveAsSketch.Commands.SAVE_AS_SKETCH.id, { openAfterMove: false, execOnlyIfTemp: true });
-                    await this.commandService.executeCommand(WorkspaceCommands.CLOSE.id);
+                    // TODO: check monaco model version. If `0` just close the app.
+                    const { response } = await remote.dialog.showMessageBox({
+                        type: 'question',
+                        buttons: ["Don't Save", 'Cancel', 'Save'],
+                        message: 'Do you want to save changes to this sketch before closing?',
+                        detail: "If you don't save, your changes will be lost."
+                    });
+                    if (response === 1) { // Cancel
+                        return;
+                    }
+                    if (response === 2) { // Save
+                        const saved = await this.commandService.executeCommand(SaveAsSketch.Commands.SAVE_AS_SKETCH.id, { openAfterMove: false, execOnlyIfTemp: true });
+                        if (!saved) { // If it was not saved, do bail the close.
+                            return;
+                        }
+                    }
                 }
+                await this.commandService.executeCommand(WorkspaceCommands.CLOSE.id);
             }
         });
     }

arduino-ide-extension/src/browser/contributions/save-as-sketch.ts

@@ -28,15 +28,18 @@ export class SaveAsSketch extends SketchContribution {
         });
     }
 
-    async saveAs({ execOnlyIfTemp, openAfterMove }: SaveAsSketch.Options = SaveAsSketch.Options.DEFAULT): Promise<void> {
+    /**
+     * Resolves `true` if the sketch was successfully saved as something.
+     */
+    async saveAs({ execOnlyIfTemp, openAfterMove }: SaveAsSketch.Options = SaveAsSketch.Options.DEFAULT): Promise<boolean> {
         const sketch = await this.getCurrentSketch();
         if (!sketch) {
-            return;
+            return false;
         }
 
         const isTemp = await this.sketchService.isTemp(sketch);
         if (!isTemp && !!execOnlyIfTemp) {
-            return;
+            return false;
         }
 
         // If target does not exist, propose a `directories.user`/${sketch.name} path
@@ -49,16 +52,17 @@ export class SaveAsSketch extends SketchContribution {
         const defaultPath = await this.fileSystem.getFsPath(defaultUri.toString())!;
         const { filePath, canceled } = await remote.dialog.showSaveDialog({ title: 'Save sketch folder as...', defaultPath });
         if (!filePath || canceled) {
-            return;
+            return false;
         }
         const destinationUri = await this.fileSystemExt.getUri(filePath);
         if (!destinationUri) {
-            return;
+            return false;
         }
         const workspaceUri = await this.sketchService.copy(sketch, { destinationUri });
         if (workspaceUri && openAfterMove) {
             this.workspaceService.open(new URI(workspaceUri));
         }
+        return !!workspaceUri;
     }
 
 }

arduino-ide-extension/src/browser/customization/arduino-about-dialog.ts renamed to arduino-ide-extension/src/browser/customization/core/about-dialog.ts

@@ -1,9 +1,9 @@
 import { injectable, inject, postConstruct } from 'inversify';
-import { AboutDialog, ABOUT_CONTENT_CLASS } from '@theia/core/lib/browser/about-dialog';
-import { ConfigService } from '../../common/protocol/config-service';
+import { AboutDialog as TheiaAboutDialog, ABOUT_CONTENT_CLASS } from '@theia/core/lib/browser/about-dialog';
+import { ConfigService } from '../../../common/protocol/config-service';
 
 @injectable()
-export class ArduinoAboutDialog extends AboutDialog {
+export class AboutDialog extends TheiaAboutDialog {
 
     @inject(ConfigService)
     protected readonly configService: ConfigService;

arduino-ide-extension/src/browser/customization/arduino-application-shell.ts renamed to arduino-ide-extension/src/browser/customization/core/application-shell.ts

@@ -1,13 +1,13 @@
 
 import { injectable, inject } from 'inversify';
 import { CommandService } from '@theia/core/lib/common/command';
-import { ApplicationShell, Widget } from '@theia/core/lib/browser';
-import { EditorMode } from '../editor-mode';
+import { ApplicationShell as TheiaApplicationShell, Widget } from '@theia/core/lib/browser';
+import { EditorMode } from '../../editor-mode';
 import { EditorWidget } from '@theia/editor/lib/browser';
-import { SaveAsSketch } from '../contributions/save-as-sketch';
+import { SaveAsSketch } from '../../contributions/save-as-sketch';
 
 @injectable()
-export class ArduinoApplicationShell extends ApplicationShell {
+export class ApplicationShell extends TheiaApplicationShell {
 
     @inject(EditorMode)
     protected readonly editorMode: EditorMode;