ATL-815: Implemented Open Recent.

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

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

@@ -134,6 +134,7 @@ import { Sketchbook } from './contributions/sketchbook';
 import { DebugFrontendApplicationContribution } from './theia/debug/debug-frontend-application-contribution';
 import { DebugFrontendApplicationContribution as TheiaDebugFrontendApplicationContribution } from '@theia/debug/lib/browser/debug-frontend-application-contribution';
 import { BoardSelection } from './contributions/board-selection';
+import { OpenRecentSketch } from './contributions/open-recent-sketch';
 
 const ElementQueries = require('css-element-queries/src/ElementQueries');
 
@@ -337,6 +338,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     Contribution.configure(bind, Debug);
     Contribution.configure(bind, Sketchbook);
     Contribution.configure(bind, BoardSelection);
+    Contribution.configure(bind, OpenRecentSketch);
 
     bind(OutputServiceImpl).toSelf().inSingletonScope().onActivation(({ container }, outputService) => {
         WebSocketConnectionProvider.createProxy(container, OutputServicePath, outputService);

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

@@ -0,0 +1,62 @@
+import { inject, injectable } from 'inversify';
+import { WorkspaceServer } from '@theia/workspace/lib/common/workspace-protocol';
+import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
+import { SketchContribution, CommandRegistry, MenuModelRegistry, Sketch } from './contribution';
+import { ArduinoMenus } from '../menu/arduino-menus';
+import { MainMenuManager } from '../../common/main-menu-manager';
+import { OpenSketch } from './open-sketch';
+import { NotificationCenter } from '../notification-center';
+
+@injectable()
+export class OpenRecentSketch extends SketchContribution {
+
+    @inject(CommandRegistry)
+    protected readonly commandRegistry: CommandRegistry;
+
+    @inject(MenuModelRegistry)
+    protected readonly menuRegistry: MenuModelRegistry;
+
+    @inject(MainMenuManager)
+    protected readonly mainMenuManager: MainMenuManager;
+
+    @inject(WorkspaceServer)
+    protected readonly workspaceServer: WorkspaceServer;
+
+    @inject(NotificationCenter)
+    protected readonly notificationCenter: NotificationCenter;
+
+    protected toDisposeBeforeRegister = new Map<string, DisposableCollection>();
+
+    onStart(): void {
+        const refreshMenu = (sketches: Sketch[]) => {
+            this.register(sketches);
+            this.mainMenuManager.update();
+        };
+        this.notificationCenter.onRecentSketchesChanged(({ sketches }) => refreshMenu(sketches));
+        this.sketchService.recentlyOpenedSketches().then(refreshMenu);
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        registry.registerSubmenu(ArduinoMenus.FILE__OPEN_RECENT_SUBMENU, 'Open Recent', { order: '2' });
+    }
+
+    protected register(sketches: Sketch[]): void {
+        let order = 0;
+        for (const sketch of sketches) {
+            const { uri } = sketch;
+            const toDispose = this.toDisposeBeforeRegister.get(uri);
+            if (toDispose) {
+                toDispose.dispose();
+            }
+            const command = { id: `arduino-open-recent--${uri}` };
+            const handler = { execute: () => this.commandRegistry.executeCommand(OpenSketch.Commands.OPEN_SKETCH.id, sketch) };
+            this.commandRegistry.registerCommand(command, handler);
+            this.menuRegistry.registerMenuAction(ArduinoMenus.FILE__OPEN_RECENT_SUBMENU, { commandId: command.id, label: sketch.name, order: String(order) });
+            this.toDisposeBeforeRegister.set(sketch.uri, new DisposableCollection(
+                Disposable.create(() => this.commandRegistry.unregisterCommand(command)),
+                Disposable.create(() => this.menuRegistry.unregisterMenuAction(command))
+            ));
+        }
+    }
+
+}

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

@@ -60,8 +60,8 @@ export class SaveAsSketch extends SketchContribution {
         }
         const workspaceUri = await this.sketchService.copy(sketch, { destinationUri });
         if (workspaceUri && openAfterMove) {
-            if (wipeOriginal) {
-                await this.fileService.delete(new URI(sketch.uri));
+            if (wipeOriginal || (openAfterMove && execOnlyIfTemp)) {
+                await this.fileService.delete(new URI(sketch.uri), { recursive: true });
             }
             this.workspaceService.open(new URI(workspaceUri), { preserveWindow: true });
         }

arduino-ide-extension/src/browser/menu/arduino-menus.ts

@@ -12,11 +12,14 @@ export namespace ArduinoMenus {
     export const FILE__SETTINGS_GROUP = [...(isOSX ? MAIN_MENU_BAR : CommonMenus.FILE), '2_settings'];
     export const FILE__QUIT_GROUP = [...CommonMenus.FILE, '3_quit'];
 
+    // -- File / Open Recent
+    export const FILE__OPEN_RECENT_SUBMENU = [...FILE__SKETCH_GROUP, '0_open_recent'];
+
     // -- File / Sketchbook
-    export const FILE__SKETCHBOOK_SUBMENU = [...FILE__SKETCH_GROUP, '0_sketchbook'];
+    export const FILE__SKETCHBOOK_SUBMENU = [...FILE__SKETCH_GROUP, '1_sketchbook'];
 
     // -- File / Examples
-    export const FILE__EXAMPLES_SUBMENU = [...FILE__SKETCH_GROUP, '1_examples'];
+    export const FILE__EXAMPLES_SUBMENU = [...FILE__SKETCH_GROUP, '2_examples'];
     export const EXAMPLES__BUILT_IN_GROUP = [...FILE__EXAMPLES_SUBMENU, '0_built_ins'];
     export const EXAMPLES__ANY_BOARD_GROUP = [...FILE__EXAMPLES_SUBMENU, '1_any_board'];
     export const EXAMPLES__CURRENT_BOARD_GROUP = [...FILE__EXAMPLES_SUBMENU, '2_current_board'];

arduino-ide-extension/src/browser/notification-center.ts

@@ -22,6 +22,7 @@ export class NotificationCenter implements NotificationServiceClient, FrontendAp
     protected readonly libraryUninstalledEmitter = new Emitter<{ item: LibraryPackage }>();
     protected readonly attachedBoardsChangedEmitter = new Emitter<AttachedBoardsChangeEvent>();
     protected readonly sketchbookChangedEmitter = new Emitter<{ created: Sketch[], removed: Sketch[] }>();
+    protected readonly recentSketchesChangedEmitter = new Emitter<{ sketches: Sketch[] }>();
 
     protected readonly toDispose = new DisposableCollection(
         this.indexUpdatedEmitter,
@@ -46,6 +47,7 @@ export class NotificationCenter implements NotificationServiceClient, FrontendAp
     readonly onLibraryUninstalled = this.libraryUninstalledEmitter.event;
     readonly onAttachedBoardsChanged = this.attachedBoardsChangedEmitter.event;
     readonly onSketchbookChanged = this.sketchbookChangedEmitter.event;
+    readonly onRecentSketchesChanged = this.recentSketchesChangedEmitter.event;
 
     @postConstruct()
     protected init(): void {
@@ -96,4 +98,8 @@ export class NotificationCenter implements NotificationServiceClient, FrontendAp
         this.sketchbookChangedEmitter.fire(event);
     }
 
+    notifyRecentSketchesChanged(event: { sketches: Sketch[] }): void {
+        this.recentSketchesChangedEmitter.fire(event);
+    }
+
 }

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

@@ -3,6 +3,7 @@ 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';
+import { SketchesService } from '../../../common/protocol';
 import { ArduinoCommands } from '../../arduino-commands';
 
 @injectable()
@@ -17,12 +18,16 @@ export class FrontendApplication extends TheiaFrontendApplication {
     @inject(CommandService)
     protected readonly commandService: CommandService;
 
+    @inject(SketchesService)
+    protected readonly sketchesService: SketchesService;
+
     protected async initializeLayout(): Promise<void> {
         await super.initializeLayout();
         const roots = await this.workspaceService.roots;
         for (const root of roots) {
             const exists = await this.fileService.exists(root.resource);
             if (exists) {
+                this.sketchesService.markAsRecentlyOpened(root.resource.toString()); // no await, will get the notification later and rebuild the menu
                 await this.commandService.executeCommand(ArduinoCommands.OPEN_SKETCH_FILES.id, root.resource);
             }
         }