Merge pull request #128 from bcmi-labs/external-programmer

[ATL-119]: Rework the menu organization for IDE 2.0, [ATL-75]: External programmer

Author: kittaakos

arduino-debugger-extension/package.json

@@ -3,9 +3,6 @@
   "version": "0.0.7",
   "description": "An extension for debugging Arduino programs",
   "license": "MIT",
-  "engines": {
-    "node": ">=10.11.0 <12"
-  },
   "dependencies": {
     "@theia/debug": "next",
     "arduino-ide-extension": "0.0.7",

arduino-debugger-extension/src/browser/arduino-debug-frontend-application-contribution.ts

@@ -114,7 +114,7 @@ export class ArduinoDebugFrontendApplicationContribution extends DebugFrontendAp
             id: ArduinoDebugCommands.START_DEBUG.id,
             command: ArduinoDebugCommands.START_DEBUG.id,
             tooltip: 'Start Debugging',
-            priority: 1
+            priority: 3
         });
     }
 

arduino-ide-extension/package.json

@@ -3,9 +3,6 @@
   "version": "0.0.7",
   "description": "An extension for Theia building the Arduino IDE",
   "license": "MIT",
-  "engines": {
-    "node": ">=10.11.0 <12"
-  },
   "scripts": {
     "prepare": "yarn download-cli && yarn download-ls && yarn run clean && yarn run build",
     "clean": "rimraf lib",
@@ -22,7 +19,6 @@
     "@grpc/grpc-js": "^1.1.1",
     "@theia/application-package": "next",
     "@theia/core": "next",
-    "@theia/cpp": "next",
     "@theia/editor": "next",
     "@theia/filesystem": "next",
     "@theia/git": "next",
@@ -31,6 +27,8 @@
     "@theia/monaco": "next",
     "@theia/navigator": "next",
     "@theia/outline-view": "next",
+    "@theia/preferences": "next",
+    "@theia/output": "next",
     "@theia/search-in-workspace": "next",
     "@theia/terminal": "next",
     "@theia/workspace": "next",
@@ -40,9 +38,11 @@
     "@types/google-protobuf": "^3.7.2",
     "@types/js-yaml": "^3.12.2",
     "@types/lodash.debounce": "^4.0.6",
+    "@types/ncp": "^2.0.4",
     "@types/ps-tree": "^1.1.0",
     "@types/react-select": "^3.0.0",
     "@types/sinon": "^7.5.2",
+    "@types/temp": "^0.8.34",
     "@types/which": "^1.3.1",
     "ajv": "^6.5.3",
     "css-element-queries": "^1.2.0",
@@ -53,11 +53,13 @@
     "google-protobuf": "^3.11.4",
     "lodash.debounce": "^4.0.8",
     "js-yaml": "^3.13.1",
+    "ncp": "^2.0.0",
     "p-queue": "^5.0.0",
     "ps-tree": "^1.2.0",
     "react-select": "^3.0.4",
     "semver": "^6.3.0",
     "string-natural-compare": "^2.0.3",
+    "temp": "^0.9.1",
     "tree-kill": "^1.2.1",
     "upath": "^1.1.2",
     "which": "^1.3.1"
@@ -66,7 +68,6 @@
     "@types/chai": "^4.2.7",
     "@types/chai-string": "^1.4.2",
     "@types/mocha": "^5.2.7",
-    "@types/temp": "^0.8.34",
     "chai": "^4.2.0",
     "chai-string": "^1.5.0",
     "decompress": "^4.2.0",
@@ -76,11 +77,9 @@
     "grpc_tools_node_protoc_ts": "^4.1.0",
     "mocha": "^7.0.0",
     "moment": "^2.24.0",
-    "ncp": "^2.0.0",
     "protoc": "^1.0.4",
     "shelljs": "^0.8.3",
     "sinon": "^9.0.1",
-    "temp": "^0.9.1",
     "uuid": "^3.2.1",
     "yargs": "^11.1.0"
   },
@@ -108,8 +107,8 @@
       "frontend": "lib/browser/arduino-ide-frontend-module"
     },
     {
-      "frontend": "lib/browser/menu/browser-arduino-menu-module",
-      "frontendElectron": "lib/electron-browser/menu/electron-arduino-menu-module"
+      "frontend": "lib/browser/theia/core/browser-menu-module",
+      "frontendElectron": "lib/electron-browser/theia/core/electron-menu-module"
     },
     {
       "frontend": "lib/browser/boards/quick-open/boards-quick-open-module"

arduino-ide-extension/src/browser/arduino-commands.ts

@@ -1,75 +1,30 @@
 import { Command } from '@theia/core/lib/common/command';
 
+/**
+ * @deprecated all these commands should go under contributions and have their command, menu, keybinding, and toolbar contributions.
+ */
 export namespace ArduinoCommands {
 
-    const category = 'Arduino';
-
-    export const VERIFY: Command = {
-        id: 'arduino-verify',
-        label: 'Verify Sketch'
-    }
-    export const VERIFY_TOOLBAR: Command = {
-        id: 'arduino-verify-toolbar',
-    }
-
-    export const UPLOAD: Command = {
-        id: 'arduino-upload',
-        label: 'Upload Sketch'
-    }
-    export const UPLOAD_TOOLBAR: Command = {
-        id: 'arduino-upload-toolbar',
-    }
-
     export const TOGGLE_COMPILE_FOR_DEBUG: Command = {
-        id: "arduino-toggle-compile-for-debug"
-    }
-
-    export const SHOW_OPEN_CONTEXT_MENU: Command = {
-        id: 'arduino-show-open-context-menu',
-        label: 'Open Sketch',
-        category
+        id: 'arduino-toggle-compile-for-debug'
     };
 
-    export const OPEN_FILE_NAVIGATOR: Command = {
-        id: 'arduino-open-file-navigator'
-    }
-
-    export const OPEN_SKETCH: Command = {
-        id: 'arduino-open-file'
-    }
-
     /**
      * Unlike `OPEN_SKETCH`, it opens all files from a sketch folder. (ino, cpp, etc...)
      */
     export const OPEN_SKETCH_FILES: Command = {
         id: 'arduino-open-sketch-files'
-    }
-
-    export const SAVE_SKETCH: Command = {
-        id: 'arduino-save-file'
-    }
-
-    export const NEW_SKETCH: Command = {
-        id: 'arduino-new-sketch',
-        label: 'New Sketch',
-        category
-    }
+    };
 
     export const OPEN_BOARDS_DIALOG: Command = {
         id: 'arduino-open-boards-dialog'
-    }
+    };
 
     export const TOGGLE_ADVANCED_MODE: Command = {
         id: 'arduino-toggle-advanced-mode'
-    }
+    };
     export const TOGGLE_ADVANCED_MODE_TOOLBAR: Command = {
-        id: "arduino-toggle-advanced-mode-toolbar"
-    }
-
-    export const OPEN_CLI_CONFIG: Command = {
-        id: 'arduino-open-cli-config',
-        label: 'Open CLI Configuration',
-        category
+        id: 'arduino-toggle-advanced-mode-toolbar'
     };
 
 }