init

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

arduino-ide-extension/package.json

@@ -79,7 +79,7 @@
     "grpc_tools_node_protoc_ts": "^4.1.0",
     "mocha": "^7.0.0",
     "moment": "^2.24.0",
-    "protoc": "1.0.4",
+    "protoc": "^1.0.4",
     "shelljs": "^0.8.3",
     "sinon": "^9.0.1",
     "uuid": "^3.2.1",

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

@@ -77,8 +77,8 @@ 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 } from '@theia/workspace/lib/browser';
+import { WorkspaceFrontendContribution, FileMenuContribution } from '@theia/workspace/lib/browser';
-import { ArduinoWorkspaceFrontendContribution } from './customization/arduino-workspace-frontend-contribution';
+import { ArduinoWorkspaceFrontendContribution, ArduinoFileMenuContribution } from './customization/arduino-workspace-frontend-contribution';
 
 const ElementQueries = require('css-element-queries/src/ElementQueries');
 
@@ -255,6 +255,7 @@ export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Un
     rebind(SearchInWorkspaceFrontendContribution).to(ArduinoSearchInWorkspaceContribution).inSingletonScope();
     rebind(FrontendApplication).to(ArduinoFrontendApplication).inSingletonScope();
     rebind(WorkspaceFrontendContribution).to(ArduinoWorkspaceFrontendContribution).inSingletonScope();
+    rebind(FileMenuContribution).to(ArduinoFileMenuContribution).inSingletonScope();
 
     // Show a disconnected status bar, when the daemon is not available
     bind(ArduinoApplicationConnectionStatusContribution).toSelf().inSingletonScope();

arduino-ide-extension/src/browser/customization/arduino-workspace-frontend-contribution.ts

@@ -1,62 +1,38 @@
 import { injectable } from 'inversify';
-import { isOSX } from '@theia/core/lib/common/os';
-import { environment } from '@theia/application-package/lib/environment';
-import { CommonMenus } from '@theia/core/lib/browser';
 import { CommandRegistry } from '@theia/core/lib/common/command';
 import { MenuModelRegistry } from '@theia/core/lib/common/menu';
-import { WorkspaceCommands } from '@theia/workspace/lib/browser/workspace-commands';
+import { WorkspaceCommands, FileMenuContribution } from '@theia/workspace/lib/browser/workspace-commands';
 import { WorkspaceFrontendContribution } from '@theia/workspace/lib/browser/workspace-frontend-contribution';
 
-// TODO: https://github.com/eclipse-theia/theia/issues/8175
 @injectable()
 export class ArduinoWorkspaceFrontendContribution extends WorkspaceFrontendContribution {
 
     registerCommands(registry: CommandRegistry): void {
         super.registerCommands(registry);
-        registry.unregisterCommand(WorkspaceCommands.SAVE_AS);
+        // TODO: instead of blacklisting commands to remove, it would be more robust to whitelist the ones we want to keep
-        registry.unregisterCommand(WorkspaceCommands.OPEN_FOLDER);
+        const commands = new Set(registry.commands);
+        [
+            WorkspaceCommands.OPEN,
+            WorkspaceCommands.OPEN_FILE,
+            WorkspaceCommands.OPEN_FOLDER,
+            WorkspaceCommands.OPEN_WORKSPACE,
+            WorkspaceCommands.OPEN_RECENT_WORKSPACE,
+            WorkspaceCommands.SAVE_WORKSPACE_AS,
+            WorkspaceCommands.SAVE_AS
+        ].filter(commands.has.bind(commands)).forEach(registry.unregisterCommand.bind(registry));
     }
 
-    registerMenus(registry: MenuModelRegistry): void {
+    registerMenus(_: MenuModelRegistry): void {
-        if (isOSX || !environment.electron.is()) {
+        // NOOP
-            registry.registerMenuAction(CommonMenus.FILE_OPEN, {
+    }
-                commandId: WorkspaceCommands.OPEN.id,
+
-                order: 'a00'
+}
-            });
+
-        }
+@injectable()
-        if (!isOSX && environment.electron.is()) {
+export class ArduinoFileMenuContribution extends FileMenuContribution {
-            registry.registerMenuAction(CommonMenus.FILE_OPEN, {
+
-                commandId: WorkspaceCommands.OPEN_FILE.id,
+    registerMenus(_: MenuModelRegistry): void {
-                label: `${WorkspaceCommands.OPEN_FILE.dialogLabel}...`,
+        // NOOP
-                order: 'a01'
-            });
-            registry.registerMenuAction(CommonMenus.FILE_OPEN, {
-                commandId: WorkspaceCommands.OPEN_FOLDER.id,
-                label: `${WorkspaceCommands.OPEN_FOLDER.dialogLabel}...`,
-                order: 'a02'
-            });
-        }
-        registry.registerMenuAction(CommonMenus.FILE_OPEN, {
-            commandId: WorkspaceCommands.OPEN_WORKSPACE.id,
-            order: 'a10'
-        });
-        registry.registerMenuAction(CommonMenus.FILE_OPEN, {
-            commandId: WorkspaceCommands.OPEN_RECENT_WORKSPACE.id,
-            order: 'a20'
-        });
-        registry.registerMenuAction(CommonMenus.FILE_OPEN, {
-            commandId: WorkspaceCommands.SAVE_WORKSPACE_AS.id,
-            order: 'a30'
-        });
-
-        registry.registerMenuAction(CommonMenus.FILE_CLOSE, {
-            commandId: WorkspaceCommands.CLOSE.id
-        });
-
-        // `Save As`
-        // menus.registerMenuAction(CommonMenus.FILE_SAVE, {
-        //     commandId: WorkspaceCommands.SAVE_AS.id,
-        // });
     }
 
 }

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

@@ -0,0 +1,6 @@
+import { CommonMenus } from '@theia/core/lib/browser/common-frontend-contribution';
+
+export namespace ArduinoMenus {
+    export const FILE__SKETCH_GROUP = [...CommonMenus.FILE, '0_sketch'];
+    export const FILE__PRINT_GROUP = [...CommonMenus.FILE, '1_print'];
+}

yarn.lock

@@ -11922,7 +11922,7 @@ proto-list@~1.2.1:
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
   integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
 
-protoc@^1.0.4:
+protoc@1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/protoc/-/protoc-1.0.4.tgz#fd0ba07132c459df80c6135889bd5cc92f0afec2"
   integrity sha512-2crtOP6xhacdWBW+lkhQJmzwg2cPmqSsh51FOHQmgTd8dKksO9sFzlhzteh6x+qPTfPU7h6smC1eg5d9bqGpTQ==